From e8cd00122920355fc7d998f929514176d568ba4d Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Mon, 28 Sep 2026 18:56:18 -0400 Subject: [PATCH] feat(desktop): add desktop shell pref and plasma catalog --- .../droiddeck/launcher/runtime/DesktopCatalog.kt | 10 ++++++++++ .../com/droiddeck/launcher/session/SessionPrefs.kt | 14 ++++++++++++++ 2 files changed, 24 insertions(+) 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 da69edf43..2f9410789 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt @@ -25,6 +25,12 @@ object DesktopCatalog { */ const val STEAM_SEED_URL = "https://raw.githubusercontent.com/The412Banner/winlator-contents/main/steam-seed.json" const val PROTON_SEED_ID = "proton-arm64" + /** + * Desktop shells other than LXQt, built in this repo (tools/plasma, build-plasma.yml) and + * installed over the desktop package when one is chosen in the Desktop settings. + */ + const val SHELLS_URL = "https://raw.githubusercontent.com/Droid-Deck/DroidDeck/main/catalog/shells.json" + const val PLASMA_ID = "plasma" class Entry( val id: String, val name: String, val tier: Int, val version: String, val kind: String, @@ -78,6 +84,10 @@ object DesktopCatalog { fun desktopInstalled(context: Context): Boolean = File(LinuxRuntime.rootDir(context), "usr/bin/labwc").isFile + /** KDE Plasma's package is in (droiddeck-desktop tests the same file). */ + fun plasmaInstalled(context: Context): Boolean = + File(LinuxRuntime.rootDir(context), "usr/bin/kwin_wayland").isFile + /** Downloads, verifies and installs one package. Returns null on success, else a message. */ fun install(context: Context, entry: Entry, listener: LinuxRuntimeInstaller.ProgressListener?): String? { val root = LinuxRuntime.rootDir(context) 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 18e1db90d..fb30170d2 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -419,6 +419,20 @@ object SessionPrefs { java.io.File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context), "root/.droiddeck-renderer-failed").delete() } + /** + * The desktop's shell: SHELL_LXQT (labwc, the desktop package) or SHELL_PLASMA (KWin, the plasma + * package over it, fetched at the next Desktop start when it is not in yet). + */ + fun desktopShell(context: Context): String = + prefs(context).getString("desktopShell", SHELL_LXQT)?.takeIf { it == SHELL_PLASMA } ?: SHELL_LXQT + + fun setDesktopShell(context: Context, shell: String) { + prefs(context).edit().putString("desktopShell", shell).apply() + } + + const val SHELL_LXQT = "lxqt" + const val SHELL_PLASMA = "plasma" + /** * 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