From fe71084f23c7e2fb009a2f754950e9166f99107a Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 9 Oct 2026 10:39:50 -0400 Subject: [PATCH] feat: replace the LXQt desktop with SteamOS-style KDE Plasma (#473) * feat: replace the LXQt desktop with SteamOS-style KDE Plasma * feat: leaving the KDE desktop logs out through Plasma and returns to gaming mode * feat: DroidDeck logo wallpaper as the KDE desktop default * feat: build the KDE wallpaper from the DroidDeck mark artwork * ci: keep the built desktop package as a short-lived artifact for device testing * fix: the desktop loading screen no longer promises Steam on the desktop * docs: the output resize comments name the desktop's KWin * fix: the desktop package verifies every package's Arch Linux ARM signature and never replaces a published tag * fix: programs sent to the GPU from the desktop drop its software rendering overrides * fix: an interrupted desktop install no longer counts as installed * feat: pin the desktop package to its DroidDeck-Components release instead of the catalog --- .github/workflows/build-desktop-kde.yml | 80 +++ .github/workflows/build-wlroots.yml | 49 -- .github/workflows/build.yml | 12 +- app/build.gradle | 10 + app/src/main/cpp/waylandcomp/CMakeLists.txt | 2 + .../single-pixel-buffer-v1-protocol.c | 61 ++ .../single-pixel-buffer-v1-server-protocol.h | 142 +++++ .../protocols/single-pixel-buffer-v1.xml | 76 +++ app/src/main/cpp/waylandcomp/src/compositor.c | 21 +- .../main/cpp/waylandcomp/src/droiddeck_ext.c | 1 + .../main/cpp/waylandcomp/src/droiddeck_ext.h | 3 + .../cpp/waylandcomp/src/wl_single_pixel.c | 51 ++ .../com/droiddeck/launcher/MainActivity.kt | 4 - .../com/droiddeck/launcher/SessionActivity.kt | 9 +- .../droiddeck/launcher/core/DeviceReport.kt | 4 +- .../gpu/LinuxVulkanDriverManager.java | 2 +- .../launcher/runtime/AppImageManager.kt | 2 +- .../launcher/runtime/BwrapSpawner.kt | 8 +- .../launcher/runtime/DesktopCatalog.kt | 38 +- .../launcher/session/SessionFiles.kt | 16 +- .../launcher/session/SessionPaths.kt | 2 +- .../launcher/session/SessionPrefs.kt | 15 - .../launcher/session/SessionService.kt | 15 +- .../launcher/ui/ModeSettingsDialog.kt | 10 - .../launcher/wayland/WaylandCompositor.java | 2 +- app/src/main/res/values-es/strings.xml | 11 +- app/src/main/res/values-fr/strings.xml | 9 +- app/src/main/res/values-ja/strings.xml | 11 +- app/src/main/res/values-ko/strings.xml | 11 +- app/src/main/res/values-ru/strings.xml | 9 +- app/src/main/res/values-zh-rCN/strings.xml | 11 +- app/src/main/res/values-zh-rHK/strings.xml | 11 +- app/src/main/res/values-zh-rTW/strings.xml | 11 +- app/src/main/res/values/strings.xml | 11 +- docs/development/flatpak.md | 8 +- tools/build_local.sh | 16 +- tools/desktop-kde/README.md | 23 + tools/desktop-kde/archlinuxarm-builder.gpg | Bin 0 -> 2228 bytes tools/desktop-kde/build.sh | 73 +++ tools/desktop-kde/closure.py | 153 +++++ tools/desktop-kde/overlay/etc/xdg/baloofilerc | 2 + .../overlay/etc/xdg/gtk-3.0/settings.ini | 5 + tools/desktop-kde/overlay/etc/xdg/kcminputrc | 5 + tools/desktop-kde/overlay/etc/xdg/kdeglobals | 24 + tools/desktop-kde/overlay/etc/xdg/konsolerc | 2 + .../overlay/etc/xdg/kscreenlockerrc | 3 + tools/desktop-kde/overlay/etc/xdg/ksmserverrc | 2 + tools/desktop-kde/overlay/etc/xdg/ksplashrc | 3 + tools/desktop-kde/overlay/etc/xdg/kwalletrc | 3 + tools/desktop-kde/overlay/etc/xdg/kwinrc | 12 + tools/desktop-kde/overlay/etc/xdg/kwinrulesrc | 32 + tools/desktop-kde/overlay/etc/xdg/plasmarc | 2 + tools/desktop-kde/overlay/etc/xdg/startkderc | 2 + .../droiddeck-return-gaming.desktop | 9 + .../applications/steamdeck-bigpicture.desktop | 8 + .../applications/steamdeck-steam.desktop | 8 + .../usr/share/color-schemes/Vapor.colors | 119 ++++ .../actions/steamdeck-gaming-return.svg | 7 + .../icons/hicolor/scalable/apps/steam.svg | 11 + .../places/distributor-logo-steamdeck.svg | 13 + .../usr/share/konsole/Vapor.colorscheme | 94 +++ .../overlay/usr/share/konsole/Vapor.profile | 6 + .../share/licenses/droiddeck-desktop/NOTICE | 12 + .../share/plasma/desktoptheme/Vapor/colors | 147 +++++ .../plasma/desktoptheme/Vapor/metadata.json | 13 + .../Vapor/widgets/plasmoidheading.svg | 71 +++ .../com.valve.vapor.desktop/contents/defaults | 27 + .../contents/icons/deck_icon.png | Bin 0 -> 4540 bytes .../layouts/org.kde.plasma.desktop-layout.js | 43 ++ .../org.kde.plasma.folder.js | 4 + .../org.kde.plasma.kickoff.js | 3 + .../org.kde.plasma.systemtray.js | 6 + .../contents/previews/preview.png | Bin 0 -> 45238 bytes .../com.valve.vapor.desktop/metadata.json | 22 + .../DroidDeck/contents/images/1920x1080.svg | 26 + .../share/wallpapers/DroidDeck/metadata.json | 8 + tools/desktop-kde/release.env | 4 + tools/desktop-kde/runtime-packages.txt | 165 ++++++ tools/desktop-kde/seeds.txt | 31 + tools/linuxfs/desktop/autostart | 57 -- tools/linuxfs/desktop/droiddeck-desktop | 231 +++----- tools/linuxfs/desktop/droiddeck-desktop-gpu | 9 +- tools/linuxfs/desktop/droiddeck-gpu | 11 +- tools/linuxfs/desktop/kwin_wayland_wrapper | 11 + tools/linuxfs/desktop/panel.conf | 55 -- tools/linuxfs/desktop/rc.xml | 31 - .../overlay/usr/local/bin/droiddeck-session | 4 +- .../usr/local/bin/droiddeck-steam-launch | 37 +- tools/linuxfs/preload/dircache.c | 16 +- tools/linuxfs/preload/links.c | 56 ++ tools/release/update_catalog.py | 2 +- tools/wlroots/build-in-arch.sh | 58 -- ...lkan-allocator-for-non-drm-gpu-nodes.patch | 549 ------------------ tools/wlroots/release.env | 2 - 94 files changed, 1904 insertions(+), 1182 deletions(-) create mode 100644 .github/workflows/build-desktop-kde.yml delete mode 100644 .github/workflows/build-wlroots.yml create mode 100644 app/src/main/cpp/waylandcomp/generated/single-pixel-buffer-v1-protocol.c create mode 100644 app/src/main/cpp/waylandcomp/generated/single-pixel-buffer-v1-server-protocol.h create mode 100644 app/src/main/cpp/waylandcomp/protocols/single-pixel-buffer-v1.xml create mode 100644 app/src/main/cpp/waylandcomp/src/wl_single_pixel.c create mode 100644 tools/desktop-kde/README.md create mode 100644 tools/desktop-kde/archlinuxarm-builder.gpg create mode 100755 tools/desktop-kde/build.sh create mode 100755 tools/desktop-kde/closure.py create mode 100644 tools/desktop-kde/overlay/etc/xdg/baloofilerc create mode 100644 tools/desktop-kde/overlay/etc/xdg/gtk-3.0/settings.ini create mode 100644 tools/desktop-kde/overlay/etc/xdg/kcminputrc create mode 100644 tools/desktop-kde/overlay/etc/xdg/kdeglobals create mode 100644 tools/desktop-kde/overlay/etc/xdg/konsolerc create mode 100644 tools/desktop-kde/overlay/etc/xdg/kscreenlockerrc create mode 100644 tools/desktop-kde/overlay/etc/xdg/ksmserverrc create mode 100644 tools/desktop-kde/overlay/etc/xdg/ksplashrc create mode 100644 tools/desktop-kde/overlay/etc/xdg/kwalletrc create mode 100644 tools/desktop-kde/overlay/etc/xdg/kwinrc create mode 100644 tools/desktop-kde/overlay/etc/xdg/kwinrulesrc create mode 100644 tools/desktop-kde/overlay/etc/xdg/plasmarc create mode 100644 tools/desktop-kde/overlay/etc/xdg/startkderc create mode 100644 tools/desktop-kde/overlay/usr/share/applications/droiddeck-return-gaming.desktop create mode 100644 tools/desktop-kde/overlay/usr/share/applications/steamdeck-bigpicture.desktop create mode 100644 tools/desktop-kde/overlay/usr/share/applications/steamdeck-steam.desktop create mode 100644 tools/desktop-kde/overlay/usr/share/color-schemes/Vapor.colors create mode 100644 tools/desktop-kde/overlay/usr/share/icons/hicolor/scalable/actions/steamdeck-gaming-return.svg create mode 100644 tools/desktop-kde/overlay/usr/share/icons/hicolor/scalable/apps/steam.svg create mode 100644 tools/desktop-kde/overlay/usr/share/icons/hicolor/scalable/places/distributor-logo-steamdeck.svg create mode 100644 tools/desktop-kde/overlay/usr/share/konsole/Vapor.colorscheme create mode 100644 tools/desktop-kde/overlay/usr/share/konsole/Vapor.profile create mode 100644 tools/desktop-kde/overlay/usr/share/licenses/droiddeck-desktop/NOTICE create mode 100644 tools/desktop-kde/overlay/usr/share/plasma/desktoptheme/Vapor/colors create mode 100644 tools/desktop-kde/overlay/usr/share/plasma/desktoptheme/Vapor/metadata.json create mode 100644 tools/desktop-kde/overlay/usr/share/plasma/desktoptheme/Vapor/widgets/plasmoidheading.svg create mode 100644 tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/defaults create mode 100644 tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/icons/deck_icon.png create mode 100644 tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js create mode 100644 tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js create mode 100644 tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js create mode 100644 tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.systemtray.js create mode 100644 tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/previews/preview.png create mode 100644 tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/metadata.json create mode 100644 tools/desktop-kde/overlay/usr/share/wallpapers/DroidDeck/contents/images/1920x1080.svg create mode 100644 tools/desktop-kde/overlay/usr/share/wallpapers/DroidDeck/metadata.json create mode 100644 tools/desktop-kde/release.env create mode 100644 tools/desktop-kde/runtime-packages.txt create mode 100644 tools/desktop-kde/seeds.txt delete mode 100644 tools/linuxfs/desktop/autostart create mode 100755 tools/linuxfs/desktop/kwin_wayland_wrapper delete mode 100644 tools/linuxfs/desktop/panel.conf delete mode 100644 tools/linuxfs/desktop/rc.xml create mode 100644 tools/linuxfs/preload/links.c delete mode 100755 tools/wlroots/build-in-arch.sh delete mode 100644 tools/wlroots/patches/0001-vulkan-allocator-for-non-drm-gpu-nodes.patch delete mode 100644 tools/wlroots/release.env diff --git a/.github/workflows/build-desktop-kde.yml b/.github/workflows/build-desktop-kde.yml new file mode 100644 index 0000000000..6566d92bd8 --- /dev/null +++ b/.github/workflows/build-desktop-kde.yml @@ -0,0 +1,80 @@ +name: Build desktop package (KDE Plasma) + +# The desktop the app installs into its Linux runtime on first use: KDE Plasma as SteamOS's desktop +# mode has it, the closure of tools/desktop-kde/seeds.txt over Arch Linux ARM minus what the runtime +# already carries, plus tools/desktop-kde/overlay (tools/desktop-kde/build.sh), every package +# signature-checked. Published as a release in Droid-Deck/DroidDeck-Components with DroidDeck's +# other components; the apk pins it in tools/desktop-kde/release.env (tag, sha256, size). A +# published tag is never rebuilt: the packages are Arch Linux ARM's current ones, so a rebuild +# would not match the pinned sha256. A changed package gets a new tag (desktop-kde-r2, ...) and a +# release.env update. +on: + push: + paths: + - 'tools/desktop-kde/**' + - '.github/workflows/build-desktop-kde.yml' + workflow_dispatch: + inputs: + tag: + description: 'Release tag to publish as (e.g. desktop-kde-r1); empty = artifact only' + required: false + default: '' + +permissions: + contents: write + +jobs: + build: + runs-on: ubuntu-24.04 + timeout-minutes: 90 + steps: + - uses: actions/checkout@v4 + - 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 xz-utils gpgv >/dev/null + tools/desktop-kde/build.sh out + echo "size $(stat -c %s out/desktop-kde.tar.zst) sha256 $(cat out/desktop-kde.sha256)" + # The package itself too, briefly: enough to try a build on a device before publishing it. + - uses: actions/upload-artifact@v4 + with: + name: desktop-kde + retention-days: 7 + compression-level: 0 + path: | + out/desktop-kde.tar.zst + out/desktop-kde.packages.txt + out/desktop-kde.sha256 + - 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 }}' + if gh release view "$TAG" >/dev/null 2>&1; then + 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" \ + --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 + gh release edit "$TAG" --latest=false --prerelease=false diff --git a/.github/workflows/build-wlroots.yml b/.github/workflows/build-wlroots.yml deleted file mode 100644 index 92780a2a49..0000000000 --- a/.github/workflows/build-wlroots.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: Build wlroots (patched) - -# The desktop's wlroots (Arch Linux ARM's wlroots0.20, what the desktop package's labwc links) -# rebuilt with tools/wlroots/patches: a Vulkan DMA-BUF allocator for the Adreno node, which is not -# a DRM device, so labwc's vulkan and gles2 renderers can start. Built in an Arch Linux ARM -# container on an arm64 runner and published as a release asset the apk build fetches -# (tools/wlroots/release.env names the tag and sha). The hosted desktop package is never changed. -on: - push: - paths: - - 'tools/wlroots/**' - - '.github/workflows/build-wlroots.yml' - workflow_dispatch: - inputs: - tag: - description: 'Release tag to publish as (e.g. wlroots-0.20.2-p1); empty = artifact only' - required: false - default: '' - -permissions: - contents: write - -jobs: - build: - runs-on: ubuntu-24.04-arm - timeout-minutes: 90 - steps: - - uses: actions/checkout@v4 - - name: Build in Arch Linux ARM - run: | - set -euo pipefail - docker run --rm -v "$PWD:/work" -w /work menci/archlinuxarm:base-devel bash tools/wlroots/build-in-arch.sh - sudo chown -R "$(id -u):$(id -g)" . - - uses: actions/upload-artifact@v4 - with: - name: wlroots-patched - path: | - wlroots.tzst - wlroots.tzst.sha256 - - name: Publish - if: github.event_name == 'workflow_dispatch' && inputs.tag != '' - env: - GH_TOKEN: ${{ github.token }} - run: | - set -euo pipefail - gh release create "${{ inputs.tag }}" --latest=false --prerelease=false --title "${{ inputs.tag }}" --notes "wlroots 0.20.2 with tools/wlroots/patches (Vulkan DMA-BUF allocator for non-DRM GPU nodes); staged by the apk at /usr/local/lib/droiddeck-wlroots for the desktop's GPU renderers. sha256 $(cut -d' ' -f1 wlroots.tzst.sha256)" wlroots.tzst wlroots.tzst.sha256 || gh release upload "${{ inputs.tag }}" wlroots.tzst wlroots.tzst.sha256 --clobber - # A component the apk fetches by tag, never something users install: it must not - # become the repo's Latest release or appear as a pre-release, also when re-uploaded. - gh release edit "${{ inputs.tag }}" --latest=false --prerelease=false diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d409218765..ac5144c95b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -216,14 +216,6 @@ jobs: test -f "$D/usr/local/bin/gamescope" rm gamescope.tzst fi - if [ -f tools/wlroots/release.env ]; then - . tools/wlroots/release.env - gh release download "${WLROOTS_TAG}" -R "${GITHUB_REPOSITORY}" -p wlroots.tzst -O wlroots.tzst - echo "${WLROOTS_SHA256} wlroots.tzst" | sha256sum -c - - tar --use-compress-program=unzstd -xf wlroots.tzst -C "$D" - test -f "$D/usr/local/lib/droiddeck-wlroots/libwlroots-0.20.so" - rm wlroots.tzst - fi . tools/linuxfs/uruntime.env curl -fsSL --retry 3 -o uruntime "https://github.com/VHSgunzo/uruntime/releases/download/${URUNTIME_VERSION}/${URUNTIME_ASSET}" echo "${URUNTIME_SHA256} uruntime" | sha256sum -c - @@ -273,9 +265,7 @@ jobs: install -Dm644 tools/linuxfs/desktop/droiddeck-desktop "$D/usr/local/bin/droiddeck-desktop" install -Dm644 tools/linuxfs/desktop/droiddeck-gpu "$D/usr/local/bin/droiddeck-gpu" install -Dm644 tools/linuxfs/desktop/droiddeck-desktop-gpu "$D/usr/local/bin/droiddeck-desktop-gpu" - install -Dm644 tools/linuxfs/desktop/autostart "$D/etc/xdg/labwc/autostart" - install -Dm644 tools/linuxfs/desktop/rc.xml "$D/etc/xdg/labwc/rc.xml" - install -Dm644 tools/linuxfs/desktop/panel.conf "$D/etc/xdg/lxqt/panel.conf" + install -Dm644 tools/linuxfs/desktop/kwin_wayland_wrapper "$D/usr/local/bin/kwin_wayland_wrapper" install -Dm644 tools/linuxfs/desktop/firefox-droiddeck.js "$D/usr/lib/firefox/defaults/pref/droiddeck.js" ls -lR "$D" diff --git a/app/build.gradle b/app/build.gradle index 98a37d7e1e..bb03f680a9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,6 +59,12 @@ def ciBuild = providers.environmentVariable('GITHUB_ACTIONS').getOrNull() == 'tr def releaseSigner = rootProject.file('keystore/release-signer.sha256').text.trim() // When the source was committed, for "built 3 hours ago": fixed per commit, so it costs no rebuilds. def commitTime = (gitValue(['show', '-s', '--format=%ct', 'HEAD']) ?: '0').with { it.isLong() ? it : '0' } +// The desktop package this apk installs (tools/desktop-kde/release.env): published once per tag in +// DroidDeck-Components, pinned here with its checksum like gamescope and the esync packs, so the +// desktop scripts in the apk always get the package they were made for. +def desktopKde = rootProject.file('tools/desktop-kde/release.env').readLines() + .findAll { it.contains('=') && !it.startsWith('#') } + .collectEntries { def kv = it.split('=', 2); [(kv[0].trim()): kv[1].trim()] } // tools/release/variants.txt as "package=suffix;...", so the updater picks the apk of the package it runs as. def variantSuffixes = rootProject.file('tools/release/variants.txt').readLines() .findAll { it.trim() && !it.startsWith('#') } @@ -88,6 +94,10 @@ android { buildConfigField "String", "RELEASE_SIGNER", "\"${releaseSigner}\"" buildConfigField "long", "COMMIT_TIME", "${commitTime}L * 1000L" buildConfigField "String", "VARIANT_SUFFIXES", "\"${variantSuffixes}\"" + buildConfigField "String", "DESKTOP_KDE_TAG", "\"${desktopKde.DESKTOP_KDE_TAG}\"" + buildConfigField "String", "DESKTOP_KDE_URL", "\"https://github.com/${desktopKde.DESKTOP_KDE_REPO}/releases/download/${desktopKde.DESKTOP_KDE_TAG}/desktop-kde.tar.zst\"" + buildConfigField "String", "DESKTOP_KDE_SHA256", "\"${desktopKde.DESKTOP_KDE_SHA256}\"" + buildConfigField "long", "DESKTOP_KDE_SIZE", "${desktopKde.DESKTOP_KDE_SIZE}L" ndk { abiFilters 'arm64-v8a' diff --git a/app/src/main/cpp/waylandcomp/CMakeLists.txt b/app/src/main/cpp/waylandcomp/CMakeLists.txt index ddf19d05f7..c2f9cb6543 100644 --- a/app/src/main/cpp/waylandcomp/CMakeLists.txt +++ b/app/src/main/cpp/waylandcomp/CMakeLists.txt @@ -17,6 +17,7 @@ add_library(droiddeckwayland SHARED src/wl_clipboard.c src/wl_text_input.c src/wl_toplevel_icon.c + src/wl_single_pixel.c src/wl_color_mgmt.c src/hdr_compose.c src/blend_pass.c @@ -31,6 +32,7 @@ add_library(droiddeckwayland SHARED generated/wlr-data-control-unstable-v1-protocol.c generated/text-input-unstable-v3-protocol.c generated/xdg-toplevel-icon-v1-protocol.c + generated/single-pixel-buffer-v1-protocol.c generated/banner-ahb-v1-protocol.c src/framegen_bridge.c src/framegen_jni.c diff --git a/app/src/main/cpp/waylandcomp/generated/single-pixel-buffer-v1-protocol.c b/app/src/main/cpp/waylandcomp/generated/single-pixel-buffer-v1-protocol.c new file mode 100644 index 0000000000..01434221c6 --- /dev/null +++ b/app/src/main/cpp/waylandcomp/generated/single-pixel-buffer-v1-protocol.c @@ -0,0 +1,61 @@ +/* Generated by wayland-scanner 1.26.0 */ + +/* + * Copyright © 2022 Simon Ser + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include +#include "wayland-util.h" + +#ifndef __has_attribute +# define __has_attribute(x) 0 /* Compatibility with non-clang compilers. */ +#endif + +#if (__has_attribute(visibility) || defined(__GNUC__) && __GNUC__ >= 4) +#define WL_PRIVATE __attribute__ ((visibility("hidden"))) +#else +#define WL_PRIVATE +#endif + +extern const struct wl_interface wl_buffer_interface; + +static const struct wl_interface *single_pixel_buffer_v1_types[] = { + &wl_buffer_interface, + NULL, + NULL, + NULL, + NULL, +}; + +static const struct wl_message wp_single_pixel_buffer_manager_v1_requests[] = { + { "destroy", "", single_pixel_buffer_v1_types + 0 }, + { "create_u32_rgba_buffer", "nuuuu", single_pixel_buffer_v1_types + 0 }, +}; + +WL_PRIVATE const struct wl_interface wp_single_pixel_buffer_manager_v1_interface = { + "wp_single_pixel_buffer_manager_v1", 1, + 2, wp_single_pixel_buffer_manager_v1_requests, + 0, NULL, +}; + diff --git a/app/src/main/cpp/waylandcomp/generated/single-pixel-buffer-v1-server-protocol.h b/app/src/main/cpp/waylandcomp/generated/single-pixel-buffer-v1-server-protocol.h new file mode 100644 index 0000000000..a030d47757 --- /dev/null +++ b/app/src/main/cpp/waylandcomp/generated/single-pixel-buffer-v1-server-protocol.h @@ -0,0 +1,142 @@ +/* Generated by wayland-scanner 1.26.0 */ + +#ifndef SINGLE_PIXEL_BUFFER_V1_SERVER_PROTOCOL_H +#define SINGLE_PIXEL_BUFFER_V1_SERVER_PROTOCOL_H + +#include +#include +#include "wayland-server.h" + +#ifdef __cplusplus +extern "C" { +#endif + +struct wl_client; +struct wl_resource; + +/** + * @page page_single_pixel_buffer_v1 The single_pixel_buffer_v1 protocol + * single pixel buffer factory + * + * @section page_desc_single_pixel_buffer_v1 Description + * + * This protocol extension allows clients to create single-pixel buffers. + * + * Compositors supporting this protocol extension should also support the + * viewporter protocol extension. Clients may use viewporter to scale a + * single-pixel buffer to a desired size. + * + * Warning! The protocol described in this file is currently in the testing + * phase. Backward compatible changes may be added together with the + * corresponding interface version bump. Backward incompatible changes can + * only be done by creating a new major version of the extension. + * + * @section page_ifaces_single_pixel_buffer_v1 Interfaces + * - @subpage page_iface_wp_single_pixel_buffer_manager_v1 - global factory for single-pixel buffers + * @section page_copyright_single_pixel_buffer_v1 Copyright + *
+ *
+ * Copyright © 2022 Simon Ser
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ */ +struct wl_buffer; +struct wp_single_pixel_buffer_manager_v1; + +#ifndef WP_SINGLE_PIXEL_BUFFER_MANAGER_V1_INTERFACE +#define WP_SINGLE_PIXEL_BUFFER_MANAGER_V1_INTERFACE +/** + * @page page_iface_wp_single_pixel_buffer_manager_v1 wp_single_pixel_buffer_manager_v1 + * @section page_iface_wp_single_pixel_buffer_manager_v1_desc Description + * + * The wp_single_pixel_buffer_manager_v1 interface is a factory for + * single-pixel buffers. + * @section page_iface_wp_single_pixel_buffer_manager_v1_api API + * See @ref iface_wp_single_pixel_buffer_manager_v1. + */ +/** + * @defgroup iface_wp_single_pixel_buffer_manager_v1 The wp_single_pixel_buffer_manager_v1 interface + * + * The wp_single_pixel_buffer_manager_v1 interface is a factory for + * single-pixel buffers. + */ +extern const struct wl_interface wp_single_pixel_buffer_manager_v1_interface; +#endif + +/** + * @ingroup iface_wp_single_pixel_buffer_manager_v1 + * @struct wp_single_pixel_buffer_manager_v1_interface + */ +struct wp_single_pixel_buffer_manager_v1_interface { + /** + * destroy the manager + * + * Destroy the wp_single_pixel_buffer_manager_v1 object. + * + * The child objects created via this interface are unaffected. + */ + void (*destroy)(struct wl_client *client, + struct wl_resource *resource); + /** + * create a 1×1 buffer from 32-bit RGBA values + * + * Create a single-pixel buffer from four 32-bit RGBA values. + * + * Unless specified in another protocol extension, the RGBA values + * use pre-multiplied alpha. + * + * The width and height of the buffer are 1. + * + * The r, g, b and a arguments valid range is from UINT32_MIN (0) + * to UINT32_MAX (0xffffffff). + * + * These arguments should be interpreted as a percentage, i.e. - + * UINT32_MIN = 0% of the given color component - UINT32_MAX = 100% + * of the given color component + * @param r value of the buffer's red channel + * @param g value of the buffer's green channel + * @param b value of the buffer's blue channel + * @param a value of the buffer's alpha channel + */ + void (*create_u32_rgba_buffer)(struct wl_client *client, + struct wl_resource *resource, + uint32_t id, + uint32_t r, + uint32_t g, + uint32_t b, + uint32_t a); +}; + + +/** + * @ingroup iface_wp_single_pixel_buffer_manager_v1 + */ +#define WP_SINGLE_PIXEL_BUFFER_MANAGER_V1_DESTROY_SINCE_VERSION 1 +/** + * @ingroup iface_wp_single_pixel_buffer_manager_v1 + */ +#define WP_SINGLE_PIXEL_BUFFER_MANAGER_V1_CREATE_U32_RGBA_BUFFER_SINCE_VERSION 1 + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/app/src/main/cpp/waylandcomp/protocols/single-pixel-buffer-v1.xml b/app/src/main/cpp/waylandcomp/protocols/single-pixel-buffer-v1.xml new file mode 100644 index 0000000000..bcbd0382eb --- /dev/null +++ b/app/src/main/cpp/waylandcomp/protocols/single-pixel-buffer-v1.xml @@ -0,0 +1,76 @@ + + + + Copyright © 2022 Simon Ser + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice (including the next + paragraph) shall be included in all copies or substantial portions of the + Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + + + This protocol extension allows clients to create single-pixel buffers. + + Compositors supporting this protocol extension should also support the + viewporter protocol extension. Clients may use viewporter to scale a + single-pixel buffer to a desired size. + + Warning! The protocol described in this file is currently in the testing + phase. Backward compatible changes may be added together with the + corresponding interface version bump. Backward incompatible changes can + only be done by creating a new major version of the extension. + + + + + The wp_single_pixel_buffer_manager_v1 interface is a factory for + single-pixel buffers. + + + + + Destroy the wp_single_pixel_buffer_manager_v1 object. + + The child objects created via this interface are unaffected. + + + + + + Create a single-pixel buffer from four 32-bit RGBA values. + + Unless specified in another protocol extension, the RGBA values use + pre-multiplied alpha. + + The width and height of the buffer are 1. + + The r, g, b and a arguments valid range is from UINT32_MIN (0) + to UINT32_MAX (0xffffffff). + + These arguments should be interpreted as a percentage, i.e. + - UINT32_MIN = 0% of the given color component + - UINT32_MAX = 100% of the given color component + + + + + + + + + diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index faa764565e..805eff9fa1 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -745,6 +745,21 @@ static void take_shm(struct surface *s, struct wl_shm_buffer *shm, struct wl_res if (ci && ci->asked_feedback) ci->shm_frames++; /* since it asked for GPU buffers */ } +/* A single-pixel buffer (wl_single_pixel.c) as a 1x1 image, which the surface's viewport stretches. */ +static void take_pixel(struct surface *s, const uint8_t bgra[4], struct wl_resource *buffer) { + if (s->shm_img && (vkp_image_width(s->shm_img) != 1 || vkp_image_height(s->shm_img) != 1)) { + vkp_image_destroy(s->shm_img); + s->shm_img = NULL; + } + if (!s->shm_img) s->shm_img = vkp_image_create_shm(1, 1); + if (s->shm_img) vkp_image_upload_shm(s->shm_img, bgra, 4); + wl_buffer_send_release(buffer); + s->buf_w = 1; + s->buf_h = 1; + s->buf_alpha = bgra[3] != 0xff; + s->has_content = s->shm_img != NULL; +} + /* The window the app's performance HUD follows: the latest one at least as big as the last to * start presenting GPU frames (take_dmabuf) (X11 binds the HUD to the _MESA_DRV window and counts X presents instead). JNI upcalls. */ static struct surface *g_hud_surface; @@ -1084,6 +1099,7 @@ static void surface_commit(struct wl_client *c, struct wl_resource *r) { struct wl_resource *buffer = s->pending_buffer; struct dmabuf_buffer *db = get_dmabuf(buffer); struct wl_shm_buffer *shm = buffer && !db ? wl_shm_buffer_get(buffer) : NULL; + uint8_t pixel[4]; /* The previous content is replaced before reaching the screen. */ feedback_discard_all(&s->feedback); @@ -1113,6 +1129,9 @@ static void surface_commit(struct wl_client *c, struct wl_resource *r) { } else if (shm) { drop_dmabuf(s, 1); take_shm(s, shm, buffer); + } else if (single_pixel_buffer_get(buffer, pixel)) { + drop_dmabuf(s, 1); + take_pixel(s, pixel, buffer); } else { drop_dmabuf(s, 1); s->has_content = 0; @@ -3211,7 +3230,7 @@ static void key_event(uint32_t evdev, int pressed) { /* The output changed size under a running session (a foldable opened or closed, with the * session following the screen). Every client that has had its first configure is told the new - * size: gamescope's Wayland backend and the desktop's labwc both resize their output to it, and + * size: gamescope's Wayland backend and the desktop's KWin both resize their output to it, and * the next buffers they commit fill the new panel instead of being letterboxed onto it. */ static void output_resized(void) { struct surface *s; diff --git a/app/src/main/cpp/waylandcomp/src/droiddeck_ext.c b/app/src/main/cpp/waylandcomp/src/droiddeck_ext.c index 74ddc6adaf..913f713d38 100644 --- a/app/src/main/cpp/waylandcomp/src/droiddeck_ext.c +++ b/app/src/main/cpp/waylandcomp/src/droiddeck_ext.c @@ -122,4 +122,5 @@ void droiddeck_ext_init(struct wl_display *display) { clipboard_init(display); text_input_init(display); toplevel_icon_init(display); + single_pixel_init(display); } diff --git a/app/src/main/cpp/waylandcomp/src/droiddeck_ext.h b/app/src/main/cpp/waylandcomp/src/droiddeck_ext.h index e21014fbf5..0dc8ae41aa 100644 --- a/app/src/main/cpp/waylandcomp/src/droiddeck_ext.h +++ b/app/src/main/cpp/waylandcomp/src/droiddeck_ext.h @@ -48,3 +48,6 @@ void text_input_host_commit(const char *utf8, size_t len); void text_input_host_preedit(const char *utf8, size_t len, int cursor_begin, int cursor_end); void text_input_host_delete(int before, int after); void toplevel_icon_init(struct wl_display *display); +void single_pixel_init(struct wl_display *display); +/* A wp_single_pixel_buffer_manager_v1 buffer: 1 and its pixel (B, G, R, A, premultiplied), else 0. */ +int single_pixel_buffer_get(struct wl_resource *buffer, uint8_t bgra[4]); diff --git a/app/src/main/cpp/waylandcomp/src/wl_single_pixel.c b/app/src/main/cpp/waylandcomp/src/wl_single_pixel.c new file mode 100644 index 0000000000..9dfe78233c --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/wl_single_pixel.c @@ -0,0 +1,51 @@ +/* + * wp_single_pixel_buffer_manager_v1 (version 1): a wl_buffer of one pixel of one colour, which a + * client stretches over a surface with wp_viewporter. KWin's Wayland backend - the desktop's KWin + * nested in this compositor - refuses to start without it. The surface takes the pixel as a 1x1 + * image, the way it takes a wl_shm buffer (compositor.c, take_pixel). + */ +#include +#include "droiddeck_ext.h" +#include "single-pixel-buffer-v1-server-protocol.h" + +struct single_pixel { + uint8_t bgra[4]; /* premultiplied, as wl_shm's ARGB8888 lies in memory */ +}; + +static void buffer_destroy(struct wl_client *c, struct wl_resource *r) { wl_resource_destroy(r); } +static const struct wl_buffer_interface buffer_impl = { .destroy = buffer_destroy }; + +static void buffer_free(struct wl_resource *r) { free(wl_resource_get_user_data(r)); } + +int single_pixel_buffer_get(struct wl_resource *buffer, uint8_t bgra[4]) { + if (!buffer || !wl_resource_instance_of(buffer, &wl_buffer_interface, &buffer_impl)) return 0; + struct single_pixel *p = wl_resource_get_user_data(buffer); + for (int i = 0; i < 4; i++) bgra[i] = p->bgra[i]; + return 1; +} + +static void mgr_destroy(struct wl_client *c, struct wl_resource *r) { wl_resource_destroy(r); } +static void mgr_create_buffer(struct wl_client *c, struct wl_resource *r, uint32_t id, + uint32_t red, uint32_t green, uint32_t blue, uint32_t alpha) { + struct single_pixel *p = calloc(1, sizeof(*p)); + struct wl_resource *buffer = p ? wl_resource_create(c, &wl_buffer_interface, 1, id) : NULL; + if (!buffer) { free(p); wl_client_post_no_memory(c); return; } + /* The protocol's values span the whole u32 range; the top byte is the 8-bit channel. */ + p->bgra[0] = blue >> 24; + p->bgra[1] = green >> 24; + p->bgra[2] = red >> 24; + p->bgra[3] = alpha >> 24; + wl_resource_set_implementation(buffer, &buffer_impl, p, buffer_free); +} +static const struct wp_single_pixel_buffer_manager_v1_interface mgr_impl = { + .destroy = mgr_destroy, .create_u32_rgba_buffer = mgr_create_buffer, +}; +static void bind_manager(struct wl_client *c, void *data, uint32_t ver, uint32_t id) { + struct wl_resource *r = wl_resource_create(c, &wp_single_pixel_buffer_manager_v1_interface, ver, id); + if (!r) { wl_client_post_no_memory(c); return; } + wl_resource_set_implementation(r, &mgr_impl, NULL, NULL); +} + +void single_pixel_init(struct wl_display *display) { + wl_global_create(display, &wp_single_pixel_buffer_manager_v1_interface, 1, NULL, bind_manager); +} diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 0c101a51a5..21b21b8f44 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -343,7 +343,6 @@ class MainActivity : ComponentActivity() { private var steamDownloadsInBackground by mutableStateOf(false) private var oscMode by mutableStateOf(SessionPrefs.OSC_AUTO) private var backActionsInverted by mutableStateOf(false) - private var renderer by mutableStateOf("vulkan") private var gameStorage by mutableStateOf("") private var storageDiagnostics by mutableStateOf(false) private var storageOptions by mutableStateOf>(emptyList()) @@ -1194,7 +1193,6 @@ class MainActivity : ComponentActivity() { directAudio = if (mode == SessionService.MODE_STEAM) directAudio else null, stretch16x9 = if (mode == SessionService.MODE_STEAM) stretch16x9 else null, mic = if (mode == SessionService.MODE_STEAM) mic else null, - renderer = if (mode == SessionService.MODE_DESKTOP) renderer else null, gameStorage = if (mode == SessionService.MODE_STEAM) gameStorage else null, storageOptions = storageOptions, storageDiagnostics = mode == SessionService.MODE_STEAM && storageDiagnostics, @@ -1266,7 +1264,6 @@ class MainActivity : ComponentActivity() { requestPermissions(arrayOf(Manifest.permission.RECORD_AUDIO), 2) } }, - onRenderer = { r -> SessionPrefs.setDesktopRenderer(this, r); renderer = r }, onGameStorage = { path, label -> setGameStorage(path, label) }, onPickGameStorageFolder = { pickGameStorage.launch(InAppFilePicker.buildDirIntent(this, getString(R.string.main_pick_game_storage), gameStorage.ifEmpty { null })) @@ -1423,7 +1420,6 @@ class MainActivity : ComponentActivity() { stretch16x9 = SessionPrefs.stretch16x9(this) mic = SessionPrefs.micEnabled(this) refreshWifiDiscovery() - renderer = SessionPrefs.desktopRenderer(this) gameStorage = SessionPrefs.gameStorage(this) storageDiagnostics = SessionPrefs.storageDiagnosticsEnabled(this) settingsMode = mode diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index d706b0622a..c54e26dafb 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -745,9 +745,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun loadingTitle(): String = when (loadingMode()) { - SessionService.MODE_DESKTOP -> - if (!SessionState.running && intent.getStringExtra(SessionService.EXTRA_STEAM_UI) != null) getString(R.string.session_starting_steam_desktop) - else getString(R.string.session_starting_desktop) + // Also when the desktop was asked for with Steam (Big Picture's Switch to Desktop): the client + // does not open on it. + SessionService.MODE_DESKTOP -> getString(R.string.session_starting_desktop) SessionService.MODE_RUN -> { val program = if (SessionState.running) SessionState.program else intent.getStringExtra(SessionService.EXTRA_PROGRAM) com.droiddeck.launcher.frontend.Library.nameForProgram(program)?.let { getString(R.string.session_starting_named, it) } @@ -929,8 +929,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { /** Null when the desktop package is in, else the loading screen's closing line. */ private fun installDesktop(): String? { uiHandler.post { loading.percent = -1; loading.say(getString(DESKTOP_LINES.downloading), DESKTOP_LINES.topic, readable = true) } - val entry = com.droiddeck.launcher.runtime.DesktopCatalog.fetch()?.firstOrNull { it.id == "desktop" } - ?: return getString(R.string.session_desktop_catalog_unreachable) + val entry = com.droiddeck.launcher.runtime.DesktopCatalog.desktopEntry(this) val problem = com.droiddeck.launcher.runtime.DesktopCatalog.install(this, entry, progressFor(DESKTOP_LINES, entry.size / 1_000_000)) return problem?.let { getString(R.string.session_desktop_install_failed, it) } diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt index c16ad51f85..d23021295d 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -53,7 +53,7 @@ object DeviceReport { b.append("DroidDeck session report\n") b.append("========================\n") k("Written", SimpleDateFormat("yyyy-MM-dd HH:mm:ss zzz", Locale.US).format(Date())) - k("Session mode", when (mode) { SessionService.MODE_DESKTOP -> "desktop (labwc/LXQt)"; SessionService.MODE_RUN -> "a program under gamescope"; else -> "Steam client (gamescope)" }) + k("Session mode", when (mode) { SessionService.MODE_DESKTOP -> "desktop (KDE Plasma)"; SessionService.MODE_RUN -> "a program under gamescope"; else -> "Steam client (gamescope)" }) h("App") runCatching { @@ -189,7 +189,7 @@ object DeviceReport { } for (name in listOf("droiddeck-tu-debug", "droiddeck-driver", "droiddeck-osc", "droiddeck-no-pad", - "droiddeck-no-hud", "droiddeck-wlr-renderer")) { + "droiddeck-no-hud")) { val f = File(Environment.getExternalStorageDirectory(), "Download/$name") if (f.isFile) k(name, FileUtils.readString(f)?.trim()?.replace('\n', ' ')?.ifEmpty { "(present, empty)" } ?: "(present)") } diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriverManager.java b/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriverManager.java index 2b7a5aa252..e5c3d585c0 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriverManager.java +++ b/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriverManager.java @@ -25,7 +25,7 @@ import java.util.zip.ZipInputStream; /** * Imported LINUX Vulkan drivers: glibc Turnip ICDs ({@code Turnip-[-variant]-Linux.zip} from * Banners-Turnip) for the runtime - the gamescope session that runs Valve's native ARM64 Steam - * client, and the labwc desktop beside it. This is the driver that DRAWS there: the client's own UI + * client, and the KDE Plasma desktop beside it. This is the driver that DRAWS there: the client's own UI * (OpenGL through the runtime's Zink), every game the client launches (D3D through Proton's * DXVK/VKD3D) and everything on the desktop. Putting the frame on the screen stays the Android * driver's job, in the app's compositor ({@link TurnipDriver}). diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/AppImageManager.kt b/app/src/main/java/com/droiddeck/launcher/runtime/AppImageManager.kt index 59f4f78044..5c63a08599 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/AppImageManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/AppImageManager.kt @@ -242,7 +242,7 @@ object AppImageManager { private fun menuEntry(context: Context, id: String) = // A system directory, not ~/.local/share/applications: the desktop copies game entries from - // here into the user's with a GPU launcher (droiddeck-desktop-gpu) while it runs on pixman. + // here into the user's with a GPU launcher (droiddeck-desktop-gpu), since it composites in software. File(LinuxRuntime.rootDir(context), "usr/local/share/applications/droiddeck-appimage-$id.desktop") /** The Linux desktop's menu entry: the desktop's own Exec rules (and droiddeck-gpu) apply to it. */ 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 3d70002288..a5d3152970 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt @@ -232,10 +232,10 @@ object BwrapSpawner { val driver = File(lib, "libvulkan_freedreno.so") if (!driver.isFile || !File("/dev/kgsl-3d0").exists()) return null if (env.containsKey("VK_ICD_FILENAMES") || env.containsKey("VK_DRIVER_FILES")) return null - // A window on the desktop while labwc composites with pixman gets shared-memory buffers - // only; Zink cannot present there, so such an app keeps Flathub's own Mesa (llvmpipe). - // From the desktop, games go through droiddeck-gpu's gamescope and do get the GPU. - if (env["WLR_RENDERER"] == "pixman" && env["GAMESCOPE_WAYLAND_DISPLAY"] == null) return null + // A window on the desktop gets shared-memory buffers only (KWin composites in software); + // Zink cannot present there, so such an app keeps Flathub's own Mesa (llvmpipe). From the + // desktop, games go through droiddeck-gpu's gamescope and do get the GPU. + 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) 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 b077ec7109..5c48fc31ca 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.runtime import com.droiddeck.launcher.core.Hashes import android.content.Context import android.util.Log +import com.droiddeck.launcher.BuildConfig import com.droiddeck.launcher.R import com.droiddeck.launcher.core.Downloader import com.droiddeck.launcher.core.FileUtils @@ -74,10 +75,32 @@ object DesktopCatalog { installed(context, PROTON_SEED_ID) == null && !File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/steamapps/appmanifest_4427310.acf").isFile - // labwc comes with the hosted desktop package itself (its launcher is staged by the app at - // every session, so it cannot tell whether the package is there); SessionFiles uses the same test. - fun desktopInstalled(context: Context): Boolean = - File(LinuxRuntime.rootDir(context), "usr/bin/labwc").isFile + /** + * The desktop: KDE Plasma (tools/desktop-kde). It replaced an LXQt/labwc package of id + * "desktop", which a runtime may still carry; that one does not count, so the first desktop + * after the update installs this one over it. + */ + const val DESKTOP_ID = "desktop-kde" + + /** + * The desktop package this apk installs: pinned in tools/desktop-kde/release.env and published + * in DroidDeck-Components, not read from the catalog, so the desktop scripts staged by this + * apk always get the package they were made for. + */ + 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, "", + "", "", + ) + + // The desktop package installed to the end: KWin is there and the marker install() writes once + // the whole package is extracted. An install cut short (the app killed, storage full) leaves + // KWin without the marker, and the next desktop installs it again. The launcher is staged by + // the app at every session, so it cannot tell. SessionFiles uses the same test. + fun desktopInstalled(context: Context): Boolean = desktopInstalled(LinuxRuntime.rootDir(context)) + + fun desktopInstalled(root: File): Boolean = + File(root, "usr/bin/kwin_wayland").isFile && File(root, ".droiddeck-pkg-$DESKTOP_ID").isFile /** Downloads, verifies and installs one package. Returns null on success, else a message. */ fun install(context: Context, entry: Entry, listener: LinuxRuntimeInstaller.ProgressListener?): String? { @@ -111,7 +134,12 @@ object DesktopCatalog { "Exec=env APPIMAGE_EXTRACT_AND_RUN=1 /opt/appimages/${entry.id}.AppImage\n" + "Icon=${entry.icon}\nTerminal=false\nCategories=${entry.category};\n") } - else -> if (!LinuxRuntimeInstaller.extract(context, download, root, listener)) return context.getString(R.string.deskpkg_extract_failed) + else -> { + // Not complete until written again at the end: a reinstall cut short must not + // leave the last install's marker saying it is. + marker(context, entry.id).delete() + if (!LinuxRuntimeInstaller.extract(context, download, root, listener)) return context.getString(R.string.deskpkg_extract_failed) + } } FileUtils.writeString(marker(context, entry.id), entry.version) return null 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 a6478cd109..25f24f8300 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -5,6 +5,7 @@ import android.os.Environment import android.util.Log import com.droiddeck.launcher.R import com.droiddeck.launcher.core.FileUtils +import com.droiddeck.launcher.runtime.DesktopCatalog import com.droiddeck.launcher.runtime.LegacyNames import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.runtime.ProotFastPath @@ -86,16 +87,15 @@ object SessionFiles { "usr/bin/steamos-polkit-helpers/jupiter-biosupdate" to "usr/bin/steamos-polkit-helpers/jupiter-biosupdate", "usr/bin/steamos-polkit-helpers/jupiter-dock-updater" to "usr/bin/steamos-polkit-helpers/jupiter-dock-updater", ) - // The desktop's launcher and labwc defaults, only where the desktop package is installed: + // The desktop's launchers, only where the desktop package is installed: // staging them into a runtime without it would make the desktop look present when it is not. val desktop = arrayOf( "usr/local/bin/droiddeck-desktop" to "usr/local/bin/droiddeck-desktop", // Games and emulators from the menu, full screen in a gamescope of their own. "usr/local/bin/droiddeck-gpu" to "usr/local/bin/droiddeck-gpu", "usr/local/bin/droiddeck-desktop-gpu" to "usr/local/bin/droiddeck-desktop-gpu", - "etc/xdg/labwc/autostart" to "etc/xdg/labwc/autostart", - "etc/xdg/labwc/rc.xml" to "etc/xdg/labwc/rc.xml", - "etc/xdg/lxqt/panel.conf" to "etc/xdg/lxqt/panel.conf", + // KWin at the app's surface size, for Plasma's session (it starts KWin through this name). + "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", ) // The patched gamescope (tools/gamescope): the runtime's own version rebuilt with the ARM64 @@ -116,10 +116,6 @@ object SessionFiles { val msitools = listOf("msiinfo", "cabextract", "libmsi-1.0.so.0", "libgsf-1.so.114", "libgcab-1.0.so.0") .map { "usr/local/lib/droiddeck-msitools/$it" } + listOf("NOTICE", "GPL-2", "GPL-3", "LGPL-2.1").map { "usr/local/share/licenses/droiddeck-msitools/$it" } - // The patched wlroots (tools/wlroots) the desktop loads for its vulkan / gles2 renderers. - val wlroots = if (File(root, "usr/bin/labwc").isFile) { - arrayOf("usr/local/lib/droiddeck-wlroots/libwlroots-0.20.so" to "usr/local/lib/droiddeck-wlroots/libwlroots-0.20.so") - } else emptyArray() val fexPreloads = listOf("x86_64", "i386").flatMap { arch -> listOf("libblsession.so", "libfakeinput.so").map { "$arch/$it" to "usr/local/lib/droiddeck-fex/$arch/$it" } } + listOf("libfaultreport.so", "libthunkaudit.so", "libvulkan-thunk.so").map { "x86_64/$it" to "usr/local/lib/droiddeck-fex/x86_64/$it" } @@ -127,11 +123,11 @@ object SessionFiles { "usr/local/bin/gamescope" to "usr/local/bin/gamescope", "usr/local/lib/droiddeck/uruntime" to "usr/local/lib/droiddeck/uruntime", "usr/local/share/licenses/uruntime/LICENSE" to "usr/local/share/licenses/uruntime/LICENSE", - ) + wlroots + mangoapp + msitools.map { it to it } + fexPreloads).filter { (asset, _) -> + ) + mangoapp + msitools.map { it to it } + fexPreloads).filter { (asset, _) -> val dir = asset.substringBeforeLast('/') runCatching { context.assets.list("linuxfs/$dir")?.contains(asset.substringAfterLast('/')) == true }.getOrDefault(false) } - val all = (if (File(root, "usr/bin/labwc").isFile) files + desktop else files) + optional + val all = (if (DesktopCatalog.desktopInstalled(root)) files + desktop else files) + optional for ((asset, relative) in all) { val target = File(root, relative) val staged = File(target.parentFile, target.name + ".staged") diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt index 896d08a19d..2b8f38eec4 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt @@ -19,7 +19,7 @@ import java.util.Locale * wayland.log the app's compositor * steam.log the Steam client's own log, scrubbed (Steam mode) * steam/ the rest of the client's logs, scrubbed (Steam mode) - * desktop.log labwc, the panel and the programs on it (desktop mode) + * desktop.log KWin, Plasma and the programs on it (desktop mode) * Download/DroidDeck/tools/ one-off commands: Flatpak installs, AppImage imports * ``` * 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 da7dd04f90..f4dcc6df09 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -634,21 +634,6 @@ object SessionPrefs { return Pair(w and 1.inv(), h and 1.inv()) } - /** - * What the desktop shell composites with: vulkan (the default) or gles2 on the GPU, through the - * app's patched wlroots (tools/wlroots) - the Adreno stand-in is not a DRM device and stock - * wlroots cannot allocate on it - or pixman in software. A GPU renderer a device cannot start - * falls back to pixman by itself (droiddeck-desktop). `Download/droiddeck-wlr-renderer` still - * overrides it. - */ - fun desktopRenderer(context: Context): String = prefs(context).getString("desktopRenderer", "vulkan") ?: "vulkan" - - fun setDesktopRenderer(context: Context, renderer: String) { - prefs(context).edit().putString("desktopRenderer", renderer).apply() - // A choice made again is a retry: forget that a renderer failed to start here before. - java.io.File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context), "root/.droiddeck-renderer-failed").delete() - } - /** * HDR10 output for MODE_STEAM / MODE_DESKTOP. Off by default. Honoured only when the panel * lists HDR10 (HdrSupport), and decided when the compositor starts, which is once per app 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 71fd002c6e..da80bf6f71 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -372,16 +372,6 @@ class SessionService : Service() { SessionState.deckPad = false deckBinds = emptyList() if (controllersOn) addControllerEnvironment(guest, fakeInputDir, sessionDir) - // The desktop is wlroots (labwc). Stock wlroots allocates through gbm on a real DRM render - // node, and ours is a KGSL stand-in - labwc died at "unable to create allocator" - so the - // default is pixman (software, shm), where a Vulkan program cannot draw at all; those run - // through droiddeck-gpu instead. vulkan / gles2 use the app's patched wlroots and fall back - // to pixman by themselves. droiddeck-wlr-renderer in Downloads overrides the choice. - if (SessionState.mode == MODE_DESKTOP) { - val override = File(Environment.getExternalStorageDirectory(), "Download/droiddeck-wlr-renderer") - .takeIf { it.isFile }?.let { FileUtils.readString(it)?.trim() } - guest.add("BL_WLR_RENDERER=" + (override?.takeIf { it.isNotEmpty() } ?: SessionPrefs.desktopRenderer(this))) - } // The user's own games, for the runtime's shortcuts writer to put in the client's library // before the client starts (see frontend/AddedGames and droiddeck-steam-shortcuts). if (steamHere) { @@ -397,9 +387,6 @@ class SessionService : Service() { // The second library's name, for droiddeck-steam-library; the bind itself is made below. GameStorage.effective(this)?.let { guest.add("BL_LIBRARY_LABEL=" + it.label.replace('"', ' ')) } if (SessionState.mode == MODE_STEAM && SessionState.steamUi == "desktop") guest.add("BL_STEAM_UI=desktop") - // The desktop asked for with Steam in it (the front end's "Steam Desktop UI", Big Picture's - // "Switch to Desktop"): the desktop's autostart opens the client's desktop UI there. - if (SessionState.mode == MODE_DESKTOP && SessionState.steamUi == "desktop") guest.add("BL_DESKTOP_STEAM=1") val shellGuest = ArrayList(guest).apply { add("SHELL=/bin/bash") add("TERM=xterm-256color") @@ -415,7 +402,7 @@ class SessionService : Service() { } // A program under gamescope: the script's run mode takes the path (an AppImage, a script // or a binary inside the runtime). This is how an emulator gets the GPU - the desktop's - // labwc composites in software and offers no dma-buf, so a Vulkan swapchain cannot exist + // KWin composites in software and offers no dma-buf, so a Vulkan swapchain cannot exist // there (RPCS3 died with VK_ERROR_SURFACE_LOST); gamescope's Xwayland is the path the // Steam games already render through. if (SessionState.mode == MODE_RUN) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index c2ae73bd1b..8f3f29ec08 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -76,7 +76,6 @@ class ModeSettings( val backActionsInverted: Boolean = false, val directAudio: Boolean?, val mic: Boolean?, - val renderer: String?, val gameStorage: String? = null, val storageOptions: List = emptyList(), /** Steam only: record allocation and sampled storage timings in the next session's Share logs. */ @@ -140,7 +139,6 @@ class ModeSettingsActions( val onBackActionsInverted: (Boolean) -> Unit = {}, val onDirectAudio: (Boolean) -> Unit, val onMic: (Boolean) -> Unit, - val onRenderer: (String) -> Unit, val onGameStorage: (path: String, label: String) -> Unit = { _, _ -> }, val onPickGameStorageFolder: () -> Unit = {}, val onStorageDiagnostics: (Boolean) -> Unit = {}, @@ -528,14 +526,6 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { onChange = a.onStorageDiagnostics, ) } - if (!steam && tab == ModeSettingsTab.DISPLAY && s.renderer != null) SettingsGroup(stringResource(R.string.mode_renderer)) { - ChoiceRow( - host, "renderer", stringResource(R.string.mode_desktop_renderer), stringResource(R.string.mode_renderer_hint), - listOf("vulkan" to stringResource(R.string.mode_renderer_vulkan), "gles2" to stringResource(R.string.mode_renderer_gles2), "pixman" to stringResource(R.string.mode_renderer_pixman)), s.renderer, - note = stringResource(R.string.mode_renderer_note), - onPick = a.onRenderer, - ) - } } if (explainWifiDiscovery) AlertDialog( onDismissRequest = { explainWifiDiscovery = false }, 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 c40fb1b527..f5b369d069 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -314,7 +314,7 @@ public final class WaylandCompositor { /** A new output size for a running compositor ("Follow screen": a foldable opening or closing). * The compositor thread re-sends the wl_output mode and an xdg_toplevel configure to every - * client, and gamescope / labwc resize their output to it. Any thread. */ + * client, and gamescope / the desktop's KWin resize their output to it. Any thread. */ public static native void nativeResizeOutput(int width, int height); /** Re-arms the one-shot first-frame notice, for a new session under a compositor that has diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 391bf585a6..5d391727e1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -358,13 +358,6 @@ Diagnóstico de almacenamiento Registra los resultados de asignación y muestras de tiempos de almacenamiento en Compartir registros. Puede ralentizar las instalaciones mientras esté activado. Se aplica en la próxima sesión. Elegir una carpeta… - Renderizador - Renderizador del escritorio - Dibuja el escritorio. - vulkan - GPU - gles2 - GPU (experimental) - pixman - software - Vulkan ejecuta los programas del escritorio en la GPU y recurre a pixman si falla. Con pixman, los juegos se abren a pantalla completa en la GPU. Resolución personalizada Sustituye el límite y la relación de aspecto. Un tamaño que no coincide con la pantalla muestra barras. Ancho @@ -894,7 +887,7 @@ Abrir escritorio Instalar y abrir escritorio Escritorio de Linux - LXQt, Firefox y tus emuladores + KDE Plasma, Firefox y tus emuladores Los juegos que instales en Steam aparecen aquí después de la sesión. Jugar en Steam Ajustes de inicio @@ -1259,7 +1252,6 @@ %1$s está en pausa El programa está en pausa - Iniciando Steam en el escritorio Iniciando el escritorio @@ -1285,7 +1277,6 @@ descomprimiendo Proton Experimental (ARM64) No se pudo acceder al catálogo del runtime. Revisa la conexión y vuelve a pulsar Jugar. El runtime de Linux no se instaló. Revisa el runtime en Configuración y vuelve a pulsar Jugar. - No se pudo acceder al catálogo del escritorio. Revisa la conexión y pulsa Escritorio de nuevo. El escritorio no se instaló (%1$s). Revisa la conexión y pulsa Escritorio de nuevo. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 436b3cc16b..994372ea05 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -303,13 +303,6 @@ Bibliothèque secondaire Les jeux lisant des ressources depuis une carte SD ou un stockage partagé peuvent saccader. Choisir un dossier… - Rendu - Moteur de rendu du bureau - Responsable du dessin du bureau. - vulkan - GPU - gles2 - GPU (expérimental) - pixman - Logiciel - Vulkan utilise le GPU pour exécuter les programmes de bureau, et bascule vers pixman en cas d\'échec. Avec pixman, les jeux s\'exécutent toujours en plein écran sur le GPU. Résolution personnalisée Remplace la limite de résolution et le format d\'écran. Les dimensions ne correspondant pas à l\'écran afficheront des bandes noires. Largeur @@ -785,7 +778,7 @@ Ouvrir le bureau Installer et ouvrir le bureau Bureau Linux - LXQt, Firefox et vos émulateurs + KDE Plasma, Firefox et vos émulateurs Les jeux installés sur Steam apparaîtront ici après la fin de la session. Lancer Steam Paramètres de lancement diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c10e9c9df4..eb417a2ebc 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -358,13 +358,6 @@ ストレージ診断 割り当て結果とサンプリングしたストレージの処理時間を「ログを共有」に記録します。有効中はインストールが遅くなる場合があります。次回のセッションで有効になります。 フォルダを選択… - レンダラー - デスクトップレンダラー - デスクトップの描画を担当します。 - vulkan - GPU - gles2 - GPU(実験的) - pixman - ソフトウェア - VulkanはGPUを使用してデスクトッププログラムを実行し、失敗した場合はpixmanにフォールバックします。pixmanを使用する場合でも、ゲームはGPU上で全画面実行されます。 カスタム解像度 解像度の上限と画面比率を置き換えます。画面に合わないサイズは黒帯で表示されます。 幅 @@ -886,7 +879,7 @@ デスクトップを開く インストールしてデスクトップを開く Linuxデスクトップ - LXQt、Firefox、エミュレーター + KDE Plasma、Firefox、エミュレーター Steamでインストールされたゲームは、セッション終了後にここに表示されます。 Steamを実行 起動設定 @@ -1237,7 +1230,6 @@ %1$sは一時停止中です プログラムは一時停止中です - デスクトップでSteamを起動中 デスクトップを起動中 @@ -1263,7 +1255,6 @@ Proton Experimental(ARM64)を展開中 実行環境のカタログに接続できませんでした。接続を確認して、もう一度Playをタップしてください。 Linux実行環境をインストールできませんでした。「設定」で実行環境を確認して、もう一度Playをタップしてください。 - デスクトップのカタログに接続できませんでした。接続を確認して、もう一度「デスクトップ」をタップしてください。 デスクトップをインストールできませんでした(%1$s)。接続を確認して、もう一度「デスクトップ」をタップしてください。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 45a58e066f..768d09d280 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -358,13 +358,6 @@ 저장 공간 진단 할당 결과와 샘플링한 저장 공간 응답 시간을 \"로그 공유\"에 기록합니다. 켜져 있는 동안 설치가 느려질 수 있습니다. 다음 세션에 적용됩니다. 폴더 선택… - 렌더러 - 데스크톱 렌더러 - 데스크톱을 그리는 역할을 합니다. - vulkan - GPU - gles2 - GPU(실험적) - pixman - 소프트웨어 - Vulkan은 GPU를 사용하여 데스크톱 프로그램을 실행하고, 실패하면 pixman으로 대체합니다. pixman을 사용할 때도 게임은 GPU에서 전체 화면으로 실행됩니다. 사용자 정의 해상도 해상도 상한과 화면 비율을 대체합니다. 화면과 일치하지 않는 크기는 검은색 여백으로 표시됩니다. 너비 @@ -886,7 +879,7 @@ 데스크톱 열기 설치 및 데스크톱 열기 Linux 데스크톱 - LXQt, Firefox 및 에뮬레이터 + KDE Plasma, Firefox 및 에뮬레이터 Steam에서 설치한 게임은 세션 종료 후 여기에 표시됩니다. Steam 실행 실행 설정 @@ -1237,7 +1230,6 @@ %1$s 일시 중지됨 프로그램이 일시 중지됨 - 데스크톱에서 Steam 시작 중 데스크톱 시작 중 @@ -1263,7 +1255,6 @@ Proton Experimental(ARM64) 압축 해제 중 런타임 카탈로그에 연결할 수 없습니다. 연결을 확인한 후 \"Steam 실행\"을 다시 누르세요. Linux 런타임이 설치되지 않았습니다. \"설정\"에서 런타임을 확인한 후 \"Steam 실행\"을 다시 누르세요. - 데스크톱 카탈로그에 연결할 수 없습니다. 연결을 확인한 후 \"데스크톱\"을 다시 누르세요. 데스크톱이 설치되지 않았습니다(%1$s). 연결을 확인한 후 \"데스크톱\"을 다시 누르세요. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 38024f75fd..595673f172 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -333,13 +333,6 @@ Диагностика хранилища Записывает результаты выделения места и выборочные замеры скорости хранилища в журналы. Пока включено, установка может идти медленнее. Вступит в силу в следующей сессии. Выбрать папку… - Рендерер - Рендерер рабочего стола - Отвечает за отрисовку рабочего стола. - vulkan — GPU - gles2 — GPU (экспериментально) - pixman — программный - Vulkan использует GPU для запуска программ рабочего стола, при сбое переключается на pixman. При использовании pixman игры по-прежнему запускаются в полноэкранном режиме на GPU. Пользовательское разрешение Заменяет предел разрешения и соотношение сторон. Размеры, не соответствующие экрану, будут отображаться с черными полосами. Ширина @@ -869,7 +862,7 @@ Открыть рабочий стол Установить и открыть рабочий стол Рабочий стол Linux - LXQt, Firefox и ваши эмуляторы + KDE Plasma, Firefox и ваши эмуляторы Игры, установленные в Steam, появятся здесь после завершения сессии. Запустить Steam Настройки запуска diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3c130a3b40..0bb996a21c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -358,13 +358,6 @@ 存储诊断 在分享日志中记录分配结果和存储采样耗时。启用期间可能减慢安装。将在下次会话生效。 选择文件夹… - 渲染器 - 桌面渲染器 - 绘制桌面。 - vulkan - GPU - gles2 - GPU(实验性) - pixman - 软件 - Vulkan 让桌面程序运行在 GPU 上,失败时回退到 pixman。桌面改用 pixman 时,游戏仍会全屏运行在 GPU 上。 自定义分辨率 取代上限与比例。与屏幕不匹配的尺寸会出现黑边。 宽度 @@ -886,7 +879,7 @@ 打开桌面 安装并打开桌面 Linux 桌面 - LXQt、Firefox 和你的模拟器 + KDE Plasma、Firefox 和你的模拟器 你在 Steam 安装的游戏会在会话结束后显示在这里。 游玩 Steam 启动设置 @@ -1237,7 +1230,6 @@ %1$s 已暂停 程序已暂停 - 正在桌面上启动 Steam 正在启动桌面 @@ -1263,7 +1255,6 @@ 正在解包 Proton Experimental(ARM64) 无法连接运行时目录。请检查网络连接,然后再次点“游玩”。 Linux 运行时未能安装。请在“配置”中检查运行时,然后再次点“游玩”。 - 无法连接桌面目录。请检查网络连接,然后再次点“桌面”。 桌面未能安装(%1$s)。请检查网络连接,然后再次点“桌面”。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index ec76509a7e..cfbd40670a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -358,13 +358,6 @@ 儲存空間診斷 在分享的記錄中加入空間分配結果和抽樣的儲存時間數據。啟用時可能會減慢安裝速度。下次會話生效。 選擇資料夾… - 渲染器 - 桌面渲染器 - 負責繪製桌面。 - vulkan - GPU - gles2 - GPU(實驗性) - pixman - 軟件 - Vulkan 會用 GPU 執行桌面程式,失敗時改用 pixman。使用 pixman 時,遊戲仍會以全螢幕在 GPU 上執行。 自訂解像度 取代解像度上限和螢幕比例。尺寸與螢幕不符時會顯示黑邊。 寬度 @@ -886,7 +879,7 @@ 開啟桌面 安裝並開啟桌面 Linux 桌面 - LXQt、Firefox 和你的模擬器 + KDE Plasma、Firefox 和你的模擬器 你在 Steam 安裝的遊戲會在會話結束後顯示在這裡。 開啟 Steam 啟動設定 @@ -1237,7 +1230,6 @@ %1$s 已暫停 程式已暫停 - 正在桌面上啟動 Steam 正在啟動桌面 @@ -1263,7 +1255,6 @@ 正在解壓 Proton Experimental (ARM64) 無法連接運行環境目錄。請檢查網絡連線,然後再按「開啟 Steam」。 Linux 運行環境未能安裝。請在「設定」中檢查運行環境,然後再按「開啟 Steam」。 - 無法連接桌面目錄。請檢查網絡連線,然後再按「桌面」。 桌面未能安裝(%1$s)。請檢查網絡連線,然後再按「桌面」。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6b715943ee..da2eaeb393 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -358,13 +358,6 @@ 儲存空間診斷 在「分享日誌」中記錄空間配置結果和取樣的儲存存取時間。啟用期間可能會減慢安裝速度。下次工作階段生效。 選擇資料夾… - 渲染器 - 桌面渲染器 - 負責繪製桌面。 - vulkan - GPU - gles2 - GPU(實驗性) - pixman - 軟體 - Vulkan 使用 GPU 執行桌面程式,失敗時退回 pixman。使用 pixman 時,遊戲仍會在 GPU 上全螢幕執行。 自訂解析度 取代解析度上限和螢幕比例。不符合螢幕的尺寸會顯示黑邊。 寬度 @@ -886,7 +879,7 @@ 開啟桌面 安裝並開啟桌面 Linux 桌面 - LXQt、Firefox 和你的模擬器 + KDE Plasma、Firefox 和你的模擬器 在 Steam 中安裝的遊戲會在工作階段結束後顯示在這裡。 執行 Steam 啟動設定 @@ -1237,7 +1230,6 @@ %1$s 已暫停 程式已暫停 - 正在桌面上啟動 Steam 正在啟動桌面 @@ -1263,7 +1255,6 @@ 正在解壓縮 Proton Experimental(ARM64) 無法連線到執行環境目錄。請檢查網路連線,然後再按一次「執行」。 Linux 執行環境未能安裝。請在「設定」中檢查執行環境,然後再按一次「執行」。 - 無法連線到桌面目錄。請檢查網路連線,然後再按一次「桌面」。 桌面未能安裝(%1$s)。請檢查網路連線,然後再按一次「桌面」。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e21c36943a..34725bd440 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -364,13 +364,6 @@ Storage diagnostics Record allocation results and sampled storage timings in Share logs. May slow installs while enabled. Applies next session. Choose a folder… - Renderer - Desktop renderer - Draws the desktop. - vulkan - GPU - gles2 - GPU (experimental) - pixman - software - Vulkan runs desktop programs on the GPU, falling back to pixman if it fails. On pixman, games open full screen on the GPU. Custom resolution Replaces the cap and ratio. A size that doesn\'t match the screen gets bars. Width @@ -896,7 +889,7 @@ Open desktop Install & open desktop Linux desktop - LXQt, Firefox and your emulators + KDE Plasma, Firefox and your emulators Games you install in Steam show up here after the session. Play Steam Launch settings @@ -1227,7 +1220,6 @@ %1$s is paused The program is paused - Starting Steam on the desktop Starting the desktop Starting %1$s @@ -1251,7 +1243,6 @@ unpacking Proton Experimental (ARM64) Could not reach the runtime catalog. Check the connection and press Play again. The Linux runtime did not install. Check the runtime in Setup and press Play again. - Could not reach the desktop catalog. Check the connection and press Desktop again. The desktop did not install (%1$s). Check the connection and press Desktop again. diff --git a/docs/development/flatpak.md b/docs/development/flatpak.md index 939b8c6be5..7ed3ae7257 100644 --- a/docs/development/flatpak.md +++ b/docs/development/flatpak.md @@ -51,8 +51,8 @@ The spawner also adds what the rootfs gives its own programs: - **GPU.** Flathub's Mesa has Turnip only for DRM, and Adreno on Android is KGSL. The runtime's own `libvulkan_freedreno.so` is bound in with the three libraries the Freedesktop runtime lacks (`libdisplay-info`, SPIRV-Tools). Vulkan uses it, and Mesa's GL runs on it through Zink - (`MESA_LOADER_DRIVER_OVERRIDE=zink`). This is skipped for an app drawing into a desktop - composited by pixman, where Zink cannot present. + (`MESA_LOADER_DRIVER_OVERRIDE=zink`). This is skipped for an app drawing into a window on the + desktop, which KWin composites in software and where Zink cannot present. - **Controllers.** The libraries in the rootfs's `/etc/ld.so.preload` (the session shim and the fake evdev reader) go in through `LD_PRELOAD`, with the session's `dev` directory. - **Browsers.** Firefox's child sandboxes are switched off (`MOZ_DISABLE_*_SANDBOX`), and @@ -70,8 +70,8 @@ screen under gamescope. Under gamescope it passes `--nosocket=wayland --socket=x opens behind gamescope. gamescope's own Wayland socket is no alternative: Chromium on Wayland asks the render node it names for a DRM version, which KGSL cannot give, and aborts. The launcher also starts a session bus when there is none. On the Linux desktop, the apps' exported -menu entries appear in the LXQt menu. While the desktop is composited by pixman, games are -wrapped through `droiddeck-gpu` like the rootfs's own. +menu entries appear in Plasma's launcher. Games are wrapped through `droiddeck-gpu` like the +rootfs's own, since the desktop composites in software. ## The store diff --git a/tools/build_local.sh b/tools/build_local.sh index 3e7767c14f..c446de5ade 100755 --- a/tools/build_local.sh +++ b/tools/build_local.sh @@ -39,9 +39,9 @@ for tool in curl tar zstd shasum unzip; do exit 1 fi done -if [[ -f "${repo_root}/tools/gamescope/release.env" || -f "${repo_root}/tools/wlroots/release.env" \ +if [[ -f "${repo_root}/tools/gamescope/release.env" \ || -f "${repo_root}/tools/droiddeck-esync/release.env" ]] && ! command -v gh >/dev/null 2>&1; then - echo "GitHub CLI is required to download the pinned Gamescope, wlroots and droiddeck-esync release assets." >&2 + echo "GitHub CLI is required to download the pinned Gamescope and droiddeck-esync release assets." >&2 exit 1 fi @@ -138,9 +138,7 @@ docker run --rm --platform linux/amd64 \ install -Dm644 tools/linuxfs/desktop/droiddeck-desktop "$d/usr/local/bin/droiddeck-desktop" install -Dm644 tools/linuxfs/desktop/droiddeck-gpu "$d/usr/local/bin/droiddeck-gpu" install -Dm644 tools/linuxfs/desktop/droiddeck-desktop-gpu "$d/usr/local/bin/droiddeck-desktop-gpu" - install -Dm644 tools/linuxfs/desktop/autostart "$d/etc/xdg/labwc/autostart" - install -Dm644 tools/linuxfs/desktop/rc.xml "$d/etc/xdg/labwc/rc.xml" - install -Dm644 tools/linuxfs/desktop/panel.conf "$d/etc/xdg/lxqt/panel.conf" + install -Dm644 tools/linuxfs/desktop/kwin_wayland_wrapper "$d/usr/local/bin/kwin_wayland_wrapper" install -Dm644 tools/linuxfs/desktop/firefox-droiddeck.js \ "$d/usr/lib/firefox/defaults/pref/droiddeck.js" @@ -225,14 +223,6 @@ if [[ -f "${repo_root}/tools/gamescope/release.env" ]]; then test -f "${linuxfs_dir}/usr/local/bin/gamescope" fi -if [[ -f "${repo_root}/tools/wlroots/release.env" ]]; then - . "${repo_root}/tools/wlroots/release.env" - wlroots_archive=$(cached "${WLROOTS_SHA256}" wlroots.tzst \ - bash -c 'gh release download "$0" -R "$1" -p wlroots.tzst -O "$out"' "${WLROOTS_TAG}" "${github_repo}") - zstd -dc "${wlroots_archive}" | tar -xf - -C "${linuxfs_dir}" - test -f "${linuxfs_dir}/usr/local/lib/droiddeck-wlroots/libwlroots-0.20.so" -fi - . "${repo_root}/tools/linuxfs/uruntime.env" uruntime_binary=$(cached "${URUNTIME_SHA256}" "${URUNTIME_ASSET}" \ bash -c 'curl -fsSL --retry 3 -o "$out" "$0"' "https://github.com/VHSgunzo/uruntime/releases/download/${URUNTIME_VERSION}/${URUNTIME_ASSET}") diff --git a/tools/desktop-kde/README.md b/tools/desktop-kde/README.md new file mode 100644 index 0000000000..4daa7cffef --- /dev/null +++ b/tools/desktop-kde/README.md @@ -0,0 +1,23 @@ +# The desktop package (KDE Plasma) + +The desktop the app installs into its Linux runtime the first time the desktop is opened: KDE Plasma +set up as SteamOS's desktop mode, with Valve's Vapor theme, the Steam Deck wallpaper and launcher +icon, Plasma's default bottom panel, and "Return to Gaming Mode" and Steam on the desktop. + +- `seeds.txt`: the packages asked for. `build.sh` takes their closure over Arch Linux ARM's + repositories (`closure.py`) and drops what the runtime already has. +- `runtime-packages.txt`: the runtime's own packages, `name version` from its pacman database + (`ls /var/lib/pacman/local` in the rootfs). Refresh it when the runtime is rebuilt. +- `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. + +`.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 +installs (`DesktopCatalog.desktopEntry`); a published tag is never replaced, so a changed package +is a new tag and a `release.env` update. + +At run time the desktop is started by `tools/linuxfs/desktop/droiddeck-desktop` (the app stages it +at every session): Plasma's own `startplasma-wayland`, with KWin nested in the app's compositor +through `kwin_wayland_wrapper`. KWin composites in software (QPainter) - the Adreno node is not a +DRM device - so games and emulators from the menu go through `droiddeck-gpu`, and Steam goes back +to the app as a Steam session. diff --git a/tools/desktop-kde/archlinuxarm-builder.gpg b/tools/desktop-kde/archlinuxarm-builder.gpg new file mode 100644 index 0000000000000000000000000000000000000000..a4a9a7b55e0ac27051d9c5afe18f7d64fdd5cb27 GIT binary patch literal 2228 zcmV;l2ut^w0u2OG+XV9g5CF{wWx|A%DU}Qx0m*#ANNhcmsLW__QG>n(Q3dAmqs7B> zc^-RmIQ6~cu;HU768$$aKu3$xvdT@cDMM^VCSyaZ;_SdYkPuyk3?+%Q8J z3I0=zOcL~a61_vFbzwS1Xq%>Xkf-0m3uDKO{ZO5D^4+~{1BuO>awI>&>cW?Zts?h@ zbcQI&_piYJN-1@b^)*wO<(EvP))8m{^-ACcguTVbt1ZF6HX7C}qKcuhnACEJuDlVM zT-!^AjBm!U(sBFyK&fQTTgwS1x_)3}|I@pN+9Xek_|^gIV2U2GmS)?M$qJi@P$TOo z&0$V$49|Pib(GTIoxzvK6PA)o#+A2ORdy#mBA@Beejn*sE;O%&9Oq74{*2GgyZ>98 zH}sP7ZRzuf;iPmFP}U&fF$1=jIuxX)6vW3!Ggp!J-l$QVz0RRECHbHV@Xdp~!ZgqGdK~ha1LUn0uWFS*{b97~GAUtAqX>4R= zazJ5nV`yw?ZgqHJa&0bea%Vn?0yhK`0SW*i1p-pr1oHwL0|g5S2nPcN6$%Lm3k4Pe z0|5X69svRufB*^!5O*0r6)W53ripA1|3d%kPoIYs0uIbF@G`aj1H1hGi0c1sM$dHe z^WhQ7_HVWg4rzWuVc7evQ(&^35;aI5VD!q$;Jc!M7o%jbEZ|HUOTCk{;x}8CbVR!*Avrb_) z{m6e4n4m1~_LM9IcUZena!8eF-?c{sWfG%kz3iT*F@(46MLGLXJ?z~Oea#7$^tF?Q zjQnHNxGkz&S)4ZnMG^Vd6^vOHimm}^{NWnd#8JTi*9H#ZW+CGQMG_HQ z7*A$%n#{XTOP5~nOAgz(s&VQ1Gf8QK=tPKTl>_MNP-wgkD}z4dInxw922n8ZppT#y z@(JC}E_VJcjWHZMMg85MyVu63f&GmUUsMe4iyFk z%IzfsVijp-mUR~Q1)vGnB>)CaqF7YYI-E8okSeL3PxHtV89Ma6TS}C5x0K?ra^Z0) z4iRgB`Te*Gt?~@6!g#3TKVuxVM?QHkT z3-VMv0IYbnoJ{ybL?}NUQX9W=NN`S`9@)p1Sd(J|+1Ch)sZ&hnS9mwD4cMqijf387y8Y1z=-I0&*EbH%$*PGp&g~8$5#S`D2=isZ zYF^2f4M93=%Hyh8?rXv5O`@%7d8@}FnSPi&yW2O=kpn0Vrk>|jyRqNiWVfYMGat$f zZ6`+v3*vPR`m}ieYus5*)2%o{-8$BMsn27?pq2n1o5nl4~iC{`vg-J zJ|JKnt!W{y-LYPkxXj<%iWE#g01*KI0f_=11Q-Dd00{*GQriUc0vikf3JDN*89x;( z+vcWM{ty3pnya?w>`Ug9a64M>uF^68kL;i)W-Cz&Oj}a_eUAw~5|$+e$naunaVT;b ze!keXC#G`Jg77f6GqU74te>4g3ix7O!2w!Zyx852qVLdS_4BWCVX{(p(62eeXx&J& zTdR&8fii%HDrvrGxYXyzPitPb;A(UFX*Rc4oB@P&Kd&$t;9Lh3>gIih2$trOXK++G zEe8gtI5KtYae1j+LHIu|#-EbgxLiu}87tjP_cZ!@Zx(PwbdiYRl-%3u7=6`S1z^nE zv}JsvcpS<=*{t;U{L~;JKD%=>dNuBVjP}!%nOf={%fzAtkVb&Z_VQ_x=sx6l z*cbGZO$eF%Q{lc^YqdYu0a^7RlZNK_*4Vy9bc?vlkpgZLnhSep;f_QwiHHs%p0*WX zy46|N5QBvSBk21~MWM|5x2y_3l2?flUG5_ItmyNfR?s>-Zy8iI@q+;~ddeztZR4d% z8s5SrytR=ITz;F2MX7fGjS=J0Q1*#C+#mp>0Kn&e9{mY0%sW0RX@6x7kGP0 CyEc6Q literal 0 HcmV?d00001 diff --git a/tools/desktop-kde/build.sh b/tools/desktop-kde/build.sh new file mode 100755 index 0000000000..fccccd4e5a --- /dev/null +++ b/tools/desktop-kde/build.sh @@ -0,0 +1,73 @@ +#!/bin/bash +# Builds the KDE Plasma desktop package for the Linux runtime: the closure of seeds.txt over Arch +# Linux ARM's aarch64 repositories, minus what the runtime image already carries, plus overlay/, +# as a zstd tarball that extracts over the rootfs (DesktopCatalog's "tar" kind). +# +# tools/desktop-kde/build.sh +# +# The runtime's own packages (runtime-packages.txt, "name version" from its pacman db) are not +# shipped again, except where something in the closure asks for a version of one the runtime does +# not have (a versioned dependency on it, or on a library it provides): then the repository's +# build comes along and replaces it. Nothing is deleted on extraction, so a library whose soname +# moved keeps its old file for what the runtime linked against it. +# +# Every package is fetched over HTTPS and must carry a valid signature by the Arch Linux ARM Build +# System key (archlinuxarm-builder.gpg; primary fingerprint pinned below, as archlinuxarm.org +# publishes it and archlinuxarm-keyring trusts it) and match the sha256 the repository database +# gives for it; anything else stops the build. The repository databases themselves are not signed +# by Arch Linux ARM, so they decide only which signed packages are taken. desktop-kde.packages.txt +# lists every package taken, with its sha256: what a release was built from. +# +# Needs curl, gpgv, tar, xz, zstd, python3. +set -euo pipefail +out=${1:?out dir} +here=$(cd "$(dirname "$0")" && pwd) +mirror=${ALARM_MIRROR:-https://fl.us.mirror.archlinuxarm.org/aarch64} +case $mirror in https://*) ;; *) echo "ALARM_MIRROR must be https" >&2; exit 1 ;; esac +builder=68B3537F39A313B3E574D06777193F152BDBE6A6 +fetch() { curl -fsSL --proto '=https' --proto-redir '=https' --retry 6 --retry-delay 5 --retry-all-errors -o "$1" "$2"; } +work=$(mktemp -d); mkdir -p "$out" "$work/db" "$work/root" +# PKG_CACHE keeps the downloaded packages between builds (a local rebuild after an overlay change). +pkgs=${PKG_CACHE:-$work/pkgs}; mkdir -p "$pkgs" +trap 'rm -rf "$work"' EXIT + +for repo in core extra alarm; do + fetch "$work/db/$repo.db" "$mirror/$repo/$repo.db" + mkdir -p "$work/db/x_$repo" && tar -xzf "$work/db/$repo.db" -C "$work/db/x_$repo" +done + +python3 "$here/closure.py" "$work/db" "$here/runtime-packages.txt" "$here/seeds.txt" > "$work/pkglist.txt" +echo "kde: $(wc -l < "$work/pkglist.txt") packages beyond the runtime's own" + +while read -r entry sum; do + file=${entry#*/} + [ -s "$pkgs/$file" ] || fetch "$pkgs/$file" "$mirror/$entry" + fetch "$work/pkg.sig" "$mirror/$entry.sig" + if ! gpgv --status-fd 1 --keyring "$here/archlinuxarm-builder.gpg" "$work/pkg.sig" "$pkgs/$file" 2>/dev/null \ + | grep -Eq "^\[GNUPG:\] VALIDSIG .* $builder\$"; then + echo "$file: no valid Arch Linux ARM Build System signature" >&2; rm -f "$pkgs/$file"; exit 1 + fi + if [ "$(sha256sum "$pkgs/$file" | cut -d' ' -f1)" != "$sum" ]; then + echo "$file: sha256 differs from the repository database's" >&2; rm -f "$pkgs/$file"; exit 1 + fi + tar -xf "$pkgs/$file" -C "$work/root" --no-same-owner --no-same-permissions \ + --exclude=.PKGINFO --exclude=.MTREE --exclude=.INSTALL --exclude=.BUILDINFO --exclude=.CHANGELOG +done < "$work/pkglist.txt" + +cp -a "$here/overlay/." "$work/root/" + +# Weight that no desktop on a phone reads. +rm -rf "$work/root/usr/share/doc" "$work/root/usr/share/man" "$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" +# English only, on purpose: the desktop session runs in C.UTF-8 and nothing hands the app's language +# to KDE, so other translations would be weight no one sees. They come back with localizing the +# desktop itself (LANGUAGE from the app's language at session start). +find "$work/root/usr/share/locale" -mindepth 1 -maxdepth 1 -type d ! -name 'en*' -exec rm -rf {} + 2>/dev/null || true +find "$work/root/usr/lib" -name '*.a' -delete +chmod -R u+rwX "$work/root" + +sed 's#^[a-z]*/##' "$work/pkglist.txt" > "$out/desktop-kde.packages.txt" # "file sha256", each verified above +tar -C "$work/root" --zstd -cf "$out/desktop-kde.tar.zst" . +sha256sum "$out/desktop-kde.tar.zst" | awk '{print $1}' > "$out/desktop-kde.sha256" +ls -l "$out/desktop-kde.tar.zst" diff --git a/tools/desktop-kde/closure.py b/tools/desktop-kde/closure.py new file mode 100755 index 0000000000..b0475cf6e6 --- /dev/null +++ b/tools/desktop-kde/closure.py @@ -0,0 +1,153 @@ +#!/usr/bin/env python3 +"""The packages the KDE desktop package ships: the dependency closure of the seeds over Arch Linux +ARM's extracted repository databases, minus what the runtime already has at a version that serves. + + closure.py + +Prints one "repo/filename sha256" per package to ship (the sha256 the repository database gives). +""" +import collections +import os +import re +import sys + +REPOS = ("core", "extra", "alarm") + + +def vercmp_part(a, b): + # rpmvercmp, as pacman compares version strings. + if a == b: + return 0 + sa = re.findall(r"\d+|[a-zA-Z]+", a) + sb = re.findall(r"\d+|[a-zA-Z]+", b) + for x, y in zip(sa, sb): + if x.isdigit() and y.isdigit(): + x, y = int(x), int(y) + if x != y: + return 1 if x > y else -1 + elif x.isdigit(): + return 1 + elif y.isdigit(): + return -1 + elif x != y: + return 1 if x > y else -1 + if len(sa) == len(sb): + return 0 + return 1 if len(sa) > len(sb) else -1 + + +def vercmp(a, b): + def split(v): + epoch, _, rest = v.rpartition(":") if ":" in v else ("0", "", v) + ver, _, rel = rest.partition("-") + return int(epoch or 0), ver, rel + ea, va, ra = split(a) + eb, vb, rb = split(b) + if ea != eb: + return 1 if ea > eb else -1 + c = vercmp_part(va, vb) + if c or not ra or not rb: + return c + return vercmp_part(ra, rb) + + +def parse_dep(d): + m = re.match(r"^([^<>=]+)(>=|<=|=|>|<)?(.*)$", d) + return m.group(1), m.group(2), m.group(3) + + +def satisfies(version, op, want): + if not op: + return True + c = vercmp(version, want) + return {"=": c == 0, ">=": c >= 0, "<=": c <= 0, ">": c > 0, "<": c < 0}[op] + + +def main(): + dbdir, runtime_file, seeds_file = sys.argv[1:4] + runtime = {} + for line in open(runtime_file): + parts = line.split() + if len(parts) == 2: + runtime[parts[0]] = parts[1] + seeds = [l.strip() for l in open(seeds_file) if l.strip() and not l.lstrip().startswith("#")] + + pkgs, providers = {}, collections.defaultdict(list) + for repo in REPOS: + root = os.path.join(dbdir, "x_" + repo) + for entry in sorted(os.listdir(root)): + fields, key = {}, None + for fname in ("desc", "depends"): + path = os.path.join(root, entry, fname) + if not os.path.exists(path): + continue + for line in open(path, encoding="utf-8", errors="replace"): + line = line.rstrip("\n") + if line.startswith("%") and line.endswith("%"): + key = line.strip("%") + fields[key] = [] + elif line == "": + key = None + elif key: + fields[key].append(line) + name = fields.get("NAME", [None])[0] + if not name or name in pkgs: + continue + provides = [parse_dep(p) for p in fields.get("PROVIDES", [])] + pkgs[name] = {"repo": repo, "file": fields["FILENAME"][0], "version": fields["VERSION"][0], + "sha256": fields.get("SHA256SUM", [""])[0], + "depends": fields.get("DEPENDS", []), "provides": provides} + providers[name].append((name, pkgs[name]["version"])) + for pname, _, pver in provides: + providers[pname].append((name, pver or pkgs[name]["version"])) + + def resolve(dep): + """The package to take for a dependency string, and whether the runtime's copy serves.""" + name, op, want = parse_dep(dep) + # A runtime package that is the dependency or provides it, at a version that serves. + if name in runtime and satisfies(runtime[name], op, want): + return name, True + candidates = providers.get(name, []) + for real, _ in candidates: + if real in runtime: + # A provided name (a soname, mostly): the runtime's build serves as long as it is + # the repository's own, or nothing asks for a particular version. + if not op or runtime[real] == pkgs[real]["version"]: + return real, True + if satisfies_provider(real, name, op, want): + return real, False + for real, pver in candidates: + if satisfies(pver, op, want): + return real, False + return None, False + + def satisfies_provider(real, name, op, want): + if real == name: + return satisfies(pkgs[real]["version"], op, want) + return any(p == name and satisfies(v or pkgs[real]["version"], op, want) for p, _, v in pkgs[real]["provides"]) + + ship, seen, missing = [], set(), [] + queue = list(seeds) + while queue: + dep = queue.pop() + real, served = resolve(dep) + if real is None: + missing.append(dep) + continue + if served or real in seen: + continue + seen.add(real) + ship.append(real) + queue.extend(pkgs[real]["depends"]) + if missing: + sys.exit("unresolved: " + " ".join(sorted(set(missing)))) + upgraded = sorted(n for n in ship if n in runtime) + if upgraded: + print("replacing runtime packages: " + " ".join(f"{n} {runtime[n]} -> {pkgs[n]['version']}" for n in upgraded), + file=sys.stderr) + for name in sorted(ship): + print(pkgs[name]["repo"] + "/" + pkgs[name]["file"], pkgs[name]["sha256"]) + + +if __name__ == "__main__": + main() diff --git a/tools/desktop-kde/overlay/etc/xdg/baloofilerc b/tools/desktop-kde/overlay/etc/xdg/baloofilerc new file mode 100644 index 0000000000..1735f7a8d4 --- /dev/null +++ b/tools/desktop-kde/overlay/etc/xdg/baloofilerc @@ -0,0 +1,2 @@ +[Basic Settings] +Indexing-Enabled=false diff --git a/tools/desktop-kde/overlay/etc/xdg/gtk-3.0/settings.ini b/tools/desktop-kde/overlay/etc/xdg/gtk-3.0/settings.ini new file mode 100644 index 0000000000..3d33a8a939 --- /dev/null +++ b/tools/desktop-kde/overlay/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/desktop-kde/overlay/etc/xdg/kcminputrc b/tools/desktop-kde/overlay/etc/xdg/kcminputrc new file mode 100644 index 0000000000..bdac20ee38 --- /dev/null +++ b/tools/desktop-kde/overlay/etc/xdg/kcminputrc @@ -0,0 +1,5 @@ +[Mouse] +cursorTheme=breeze_cursors + +[Libinput][Defaults] +PointerAccelerationProfile=1 diff --git a/tools/desktop-kde/overlay/etc/xdg/kdeglobals b/tools/desktop-kde/overlay/etc/xdg/kdeglobals new file mode 100644 index 0000000000..d8ba273a48 --- /dev/null +++ b/tools/desktop-kde/overlay/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/desktop-kde/overlay/etc/xdg/konsolerc b/tools/desktop-kde/overlay/etc/xdg/konsolerc new file mode 100644 index 0000000000..f93c61af6f --- /dev/null +++ b/tools/desktop-kde/overlay/etc/xdg/konsolerc @@ -0,0 +1,2 @@ +[Desktop Entry] +DefaultProfile=Vapor.profile diff --git a/tools/desktop-kde/overlay/etc/xdg/kscreenlockerrc b/tools/desktop-kde/overlay/etc/xdg/kscreenlockerrc new file mode 100644 index 0000000000..8a52bc54ce --- /dev/null +++ b/tools/desktop-kde/overlay/etc/xdg/kscreenlockerrc @@ -0,0 +1,3 @@ +[Daemon] +Autolock=false +LockOnResume=false diff --git a/tools/desktop-kde/overlay/etc/xdg/ksmserverrc b/tools/desktop-kde/overlay/etc/xdg/ksmserverrc new file mode 100644 index 0000000000..b47cc8917c --- /dev/null +++ b/tools/desktop-kde/overlay/etc/xdg/ksmserverrc @@ -0,0 +1,2 @@ +[General] +loginMode=emptySession diff --git a/tools/desktop-kde/overlay/etc/xdg/ksplashrc b/tools/desktop-kde/overlay/etc/xdg/ksplashrc new file mode 100644 index 0000000000..c252676bf0 --- /dev/null +++ b/tools/desktop-kde/overlay/etc/xdg/ksplashrc @@ -0,0 +1,3 @@ +[KSplash] +Engine=none +Theme=None diff --git a/tools/desktop-kde/overlay/etc/xdg/kwalletrc b/tools/desktop-kde/overlay/etc/xdg/kwalletrc new file mode 100644 index 0000000000..3f28331ef6 --- /dev/null +++ b/tools/desktop-kde/overlay/etc/xdg/kwalletrc @@ -0,0 +1,3 @@ +[Wallet] +Enabled=false +First Use=false diff --git a/tools/desktop-kde/overlay/etc/xdg/kwinrc b/tools/desktop-kde/overlay/etc/xdg/kwinrc new file mode 100644 index 0000000000..f9656dd00e --- /dev/null +++ b/tools/desktop-kde/overlay/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/desktop-kde/overlay/etc/xdg/kwinrulesrc b/tools/desktop-kde/overlay/etc/xdg/kwinrulesrc new file mode 100644 index 0000000000..80b8acdbd4 --- /dev/null +++ b/tools/desktop-kde/overlay/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 +skiptaskbar=true +skiptaskbarrule=2 +title=Steam Keyboard +titlematch=2 +type=16 +typerule=2 +wmclass=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/desktop-kde/overlay/etc/xdg/plasmarc b/tools/desktop-kde/overlay/etc/xdg/plasmarc new file mode 100644 index 0000000000..c2a661e5d6 --- /dev/null +++ b/tools/desktop-kde/overlay/etc/xdg/plasmarc @@ -0,0 +1,2 @@ +[Theme] +name=Vapor diff --git a/tools/desktop-kde/overlay/etc/xdg/startkderc b/tools/desktop-kde/overlay/etc/xdg/startkderc new file mode 100644 index 0000000000..2ebf976ad5 --- /dev/null +++ b/tools/desktop-kde/overlay/etc/xdg/startkderc @@ -0,0 +1,2 @@ +[General] +systemdBoot=false diff --git a/tools/desktop-kde/overlay/usr/share/applications/droiddeck-return-gaming.desktop b/tools/desktop-kde/overlay/usr/share/applications/droiddeck-return-gaming.desktop new file mode 100644 index 0000000000..67f1d7f218 --- /dev/null +++ b/tools/desktop-kde/overlay/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/desktop-kde/overlay/usr/share/applications/steamdeck-bigpicture.desktop b/tools/desktop-kde/overlay/usr/share/applications/steamdeck-bigpicture.desktop new file mode 100644 index 0000000000..98c3b27b10 --- /dev/null +++ b/tools/desktop-kde/overlay/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/desktop-kde/overlay/usr/share/applications/steamdeck-steam.desktop b/tools/desktop-kde/overlay/usr/share/applications/steamdeck-steam.desktop new file mode 100644 index 0000000000..794c1e4482 --- /dev/null +++ b/tools/desktop-kde/overlay/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/desktop-kde/overlay/usr/share/color-schemes/Vapor.colors b/tools/desktop-kde/overlay/usr/share/color-schemes/Vapor.colors new file mode 100644 index 0000000000..820af1df32 --- /dev/null +++ b/tools/desktop-kde/overlay/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/desktop-kde/overlay/usr/share/icons/hicolor/scalable/actions/steamdeck-gaming-return.svg b/tools/desktop-kde/overlay/usr/share/icons/hicolor/scalable/actions/steamdeck-gaming-return.svg new file mode 100644 index 0000000000..5cff1ce9d8 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/icons/hicolor/scalable/actions/steamdeck-gaming-return.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/tools/desktop-kde/overlay/usr/share/icons/hicolor/scalable/apps/steam.svg b/tools/desktop-kde/overlay/usr/share/icons/hicolor/scalable/apps/steam.svg new file mode 100644 index 0000000000..d5926b262e --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/icons/hicolor/scalable/apps/steam.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/tools/desktop-kde/overlay/usr/share/icons/hicolor/scalable/places/distributor-logo-steamdeck.svg b/tools/desktop-kde/overlay/usr/share/icons/hicolor/scalable/places/distributor-logo-steamdeck.svg new file mode 100644 index 0000000000..082485bf1a --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/icons/hicolor/scalable/places/distributor-logo-steamdeck.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/tools/desktop-kde/overlay/usr/share/konsole/Vapor.colorscheme b/tools/desktop-kde/overlay/usr/share/konsole/Vapor.colorscheme new file mode 100644 index 0000000000..91f6921c8f --- /dev/null +++ b/tools/desktop-kde/overlay/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/desktop-kde/overlay/usr/share/konsole/Vapor.profile b/tools/desktop-kde/overlay/usr/share/konsole/Vapor.profile new file mode 100644 index 0000000000..b4557e15e1 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/konsole/Vapor.profile @@ -0,0 +1,6 @@ +[Appearance] +ColorScheme=Vapor + +[General] +Name=Vapor +Parent=FALLBACK/ diff --git a/tools/desktop-kde/overlay/usr/share/licenses/droiddeck-desktop/NOTICE b/tools/desktop-kde/overlay/usr/share/licenses/droiddeck-desktop/NOTICE new file mode 100644 index 0000000000..c13011cd1b --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/licenses/droiddeck-desktop/NOTICE @@ -0,0 +1,12 @@ +Third-party files in DroidDeck's KDE desktop package (tools/desktop-kde/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. + +Everything else in the package is Arch Linux ARM's own packages, under their own licenses +(/usr/share/licenses). diff --git a/tools/desktop-kde/overlay/usr/share/plasma/desktoptheme/Vapor/colors b/tools/desktop-kde/overlay/usr/share/plasma/desktoptheme/Vapor/colors new file mode 100644 index 0000000000..673d46a284 --- /dev/null +++ b/tools/desktop-kde/overlay/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/desktop-kde/overlay/usr/share/plasma/desktoptheme/Vapor/metadata.json b/tools/desktop-kde/overlay/usr/share/plasma/desktoptheme/Vapor/metadata.json new file mode 100644 index 0000000000..53e9f86420 --- /dev/null +++ b/tools/desktop-kde/overlay/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/desktop-kde/overlay/usr/share/plasma/desktoptheme/Vapor/widgets/plasmoidheading.svg b/tools/desktop-kde/overlay/usr/share/plasma/desktoptheme/Vapor/widgets/plasmoidheading.svg new file mode 100644 index 0000000000..4d92847799 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/plasma/desktoptheme/Vapor/widgets/plasmoidheading.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/defaults b/tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/defaults new file mode 100644 index 0000000000..2e46cd938f --- /dev/null +++ b/tools/desktop-kde/overlay/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/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/icons/deck_icon.png b/tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/icons/deck_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7e596c00cab8fc71373669e37cbd76cec403d85a GIT binary patch literal 4540 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 literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000..485bf74688 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js @@ -0,0 +1,43 @@ +// The first desktop: DroidDeck's wallpaper, and SteamOS's Plasma's default bottom panel with the Steam Deck +// launcher icon, Steam, the file manager, the browser and Konsole pinned to the task manager. +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 panel = new Panel; +panel.location = "bottom"; +panel.height = 2 * Math.ceil(gridUnit * 2.5 / 2); + +var kickoff = panel.addWidget("org.kde.plasma.kickoff"); +kickoff.currentConfigGroup = ["Shortcuts"]; +kickoff.writeConfig("global", "Alt+F1"); +kickoff.currentConfigGroup = ["General"]; +kickoff.writeConfig("icon", "distributor-logo-steamdeck"); + +panel.addWidget("org.kde.plasma.pager"); + +var tasks = panel.addWidget("org.kde.plasma.icontasks"); +tasks.currentConfigGroup = ["General"]; +tasks.writeConfig("launchers", [ + "applications:steamdeck-steam.desktop", + "preferred://filemanager", + "preferred://browser", + "applications:org.kde.konsole.desktop", +]); + +panel.addWidget("org.kde.plasma.marginsseparator"); +var tray = panel.addWidget("org.kde.plasma.systemtray"); +var trayId = tray.readConfig("SystrayContainmentId"); +if (trayId) { + var trayContainment = desktopById(trayId); + trayContainment.currentConfigGroup = ["General"]; + trayContainment.writeConfig("scaleIconsToFit", true); +} +// The runtime has no locale of its own (C.UTF-8), whose short date reads "9 10 2026". +var clock = panel.addWidget("org.kde.plasma.digitalclock"); +clock.currentConfigGroup = ["Appearance"]; +clock.writeConfig("dateFormat", "isoDate"); +panel.addWidget("org.kde.plasma.showdesktop"); diff --git a/tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js b/tools/desktop-kde/overlay/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/desktop-kde/overlay/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/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js b/tools/desktop-kde/overlay/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/desktop-kde/overlay/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/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.systemtray.js b/tools/desktop-kde/overlay/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/desktop-kde/overlay/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/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/previews/preview.png b/tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/previews/preview.png new file mode 100644 index 0000000000000000000000000000000000000000..708bcf3126488ffca8bbd55dd84b15ceb71260ab GIT binary patch literal 45238 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 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/desktop-kde/overlay/usr/share/wallpapers/DroidDeck/metadata.json b/tools/desktop-kde/overlay/usr/share/wallpapers/DroidDeck/metadata.json new file mode 100644 index 0000000000..c4431e01ca --- /dev/null +++ b/tools/desktop-kde/overlay/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/desktop-kde/release.env b/tools/desktop-kde/release.env new file mode 100644 index 0000000000..22a241e4be --- /dev/null +++ b/tools/desktop-kde/release.env @@ -0,0 +1,4 @@ +DESKTOP_KDE_REPO=Droid-Deck/DroidDeck-Components +DESKTOP_KDE_TAG=desktop-kde-r1 +DESKTOP_KDE_SHA256=55747e75d0ec055ab7ea1e92a757f3be227cc3205bb9101f5b53cadef6318579 +DESKTOP_KDE_SIZE=846370256 diff --git a/tools/desktop-kde/runtime-packages.txt b/tools/desktop-kde/runtime-packages.txt new file mode 100644 index 0000000000..928b17f3ac --- /dev/null +++ b/tools/desktop-kde/runtime-packages.txt @@ -0,0 +1,165 @@ +acl 2.4.0-1 +archlinux-keyring 20260727-1 +archlinuxarm-keyring 20240419-2 +attr 2.6.0-1 +audit 4.2.1-1 +base 3-3 +bash 5.3.15-1 +binutils 2.46+r70+g155188ea10a7-1 +brotli 1.2.0-1 +bzip2 1.0.8-6 +ca-certificates 20240618-1 +ca-certificates-mozilla 3.126-1 +ca-certificates-utils 20240618-1 +coreutils 9.11-2 +cryptsetup 2.8.7-1 +curl 8.21.0-1 +dbus 1.16.2-1 +dbus-broker 37-3 +dbus-broker-units 37-3 +dbus-units 37-3 +device-mapper 2.03.41-1 +dhcpcd 10.3.2-1 +diffutils 3.12-2 +e2fsprogs 1.47.4-1 +ex-vi-compat 3-1 +expat 2.8.2-1 +file 5.48-1 +filesystem 2025.10.12-1 +findutils 4.11.0-1 +gawk 5.4.1-1 +gcc-libs 16.1.1+r12+g301eb08fa2c5-1 +gdbm 1.26-2 +gettext 1.0-2 +glib2 2.88.3-1 +glibc 2.43+r22+g8362e8ce10b2-2 +gmp 6.3.0-3 +gnulib-l10n 20241231-1 +gnupg 2.4.9-2 +gnutls 3.8.13-2 +gpgme 2.1.2-1 +gpm 1.20.7.r38.ge82d1a6-6 +grep 3.12-2 +gzip 1.14-2 +hwdata 0.410-1 +iana-etc 20260530-1 +icu 78.3-1 +iproute2 7.1.0-1 +iptables 1:1.8.13-1 +iputils 20250605-1 +jansson 2.15.0-1 +json-c 0.19-1 +kbd 2.10.0-1 +keyutils 1.6.3-4 +kmod 34.2-1 +krb5 1.22.2-1 +leancrypto 1.8.0-1 +libarchive 3.8.9-1 +libasan 16.1.1+r12+g301eb08fa2c5-1 +libassuan 3.0.0-1 +libatomic 16.1.1+r12+g301eb08fa2c5-1 +libbpf 1.7.0-1 +libcap 2.78-1 +libcap-ng 0.9.3-1 +libedit 20260512_3.1-1 +libelf 0.195-1 +libevent 2.1.13-2 +libffi 3.7.1-1 +libgcc 16.1.1+r12+g301eb08fa2c5-1 +libgcrypt 1.12.2-1 +libgfortran 16.1.1+r12+g301eb08fa2c5-1 +libgomp 16.1.1+r12+g301eb08fa2c5-1 +libgpg-error 1.61-1 +libidn2 2.3.8-1 +libksba 1.8.0-1 +libldap 2.6.13-1 +liblsan 16.1.1+r12+g301eb08fa2c5-1 +libmakepkg-dropins 20-1 +libmnl 1.0.5-2 +libnetfilter_conntrack 1.1.1-1 +libnfnetlink 1.0.2-2 +libnftnl 1.3.1-1 +libnghttp2 1.70.0-1 +libnghttp3 1.18.0-1 +libngtcp2 1.25.0-1 +libnl 3.12.0-1 +libnsl 2.0.1-2 +libobjc 16.1.1+r12+g301eb08fa2c5-1 +libp11-kit 0.26.4-1 +libpcap 1.10.6-1 +libpsl 0.21.5-2 +libquadmath 16.1.1+r12+g301eb08fa2c5-1 +libsasl 2.1.28-5 +libseccomp 2.6.0-1 +libsecret 0.21.7-1 +libssh2 1.11.1-7 +libstdc++ 16.1.1+r12+g301eb08fa2c5-1 +libsysprof-capture 50.0-4 +libtasn1 4.21.0-1 +libtirpc 1.3.7-1 +libtsan 16.1.1+r12+g301eb08fa2c5-1 +libubsan 16.1.1+r12+g301eb08fa2c5-1 +libunistring 1.4.2-1 +libusb 1.0.30-1 +libverto 0.3.2-6 +libxcrypt 4.5.2-1 +libxml2 2.15.3-1 +licenses 20240728-1 +linux-aarch64 7.1.6-1 +linux-api-headers 7.1-1 +linux-firmware 20260622-1 +linux-firmware-amdgpu 20260622-1 +linux-firmware-atheros 20260622-1 +linux-firmware-broadcom 20260622-1 +linux-firmware-cirrus 20260622-1 +linux-firmware-intel 20260622-1 +linux-firmware-mediatek 20260622-1 +linux-firmware-nvidia 20260622-1 +linux-firmware-other 20260622-1 +linux-firmware-radeon 20260622-1 +linux-firmware-realtek 20260622-1 +linux-firmware-whence 20260622-1 +lmdb 0.9.35-1 +lz4 1:1.10.0-2 +mkinitcpio 41-4 +mkinitcpio-busybox 1.36.1-1 +mpfr 4.2.2-1 +nano 9.1-1 +ncurses 6.6-2 +net-tools 2.10-3 +netctl 1.29-2 +nettle 4.0-1 +nftables 1:1.1.6-3 +npth 1.8-1 +openssh 10.4p1-3 +openssl 3.6.3-1 +p11-kit 0.26.4-1 +pacman 7.1.0.r9.g54d9411-2 +pacman-mirrorlist 20260411-2 +pam 1.7.2-2 +pambase 20260616-1 +pciutils 3.15.0-1 +pcre2 10.47-1 +pinentry 1.3.3-1 +popt 1.19-2 +procps-ng 4.0.6-3 +psmisc 23.7-2 +readline 8.3.003-1 +sed 4.10-1 +shadow 4.20.0.arch1-1 +sqlite 3.53.4-1 +systemd 261.2-1 +systemd-libs 261.2-1 +systemd-resolvconf 261.2-1 +systemd-sysvcompat 261.2-1 +tar 1.35-2 +tpm2-tss 4.1.3-1 +tzdata 2026c-1 +util-linux 2.42.2-1 +util-linux-libs 2.42.2-1 +vim 9.2.0849-1 +vim-runtime 9.2.0849-1 +which 2.25-1 +xz 5.8.3-1 +zlib 1:1.3.2-3 +zstd 1.5.7-3 diff --git a/tools/desktop-kde/seeds.txt b/tools/desktop-kde/seeds.txt new file mode 100644 index 0000000000..816285de56 --- /dev/null +++ b/tools/desktop-kde/seeds.txt @@ -0,0 +1,31 @@ +# The desktop: KDE Plasma, as SteamOS's desktop mode has it - KWin nested as a client of the app's +# compositor, Plasma's shell on it, and the apps SteamOS puts on its desktop. One package name per +# line; build.sh takes the closure over Arch Linux ARM at build time, minus what the runtime has. +kwin +plasma-workspace +plasma-desktop +plasma-integration +plasma-pa +kscreen +breeze +breeze-gtk +kde-gtk-config +breeze-icons +systemsettings +kde-cli-tools +kinfocenter +dolphin +konsole +kate +ark +gwenview +spectacle +xdg-desktop-portal-kde +xorg-xwayland +qt6-wayland +wayland-utils +noto-fonts +noto-fonts-emoji +xdg-utils +firefox +mpv diff --git a/tools/linuxfs/desktop/autostart b/tools/linuxfs/desktop/autostart deleted file mode 100644 index bcc9b95b97..0000000000 --- a/tools/linuxfs/desktop/autostart +++ /dev/null @@ -1,57 +0,0 @@ -# What the desktop is made of, started once labwc is up. Everything logs into the session log. -# With ~/.droiddeck-desktop-debug present, the panel and the file manager also log what they -# say to the compositor about their windows (shell, layer, output), capped so it stays readable. -run() { - local tag=$1; shift - if [ -f "$HOME/.droiddeck-desktop-debug" ]; then - # Everything it says goes to ~/.cache/droiddeck/.log; the window-related protocol - # traffic also goes into the session log, capped. - mkdir -p "$HOME/.cache/droiddeck" - WAYLAND_DEBUG=1 "$@" 2>&1 | tee "$HOME/.cache/droiddeck/$tag.log" | awk -v t="[$tag]" '!/^\[[0-9:.]+\] +\{/ || (c<120 && /layer_s|xdg_toplevel|fullscreen|wl_output|xdg_output|configure\(/) {print t, $0; c++; fflush()}' & - else - "$@" 2>&1 | sed "s/^/[$tag] /" & - fi -} -# The output at the app's real size, in case rc.xml's mode did not take. -[ -n "${BL_WIDTH:-}" ] && wlr-randr --output WL-1 --custom-mode "${BL_WIDTH}x${BL_HEIGHT}" 2>&1 | sed 's/^/[wlr-randr] /' -# In debug runs, ground truth on the network from inside the session: name lookup, then a -# fetch over IPv4 and over IPv6, so a browser's "no internet" can be placed. -if [ -f "$HOME/.droiddeck-desktop-debug" ]; then - ( - echo "[net] getent: $(getent hosts example.com 2>&1 | head -2 | tr '\n' ' ')" - for f in 4 6; do - echo "[net] curl -$f: $(curl -$f -sS -m 8 -o /dev/null -w '%{http_code} %{remote_ip}' https://example.com 2>&1)" - done - ) & -fi -# In debug runs Firefox (started from the panel or the menu, so it inherits this) writes its -# own network log: name lookups, connects, HTTP transactions, the link/offline decisions. -if [ -f "$HOME/.droiddeck-desktop-debug" ]; then - mkdir -p "$HOME/.cache/droiddeck" - export MOZ_LOG="nsHttp:3,nsSocketTransport:3,nsHostResolver:4,NetworkLinkService:5,NetworkConnectivityService:5,nsIOService:5" - export MOZ_LOG_FILE="$HOME/.cache/droiddeck/firefox-net.log" -fi -swaybg -m fill -i /usr/share/backgrounds/steamdeck.png & -# Desktop icons (pcmanfm-qt manages the desktop surface) and the panel with the app menu. -run pcmanfm-qt pcmanfm-qt --desktop --profile lxqt -run lxqt-panel lxqt-panel -/usr/lib/xdg-desktop-portal-wlr >/dev/null 2>&1 & -# The desktop was asked for with Steam in it (the front end's "Steam Desktop UI", Big Picture's -# "Switch to Desktop"): the client's desktop UI, as the menu's Steam entry opens it. A running -# client just gets the request; on a software desktop it goes back to the app as a Steam session. -[ "${BL_DESKTOP_STEAM:-0}" = 1 ] && run steam /usr/local/bin/droiddeck-steam-launch desktop -# Remote runs, for driving the desktop from a debugger: with ~/.droiddeck-remote-run present (only -# the app or root can create it), each script dropped into ~/.cache/droiddeck/run/ is run once, -# inside the session with its environment, its output tagged into the desktop log. -if [ -f "$HOME/.droiddeck-remote-run" ]; then - mkdir -p "$HOME/.cache/droiddeck/run" - ( - while sleep 1; do - for f in "$HOME"/.cache/droiddeck/run/*.sh; do - [ -f "$f" ] || continue - mv -f "$f" "$f.running" || continue - ( echo "[run] $(basename "$f") started"; bash "$f.running" 2>&1 | sed "s/^/[run] /"; echo "[run] $(basename "$f") exited"; rm -f "$f.running" ) & - done - done - ) & -fi diff --git a/tools/linuxfs/desktop/droiddeck-desktop b/tools/linuxfs/desktop/droiddeck-desktop index fe4d0725d5..c955251843 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop +++ b/tools/linuxfs/desktop/droiddeck-desktop @@ -1,15 +1,24 @@ #!/bin/bash -# The desktop session: labwc nested as a client of the app's compositor, with LXQt's panel and -# file manager started from its autostart, and Xwayland for the X11 programs (the Steam client, -# most emulators). Run by droiddeck-session in place of gamescope for mode "lxqt". +# The desktop session: KDE Plasma, set up as SteamOS's desktop mode - KWin nested as a client of the +# app's compositor, Plasma's shell on it, and Xwayland for the X11 programs (the Steam client, most +# emulators). Run by droiddeck-session in place of gamescope for mode "lxqt" (the mode's name from +# the LXQt desktop this replaced; it is what the app and its preferences use). # Staged by the app over the desktop package's copy on every launch, so a fix here reaches an # installed desktop without re-downloading the package. set -u -export XDG_SESSION_TYPE=wayland XDG_CURRENT_DESKTOP=LXQt XDG_SESSION_DESKTOP=lxqt +export XDG_SESSION_TYPE=wayland XDG_CURRENT_DESKTOP=KDE XDG_SESSION_DESKTOP=KDE DESKTOP_SESSION=plasma +export KDE_FULL_SESSION=true KDE_SESSION_VERSION=6 KDE_APPLICATIONS_AS_SCOPE=0 # Qt tries Wayland and falls back to X11 (Xwayland): an AppImage that bundles only Qt's xcb # plugin - melonDS - exits at once on a plain "wayland" ("Could not find the Qt platform plugin"). export QT_QPA_PLATFORM="wayland;xcb" GDK_BACKEND=wayland,x11 SDL_VIDEODRIVER=wayland,x11 -export QT_QPA_PLATFORMTHEME=lxqt +unset QT_QPA_PLATFORMTHEME +# KDE's programs log through Qt, which writes to the journal when stderr is not a terminal; there is +# no journal here, so their messages go to the desktop log with everything else. +export QT_FORCE_STDERR_LOGGING=1 +# SteamOS's /etc/profile.d/kde.sh. +export MOZ_ENABLE_WAYLAND=1 MOZ_USE_XINPUT2=1 +# Konsole's profile starts the login shell, which it finds here. +export SHELL=/bin/bash # Firefox's child processes sandbox themselves with seccomp and namespaces, neither of which # behaves under proot: the content process ends up unable to read the font files its parent can, # reports "no fonts" and dies - the tab crash, with the chrome around it still drawing text. @@ -21,77 +30,34 @@ export MOZ_DISABLE_SOCKET_PROCESS_SANDBOX=1 MOZ_DISABLE_UTILITY_SANDBOX=1 # ("Shared memory PlatformHandle is not safe to map") and dies on signal 11 - every page. Firefox's # own switch skips the seals. (#280; the line went missing in the fontconfig move of #252.) export MOZ_SHM_NO_SEALS=1 -# pixman composites in software and gives programs shm buffers only, so a Vulkan program on it -# fails at its swapchain. vulkan (or gles2) composite on the GPU and give programs DMA-BUFs, but -# stock wlroots allocates through gbm on a real DRM node and the KGSL stand-in is not one ("unable -# to create allocator"): they need the app's patched wlroots (tools/wlroots), whose Vulkan -# allocator exports the buffers instead. BL_WLR_RENDERER picks; see the fallback at the end. -export WLR_RENDERER=${BL_WLR_RENDERER:-vulkan} -WLROOTS_DIR=/usr/local/lib/droiddeck-wlroots -BASE_LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-} -use_renderer() { - export WLR_RENDERER=$1 - if [ "$1" != pixman ] && [ -f "$WLROOTS_DIR/libwlroots-0.20.so" ]; then - export LD_LIBRARY_PATH=$WLROOTS_DIR${BASE_LD_LIBRARY_PATH:+:$BASE_LD_LIBRARY_PATH} - elif [ -n "$BASE_LD_LIBRARY_PATH" ]; then - export LD_LIBRARY_PATH=$BASE_LD_LIBRARY_PATH - else - unset LD_LIBRARY_PATH - fi -} -use_renderer "$WLR_RENDERER" -# A GPU renderer that failed to start here is not tried again on every desktop start (each try costs -# up to 20 s): the failure is kept with what it failed on - the renderer, the patched wlroots and the -# Linux driver - so an app update or a different driver retries, and so does picking a renderer -# again in the app's settings (which deletes the file). -FAILED_FILE=$HOME/.droiddeck-renderer-failed -renderer_key() { - echo "$WLR_RENDERER $(md5sum "$WLROOTS_DIR/libwlroots-0.20.so" 2>/dev/null | cut -d' ' -f1) ${BL_VK_DRIVER:-runtime}" -} -if [ "$WLR_RENDERER" != pixman ] && [ "$(cat "$FAILED_FILE" 2>/dev/null)" = "$(renderer_key)" ]; then - echo "== droiddeck-desktop: $WLR_RENDERER failed to start here before; using pixman (choose a renderer in the settings to retry)" - use_renderer pixman -fi -# The desktop's own log, beside the session's, so labwc and the programs on it can be read apart +# KWin composites in software (QPainter): its GPU path allocates through gbm on a DRM render node, +# and the KGSL stand-in is not one. Its windows get shm buffers only, so GL programs on it draw with +# Mesa's software rasterizer, Plasma's own Qt Quick draws with Qt's software renderer (plasmashell +# crashes on llvmpipe here), and a Vulkan program cannot draw at all: games and emulators from the +# menu run through droiddeck-gpu (their own gamescope on the app's compositor), and Steam goes back +# to the app as a Steam session - SteamOS's "Return to Gaming Mode". The session's own GL choice +# (zink on Turnip, for the Steam client) is put back by droiddeck-gpu. +export KWIN_COMPOSE=Q QT_QUICK_BACKEND=software LIBGL_ALWAYS_SOFTWARE=1 GALLIUM_DRIVER=llvmpipe +export DROIDDECK_GLTHREAD=${mesa_glthread:-} +unset MESA_LOADER_DRIVER_OVERRIDE LIBGL_KOPPER_DRI2 mesa_glthread +# The desktop's own log, beside the session's, so KWin and the programs on it can be read apart # from the session that started them. The session log keeps the milestones either way. if [ -n "${BL_DEBUG_DIR:-}" ]; then mkdir -p "$BL_DEBUG_DIR" 2>/dev/null || true exec >>"$BL_DEBUG_DIR/desktop.log" 2>&1 - echo "== droiddeck-desktop $(date -u '+%Y-%m-%d %H:%M:%S UTC') renderer=$WLR_RENDERER" + echo "== droiddeck-desktop $(date -u '+%Y-%m-%d %H:%M:%S UTC') ${BL_WIDTH:-1280}x${BL_HEIGHT:-720}" fi -export WLR_BACKENDS=wayland -# The cursor goes to the app's compositor as a wl_pointer cursor surface ("hardware" cursor on the -# wayland backend), which the app draws as its pointer. Drawn into the desktop's own frames instead -# (WLR_NO_HARDWARE_CURSORS=1), it cost every frame a full-screen composite: a software cursor -# rules out direct scan-out, so a full-screen game was never handed to the app as it is. -mkdir -p "$HOME/.config/labwc" "$HOME/.config/lxqt" -# Our defaults for labwc and the panel, refreshed every session. What a user changes in the -# panel's own settings lands in panel.conf and is kept; only rc.xml and autostart are ours. -# The nested output takes the app's surface size; left alone, wlroots' Wayland backend opens -# a 1280x720 window and the whole desktop is upscaled from that. -sed "s/@MODE@/${BL_WIDTH:-1280}x${BL_HEIGHT:-720}/" /etc/xdg/labwc/rc.xml > "$HOME/.config/labwc/rc.xml" -cp -f /etc/xdg/labwc/autostart "$HOME/.config/labwc/autostart" -# panel.conf is the user's once the panel has written it, except the one our first package -# shipped: it never named its panel ([General] panels=), so lxqt-panel built an empty default -# one. That file is replaced; one that names its panels is kept. -if ! grep -q '^panels=' "$HOME/.config/lxqt/panel.conf" 2>/dev/null; then - cp -f /etc/xdg/lxqt/panel.conf "$HOME/.config/lxqt/panel.conf" -fi -[ -f "$HOME/.config/lxqt/lxqt.conf" ] || cp /etc/xdg/lxqt/lxqt.conf "$HOME/.config/lxqt/lxqt.conf" -# pcmanfm-qt paints the desktop; left unconfigured it paints it black, over swaybg's wallpaper. -if [ ! -f "$HOME/.config/pcmanfm-qt/lxqt/settings.conf" ]; then - mkdir -p "$HOME/.config/pcmanfm-qt/lxqt" - printf '[Desktop]\nWallpaper=/usr/share/backgrounds/steamdeck.png\nWallpaperMode=zoom\nBgColor=#1b1030\nShowHidden=false\n' \ - > "$HOME/.config/pcmanfm-qt/lxqt/settings.conf" -fi -# The runtime directory outlives a session. lxqt-panel and pcmanfm-qt are single-instance -# programs that leave a lock and a socket there; finding last session's, they decide they are -# already running and exit without a word - a desktop with a wallpaper and nothing on it. -# Only the app's own compositor socket (wayland-0) is kept. +# The runtime directory outlives a session. KDE's daemons are single-instance programs that leave a +# lock and a socket there; finding last session's, they decide they are already running and exit +# without a word. Only the app's own compositor socket (wayland-0) is kept. find "$XDG_RUNTIME_DIR" -mindepth 1 -maxdepth 1 ! -name 'wayland-0*' ! -name 'keymap.xkb' -exec rm -rf {} + 2>/dev/null +chmod 700 "$XDG_RUNTIME_DIR" 2>/dev/null +# KWin will not start Xwayland when its socket directory is not sticky, as a shared /tmp would be, +# and Plasma's session manager cannot listen at all without the ICE directory, which only root may +# create for it. +mkdir -p /tmp/.X11-unix /tmp/.ICE-unix && chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix 2>/dev/null # Fontconfig defaults and Android language fallbacks are set up by droiddeck-session before this -# script or any desktop program starts. The generated defaults live in conf.d, leaving local.conf -# available for the user's own final overrides. +# script or any desktop program starts. # The menu's "Steam" / "Steam Big Picture" entries and one entry per installed game: all of them # hand off to the app (droiddeck-steam-launch), since the client cannot draw on this desktop. export BL_DESKTOP=1 @@ -103,81 +69,62 @@ python3 /usr/local/bin/droiddeck-desktop-games 2>&1 | sed 's/^/[games] /' # given the controller for its next start without waiting for the next desktop. 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 ) & -# Games and emulators from the menu run through droiddeck-gpu (their own gamescope on the app's -# compositor) while the desktop is on pixman, where they could not draw with the GPU. -# BL_DESKTOP_GPU=on/off overrides; each entry keeps "Run in a desktop window" either way. -gpu_entries() { python3 /usr/local/bin/droiddeck-desktop-gpu 2>&1 | sed 's/^/[gpu] /'; } -gpu_entries - -# ~/.droiddeck-desktop-debug: labwc's own debug log (views and layer surfaces mapping) too. The GPU -# renderers are experimental and always log in full, so a desktop that does not come up says why. -DEBUG=; { [ -f "$HOME/.droiddeck-desktop-debug" ] || [ "$WLR_RENDERER" != pixman ]; } && DEBUG=-d -run_labwc() { - echo "== droiddeck-desktop: labwc ($WLR_RENDERER${LD_LIBRARY_PATH:+, wlroots from $WLROOTS_DIR}) on $WAYLAND_DISPLAY" - # A session bus: the panel's menus, the file manager and the portal all expect one. - if command -v dbus-run-session >/dev/null 2>&1; then - dbus-run-session -- labwc $DEBUG -C "$HOME/.config/labwc" - else - labwc $DEBUG -C "$HOME/.config/labwc" - fi -} -pids_named() { - local p - for p in /proc/[0-9]*; do - [ "$(cat "$p/comm" 2>/dev/null)" = "$1" ] && echo "${p#/proc/}" - done -} -# labwc answers on its own socket (the one beside the app's wayland-0) once its event loop runs; a -# labwc stuck on the GPU never does. -labwc_answers() { - local sock - for sock in "$XDG_RUNTIME_DIR"/wayland-*; do - case $sock in *.lock|*/wayland-0) continue ;; esac - [ -S "$sock" ] || continue - WAYLAND_DISPLAY=${sock##*/} timeout 3 wayland-info >/dev/null 2>&1 && return 0 - done - return 1 -} -if [ "$WLR_RENDERER" = pixman ]; then - run_labwc - exit $? +# Games and emulators from the menu run through droiddeck-gpu; BL_DESKTOP_GPU=on/off overrides, +# and each entry keeps "Run in a desktop window" either way. +python3 /usr/local/bin/droiddeck-desktop-gpu 2>&1 | sed 's/^/[gpu] /' +# SteamOS's desktop icons: Return to Gaming Mode and Steam, put there once - what the user moves +# or deletes stays that way. +desktop_dir=$(xdg-user-dir DESKTOP 2>/dev/null); [ -n "$desktop_dir" ] && [ "$desktop_dir" != "$HOME" ] || desktop_dir=$HOME/Desktop +if [ ! -e "$HOME/.config/droiddeck-desktop-icons" ]; then + mkdir -p "$desktop_dir" "$HOME/.config" + cp -f /usr/share/applications/droiddeck-return-gaming.desktop "$desktop_dir/Return.desktop" 2>/dev/null + cp -f /usr/share/applications/steamdeck-steam.desktop "$desktop_dir/steam.desktop" 2>/dev/null + chmod +x "$desktop_dir"/*.desktop 2>/dev/null + touch "$HOME/.config/droiddeck-desktop-icons" fi -# A GPU renderer this device cannot start either ends the desktop at once or leaves it hanging on -# the loading screen. Either way the desktop comes up on pixman instead, and the log says why. -started=$(date +%s) -run_labwc & -labwc_job=$! -answered= -while kill -0 "$labwc_job" 2>/dev/null; do - if labwc_answers; then answered=1; break; fi - [ $(( $(date +%s) - started )) -ge 20 ] && break - sleep 1 -done -if [ -n "$answered" ]; then - echo "== droiddeck-desktop: labwc on $WLR_RENDERER is up after $(( $(date +%s) - started )) s" - wait "$labwc_job" - exit $? +# A Return icon still there is kept current with the package's entry (what it runs has changed). +[ -f "$desktop_dir/Return.desktop" ] && cp -f /usr/share/applications/droiddeck-return-gaming.desktop "$desktop_dir/Return.desktop" 2>/dev/null +# Plasma's caches of the menu, the icons and the MIME types, which a package install never ran. +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 +# In debug runs Firefox (started from the panel or the menu, so it inherits this) writes its +# own network log: name lookups, connects, HTTP transactions, the link/offline decisions. +if [ -f "$HOME/.droiddeck-desktop-debug" ]; then + mkdir -p "$HOME/.cache/droiddeck" + export MOZ_LOG="nsHttp:3,nsSocketTransport:3,nsHostResolver:4,NetworkLinkService:5,NetworkConnectivityService:5,nsIOService:5" + export MOZ_LOG_FILE="$HOME/.cache/droiddeck/firefox-net.log" + export QT_LOGGING_RULES="kwin_*.debug=true" fi -if kill -0 "$labwc_job" 2>/dev/null; then - echo "== droiddeck-desktop: labwc on $WLR_RENDERER did not answer in 20 s; stopping it" - kill -TERM $(pids_named labwc) 2>/dev/null - sleep 2 - kill -KILL $(pids_named labwc) 2>/dev/null - for prog in lxqt-panel pcmanfm-qt swaybg Xwayland; do kill -KILL $(pids_named "$prog") 2>/dev/null; done - wait "$labwc_job" 2>/dev/null - rc=124 -else - wait "$labwc_job" - rc=$? +# Remote runs, for driving the desktop from a debugger: with ~/.droiddeck-remote-run present (only +# the app or root can create it), each script dropped into ~/.cache/droiddeck/run/ is run once, +# inside the session with its environment, its output tagged into the desktop log. +if [ -f "$HOME/.droiddeck-remote-run" ]; then + mkdir -p "$HOME/.cache/droiddeck/run" + ( + while sleep 1; do + for f in "$HOME"/.cache/droiddeck/run/*.sh; do + [ -f "$f" ] || continue + mv -f "$f" "$f.running" || continue + ( echo "[run] $(basename "$f") started"; WAYLAND_DISPLAY=wayland-1 DISPLAY=:1 bash "$f.running" 2>&1 | sed "s/^/[run] /"; echo "[run] $(basename "$f") exited"; rm -f "$f.running" ) & + done + done + ) & fi -if [ "$rc" -ne 0 ] && [ $(( $(date +%s) - started )) -lt 40 ]; then - echo "== droiddeck-desktop: labwc on $WLR_RENDERER failed at start (exit $rc); starting on pixman instead" - renderer_key > "$FAILED_FILE" - use_renderer pixman - DEBUG=; [ -f "$HOME/.droiddeck-desktop-debug" ] && DEBUG=-d - find "$XDG_RUNTIME_DIR" -mindepth 1 -maxdepth 1 ! -name 'wayland-0*' ! -name 'keymap.xkb' -exec rm -rf {} + 2>/dev/null - gpu_entries - run_labwc - rc=$? +# Plasma as its own login starts it: startplasma-wayland sets up the session's environment and runs +# plasma_session, which starts KWin (through kwin_wayland_wrapper, ours first on PATH) as a client of +# the app's compositor with its own Xwayland, then Plasma's daemons, shell and autostart entries on +# it. The session bus is ours: Plasma, the file manager and the portal all expect one. +echo "== droiddeck-desktop: Plasma on $WAYLAND_DISPLAY" +dbus-run-session -- startplasma-wayland +rc=$? +echo "== droiddeck-desktop: Plasma ended ($rc)" +# Plasma logged out - Log Out, or Return to Gaming Mode, which logs out the same way, so open windows +# are asked to close (and to save) first. As on SteamOS, leaving the desktop goes to Gaming Mode: the +# app is asked for a Steam session, and it ends this one to start it. A desktop the app stops never +# gets here; a Plasma that failed does not count as a logout. +if [ "$rc" -eq 0 ]; then + /usr/local/bin/droiddeck-steam-launch bigpicture + sleep 30 fi exit $rc diff --git a/tools/linuxfs/desktop/droiddeck-desktop-gpu b/tools/linuxfs/desktop/droiddeck-desktop-gpu index 5b0a533fa2..af9e112092 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop-gpu +++ b/tools/linuxfs/desktop/droiddeck-desktop-gpu @@ -6,7 +6,7 @@ # a desktop window". Run at every desktop start; copies whose original is gone, or all of them when # the switch is off, are removed. # -# BL_DESKTOP_GPU=auto (default: on while the desktop is composited by pixman) | on | off +# BL_DESKTOP_GPU=on (default: the desktop composites in software) | off import os import re @@ -23,12 +23,7 @@ SKIP = re.compile(r"^(steam|droiddeck-game-|droiddeck-steam|steamdeck-)", re.I) def enabled(): - mode = os.environ.get("BL_DESKTOP_GPU", "auto").strip().lower() - if mode in ("on", "1", "yes", "true"): - return True - if mode in ("off", "0", "no", "false"): - return False - return os.environ.get("WLR_RENDERER", "pixman") == "pixman" + return os.environ.get("BL_DESKTOP_GPU", "on").strip().lower() not in ("off", "0", "no", "false") def main_group(text): diff --git a/tools/linuxfs/desktop/droiddeck-gpu b/tools/linuxfs/desktop/droiddeck-gpu index ff6fab7f0f..7f5b29432b 100644 --- a/tools/linuxfs/desktop/droiddeck-gpu +++ b/tools/linuxfs/desktop/droiddeck-gpu @@ -1,7 +1,7 @@ #!/bin/bash # Runs a program from the desktop on the GPU: in a gamescope of its own that draws straight into -# the app's compositor (wayland-0), not inside labwc. The desktop is composited by pixman, and -# pixman gives its windows no DMA-BUFs - a Vulkan program there fails at its swapchain +# the app's compositor (wayland-0), not inside the desktop's KWin. KWin composites in software, and +# gives its windows no DMA-BUFs - a Vulkan program there fails at its swapchain # (VK_ERROR_SURFACE_LOST, RPCS3's error). Here it gets the same path as a program started from the # app's rail: full screen over the desktop until it exits, then the desktop is back. # droiddeck-gpu [args...] @@ -20,10 +20,15 @@ elif [ "${BL_REFRESH:-0}" -gt 0 ]; then fi [ "${BL_HDR:-0}" = 1 ] && args+=(--hdr-enabled) echo "== droiddeck-gpu $(date -u +%H:%M:%S): $* (gamescope ${width}x${height} on wayland-0)" -# gamescope is a client of the app's compositor, beside labwc; the program inside it reaches it +# gamescope is a client of the app's compositor, beside the desktop's KWin; the program inside it reaches it # through gamescope's own Xwayland, as in a Steam session. export WAYLAND_DISPLAY=wayland-0 export GDK_BACKEND=x11 QT_QPA_PLATFORM=xcb SDL_VIDEODRIVER=x11 +# GL on the GPU again (zink on Turnip, as the session sets it): the desktop itself draws GL in software. +# Qt Quick back on its GPU renderer and KWin's software compositing not passed on, too. +unset LIBGL_ALWAYS_SOFTWARE QT_QUICK_BACKEND KWIN_COMPOSE +export MESA_LOADER_DRIVER_OVERRIDE=zink GALLIUM_DRIVER=zink LIBGL_KOPPER_DRI2=true +[ -n "${DROIDDECK_GLTHREAD:-}" ] && export mesa_glthread=$DROIDDECK_GLTHREAD # AppImages cannot mount under proot; the menu entries already say so, a hand-typed one may not. export APPIMAGE_EXTRACT_AND_RUN=1 gamescope "${args[@]}" -- "$@" diff --git a/tools/linuxfs/desktop/kwin_wayland_wrapper b/tools/linuxfs/desktop/kwin_wayland_wrapper new file mode 100755 index 0000000000..020c3d9c4d --- /dev/null +++ b/tools/linuxfs/desktop/kwin_wayland_wrapper @@ -0,0 +1,11 @@ +#!/bin/bash +# KWin for the desktop. Plasma's session (plasma_session) starts KWin through kwin_wayland_wrapper as +# found on PATH; this one, first on it, has KWin draw into the app's compositor (wayland-0) and serve +# its own clients on wayland-1 - by default it takes wayland-0 and finds the app's lock on it - with +# its nested output at the app's surface size (left alone, a 1024x768 window the desktop is scaled +# from), and without the lock screen, which the app's own suspend stands in for. Anything else (a KWin +# started outside DroidDeck's desktop) gets the real wrapper as it is. +if [ "${BL_DESKTOP:-}" = 1 ]; then + set -- --wayland-display wayland-0 --socket wayland-1 --width "${BL_WIDTH:-1280}" --height "${BL_HEIGHT:-720}" --no-lockscreen "$@" +fi +exec /usr/bin/kwin_wayland_wrapper "$@" diff --git a/tools/linuxfs/desktop/panel.conf b/tools/linuxfs/desktop/panel.conf deleted file mode 100644 index 06c940f749..0000000000 --- a/tools/linuxfs/desktop/panel.conf +++ /dev/null @@ -1,55 +0,0 @@ -[General] -__userfile__=true -iconTheme=Papirus-Dark -panels=panel1 -panels=panel1 - -[panel1] -alignment=-1 -animation-duration=0 -background-color=@Variant(\0\0\0\x43\x1\xff\xff\x1c\x1c\x1c\x1c\x1c\x1c\0\0) -background-image= -font-color=@Variant(\0\0\0\x43\x1\xff\xff\xff\xff\xff\xff\xff\xff\0\0) -hidable=false -iconSize=28 -lineCount=1 -lockPanel=false -opacity=90 -panelSize=40 -plugins=mainmenu, quicklaunch, taskbar, spacer, tray, worldclock, showdesktop -position=Bottom -reserve-space=true -show-delay=0 -width=100 -width-percent=true - -[mainmenu] -type=mainmenu -icon=/usr/share/icons/Papirus-Dark/32x32/apps/steam.svg -showText=false - -[quicklaunch] -type=quicklaunch -apps\1\desktop=/usr/share/applications/steamdeck-steam.desktop -apps\2\desktop=/usr/share/applications/steamdeck-bigpicture.desktop -apps\3\desktop=/usr/share/applications/pcmanfm-qt.desktop -apps\4\desktop=/usr/share/applications/qterminal.desktop -apps\size=4 - -[taskbar] -type=taskbar -buttonStyle=IconAndText -groupingEnabled=false -showGroupOnHover=true - -[spacer] -type=spacer - -[tray] -type=tray - -[worldclock] -type=worldclock - -[showdesktop] -type=showdesktop diff --git a/tools/linuxfs/desktop/rc.xml b/tools/linuxfs/desktop/rc.xml deleted file mode 100644 index cf5ab8a1f8..0000000000 --- a/tools/linuxfs/desktop/rc.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - 0yes - - Clearlooks - 6 - DejaVu Sans11 - - - center - - - - - qterminal - pcmanfm-qt - - - 500 - - - - - - - - diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 8bf8812f7a..6c9a8b12b2 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -4,7 +4,7 @@ # droiddeck-session desktop the file manager # droiddeck-session run a Linux program (AppImage, script or ELF) # droiddeck-session steam [steam-url] the native Steam client -# droiddeck-session lxqt the LXQt/labwc desktop (DroidDeck's desktop package) +# droiddeck-session lxqt the KDE Plasma desktop (DroidDeck's desktop package) # BL_WIDTH / BL_HEIGHT size the output, BL_FPS limits it, BL_LOG collects everything said here. set -u export HOME=${HOME:-/root} @@ -173,7 +173,7 @@ if [ -z "${BL_INSIDE:-}" ]; then wayland-info >/dev/null 2>&1 && break sleep 0.1 done - # The desktop (DroidDeck's hosted package) is its own nested compositor, labwc, drawing straight + # The desktop (DroidDeck's hosted package) is its own nested compositor, KWin, drawing straight # into the app's: no gamescope in between. if [ "$mode" = lxqt ]; then step "starting the desktop" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch index 121c77d907..a04d7980c0 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch @@ -4,15 +4,10 @@ # droiddeck-steam-launch desktop [appid|steam-url] Steam's desktop UI, optionally a game # droiddeck-steam-launch bigpicture [appid|steam-url] Big Picture # -# On a desktop that draws with the GPU (labwc on vulkan or gles2 - the default since the GPU -# desktop) the client runs right there: a window on the desktop, through the desktop's Xwayland, -# with the same set-up a Steam session gives it (droiddeck-session steam, minus gamescope), and -# its games open in windows of their own. A client already running there gets the request instead -# of a second one being started. -# -# On a software desktop (pixman: the GPU renderers failed on this device) there is no dma-buf, so a -# game - or the client's own Vulkan window - would die at its first frame. There the request goes -# to the app, which ends the desktop and starts a Steam session under gamescope in its place. +# The desktop (KDE Plasma) composites in software and has no dma-buf, so the client's own Vulkan +# window - and any game it starts - would die at its first frame there. The request goes to the app +# instead, which ends the desktop and starts a Steam session under gamescope in its place, as +# SteamOS's desktop hands Steam back to Gaming Mode. set -u ui=${1:-desktop} target=${2:-} @@ -25,29 +20,7 @@ case $target in *) url=steam://rungameid/$target ;; esac -steam_root=${XDG_DATA_HOME:-${HOME:-/root}/.local/share}/Steam -client=$steam_root/steamrtarm64/steam - -if [ "${BL_DESKTOP:-}" = 1 ] && [ -n "${WLR_RENDERER:-}" ] && [ "$WLR_RENDERER" != pixman ]; then - log=${BL_DEBUG_DIR:-$HOME/.cache/droiddeck}/steam-desktop.log - mkdir -p "$(dirname "$log")" 2>/dev/null - if pgrep -f 'steamrtarm64/steam( |$)' >/dev/null 2>&1 && [ -x "$client" ]; then - # One client at a time: the running one takes the request (a second start hands its command - # line over and exits). No game asked for = switch it to the UI that was clicked. - [ -n "$url" ] || { [ "$ui" = bigpicture ] && url=steam://open/bigpicture || url=steam://open/main; } - echo "droiddeck-steam-launch: the client is running on the desktop; handing it $url" | tee -a "$log" - exec "$client" "$url" - fi - echo "droiddeck-steam-launch: starting the Steam client on the desktop ($ui${url:+, $url}); log: $log" - # BL_INSIDE: the session script's Steam start-up without gamescope in front of it. The desktop UI - # unless Big Picture was asked for; never Deck mode (its Quick Access Menu needs gamescope). - export BL_INSIDE=1 BL_STEAMDECK=0 - if [ "$ui" = desktop ]; then export BL_STEAM_UI=desktop; else unset BL_STEAM_UI; fi - setsid /usr/local/bin/droiddeck-session steam ${url:+"$url"} >>"$log" 2>&1 < /dev/null & - exit 0 -fi - -# The software desktop, or outside the desktop: ask the app for a Steam session. +# Ask the app for a Steam session. dir=${BL_LAUNCH_DIR:-} if [ -z "$dir" ] || [ ! -d "$dir" ]; then echo "droiddeck-steam-launch: not inside a DroidDeck session (BL_LAUNCH_DIR unset)" >&2 diff --git a/tools/linuxfs/preload/dircache.c b/tools/linuxfs/preload/dircache.c index 0759913662..baf0ada12e 100644 --- a/tools/linuxfs/preload/dircache.c +++ b/tools/linuxfs/preload/dircache.c @@ -768,17 +768,17 @@ ONE_PATH(rmdir, REMOVED, IN_DELETE, next_rmdir(path)) ONE_PATH(unlink, REMOVED, IN_DELETE, next_unlink(path)) ONE_PATH(remove, REMOVED, IN_DELETE, next_remove(path)) -#define TWO_PATHS(name, gone, event) \ +#define TWO_PATHS(name, gone, event, call) \ int name(const char *from, const char *to) { \ NEXT(name); \ struct side a, b; \ int track_a = gone && watching(from) && split(from, &a), track_b = watching(to) && split(to, &b); \ - if (!track_a && !track_b) return next_##name(from, to); \ + if (!track_a && !track_b) return call(from, to); \ pthread_mutex_lock(&oplock); \ begin(); \ if (track_a) before(&a); \ if (track_b) before(&b); \ - int r = next_##name(from, to); \ + int r = call(from, to); \ int saved = errno; \ struct expect x[2]; \ int nx = 0; \ @@ -795,9 +795,13 @@ ONE_PATH(remove, REMOVED, IN_DELETE, next_remove(path)) return r; \ } -TWO_PATHS(rename, 1, IN_MOVED_TO) -TWO_PATHS(link, 0, IN_CREATE) -TWO_PATHS(symlink, 0, IN_CREATE) +/* A refused hard link to a lock file is taken as a symlink (links.c). */ +int bl_link_lock(const char *oldpath, const char *newpath, int result) __attribute__((visibility("hidden"))); +static int link_or_lock(const char *from, const char *to) { return bl_link_lock(from, to, next_link(from, to)); } + +TWO_PATHS(rename, 1, IN_MOVED_TO, next_rename) +TWO_PATHS(link, 0, IN_CREATE, link_or_lock) +TWO_PATHS(symlink, 0, IN_CREATE, next_symlink) #else diff --git a/tools/linuxfs/preload/links.c b/tools/linuxfs/preload/links.c new file mode 100644 index 0000000000..c1304577f0 --- /dev/null +++ b/tools/linuxfs/preload/links.c @@ -0,0 +1,56 @@ +/* + * Lock files taken by hard link, which Android denies apps. + * + * libICE and libXau lock an authority file the classic way: create "-c", then link() it to + * "-l" - the link either appears or fails because the other holder's is there. Android's + * SELinux policy refuses hard links in an app's data, so the link fails for everyone, the lock is + * never taken, and Plasma's session manager gives up at "Could not lock ICEAuthority file". With + * no session manager there is no Plasma desktop. + * + * Only that convention is answered here: when the real link is refused and the new name ends in + * "-l", a symlink stands in. Creating a symlink fails on an existing name just as a link does, so + * the lock excludes as before, and the holder removes both names when it is done. Every other + * link keeps the real answer: a program that links a file into place and then deletes the + * original would be left with a dangling symlink. + */ +#define _GNU_SOURCE +#include +#include +#include +#include +#include + +static int refused(int error) { return error == EPERM || error == EACCES; } + +static int lock_name(const char *path) { + size_t n = path ? strlen(path) : 0; + return n > 2 && strcmp(path + n - 2, "-l") == 0; +} + +/* The answer to link(oldpath, newpath), given the real call's: a refused lock link becomes a symlink. */ +__attribute__((visibility("hidden"))) int bl_link_lock(const char *oldpath, const char *newpath, int result) { + /* libc's own symlink: dircache.c's wrapper may be holding its lock around this call. */ + static int (*real_symlink)(const char *, const char *); + if (result == 0 || !refused(errno) || !lock_name(newpath)) return result; + if (real_symlink == NULL) real_symlink = dlsym(RTLD_NEXT, "symlink"); + return real_symlink(oldpath, newpath); +} + +/* 64-bit builds wrap link() in dircache.c, which hands its result to bl_link_lock. */ +#if __SIZEOF_POINTER__ != 8 +int link(const char *oldpath, const char *newpath) { + static int (*real_link)(const char *, const char *); + if (real_link == NULL) real_link = dlsym(RTLD_NEXT, "link"); + return bl_link_lock(oldpath, newpath, real_link(oldpath, newpath)); +} +#endif + +int linkat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath, int flags) { + static int (*real_linkat)(int, const char *, int, const char *, int); + if (real_linkat == NULL) real_linkat = dlsym(RTLD_NEXT, "linkat"); + int result = real_linkat(olddirfd, oldpath, newdirfd, newpath, flags); + /* A relative old name would resolve against the new name's directory as a symlink's target. */ + if (result != 0 && refused(errno) && lock_name(newpath) && oldpath[0] == '/' && flags == 0) + return symlinkat(oldpath, newdirfd, newpath); + return result; +} diff --git a/tools/release/update_catalog.py b/tools/release/update_catalog.py index e7c71f89bd..b16e4eab3d 100755 --- a/tools/release/update_catalog.py +++ b/tools/release/update_catalog.py @@ -288,7 +288,7 @@ def main_commit(release: dict) -> str | None: def stable_app_release(releases: list[dict]) -> dict | None: - """The newest published app release. The repo also publishes gamescope and wlroots + """The newest published app release. The repo also publishes gamescope and desktop-package releases that GitHub may mark latest, so an app release is one shipping DroidDeck-.apk.""" apps = [ r for r in releases diff --git a/tools/wlroots/build-in-arch.sh b/tools/wlroots/build-in-arch.sh deleted file mode 100755 index 8d39c5dfad..0000000000 --- a/tools/wlroots/build-in-arch.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/bash -# Runs INSIDE an Arch Linux ARM container (menci/archlinuxarm:base-devel) on an arm64 runner. -# Builds Arch's own wlroots0.20 package - the wlroots the desktop package's labwc links - with the -# patches in ./patches added, keeps only the library, and packs it as wlroots.tzst -# (usr/local/lib/droiddeck-wlroots/libwlroots-0.20.so) for the apk to stage. The desktop launcher -# puts that directory first on labwc's library path for the GPU renderers only. -set -euxo pipefail -VERSION=${WLROOTS_VERSION:-0.20.2} -WORK=/work -cd "$WORK" -# Same container workarounds as tools/gamescope/build-in-arch.sh. -grep -q '^DisableSandbox' /etc/pacman.conf || sed -i 's/^\[options\]/[options]\nDisableSandbox/' /etc/pacman.conf -{ for m in https://ca.us.mirror.archlinuxarm.org https://fl.us.mirror.archlinuxarm.org https://de3.mirror.archlinuxarm.org https://nl.mirror.archlinuxarm.org; do echo "Server = $m/\$arch/\$repo"; done; cat /etc/pacman.d/mirrorlist; } > /etc/pacman.d/mirrorlist.new -mv /etc/pacman.d/mirrorlist.new /etc/pacman.d/mirrorlist -pacman -Syu --noconfirm --needed git sudo zstd binutils -id builder >/dev/null 2>&1 || useradd -m builder -echo 'builder ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/builder -rm -rf pkg && mkdir pkg && cp -r tools/wlroots/patches pkg/ && chown -R builder pkg -sudo -u builder bash -c " -set -euxo pipefail -cd pkg -for rel in 1 2 3 4; do - if git clone -q --depth 1 --branch ${VERSION}-\$rel https://gitlab.archlinux.org/archlinux/packaging/packages/wlroots0.20.git arch 2>/dev/null; then break; fi -done -test -f arch/PKGBUILD -cd arch -grep -q '^pkgver=${VERSION}$' PKGBUILD -cp ../patches/*.patch . -PATCHES=\$(ls *.patch | sort) -{ echo; echo 'source+=('; for p in \$PATCHES; do echo \" \$p\"; done; echo ')'; for p in \$PATCHES; do echo \"sha256sums+=('SKIP')\"; done; } >> PKGBUILD -# Arch's PKGBUILD has no prepare(); ours applies the patches to the checkout. -cat >> PKGBUILD <<'PREP' - -prepare() { - cd \"\$srcdir/\$pkgname\" - for p in \$(ls \"\$srcdir\"/*.patch | sort); do - echo \"applying \$(basename \"\$p\")\" - patch -p1 --no-backup-if-mismatch < \"\$p\" - done -} -PREP -makepkg -A -s --noconfirm --skipchecksums --skippgpcheck -ls -l *.pkg.tar.* -" -cd "$WORK" -rm -rf out && mkdir -p out/usr/local/lib/droiddeck-wlroots -PKG=$(ls pkg/arch/wlroots0.20-*.pkg.tar.* | grep -v -- '-debug-' | head -1) -mkdir -p x && tar --use-compress-program=unzstd -xf "$PKG" -C x -SO=x/usr/lib/libwlroots-0.20.so -test -f "$SO" -cp -L "$SO" out/usr/local/lib/droiddeck-wlroots/libwlroots-0.20.so -strip --strip-unneeded out/usr/local/lib/droiddeck-wlroots/libwlroots-0.20.so || true -# The patch is in: the allocator's symbol and its log line. -grep -q 'Created Vulkan DMA-BUF allocator' out/usr/local/lib/droiddeck-wlroots/libwlroots-0.20.so -readelf -d out/usr/local/lib/droiddeck-wlroots/libwlroots-0.20.so | grep -E 'NEEDED|SONAME' -(cd out && tar --use-compress-program='zstd -19' -cf ../wlroots.tzst usr) -sha256sum wlroots.tzst | tee wlroots.tzst.sha256 -ls -l wlroots.tzst out/usr/local/lib/droiddeck-wlroots/ diff --git a/tools/wlroots/patches/0001-vulkan-allocator-for-non-drm-gpu-nodes.patch b/tools/wlroots/patches/0001-vulkan-allocator-for-non-drm-gpu-nodes.patch deleted file mode 100644 index 658233f4fa..0000000000 --- a/tools/wlroots/patches/0001-vulkan-allocator-for-non-drm-gpu-nodes.patch +++ /dev/null @@ -1,549 +0,0 @@ -diff --git a/include/render/vulkan.h b/include/render/vulkan.h -index f96619f2..9f945f87 100644 ---- a/include/render/vulkan.h -+++ b/include/render/vulkan.h -@@ -461,6 +461,10 @@ struct wlr_vk_descriptor_pool *vulkan_alloc_blend_ds( - // Frees the given descriptor set from the pool its pool. - void vulkan_free_ds(struct wlr_vk_renderer *renderer, - struct wlr_vk_descriptor_pool *pool, VkDescriptorSet ds); -+// A DMA-BUF allocator on a Vulkan device of its own, for a DRM fd gbm cannot use (see -+// render/vulkan/allocator.c). -+struct wlr_allocator *vulkan_allocator_create(int drm_fd); -+ - struct wlr_vk_format_props *vulkan_format_props_from_drm( - struct wlr_vk_device *dev, uint32_t drm_format); - struct wlr_vk_renderer *vulkan_get_renderer(struct wlr_renderer *r); -diff --git a/render/allocator/allocator.c b/render/allocator/allocator.c -index b7dbf3d6..f3162d47 100644 ---- a/render/allocator/allocator.c -+++ b/render/allocator/allocator.c -@@ -1,6 +1,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -13,6 +14,10 @@ - #include "render/allocator/shm.h" - #include "render/wlr_renderer.h" - -+#if WLR_HAS_VULKAN_RENDERER -+#include "render/vulkan.h" -+#endif -+ - #if WLR_HAS_GBM_ALLOCATOR - #include "render/allocator/gbm.h" - #endif -@@ -32,6 +37,29 @@ void wlr_allocator_init(struct wlr_allocator *alloc, - wl_signal_init(&alloc->events.destroy); - } - -+/* Whether the fd is a DRM device at all. The GPU node on Android (KGSL, for Adreno) stands in for -+ * a render node so that Vulkan and libdrm's device lookup can name the GPU, but it answers no DRM -+ * ioctl: drmIsMaster() takes that for mastership, and gbm cannot allocate on it. */ -+static bool is_drm_device(int fd) { -+ drmVersion *version = drmGetVersion(fd); -+ if (version == NULL) { -+ return false; -+ } -+ drmFreeVersion(version); -+ return true; -+} -+ -+#if WLR_HAS_VULKAN_RENDERER -+static struct wlr_allocator *try_vulkan_allocator(int drm_fd) { -+ wlr_log(WLR_DEBUG, "Trying to create Vulkan allocator"); -+ struct wlr_allocator *alloc = vulkan_allocator_create(drm_fd); -+ if (alloc == NULL) { -+ wlr_log(WLR_DEBUG, "Failed to create Vulkan allocator"); -+ } -+ return alloc; -+} -+#endif -+ - /* Re-open the DRM node to avoid GEM handle ref'counting issues. See: - * https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/110 - */ -@@ -109,8 +137,20 @@ struct wlr_allocator *wlr_allocator_autocreate(struct wlr_backend *backend, - struct wlr_allocator *alloc = NULL; - - uint32_t gbm_caps = WLR_BUFFER_CAP_DMABUF; -+ bool drm_device = drm_fd >= 0 && is_drm_device(drm_fd); -+ const char *forced = getenv("WLR_ALLOCATOR"); -+ bool vk_first = forced != NULL && strcmp(forced, "vulkan") == 0; -+#if WLR_HAS_VULKAN_RENDERER -+ // A GPU node that is not a DRM device (and WLR_ALLOCATOR=vulkan): buffers come from Vulkan. -+ if ((backend_caps & gbm_caps) && (renderer_caps & gbm_caps) && drm_fd >= 0 -+ && (vk_first || !drm_device)) { -+ if ((alloc = try_vulkan_allocator(drm_fd)) != NULL) { -+ return alloc; -+ } -+ } -+#endif - if ((backend_caps & gbm_caps) && (renderer_caps & gbm_caps) -- && drm_fd >= 0) { -+ && drm_fd >= 0 && drm_device) { - #if WLR_HAS_GBM_ALLOCATOR - wlr_log(WLR_DEBUG, "Trying to create gbm allocator"); - int gbm_fd = reopen_drm_node(drm_fd, true); -@@ -124,6 +164,11 @@ struct wlr_allocator *wlr_allocator_autocreate(struct wlr_backend *backend, - wlr_log(WLR_DEBUG, "Failed to create gbm allocator"); - #else - wlr_log(WLR_DEBUG, "Skipping gbm allocator: disabled at compile-time"); -+#endif -+#if WLR_HAS_VULKAN_RENDERER -+ if (!vk_first && (alloc = try_vulkan_allocator(drm_fd)) != NULL) { -+ return alloc; -+ } - #endif - } - -@@ -138,7 +183,7 @@ struct wlr_allocator *wlr_allocator_autocreate(struct wlr_backend *backend, - - uint32_t drm_caps = WLR_BUFFER_CAP_DMABUF | WLR_BUFFER_CAP_DATA_PTR; - if ((backend_caps & drm_caps) && (renderer_caps & drm_caps) -- && drm_fd >= 0 && drmIsMaster(drm_fd)) { -+ && drm_fd >= 0 && drm_device && drmIsMaster(drm_fd)) { - wlr_log(WLR_DEBUG, "Trying to create drm dumb allocator"); - int dumb_fd = reopen_drm_node(drm_fd, false); - if (dumb_fd < 0) { -diff --git a/render/vulkan/allocator.c b/render/vulkan/allocator.c -new file mode 100644 -index 00000000..4c00d361 ---- /dev/null -+++ b/render/vulkan/allocator.c -@@ -0,0 +1,392 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "render/vulkan.h" -+ -+/* -+ * DMA-BUFs allocated by Vulkan, for a GPU whose device node is not a DRM device and so cannot be -+ * given to gbm - Adreno through KGSL on Android, where the node Turnip opens stands in for a -+ * render node. Each buffer is an exportable image with an explicit DRM format modifier, created -+ * the way vulkan_import_dmabuf() imports one for rendering, so the renderer and the parent -+ * compositor see the same layout. The device is our own, on the physical device the DRM fd names: -+ * this works under the gles2 renderer too, as long as its EGL can import the result. -+ */ -+ -+struct wlr_vk_allocator { -+ struct wlr_allocator base; -+ struct wlr_vk_device *dev; -+ PFN_vkGetMemoryFdKHR get_memory_fd; -+ PFN_vkGetImageDrmFormatModifierPropertiesEXT get_modifier_props; -+ struct wl_list buffers; // wlr_vk_allocator_buffer.link -+}; -+ -+struct wlr_vk_allocator_buffer { -+ struct wlr_buffer base; -+ struct wlr_vk_allocator *alloc; // NULL once the allocator is gone -+ struct wl_list link; -+ VkImage image; -+ VkDeviceMemory memory; -+ struct wlr_dmabuf_attributes dmabuf; -+}; -+ -+static const struct wlr_buffer_impl buffer_impl; -+ -+static struct wlr_vk_allocator_buffer *buffer_from_buffer(struct wlr_buffer *wlr_buffer) { -+ assert(wlr_buffer->impl == &buffer_impl); -+ struct wlr_vk_allocator_buffer *buffer = wl_container_of(wlr_buffer, buffer, base); -+ return buffer; -+} -+ -+static void buffer_release_vk(struct wlr_vk_allocator_buffer *buffer) { -+ if (buffer->alloc == NULL) { -+ return; -+ } -+ VkDevice dev = buffer->alloc->dev->dev; -+ // The exported DMA-BUF keeps the memory alive for whoever imported it. -+ if (buffer->image != VK_NULL_HANDLE) { -+ vkDestroyImage(dev, buffer->image, NULL); -+ } -+ if (buffer->memory != VK_NULL_HANDLE) { -+ vkFreeMemory(dev, buffer->memory, NULL); -+ } -+ buffer->image = VK_NULL_HANDLE; -+ buffer->memory = VK_NULL_HANDLE; -+ wl_list_remove(&buffer->link); -+ buffer->alloc = NULL; -+} -+ -+static void buffer_destroy(struct wlr_buffer *wlr_buffer) { -+ struct wlr_vk_allocator_buffer *buffer = buffer_from_buffer(wlr_buffer); -+ wlr_buffer_finish(wlr_buffer); -+ buffer_release_vk(buffer); -+ wlr_dmabuf_attributes_finish(&buffer->dmabuf); -+ free(buffer); -+} -+ -+static bool buffer_get_dmabuf(struct wlr_buffer *wlr_buffer, -+ struct wlr_dmabuf_attributes *dmabuf) { -+ struct wlr_vk_allocator_buffer *buffer = buffer_from_buffer(wlr_buffer); -+ *dmabuf = buffer->dmabuf; -+ return true; -+} -+ -+static const struct wlr_buffer_impl buffer_impl = { -+ .destroy = buffer_destroy, -+ .get_dmabuf = buffer_get_dmabuf, -+}; -+ -+// One vkCreateImage over the modifiers that share the same mutable-sRGB setting, the one thing -+// in the import that depends on the modifier. The driver picks the modifier. -+static VkImage create_image(struct wlr_vk_allocator *alloc, -+ const struct wlr_vk_format_props *props, int width, int height, -+ const uint64_t *mods, uint32_t mods_len, bool mutable_srgb) { -+ VkImageCreateInfo img_info = { -+ .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, -+ .imageType = VK_IMAGE_TYPE_2D, -+ .format = props->format.vk, -+ .mipLevels = 1, -+ .arrayLayers = 1, -+ .samples = VK_SAMPLE_COUNT_1_BIT, -+ .sharingMode = VK_SHARING_MODE_EXCLUSIVE, -+ .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED, -+ .extent = (VkExtent3D){ width, height, 1 }, -+ .usage = vulkan_render_usage, -+ .tiling = VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT, -+ }; -+ if (mutable_srgb) { -+ img_info.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; -+ } -+ -+ VkExternalMemoryImageCreateInfo eimg = { -+ .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO, -+ .handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT, -+ }; -+ img_info.pNext = &eimg; -+ -+ VkImageDrmFormatModifierListCreateInfoEXT mod_list = { -+ .sType = VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_LIST_CREATE_INFO_EXT, -+ .drmFormatModifierCount = mods_len, -+ .pDrmFormatModifiers = mods, -+ }; -+ eimg.pNext = &mod_list; -+ -+ VkFormat view_formats[] = { -+ props->format.vk, -+ props->format.vk_srgb, -+ }; -+ VkImageFormatListCreateInfoKHR list_info = { -+ .sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR, -+ .pViewFormats = view_formats, -+ .viewFormatCount = sizeof(view_formats) / sizeof(view_formats[0]), -+ }; -+ if (mutable_srgb) { -+ mod_list.pNext = &list_info; -+ } -+ -+ VkImage image = VK_NULL_HANDLE; -+ VkResult res = vkCreateImage(alloc->dev->dev, &img_info, NULL, &image); -+ if (res != VK_SUCCESS) { -+ wlr_vk_error("vkCreateImage", res); -+ return VK_NULL_HANDLE; -+ } -+ return image; -+} -+ -+static struct wlr_buffer *allocator_create_buffer(struct wlr_allocator *wlr_allocator, -+ int width, int height, const struct wlr_drm_format *format) { -+ struct wlr_vk_allocator *alloc = wl_container_of(wlr_allocator, alloc, base); -+ VkDevice dev = alloc->dev->dev; -+ -+ const struct wlr_vk_format_props *props = -+ vulkan_format_props_from_drm(alloc->dev, format->format); -+ if (props == NULL) { -+ wlr_log(WLR_ERROR, "Vulkan allocator: format 0x%08"PRIX32" not supported", -+ format->format); -+ return NULL; -+ } -+ -+ // The modifiers asked for that this device can render to at this size, split by whether the -+ // import will make the image mutable-format. INVALID (implicit) is not something Vulkan can -+ // allocate; LINEAR stands in for it when it is all there is. -+ uint64_t *mutable_mods = calloc(format->len + 1, sizeof(uint64_t)); -+ uint64_t *plain_mods = calloc(format->len + 1, sizeof(uint64_t)); -+ if (mutable_mods == NULL || plain_mods == NULL) { -+ free(mutable_mods); -+ free(plain_mods); -+ return NULL; -+ } -+ uint32_t mutable_len = 0, plain_len = 0; -+ bool implicit_only = format->len > 0; -+ for (size_t i = 0; i <= format->len; i++) { -+ uint64_t mod; -+ if (i < format->len) { -+ mod = format->modifiers[i]; -+ if (mod == DRM_FORMAT_MOD_INVALID) { -+ continue; -+ } -+ implicit_only = false; -+ } else if (implicit_only) { -+ mod = DRM_FORMAT_MOD_LINEAR; -+ } else { -+ break; -+ } -+ const struct wlr_vk_format_modifier_props *mp = -+ vulkan_format_props_find_modifier(props, mod, true); -+ if (mp == NULL || (uint32_t)width > mp->max_extent.width || -+ (uint32_t)height > mp->max_extent.height) { -+ continue; -+ } -+ if (mp->has_mutable_srgb) { -+ mutable_mods[mutable_len++] = mod; -+ } else { -+ plain_mods[plain_len++] = mod; -+ } -+ } -+ -+ VkImage image = VK_NULL_HANDLE; -+ if (mutable_len > 0) { -+ image = create_image(alloc, props, width, height, mutable_mods, mutable_len, true); -+ } -+ if (image == VK_NULL_HANDLE && plain_len > 0) { -+ image = create_image(alloc, props, width, height, plain_mods, plain_len, false); -+ } -+ free(mutable_mods); -+ free(plain_mods); -+ if (image == VK_NULL_HANDLE) { -+ wlr_log(WLR_ERROR, "Vulkan allocator: no usable modifier for %dx%d format 0x%08"PRIX32, -+ width, height, format->format); -+ return NULL; -+ } -+ -+ struct wlr_vk_allocator_buffer *buffer = calloc(1, sizeof(*buffer)); -+ if (buffer == NULL) { -+ vkDestroyImage(dev, image, NULL); -+ return NULL; -+ } -+ wlr_buffer_init(&buffer->base, &buffer_impl, width, height); -+ buffer->alloc = alloc; -+ buffer->image = image; -+ wl_list_insert(&alloc->buffers, &buffer->link); -+ for (int i = 0; i < WLR_DMABUF_MAX_PLANES; i++) { -+ buffer->dmabuf.fd[i] = -1; -+ } -+ -+ VkMemoryRequirements reqs; -+ vkGetImageMemoryRequirements(dev, image, &reqs); -+ int mem_type = vulkan_find_mem_type(alloc->dev, -+ VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, reqs.memoryTypeBits); -+ if (mem_type < 0) { -+ mem_type = vulkan_find_mem_type(alloc->dev, 0, reqs.memoryTypeBits); -+ } -+ if (mem_type < 0) { -+ wlr_log(WLR_ERROR, "Vulkan allocator: no memory type for the image"); -+ goto error; -+ } -+ -+ VkMemoryDedicatedAllocateInfo dedicated = { -+ .sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO, -+ .image = image, -+ }; -+ VkExportMemoryAllocateInfo export = { -+ .sType = VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO, -+ .pNext = &dedicated, -+ .handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT, -+ }; -+ VkMemoryAllocateInfo mem_info = { -+ .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, -+ .pNext = &export, -+ .allocationSize = reqs.size, -+ .memoryTypeIndex = mem_type, -+ }; -+ VkResult res = vkAllocateMemory(dev, &mem_info, NULL, &buffer->memory); -+ if (res != VK_SUCCESS) { -+ wlr_vk_error("vkAllocateMemory", res); -+ goto error; -+ } -+ res = vkBindImageMemory(dev, image, buffer->memory, 0); -+ if (res != VK_SUCCESS) { -+ wlr_vk_error("vkBindImageMemory", res); -+ goto error; -+ } -+ -+ VkImageDrmFormatModifierPropertiesEXT mod_props = { -+ .sType = VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT, -+ }; -+ res = alloc->get_modifier_props(dev, image, &mod_props); -+ if (res != VK_SUCCESS) { -+ wlr_vk_error("vkGetImageDrmFormatModifierPropertiesEXT", res); -+ goto error; -+ } -+ const struct wlr_vk_format_modifier_props *mp = -+ vulkan_format_props_find_modifier(props, mod_props.drmFormatModifier, true); -+ if (mp == NULL) { -+ wlr_log(WLR_ERROR, "Vulkan allocator: driver chose modifier 0x%016"PRIX64 -+ " which it cannot render to", mod_props.drmFormatModifier); -+ goto error; -+ } -+ uint32_t n_planes = mp->props.drmFormatModifierPlaneCount; -+ if (n_planes == 0 || n_planes > WLR_DMABUF_MAX_PLANES) { -+ wlr_log(WLR_ERROR, "Vulkan allocator: %"PRIu32" memory planes", n_planes); -+ goto error; -+ } -+ -+ VkMemoryGetFdInfoKHR fd_info = { -+ .sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR, -+ .memory = buffer->memory, -+ .handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT, -+ }; -+ int fd = -1; -+ res = alloc->get_memory_fd(dev, &fd_info, &fd); -+ if (res != VK_SUCCESS || fd < 0) { -+ wlr_vk_error("vkGetMemoryFdKHR", res); -+ goto error; -+ } -+ -+ buffer->dmabuf = (struct wlr_dmabuf_attributes){ -+ .width = width, -+ .height = height, -+ .format = format->format, -+ .modifier = mod_props.drmFormatModifier, -+ .n_planes = n_planes, -+ }; -+ for (int i = 0; i < WLR_DMABUF_MAX_PLANES; i++) { -+ buffer->dmabuf.fd[i] = -1; -+ } -+ static const VkImageAspectFlagBits plane_aspects[] = { -+ VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT_EXT, -+ VK_IMAGE_ASPECT_MEMORY_PLANE_1_BIT_EXT, -+ VK_IMAGE_ASPECT_MEMORY_PLANE_2_BIT_EXT, -+ VK_IMAGE_ASPECT_MEMORY_PLANE_3_BIT_EXT, -+ }; -+ for (uint32_t i = 0; i < n_planes; i++) { -+ VkImageSubresource sub = { .aspectMask = plane_aspects[i] }; -+ VkSubresourceLayout layout; -+ vkGetImageSubresourceLayout(dev, image, &sub, &layout); -+ buffer->dmabuf.offset[i] = layout.offset; -+ buffer->dmabuf.stride[i] = layout.rowPitch; -+ // Every plane lives in the one allocation; each gets its own fd, as -+ // wlr_dmabuf_attributes_finish() closes them one by one. -+ buffer->dmabuf.fd[i] = i == 0 ? fd : fcntl(fd, F_DUPFD_CLOEXEC, 0); -+ if (buffer->dmabuf.fd[i] < 0) { -+ wlr_log_errno(WLR_ERROR, "Vulkan allocator: dup failed"); -+ goto error; -+ } -+ } -+ -+ wlr_log(WLR_DEBUG, "Vulkan allocator: %dx%d format 0x%08"PRIX32" modifier 0x%016"PRIX64 -+ ", %"PRIu32" plane(s)", width, height, format->format, mod_props.drmFormatModifier, n_planes); -+ return &buffer->base; -+ -+error: -+ buffer_destroy(&buffer->base); -+ return NULL; -+} -+ -+static void allocator_destroy(struct wlr_allocator *wlr_allocator) { -+ struct wlr_vk_allocator *alloc = wl_container_of(wlr_allocator, alloc, base); -+ // Buffers may outlive their allocator; their DMA-BUF fds stay valid without the device. -+ struct wlr_vk_allocator_buffer *buffer, *tmp; -+ wl_list_for_each_safe(buffer, tmp, &alloc->buffers, link) { -+ buffer_release_vk(buffer); -+ } -+ struct wlr_vk_instance *ini = alloc->dev->instance; -+ vulkan_device_destroy(alloc->dev); -+ vulkan_instance_destroy(ini); -+ free(alloc); -+} -+ -+static const struct wlr_allocator_interface allocator_impl = { -+ .destroy = allocator_destroy, -+ .create_buffer = allocator_create_buffer, -+}; -+ -+struct wlr_allocator *vulkan_allocator_create(int drm_fd) { -+ struct wlr_vk_instance *ini = vulkan_instance_create(false); -+ if (ini == NULL) { -+ wlr_log(WLR_ERROR, "Vulkan allocator: could not create an instance"); -+ return NULL; -+ } -+ VkPhysicalDevice phdev = vulkan_find_drm_phdev(ini, drm_fd); -+ if (phdev == VK_NULL_HANDLE) { -+ wlr_log(WLR_ERROR, "Vulkan allocator: no Vulkan device for the DRM fd"); -+ vulkan_instance_destroy(ini); -+ return NULL; -+ } -+ struct wlr_vk_device *dev = vulkan_device_create(ini, phdev); -+ if (dev == NULL) { -+ wlr_log(WLR_ERROR, "Vulkan allocator: could not create a device"); -+ vulkan_instance_destroy(ini); -+ return NULL; -+ } -+ -+ struct wlr_vk_allocator *alloc = calloc(1, sizeof(*alloc)); -+ if (alloc == NULL) { -+ vulkan_device_destroy(dev); -+ vulkan_instance_destroy(ini); -+ return NULL; -+ } -+ alloc->dev = dev; -+ wl_list_init(&alloc->buffers); -+ alloc->get_memory_fd = (PFN_vkGetMemoryFdKHR) -+ vkGetDeviceProcAddr(dev->dev, "vkGetMemoryFdKHR"); -+ alloc->get_modifier_props = (PFN_vkGetImageDrmFormatModifierPropertiesEXT) -+ vkGetDeviceProcAddr(dev->dev, "vkGetImageDrmFormatModifierPropertiesEXT"); -+ if (alloc->get_memory_fd == NULL || alloc->get_modifier_props == NULL) { -+ wlr_log(WLR_ERROR, "Vulkan allocator: the device lacks DMA-BUF export"); -+ free(alloc); -+ vulkan_device_destroy(dev); -+ vulkan_instance_destroy(ini); -+ return NULL; -+ } -+ -+ wlr_allocator_init(&alloc->base, &allocator_impl, WLR_BUFFER_CAP_DMABUF); -+ wlr_log(WLR_INFO, "Created Vulkan DMA-BUF allocator"); -+ return &alloc->base; -+} -diff --git a/render/vulkan/meson.build b/render/vulkan/meson.build -index 36a822f9..abeb5337 100644 ---- a/render/vulkan/meson.build -+++ b/render/vulkan/meson.build -@@ -37,6 +37,7 @@ glslang_version_info = run_command(glslang, '--version', check: true).stdout() - glslang_version = glslang_version_info.split('\n')[0].split(':')[-1] - - wlr_files += files( -+ 'allocator.c', - 'pass.c', - 'renderer.c', - 'texture.c', -diff --git a/types/wlr_linux_dmabuf_v1.c b/types/wlr_linux_dmabuf_v1.c -index 3165e880..a7fe060c 100644 ---- a/types/wlr_linux_dmabuf_v1.c -+++ b/types/wlr_linux_dmabuf_v1.c -@@ -901,11 +901,22 @@ static bool set_default_feedback(struct wlr_linux_dmabuf_v1 *linux_dmabuf, - if (device->available_nodes & (1 << DRM_NODE_RENDER)) { - const char *name = device->nodes[DRM_NODE_RENDER]; - main_device_fd = open(name, O_RDWR | O_CLOEXEC); -- drmFreeDevice(&device); - if (main_device_fd < 0) { - wlr_log_errno(WLR_ERROR, "Failed to open DRM device %s", name); -+ drmFreeDevice(&device); - goto error_compiled; - } -+ // A GPU node that stands in for a render node without being a DRM device (KGSL on -+ // Android) cannot import a buffer as a GEM handle; every client's would be refused. -+ drmVersion *version = drmGetVersion(main_device_fd); -+ if (version == NULL) { -+ wlr_log(WLR_INFO, "%s is not a DRM device, skipping DMA-BUF import checks", name); -+ close(main_device_fd); -+ main_device_fd = -1; -+ } else { -+ drmFreeVersion(version); -+ } -+ drmFreeDevice(&device); - } else { - // Likely a split display/render setup. Unfortunately we have no way to - // get back the proper render node used by the renderer under-the-hood. diff --git a/tools/wlroots/release.env b/tools/wlroots/release.env deleted file mode 100644 index f9e6fcaebd..0000000000 --- a/tools/wlroots/release.env +++ /dev/null @@ -1,2 +0,0 @@ -WLROOTS_TAG=wlroots-0.20.2-p1 -WLROOTS_SHA256=b4dcb08b46e69dbfaa004597844e843cdf938591ba5dbc7079b91626cdd4591d