From b9d703db344c8698841e730246978dba692b68cf Mon Sep 17 00:00:00 2001 From: Moroni Granja Date: Mon, 19 Oct 2026 22:43:49 -0300 Subject: [PATCH 001/135] fix: extract GOG installers natively on ARM The GOG installer fallback downloaded only the setup stub and then launched it through Proton/FEX, where the 32-bit Inno Setup stub corrupts its own path strings before CreateFileW. Download every installer part and extract them with the bundled ARM64 innoextract in the Linux guest instead, registering the real game executable. Also classify truncated response bodies as server faults so the native engine retries on the other CDN mirror. --- app/build.gradle | 1 + .../launcher/runtime/GuestCommand.kt | 27 ++- .../launcher/session/SessionFiles.kt | 9 + .../launcher/stores/gog/GogBackend.kt | 37 ++-- .../stores/gog/GogDownloadManager.java | 183 +++++++++++++++--- app/src/main/rust/stores/src/fetch_core.rs | 101 ++++++++-- app/src/main/rust/stores/src/fetch_tuning.rs | 4 + .../stores/gog/GogInstallerPartsTest.kt | 90 +++++++++ .../usr/local/bin/droiddeck-innoextract | 7 + .../usr/local/lib/droiddeck-inno/innoextract | Bin 0 -> 793704 bytes .../libboost_container.so.1.92.0 | Bin 0 -> 133208 bytes .../libboost_filesystem.so.1.92.0 | Bin 0 -> 264456 bytes .../libboost_iostreams.so.1.92.0 | Bin 0 -> 133200 bytes .../libboost_program_options.so.1.92.0 | Bin 0 -> 461016 bytes .../droiddeck-inno/libboost_random.so.1.92.0 | Bin 0 -> 67712 bytes .../licenses/droiddeck-inno/LICENSE.boost | 23 +++ .../droiddeck-inno/LICENSE.innoextract | 18 ++ 17 files changed, 435 insertions(+), 65 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/gog/GogInstallerPartsTest.kt create mode 100755 tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract create mode 100755 tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/innoextract create mode 100755 tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0 create mode 100755 tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_filesystem.so.1.92.0 create mode 100755 tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0 create mode 100755 tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_program_options.so.1.92.0 create mode 100755 tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_random.so.1.92.0 create mode 100644 tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.boost create mode 100644 tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract diff --git a/app/build.gradle b/app/build.gradle index 2e269ac50e..c11a7557a2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -230,6 +230,7 @@ def runtimeAssetsDir = layout.buildDirectory.dir('runtimeAssets') def stageRuntimeAssets = tasks.register('stageRuntimeAssets', Sync) { dependsOn(stageSessionScripts) from(layout.projectDirectory.dir('src/main/assets')) { exclude 'pulseaudio.tzst' } + from(rootProject.file('tools/linuxfs/innoextract')) from(layout.buildDirectory.dir('prepared-assets')) into(runtimeAssetsDir) } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt index 8b4f14e5ad..c417228ea4 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt @@ -8,10 +8,12 @@ import com.droiddeck.launcher.session.SessionFiles import com.droiddeck.launcher.session.SessionPaths import com.droiddeck.launcher.session.SessionPrefs import java.io.File +import java.util.concurrent.atomic.AtomicBoolean object GuestCommand { fun run(context: Context, argv: List, fakeRoot: Boolean = false, logName: String? = null, - linkDir: File? = null, extraBinds: List? = null, fastPath: Boolean = false, onLine: (String) -> Unit): Int { + linkDir: File? = null, extraBinds: List? = null, fastPath: Boolean = false, cancelled: AtomicBoolean? = null, + onLine: (String) -> Unit): Int { val log = logName?.let { try { File(File(LinuxRuntime.logDir(context), SessionPaths.TOOLS_DIR).apply { mkdirs() }, "$it.log").printWriter() @@ -19,14 +21,14 @@ object GuestCommand { } log?.println("== ${java.util.Date()} ${argv.joinToString(" ")}") try { - return runLogged(context, argv, fakeRoot, linkDir, extraBinds, fastPath) { line -> log?.println(line); log?.flush(); onLine(line) } + return runLogged(context, argv, fakeRoot, linkDir, extraBinds, fastPath, cancelled) { line -> log?.println(line); log?.flush(); onLine(line) } } finally { log?.close() } } private fun runLogged(context: Context, argv: List, fakeRoot: Boolean, linkDir: File?, extraBinds: List?, - fastPath: Boolean, onLine: (String) -> Unit): Int { + fastPath: Boolean, cancelled: AtomicBoolean?, onLine: (String) -> Unit): Int { val root = LinuxRuntime.rootDir(context) LinuxRuntime.writeAccounts(context) SessionFiles.stage(context, root) @@ -56,13 +58,32 @@ object GuestCommand { fastPathKey?.let { ProotFastPath.hostEnv(it).let { (k, v) -> put(k, v) } } LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } } + if (cancelled?.get() == true) return 130 val process = builder.start() val pid = HostProcess.pidOf(process) OrphanReaper.keep(pid) + val watcher = cancelled?.let { flag -> + Thread({ + try { + while (process.isAlive && !flag.get()) Thread.sleep(200) + if (flag.get()) { + // PRoot ignores SIGTERM; SIGQUIT makes it kill its tracees and exit cleanly. + if (pid > 0) { + runCatching { android.system.Os.kill(pid, android.system.OsConstants.SIGQUIT) } + } else { + process.destroy() + } + if (!process.waitFor(3, java.util.concurrent.TimeUnit.SECONDS)) process.destroyForcibly() + } + } catch (_: InterruptedException) { + } + }, "guest-cancel").apply { isDaemon = true; start() } + } try { process.inputStream.bufferedReader().useLines { lines -> lines.forEach(onLine) } return process.waitFor() } finally { + watcher?.interrupt() OrphanReaper.release(pid) } } 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 46d84c50a8..a29531cc1f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -88,6 +88,15 @@ object SessionFiles { "usr/local/bin/droiddeck-script-run" to "usr/local/bin/droiddeck-script-run", "usr/local/bin/droiddeck-open" to "usr/local/bin/droiddeck-open", "usr/local/bin/droiddeck-proton-run" to "usr/local/bin/droiddeck-proton-run", + "usr/local/bin/droiddeck-innoextract" to "usr/local/bin/droiddeck-innoextract", + "usr/local/lib/droiddeck-inno/innoextract" to "usr/local/lib/droiddeck-inno/innoextract", + "usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0", + "usr/local/lib/droiddeck-inno/libboost_filesystem.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_filesystem.so.1.92.0", + "usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0", + "usr/local/lib/droiddeck-inno/libboost_program_options.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_program_options.so.1.92.0", + "usr/local/lib/droiddeck-inno/libboost_random.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_random.so.1.92.0", + "usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract" to "usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract", + "usr/local/share/licenses/droiddeck-inno/LICENSE.boost" to "usr/local/share/licenses/droiddeck-inno/LICENSE.boost", "usr/bin/steamos-update" to "usr/bin/steamos-update", "usr/bin/steamos-select-branch" to "usr/bin/steamos-select-branch", "usr/bin/steamos-session-select" to "usr/bin/steamos-session-select", diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt index 1003921c04..1676ef9dbe 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt @@ -82,24 +82,31 @@ object GogBackend : StoreBackend { handle.stage(DownloadStage.MANIFEST) StoreInstalls.begin(folder, Store.GOG, game.gameId, game.title, item.tallImageUrl ?: item.imageUrl, item.imageUrl) var downloading = false - val result = GogDownloadManager.install(app, game, folder, object : GogDownloadManager.Callback { - override fun onProgress(message: String, pct: Int) { - when { - message.startsWith("Finishing") -> handle.stage(DownloadStage.INSTALL, message) - message.startsWith("Downloading") || message.startsWith("Verified") || message.startsWith("Resuming") -> { - if (!downloading) { downloading = true; handle.stage(DownloadStage.DOWNLOAD, message) } else handle.progress(-1, -1, message) + val result = try { + GogDownloadManager.install(app, game, folder, object : GogDownloadManager.Callback { + override fun onProgress(message: String, pct: Int) { + when { + message.startsWith("Finishing") || message.startsWith("Extracting") -> handle.stage(DownloadStage.INSTALL, message) + message.startsWith("Downloading") || message.startsWith("Verified") || message.startsWith("Resuming") -> { + if (!downloading) { downloading = true; handle.stage(DownloadStage.DOWNLOAD, message) } else handle.progress(-1, -1, message) + } + else -> handle.stage(DownloadStage.MANIFEST, message) } - else -> handle.stage(DownloadStage.MANIFEST, message) } + override fun onBytes(done: Long, total: Long, speedBps: Long) { handle.progress(done, total, null, speedBps) } + override fun onLog(line: String) { handle.log(line) } + override fun onSizes(downloadBytes: Long, diskBytes: Long) { handle.diskSize(diskBytes) } + override fun onStage(stage: String, done: Long, total: Long, items: Int, itemsTotal: Int) { + handle.stage(when (stage) { "check" -> DownloadStage.MANIFEST; "verify" -> DownloadStage.VERIFY; else -> DownloadStage.INSTALL }) + handle.stageProgress(done, total, items, itemsTotal, bytes = stage == "install") + } + }, cancelled) + } catch (t: Throwable) { + if (t is GogDownloadManager.InstallerException && !cancelled.get()) { + StoreInstalls.discard(app, folder, listOf(File(folder, ".gog_chunks"))) } - override fun onBytes(done: Long, total: Long, speedBps: Long) { handle.progress(done, total, null, speedBps) } - override fun onLog(line: String) { handle.log(line) } - override fun onSizes(downloadBytes: Long, diskBytes: Long) { handle.diskSize(diskBytes) } - override fun onStage(stage: String, done: Long, total: Long, items: Int, itemsTotal: Int) { - handle.stage(when (stage) { "check" -> DownloadStage.MANIFEST; "verify" -> DownloadStage.VERIFY; else -> DownloadStage.INSTALL }) - handle.stageProgress(done, total, items, itemsTotal, bytes = stage == "install") - } - }, cancelled) ?: return null + throw t + } ?: return null if (cancelled.get()) return null handle.stage(DownloadStage.INSTALL, app.getString(com.droiddeck.launcher.R.string.stores_registering)) val sidecar = StoreGameSidecar( diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java index b61af1e96c..e5e1bec684 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java @@ -3,6 +3,8 @@ package com.droiddeck.launcher.stores.gog; import android.content.Context; import android.util.Log; +import com.droiddeck.launcher.frontend.AddedGames; +import com.droiddeck.launcher.runtime.GuestCommand; import com.droiddeck.launcher.stores.StoreLog; import com.droiddeck.launcher.stores.download.StoreDownloadTier; @@ -20,7 +22,9 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import java.nio.file.Files; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.concurrent.Callable; @@ -60,10 +64,15 @@ public final class GogDownloadManager { Result(String exeRelative, String buildId, long bytes) { this.exeRelative = exeRelative; this.buildId = buildId; this.bytes = bytes; } } - public static final class InstallException extends Exception { + public static class InstallException extends Exception { InstallException(String message) { super(message); } } + /** A failure of the offline-installer fallback; its partial files can be discarded. */ + public static final class InstallerException extends InstallException { + InstallerException(String message) { super(message); } + } + private GogDownloadManager() {} public static Result install(Context ctx, GogGame game, File installPath, Callback cb, AtomicBoolean cancelled) throws InstallException { @@ -385,41 +394,149 @@ public final class GogDownloadManager { String productJson = httpGet("https://api.gog.com/products/" + game.gameId + "?expand=downloads", token); if (productJson == null) throw new InstallException("No downloadable builds for this game"); JSONObject downloads = new JSONObject(productJson).optJSONObject("downloads"); - JSONArray installers = downloads == null ? null : downloads.optJSONArray("installers"); - if (installers == null || installers.length() == 0) throw new InstallException("No downloadable builds for this game"); - String manualUrl = null, fileName = null; - for (int i = 0; i < installers.length(); i++) { - JSONObject inst = installers.getJSONObject(i); - if (!"windows".equals(inst.optString("os"))) continue; - JSONArray files = inst.optJSONArray("files"); - if (files != null && files.length() > 0) { - JSONObject f = files.getJSONObject(0); - manualUrl = f.optString("downlink", null); - if (manualUrl == null) manualUrl = f.optString("manualUrl", null); - fileName = f.optString("filename", null); - } - if (manualUrl == null) manualUrl = inst.optString("manualUrl", null); - if (fileName == null || fileName.isEmpty()) fileName = "setup_" + game.gameId + ".exe"; - break; - } - if (manualUrl == null) throw new InstallException("No Windows installer for this game"); - String downloadUrl = resolveRedirect(manualUrl, token); - if (downloadUrl == null) throw new InstallException("The installer link could not be resolved"); + List parts = installerParts(downloads, game.gameId); + if (parts.isEmpty()) throw new InstallException("No downloadable builds for this game"); installPath.mkdirs(); - File outFile = new File(installPath, fileName); - cb.onProgress("Downloading installer: " + fileName, 15); - long size = downloadWithProgress(downloadUrl, outFile, cb, cancelled); + long planned = 0; + boolean sized = true; + for (InstallerPart part : parts) { planned += part.size; if (part.size <= 0) sized = false; } + if (sized) { + long usable = com.droiddeck.launcher.stores.StoreInstallRoot.availableBytes(installPath); + if (com.droiddeck.launcher.stores.StoreInstallRoot.insufficientSpace(planned, usable)) { + throw new InstallException("Not enough free space: need " + formatBytes(planned) + ", only " + formatBytes(usable) + " free"); + } + } + long total = 0; + for (InstallerPart part : parts) { + if (cancelled.get()) return null; + String downloadUrl = resolveRedirect(part.url, token); + if (downloadUrl == null) throw new InstallException("The installer link could not be resolved: " + part.filename); + File outFile; + try { + outFile = installerDestination(installPath, part.filename); + } catch (IOException e) { + throw new InstallException("The installer part is not inside the game folder: " + part.filename); + } + cb.onProgress("Downloading installer: " + part.filename, 15 + (int) ((total / (float) Math.max(1, planned)) * 80)); + long size = downloadWithProgress(downloadUrl, outFile, cb, cancelled, total, sized ? planned : 0); + if (cancelled.get()) return null; + if (size <= 0) throw new InstallException("The installer download failed: " + part.filename); + total += size; + } if (cancelled.get()) return null; - if (size <= 0) throw new InstallException("The installer download failed"); - cb.onLog("gog: installer downloaded; the game installs itself on first launch"); - return new Result(fileName, "", size); - } catch (InstallException e) { + cb.onLog("gog: installer downloaded (" + parts.size() + " file(s)); extracting natively"); + extractInstaller(ctx, installPath, parts.get(0).filename, cb, cancelled); + if (cancelled.get()) return null; + for (InstallerPart part : parts) new File(installPath, part.filename).delete(); + deleteDir(new File(installPath, "tmp")); + deleteDir(new File(installPath, "commonappdata")); + String exe = pickExe(installPath, null, game.title); + if (exe.isEmpty()) throw new InstallException("The installer was extracted but no game executable was found"); + cb.onLog("gog: installer extracted natively; game exe " + exe); + return new Result(exe, "", total); + } catch (InstallerException e) { throw e; + } catch (InstallException e) { + throw new InstallerException(e.getMessage()); } catch (Exception e) { - throw new InstallException("Installer download error: " + e.getClass().getSimpleName()); + throw new InstallerException("Installer download error: " + e.getClass().getSimpleName()); } } + /** + * GOG's Windows installer is a 32-bit Inno Setup stub. On ARM64 it runs through + * Proton/FEX, where its path strings are corrupted before CreateFileW (observed on + * Wine 11 + FEX: "Path not found"). Extracting the same files with innoextract in + * the Linux guest avoids that path entirely. + */ + private static void extractInstaller(Context ctx, File installPath, String setupName, Callback cb, AtomicBoolean cancelled) throws InstallException { + String guestDir = AddedGames.INSTANCE.guestPath(ctx, installPath); + if (guestDir == null || guestDir.isEmpty()) { + throw new InstallException("The game folder is not visible to the Linux session"); + } + String guestSetup = guestDir + "/" + setupName; + cb.onProgress("Extracting installer…", 95); + int rc; + try { + rc = GuestCommand.INSTANCE.run(ctx, Arrays.asList( + "/usr/local/bin/droiddeck-innoextract", "--gog", "--silent", + "-d", guestDir, guestSetup), + false, "gog-innoextract", null, null, false, cancelled, + line -> { cb.onLog("gog innoextract: " + line); return kotlin.Unit.INSTANCE; }); + } catch (Exception e) { + throw new InstallException("The installer could not be extracted: " + e.getClass().getSimpleName()); + } + if (cancelled.get()) return; + if (rc != 0) throw new InstallException("The installer could not be extracted (innoextract exit " + rc + ")"); + } + + static final class InstallerPart { + final String url; + final String filename; + final long size; + InstallerPart(String url, String filename, long size) { this.url = url; this.filename = filename; this.size = size; } + } + + /** + * Every file of the first usable Windows installer. GOG lists a setup stub and its data parts as + * separate files, often without a filename; the parts are named after the stub so the installer + * finds them when launched (setup_<id>.exe, setup_<id>-1.bin, ...). + */ + static List installerParts(JSONObject downloads, String gameId) { + List out = new ArrayList<>(); + if (downloads == null) return out; + JSONArray installers = downloads.optJSONArray("installers"); + if (installers == null) return out; + for (int i = 0; i < installers.length(); i++) { + JSONObject inst = installers.optJSONObject(i); + if (inst == null || !"windows".equals(inst.optString("os"))) continue; + JSONArray files = inst.optJSONArray("files"); + String base = null; + if (files != null) { + for (int j = 0; j < files.length(); j++) { + JSONObject f = files.optJSONObject(j); + if (f == null) continue; + String url = f.optString("downlink", ""); + if (url.isEmpty()) url = f.optString("manualUrl", ""); + if (url.isEmpty()) continue; + String name = partName(f.optString("filename", "")); + if (name.isEmpty()) { + if (base == null) base = "setup_" + safeName(gameId); + name = out.isEmpty() ? base + ".exe" : base + "-" + out.size() + ".bin"; + } else if (base == null) { + base = name.toLowerCase(java.util.Locale.US).endsWith(".exe") ? name.substring(0, name.length() - 4) : name; + } + out.add(new InstallerPart(url, name, f.optLong("size", 0))); + } + } + if (out.isEmpty()) { + String url = inst.optString("manualUrl", ""); + if (url.isEmpty()) url = inst.optString("downlink", ""); + if (!url.isEmpty()) out.add(new InstallerPart(url, "setup_" + safeName(gameId) + ".exe", inst.optLong("total_size", 0))); + } + if (!out.isEmpty()) return out; + } + return out; + } + + static File installerDestination(File installPath, String filename) throws IOException { + File root = installPath.getCanonicalFile(); + File candidate = new File(root, filename); + if (Files.isSymbolicLink(candidate.toPath())) throw new IOException("installer part is a link"); + File out = candidate.getCanonicalFile(); + if (out.equals(root) || !out.toPath().startsWith(root.toPath())) throw new IOException("installer part leaves the game folder"); + return out; + } + + private static String partName(String raw) { + return raw == null ? "" : new File(raw.replace('\\', '/')).getName(); + } + + private static String safeName(String raw) { + String cleaned = raw == null ? "" : raw.replaceAll("[^A-Za-z0-9._-]", "_"); + return cleaned.isEmpty() ? "game" : cleaned; + } + private static String resolveRedirect(String url, String token) { try { if (url.startsWith("/")) url = "https://www.gog.com" + url; @@ -452,7 +569,7 @@ public final class GogDownloadManager { return null; } - private static long downloadWithProgress(String url, File out, Callback cb, AtomicBoolean cancelled) { + private static long downloadWithProgress(String url, File out, Callback cb, AtomicBoolean cancelled, long doneBefore, long planned) { try { HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection(); conn.setConnectTimeout(TIMEOUT); conn.setReadTimeout(60_000); @@ -468,7 +585,11 @@ public final class GogDownloadManager { downloaded += n; windowBytes += n; long elapsed = System.currentTimeMillis() - windowStart; if (elapsed >= 500) { speed = windowBytes * 1000L / elapsed; windowStart = System.currentTimeMillis(); windowBytes = 0; } - if (total > 0) { + if (planned > 0) { + long shown = doneBefore + downloaded; + cb.onProgress("Downloading: " + out.getName() + speedSuffix(speed), 15 + (int) ((shown / (float) planned) * 80)); + cb.onBytes(shown, planned, speed); + } else if (total > 0) { cb.onProgress("Downloading: " + out.getName() + speedSuffix(speed), 15 + (int) ((downloaded / (float) total) * 80)); cb.onBytes(downloaded, total, speed); } diff --git a/app/src/main/rust/stores/src/fetch_core.rs b/app/src/main/rust/stores/src/fetch_core.rs index e0c10112ca..f019734405 100644 --- a/app/src/main/rust/stores/src/fetch_core.rs +++ b/app/src/main/rust/stores/src/fetch_core.rs @@ -1,7 +1,8 @@ use crate::fetch_tuning::{ budget_admits, connect_timeout, inflight_budget_bytes, retry_backoff_millis, AsyncFetchError, FetchFailKind, BOOTSTRAP_WINDOW, MAX_CHUNK_ATTEMPTS, NOMINAL_CHUNK_RESERVE_BYTES, - RATE_LIMIT_COOLDOWN_MS, SERVER_EXPLORE_EVERY, USER_AGENT, WINDOW_BPS_EWMA_ALPHA, + RATE_LIMIT_COOLDOWN_MS, SERVER_EXPLORE_EVERY, SERVER_FAULT_COOLDOWN_MS, USER_AGENT, + WINDOW_BPS_EWMA_ALPHA, WINDOW_COOLDOWN_MS, WINDOW_DECLINE_EPS, WINDOW_ERR_BURST_IMMEDIATE, WINDOW_ERR_RATE_HIGH, WINDOW_ERR_RATE_LOW, WINDOW_HARD_CAP, WINDOW_IMPROVE_EPS, WINDOW_LOG_EVERY_PROBES, WINDOW_MIN_FLOOR, WINDOW_PLATEAU_PATIENCE, WINDOW_PLATEAU_REARM_MAX_MS, @@ -607,6 +608,10 @@ fn classify_reqwest_error(err: &reqwest::Error) -> FetchFailKind { FetchFailKind::Timeout } else if err.is_connect() { FetchFailKind::Connect + } else if err.is_body() || err.is_decode() { + // A truncated or undecodable body comes from the CDN, not the request. Rest that host so + // the retry goes to another mirror instead of reading the same bad object again. + FetchFailKind::ServerFault } else { FetchFailKind::Other } @@ -663,14 +668,9 @@ async fn fetch_once( } Ok(None) => break, Err(err) => { - let kind = if err.is_timeout() { - FetchFailKind::Timeout - } else { - FetchFailKind::Other - }; return Err(AsyncFetchError { message: format!("http body: {err}"), - kind, + kind: classify_reqwest_error(&err), }); } } @@ -1150,7 +1150,7 @@ async fn run_driver(ctx: DriverCtx<'_>) { Ok(Fetched::Body(body)) => { let raw_len = body.len() as u64; meter.record(done.server_idx, raw_len); - sched.on_success(done.server_idx, raw_len, done.elapsed); + sched.on_success(done.server_idx, raw_len, done.elapsed, now); window.record_ok(done.elapsed.as_secs_f64() * 1000.0); if raw_len >= done.reserve { in_flight.fetch_add(raw_len - done.reserve, Ordering::Relaxed); @@ -1172,7 +1172,7 @@ async fn run_driver(ctx: DriverCtx<'_>) { } Ok(Fetched::Streamed(total_len)) => { meter.record(done.server_idx, total_len); - sched.on_success(done.server_idx, total_len, done.elapsed); + sched.on_success(done.server_idx, total_len, done.elapsed, now); window.record_ok(done.elapsed.as_secs_f64() * 1000.0); outstanding += 1; if txs[done.idx % txs.len()] @@ -1335,6 +1335,7 @@ struct ServerHealth { samples: u32, consecutive_errors: u32, cooldown_until: Option, + fault_until: Option, } struct FetchScheduler { @@ -1412,7 +1413,7 @@ impl FetchScheduler { }) } - fn on_success(&mut self, server_idx: usize, bytes: u64, elapsed: Duration) { + fn on_success(&mut self, server_idx: usize, bytes: u64, elapsed: Duration, now: Instant) { let secs = elapsed.as_secs_f64().max(0.001); let bps = bytes as f64 / secs; let h = &mut self.health[server_idx]; @@ -1423,7 +1424,15 @@ impl FetchScheduler { }; h.samples = h.samples.saturating_add(1); h.consecutive_errors = 0; - h.cooldown_until = None; + // A success can belong to a request that was already in flight when another response from + // this host failed. Keep a server-fault cooldown until it expires instead of clearing it + // early and sending the retry straight back to the same mirror. + if let Some(fault) = h.fault_until.filter(|until| *until > now) { + h.cooldown_until = Some(h.cooldown_until.map_or(fault, |current| current.max(fault))); + } else { + h.fault_until = None; + h.cooldown_until = None; + } } fn rest(&mut self, server_idx: usize, now: Instant, rest: Duration) { @@ -1436,10 +1445,18 @@ impl FetchScheduler { let h = &mut self.health[server_idx]; h.consecutive_errors = h.consecutive_errors.saturating_add(1); let mut backoff = retry_backoff_millis(h.consecutive_errors); - if kind == FetchFailKind::RateLimited { - backoff = backoff.max(RATE_LIMIT_COOLDOWN_MS); + match kind { + FetchFailKind::RateLimited => backoff = backoff.max(RATE_LIMIT_COOLDOWN_MS), + FetchFailKind::ServerFault => backoff = backoff.max(SERVER_FAULT_COOLDOWN_MS), + _ => {} } - h.cooldown_until = Some(now + Duration::from_millis(backoff)); + let until = now + Duration::from_millis(backoff); + if kind == FetchFailKind::ServerFault { + h.fault_until = Some(now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS)); + } + let current = h.cooldown_until.unwrap_or(until); + let fault = h.fault_until.unwrap_or(until); + h.cooldown_until = Some(current.max(fault).max(until)); h.ewma_bps *= 0.5; } } @@ -1806,6 +1823,7 @@ mod tests { use super::*; use crate::fetch_tuning::{ FETCH_INFLIGHT_BUDGET_FLOOR_BYTES, FETCH_INFLIGHT_BUDGET_HARD_CAP_BYTES, PER_HOST_CAP, + SERVER_FAULT_COOLDOWN_MS, }; use std::collections::HashMap; use std::io::{Read, Write}; @@ -1900,9 +1918,9 @@ mod tests { let mut s = FetchScheduler::new(&hosts, 2); let now = Instant::now(); assert_eq!(s.pick(now), Some(0)); - s.on_success(0, 1_000_000, Duration::from_millis(100)); + s.on_success(0, 1_000_000, Duration::from_millis(100), now); assert_eq!(s.pick(now), Some(1)); - s.on_success(1, 1_000_000, Duration::from_millis(500)); + s.on_success(1, 1_000_000, Duration::from_millis(500), now); assert_eq!(s.pick(now), Some(0)); s.on_error(0, now, FetchFailKind::Timeout); assert_eq!(s.pick(now), Some(1)); @@ -1911,6 +1929,57 @@ mod tests { assert_eq!(s.pick(now + Duration::from_secs(6)), Some(0)); } + #[test] + fn a_server_fault_rests_the_host_for_the_other_mirror() { + let hosts = vec!["a".to_string(), "b".to_string()]; + let mut s = FetchScheduler::new(&hosts, 2); + let now = Instant::now(); + s.on_success(0, 1_000_000, Duration::from_millis(100), now); + s.on_success(1, 1_000_000, Duration::from_millis(100), now); + s.on_error(0, now, FetchFailKind::ServerFault); + assert_eq!(s.pick(now), Some(1)); + assert_eq!( + s.pick(now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS - 1)), + Some(1) + ); + assert!(!s.eligible(0, now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS - 1))); + assert!(s.eligible(0, now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS))); + } + + #[test] + fn a_success_from_an_earlier_request_does_not_clear_a_server_fault_cooldown() { + let hosts = vec!["a".to_string(), "b".to_string()]; + let mut s = FetchScheduler::new(&hosts, 2); + let now = Instant::now(); + s.on_error(0, now, FetchFailKind::ServerFault); + s.on_success(0, 1_000_000, Duration::from_millis(100), now + Duration::from_millis(100)); + assert!(!s.eligible(0, now + Duration::from_millis(100))); + assert!(s.eligible(0, now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS))); + } + + #[test] + fn a_success_keeps_a_longer_cooldown_than_the_server_fault() { + let hosts = vec!["a".to_string(), "b".to_string()]; + let mut s = FetchScheduler::new(&hosts, 2); + let now = Instant::now(); + s.on_error(0, now, FetchFailKind::ServerFault); + s.rest(0, now, Duration::from_secs(30)); + s.on_success(0, 1_000_000, Duration::from_millis(100), now + Duration::from_millis(100)); + assert!(!s.eligible(0, now + Duration::from_secs(29))); + assert!(s.eligible(0, now + Duration::from_secs(30))); + } + + #[test] + fn a_server_fault_keeps_a_longer_host_stall_cooldown() { + let hosts = vec!["a".to_string(), "b".to_string()]; + let mut s = FetchScheduler::new(&hosts, 2); + let now = Instant::now(); + s.rest(0, now, Duration::from_secs(30)); + s.on_error(0, now, FetchFailKind::ServerFault); + assert!(!s.eligible(0, now + Duration::from_secs(29))); + assert!(s.eligible(0, now + Duration::from_secs(30))); + } + #[test] fn window_shrinks_only_on_error_bursts() { let now = Instant::now(); diff --git a/app/src/main/rust/stores/src/fetch_tuning.rs b/app/src/main/rust/stores/src/fetch_tuning.rs index 4f1f7074f9..5c380d537b 100644 --- a/app/src/main/rust/stores/src/fetch_tuning.rs +++ b/app/src/main/rust/stores/src/fetch_tuning.rs @@ -68,6 +68,10 @@ pub const SERVER_EXPLORE_EVERY: u64 = 8; pub const NOMINAL_CHUNK_RESERVE_BYTES: u64 = 1024 * 1024; pub const RATE_LIMIT_COOLDOWN_MS: u64 = 5_000; +// Long enough that every retry of the item (5 attempts, at most ~4.5 s of backoff) goes to another +// mirror after this one served a truncated or undecodable body. +pub const SERVER_FAULT_COOLDOWN_MS: u64 = 10_000; + pub fn retry_backoff_millis(attempt: u32) -> u64 { if attempt == 0 { return 0; diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogInstallerPartsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogInstallerPartsTest.kt new file mode 100644 index 0000000000..e60775b0e3 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogInstallerPartsTest.kt @@ -0,0 +1,90 @@ +package com.droiddeck.launcher.stores.gog + +import java.io.File +import java.io.IOException +import java.nio.file.Files +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertThrows +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class GogInstallerPartsTest { + private fun downloads(json: String) = JSONObject("""{"downloads":$json}""").getJSONObject("downloads") + + @Test fun everyFileOfTheWindowsInstallerIsKeptAndThePartsAreNamedAfterItsSetup() { + val parts = GogDownloadManager.installerParts( + downloads( + """{"installers":[ + {"os":"windows","language":"en","files":[ + {"id":"en1installer0","size":1048576,"downlink":"https://api.gog.com/products/1947927225/downlink/installer/en1installer0"}, + {"id":"en1installer1","size":3786407936,"downlink":"https://api.gog.com/products/1947927225/downlink/installer/en1installer1"} + ]}, + {"os":"linux","files":[{"downlink":"https://example.invalid/linux"}]} + ]}""", + ), + "1947927225", + ) + assertEquals(listOf("setup_1947927225.exe", "setup_1947927225-1.bin"), parts.map { it.filename }) + assertEquals(listOf(1048576L, 3786407936L), parts.map { it.size }) + assertTrue(parts[1].url.endsWith("en1installer1")) + } + + @Test fun explicitNamesAreKeptAndUnnamedPartsFollowTheFirstSetupExe() { + val parts = GogDownloadManager.installerParts( + downloads( + """{"installers":[{"os":"windows","files":[ + {"filename":"setup_witcher_2.1.0.exe","downlink":"https://example.invalid/setup"}, + {"downlink":"https://example.invalid/data"}, + {"filename":"readme.bin","downlink":"https://example.invalid/readme"} + ]}]}""", + ), + "1207658924", + ) + assertEquals(listOf("setup_witcher_2.1.0.exe", "setup_witcher_2.1.0-1.bin", "readme.bin"), parts.map { it.filename }) + } + + @Test fun aSingleManualInstallerIsNamedForTheGameAndSanitised() { + val parts = GogDownloadManager.installerParts( + downloads("""{"installers":[{"os":"windows","manualUrl":"https://example.invalid/setup","total_size":42}]}"""), + "../game id", + ) + assertEquals(1, parts.size) + assertEquals("setup_.._game_id.exe", parts[0].filename) + assertEquals(42L, parts[0].size) + } + + @Test fun installerPartsStayInsideTheGameFolder() { + val root = kotlin.io.path.createTempDirectory("gog-installer").toFile() + try { + assertEquals( + File(root, "setup_1.exe").canonicalFile, + GogDownloadManager.installerDestination(root, "setup_1.exe"), + ) + assertThrows(IOException::class.java) { + GogDownloadManager.installerDestination(root, "../outside.exe") + } + val outside = File(root.parentFile, "outside-${System.nanoTime()}.bin").apply { writeText("x") } + try { + Files.createSymbolicLink(File(root, "setup_1-1.bin").toPath(), outside.toPath()) + assertThrows(IOException::class.java) { + GogDownloadManager.installerDestination(root, "setup_1-1.bin") + } + } finally { + outside.delete() + } + } finally { + root.deleteRecursively() + } + } + + @Test fun anotherPlatformOrNoDownloadsAddsNothing() { + assertEquals(0, GogDownloadManager.installerParts(downloads("""{"installers":[{"os":"linux","manualUrl":"https://example.invalid/x"}]}"""), "1").size) + assertEquals(0, GogDownloadManager.installerParts(downloads("{}"), "1").size) + } +} diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract b/tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract new file mode 100755 index 0000000000..217878a368 --- /dev/null +++ b/tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract @@ -0,0 +1,7 @@ +#!/bin/sh +# Runs DroidDeck's bundled innoextract with its own boost libraries. The guest's +# env -i startup has no LD_LIBRARY_PATH, and the rootfs must not grow a second +# copy of boost for the installer fallback. +LD_LIBRARY_PATH=/usr/local/lib/droiddeck-inno +export LD_LIBRARY_PATH +exec /usr/local/lib/droiddeck-inno/innoextract "$@" diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/innoextract b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/innoextract new file mode 100755 index 0000000000000000000000000000000000000000..ef18119f427a3f9acd112d58389079ff855bb99b GIT binary patch literal 793704 zcmeFad3+n?wfOy5&Z0mdDhWX>C33dbl0bIy6z8I89zU4DtHs;XMxt6JPIs^ItRHuud4G#UsdPncN6W`@49}nZt|xE zKj-hu;WPQt?^0I2LNE2Nk-uO5_EGjRe}Cdc8w>re&-*txPue-zmj?w`;(1Pf$^MHH z)bIMd^E*3MpWnIW1Dze+>k}VnYwL~1mMl82ujjm4Rc|RLJ$UIAAGQ_9cu%)~Q=iX) z-zAfuKlrDwerMVBO@D1#cHGAv9$sH~>>Nu9?XK!up^z&{B5eHG+ybl?LH z{0qPTHuxBmpRB^<-offxapw(a}M$;2mU<={+I**tpoqN1DBmgB|lsMyprFpbKsjC z^lWk9Uw6>6-9i3G4)T9@;BPzd1a#_^>h&uJ-U6LnCI8$Dypo_z#nkn(_#3pWX}TNmCC)`LB7pFeyfB0fCK-! z1OJhOe#=4rJqPZFX-=j3)&Q?m-#Q20=%D8#4t$*hzs-UFz=0PW_X5mmK&}vntzvxdU%^ z;2VHf%FoXNuhcIMI_SCEfq%z=|Ca+Fao`U+@W&kZuO0aF4*YMxEBWD72l;B4uvf~T z84i4o13wpdrE-@!$PYU3VF&)-4*Wp}{uuB|_Wa6$|JFgzvkv?WP+rMzwZJQt`%wq^ zbq+k?z_&Q?0SEpC2mWOT{&fd_uLGYAPN?LE#~k>t9QeBq{OsA4_5ZsA-|WD*Iq=&Y z_^<=F9QYZqu&v~WX5iqu1724<@J~AE+2+7g4m{_e|HR`f+xZCx{&@%fbKsTgwZ}nz z-rUOamjJKiw;l(6zXSif13&hJ%K94}_|*

A-*L!1E5g##`B*%?^A3cqKpor-S@s z4*YEgUJLt5mHgk~z|#)=F$eyolPcT)67Wjpo(da(mH4?1+;HF@b>MLa{#gfpj{|=X zc%`_UeM)8iQ3rkl@JjW)*Ma}aLC$8q%cmXqF{f9SZ*t&Yci_{{sH|t51Ha9I zKkLA~XI9p~(t-bn1K;JqPxDvSA9dir241Nh%{{BKp7jp=Zw~yVvn%U~I`BU^@Q<8R z+0F+XcI=pLO7G zIPecGs;uXB2R^n$2{@c(m)reVQ;5pcsf){kB_Um=%A8N#0;du%+ z5a88p|0~2?h@<4Kzg2ty`IR3~-2aT?klywy2>qdyPwY}Wf&5+Ye~p+8*QXTM`hT}r zu3L{0kxj6X4zKMf|99y3q@9D$DmyPiekIgb%4atyd9B9+ze%3{jN(DKP9R_BK|g8N z>vyVLm>$@#Qmx{VUzPLKXn*Yaayzpyj!QkE=M;zKlKl!pp4c4qXnwUVKT8;IDElD| z?AOk7mAv_6x&E_!l7l?P1M$)|nFZ$-=#aIgJ3(XQ7l5y5h2BflN<%^#wERmkW84*}vNM+guT2^?d>q z%5u${m4EI*J?EnzvaDY^*KVh?L^G?`OV}UAu-!qkwO{vQe9fDb{!`#OmVDiWdi~_ zxVo*cBN|@Y*WcUT*0mxEs5TmF>kaq!wsrLPt%x=?sq4$;yh zY-MZU?TS_XOT*!4B2imgTd!32fa;F!bYLlfj);4XRC7oBdM5*nsU8EFs9MnkL zgbrmw?ZV#m-TfV1?cw&`-kx4i9l9)9uDn)B*0(33?eYGOp6=y!P`)(1EgWs@>tqO$8?2(GgoL8sntbA7~EXr%Ob)YiZ(+zU# zqx~x`UtQbO)U*L=+Xebo_1A$d{juJjjZplWa9eM0+oo`L`^Io*d-uBj81r}i5t^_V zOz3ToceX{_!IaK5O`&L)v_P5w`A}Qev%Wvvvo_q@*1fLXc5~b6p5A_CU~NZFpY0pz z*50<>P2rC2j{b7X7S;)LB{U+^2Ay?~YKacpq5~9QSrb-4Mx&)IR{!{qQ9rJXJdOWoZPYkukVH|j5gJEtdRwPX|=V`13?F4H$<#Q%Zk;i^hMeiG(*B`yZXU^>&x0lUBFh? zvv_Ui`o0+Yva?V2V7$9pDcz_1(4#w@mT=Rm#bMB@jM668PO_ENLsrQwSl2DxzDQ+A z&%*fn{-z_;SR0sVG)-N0b5W*YrwOg1QtX-*M?2fwdYhn%b>S7za^R<5_EEO454T#i zizbW+!yp2NbjkY2oQ8-TnNsPiuJzI=TCX07JGy0ttyt64v~pEXOL+&VIv*<5rNtoE zT4<6V-ngO?y*3zLxf;f__I9u$+S}gM-rXMpFHYd`PMTGF@=Z$i?tPoOqq6@~-LGuy zn1j0Vl?K=f8QT(W2|&&+ft+2nFx&|?wOqBT{}9QcED!1)Rkt=cQ8$RS9i8nC-Gbd- zq3;?`qRCf$Av80)NlF`QC(eTj#lZ?2?_-zCp$a(v z3J2*!#+z%$;=cCwYu7b(f(z70wF-{cbjX>5JuTI}ac}$Tw$8S0m^!ZQ>4mDnEZL!7 zUWqfajzzFik&{f>jILPKvv^}~2Mjjg5DjF}@rp%Xu}T{TW8B&}46?P*@Va10Bi+`2 z7GIfgMi@nWSVrA@fZd17!qZ=GV4$}>;rHzfS5)H_e z=(;E@#MJHJc3RbwLEfIsw!vxR8MfLXv0$2uxizsAfC;Qz*1$9tosCO`iGYl+In-QN zbpWtn?CiL{U96Xj&+fjqez6|rJod_<|9bdE;6c~5Qb5Rm)^&-Eu+olqtPzlp9f@#X zylrDQEOo+t-Emkr_pc2{W7i5;Ty*sIbOVN&bazkKZt1XW6&M_xx zCsrSJxXV^!D%#_@#d^t&T9HL_4T)R zEm2zpbwTJ8+oSzGa^VX-ZX5hIF+*)yc?BeAZ3UU8&=sq~OO&eGfT~>-Iv=|SJG|1y zcMlFynjDt{;YIPb{#cW3($WdDd+hC#K50>HxNh;p2jlgLxAnGl*#ebKmfo}%_g6St zURw)#!9(!V6<^cY6tbJ;tOL={^Qgx`)de^`#``{ft6z z^(w($N|Q;7-5d{cUXzgPVL6u#t9-Y+DX6;&N64t>FYRrIUVj5DJk|M=+BiJ;Kn^3@WOg6*pgf7X*GFUR z&;dc_*s}+ve-6RPBSNE%hEMH(1pR=V|D0~&<0q(c62m_E|I^$|4r~SNj;0();EN*KG;38C(wGZpVYp=;`M7`15!`QCS4Yo31#5|q2h%2z|;<-I>#^?~VFMahG-Lb&!IPm{_f z6-`?htZCl^j50hP(QMRw!B*Wq$ zTd!qxp9qTzXYn9NcY;c_z0XU>P)yXzX*7Z4#w6k>{}0; zeI5PlVY`nwxet=%NK!=h8IB3-V8g_?Fwt6h6&>6*?h@L%A>9vfV}V$6T^qmz>*?*Qt5a*MwH>{1*F{e>y1uu!9k!P3 z;Ho}B2F$60afp{aVLp=NSXCc}|H-Op5@D*XgLxp_d(s8T**|`jLGG+9xmNCh+FR5U zd2^(B;OK*jSs?de|1UI;HfV{xZPEVlhPK|0w$-pR2KUp%I}-nc!W=@o1QtXcYhgsN z_pTO}l_yi&$sLRPU^`BwPas?uP}?{5D6>WnOEB(KR!e3b2gDr*`=!yYHFC~hR|f-l zSnmGHZnCXY>$V*c2rmpA_z`S2^+kI-?4j{sHQ*&JlqKPaTBZXhp7oVJJBWvB%blsW z#~tEusG2NnTVwBv9IVY8O2;8gsI62(yIfez*OEE)0YR&HCX{x~H3#ueU8Ul}u=Y^* zIYnV7^Rj5j-d(L-WOupa6P)s$k^{_{l;*O{mIG8&tWj+(1VN{WT4*~&v*PJT+*cgb zjTMWktL=gmRtp{3jPS0ugEfcR+J3n=1=~u{%>FO*Gip;`w`;Z4(!bkH-W_o4vM><1rF0syGo^-Grg_{)M zO70=X80Tq?<3w`YhrF7HKBIy}nd5l2Ppmp%wQ~fkNvV8%akXUpE)nR#>|2EcaGwlx zVKBvDE2=|_YONEOeC?Fc({hH7XenIgnL}Ho!%|+fZX*X?1%;6bt}KSzI$`G>mX}?9 zwYBm}sa#%$H!Q?ykh=N^mN@Hy?P+<%wd{l=x=>mhP@2FbHB9J>pGT%`5!@jL(|Nc% zunPvNYs>6|P1z$;dVtUB*UA+_Z%+@*C8ay4tO| zr#O^ykg7Noa*#6|$~ai%9SS+vDXf&*O0i~YE6F&w*#p~tK<-4h$-5=Xn?78|IB4rX zKvNyGV)eCz_5|F6(Rul8;lwRj_Kk$> zQ+5%8h}hr5YlMHN!gul9@NR!2aFzMHfbfYXAQ89EE9QurTL)Ke6Ej>#xn{WD=dJPv z?`rck&-~mk{Ml1_KGAH>@!mLP%4wz>zJKU(C#6!UZ@T_|pVW)L&xH45@%LHy{yuz{ z=gDWj&c@?8@IDuQPK2LRkj;a4AN49e&P)pR?fSZ1_1Be&p*sct0P00(dN0 zE&g5y?+fwwMex2De_w*{Qg$i)F2DEvLHN0l@QdL0i}BbXd>Q`UfbWg)ekuGk{N{~y z?Ptth{l#UUxqjaFdPB|s=f7GS_HDfD$~!;s?)O%2`OrV^x~}E6`VS6=)_-ek{f2cH zZ@G5m?r(RVxa!HA=fB*?t$yUX`!5d^e&}EDlcyiQ;r(Cx?rrBTn|bdqlRsEB?_d9Y z_bF%n+nMfb-CMu%=)I?%_2WX*`7=&l@uTLCeeb^U(F zrt>!X-`o7-6HflYf82fckM8`(YY(>WjGT7Ov|ZPJ)t2ZR_qHrUVZJ> z{U?8L=jR{4{gf|Wcm9;KFYEft<9%mtZ{PIvA3t=)nU}V#{namC-oNhjjoYu9F>C71 zp6kDQ=cC_Rx9+RgUHq2y%&xlRA5I>e@BXhjm+t@8F_*k@!&O)L5}O`H=JcPG zaf_+=xwOIs$1Z4AvVQbGnRzbx4}5aG{h!jW>Lw-SC-T4Ymu$JRPU@v=r6ebOAZsZ7 zBR~KDU-FsTE+L;4Aiw7dW95nPG};w~wpEr?E{-dH8Dcxcq1B&!-6a{cNdY z#6F%Xz9A3bRRx-Q;awhD@Y8?R7a>H`#9CwSYw~syIk9hpqEoZ@*?-M@*ugK3gJ^B5k<&#EQ;9vQwg8$wk4SfDffbj_OAmeGQZ!_a=d@e(Xajn0VajieXxYi$IJcGw^ z#*N=7eT8}PA>&c@Y zi^*qiP^Nd@MEBPYh16Z#3MR~p%FDrRB<5$atF}ysCXR*Fs&VR4;_!-yb1{h!dl#&lJ zZj32zaE|p2F|PHuGCqp>BaAytq?`7Ql6D$be z6<}P;w>of>@iEjt!1%WFr`!6IjNh|d@j=G5JsHNe{t?ErHA+vG@$?eK#~9aoEXMEg zEBQR*=?fJvGH&7X@5Ih>KkIn888`o+{On=e$}8?=Jd5)LALEhdmAv192OPM;xbX*N zcQfPK{t)BZ{#M2X+8<$D+aF_G+aGt}2?svFcq`hUWL(=n$hfvY&3HDX;yc7S`ai?C zwtvKdXB~Ks@%)R*|6`16`z^+`{dvYCe^&Mv7}x$UGOq0xPq4hjymC8mFXQ4Rb-s^r zZNHy!ZGV7q>m_A>ka2Cl!ML`+*@1@~c!Y61UyU)Y=c{qX^?WtKxSp??jO+R80ONYT znq*whR|gr_^VKxtdcHcu_$|1>m0>)Bf7ft?aSP?Mj2qXg`Nk;Y5#%|>P2^*Yr;%HX zXOZU_w~!YY7oEzUBI5>ff%^e^y%|C7X52*XVLXl8%Xk*Kk8umRpK;Np>l! z8DL!RrzIKJ`)O&$^>avv7}xt|Ba9DWeY1>baa}*kxTW_8aGk3Csh^)a#JGO`?+D{* zeBNu0@hozS@gnj92N>7S?Hy!X>ltEP zKd*L#acyUg@zAp>|1HL~{sQA3TrUfJuCMlw*6(FpKS$foxYi$JTtAn&nQ^T@!nld{ z#Tbti)Ve9oc(Y&ilL^Kx`G+LoWisx2M)4%$y4*p=*ZfY&rx{P9o)N~io-E^e)HBNX zxw!5gV|*0-U@;zfSJ{(ieDECQhXUi`uS&kixKI8;O?bKS`O-S>x?B(AChGAro<==> z#*O_-zrncH-^{r9o01PPe%e12k1(#EFCSyvEGhXo<9_r{f^qXNO5Wrg?MX7O%N=A~ z`)#*3&oz_=fu zbKT6ie(roL9>L=z<4KesWIT??LyY@gRr*I5*Vij8#*-+YXFQF^MaJ_e@4@S7Ixd0NRJmTp z3wXYt@gbBCFz&`n7~#UO0*vc=H8Y;aazl*kawCjK z-cs?3F|Oqkj2BSe4lu6cm}FeXagcEx$28+Qjv2;ve?G!^_G-*4#?#j*KFYX`;~3)xwnvL`AM!lo z7PbrVLV2F}cB^*bVO+=2$9Q^p1!t*KzbSuHzVBT*uL1Jce;>X59QM z<`v`dbJcZ|R>pmQRPqtVjlU}%XIz(?VEh);V=|sWJ%fyEJ!!@T-gh^|c;Fw(o)N}J z(GOY1%~P@e;e4LrImXkL(r+tKE@+Bp86R#kp~zz+)95lU_u|cQc;H^Sz80 zQQpV+D9Q&IH{MqE1Q{Pg`DVrwC?8=wi9E)*_Gf}|_dBXwlkrwOPBNZA`9a3D{vpOa z?<)Nn#s}~?%Xk{)M;X`p#~AnTQ~E8&NAS47cpBx4jE8U^#*OzQ>$v;gQ~EuOYk42z z2I}=Qo_#^}=K;nopmADIQ^5uRG$LClX{C*Xxc^#*M!y{W-?o^WFuH%?yT*q;UaUI7D<2sHbjO#dN8P{y`6I*tR3>o_JE*KtfUp2qe##QALHhYaJ{If{=kuH!h$xQ=6v zaUI7o#&sMEjO#dxe0iSeIC>b@ar82- zj;)OAIK~*yVI1R(o3m8B5}bP!HyPJ)Ofqg^yBlO&R4F}a#?AdIpGO$?y{Pyo<2sIG zjHlmI@)qMdj(N^;AEUsyj$@H=9Y^uk^1QOpemCP0jH8Ef9Y-(YI*vZZbsPhXCmvVx zt03cg-Pg>x?{CWP5aZ|mMER|iaoHWZ z#CYU8ijOcp^gYG1jNfvv;-iee_-(~=jGHJw#&{aJ#dtH?pJzOa@&(49Kwf0rKrS#o zdj1?j?qPfgVYvBCHV&fA+A*Xy-b#=ZNM{s`kb595p*D4$?l z%MUOfL-{1*T0YJA0Ll+BuKhE@coF5Zj1S^*j`3D_wwip6F|PIJ8PB17f$>p17JJM4 zlVFw7?`B-<_cESAc^~6N)E{8n>r(oIjBEYPjHgjP#JC@iBaCOT+!*7LPpJMs&Ukh; zjysG;LW&P?{xQXqjGM>@8Bc#y$!8dktWZ45InLX2jAvVw{21fbC5l^&>wU#MBmb`K3^JZ>Q`}(O{5Qoz zjHj_)t&C@pM;I6A{{-h(DE$MB>v_T;d7)5 zLHkD;&!T*eaUI7o#s!vZG44ZNVBCZGRAfAIwX$FQqdc$7h~jR>(<>GCGHzkKe2j~a zD|tWTk*gFp7*BU79%5X_F~Yd{VI?19+=u>*bB^sj!MKHfGZ{Bf&j90Dv_Hvs1my=A zH}w8L<0h6n#CRI{2;&CEG0S)a{XEKfSotT%Io_vaG44Y>dBzRo1;*1YO27M`<@qBn zSKQ0Ej-#LP>?$Q6U|i4JgPiN@kBsYido$yD-X3CHVE(jnj&Y1IuG?dbaXoL3Gp^_D zCgZ_sHU17Vp1|WYp?wg|goMv3>&oZv{j4|Gfdh(2GJw?X-c7Lw#~9asi!<)qqvD=m+(4dWT$ek@xNo=8lV;pNKEk;6 zPnPjC%8xRhMQ$-}pda##n|WnVf$_9_P&K@Yj9Y(J^5T{9c!`4I9>#UKUdGq_MalaZ zH&IWJajnN-Jdb*s8K3!z(%;JX0Qw=qcpBwnjDJl&$Qxd9#d7)5_`A}dV?2j`7-QV`mXfy^AH)Zk=NUI%Qt}1HBmY!f zyjq?ox?DHokD?wA;}+`iGp_Xn7;nb>3^LyNva+X{aWCd~i1EnlO1_oxBtFzV!gw0{ zff(ai^nZeJU9QRaX)mgB2N*a0p?I2ct!IewA=Hy${0Y>PWxOy=_5Yza%Hw6oht$Js zh;i#E`J`$gGK{CsQ#{9bwn=@DX^inW>d7-+LOn&s^C<6ov)s-hGztsO$xt-|@exHtUa|t|t8eVbEUsCc3#&c+o$+$p2 z=Q$rxdWwu&pH}6HV!55U?<($Q{E4eoeSM4<&>lbIk@Ijrjq`t1_5>NvA~zWKU8dxl z8Eyen?+Ge< zMi@8OD4u0}=1#0HEzY?rDV7>hB zme(u$F%_2pRP)~?)v0llyGJftyRQ^O5@BEs|^BCjlb|s%+JaV;? zHyJ83~5mmgvxVcvG zBIC(VDK7Sv$I*AY^0S-q@7}KDJ&YTzs=hwPt&b}1XWTca^aL0;KcRS#@${E4PZ&2g zDEVf_*L+XOhZwhJD}S~!p8cfa5ysOWRr+I`qd((}H-A%=n_%3CD?KLTzAKb}h8Tab zQ}qv?_sZi^=vBO#@$_=6FXO&%EBRK&NAFcU#<7OK+?SOZGvgWLA;z=FBaBo5aV&=8OD>yM;ISMo@G3Xe3bDqKb0_`s{ z?nW-E%k$ZX+|9Tjxrgxpav$T($o-6mkOvr#AP+JgLvAo0Oez0_7#~3SR>nt@N) z1B}O!2N@qgZZMuk-pu$2@(|-=$XgjNAdfKazDw0N#<(AOoN)trg7H@5CgXAB1B?$K zPclA)e30=`L&$xM$B_FOH<1SzA4DExJcHa|JcqoQ zaSM5f@gnk8#=Z9_KSUT0AdfK~LLO&4jy%D561mBE8u<4A4T~B<9Xyo#*4_swDNp*e+%=O@c?oU z;|6js<00fe#)oz&{Q<_k$b*arksFMMkT)|PM;>B)5P5`g-w%~NamMw0FTuEldQ8Ui z$OjlNB2O|du-rk$-N@67dy!`t4BG^ZZO`AyqWP<a4ry0*8A7VU*Ji~Y%`3U1h96|13+(hnWd;qzR@j>K%#)psx7JT#=Q?K``t6j{TW2=W4sx8kntGu z5aR>LV~h_XHyIy7KFIh8@(kmn$VV9;LvAsiM_y#Sh}?tMqx3#}8o!_7Wjur2$9NXG zpYfdjo(to7l2Eb zjE9ix`$4q+X5>jGZy+CJJcvBacmVkj<9_5B#(l^~822L2GVVb>%D5YOj&Xr}jPWA+ z&0@TOJkNL@d4X{Yd6DsvrolC~^{%`U!yz-t2-hT_v3Y{D#k+&JmJ6xelww8U7=I@GY;HC z>{M4Cm3%X?Q{6G5c#!C!JmSFfM324#C^dPAJmq5!T#))w`O)Vl>Pz|9A1ZV4$I9Ho z`(b3fFw^V`C-A-z$<-Yf$`1(=_oEfE|IOg_St+kFRee~*`?w@OmdN{vo>_!jcz=kL zKaTK0!e{rrBy<0S5<5E?`v@Pz`wXT2 z8o~!ix$_BcCjMDKc!==R2u~A!I^jve&mcTa{BS1W&4l|24-kG9;cmjuCfp+RJ%{j7 z!p|jK5Ir9t+(Y>qQ9Q-B+>IPgtrp@LBdT^-wOy&kal+=;e!r5@Z?0hqw+xq9&+HV z4qX4eblH9{0((4Ylm7c-oa?{4#ku}_Q=IF+f5N%`yBwVBzZb!|{yPSo>%aTWxp-#6 zZ?s-&tj9{qPXIoJ0w zajyT~Cg*O_?x>ymz9%jpbdV1@aD6`%*Q5Uq73cczN^!3L9u(((GOwWaha7m!fybYo zXfISx&VlQ{SI_Oyf7gO@{oDf13(r*wlmdHtL`&h>NGIM>hd;#@x$igW!OLC*E_hd9qW*e~!o za$Mez&r#vrjn6IM+~>f94m{+*V-DPO;QBct+#da$49@j)K{(gXW8hpr=Yw-rp)!|$WIjWAz=4NIUQu~3nU_*-5c!p)+-Aa85gs7Ch43KZA0~W^%vY}> zJWKdT2+t7SO85xjA0^x*{9}X{h@U@B_!!|=6K)ay?}Xj)nryqEAa;eCV; z65daElJNC}4-meAaFevhjg%Al1mSVQHxV8q{CdJ8gl{H1_UyzsdjsKalFy$c+~>f9 z4m?TrnLkDJv=V!^5FR4jB)pmM8wocE-%5Cp@S6w^5WbCYKjEJy+)Map2p=Hv`VYbj zBtHiT_YyyRmU5EkpCdd?^xRB%l9YQ3;Uh%;^Mnr){r^dLf$%R7o+kQ}gbU(_6yZfO zzxpEKNuvKtgnNjdTM2g)ejDKhqW{Z;=Lx@^aEtIk!p8{z3gH7JE_V>_Ch}h;+#>Q{ zBfLoX*9kA+-_4fukZ%y~BkM=Xo5{TBP9mQq>r=`@WF18L0GWqVKI*_n$UZ-n50Y_; z@==l}X=0~%8~YQOZ{J0Dg!uDr!gKFT$bXaYG~xFUK1lezgy)F{e*}9RGE8UsLU+~?!&)RBik3%A0hiHlpAE9 zgz^m8H=sO$&lTtT4SbF?=WcusFy}c3o+0}ZwA@jAejC@5#OLyH-ujQqe)Ey`PW2~9 zTt-M-3=$X0-NgTt=N!0)#D&U-NL(lnkhoBuCUK!WM&d$wfW(FJq65#8xKQ~ti3{Z; zBrcSjBrcRUlekdsA#tHRM&j}SiA#XQh4P{U&yu)Mc|qbrxk2JWxsSw!@+651<*g(x zl>3PPDbG9b42cVsPm;J$K1AX|d7Q+B@*s%|<$}b8@(78`k4Rkn#Q&5R9QX){3zaY8 z-)ocYn(`ot3*}xC7s>}nTqqBbxKQpT{-@k>;6o%XRDOWOh4M6s3*|8q7s>-9E|eD? zxIyCbV-goP@jvA`2R=yRLgmLuTqyUFxKLhn;4u;xDjy(mp}gq8vm`E5et^V<@)(H= z<;^56lzWK(DIas-**{E-M?WEP86f_oJV^XQd4{w{$_oyBh|CXvO3D?_PuTM_ z!rf#(^C02Pgl7r&68;e3al#)ays!_;h57I!gy#u=l;ZG6n`~8Ife@pm?0}qW=md`uzA+m4zJEGrm z;NGVv^i%ne19uZWPZRwCvi^OB@DT@YlKd}|ci=vv=l4YakOPksJ!SF^+(+8=7||~X zf0pnf>3^Ohyg>N#gl7o<1K|n6|44Y8@IMhABm4!zBZOOow-UaK@DSm<32!ER58(#k zFA^Rk{3XHzg#VdvKjD8N+(&qxa4+G1CEP>!-w1aTzL#)8_}>XHlJ)FA2rm%+Pr}Ct zf0^(c;RV7+34ev~5yD?3JVW?vghvQ}op3+lZxHSw{7u5$gug|2p6v4!3AYF@5k5xv z+k{65e~0i^!rvv_L-;!Xt!N6W&Vr z6vFfSRsZRNabNwWN+=NS(S^c$k#MT#;sw=D@7w&~@V;u1diVX})_t2F8hQ{|wmNKg zj|KRwFjW-Z_v)o3&(@1mKG(cw=J~3h)<5=VZ^CDHtIzD?x8e9|M5Re@nw0_j6S_@JQk<(Hldv@xsubC@Naq%;|s>OY~;m0>+Sy9$6 zD@2R*m*-~@|)SE!I?#5nz{fu_(ds1<~4A+6C`5q2;Ar)iZ|W=WoIBTNf<{ zf4Wj{!tc*~qp@T)iqaeK`;KqH?;vBJGt^iTk*d@?z&BqB=YK?$itxMl!G_XX4I*XB zEMH!F27ccGKh~vonaNYki&MKkC}g?G8snnWu2rJ+rMX7wOH;*m>tdr6nJY@y-wpE9 zn};Lc5T#|{zm4-nDYAP?%32EVuBud|8sc#o$Uf{!`M`G@;PYKq!tw4Z``DWPufsQh zp2(?C=2D{+o-Ru3L6?->RXyQn6a8$*4s^POm;-j@YC0QjS*UAH#G#&W-i!P9pJ2hc zRjuYzLYDtQqhwXjxlihR9pXDroVfR)(*Bm$RxN`#G(a30Ar8xj-|1@_-nV(DW31kS zb7j2jSgkRJ?{uBGH+_^HtDLyUj!&)z;v@|4$(6Pba{}UJO?S(9CGB{EUu;_;CKmV; z;+A^`Vkkd{xaD?03}rlRpR1VVWX!DT(}%MVGl*MG#!Wyx#^ZIFD9O)cyuRczNh1k47SsXay?vK#R}iBbA$H0*=@`j)$v8nf%gHuvx3h!B@{nyjcLZ&GqU^FZ z{{LQCz8PY>?7!?>!9EQ7tEB8-WIr}1Em94TOLo3pu)Nd;?M&y@YKWoC(;JVnS+3^t z<)w(s4QR7=+XLUqzDDPT-PXR=Xy-)@oYyAvM9M(EkIO?Fco_2V5%_6<{ER|AMxo5r z(6;3{cTOYuBhQ64@H)KT3Nf^GIJ9@ub@2B7H0DwP+PKUY+3sbZEAt{-9e!pH_`+ox z!}F`fb~*03X1Z=(1AXm+{AO69nP0pq7A@WgV_}1+-gz2~MGfyZerb30{IkVr58q)5 z-`{q@_)!Dn#(ZJGrKIe0!jpZ@m?>_a27Qn|j=-@Cj;ml?lV$GP{G*C}eF@lHCJ?5mL{$+ik{0!QL> zWy8y0t}`F!IydeCpPn!gyBp`J_(UK+CiwiusGQSO?Uix85&SG;CqJ{QPr0uOVkLin zxBBG!=7X$NebRlqs!zBNeDLIa=yUIf{1(v1z+7W{6@0GaDRtBoKKWZ2*Lg7Z3efB0 zG7wu^4&rLd%>p^lH4pTrAy2ffsw(p-`MK1QMICy4tN|Ue@0EJw7+C|lR3H4LdT za6J97-5%ulSpq-H*x3EY9~z*Km;IIdJ~=0P6JjIhMG2UP_`sgy#oU_{pAy4z+}_e4 z>L0vFyfW;9G54)4|NWp#?1eq07F*9K^dVDV&Scb1^k0uQlpefZyz={M^Qrsi-+qTR zP3e@rohL+n#0B#e=>MuA_Exp`zFpvhJ6%^V`j%WfMM_+RIQ?qg(L*gjqka~9Ac;}Vf} z#uf)$GF?$Q?BOG#!}fF+Xej-=&^17U1RA{7&EpRC#I%cE{5+G zBKMFSL&S-x8ecFaeY|h;Plios54H}-m)D_9zXo|EbLI_bzi(Dgz3;7)Md>ZDKMZS* z&w{V+oTB0v5#S?;pN!KkklhXEDqq383hbBqAttYEJMJTIn{ZylHRt9w*9qf3j$E@b z7`bLqQ1&(YJn3V3-kq)!_O6&NS~h@u8qSlky-Ajh@kzT3nP>I2aIQUHd1`q{=FP6^ zClI{iIzFICtOXX<%nn z>a|tVVNKzNHN}i!7<*Dh=(kGO9yR>V$3>|TbniJ|_BZBJGFKO0ZVW?zklF%$+6>4U z+YacnbQ`lk=CuW)Bx9;`LB`ptuCjC4f__ZpW5ak(N&nh5t%3Cj^l29O?zMTs_Oo@9 zQJ)ToC9hxGIQ$jYNjKZ;7g;Xk)Ky@UZ;lZZiT58TP7%k=8xYr7C)|05fIj~jm$><2 z=#%7nT=qv&R=}7oAlC3uftyc;SkLY^N?WSu?j3-(5cy2QupH|k{w>Ra_zQS_KVQ=+;WO&%HkecHh53h$7x!ly?CrdQ@vP)C zx%cx|wChN7!gsQ0q4`#|t+5{3@zOa7qtp-cG-#h00c~*i`9`S<+E@eRUKQl%Ll7_f zGefmqb2s$GLM-~m+GQ8Qq*U%7WNI#$7}IV9|AOB$LL8l%@0IgKvDXLfL$=2%h=J^@ zU_Yk*y^DOq25~-h*$PcqTUb96fK((!3GA@j_>s1yEc7e1 zEzN`Vix=9;>#%k)q1@Tfr+>*c`{u|=#slf<*pkS6oBzmj#-W$ST@mTSTMW}Y}wyZDpbC9{$tVykzD~9J+ ziHy`|kE!MjYu15oWg-!&_jUod#dSo@?eA*n@D|Q_0FbmAggiLD%fP zyP$8DIqHKPzY*4Bay|^XyHl=r_HBMdu75Lp4^r}MwVE5-wmr($KIrpLZOvW)ZRLFJ zJL#{-q|d;2kAdG{O_bXPKA!4T{+n`xYxp4<6Y$@>8>)w;4^N$9UO3OEe0a!MPoIc& z`dFiM)7|q^mE&ABJRal7>8YO`1u=$ovbIy&_25YmV{w{_arQJj#tl^}XY3e@>8Tpu z+|;Lzf*7B4h!}$%M-t;Q->SSWs67P8YxhK5-+(;Hg5T^m+0q32o>Nol&xqnfkWUt@ zkqpSGEbO~&Z8$k4{cGnt^gX^&z<;O<`-NW6A)jS_wu}XkSi5) z3u5*d#LLbth^@>m8Mi5Lz0S@pjN3e~b54!-9j8wC_;vKL^sQWXn&4kKZ+iVfaqC?_ zG9G~bq7d~Rle+Oo;sI$_^u3wGa?P)EYMXhq@}V))_TlO(k(BmqdGDBEl~1QZK21+; z*`VyQV-J0R+`BliA5eP~mD#rHlZgpL#Vh-4QM&L`iM-DoqUY)a8xj?}V5nqoynM zv#pO@5QR0bj?s(2A3Ov43}031CHVbbtIE!qhh3!aG#906(jS06`?s;rZYpN@0% zJ=d^|sf?$NwVe0JxNdo`+U{HJc8RgoamDL*2exw(4>?9RK)>qRCW`j@AM(Ee;v#L@ z0_AGItA4d=nAm2|$)w-!wVZvf$EAvGMb8t7J!ScUu=8^j2Wu_Ld_!{hWbN$O{%;(7Us<2(DhGVTDld=uP~2r z@PnF1VC?^Q{oty0_Cwa~?1#v7He;@Yt zADNf>=~u+9w(LMt$$DgJss!iNf1#FdoZRMo0I)pO7G!F@#5J900; z2iI|D+xL{&=gNJ9>gD7625^5)()%T)Prx~E!|}&%Zz{=q5ca^mTyUKtBki&FRKa~~ zr^DJB>;gH>8!TXvGs;=|4CwpLw3&S_*jHnmnfg4~FKx3PnVyoiO1rh42eVPiOWU|j z4UsdU9DhpMR%Vmo2Rr@c46ditq|Yj6SzzMqa%P+ja*SEP%yY`+(&s?E&t>dfU>{)Y z17PEMG!9W8&#>sv`}r|IytpWh+zZf2hyJK%&Osch-LMdjKm$z?&#sI%q9b1+>8eqUJbPjey2EwY&|_d}KR$@z`3xUAg9 zigJq~j!Vkq>MO}bmcYEQT<-iza=xXIXG_cLVFAkq%j;nU!7ugYEL#ukUu-s>E7rfH zb`0wFb@XB8%F%YN$a^=(eJVZ(WqfeFZD}9AyS+l}vLG9|pu8^W3&5`zPWYeXot$ed zhdirE`%;g<@6pKo6x^FK+z9!%4Dv1Pse(21$@j@Tvvcg0YIz@RCTd=o8qc*U)8zdf z&`)0Em~Z30iCmQG9{0^Lhv}PR4)jg>B51!CkNalaXTFOeei!RljZ{3qM^7nTjncJG5Ww=4knvVk1SFX8~W?{r25*?4N3XCgZdV#!2-)1K*Fv_hayVmi<1i=aJbd>33TP z{5~liFkaN$1M`JFQ&Ms-!d@c`HOYIKaxP&WC+jOei@;}cEl~4aDXZ?$+%4}FgP829 zHXgWp1m`jtr~}kZaybvP=P28u&I_lMc7Yzv<$Jyn?i>6e#1iyIN8mirYXO6DSIY9< ziZ%`JcX{`w;Tp88-6*sd?2W?A-w`C>K98^0;- zUr>{30N=a!!f%*m3{K zMBJ@Mj!*6R=G@fo#uHNeZ<_kR{+%xA_uRZ2#IO~e3vIMIWj*dHSUrt zu>a`l(*Bd-_)K^|r@Hj=mm$}nuCF(`QnKFG0=Qota^XZ66YhljpRDP3o@70Ke7(GW zVySCkwvXkWHk~W)e*DArTjz@<(4Ve^I@Lp8T8M66UXuO0%um^mtrnvGw^*JmN0ukc zdJp;_yQ~wSteq2OJuLT1AfCJ|@J~kSl-Eoitf24fpil0*Ynz?)yx^L%H*$(-$-1gi z7sA+mJltEh!zEUZ>o==Y-zNIswC$aH-={&p{QkfT=#vTk@?O1(^}~M9Z+YPwALu_F z^ur!$J>U zeeweAVe9_map+H=9UkD5-+&BWUxqQSP;)iJa|_hNfbZbIT=5^UHhFEGQCbD}o@%?~ zwW|pDVI{;kjrHs!ez>cwu5iBwtk0#btKQqc!@ANaJ$jqC)%p(HPjC~g!+9KkpnPce zc`!Eo;y*za;=koP@D5|hC*}Jivr?Pw_hV9RjywnEK7taa6GZM7{aXeL0b zZQM4m(&{3W;9)hiUd^wC)@iW}>RS7=|7}ofyRBPh0xjBfw;-nsMCbqcJ~MBaU{LpW z`2TZVx!!l)_c`3peZKGK@WPwm`r{WdPpse9@EaNYxS!ucauN19|H{~~*Jy7+pH%$r1W}g?>M*e%V=XnrwT-(rWL45!(BC?l^w^ z!Q-&)5r?b2wh`LflH1;^AKcy$o)bRj)|~cSefJ&OQyzBr2k5&U=)290=(}HE6H2~% zO~}u>O;gf7#gm78kYh;vVNysiFBzeayK-UPGb!{zeW^{g6%3r=EE=J`f5>fb_XoFU zaZ1iYZO$2?y=!vY+xKDHJKMHbK0 zAzLoZC+D_z@PpeM;vtjg{CX72FT`D*GxvQ0ENcC6MQ=AECV+ZhP{x_Iz-AeMct| zTc9%)-;-|*8`COS?;4@)rL_HF^;DGgdGdp9{ULq>vd+F02i&C+7x_|&=O;T_zs$a= z?v|^}dTZ~Rq>DXH(r;1=(3b)H7;8UYW34*R6?^nmWY#JlzNj&Eysk0zGw;-n9p0(^ zk?)zN-(g!STN+bGXUuen_4i-j+?eW`s5KlW<=XEbd$m4#$`<7}llb_-Jl5{8&p6)C zekXjKBr%`Xrpx9HQnsA6&TjcW$~RCxO!>fny5*~e%J23DZe4zdY1+mb;GyK%Chw)dV%3UyCUAKMS%u64g1dkHO zFy{Bz=*AO1(hy(7^PF)b&@S}fpq*km@pYieEU>hxYD`(5c{&_co+e<|7wQqI<| zVIDKL9>29GO7+O!>|cdnsNc)Mv0xDl^`1-{lE+8~aygo{i(3lkTYXGURlNP;11I#8 zD~FGRvk%SNE$}verya}X7pE?OFCr5&>l|4x)7fCKBk)ljdj%5TFirMZbUORpz5M~! z_GZdVvA@ILlx|{g6>a#mujhmKnF@ZsrLdJ-M+sk3xcJEx{&rk;iCucBiq zvHuA=zNd}wNxZ;s)e$e~>eAiz2XDH+hhTW&r270Gss1kq(-qQ(``*ESgm;M7Gq%CN zOUQ)ue^+l|M*nlKeNuJ|FOk=$o@nWoi~PDUQ&)9N)@E>@!0tr<4W6XDe3;M6ccm}$ zPT~9m_^EabcV3)Y#l3Bt^(-zP)&7tiArJ0&ZG6mLnuvHKE1$xF<(;!KdueLbHhjz8 z%ozHjQ*!{!ZN(%Lisj7+a`8u=eOS2&v!+@)|G#=h*7?%+`>rtSGrEfXTZufUaf?|W zC@>3#o(1xqMLdgMYoB$>Rs@+x4Dl>{3$)O03wypZk7vulVVL#)$%BR9)t{M9xi_=# zn6dXZR9YR`sdvGye4F=5qD%F=4;upBI42^5H*ifpmVIB~LwFuR@7lex$sE1QKGh|) z@Qg>aq}?QVRJ|Ns{hm4oU(>_9iu!r%{`cyl_V?o4wsCUaVmJOq9N$JbcU+uTS2{n> z;27L7X4Xr5V}w4o(Z`VAF}gh0?-;Q!3p4W$YV%7YwAb{%0P~GQFqbmYy0@r z2z}h^!Ytor{0GAOJ~p$z zM!Lg%5xtSkyZo5Enfxd0Y_IGrvfV4&D_dvfpsT>{^LC%xXRL+P`|ljLF>eM3rpPH8 z0lq);>?HXfk^bVfFz|`jj{Lx^_pxSrFZmzkf%@3LqP&ma z*Z!WDI#z#$Y08zU?Tpj->E&J~9V|mWuZ{gRr zB!8m*e~yvByCxmM@BiF;2_C91Hoe3 z?NJW8?se$PTn7I4a39j*B3GBaeyN$4{1)}Wr`3zS7pJ_~kO*zqG3{qe&j+n;j5L|~ zM<^HfVo%tk5oeD^1$&Q_6e&KM&uB`<=Aigq!Ar?O0k8Zf z=|MYYhfu|HI>Sw8iQ7GP$^nUg{d-^mV>h2aI*$Qx3oI zgU1`l(Zl~ndzPNR)0~|@Gj|N#<|4Cp{U7?lT>~@3GdX$ot=EUUiCcP)PP{lpd}7bk z(R}eLbe!}E_ldvUn?hnFLF%)98f^+&VqN8w2~f3LVkIPAg?-0am^A)c50 zQFGun%B&}M{FjX1XLWnMWRCKBuJeiv_+F1cD!eDi=k=r4i5+`w>`2@gRomH^G0E8y zy05^;5U=*JKT5HsV(2ix6+0*Jdyt6^#m0(F%|aVL_uBZm!N$+MHhvyQ{7lU4&(6P{ zDt=Df;>N=#;^*V<6F)~<-11Y0#m~W+$ThK?8$(O3!|Zw0UNOPxA%-@LtK#yRn%7Jj zu62}2c*7&c&)0k{eSz>{@phbC4R{bvw7*L_vyb1wt~_Vrlg!m9*5|iy`R#Ru3#^X_ zJ>?^c)*)zYb-^3N4LrB)Wa(_yrcdae96p+eUnqF|BevS+TY zlkO8w+ZCYNjbsk~UZh2Gc6E!^RaZgBk^#b!IRF}>@fi)I>Y zFgngz!#axyuv)pad4RHEc>oV^HI9l-bYYeau`>N<#c7_7HQ+`2vxCN095nv(Je9;{ zJPR9QR_2=2mtY8XjkCT~ly}ie_7iiBGY4bGbvm-7GC6T;lJ^$BMVXju55K+eKtqDO z4_DTY90+#Jbm~jmH^@iJ&0W}f#AmXA+L#+E`eB-KhI33<^IkpK$p`;4{+51F<-S2V*ZI(|*O_Ssmc&)BQZN{P~xQQ~%01-SK-E|MrjLe=z>b-0@#}aq64& zZ^vx+j?0KKj9aR1-K|JCLqWepR^oH9nAS=dYPO zN-kZcb8=;1Ex)Y{L~~>yGO`S)u4HWI-t^Y!zVue{la;Y}Mh*jZ{FyU%g!_K@I0qj+ zLF>~E;iE_Kzior@2cx5g;p0j0v7PpgV)GbN@2#Rgaf9$Iypd;_a~1Sa|L!wnV9reH zB=Bdw;N*PfHLq2f?C*2Xk3GG`f_l;evR5tr#*cHgi1I)r@@FOPmg{rH_8Xx9L2Lgx3UwFV&5?vs?ut^v3^J0^>tteyQm&!oRJrlC4HzJzjt z@Av-m**5=yYc4)EPsrfo%b7eSYk(JL_N==;3^H`mI*tsy__`XGre7jjsQ+eqW|c&iakdhz9uCin+ye&DhVx2|q7WJ|~AL`TW?$@MJcY zjU3ErHz$_;c9zCEU&Qiq)>h@_DWeB+>gM$EwQSu#akX;s6mvQa#yLX%AR`ym)`sln z{rmBm>f7=eJ7W1svh{18TYlDAD<|ov;2$`v7dbH5vsO-3F8S}n%jNR%a_}eFX!-#7 zF6aG6voJn|K0j4o?XM5-D;J-x?cYK>xiHi-A0rsn)2_wgSr?}?=i=5C9?tpz_`XWr z>6EecPm;xNX5qe%tMs=QyKzeRdxyjSu-oQs8NYA&2_GnH6NmB~IW|%29ZIZ>yYPq? zH4fWvRyU=wvF>|2))C757vs{q+Ltf^YZFBIw^Nsd7 z^K5Fv_Hl@H*2qD2uB|7?Z~0FNmlh+;Sz4YUeyh*=kLMyc8?y57U3>Lx+3fm)T;Gol z?JgZo(h<2dosdIQ!yoT@Hxrk5dh%0oU-RpFmissKe(R~wllO+jFn4+rxe+cdQzpr|TSN59Mt8hlaO5H2%Sn;j{g-4{R+s@bX`63OFy9`*o&U zec1LRbDc)s+4jd241<5D{j!1~m`=ujJMDQYM}9v`YjF5~g8V=*G1Jkxmh5flX<;v* z&VHH6{d0-A&bqEy_DuTI_-9%hP=ZFrCi-ZryL5?Gy!1b1uHh z49tq;JB=kKc8#ZM!s4sE1J`;gCp6AAvA@rsIf1q5t!0agoZ_&F&18SCADWKeUf}qv zJgpVs0-Nh8F>9Apl|^fB2d4kIzu_7G>CxJW@v%b42Hi{iCyUX%JM*J+7pO=;Jf zCC}a#e%k+uXzdg6aA^09;iq>1;~mu9+=;_lUMa~Xj zezEH`XIxFGGr1{R+hQswjD2R3;~&iDT(`>eZaLt6X7u*a&h*4rYv$0#Wx>;(@=g;g zj~6-q%T20k|2JwldnYt0!8s;(n$)zKXl;HpFEop}8UK2dTI7k>PMYh9`LBxBPI{r( zSs1u9q|GsFg@c3QEv`Frjw!X-|5c#<>y(0Iy1|G?TMpVPRxA2Tq)@oqG!2~kgM!eaE~ z3*>fd3PYv6!1Pz{S4L|q!$qOW=me)U;Ek1<@s5A{sL(NB7zCf*GEeGR?(2Z}=is!B zHur(w-@+r44^4i0!piZ^@4)8{-ZwL@Hej6{xGYo{FAj}fIL`4e^Q6S%{+cnNCjxUE z|9zg+;kAY5RcwvcikJ7X2K6DvP}UV)QWoy|Ldoskn7_u8s=BT0>1D}y&6KC2wZ-v? zPD$JwD|x2G@!sf3jW6-VroR-eEeMYdLDx?I_dTf>17|wpBfi)AKUzB~5M8nf*r(^U*N&pU>3Uw-UVD0EjI#+|uj6cCaNFtUx{f`lqQhN% z@K++bq?GdSa$gZIbNqXvHI?BroMrr;7%g{%m(c^|PTk#}?g^3hB@-y?=e{H!T~flm zXmJ+vGX7}HH~7A|=S%v`~dP+o_7T*Z%yA=IOC3tDOmf!q|lP zY{$FamnyrxFy`M*+X;9!K0S0sWP(!`FN~F$YR9|Rm#T!vC4VvSEBa0voay`w+zH3C z0#}8kXEyP?C_2m8XmyM9!Yt>JJHt=shl3&iS$QeT^V?^H)^&XZ9?g@?cBaK+HGz{*iHw+kb}RpS#BL><-{L25%FFI`hBoYjH< z9q`4Afw@)|C!r@MMY_H)?e;b3&5t;>@P_CzYG97DjQgp{Xif3T(;a`!tdMwP6F4Z^ zJl7fj%tx%Q9~+G>8B6_IcxFQUOlQo>^PJV(mqyQl4yT2hY0E!2q19(b#r*5?Qqvc& zsr@;4@Le@3=KX$Ns>Mtn?XM|qz1z&3FtLj=uQ9KG+nQSO_VnnQ+Ghp(Q)_C4zq=Vz z9qm04IM-Rdb7zhJA@C=dD6^aA;|9)g{(~`>uRP1Sb@RE7pZk*4XFH-r9kgi%_H}{t z(3!jtv*b{4?`Y z)7P)5U6j~aGq$rh=Dj>WHFhEWY@gKX*?zt=DN!7o6rbz(@61n4i?6Bu55}+?T$jf$ zaH`;`X}xP|-{D!+-ZiyT(Ua2#*2q3}{s+9}r(99+d}olc2>+s?#;qX&To8#(nvKFJrf% z&ENAoC77_?S1n|ZRL!*3@~&~QYoV3DsSy1>t##7=aj{7Ocye`N>Ke-XS5I#(3y+UA zu@2k+cwtI3cn5fQbIsT~=n%Nj`UsN$TQ^_mOo9LWRsPncx^DNk`VSSdb{P8zOjoWf zaH^o+$ zis&Cjc<{0FqU;+aCL-$aMAiwbwG3)E5u-{__MT?_I1HU4uh_3aY==iZyQ>xRVF zYnnHDTALH!tZAT9Kes`fOZs#{w z|MsF3F;!BypBo#k=SO)~!m*U~6HBz@h${lr9c$$8vs z?DM#mceO9s&Ha4tcW~WQZ(7e^47$Bar%icE}M zgO2de8SGch&+pU%H*RO(#X5g-1MG1eKUrkU#^^PL*eug*MNBRXy3Su46vtxtJkc3MQ8XobAM&HaMzrb`A%J;Y-L?yGXK+8`WsB^RWB9n z@_&C+%KsYwgQHS438!Ww`m;9i9m(GQMTv)N))7N?M9Q4I>9^FBVqZt4&Mzu*re9SW zE9)wa%_E+ixW6=Ze?)sFziMf)8<>s@cH%(cxsDhR{Pu_z7ZGa}Z8pwbR!qZJ%$`zX$p4P@qmjnHgoO)W4Y`Z z!&tnnbsK%HXPdm%e~MH(i-_;glRY}8p*%V%c5N7)_Cj&0uy+#iAJ;&6Y#;G-e%a{M zKG{?FSoCQQtgl&mOZe&Oz`3L$+*>GwpdQI7c=0wTLC8lg;v-x(-9{Bp##M}k9m&cU%@Yjq^ zwFG=lLA*Scf8*#>X-P%Qe;?OKMJ#{o=u|B@6pkLa{c>xIK4l)P34yB{IQRDJ`#;`V z1AJ|~*SdwDgU>eb@=uW|&cpwZ@ux0(Cf{jJOj&vPLZ9<7GkvAv>gK>BHD_#Q-!$ti zn>U))k{`g;kDt%b_KJl?);2F&%yZ-G*aWN=Z^1n0 z58&)|6PWOYc)sP$+f3mu(G?xvbJ^xRr#WzM&DF-!dUX`tKNH=Q=%{Ia!_#_0I9j_1 z7@ES~*5=EjwRf&8*wtL+YaQQJ8T;Hquan<2CRMV(GFG>mYj|=jj_*3_@iD2+$TVku z=j7On_-J*%8j}(|chlcz7w7NNcqY^4CaxC>zwlmneYkZcIQ<9c*t{&SRk&NhvsY^fEgqZtr^s~YleBY2FyGNwAA(C%;jyKcZ=l8$bh+gbBnc6YOHQM*Z9;}#X#P!MZnay%+vZTywDc- zX3f8VyPM*k)=`%h?3%TgdM3K$+>)x;zW`_5m~pAG(fnQKMyiMdqf2JZ8<+YYJfGiF z6{}k|E;Zjwi@jb@HDT7eaj8{R(b~4bMNhX4);-;}+QYy1>AP+(cv?P28+fl$zrcC# z{wrJCfOYgjk8^k8o|-oFXB&L@u;k6{c)+;UDIMO4o;mg>$P#IbN5e+og1DW+fKRPK+8`F_mP>L zH!%u$M)N=B>B`TBpS}TjI`?1IdVK=lA>h=kx&5lvG|%dQuMXJS(37&&EnNjp3OtpV z2`lS>tK`xGXV%8?sYkgNt^Nqiesh1#FTvrgJICWQ7dp=X>tylPGx&3tk58q6Wp?NE z*z5%VbN#XF`F%g-e+F!0O`$XW&I_NGyjGdcno*{F<<}##oJC{qtzE}?Ymd;kKk%KJ zG4PTf9rG)2?_XWZvv1T$2l~y%n!l$lKREZ@Tj*3FkHWF=duAMa{Dx_r81}UK(FKbF z_gX(!wD9Ngd)~dZOUY$SORTN2c%YtN@6Z*qqyE@zjp>E)sk*)Q)Xwkq$Ljvd{Q&oY zKx|f7N$P^z1F^aquJJ&u=F{kCWZqA|QxgAFdzE=Ou(b{M@+}Z`+ z6z|Wjo`uhIQu>3o|?eo~O75w`a7Y@shlV9&tjy$-K^(0pnz9&a68>{y{taUFb{%Fe6 zb)hr8BNs>HPl* zo0DYiT3@ws{>-`CU0T2YRD=D#Paf|}`_d1V^KYMjpZ$@X7s2m}Q?;%B!A&O@?Q!Z1 za%C;NUH5Ls)x$ReX=6Y0q{4&RIk`M_UY;@7_GZEyGWj=(~jZ_S=Q}cBK2A#5ijj-0vZ7=6i@9lbOp}&bU4B_l%Ri zpXk2-ztygfep`&$rag`N4&tYa>bq~`d&hO`>uCslb;F8udYit7=wls(p1tKWO+I)z zN!bL?#dAL51mHubu-BDuLJ8M;XXzK`TUf}#o?^GA&dc`kl3gRC?=5E9 zba_bas~@%FK2sU});skp{(5KC&$@MPrTWP03U_ZZMg8z>lfLN|0GFROtnbZhe`*D| zZ8rJ+QP$15-=Z7EJALCh-=y!q$BcTpZ*cJgDidceznS&3dkXWq!)1K)ir8mwHRtE^ z&dLJcJs~frtO<~8MeWNTai9B*q zW)y4JPn>TR&)fNw;A=L8{rdJ~L)bVUgSY!CnCtY6dO1N|R}S{D2S_;Vt7z!n!&;nA zb5>KADeVxSM~Y19C1mYU>d)k?my_Q;&pQh{-$g{H_L}IKcFo7*=mLF9TX+DEy};e8 z_vF@`hVWVTJKCNtneS)^Snr*C-s)EB>RYXuZ#bGQ7qa&Ir+mLtbB~&H)ETTxdG?1w zvvoDs?FDA*LtG!?d&Cu7zs$D_k08s}viABnTrXga^^drgGJeT8`yd|F{JUp#^c9_P zqxBwF!;e4WUTY`xT+i-6FX>zy?W29wzAGR0?g;PR zIl#NudG~;Q$9Fk%`Wxik|HHdG>^t_c=e#@4yBBzOwS6~b*t=uA`x)=t?@a5g8?6mJ zpR&1aq$u}&%E|8PTbu8!%AAMe^1XOp|Np=bY6A?`+Hnn)Ldf@6d~tY$KTBQf9d@hKJAB`u~53m z{U!|STSDmgP=sU`JLIaTWm2A44u% z_$Fy2`+lUhhv@>=)2l7=tf?8uULLT>7Kp!E*sIrmbIZcI?d;WK3~P};Q;$D}&#Lb+ z`sbL*XSaWi{BvE!+R&b1pYMVzGT(u>?^xqgO4~o8?eo!3C)&=e(^uPv+3T(P>M!$+iRYiP z{wr&e1fBg!_(*$0J>ytY&hOVai|xnM-%9;*>c?sKMq4kV%U|cY%3W*g zq5HG-?zFnUY>WKNL)1S^xiabtt|nWbb;9Uo!KM1FC8b|%K(_uDsecq(@;|9xc4jy= z3HaRli%(e}JCRd=fcno+e?9fTol}3_DeGfPa_SFK|6izoC-uLWQy)7H-bR8Sdy`ZD zIQ7?4zlr+SS+s?P4iR}Af_!xU{ZD8iRv%j!$r^{Qqrq_CQA?v*@hxE-=Pxm{G z#zC&^_hJuT?d3bt`X;ase6KZ zUDksP+r61V)>So7?iqepa#mm$d}QCTrm&oL%Gpynf0Ehy6W$;Fqx2Bp*rkkgh1&+_ z3~f=ptBu)qK6@eB-W`A7EzX4rkjrQrS9Hbn-kr6&pZ40$+Vmywes-|%OP||bH~86& zPj3Hg)OXV(W|G-9Sh!-?vp~7omM*;FbI;bLKl|*H&wjRxa&gK<-d+9b5#TN5f4Z6R zh`H*?CGF@Dzd3Ds#5?1W6+Dmo{C@3^bKz@eul4!pe-ocEeFpXk9n~8&C-#$hD4Qt* z&baq*-V5h8h0p;VQDiHQ9(LQ}xif=4G+z0}QFM@rPj|{zerZ7bEZo@dmhevgoyys| z=w9jdGVr+`o%6nB?V59VhVt0meqydyg5%`d*JGDTw;XL*+`S(jI(T)1>{8F+rHy>2 z?K~%ij0iUP#*xl+VYWQOemeA}-LEM9`wG10@`G^Z@`&0CcAe{7$6iChDEQZaU)?Vx z{@43Pa1@MZ_-3uw*YPFx9lGW0cX%nQGJ3aycMYbZxWP<2Zv}f2EiBo+gwp@@qoPaL z3t#NgAV7ITd1Lqv0p+g&&IsjfJ?x3-6M-(SZO~Y>XGU%1mT~ztdQ#czC@Z-r=fCZn zo&#^O=fTBO)^7GTZ$iO*LJS^x!QiRdzy^O;qx5C7x^Ra6npGNo?Smd>y%5^={tU& z{s3`ll9(^T{szWQ99=(P_h7&iQS{gfo<)jHDynmv3XF0YsZC)MiV}x@bsTXcJkNPf zsg^F|tmXX<{FiVE>(=de{W89{Y-n*XYOcBkMdh_pT^Km9{Xm-pfN>C4Ck2^_D3jZ z`S%s{8TI%23iA_*O(gyR#1OUw0U3!^@BWX^XBy%@G6|B z{|IH*AaBAe_MmAE@Fh!q-TTJpbvHn#KcQR2GKu}ZfN!OPxq7a!99d%v}~do!?liexkR9^3qsqsMzsiUk_f*H|twQlYbb~odU1N?-&c7!yzy5^l?717rM01FbigY*MQICY@QJg z&0nk7&m4H2ef`1n%zPKO!i%M;_KQX@bXz0))4(>`+jw!LUhdz@*QIdA?%S&P?z_5)4ECmi06U^4V6 zdz!#Tma`B4$DbrN>Eo=Mxn|x@_Tk(5b{~F)t#9GZ?!*7->~LuFoN(w-aQ65V_U`*U zqaXW7IAl!TXk&b%S8(1L^BdJd1e(#+t0= z8Dor(XB^d>zZ1M_zRH?&c%GHBK70X}{uvrAbbib`?e`IU7Kf)dDz@)kFMeS>JH6PJ zY<`$(hZ2aPXI9lUIKq#Z7#&#wpWA~MttmBqpwZAvVIRaUzNESIQmM%v6;-L9Hp#$zDDCI z{&Pz>z;+heRH!luW`?^wKIhm*u(LF}n;n@ekQItz|*E~49(+Oc)m17*vK zM(B>dI&cZyT;F{2BKhW*!gEtN@B3qXoBA?z%g50zmlJdTT{n8jiTj#ge{^<6X84X~ zNU}21c#)Niyhv7#{dUuozP}b)o{CO23$8!IESQJ91dtW{uGA*vCC)hu*ym0Y;G8gQ zE3oz$=@Rlv(7opP)c-4qODZ3sLPg$Jxnf;Zf<_&wk!Q%`ot z)oH4i{FdPzUWQw5ZAR}!`R)a}X{$X0jJndLwqMS`8S2;nLH$Y>Wcqdc?86TgJ;kS@ zvGjwh2MxL*UXjrasyD;!lUxrUP=l8^!<&7O!7N?m_qP8rE#9*GP?7mgi#Pm^U}S;i zvA?pftqWaZ%HS>JH1XHM1^YC2|XmkhsV4%0^>N`Rbi{4chwpoW3p0GL zd{Y4U`^Zm_7u{-k7~PtL-`%?Sg+1;$kQTO_eSEn*A4b0&!`96GG$b#$1OZR8@( zc|5Wa$0lTKglivyzfL##@af(1s_V9+y3)%RqF4Soi{oe($I(>b{IBrumQ_6$52C&1 zFf6{!eCKiQWtZGOqwGa?W#yB!YwKn8vD=;tkJ?h(b{xPj9qiVPzgoDUY=YV5)>)CU z+nqty>bf!~e%>tFViVkQ((@i<%B6plGP2jU+z7f)e#B5aSv#Tns^`M?tUC^5UgJK| z7vBP73_s_6pYA;Jn4Kc zSC%|E`QB5?eLwY05^LN-w?BdPh z%!KTI`6J-7FKhFao3l9*I|uL8d`RY;id@?-eKdkS?_y5Mwx7+_$TsuMusPN~|DbSw zCH(Yf`qJ4Ew%iD9D2HI*WzUGPvbz{tN*o!0_I~`QcUJwx&ZWC?^TAc&A1Zb}vUd3o zHD{rDjAJ%7$?txXd~u?Ye{wWkG3EE*n*~is`Imvh!tR-W4L|Vh z)#l;fh_>(6zq$-sMMh8Um|SW)G_Sva-)V1Ef8YHZH#|yC+T0o$sE3BaJ2<}};jMaE zXA0g2{`{uAza!5yMe+s~9L692HuD)t-zD7_lo-yduj~(yODd(kCjK{ZHtCxCAK1`G zn;zN=^KWg@rTEK?8z1X}sJHaxBx99d_I=t{{69alUP)zWfW(U37)V5{>8|Y{3qtuM5oj&CeO`OSinm{T|wSowJ1=^)?Sgh^IHN zXdDzDDpmu*{117&v|xjYw+%xiJj6pvC(PdmAp3$EHCzUFXvpBmMN5D zUMb?8Hn7|~eZX%_sHMTcLF^m#)G+K6z*Ov`h?T6~vnKX^RN_mO~) zGb{Ff3ZpG<>x&h6>j z=lS7`^Am6TSxXb<97K;9ykB&`cLw+54EMm>kHOo))z3d19Bg>Cj&i}yH5&~0R$Y}< z{YioL4LT$3^dRTS%XYqiuUb5*<2vR?#M_cD#mVA@$ybHD>wJ~{ampUYZ#sxiBH7b_ zQfKxvhR;Il2t2VIxNqft6?_%(LGu~lbZzrOaOyYb#10Q0{*Xip1eV$39Y7&6$P}ZTr9Gpx`yv-MVQxG&NIF- zk!pUPd57Y%j@{&mOFOnj!X{JU~L;OQW^`6;-(eh2du@Ol$^L;SNG_=Wcf_%7T?4Ey3S;jYxtENIKYZ|ol@;jR3|$v@Va>PsJlq3;*P4PyAHpE}znFu=SY4D*o@B^A|EQTMcD;`z6 zRZm^bPXx2;G~^Sz_pD>UXQ~{cadIHdI5nrm{3>IuL$AtCHfXG)Gh@{_HAbz~YV(!$ zcd;JL#jWr(47b!Xz$)B^xoTWGa|wG+AFR*tP3cdtR!!}@ZN$MtZX3o2F9=s^gL^OI z@1_lp`K#3{Z(7?=tQ^14`RCtjZq~a+@O9aKyjygp&kA^M&qXF*rvn^iPb5S@o zjdGIpc!SPE!ychKB(t0Ghg~>SUNAJ!j_T=N{9FHgX6?(1+`Bk^jr#<1AK$iD&z8Hn zrk_`iaujpBd{+?o(Py1O{E35CldoJl8k;w+dj_)8cS$BES$ezXgsS?@>DEW-G?(L3 z5a$!ScdkNqQ@4)oKHTC_4B2VWi^>ro*PYjYyfKyH3{Lx;aVj5hv}H{9m%QQ7mqwfU z3E;+w2;B*vd6tE{52y3^mZB##z_(xgb>_fZ)@65REHpFPCu!cF2de&gr*Z(gwQ=$Y^!zZJ9UTwI;A?)Q26-{N~A z!s#Br$0485dGr{tR(l+BN9@yL-WMI9dgzy3{+kyr9H5;fzgGZvnDsn;v&>fIN!H&V z-QYKs{gs^$ZPtnM8eY*2oox+8Q6J+T}d#hJTJu4NA?eI>kQFN=p0;7u`ok{Cj?ond_6LkBhOA?8cs_lw5r zKa5^V5zk|KJxNYYZOeuT@1n8zLUubrPM zTmpaMw{lLhT}we*@*6vY%w@)Xtl!A45j<7-BzA73@_oRQi8DE~8+yvVxZ}+ohlOnf zT>-*{^agn2SGTsjh&&l{m;@{ix<;17| z2~PjYKi}Nl^#pxC0sL?7Vg2K(66VwLSj#wp^+&!f>zU_0ymTUSYu+vLxsSG#b|1yJ z&|3D*=*484K|eB|dsy~&(iY|IzpMN6!>QwUOzKX|)Ox+L?hRfu@y=3mm>rGXhxqnw zj6Orh;kiBdx9F|07a#-VS`P2=I*G@;PWnpp*jjJs@O36tz`MlXF6mCS_?*;dWP8f` zyNEB6&^^KLPy!gN*8vgtG%J)xAOkWCe`=6FEn)!*ggYn z=rq5X?9Llxc=K~v9~WFFuFL4BICLMPd2`Nt^qJro_8xeGvOB7efAAG!=0Uq9E2=%A z$TYLyOVXp&@Hp{ybh>F;fgV;2RCInO9uzKIysR+Zj^)gO2{)DCv!#?gH}AdRTKN7S z(izZ0xSBst_oZ9*bX>;w#p{Vb@dvTnZIV~wq9ky);2X+@F2^?vE2j=#`4nEUPU_aC?oId+k{K6w$_M4n%Ow25#jv@X3=NPu7l%V~)i&G)C&3;3 z6*_*$HLNYas{7#8e~%qr!ko<2%*EteJM7{S-3~8QY*8uamesEl+o zyf2=qVJ)bKa!JOc9CL!QqSFp+L3pCRKb(n6m!ofT`B-a%MW3LVWNG%jL+J|4F+2f$uu>5t9$@ySV#N;_@VGwoQ@g zIPUXwSCU_=X&x`Hiw1neTMk4JYD~4ytusME7_dWb%pRV-z1;$ zz=IojCUoBFi(10i`>wK1DCfeyfaPx>J?8l`=E3v9-ZZbjPc2lxqwTc)o8bdQb5+ex~$> z&YO4Z#PJnBOr5`{pX8o~kO$q0F!iogtY{&eoN-S@*j-Dh3DjU zgQ*j?Ui%bWd#~>q1miW<=10M``VlVNb`(3?zR~vuucaT<<58E!kLvRTm!IEw)+@;*WJF6h|FW?D>hYdqr!ajqFKhUwRSzL2T+bRs9ickuBepiDm8mC%E?$t0T(>|B*S4ZX4q^ z6UW{m&if{2z4=pzT(B4?G6H-miThieIt2 ziRa+~d|?F2sbcH_#-*~Q#A%7@JSUMJ-~DB8MTfq<6+I`j$L&t}rsNQ997(<)NFVzC zYPiAu9!%Ms@321jbz<0t65>mklw&bq+?bXY05 zQ%HwUX zs;^&?2Uh=n`hSUgBV9?~BlSzHcL4e}y*9|V2jEljr~l@fh0?3Jaj^8<;98S<1HG;F zKZhUlIfwE2#Q)I(`8)W7&{;Xk1kaQBddtzBcXA#`0-v#scsRGcC22yJ>Hr1^?8SA3F4;c)YYfPCh>Q z8S3ym`2)jx4fGcEJyGQWC|m6d4Sdhw@3AI|yyX$(ED#|#@HMkAkY`eTPikJhtUpZd zCGi8Toi(XAI=qi|>P@)&cZ%y<@{H98m4EunmH!>cX&C-=<=^56 zou@pIy_cRlCwsrFF(v(ws5Yrd=!nFX@DzGWeyH@s$*`C?r-mg7{j3hUdEP?7VBkAf zSNNG92x&TL4#MD)OLJ!>7RquUguyP z_9sXGL|Lo9SvrH~nz#Ki{cS~O1Qi?A5i2~O=j=dl9BJfzOJ3;E0~x&mJ~MGFzmpG} zjNYIPt2ZdC`1Qzx8F`D6Z`XIYX3(Z|$D^+9cp#%YBFc+BoY5U!IlAM=(jCv|ozNX^ z6Rixz1C$3gtG|%{HPEv`Yl1Gxp&2+)Jni~ULuGR4+D^To>^ZU~U2zy(y0ppAE#m|K zKRkEk+}45bbM1n7OEK*c`jl;G2PWx=0QAv!LdyO#y>&TP*%a-!uzML>u-(x8X=t-K zs~ZfuH~~(qZouCff*IVn`r$e1yD&b7Jyjg$^46xDcjB!_PvV`g=e*C<&5ZAHo{NWE zp871m<+Heciu@WY@7Z++?${IPO7z;0@2Px{Etg$eaH?{fkzb3)OrERP&2w2l5m|HT zV)ZwA^uD>|QBLZs9Us@0%gGJ(fjjZG>`?+5DDO2A4qe`}% z{SI8YeW*N3jKc*R~eV}A_&4#P{1 z-P|m?1BdjBYhUBJ@|9E89hde%+B%;T-xABg11>&tZMNd2KJaYIBA0@N+}m(ia%A&g z-Uk<(iH}F(pLNKy_KZBwSqjhbPh8NO*)LK%Y`=(n7Wqvh^2rZQ$eMg6>6p#nKyz$b z&ms8lwM->;l|C1?FaOhw0?`wFkTX0PYUYxkNf7w})j^X5Fx@%7KU zBK@rkKD&GRmp^;_qN*#>tE#SOy=d7Lt5z+$;uzO7*V-oo^*-h1X5qvC3eSC?a`UqAp>xCY-lyEc zEPUi-!V6Dbu1j`@^?Uf?9c4w~)YLmOYrIA=E>C4R<}HsdVGm$&U6gMe!+)N2jiH_8 zX1+h#Seq{Nj9brIFV?U*>1y-NrWxkIQ^+{`+RN6@FuU~o4EQEOoUOGU|BPNy&fm)% zv2U*YHTHhsFZcuIKoosobJJ^ zKT6J;d5)!*FlX$wagfFrc_*#$^_uMX5`%>cq@&z1CdkW8LeFW89`xP=l)Z!V6oRbB zmVIXp)f}n5WByyM^XdzSBFs6xdsBVw zwqbo#NcM*MNJ4+NkLfvm$fwz9`^fAEQy=fr$D_0*UUY4x<%~(p3?C#vC%37-WuxoKw_3dA_^Lx~o&-no*l;*(z1uQp0*FSZqK$<;`yH`p zjx1?z+qQA1`wcI0d(c7S`Yhv_^TWj&E@iEaPv=nv${a7(2EM^z z1|zSwtXvLHP99ya>uTS_!PVjW&FY;Ge}^@NJ6{iXFCT5T@eQ3&(E7dBm;cFE*adJS4g?O1xCv#eQkdG2u+#ZV!G*8+vsQ zzMAGcM`2qxO$^=0OrQF-LhifFzbSk(bx4{Hv-2-)_M7;w~am~@vMuSLo>P7cE*t4nbs<9 zrhHUuY~D>@@WmCTTQIcIpXF`k<}Mj-mx6OLYnt5kOzs+}+;vUr@7s)3{dI8;jbgIH z*j3Gw1@APwRw#E6o#u$ABp3h4^IuT*)8O!N&KOw783Rvv%(mx%?Q7ubCC2^dnFSpU z+}}h#(L2f8@lpJbo5%tDVGMX0Z&FL)nHk`^A@ITm_6u%V0ZqO~yU?)nQRr!)Yno?$ zlq~`$ee~4;P5OA&42@Yk+2mchVnFZhJUcjA%6ntpy}wQQ>B;y;^sn`G;?c;#yIxJw zze{h;U)a1nv9#i0Z#40W+UcTR4QDkDl_OuIa#n^{Hl}F%z>128Hz>dCQT~VcqXGIJ zrR@l~!B$_XIq7y^MThdK{?&`fvv*cP|x1aUVgV3~w zbL~_%Nq%u5@{shC=W7e!eUDWY)=zsIgfq`E__t|4j>IKI4HSUp}SMme@y5R{^xaD8-;Ef!ZHgfJk0^jTC z4DiU>&E@2Kly^M8KmA~OeE1!6_nWVL7hN;>hvj$s&1W8Y_W2ppHQp#|Xk`bU9ld&b z{B`CDfHBUwn_a%vM|!I9vcj8wPfjnT{Ylah4XjDmK0oOwtt)N!L?7nG;fuJuY%m`Od;j9BFd8?D+W0c4FscwXVy6$LcJO*MZ}&f#aLN@tffI z)4Y3&GEdCT?u+7Y zH>~fM9G!vBmAC{RVm$8rX*)VTioPL8fOQLI0-1_s-qoUCY|H3-{S>$#g;zw&FUXQ;<|gKfG`p2=_8lMHrI zFL@62;77Nv%6PDYYUkv!7}*SsHR}_#bMJnqT0EwCh#0zEJXTE~-kVorf1~#YecqRY z&@1Uf1JB&KAz}i5k?a~1|Gg=R|Ngo$rsE;ns$|`7f;JKh;79M|{s1xYL2z9Pf2{gO z1N@JScs#B8e`)42vy`|HtvVcLnJ$Lo>vpfN8S_$Z7#)VD}}GW!7P zfm!3$JG&m7aqB*c?l!E!jTUgW)gW@W*5e#KAO87E`oW{;hf|!XoAHtGvzSBa)%lvT z1xe&nI&dW1)wAx_;%;4*4}i~rcdL_`_i}Nu09-sv`)g>ofgH8?!KF!3-WYC}2NB)nv44L$^;&IFR3ijM;?$c?AW!yJLf=0Z8=96y3{cQ_AGy4%&+ z4Q1iCyTJV{-a*?}w4V7fbm(KmU!wWf0`UzkX7)F#kt=X$^L8HS;mXp0r+p)j_F8DK&3F#T_r4K*sB>|vkEgfhaX#LS$o5*~+|N1j zTA!XPM=lrc>c4~^iv zYG2|q^wh)bJz6z_@46}LyM}?c51(Q)utlVI$^6Cvm*8(4^t_kMGg7{#p@y{un zIhz6hwWkIDmG%!bRBU*!|4RGvUlrrYf0Z8_Bqx4KAC|sP_F?6}2H?RybV{!O+J~<+ z3O-NSpUu84p*A!u6(Hr|4@L~J#%kii7OAm$1u&azEfM3g6pJC^h4EeXTCBN4C zx7ecpj(__t<`O>8zXgs{`nTZff7`#sCZ6oyE`JmMcJwLyTgGesTW~kz-vZ-E{_T+* z|5kJ0@^7`Cu|4bGzQuhQ-}Wo~Hu$#3}WNi=7>9KIHx1+uh|U%L{&Ry3@E z)*gJ`2zFb3??`@b`%n4xQhu&vxbC1dTxU$K?gz`+y z1M)wtUwRtPuOh^$Vp|YhnJBL>X98B!FTP#-?T8C@LhZ4yV~)){+r|nKQH-U zxcg78kAQ!$ZCrlGvX@y;Uzp#WI1_o*IwQtZiVySv`D$`7?3c;-rmy@@?GNDWS>Q+j zhwQ7#`jW2_za$!2pSLgl;D3R8{E{B|j>5+dez)^mFuBjIPlYfHC)MdFAcSC+^o?|8Fxt zr@j8qaQ!X++Viio<O^(+zKC<9n7bg)-DA&ZZuHr_ zU@`IQ9(XU=1}%Y2_Af$T%7bbCC(QlztlikVC!88=E7tr+Xx%ik^-trM;&*z7_BQMw zhqtEW;$!QgU&Y7uz5FHou>>-WZnAqHeE5(me>=~WV>#Sn_qc6IWY_O${YN`-UxMe! zTRG?wZkyx8Y{LefauxMRS-#yfOz@#oe zopF|4-aWuN!y_$P-#4j0&OC1NR{DLCHhuuy--B27upX{-N%!HlG4PQuq_wwN>k?rd zRq|oV@;kZ1V59M=s`H&U<fpktpnQoGuAu)!lX)cp7Bq}HPN2-BNG=kC3j?W zOGLWjNy&6&=J^kDodS6wx) zW94YQ&NIraaSHsYaQ^QlXG=2qSHs-i8swqjEM$f{fQxD&a%w=zn_`3Ne=?j^Fcb3 zAYgHqb%CT2v@?@%P+aj(gRre@CkZZS_y4ZGL=0Gze=p1aU&m{74f+D_@D512nky!Yj?wK7&>YC-wWid_E%CO5*~T#E&%Q$?aXWT(M;)QQ{jURLOg623LeA#y+^J1)A zJn(3NVEH0rwPW#UMUpr+3m4&9pxn>Aa>`+1;WLV_=b?{JKMNg%CV%xAeY!L(2Q4hO z=g~6tn_ubDvLrT7-gjEuUNwxLZ)0z2TsBt`W!<^V3C7W#RwwV#!HgTL=)U*pq5AaW zrDR_d-SGc{GKXXhKc|qDFT!tst`rW*&)=BtJW`= zV2TT7@E0X!;$CO-d2csAD3POm!1LG14;Lk`KsCAES^rKli<9rKa9Y^n=Uk>)U=#AKt8>ZO2jrmrG zGc8lngS^+7we6EXl3kf}(n~Hd8$FIcQLkpV6-#Y3%C=m(q^s&tBn2S1)IO>v4363eEuAm)&1dVsn05z9W0 zHQh)otz_ny>;hYbv*>Ktk#g5My&={fd)UGRGN>I(O;vi8Vy>q^H_f~b@-f)6EQ%X9 z@ToS=va}PUW?}ZR25b!Tx{LftFPzREI93_AHtTl!EYz5O^*KPF3Hpqw&$!oT4f*5! zJ}YhBhjbr(>f##nI@arH1}-F*^HI_5Qhf}=9>R8;8{G|u{lesX$O1U zF2m;ztfAg%_9cpWVM?->k8_9X?jOXFsuG({NsP!v@$V#zrsN-iB%;>lg zemQV`toWPn7w*0N9N`1Gwj+BsEqTFYmtya7Qil6kO!3~S=9JDE=7GNfX9^9Xm8L#_ z2{BgSrPk)y6xM_NE8A=Tf0Q;#f1QC|B)#D>WB|qEa29f*VzCR9yZN=!#=a|bZv5lf zV>Of0`N2u)V~gS4?=%}E!`O4h^jEsx!IsA7+R62U?7e$&>&mD(YMxFAl7AiU$~@`W#sM!FugU^-*fzuV!-nk-I2YGqwH;zk|-K zR6FFGa`}Tt%ZK-9a1W0t6Wqs)OJf=Fo-swiKjGd<_Q_%9bSHFS3+Fae&Xq}l3ApN) z%Omd=2D!62NH0p-*KRw~$@eBC+s_;-{2RO!8aV@cZlL9&f!mOulP`=zBcY*oZ;zsp zrM4-GVehnbb`+f~p^x~urOyF)i~1aZzjUpM_lN(4zAqDf5AQVcQ?3qemj7f8dQyd42?aEzIu2RjqRFzgQc-2&L5w~<}H1Nt_Y^UXEc3{ zoP7rRy4I(!#?sf=%chC=?asX;=qouFd!ykiI78jZa_6DOaYi z5$rX?^mXP4`g-l94mnKb4Xq`I*?$>*1?Hpa>zU}q(K5Z5+5OFb=S)3xVmkCfHZ7gC z-iKT+I)N=G{b#S1HsXM*Q+t6kE$$vY)4mZN1osU*pl^-#6~5wE*f-+wow0sXVg4WJ z=x6@!di<|H|1f!)(9iMtVH4__@0m4g-sqG ztS>)`Cl}f%Yi8^eZ1T5)_m_b8XJ40{0Ikh^(Dcb)7US7TXgfZf`-vaxtj8~`{5>t< zSdnumy+^qp<1l)ma&?G5MzHN+Te7)B^}7rDUTwtxumy7;*2-D2;%D)L$w#A{Q+ehR z+`r@HfQx|Nnve1(X+9sL|0m^B)>=V3qh|h2l}XZWbHK0M%$kWd>7Az|@7DJRF4DYa zbic%Urm)ND%)92ardaCx8g`aSbm?X@(fZ0&zhIo}oC~*aYB$l}#$xz0@RvvNmuvpd zb1&%ww4wP%vFjCphd<}kaqh?LT;hg zw{r$CVswTN8x%QC{kBv8M%w|Li|^%b5%rCnvzU4O9WqeSI}@q6E5FZ+cz&inU!+f` zZn)3+)U`PG1iB-34B=Xe41B?Pbv;^Yx>GtPc&z(kittq38I!0Ab;wsGzSKZ&2*n_2 ze0Oti%(4jl9T`nyy$_rC(d%`0)%5No#^xy9NFS%? ziAs;+~d@#5cdstaUa6B1d!sZ3B^M~GboO1=({O-z-SMhA}fmdwZypB40 z_km-kNixG`o|!M)SJ#Rz5Y?ZF-CxsXYNOvay-{?oR{q+c&5!;gaARNBCdt3@_ogZL z_czxixA)X#?q5{rKhJ@i$(-qnFmBQOX9h@Gj~d<8G^I4JJKjhe;oS z_nn8{oP>9Eh2TfTJtWCznwe;dEAL&L%{(Rf!PIAnTWrR+u~_zW-b=*@g4qv|<4t4Qw?<;k3j4kxeB|tXJXd z+##O_uV*!7AJ&@Rifv(l92MG^ZEwrw*_W~Vu=T89%!X&!6jE2=@6?`yx8!dk_afgV z6WV9;siALa-x=&5$Q!){;AW8BE{(9SdDa4472CNIJ9^=IeaEjr{KK=KG)?4x>{&*`OM~j-&rdryX3B9<3J}#FX7+71~ zkM-XRzQK?B%mnNe*kR1yM4s3C80GZtJG?6bXW^xC)NH4X!JD9s;CX}?ojmiHaUhZ1 z7MeShX)#SNTo5Z>f$d>0d;8EY4RXNTZtUJS9L6qm8J`OR_RBAk6K++=T)wH%)b@kN z`fcC|^ z%$dH+CtL#!2bQAYwctkK8rj&8&ETWS1;+ZEQ}5tTQ2Na;jw!Cx+C_f`&B@@4&R;=! z?%X-e&-Ew6elBx4y!bl$sF{*JuoasodcFEsImgto9=q*WDj4g9&^L`serRkH_B+0n zBiKJ=bF{wai$xzQu&XLI-Sa&IKji_B(WY#O`&ME5X{AnSK6zOx>(4(A-!C?ud`)F~ z@UA#_C%V4p5cTDMcJzt8;%D$H!Bo%nEZm6?nmRw_x%ELG!xjt8_kGa#-`#vPJTH_O zFZ(8c(iHE)|9b*od|SfQpD4}FYCNUZiS@V4^~W*sjN^Em{_L96Otijg-w*vwZyd)5 zC#H}8eB@YS_$I|O@;ooRXqao2&4nbIqwy4ej$FieWJ@0SC3UfVW+TjZziV?lI?E}_ z9wvSnA)Z)#G|%tCHOK+*H_;a3Tg_|f3 z{vLqN4q(SC@Tb0Hvo5t()$d#46pt=C%&+Xne$nMY_W3hrI`**A@is$IV6 zaE0|vr+nY^EBK}_1oq&!@L8YNLRYNpV*SqZyH!u`>@)U& zpt3etw>jW?NHT_fmp~(EM>d>l`4-?Ovd!zA;;{8xc46VAeAWrpPw$#edpGQpUdX$G{Il%E zcZ0LD%D*S3FXH#*{8o%ZVNiBZ*DmA7I0y$U{d*8!^jg|rJ!Pcv@QFH=YytA-v_-`K4{vv?;rKfB~~)d z2JieDQRjK@tb!+JV`~)zM;FH$+exJ24A93v|DSUZBeDPx( z9;VFpYV@lB&WQHs0<{0oO4-lcIEN_rFD*b0ux-so=0;Z%E=Nk$Kajs-BDTR^Vp+5EDiH};-xp{Dy@tmeqRlow{TX%!5;Q2;*Wee zLNbJMhaBTBn8QzT{ur4eDq^do9nN)85Oo=StLpmS-h9N?zQLtve_$9)P$0A@btD z_1x1yTk(7>+l9^<=ghzyWZ~Ion~wVFb2@yPHT8p1?+jpmBcFG%-pVQcU1B^>+{C>F z=q*Rt%YDd*H$GXiX9P>ozh>Z@v~uGt8`m8}C&(c)?%|o9=R)8lZRR<@pX4sM<^fla zh=^aECtKQdn=f4ZRQyx+ReulrwpFVqKw}hFXmyUW!42eTgZ(8^VT%6*y!^4<@m+Up z(4aoW53E9;DS+bx$OpM<_R)uiaVmG9boup^5xpw~;3)C}loN8SRJ6{>oZ#dslP}+DItTM*^0m$xQ*QOccoJj`_O}}PlyC4n zvta`In)ZNn3CX_481pg4yck&Nxp%yArg6eZ?3YIUW>d;4k6 zhcR?y1dQJU{qx5O?pQnjkC0t_n@y7ZX!3o@$5nBH^q_PE?vGz zFk$cEZ#lYAbZlT#0%JkSg$DjAa39X?5_c6qJ<6e zbsWAjDEtBUY(4Jzvhn(X^6EqF%6EY;uGc}2iB4_Ub9({VP3ujrm<+M2&qqyf*MG1l z*P8SXU-aIQ9|rlj)*r9qwRJdx4n?`HP-XfXzd`?IOtPu@w?aabGQ=|~%x1C6xrSIZa49Dj>$&zNU|w@X-0pEoLp{m(v8lAUgs zYo{COr@4^+jxA;*4@-AsP%PhqEUZDw< z=>10imT+WYJO(@kM>_}47AIL%I2>c0grmo~Yq9{$^;~kA zo-4*C6pl=8Mh>NJ?P6$2jB|fU_eT>+)|?nSSKg=wmeE)O4Tl~y%w=;InB!9xe zWQD1d58_q!&dBzTXiEw&#Dr9U-#{Pg+HexH1wPM;&@M;+ZqYRAO)sl0!FFR~Ep zqBZ#r?<`;WAvAEhy4mws8B&DpWyGyhcDI9{E0eB5@tjnett`yFjPXuEyx>3zX?oE$o% z9lPRDJsX1XM6pi`=VM!e7o^T*{oxe`TdQo!etAbWcb*6RJ(1C6pt*`0jZ#+U`P6n{ z?WAreH^ukyh-rSDO90GozwpS6>GoCiLN?e*&f*Uq;6g4>U9 zL%s*qJ#mJ)G;>FRoo6htuK$Vk@nt;uXvc$_^B*Jo8n4{;-@UbR?c`w$j(q^wYre~| zpEUy~!Si1jkKm>6Wtd@C)B0=eMfZe5;J3x85PWnV^4eTtC#=kfF9JR9{zW`r^}AB< zE#X+P@dDG=FkRF9Aiie%+qQqA85?hgi*KhFrDT*n%9iIv@q|yh7uOL?Te}Qf1o7J<&kCMLFK9#??(?=w--;eepoN#d6{;R-@~-Y&B`>pr41m zTn6)pa~Yt=Kg9bsZ2NKgiqS_(IxBig)R>);1(V1KW5t~4ogZ_e?M=)Zs{e0Y;6IX999e3OR;(l;xNta?DoRNid%HD4pql^4#J- zbZiRy>mq(@PgpwQ?THBZGTxq$o^cC&TzNUSvS%NLPHOMA=4;Z4ScRLHa|?1XxM26s zUzKf9E^WjQBbiCKG9JFhf9~PoI(H9^SI!|m#r8qoSxY~>`;|18XQAz*=aqb6{CPb| z`SJSMjvO*xKeo=N-EnrR&%mDP^7hPwJlB|}0J}5ooqzDk_3)`R+U|WyCjZ9wp@o5X z&GO#6W_a)Uw6gsicdx$e)fc_;*ZiBTdDeTbdzb9GLu9yJF@E~# zNr-p6=+bztTmBinpXPwZ zu2DW>(X*dWr$GJPe73U|gB|4Uh8BuW43d9G=b|;w3~das2Kv5Segkp|d;9gYwa|X| z$1$28e%x#C5z45oljs*`Jj>A#vu8Qp_Uu3GF17yAPMzx*Tpml?_R(=$^Rv?{S-X|L zv3I{0^BYa^z>bM&Xb^d$M2pdzMgJZrUWOPPQx(#_>WSv@pY6CLUHJLg*-UjsT5Db^ zO^_|-`Z%-(A9l}%mm7*Txhv8M>A=Y=(}O1`6jgShZK7?rG&HeTdVJnJhwDtSv}*19 zN^NW3m!hv28fcuE7$4zI;lk(`&_M_X&q{Re3)MSaek_so8#q4?70#b1zzXxH9r z9&$P&f8|Jz?@7Fd{}7(#mjyOA44|uOe_5Ek1`IpEKl(s-wJ^!QT2Y_6E>x>Co6_BF zJBJ%=ojiQBusqRk$YqO9tUtBPsT<@O_ny}$&yUq7&NH=%iK*TDcxL9`y=S@!b+08~ z>>$rKgzotE5uUFN{nfXRt#y5inX6;<3ry^wY+$#W4Vx?skGt}f9pCR8us1Bi?l!ag z=oejIDSV-4ooU35$vuHL#QI&^A+eOqDU%?7x`Ulr>l zi^>zh{NRb*=vVBgg&Aaf{K1?7!9RDlLoO8jJ!`A#o9CFmOo(>ytE=7IoeuY8eGpsj zMc;`7&qBlGemmCtbS~swY5GYYxx^i-h23mx^Y78~Xs*i2FSdL|qwQaKSYRv>!4RKv zguK3)&(H_Yq`Ra-k;(a0jve!Xt&_MPS>vAG{p7*Y#uW3)%{O(nEcGJ`I6JTmJ}dtr z_Y>cKu0!lL_oi^ihwZbf5g)ga9N!Zqo=bL2`yD%2;cQdHj@I+g*^NcT$=t#BKIEuX ze6E_-s2m49vwxW=B472$CYO5~d2s{r4aDy(%Agne&6*5 zo;%$dM-A@=D+TX4-G!Q~iUSv3W#d-t*jgKlC&KSY$7ris?QIPc57vkuD>RgkJ5Bi& zz?x_IZ-k45OJc=3m7xv!#0I|}Chsm5I|>)`4mz9>J)rHf&zE+}&yi~+ z>pJ{dd*s%J;!@fz`*pv8p6<1wb4WF&CSiSmfC{)&JziN*sI9sgqFR3fBZS!3AX}f=?Gw%j`>+?R`FF4t~ z^2$x}y>h-+IA4=4e0NEIOzZpN2kh^G!4DKIzMa=dzFwZ=Pgl7CWPbg&I2viR`%BLc zuy04~G3*n0_Oz3l37)xnbMhr`uF5a{fKzANV2>u*vqxBuJo{FAGQv1c+oxvonEN!( zxbVN#i#|+azJjf-dwyfl0S+32=5+v`r+3qnVH*>dyTR!dkJ7%?+9kEd;!oJr4j}(n zxJ?yo+&fck8Nr7(EL~s?qO3)f&tsQjM)*O#`%5U`{97=4DM)-{$*%PE4c53+`At zCLDXCvi3ORwP#}(ug=D_(w8x_cUGWVG}GQX&c$qrMTb5a3N@|1Z)sNcPx&h&$X6j^ zU!$uZ-W(1)9kW(6Khazj>%a3N`kiL_r!v08lo&o8vv7dldG_f;)3g`n55@2)s^7iv zLcvM>IrOJ-Xbh=vtUpS>#F#B?WB;vr!)bEpYtHJf&2z(ZI@-`ht4mIk;B|5t^Q-9F zthrv#9Ll#4D#plM6?b*6WWE^VA^$`F0&I()Tvo?;W^oS+uUsJN1WahS}WFB>#jAnwEW^m;4*h7zMY=>OZX0aW`LW@F*=_(_ax8l zo!j(dzyAsNi9g+bR~+vwGa~=c7UIuSN1Ud3IF?E1AZ71`FQPImD;&PqYs zB|mpnI=$@W*VW(oCU$~51?F}^xA(CYy5nb%=ZE=Bu@9xIux4q+6m4FJ9v&j+2fTAb zwUfS+G2&P3{-vE4cLS|8X(J!h+3~E|VroxfBUr|~wuENcIk|b)W_GJg3|U3`&{M<& zNRHW8Gl4Vv^V5SnCZ>-nHi_{n-b!nGWFhB{wU@wit#dQuh#TTJS+5*>*FW2=^Q22# z83Sv$4LCO78}NCc-Iwf7^T$r@q1HtIrSEVqvviS|UbDo7tK>dn>=s&@bQx>D*^^tv zBjJw)`mctD<}a~6w4T;Qjh0sr{1mtiLgRqj0C9Mw?}LMt^RtDvcVxl+p(L@L+E0TX z9=3vqmUdn#JapsV6Y$1?>kWBT!<+LrdALUGiQ&2QB#V17#>AXOUkx-SdDN3RG%tN` zKyD-c)PNHXI#A(a$`bo0J{!3bI?3LZ4_D_wwTIw~#Tn2N#Xsl1hdoK{!YgxMqb=~Q zP{VIzL926I-AKGAdyh6O4X16zk*MtqF_ghJbr+QO!7IOljtFlnh`(k2l3@zO8pgDT z!J)`NA&tbP7c54OmM(nIZY@#Z-^Ja?tjgXide{6_vl)*1ME!wC7SB>@dV{%HxB;=oGcJ+1sj zEZU3EUgV}`o+l?WZt7k^xj28TCz|5Pfb5k-_WJz_*2I&YtXyT~uX%1PlqY}bd7+Ja z_VC}Y9;isKdRVl{wH-)@-166~Df(JmbTfjipIV%5o@uP!*mm#Rzo~QZ$*-7V+n-k4 zqk3)Nuw(^2r(Tb(mw!JoR_{+YpU1cz1J3L<|{LV>a{CQP!}9b_QA*D`U6MGxNRn zCRv$C>#enJ`zUsIVv*XG5<50+%P*R5;Pc{G|J?(V>$|v5AW6A(m7HY*U)D@a-4H&9 zb-aR{WnWmDh5vL)cil!Fp25%a{+u;)g}(#fh{o#J95qhIQ_qoC{IB^9z47a4?1c`- z_mr!zW|lj(c1#}L8J%4j#PQ#tPD5O=VJ+`O_eKY0I_H;Eq%!WW#j`J1(l8_37t zV6*-#IFg^IbA*!1W)3;OLH=Q^iop^t=DCXl8r~l}tE$e( zna&MM8_E4p-C=QHIc1PNB%i9SU^`}NRb9y3w_EasYzoyTb1;RhJr6nw9ew?Oxbl}h z4-lJVnv^@>JB(d8qH~?8!4KBwK5FXPm&A)HbZF7<*iFbG=+rvnzlQfI;(8-|$M&If zsI{qO$nj?8r;-z`j@=pc{CuKkS{u}>M&bsm7OnateuH=ZbMJYZ?zT&n~B8*~m{ z*qL}%HZ9S}X>QCbbg0-+1MKDub$t}x70~x`th22nyQxRJv^Om5bQTJmSpr*G1N_F} zuN598y`udr$E|05Thrv*>WsR+tX+epad=FO zzbLd(e5V~gVPOF6O9gmP1Rk^rKADF;rmBsVnYE6#EVMBNZ4A;d`y84mzn(1*om6@H z>k&_EKW~^Os!z!li{YW|^eK74)`vc-j&y-wUUX!MGCdS6l%8$*IdIv|xi0a5YUW$x z!K9@Dm;sY!_=99x$#<+nli((pUBvf+SyQ=D!0(Cnc& zaaEER?Ow%BF$1{SSa4)HTc-mZfHliu!z%A*=ycSWoqB(GF*@iq_z1~OkmC#-_P5Tx zUu!7peuZPeR8?$b)Q!E*}ah*A!fLJjzSo#b}(dEhYuR<{nrs=%B@_bp98R*ypW)vw?$ zx{$vZyjdc=#((=T>#{)QP49HdP3N-AFwle zoAjd84Yn?LmDx*Ps4)F-e_iTFrY?fLDaPlK{qzBjO4rNa3$r|OabpoXYv-}AG!$ne z^OkW2T=8Keys`TaoWaK1xeA==MfQ3goEdMQkKW%8f)m=~(ucL5w5O8+oY|;-KMH3? z?_(clw3ol+?PZI@o@_JTUXIX@wWmqHu-|8NYmK#E6_f@{0BGVkKpba;czv68%xvCNA+9&o8})5(>BrfmKb~BTK;0L>}lJCmK~xUpOz&< z6}D~r4&60b9k%Btnm_2Z<;i{aJ+dCOl$ew&(#dt)fhP{;2m!-h+?j_uy$+Mx?%j{;xI6?~E01e!jHv z(1qaDdgLbXO0>`NU-oelT+e-n90SnQl`ZHw(5aO6mRDACU!J`6=XVc$Po5X3q3#Y@!8cq8YMllWWSJt1T=icf&UJ2zF4Nr|Rm)&V(%#8(+8b ziWG9Duh~FLvZl8PADm6Bh`(mo@9wW=Z`D#R1pXf(x5gp#gTvUQ78C0c`JQ;B8~dTN z$X(1aWLPKK%YBzPUU)%ta5!E+%3k+j8>!@bYvA44!|$ZmI$q9x*>5fHxWXy+KB6&B zCr1deN5ETm$7y^C?mKv7wsLw@xcLHrkqMjY@)zVb?IAuR^#o^}iD6mEnPAOf{nTk4 zw^RS8*ccV}FIc7+r(vCgGOojU??L8JE)$+)&m#F{loPF;^J?$McS}qvvUR9C^+2ib zABi#7{>r6Fz5CdAK^?0ac{r$JZ9%R`wUI;3$`#XxF5>%o@b%EW*g2r_(o32*W2>5m zeZe?89rA>kQp0+S6D4xBV5^(Xomd;t8MbhD>4y8;H%SKAa8NnJTpBy=wnfK_jPC_- zPwnU~#0H(y;haHI^pX{m27v6IJu=}CSsOP2boh~wN4n!9s8xby^dr4LCzQZ8U$Zhn&IFWEN3 z-TB8^OW-NIQXG-F!80&`r)>xctW4`AOt>0?W z?_IxXllZ3JhxTE8n6t_3*Ljp%5b)0_Z;Q&lcl~Couc?k-J_nVV7p%f?wB{u zu1x`d!}@EE*vN;R>!DNh5yiKYqQ3)!m6mq4Q!dYUyFSQFQR+mAh1D9xzFt`umyXa- z(QoTo9pUY^o*g?nLc7jb)x13&&Cj;b=A@*QqD|2O9-1e+y{ zZRKyl55}VQl036xdN+K8-*J458dJHQyw{G#ul~JptDYUJ)jQm==Go5%n`JIjS!>^U zdSit4WS_SEe7e!jB^o==ojc<(XVC4swh+%unS|Btrgz(R(e3QKJ>AYeL$-+dvIXOq zp_pg(VE99^?2Q+iI{7~`#CpS}Kwh5ZT6REN9m^NR!nQ?xM0pId4RWj{*! zy}w8lZ{qV9>u@ulvtK1&gxYzM^4J+u>)Vr!#YUj zGFQg>QH|6&{;H2My9Uw1!xr$zVNSy1Bxet;Y$$uU7efF{Ys>8bkLdZ{xl8zuVSZY>zl4UJ z1}l8^Eu&zSJ4)^Y;N#D^FmEJ`z6)(E!>?xKyB^+MX6EgjmO}4>FK!8)^ZEn#ujj0} zWM-G=o1bHQL%t4U?)!L>EdabvrN@qx3KbGoC+ndt#?Kv;Z0H?aF08-nmr?~``j&1>3+(a5ZHqQWg} z?I7?Py|?Q!+od&8@>FPj#@fgB*%ul(2aY`m-lP3(>)wu^oM+-)c5SikP`2|#182C* z73ubnfkw_9YHx7deRzg_UuYw{D|3|n2D#)lwWD?uW>z|yskOXZcx}*A)&C&8disY# zS@BBUwH@J%kYWFALDn0%2)@0abpf6+_=p{U4*NemQgsC**-%68!d5XAdFtcn&)_@p zORuf_6UF7|zS}w7>LW#YPbW@GC(eU!mUi!$5TM<&hGF8tGhd@|yEMf3 zSQ_fq`Db{peJ0xjc{DV>$X%trcIZV4{y6a0;376E{7W4UcE+eV?@wct>7kxzT z?gf{BkNwt#Y%Bitp67^7L56Tdb0ljs>O!Vb;0{J)|HS=*cqTtOHfkXPM$?pbEHo*V0{dTK8Y9Z`QiP0IZmeh(c^$^K1S4`{s5rr3$f+J_md z`YF^PZ$g`O|4fuI7BoiYx&gW_x+l9wi$UIIe%0`O<=nS;UFF7##c5M@RMwyG_n-yZ zvsxF~4pXD}G7fZwC# z18g}eSEdVAKHz@P5%K}`Jo&)df4uU;IPLaraR<2|`Pct-ashkv&E*2gR6D8yu&5bh zUlKnRn=wr5>|S)srC4vDpKJfTofsH*ubWDPkMlC0?j&Ljzcg8Th;o{cvai?e0Aqp^%Vzn78CKcF*3Lmq8J zHn(GH#2+z=Hs1Fh*$>&fJ0_;@|JTyS3_Y*jIV#O*%@B1azg}qF0FygwPqS?ug#F82utS*=bq~+#~3X;sN4;(mPD&noZNm zFXz+R5qcx-jMf`v%Z-G|Ck>79?T`K%iWWsZTWtjW5hBFdS5tf^>uGria-8U&Ee~A~ zylq?oYw*pV62mDS@bmHP6T3$0cje%Z8BA4y{Eq z9i%_>GL^G^q$F41{{r`HU%;C9h5FPxOr3=#^1Q_f_?hUsKgQ-!^xd`yOdyXA? zx69Un7DXd7?b^KoULW3wZBMXUr+qZNdp-P7@REO#xQC7ydWKzZFK(hlZ0R%XL0jiO z;HkJB>Ky!`XHwm zwg>g;*U_^ibXIj11nd{K{->QW>leZw?$5uNx*?Lv{CD>IireVpFk{#-n{!u!T_C<` z-=Pn%zvpyc#q+OzL3?E`aA7Ss8*69FFu%6~1I6gp13URGN5IL87ZIF-{@U2yH-=#u z@Yg;Dt~h7opZi&<*V@*QrT+*zU~v`Nq5WsqfW4?TYoMzo#`+NTtgL`Ov=%&yNca1P ziFJxmRUG?i>o+ZMhUbeOPIbER3g^l8*?hLTcsS6x! z-P7v)C*~v?vuu*t5N2+Jt%-iYstrD-*#ALd{RY@q$cekwZ9sPbuK!E?cfD)Vmd$%R za^#2MRsK4R*q+PoGeVvYfLDo5O2;02%9 zrF$%u7tcY4OA7BUgg%*R9r^X9c!Du1rn5x5`Ag6n*lS_-?Y0niU~z`403M4593uXl zy)%?ou3B*T2r*KJR#X%V+S?aTC>|xY>hP@<#iJKaC|)dl3FMZ}1#?SZb9!#+MZi(? z;Zi;=ULcQv1wol?m+R|yWjhN?=%8SpuaQi)z{1qRA|P{KsWtP?I+SsexB|id4c_%Z zqcb0lWqq6YG|wJB#g50d8PBC$4Qu0&OM4${)yjEDcqUHul@tB76rKJeYxh;)(ls@f^~Ybs`1=|Ead4pqTzH6jvJ0dn|Iw!M zEBozAcR2)pSUdwqj??BL@Z)aURiAh29ISAXF}Qh|rHi_`eS|+H@Tb)9uKG>T6lA?! z$_rb8-A7~1x1Qf2TfAhuU|s#5;FT$~z7tzBZSw46^rfbR7BYfL%N79|yegE{C7z z;fs>R{k;<8>2GDsw!atL@r>>>&)KAZ{9mPwjjV_IRUTD+Di^3eU-v%G)W(~^r0amS z@9l~N zchJlN^k3_m0q?Pk?o!->Y%D2ct`xMkU2!DF?98Y>WjEmel+DbM3`70=u~Kgtw!Bwa z;X^-jx8npyN5d@vuea|;;j3-Owg2ymdgoEz6h1G$MVw&`1ux;1#`AObVm0!!=9(au z;|Tn!g%}aVsM@h1Un}0|W57f)hr<76eD(Gn^0nGX0;9r87kc7==04=gGY5gUKUU4jmccJ| z4>XlSpDvxA=K3AV>jl5|*Gsx&;c-(eT*K#g`Mj02MgJ~*pR=Zql{S7?atiYm-}hro z%DA@xor;_Tc|P&0aL&f`c2(nZC9Y)KQ^Rp3UAF#=a$HH57gzEfuS^^qe3&xEK&t|A zC58VNxY4d?px~x{6j$QUBgV7DD10-#mn{&VeO9p%ibJ$CFh47OAA44G(YNn^XR6s? z+k)oFj_aSNdMorHDDURL0e?)v_{2BE;r1T|ad^gOL&u!!nK0Z`|-rW4O*T*9^)?-)n(MEgL)~Bn3o@^h)A^CmV6r;$z3h+Pi zMajP@*;oT{na!?UXjjzINzSQZOD*HKN1y*<6n?7hSI2m!`+J&d`>+M{!4rA=mfI{vS&J$jf{P3yi3IwShrH)=jU41FHAZ`6DLxpGs8 z4*t>~R~a6zojG?}J=dr5J)UcQ#*ua0^&Lmn$&l}JtTlbnaqo$Qp6^nuQyv?QXS=a? zmP%LCe$_d73u}0aiIidejmk8^PK(9uZ4ayw>-KZXM-dM_LxW{ zeT`%U#(=&-%zY&NM^ns(L!3K@M?wGCD_=Cl2hk<%+$>#Ge7WnlD|}J3_?ogz$eC*H zRpFV=<1?p#oan+Xe6@`Y5}kfCJdbu+I@J^K=l3X98~M7&r&Wuq%$#68 zCx_|&9d;vqKI*UiTZTndx*`aRWL5gNlTU}mjc*Ya&ZqzDV6pwdH-|+T_olEO&}P9{ zxhZ_ykj+c9SnFSdo+BKPyg!H@^C)wYE+8Bj2v5XU6S3#r-pg}W7vL@i;GTF)u@l6l zNk2GU7dU-?EKl?kgME2{KGm0PqsMI{e~!7#Jr|5#0$)l>uJq0YPeM1h_|Yqw2w&nv zQx}zwhI7kyKKCJ$NuG_k_ESq2+}M{MJ&&4bTJI$5+VbaEyKm1*&+e--&De4MGO_~< zpubt%B1Xn2i+0O3t@Nu4)>OgAxpS$ z3-AFucaN_%;ky`1pUDuX?&&k9!TrPX!|u3NaI3ZB7`+D=pIvKogs7=b=a3EEb+$TR zPXhmZaGk5!%TdXzW#4?rxBH#e_nYnO<~1ex>+K#68E6jeik<}h^%{F>f~kA6ww#pp zVfUDIuI@J$obtnZ-)UpDu(2|M7pLsWJ^{Pt8Q11H)<(2Oa!DRs&m1mY{-*GbMbo$Z zAB1<|&Nqj*<}ey(f54pde3<9Xu`zR%@EbiJ4ZEY1A3zpV42Rw;Z%%$#hH~K;kd0pR z+E?tY^iiLF3GZa%y~(5FH+r9M1E>Gc^$p5^N$#-q`|xEqzppF3KBmI|kvV&$=lSwT zC+|i-3+`c)CT`Q)yOIUhQGU>qiAUFK111q*qW*(2wDLsx{k3{ynd5z4>EYN|aN6sw zMaC<87N29tTb*w1uqoF6-}R6yZ@utnY2)+wM737_IHzNiPMsAieoOabvnQP?sofjU z`!z3e^Aj&Y{04qg{eGQsSsWNcro0DP+{YWW|7*(nI@@}0tdD#13c@mXM_`Qt^zc#2 zjJ zI5MKA7miI+&Jg3Y{pL64|6{@DOtdcu_c(D+qxZAVgO(yI81Xb|s5Msf;FT(jhM%PV`dpucaxT zf2u4Gcs^m3QM*rJgNT~*ZA^c&wS7!0+dc}6N#)A2$|zoK$NL50CubumCz(ZKwtd++ zI-QyH;^^RCQTVC!*kN8>_R;;pc;{U8)_BKhGQW?n@|^}`{v7xqm}wmbJiTF*ZPp!Q zK!!c7ZP&KqmJ76P;pFjh#pbII-|i~?zUa})u&3iq@IFQJRrY@}wz2p_-qp!F&!m%Y zzryO|ozlsZ#7+4+`E`tgadrB3KHnB4S}*)7+uetCvQFt_16k2ua(|(Fsf;gQo+Y^f z_*r?0c6Daf(jxn8SP%2)OsDl-2Vn{Rj3KwXkkWb)CL$ zX6KDfQm~bNX^x92cdW1M-}mhbKpW%JWg3^k~qK_o=*s8so=#&-%N4 z2Y8Qc0%MIgi9O!qJ*SQLO4=;96@dS0=I+~>)TiuB0UCW;-=pWF{coQ=R<;{=8gG7o z?9K0(Hy`1=`jBmna~2D8;pMnY$Nq=!^D}wkv&Ji9aXN;cFisoxeRBNw>R&qE8SAIU zuRkChq7B7aj@bq_;TU#ly|ZJvO6sEZg{^6KB>*1s>*QElfH8gpKL8|dD0PUHIs`}&;kS>D(qzUW{Z58}b8RsWQY!sGSsRG4@G;u^Gf zRL<_VCtN*V_AvPy4&g63wd$!yZM*o%f^Dh4(f{0XUjLcd-%IQt z(W|S0#nZXQqTi3sUmfCk7{7l48_O;5uXV^dIcT-D|9NvA3-A4Taz9mZ2fm)R3hZ$3 z=NhA&U*Q!o;-B#S+@QK)?a>pPcjvzK$idhpPaRC&c=RAKDb{~jBcIM2TR3BtIrvWM zR{RaQQ>t>CBEA1@k8sGaH}u(xPcbz;JdZf370Owqc0=6T=ukg0s%;z3;gwO0cAUR< zVzw1y<<~VllZ~?c+n>;=&k4{E?mp^VXWo|nDs{HuOGz;|_t{x#{cgu+rSq0C#!ufX zkn5Ual#LLhuJLto2Y}}5_oX$_8YuTd23QZAP0my5Qf5V*wp3TKGhM(n=e6MwKkK)F z?PR)OD?Ah&{C<};tbl1*x$or>OIoVU_9e)elU&0ToGpqxOzjFQeoze+js&xHY zUj_E^Yej+gsa5gp0QhY8+tZEYFhzHP-dnlkhl+PYTMwK1B=ENUnRfI{b1>v|EYK!v zfc-E$#D3TfzSuU^j)gJfGgDn#Q+e=w@#%-oQEN>_OMDulv(#1&AvU!6a~?e*7F6;O zF^o1xQ<9j&2xGFehB(kb3}|OG5Chsg*{gqZfd4;2%%o@+zJ+G)cvQPd`cd5H2s+ix zxPgW3V_0V|%MS(C=hUhnSUOludzwdru^(FEaPPY5jxaY{mwBv3hdDyLmh`eaILoj; zG@~Q+smqUR9_2AI#}>x%pP85Khk0on3FftiwvXVmR)1|1-MI;tcAc4*;#E(r+VSX_ z=BInWf@>E1{(sy0+4(<8?5?+tf}!O-iLrUlcx(DA=DdJ7(*K*+Rcl(_7tGmTU(H!- zZg~*v>o9k%aggVZH*e9NG1k}SZ4q9BSG$DQ;_<@m1i4(wdz5>#qq23A=c;85asuOP zpSa+-?F*bvTKpTeUx)KNxcfEa#%woJ*4Fd(tNrfbb&YVF*p60WPFm?xv_P=fqV~z7 z&`jSW@%yPW;`guZ{GW@*#Nx%sq- zx%uJY2LzL;j`u|82kzK z&lyFpY̥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ℜ)sO2k5VjmO*3w;^M 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'n^3p#n^_v$ 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 LZ}t`FONRazjAy!( literal 0 HcmV?d00001 diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0 b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0 new file mode 100755 index 0000000000000000000000000000000000000000..c7ea48d83ad8064af706e4722ca3764d1047e7a0 GIT binary patch literal 133208 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 z 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≺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 literal 0 HcmV?d00001 diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0 b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0 new file mode 100755 index 0000000000000000000000000000000000000000..aceb212bde18fe5b11f5d92389125cfdac1119b5 GIT binary patch literal 133200 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 z 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

  • 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

    Join the DroidDeck Discord

    +

    + Star History Rank +

    +

    Droid-Deck%2FDroidDeck | Trendshift Droid-Deck%2FDroidDeck | Trendshift From a7753a667c9dd8062d65aabda7fc345ecce8e066 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sun, 25 Oct 2026 11:28:25 -0400 Subject: [PATCH 007/135] fix: Flatpak apps see the device's network, so WebRTC streams connect (#1548) --- .../droiddeck/launcher/runtime/BwrapSpawner.kt | 2 ++ .../launcher/runtime/BwrapSpawnerTest.kt | 15 +++++++++++++++ 2 files changed, 17 insertions(+) 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 4825646786..81fabd7f7d 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt @@ -220,6 +220,7 @@ object BwrapSpawner { val binds = ArrayList() val paths = libs.map { lib -> "$PRELOAD_DIR/${lib.substringAfterLast('/')}".also { binds.add(Bind(rootfs + lib, it)) } } env["LD_PRELOAD"] = (paths + listOfNotNull(env["LD_PRELOAD"]?.takeIf { it.isNotBlank() })).joinToString(":") + File(rootfs, NET_LINK).takeIf { it.isFile }?.let { binds.add(Bind(it.path, "/$NET_LINK")) } env["FAKE_EVDEV_DIR"]?.let { File(it).parent }?.let { dev -> binds.addAll(bindsFor(session, rootfs, dev, dev)) } @@ -227,6 +228,7 @@ object BwrapSpawner { } private const val PRELOAD_DIR = "/run/droiddeck-preload" + private const val NET_LINK = "etc/droiddeck-net" private const val ZYPAK_SHIM = "#!/bin/sh\nprogram=\$1\nshift\nexec \"\$program\" --no-sandbox \"\$@\"\n" diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt index 2cb5e5edd6..dfb3286511 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt @@ -119,6 +119,21 @@ class BwrapSpawnerPlanTest { assertEquals("org.example.Game", plan.env["FLATPAK_ID"]) } + @Test fun sandboxedAppsSeeTheSessionsNetworkLink() { + val context = RuntimeEnvironment.getApplication() + val rootfs = LinuxRuntime.rootDir(context) + val lib = File(rootfs, "usr/local/lib/libblsession.so").apply { parentFile?.mkdirs(); writeText("") } + val preload = File(rootfs, "etc/ld.so.preload").apply { parentFile?.mkdirs(); writeText("/usr/local/lib/libblsession.so\n") } + val link = File(rootfs, "etc/droiddeck-net").apply { writeText("if wlan0 2 1500\n") } + try { + val plan = BwrapSpawner.plan(context, request(op("t" to "dir", "dest" to "/tmp")), dir) + assertEquals("/run/droiddeck-preload/libblsession.so", plan.env["LD_PRELOAD"]) + assertEquals(link.path, plan.binds.single { it.guest == "/etc/droiddeck-net" }.host) + } finally { + listOf(lib, preload, link).forEach { it.delete() } + } + } + @Test fun zypakLaunchesTheBrowserWithoutItsSandbox() { val context = RuntimeEnvironment.getApplication() val app = File(runtime, "app").apply { File(this, "bin").mkdirs() } From c9565bc0b9b27d0865aa6ce24a983c2a143583b2 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sun, 25 Oct 2026 11:28:28 -0400 Subject: [PATCH 008/135] Skip umu-protonfixes for Black Ops III and Dark Souls Remastered (#1508) GE-based Protons, the default with the x86-64 Steam client, run umu-protonfixes. Its Black Ops III fix switches the prefix to Wine's ALSA driver, which has no device here and replaces DirectAudio, and its Dark Souls Remastered fix runs the VC++ 2017 installer, which fails under ARM64 Proton. --- README.md | 2 ++ tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env | 6 ++++++ tools/tests/test_game_environment.py | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/README.md b/README.md index 9cfb7a1653..e2b975dd86 100644 --- a/README.md +++ b/README.md @@ -72,3 +72,5 @@ Camera hand tracking runs Google's [MediaPipe](https://github.com/google-ai-edge The Store installs and runs apps with [Flatpak](https://github.com/flatpak/flatpak) (LGPL-2.1). Its sandbox goes through DroidDeck's own bubblewrap shim, which follows how Flatpak hands bwrap its environment. Chromium and Electron apps from Flathub start their browser processes through [zypak](https://github.com/refi64/zypak) by [@refi64](https://github.com/refi64) (BSD-3-Clause); its source was read to see that it always spawns them through Flatpak's spawn portal, which is why DroidDeck starts them directly without Chromium's sandbox instead. Steam's Browse buttons open a GTK 3 file chooser through PyGObject (LGPL-2.1-or-later). It runs under Steam's own `reaper` with Steam's app ID, which [gamescope](https://github.com/ValveSoftware/gamescope) (BSD-2-Clause) reads from the process tree (`GetAppIdFromReaper` in `src/Utils/Process.cpp`) to show it over Steam. + +Black Ops III and Dark Souls Remastered start without [umu-protonfixes](https://github.com/Open-Wine-Components/umu-protonfixes) (BSD-2-Clause), whose fixes for them (`311210.py` sets ALSA audio, `570940.py` installs VC++ 2017) fail under ARM64 Proton. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 505b75e02c..d430246a04 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -122,6 +122,12 @@ def arkham_city_x87(game): +@fix +def protonfixes_off(game): + if game.stem in ("blackops3", "darksoulsremastered"): + return {"PROTONFIXES_DISABLE": "1"}, [], "umu-protonfixes off (its ALSA audio and VC++ installer steps fail here)" + + @fix def caravan_sandwitch_feature_level(game): if "caravansandwitch.exe" in game.files or game.stem == "caravansandwitch-win64-shipping": diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 208e4b1dd1..833c23a60f 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -357,6 +357,13 @@ class GameEnvironmentTest(unittest.TestCase): (asylum / name).touch() self.assertEqual(MODULE["engine_fixes"](str(asylum / "BmLauncher.exe"), []), ({}, [], [])) + def test_black_ops_iii_and_dark_souls_remastered_skip_protonfixes(self): + for exe in ("/game/Call of Duty Black Ops III/BlackOps3.exe", "/game/DARK SOULS REMASTERED/DarkSoulsRemastered.exe"): + env, extra, notes = MODULE["engine_fixes"](exe, []) + self.assertEqual((env, extra), ({"PROTONFIXES_DISABLE": "1"}, [])) + self.assertTrue(notes) + self.assertEqual(MODULE["engine_fixes"]("/game/Game/DarkSoulsII.exe", []), ({}, [], [])) + def test_caravan_sandwitch_and_cyberpunk_run_at_feature_level_12_1(self): with tempfile.TemporaryDirectory() as tmp: caravan = Path(tmp) / "Caravan SandWitch" From e62698e39554c2bc57dee97b230bfef6e5f78be5 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 11:33:24 -0400 Subject: [PATCH 009/135] fix: show when non-Steam games were last played, from Steam's shortcuts (#1551) --- .../droiddeck/launcher/frontend/Library.kt | 24 +++++++-- .../LibraryShortcutsLastPlayedTest.kt | 54 +++++++++++++++++++ 2 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/LibraryShortcutsLastPlayedTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 05f3f98691..5fb1a4ecd9 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -204,9 +204,24 @@ object Library { (runCatching { g.folder.canonicalPath }.getOrDefault(g.folder.absolutePath) !in claimed && AddedGames.guestPath(context, g.folder).let { it == null || it !in claimed }) } - return (steam + own.map { g -> addedGame(context, g, roots) }).distinctBy { it.gameId } + val played = shortcutsLastPlayed(SessionPrefs.steamRoot(context, arch)) + return (steam + own.map { g -> addedGame(context, g, roots, played[g.appId] ?: 0L) }).distinctBy { it.gameId } } + /** Steam's LastPlayTime for each non-Steam shortcut, by its unsigned shortcut app id. */ + internal fun shortcutsLastPlayed(root: File): Map = runCatching { + val config = AddedGames.accountConfig(root) ?: return emptyMap() + val bytes = File(config, "shortcuts.vdf").takeIf { it.isFile }?.readBytes() ?: return emptyMap() + val vdf = SteamAppInfo.readMap(java.nio.ByteBuffer.wrap(bytes).order(java.nio.ByteOrder.LITTLE_ENDIAN), null) + (vdf["shortcuts"] as? Map<*, *>)?.values?.filterIsInstance>()?.mapNotNull { s -> + fun int(key: String) = s.entries.firstOrNull { (it.key as? String).equals(key, ignoreCase = true) } + ?.let { (it.value as? String)?.toLongOrNull() }?.and(0xFFFFFFFFL) + val id = int("appid") ?: return@mapNotNull null + val time = int("LastPlayTime")?.takeIf { it > 0L } ?: return@mapNotNull null + id to time + }?.toMap() + }.getOrNull().orEmpty() + fun claimedFolders(steam: List): Set = steam.filter(::fromSteamClient).flatMap { g -> val dir = g.gameFiles ?: return@flatMap emptyList() listOfNotNull( @@ -215,11 +230,14 @@ object Library { ) }.toSet() - fun addedGame(context: Context, g: AddedGames.Game, roots: List = steamLibraries(context).map { it.first }): SteamGame = + fun addedGame( + context: Context, g: AddedGames.Game, roots: List = steamLibraries(context).map { it.first }, + lastPlayed: Long = 0L, + ): SteamGame = AddedGameArt.resolve(context, g).let { art -> SteamGame( g.steamAppId ?: g.appId.toInt(), g.name, art.portrait ?: art.header, ADDED, g.gameId, - hero = art.hero ?: art.header, gameFiles = g.folder, + hero = art.hero ?: art.header, lastPlayed = lastPlayed, gameFiles = g.folder, protonPrefix = protonPrefix(context, g.steamAppId?.toLong() ?: g.appId, libraries = roots), icon = art.icon?.takeIf { it.extension.lowercase() != "ico" }, source = g.source, storeId = g.storeId, diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/LibraryShortcutsLastPlayedTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/LibraryShortcutsLastPlayedTest.kt new file mode 100644 index 0000000000..cc9a1ac7df --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/LibraryShortcutsLastPlayedTest.kt @@ -0,0 +1,54 @@ +package com.droiddeck.launcher.frontend + +import java.io.ByteArrayOutputStream +import java.io.File +import java.nio.ByteBuffer +import java.nio.ByteOrder +import org.junit.Assert.assertEquals +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class LibraryShortcutsLastPlayedTest { + @get:Rule val tmp = TemporaryFolder() + + private fun steamRoot(): File = tmp.newFolder("Steam").also { root -> + File(root, "config").mkdirs() + File(root, "config/loginusers.vdf").writeText( + "\"users\"\n{\n\t\"76561198352563669\"\n\t{\n\t\t\"AccountName\"\t\t\"a\"\n\t\t\"MostRecent\"\t\t\"1\"\n\t}\n}\n") + } + + private class Vdf { + val out = ByteArrayOutputStream() + fun key(type: Int, k: String) { out.write(type); out.write(k.toByteArray()); out.write(0) } + fun map(k: String, body: Vdf.() -> Unit) { key(0, k); body(); out.write(8) } + fun str(k: String, v: String) { key(1, k); out.write(v.toByteArray()); out.write(0) } + fun int(k: String, v: Long) { key(2, k); out.write(ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN).putInt(v.toInt()).array()) } + } + + @Test fun readsEachShortcutsLastPlayTimeByUnsignedAppId() { + val root = steamRoot() + val vdf = Vdf().apply { + map("shortcuts") { + map("0") { int("appid", 3388195926L); str("AppName", "Rayman 2"); int("LastPlayTime", 1792931476L) } + map("1") { int("appid", 2228102537L); str("AppName", "Do Not Disturb"); int("LastPlayTime", 0L) } + map("2") { int("appid", 1234L); str("appname", "Old"); int("lastplaytime", 1700000000L) } + } + out.write(8) + } + File(root, "userdata/392297941/config").apply { mkdirs() }.resolve("shortcuts.vdf").writeBytes(vdf.out.toByteArray()) + assertEquals(mapOf(3388195926L to 1792931476L, 1234L to 1700000000L), Library.shortcutsLastPlayed(root)) + } + + @Test fun missingOrBrokenShortcutsGiveNothing() { + val root = steamRoot() + assertEquals(emptyMap(), Library.shortcutsLastPlayed(root)) + File(root, "userdata/392297941/config").apply { mkdirs() }.resolve("shortcuts.vdf").writeBytes(byteArrayOf(0, 's'.code.toByte())) + assertEquals(emptyMap(), Library.shortcutsLastPlayed(root)) + } +} From 709c041b24225a01d9365b8f6eef97b17131c470 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 11:41:39 -0400 Subject: [PATCH 010/135] perf: pause the home page's ambient motion after 20 s without input (#1550) * perf: pause the home page's ambient motion after 20 s without input * fix: restart the idle timer when a touch gesture ends --- .../droiddeck/launcher/FrontEndActivity.kt | 18 +++++ .../droiddeck/launcher/ui/FrontEndScreen.kt | 6 ++ .../com/droiddeck/launcher/ui/LiftSheet.kt | 16 +++-- .../droiddeck/launcher/ui/SessionLoading.kt | 2 +- .../com/droiddeck/launcher/ui/SteamHome.kt | 68 ++++++++++++------- 5 files changed, 81 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index ed974c2560..72ec9349dd 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1272,6 +1272,23 @@ class FrontEndActivity : ComponentActivity() { } } + override fun onUserInteraction() { + super.onUserInteraction() + com.droiddeck.launcher.ui.Ambient.poke() + } + + override fun dispatchTouchEvent(event: android.view.MotionEvent): Boolean { + if (event.actionMasked == android.view.MotionEvent.ACTION_UP || event.actionMasked == android.view.MotionEvent.ACTION_CANCEL) { + com.droiddeck.launcher.ui.Ambient.poke() + } + return super.dispatchTouchEvent(event) + } + + override fun dispatchGenericMotionEvent(event: android.view.MotionEvent): Boolean { + com.droiddeck.launcher.ui.Ambient.poke() + return super.dispatchGenericMotionEvent(event) + } + override fun dispatchKeyEvent(event: KeyEvent): Boolean { if (event.keyCode == KeyEvent.KEYCODE_BUTTON_A) com.droiddeck.launcher.ui.HeldKeys.confirm = event.action == KeyEvent.ACTION_DOWN if (showComponents && (event.keyCode == KeyEvent.KEYCODE_BUTTON_L1 || event.keyCode == KeyEvent.KEYCODE_BUTTON_R1)) { @@ -1297,6 +1314,7 @@ class FrontEndActivity : ComponentActivity() { com.droiddeck.launcher.stores.StoresState.refresh(this) com.droiddeck.launcher.stores.StoresState.libraryListener = { refreshAddedGames(); refresh() } com.droiddeck.launcher.ui.Motion.refresh(this) + com.droiddeck.launcher.ui.Ambient.poke() com.droiddeck.launcher.ui.QuitFlood.take()?.let { c -> returning = ReturningFlood(c, com.droiddeck.launcher.ui.LaunchOrigin.takeReturn()) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index b8ac10ba11..bde8b54f7f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -254,6 +254,12 @@ internal object Motion { if (scale == 0f) snap() else spring(damping, stiffness) } +internal object Ambient { + var poked by mutableStateOf(0L) + private set + fun poke() { poked = android.os.SystemClock.uptimeMillis() } +} + private val Shape10 = RoundedCornerShape(10.dp) internal val Shape12 = RoundedCornerShape(12.dp) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt b/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt index c428b8b97d..fae0f318d2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt @@ -641,11 +641,7 @@ internal fun LiftHero( } @Composable -internal fun Handle(height: Dp, above: Boolean = false) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val shape = if (above) RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp) else RoundedCornerShape(bottomStart = 12.dp, bottomEnd = 12.dp) - val still = Motion.scale == 0f +private fun handleBob(): Float { val bob = androidx.compose.animation.core.rememberInfiniteTransition(label = "handle") val lift by bob.animateFloat( 0f, 0f, @@ -660,6 +656,16 @@ internal fun Handle(height: Dp, above: Boolean = false) { ), label = "handleBob", ) + return lift +} + +@Composable +internal fun Handle(height: Dp, above: Boolean = false) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shape = if (above) RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp) else RoundedCornerShape(bottomStart = 12.dp, bottomEnd = 12.dp) + val still = Motion.scale == 0f || !ambientAwake() + val lift = if (still) 0f else handleBob() Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp), modifier = Modifier.height(height).clip(shape).background(colors.surface) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt index d1c478eb08..cdde71b587 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt @@ -222,7 +222,7 @@ fun LoadingOverlay( .background(colors.background) .blockTouches(), ) { - CapsuleWall(games, driftMs = 65_000, modifier = Modifier.alpha(0.3f)) + CapsuleWall(games, driftMs = 65_000, modifier = Modifier.alpha(0.3f), pauseWhenIdle = false) Box( Modifier.fillMaxSize().drawBehind { drawRect( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt index dfb6d2525d..888d87e232 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt @@ -5,12 +5,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import com.droiddeck.launcher.R import androidx.compose.ui.res.stringResource import androidx.compose.animation.core.FastOutSlowInEasing -import androidx.compose.animation.core.RepeatMode -import androidx.compose.runtime.State -import androidx.compose.animation.core.animateFloat -import androidx.compose.animation.core.infiniteRepeatable -import androidx.compose.animation.core.rememberInfiniteTransition -import androidx.compose.animation.core.tween import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -76,6 +70,38 @@ private const val WALL_MIN_GAMES = 4 private const val WALL_DISTINCT = 40 private const val DRIFT_STEP_NS = 15_000_000L +private const val AMBIENT_IDLE_NS = 20_000_000_000L + +@Composable +internal fun ambientAwake(): Boolean { + val poked = Ambient.poked + var awake by remember { mutableStateOf(true) } + LaunchedEffect(poked) { + awake = true + kotlinx.coroutines.delay(AMBIENT_IDLE_NS / 1_000_000) + awake = false + } + return awake +} + +@Composable +internal fun AmbientFrames(pauseWhenIdle: Boolean = true, step: (Long) -> Unit) { + val onStep = androidx.compose.runtime.rememberUpdatedState(step) + val poked = if (pauseWhenIdle) Ambient.poked else 0L + if (Motion.scale != 0f) LaunchedEffect(poked, pauseWhenIdle) { + var shown = 0L + var end = Long.MAX_VALUE + while (shown < end) withFrameNanos { now -> + if (shown == 0L) { + shown = now + if (pauseWhenIdle) end = now + AMBIENT_IDLE_NS + } else if (now - shown >= DRIFT_STEP_NS) { + onStep.value(now - shown) + shown = now + } + } + } +} @Composable internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) { @@ -179,6 +205,7 @@ internal fun CapsuleWall( modifier: Modifier = Modifier, owned: List> = emptyList(), featured: List = emptyList(), + pauseWhenIdle: Boolean = true, ) { val pal = LocalPalette.current val blank = remember(pal) { WallCapsule(Brush.linearGradient(listOf(pal.surface, pal.background)), edge = pal.line) } @@ -188,7 +215,7 @@ internal fun CapsuleWall( val store = if (owned.isEmpty()) featured.filter { shown.add(it.appId) }.map { it.name to it.art } else emptyList() (library + store).take((WALL_DISTINCT - games.size).coerceAtLeast(0)) } - TiltedWall(games.size + padding.size, driftMs, modifier) { i -> + TiltedWall(games.size + padding.size, driftMs, modifier, pauseWhenIdle = pauseWhenIdle) { i -> when { i < games.size -> WallCapsule(artBrush(hueOf(games[i].name)), games[i].art) i - games.size < padding.size -> padding[i - games.size].let { (seed, art) -> WallCapsule(artBrush(hueOf(seed)), art) } @@ -208,20 +235,13 @@ internal fun TiltedWall( capH: androidx.compose.ui.unit.Dp = 168.dp, gap: androidx.compose.ui.unit.Dp = 14.dp, corner: androidx.compose.ui.unit.Dp = 10.dp, + pauseWhenIdle: Boolean = true, capsule: (index: Int) -> WallCapsule, ) { val still = Motion.scale == 0f val drift = remember { mutableFloatStateOf(0f) } - val period = androidx.compose.runtime.rememberUpdatedState(driftMs) - if (!still) LaunchedEffect(Unit) { - var shown = 0L - while (true) withFrameNanos { now -> - if (shown == 0L) shown = now - else if (now - shown >= DRIFT_STEP_NS) { - drift.floatValue = ((drift.floatValue + (now - shown) / (period.value * 1_000_000.0 * Motion.scale)) % 1.0).toFloat() - shown = now - } - } + AmbientFrames(pauseWhenIdle) { dt -> + drift.floatValue = ((drift.floatValue + dt / (driftMs * 1_000_000.0 * Motion.scale)) % 1.0).toFloat() } val density = LocalDensity.current BoxWithConstraints(modifier.fillMaxSize()) { @@ -307,10 +327,9 @@ private fun DrawScope.drawCapsule(look: WallCapsule, art: Painter?, radius: Floa private fun CapsuleFan(games: List) { val pal = LocalPalette.current val density = LocalDensity.current - val transition = rememberInfiniteTransition(label = "fan") - val floats = listOf(9_000, 11_000, 13_000).map { ms -> - transition.animateFloat(0f, 1f, infiniteRepeatable(tween(ms, easing = FastOutSlowInEasing), RepeatMode.Reverse), label = "float") - } + val clock = remember { androidx.compose.runtime.mutableLongStateOf(0L) } + AmbientFrames { clock.longValue += it } + val floatMs = listOf(9_000, 11_000, 13_000) val still = Motion.scale == 0f val slots = listOf( FanSlot(0.54f, 0.14f, 0.62f, -9f), @@ -331,7 +350,7 @@ private fun CapsuleFan(games: List) { for (i in games.indices.reversed()) { val slot = slots[i] val h = maxHeight * slot.height - val v: State = floats[i] + val ms = floatMs[i] val look = WallCapsule(artBrush(hueOf(games[i].name)), games[i].art) val art = look.art?.let { rememberCapsuleArt(it, with(density) { Size((h * 2f / 3f).toPx(), h.toPx()) }, radius) } Spacer( @@ -339,7 +358,10 @@ private fun CapsuleFan(games: List) { .offset(x = maxWidth * slot.x, y = maxHeight * slot.y) .size(h * 2f / 3f, h) .graphicsLayer { - val t = if (still) 0f else v.value + val t = if (still) 0f else { + val phase = (clock.longValue / (ms * 1_000_000.0 * Motion.scale)) % 2.0 + FastOutSlowInEasing.transform((if (phase < 1.0) phase else 2.0 - phase).toFloat()) + } rotationZ = slot.lean + 2f * t translationY = -12.dp.toPx() * t shadowElevation = 24.dp.toPx() From 9cecd528e89f993f8e910716d25c32b6b304b485 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 11:50:44 -0400 Subject: [PATCH 011/135] fix: Start without Steam uses the launch options set in Steam's Properties (#1552) * fix: Start without Steam uses the launch options set in Steam's Properties * fix: treat a malformed shortcuts.vdf as having no launch options --- .../launcher/session/NoSteamLaunch.kt | 4 +- .../launcher/session/NoSteamLaunchTest.kt | 2 + .../usr/local/bin/droiddeck-proton-run | 41 ++++++++++++++++++- tools/tests/test_desktop_open.py | 37 +++++++++++++++++ 4 files changed, 81 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt b/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt index 6787d92d22..c77e8dc161 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt @@ -37,7 +37,9 @@ object NoSteamLaunch { fun addedCommand(game: AddedGames.Game): Command = Command( PROTON_RUN, - listOf("--app", (game.appId and 0xFFFFFFFFL).toString(), "--dir", game.guestDir, "--options", game.launchOptions, "--", game.guestExe), + listOf("--app", (game.appId and 0xFFFFFFFFL).toString(), "--dir", game.guestDir) + + (if (game.launchOptions.isEmpty()) emptyList() else listOf("--options", game.launchOptions)) + + listOf("--", game.guestExe), game.name, ) diff --git a/app/src/test/java/com/droiddeck/launcher/session/NoSteamLaunchTest.kt b/app/src/test/java/com/droiddeck/launcher/session/NoSteamLaunchTest.kt index 84c995ee23..d0739df4ae 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/NoSteamLaunchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/NoSteamLaunchTest.kt @@ -61,6 +61,8 @@ class NoSteamLaunchTest { listOf("--app", "2733369024", "--dir", game.guestDir, "--options", "-windowed", "--", game.guestExe), added.args, ) + val plain = NoSteamLaunch.addedCommand(AddedGames.Game(game.folder, game.name, game.exe, game.guestExe, game.guestDir, 2733369024L, 0L, emptyList(), source = "gog")) + assertEquals(listOf("--app", "2733369024", "--dir", game.guestDir, "--", game.guestExe), plain.args) assertNull(NoSteamLaunch.command(shortcut, null)) val steam = NoSteamLaunch.command(steamGame, null)!! assertEquals(listOf("--app", "413150"), steam.args) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run index 5d59829bf1..8d0805a878 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run @@ -13,7 +13,8 @@ the STEAM_COMPAT_* environment - so its wrapper applies the game's settings, com --window keeps the program in the desktop's own window, drawn with WineD3D. --app starts one game without the Steam client (its Start without Steam): a Steam game's default Windows launch option from appinfo.vdf when no program is given, else the program in that -shortcut's own prefix, started in --dir with the shortcut's launch options (--options). +shortcut's own prefix, started in --dir with the shortcut's launch options (--options). Without +--options it takes the launch options set in the client's Properties for that game or shortcut. """ import json import os @@ -230,6 +231,40 @@ def shortcut_entries(root): return entries +def vdf_string(token): + return re.sub(r'\\(.)', r'\1', token[1:-1]) if token.startswith('"') else "" + + +def steam_options(app, root): + """The launch options the client keeps for a game (localconfig.vdf) or a shortcut (shortcuts.vdf).""" + try: + tool = runpy.run_path(os.path.join(BIN_DIR, "droiddeck-steam-shortcuts")) + account = tool["account_dir"](root) + if not account: + return "" + if int(app) >= STEAM_APP_LIMIT: + with open(os.path.join(account, "config", "shortcuts.vdf"), "rb") as f: + shortcuts = tool["parse"](f.read()).get("shortcuts", {}) + for value in shortcuts.values(): + if isinstance(value, dict) and (value.get("appid", value.get("AppId")) or 0) & 0xFFFFFFFF == int(app): + options = value.get("LaunchOptions", value.get("launchoptions", "")) + return options if isinstance(options, str) else "" + return "" + tokens = compat()["tokenize"](read_text(os.path.join(account, "config", "localconfig.vdf")) or "") + start = compat()["find_block"](tokens, ["UserLocalConfigStore", "Software", "Valve", "Steam", "apps", app]) + if start is None: + return "" + end, depth = compat()["block_end"](tokens, start), 0 + for i in range(start + 1, end): + if tokens[i] in ("{", "}"): + depth += 1 if tokens[i] == "{" else -1 + elif depth == 0 and tokens[i].lower() == '"launchoptions"' and i + 1 < end: + return vdf_string(tokens[i + 1]) + except (OSError, ValueError, IndexError, KeyError, TypeError, AttributeError, struct.error): + pass + return "" + + def shortcut(program, root): for appid, exe, start in shortcut_entries(root): if same_file(program, exe): @@ -372,7 +407,7 @@ def arguments(program, args): def main(argv): window = False - app, start, options = None, None, "" + app, start, options = None, None, None while argv and argv[0].startswith("--"): option = argv.pop(0) if option == "--window": @@ -397,6 +432,8 @@ def main(argv): say("usage: droiddeck-proton-run [--window] PROGRAM [ARGS...]") return 2 root = os.environ.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or STEAM_ROOT + if options is None: + options = steam_options(app, root) if app is not None else "" extra, args = split_options(options) if not argv: if int(app) >= STEAM_APP_LIMIT: diff --git a/tools/tests/test_desktop_open.py b/tools/tests/test_desktop_open.py index de98e75c6e..085b1a7479 100644 --- a/tools/tests/test_desktop_open.py +++ b/tools/tests/test_desktop_open.py @@ -568,6 +568,43 @@ class ProtonRunTest(Temp): self.assertTrue((self.root / "steamapps/compatdata/2733369024").is_dir()) self.assertEqual(dirs, [str(start)]) + def write_account(self): + self.write("Steam/config/loginusers.vdf", + '"users"\n{\n\t"76561198352563669"\n\t{\n\t\t"MostRecent"\t\t"1"\n\t}\n}\n') + return "Steam/userdata/392297941/config/" + + def test_without_steam_and_options_a_game_takes_its_steam_launch_options(self): + config = self.write_account() + self.write(config + "localconfig.vdf", '"UserLocalConfigStore"\n{\n\t"Software"\n\t{\n\t\t"Valve"\n\t\t{\n' + '\t\t\t"Steam"\n\t\t\t{\n\t\t\t\t"apps"\n\t\t\t\t{\n\t\t\t\t\t"413150"\n\t\t\t\t\t{\n' + '\t\t\t\t\t\t"cloud"\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\t"LaunchOptions"\t\t"-wrong"\n\t\t\t\t\t\t}\n' + '\t\t\t\t\t\t"LaunchOptions"\t\t"DXVK_HUD=1 %command% -d3d9 \\"-name=Two Words\\""\n' + '\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\n') + shortcuts = runpy.run_path(str(BIN / "droiddeck-steam-shortcuts")) + self.write(config + "shortcuts.vdf", shortcuts["write"]({"shortcuts": { + "0": {"appid": -1561598272, "AppName": "Batman", "LaunchOptions": "-d3d9"}, + "1": {"appid": -1, "AppName": "Other", "LaunchOptions": "-x"}, + }})) + root = str(self.root) + self.assertEqual(RUN["steam_options"]("413150", root), 'DXVK_HUD=1 %command% -d3d9 "-name=Two Words"') + self.assertEqual(RUN["steam_options"]("2733369024", root), "-d3d9") + self.assertEqual(RUN["steam_options"]("70", root), "") + self.assertEqual(RUN["steam_options"]("2733369025", root), "") + info = {"common": {"type": "Game"}, "config": {"launch": { + "0": {"executable": "Game.exe", "type": "default", "config": {"oslist": "windows"}}}}} + self.write("Steam/appcache/appinfo.vdf", appinfo({413150: info})) + program = self.game("413150", "Some Game", "Game.exe") + code, calls, _ = self.run_main(["--app", "413150"]) + self.assertIsNone(code) + _, argv, env = calls[0] + self.assertEqual(argv[1:], ["waitforexitandrun", str(program), "-d3d9", "-name=Two Words"]) + self.assertEqual(env["DXVK_HUD"], "1") + bat = self.write("Games/GOG/Batman/Batman.exe", b"MZ") + code, calls, _ = self.run_main(["--app", "2733369024", "--", str(bat)]) + self.assertEqual(calls[0][1][1:], ["waitforexitandrun", str(bat), "-d3d9"]) + code, calls, _ = self.run_main(["--app", "2733369024", "--options", "", "--", str(bat)]) + self.assertEqual(calls[0][1][1:], ["waitforexitandrun", str(bat)]) + def test_launch_options_split_like_steam_does(self): split = RUN["split_options"] self.assertEqual(split(""), ({}, [])) From 3995fe3829d211497079c23894ffb65c5c1627e8 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 11:50:47 -0400 Subject: [PATCH 012/135] fix: install XACT audio with Skyrim so its voice lines play (#1554) * fix: install XACT audio with Skyrim so its voice lines play * fix: rescan cached component findings when the detectors change --- .../droiddeck/launcher/frontend/AutoComponents.kt | 2 ++ .../com/droiddeck/launcher/frontend/SteamRedists.kt | 5 +++++ .../droiddeck/launcher/frontend/WinCompSources.kt | 5 +++-- .../launcher/frontend/WinComponentDetectorsTest.kt | 12 ++++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt index fc32744273..ae43cf0fec 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt @@ -257,10 +257,12 @@ object AutoComponents { private const val FINDINGS = "wincomp-findings.json" + private const val DETECTORS = "d2" internal fun signature(context: Context, game: Library.SteamGame): String { val folder = game.gameFiles val parts = listOfNotNull( + DETECTORS, folder?.lastModified(), folder?.let { SteamRedists.manifest(it, game.appId)?.lastModified() }, folder?.let { StoreGameSidecar.file(it).lastModified() }, diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt index f41b8265ff..e3285b260a 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt @@ -15,6 +15,11 @@ object SteamRedists { "228989" to ("vcredist2022_dll" to "VC++ 2022"), "228990" to ("d3dx9" to "DirectX (June 2010)"), ) + /** Redists a game's own install script runs on Windows that its shared depots don't name. */ + val SCRIPTED = mapOf( + 72850 to listOf("xact" to "DirectX XACT audio"), + 489830 to listOf("xact_x64" to "DirectX XACT audio (64-bit)"), + ) private val BLOCK = Regex("\"SharedDepots\"\\s*\\{([^}]*)\\}", RegexOption.IGNORE_CASE) private val ENTRY = Regex("\"(\\d+)\"\\s+\"\\d+\"") diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt b/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt index 63e8627790..390b13d523 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt @@ -77,8 +77,9 @@ object WinCompSources { fun steamList(context: Context, gameDir: File?, appId: Int, gameName: String, auto: Boolean): List { val local = SteamRedists.detect(gameDir, appId) - val pairs = if (local.isNotEmpty()) local.map { it.componentName to it.label } - else SteamAppInfo.info(context, appId)?.let { steamDepots(it.sharedDepots) }.orEmpty() + val pairs = (if (local.isNotEmpty()) local.map { it.componentName to it.label } + else SteamAppInfo.info(context, appId)?.let { steamDepots(it.sharedDepots) }.orEmpty()) + + SteamRedists.SCRIPTED[appId].orEmpty() return pairs.map { (component, label) -> Finding(component, label, if (auto) Origin.STEAM else Origin.STEAM_NAME, auto, listOf(label, gameName, appId.toString())) } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/WinComponentDetectorsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/WinComponentDetectorsTest.kt index fbf077910d..cf39fb396a 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/WinComponentDetectorsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/WinComponentDetectorsTest.kt @@ -42,6 +42,18 @@ class WinComponentDetectorsTest { assertEquals(emptyList(), SteamRedists.detect(game, 1)) } + @Test fun skyrimGetsTheXactAudioItsInstallScriptRunsOnWindows() { + val steamapps = tmp.newFolder("steamapps") + val game = File(steamapps, "common/Skyrim Special Edition").apply { mkdirs() } + File(steamapps, "appmanifest_489830.acf").writeText("\"AppState\"\n{\n\t\"SharedDepots\"\n\t{\n\t\t\"228990\"\t\t\"228980\"\n\t}\n}\n") + val context = androidx.test.core.app.ApplicationProvider.getApplicationContext() + val found = WinCompSources.steamList(context, game, 489830, "Skyrim Special Edition", auto = true) + assertEquals(listOf("d3dx9", "xact_x64"), found.map { it.component }) + assertTrue(found.all { it.auto && it.origin == WinCompSources.Origin.STEAM }) + assertEquals(listOf("DirectX XACT audio (64-bit)", "Skyrim Special Edition", "489830"), found.last().args) + assertEquals(emptyList(), WinCompSources.steamList(context, game, 409710, "Other", auto = true).map { it.component }) + } + @Test fun thePrefixCountsOnlyWhatDroidDeckDidNotPutThere() { val compat = tmp.newFolder("compatdata", "409710") val pfx = File(compat, "pfx") From dfe8227f49acd4f4feafbc0a7ce3c92b47271035 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 11:58:38 -0400 Subject: [PATCH 013/135] fix: run RoboCop: Rogue City at D3D12 feature level 12_1 (#1553) --- tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env | 8 ++++++++ tools/tests/test_game_environment.py | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index d430246a04..3f7154ba3d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -134,6 +134,14 @@ def caravan_sandwitch_feature_level(game): return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "Caravan SandWitch: D3D12 feature level 12_1 (12_2 hands it mesh shader pipelines vkd3d-proton cannot build)" +@fix +def robocop_rogue_city_feature_level(game): + """vkd3d-proton turns mesh shaders off on Adreno, but 12_2 still advertises them, and UE5 then builds mesh + pipelines with no pipeline layout that crash Turnip on launch.""" + if "robocop.exe" in game.files or game.stem == "robocop-win64-shipping": + return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "RoboCop: Rogue City: D3D12 feature level 12_1" + + @fix def cyberpunk_feature_level(game): if game.stem == "cyberpunk2077" or ( diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 833c23a60f..56e5e651df 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -364,7 +364,7 @@ class GameEnvironmentTest(unittest.TestCase): self.assertTrue(notes) self.assertEqual(MODULE["engine_fixes"]("/game/Game/DarkSoulsII.exe", []), ({}, [], [])) - def test_caravan_sandwitch_and_cyberpunk_run_at_feature_level_12_1(self): + def test_caravan_sandwitch_robocop_and_cyberpunk_run_at_feature_level_12_1(self): with tempfile.TemporaryDirectory() as tmp: caravan = Path(tmp) / "Caravan SandWitch" shipping = caravan / "CaravanSandWitch/Binaries/Win64" @@ -376,8 +376,13 @@ class GameEnvironmentTest(unittest.TestCase): (cyberpunk / "bin/x64").mkdir(parents=True) for name in ("REDprelauncher.exe", "bin/x64/Cyberpunk2077.exe"): (cyberpunk / name).touch() + robocop = Path(tmp) / "RoboCop Rogue City" + (robocop / "RoboCop/Binaries/Win64").mkdir(parents=True) + for name in ("RoboCop.exe", "RoboCop/Binaries/Win64/RoboCop-Win64-Shipping.exe"): + (robocop / name).touch() games = [caravan / "CaravanSandWitch.exe", caravan / ".droiddeck-launch.bat", shipping / "CaravanSandWitch-Win64-Shipping.exe", + robocop / "RoboCop.exe", robocop / "RoboCop/Binaries/Win64/RoboCop-Win64-Shipping.exe", cyberpunk / "REDprelauncher.exe", cyberpunk / "bin/x64/Cyberpunk2077.exe"] for exe in games: env, extra, notes = MODULE["engine_fixes"](str(exe), []) From 2be08bc67d2e4d9896498d70d87c34b7c28a9918 Mon Sep 17 00:00:00 2001 From: Jamison Prine Date: Sun, 25 Oct 2026 11:06:45 -0500 Subject: [PATCH 014/135] feat: adjustable RAM and VRAM caps for the container (#1537) * feat: adjustable RAM and VRAM caps for the container Performance > Memory gets two sliders: - RAM cap (soft, Steam sessions): when the session is resident above the cap, the session watcher compresses the Steam client into zRAM, waits for its page-out acknowledgment, then compresses the rest of the session (processes that loaded libblsession) if still over. Nothing is closed. Measured at most every 30 s; the client is read back once usage drops below the cap. Invalid values leave the cap off. Needs zRAM swap. - VRAM cap: sets dxgi.maxDeviceMemory ahead of the game's own DXVK_CONFIG, so Direct3D games budget for less video memory. A game profile still wins. Applies from the next session. * fix: back off the RAM cap when paging out cannot get under it A cap below the game's working set was never met, so the watcher paged out the client and the whole session every 30 s for the rest of the session. Usage is still measured every 30 s, but after a page-out that leaves the session over the cap the next one waits twice as long (60 s up to 10 min), resetting once usage is under the cap. The client step is skipped while the client is already under 512 MB resident. * fix: RAM cap covers desktop Steam, signals each group once, no idle churn - Steam opened from the desktop runs the same session watcher, so the cap is exported whenever the Steam client runs, not only in Steam mode. - The second page-out goes to the rest of the session only; Steam was signalled again even when its own step had been skipped as already small. - A cap page-out while no game runs stays paged out. Reading the client back right away pushed it over the cap again and repeated every minute; only a game closing while over the cap still defers a read-back. * fix: RAM cap marks the client packed only when it compressed it When the cap skipped the client as already small during a game, it still recorded the client as packed, so the regular in-game client page-out waited up to 300 s for a page-out that never happened. --------- Co-authored-by: jazzyjames <182448902+jazzyjamesgames@users.noreply.github.com> --- .../droiddeck/launcher/FrontEndActivity.kt | 10 ++ .../droiddeck/launcher/core/DeviceReport.kt | 2 + .../launcher/session/SessionPrefs.kt | 12 ++ .../launcher/session/SessionService.kt | 6 +- .../launcher/session/SettingsReset.kt | 2 +- .../launcher/ui/PerformanceDialog.kt | 24 ++++ app/src/main/res/values/strings.xml | 8 ++ .../overlay/usr/local/bin/droiddeck-game-env | 13 +++ .../overlay/usr/local/bin/droiddeck-session | 108 ++++++++++++++++-- tools/tests/test_game_environment.py | 8 ++ 10 files changed, 180 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 72ec9349dd..f81680e0fa 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -152,6 +152,8 @@ class FrontEndActivity : ComponentActivity() { private var syncFallback by mutableStateOf(true) private var fsyncFirst by mutableStateOf(false) private var gamescopeRealtime by mutableStateOf(false) + private var ramCapMb by mutableStateOf(0) + private var vramCapMb by mutableStateOf(0) private var gpuClockPin by mutableStateOf(false) private var prootNoSeccomp by mutableStateOf(false) private var prootFastPath by mutableStateOf(true) @@ -1799,6 +1801,10 @@ class FrontEndActivity : ComponentActivity() { fsyncFirst = fsyncFirst, gamescopeRealtime = gamescopeRealtime, gpuClockPin = gpuClockPin, + ramCapMb = ramCapMb, vramCapMb = vramCapMb, + deviceRamMb = (android.app.ActivityManager.MemoryInfo() + .also((getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager)::getMemoryInfo).totalMem / (1024 * 1024)).toInt(), + ramCapAvailable = com.droiddeck.launcher.core.ZramSupport.supported(), prootNoSeccomp = prootNoSeccomp, prootFastPath = prootFastPath, cursorComposite = cursorComposite, guestHostname = guestHostname, phantomWarning = phantomWarning, onClientOverride = { on -> SessionPrefs.setClientCpusOverride(this, on); clientOverride = on }, @@ -1812,6 +1818,8 @@ class FrontEndActivity : ComponentActivity() { onFsyncFirst = { on -> SessionPrefs.setFsyncFirst(this, on); fsyncFirst = on }, onGamescopeRealtime = { on -> SessionPrefs.setGamescopeRealtime(this, on); gamescopeRealtime = on }, onGpuClockPin = { on -> SessionPrefs.setGpuClockPin(this, on); gpuClockPin = on }, + onRamCapMb = { mb -> SessionPrefs.setRamCapMb(this, mb); ramCapMb = mb }, + onVramCapMb = { mb -> SessionPrefs.setVramCapMb(this, mb); vramCapMb = mb }, onProotNoSeccomp = { on -> SessionPrefs.setProotNoSeccomp(this, on); prootNoSeccomp = on }, onProotFastPath = { on -> SessionPrefs.setProotFastPath(this, on); prootFastPath = on }, onCursorComposite = { on -> SessionPrefs.setCursorComposite(this, on); cursorComposite = on }, @@ -2007,6 +2015,8 @@ class FrontEndActivity : ComponentActivity() { syncFallback = SessionPrefs.syncFallback(this) fsyncFirst = SessionPrefs.fsyncFirst(this) gamescopeRealtime = SessionPrefs.gamescopeRealtime(this) + ramCapMb = SessionPrefs.ramCapMb(this) + vramCapMb = SessionPrefs.vramCapMb(this) gpuClockPin = SessionPrefs.gpuClockPin(this) prootNoSeccomp = SessionPrefs.prootNoSeccomp(this) prootFastPath = SessionPrefs.prootFastPath(this) 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 058b07dd5d..0246ed8e6b 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -256,6 +256,8 @@ object DeviceReport { EsyncPacks.status(LinuxRuntime.rootDir(context)).let { k("droiddeck-esync packs", "${it.installed} installed, ${it.wanted} wanted") } k("Linux x86 (FEX)", if (com.droiddeck.launcher.runtime.LinuxFex.ready(context)) "ready" else "not set up") k("gamescope realtime", SessionPrefs.gamescopeRealtime(context)) + k("RAM cap", SessionPrefs.ramCapMb(context).let { if (it > 0) "$it MB" else "off" }) + k("VRAM cap", SessionPrefs.vramCapMb(context).let { if (it > 0) "$it MB" else "driver default" }) k("proot without seccomp", SessionPrefs.prootNoSeccomp(context)) k("proot fast path", SessionPrefs.prootFastPath(context)) k("Guest host name", SessionPrefs.guestHostname(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 d77cced0b8..8ab1f7e751 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -453,6 +453,18 @@ object SessionPrefs { prefs(context).edit().putBoolean("gamescopeRealtime", on).apply() } + fun ramCapMb(context: Context): Int = prefs(context).getInt("ramCapMb", 0).coerceAtLeast(0) + + fun setRamCapMb(context: Context, mb: Int) { + prefs(context).edit().putInt("ramCapMb", mb.coerceAtLeast(0)).apply() + } + + fun vramCapMb(context: Context): Int = prefs(context).getInt("vramCapMb", 0).coerceAtLeast(0) + + fun setVramCapMb(context: Context, mb: Int) { + prefs(context).edit().putInt("vramCapMb", mb.coerceAtLeast(0)).apply() + } + fun gpuClockPin(context: Context): Boolean = prefs(context).getBoolean("gpuClockPin", false) fun setGpuClockPin(context: Context, on: Boolean) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index c49e3f7acb..9d0a99fe1b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -738,7 +738,11 @@ class SessionService : Service() { guest.add("BL_FSYNC_FIRST=" + (if (SessionPrefs.fsyncFirst(this)) "1" else "0")) guest.add("BL_GAMESCOPE_REALTIME=" + (if (SessionPrefs.gamescopeRealtime(this)) "1" else "0")) if (SessionPrefs.cursorComposite(this)) guest.add("BL_CURSOR_COMPOSITE=1") - if (com.droiddeck.launcher.core.ZramSupport.supported()) guest.add("BL_ZRAM=1") + if (com.droiddeck.launcher.core.ZramSupport.supported()) { + guest.add("BL_ZRAM=1") + if (steamHere) SessionPrefs.ramCapMb(this).takeIf { it > 0 }?.let { guest.add("BL_RAM_CAP_MB=$it") } + } + SessionPrefs.vramCapMb(this).takeIf { it > 0 }?.let { guest.add("BL_VRAM_MB=$it") } guest.add("BANNER_AUDIO_DIRECT_DECAY=0") val extra = extraEnv() + com.droiddeck.launcher.agent.AgentEnv.beginSession(this) if (extra.none { it.startsWith("TU_DEBUG=") }) guest.add("$GAME_TU_DEBUG=" + (tuOverride ?: if (tuDriver) "sysmem" else "")) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 27bc081b0d..7d7f0cff52 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -18,7 +18,7 @@ object SettingsReset { "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", "stretch16x9", "picturePosition", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", - "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", + "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "cursorComposite", "guestHostname", "fexPreset", "forceSsbs", "logs", "storageDiagnostics", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt index 25f344a77a..d8c83c9a0b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt @@ -28,6 +28,8 @@ import com.droiddeck.launcher.session.SessionPrefs class CoreRow(val core: Int, val label: String) +private const val MEMORY_CAP_STEP_MB = 256 + @Composable fun PerformancePage( cores: List, @@ -44,6 +46,10 @@ fun PerformancePage( fsyncFirst: Boolean, gamescopeRealtime: Boolean, gpuClockPin: Boolean, + ramCapMb: Int, + vramCapMb: Int, + deviceRamMb: Int, + ramCapAvailable: Boolean, prootNoSeccomp: Boolean, prootFastPath: Boolean, cursorComposite: Boolean, @@ -60,6 +66,8 @@ fun PerformancePage( onFsyncFirst: (Boolean) -> Unit, onGamescopeRealtime: (Boolean) -> Unit, onGpuClockPin: (Boolean) -> Unit, + onRamCapMb: (Int) -> Unit, + onVramCapMb: (Int) -> Unit, onProotNoSeccomp: (Boolean) -> Unit, onProotFastPath: (Boolean) -> Unit, onCursorComposite: (Boolean) -> Unit, @@ -123,6 +131,22 @@ fun PerformancePage( gpuClockPin, onChange = onGpuClockPin, ) } + SettingsGroup(stringResource(R.string.perf_memory)) { + val top = (deviceRamMb / MEMORY_CAP_STEP_MB * MEMORY_CAP_STEP_MB).coerceAtLeast(MEMORY_CAP_STEP_MB) + val off = stringResource(R.string.perf_cap_off) + val auto = stringResource(R.string.perf_cap_auto) + SliderRow( + stringResource(R.string.perf_ram_cap), + if (ramCapAvailable) stringResource(R.string.perf_ram_cap_hint) else stringResource(R.string.perf_ram_cap_unavailable), + ramCapMb.coerceAtMost(top), 0..top, step = MEMORY_CAP_STEP_MB, enabled = ramCapAvailable, + format = { if (it == 0) off else "$it MB" }, onChange = onRamCapMb, + ) + SliderRow( + stringResource(R.string.perf_vram_cap), stringResource(R.string.perf_vram_cap_hint), + vramCapMb.coerceAtMost(top), 0..top, step = MEMORY_CAP_STEP_MB, + format = { if (it == 0) auto else "$it MB" }, onChange = onVramCapMb, + ) + } SettingsGroup(stringResource(R.string.perf_fixes)) { ToggleRow( host, "sysmem", stringResource(R.string.perf_sysmem), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1ca3066271..0889e5d8be 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -552,6 +552,14 @@ gamescope: realtime GPU queue Prioritizes the compositor\'s GPU work. Can smooth frame pacing at some cost to games. GPU + Memory + Off + Driver default + RAM cap + Applies while the Steam client runs, in Steam mode or from the desktop. When the session uses more than this, Steam and then the session\'s other supported processes are compressed into zRAM. A soft cap: nothing is closed, but games may stutter while pages come back. + Needs zRAM swap, which this device does not have. + VRAM cap + The video memory DXVK reports to Direct3D games, so they budget textures for less. A game\'s own DXVK settings still win. Takes effect at the next session. Hold the GPU at its top clock Adreno only. Fewer hitches, more battery use and heat. Session fixes diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 3f7154ba3d..43f24138d7 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -287,6 +287,18 @@ def game_gpu(env): return result +def vram_cap(env): + """Puts the session's VRAM cap ahead of the game's own DXVK settings, so a game profile can still raise it.""" + value = env.get("BL_VRAM_MB", "") + if not re.fullmatch(r"[1-9][0-9]{0,6}", value): + return env + result = env.copy() + cap = "dxgi.maxDeviceMemory = %d" % int(value) + own = result.get("DXVK_CONFIG", "").strip().strip(";").strip() + result["DXVK_CONFIG"] = cap + "; " + own if own else cap + return result + + def apply_config(env, config, app_id, fixes=None): if config.get("version") != 1: raise ValueError("unsupported environment configuration") @@ -560,6 +572,7 @@ def main(): command = offline_without_anticheat(command, env) if mic_enabled == "0": env["BANNER_AUDIO_DIRECT_MIC"] = "0" + env = vram_cap(env) env = force_ssbs(command, env) try: xbox = runpy.run_path(str(Path(__file__).with_name("droiddeck-xbox"))) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index e95a7a940a..043e8304d5 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -446,48 +446,134 @@ case $mode in fi if [ "${BL_ZRAM:-0}" = 1 ]; then step "zRAM compression: on" + _bl_ram_cap=0 + case ${BL_RAM_CAP_MB:-} in + ''|0) ;; + *[!0-9]*|0*|???????*) step "RAM cap: ignored invalid value '$BL_RAM_CAP_MB'" ;; + *) _bl_ram_cap=$((BL_RAM_CAP_MB * 1024)); step "RAM cap: ${BL_RAM_CAP_MB} MB" ;; + esac ( bl_zram_scan() { - _bl_game=0 _bl_pids=() + _bl_game=0 _bl_pids=() _bl_others=() for _d in /proc/[0-9]*; do + [ "${_d#/proc/}" != "$BASHPID" ] || continue # Under FEX the program is FEX's first argument. { IFS= read -r -d '' _c && case ${_c##*/} in FEX|FEXInterpreter) IFS= read -r -d '' _c ;; esac; } \ 2>/dev/null < "$_d/cmdline" || continue case ${_c##*/} in reaper) _bl_game=1 ;; steam|steamwebhelper) _bl_pids+=("${_d#/proc/}") ;; + *) _bl_others+=("${_d#/proc/}") ;; esac done } bl_zram_usage() { local _p _k _v _u _rss=0 _swap=0 - for _p in "${_bl_pids[@]}"; do + for _p in "$@"; do while read -r _k _v _u; do case $_k in VmRSS:) _rss=$((_rss + _v)) ;; VmSwap:) _swap=$((_swap + _v)) ;; esac done 2>/dev/null < "/proc/$_p/status" done - echo "${#_bl_pids[@]} processes, resident $((_rss / 1024)) MB, in zram $((_swap / 1024)) MB" + _bl_rss=$_rss + echo "$# processes, resident $((_rss / 1024)) MB, in zram $((_swap / 1024)) MB" + } + # Only processes that loaded libblsession are the session's own and answer SIGURG. + bl_session_others() { + local _p + _bl_session=() + for _p in "${_bl_others[@]}"; do + grep -q -m1 '/libblsession\.so$' "/proc/$_p/maps" 2>/dev/null && _bl_session+=("$_p") + done + } + bl_zram_pick() { + if [ "$1" = session ]; then + bl_session_others + _pids=("${_bl_session[@]}") + else + _pids=("${_bl_pids[@]}") + fi + } + # Same protocol as SessionSuspendController: an empty ack when the page-out starts, a byte when it is done. + # A process whose SIGURG handler was replaced never acks, so it is not waited for after the first 2 s. + bl_zram_wait() { + local _p _left _start=$SECONDS + while [ $((SECONDS - _start)) -lt 12 ]; do + _left=0 + for _p in "$@"; do + [ -s "/tmp/.bl-zram.ack.$_p" ] && continue + [ -d "/proc/$_p" ] || continue + [ $((SECONDS - _start)) -ge 2 ] && [ ! -e "/tmp/.bl-zram.ack.$_p" ] && continue + _left=1 + done + [ "$_left" = 1 ] || break + nap 0.2 + done + for _p in "$@"; do rm -f "/tmp/.bl-zram.ack.$_p"; done } bl_zram_send() { - step "zRAM: $2 ($(bl_zram_usage))" - printf '%s' "$1" > /tmp/.bl-zram - [ "${#_bl_pids[@]}" = 0 ] || kill -URG "${_bl_pids[@]}" 2>/dev/null - nap 5 + local _mode=$1 _what=$2 _which=$3 _pids _p + bl_zram_pick "$_which" + step "zRAM: $_what ($(bl_zram_usage "${_pids[@]}"))" + for _p in "${_pids[@]}"; do rm -f "/tmp/.bl-zram.ack.$_p"; done + printf '%s' "$_mode" > /tmp/.bl-zram + [ "${#_pids[@]}" = 0 ] || kill -URG "${_pids[@]}" 2>/dev/null + if [ "$_mode" = 1 ]; then bl_zram_wait "${_pids[@]}"; else nap 5; fi bl_zram_scan - step "zRAM: done ($(bl_zram_usage))" + bl_zram_pick "$_which" + step "zRAM: done ($(bl_zram_usage "${_pids[@]}"))" } - _bl_since=-1 _bl_packed=-1 + bl_over_cap() { + [ "$_bl_ram_cap" -gt 0 ] || return 1 + _bl_measured=$SECONDS + bl_session_others + bl_zram_usage "${_bl_pids[@]}" "${_bl_session[@]}" > /dev/null + [ "$_bl_rss" -gt "$_bl_ram_cap" ] + } + bl_cap_due() { + [ "$_bl_ram_cap" -gt 0 ] && { [ "$_bl_measured" -lt 0 ] || [ $((SECONDS - _bl_measured)) -ge 30 ]; } + } + _bl_since=-1 _bl_packed=-1 _bl_measured=-1 _bl_unpack=0 _bl_capped=-1 _bl_backoff=30 while kill -0 $$ 2>/dev/null; do bl_zram_scan + if bl_cap_due; then + if bl_over_cap; then + # A cap below the game's working set cannot be met; paging out again every 30 s only churns. + if [ "$_bl_capped" -lt 0 ] || [ $((SECONDS - _bl_capped)) -ge "$_bl_backoff" ]; then + bl_zram_usage "${_bl_pids[@]}" > /dev/null + if [ "$_bl_rss" -ge $((512 * 1024)) ]; then + bl_zram_send 1 "over the ${BL_RAM_CAP_MB} MB RAM cap, compressing the client" client + [ "$_bl_game" = 1 ] && _bl_packed=$SECONDS + else + step "RAM cap: over, client already small ($((_bl_rss / 1024)) MB resident), skipping it" + fi + bl_over_cap && bl_zram_send 1 "still over the RAM cap, compressing the rest of the session" session + if bl_over_cap; then + _bl_backoff=$((_bl_backoff * 2 > 600 ? 600 : _bl_backoff * 2)) + step "RAM cap: still over after paging out, next try in ${_bl_backoff} s" + else + _bl_backoff=30 + fi + _bl_capped=$SECONDS + fi + else + _bl_backoff=30 + if [ "$_bl_unpack" = 1 ] && [ "$_bl_game" = 0 ]; then + bl_zram_send 0 "back under the RAM cap, reading the client back" client + _bl_unpack=0 + fi + fi + fi if [ "$_bl_game" = 1 ]; then [ "$_bl_since" -ge 0 ] || _bl_since=$SECONDS if [ $((SECONDS - _bl_since)) -ge 20 ] && [ "${#_bl_pids[@]}" -gt 0 ] && { [ "$_bl_packed" -lt 0 ] || [ $((SECONDS - _bl_packed)) -ge 300 ]; }; then - bl_zram_send 1 "compressing the client" + bl_zram_send 1 "compressing the client" client _bl_packed=$SECONDS fi elif [ "$_bl_since" -ge 0 ]; then - [ "$_bl_packed" -lt 0 ] || bl_zram_send 0 "game closed, reading the client back" + if [ "$_bl_packed" -ge 0 ]; then + if bl_over_cap; then _bl_unpack=1; else bl_zram_send 0 "game closed, reading the client back" client; _bl_unpack=0; fi + fi _bl_since=-1 _bl_packed=-1 fi nap 5 diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 56e5e651df..817281af5b 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -180,6 +180,14 @@ class GameEnvironmentTest(unittest.TestCase): self.assertEqual(MODULE["apply_config"](env, config, "42")["TU_DEBUG"], "sysmem") self.assertNotIn("TU_DEBUG", MODULE["apply_config"](env, config, "43")) + def test_the_vram_cap_comes_before_the_games_own_dxvk_settings(self): + cap = MODULE["vram_cap"] + self.assertEqual(cap({"BL_VRAM_MB": "4096"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4096") + self.assertEqual(cap({"BL_VRAM_MB": "2048", "DXVK_CONFIG": "dxvk.maxFrameRate = 60;"})["DXVK_CONFIG"], + "dxgi.maxDeviceMemory = 2048; dxvk.maxFrameRate = 60") + for off in ({}, {"BL_VRAM_MB": "0"}, {"BL_VRAM_MB": "lots"}, {"BL_VRAM_MB": "²"}, {"BL_VRAM_MB": "-1"}): + self.assertNotIn("DXVK_CONFIG", cap(off)) + def test_a_games_wine_sync_choice_also_reaches_its_setup_runs(self): env = {"BL_SYNC": "1", "BL_SYNC_FALLBACK": "1", "BL_FSYNC_FIRST": "0", "OTHER": "kept"} config = {"version": 1, "games": {"42": {"BL_SYNC": "0", "BL_FSYNC_FIRST": "1", "PROTON_NO_ESYNC": "1", "FEX_TSOENABLED": "1"}}} From c6bc8aef04ef9f9b336d015c42562fcc7e7f4aaa Mon Sep 17 00:00:00 2001 From: VIIII4 Date: Mon, 26 Oct 2026 00:07:26 +0800 Subject: [PATCH 015/135] Add an optional HTTP proxy for downloads (#1474) * Add an optional HTTP proxy for downloads Downloads only reached GitHub directly or through URL-rewrite mirrors, which does not help where a local proxy is the workable route. Setup now takes a host:port HTTP proxy that every Downloader connection uses, independently of the download source mode. * Reference the Kotlin object instance from Java Java cannot call a Kotlin object member on the class name without @JvmStatic; the surrounding code already uses INSTANCE. * Assert the proxy host literal without a reverse lookup InetSocketAddress.getHostName reverse-resolves on some JVMs (127.0.0.1 became localhost on CI); hostString is the literal. * Pass the app proxy into the guest environment The Steam client installer and the guest package tools fetch with plain curl against their own CDNs, outside Downloader. Export the usual proxy variables for them when the app proxy is set; proot shares the host network, so a localhost proxy is reachable as-is. --------- Co-authored-by: VIIII4 --- .../droiddeck/launcher/FrontEndActivity.kt | 7 ++++ .../droiddeck/launcher/core/DownloadSource.kt | 26 ++++++++++++++ .../droiddeck/launcher/core/Downloader.java | 6 +++- .../launcher/runtime/GuestCommand.kt | 10 ++++++ .../droiddeck/launcher/ui/FrontEndScreen.kt | 2 ++ .../droiddeck/launcher/ui/FrontEndSetup.kt | 12 +++++++ app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../launcher/core/DownloadSourceProxyTest.kt | 36 +++++++++++++++++++ 9 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/core/DownloadSourceProxyTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index f81680e0fa..5e5bf5c9a3 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -170,6 +170,7 @@ class FrontEndActivity : ComponentActivity() { private var downloadSource by mutableStateOf(DownloadSource.MODE_AUTO) private var downloadMirror by mutableStateOf("") private var downloadPrefix by mutableStateOf("") + private var downloadProxy by mutableStateOf("") private var animationsEnabled by mutableStateOf(true) private var launcherIcon by mutableStateOf(LauncherIcon.DARK) private var gameStoresEnabled by mutableStateOf(true) @@ -768,6 +769,7 @@ class FrontEndActivity : ComponentActivity() { downloadSource = DownloadSource.mode(this) downloadMirror = DownloadSource.mirror(this) downloadPrefix = DownloadSource.custom(this) + downloadProxy = DownloadSource.proxyHostPort(this) DownloadSource.probe() animationsEnabled = SessionPrefs.animationsEnabled(this) LauncherIcon.repair(this, intent?.component) @@ -833,6 +835,7 @@ class FrontEndActivity : ComponentActivity() { downloadSource = downloadSource, downloadMirror = downloadMirror, downloadPrefix = downloadPrefix, + downloadProxy = downloadProxy, animationsEnabled = animationsEnabled, launcherIcon = launcherIcon, gameStoresEnabled = gameStoresEnabled, @@ -1033,6 +1036,10 @@ class FrontEndActivity : ComponentActivity() { DownloadSource.setCustom(this, prefix) downloadPrefix = DownloadSource.custom(this) }, + onDownloadProxy = { value -> + DownloadSource.setProxy(this, value) + downloadProxy = DownloadSource.proxyHostPort(this) + }, onHomeApp = { manageHomeApp() }, onHomeScreen = { on -> HomeApp.setHomeScreenEnabled(this, on) diff --git a/app/src/main/java/com/droiddeck/launcher/core/DownloadSource.kt b/app/src/main/java/com/droiddeck/launcher/core/DownloadSource.kt index 870e8ed424..b11e3113af 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DownloadSource.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DownloadSource.kt @@ -3,6 +3,8 @@ package com.droiddeck.launcher.core import android.content.Context import android.content.SharedPreferences import java.net.HttpURLConnection +import java.net.InetSocketAddress +import java.net.Proxy import java.net.URL import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.CountDownLatch @@ -20,6 +22,7 @@ object DownloadSource { private const val KEY_MODE = "mode" private const val KEY_MIRROR = "mirror" private const val KEY_CUSTOM = "custom" + private const val KEY_PROXY = "proxy" private const val KEY_FASTEST = "fastest" private const val PROBE = "https://raw.githubusercontent.com/Droid-Deck/DroidDeck/main/README.md" @@ -175,6 +178,22 @@ object DownloadSource { prefs(context)?.edit()?.putString(KEY_CUSTOM, normalizePrefix(prefix))?.apply() } + fun proxyHostPort(context: Context): String = prefs(context)?.getString(KEY_PROXY, "") ?: "" + + fun setProxy(context: Context, value: String) { + prefs(context)?.edit()?.putString(KEY_PROXY, normalizeProxy(value))?.apply() + } + + /** An HTTP proxy every Downloader connection uses, or null when none is configured. */ + fun httpProxy(): Proxy? = proxyOf(prefs()?.getString(KEY_PROXY, "") ?: "") + + internal fun proxyOf(value: String): Proxy? { + val host = value.substringBefore(':') + val port = value.substringAfter(':', "").toIntOrNull() ?: return null + if (host.isEmpty()) return null + return Proxy(Proxy.Type.HTTP, InetSocketAddress(host, port)) + } + fun reset(context: Context) { lastGood = null prefs(context)?.edit()?.clear()?.apply() @@ -205,4 +224,11 @@ object DownloadSource { if (trimmed.isEmpty() || trimmed.startsWith("http://")) return "" return if (trimmed.startsWith("https://")) trimmed else "https://$trimmed" } + + internal fun normalizeProxy(value: String): String { + val trimmed = value.trim().removePrefix("http://").trimEnd('/') + val host = trimmed.substringBefore(':') + val port = trimmed.substringAfter(':', "").toIntOrNull() ?: 0 + return if (host.isNotEmpty() && port in 1..65535) "$host:$port" else "" + } } diff --git a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java index 183076188d..98e41ab6f6 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java +++ b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java @@ -11,6 +11,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.HttpURLConnection; +import java.net.Proxy; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.List; @@ -277,7 +278,10 @@ public final class Downloader { } private static HttpURLConnection open(String url, int readTimeoutMs) throws java.io.IOException { - HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(); + // An explicit Proxy routes the connection through the app setting instead of the system-wide proxy. + Proxy proxy = DownloadSource.INSTANCE.httpProxy(); + HttpURLConnection connection = (HttpURLConnection) (proxy != null + ? new URL(url).openConnection(proxy) : new URL(url).openConnection()); connection.setConnectTimeout(CONNECT_TIMEOUT_MS); connection.setReadTimeout(readTimeoutMs); connection.setInstanceFollowRedirects(true); diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt index 8b4f14e5ad..33317e15b2 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.runtime import android.content.Context import android.os.Environment +import com.droiddeck.launcher.core.DownloadSource import com.droiddeck.launcher.core.HostProcess import com.droiddeck.launcher.session.OrphanReaper import com.droiddeck.launcher.session.SessionFiles @@ -45,6 +46,15 @@ object GuestCommand { "DROIDDECK_BWRAP_SOCKET=${BwrapSpawner.socket(context)}", "XDG_DATA_DIRS=/root/.local/share/flatpak/exports/share:/usr/local/share:/usr/share", ) + // The Steam client installer and the package tools inside the guest fetch over plain curl, + // so the app proxy has to reach them through the environment proot starts them with. + DownloadSource.proxyHostPort(context).takeIf { it.isNotEmpty() }?.let { hostPort -> + cmd += listOf( + "http_proxy=http://$hostPort", "https_proxy=http://$hostPort", + "HTTP_PROXY=http://$hostPort", "HTTPS_PROXY=http://$hostPort", + "no_proxy=localhost,127.0.0.1,::1", "NO_PROXY=localhost,127.0.0.1,::1", + ) + } fastPathKey?.let { cmd += ProotFastPath.guestEnv(root, binds, it) } cmd += argv val builder = ProcessBuilder(cmd).directory(root).redirectErrorStream(true) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index bde8b54f7f..41e18b486e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -137,6 +137,7 @@ class FrontEndState( val downloadSource: String = DownloadSource.MODE_AUTO, val downloadMirror: String = "", val downloadPrefix: String = "", + val downloadProxy: String = "", val animationsEnabled: Boolean = true, val launcherIcon: String = com.droiddeck.launcher.LauncherIcon.DARK, val gameStoresEnabled: Boolean = true, @@ -214,6 +215,7 @@ class FrontEndActions( val onDownloadSource: (String) -> Unit = {}, val onDownloadMirror: (String) -> Unit = {}, val onDownloadPrefix: (String) -> Unit = {}, + val onDownloadProxy: (String) -> Unit = {}, val onGameStoresEnabled: (Boolean) -> Unit = {}, val onGameStoresSpeedTier: (String) -> Unit = {}, val onNavigated: () -> Unit = {}, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 8f92dbbc6a..f96c0eb2d5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -174,6 +174,7 @@ internal fun SetupPanel( var showLimitDetails by rememberSaveable { mutableStateOf(false) } var editSgdbKey by remember { mutableStateOf(false) } var editDownloadPrefix by remember { mutableStateOf(false) } + var editDownloadProxy by remember { mutableStateOf(false) } if (editSgdbKey) SgdbKeyDialog(s.sgdbUserKey, onSave = { a.onSgdbKey(it); editSgdbKey = false }, onDismiss = { editSgdbKey = false }) if (editDownloadPrefix) TextEntryDialog( @@ -181,6 +182,11 @@ internal fun SetupPanel( onDismiss = { editDownloadPrefix = false }, onSave = { a.onDownloadPrefix(it); editDownloadPrefix = false }, ) + if (editDownloadProxy) TextEntryDialog( + stringResource(R.string.setup_download_proxy), s.downloadProxy, + onDismiss = { editDownloadProxy = false }, + onSave = { a.onDownloadProxy(it); editDownloadProxy = false }, + ) val tabs = listOf(stringResource(R.string.setup_tab_overview), stringResource(R.string.setup_tab_controller), stringResource(R.string.setup_tab_launcher), stringResource(R.string.setup_tab_storage), stringResource(R.string.setup_tab_diagnostics), stringResource(R.string.setup_tab_glasses)) var tab by rememberSaveable { mutableStateOf(if (SetupTabs.openLauncher) LAUNCHER_TAB else 0) } SetupTabs.openLauncher = false @@ -439,6 +445,12 @@ internal fun SetupPanel( onClick = { editDownloadPrefix = true }, ) } + ActionRow( + stringResource(R.string.setup_download_proxy), + s.downloadProxy.takeIf { it.isNotEmpty() }, + stringResource(R.string.mode_sgdb_edit), + onClick = { editDownloadProxy = true }, + ) } } if (wide) Row(horizontalArrangement = Arrangement.spacedBy(16.dp), verticalAlignment = Alignment.Top) { diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index a2ca7e8574..3004e5b178 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -838,6 +838,7 @@ 自定义前缀 镜像站点 前缀 + HTTP 代理 文件 浏览和管理文件 Proton 版本 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0889e5d8be..11dc9fd569 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2420,6 +2420,7 @@ Custom prefix Site Prefix + HTTP proxy LINUX APPS Flathub Desktop apps for the Linux desktop, opened from Desktop. diff --git a/app/src/test/java/com/droiddeck/launcher/core/DownloadSourceProxyTest.kt b/app/src/test/java/com/droiddeck/launcher/core/DownloadSourceProxyTest.kt new file mode 100644 index 0000000000..46725fc7f2 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/DownloadSourceProxyTest.kt @@ -0,0 +1,36 @@ +package com.droiddeck.launcher.core + +import java.net.InetSocketAddress +import java.net.Proxy +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class DownloadSourceProxyTest { + @Test fun hostAndPortBecomeAnHttpProxy() { + val proxy = DownloadSource.proxyOf("127.0.0.1:9910") + assertEquals(Proxy.Type.HTTP, proxy?.type()) + val address = proxy?.address() as InetSocketAddress + assertEquals("127.0.0.1", address.hostString) + assertEquals(9910, address.port) + } + + @Test fun missingOrInvalidPortIsIgnored() { + assertNull(DownloadSource.proxyOf("")) + assertNull(DownloadSource.proxyOf("127.0.0.1")) + assertNull(DownloadSource.proxyOf("127.0.0.1:")) + assertNull(DownloadSource.proxyOf("127.0.0.1:notaport")) + } + + @Test fun normalizationAcceptsSchemeAndTrailingSlash() { + assertEquals("127.0.0.1:9910", DownloadSource.normalizeProxy(" http://127.0.0.1:9910/ ")) + assertEquals("192.168.1.2:8080", DownloadSource.normalizeProxy("192.168.1.2:8080")) + } + + @Test fun invalidInputDisablesTheProxy() { + assertEquals("", DownloadSource.normalizeProxy("")) + assertEquals("", DownloadSource.normalizeProxy("127.0.0.1")) + assertEquals("", DownloadSource.normalizeProxy("127.0.0.1:70000")) + assertEquals("", DownloadSource.normalizeProxy("http://127.0.0.1:notaport")) + } +} From b1c70f5f816200802024a0d79142cb2e24f6c5ba Mon Sep 17 00:00:00 2001 From: informalTechCode Date: Sun, 25 Oct 2026 10:07:47 -0600 Subject: [PATCH 016/135] Add Rokid Max 2 support using its verified USB identity (#1535) Add Rokid Max 2 USB recognition and validated Max support --- .../droiddeck/launcher/glasses/RokidModel.kt | 7 ++++--- .../launcher/glasses/GlassesUsbTest.kt | 11 +++++++++++ .../launcher/glasses/RokidProtocolTest.kt | 19 +++++++++++++++++++ docs/smart-glasses-support.md | 8 ++++---- 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RokidModel.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RokidModel.kt index a1ad6e83a1..35227206b7 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RokidModel.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RokidModel.kt @@ -3,7 +3,7 @@ package com.droiddeck.launcher.glasses import java.nio.ByteBuffer import java.nio.ByteOrder -/** Rokid Air/Max share one USB identity; the product string distinguishes them. */ +/** Rokid Air/Max share one USB identity; Max 2 has a separate product ID. */ internal class RokidModel private constructor(override val name: String, private val max: Boolean) : GlassesModel { override val controllable = true override val brightnessMax = BRIGHTNESS_STEPS @@ -33,6 +33,7 @@ internal class RokidModel private constructor(override val name: String, private companion object { const val VENDOR_ID = 0x04d2 const val PRODUCT_ID = 0x162f + const val MAX2_PRODUCT_ID = 0x2002 const val BRIGHTNESS_STEPS = 10 // Vendor control requests, device recipient. @@ -52,9 +53,9 @@ internal class RokidModel private constructor(override val name: String, private // 0x04d2 is a shared vendor ID, so the Rokid product string is required too. fun model(vid: Int, pid: Int, name: String?): GlassesModel? { - if (vid != VENDOR_ID || pid != PRODUCT_ID) return null + if (vid != VENDOR_ID || (pid != PRODUCT_ID && pid != MAX2_PRODUCT_ID)) return null val product = name?.trim()?.takeIf { it.startsWith("Rokid", ignoreCase = true) } ?: return null - return RokidModel(product, product.contains("Max", ignoreCase = true)) + return RokidModel(product, pid == MAX2_PRODUCT_ID || product.contains("Max", ignoreCase = true)) } fun isDisplay(name: String) = name.contains("Rokid", ignoreCase = true) diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesUsbTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesUsbTest.kt index 225805dc65..14dcf26d69 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesUsbTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesUsbTest.kt @@ -269,6 +269,17 @@ class GlassesUsbTest { assertTrue(Glasses.isGlassesDisplayName("Rokid Max")) } + @Test fun rokidMax2RequestsPermissionForItsOwnProductId() { + val max2 = device(0x2002, 0x04d2, "Rokid Max2") + manager.devices[max2.deviceName] = max2 + refresh(ask = true) + assertEquals("Rokid Max2", state.value.model) + assertTrue(state.value.controllable) + assertEquals(listOf(max2), manager.requests) + assertTrue(Glasses.isGlassesDisplayName("Rokid Max 2")) + assertEquals(null, Glasses.deviceModel(device(0x2002, 0x04d2, "Generic HID"))) + } + private fun device(pid: Int, vid: Int = VitureProtocol.VENDOR_ID, name: String = "VITURE device"): UsbDevice = ReflectionHelpers.callConstructor( UsbDevice::class.java, from(String::class.java, "/dev/bus/usb/$pid"), diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/RokidProtocolTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/RokidProtocolTest.kt index c2cf38e33b..538958801f 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/RokidProtocolTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/RokidProtocolTest.kt @@ -13,6 +13,10 @@ class RokidProtocolTest { @Test fun identityRequiresRokidProductString() { assertEquals("Rokid Max", RokidModel.model(0x04d2, 0x162f, "Rokid Max")?.name) assertEquals("Rokid Air", RokidModel.model(0x04d2, 0x162f, "Rokid Air")?.name) + assertEquals("Rokid Max2", RokidModel.model(0x04d2, 0x2002, "Rokid Max2")?.name) + assertNull(RokidModel.model(0x04d2, 0x2002, "USB Keyboard")) + assertNull(RokidModel.model(0x04d2, 0x2002, null)) + assertNull(RokidModel.model(0x1234, 0x2002, "Rokid Max2")) assertNull(RokidModel.model(0x04d2, 0x162f, "USB Keyboard")) assertNull(RokidModel.model(0x04d2, 0x162f, null)) assertNull(RokidModel.model(0x04d2, 0x1234, "Rokid Max")) @@ -40,6 +44,21 @@ class RokidProtocolTest { assertEquals(listOf(60), air.rates2d) } + @Test fun max2UsesMaxModesAndParsesItsCapturedCombinedReport() { + val max2 = RokidModel.model(0x04d2, 0x2002, "Rokid Max2")!! + assertEquals(RokidModel.MODE_2D_120, max2.mode(120, false, null)) + assertEquals(RokidModel.MODE_SBS_1080_60, max2.mode(60, true, GlassesResolution(1920, 1080))) + assertEquals(RokidModel.MODE_SBS_1200_90, max2.mode(90, true, null)) + val packet = hex("119ceac6a47b000000542389bf2f430f41de9f6fc000967a38666144bbd0d4413b66661bc2cdcc2c4066e6e142000000ea70a2a47b0000000000006464000000") + val sample = RokidProtocol.Parser().parse(packet)!! + assertEquals(0x7ba4c6ea9cL, sample.timeNs) + assertEquals(8.954f, sample.accel.y, 0.001f) + assertEquals(100, sample.brightness) + val pose = ImuFusion().update(sample.timeNs, sample.accel, sample.gyro) + assertNotNull(pose) + assertTrue(pose!!.all { it.isFinite() }) + } + @Test fun brightnessStepsRoundTripTheDevicePercent() { assertEquals(8, RokidModel.brightnessStep(80)) assertEquals(10, RokidModel.brightnessStep(100)) diff --git a/docs/smart-glasses-support.md b/docs/smart-glasses-support.md index 416b0c3f48..19f59c2009 100644 --- a/docs/smart-glasses-support.md +++ b/docs/smart-glasses-support.md @@ -1,6 +1,6 @@ # Smart-glasses support -This describes the integrations implemented in DroidDeck as of 2026-10-17. A recognized product name alone does not establish that every firmware, phone, cable, or adapter supports every mode. Controls become available from the connected device's capabilities and the display modes Android actually exposes. +This describes the integrations implemented in DroidDeck as of 2026-10-24. A recognized product name alone does not establish that every firmware, phone, cable, or adapter supports every mode. Controls become available from the connected device's capabilities and the display modes Android actually exposes. **3DoF** tracks head rotation: turn, tilt, and roll around a virtual screen. **6DoF** also tracks head position, so leaning or moving changes the view. Both apply to DroidDeck menus, non-Steam launchers, desktop sessions, and games when the tracked virtual screen is enabled. Direct SteamVR rendering uses the corresponding headset pose instead of the virtual-screen layout. @@ -23,10 +23,10 @@ This describes the integrations implemented in DroidDeck as of 2026-10-17. A rec | Recognized RayNeo / TCL Air-series devices | Integrated RayNeo USB transport | Yes, with orientation calibration controls | No | No | | RayNeo GT-series devices matching the supported USB identity, including GT Max identification | Integrated GT USB/IMU path | Yes, with orientation calibration controls | No | No | | **XREAL 1S** | **Experimental**; exact USB identity plus the device's USB-Ethernet control/IMU connection | Yes, when that connection is ready | No | No | -| Rokid Max; Rokid Air under the same USB identity | Integrated Rokid USB transport (vendor control requests and HID IMU reports) | Yes | No | No | +| Rokid Max / Max 2; Rokid Air under the Max USB identity | Integrated Rokid USB transport (vendor control requests and HID IMU reports) | Yes | No | No | | Other XREAL models; unrecognized glasses; display adapters and docks | Display-only where Android exposes a usable display; automatic glasses routing also requires display recognition | No supported app tracking connection | No | No | -RayNeo's Air-series recognition uses its known USB identity or a RayNeo/TCL Air name under the accepted vendor IDs; it is not a per-model certification list. The GT vendor path requires the specific supported product ID. Rokid recognition requires USB 04d2:162f plus a Rokid product name, since that vendor ID is shared with unrelated devices; it was verified on a Rokid Max, and the Air follows the same published protocol untested. XREAL support currently targets **1S only**: One, One Pro, Air-family devices, and recovery-mode products are not enabled by the 1S transport. VITURE Pro 2 is identified through SDK validation rather than a guessed product ID. A dock does not supply the connected glasses' sensors by itself. +RayNeo's Air-series recognition uses its known USB identity or a RayNeo/TCL Air name under the accepted vendor IDs; it is not a per-model certification list. The GT vendor path requires the specific supported product ID. Rokid recognition requires USB 04d2:162f (Max/Air) or 04d2:2002 (Max 2), plus a Rokid product name, since that vendor ID is shared with unrelated devices. Max 2 reports the USB product name "Rokid Max2". Hardware checks cover the Max and Max 2; the Air follows the same published protocol untested. XREAL support currently targets **1S only**: One, One Pro, Air-family devices, and recovery-mode products are not enabled by the 1S transport. VITURE Pro 2 is identified through SDK validation rather than a guessed product ID. A dock does not supply the connected glasses' sensors by itself. The final column refers specifically to Luma Ultra's stereo tracking cameras. DroidDeck's separate phone-camera and physical-controller features are independent of this matrix. @@ -43,7 +43,7 @@ All display modes depend on the phone's video output, the cable/adapter, and And | VITURE Pro 2 | 1080p per eye; 2D and SBS | Brightness and volume; no electrochromic-film control | | RayNeo Air/GT | 2D/SBS switching; resolution and refresh follow available Android modes | Orientation calibration; no app brightness, volume, or dimming commands | | XREAL 1S | Supported 1S display-mode commands, including native 1200p/60 Hz and SBS | Brightness and dimming toggle; no app volume command | -| Rokid Max | 1080p at 60 or 120 Hz in 2D; SBS at 1080p/60, 1200p/60, or 1200p/90 | Brightness; volume follows Android's USB audio volume; no dimming film | +| Rokid Max / Max 2 | 1080p at 60 or 120 Hz in 2D; SBS at 1080p/60, 1200p/60, or 1200p/90 | Brightness; volume follows Android's USB audio volume; no dimming film | | Rokid Air | 1080p/60 in 2D and SBS | Brightness; volume follows Android's USB audio volume | DroidDeck saves separate **2D resolution**, **3D resolution**, and **VR resolution** preferences. Unsupported saved choices fall back to the connected model's automatic behavior. Native **30 Hz** is offered only when Android advertises a matching mode and glasses presentation output is enabled. Higher refresh selections are constrained by the active 2D/SBS layout and model; a firmware-rejected switch is not treated as successful until the physical display confirms it. From 86ecb716eb6aedfaec4f66522ba6e649e263dc5e Mon Sep 17 00:00:00 2001 From: angelrenefm <17342133+angelrenefm@users.noreply.github.com> Date: Sun, 25 Oct 2026 17:08:08 +0100 Subject: [PATCH 017/135] fix(build): build the local image when Podman reports it missing (#1527) --- tools/docker_preflight.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker_preflight.py b/tools/docker_preflight.py index b4e9232755..b9cb3dbd97 100644 --- a/tools/docker_preflight.py +++ b/tools/docker_preflight.py @@ -17,7 +17,7 @@ if __name__ == '__main__': sys.exit('Docker is unavailable: ' + engine.stderr.strip()) image = run('image', 'inspect', sys.argv[1]) if image.returncode: - if 'No such image' not in image.stderr: + if 'No such image' not in image.stderr and 'image not known' not in image.stderr: # Docker, Podman sys.exit('Cannot inspect the build image: ' + image.stderr.strip()) repo = Path(__file__).resolve().parents[1] subprocess.run(['docker', 'build', '--platform', 'linux/amd64', '-t', sys.argv[1], From 8658ffff90549822ec56efca287e9d3118438624 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 12:08:12 -0400 Subject: [PATCH 018/135] fix: Steam's Browse buttons open the file chooser with the x86-64 client too (#1557) --- .../overlay/usr/local/bin/droiddeck-session | 6 ++- .../usr/local/bin/droiddeck-steam-compat | 54 ++++++++++++++++--- tools/tests/test_steam_compat_environment.py | 38 +++++++++++++ 3 files changed, 91 insertions(+), 7 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 043e8304d5..8628db6725 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -894,7 +894,11 @@ BUSCONF echo "== steam: devtools port $BL_CDP_PORT, guest processes only" fi [ -n "${BL_LAUNCH_DIR:-}" ] && mkdir -p "$BL_LAUNCH_DIR/agent" && echo "$BL_CDP_PORT" > "$BL_LAUNCH_DIR/agent/cdp-port" - [ "$steam_x64" = 1 ] || { "${_bl_compat_env[@]}" droiddeck-steam-compat "$steam_root" 2>&1 & } + if [ "$steam_x64" = 1 ]; then + { droiddeck-steam-compat --files-only "$steam_root" 2>&1 & } + else + { "${_bl_compat_env[@]}" droiddeck-steam-compat "$steam_root" 2>&1 & } + fi _bl_ui=(-gamepadui) [ "${BL_STEAM_UI:-}" = desktop ] && _bl_ui=() _bl_cef=(-cef-force-gpu -cef-use-gl=angle -cef-use-angle=vulkan) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index 73bf29c3e1..4246ffe039 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -620,10 +620,11 @@ class Watcher: class Helper: - def __init__(self, steam_root, port, steamos=False): + def __init__(self, steam_root, port, steamos=False, files_only=False): self.steam_root = steam_root self.port = port self.steamos = steamos + self.files_only = files_only self.page = None self.known = set() self.installed = None @@ -647,9 +648,13 @@ class Helper: self.finish_chooser(ident, None) return command = [sys.executable, os.path.realpath(__file__), "--choose-file"] - reaper = os.path.join(self.steam_root, "steamrtarm64", "reaper") - if os.access(reaper, os.X_OK): - command = [reaper, "SteamLaunch", "AppId=769", "--"] + command + # Gamescope shows the dialog over the client by the AppId on a reaper above it; the x86-64 client has no + # native reaper, so the arm64 client's is borrowed when it is installed. + for root in (self.steam_root, os.path.join(os.path.expanduser("~"), ".local", "share", "Steam")): + reaper = os.path.join(root, "steamrtarm64", "reaper") + if os.access(reaper, os.X_OK): + command = [reaper, "SteamLaunch", "AppId=769", "--"] + command + break try: proc = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, start_new_session=True) @@ -699,6 +704,11 @@ class Helper: try: if page.evaluate("typeof SteamClient === 'object' && typeof SteamClient.WebUITransport === 'object'") is not True: raise LookupError("SteamClient is not ready") + if self.files_only: + page.call("Runtime.addBinding", {"name": FILE_BINDING}) + page.evaluate(FILE_JS) + self.page = page + return True page.call("Runtime.addBinding", {"name": BINDING}) page.call("Runtime.addBinding", {"name": VR_BINDING}) page.evaluate(VR_JS) @@ -847,7 +857,21 @@ class Helper: self.open_chooser(e["params"]["payload"]) return events + def serve_files(self): + say("attached to the client on port %d for its file dialogs" % self.port) + while True: + sources = [self.page.ws] + ([self.chooser[1].stdout] if self.chooser is not None else []) + ready = [self.page.ws] if self.page.ws.pending() else select.select(sources, [], [], 30)[0] + if self.chooser is not None and self.chooser[1].stdout in ready: + self.chooser_done() + if self.page.ws in ready: + for e in self.page.drain(): + if called(e, FILE_BINDING) and isinstance(e.get("params", {}).get("payload"), str): + self.open_chooser(e["params"]["payload"]) + def serve(self, watcher): + if self.files_only: + return self.serve_files() with open(COMPAT["state_path"]("live.pid"), "w") as f: f.write("%d\n" % os.getpid()) say("attached to the client on port %d" % self.port) @@ -903,12 +927,29 @@ def chooser_main(): def main(): - steam_root = sys.argv[1] + files_only = sys.argv[1:2] == ["--files-only"] + steam_root = sys.argv[2 if files_only else 1] try: port = int(os.environ.get("BL_CDP_PORT", "")) except ValueError: say("no devtools port for this session; the client's mapping is kept through config.vdf") return 0 + if files_only: + helper = Helper(steam_root, port, files_only=True) + failures = 0 + while True: + try: + helper.attach() + failures = 0 + helper.serve(None) + except Exception as e: + helper.close_chooser() + if helper.page is not None: + say("lost the client (%s); reattaching" % e) + helper.page.ws.close() + helper.page = None + failures += 1 + time.sleep(min(2 * max(failures, 1), 10)) os.makedirs(COMPAT["COMPAT_DIR"], exist_ok=True) watcher = Watcher([COMPAT["state_path"]("request.json"), COMPAT["state_path"]("games.json")] + [os.path.join(lib, "steamapps", "libraryfolders.vdf") for lib in (steam_root, COMPAT["LIBRARY"] + "-sd")]) @@ -943,4 +984,5 @@ if __name__ == "__main__": try: sys.exit(main()) finally: - detach() + if sys.argv[1:2] != ["--files-only"]: + detach() diff --git a/tools/tests/test_steam_compat_environment.py b/tools/tests/test_steam_compat_environment.py index 273fbf6dde..5ecaba1772 100644 --- a/tools/tests/test_steam_compat_environment.py +++ b/tools/tests/test_steam_compat_environment.py @@ -69,6 +69,44 @@ class SteamCompatEnvironmentTest(unittest.TestCase): os.kill(helper_pid, 9) self.fail('droiddeck-steam-compat outlived the session') + def test_the_x86_64_client_gets_only_the_file_dialog_bridge(self): + source = (BIN / 'droiddeck-session').read_text() + start = source.index(' if [ "$steam_x64" = 1 ]; then\n { droiddeck-steam-compat --files-only') + block = source[start:source.index(' fi\n', start) + len(' fi\n')] + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + helper = root / 'droiddeck-steam-compat' + helper.write_text('#!/bin/sh\necho "$@" >> "$ARGS_FILE"\n') + helper.chmod(0o755) + for x64, expected in (('1', '--files-only /steam'), ('0', '/steam')): + with self.subTest(x64=x64): + args = root / ('args-' + x64) + env = dict(os.environ, PATH=str(root) + os.pathsep + os.environ['PATH'], + ARGS_FILE=str(args), steam_root='/steam', steam_x64=x64) + subprocess.run(['bash', '-c', '_bl_compat_env=(env)\n' + block + 'wait\n'], env=env, timeout=10, check=True) + self.assertEqual(args.read_text().split('\n')[0], expected) + + def test_files_only_mode_installs_only_the_file_dialog_hook(self): + import runpy + compat = runpy.run_path(str(BIN / 'droiddeck-steam-compat')) + calls = [] + + class Page: + def __init__(self, port, path): + self.ws = None + def evaluate(self, expression): + calls.append(('evaluate', expression[:40])) + return True + def call(self, method, params): + calls.append((method, params['name'])) + + helper = compat['Helper']('/steam', 1234, files_only=True) + helper.attach.__globals__.update(shared_context=lambda port: '/devtools/page/1', Page=Page) + self.assertTrue(helper.attach()) + bindings = [name for method, name in calls if method == 'Runtime.addBinding'] + self.assertEqual(bindings, [compat['FILE_BINDING']]) + self.assertIn(('evaluate', compat['FILE_JS'][:40]), calls) + if __name__ == '__main__': unittest.main() From 7d99a24ad5a655616204b159b5434c32a4c296e7 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 12:27:42 -0400 Subject: [PATCH 019/135] fix: find the arm64 reaper under XDG_DATA_HOME and serve queued file dialog requests at once (#1560) --- .../linuxfs/overlay/usr/local/bin/droiddeck-steam-compat | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index 4246ffe039..ba739235b1 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -650,7 +650,8 @@ class Helper: command = [sys.executable, os.path.realpath(__file__), "--choose-file"] # Gamescope shows the dialog over the client by the AppId on a reaper above it; the x86-64 client has no # native reaper, so the arm64 client's is borrowed when it is installed. - for root in (self.steam_root, os.path.join(os.path.expanduser("~"), ".local", "share", "Steam")): + data = os.environ.get("XDG_DATA_HOME") or os.path.join(os.path.expanduser("~"), ".local", "share") + for root in (self.steam_root, os.path.join(data, "Steam")): reaper = os.path.join(root, "steamrtarm64", "reaper") if os.access(reaper, os.X_OK): command = [reaper, "SteamLaunch", "AppId=769", "--"] + command @@ -861,10 +862,11 @@ class Helper: say("attached to the client on port %d for its file dialogs" % self.port) while True: sources = [self.page.ws] + ([self.chooser[1].stdout] if self.chooser is not None else []) - ready = [self.page.ws] if self.page.ws.pending() else select.select(sources, [], [], 30)[0] + queued = self.page.ws.pending() or bool(self.page.events) + ready = [self.page.ws] if queued else select.select(sources, [], [], 30)[0] if self.chooser is not None and self.chooser[1].stdout in ready: self.chooser_done() - if self.page.ws in ready: + if self.page.ws in ready or self.page.events: for e in self.page.drain(): if called(e, FILE_BINDING) and isinstance(e.get("params", {}).get("payload"), str): self.open_chooser(e["params"]["payload"]) From 411fda343a58882b6ad7f9ca2061e6941d205708 Mon Sep 17 00:00:00 2001 From: FX1922 <120828496+FX192@users.noreply.github.com> Date: Sun, 25 Oct 2026 19:37:04 +0300 Subject: [PATCH 020/135] itch.io: version picker and installing free games (#1503) * itch.io: temporary Test itch.io button that logs what the API answers (not for merge) * itch.io: show Test itch.io only while Debugging tools is on * itch.io: version picker and installing free games * itch.io: build the platform names outside joinToString so the composable call compiles * itch.io: ask for the version before resuming an unfinished install * itch.io: keep the chosen upload, save free games in the queue, don't auto-install a closed picker * itch.io: install straight away when exactly one build is installable * itch.io: show the picker again unless the game has exactly one build * itch.io: ignore a second build tap while the picker is closing * itch.io: empty a partial install before extracting so builds never mix * stores: deleteTree removes a symlink without following it * stores: skip symlinked folders in the uninstall walk, and only empty a partial install that is this game's own --- .../launcher/stores/StoreInstalls.kt | 6 +- .../droiddeck/launcher/stores/StoresState.kt | 2 + .../launcher/stores/download/SavedQueue.kt | 4 +- .../droiddeck/launcher/stores/itch/ItchApi.kt | 6 +- .../launcher/stores/itch/ItchBackend.kt | 2 +- .../launcher/stores/itch/ItchGame.kt | 44 +++++++ .../launcher/stores/itch/ItchInstaller.kt | 21 +++- .../launcher/stores/itch/ItchUploads.kt | 22 ++++ .../droiddeck/launcher/ui/FrontEndScreen.kt | 1 + .../com/droiddeck/launcher/ui/GameDetail.kt | 4 + .../droiddeck/launcher/ui/ItchBuildPicker.kt | 117 ++++++++++++++++++ app/src/main/res/values-ar/strings.xml | 7 ++ app/src/main/res/values-b+es+419/strings.xml | 7 ++ app/src/main/res/values-bg/strings.xml | 7 ++ app/src/main/res/values-cs/strings.xml | 7 ++ app/src/main/res/values-da/strings.xml | 7 ++ app/src/main/res/values-de/strings.xml | 7 ++ app/src/main/res/values-el/strings.xml | 7 ++ app/src/main/res/values-es/strings.xml | 7 ++ app/src/main/res/values-fi/strings.xml | 7 ++ app/src/main/res/values-fr/strings.xml | 7 ++ app/src/main/res/values-hi/strings.xml | 7 ++ app/src/main/res/values-hu/strings.xml | 7 ++ app/src/main/res/values-in/strings.xml | 7 ++ app/src/main/res/values-it/strings.xml | 7 ++ app/src/main/res/values-ja/strings.xml | 7 ++ app/src/main/res/values-ko/strings.xml | 7 ++ app/src/main/res/values-ms/strings.xml | 7 ++ app/src/main/res/values-nb/strings.xml | 7 ++ app/src/main/res/values-nl/strings.xml | 7 ++ app/src/main/res/values-pl/strings.xml | 7 ++ app/src/main/res/values-pt-rPT/strings.xml | 7 ++ app/src/main/res/values-pt/strings.xml | 7 ++ app/src/main/res/values-ro/strings.xml | 7 ++ app/src/main/res/values-ru/strings.xml | 7 ++ app/src/main/res/values-sv/strings.xml | 7 ++ app/src/main/res/values-th/strings.xml | 7 ++ app/src/main/res/values-tr/strings.xml | 7 ++ app/src/main/res/values-uk/strings.xml | 7 ++ app/src/main/res/values-vi/strings.xml | 7 ++ app/src/main/res/values-zh-rCN/strings.xml | 7 ++ app/src/main/res/values-zh-rHK/strings.xml | 7 ++ app/src/main/res/values-zh-rTW/strings.xml | 7 ++ app/src/main/res/values/strings.xml | 12 ++ .../launcher/stores/itch/ItchGameTest.kt | 66 ++++++++++ docs/development/itch-install.md | 21 ++++ 46 files changed, 541 insertions(+), 11 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/itch/ItchGame.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/ItchBuildPicker.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/itch/ItchGameTest.kt create mode 100644 docs/development/itch-install.md diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt index 65fdf6e921..9b73f8cc87 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt @@ -70,7 +70,7 @@ object StoreInstalls { fun uninstall(context: Context, game: InstalledStoreGame, progress: (Float) -> Unit = {}, removed: () -> Unit = {}) { val app = context.applicationContext val appId = SessionPrefs.addedGameStoredAppId(app, game.folder.path) - val files = game.folder.walkBottomUp().toList() + val files = game.folder.walkBottomUp().onEnter { !Files.isSymbolicLink(it.toPath()) }.toList() val step = (files.size / 100).coerceAtLeast(1) files.forEachIndexed { i, f -> f.delete() @@ -98,6 +98,10 @@ object StoreInstalls { } fun deleteTree(dir: File) { + if (Files.isSymbolicLink(dir.toPath())) { + dir.delete() + return + } dir.listFiles()?.forEach { if (it.isDirectory) deleteTree(it) else it.delete() } dir.delete() } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index 1fcbcd4815..282bcb16f2 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -212,9 +212,11 @@ object StoresState { } var pendingInstall by mutableStateOf(null) + var itchPicking by mutableStateOf(null) fun requestInstall(context: Context, item: CatalogItem) { askForNotifications(context) + if (item.store == Store.ITCH && item.extra["uploadId"].isNullOrEmpty()) { itchPicking = item; return } if (isUnfinished(item)) { install(context, item); return } val targets = StoreInstallRoot.targets(context) if (targets.size > 1 || StoreLanguage.selectable(item.store)) pendingInstall = item diff --git a/app/src/main/java/com/droiddeck/launcher/stores/download/SavedQueue.kt b/app/src/main/java/com/droiddeck/launcher/stores/download/SavedQueue.kt index a9a25759e1..e9a0acbcfa 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/download/SavedQueue.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/download/SavedQueue.kt @@ -79,7 +79,7 @@ object SavedQueue { put("image", i.imageUrl ?: ""); put("tall", i.tallImageUrl ?: "") i.logoUrl?.let { put("logo", it) } put("tags", i.tags); put("developer", i.developer); put("description", i.description) - put("size", i.sizeBytes); put("owned", i.owned); put("subscription", i.subscription) + put("size", i.sizeBytes); put("owned", i.owned); put("subscription", i.subscription); put("free", i.isFree) put("extra", JSONObject(i.extra)) } @@ -90,7 +90,7 @@ object SavedQueue { id = o.getString("id"), title = o.getString("title"), imageUrl = o.optString("image").ifEmpty { null }, tallImageUrl = o.optString("tall").ifEmpty { null }, tags = o.optString("tags"), developer = o.optString("developer"), description = o.optString("description"), - owned = o.optBoolean("owned", true), subscription = o.optBoolean("subscription"), sizeBytes = o.optLong("size"), + owned = o.optBoolean("owned", true), subscription = o.optBoolean("subscription"), isFree = o.optBoolean("free"), sizeBytes = o.optLong("size"), extra = extra?.keys()?.asSequence()?.associateWith { extra.getString(it) } ?: emptyMap(), logoUrl = o.optString("logo").ifEmpty { null }, ) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchApi.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchApi.kt index 92635630d9..496691feec 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchApi.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchApi.kt @@ -20,7 +20,7 @@ internal object ItchApi { fun ownedKeys(key: String, page: Int): JSONObject? = get("/profile/owned-keys?page=$page&per_page=500", key) fun uploads(key: String, gameId: String, downloadKeyId: String): JSONArray? = - get("/games/$gameId/uploads?download_key_id=$downloadKeyId", key)?.optJSONArray("uploads") + get("/games/$gameId/uploads" + keyQuery(downloadKeyId), key)?.optJSONArray("uploads") fun search(key: String, query: String, page: Int): JSONArray? { val q = java.net.URLEncoder.encode(query, "UTF-8") @@ -28,7 +28,9 @@ internal object ItchApi { } fun downloadUrl(uploadId: String, downloadKeyId: String): String = - "$BASE/uploads/$uploadId/download?download_key_id=$downloadKeyId" + "$BASE/uploads/$uploadId/download" + keyQuery(downloadKeyId) + + private fun keyQuery(downloadKeyId: String): String = if (downloadKeyId.isBlank()) "" else "?download_key_id=$downloadKeyId" fun pageUrl(slug: String): String = "$WEB/$slug" } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBackend.kt index b1bf834c15..66ca72602a 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBackend.kt @@ -55,7 +55,7 @@ object ItchBackend : StoreBackend { override fun install(context: Context, item: CatalogItem, root: File) { val app = context.applicationContext - if (item.extra["downloadKeyId"].isNullOrEmpty()) { + if (item.extra["downloadKeyId"].isNullOrEmpty() && !item.isFree) { StoresState.logLine("itch.io: \"${item.title}\" is not in the library") return } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchGame.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchGame.kt new file mode 100644 index 0000000000..39b69ea3fc --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchGame.kt @@ -0,0 +1,44 @@ +package com.droiddeck.launcher.stores.itch + +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.StoreNet +import org.json.JSONArray + +internal class ItchBuild( + val uploadId: String, + val filename: String, + val size: Long, + val updatedAt: String, + val platforms: Set, + val demo: Boolean, +) { + val installable: Boolean get() = "windows" in platforms +} + +internal object ItchGame { + private val PATH_AFTER = Regex("""name="itch:path"[^>]*content="games/(\d+)"""") + private val PATH_BEFORE = Regex("""content="games/(\d+)"[^>]*name="itch:path"""") + + fun idFromPage(html: String): String? = + PATH_AFTER.find(html)?.groupValues?.get(1) ?: PATH_BEFORE.find(html)?.groupValues?.get(1) + + fun resolveId(item: CatalogItem): String? { + item.extra["gameId"]?.takeIf { it.isNotBlank() }?.let { return it } + if (item.storeUrl.isBlank()) return null + val html = StoreNet.get(item.storeUrl) ?: return null + return idFromPage(html) + } + + fun builds(uploads: JSONArray?): List { + if (uploads == null) return emptyList() + return (0 until uploads.length()).mapNotNull { uploads.optJSONObject(it) } + .filter { it.optString("storage") != "external" } + .map { + ItchBuild( + it.optString("id"), ItchUploads.filename(it), ItchUploads.size(it), + it.optString("updated_at", it.optString("updatedAt")), ItchUploads.platforms(it), it.optBoolean("demo"), + ) + } + .sortedWith(compareByDescending { it.installable }.thenByDescending { it.updatedAt }) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt index 96ec0ae353..5037de863c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt @@ -38,11 +38,14 @@ internal class ItchInstaller( val key = ItchAuth.key(app) if (key.isBlank()) throw IllegalStateException(app.getString(R.string.stores_sync_sign_in)) val downloadKeyId = item.extra["downloadKeyId"].orEmpty() - if (downloadKeyId.isBlank()) throw IllegalStateException(app.getString(R.string.stores_itch_not_owned)) - val gameId = item.extra["gameId"].orEmpty().ifBlank { item.id.substringAfterLast('/') } + if (downloadKeyId.isBlank() && !item.isFree) throw IllegalStateException(app.getString(R.string.stores_itch_not_owned)) + val gameId = ItchGame.resolveId(item) ?: throw IllegalStateException(app.getString(R.string.stores_itch_no_game)) + val resuming = StoreGameSidecar.read(folder)?.let { it.state == StoreGameSidecar.STATE_INSTALLING && it.id == item.id } == true StoreInstalls.begin(folder, Store.ITCH, item.id, item.title, item.imageUrl, item.imageUrl) handle.stage(DownloadStage.MANIFEST) - val upload = ItchUploads.windows(ItchApi.uploads(key, gameId, downloadKeyId)) + val uploads = ItchApi.uploads(key, gameId, downloadKeyId) + val chosen = item.extra["uploadId"].orEmpty() + val upload = (if (chosen.isBlank()) ItchUploads.windows(uploads) else ItchUploads.byId(uploads, chosen)) ?: throw IllegalStateException(app.getString(R.string.stores_itch_no_upload)) val uploadId = upload.optString("id") val filename = ItchUploads.filename(upload) @@ -55,7 +58,7 @@ internal class ItchInstaller( download(key, downloadKeyId, uploadId, upload.optString("updated_at", upload.optString("updatedAt")), archive, size, handle) if (cancelled.get()) return null handle.stage(DownloadStage.INSTALL) - install(archive, filename, handle) + install(archive, filename, handle, resuming) } catch (t: Throwable) { if (!cancelled.get()) StoreInstalls.discard(app, folder, listOf(scratch)) throw t @@ -147,8 +150,16 @@ internal class ItchInstaller( } } - private fun install(archive: File, filename: String, handle: DownloadQueue.JobHandle): String? { + private fun clearPartialInstall() { + folder.listFiles()?.forEach { + if (it.name == StoreGameSidecar.FILE_NAME) return@forEach + if (it.isDirectory) StoreInstalls.deleteTree(it) else it.delete() + } + } + + private fun install(archive: File, filename: String, handle: DownloadQueue.JobHandle, resuming: Boolean): String? { folder.mkdirs() + if (resuming) clearPartialInstall() when (val kind = sniff(archive, filename)) { "zip" -> unzip(archive, handle) "7z" -> sevenZip(archive, handle) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchUploads.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchUploads.kt index 773ad22c30..7e3ed94b47 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchUploads.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchUploads.kt @@ -30,6 +30,28 @@ internal object ItchUploads { return names.none { it in PLATFORM_TRAITS } } + fun platforms(upload: JSONObject): Set { + val found = LinkedHashSet() + upload.optJSONObject("platforms")?.let { flags -> + for (name in listOf("windows", "linux", "osx", "android")) if (flags.optBoolean(name)) found.add(name) + } + upload.optJSONArray("traits")?.let { traits -> + for (i in 0 until traits.length()) when (traits.optString(i)) { + "p_windows" -> found.add("windows") + "p_linux" -> found.add("linux") + "p_osx" -> found.add("osx") + "p_android" -> found.add("android") + } + } + if (upload.optString("type") == "html") found.add("web") + return if (found.isEmpty()) setOf("windows") else found + } + + fun byId(uploads: JSONArray?, id: String): JSONObject? { + if (uploads == null || id.isBlank()) return null + return (0 until uploads.length()).mapNotNull { uploads.optJSONObject(it) }.firstOrNull { it.optString("id") == id } + } + fun size(upload: JSONObject): Long = upload.optLong("size", upload.optLong("size_bytes")) fun filename(upload: JSONObject): String = upload.optString("filename").substringAfterLast('/') diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 41e18b486e..97e289912f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -561,6 +561,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com FlightsLayer(screenAt) GamesDialogs(a, s.steamGames) com.droiddeck.launcher.stores.StoresState.pendingInstall?.let { item -> StoreTheme(item.store) { InstallWhere(item) } } + com.droiddeck.launcher.stores.StoresState.itchPicking?.let { item -> StoreTheme(item.store) { ItchBuildPicker(item) { com.droiddeck.launcher.stores.StoresState.itchPicking = null } } } StepsLayer(screenAt) appToChooseDisplay?.let { app -> diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index 50b85c7e35..0024075286 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -397,6 +397,10 @@ private fun GameActions( } if (!item.accessible) SecondaryButton(buyLabel(item)) { openStoreUrl(ctx, item) } } + item != null && item.store == Store.ITCH && item.isFree -> { + InstallButton(stringResource(R.string.stores_install), leadOn) { StoresState.requestInstall(ctx, item) } + SecondaryButton(stringResource(R.string.stores_view_on, item.store.shortLabel)) { openStoreUrl(ctx, item) } + } item != null && item.isFree -> PrimaryButton(stringResource(R.string.stores_get_free), main = true, modifier = leadOn) { openStoreUrl(ctx, item) } item != null -> PrimaryButton(buyLabel(item), main = true, modifier = leadOn) { openStoreUrl(ctx, item) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBuildPicker.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBuildPicker.kt new file mode 100644 index 0000000000..09c6d08f32 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBuildPicker.kt @@ -0,0 +1,117 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.key +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.formatBytes +import com.droiddeck.launcher.stores.itch.ItchApi +import com.droiddeck.launcher.stores.itch.ItchAuth +import com.droiddeck.launcher.stores.itch.ItchBuild +import com.droiddeck.launcher.stores.itch.ItchGame +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +private class BuildList(val gameId: String, val builds: List) + +@Composable +internal fun ItchBuildPicker(item: CatalogItem, onDismiss: () -> Unit) { + val ctx = LocalContext.current + val app = ctx.applicationContext + val colors = MaterialTheme.colorScheme + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + var loaded by remember(item) { mutableStateOf(null) } + var failed by remember(item) { mutableStateOf(false) } + + val install: (BuildList, ItchBuild) -> Unit = install@{ list, build -> + if (!shown.targetState) return@install + val tagged = item.copy( + extra = item.extra + mapOf("gameId" to list.gameId, "uploadId" to build.uploadId), + sizeBytes = build.size.takeIf { it > 0 } ?: item.sizeBytes, + ) + close() + StoresState.requestInstall(ctx, tagged) + } + + LaunchedEffect(item) { + val result = withContext(Dispatchers.IO) { + val key = ItchAuth.key(app) + val id = if (key.isBlank()) null else ItchGame.resolveId(item) + val uploads = id?.let { ItchApi.uploads(key, it, item.extra["downloadKeyId"].orEmpty()) } + if (id == null || uploads == null) null else BuildList(id, ItchGame.builds(uploads)) + } + if (result == null) { failed = true; return@LaunchedEffect } + loaded = result + if (shown.targetState) result.builds.singleOrNull()?.takeIf { it.installable }?.let { install(result, it) } + } + + AppDialog(shown, close, "itchBuilds", wide = false, maxWidth = 460.dp) { + DialogTitleRow(stringResource(R.string.stores_itch_pick_title), close) + Text(item.title, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + val list = loaded + when { + failed -> Text(stringResource(R.string.stores_itch_pick_failed), fontSize = 13.sp, color = colors.onSurfaceVariant) + list == null -> LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 8.dp)) + list.builds.isEmpty() -> Text(stringResource(R.string.stores_itch_pick_none), fontSize = 13.sp, color = colors.onSurfaceVariant) + else -> Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) { + for (build in list.builds) key(build.uploadId) { BuildRow(item, build) { install(list, build) } } + } + } + } +} + +@Composable +private fun BuildRow(item: CatalogItem, build: ItchBuild, onInstall: () -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val linux = "linux" in build.platforms && !build.installable + val detail = listOfNotNull( + build.platforms.map { platformName(it) }.joinToString(", "), + build.size.takeIf { it > 0 }?.let { formatBytes(it) }, + build.updatedAt.take(10).takeIf { it.isNotBlank() }, + if (build.demo) stringResource(R.string.stores_itch_build_demo) else null, + ).joinToString(" · ") + ListRow(enabled = !linux, onClick = { if (build.installable) onInstall() else openStoreUrl(ctx, item) }) { + Column(Modifier.weight(1f)) { + Text(build.filename.ifBlank { item.title }, fontSize = 13.sp, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(detail, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + val label = when { + build.installable -> stringResource(R.string.stores_install) + linux -> stringResource(R.string.stores_itch_build_linux_soon) + else -> stringResource(R.string.stores_itch_build_open) + } + Text(label, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1) + } +} + +@Composable +private fun platformName(platform: String): String = stringResource( + when (platform) { + "windows" -> R.string.stores_itch_build_windows + "linux" -> R.string.stores_itch_build_linux + "osx" -> R.string.stores_itch_build_macos + "android" -> R.string.stores_itch_build_android + else -> R.string.stores_itch_build_web + }, +) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d457db27a3..b609d1b918 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2099,6 +2099,13 @@ تعذّر تحميل الألعاب من itch.io أرشيفات %1$s غير مدعومة استجاب itch.io بـ HTTP %1$d + اختر إصدارًا + لم يُعثر على تنزيلات لهذه اللعبة + تعذر تحميل التنزيلات من itch.io + نسخة تجريبية + فتح على itch.io + غير مدعوم بعد + تعذر العثور على هذه اللعبة على itch.io مجاني استئناف تحديث diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 598c110e21..cd331b35fb 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2783,6 +2783,13 @@ No se pudieron cargar los juegos de itch.io Los archivos %1$s no son compatibles itch.io respondió HTTP %1$d + Elige una versión + No se encontraron descargas para este juego + No se pudieron cargar las descargas de itch.io + Demo + Abrir en itch.io + Aún no es compatible + No se encontró este juego en itch.io Cámaras Luma Ultra — Experimental Seguimiento de posición de los Joy-Con Usa las cámaras de las gafas inteligentes para posicionar tus mandos Joy-Con emparejados. La rotación y las pulsaciones de los botones provienen de los mandos Joy-Con. La posición se estima cuando tus muñecas están ocultas. Reemplaza los mandos operados con las manos desnudas y pausa el seguimiento de la cámara del teléfono. Apunta los mandos Joy-Con hacia adelante al conectar o restablecer el centro de seguimiento. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index a0bc668c8a..0f95de2328 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2015,6 +2015,13 @@ Игрите от itch.io не можаха да се заредят Архивите %1$s не се поддържат itch.io отговори HTTP %1$d + Изберете версия + Не са намерени изтегляния за тази игра + Изтеглянията от itch.io не можаха да се заредят + Демо + Отваряне в itch.io + Все още не се поддържа + Играта не беше намерена в itch.io Безплатна Продължи Обнови diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 8880695bb6..b1977d00a5 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2057,6 +2057,13 @@ Hry z itch.io se nepodařilo načíst Archivy %1$s nejsou podporovány itch.io odpovědělo HTTP %1$d + Vyberte verzi + Pro tuto hru nebyla nalezena žádná stažení + Stahování z itch.io se nepodařilo načíst + Demo + Otevřít na itch.io + Zatím nepodporováno + Tuto hru se na itch.io nepodařilo najít Zdarma Pokračovat Obnovit diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 853328bfd2..8786ddbedd 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2015,6 +2015,13 @@ Kunne ikke hente spil fra itch.io %1$s-arkiver understøttes ikke itch.io svarede HTTP %1$d + Vælg en version + Ingen downloads fundet til dette spil + Kunne ikke indlæse downloads fra itch.io + Demo + Åbn på itch.io + Understøttes ikke endnu + Kunne ikke finde dette spil på itch.io Gratis Genoptag Opdater diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index db7241eaf3..dab2d35b29 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2007,6 +2007,13 @@ Spiele von itch.io konnten nicht geladen werden %1$s-Archive werden nicht unterstützt itch.io antwortete mit HTTP %1$d + Version auswählen + Für dieses Spiel wurden keine Downloads gefunden + Die Downloads von itch.io konnten nicht geladen werden + Demo + Auf itch.io öffnen + Noch nicht unterstützt + Dieses Spiel wurde auf itch.io nicht gefunden Kostenlos Fortsetzen Aktualisieren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index f720eba4f9..72ac7955ea 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2015,6 +2015,13 @@ Δεν ήταν δυνατή η φόρτωση παιχνιδιών από το itch.io Τα αρχεία %1$s δεν υποστηρίζονται Το itch.io απάντησε HTTP %1$d + Επιλέξτε έκδοση + Δεν βρέθηκαν λήψεις για αυτό το παιχνίδι + Δεν ήταν δυνατή η φόρτωση των λήψεων από το itch.io + Demo + Άνοιγμα στο itch.io + Δεν υποστηρίζεται ακόμη + Δεν βρέθηκε αυτό το παιχνίδι στο itch.io Δωρεάν Συνέχιση Ανανέωση diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 118be6cee0..995e969e5f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2038,6 +2038,13 @@ No se pudieron cargar los juegos de itch.io Los archivos %1$s no son compatibles itch.io respondió HTTP %1$d + Elige una versión + No se han encontrado descargas para este juego + No se pudieron cargar las descargas de itch.io + Demo + Abrir en itch.io + Aún no es compatible + No se ha encontrado este juego en itch.io Gratis Reanudar Actualizar diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index f94c35c110..1304b02ac3 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2015,6 +2015,13 @@ Pelien lataaminen itch.io:sta epäonnistui %1$s-arkistot eivät ole tuettuja itch.io vastasi HTTP %1$d + Valitse versio + Tälle pelille ei löytynyt latauksia + Latausten haku itch.iosta epäonnistui + Demo + Avaa itch.iossa + Ei vielä tuettu + Peliä ei löytynyt itch.iosta Ilmainen Jatka Päivitä diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 6b22a92a6e..325f41614c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2038,6 +2038,13 @@ Impossible de charger les jeux d\'itch.io Les archives %1$s ne sont pas prises en charge itch.io a répondu HTTP %1$d + Choisissez une version + Aucun téléchargement trouvé pour ce jeu + Impossible de charger les téléchargements depuis itch.io + Démo + Ouvrir sur itch.io + Pas encore pris en charge + Ce jeu est introuvable sur itch.io Gratuit Reprendre Actualiser diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d0e385c612..7b0930217a 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2015,6 +2015,13 @@ itch.io से गेम लोड नहीं हो सके %1$s आर्काइव समर्थित नहीं हैं itch.io ने HTTP %1$d लौटाया + संस्करण चुनें + इस गेम के लिए कोई डाउनलोड नहीं मिला + itch.io से डाउनलोड लोड नहीं हो सके + डेमो + itch.io पर खोलें + अभी समर्थित नहीं है + यह गेम itch.io पर नहीं मिला फ़्री फिर से शुरू करें रीफ़्रेश करें diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index ada8fe46c2..5fb0d0ee78 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2015,6 +2015,13 @@ Nem sikerült betölteni a játékokat az itch.io-ról A(z) %1$s archívumok nem támogatottak Az itch.io HTTP %1$d választ adott + Válassz verziót + Ehhez a játékhoz nem található letöltés + A letöltések betöltése az itch.io-ról nem sikerült + Demó + Megnyitás az itch.io-n + Még nem támogatott + A játék nem található az itch.io-n Ingyenes Folytatás Frissítés diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 7a93dff316..1a2840c0c3 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1994,6 +1994,13 @@ Tidak dapat memuat game dari itch.io Arsip %1$s tidak didukung itch.io menjawab HTTP %1$d + Pilih versi + Tidak ada unduhan untuk game ini + Tidak dapat memuat unduhan dari itch.io + Demo + Buka di itch.io + Belum didukung + Game ini tidak ditemukan di itch.io Gratis Lanjutkan Segarkan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 5491ea5244..ffaf3f6027 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2028,6 +2028,13 @@ Impossibile caricare i giochi da itch.io Gli archivi %1$s non sono supportati itch.io ha risposto HTTP %1$d + Scegli una versione + Nessun download trovato per questo gioco + Impossibile caricare i download da itch.io + Demo + Apri su itch.io + Non ancora supportato + Gioco non trovato su itch.io Gratis Riprendi Aggiorna diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f0df57bd02..857969d089 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1996,6 +1996,13 @@ itch.io のゲームを読み込めませんでした %1$s 形式のアーカイブには対応していません itch.io が HTTP %1$d を返しました + バージョンを選択 + このゲームのダウンロードが見つかりません + itch.io からダウンロードを読み込めませんでした + デモ + itch.io で開く + まだ対応していません + itch.io でこのゲームが見つかりませんでした 無料 再開 更新 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 94e23ea9dd..64a063461a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1996,6 +1996,13 @@ itch.io에서 게임을 불러오지 못했습니다 %1$s 압축 파일은 지원하지 않습니다 itch.io가 HTTP %1$d을(를) 반환했습니다 + 버전 선택 + 이 게임의 다운로드를 찾을 수 없습니다 + itch.io에서 다운로드를 불러오지 못했습니다 + 데모 + itch.io에서 열기 + 아직 지원되지 않음 + itch.io에서 이 게임을 찾을 수 없습니다 무료 재개 새로 고침 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 9ba680d285..3135c66816 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1994,6 +1994,13 @@ Tidak dapat memuatkan permainan daripada itch.io Arkib %1$s tidak disokong itch.io menjawab HTTP %1$d + Pilih versi + Tiada muat turun ditemui untuk permainan ini + Tidak dapat memuatkan muat turun daripada itch.io + Demo + Buka di itch.io + Belum disokong + Permainan ini tidak ditemui di itch.io Percuma Sambung Segar semula diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index cd62ccb5ac..4e685d919e 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2015,6 +2015,13 @@ Kunne ikke laste spill fra itch.io %1$s-arkiver støttes ikke itch.io svarte HTTP %1$d + Velg en versjon + Fant ingen nedlastinger for dette spillet + Kunne ikke laste inn nedlastingene fra itch.io + Demo + Åpne på itch.io + Støttes ikke ennå + Fant ikke dette spillet på itch.io Gratis Gjenoppta Oppdater diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c83f80dff1..30494a6fa5 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2015,6 +2015,13 @@ Games van itch.io konden niet worden geladen %1$s-archieven worden niet ondersteund itch.io antwoordde HTTP %1$d + Kies een versie + Geen downloads gevonden voor deze game + De downloads van itch.io konden niet worden geladen + Demo + Openen op itch.io + Nog niet ondersteund + Deze game is niet gevonden op itch.io Gratis Hervatten Vernieuwen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f1234702a1..64414194eb 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2057,6 +2057,13 @@ Nie udało się wczytać gier z itch.io Archiwa %1$s nie są obsługiwane itch.io odpowiedziało HTTP %1$d + Wybierz wersję + Nie znaleziono plików do pobrania dla tej gry + Nie udało się wczytać plików z itch.io + Demo + Otwórz w itch.io + Jeszcze nieobsługiwane + Nie znaleziono tej gry w itch.io Bezpłatna Wznów Odśwież diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 662a45b790..6900b72d55 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2028,6 +2028,13 @@ Não foi possível carregar os jogos do itch.io Ficheiros %1$s não são suportados O itch.io respondeu HTTP %1$d + Escolha uma versão + Não foram encontradas transferências para este jogo + Não foi possível carregar as transferências do itch.io + Demo + Abrir no itch.io + Ainda não suportado + Não foi possível encontrar este jogo no itch.io Grátis Retomar Atualizar diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index c0c4ca359e..a03f518c5e 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2028,6 +2028,13 @@ Não foi possível carregar os jogos do itch.io Arquivos %1$s não são suportados O itch.io respondeu HTTP %1$d + Escolha uma versão + Nenhum download encontrado para este jogo + Não foi possível carregar os downloads do itch.io + Demo + Abrir no itch.io + Ainda não suportado + Não foi possível encontrar este jogo no itch.io Grátis Retomar Atualizar diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 9bd9a1df3a..e1e54f3515 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2036,6 +2036,13 @@ Nu s-au putut încărca jocurile de pe itch.io Arhivele %1$s nu sunt acceptate itch.io a răspuns HTTP %1$d + Alege o versiune + Nu s-au găsit descărcări pentru acest joc + Descărcările de pe itch.io nu au putut fi încărcate + Demo + Deschide pe itch.io + Încă nu este acceptat + Jocul nu a fost găsit pe itch.io Gratuit Reluare Reîmprospătează diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7fa1bc8a6b..0c45e5b870 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2059,6 +2059,13 @@ Не удалось загрузить игры с itch.io Архивы %1$s не поддерживаются itch.io ответил HTTP %1$d + Выберите версию + Для этой игры не найдено загрузок + Не удалось загрузить список файлов с itch.io + Демо + Открыть на itch.io + Пока не поддерживается + Не удалось найти эту игру на itch.io Бесплатно Продолжить Обновить diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 1729070d38..59169120f8 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2015,6 +2015,13 @@ Det gick inte att läsa in spel från itch.io %1$s-arkiv stöds inte itch.io svarade HTTP %1$d + Välj en version + Inga nedladdningar hittades för det här spelet + Det gick inte att läsa in nedladdningarna från itch.io + Demo + Öppna på itch.io + Stöds inte ännu + Spelet hittades inte på itch.io Gratis Återuppta Uppdatera diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 3fca7f7dd1..f300fe8964 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1994,6 +1994,13 @@ โหลดเกมจาก itch.io ไม่ได้ ไม่รองรับไฟล์ %1$s itch.io ตอบกลับ HTTP %1$d + เลือกเวอร์ชัน + ไม่พบไฟล์ดาวน์โหลดสำหรับเกมนี้ + โหลดรายการดาวน์โหลดจาก itch.io ไม่ได้ + เดโม + เปิดบน itch.io + ยังไม่รองรับ + ไม่พบเกมนี้บน itch.io ฟรี ดำเนินการต่อ รีเฟรช diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 9b917e2339..a8347b5c64 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2009,6 +2009,13 @@ itch.io oyunları yüklenemedi %1$s arşivleri desteklenmiyor itch.io HTTP %1$d yanıtı verdi + Bir sürüm seçin + Bu oyun için indirme bulunamadı + İndirmeler itch.io\'dan yüklenemedi + Demo + itch.io\'da aç + Henüz desteklenmiyor + Bu oyun itch.io\'da bulunamadı Ücretsiz Sürdür Yenile diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 8b55100f67..bc35a13b61 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2057,6 +2057,13 @@ Не вдалося завантажити ігри з itch.io Архіви %1$s не підтримуються itch.io відповів HTTP %1$d + Виберіть версію + Для цієї гри не знайдено завантажень + Не вдалося завантажити список файлів з itch.io + Демо + Відкрити на itch.io + Ще не підтримується + Не вдалося знайти цю гру на itch.io Безкоштовно Продовжити Оновити diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 0bde8b4a9f..aa8132f50e 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1994,6 +1994,13 @@ Không tải được game từ itch.io Không hỗ trợ tệp %1$s itch.io trả về HTTP %1$d + Chọn phiên bản + Không tìm thấy bản tải xuống cho trò chơi này + Không thể tải danh sách tải xuống từ itch.io + Bản demo + Mở trên itch.io + Chưa được hỗ trợ + Không tìm thấy trò chơi này trên itch.io Miễn phí Tiếp tục Làm mới diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3004e5b178..0d4cdd5b58 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2074,6 +2074,13 @@ 无法从 itch.io 加载游戏 不支持 %1$s 压缩包 itch.io 返回 HTTP %1$d + 选择版本 + 未找到此游戏的下载 + 无法从 itch.io 加载下载内容 + 试玩版 + 在 itch.io 上打开 + 暂不支持 + 在 itch.io 上找不到这款游戏 免费 继续 刷新 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 82daf9cca2..50a1a5011d 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1997,6 +1997,13 @@ 無法從 itch.io 載入遊戲 不支援 %1$s 壓縮檔 itch.io 回應 HTTP %1$d + 選擇版本 + 找不到此遊戲的下載 + 無法從 itch.io 載入下載內容 + 試玩版 + 在 itch.io 開啟 + 暫不支援 + 在 itch.io 找不到這款遊戲 免費 繼續 重新整理 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 26d108539b..d3f66e5024 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1997,6 +1997,13 @@ 無法從 itch.io 載入遊戲 不支援 %1$s 壓縮檔 itch.io 回應 HTTP %1$d + 選擇版本 + 找不到此遊戲的下載 + 無法從 itch.io 載入下載內容 + 試玩版 + 在 itch.io 開啟 + 尚未支援 + 在 itch.io 找不到這款遊戲 免費 繼續 重新整理 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 11dc9fd569..1044953c7b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2108,6 +2108,18 @@ Could not load games from itch.io %1$s archives are not supported itch.io answered HTTP %1$d + Choose a version + No downloads found for this game + Could not load the downloads from itch.io + Demo + Open on itch.io + Not supported yet + Could not find this game on itch.io + Windows + macOS + Linux + Android + Web Free Resume Refresh diff --git a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchGameTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchGameTest.kt new file mode 100644 index 0000000000..1b7d8336f7 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchGameTest.kt @@ -0,0 +1,66 @@ +package com.droiddeck.launcher.stores.itch + +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class ItchGameTest { + private fun upload(id: String, filename: String, vararg traits: String, type: String = "default", storage: String = "hosted", demo: Boolean = false, updated: String = "2026-09-16T02:26:06Z") = + JSONObject().put("id", id).put("filename", filename).put("size", 1000).put("type", type).put("storage", storage) + .put("demo", demo).put("traits", JSONArray(traits.toList())).put("updated_at", updated) + + @Test fun theGameNumberComesFromThePageMeta() { + assertEquals("1576684", ItchGame.idFromPage("""""")) + assertEquals("1576684", ItchGame.idFromPage("""""")) + assertNull(ItchGame.idFromPage("no meta here")) + } + + @Test fun platformsComeFromTheTraits() { + assertEquals(setOf("windows"), ItchUploads.platforms(upload("1", "a.zip", "p_windows"))) + assertEquals(setOf("linux", "osx"), ItchUploads.platforms(upload("2", "a.zip", "p_linux", "p_osx"))) + assertEquals(setOf("android"), ItchUploads.platforms(upload("3", "a.apk", "p_android"))) + assertEquals(setOf("web"), ItchUploads.platforms(upload("4", "a.zip", type = "html"))) + } + + @Test fun anUploadWithNoPlatformIsTreatedAsWindows() { + assertEquals(setOf("windows"), ItchUploads.platforms(upload("5", "a.zip"))) + } + + @Test fun platformsAlsoReadTheFlagObject() { + val flags = JSONObject().put("windows", false).put("linux", true) + assertEquals(setOf("linux"), ItchUploads.platforms(JSONObject().put("platforms", flags))) + } + + @Test fun buildsSkipExternalUploadsAndPutWindowsFirst() { + val uploads = JSONArray() + .put(upload("10", "linux.tar.gz", "p_linux", updated = "2026-10-01T00:00:00Z")) + .put(upload("11", "win.zip", "p_windows", updated = "2026-09-01T00:00:00Z")) + .put(upload("12", "site", "p_windows", storage = "external")) + val builds = ItchGame.builds(uploads) + assertEquals(listOf("11", "10"), builds.map { it.uploadId }) + assertTrue(builds[0].installable) + assertFalse(builds[1].installable) + } + + @Test fun aDemoIsFlagged() { + assertTrue(ItchGame.builds(JSONArray().put(upload("20", "demo.zip", "p_windows", demo = true))).single().demo) + } + + @Test fun anUploadIsFoundById() { + val uploads = JSONArray().put(upload("30", "a.zip")).put(upload("31", "b.zip")) + assertEquals("b.zip", ItchUploads.byId(uploads, "31")?.optString("filename")) + assertNull(ItchUploads.byId(uploads, "99")) + assertNull(ItchUploads.byId(uploads, "")) + } + + @Test fun noDownloadKeyMeansNoKeyInTheAddress() { + assertEquals("https://api.itch.io/uploads/13619666/download", ItchApi.downloadUrl("13619666", "")) + assertEquals("https://api.itch.io/uploads/13619666/download?download_key_id=7", ItchApi.downloadUrl("13619666", "7")) + } +} diff --git a/docs/development/itch-install.md b/docs/development/itch-install.md new file mode 100644 index 0000000000..3db9fde5d4 --- /dev/null +++ b/docs/development/itch-install.md @@ -0,0 +1,21 @@ +# itch.io install and version picker + +Installing an itch.io game opens a version picker first. It lists the game's uploads from `/games/{id}/uploads`, with the platform, size and date of each. + +- Windows builds install. A game with a single Windows build skips the picker and installs at once. +- Other builds (macOS, Android, web) open the game's page on itch.io. +- Linux builds are listed but cannot be installed yet. + +## Free games + +A free game does not need to be in the library. The game's number is read from the `itch:path` meta tag of its page (`games/`), and both the upload list and the download work with the API key alone and no download key. This was checked against a live free game: the upload list answered 200 and a one-byte range request on the download answered 206. + +A game that costs money and has no download key in the library is still refused. + +## Pieces + +`ItchGame` finds the game number and turns the upload list into builds. `ItchUploads.platforms` reads the platform from the upload's flags or `p_*` traits, and treats an upload with none as Windows. `ItchBuildPicker` is the pop-up. The chosen upload is carried in the item's `extra` as `uploadId`, and `ItchInstaller` downloads that upload. + +If the upload the user chose is no longer in the game's list when the install starts, the install fails with "No Windows download for this game" and does not pick another build. Only an install with no chosen upload falls back to the newest Windows build. The saved queue keeps whether a game is free, so an interrupted free-game install resumes after a restart. + +Before an install extracts, a leftover partial install of the same game (a folder whose marker said "installing" with this game's ID when the install started) is emptied, so a different build chosen after an interruption never mixes with files from the first. A finished or updating install, or another game's unfinished folder that happens to share the folder name, is never emptied. From 10fe5c5f777e52c418f2b5e18fa4540f6eb25431 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 12:37:47 -0400 Subject: [PATCH 021/135] feat: stretch 16:9 games to screens wider than 16:9 too (#1558) * feat: stretch 16:9 games to screens wider than 16:9 too * fix: don't offer 16:9 game fit while the session follows the screen --- .../droiddeck/launcher/session/SessionDisplay.kt | 2 +- .../droiddeck/launcher/ui/ModeSettingsDialog.kt | 3 ++- app/src/main/res/values/strings.xml | 2 +- .../launcher/session/SessionDisplayTest.kt | 5 ++++- .../overlay/usr/local/bin/droiddeck-session | 15 ++++++++++++--- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt index c0bba60936..39ed2c43e9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt @@ -79,5 +79,5 @@ object SessionDisplay { } fun canStretch16x9(size: Pair): Boolean = - (size.second * 16 + 4) / 9 / 2 * 2 > size.first + (size.second * 16 + 4) / 9 / 2 * 2 > size.first || (size.first * 9 + 8) / 16 / 2 * 2 > size.second } 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 c546a34c35..8e83598386 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -221,7 +221,8 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: } if (s.stretch16x9 != null && (com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(s.panelSize) || com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(displaySize))) { - val canStretch = com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(displaySize) + val canStretch = s.resolution != com.droiddeck.launcher.session.SessionDisplay.FOLLOW_SCREEN && + com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(displaySize) ChoiceRow(host, "game-fit", stringResource(R.string.display_game_fit), stringResource(if (canStretch) R.string.display_game_fit_hint else R.string.display_game_fit_unavailable), listOf(false to stringResource(R.string.display_preserve), true to stringResource(R.string.display_stretch)), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1044953c7b..01e94757df 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2003,7 +2003,7 @@ Resolution 16:9 game fit How 16:9 games fit this display. Next session. - Choose Match screen or a custom size narrower than 16:9. + Choose Match screen or a custom size that isn\'t 16:9. Keep proportions Stretch to display Image scaling diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt index 48d77d0b0d..7962ef6fc8 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt @@ -96,7 +96,10 @@ class SessionDisplayTest { @Test fun gameStretchAvailabilityMatchesTheRuntimeIncludingRounding() { assertTrue(SessionDisplay.canStretch16x9(960 to 720)) assertFalse(SessionDisplay.canStretch16x9(1280 to 720)) - assertFalse(SessionDisplay.canStretch16x9(1600 to 720)) + assertTrue(SessionDisplay.canStretch16x9(1600 to 720)) + assertTrue(SessionDisplay.canStretch16x9(2400 to 1080)) + assertFalse(SessionDisplay.canStretch16x9(1920 to 1080)) + assertFalse(SessionDisplay.canStretch16x9(1366 to 768)) val wide = SessionDisplay.resolve(1440 to 1080, 0, SessionPrefs.SHAPE_WIDE) assertFalse(SessionDisplay.canStretch16x9(wide)) } diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 8628db6725..2688d9a8a6 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -211,13 +211,19 @@ if [ -z "${BL_INSIDE:-}" ]; then width=${BL_WIDTH:-1280} height=${BL_HEIGHT:-720} nested=$width + nested_h=$height if [ "${BL_FOLLOW_OUTPUT:-0}" = 1 ]; then echo "== gamescope: the output follows the screen (${width}x${height} to start)" elif [ "$mode" = steam ] && [ "${BL_GAMESCOPE_STRETCH_16X9:-0}" = 1 ]; then wide=$(( (height * 16 + 4) / 9 / 2 * 2 )) + tall=$(( (width * 9 + 8) / 16 / 2 * 2 )) if [ "$wide" -gt "$width" ]; then nested=$wide - echo "== gamescope: games at ${nested}x${height} stretched to the ${width}x${height} output" + elif [ "$tall" -gt "$height" ]; then + nested_h=$tall + fi + if [ "$nested" != "$width" ] || [ "$nested_h" != "$height" ]; then + echo "== gamescope: games at ${nested}x${nested_h} stretched to the ${width}x${height} output" fi fi # Off unless Performance asks for it. Compositing the cursor here adds a second @@ -225,8 +231,11 @@ if [ -z "${BL_INSIDE:-}" ]; then if [ "$mode" = steam ] && [ "${BL_CURSOR_COMPOSITE:-0}" = 1 ]; then export gamescope_cursor_composite=2 fi - args=(--backend wayland --expose-wayland -f -W "$width" -H "$height" -w "$nested" -h "$height") - [ "$nested" != "$width" ] && args+=(-S stretch) && export BL_STRETCHED=1 + args=(--backend wayland --expose-wayland -f -W "$width" -H "$height" -w "$nested" -h "$nested_h") + if [ "$nested" != "$width" ] || [ "$nested_h" != "$height" ]; then + args+=(-S stretch) + export BL_STRETCHED=1 + fi if [ "${BL_FPS:-0}" -gt 0 ]; then args+=(-r "$BL_FPS") elif [ "${BL_REFRESH:-0}" -gt 0 ]; then From 597402107db5a662e785d48e44a79b4955acd68f Mon Sep 17 00:00:00 2001 From: Kerim R Shaydullin <92952605+RewCrew@users.noreply.github.com> Date: Sun, 25 Oct 2026 13:42:51 -0300 Subject: [PATCH 022/135] [FIX] statx call on old kernels < 4.11 (#947) * [FIX] Fix git statx call on old kernels < 4.11 for correct using of "Fast proot path" Issue https://github.com/Droid-Deck/DroidDeck/issues/770 * [FIX] fix: don't call major() from the proot fast path * fix: preserve statx fallback request semantics * fix statx fallback argument handling * fix: silence statx null check warning --------- Co-authored-by: xXJsonDeruloXx Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- tools/proot/fastpath/fastpath.c | 69 ++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/tools/proot/fastpath/fastpath.c b/tools/proot/fastpath/fastpath.c index 811b0057c8..bd3fc0d210 100644 --- a/tools/proot/fastpath/fastpath.c +++ b/tools/proot/fastpath/fastpath.c @@ -875,19 +875,84 @@ int __fxstat(int ver, int fd, struct stat *st) { } int __fxstat64(int ver, int fd, struct stat64 *st) { return __fxstat(ver, fd, (struct stat *)st); } +#ifndef STATX__RESERVED +#define STATX__RESERVED 0x80000000U +#endif + +static int statx_missing; + +static unsigned int dev_major(unsigned long long dev) { + return ((dev >> 8) & 0xfff) | ((unsigned int)(dev >> 32) & ~0xfffU); +} +static unsigned int dev_minor(unsigned long long dev) { + return (dev & 0xff) | ((unsigned int)(dev >> 12) & ~0xffU); +} + +static void fill_statx(struct statx *out, const struct stat *st) { + memset(out, 0, sizeof *out); + out->stx_mask = STATX_BASIC_STATS; + out->stx_blksize = st->st_blksize; + out->stx_nlink = st->st_nlink; + out->stx_uid = st->st_uid; + out->stx_gid = st->st_gid; + out->stx_mode = st->st_mode; + out->stx_ino = st->st_ino; + out->stx_size = st->st_size; + out->stx_blocks = st->st_blocks; + out->stx_atime.tv_sec = st->st_atim.tv_sec; + out->stx_atime.tv_nsec = st->st_atim.tv_nsec; + out->stx_ctime.tv_sec = st->st_ctim.tv_sec; + out->stx_ctime.tv_nsec = st->st_ctim.tv_nsec; + out->stx_mtime.tv_sec = st->st_mtim.tv_sec; + out->stx_mtime.tv_nsec = st->st_mtim.tv_nsec; + out->stx_rdev_major = dev_major(st->st_rdev); + out->stx_rdev_minor = dev_minor(st->st_rdev); + out->stx_dev_major = dev_major(st->st_dev); + out->stx_dev_minor = dev_minor(st->st_dev); +} + +/* Emulate statx on older kernels < 4.11 */ +static long statx_call(int dirfd, const char *path, int flags, unsigned mask, struct statx *out) { + struct stat st; + long rs; + if ((flags & ~(AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT | AT_STATX_SYNC_TYPE)) || + (flags & AT_STATX_SYNC_TYPE) == AT_STATX_SYNC_TYPE) + return -EINVAL; + if (!statx_missing) { + rs = sc(SYS_statx, dirfd, (long)path, flags, mask, (long)out); + if (rs != -ENOSYS) return rs; + statx_missing = 1; + } + if (flags & AT_STATX_SYNC_TYPE) return -ENOSYS; + rs = sc(SYS_newfstatat, dirfd, (long)path, (long)&st, + flags & (AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT), 0); + if (rs < 0) return rs; + fill_statx(out, &st); + return 0; +} + int statx(int dirfd, const char *path, int flags, unsigned mask, struct statx *out) { REAL(statx, int (*)(int, const char *, int, unsigned, struct statx *)); struct res r; long rs; + if (mask & STATX__RESERVED) { errno = EINVAL; return -1; } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnonnull-compare" + if (!out) { errno = EFAULT; return -1; } + if (!path) { + if (!(flags & AT_EMPTY_PATH)) { errno = EFAULT; return -1; } + return real_statx ? real_statx(dirfd, path, flags, mask, out) : ret(sc(SYS_statx, dirfd, (long)path, flags, mask, (long)out)); + } +#pragma GCC diagnostic pop if ((flags & AT_EMPTY_PATH) && !path[0] && fp_ready()) { hits++; - return ret(sc(SYS_statx, dirfd, (long)"", flags, mask, (long)out)); + return ret(statx_call(dirfd, "", flags, mask, out)); } rs = (flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT | AT_STATX_SYNC_TYPE)) ? FP_SLOW : resolve(dirfd, path, (flags & AT_SYMLINK_NOFOLLOW ? 0 : 1) | MAY_BE_UNSEEN, &r); if (rs == 1) rs = -ENOENT; if (rs == 0 || rs == UNSEEN) - rs = sc(SYS_statx, AT_FDCWD, (long)r.host, flags | (rs == 0 && !r.magic ? AT_SYMLINK_NOFOLLOW : 0), mask, (long)out); + rs = statx_call(AT_FDCWD, r.host, flags | (rs == 0 && !r.magic ? AT_SYMLINK_NOFOLLOW : 0), mask, out); ANSWER(rs, dirfd, path, real_statx(dirfd, path, flags, mask, out)); } From 6918fd93086acb1d5e65b7a0b54071b20e715eee Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 12:44:35 -0400 Subject: [PATCH 023/135] feat: install the redists a Steam game's install script runs on Windows (#1561) * feat: install the redists a Steam game's install script runs on Windows * fix: rescan a game's components when its install script changes --- .../launcher/frontend/AutoComponents.kt | 4 ++- .../launcher/frontend/SteamRedists.kt | 11 +++++++ .../launcher/frontend/WinCompSources.kt | 4 +-- .../frontend/WinComponentDetectorsTest.kt | 33 +++++++++++++++++++ 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt index ae43cf0fec..650c717d87 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt @@ -257,7 +257,7 @@ object AutoComponents { private const val FINDINGS = "wincomp-findings.json" - private const val DETECTORS = "d2" + private const val DETECTORS = "d3" internal fun signature(context: Context, game: Library.SteamGame): String { val folder = game.gameFiles @@ -267,6 +267,8 @@ object AutoComponents { folder?.let { SteamRedists.manifest(it, game.appId)?.lastModified() }, folder?.let { StoreGameSidecar.file(it).lastModified() }, folder?.let { File(it, "fuel.json").lastModified() }, + folder?.listFiles { f -> f.name.lowercase().let { it.startsWith("installscript") && it.endsWith(".vdf") } } + ?.maxOfOrNull { it.lastModified() }, SteamAppInfo.appinfoFile(context).lastModified(), folder?.let { SteamMatch.get(context, it.path) }?.let { "${it.appId}/${it.certainty}" }, steamAppOf(context, game)?.let { SteamAppInfo.state(context, it) }, diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt index e3285b260a..e022ebc8ec 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt @@ -28,6 +28,17 @@ object SteamRedists { return File(steamapps, "appmanifest_$appId.acf").takeIf { it.isFile } } + /** Redists the game's own install script has Steam run on Windows, from its "Run Process" entries. */ + fun installScript(gameDir: File?): List> = + gameDir?.listFiles { f -> + f.isFile && f.length() < 1L shl 20 && f.name.lowercase().let { it.startsWith("installscript") && it.endsWith(".vdf") } + }.orEmpty().sortedBy { it.name }.flatMap { file -> + val root = runCatching { com.droiddeck.launcher.input.KeyValues.parse(file.readText()) }.getOrNull() ?: return@flatMap emptyList() + (root.child("InstallScript") ?: root).children("Run Process") + .flatMap { run -> run.entries.mapNotNull { (it.second as? com.droiddeck.launcher.input.KeyValues.Node)?.string("process 1") } } + .flatMap { path -> DependencyDetector.componentsFor(path).map { it to DependencyDetector.label(it) } } + }.distinctBy { it.first } + fun detect(gameDir: File?, appId: Int): List { val text = try { manifest(gameDir, appId)?.takeIf { it.length() < 1L shl 20 }?.readText() ?: return emptyList() diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt b/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt index 390b13d523..8e91102f3b 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt @@ -79,8 +79,8 @@ object WinCompSources { val local = SteamRedists.detect(gameDir, appId) val pairs = (if (local.isNotEmpty()) local.map { it.componentName to it.label } else SteamAppInfo.info(context, appId)?.let { steamDepots(it.sharedDepots) }.orEmpty()) + - SteamRedists.SCRIPTED[appId].orEmpty() - return pairs.map { (component, label) -> + SteamRedists.installScript(gameDir) + SteamRedists.SCRIPTED[appId].orEmpty() + return pairs.distinctBy { it.first.removeSuffix("_dll") }.map { (component, label) -> Finding(component, label, if (auto) Origin.STEAM else Origin.STEAM_NAME, auto, listOf(label, gameName, appId.toString())) } } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/WinComponentDetectorsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/WinComponentDetectorsTest.kt index cf39fb396a..cdad5c09b7 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/WinComponentDetectorsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/WinComponentDetectorsTest.kt @@ -54,6 +54,39 @@ class WinComponentDetectorsTest { assertEquals(emptyList(), WinCompSources.steamList(context, game, 409710, "Other", auto = true).map { it.component }) } + @Test fun theGamesInstallScriptRedistsAreInstalledAsSteamWould() { + val steamapps = tmp.newFolder("steamapps") + val game = File(steamapps, "common/DiRT 3 Complete Edition").apply { mkdirs() } + File(steamapps, "appmanifest_321040.acf").writeText("\"AppState\"\n{\n\t\"SharedDepots\"\n\t{\n\t\t\"228983\"\t\t\"228980\"\n\t}\n}\n") + File(game, "installscript.vdf").writeText( + """ + "InstallScript" + { + "Registry" { "HKEY_LOCAL_MACHINE\\Software\\Codemasters" { "string" { "Path" "%INSTALLDIR%" } } } + "Run Process" + { + "OpenAL" + { + "HasRunKey" "HKEY_LOCAL_MACHINE\\Software\\Valve\\Steam\\Apps\\321040" + "process 1" "%INSTALLDIR%\\_CommonRedist\\OpenAL\\2.0.7.0\\oalinst.exe" + "command 1" "/s" + } + "VC2010" + { + "process 1" "%INSTALLDIR%\\_CommonRedist\\vcredist\\2010\\vcredist_x86.exe" + } + } + } + """.trimIndent(), + ) + assertEquals(listOf("oalinst", "vcredist2010"), SteamRedists.installScript(game).map { it.first }) + val context = androidx.test.core.app.ApplicationProvider.getApplicationContext() + val found = WinCompSources.steamList(context, game, 321040, "DiRT 3 Complete Edition", auto = true) + assertEquals(listOf("vcredist2010_dll", "oalinst"), found.map { it.component }) + assertTrue(found.all { it.auto && it.origin == WinCompSources.Origin.STEAM }) + assertEquals(emptyList>(), SteamRedists.installScript(File(steamapps, "missing"))) + } + @Test fun thePrefixCountsOnlyWhatDroidDeckDidNotPutThere() { val compat = tmp.newFolder("compatdata", "409710") val pfx = File(compat, "pfx") From c4df7e9b3d6ce762332174ed6f5c864653990781 Mon Sep 17 00:00:00 2001 From: Charles DuBose Date: Sun, 25 Oct 2026 12:49:27 -0400 Subject: [PATCH 024/135] feat: Battle.net on the desktop with its games and store, plus memory options (#979) --- README.md | 2 +- .../main/java/com/droiddeck/launcher/App.kt | 1 + .../droiddeck/launcher/FrontEndActivity.kt | 71 +- .../com/droiddeck/launcher/SessionActivity.kt | 17 +- .../launcher/core/BackgroundAppLimit.kt | 59 + .../droiddeck/launcher/core/WirelessAdbFix.kt | 32 +- .../launcher/frontend/AddedGameArt.kt | 34 +- .../droiddeck/launcher/frontend/AddedGames.kt | 15 + .../launcher/frontend/GameRemoval.kt | 2 +- .../droiddeck/launcher/frontend/Library.kt | 10 +- .../droiddeck/launcher/runtime/BattleNet.kt | 410 +++++++ .../launcher/session/ComponentsManager.kt | 1 + .../launcher/session/GameEnvironmentStore.kt | 8 + .../launcher/session/MemoryReadout.kt | 175 +++ .../launcher/session/NoSteamLaunch.kt | 6 + .../launcher/session/SessionFiles.kt | 1 + .../launcher/session/SessionPrefs.kt | 26 + .../launcher/session/SessionService.kt | 47 +- .../launcher/session/WineProcesses.kt | 13 + .../droiddeck/launcher/stores/CloudSaves.kt | 6 +- .../droiddeck/launcher/stores/LoginFlows.kt | 2 +- .../launcher/stores/SteamLiveShortcuts.kt | 8 +- .../com/droiddeck/launcher/stores/Store.kt | 3 +- .../launcher/stores/StoreAccounts.kt | 1 + .../launcher/stores/StoreInstallRoot.kt | 4 +- .../droiddeck/launcher/stores/StoreSizes.kt | 4 +- .../droiddeck/launcher/stores/StoresState.kt | 11 +- .../stores/battlenet/BattleNetStore.kt | 294 +++++ .../launcher/stores/battlenet/BlizzardArt.kt | 93 ++ .../droiddeck/launcher/ui/FrontEndScreen.kt | 9 + .../droiddeck/launcher/ui/FrontEndSetup.kt | 32 + .../com/droiddeck/launcher/ui/GameDetail.kt | 3 + .../launcher/ui/GameEnvironmentEditor.kt | 3 +- .../com/droiddeck/launcher/ui/StoreChips.kt | 2 + .../droiddeck/launcher/ui/StoresDownloads.kt | 4 +- .../com/droiddeck/launcher/ui/StoresPage.kt | 42 +- app/src/main/res/values-ar/strings.xml | 21 + app/src/main/res/values-b+es+419/strings.xml | 21 + app/src/main/res/values-bg/strings.xml | 21 + app/src/main/res/values-cs/strings.xml | 21 + app/src/main/res/values-da/strings.xml | 21 + app/src/main/res/values-de/strings.xml | 21 + app/src/main/res/values-el/strings.xml | 21 + app/src/main/res/values-es/strings.xml | 21 + app/src/main/res/values-fi/strings.xml | 21 + app/src/main/res/values-fr/strings.xml | 21 + app/src/main/res/values-hi/strings.xml | 21 + app/src/main/res/values-hu/strings.xml | 21 + app/src/main/res/values-in/strings.xml | 21 + app/src/main/res/values-it/strings.xml | 21 + app/src/main/res/values-ja/strings.xml | 21 + app/src/main/res/values-ko/strings.xml | 21 + app/src/main/res/values-ms/strings.xml | 21 + app/src/main/res/values-nb/strings.xml | 21 + app/src/main/res/values-nl/strings.xml | 21 + app/src/main/res/values-pl/strings.xml | 21 + app/src/main/res/values-pt-rPT/strings.xml | 21 + app/src/main/res/values-pt/strings.xml | 21 + app/src/main/res/values-ro/strings.xml | 21 + app/src/main/res/values-ru/strings.xml | 21 + app/src/main/res/values-sv/strings.xml | 21 + app/src/main/res/values-th/strings.xml | 21 + app/src/main/res/values-tr/strings.xml | 21 + app/src/main/res/values-uk/strings.xml | 21 + app/src/main/res/values-vi/strings.xml | 21 + app/src/main/res/values-zh-rCN/strings.xml | 21 + app/src/main/res/values-zh-rHK/strings.xml | 21 + app/src/main/res/values-zh-rTW/strings.xml | 21 + app/src/main/res/values/strings.xml | 22 + .../launcher/core/BackgroundAppLimitTest.kt | 40 + .../launcher/runtime/BattleNetTest.kt | 378 ++++++ .../launcher/session/MemoryReadoutTest.kt | 66 ++ .../launcher/session/WineProcessesTest.kt | 23 + .../stores/battlenet/BattleNetRequestTest.kt | 38 + .../stores/battlenet/BlizzardArtTest.kt | 30 + .../overlay/usr/local/bin/droiddeck-battlenet | 933 +++++++++++++++ .../usr/local/bin/droiddeck-proton-run | 58 +- .../usr/local/bin/droiddeck-store-launch | 27 + .../overlay/usr/local/bin/steam-compatibility | 5 +- tools/tests/test_battlenet.py | 1013 +++++++++++++++++ tools/tests/test_desktop_open.py | 16 + tools/tests/test_store_launch.py | 31 +- 82 files changed, 4750 insertions(+), 53 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/core/BackgroundAppLimit.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/session/MemoryReadout.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/session/WineProcesses.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/battlenet/BlizzardArt.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/core/BackgroundAppLimitTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/MemoryReadoutTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/WineProcessesTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetRequestTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/battlenet/BlizzardArtTest.kt create mode 100755 tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet create mode 100644 tools/tests/test_battlenet.py diff --git a/README.md b/README.md index e2b975dd86..76a02242b7 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Compatibility and performance vary by device; hardware validation is limited. De ## Credits and licence -GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. The registry entries a GOG game's install script (`goggame-.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc//mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc//status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). Xbox games load the Windows modules of [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) runtime (LGPL-2.1-or-later), including its `wintypes.dll`, whose `ApiInformation` answer Minecraft for Windows needs to start; how Minecraft installs GameInput under Wine was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. +GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. Battle.net support is [@kayakyakr](https://github.com/kayakyakr)'s: it runs Blizzard's own Battle.net client, downloaded from Blizzard and not included, in Proton, and shows the key art from each game's [Battle.net Shop](https://shop.battle.net) page; without the Steam client its games see DroidDeck's pad as an Xbox 360 controller through `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. The registry entries a GOG game's install script (`goggame-.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc//mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc//status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). Xbox games load the Windows modules of [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) runtime (LGPL-2.1-or-later), including its `wintypes.dll`, whose `ApiInformation` answer Minecraft for Windows needs to start; how Minecraft installs GameInput under Wine was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. XR glasses support builds on WinNative's VITURE glasses work. VITURE protocol details were checked against [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) by [@wheaney](https://github.com/wheaney), including the VITURE protocol header it ships, [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) by [@badicsalex](https://github.com/badicsalex) and the [go-macos/iokit VITURE package](https://pkg.go.dev/github.com/go-macos/iokit/viture); the optional VITURE SDK belongs to VITURE and is not included. RayNeo support adapts [@informalTechCode](https://github.com/informalTechCode)'s [RayNeo-Air-Series-3DoF-Scaffold](https://github.com/informalTechCode/RayNeo-Air-Series-3DoF-Scaffold) (Apache-2.0) and references [@verncat](https://github.com/verncat)'s [RayNeo-Air-3S-Pro-OpenVR](https://github.com/verncat/RayNeo-Air-3S-Pro-OpenVR) (MIT) and [Monado](https://gitlab.freedesktop.org/monado/monado) (BSL-1.0); see [docs/third-party/rayneo](docs/third-party/rayneo/README.md). XREAL 1S support references [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) and [xrealOneDeviceKit](https://github.com/wheaney/xrealOneDeviceKit) by @wheaney, [xreal_one_driver](https://github.com/rohitsangwan01/xreal_one_driver) by [@rohitsangwan01](https://github.com/rohitsangwan01) (MIT) and [xr-tools](https://github.com/0xcaff/xr-tools) by [@0xcaff](https://github.com/0xcaff). Rokid support follows the Rokid protocol notes in [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) and @badicsalex's [Void Computing write-ups](https://voidcomputing.hu/blog/worse-better-prettier/), and [Monado](https://gitlab.freedesktop.org/monado/monado)'s Rokid driver. The REDMAGIC glasses-display findings draw on [@mekhontsev](https://github.com/mekhontsev)'s [MagicDesk investigation](https://github.com/mekhontsev/magicdesk/blob/main/docs/xr-resolution-fix.md) and [@Coding-BR](https://github.com/Coding-BR)'s [decompiled Nubia kernel](https://github.com/Coding-BR/android_kernel_nubia_sm8850_qwjujube). VITURE, RayNeo, XREAL, Rokid and REDMAGIC are trademarks of their owners; this project is not affiliated with them. diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 928d7caa8c..324941bd43 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -53,6 +53,7 @@ class App : Application() { com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.amazon.AmazonBackend) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.itch.ItchBackend) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.xbox.XboxBackend) + com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.battlenet.BattleNetBackend) } /** Fetches the packs an existing setup already relies on, so the first use after an update does not wait. */ diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 5e5bf5c9a3..caefd04e92 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -139,6 +139,7 @@ class FrontEndActivity : ComponentActivity() { private var pkgPercent by mutableIntStateOf(-1) private var desktopInstalled by mutableStateOf(false) private var desktopPresent by mutableStateOf(false) + private var battleNetInstalled by mutableStateOf(false) private var offlineAccount by mutableStateOf(null) private var offline by mutableStateOf(false) private var showPerformance by mutableStateOf(false) @@ -414,6 +415,10 @@ class FrontEndActivity : ComponentActivity() { private var logsEnabled by mutableStateOf(true) private var vacDiagnostics by mutableStateOf(false) private var agentCommands by mutableStateOf(false) + private var clearCachedApps by mutableStateOf(false) + private var adbPaired by mutableStateOf(false) + private var memoryHud by mutableStateOf(SessionPrefs.MEMORY_HUD_OFF) + private var backgroundAppLimit by mutableStateOf(com.droiddeck.launcher.core.BackgroundAppLimit.OFF) private var showRoms by mutableStateOf(false) private var homeAppSelected by mutableStateOf(false) private var homeScreenEnabled by mutableStateOf(false) @@ -594,6 +599,7 @@ class FrontEndActivity : ComponentActivity() { when { !SessionState.running -> startSessionOrWait(next) SessionState.stopRequested -> android.widget.Toast.makeText(this, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show() + command.program == com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET && handToBattleNet(command.args, returnHome) { pendingSwitch = next } -> {} SessionState.mode == SessionService.MODE_RUN && SessionState.program == command.program && SessionState.programArgs == command.args -> startActivity(Intent(this, SessionActivity::class.java).setAction(SessionService.ACTION_RESUME) .returnTo(returnHome) @@ -691,7 +697,8 @@ class FrontEndActivity : ComponentActivity() { } private fun startSessionOrWait(next: Intent): Boolean { - val started = startSession(next, steamSession = next.hasExtra(SessionService.EXTRA_STEAM_URL)) + val started = startSession(next, steamSession = next.hasExtra(SessionService.EXTRA_STEAM_URL) || + next.getStringExtra(SessionService.EXTRA_PROGRAM) in setOf(com.droiddeck.launcher.session.NoSteamLaunch.PROTON_RUN, com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET)) if (!started && (busy || LinuxRuntimeInstaller.isBusy())) android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show() return started } @@ -756,6 +763,7 @@ class FrontEndActivity : ComponentActivity() { gameSyncFolder = GameFileSync.folder(this) displayManager = getSystemService(DISPLAY_SERVICE) as DisplayManager refreshPhantomStatus() + if (!SessionState.running) com.droiddeck.launcher.core.BackgroundAppLimit.restoreAsync(this) theme = SessionPrefs.theme(this) frameGenLabel = getString(R.string.frame_gen_off) appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(this) @@ -805,6 +813,7 @@ class FrontEndActivity : ComponentActivity() { offlineAccount = offlineAccount, offline = offline, frameGenLabel = frameGenLabel, romsDir = romsDir, logsEnabled = logsEnabled, vacDiagnostics = vacDiagnostics, agentCommands = agentCommands, + clearCachedApps = clearCachedApps, adbPaired = adbPaired, memoryHud = memoryHud, backgroundAppLimit = backgroundAppLimit, steamGames = steamGames, steamGamesX64 = steamGamesX64, emulators = emulatorList, running = runningLabel, frameGen = FrameGen.mode(this), lossless = lossless, @@ -823,6 +832,7 @@ class FrontEndActivity : ComponentActivity() { packageStage = pkgStage, packagePercent = pkgPercent, sessionRunning = SessionState.running, + battleNetInstalled = battleNetInstalled, backActionsInverted = backActionsInverted, buildLabel = BuildConfig.BUILD_LABEL, oscMode = oscMode, @@ -911,6 +921,7 @@ class FrontEndActivity : ComponentActivity() { .putExtra(SessionService.EXTRA_PROGRAM, app.program) .putExtra(SessionService.EXTRA_PROGRAM_ARGS, app.args.toTypedArray())) }, + onBattleNet = { openBattleNet() }, onFlatpakApp = { id, name -> Library.flatpakNames[id] = name startActivity(Intent(this, SessionActivity::class.java) @@ -965,6 +976,12 @@ class FrontEndActivity : ComponentActivity() { com.droiddeck.launcher.agent.AgentAccess.setCommandsEnabled(this, !com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(this)) agentCommands = com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(this) }, + onClearCachedApps = { on -> SessionPrefs.setClearCachedApps(this, on); clearCachedApps = on }, + onMemoryHud = { value -> SessionPrefs.setMemoryHud(this, value); memoryHud = value }, + onBackgroundAppLimit = { limit -> + SessionPrefs.setBackgroundAppLimit(this, limit); backgroundAppLimit = limit + if (limit == com.droiddeck.launcher.core.BackgroundAppLimit.OFF) com.droiddeck.launcher.core.BackgroundAppLimit.restoreAsync(this) + }, onShareLogs = { SessionLogShare.prepare(this, { SessionLogShare.latest(this) }) { zip -> if (zip == null) android.widget.Toast.makeText(this, R.string.main_no_logs_yet, android.widget.Toast.LENGTH_LONG).show() @@ -1322,6 +1339,7 @@ class FrontEndActivity : ComponentActivity() { refreshWifiDiscovery() com.droiddeck.launcher.stores.StoresState.refresh(this) com.droiddeck.launcher.stores.StoresState.libraryListener = { refreshAddedGames(); refresh() } + com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = { args -> openBattleNet(args) } com.droiddeck.launcher.ui.Motion.refresh(this) com.droiddeck.launcher.ui.Ambient.poke() com.droiddeck.launcher.ui.QuitFlood.take()?.let { c -> @@ -1389,6 +1407,7 @@ class FrontEndActivity : ComponentActivity() { unregisterReceiver(mediaReceiver) ui.removeCallbacks(mediaRefresh) com.droiddeck.launcher.stores.StoresState.libraryListener = null + com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = null displayManager.unregisterDisplayListener(secondScreenDisplayListener) flood = null returning = null @@ -1582,6 +1601,50 @@ class FrontEndActivity : ComponentActivity() { desktopPresent = DesktopCatalog.desktopPresent(this) } + private fun openBattleNet(args: List = emptyList()) { + if (protons.protonBusyId != null || ProtonExtras.installInProgress || pkgStage != null) { + android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show() + return + } + val app = applicationContext + Thread({ + val full = if (args.firstOrNull() == "--library") args else com.droiddeck.launcher.stores.battlenet.BattleNetClient.library(app) + args + ui.post { + if (isDestroyed) return@post + val next = Intent(this, SessionActivity::class.java) + .putExtra(SessionService.EXTRA_MODE, SessionService.MODE_RUN) + .putExtra(SessionService.EXTRA_PROGRAM, com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET) + .putExtra(SessionService.EXTRA_PROGRAM_ARGS, full.toTypedArray()) + when { + !SessionState.running -> startSessionOrWait(next) + SessionState.stopRequested -> android.widget.Toast.makeText(this, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show() + handToBattleNet(full) { pendingSwitch = next } -> {} + else -> pendingSwitch = next + } + } + }, "battlenet-open").start() + } + + private fun handToBattleNet(args: List, returnHome: Boolean = false, otherwise: () -> Unit): Boolean { + if (SessionState.mode != SessionService.MODE_RUN || SessionState.program != com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET) return false + val library = args.takeIf { it.firstOrNull() == "--library" }?.getOrNull(1) + val sessionLibrary = SessionState.programArgs.takeIf { it.firstOrNull() == "--library" }?.getOrNull(1) + if (library != null && sessionLibrary != null && library != sessionLibrary) return false + val request = if (library != null) args.drop(2) else args + val app = applicationContext + Thread({ + val handed = request.isEmpty() || com.droiddeck.launcher.stores.battlenet.BattleNetClient.request(LinuxRuntime.sessionRoot(app), request) + ui.post { + if (isDestroyed) return@post + if (!handed) otherwise() + else startActivity(Intent(this, SessionActivity::class.java).setAction(SessionService.ACTION_RESUME) + .returnTo(returnHome) + .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)) + } + }, "battlenet-request").start() + return true + } + private fun launchProgram(path: String) { startActivity(Intent(this, SessionActivity::class.java) .putExtra(SessionService.EXTRA_MODE, SessionService.MODE_RUN) @@ -2044,6 +2107,7 @@ class FrontEndActivity : ComponentActivity() { addedGamesArt = SessionPrefs.addedGamesArt(this) desktopInstalled = DesktopCatalog.desktopInstalled(this) desktopPresent = DesktopCatalog.desktopPresent(this) + battleNetInstalled = com.droiddeck.launcher.runtime.BattleNet.installed(this) offlineAccount = OfflineMode.account(this) offline = OfflineMode.enabled(this) installed = LinuxRuntimeInstaller.installedVersion(this) @@ -2054,6 +2118,10 @@ class FrontEndActivity : ComponentActivity() { logsEnabled = SessionPrefs.logsEnabled(this) vacDiagnostics = SessionPrefs.vacDiagnostics(this) agentCommands = com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(this) + clearCachedApps = SessionPrefs.clearCachedApps(this) + adbPaired = WirelessAdbFix.hasSavedPairing(this) + memoryHud = SessionPrefs.memoryHud(this) + backgroundAppLimit = SessionPrefs.backgroundAppLimit(this) runningLabel = if (SessionState.running) when (SessionState.mode) { SessionService.MODE_DESKTOP -> getString(R.string.rail_desktop) SessionService.MODE_RUN -> Library.nameForProgram(SessionState.program) @@ -2151,6 +2219,7 @@ class FrontEndActivity : ComponentActivity() { private fun refreshPhantomStatus() { phantomProcessStatus = PhantomProcessLimit.read(this) + adbPaired = WirelessAdbFix.hasSavedPairing(this) phantomWarning = if (PhantomProcessLimit.blocksSteam(phantomProcessStatus)) { getString( R.string.phantom_warning, PhantomProcessLimit.title(this, phantomProcessStatus), diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 29953e6c31..67227b8615 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -155,6 +155,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private lateinit var sessionOverlay: ComposeView private lateinit var loading: LoadingState private lateinit var hud: PerfHud + private lateinit var memoryHud: com.droiddeck.launcher.session.MemoryHud private var padBridge: PadBridge? = null private var joyConVr: com.droiddeck.launcher.input.JoyConVr? = null private var handCamera: com.droiddeck.launcher.handtracking.HandCamera? = null @@ -572,17 +573,21 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val needResume = !needRuntime && com.droiddeck.launcher.runtime.DesktopCatalog.interrupted(this).isNotEmpty() val needDesktop = intent.getStringExtra(SessionService.EXTRA_MODE) == SessionService.MODE_DESKTOP && (repair || !com.droiddeck.launcher.runtime.DesktopCatalog.desktopInstalled(this)) - val needProton = (intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM) == SessionService.MODE_STEAM && - com.droiddeck.launcher.runtime.DesktopCatalog.protonSeedNeeded(this) + val program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) + val protonUser = (intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM) == SessionService.MODE_STEAM || + program == com.droiddeck.launcher.runtime.BattleNet.PROGRAM || program == com.droiddeck.launcher.session.NoSteamLaunch.PROTON_RUN + val needProton = protonUser && com.droiddeck.launcher.runtime.DesktopCatalog.protonSeedNeeded(this) if (needRuntime || needResume || needDesktop || needProton) installThenStart(needRuntime, needDesktop, needProton, needResume) } hud = PerfHud(this) + memoryHud = com.droiddeck.launcher.session.MemoryHud(this) hud.onPresentingWindowChanged = { if (FrameGen.engine(this) != FrameGen.ENGINE_OFF) CompositorHost.rearmFrameGen { applyFrameGen() } } if (SessionState.running && SessionState.firstFrameSeen) { loading.visible = false hud.start() + memoryHud.start() } readPrefs() @@ -677,7 +682,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize()) { CursorOverlay({ cursorPos }, cursorVisible, resources.displayMetrics.density, cursorImage, cursorHotX, cursorHotY, cursorImageScale) - if (hud.text.isNotEmpty() || hud.graph.size >= 2) HudText(hud.text, hud.graph, hudColor, hudOpacity) + val hudLines = listOf(hud.text, memoryHud.text).filter { it.isNotEmpty() } + if (hudLines.isNotEmpty() || hud.graph.size >= 2) + HudText(hudLines.joinToString("\n"), hud.graph, hudColor, hudOpacity) val phonePanel = glassesOutputActive && !loading.visible && !drawerOpen && !pcKeyboardOpen if (phonePanel) GlassesPhonePanel(glasses, steamVrStatus == SteamVr.Status.RUNNING, headTracking) if (trackingRecovery != null && !drawerOpen && !pcKeyboardOpen && !loading.visible) { @@ -3056,6 +3063,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (!SessionState.suspended) pausedFrame = null com.droiddeck.launcher.ui.Motion.refresh(this) refreshHomeApp() + if (::memoryHud.isInitialized && SessionState.running && SessionState.firstFrameSeen) memoryHud.refresh() if (intent?.action == SessionService.ACTION_RESUME) { intent.action = null SessionService.resume(this) @@ -3501,8 +3509,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionEvents.firstFrame() if (SessionState.mode == SessionService.MODE_STEAM) SteamRepair.clientShown(this) runOnUiThread { + if (isFinishing || isDestroyed) return@runOnUiThread loading.visible = false hud.start() + memoryHud.start() } } @@ -3520,6 +3530,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { glassesScreen?.let { screen -> glassesScreen = null; runCatching { screen.dismiss() } } headTracker?.stop() if (::hud.isInitialized) hud.stop() + if (::memoryHud.isInitialized) memoryHud.stop() joyConVr?.close() joyConVr = null handCamera?.stop() diff --git a/app/src/main/java/com/droiddeck/launcher/core/BackgroundAppLimit.kt b/app/src/main/java/com/droiddeck/launcher/core/BackgroundAppLimit.kt new file mode 100644 index 0000000000..02447f360c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/core/BackgroundAppLimit.kt @@ -0,0 +1,59 @@ +package com.droiddeck.launcher.core + +import android.content.Context +import android.util.Log +import java.util.concurrent.Executors + +object BackgroundAppLimit { + private const val TAG = "BackgroundAppLimit" + const val OFF = -1 + val CHOICES = listOf(OFF, 4, 1, 0) + private const val KEY = "max_cached_processes" + private const val STATE = "background-app-limit" + private const val APPLIED = "applied" + private const val PREVIOUS = "previous" + + private val worker = Executors.newSingleThreadExecutor { Thread(it, "background-app-limit").apply { isDaemon = true } } + + internal fun readCommand() = "device_config get activity_manager $KEY" + internal fun setCommand(limit: Int): String { + require(limit in 0..1024) + return "device_config put activity_manager $KEY $limit" + } + internal fun restoreCommand(previous: String?) = + if (previous == null) "device_config delete activity_manager $KEY" else "device_config put activity_manager $KEY $previous" + + internal fun parse(output: String): String? = output.trim().takeIf { it.toIntOrNull() != null } + + private fun state(context: Context) = context.applicationContext.getSharedPreferences(STATE, Context.MODE_PRIVATE) + + fun applied(context: Context): Boolean = state(context).getBoolean(APPLIED, false) + + fun applyAsync(context: Context, limit: Int) { + val app = context.applicationContext + worker.execute { + runCatching { + if (!applied(app)) { + val previous = parse(WirelessAdbFix.shell(app, readCommand())) + check(state(app).edit().putBoolean(APPLIED, true).putString(PREVIOUS, previous).commit()) { "previous value not saved" } + } + WirelessAdbFix.shell(app, setCommand(limit)) + }.onSuccess { Log.i(TAG, "at most $limit cached app(s) while the session runs") } + .onFailure { Log.w(TAG, "limit not set: ${it.message}") } + } + } + + fun restoreAsync(context: Context) { + val app = context.applicationContext + worker.execute { + if (!applied(app)) return@execute + val previous = state(app).getString(PREVIOUS, null) + runCatching { WirelessAdbFix.shell(app, restoreCommand(previous)) } + .onSuccess { + state(app).edit().putBoolean(APPLIED, false).remove(PREVIOUS).commit() + Log.i(TAG, "cached-app limit put back (${previous ?: "Android's own"})") + } + .onFailure { Log.w(TAG, "limit not put back yet: ${it.message}") } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt index e3f432e184..fcb5d08894 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt @@ -182,25 +182,47 @@ object WirelessAdbFix { } fun setUsingSavedPairing(context: Context, enabled: Boolean) { + withSavedPairing(context) { appContext, host, port -> setChildProcessLimit(appContext, host, port, enabled) } + } + + fun hasSavedPairing(context: Context): Boolean = savedConnection(context.applicationContext) != null + + fun clearCachedApps(context: Context) { + shell(context, "am kill-all") + } + + fun shell(context: Context, command: String): String { + var output = "" + withSavedPairing(context) { appContext, host, port -> + loadOrCreateIdentity(appContext) + Kadb.create(host, port).use { adb -> + val result = adb.shell(command) + check(result.exitCode == 0) { result.allOutput.ifBlank { appContext.getString(R.string.adbfix_command_failed, result.exitCode) } } + output = result.output + } + saveConnection(appContext, host, port) + } + return output + } + + private fun withSavedPairing(context: Context, action: (Context, String, Int) -> Unit) { val appContext = context.applicationContext val saved = savedConnection(appContext) ?: error(appContext.getString(R.string.adbfix_no_pairing)) val cachedPort = saved.port if (cachedPort != null) { - val cachedResult = runCatching { - setChildProcessLimit(appContext, saved.host, cachedPort, enabled) - } + val cachedResult = runCatching { action(appContext, saved.host, cachedPort) } if (cachedResult.isSuccess) return val discoveredPort = findConnectPort(appContext, saved.host) if (discoveredPort != null && discoveredPort != cachedPort) { - setChildProcessLimit(appContext, saved.host, discoveredPort, enabled) + action(appContext, saved.host, discoveredPort) } else { cachedResult.getOrThrow() } } else { val discoveredPort = findConnectPort(appContext, saved.host) ?: error(appContext.getString(R.string.adbfix_enter_address)) - setChildProcessLimit(appContext, saved.host, discoveredPort, enabled) + action(appContext, saved.host, discoveredPort) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt index 8315c22e9e..28eb1bf723 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt @@ -4,7 +4,9 @@ import android.content.Context import android.graphics.Bitmap import android.util.Log import com.droiddeck.launcher.files.PeIconExtractor +import com.droiddeck.launcher.runtime.BattleNet import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreArt import com.droiddeck.launcher.stores.StoreGameSidecar import org.json.JSONObject @@ -75,14 +77,18 @@ object AddedGameArt { ) } + private fun storeArt(context: Context, game: AddedGames.Game): BattleNet.Art? = + if (game.source != Store.BATTLENET.id) null else game.storeId?.let(BattleNet::title)?.let { BattleNet.art(context, it) } + fun resolve(context: Context, game: AddedGames.Game): Art { val own = local(game) val cache = cacheDir(context, game) + val store = storeArt(context, game) fun cached(name: String) = File(cache, name).takeIf { it.isFile } return Art( - portrait = chosen(cache, Slot.COVER) ?: own.portrait ?: cached("p.jpg") ?: exeArt(context, game, cover = true), - header = chosen(cache, Slot.WIDE) ?: own.header ?: cached("header.jpg") ?: exeArt(context, game, cover = false), - hero = chosen(cache, Slot.BACKGROUND) ?: own.hero ?: cached("hero.jpg"), + portrait = chosen(cache, Slot.COVER) ?: own.portrait ?: store?.cover ?: cached("p.jpg") ?: exeArt(context, game, cover = true), + header = chosen(cache, Slot.WIDE) ?: own.header ?: store?.header ?: cached("header.jpg") ?: exeArt(context, game, cover = false), + hero = chosen(cache, Slot.BACKGROUND) ?: own.hero ?: store?.header ?: cached("hero.jpg"), logo = chosen(cache, Slot.LOGO) ?: own.logo ?: cached("logo.png"), icon = chosen(cache, Slot.ICON) ?: own.icon ?: cached("icon-sgdb.png") ?: exeIcon(context, game), ) @@ -91,15 +97,16 @@ object AddedGameArt { fun describe(context: Context, game: AddedGames.Game): List { val own = local(game) val cache = cacheDir(context, game) + val store = storeArt(context, game) fun cached(name: String): Pair? = File(cache, name).takeIf { it.isFile }?.let { f -> f to (File(cache, "$name.src").takeIf { it.isFile }?.readText()?.trim()?.takeIf { it.isNotEmpty() } ?: STEAM) } return Slot.values().map { slot -> chosen(cache, slot)?.let { return@map SlotState(slot, it, chosenSource(context, game, slot).first.ifEmpty { FILE }, true) } val auto: Pair? = when (slot) { - Slot.COVER -> own.portrait?.let { it to FOLDER } ?: cached("p.jpg") ?: exeArt(context, game, cover = true)?.let { it to EXE } - Slot.WIDE -> own.header?.let { it to FOLDER } ?: cached("header.jpg") ?: exeArt(context, game, cover = false)?.let { it to EXE } - Slot.BACKGROUND -> own.hero?.let { it to FOLDER } ?: cached("hero.jpg") + Slot.COVER -> own.portrait?.let { it to FOLDER } ?: store?.cover?.let { it to AUTO } ?: cached("p.jpg") ?: exeArt(context, game, cover = true)?.let { it to EXE } + Slot.WIDE -> own.header?.let { it to FOLDER } ?: store?.header?.let { it to AUTO } ?: cached("header.jpg") ?: exeArt(context, game, cover = false)?.let { it to EXE } + Slot.BACKGROUND -> own.hero?.let { it to FOLDER } ?: store?.header?.let { it to AUTO } ?: cached("hero.jpg") Slot.LOGO -> own.logo?.let { it to FOLDER } ?: cached("logo.png") Slot.ICON -> own.icon?.let { it to FOLDER } ?: File(cache, "icon-sgdb.png").takeIf { it.isFile }?.let { it to SGDB } ?: exeIcon(context, game)?.let { it to EXE } @@ -253,12 +260,13 @@ object AddedGameArt { internal fun missing(context: Context, game: AddedGames.Game): Set { val own = local(game) val cache = cacheDir(context, game) + val store = storeArt(context, game) fun has(slot: Slot, mine: File?, cached: String) = chosen(cache, slot) != null || mine != null || File(cache, cached).isFile return Slot.values().filterNot { slot -> when (slot) { - Slot.COVER -> has(slot, own.portrait, "p.jpg") - Slot.WIDE -> has(slot, own.header, "header.jpg") - Slot.BACKGROUND -> has(slot, own.hero, "hero.jpg") + Slot.COVER -> has(slot, own.portrait ?: store?.cover, "p.jpg") + Slot.WIDE -> has(slot, own.header ?: store?.header, "header.jpg") + Slot.BACKGROUND -> has(slot, own.hero ?: store?.header, "hero.jpg") Slot.LOGO -> has(slot, own.logo, "logo.png") Slot.ICON -> has(slot, own.icon, "icon-sgdb.png") } @@ -322,6 +330,10 @@ object AddedGameArt { } internal fun steamMatch(context: Context, game: AddedGames.Game, search: (String) -> Int?): SteamMatch.Match { + if (game.source == Store.BATTLENET.id) { + val id = game.storeId?.let(BattleNet::title)?.steam + return SteamMatch.Match(id, if (id == null) SteamMatch.Certainty.NONE else SteamMatch.Certainty.FILES, Store.BATTLENET.id, System.currentTimeMillis()) + } val match = SteamMatch.resolve(context, game.folder.path, game.exe, game.name, legacy = File(cacheDir(context, game), "steam-appid"), search = search) match.appId?.let { Log.i(TAG, "${game.name}: Steam app $it (${match.certainty.name.lowercase()})") } return match @@ -361,14 +373,14 @@ object AddedGameArt { .filter { it.second > 0 && it.first.isNotEmpty() } .maxByOrNull { it.second }?.first - private fun search(name: String): String? { + internal fun search(name: String): String? { val term = name.replace(EDITION, " ").trim().ifEmpty { name } val json = get(STORE_SEARCH + URLEncoder.encode(term, "UTF-8"))?.toString(Charsets.UTF_8) ?: return null val items = JSONObject(json).optJSONArray("items") ?: return null return pickStoreResult(name, (0 until items.length()).map { items.getJSONObject(it) }.map { it.optString("id") to it.optString("name") }) } - private fun download(id: String, cache: File, slots: Set): Boolean { + internal fun download(id: String, cache: File, slots: Set = Slot.entries.toSet()): Boolean { var got = false for ((slot, remote, localName) in listOf( Triple(Slot.COVER, "library_600x900.jpg", "p.jpg"), Triple(Slot.WIDE, "header.jpg", "header.jpg"), diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt index 340bc83ce0..aa1c6eef4c 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -79,6 +79,18 @@ object AddedGames { return null } + fun hostPath(context: Context, guest: String): File? { + if (!guest.startsWith("/") || guest.split('/').any { it == ".." }) return null + val mapped = roots(context).map { it.host to it.guest } + StoreInstallRoot.externalRoots(context) + + listOfNotNull(GameStorage.effective(context)?.let { File(it.path) to LIBRARY }) + + (android.os.Environment.getExternalStorageDirectory() to "/root/Storage") + for ((host, root) in mapped.sortedByDescending { it.second.length }) { + if (guest == root) return host + if (guest.startsWith("$root/")) return File(host, guest.removePrefix("$root/")) + } + return File(LinuxRuntime.rootDir(context), guest.removePrefix("/")) + } + fun candidates(folder: File): List = rank(folder).exes fun rank(folder: File): GameExePicker.Ranking { @@ -177,6 +189,9 @@ object AddedGames { scanGame(context, folder, out, single = entry) } for (folder in StoreInstallRoot.gameFolders(context)) if (StoreInstallRoot.isFinished(folder)) scanGame(context, folder, out) + for (game in com.droiddeck.launcher.runtime.BattleNet.games(context)) { + if (game.folder.path !in removed) com.droiddeck.launcher.runtime.BattleNet.shortcut(context, game)?.let(out::add) + } return out.distinctBy { it.folder.canonicalPath } } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt index ab997f0271..388448e184 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt @@ -11,7 +11,7 @@ object GameRemoval { enum class Kind { STORE, SHORTCUT, LAUNCHER } fun kind(game: Library.SteamGame): Kind = when { - game.library == Library.EPIC_LAUNCHER -> Kind.LAUNCHER + game.library == Library.EPIC_LAUNCHER || game.library == Library.BATTLENET_LAUNCHER -> Kind.LAUNCHER game.library == Library.ADDED && game.source == Library.ADDED -> Kind.SHORTCUT else -> Kind.STORE } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 5fb1a4ecd9..9fb776447a 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -22,11 +22,16 @@ object Library { SteamGame(appId, name, art, library, gameId, hero, lastPlayed, gameFiles, protonPrefix, icon, source, storeId, logo) val gameIdString: String get() = java.lang.Long.toUnsignedString(gameId) - val profileKey: String get() = if (library == ADDED) java.lang.Integer.toUnsignedString(appId) else appId.toString() + val profileKey: String get() = when { + source == com.droiddeck.launcher.stores.Store.BATTLENET.id -> com.droiddeck.launcher.runtime.BattleNet.APP_ID.toString() + library == ADDED -> java.lang.Integer.toUnsignedString(appId) + else -> appId.toString() + } } const val ADDED = "added" const val EPIC_LAUNCHER = "epic-launcher" const val EPIC_LAUNCHER_NAME = "Epic Games Launcher" + const val BATTLENET_LAUNCHER = "battlenet-launcher" const val XBOX_CLOUD = "xbox-cloud" const val SOURCE_STEAM = "steam" @@ -238,7 +243,8 @@ object Library { SteamGame( g.steamAppId ?: g.appId.toInt(), g.name, art.portrait ?: art.header, ADDED, g.gameId, hero = art.hero ?: art.header, lastPlayed = lastPlayed, gameFiles = g.folder, - protonPrefix = protonPrefix(context, g.steamAppId?.toLong() ?: g.appId, libraries = roots), + protonPrefix = if (g.source == com.droiddeck.launcher.stores.Store.BATTLENET.id) File(com.droiddeck.launcher.runtime.BattleNet.prefix(context), "pfx").takeIf { it.isDirectory } + else protonPrefix(context, g.steamAppId?.toLong() ?: g.appId, libraries = roots), icon = art.icon?.takeIf { it.extension.lowercase() != "ico" }, source = g.source, storeId = g.storeId, logo = art.logo, diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt new file mode 100644 index 0000000000..5cd766a7b8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -0,0 +1,410 @@ +package com.droiddeck.launcher.runtime + +import android.app.ActivityManager +import android.content.Context +import android.util.Log +import com.droiddeck.launcher.session.ComponentsManager +import com.droiddeck.launcher.session.GameEnvironmentStore +import java.io.File + +object BattleNet { + private const val TAG = "BattleNet" + + const val APP_ID = 2596113170L + + const val FEX_REQUEST = "battlenet-fex.request" + const val FEX_RESULT = "battlenet-fex.result" + + const val PROGRAM = "/usr/local/bin/droiddeck-battlenet" + + class Title(val uid: String, val name: String, val code: String, val steam: Int? = null, val shop: String? = null) + + internal val TITLES = listOf( + Title("wow", "World of Warcraft", "WoW", shop = "world-of-warcraft-midnight"), + Title("wow_classic", "World of Warcraft Classic", "WoWC", shop = "world-of-warcraft-burning-crusade-classic-anniversary-edition-upgrades"), + Title("wow_classic_era", "World of Warcraft Classic", "WoWC"), + Title("wow_classic_anniversary", "World of Warcraft Classic", "WoWC"), + Title("diablo3", "Diablo III", "D3", shop = "diablo-iii"), + Title("d3cn", "Diablo III", "D3CN", shop = "diablo-iii"), + Title("s2", "StarCraft II", "S2", shop = "starcraft-ii"), + Title("s1", "StarCraft", "S1", shop = "starcraft-remastered"), + Title("hs_beta", "Hearthstone", "WTCG", shop = "hearthstone"), + Title("heroes", "Heroes of the Storm", "Hero", shop = "heroes-of-the-storm"), + Title("prometheus", "Overwatch 2", "Pro", 2357570, shop = "overwatch"), + Title("w3", "Warcraft III: Reforged", "W3", shop = "warcraft-3-reforged"), + Title("viper", "Call of Duty: Black Ops 4", "VIPR", shop = "call-of-duty-black-ops-4"), + Title("odin", "Call of Duty: Modern Warfare", "ODIN", 2000950, shop = "call-of-duty-modern-warfare"), + Title("lazarus", "Call of Duty: Modern Warfare 2 Campaign Remastered", "LAZR", shop = "call-of-duty-modern-warfare-2-campaign-remastered"), + Title("zeus", "Call of Duty: Black Ops Cold War", "ZEUS", shop = "call-of-duty-black-ops-cold-war"), + Title("fore", "Call of Duty: Vanguard", "FORE", shop = "call-of-duty-vanguard"), + Title("auks", "Call of Duty: Modern Warfare II", "AUKS", shop = "call-of-duty-modern-warfare-ii"), + Title("pinta", "Call of Duty: Modern Warfare III", "PNTA", 2519060, shop = "call-of-duty-modern-warfare-iii"), + Title("wlby", "Crash Bandicoot 4: It's About Time", "WLBY", 1378990, shop = "crash-bandicoot-4"), + Title("osi", "Diablo II: Resurrected", "OSI"), + Title("rtro", "Blizzard Arcade Collection", "RTRO", shop = "blizzard-arcade-collection"), + Title("anbs", "Diablo Immortal", "ANBS", shop = "diablo-immortal"), + Title("fenris", "Diablo IV", "Fen", 2344520, shop = "diablo-iv"), + Title("fen", "Diablo IV", "Fen", 2344520, shop = "diablo-iv"), + Title("d1", "Diablo", "D1", shop = "diablo"), + Title("w1", "Warcraft: Orcs & Humans", "W1", shop = "warcraft-orcs-and-humans"), + Title("w2", "Warcraft II: Battle.net Edition", "W2", shop = "warcraft-2-battle-net-edition"), + Title("w1r", "Warcraft: Remastered", "W1R", shop = "warcraft-1-remastered"), + Title("w2r", "Warcraft II: Remastered", "W2R", shop = "warcraft-2-remastered"), + Title("gryphon", "Warcraft Rumble", "GRY", shop = "warcraft-rumble"), + Title("aris", "Doom: The Dark Ages", "ARIS", 3017860, shop = "doom-the-dark-ages"), + Title("scorpio", "Sea of Thieves", "SCOR", 1172620, shop = "sea-of-thieves"), + Title("arkansas", "The Outer Worlds 2", "ARK", 1449110, shop = "the-outer-worlds-2"), + Title("libra", "Tony Hawk's Pro Skater 3 + 4", "LBRA", 2545710), + Title("aqua", "Avowed", "AQUA", 2457220, shop = "avowed"), + ) + + val STORE: List get() = TITLES.distinctBy { it.code }.filter { it.uid != "d3cn" && it.code != "WoWC" } + + fun notInstalled(title: Title, installedIds: Collection<String?>) = + installedIds.mapNotNull { id -> id?.let(::title)?.code }.none { it == title.code } + + private const val COVER_RETRY_MS = 24 * 3600_000L + + private fun coverDir(context: Context, title: Title) = + File(context.filesDir, "battlenet-art/${(TITLES.firstOrNull { it.code == title.code } ?: title).uid}") + + fun cover(context: Context, title: Title): File? = art(context, title).cover + + private val coverLock = Any() + + fun fetchCovers(context: Context, titles: List<Title> = TITLES.distinctBy { it.code }.filter { it.uid != "d3cn" }): Boolean = synchronized(coverLock) { + val art = com.droiddeck.launcher.frontend.AddedGameArt + val key = com.droiddeck.launcher.frontend.SteamGridDb.key(context) + var got = false + for (title in titles) { + val dir = coverDir(context, title) + val tried = File(dir, ".tried") + val wide = File(dir, BLIZZARD) + val done = File(dir, "p.jpg").isFile && (title.shop == null || wide.isFile) + if (done || System.currentTimeMillis() - tried.lastModified() < COVER_RETRY_MS) continue + dir.mkdirs() + if (title.steam != null && runCatching { art.download(title.steam.toString(), dir) }.getOrDefault(false)) got = true + if (title.shop != null && !wide.isFile) { + val cover = File(dir, BLIZZARD_COVER).takeUnless { File(dir, "p.jpg").isFile } + if (runCatching { com.droiddeck.launcher.stores.battlenet.BlizzardArt.fetch(title.shop, wide, cover) } + .onFailure { Log.w(TAG, "Blizzard art for ${title.uid}: ${it.javaClass.simpleName}") }.getOrDefault(false)) got = true + } + if (!File(dir, "p.jpg").isFile && !File(dir, BLIZZARD_COVER).isFile && key.isNotEmpty()) { + val id = runCatching { com.droiddeck.launcher.frontend.SteamGridDb.gameId(key, title.steam, title.name) }.getOrNull() + if (id != null && runCatching { com.droiddeck.launcher.frontend.SteamGridDb.download(key, id, dir) }.getOrDefault(false)) got = true + } + runCatching { tried.writeText("") ; tried.setLastModified(System.currentTimeMillis()) } + } + got + } + + private val LOCALES = setOf( + "enus", "engb", "dede", "eses", "esmx", "frfr", "itit", "kokr", "plpl", "ptbr", "ptpt", "ruru", "zhcn", "zhtw", "jajp", "thth", "trtr", "arsa", + ) + + private val NOT_GAMES = setOf("agent", "bna", "battle.net") + + class Game(val uid: String, val name: String, val code: String, val folder: File) { + val title: Title get() = title(uid) ?: Title(uid, name, code) + } + + class Art(val cover: File?, val header: File?) + + private const val BLIZZARD = "blizzard.jpg" + private const val BLIZZARD_COVER = "p-blizzard.jpg" + + fun art(context: Context, title: Title): Art { + val dir = coverDir(context, title) + fun first(vararg names: String) = names.map { File(dir, it) }.firstOrNull { it.isFile } + return Art(first("p.jpg", BLIZZARD_COVER), first(BLIZZARD, "header.jpg")) + } + + fun prefix(context: Context) = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/steamapps/compatdata/$APP_ID") + + fun client(context: Context) = File(prefix(context), "pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe") + + fun installed(context: Context) = File(prefix(context), "pfx/drive_c/Program Files (x86)/Battle.net/Battle.net Launcher.exe").isFile + + fun profile(context: Context): Pair<String, String>? = + (APP_ID.toString() to context.getString(com.droiddeck.launcher.R.string.bnet_name)).takeIf { installed(context) } + + fun icon(context: Context): File? { + val out = File(context.filesDir, "battlenet-art/launcher/icon.png") + if (out.isFile) return out + val exe = client(context).takeIf { it.isFile } ?: return null + val bitmap = runCatching { com.droiddeck.launcher.files.PeIconExtractor.extract(exe) }.getOrNull() ?: return null + return runCatching { + out.parentFile?.mkdirs() + val tmp = File(out.path + ".tmp") + tmp.outputStream().use { check(bitmap.compress(android.graphics.Bitmap.CompressFormat.PNG, 100, it)) } + check(tmp.renameTo(out)) + out + }.getOrNull() + } + + fun launcherEntry(installed: Boolean, art: File? = null): com.droiddeck.launcher.frontend.Library.SteamGame? = + if (!installed) null + else com.droiddeck.launcher.frontend.Library.SteamGame( + appId = APP_ID.toInt(), name = com.droiddeck.launcher.stores.Store.BATTLENET.label, art = art, + library = com.droiddeck.launcher.frontend.Library.BATTLENET_LAUNCHER, gameId = APP_ID, + source = com.droiddeck.launcher.stores.Store.BATTLENET.id, + ) + + fun fexInUse(context: Context): String? = ComponentsManager.gameComponents(context, APP_ID.toString())["fex"] + + internal fun title(uid: String): Title? { + val id = uid.lowercase() + TITLES.firstOrNull { it.uid == id }?.let { return it } + val base = id.substringBeforeLast('_', "") + return if (base.isNotEmpty() && id.substringAfterLast('_') in LOCALES) TITLES.firstOrNull { it.uid == base } else null + } + + fun games(context: Context): List<Game> { + val pfx = File(prefix(context), "pfx") + val entries = runCatching { File(pfx, "system.reg").useLines { uninstallEntries(it) } }.getOrDefault(emptyList()) + + runCatching { productDbEntries(File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").readBytes()) }.getOrDefault(emptyList()) + val found = LinkedHashMap<String, Game>() + for ((uid, path) in entries) { + val title = title(uid) + if (title == null) { + if (uid.lowercase() !in NOT_GAMES) Log.i(TAG, "not listed: $uid (no launch code known)") + continue + } + if (title.code in found) continue + val folder = hostFolder(context, path)?.takeIf { it.isDirectory } ?: continue + found[title.code] = Game(title.uid, title.name, title.code, folder) + } + return found.values.toList() + } + + internal fun hostFolder(context: Context, path: String): File? { + val drive = Regex("""^([CcZz]):[\\/](.*)$""").matchEntire(path.trim()) ?: return null + val relative = drive.groupValues[2].replace('\\', '/').trim('/') + if (relative.isEmpty() || relative.split('/').any { it == ".." }) return null + return if (drive.groupValues[1].equals("c", ignoreCase = true)) File(prefix(context), "pfx/drive_c/$relative") + else com.droiddeck.launcher.frontend.AddedGames.hostPath(context, "/$relative") + } + + private val KEY = Regex("""^\[(.+)\](?:\s+\d+)?\s*$""") + private val UNINSTALL = Regex("""(?i)\\CurrentVersion\\Uninstall\\[^\\]+$""") + private val VALUE = Regex("""^"((?:[^"\\]|\\.)*)"=(?:str\(\d+\):)?"((?:[^"\\]|\\.)*)"\s*$""") + private val UID = Regex("""--uid=([A-Za-z0-9_.-]+)""") + + internal fun uninstallEntries(lines: Sequence<String>): List<Pair<String, String>> { + val out = ArrayList<Pair<String, String>>() + var inside = false + var uid: String? = null + var location: String? = null + fun flush() { + val u = uid + val l = location + if (u != null && l != null) out.add(u to l) + uid = null + location = null + } + for (line in lines) { + if (line.startsWith("[")) { + flush() + inside = KEY.matchEntire(line)?.groupValues?.get(1)?.let { UNINSTALL.containsMatchIn(unescape(it)) } == true + continue + } + if (!inside) continue + val value = VALUE.matchEntire(line) ?: continue + val text = unescape(value.groupValues[2]) + when (unescape(value.groupValues[1]).lowercase()) { + "uninstallstring" -> if (text.contains("battle.net", ignoreCase = true)) uid = UID.find(text)?.groupValues?.get(1) + "installlocation" -> location = text + } + } + flush() + return out + } + + private fun unescape(s: String): String { + val out = StringBuilder(s.length) + var i = 0 + while (i < s.length) { + val c = s[i++] + if (c != '\\' || i >= s.length) { out.append(c); continue } + when (val e = s[i++]) { + 'n' -> out.append('\n') + 'r' -> out.append('\r') + 't' -> out.append('\t') + '0' -> out.append('\u0000') + 'x' -> { + var end = i + while (end < s.length && end - i < 4 && s[end].lowercaseChar() in "0123456789abcdef") end++ + if (end > i) { out.append(s.substring(i, end).toInt(16).toChar()); i = end } else out.append('x') + } + else -> out.append(e) + } + } + return out.toString() + } + + internal fun productDbEntries(bytes: ByteArray): List<Pair<String, String>> { + val installs = runCatching { fields(bytes, 0, bytes.size) }.getOrDefault(emptyList()).filter { it.first == 1 } + return installs.mapNotNull { (_, start, end) -> + runCatching { + val install = fields(bytes, start, end) + val uid = install.firstOrNull { it.first == 1 }?.let { String(bytes, it.second, it.third - it.second) } + val path = install.firstOrNull { it.first == 3 }?.let { s -> fields(bytes, s.second, s.third).firstOrNull { it.first == 1 } } + ?.let { String(bytes, it.second, it.third - it.second) } + val installed = install.firstOrNull { it.first == 4 }?.let { s -> fields(bytes, s.second, s.third).firstOrNull { it.first == 1 } } + ?.let { s -> varints(bytes, s.second, s.third)[1] } + if (uid.isNullOrEmpty() || path.isNullOrEmpty() || installed == 0L) null else uid to path + }.getOrNull() + } + } + + private fun fields(bytes: ByteArray, from: Int, to: Int): List<Triple<Int, Int, Int>> = walk(bytes, from, to) { _, _ -> } + + private fun varints(bytes: ByteArray, from: Int, to: Int): Map<Int, Long> = + HashMap<Int, Long>().also { found -> walk(bytes, from, to) { field, value -> found.putIfAbsent(field, value) } } + + private fun walk(bytes: ByteArray, from: Int, to: Int, varint: (Int, Long) -> Unit): List<Triple<Int, Int, Int>> { + val out = ArrayList<Triple<Int, Int, Int>>() + var i = from + fun next(): Long { + var value = 0L + var shift = 0 + while (true) { + require(i < to && shift < 64) { "truncated" } + val b = bytes[i++].toInt() and 0xff + value = value or ((b and 0x7f).toLong() shl shift) + if (b < 0x80) return value + shift += 7 + } + } + while (i < to) { + val key = next() + when ((key and 7).toInt()) { + 0 -> varint((key ushr 3).toInt(), next()) + 1 -> { require(to - i >= 8) { "truncated" }; i += 8 } + 2 -> { + val n = next() + require(n in 0..(to - i).toLong()) { "truncated" } + out.add(Triple((key ushr 3).toInt(), i, i + n.toInt())) + i += n.toInt() + } + 5 -> { require(to - i >= 4) { "truncated" }; i += 4 } + else -> error("wire type ${key and 7}") + } + } + return out + } + + fun shortcut(context: Context, game: Game): com.droiddeck.launcher.frontend.AddedGames.Game? { + val added = com.droiddeck.launcher.frontend.AddedGames + val client = client(context) + val guestExe = added.guestPath(context, client) ?: return null + val guestDir = added.guestPath(context, client.parentFile ?: return null) ?: return null + val guestPrefix = added.guestPath(context, prefix(context)) ?: return null + val crc = java.util.zip.CRC32().apply { update("\"$guestExe\"${game.name}".toByteArray()) }.value + val appId = com.droiddeck.launcher.session.SessionPrefs.addedGameAppId(context, game.folder.path, crc or 0x80000000L) + val exe = added.candidates(game.folder).firstOrNull() ?: client + return com.droiddeck.launcher.frontend.AddedGames.Game( + game.folder, game.name, exe, guestExe, guestDir, appId, (appId shl 32) or 0x02000000L, listOf(exe), + source = com.droiddeck.launcher.stores.Store.BATTLENET.id, storeId = game.uid, + launchOptions = "STEAM_COMPAT_DATA_PATH=$guestPrefix %command% --exec=\"launch ${game.code}\"", + ) + } + + fun remove(context: Context) { + val root = LinuxRuntime.rootDir(context) + com.droiddeck.launcher.core.FileUtils.delete(prefix(context)) + File(root, "usr/local/share/applications/droiddeck-battlenet.desktop").delete() + com.droiddeck.launcher.core.FileUtils.delete(File(root, "root/.cache/droiddeck/battlenet")) + ComponentsManager.clearGameComponents(context, APP_ID.toString()) + Log.i(TAG, "removed") + } + + private val D2RFIX = Regex("""(?i)FEXCore-(\d+(?:\.\d+)*)-d2rfix(\d+)-linux\.wcp""") + + private const val LISTING_MAX_AGE = 6 * 3600L + + private val NEWEST = Comparator<Pair<List<Long>, Long>> { a, b -> + for (i in 0 until minOf(a.first.size, b.first.size)) if (a.first[i] != b.first[i]) return@Comparator a.first[i].compareTo(b.first[i]) + if (a.first.size != b.first.size) a.first.size.compareTo(b.first.size) else a.second.compareTo(b.second) + } + + internal fun d2rfix(file: String): Pair<List<Long>, Long>? { + val m = D2RFIX.matchEntire(file) ?: return null + val version = m.groupValues[1].split('.').map { it.toLongOrNull() ?: return null } + return version to (m.groupValues[2].toLongOrNull() ?: return null) + } + + internal fun newestD2rFix(items: List<ComponentsManager.CatalogItem>): ComponentsManager.CatalogItem? = + items.filter { it.comp == "fex" }.mapNotNull { item -> d2rfix(item.file)?.let { item to it } } + .maxWithOrNull { a, b -> NEWEST.compare(a.second, b.second) }?.first + + fun ensureFex(context: Context): String = ensureFex(context) { ComponentsManager.catalog(it, true).items } + + @Synchronized + internal fun ensureFex(context: Context, refresh: (Context) -> List<ComponentsManager.CatalogItem>): String { + val item = newestD2rFix(listing(context, refresh)) ?: error("no d2rfix FEXCore build in the Nightlies listing") + val file = ComponentsManager.safeName(item.file) + if (ComponentsManager.packages(context).none { it.file == file }) { + Log.i(TAG, "downloading ${item.file}") + ComponentsManager.download(context, item) {} + } + val scope = APP_ID.toString() + if (ComponentsManager.gameComponents(context, scope)["fex"] != file) { + ComponentsManager.setGameComponent(context, scope, "fex", file) + Log.i(TAG, "FEX for the Battle.net prefix: $file") + } + return file + } + + private fun listing(context: Context, refresh: (Context) -> List<ComponentsManager.CatalogItem>): List<ComponentsManager.CatalogItem> { + val cached = ComponentsManager.catalog(context, false) + val age = System.currentTimeMillis() / 1000 - cached.fetchedAt + if (age in 0 until LISTING_MAX_AGE && newestD2rFix(cached.items) != null) return cached.items + val fetched = runCatching { refresh(context) } + .onFailure { Log.w(TAG, "Nightlies listing: ${it.message}") }.getOrNull().orEmpty() + return if (newestD2rFix(fetched) != null) fetched else cached.items + } + + internal fun videoMemory(totalMb: Long): Int = (totalMb / 5 / 512 * 512).coerceIn(1536, 3584).toInt() + + internal fun videoMemoryOptions(megabytes: Int): String = + "dxgi.maxDeviceMemory = $megabytes; dxgi.maxSharedMemory = $megabytes; d3d9.maxAvailableMemory = $megabytes" + + fun ensureVideoMemory(context: Context): Boolean { + val memory = ActivityManager.MemoryInfo() + context.getSystemService(ActivityManager::class.java)?.getMemoryInfo(memory) ?: return false + if (memory.totalMem <= 0) return false + val options = videoMemoryOptions(videoMemory(memory.totalMem / (1024 * 1024))) + val set = GameEnvironmentStore.setDefault(context, APP_ID.toString(), DXVK_CONFIG, options) + if (set) Log.i(TAG, "DXVK_CONFIG for the Battle.net profile: $options") + return set + } + + private const val DXVK_CONFIG = "DXVK_CONFIG" + + fun ensureNoSteam(context: Context): Boolean { + if (com.droiddeck.launcher.session.SessionPrefs.battleNetNoSteamSet(context)) return false + GameEnvironmentStore.setGameNoSteam(context, APP_ID.toString(), true) + com.droiddeck.launcher.session.SessionPrefs.setBattleNetNoSteamSet(context) + Log.i(TAG, "Start without Steam for the Battle.net profile") + return true + } + + fun answerFexRequest(context: Context, dir: File) { + val app = context.applicationContext + Thread({ + runCatching { ensureVideoMemory(app) }.onFailure { Log.w(TAG, "video memory cap for the Battle.net profile", it) } + runCatching { ensureNoSteam(app) }.onFailure { Log.w(TAG, "Start without Steam for the Battle.net profile", it) } + val answer = try { + "ok " + ensureFex(app) + } catch (e: Exception) { + Log.w(TAG, "FEX for the Battle.net prefix", e) + "error " + (e.message ?: e.javaClass.simpleName) + } + Log.i(TAG, "FEX request: $answer") + val result = File(dir, FEX_RESULT) + val partial = File(dir, "$FEX_RESULT.tmp") + runCatching { partial.writeText(answer.replace('\n', ' ') + "\n"); partial.renameTo(result) } + }, "battlenet-fex").start() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index 058785cc7d..db387833b0 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -900,6 +900,7 @@ object ComponentsManager { .put("url", a.optString("browser_download_url")).put("size", a.optLong("size")).put("digest", a.optString("digest"))) } } + if (items.length() == 0 && cache.isFile) runCatching { return parseCatalog(JSONObject(cache.readText())) } val out = JSONObject().put("items", items).put("fetchedAt", System.currentTimeMillis() / 1000) val tmp = File(cache.parentFile, cache.name + ".tmp") tmp.writeText(out.toString()); tmp.renameTo(cache) diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt index 351fe304c0..4d1ae8de21 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt @@ -78,6 +78,14 @@ object GameEnvironmentStore { return config } + @Synchronized + fun setDefault(context: Context, scope: String, name: String, value: String): Boolean { + val config = read(context) + if (GameEnvironment.hasOverride(config, scope, name)) return false + save(context, GameEnvironment.withScopeValue(config, scope, name, value)) + return true + } + @Synchronized fun publish(context: Context, config: GameEnvironment.Config = read(context)) { val resolved = config.copy(shared = GameEnvironment.defaults(SessionPrefs.fexPreset(context), SessionPrefs.forceSsbs(context)) + config.shared) diff --git a/app/src/main/java/com/droiddeck/launcher/session/MemoryReadout.kt b/app/src/main/java/com/droiddeck/launcher/session/MemoryReadout.kt new file mode 100644 index 0000000000..c5fcf8a733 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/MemoryReadout.kt @@ -0,0 +1,175 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import android.os.Handler +import android.os.Looper +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.R +import java.io.File +import java.util.Locale + +internal object MemoryReadout { + data class Device(val totalKb: Long, val availableKb: Long, val swapTotalKb: Long, val swapFreeKb: Long) { + val usedKb get() = (totalKb - availableKb).coerceAtLeast(0) + val swapUsedKb get() = (swapTotalKb - swapFreeKb).coerceAtLeast(0) + } + + data class Split(val gameKb: Long, val droiddeckKb: Long, val gpuKb: Long?) + + fun parseMeminfo(text: String): Device? { + fun field(name: String) = Regex("""(?m)^$name:\s+(\d+) kB""").find(text)?.groupValues?.get(1)?.toLongOrNull() + val total = field("MemTotal") ?: return null + val available = field("MemAvailable") ?: return null + return Device(total, available, field("SwapTotal") ?: 0, field("SwapFree") ?: 0) + } + + fun residentKb(status: String): Long { + fun field(name: String) = Regex("""(?m)^$name:\s+(\d+) kB""").find(status)?.groupValues?.get(1)?.toLongOrNull() ?: 0 + return field("RssAnon") + field("RssShmem") + } + + fun inWinePrefix(environ: ByteArray): Boolean { + var start = 0 + val key = "WINEPREFIX=".toByteArray() + for (i in 0..environ.size) { + if (i == environ.size || environ[i] == 0.toByte()) { + if (i - start >= key.size && (key.indices).all { environ[start + it] == key[it] }) return true + start = i + 1 + } + } + return false + } + + fun androidKb(device: Device, split: Split): Long = + (device.usedKb - split.gameKb - split.droiddeckKb - (split.gpuKb ?: 0)).coerceAtLeast(0) + + fun gb(kb: Long): String = String.format(Locale.US, "%.1f", kb / (1024.0 * 1024.0)) + + fun availableMb(): Long? = runCatching { parseMeminfo(File("/proc/meminfo").readText())?.availableKb?.div(1024) }.getOrNull() + + fun device(): Device? = runCatching { parseMeminfo(File("/proc/meminfo").readText()) }.getOrNull() + + fun split(root: Int = android.os.Process.myPid()): Split { + val parents = HashMap<Int, Int>() + File("/proc").listFiles()?.forEach { entry -> + val pid = entry.name.toIntOrNull() ?: return@forEach + parentOf(pid)?.let { parents[pid] = it } + } + val children = parents.entries.groupBy({ it.value }, { it.key }) + var game = 0L + var droiddeck = 0L + val queue = ArrayDeque<Int>().apply { add(root) } + val seen = HashSet<Int>() + while (queue.isNotEmpty()) { + val pid = queue.removeFirst() + if (!seen.add(pid)) continue + val status = runCatching { File("/proc/$pid/status").readText() }.getOrNull() + if (status != null) { + val kb = residentKb(status) + val windows = pid != root && runCatching { inWinePrefix(File("/proc/$pid/environ").readBytes()) }.getOrDefault(false) + if (windows) game += kb else droiddeck += kb + } + children[pid]?.let(queue::addAll) + } + return Split(game, droiddeck, gpuKb()) + } + + private fun parentOf(pid: Int): Int? { + val stat = runCatching { File("/proc/$pid/stat").readText() }.getOrNull() ?: return null + val close = stat.lastIndexOf(')') + if (close < 0 || close + 2 >= stat.length) return null + return stat.substring(close + 2).split(' ').getOrNull(1)?.toIntOrNull() + } + + private fun gpuKb(): Long? = runCatching { + File("/sys/class/kgsl/kgsl/page_alloc").readText().trim().split(Regex("\\s+"))[0].toLong() / 1024 + }.getOrNull() +} + +object MemoryLog { + private const val TAG = "Memory" + private const val PERIOD_MS = 10_000L + @Volatile private var thread: Thread? = null + + internal fun line(device: MemoryReadout.Device, split: MemoryReadout.Split): String = + "used ${device.usedKb / 1024}/${device.totalKb / 1024} MB, available ${device.availableKb / 1024} MB, " + + "swap ${device.swapUsedKb / 1024}/${device.swapTotalKb / 1024} MB | game ${split.gameKb / 1024}, " + + "droiddeck ${split.droiddeckKb / 1024}, android ${MemoryReadout.androidKb(device, split) / 1024}, " + + "gpu ${split.gpuKb?.div(1024) ?: "?"} MB" + + @Synchronized + fun start() { + if (thread != null) return + thread = Thread({ + while (!Thread.currentThread().isInterrupted) { + runCatching { MemoryReadout.device()?.let { android.util.Log.i(TAG, line(it, MemoryReadout.split())) } } + try { Thread.sleep(PERIOD_MS) } catch (e: InterruptedException) { break } + } + }, "memory-log").apply { isDaemon = true; start() } + } + + @Synchronized + fun stop() { + thread?.interrupt() + thread = null + } +} + +class MemoryHud(context: Context) { + var text by mutableStateOf("") + private set + + private val context = context.applicationContext + private val handler = Handler(Looper.getMainLooper()) + @Volatile private var running = false + @Volatile private var generation = 0 + private var thread: Thread? = null + + fun refresh() { + if (SessionPrefs.memoryHud(context) == SessionPrefs.MEMORY_HUD_OFF) stop() else start() + } + + fun start() { + if (running || SessionPrefs.memoryHud(context) == SessionPrefs.MEMORY_HUD_OFF) return + running = true + val token = ++generation + thread = Thread({ + while (running && generation == token) { + val line = runCatching { sample() }.getOrDefault("") + handler.post { if (running && generation == token) text = line } + try { Thread.sleep(PERIOD_MS) } catch (e: InterruptedException) { break } + } + }, "memory-hud").apply { isDaemon = true; start() } + } + + fun stop() { + running = false + generation++ + thread?.interrupt() + thread = null + text = "" + } + + private fun sample(): String { + val device = MemoryReadout.device() ?: return "" + val memory = context.getString( + R.string.memory_hud_simple, + MemoryReadout.gb(device.usedKb), MemoryReadout.gb(device.totalKb), + MemoryReadout.gb(device.swapUsedKb), MemoryReadout.gb(device.swapTotalKb), + ) + if (SessionPrefs.memoryHud(context) != SessionPrefs.MEMORY_HUD_ADVANCED) return memory + val split = MemoryReadout.split() + val parts = context.getString( + R.string.memory_hud_split, + MemoryReadout.gb(split.gameKb), MemoryReadout.gb(split.droiddeckKb), MemoryReadout.gb(MemoryReadout.androidKb(device, split)), + ) + val gpu = split.gpuKb?.let { context.getString(R.string.memory_hud_gpu, MemoryReadout.gb(it)) } + return listOfNotNull(memory, parts, gpu).joinToString("\n") + } + + private companion object { + const val PERIOD_MS = 2000L + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt b/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt index c77e8dc161..b8dab5de11 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt @@ -9,11 +9,13 @@ import com.droiddeck.launcher.stores.epic.EpicClient object NoSteamLaunch { const val PROTON_RUN = "/usr/local/bin/droiddeck-proton-run" const val EPIC = "/usr/local/bin/droiddeck-epic" + const val BATTLENET = com.droiddeck.launcher.runtime.BattleNet.PROGRAM class Command(val program: String, val args: List<String>, val name: String) fun scope(game: Library.SteamGame): String? = when { game.library == Library.EPIC_LAUNCHER -> EpicClient.shortcutAppId.toString() + game.library == Library.BATTLENET_LAUNCHER -> com.droiddeck.launcher.runtime.BattleNet.APP_ID.toString() game.library == Library.ADDED || game.appId > 0 -> game.profileKey else -> null }?.takeIf { it.isNotEmpty() && GameEnvironment.validScope(it) } @@ -30,6 +32,8 @@ object NoSteamLaunch { fun command(game: Library.SteamGame, added: AddedGames.Game?): Command? = when { game.library == Library.EPIC_LAUNCHER -> Command(EPIC, listOf("run"), game.name) + game.library == Library.ADDED && game.source == com.droiddeck.launcher.stores.Store.BATTLENET.id -> + game.storeId?.let(com.droiddeck.launcher.runtime.BattleNet::title)?.let { Command(BATTLENET, listOf("launch", it.code), game.name) } game.library == Library.ADDED -> added?.let { a -> a.steamAppId?.let { Command(PROTON_RUN, listOf("--app", it.toString()), a.name) } ?: addedCommand(a) } game.appId > 0 -> Command(PROTON_RUN, listOf("--app", game.appId.toString()), game.name) else -> null @@ -52,6 +56,7 @@ object NoSteamLaunch { fun nameFor(program: String?, args: List<String>): String? = when (program) { EPIC -> Library.EPIC_LAUNCHER_NAME + BATTLENET -> args.getOrNull(args.indexOf("launch") + 1)?.takeIf { args.contains("launch") }?.let { names[it] } ?: com.droiddeck.launcher.stores.Store.BATTLENET.label PROTON_RUN -> args.getOrNull(args.indexOf("--app") + 1)?.takeIf { args.contains("--app") }?.let { names[it] } else -> null } @@ -60,5 +65,6 @@ object NoSteamLaunch { fun remember(command: Command) { if (command.program == PROTON_RUN) command.args.getOrNull(command.args.indexOf("--app") + 1)?.let { names[it] = command.name } + if (command.program == BATTLENET) command.args.getOrNull(command.args.indexOf("launch") + 1)?.takeIf { command.args.contains("launch") }?.let { names[it] = command.name } } } 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 38d6c6fd08..2991b559c5 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -74,6 +74,7 @@ object SessionFiles { "usr/local/bin/droiddeck-steam-shortcuts" to "usr/local/bin/droiddeck-steam-shortcuts", "usr/local/bin/droiddeck-xbox" to "usr/local/bin/droiddeck-xbox", "usr/local/bin/droiddeck-store-launch" to "usr/local/bin/droiddeck-store-launch", + "usr/local/bin/droiddeck-battlenet" to "usr/local/bin/droiddeck-battlenet", "usr/local/bin/droiddeck-epic" to "usr/local/bin/droiddeck-epic", "usr/local/bin/droiddeck-epic-steam" to "usr/local/bin/droiddeck-epic-steam", "usr/local/bin/droiddeck-open-url" to "usr/local/bin/droiddeck-open-url", 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 8ab1f7e751..01d00c8d43 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -566,6 +566,32 @@ object SessionPrefs { prefs(context).edit().putBoolean("logs", on).apply() } + fun battleNetNoSteamSet(context: Context): Boolean = prefs(context).getBoolean("battleNetNoSteamSet", false) + fun setBattleNetNoSteamSet(context: Context) { prefs(context).edit().putBoolean("battleNetNoSteamSet", true).apply() } + + fun clearCachedApps(context: Context): Boolean = prefs(context).getBoolean("clearCachedApps", false) + fun setClearCachedApps(context: Context, on: Boolean) { prefs(context).edit().putBoolean("clearCachedApps", on).apply() } + + fun backgroundAppLimit(context: Context): Int = + prefs(context).getInt("backgroundAppLimit", com.droiddeck.launcher.core.BackgroundAppLimit.OFF) + .takeIf { it in com.droiddeck.launcher.core.BackgroundAppLimit.CHOICES } ?: com.droiddeck.launcher.core.BackgroundAppLimit.OFF + fun setBackgroundAppLimit(context: Context, limit: Int) { + require(limit in com.droiddeck.launcher.core.BackgroundAppLimit.CHOICES) + prefs(context).edit().putInt("backgroundAppLimit", limit).apply() + } + + const val MEMORY_HUD_OFF = "off" + const val MEMORY_HUD_SIMPLE = "simple" + const val MEMORY_HUD_ADVANCED = "advanced" + + fun memoryHud(context: Context): String = + prefs(context).getString("memoryHud", MEMORY_HUD_OFF) + ?.takeIf { it == MEMORY_HUD_SIMPLE || it == MEMORY_HUD_ADVANCED } ?: MEMORY_HUD_OFF + fun setMemoryHud(context: Context, value: String) { + require(value == MEMORY_HUD_OFF || value == MEMORY_HUD_SIMPLE || value == MEMORY_HUD_ADVANCED) + prefs(context).edit().putString("memoryHud", value).apply() + } + fun storageDiagnosticsEnabled(context: Context): Boolean = prefs(context).getBoolean("storageDiagnostics", false) 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 9d0a99fe1b..0fa1182ccc 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -351,6 +351,7 @@ class SessionService : Service() { SessionState.programArgs = intent?.getStringArrayExtra(EXTRA_PROGRAM_ARGS)?.toList().orEmpty() SessionState.steamUi = intent?.getStringExtra(EXTRA_STEAM_UI) SessionState.steamUrl = intent?.getStringExtra(EXTRA_STEAM_URL) + com.droiddeck.launcher.stores.battlenet.BattleNetClient.clearRequests(LinuxRuntime.sessionRoot(this)) synchronized(stopLock) { SessionState.steamClientArch = null SessionState.running = true @@ -365,6 +366,9 @@ class SessionService : Service() { SessionEvents.transition(SessionPhase.STARTING_GUEST, "service.started", mapOf("mode" to SessionState.mode)) com.droiddeck.launcher.wayland.CompositorHost.newSession() val gen = ++sessionGen + SessionPrefs.backgroundAppLimit(this).takeIf { it != com.droiddeck.launcher.core.BackgroundAppLimit.OFF } + ?.let { com.droiddeck.launcher.core.BackgroundAppLimit.applyAsync(this, it) } + if (SessionPrefs.clearCachedApps(this)) clearCachedApps() cancelQueuedSteamGame(clearMailbox = false) clearSteamGameMailbox() if (SessionState.mode == MODE_STEAM) SessionState.steamUrl @@ -671,6 +675,7 @@ class SessionService : Service() { DeviceReport.write(this, File(sessionDir, "device.txt"), SessionState.mode) NetworkReport.write(this, File(sessionDir, "network.txt")) SessionLogCapture.start(File(sessionDir, "app.log")) + MemoryLog.start() return sessionDir } @@ -757,7 +762,7 @@ class SessionService : Service() { } private fun noSteamGame(): Boolean = - SessionState.mode == MODE_RUN && SessionState.program in setOf(NoSteamLaunch.PROTON_RUN, NoSteamLaunch.EPIC) + SessionState.mode == MODE_RUN && SessionState.program in setOf(NoSteamLaunch.PROTON_RUN, NoSteamLaunch.EPIC, NoSteamLaunch.BATTLENET) private fun startAudio(guest: MutableList<String>, sessionDir: File): PulseAudioComponent { val wantsDirectAudio = (SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP || noSteamGame()) && @@ -1057,6 +1062,7 @@ class SessionService : Service() { if (!stillSameProcess()) return val tree = descendants(prootPid) if (!stillSameProcess()) return + saveWineRegistries(tree) android.os.Process.sendSignal(prootPid, 15) if (!waitForExit(prootPid, GRACE_MS)) { if (!stillSameProcess()) return @@ -1073,6 +1079,31 @@ class SessionService : Service() { if (killed > 0) Log.i(TAG, "swept $killed process(es) proot left behind") } + private fun clearCachedApps() { + val app = applicationContext + Thread({ + val before = MemoryReadout.availableMb() + val result = runCatching { com.droiddeck.launcher.core.WirelessAdbFix.clearCachedApps(app) } + val after = MemoryReadout.availableMb() + result.onSuccess { Log.i(TAG, "cached apps closed: available memory $before -> $after MB") } + .onFailure { Log.w(TAG, "cached apps not closed: ${it.message}") } + }, "clear-cached-apps").start() + } + + private fun saveWineRegistries(tree: List<Pair<Int, Long>>) { + val servers = tree.filter { (pid, started) -> + readStat(pid)?.second == started && WineProcesses.isWineserver( + runCatching { File("/proc/$pid/cmdline").readBytes() }.getOrNull(), + runCatching { File("/proc/$pid/comm").readText() }.getOrNull(), + ) + } + if (servers.isEmpty()) return + servers.forEach { (pid, _) -> android.os.Process.sendSignal(pid, 15) } + val deadline = System.currentTimeMillis() + WINE_SAVE_MS + val saved = servers.count { (pid, _) -> waitForExit(pid, (deadline - System.currentTimeMillis()).coerceAtLeast(0)) } + Log.i(TAG, "wineserver registry save: $saved of ${servers.size} exited after SIGTERM") + } + private fun descendants(root: Int): List<Pair<Int, Long>> { val started = HashMap<Int, Long>() val children = HashMap<Int, MutableList<Int>>() @@ -1352,6 +1383,11 @@ class SessionService : Service() { } return } + if (path == com.droiddeck.launcher.runtime.BattleNet.FEX_REQUEST) { + File(dir, path).delete() + com.droiddeck.launcher.runtime.BattleNet.answerFexRequest(this@SessionService, dir) + return + } if (path != null && path.startsWith("desktop-import-") && path.endsWith(".request")) { val request = File(dir, path) val text = runCatching { request.readText() }.getOrNull() ?: return @@ -1635,6 +1671,8 @@ class SessionService : Service() { runCatching { com.droiddeck.launcher.agent.AgentEnv.endSession(this) } .onFailure { Log.w(TAG, "clearing the agent's session environment", it) } releaseLocks() + MemoryLog.stop() + com.droiddeck.launcher.core.BackgroundAppLimit.restoreAsync(applicationContext) if (status == 0) { SessionEvents.transition(SessionPhase.IDLE, "session.stopped", mapOf("status" to status)) } else { @@ -1688,7 +1726,8 @@ class SessionService : Service() { updateDownloadMonitoring() val stoppedGen = sessionGen val stoppedSession = SessionState.sessionId - val launcherEnded = SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP || SessionState.program == NoSteamLaunch.EPIC + val launcherEnded = SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP || SessionState.program == NoSteamLaunch.EPIC || + SessionState.program == NoSteamLaunch.BATTLENET SessionState.stopRequested = false GpuClockPin.stop(this) GameThreadHints.stop() @@ -1748,6 +1787,9 @@ class SessionService : Service() { private fun importLauncherGames() { runCatching { com.droiddeck.launcher.stores.epic.EpicClientLibrary.importClientGames(this) } .onFailure { Log.w(TAG, "client library scan failed: ${it.javaClass.simpleName}") } + runCatching { com.droiddeck.launcher.stores.battlenet.BattleNetClient.syncAccount(this) } + .onFailure { Log.w(TAG, "Battle.net sign-in check failed: ${it.javaClass.simpleName}") } + com.droiddeck.launcher.stores.StoresState.notifyLibraryChanged(this) } override fun onTaskRemoved(rootIntent: Intent?) { @@ -1995,6 +2037,7 @@ class SessionService : Service() { private val STRAGGLERS = listOf("droiddeck-session", "gamescope", "Xwayland", "steamrtarm64", "steamwebhelper", "linuxfs/opt/android-host/proot", "/libproot.so", "pulseaudio/libpulseaudio.so") private const val GRACE_MS = 1200L + private const val WINE_SAVE_MS = 3000L private const val STEAM_PICKUP_MS = 1500L private const val STEAM_EXIT_MS = 10_000L private const val GAME_LAUNCH_RETRY_MS = 250L diff --git a/app/src/main/java/com/droiddeck/launcher/session/WineProcesses.kt b/app/src/main/java/com/droiddeck/launcher/session/WineProcesses.kt new file mode 100644 index 0000000000..d80099bdd6 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/WineProcesses.kt @@ -0,0 +1,13 @@ +package com.droiddeck.launcher.session + +internal object WineProcesses { + private const val WINESERVER = "wineserver" + + fun isWineserver(cmdline: ByteArray?, comm: String?): Boolean { + val program = cmdline?.let { bytes -> + val end = bytes.indexOf(0.toByte()).let { if (it < 0) bytes.size else it } + String(bytes, 0, end, Charsets.UTF_8).substringAfterLast('/') + } + return program == WINESERVER || comm?.trim() == WINESERVER + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt index 669a13eee0..e81d594e04 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt @@ -58,7 +58,7 @@ object CloudSaves { val item = sidecar.extra["catalogItemId"].orEmpty() if (ns.isEmpty() || item.isEmpty()) "" else EpicApiClient.getCustomAttribute(token, ns, item, "CloudSaveFolder") } - Store.AMAZON, Store.ITCH, Store.XBOX -> "" + Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> "" } ?: return null p.edit().putString("cloud_template_$id", fetched).apply() Log.i(TAG, "cloud ${store.id} $id template ${if (fetched.isEmpty()) "none" else "found"}") @@ -96,7 +96,7 @@ object CloudSaves { val dir = when (store) { Store.GOG -> CloudSavePaths.gog(template, pfx, folder) Store.EPIC -> CloudSavePaths.epic(template, pfx, folder, EpicCredentialStore.load(context)?.accountId.orEmpty(), id) - Store.AMAZON, Store.ITCH, Store.XBOX -> null + Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> null } return dir to (if (dir == null) "unresolved" else "ok") } @@ -121,7 +121,7 @@ object CloudSaves { val account = EpicCredentialStore.load(context)?.accountId.orEmpty() if (token == null || account.isEmpty()) null else EpicCloud(account, id, token) } - Store.AMAZON, Store.ITCH, Store.XBOX -> null + Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> null } private fun gogScopedToken(context: Context, id: String, clientId: String): String? { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt index adb507e996..79ca0f8492 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt @@ -12,7 +12,7 @@ internal object LoginFlows { Store.GOG -> GogFlow(state, browserUserAgent) Store.EPIC -> epicFlow() Store.AMAZON -> amazonFlow() - Store.ITCH, Store.XBOX -> null + Store.ITCH, Store.XBOX, Store.BATTLENET -> null } @Volatile var epicFlow: () -> StoreLoginActivity.Flow? = { null } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt b/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt index a0faaa8c01..0cc03b7028 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt @@ -23,14 +23,14 @@ object SteamLiveShortcuts { val wanted = games.filter(include) if (wanted.isEmpty() || !clientRunning()) return val list = JSONArray() - for (g in wanted) list.put(JSONObject().put("name", g.name).put("exe", g.guestExe).put("dir", g.guestDir).put("appid", g.appId and 0xFFFFFFFFL)) + for (g in wanted) list.put(JSONObject().put("name", g.name).put("exe", g.guestExe).put("dir", g.guestDir).put("appid", g.appId and 0xFFFFFFFFL).put("launch", g.launchOptions)) val js = """ (async () => { const want = ${list}; let added = 0; for (const w of want) { if (await ${KNOWN}(w.appid, w.name, w.exe)) continue; - if (await ${ADD}(w.name, w.exe, w.dir, true, ${JSONObject.quote(compatTool(context))})) added++; + if (await ${ADD}(w.name, w.exe, w.dir, true, ${JSONObject.quote(compatTool(context))}, w.launch)) added++; } return added; })() @@ -164,8 +164,8 @@ object SteamLiveShortcuts { private fun compatTool(context: Context): String = com.droiddeck.launcher.session.ProtonDefault.state(context).default ?: COMPAT_TOOL - private val ADD = """(async (name, exe, dir, compat, tool) => { - const id = await SteamClient.Apps.AddShortcut(name, exe, dir, ""); + private val ADD = """(async (name, exe, dir, compat, tool, launch) => { + const id = await SteamClient.Apps.AddShortcut(name, exe, dir, launch || ""); if (!id) return 0; try { SteamClient.Apps.SetShortcutName(id, name); } catch (e) {} try { SteamClient.Apps.AddUserTagToApps([id], ${JSONObject.quote(TAG_NAME)}); } catch (e) {} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt index b5e0d1fbf6..54476b6e19 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt @@ -5,7 +5,8 @@ enum class Store(val id: String, val label: String, val shortLabel: String) { EPIC("epic", "Epic Games", "Epic"), AMAZON("amazon", "Amazon Games", "Amazon"), XBOX("xbox", "Xbox", "Xbox"), - ITCH("itch", "itch.io", "itch"); + ITCH("itch", "itch.io", "itch"), + BATTLENET("battlenet", "Battle.net", "Battle.net"); companion object { fun byId(id: String?): Store? = entries.firstOrNull { it.id == id } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt index a740eb088e..f69380f7c4 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt @@ -90,6 +90,7 @@ object StoreAccounts { fun signedInAs(context: Context, store: Store): String? { val json = read(context, store) ?: return if (isUnavailable(store)) store.label else null if (store == Store.XBOX) return json.optString("username").takeIf { it.isNotBlank() } + if (store == Store.BATTLENET) return json.optString("display_name").takeIf { it.isNotBlank() } if (json.optString("access_token", "").isEmpty()) return null return json.optString("display_name", "").ifEmpty { json.optString("username", "") }.ifEmpty { store.label } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt index 91a0f96f5b..7b13428d7a 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt @@ -91,6 +91,8 @@ object StoreInstallRoot { fun installRoot(context: Context): File = internalRoot(context) + fun libraryRoot(context: Context): File? = GameStorage.effective(context)?.let { File(it.path, ON_VOLUME) } + fun roots(context: Context): List<File> { val cards = GameStorage.options(context).map { File(it.path, ON_VOLUME) } val library = GameStorage.effective(context)?.let { File(it.path, ON_VOLUME) } @@ -187,7 +189,7 @@ object StoreInstallRoot { fun isFinished(folder: File): Boolean = StoreGameSidecar.read(folder)?.isInstalled == true fun unfinished(context: Context): List<Unfinished> = roots(context).flatMap { root -> - Store.entries.flatMap { store -> + Store.entries.filter { it != Store.BATTLENET }.flatMap { store -> storeDir(root, store).listFiles { f -> f.isDirectory }.orEmpty().mapNotNull { folder -> val sidecar = StoreGameSidecar.read(folder) when { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt index 454e3d23bc..290676c9ed 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt @@ -55,7 +55,7 @@ object StoreSizes { Store.EPIC -> EpicPrefs.get(app).edit().putLong("size_${item.id}", it).apply() Store.AMAZON -> AmazonPrefs.get(app).edit().putLong("size_${item.id}", it).apply() Store.ITCH -> {} - Store.GOG, Store.XBOX -> {} + Store.GOG, Store.XBOX, Store.BATTLENET -> {} } } }, pool).exceptionally { error -> @@ -111,7 +111,7 @@ object StoreSizes { val bytes = AmazonApiClient.getBytes(AmazonApiClient.appendPath(spec.downloadUrl, "manifest.proto"), token) ?: return 0L AmazonManifest.parse(bytes).totalInstallSize } - Store.GOG, Store.XBOX -> 0L + Store.GOG, Store.XBOX, Store.BATTLENET -> 0L Store.ITCH -> com.droiddeck.launcher.stores.itch.ItchLibrary.size(context, item) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index 282bcb16f2..f09712b78a 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -77,10 +77,11 @@ object StoresState { val app = context.applicationContext com.droiddeck.launcher.stores.download.SavedQueue.restore(app) background("stores-refresh") { + runCatching { com.droiddeck.launcher.stores.battlenet.BattleNetClient.syncAccount(app) } val found = Store.entries.mapNotNull { store -> StoreAccounts.displayName(app, store)?.let { store to it } } val onDisk = StoreInstallRoot.gameFolders(app).mapNotNull { folder -> StoreGameSidecar.read(folder)?.takeIf { it.isInstalled }?.let { InstalledStoreGame(it, folder) } - } + } + runCatching { com.droiddeck.launcher.stores.battlenet.BattleNetBackend.installedGames(app) }.getOrDefault(emptyList()) val partial = StoreInstallRoot.unfinished(app) val version = if (StoresNative.available) StoresNative.version ?: "" else "" main.post { @@ -225,6 +226,10 @@ object StoresState { fun install(context: Context, item: CatalogItem, root: java.io.File? = null, language: String? = null) { val app = context.applicationContext + if (item.store == Store.BATTLENET) { + backends[item.store]?.install(app, item, root ?: StoreInstallRoot.installRoot(app)) + return + } val folder = StoreInstallRoot.folderFor(app, item.store, item.id, item.title, root ?: StoreInstallRoot.installRoot(app)) val target = folder.parentFile!!.parentFile!! val code = language?.takeIf { it.isNotBlank() } ?: StoreLanguage.preferredCode(app) @@ -258,6 +263,10 @@ object StoresState { uninstalling[key] = 0f background("stores-uninstall", onFailure = { main.post { uninstalling.remove(key); onDone() } }) { runCatching { backends[game.sidecar.store]?.uninstall(app, game) } + if (game.sidecar.store == Store.BATTLENET) { + main.post { uninstalling.remove(key); onDone() } + return@background + } StoreInstalls.uninstall(app, game, progress = { f -> main.post { if (key in uninstalling) uninstalling[key] = f } }, removed = { main.post { installed = installed.filterNot { it.folder.absolutePath == game.folder.absolutePath } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt new file mode 100644 index 0000000000..945c75c7a6 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt @@ -0,0 +1,294 @@ +package com.droiddeck.launcher.stores.battlenet + +import android.content.Context +import android.net.Uri +import android.util.Log +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.AddedGames +import com.droiddeck.launcher.runtime.BattleNet +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import com.droiddeck.launcher.stores.StoreBackend +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreShelves +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.download.DownloadEntry +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadStage +import org.json.JSONObject +import java.io.File +import java.io.FileOutputStream +import java.io.IOException +import java.net.HttpURLConnection +import java.net.URL +import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.AtomicLong + +object BattleNetClient { + private const val TAG = "BattleNetClient" + const val DOWNLOAD_ID = "battlenet-client" + const val DOWNLOAD_KEY = "battlenet:$DOWNLOAD_ID" + const val REQUEST = "battlenet-request" + internal const val INSTALLER_URL = "https://downloader.battle.net/download/getInstallerForGame?os=win&gameProgram=BATTLENET_APP&version=Live" + private const val SETUP = "root/.cache/droiddeck/battlenet/Battle.net-Setup.exe" + private const val CONFIG = "pfx/drive_c/users/steamuser/AppData/Roaming/Battle.net/Battle.net.config" + internal const val MIN_SETUP = 1L shl 20 + private val work = Executors.newSingleThreadExecutor { r -> Thread(r, "battlenet-client") } + + private val sequence = AtomicLong() + + @Volatile var opener: ((List<String>) -> Unit)? = null + + fun setup(context: Context): File = File(LinuxRuntime.rootDir(context), SETUP) + + internal fun setupReady(file: File): Boolean = runCatching { + file.length() >= MIN_SETUP && file.inputStream().use { input -> + val head = ByteArray(2) + input.read(head) == 2 && head[0] == 'M'.code.toByte() && head[1] == 'Z'.code.toByte() + } + }.getOrDefault(false) + + internal fun account(config: String?): String? { + val client = runCatching { JSONObject(config ?: return null).optJSONObject("Client") }.getOrNull() ?: return null + if (client.optString("AutoLogin") != "true") return null + return client.optString("SavedAccountNames").split(',').map { it.trim() }.firstOrNull { it.isNotEmpty() } + } + + private fun config(context: Context) = File(BattleNet.prefix(context), CONFIG) + + fun signedInAs(context: Context): String? = + if (!BattleNet.installed(context)) null + else account(runCatching { config(context).readText() }.getOrNull())?.let(StoreAccounts::maskEmail) + + fun syncAccount(context: Context): Boolean { + val name = signedInAs(context) + if (name == StoreAccounts.signedInAs(context, Store.BATTLENET)) return false + if (name == null) StoreAccounts.clear(context, Store.BATTLENET) + else StoreAccounts.write(context, Store.BATTLENET, JSONObject().put("display_name", name)) + Log.i(TAG, if (name == null) "Battle.net is signed out" else "Battle.net is signed in") + return true + } + + fun refresh(context: Context) { + val app = context.applicationContext + work.execute { + if (runCatching { syncAccount(app) }.getOrDefault(false)) StoresState.notifyLibraryChanged(app) + } + } + + fun signIn(context: Context) { + val app = context.applicationContext + work.execute { + if (BattleNet.installed(app) || setupReady(setup(app))) { + open(emptyList()) + return@execute + } + StoresState.post { + if (DownloadQueue.isActive(DOWNLOAD_KEY)) return@post + val entry = DownloadEntry( + Store.BATTLENET, DOWNLOAD_ID, app.getString(R.string.bnet_name), + location = StoreInstallRoot.labelFor(app, setup(app)), + ) + DownloadQueue.enqueue(app, entry) { SetupDownload(app) } + StoresState.openDownloads = true + } + } + } + + fun signOut(context: Context) { + val file = config(context) + runCatching { + val json = JSONObject(file.readText()) + json.optJSONObject("Client")?.put("AutoLogin", "false") ?: return@runCatching + val staged = File(file.path + ".droiddeck") + staged.writeText(json.toString(4)) + check(staged.renameTo(file)) + Log.i(TAG, "Battle.net will ask for a sign-in at its next start") + }.onFailure { Log.w(TAG, "Battle.net's sign-in kept: ${it.javaClass.simpleName}") } + } + + fun request(sessionRoot: File, args: List<String>): Boolean = runCatching { + require(args.none { '\n' in it }) + val now = System.nanoTime() + val name = "$REQUEST.%020d".format(java.util.Locale.ROOT, sequence.updateAndGet { maxOf(it + 1, now) }) + val staged = File(sessionRoot, "$name.tmp") + staged.writeText(args.joinToString("\n") + "\n") + check(staged.renameTo(File(sessionRoot, name))) + Log.i(TAG, "handed ${args.firstOrNull()} to the open Battle.net") + }.onFailure { Log.w(TAG, "Battle.net request not left: ${it.javaClass.simpleName}") }.isSuccess + + fun clearRequests(sessionRoot: File) { + sessionRoot.listFiles { file -> file.name == REQUEST || file.name.startsWith("$REQUEST.") }?.forEach { it.delete() } + } + + fun open(args: List<String>) { + StoresState.post { opener?.invoke(args) } + } + + fun library(context: Context, root: File = preferred(context)): List<String> = + AddedGames.guestPath(context, StoreInstallRoot.storeDir(root, Store.BATTLENET))?.let { listOf("--library", it) }.orEmpty() + + internal fun preferred(context: Context): File { + val second = StoreInstallRoot.libraryRoot(context)?.absolutePath + return StoreInstallRoot.targets(context).firstOrNull { it.root.absolutePath == second && (it.root.isDirectory || it.root.mkdirs()) }?.root + ?: StoreInstallRoot.internalRoot(context) + } + + fun installGame(context: Context, uid: String, root: File) { + val app = context.applicationContext + work.execute { open(library(app, root) + listOf("install-game", uid)) } + } + + internal fun downloaded(context: Context) { + Log.i(TAG, "Battle.net's installer downloaded from Blizzard") + open(emptyList()) + StoresState.post { StoresState.notifyLibraryChanged(context) } + } +} + +object BattleNetBackend : StoreBackend { + override val store: Store = Store.BATTLENET + + override fun signIn(context: Context) = BattleNetClient.signIn(context) + + override fun signOut(context: Context) { + BattleNetClient.signOut(context) + StoresState.post { StoresState.shelves.remove(store); StoresState.found.remove(store) } + } + + override fun syncLibrary(context: Context, force: Boolean) { + val app = context.applicationContext + Thread({ + val items = runCatching { installed(app).map { item(app, it.title, owned = true) } }.getOrDefault(emptyList()) + StoresState.post { StoresState.library[store] = items } + }, "battlenet-library").start() + } + + override fun loadShelves(context: Context, force: Boolean) { + val app = context.applicationContext + Thread({ + val known = shelves(app) + StoresState.post { StoresState.shelves[store] = known } + if (runCatching { BattleNet.fetchCovers(app) }.getOrDefault(false)) { + val covered = shelves(app) + val items = runCatching { installed(app).map { item(app, it.title, owned = true) } }.getOrDefault(emptyList()) + StoresState.post { + StoresState.shelves[store] = covered + StoresState.library[store] = items + StoresState.notifyLibraryChanged(app) + } + } + }, "battlenet-shelves").start() + } + + override fun search(context: Context, query: String): List<CatalogItem> = + BattleNet.STORE.filter { it.name.contains(query, ignoreCase = true) }.map { item(context, it) } + + override fun install(context: Context, item: CatalogItem, root: File) = BattleNetClient.installGame(context, item.id, root) + + override fun uninstall(context: Context, game: InstalledStoreGame) = BattleNetClient.open(emptyList()) + + fun installed(context: Context): List<BattleNet.Game> = if (BattleNet.installed(context)) BattleNet.games(context) else emptyList() + + fun installedGames(context: Context): List<InstalledStoreGame> = installed(context).map { game -> + val art = BattleNet.art(context, game.title) + val cover = art.cover?.let { Uri.fromFile(it).toString() } + InstalledStoreGame(StoreGameSidecar(store, game.title.uid, game.name, "", cover = cover, hero = art.header?.let { Uri.fromFile(it).toString() } ?: cover), game.folder) + } + + private fun shelves(context: Context): StoreShelves { + val items = BattleNet.STORE.map { item(context, it) } + return StoreShelves(trending = items, art = items.mapNotNull { it.tallImageUrl }) + } + + private fun item(context: Context, title: BattleNet.Title, owned: Boolean = false): CatalogItem { + val art = BattleNet.art(context, title) + return CatalogItem( + store, title.uid, title.name, + imageUrl = (art.header ?: art.cover)?.let { Uri.fromFile(it).toString() }, + tallImageUrl = art.cover?.let { Uri.fromFile(it).toString() }, + owned = owned, + ) + } +} + +internal class SetupDownload(private val app: Context) : DownloadQueue.DownloadJob { + private val cancelled = AtomicBoolean(false) + @Volatile private var connection: HttpURLConnection? = null + + override fun run(handle: DownloadQueue.JobHandle): String? { + handle.stage(DownloadStage.DOWNLOAD) + if (!LinuxRuntime.isInstalled(app)) throw IllegalStateException(app.getString(R.string.epic_client_no_runtime)) + val file = BattleNetClient.setup(app) + val partial = File(file.path + ".part") + file.parentFile?.mkdirs() + var attempt = 0 + while (!cancelled.get()) { + try { + fetch(partial, handle) + if (cancelled.get()) break + if (!BattleNetClient.setupReady(partial)) throw IOException("not a Windows program") + if (!partial.renameTo(file)) throw IOException("could not keep the installer") + BattleNetClient.downloaded(app) + return file.absolutePath + } catch (e: IOException) { + partial.delete() + if (cancelled.get()) break + attempt++ + handle.log("Battle.net installer attempt $attempt: ${e.message ?: e.javaClass.simpleName}") + if (attempt >= ATTEMPTS) throw IllegalStateException(app.getString(R.string.epic_client_download_failed, e.message ?: e.javaClass.simpleName)) + val until = System.currentTimeMillis() + (2_000L shl (attempt - 1)) + while (System.currentTimeMillis() < until && !cancelled.get()) Thread.sleep(100) + } + } + partial.delete() + return null + } + + private fun fetch(partial: File, handle: DownloadQueue.JobHandle) { + val conn = (URL(BattleNetClient.INSTALLER_URL).openConnection() as HttpURLConnection).apply { + connectTimeout = 20_000 + readTimeout = 30_000 + instanceFollowRedirects = true + setRequestProperty("User-Agent", "DroidDeck") + } + connection = conn + try { + if (conn.responseCode != 200) throw IOException("HTTP ${conn.responseCode}") + if (conn.url.protocol != "https") throw IOException("not served over HTTPS") + val total = conn.contentLengthLong + var done = 0L + conn.inputStream.use { input -> + FileOutputStream(partial).use { out -> + val buf = ByteArray(64 * 1024) + while (!cancelled.get()) { + val n = input.read(buf) + if (n < 0) break + out.write(buf, 0, n) + done += n + handle.progress(done, total) + } + out.fd.sync() + } + } + if (!cancelled.get() && total > 0 && done != total) throw IOException("the download ended early") + } finally { + connection = null + runCatching { conn.disconnect() } + } + } + + override fun cancel(deleteFiles: Boolean) { + cancelled.set(true) + runCatching { connection?.disconnect() } + } + + private companion object { + const val ATTEMPTS = 4 + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BlizzardArt.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BlizzardArt.kt new file mode 100644 index 0000000000..3fc972ab20 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BlizzardArt.kt @@ -0,0 +1,93 @@ +package com.droiddeck.launcher.stores.battlenet + +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import java.io.File +import java.io.IOException +import java.net.CookieManager +import java.net.CookiePolicy +import java.net.HttpURLConnection +import java.net.URL + +internal object BlizzardArt { + private const val SHOP = "https://us.shop.battle.net/en-us/product/" + private const val MAX_PAGE = 16 shl 20 + private const val MAX_IMAGE = 12 shl 20 + private const val WIDE = 1280 + private val OG = Regex("""<meta property="og:image" content="(https://[^"]+)"""") + private val THUMB = Regex("""\\?"imageUrl\\?":\\?"(//catalog\.blzstatic\.com/[^"\\]+)""") + private val HOSTS = listOf(".blzstatic.com", ".blz-contentstack.com", "blz-contentstack-images.akamaized.net") + + internal fun imageUrl(page: String): String? { + val og = OG.find(page)?.groupValues?.get(1)?.takeUnless { "youtube" in it || "maxresdefault" in it } + val thumbs = THUMB.findAll(page).map { it.groupValues[1] }.filter { "_bundle" !in it }.map { "https:$it" } + return (sequenceOf(og) + thumbs).filterNotNull().firstOrNull(::allowed) + } + + private fun allowed(url: String): Boolean { + val host = runCatching { URL(url).host }.getOrNull() ?: return false + return HOSTS.any { h -> host == h.trimStart('.') || host.endsWith(h) } + } + + fun fetch(slug: String, wide: File, cover: File?): Boolean { + val page = get(URL(SHOP + slug), MAX_PAGE, true)?.toString(Charsets.UTF_8) ?: return false + val url = imageUrl(page) ?: return false + val bytes = get(URL(url.substringBefore('?') + "?imwidth=$WIDE"), MAX_IMAGE, false) ?: return false + val art = BitmapFactory.decodeByteArray(bytes, 0, bytes.size) ?: return false + try { + val scaled = if (art.width > WIDE) Bitmap.createScaledBitmap(art, WIDE, art.height * WIDE / art.width, true) else art + save(scaled, wide) + if (cover != null) { + val w = minOf(scaled.width, scaled.height * 2 / 3) + val crop = Bitmap.createBitmap(scaled, (scaled.width - w) / 2, 0, w, w * 3 / 2) + save(Bitmap.createScaledBitmap(crop, 600, 900, true), cover) + } + return true + } finally { + art.recycle() + } + } + + private fun save(bitmap: Bitmap, file: File) { + val tmp = File(file.path + ".tmp") + tmp.outputStream().use { if (!bitmap.compress(Bitmap.CompressFormat.JPEG, 90, it)) throw IOException("not saved") } + if (!tmp.renameTo(file)) throw IOException("not kept") + } + + private fun get(start: URL, limit: Int, follow: Boolean): ByteArray? { + val cookies = CookieManager(null, CookiePolicy.ACCEPT_ALL) + var url = start + repeat(8) { + if (url.protocol != "https") return null + val conn = (url.openConnection() as HttpURLConnection).apply { + instanceFollowRedirects = false + connectTimeout = 15_000 + readTimeout = 20_000 + setRequestProperty("User-Agent", "DroidDeck") + cookies.get(url.toURI(), emptyMap()).forEach { (k, v) -> if (v.isNotEmpty()) setRequestProperty(k, v.joinToString("; ")) } + } + try { + val code = conn.responseCode + cookies.put(url.toURI(), conn.headerFields) + when { + code == 200 -> return conn.inputStream.use { input -> + val out = java.io.ByteArrayOutputStream() + val buf = ByteArray(64 * 1024) + while (true) { + val n = input.read(buf) + if (n < 0) break + out.write(buf, 0, n) + if (out.size() > limit) return null + } + out.toByteArray() + } + follow && code in 301..308 -> url = URL(url, conn.getHeaderField("Location") ?: return null) + else -> return null + } + } finally { + conn.disconnect() + } + } + return null + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 97e289912f..a3c685b756 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -100,6 +100,10 @@ class FrontEndState( val logsEnabled: Boolean, val vacDiagnostics: Boolean = false, val agentCommands: Boolean = false, + val clearCachedApps: Boolean = false, + val adbPaired: Boolean = false, + val backgroundAppLimit: Int = -1, + val memoryHud: String = "off", val steamGames: List<Library.SteamGame>, val steamGamesX64: Boolean = false, val emulators: List<Library.Emulator>, @@ -124,6 +128,7 @@ class FrontEndState( val packageStage: String? = null, val packagePercent: Int = -1, val sessionRunning: Boolean = false, + val battleNetInstalled: Boolean = false, val removalPending: Boolean = false, val runtimeActionsBlocked: Boolean = false, val backActionsInverted: Boolean = false, @@ -176,6 +181,7 @@ class FrontEndActions( val onEmulator: (Library.Emulator) -> Unit, val onFlatpakApp: (String, String) -> Unit = { _, _ -> }, val onUserApp: (com.droiddeck.launcher.runtime.UserApps.App) -> Unit = {}, + val onBattleNet: () -> Unit = {}, val onRom: (Library.Rom) -> Unit, val onResume: () -> Unit, val onSteamSettings: () -> Unit, @@ -200,6 +206,9 @@ class FrontEndActions( val onLogs: () -> Unit, val onVacDiagnostics: () -> Unit = {}, val onAgentCommands: () -> Unit = {}, + val onClearCachedApps: (Boolean) -> Unit = {}, + val onMemoryHud: (String) -> Unit = {}, + val onBackgroundAppLimit: (Int) -> Unit = {}, val onShareLogs: () -> Unit = {}, val onClearLogs: () -> Unit = {}, val onResetSettings: () -> Unit = {}, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index f96c0eb2d5..69aa9cee0d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -470,6 +470,38 @@ internal fun SetupPanel( ActionRow(stringResource(R.string.setup_reset_settings), stringResource(R.string.setup_reset_settings_hint), stringResource(R.string.setup_reset_settings_button), a.onResetSettings) } + SettingsGroup(stringResource(R.string.setup_group_memory)) { + ToggleRow( + host, "clear-cached-apps", stringResource(R.string.setup_clear_cached), + stringResource(if (s.adbPaired) R.string.setup_clear_cached_hint else R.string.setup_clear_cached_unpaired), + s.clearCachedApps, enabled = s.adbPaired || s.clearCachedApps, + ) { a.onClearCachedApps(it) } + ChoiceRow( + host, "background-app-limit", stringResource(R.string.setup_bg_limit), + stringResource(if (s.adbPaired) R.string.setup_bg_limit_hint else R.string.setup_clear_cached_unpaired), + listOf( + com.droiddeck.launcher.core.BackgroundAppLimit.OFF to stringResource(R.string.game_env_off), + 4 to stringResource(R.string.setup_bg_limit_4), + 1 to stringResource(R.string.setup_bg_limit_1), + 0 to stringResource(R.string.setup_bg_limit_0), + ), + s.backgroundAppLimit, enabled = s.adbPaired || s.backgroundAppLimit != com.droiddeck.launcher.core.BackgroundAppLimit.OFF, + onPick = a.onBackgroundAppLimit, + ) + ChoiceRow( + host, "memory-hud", stringResource(R.string.setup_memory_hud), stringResource(R.string.setup_memory_hud_hint), + listOf( + com.droiddeck.launcher.session.SessionPrefs.MEMORY_HUD_OFF to stringResource(R.string.game_env_off), + com.droiddeck.launcher.session.SessionPrefs.MEMORY_HUD_SIMPLE to stringResource(R.string.setup_memory_hud_simple), + com.droiddeck.launcher.session.SessionPrefs.MEMORY_HUD_ADVANCED to stringResource(R.string.setup_memory_hud_advanced), + ), + s.memoryHud, onPick = a.onMemoryHud, + ) + if (!s.adbPaired) ActionRow( + stringResource(R.string.setup_adb_pair), stringResource(R.string.setup_adb_pair_hint), + stringResource(R.string.setup_adb_pair_button), { onRequestWirelessAdb(false) }, + ) + } } GLASSES_TAB -> GlassesSetupPanel() } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index 0024075286..32be30564e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -364,6 +364,7 @@ private fun GameActions( } SecondaryButton(stringResource(R.string.stores_xbox_manage), enabled = download == null) { XboxContent.manage(ctx, installed) } } + if (store == Store.BATTLENET) SecondaryButton(stringResource(R.string.bnet_open)) { a.onBattleNet() } } download != null -> { ActionChip(downloadLabel(download), ok = false) @@ -378,6 +379,7 @@ private fun GameActions( } ConfirmButton(stringResource(R.string.stores_dl_clear), stringResource(R.string.stores_dl_cancel_confirm), compact = true) { DownloadQueue.clear(ctx, failed.key) } } + store == Store.BATTLENET && item != null -> InstallButton(stringResource(R.string.stores_install), leadOn) { StoresState.requestInstall(ctx, item) } store == Store.XBOX && item != null && !item.xboxPc && item.xboxCloud -> { XboxStreamButton(item.id, item.title, main = true, modifier = leadOn) XboxLibraryButton(item.id, item) @@ -521,6 +523,7 @@ private fun IconAction(icon: androidx.compose.ui.graphics.vector.ImageVector, la private fun RemoveButton(title: String, game: Library.SteamGame?, installed: InstalledStoreGame?, a: FrontEndActions) { val ctx = LocalContext.current val colors = MaterialTheme.colorScheme + if ((installed?.sidecar?.store?.id ?: game?.source) == Store.BATTLENET.id) return if (installed != null) { val key = installed.key val gone = StoresState.uninstalling[key] diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameEnvironmentEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameEnvironmentEditor.kt index f8f50a5ebc..8055f08649 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameEnvironmentEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameEnvironmentEditor.kt @@ -101,7 +101,8 @@ internal fun GameEnvironmentEditor(byPad: Boolean, initialScope: String = "", on LaunchedEffect(Unit) { runCatching { withContext(Dispatchers.IO) { - GameEnvironmentStore.read(context) to Library.steamGames(context).map { it.appId.toString() to it.name } + GameEnvironmentStore.read(context) to Library.steamGames(context).map { it.appId.toString() to it.name } + + listOfNotNull(com.droiddeck.launcher.runtime.BattleNet.profile(context)) } }.onSuccess { (settings, installed) -> config = settings; games = installed } .onFailure { error = true } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt index e913dc6afc..40bfd22c4c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt @@ -31,6 +31,7 @@ internal fun sourceColours(source: String): SourceColours = when (source) { Store.AMAZON.id -> SourceColours(Color(0xFF3A2A0A), Color(0xFFFFC266), Color(0xFFFF9900)) Store.XBOX.id -> SourceColours(Color(0xFF17381B), Color(0xFFC6EDC2), Color(0xFF70C850)) Store.ITCH.id -> SourceColours(Color(0xFF3A1A1E), Color(0xFFFFB3B3), Color(0xFFFF5C5C)) + Store.BATTLENET.id -> SourceColours(Color(0xFF0A2440), Color(0xFF9DD1FF), Color(0xFF148EFF)) Library.SOURCE_STEAM -> SourceColours(Color(0xFF16293D), Color(0xFF7CC4FF), Color(0xFF1A9FFF)) FLATHUB -> SourceColours(Color(0xFF0B2E2B), Color(0xFF9FE3DD), FlathubTeal) else -> SourceColours(Color(0xFF1A1D22), Color(0xFF9AA3AF), Color(0xFF9AA3AF)) @@ -44,6 +45,7 @@ internal fun sourceLabel(source: String): String = when (source) { Store.AMAZON.id -> Store.AMAZON.label Store.XBOX.id -> Store.XBOX.label Store.ITCH.id -> Store.ITCH.label + Store.BATTLENET.id -> Store.BATTLENET.label else -> stringResource(R.string.source_added) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt index 8c7c92f524..e521856811 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt @@ -221,7 +221,7 @@ private fun FinishedRow(d: DownloadEntry, s: FrontEndState, a: FrontEndActions, ArtStrip(d.cover, d.name) { StripLabel(d.name, d.store.id, stringResource(if (d.state == DownloadState.INSTALLED) R.string.stores_installed_chip else R.string.stores_dl_cancelled), Color.White.copy(alpha = 0.72f)) if (d.state == DownloadState.INSTALLED) Box(Modifier.bloomIn(bloom, GATHER_HOLD_MS + 150)) { - RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else launchStoreGame(ctx, d.store, d.id, s, a) } + RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(ctx, d.store, d.id, s, a) } } } } @@ -372,7 +372,7 @@ private fun DownloadCard(d: DownloadEntry, s: FrontEndState, a: FrontEndActions) CancelAction { DownloadQueue.clear(ctx, d.key) } } DownloadState.INSTALLED -> Box(Modifier.bloomIn(true, 420)) { - RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else launchStoreGame(ctx, d.store, d.id, s, a) } + RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(ctx, d.store, d.id, s, a) } } DownloadState.CANCELLED -> {} } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 46d12dc328..e00ae0f096 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -235,6 +235,12 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier LaunchedEffect(Unit) { StoresState.refresh(ctx) } val lifecycle = androidx.compose.ui.platform.LocalLifecycleOwner.current.lifecycle LaunchedEffect(chip) { + if (chip == Store.BATTLENET.id) { + while (true) { + if (lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED)) com.droiddeck.launcher.stores.battlenet.BattleNetClient.refresh(ctx) + delay(5_000) + } + } if (chip == Store.EPIC.id) { EpicClient.ensure(ctx) while (true) { @@ -919,7 +925,7 @@ private fun Storefront( Shelf(stringResource(R.string.stores_shelf_new), shelf(shelves?.whatsNew), card) Shelf(stringResource(R.string.stores_shelf_deals), shelf(shelves?.deals), card) Shelf(stringResource(R.string.stores_shelf_free), shelf(shelves?.free), card) - Shelf(stringResource(R.string.stores_shelf_trending), shelf(shelves?.trending), card) + Shelf(stringResource(if (store == Store.BATTLENET) R.string.bnet_store else R.string.stores_shelf_trending), shelf(shelves?.trending), card) if (shelves == null) Rise(4) { Box(Modifier.padding(top = 8.dp)) { Note(stringResource(R.string.stores_shelves_loading)) } } else if (shelves.isEmpty && store == Store.AMAZON) Rise(4) { Box(Modifier.padding(top = 8.dp)) { Note(stringResource(R.string.stores_amazon_no_catalog)) } } } @@ -965,6 +971,39 @@ private fun ProfileStrip(store: Store, owned: Int, loaded: Boolean, s: FrontEndS } } if (store == Store.EPIC) EpicLauncherRow(s, a) + if (store == Store.BATTLENET) BattleNetLauncherRow(s, a) + } +} + +@Composable +private fun BattleNetLauncherRow(s: FrontEndState, a: FrontEndActions) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val title = stringResource(R.string.bnet_name) + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth().testTag("stores-battlenet-launcher")) { + val icon by androidx.compose.runtime.produceState<java.io.File?>(null, s.battleNetInstalled) { + value = if (!s.battleNetInstalled) null + else kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { com.droiddeck.launcher.runtime.BattleNet.icon(ctx) } + } + if (icon != null) AsyncImage(model = icon, contentDescription = null, contentScale = ContentScale.Fit, modifier = Modifier.size(36.dp).clip(RoundedCornerShape(8.dp))) + Text(title, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + Actions { + SecondaryButton(stringResource(R.string.bnet_open), enabled = !s.busy, compact = true) { a.onBattleNet() } + val entry = remember(s.battleNetInstalled) { com.droiddeck.launcher.runtime.BattleNet.launcherEntry(s.battleNetInstalled) } + val scope = entry?.let { com.droiddeck.launcher.session.NoSteamLaunch.scope(it) } + if (entry != null && scope != null) { + val host = rememberMenuHost() + val settings = rememberGameSettings(scope) + Box { + SecondaryButton(stringResource(R.string.game_settings_card), compact = true) { + host.open = if (host.open == GAME_SETTINGS_MENU) null else GAME_SETTINGS_MENU + } + GameSettingsMenus(host, entry, settings) + } + } + } } } @@ -1066,6 +1105,7 @@ internal fun storePalette(base: Palette, store: Store?): Palette { Store.AMAZON -> Color(0xFFFF9900) to Color(0xFFE07800) Store.XBOX -> Color(0xFF70C850) to Color(0xFF107C10) Store.ITCH -> Color(0xFFFF5C5C) to Color(0xFFD93B3B) + Store.BATTLENET -> Color(0xFF148EFF) to Color(0xFF0B6BD3) null -> return base } val on = if (accent.luminance() > 0.18f) Color(0xFF0B0B0D) else Color.White diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index b609d1b918..5416c2d32e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2062,6 +2062,8 @@ <string name="stores_shelf_trending">الرائج</string> <string name="stores_play">تشغيل</string> <string name="stores_install">تثبيت</string> + <string name="bnet_open">فتح Battle.net</string> + <string name="bnet_store">ألعاب Blizzard</string> <string name="stores_resume_install">استئناف التثبيت</string> <string name="stores_dl_interrupted">منقطع</string> <string name="stores_install_size">تثبيت · %1$s</string> @@ -3143,6 +3145,25 @@ <string name="spatial_saved_views_hint">يمكن إعادة حساب المشاهدات المحفوظة. ابدأ معايرة جديدة لالتقاطها في نظام إحداثيات التتبع الحالي.</string> <string name="spatial_model_checksum_error">المجموع الاختباري لنموذج تتبع اليدين غير مطابق</string> <string name="spatial_opencv_load_error">تعذر تحميل OpenCV</string> + <string name="setup_group_memory">الذاكرة</string> + <string name="setup_clear_cached">إغلاق التطبيقات المخزّنة مؤقتًا قبل الجلسة</string> + <string name="setup_clear_cached_hint">عند بدء الجلسة، يُغلق DroidDeck التطبيقات التي يُبقيها Android في الخلفية، لتحصل اللعبة على ذاكرة أكبر. يجب تفعيل تصحيح الأخطاء اللاسلكي.</string> + <string name="setup_clear_cached_unpaired">يتطلّب إقران DroidDeck بتصحيح الأخطاء اللاسلكي (إقران، أدناه).</string> + <string name="setup_memory_hud">مؤشر الذاكرة</string> + <string name="setup_memory_hud_hint">الذاكرة وswap المستخدمة، على شاشة الجلسة. يقسّمها الوضع المتقدّم بين اللعبة وDroidDeck وAndroid وGPU.</string> + <string name="setup_memory_hud_simple">بسيط</string> + <string name="setup_memory_hud_advanced">متقدّم</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">اللعبة %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">التطبيقات في الخلفية أثناء الجلسة</string> + <string name="setup_bg_limit_hint">أثناء تشغيل الجلسة، يُبقي Android هذا العدد من التطبيقات كحد أقصى في الذاكرة المؤقتة ويُغلق الباقي، لتحصل اللعبة على ذاكرتها. يُعيد DroidDeck الحد إلى ما كان عليه عند انتهاء الجلسة. يجب تفعيل تصحيح الأخطاء اللاسلكي.</string> + <string name="setup_bg_limit_4">4 كحد أقصى</string> + <string name="setup_bg_limit_1">1 كحد أقصى</string> + <string name="setup_bg_limit_0">لا شيء</string> + <string name="setup_adb_pair">تصحيح الأخطاء اللاسلكي</string> + <string name="setup_adb_pair_hint">يُقرن DroidDeck بتصحيح الأخطاء اللاسلكي في Android للخيارات أعلاه. يبقى حد العمليات الفرعية متوقفًا.</string> + <string name="setup_adb_pair_button">إقران</string> <string name="epic_client_missing">غير مثبَّت</string> <string name="epic_client_open">فتح</string> <string name="epic_client_install">تثبيت</string> diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index cd331b35fb..79b3ebf1be 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2030,6 +2030,8 @@ <string name="stores_shelf_trending">En tendencia</string> <string name="stores_play">Jugar</string> <string name="stores_install">Instalar</string> + <string name="bnet_open">Abrir Battle.net</string> + <string name="bnet_store">Juegos de Blizzard</string> <string name="stores_resume_install">Reanudar instalación</string> <string name="stores_dl_interrupted">Interrumpida</string> <string name="stores_install_size">Instalar · %1$s</string> @@ -2993,6 +2995,25 @@ <string name="spatial_saved_views_hint">Las vistas guardadas se pueden recalcular. Inicie una nueva calibración para capturar en el sistema de coordenadas de seguimiento actual.</string> <string name="spatial_model_checksum_error">La suma de comprobación del modelo de mano no coincide</string> <string name="spatial_opencv_load_error">OpenCV no se pudo cargar</string> + <string name="setup_group_memory">Memoria</string> + <string name="setup_clear_cached">Cerrar apps en caché antes de una sesión</string> + <string name="setup_clear_cached_hint">Al iniciar una sesión, DroidDeck cierra las apps que Android mantiene en segundo plano para que el juego tenga más memoria. La Depuración inalámbrica debe estar activada.</string> + <string name="setup_clear_cached_unpaired">DroidDeck debe estar vinculado con la Depuración inalámbrica (Vincular, abajo).</string> + <string name="setup_memory_hud">Indicador de memoria</string> + <string name="setup_memory_hud_hint">Memoria y swap en uso, en la pantalla de la sesión. Avanzado lo divide entre el juego, DroidDeck, Android y la GPU.</string> + <string name="setup_memory_hud_simple">Simple</string> + <string name="setup_memory_hud_advanced">Avanzado</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">juego %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Apps en segundo plano durante una sesión</string> + <string name="setup_bg_limit_hint">Mientras una sesión está en curso, Android mantiene en caché como máximo esta cantidad de apps y cierra las demás para que el juego use su memoria. DroidDeck restablece el límite anterior cuando termina la sesión. La Depuración inalámbrica debe estar activada.</string> + <string name="setup_bg_limit_4">Como máximo 4</string> + <string name="setup_bg_limit_1">Como máximo 1</string> + <string name="setup_bg_limit_0">Ninguna</string> + <string name="setup_adb_pair">Depuración inalámbrica</string> + <string name="setup_adb_pair_hint">Vincula DroidDeck con la Depuración inalámbrica de Android para las opciones de arriba. El límite de procesos secundarios sigue desactivado.</string> + <string name="setup_adb_pair_button">Vincular</string> <string name="epic_client_missing">No instalada</string> <string name="epic_client_open">Abrir</string> <string name="epic_client_install">Instalar</string> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 0f95de2328..3c052c8586 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1978,6 +1978,8 @@ <string name="stores_shelf_trending">Актуални</string> <string name="stores_play">Играй</string> <string name="stores_install">Инсталирай</string> + <string name="bnet_open">Отвори Battle.net</string> + <string name="bnet_store">Игри на Blizzard</string> <string name="stores_resume_install">Продължи инсталацията</string> <string name="stores_dl_interrupted">Прекъснато</string> <string name="stores_install_size">Инсталация · %1$s</string> @@ -3007,6 +3009,25 @@ <string name="spatial_saved_views_hint">Запазените изгледи могат да бъдат преизчислени. Започнете ново калибриране за заснемане в текущата координатна система за проследяване.</string> <string name="spatial_model_checksum_error">Несъответствие на контролната сума на модела на ръката</string> <string name="spatial_opencv_load_error">OpenCV не можа да се зареди</string> + <string name="setup_group_memory">Памет</string> + <string name="setup_clear_cached">Затваряне на кешираните приложения преди сесия</string> + <string name="setup_clear_cached_hint">При стартиране на сесия DroidDeck затваря приложенията, които Android държи във фонов режим, за да има играта повече памет. Безжичното отстраняване на грешки трябва да е включено.</string> + <string name="setup_clear_cached_unpaired">Изисква DroidDeck да е сдвоен чрез безжично отстраняване на грешки (Сдвояване, по-долу).</string> + <string name="setup_memory_hud">Показател за паметта</string> + <string name="setup_memory_hud_hint">Използвана памет и swap на екрана на сесията. Разширеният режим я разделя между играта, DroidDeck, Android и GPU.</string> + <string name="setup_memory_hud_simple">Опростен</string> + <string name="setup_memory_hud_advanced">Разширен</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">игра %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Фонови приложения по време на сесия</string> + <string name="setup_bg_limit_hint">Докато сесията работи, Android държи в кеша най-много толкова приложения и затваря останалите, за да получи играта тяхната памет. DroidDeck връща предишното ограничение, когато сесията приключи. Безжичното отстраняване на грешки трябва да е включено.</string> + <string name="setup_bg_limit_4">Най-много 4</string> + <string name="setup_bg_limit_1">Най-много 1</string> + <string name="setup_bg_limit_0">Нито едно</string> + <string name="setup_adb_pair">Безжично отстраняване на грешки</string> + <string name="setup_adb_pair_hint">Сдвоява DroidDeck с безжичното отстраняване на грешки на Android за опциите по-горе. Ограничението на дъщерните процеси остава изключено.</string> + <string name="setup_adb_pair_button">Сдвояване</string> <string name="epic_client_missing">Не е инсталирано</string> <string name="epic_client_open">Отвори</string> <string name="epic_client_install">Инсталиране</string> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b1977d00a5..8dec40660e 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2020,6 +2020,8 @@ <string name="stores_shelf_trending">Populární</string> <string name="stores_play">Hrát</string> <string name="stores_install">Instalovat</string> + <string name="bnet_open">Otevřít Battle.net</string> + <string name="bnet_store">Hry od Blizzardu</string> <string name="stores_resume_install">Pokračovat v instalaci</string> <string name="stores_dl_interrupted">Přerušeno</string> <string name="stores_install_size">Instalace · %1$s</string> @@ -3075,6 +3077,25 @@ <string name="spatial_saved_views_hint">Uložená zobrazení lze přepočítat. Spusťte novou kalibraci pro zachycení v aktuálním sledovacím souřadnicovém systému.</string> <string name="spatial_model_checksum_error">Neshoda kontrolního součtu modelu ruky</string> <string name="spatial_opencv_load_error">OpenCV se nepodařilo načíst</string> + <string name="setup_group_memory">Paměť</string> + <string name="setup_clear_cached">Zavřít aplikace v mezipaměti před relací</string> + <string name="setup_clear_cached_hint">Při spuštění relace DroidDeck zavře aplikace, které Android drží na pozadí, aby hra měla více paměti. Musí být zapnuté Bezdrátové ladění.</string> + <string name="setup_clear_cached_unpaired">Vyžaduje DroidDeck spárovaný přes Bezdrátové ladění (Spárovat, níže).</string> + <string name="setup_memory_hud">Ukazatel paměti</string> + <string name="setup_memory_hud_hint">Využitá paměť a swap na obrazovce relace. Pokročilé zobrazení ji rozdělí na hru, DroidDeck, Android a GPU.</string> + <string name="setup_memory_hud_simple">Jednoduché</string> + <string name="setup_memory_hud_advanced">Pokročilé</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">hra %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Aplikace na pozadí během relace</string> + <string name="setup_bg_limit_hint">Během relace Android ponechá v mezipaměti nejvýše tolik aplikací a ostatní zavře, aby hra dostala jejich paměť. Po skončení relace DroidDeck vrátí limit na původní hodnotu. Musí být zapnuté Bezdrátové ladění.</string> + <string name="setup_bg_limit_4">Nejvýše 4</string> + <string name="setup_bg_limit_1">Nejvýše 1</string> + <string name="setup_bg_limit_0">Žádné</string> + <string name="setup_adb_pair">Bezdrátové ladění</string> + <string name="setup_adb_pair_hint">Spáruje DroidDeck s Bezdrátovým laděním Androidu pro výše uvedené možnosti. Omezení pro dětské procesy zůstane vypnuté.</string> + <string name="setup_adb_pair_button">Spárovat</string> <string name="epic_client_missing">Není nainstalováno</string> <string name="epic_client_open">Otevřít</string> <string name="epic_client_install">Instalovat</string> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 8786ddbedd..41e94a3c7c 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1978,6 +1978,8 @@ <string name="stores_shelf_trending">Populært</string> <string name="stores_play">Spil</string> <string name="stores_install">Installer</string> + <string name="bnet_open">Åbn Battle.net</string> + <string name="bnet_store">Blizzard-spil</string> <string name="stores_resume_install">Genoptag installation</string> <string name="stores_dl_interrupted">Afbrudt</string> <string name="stores_install_size">Installation · %1$s</string> @@ -3007,6 +3009,25 @@ <string name="spatial_saved_views_hint">Gemte visninger kan genberegnes. Start en ny kalibrering for at fange i det aktuelle sporingskoordinatsystem.</string> <string name="spatial_model_checksum_error">Håndmodel kontrolsum uoverensstemmelse</string> <string name="spatial_opencv_load_error">OpenCV kunne ikke indlæse</string> + <string name="setup_group_memory">Hukommelse</string> + <string name="setup_clear_cached">Luk cachelagrede apps før en session</string> + <string name="setup_clear_cached_hint">Når en session starter, lukker DroidDeck de apps, Android holder parkeret i baggrunden, så spillet får mere hukommelse. Trådløs fejlretning skal være slået til.</string> + <string name="setup_clear_cached_unpaired">Kræver, at DroidDeck er parret med Trådløs fejlretning (Par, nedenfor).</string> + <string name="setup_memory_hud">Hukommelsesvisning</string> + <string name="setup_memory_hud_hint">Hukommelse og swap i brug på sessionsskærmen. Avanceret fordeler det på spillet, DroidDeck, Android og GPU\'en.</string> + <string name="setup_memory_hud_simple">Enkel</string> + <string name="setup_memory_hud_advanced">Avanceret</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">spil %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Baggrundsapps under en session</string> + <string name="setup_bg_limit_hint">Mens en session kører, holder Android højst så mange apps i cache og lukker resten, så spillet får deres hukommelse. DroidDeck sætter grænsen tilbage, som den var, når sessionen slutter. Trådløs fejlretning skal være slået til.</string> + <string name="setup_bg_limit_4">Højst 4</string> + <string name="setup_bg_limit_1">Højst 1</string> + <string name="setup_bg_limit_0">Ingen</string> + <string name="setup_adb_pair">Trådløs fejlretning</string> + <string name="setup_adb_pair_hint">Parrer DroidDeck med Androids Trådløs fejlretning til indstillingerne ovenfor. Grænsen for underprocesser forbliver slået fra.</string> + <string name="setup_adb_pair_button">Par</string> <string name="epic_client_missing">Ikke installeret</string> <string name="epic_client_open">Åbn</string> <string name="epic_client_install">Installer</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index dab2d35b29..e4d34fe62a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1970,6 +1970,8 @@ <string name="stores_shelf_trending">Im Trend</string> <string name="stores_play">Spielen</string> <string name="stores_install">Installieren</string> + <string name="bnet_open">Battle.net öffnen</string> + <string name="bnet_store">Blizzard-Spiele</string> <string name="stores_resume_install">Installation fortsetzen</string> <string name="stores_dl_interrupted">Unterbrochen</string> <string name="stores_install_size">Installieren · %1$s</string> @@ -3007,6 +3009,25 @@ <string name="spatial_saved_views_hint">Gespeicherte Ansichten können neu berechnet werden. Starten Sie eine neue Kalibrierung zur Erfassung im aktuellen Tracking-Koordinatensystem.</string> <string name="spatial_model_checksum_error">Die Prüfsumme des Handmodells stimmt nicht überein</string> <string name="spatial_opencv_load_error">OpenCV konnte nicht geladen werden</string> + <string name="setup_group_memory">Arbeitsspeicher</string> + <string name="setup_clear_cached">Apps im Cache vor einer Sitzung schließen</string> + <string name="setup_clear_cached_hint">Beim Start einer Sitzung schließt DroidDeck die Apps, die Android im Hintergrund vorhält, damit das Spiel mehr Arbeitsspeicher hat. „Debugging über WLAN“ muss aktiviert sein.</string> + <string name="setup_clear_cached_unpaired">DroidDeck muss über „Debugging über WLAN“ gekoppelt sein (Koppeln, unten).</string> + <string name="setup_memory_hud">Speicheranzeige</string> + <string name="setup_memory_hud_hint">Belegter Arbeitsspeicher und Swap auf dem Sitzungsbildschirm. „Erweitert“ schlüsselt ihn nach Spiel, DroidDeck, Android und GPU auf.</string> + <string name="setup_memory_hud_simple">Einfach</string> + <string name="setup_memory_hud_advanced">Erweitert</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · Swap %3$s/%4$s GB</string> + <string name="memory_hud_split">Spiel %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Hintergrund-Apps während einer Sitzung</string> + <string name="setup_bg_limit_hint">Während eine Sitzung läuft, hält Android höchstens so viele Apps im Cache und schließt die übrigen, damit das Spiel deren Speicher bekommt. DroidDeck stellt das vorherige Limit wieder her, wenn die Sitzung endet. „Debugging über WLAN“ muss aktiviert sein.</string> + <string name="setup_bg_limit_4">Höchstens 4</string> + <string name="setup_bg_limit_1">Höchstens 1</string> + <string name="setup_bg_limit_0">Keine</string> + <string name="setup_adb_pair">Debugging über WLAN</string> + <string name="setup_adb_pair_hint">Koppelt DroidDeck mit „Debugging über WLAN“ von Android für die Optionen oben. Das Limit für untergeordnete Prozesse bleibt aus.</string> + <string name="setup_adb_pair_button">Koppeln</string> <string name="epic_client_missing">Nicht installiert</string> <string name="epic_client_open">Öffnen</string> <string name="epic_client_install">Installieren</string> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 72ac7955ea..3518c85469 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1978,6 +1978,8 @@ <string name="stores_shelf_trending">Σε άνοδο</string> <string name="stores_play">Αναπαραγωγή</string> <string name="stores_install">Εγκατάσταση</string> + <string name="bnet_open">Άνοιγμα του Battle.net</string> + <string name="bnet_store">Παιχνίδια της Blizzard</string> <string name="stores_resume_install">Συνέχιση εγκατάστασης</string> <string name="stores_dl_interrupted">Διακόπηκε</string> <string name="stores_install_size">Εγκατάσταση · %1$s</string> @@ -3007,6 +3009,25 @@ <string name="spatial_saved_views_hint">Οι αποθηκευμένες προβολές μπορούν να υπολογιστούν εκ νέου. Ξεκινήστε μια νέα βαθμονόμηση για αποτύπωση στο τρέχον σύστημα συντεταγμένων παρακολούθησης.</string> <string name="spatial_model_checksum_error">Αναντιστοιχία αθροίσματος ελέγχου μοντέλου χεριού</string> <string name="spatial_opencv_load_error">Δεν ήταν δυνατή η φόρτωση του OpenCV</string> + <string name="setup_group_memory">Μνήμη</string> + <string name="setup_clear_cached">Κλείσιμο εφαρμογών στην προσωρινή μνήμη πριν από τη συνεδρία</string> + <string name="setup_clear_cached_hint">Όταν ξεκινά μια συνεδρία, το DroidDeck κλείνει τις εφαρμογές που το Android κρατά στο παρασκήνιο, ώστε το παιχνίδι να έχει περισσότερη μνήμη. Ο Ασύρματος εντοπισμός σφαλμάτων πρέπει να είναι ενεργός.</string> + <string name="setup_clear_cached_unpaired">Απαιτεί σύζευξη του DroidDeck με τον Ασύρματο εντοπισμό σφαλμάτων (Σύζευξη, παρακάτω).</string> + <string name="setup_memory_hud">Ένδειξη μνήμης</string> + <string name="setup_memory_hud_hint">Μνήμη και swap σε χρήση, στην οθόνη της συνεδρίας. Με την επιλογή «Για προχωρημένους» χωρίζεται σε παιχνίδι, DroidDeck, Android και GPU.</string> + <string name="setup_memory_hud_simple">Απλή</string> + <string name="setup_memory_hud_advanced">Για προχωρημένους</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">παιχνίδι %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Εφαρμογές παρασκηνίου κατά τη συνεδρία</string> + <string name="setup_bg_limit_hint">Όσο εκτελείται μια συνεδρία, το Android κρατά στην προσωρινή μνήμη το πολύ τόσες εφαρμογές και κλείνει τις υπόλοιπες, ώστε το παιχνίδι να πάρει τη μνήμη τους. Το DroidDeck επαναφέρει το όριο όπως ήταν όταν τελειώσει η συνεδρία. Ο Ασύρματος εντοπισμός σφαλμάτων πρέπει να είναι ενεργός.</string> + <string name="setup_bg_limit_4">Το πολύ 4</string> + <string name="setup_bg_limit_1">Το πολύ 1</string> + <string name="setup_bg_limit_0">Καμία</string> + <string name="setup_adb_pair">Ασύρματος εντοπισμός σφαλμάτων</string> + <string name="setup_adb_pair_hint">Συζευγνύει το DroidDeck με τον Ασύρματο εντοπισμό σφαλμάτων του Android για τις παραπάνω επιλογές. Το όριο θυγατρικών διαδικασιών παραμένει απενεργοποιημένο.</string> + <string name="setup_adb_pair_button">Σύζευξη</string> <string name="epic_client_missing">Δεν είναι εγκατεστημένο</string> <string name="epic_client_open">Άνοιγμα</string> <string name="epic_client_install">Εγκατάσταση</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 995e969e5f..ac6933cad1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2001,6 +2001,8 @@ <string name="stores_shelf_trending">En tendencia</string> <string name="stores_play">Jugar</string> <string name="stores_install">Instalar</string> + <string name="bnet_open">Abrir Battle.net</string> + <string name="bnet_store">Juegos de Blizzard</string> <string name="stores_resume_install">Reanudar instalación</string> <string name="stores_dl_interrupted">Interrumpida</string> <string name="stores_install_size">Instalar · %1$s</string> @@ -3043,6 +3045,25 @@ <string name="spatial_saved_views_hint">Las vistas guardadas se pueden recalcular. Inicie una nueva calibración para capturar en el sistema de coordenadas de seguimiento actual.</string> <string name="spatial_model_checksum_error">La suma de comprobación del modelo de mano no coincide</string> <string name="spatial_opencv_load_error">OpenCV no se pudo cargar</string> + <string name="setup_group_memory">Memoria</string> + <string name="setup_clear_cached">Cerrar apps en caché antes de una sesión</string> + <string name="setup_clear_cached_hint">Al empezar una sesión, cierra las apps que Android mantiene en segundo plano para que el juego tenga más memoria. La depuración inalámbrica debe estar activada.</string> + <string name="setup_clear_cached_unpaired">DroidDeck debe estar vinculado con la depuración inalámbrica (Vincular, abajo).</string> + <string name="setup_memory_hud">Indicador de memoria</string> + <string name="setup_memory_hud_hint">Memoria y swap en uso, en la pantalla de la sesión. Avanzado lo divide entre el juego, DroidDeck, Android y la GPU.</string> + <string name="setup_memory_hud_simple">Simple</string> + <string name="setup_memory_hud_advanced">Avanzado</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">juego %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Apps en segundo plano durante una sesión</string> + <string name="setup_bg_limit_hint">Mientras una sesión está en marcha, Android mantiene en caché como máximo este número de apps y cierra las demás, para que el juego tenga su memoria. Se restablece al terminar la sesión. La depuración inalámbrica debe estar activada.</string> + <string name="setup_bg_limit_4">Como máximo 4</string> + <string name="setup_bg_limit_1">Como máximo 1</string> + <string name="setup_bg_limit_0">Ninguna</string> + <string name="setup_adb_pair">Depuración inalámbrica</string> + <string name="setup_adb_pair_hint">Vincula DroidDeck con la depuración inalámbrica de Android para las opciones de arriba. El límite de procesos secundarios sigue desactivado.</string> + <string name="setup_adb_pair_button">Vincular</string> <string name="epic_client_missing">No instalada</string> <string name="epic_client_open">Abrir</string> <string name="epic_client_install">Instalar</string> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 1304b02ac3..8359d4cf8c 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1978,6 +1978,8 @@ <string name="stores_shelf_trending">Nousussa</string> <string name="stores_play">Pelaa</string> <string name="stores_install">Asenna</string> + <string name="bnet_open">Avaa Battle.net</string> + <string name="bnet_store">Blizzardin pelit</string> <string name="stores_resume_install">Jatka asennusta</string> <string name="stores_dl_interrupted">Keskeytynyt</string> <string name="stores_install_size">Asenna · %1$s</string> @@ -3007,6 +3009,25 @@ <string name="spatial_saved_views_hint">Tallennetut näkymät voidaan laskea uudelleen. Aloita uusi kalibrointi kaapataksesi nykyiseen seurantakoordinaattijärjestelmään.</string> <string name="spatial_model_checksum_error">Käsimallin tarkistussumman epäsuhta</string> <string name="spatial_opencv_load_error">OpenCV:tä ei voitu ladata</string> + <string name="setup_group_memory">Muisti</string> + <string name="setup_clear_cached">Sulje välimuistissa olevat sovellukset ennen istuntoa</string> + <string name="setup_clear_cached_hint">Kun istunto alkaa, DroidDeck sulkee sovellukset, joita Android pitää taustalla, jotta pelillä on enemmän muistia. Langattoman virheenkorjauksen on oltava päällä.</string> + <string name="setup_clear_cached_unpaired">Vaatii, että DroidDeck on pariutettu Langattoman virheenkorjauksen kautta (Pariuta, alla).</string> + <string name="setup_memory_hud">Muistinäyttö</string> + <string name="setup_memory_hud_hint">Käytössä oleva muisti ja swap istuntonäytöllä. Laajennettu näyttää erikseen pelin, DroidDeckin, Androidin ja GPU:n osuuden.</string> + <string name="setup_memory_hud_simple">Yksinkertainen</string> + <string name="setup_memory_hud_advanced">Laajennettu</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">peli %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Taustasovellukset istunnon aikana</string> + <string name="setup_bg_limit_hint">Istunnon aikana Android pitää välimuistissa enintään näin monta sovellusta ja sulkee loput, jotta peli saa niiden muistin. DroidDeck palauttaa rajan ennalleen, kun istunto päättyy. Langattoman virheenkorjauksen on oltava päällä.</string> + <string name="setup_bg_limit_4">Enintään 4</string> + <string name="setup_bg_limit_1">Enintään 1</string> + <string name="setup_bg_limit_0">Ei mitään</string> + <string name="setup_adb_pair">Langaton virheenkorjaus</string> + <string name="setup_adb_pair_hint">Pariuttaa DroidDeckin Androidin Langattomaan virheenkorjaukseen yllä olevia asetuksia varten. Lapsiprosessien raja pysyy pois päältä.</string> + <string name="setup_adb_pair_button">Pariuta</string> <string name="epic_client_missing">Ei asennettu</string> <string name="epic_client_open">Avaa</string> <string name="epic_client_install">Asenna</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 325f41614c..18936f64a6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2001,6 +2001,8 @@ <string name="stores_shelf_trending">Tendances</string> <string name="stores_play">Jouer</string> <string name="stores_install">Installer</string> + <string name="bnet_open">Ouvrir Battle.net</string> + <string name="bnet_store">Jeux Blizzard</string> <string name="stores_resume_install">Reprendre l\'installation</string> <string name="stores_dl_interrupted">Interrompu</string> <string name="stores_install_size">Installer · %1$s</string> @@ -3043,6 +3045,25 @@ <string name="spatial_saved_views_hint">Les vues enregistrées peuvent être recalculées. Démarrez un nouvel étalonnage pour capturer dans le système de coordonnées de suivi actuel.</string> <string name="spatial_model_checksum_error">Incohérence de la somme de contrôle du modèle manuel</string> <string name="spatial_opencv_load_error">OpenCV n\'a pas pu charger</string> + <string name="setup_group_memory">Mémoire</string> + <string name="setup_clear_cached">Fermer les applis en cache avant une session</string> + <string name="setup_clear_cached_hint">Au début d\'une session, ferme les applis qu\'Android garde en arrière-plan, pour laisser plus de mémoire au jeu. Le débogage sans fil doit être activé.</string> + <string name="setup_clear_cached_unpaired">DroidDeck doit être associé au débogage sans fil (Associer, ci-dessous).</string> + <string name="setup_memory_hud">Indicateur de mémoire</string> + <string name="setup_memory_hud_hint">Mémoire et swap utilisés, sur l\'écran de la session. Avancé détaille le jeu, DroidDeck, Android et le GPU.</string> + <string name="setup_memory_hud_simple">Simple</string> + <string name="setup_memory_hud_advanced">Avancé</string> + <string name="memory_hud_simple">RAM %1$s/%2$s Go · swap %3$s/%4$s Go</string> + <string name="memory_hud_split">jeu %1$s · DroidDeck %2$s · Android %3$s Go</string> + <string name="memory_hud_gpu">GPU %1$s Go</string> + <string name="setup_bg_limit">Applis en arrière-plan pendant une session</string> + <string name="setup_bg_limit_hint">Pendant une session, Android garde au plus ce nombre d\'applis en cache et ferme les autres, pour laisser leur mémoire au jeu. Rétabli à la fin de la session. Le débogage sans fil doit être activé.</string> + <string name="setup_bg_limit_4">4 au maximum</string> + <string name="setup_bg_limit_1">1 au maximum</string> + <string name="setup_bg_limit_0">Aucune</string> + <string name="setup_adb_pair">Débogage sans fil</string> + <string name="setup_adb_pair_hint">Associe DroidDeck au débogage sans fil d\'Android pour les options ci-dessus. La limite des processus enfants reste désactivée.</string> + <string name="setup_adb_pair_button">Associer</string> <string name="epic_client_missing">Non installé</string> <string name="epic_client_open">Ouvrir</string> <string name="epic_client_install">Installer</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 7b0930217a..7acad5ccd0 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1978,6 +1978,8 @@ <string name="stores_shelf_trending">ट्रेंडिंग</string> <string name="stores_play">Play</string> <string name="stores_install">इंस्टॉल करें</string> + <string name="bnet_open">Battle.net खोलें</string> + <string name="bnet_store">Blizzard के गेम</string> <string name="stores_resume_install">इंस्टॉल फिर से शुरू करें</string> <string name="stores_dl_interrupted">बाधित</string> <string name="stores_install_size">इंस्टॉल · %1$s</string> @@ -3007,6 +3009,25 @@ <string name="spatial_saved_views_hint">सहेजे गए दृश्यों की पुनर्गणना की जा सकती है। वर्तमान ट्रैकिंग समन्वय प्रणाली में कैप्चर करने के लिए एक नया अंशांकन प्रारंभ करें।</string> <string name="spatial_model_checksum_error">हैंड मॉडल चेकसम बेमेल</string> <string name="spatial_opencv_load_error">OpenCV लोड नहीं हो सका</string> + <string name="setup_group_memory">मेमोरी</string> + <string name="setup_clear_cached">सेशन से पहले कैश्ड ऐप बंद करें</string> + <string name="setup_clear_cached_hint">सेशन शुरू होने पर DroidDeck उन ऐप को बंद कर देता है जिन्हें Android बैकग्राउंड में रखता है, ताकि गेम को ज़्यादा मेमोरी मिले। वायरलेस डीबगिंग चालू होनी चाहिए।</string> + <string name="setup_clear_cached_unpaired">DroidDeck को वायरलेस डीबगिंग से पेयर करना ज़रूरी है (नीचे, पेयर करें)।</string> + <string name="setup_memory_hud">मेमोरी रीडआउट</string> + <string name="setup_memory_hud_hint">सेशन स्क्रीन पर इस्तेमाल हो रही मेमोरी और swap। एडवांस्ड इसे गेम, DroidDeck, Android और GPU में बांटकर दिखाता है।</string> + <string name="setup_memory_hud_simple">सिंपल</string> + <string name="setup_memory_hud_advanced">एडवांस्ड</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">गेम %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">सेशन के दौरान बैकग्राउंड ऐप</string> + <string name="setup_bg_limit_hint">सेशन चलते समय Android ज़्यादा से ज़्यादा इतने ऐप कैश में रखता है और बाकी बंद कर देता है, ताकि गेम को उनकी मेमोरी मिले। सेशन खत्म होने पर DroidDeck सीमा को पहले जैसा कर देता है। वायरलेस डीबगिंग चालू होनी चाहिए।</string> + <string name="setup_bg_limit_4">ज़्यादा से ज़्यादा 4</string> + <string name="setup_bg_limit_1">ज़्यादा से ज़्यादा 1</string> + <string name="setup_bg_limit_0">कोई नहीं</string> + <string name="setup_adb_pair">वायरलेस डीबगिंग</string> + <string name="setup_adb_pair_hint">ऊपर दिए गए विकल्पों के लिए DroidDeck को Android की वायरलेस डीबगिंग से पेयर करता है। चाइल्ड-प्रोसेस सीमा बंद ही रहती है।</string> + <string name="setup_adb_pair_button">पेयर करें</string> <string name="epic_client_missing">इंस्टॉल नहीं है</string> <string name="epic_client_open">खोलें</string> <string name="epic_client_install">इंस्टॉल करें</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 5fb0d0ee78..86f9d00962 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1978,6 +1978,8 @@ <string name="stores_shelf_trending">Felkapott</string> <string name="stores_play">Játék</string> <string name="stores_install">Telepítés</string> + <string name="bnet_open">Battle.net megnyitása</string> + <string name="bnet_store">Blizzard-játékok</string> <string name="stores_resume_install">Telepítés folytatása</string> <string name="stores_dl_interrupted">Megszakítva</string> <string name="stores_install_size">Telepítés · %1$s</string> @@ -3005,6 +3007,25 @@ <string name="spatial_saved_views_hint">Az elmentett nézetek újraszámíthatók. Indítson el egy új kalibrálást, hogy rögzítse az aktuális követési koordináta-rendszerben.</string> <string name="spatial_model_checksum_error">A kézi modell ellenőrzőösszegének eltérése</string> <string name="spatial_opencv_load_error">Az OpenCV betöltése nem sikerült</string> + <string name="setup_group_memory">Memória</string> + <string name="setup_clear_cached">Gyorsítótárazott alkalmazások bezárása munkamenet előtt</string> + <string name="setup_clear_cached_hint">Munkamenet indításakor a DroidDeck bezárja azokat az alkalmazásokat, amelyeket az Android a háttérben tart, így a játéknak több memória jut. A vezeték nélküli hibakeresésnek bekapcsolva kell lennie.</string> + <string name="setup_clear_cached_unpaired">A DroidDecket párosítani kell a vezeték nélküli hibakereséssel (Párosítás, lent).</string> + <string name="setup_memory_hud">Memóriakijelzés</string> + <string name="setup_memory_hud_hint">A használt memória és swap a munkamenet képernyőjén. A Speciális nézet szétbontja a játék, a DroidDeck, az Android és a GPU között.</string> + <string name="setup_memory_hud_simple">Egyszerű</string> + <string name="setup_memory_hud_advanced">Speciális</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">játék %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Háttéralkalmazások munkamenet közben</string> + <string name="setup_bg_limit_hint">Munkamenet közben az Android legfeljebb ennyi alkalmazást tart a gyorsítótárban, a többit bezárja, így azok memóriája a játéké lesz. A munkamenet végén a DroidDeck visszaállítja a korábbi korlátot. A vezeték nélküli hibakeresésnek bekapcsolva kell lennie.</string> + <string name="setup_bg_limit_4">Legfeljebb 4</string> + <string name="setup_bg_limit_1">Legfeljebb 1</string> + <string name="setup_bg_limit_0">Nincs</string> + <string name="setup_adb_pair">Vezeték nélküli hibakeresés</string> + <string name="setup_adb_pair_hint">Párosítja a DroidDecket az Android vezeték nélküli hibakeresésével a fenti beállításokhoz. A gyermekfolyamat-korlát kikapcsolva marad.</string> + <string name="setup_adb_pair_button">Párosítás</string> <string name="glasses_3dof">3DoF virtuális képernyő</string> <string name="glasses_6dof">6DoF virtuális képernyő</string> <string name="epic_client_missing">Nincs telepítve</string> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 1a2840c0c3..dbc2d16c36 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1957,6 +1957,8 @@ <string name="stores_shelf_trending">Sedang tren</string> <string name="stores_play">Mainkan</string> <string name="stores_install">Instal</string> + <string name="bnet_open">Buka Battle.net</string> + <string name="bnet_store">Game Blizzard</string> <string name="stores_resume_install">Lanjutkan instalasi</string> <string name="stores_dl_interrupted">Terhenti</string> <string name="stores_install_size">Instal · %1$s</string> @@ -2982,6 +2984,25 @@ <string name="spatial_saved_views_hint">Tampilan yang disimpan dapat dihitung ulang. Mulai kalibrasi baru untuk menangkap sistem koordinat pelacakan saat ini.</string> <string name="spatial_model_checksum_error">Ketidakcocokan checksum model tangan</string> <string name="spatial_opencv_load_error">OpenCV tidak dapat memuat</string> + <string name="setup_group_memory">Memori</string> + <string name="setup_clear_cached">Tutup aplikasi dalam cache sebelum sesi</string> + <string name="setup_clear_cached_hint">Saat sesi dimulai, DroidDeck menutup aplikasi yang disimpan Android di latar belakang agar gim mendapat lebih banyak memori. Debugging nirkabel harus aktif.</string> + <string name="setup_clear_cached_unpaired">DroidDeck harus disandingkan dengan Debugging nirkabel (Pasangkan, di bawah).</string> + <string name="setup_memory_hud">Tampilan memori</string> + <string name="setup_memory_hud_hint">Memori dan swap yang digunakan, di layar sesi. Lanjutan merincinya menjadi gim, DroidDeck, Android, dan GPU.</string> + <string name="setup_memory_hud_simple">Sederhana</string> + <string name="setup_memory_hud_advanced">Lanjutan</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">gim %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Aplikasi latar belakang selama sesi</string> + <string name="setup_bg_limit_hint">Selama sesi berjalan, Android menyimpan paling banyak sejumlah ini aplikasi di cache dan menutup sisanya agar gim mendapat memorinya. DroidDeck mengembalikan batas seperti semula saat sesi berakhir. Debugging nirkabel harus aktif.</string> + <string name="setup_bg_limit_4">Paling banyak 4</string> + <string name="setup_bg_limit_1">Paling banyak 1</string> + <string name="setup_bg_limit_0">Tidak ada</string> + <string name="setup_adb_pair">Debugging nirkabel</string> + <string name="setup_adb_pair_hint">Menyandingkan DroidDeck dengan Debugging nirkabel Android untuk opsi di atas. Batas proses turunan tetap nonaktif.</string> + <string name="setup_adb_pair_button">Pasangkan</string> <string name="epic_client_missing">Belum terinstal</string> <string name="epic_client_open">Buka</string> <string name="epic_client_install">Pasang</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ffaf3f6027..e3c5cc25c9 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1991,6 +1991,8 @@ <string name="stores_shelf_trending">Di tendenza</string> <string name="stores_play">Gioca</string> <string name="stores_install">Installa</string> + <string name="bnet_open">Apri Battle.net</string> + <string name="bnet_store">Giochi Blizzard</string> <string name="stores_resume_install">Riprendi installazione</string> <string name="stores_dl_interrupted">Interrotto</string> <string name="stores_install_size">Installa · %1$s</string> @@ -3039,6 +3041,25 @@ <string name="spatial_saved_views_hint">Le visualizzazioni salvate possono essere ricalcolate. Avvia una nuova calibrazione per acquisire il sistema di coordinate di tracciamento corrente.</string> <string name="spatial_model_checksum_error">Mancata corrispondenza del checksum del modello di mano</string> <string name="spatial_opencv_load_error">Impossibile caricare OpenCV</string> + <string name="setup_group_memory">Memoria</string> + <string name="setup_clear_cached">Chiudi le app in cache prima di una sessione</string> + <string name="setup_clear_cached_hint">All\'avvio di una sessione, DroidDeck chiude le app che Android tiene parcheggiate in background, così il gioco ha più memoria. Il Debug wireless deve essere attivo.</string> + <string name="setup_clear_cached_unpaired">Richiede DroidDeck accoppiato con il Debug wireless (Accoppia, qui sotto).</string> + <string name="setup_memory_hud">Indicatore della memoria</string> + <string name="setup_memory_hud_hint">Memoria e swap in uso, nella schermata della sessione. Avanzato la suddivide tra gioco, DroidDeck, Android e GPU.</string> + <string name="setup_memory_hud_simple">Semplice</string> + <string name="setup_memory_hud_advanced">Avanzato</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">gioco %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">App in background durante una sessione</string> + <string name="setup_bg_limit_hint">Durante una sessione, Android tiene in cache al massimo questo numero di app e chiude le altre, così il gioco ha la loro memoria. Al termine della sessione DroidDeck ripristina il limite precedente. Il Debug wireless deve essere attivo.</string> + <string name="setup_bg_limit_4">Al massimo 4</string> + <string name="setup_bg_limit_1">Al massimo 1</string> + <string name="setup_bg_limit_0">Nessuna</string> + <string name="setup_adb_pair">Debug wireless</string> + <string name="setup_adb_pair_hint">Accoppia DroidDeck al Debug wireless di Android per le opzioni qui sopra. Il limite dei processi figlio resta disattivato.</string> + <string name="setup_adb_pair_button">Accoppia</string> <string name="setup_glasses_scope">Le impostazioni dello schermo e del tracciamento della testa sono condivise tra menu, giochi e sessioni desktop di DroidDeck.</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> <string name="epic_client_missing">Non installata</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 857969d089..f0b2b83310 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1959,6 +1959,8 @@ <string name="stores_shelf_trending">トレンド</string> <string name="stores_play">プレイ</string> <string name="stores_install">インストール</string> + <string name="bnet_open">Battle.net を開く</string> + <string name="bnet_store">Blizzard のゲーム</string> <string name="stores_resume_install">インストールを再開</string> <string name="stores_dl_interrupted">中断</string> <string name="stores_install_size">インストール · %1$s</string> @@ -2984,6 +2986,25 @@ <string name="spatial_opencv_load_error">OpenCVをロードできませんでした</string> <string name="tracking_recovery_look">明るい部屋でゆっくりと周囲を見回してください。\nトラッキングカメラを遮るものがないように、家具などの見えるものに顔を向けてください。</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> + <string name="setup_group_memory">メモリ</string> + <string name="setup_clear_cached">セッション前にキャッシュ済みアプリを閉じる</string> + <string name="setup_clear_cached_hint">セッションの開始時に、Android がバックグラウンドに保持しているアプリを閉じ、ゲームに使えるメモリを増やします。ワイヤレスデバッグをオンにする必要があります。</string> + <string name="setup_clear_cached_unpaired">DroidDeck をワイヤレスデバッグとペア設定する必要があります(下の「ペア設定」)。</string> + <string name="setup_memory_hud">メモリ表示</string> + <string name="setup_memory_hud_hint">使用中のメモリとスワップをセッション画面に表示します。詳細設定では、ゲーム、DroidDeck、Android、GPU に分けて表示します。</string> + <string name="setup_memory_hud_simple">シンプル</string> + <string name="setup_memory_hud_advanced">詳細設定</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · スワップ %3$s/%4$s GB</string> + <string name="memory_hud_split">ゲーム %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">セッション中のバックグラウンドアプリ</string> + <string name="setup_bg_limit_hint">セッション中、Android がキャッシュに保持するアプリをこの数までに抑え、残りを閉じてゲームにメモリを回します。セッション終了時に元に戻します。ワイヤレスデバッグをオンにする必要があります。</string> + <string name="setup_bg_limit_4">最大 4 個</string> + <string name="setup_bg_limit_1">最大 1 個</string> + <string name="setup_bg_limit_0">なし</string> + <string name="setup_adb_pair">ワイヤレスデバッグ</string> + <string name="setup_adb_pair_hint">上のオプションのために DroidDeck を Android のワイヤレスデバッグとペア設定します。子プロセス制限はオフのままです。</string> + <string name="setup_adb_pair_button">ペア設定</string> <string name="epic_client_missing">未インストール</string> <string name="epic_client_open">開く</string> <string name="epic_client_install">インストール</string> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 64a063461a..4c30f8ed68 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1959,6 +1959,8 @@ <string name="stores_shelf_trending">인기 급상승</string> <string name="stores_play">플레이</string> <string name="stores_install">설치</string> + <string name="bnet_open">Battle.net 열기</string> + <string name="bnet_store">Blizzard 게임</string> <string name="stores_resume_install">설치 재개</string> <string name="stores_dl_interrupted">중단됨</string> <string name="stores_install_size">설치 · %1$s</string> @@ -2984,6 +2986,25 @@ <string name="spatial_distance_result">카메라 측정 %1$s; 선택한 거리 %2$s. %3$s</string> <string name="spatial_wait_previews">보정을 시작하기 전에 두 카메라 미리보기를 모두 기다리세요.</string> <string name="spatial_saved_views_hint">저장된 뷰는 다시 계산될 수 있습니다. 현재 추적 좌표계에서 캡처하려면 새 보정을 시작하세요.</string> + <string name="setup_group_memory">메모리</string> + <string name="setup_clear_cached">세션 전에 캐시된 앱 닫기</string> + <string name="setup_clear_cached_hint">세션이 시작될 때 Android가 백그라운드에 보관 중인 앱을 닫아 게임이 메모리를 더 쓸 수 있게 합니다. 무선 디버깅이 켜져 있어야 합니다.</string> + <string name="setup_clear_cached_unpaired">DroidDeck을 무선 디버깅과 페어링해야 합니다(아래 페어링).</string> + <string name="setup_memory_hud">메모리 표시</string> + <string name="setup_memory_hud_hint">사용 중인 메모리와 스왑을 세션 화면에 표시합니다. 고급에서는 게임, DroidDeck, Android, GPU로 나눠 보여 줍니다.</string> + <string name="setup_memory_hud_simple">간단</string> + <string name="setup_memory_hud_advanced">고급</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · 스왑 %3$s/%4$s GB</string> + <string name="memory_hud_split">게임 %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">세션 중 백그라운드 앱</string> + <string name="setup_bg_limit_hint">세션이 실행되는 동안 Android가 캐시에 두는 앱을 이 개수까지로 제한하고 나머지는 닫아 게임이 그 메모리를 쓰게 합니다. 세션이 끝나면 원래대로 돌아갑니다. 무선 디버깅이 켜져 있어야 합니다.</string> + <string name="setup_bg_limit_4">최대 4개</string> + <string name="setup_bg_limit_1">최대 1개</string> + <string name="setup_bg_limit_0">없음</string> + <string name="setup_adb_pair">무선 디버깅</string> + <string name="setup_adb_pair_hint">위 옵션을 위해 DroidDeck을 Android 무선 디버깅과 페어링합니다. 하위 프로세스 제한은 꺼진 상태로 유지됩니다.</string> + <string name="setup_adb_pair_button">페어링</string> <string name="epic_client_missing">설치되지 않음</string> <string name="epic_client_open">열기</string> <string name="epic_client_install">설치</string> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 3135c66816..3047eae83f 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1957,6 +1957,8 @@ <string name="stores_shelf_trending">Tular</string> <string name="stores_play">Main</string> <string name="stores_install">Pasang</string> + <string name="bnet_open">Buka Battle.net</string> + <string name="bnet_store">Permainan Blizzard</string> <string name="stores_resume_install">Sambung pemasangan</string> <string name="stores_dl_interrupted">Terganggu</string> <string name="stores_install_size">Pasang · %1$s</string> @@ -2980,6 +2982,25 @@ <string name="spatial_saved_views_hint">Pandangan yang disimpan boleh dikira semula. Mulakan penentukuran baharu untuk ditangkap dalam sistem koordinat penjejakan semasa.</string> <string name="spatial_model_checksum_error">Ketakpadanan checksum model tangan</string> <string name="spatial_opencv_load_error">OpenCV tidak dapat dimuatkan</string> + <string name="setup_group_memory">Memori</string> + <string name="setup_clear_cached">Tutup apl dalam cache sebelum sesi</string> + <string name="setup_clear_cached_hint">Apabila sesi bermula, DroidDeck menutup apl yang disimpan Android di latar belakang supaya permainan mendapat lebih banyak memori. Debugging Wayarles mesti dihidupkan.</string> + <string name="setup_clear_cached_unpaired">Memerlukan DroidDeck digandingkan dengan Debugging Wayarles (Gandingkan, di bawah).</string> + <string name="setup_memory_hud">Paparan memori</string> + <string name="setup_memory_hud_hint">Memori dan swap yang digunakan, pada skrin sesi. Lanjutan memecahkannya kepada permainan, DroidDeck, Android dan GPU.</string> + <string name="setup_memory_hud_simple">Ringkas</string> + <string name="setup_memory_hud_advanced">Lanjutan</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">permainan %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Apl latar belakang semasa sesi</string> + <string name="setup_bg_limit_hint">Semasa sesi berjalan, Android menyimpan paling banyak bilangan apl ini dalam cache dan menutup selebihnya, supaya permainan mendapat memori apl tersebut. DroidDeck memulihkan had seperti asal apabila sesi tamat. Debugging Wayarles mesti dihidupkan.</string> + <string name="setup_bg_limit_4">Paling banyak 4</string> + <string name="setup_bg_limit_1">Paling banyak 1</string> + <string name="setup_bg_limit_0">Tiada</string> + <string name="setup_adb_pair">Debugging Wayarles</string> + <string name="setup_adb_pair_hint">Menggandingkan DroidDeck dengan Debugging Wayarles Android untuk pilihan di atas. Had proses anak kekal dimatikan.</string> + <string name="setup_adb_pair_button">Gandingkan</string> <string name="spatial_print_title">DroidDeck - Penentukuran Luma Ultra</string> <string name="spatial_base_loaded">Penentukuran asas Luma Ultra dimuatkan</string> <string name="epic_client_missing">Belum dipasang</string> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 4e685d919e..2ca4cc2335 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1978,6 +1978,8 @@ <string name="stores_shelf_trending">Trender</string> <string name="stores_play">Spill</string> <string name="stores_install">Installer</string> + <string name="bnet_open">Åpne Battle.net</string> + <string name="bnet_store">Blizzard-spill</string> <string name="stores_resume_install">Gjenoppta installasjon</string> <string name="stores_dl_interrupted">Avbrutt</string> <string name="stores_install_size">Installer · %1$s</string> @@ -3007,6 +3009,25 @@ <string name="spatial_saved_views_hint">Lagrede visninger kan beregnes på nytt. Start en ny kalibrering for å fange opp i gjeldende sporingskoordinatsystem.</string> <string name="spatial_model_checksum_error">Uoverensstemmelse med håndmodellsjekksum</string> <string name="spatial_opencv_load_error">OpenCV kunne ikke laste</string> + <string name="setup_group_memory">Minne</string> + <string name="setup_clear_cached">Lukk bufrede apper før en sesjon</string> + <string name="setup_clear_cached_hint">Når en sesjon starter, lukker DroidDeck appene Android holder parkert i bakgrunnen, slik at spillet får mer minne. Trådløs feilsøking må være på.</string> + <string name="setup_clear_cached_unpaired">Krever at DroidDeck er paret med trådløs feilsøking (Koble sammen, nedenfor).</string> + <string name="setup_memory_hud">Minnevisning</string> + <string name="setup_memory_hud_hint">Minne og swap i bruk, på sesjonsskjermen. Avansert fordeler det på spillet, DroidDeck, Android og GPU-en.</string> + <string name="setup_memory_hud_simple">Enkel</string> + <string name="setup_memory_hud_advanced">Avansert</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">spill %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Bakgrunnsapper under en sesjon</string> + <string name="setup_bg_limit_hint">Mens en sesjon kjører, holder Android høyst så mange apper i hurtiglageret og lukker resten, slik at spillet får minnet deres. DroidDeck setter grensen tilbake slik den var når sesjonen avsluttes. Trådløs feilsøking må være på.</string> + <string name="setup_bg_limit_4">Høyst 4</string> + <string name="setup_bg_limit_1">Høyst 1</string> + <string name="setup_bg_limit_0">Ingen</string> + <string name="setup_adb_pair">Trådløs feilsøking</string> + <string name="setup_adb_pair_hint">Kobler DroidDeck sammen med trådløs feilsøking i Android for valgene ovenfor. Grensen for underprosesser forblir av.</string> + <string name="setup_adb_pair_button">Koble sammen</string> <string name="epic_client_missing">Ikke installert</string> <string name="epic_client_open">Åpne</string> <string name="epic_client_install">Installer</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 30494a6fa5..d5c217f93a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1978,6 +1978,8 @@ <string name="stores_shelf_trending">Populair</string> <string name="stores_play">Spelen</string> <string name="stores_install">Installeren</string> + <string name="bnet_open">Battle.net openen</string> + <string name="bnet_store">Blizzard-games</string> <string name="stores_resume_install">Installatie hervatten</string> <string name="stores_dl_interrupted">Onderbroken</string> <string name="stores_install_size">Installeren · %1$s</string> @@ -3005,6 +3007,25 @@ <string name="spatial_saved_views_hint">Opgeslagen weergaven kunnen opnieuw worden berekend. Start een nieuwe kalibratie om vast te leggen in het huidige volgcoördinatensysteem.</string> <string name="spatial_model_checksum_error">Controlesom handmodel komt niet overeen</string> <string name="spatial_opencv_load_error">OpenCV kon niet laden</string> + <string name="setup_group_memory">Geheugen</string> + <string name="setup_clear_cached">Gecachete apps sluiten voor een sessie</string> + <string name="setup_clear_cached_hint">Als een sessie start, sluit DroidDeck de apps die Android op de achtergrond geparkeerd houdt, zodat de game meer geheugen heeft. Draadloos debuggen moet aanstaan.</string> + <string name="setup_clear_cached_unpaired">DroidDeck moet gekoppeld zijn met Draadloos debuggen (Koppelen, hieronder).</string> + <string name="setup_memory_hud">Geheugenweergave</string> + <string name="setup_memory_hud_hint">Gebruikt geheugen en swap, op het sessiescherm. Geavanceerd verdeelt het over de game, DroidDeck, Android en de GPU.</string> + <string name="setup_memory_hud_simple">Eenvoudig</string> + <string name="setup_memory_hud_advanced">Geavanceerd</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">game %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Achtergrond-apps tijdens een sessie</string> + <string name="setup_bg_limit_hint">Tijdens een sessie houdt Android maximaal dit aantal apps in de cache en sluit de rest, zodat de game hun geheugen krijgt. DroidDeck zet de limiet terug zoals hij was als de sessie eindigt. Draadloos debuggen moet aanstaan.</string> + <string name="setup_bg_limit_4">Maximaal 4</string> + <string name="setup_bg_limit_1">Maximaal 1</string> + <string name="setup_bg_limit_0">Geen</string> + <string name="setup_adb_pair">Draadloos debuggen</string> + <string name="setup_adb_pair_hint">Koppelt DroidDeck aan Draadloos debuggen van Android voor de opties hierboven. De limiet voor subprocessen blijft uit.</string> + <string name="setup_adb_pair_button">Koppelen</string> <string name="glasses_6dof">Virtueel scherm met 6DoF</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> <string name="epic_client_missing">Niet geïnstalleerd</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 64414194eb..02d9de52d6 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2020,6 +2020,8 @@ <string name="stores_shelf_trending">Popularne</string> <string name="stores_play">Graj</string> <string name="stores_install">Zainstaluj</string> + <string name="bnet_open">Otwórz Battle.net</string> + <string name="bnet_store">Gry Blizzarda</string> <string name="stores_resume_install">Wznów instalację</string> <string name="stores_dl_interrupted">Przerwano</string> <string name="stores_install_size">Instalacja · %1$s</string> @@ -3074,6 +3076,25 @@ <string name="spatial_saved_views_hint">Zapisane widoki można przeliczyć. Rozpocznij nową kalibrację, aby przechwycić bieżący układ współrzędnych śledzenia.</string> <string name="spatial_model_checksum_error">Niezgodność sumy kontrolnej modelu ręki</string> <string name="spatial_opencv_load_error">Nie można załadować OpenCV</string> + <string name="setup_group_memory">Pamięć</string> + <string name="setup_clear_cached">Zamykaj aplikacje z pamięci podręcznej przed sesją</string> + <string name="setup_clear_cached_hint">Na początku sesji DroidDeck zamyka aplikacje, które Android trzyma w tle, aby gra miała więcej pamięci. Debugowanie bezprzewodowe musi być włączone.</string> + <string name="setup_clear_cached_unpaired">Wymaga sparowania DroidDeck przez Debugowanie bezprzewodowe (Sparuj, poniżej).</string> + <string name="setup_memory_hud">Wskaźnik pamięci</string> + <string name="setup_memory_hud_hint">Używana pamięć i swap na ekranie sesji. Tryb Zaawansowany dzieli ją na grę, DroidDeck, Androida i GPU.</string> + <string name="setup_memory_hud_simple">Prosty</string> + <string name="setup_memory_hud_advanced">Zaawansowany</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">gra %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Aplikacje w tle podczas sesji</string> + <string name="setup_bg_limit_hint">W trakcie sesji Android trzyma w pamięci podręcznej najwyżej tyle aplikacji, a resztę zamyka, aby gra dostała ich pamięć. Po zakończeniu sesji DroidDeck przywraca poprzedni limit. Debugowanie bezprzewodowe musi być włączone.</string> + <string name="setup_bg_limit_4">Najwyżej 4</string> + <string name="setup_bg_limit_1">Najwyżej 1</string> + <string name="setup_bg_limit_0">Brak</string> + <string name="setup_adb_pair">Debugowanie bezprzewodowe</string> + <string name="setup_adb_pair_hint">Paruje DroidDeck z Debugowaniem bezprzewodowym Androida na potrzeby opcji powyżej. Limit procesów podrzędnych pozostaje wyłączony.</string> + <string name="setup_adb_pair_button">Sparuj</string> <string name="spatial_gpu_hint">Domyślnie używany jest CPU. GPU jest opcją eksperymentalną i może powodować ponowne uruchamianie SteamVR. Wybór jest resetowany po ponownym uruchomieniu śledzenia.</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> <string name="spatial_connect_hint">Podłącz Luma Ultra i włącz śledzenie pozycji.</string> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 6900b72d55..73658c0f23 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1991,6 +1991,8 @@ <string name="stores_shelf_trending">Tendências</string> <string name="stores_play">Jogar</string> <string name="stores_install">Instalar</string> + <string name="bnet_open">Abrir o Battle.net</string> + <string name="bnet_store">Jogos da Blizzard</string> <string name="stores_resume_install">Retomar instalação</string> <string name="stores_dl_interrupted">Interrompida</string> <string name="stores_install_size">Instalar · %1$s</string> @@ -3040,6 +3042,25 @@ <string name="spatial_saved_views_hint">As visualizações guardadas podem ser recalculadas. Inicie uma nova calibração para captar no sistema de coordenadas de seguimento atual.</string> <string name="spatial_model_checksum_error">Incompatibilidade de checksum do modelo de mãos</string> <string name="spatial_opencv_load_error">O OpenCV não conseguiu carregar</string> + <string name="setup_group_memory">Memória</string> + <string name="setup_clear_cached">Fechar apps em cache antes de uma sessão</string> + <string name="setup_clear_cached_hint">Quando uma sessão começa, o DroidDeck fecha as apps que o Android mantém em segundo plano, para que o jogo tenha mais memória. A Depuração sem fios tem de estar ativada.</string> + <string name="setup_clear_cached_unpaired">É necessário sincronizar o DroidDeck com a Depuração sem fios (Sincronizar, abaixo).</string> + <string name="setup_memory_hud">Indicador de memória</string> + <string name="setup_memory_hud_hint">Memória e swap em uso, no ecrã da sessão. O modo Avançado divide-a entre o jogo, o DroidDeck, o Android e a GPU.</string> + <string name="setup_memory_hud_simple">Simples</string> + <string name="setup_memory_hud_advanced">Avançado</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">jogo %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Apps em segundo plano durante uma sessão</string> + <string name="setup_bg_limit_hint">Enquanto uma sessão decorre, o Android mantém em cache no máximo este número de apps e fecha as restantes, para que o jogo fique com a memória delas. O DroidDeck repõe o limite anterior quando a sessão termina. A Depuração sem fios tem de estar ativada.</string> + <string name="setup_bg_limit_4">No máximo 4</string> + <string name="setup_bg_limit_1">No máximo 1</string> + <string name="setup_bg_limit_0">Nenhuma</string> + <string name="setup_adb_pair">Depuração sem fios</string> + <string name="setup_adb_pair_hint">Sincroniza o DroidDeck com a Depuração sem fios do Android para as opções acima. O limite de processos secundários continua desativado.</string> + <string name="setup_adb_pair_button">Sincronizar</string> <string name="tracking_recovery_look">Olhe em redor lentamente num ambiente bem iluminado.\nMantenha as câmaras de seguimento desobstruídas e viradas para móveis ou outros detalhes visíveis.</string> <string name="epic_client_missing">Não instalado</string> <string name="epic_client_open">Abrir</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index a03f518c5e..16cd8eb468 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1991,6 +1991,8 @@ <string name="stores_shelf_trending">Em alta</string> <string name="stores_play">Jogar</string> <string name="stores_install">Instalar</string> + <string name="bnet_open">Abrir o Battle.net</string> + <string name="bnet_store">Jogos da Blizzard</string> <string name="stores_resume_install">Retomar instalação</string> <string name="stores_dl_interrupted">Interrompido</string> <string name="stores_install_size">Instalar · %1$s</string> @@ -3040,6 +3042,25 @@ <string name="spatial_saved_views_hint">As visualizações salvas podem ser recalculadas. Inicie uma nova calibração para capturar no sistema de coordenadas de rastreamento atual.</string> <string name="spatial_model_checksum_error">Incompatibilidade de soma de verificação do modelo de mãos</string> <string name="spatial_opencv_load_error">OpenCV não pôde carregar</string> + <string name="setup_group_memory">Memória</string> + <string name="setup_clear_cached">Fechar apps em cache antes de uma sessão</string> + <string name="setup_clear_cached_hint">Quando uma sessão começa, o DroidDeck fecha os apps que o Android mantém em segundo plano, para que o jogo tenha mais memória. A Depuração por Wi-Fi precisa estar ativada.</string> + <string name="setup_clear_cached_unpaired">O DroidDeck precisa estar pareado com a Depuração por Wi-Fi (Parear, abaixo).</string> + <string name="setup_memory_hud">Indicador de memória</string> + <string name="setup_memory_hud_hint">Memória e swap em uso, na tela da sessão. O modo Avançado divide entre o jogo, o DroidDeck, o Android e a GPU.</string> + <string name="setup_memory_hud_simple">Simples</string> + <string name="setup_memory_hud_advanced">Avançado</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">jogo %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Apps em segundo plano durante uma sessão</string> + <string name="setup_bg_limit_hint">Enquanto uma sessão está em andamento, o Android mantém no máximo esse número de apps em cache e fecha o restante, para que o jogo fique com a memória deles. O DroidDeck restaura o limite anterior quando a sessão termina. A Depuração por Wi-Fi precisa estar ativada.</string> + <string name="setup_bg_limit_4">No máximo 4</string> + <string name="setup_bg_limit_1">No máximo 1</string> + <string name="setup_bg_limit_0">Nenhum</string> + <string name="setup_adb_pair">Depuração por Wi-Fi</string> + <string name="setup_adb_pair_hint">Pareia o DroidDeck com a Depuração por Wi-Fi do Android para as opções acima. O limite de processos filhos continua desativado.</string> + <string name="setup_adb_pair_button">Parear</string> <string name="tracking_recovery_look">Olhe ao redor lentamente em um ambiente bem iluminado.\nMantenha as câmeras de rastreamento desobstruídas e voltadas para móveis ou outros detalhes visíveis.</string> <string name="epic_client_missing">Não instalado</string> <string name="epic_client_open">Abrir</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index e1e54f3515..d9e87c4465 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1999,6 +1999,8 @@ <string name="stores_shelf_trending">În tendințe</string> <string name="stores_play">Joacă</string> <string name="stores_install">Instalează</string> + <string name="bnet_open">Deschide Battle.net</string> + <string name="bnet_store">Jocuri Blizzard</string> <string name="stores_resume_install">Reia instalarea</string> <string name="stores_dl_interrupted">Întreruptă</string> <string name="stores_install_size">Instalare · %1$s</string> @@ -3041,6 +3043,25 @@ <string name="spatial_saved_views_hint">Vizualizările salvate pot fi recalculate. Începe o nouă calibrare pentru a captura în sistemul de coordonate de urmărire curent.</string> <string name="spatial_model_checksum_error">Nepotrivire a sumei de control a modelului de mâini</string> <string name="spatial_opencv_load_error">OpenCV nu s-a putut încărca</string> + <string name="setup_group_memory">Memorie</string> + <string name="setup_clear_cached">Închide aplicațiile din cache înainte de o sesiune</string> + <string name="setup_clear_cached_hint">La pornirea unei sesiuni, DroidDeck închide aplicațiile pe care Android le ține în fundal, ca jocul să aibă mai multă memorie. Depanarea wireless trebuie să fie activată.</string> + <string name="setup_clear_cached_unpaired">DroidDeck trebuie asociat prin Depanarea wireless (Asociază, mai jos).</string> + <string name="setup_memory_hud">Indicator de memorie</string> + <string name="setup_memory_hud_hint">Memoria și swap-ul folosite, pe ecranul sesiunii. Avansat le împarte între joc, DroidDeck, Android și GPU.</string> + <string name="setup_memory_hud_simple">Simplu</string> + <string name="setup_memory_hud_advanced">Avansat</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">joc %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Aplicații în fundal în timpul unei sesiuni</string> + <string name="setup_bg_limit_hint">Cât timp rulează o sesiune, Android păstrează în cache cel mult atâtea aplicații și le închide pe celelalte, ca jocul să primească memoria lor. DroidDeck readuce limita la valoarea anterioară când se termină sesiunea. Depanarea wireless trebuie să fie activată.</string> + <string name="setup_bg_limit_4">Cel mult 4</string> + <string name="setup_bg_limit_1">Cel mult 1</string> + <string name="setup_bg_limit_0">Niciuna</string> + <string name="setup_adb_pair">Depanare wireless</string> + <string name="setup_adb_pair_hint">Asociază DroidDeck cu Depanarea wireless din Android pentru opțiunile de mai sus. Limita proceselor-copil rămâne dezactivată.</string> + <string name="setup_adb_pair_button">Asociază</string> <string name="epic_client_missing">Neinstalat</string> <string name="epic_client_open">Deschide</string> <string name="epic_client_install">Instalează</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0c45e5b870..060c7469f8 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2022,6 +2022,8 @@ <string name="stores_shelf_trending">Популярное</string> <string name="stores_play">Играть</string> <string name="stores_install">Установить</string> + <string name="bnet_open">Открыть Battle.net</string> + <string name="bnet_store">Игры Blizzard</string> <string name="stores_resume_install">Продолжить установку</string> <string name="stores_dl_interrupted">Прервано</string> <string name="stores_install_size">Установить · %1$s</string> @@ -3077,6 +3079,25 @@ <string name="spatial_gpu">Распознавание рук на GPU</string> <string name="spatial_gpu_hint">По умолчанию используется CPU. Режим GPU экспериментальный и может вызывать перезапуск SteamVR. Выбор сбрасывается при перезапуске отслеживания.</string> <string name="spatial_inference_error">Распознавание рук недоступно: %1$s. Измените режим CPU/GPU или выключите и снова включите управление руками, чтобы повторить попытку.</string> + <string name="setup_group_memory">Память</string> + <string name="setup_clear_cached">Закрывать фоновые приложения перед сеансом</string> + <string name="setup_clear_cached_hint">При запуске сеанса закрывает приложения, которые Android держит в фоне, чтобы игре досталось больше памяти. Отладка по Wi-Fi должна быть включена.</string> + <string name="setup_clear_cached_unpaired">DroidDeck должен быть сопряжён через отладку по Wi-Fi (кнопка «Сопрячь» ниже).</string> + <string name="setup_memory_hud">Индикатор памяти</string> + <string name="setup_memory_hud_hint">Используемая память и подкачка на экране сеанса. «Дополнительно» показывает отдельно игру, DroidDeck, Android и GPU.</string> + <string name="setup_memory_hud_simple">Простой</string> + <string name="setup_memory_hud_advanced">Дополнительно</string> + <string name="memory_hud_simple">ОЗУ %1$s/%2$s ГБ · подкачка %3$s/%4$s ГБ</string> + <string name="memory_hud_split">игра %1$s · DroidDeck %2$s · Android %3$s ГБ</string> + <string name="memory_hud_gpu">GPU %1$s ГБ</string> + <string name="setup_bg_limit">Фоновые приложения во время сеанса</string> + <string name="setup_bg_limit_hint">Пока идёт сеанс, Android хранит в кэше не больше этого числа приложений и закрывает остальные, чтобы их память досталась игре. После сеанса всё возвращается как было. Отладка по Wi-Fi должна быть включена.</string> + <string name="setup_bg_limit_4">Не больше 4</string> + <string name="setup_bg_limit_1">Не больше 1</string> + <string name="setup_bg_limit_0">Нет</string> + <string name="setup_adb_pair">Отладка по Wi-Fi</string> + <string name="setup_adb_pair_hint">Сопрягает DroidDeck с отладкой Android по Wi-Fi для параметров выше. Ограничение дочерних процессов остаётся отключённым.</string> + <string name="setup_adb_pair_button">Сопрячь</string> <string name="epic_client_missing">Не установлено</string> <string name="epic_client_open">Открыть</string> <string name="epic_client_install">Установить</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 59169120f8..1fc734869b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1978,6 +1978,8 @@ <string name="stores_shelf_trending">Populärt nu</string> <string name="stores_play">Spela</string> <string name="stores_install">Installera</string> + <string name="bnet_open">Öppna Battle.net</string> + <string name="bnet_store">Blizzard-spel</string> <string name="stores_resume_install">Återuppta installation</string> <string name="stores_dl_interrupted">Avbruten</string> <string name="stores_install_size">Installation · %1$s</string> @@ -3006,6 +3008,25 @@ <string name="spatial_saved_views_hint">Sparade vyer kan räknas om. Starta en ny kalibrering för att fånga i det aktuella spårningskoordinatsystemet.</string> <string name="spatial_model_checksum_error">Kontrollsumman för handmodellen inte överensstämmer</string> <string name="spatial_opencv_load_error">OpenCV kunde inte laddas</string> + <string name="setup_group_memory">Minne</string> + <string name="setup_clear_cached">Stäng cachade appar före en session</string> + <string name="setup_clear_cached_hint">När en session startar stänger DroidDeck apparna som Android håller parkerade i bakgrunden, så att spelet får mer minne. Trådlös felsökning måste vara på.</string> + <string name="setup_clear_cached_unpaired">Kräver att DroidDeck är ihopparat via Trådlös felsökning (Para ihop, nedan).</string> + <string name="setup_memory_hud">Minnesvisning</string> + <string name="setup_memory_hud_hint">Minne och swap som används, på sessionsskärmen. Avancerat delar upp det på spelet, DroidDeck, Android och GPU:n.</string> + <string name="setup_memory_hud_simple">Enkel</string> + <string name="setup_memory_hud_advanced">Avancerat</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">spel %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Bakgrundsappar under en session</string> + <string name="setup_bg_limit_hint">Medan en session pågår håller Android högst så här många appar cachade och stänger resten, så att spelet får deras minne. DroidDeck återställer gränsen som den var när sessionen slutar. Trådlös felsökning måste vara på.</string> + <string name="setup_bg_limit_4">Högst 4</string> + <string name="setup_bg_limit_1">Högst 1</string> + <string name="setup_bg_limit_0">Ingen</string> + <string name="setup_adb_pair">Trådlös felsökning</string> + <string name="setup_adb_pair_hint">Parar ihop DroidDeck med Androids Trådlös felsökning för alternativen ovan. Gränsen för underprocesser förblir av.</string> + <string name="setup_adb_pair_button">Para ihop</string> <string name="glasses_6dof">Virtuell skärm med 6DoF</string> <string name="epic_client_missing">Inte installerad</string> <string name="epic_client_open">Öppna</string> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index f300fe8964..d0a3c6cd8c 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1957,6 +1957,8 @@ <string name="stores_shelf_trending">กำลังเป็นที่นิยม</string> <string name="stores_play">เล่น</string> <string name="stores_install">ติดตั้ง</string> + <string name="bnet_open">เปิด Battle.net</string> + <string name="bnet_store">เกมของ Blizzard</string> <string name="stores_resume_install">ดำเนินการติดตั้งต่อ</string> <string name="stores_dl_interrupted">ถูกขัดจังหวะ</string> <string name="stores_install_size">ติดตั้ง · %1$s</string> @@ -2981,6 +2983,25 @@ <string name="spatial_saved_views_hint">มุมมองที่บันทึกไว้สามารถคำนวณใหม่ได้ เริ่มการสอบเทียบใหม่เพื่อบันทึกในระบบพิกัดการติดตามปัจจุบัน</string> <string name="spatial_model_checksum_error">ผลรวมตรวจสอบแบบจำลองมือไม่ตรงกัน</string> <string name="spatial_opencv_load_error">OpenCV ไม่สามารถโหลดได้</string> + <string name="setup_group_memory">หน่วยความจำ</string> + <string name="setup_clear_cached">ปิดแอปที่แคชไว้ก่อนเริ่มเซสชัน</string> + <string name="setup_clear_cached_hint">เมื่อเซสชันเริ่ม DroidDeck จะปิดแอปที่ Android พักไว้ในพื้นหลัง เพื่อให้เกมมีหน่วยความจำมากขึ้น ต้องเปิด Wireless debugging ไว้</string> + <string name="setup_clear_cached_unpaired">ต้องจับคู่ DroidDeck กับ Wireless debugging ก่อน (จับคู่ ด้านล่าง)</string> + <string name="setup_memory_hud">การแสดงหน่วยความจำ</string> + <string name="setup_memory_hud_hint">หน่วยความจำและ swap ที่ใช้อยู่ บนหน้าจอเซสชัน โหมดขั้นสูงจะแยกเป็นเกม, DroidDeck, Android และ GPU</string> + <string name="setup_memory_hud_simple">แบบง่าย</string> + <string name="setup_memory_hud_advanced">ขั้นสูง</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">เกม %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">แอปพื้นหลังระหว่างเซสชัน</string> + <string name="setup_bg_limit_hint">ระหว่างที่เซสชันทำงาน Android จะเก็บแอปไว้ในแคชไม่เกินจำนวนนี้และปิดแอปที่เหลือ เพื่อให้เกมได้หน่วยความจำของแอปเหล่านั้น DroidDeck จะคืนค่าขีดจำกัดเดิมเมื่อเซสชันสิ้นสุด ต้องเปิด Wireless debugging ไว้</string> + <string name="setup_bg_limit_4">ไม่เกิน 4</string> + <string name="setup_bg_limit_1">ไม่เกิน 1</string> + <string name="setup_bg_limit_0">ไม่มี</string> + <string name="setup_adb_pair">Wireless debugging</string> + <string name="setup_adb_pair_hint">จับคู่ DroidDeck กับ Wireless debugging ของ Android สำหรับตัวเลือกด้านบน ขีดจำกัดโพรเซสลูกยังคงปิดอยู่</string> + <string name="setup_adb_pair_button">จับคู่</string> <string name="spatial_restored">กู้คืนมุมมองที่บันทึกไว้แล้ว %1$d รายการ คำนวณการสอบเทียบเพื่อลองอีกครั้ง หรือเริ่มชุดใหม่เพื่อบันทึกข้อมูลเพิ่มเติม</string> <string name="epic_client_missing">ยังไม่ติดตั้ง</string> <string name="epic_client_open">เปิด</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a8347b5c64..21fcaa6a5c 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1972,6 +1972,8 @@ <string name="stores_shelf_trending">Gündemde</string> <string name="stores_play">Oyna</string> <string name="stores_install">Yükle</string> + <string name="bnet_open">Battle.net\'i aç</string> + <string name="bnet_store">Blizzard oyunları</string> <string name="stores_resume_install">Yüklemeyi sürdür</string> <string name="stores_dl_interrupted">Kesintiye uğradı</string> <string name="stores_install_size">Yükle · %1$s</string> @@ -3006,6 +3008,25 @@ <string name="spatial_saved_views_hint">Kaydedilen görünümler yeniden hesaplanabilir. Geçerli izleme koordinat sistemini yakalamak için yeni bir kalibrasyon başlatın.</string> <string name="spatial_model_checksum_error">El modeli sağlama toplamı uyuşmazlığı</string> <string name="spatial_opencv_load_error">OpenCV yüklenemedi</string> + <string name="setup_group_memory">Bellek</string> + <string name="setup_clear_cached">Oturumdan önce önbellekteki uygulamaları kapat</string> + <string name="setup_clear_cached_hint">Bir oturum başladığında DroidDeck, Android\'in arka planda tuttuğu uygulamaları kapatır; böylece oyuna daha fazla bellek kalır. Kablosuz hata ayıklama açık olmalıdır.</string> + <string name="setup_clear_cached_unpaired">DroidDeck\'in Kablosuz hata ayıklama ile eşlenmesi gerekir (Eşle, aşağıda).</string> + <string name="setup_memory_hud">Bellek göstergesi</string> + <string name="setup_memory_hud_hint">Oturum ekranında kullanılan bellek ve swap. Gelişmiş, bunu oyun, DroidDeck, Android ve GPU olarak ayırır.</string> + <string name="setup_memory_hud_simple">Basit</string> + <string name="setup_memory_hud_advanced">Gelişmiş</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">oyun %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Oturum sırasında arka plan uygulamaları</string> + <string name="setup_bg_limit_hint">Oturum sürerken Android önbellekte en fazla bu kadar uygulama tutar ve gerisini kapatır; böylece onların belleği oyuna kalır. Oturum bittiğinde DroidDeck sınırı eski haline getirir. Kablosuz hata ayıklama açık olmalıdır.</string> + <string name="setup_bg_limit_4">En fazla 4</string> + <string name="setup_bg_limit_1">En fazla 1</string> + <string name="setup_bg_limit_0">Yok</string> + <string name="setup_adb_pair">Kablosuz hata ayıklama</string> + <string name="setup_adb_pair_hint">Yukarıdaki seçenekler için DroidDeck\'i Android\'in Kablosuz hata ayıklama özelliğiyle eşler. Alt süreç sınırı kapalı kalır.</string> + <string name="setup_adb_pair_button">Eşle</string> <string name="tracking_recovery_look">İyi aydınlatılmış bir odada yavaşça etrafa bakın.\nİzleme kameralarını temiz tutun ve mobilyalara veya diğer görünür ayrıntılara doğru bakın.</string> <string name="spatial_need_views">Sabit kalibrasyon hedefinin en az 24 farklı görünümünü yakalayın.</string> <string name="spatial_need_rotation">Akıllı gözlükleri sola ve sağa çevirin, yukarı ve aşağı eğin; dönme olmadan hareket, kamera hizalamasını kalibre edemez.</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index bc35a13b61..972d389301 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2020,6 +2020,8 @@ <string name="stores_shelf_trending">Популярне</string> <string name="stores_play">Грати</string> <string name="stores_install">Встановити</string> + <string name="bnet_open">Відкрити Battle.net</string> + <string name="bnet_store">Ігри Blizzard</string> <string name="stores_resume_install">Продовжити встановлення</string> <string name="stores_dl_interrupted">Перервано</string> <string name="stores_install_size">Встановити · %1$s</string> @@ -3074,6 +3076,25 @@ <string name="spatial_saved_views_hint">Збережені перегляди можна перерахувати. Розпочніть нове калібрування для запису в поточній системі координат відстеження.</string> <string name="spatial_model_checksum_error">Невідповідність контрольної суми моделі руки</string> <string name="spatial_opencv_load_error">Не вдалося завантажити OpenCV</string> + <string name="setup_group_memory">Пам\'ять</string> + <string name="setup_clear_cached">Закривати кешовані додатки перед сеансом</string> + <string name="setup_clear_cached_hint">Коли починається сеанс, DroidDeck закриває додатки, які Android тримає у фоні, щоб грі дісталося більше пам\'яті. Бездротове налагодження має бути ввімкнене.</string> + <string name="setup_clear_cached_unpaired">Потрібно поєднати DroidDeck через бездротове налагодження («Поєднати», нижче).</string> + <string name="setup_memory_hud">Показник пам\'яті</string> + <string name="setup_memory_hud_hint">Використана пам\'ять і swap на екрані сеансу. «Розширений» розподіляє її між грою, DroidDeck, Android і GPU.</string> + <string name="setup_memory_hud_simple">Простий</string> + <string name="setup_memory_hud_advanced">Розширений</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">гра %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Фонові додатки під час сеансу</string> + <string name="setup_bg_limit_hint">Під час сеансу Android тримає в кеші не більше ніж стільки додатків і закриває решту, щоб гра отримала їхню пам\'ять. Коли сеанс завершується, DroidDeck повертає попереднє обмеження. Бездротове налагодження має бути ввімкнене.</string> + <string name="setup_bg_limit_4">Не більше 4</string> + <string name="setup_bg_limit_1">Не більше 1</string> + <string name="setup_bg_limit_0">Жодного</string> + <string name="setup_adb_pair">Бездротове налагодження</string> + <string name="setup_adb_pair_hint">Поєднує DroidDeck з бездротовим налагодженням Android для параметрів вище. Обмеження дочірніх процесів залишається вимкненим.</string> + <string name="setup_adb_pair_button">Поєднати</string> <string name="spatial_gpu_hint">Типово використовується CPU. Режим GPU є експериментальним і може спричинити перезапуск SteamVR. Вибір скидається після перезапуску відстеження.</string> <string name="epic_client_missing">Не встановлено</string> <string name="epic_client_open">Відкрити</string> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index aa8132f50e..a7b2ee7483 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1957,6 +1957,8 @@ <string name="stores_shelf_trending">Xu hướng</string> <string name="stores_play">Chơi</string> <string name="stores_install">Cài</string> + <string name="bnet_open">Mở Battle.net</string> + <string name="bnet_store">Trò chơi Blizzard</string> <string name="stores_resume_install">Tiếp tục cài</string> <string name="stores_dl_interrupted">Bị gián đoạn</string> <string name="stores_install_size">Cài · %1$s</string> @@ -2981,6 +2983,25 @@ <string name="spatial_saved_views_hint">Các lượt xem đã lưu có thể được tính toán lại. Bắt đầu hiệu chuẩn mới để chụp trong hệ tọa độ theo dõi hiện tại.</string> <string name="spatial_model_checksum_error">Tổng kiểm tra mô hình bàn tay không khớp</string> <string name="spatial_opencv_load_error">OpenCV không thể tải</string> + <string name="setup_group_memory">Bộ nhớ</string> + <string name="setup_clear_cached">Đóng ứng dụng đã lưu đệm trước phiên</string> + <string name="setup_clear_cached_hint">Khi phiên bắt đầu, DroidDeck đóng các ứng dụng mà Android giữ ở nền để game có thêm bộ nhớ. Phải bật Gỡ lỗi qua mạng không dây.</string> + <string name="setup_clear_cached_unpaired">Cần ghép nối DroidDeck với Gỡ lỗi qua mạng không dây (Ghép nối, bên dưới).</string> + <string name="setup_memory_hud">Chỉ báo bộ nhớ</string> + <string name="setup_memory_hud_hint">Bộ nhớ và swap đang dùng, trên màn hình phiên. Nâng cao chia theo game, DroidDeck, Android và GPU.</string> + <string name="setup_memory_hud_simple">Đơn giản</string> + <string name="setup_memory_hud_advanced">Nâng cao</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">game %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Ứng dụng nền trong phiên</string> + <string name="setup_bg_limit_hint">Trong khi phiên chạy, Android chỉ giữ tối đa chừng này ứng dụng trong bộ nhớ đệm và đóng phần còn lại để game có bộ nhớ của chúng. DroidDeck đặt lại giới hạn như cũ khi phiên kết thúc. Phải bật Gỡ lỗi qua mạng không dây.</string> + <string name="setup_bg_limit_4">Tối đa 4</string> + <string name="setup_bg_limit_1">Tối đa 1</string> + <string name="setup_bg_limit_0">Không có</string> + <string name="setup_adb_pair">Gỡ lỗi qua mạng không dây</string> + <string name="setup_adb_pair_hint">Ghép nối DroidDeck với Gỡ lỗi qua mạng không dây của Android cho các tùy chọn ở trên. Giới hạn tiến trình con vẫn tắt.</string> + <string name="setup_adb_pair_button">Ghép nối</string> <string name="tracking_recovery_look">Nhìn xung quanh chậm rãi trong phòng có đủ ánh sáng.\nGiữ cho camera theo dõi rõ ràng và hướng về phía đồ nội thất hoặc các chi tiết có thể nhìn thấy khác.</string> <string name="epic_client_missing">Chưa cài</string> <string name="epic_client_open">Mở</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0d4cdd5b58..b740148990 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2037,6 +2037,8 @@ <string name="stores_shelf_trending">趋势</string> <string name="stores_play">游玩</string> <string name="stores_install">安装</string> + <string name="bnet_open">打开 Battle.net</string> + <string name="bnet_store">暴雪游戏</string> <string name="stores_resume_install">继续安装</string> <string name="stores_dl_interrupted">已中断</string> <string name="stores_install_size">安装 · %1$s</string> @@ -2986,6 +2988,25 @@ <string name="glasses_6dof">6DoF 虚拟屏幕</string> <string name="tracking_recovery_look">在光线充足的房间内缓慢环顾四周。\n不要遮挡追踪摄像头,并面向家具等有明显细节的物体。</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> + <string name="setup_group_memory">内存</string> + <string name="setup_clear_cached">会话前关闭缓存的应用</string> + <string name="setup_clear_cached_hint">会话开始时关闭 Android 留在后台的应用,让游戏有更多内存可用。需要开启无线调试。</string> + <string name="setup_clear_cached_unpaired">需要先将 DroidDeck 与无线调试配对(见下方“配对”)。</string> + <string name="setup_memory_hud">内存读数</string> + <string name="setup_memory_hud_hint">在会话画面上显示已用内存和交换空间。高级模式会分别显示游戏、DroidDeck、Android 和 GPU。</string> + <string name="setup_memory_hud_simple">简单</string> + <string name="setup_memory_hud_advanced">高级</string> + <string name="memory_hud_simple">内存 %1$s/%2$s GB · 交换 %3$s/%4$s GB</string> + <string name="memory_hud_split">游戏 %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">会话期间的后台应用</string> + <string name="setup_bg_limit_hint">会话运行期间,Android 最多缓存这么多个应用并关闭其余应用,让游戏使用它们的内存。会话结束后恢复原状。需要开启无线调试。</string> + <string name="setup_bg_limit_4">最多 4 个</string> + <string name="setup_bg_limit_1">最多 1 个</string> + <string name="setup_bg_limit_0">无</string> + <string name="setup_adb_pair">无线调试</string> + <string name="setup_adb_pair_hint">为上面的选项将 DroidDeck 与 Android 无线调试配对。子进程限制保持关闭。</string> + <string name="setup_adb_pair_button">配对</string> <string name="epic_client_missing">未安装</string> <string name="epic_client_open">打开</string> <string name="epic_client_install">安装</string> diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 50a1a5011d..310ac68d8b 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1960,6 +1960,8 @@ <string name="stores_shelf_trending">趨勢</string> <string name="stores_play">開啟遊戲</string> <string name="stores_install">安裝</string> + <string name="bnet_open">開啟 Battle.net</string> + <string name="bnet_store">Blizzard 遊戲</string> <string name="stores_resume_install">繼續安裝</string> <string name="stores_dl_interrupted">已中斷</string> <string name="stores_install_size">安裝 · %1$s</string> @@ -2985,6 +2987,25 @@ <string name="glasses_6dof">6DoF 虛擬螢幕</string> <string name="tracking_recovery_look">在光線充足的房間內緩慢環顧四周。\n不要遮擋追蹤攝影機,並面向家具等有明顯細節的物體。</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> + <string name="setup_group_memory">記憶體</string> + <string name="setup_clear_cached">工作階段前關閉快取的應用程式</string> + <string name="setup_clear_cached_hint">工作階段開始時關閉 Android 留在背景的應用程式,讓遊戲有更多記憶體可用。需要開啟無線偵錯。</string> + <string name="setup_clear_cached_unpaired">需要先將 DroidDeck 與無線偵錯配對(見下方「配對」)。</string> + <string name="setup_memory_hud">記憶體讀數</string> + <string name="setup_memory_hud_hint">在工作階段畫面上顯示已用記憶體和交換空間。進階模式會分別顯示遊戲、DroidDeck、Android 和 GPU。</string> + <string name="setup_memory_hud_simple">簡單</string> + <string name="setup_memory_hud_advanced">進階</string> + <string name="memory_hud_simple">記憶體 %1$s/%2$s GB · 交換 %3$s/%4$s GB</string> + <string name="memory_hud_split">遊戲 %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">工作階段期間的背景應用程式</string> + <string name="setup_bg_limit_hint">工作階段執行期間,Android 最多快取這麼多個應用程式並關閉其餘的,讓遊戲使用它們的記憶體。工作階段結束後還原。需要開啟無線偵錯。</string> + <string name="setup_bg_limit_4">最多 4 個</string> + <string name="setup_bg_limit_1">最多 1 個</string> + <string name="setup_bg_limit_0">無</string> + <string name="setup_adb_pair">無線偵錯</string> + <string name="setup_adb_pair_hint">為上面的選項將 DroidDeck 與 Android 無線偵錯配對。子進程限制保持關閉。</string> + <string name="setup_adb_pair_button">配對</string> <string name="epic_client_missing">未安裝</string> <string name="epic_client_open">開啟</string> <string name="epic_client_install">安裝</string> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d3f66e5024..841644eb10 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1960,6 +1960,8 @@ <string name="stores_shelf_trending">趨勢</string> <string name="stores_play">執行</string> <string name="stores_install">安裝</string> + <string name="bnet_open">開啟 Battle.net</string> + <string name="bnet_store">Blizzard 遊戲</string> <string name="stores_resume_install">繼續安裝</string> <string name="stores_dl_interrupted">已中斷</string> <string name="stores_install_size">安裝 · %1$s</string> @@ -2985,6 +2987,25 @@ <string name="glasses_6dof">6DoF 虛擬螢幕</string> <string name="tracking_recovery_look">在光線充足的房間內緩慢環顧四周。\n不要遮擋追蹤攝影機,並面向家具等有明顯細節的物體。</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> + <string name="setup_group_memory">記憶體</string> + <string name="setup_clear_cached">工作階段前關閉快取的應用程式</string> + <string name="setup_clear_cached_hint">工作階段開始時關閉 Android 留在背景的應用程式,讓遊戲有更多記憶體可用。需要開啟無線偵錯。</string> + <string name="setup_clear_cached_unpaired">需要先將 DroidDeck 與無線偵錯配對(見下方「配對」)。</string> + <string name="setup_memory_hud">記憶體讀數</string> + <string name="setup_memory_hud_hint">在工作階段畫面上顯示已用記憶體和交換空間。進階模式會分別顯示遊戲、DroidDeck、Android 和 GPU。</string> + <string name="setup_memory_hud_simple">簡單</string> + <string name="setup_memory_hud_advanced">進階</string> + <string name="memory_hud_simple">記憶體 %1$s/%2$s GB · 交換 %3$s/%4$s GB</string> + <string name="memory_hud_split">遊戲 %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">工作階段期間的背景應用程式</string> + <string name="setup_bg_limit_hint">工作階段執行期間,Android 最多快取這麼多個應用程式並關閉其餘的,讓遊戲使用它們的記憶體。工作階段結束後還原。需要開啟無線偵錯。</string> + <string name="setup_bg_limit_4">最多 4 個</string> + <string name="setup_bg_limit_1">最多 1 個</string> + <string name="setup_bg_limit_0">無</string> + <string name="setup_adb_pair">無線偵錯</string> + <string name="setup_adb_pair_hint">為上面的選項將 DroidDeck 與 Android 無線偵錯配對。子處理程序限制保持關閉。</string> + <string name="setup_adb_pair_button">配對</string> <string name="epic_client_missing">未安裝</string> <string name="epic_client_open">開啟</string> <string name="epic_client_install">安裝</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 01e94757df..018f681a4d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -143,6 +143,7 @@ <string name="user_apps_remove">Remove</string> <string name="user_apps_remove_confirm">Press again to remove</string> <string name="user_apps_stop_session">Stop the session to remove</string> + <string name="bnet_name" translatable="false">Battle.net</string> <string name="user_apps_script_linked">Runs %1$s from its folder, linked into the session where it lies. Removing the app leaves that folder alone.</string> <string name="user_apps_script_copied">Runs %1$s from a copy of its folder inside DroidDeck. Removing the app deletes the copy, not the original.</string> <string name="user_apps_runtime_required">Install the Linux runtime first</string> @@ -2065,6 +2066,8 @@ <string name="stores_shelf_trending">Trending</string> <string name="stores_play">Play</string> <string name="stores_install">Install</string> + <string name="bnet_open">Open Battle.net</string> + <string name="bnet_store">Blizzard games</string> <string name="stores_resume_install">Resume install</string> <string name="stores_dl_interrupted">Interrupted</string> <string name="stores_install_size">Install · %1$s</string> @@ -3103,6 +3106,25 @@ <string name="spatial_saved_views_hint">Saved views can be recalculated. Start a new calibration to capture in the current tracking frame.</string> <string name="spatial_model_checksum_error">Hand model checksum mismatch</string> <string name="spatial_opencv_load_error">OpenCV could not load</string> + <string name="setup_group_memory">Memory</string> + <string name="setup_clear_cached">Clear cached apps before a session</string> + <string name="setup_clear_cached_hint">When a session starts, DroidDeck closes the apps Android keeps parked in the background, so the game has more memory. Wireless debugging must be on.</string> + <string name="setup_clear_cached_unpaired">Needs DroidDeck paired with Wireless debugging (Pair, below).</string> + <string name="setup_memory_hud">Memory readout</string> + <string name="setup_memory_hud_hint">Memory and swap in use, on the session screen. Advanced splits it into the game, DroidDeck, Android and the GPU.</string> + <string name="setup_memory_hud_simple">Simple</string> + <string name="setup_memory_hud_advanced">Advanced</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">game %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Background apps during a session</string> + <string name="setup_bg_limit_hint">While a session runs, Android keeps at most this many apps cached and closes the rest, so the game has their memory. DroidDeck puts the limit back as it was when the session ends. Wireless debugging must be on.</string> + <string name="setup_bg_limit_4">At most 4</string> + <string name="setup_bg_limit_1">At most 1</string> + <string name="setup_bg_limit_0">None</string> + <string name="setup_adb_pair">Wireless debugging</string> + <string name="setup_adb_pair_hint">Pairs DroidDeck with Android\'s Wireless debugging for the options above. The child-process limit stays off.</string> + <string name="setup_adb_pair_button">Pair</string> <string name="stores_xbox_update">Update / verify</string> <string name="stores_xbox_manage">Manage content</string> <string name="stores_xbox_close_first">Close this Xbox game before updating it.</string> diff --git a/app/src/test/java/com/droiddeck/launcher/core/BackgroundAppLimitTest.kt b/app/src/test/java/com/droiddeck/launcher/core/BackgroundAppLimitTest.kt new file mode 100644 index 0000000000..1f9d3391e4 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/BackgroundAppLimitTest.kt @@ -0,0 +1,40 @@ +package com.droiddeck.launcher.core + +import com.droiddeck.launcher.session.SessionPrefs +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertThrows +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class BackgroundAppLimitTest { + @Test fun theLimitIsActivityManagersCachedProcessCap() { + assertEquals("device_config get activity_manager max_cached_processes", BackgroundAppLimit.readCommand()) + assertEquals("device_config put activity_manager max_cached_processes 4", BackgroundAppLimit.setCommand(4)) + assertEquals("device_config put activity_manager max_cached_processes 0", BackgroundAppLimit.setCommand(0)) + assertThrows(IllegalArgumentException::class.java) { BackgroundAppLimit.setCommand(-1) } + } + + @Test fun whatWasThereIsWhatGoesBack() { + assertNull(BackgroundAppLimit.parse("null\n")) + assertNull(BackgroundAppLimit.parse("")) + assertEquals("16", BackgroundAppLimit.parse("16\n")) + assertEquals("device_config delete activity_manager max_cached_processes", BackgroundAppLimit.restoreCommand(null)) + assertEquals("device_config put activity_manager max_cached_processes 16", BackgroundAppLimit.restoreCommand("16")) + } + + @Test fun setupOffersOffAndDeveloperOptionsOwnLimits() { + val context = RuntimeEnvironment.getApplication() + assertEquals(BackgroundAppLimit.OFF, SessionPrefs.backgroundAppLimit(context)) + for (limit in listOf(4, 1, 0, BackgroundAppLimit.OFF)) { + SessionPrefs.setBackgroundAppLimit(context, limit) + assertEquals(limit, SessionPrefs.backgroundAppLimit(context)) + } + assertThrows(IllegalArgumentException::class.java) { SessionPrefs.setBackgroundAppLimit(context, 7) } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt new file mode 100644 index 0000000000..d23a2eac23 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -0,0 +1,378 @@ +package com.droiddeck.launcher.runtime + +import android.content.Context +import com.droiddeck.launcher.session.ComponentsManager +import com.droiddeck.launcher.session.GameEnvironmentStore +import com.github.luben.zstd.ZstdOutputStream +import org.apache.commons.compress.archivers.tar.TarArchiveEntry +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertThrows +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.io.File +import java.nio.file.Files +import java.util.zip.CRC32 + +private val REGISTRY = """ +WINE REGISTRY Version 2 +;; All keys relative to \\Machine + +[Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Battle.net] 1760380000 +#time=1dc3c6e0a5e1f2a +"DisplayName"="Battle.net" +"InstallLocation"="C:\\Program Files (x86)\\Battle.net" +"UninstallString"="\"C:\\Program Files (x86)\\Battle.net\\Battle.net Uninstaller.exe\" --lang=enUS" + +[Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Diablo IV] 1760380001 +"DisplayIcon"="C:\\Program Files (x86)\\Diablo IV\\Diablo IV Launcher.exe" +"DisplayName"="Diablo\xae IV" +"InstallLocation"="C:\\Program Files (x86)\\Diablo IV" +"Publisher"="Blizzard Entertainment" +"UninstallString"="\"C:\\ProgramData\\Battle.net\\Agent\\Blizzard Uninstaller.exe\" --lang=enUS --uid=fenris --displayname=\"Diablo IV\"" + +[Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Overwatch] 1760380002 +"InstallLocation"="C:\\Program Files (x86)\\Overwatch" +"UninstallString"="\"C:\\ProgramData\\Battle.net\\Agent\\Blizzard Uninstaller.exe\" --lang=enUS --uid=prometheus --displayname=\"Overwatch\"" + +[Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam] 1760380003 +"InstallLocation"="C:\\Program Files (x86)\\Steam" +"UninstallString"="C:\\Program Files (x86)\\Steam\\uninstall.exe --uid=steam" + +[Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Diablo II Resurrected] 1760380004 +"UninstallString"=str(2):"\"C:\\ProgramData\\Battle.net\\Agent\\Blizzard Uninstaller.exe\" --lang=enUS --uid=osi --displayname=\"Diablo II: Resurrected\"" +"InstallLocation"="C:/Games/Diablo II Resurrected" + +[Software\\Wine\\Fonts] 1760380005 +"InstallLocation"="C:\\x" +"UninstallString"="Battle.net --uid=wow" +""".trimStart() + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class BattleNetTest { + private lateinit var context: Context + + @Before fun setUp() { + context = RuntimeEnvironment.getApplication() + File(context.filesDir, "components").deleteRecursively() + LinuxRuntime.rootDir(context).deleteRecursively() + } + + @Test fun theIdIsTheShortcutIdTheScriptNames() { + val crc = CRC32().apply { update("\"droiddeck-battlenet\"Battle.net".toByteArray()) }.value + assertEquals(crc or 0x80000000L, BattleNet.APP_ID) + } + + @Test fun theNewestD2rfixIsTheHighestFexThenTheHighestFix() { + val items = listOf( + item("FEXCore-2610-linux.wcp"), + item("FEXCore-2609-d2rfix25-linux.wcp"), + item("FEXCore-2610-d2rfix9-linux.wcp"), + item("FEXCore-2610-d2rfix28-linux.wcp"), + item("FEXCore-2509.1-d2rfix40-linux.wcp"), + ) + assertEquals("FEXCore-2610-d2rfix28-linux.wcp", BattleNet.newestD2rFix(items)?.file) + assertEquals("FEXCore-2610.1-d2rfix1-linux.wcp", BattleNet.newestD2rFix(items + item("FEXCore-2610.1-d2rfix1-linux.wcp"))?.file) + assertEquals("FexCore-2611-D2RFIX2-linux.wcp", BattleNet.newestD2rFix(items + item("FexCore-2611-D2RFIX2-linux.wcp"))?.file) + } + + @Test fun onlyFexD2rfixPackagesCount() { + assertNull(BattleNet.newestD2rFix(listOf(item("FEXCore-2610-linux.wcp"), item("FEXCore-2610-d2rfix28-linux.wcp", comp = "dxvk")))) + assertNull(BattleNet.d2rfix("FEXCore-2610-d2rfix28-linux.wcp.part")) + assertNull(BattleNet.d2rfix("FEXCore-2610-d2rfix-linux.wcp")) + assertEquals(listOf(2610L) to 28L, BattleNet.d2rfix("FEXCore-2610-d2rfix28-linux.wcp")) + } + + @Test fun theNewestStoredBuildIsSetForThePrefix() { + catalog("FEXCore-2609-d2rfix25-linux.wcp", "FEXCore-2610-d2rfix28-linux.wcp", "FEXCore-2610-linux.wcp") + store("FEXCore-2610-d2rfix28-linux.wcp") + + assertEquals("FEXCore-2610-d2rfix28-linux.wcp", BattleNet.ensureFex(context, ::noRefresh)) + + assertEquals(mapOf("fex" to "FEXCore-2610-d2rfix28-linux.wcp"), ComponentsManager.gameComponents(context, BattleNet.APP_ID.toString())) + assertEquals("FEXCore-2610-d2rfix28-linux.wcp", BattleNet.ensureFex(context, ::noRefresh)) + } + + @Test fun aNewerBuildReplacesTheOldOne() { + catalog("FEXCore-2609-d2rfix25-linux.wcp") + store("FEXCore-2609-d2rfix25-linux.wcp") + BattleNet.ensureFex(context, ::noRefresh) + catalog("FEXCore-2609-d2rfix25-linux.wcp", "FEXCore-2610-d2rfix28-linux.wcp") + store("FEXCore-2610-d2rfix28-linux.wcp") + + BattleNet.ensureFex(context, ::noRefresh) + + assertEquals("FEXCore-2610-d2rfix28-linux.wcp", ComponentsManager.gameComponents(context, BattleNet.APP_ID.toString())["fex"]) + } + + @Test fun aStaleListingIsFetchedAgain() { + catalog("FEXCore-2609-d2rfix25-linux.wcp", fetchedAt = 1) + store("FEXCore-2610-d2rfix28-linux.wcp") + + BattleNet.ensureFex(context) { listOf(item("FEXCore-2609-d2rfix25-linux.wcp"), item("FEXCore-2610-d2rfix28-linux.wcp")) } + + assertEquals("FEXCore-2610-d2rfix28-linux.wcp", ComponentsManager.gameComponents(context, BattleNet.APP_ID.toString())["fex"]) + } + + @Test fun aFailedFetchFallsBackOnTheCachedListing() { + catalog("FEXCore-2609-d2rfix25-linux.wcp", fetchedAt = 1) + store("FEXCore-2609-d2rfix25-linux.wcp") + + assertEquals("FEXCore-2609-d2rfix25-linux.wcp", BattleNet.ensureFex(context) { error("offline") }) + } + + @Test fun aListingWithoutD2rfixIsAnError() { + catalog("FEXCore-2610-linux.wcp") + var refreshed = 0 + assertThrows(IllegalStateException::class.java) { BattleNet.ensureFex(context) { refreshed++; emptyList() } } + assertEquals(1, refreshed) + assertEquals(emptyMap<String, String>(), ComponentsManager.gameComponents(context, BattleNet.APP_ID.toString())) + } + + @Test fun installedIsTheLauncherInThePrefix() { + assertFalse(BattleNet.installed(context)) + launcher().apply { parentFile!!.mkdirs(); writeText("MZ") } + assertTrue(BattleNet.installed(context)) + } + + @Test fun theEnvironmentEditorNamesBattleNetsProfileOnceItIsInstalled() { + assertNull(BattleNet.profile(context)) + launcher().apply { parentFile!!.mkdirs(); writeText("MZ") } + assertEquals(BattleNet.APP_ID.toString() to "Battle.net", BattleNet.profile(context)) + } + + @Test fun removeTakesThePrefixItsMenuEntryAndCacheButNothingItLinksTo() { + catalog("FEXCore-2610-d2rfix28-linux.wcp") + store("FEXCore-2610-d2rfix28-linux.wcp") + BattleNet.ensureFex(context, ::noRefresh) + val root = LinuxRuntime.rootDir(context) + fun put(relative: String) = File(root, relative).apply { parentFile!!.mkdirs(); writeText("x") } + launcher().apply { parentFile!!.mkdirs(); writeText("MZ") } + val outside = File(context.cacheDir, "bnet-outside").apply { mkdirs() } + val kept = File(outside, "kept").apply { writeText("x") } + val drives = File(BattleNet.prefix(context), "pfx/dosdevices").apply { mkdirs() } + Files.createSymbolicLink(File(drives, "z:").toPath(), outside.toPath()) + val menu = put("usr/local/share/applications/droiddeck-battlenet.desktop") + val otherMenu = put("usr/local/share/applications/other.desktop") + val log = put("root/.cache/droiddeck/battlenet/battlenet.log") + val otherPrefix = put("root/.local/share/Steam/steamapps/compatdata/123/pfx/system.reg") + + BattleNet.remove(context) + + assertFalse(BattleNet.prefix(context).exists()) + assertFalse(BattleNet.installed(context)) + assertTrue(kept.isFile) + assertFalse(menu.exists()) + assertTrue(otherMenu.isFile) + assertFalse(log.parentFile!!.exists()) + assertTrue(otherPrefix.isFile) + assertNull(BattleNet.fexInUse(context)) + outside.deleteRecursively() + } + + @Test fun anIdNamesItsTitleWithOrWithoutItsLocale() { + assertEquals("Pro", BattleNet.title("prometheus")?.code) + assertEquals("D3", BattleNet.title("diablo3_enus")?.code) + assertEquals("Fen", BattleNet.title("Fenris")?.code) + assertEquals("WTCG", BattleNet.title("hs_beta")?.code) + assertEquals("Diablo II: Resurrected", BattleNet.title("osi_dede")?.name) + assertEquals("WoWC", BattleNet.title("wow_classic")?.code) + assertEquals("WoWC", BattleNet.title("wow_classic_era_enus")?.code) + assertNull(BattleNet.title("agent")) + assertNull(BattleNet.title("osi_beta")) + } + + @Test fun theUninstallEntriesOfBattleNetsGamesAreRead() { + val entries = BattleNet.uninstallEntries(REGISTRY.lineSequence()) + assertEquals(listOf( + "fenris" to "C:\\Program Files (x86)\\Diablo IV", + "prometheus" to "C:\\Program Files (x86)\\Overwatch", + "osi" to "C:/Games/Diablo II Resurrected", + ), entries) + } + + @Test fun productDbsInstallsAreRead() { + val db = message( + field(1, message(field(1, "agent"), field(2, "agent"), field(3, message(field(1, "C:/ProgramData/Battle.net/Agent"))))), + varintField(7, 300), + field(1, message(field(1, "hs_beta"), field(2, "wtcg"), varintField(9, 1), field(3, message(field(1, "C:/Program Files (x86)/Hearthstone"), field(2, "US"))))), + field(1, message(field(1, "s2"))), + field(1, message(field(1, "s1"), field(3, message(field(1, "Z:/mnt/droiddeck-sd/Games/Battle.net/StarCraft"))), field(4, message(field(1, message(varintField(1, 0), varintField(2, 0))))))), + field(1, message(field(1, "wow_classic_anniversary"), field(3, message(field(1, "Z:/root/Games/World of Warcraft"))), field(4, message(field(1, message(varintField(1, 1), varintField(2, 1))))))), + ) + assertEquals(listOf("agent" to "C:/ProgramData/Battle.net/Agent", "hs_beta" to "C:/Program Files (x86)/Hearthstone", "wow_classic_anniversary" to "Z:/root/Games/World of Warcraft"), + BattleNet.productDbEntries(db)) + assertEquals(emptyList<Pair<String, String>>(), BattleNet.productDbEntries(db.copyOf(db.size - 3))) + assertEquals(emptyList<Pair<String, String>>(), BattleNet.productDbEntries(byteArrayOf(0x0a, 0x7f, 0x01))) + } + + @Test fun theGamesAreTheTitlesInstalledInTheirFolders() { + val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } + File(pfx, "system.reg").writeText(REGISTRY) + File(pfx, "drive_c/ProgramData/Battle.net/Agent").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").writeBytes(message( + field(1, message(field(1, "hs_beta"), field(3, message(field(1, "C:/Program Files (x86)/Hearthstone"))))), + field(1, message(field(1, "fenris"), field(3, message(field(1, "C:/Program Files (x86)/Diablo IV"))))), + field(1, message(field(1, "wow_classic"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))), + )) + for (folder in listOf("Program Files (x86)/Diablo IV", "Games/Diablo II Resurrected", "Program Files (x86)/Hearthstone", "Program Files (x86)/World of Warcraft")) { + File(pfx, "drive_c/$folder").mkdirs() + } + val games = BattleNet.games(context) + assertEquals(listOf("Fen", "OSI", "WTCG", "WoWC"), games.map { it.code }) + assertEquals(listOf("Diablo IV", "Diablo II: Resurrected", "Hearthstone", "World of Warcraft Classic"), games.map { it.name }) + assertEquals(File(pfx, "drive_c/Games/Diablo II Resurrected"), games[1].folder) + assertNull(BattleNet.hostFolder(context, "D:\\Games\\X")) + assertNull(BattleNet.hostFolder(context, "C:\\..\\..\\etc")) + assertNull(BattleNet.hostFolder(context, "Z:\\root\\..\\..\\etc")) + assertEquals(File(LinuxRuntime.rootDir(context), "root/Games/Stores/Battle.net/Hearthstone"), + BattleNet.hostFolder(context, "Z:/root/Games/Stores/Battle.net/Hearthstone/")) + } + + @Test fun aGamesShortcutHasBattleNetLaunchItInItsPrefix() { + val folder = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Diablo IV").apply { mkdirs() } + File(folder, "Diablo IV Launcher.exe").writeBytes(byteArrayOf(0x4d, 0x5a)) + val shortcut = BattleNet.shortcut(context, BattleNet.Game("fenris", "Diablo IV", "Fen", folder))!! + val exe = "/root/.local/share/Steam/steamapps/compatdata/2596113170/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe" + assertEquals(exe, shortcut.guestExe) + assertEquals(exe.substringBeforeLast('/'), shortcut.guestDir) + assertEquals("STEAM_COMPAT_DATA_PATH=/root/.local/share/Steam/steamapps/compatdata/2596113170 %command% --exec=\"launch Fen\"", shortcut.launchOptions) + val crc = CRC32().apply { update("\"$exe\"Diablo IV".toByteArray()) }.value + assertEquals(crc or 0x80000000L, shortcut.appId) + assertEquals((shortcut.appId shl 32) or 0x02000000L, shortcut.gameId) + assertEquals(com.droiddeck.launcher.stores.Store.BATTLENET.id, shortcut.source) + assertEquals("Diablo IV Launcher.exe", shortcut.exe.name) + val listing = com.droiddeck.launcher.frontend.AddedGames.writeListing(context, listOf(shortcut)).readText() + val entry = JSONArray(listing).getJSONObject(0) + assertEquals(com.droiddeck.launcher.stores.Store.BATTLENET.id, entry.getString("store")) + assertEquals(shortcut.launchOptions, entry.getString("launch")) + assertEquals(exe, entry.getString("exe")) + } + + @Test fun titlesSharingALaunchCodeShareTheirArt() { + val cover = File(context.filesDir, "battlenet-art/fenris/p.jpg").apply { parentFile!!.mkdirs(); writeBytes(byteArrayOf(1)) } + assertEquals(cover, BattleNet.art(context, BattleNet.title("fen")!!).cover) + val wide = File(context.filesDir, "battlenet-art/wow_classic/blizzard.jpg").apply { parentFile!!.mkdirs(); writeBytes(byteArrayOf(1)) } + assertEquals(wide, BattleNet.art(context, BattleNet.title("wow_classic_anniversary")!!).header) + } + + @Test fun theStoreOffersEachTitleOnceAndHidesWhatIsInstalled() { + val codes = BattleNet.STORE.map { it.code } + assertEquals(codes.distinct(), codes) + assertTrue("Fen" in codes && "OSI" in codes && "WTCG" in codes) + assertFalse(BattleNet.STORE.any { it.uid == "d3cn" || it.uid == "fen" }) + assertEquals("fenris", BattleNet.STORE.first { it.code == "Fen" }.uid) + assertTrue(BattleNet.STORE.all { it.uid.matches(Regex("[a-z0-9_]{1,32}")) }) + val installed = listOf("fenris", "diablo3_enus", null) + val offered = BattleNet.STORE.filter { BattleNet.notInstalled(it, installed) }.map { it.code } + assertFalse("Fen" in offered || "D3" in offered) + assertTrue("OSI" in offered) + } + + @Test fun aBattleNetGameStartsWithoutSteamThroughItsShortcutUntilThatIsSwitchedOff() { + File(context.filesDir, "game-environment.json").delete() + val folder = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Diablo IV").apply { mkdirs() } + File(folder, "Diablo IV Launcher.exe").writeBytes(byteArrayOf(0x4d, 0x5a)) + val shortcut = BattleNet.shortcut(context, BattleNet.Game("fenris", "Diablo IV", "Fen", folder))!! + val game = com.droiddeck.launcher.frontend.Library.SteamGame( + shortcut.appId.toInt(), shortcut.name, null, com.droiddeck.launcher.frontend.Library.ADDED, shortcut.gameId, + source = com.droiddeck.launcher.stores.Store.BATTLENET.id, storeId = shortcut.storeId) + val noSteam = com.droiddeck.launcher.session.NoSteamLaunch + assertEquals(BattleNet.APP_ID.toString(), noSteam.scope(game)) + assertFalse(noSteam.enabled(context, game)) + assertTrue(BattleNet.ensureNoSteam(context)) + assertTrue(noSteam.enabled(context, game)) + val command = noSteam.command(game, shortcut)!! + assertEquals(noSteam.BATTLENET, command.program) + assertEquals(listOf("launch", "Fen"), command.args) + GameEnvironmentStore.setGameNoSteam(context, BattleNet.APP_ID.toString(), false) + assertFalse(BattleNet.ensureNoSteam(context)) + assertFalse(noSteam.enabled(context, game)) + } + + @Test fun theGamesAreToldOfAFifthOfThePhonesMemory() { + assertEquals(2048, BattleNet.videoMemory(11113)) + assertEquals(1536, BattleNet.videoMemory(7468)) + assertEquals(2560, BattleNet.videoMemory(15200)) + assertEquals(3584, BattleNet.videoMemory(60000)) + assertTrue(BattleNet.videoMemory(Long.MAX_VALUE / 2) < 4096) + assertEquals( + "dxgi.maxDeviceMemory = 2048; dxgi.maxSharedMemory = 2048; d3d9.maxAvailableMemory = 2048", + BattleNet.videoMemoryOptions(2048), + ) + } + + @Test fun theCapIsTheBattleNetProfilesOwnDxvkConfigUnlessItHasOne() { + File(context.filesDir, "game-environment.json").delete() + val manager = context.getSystemService(android.app.ActivityManager::class.java) + org.robolectric.Shadows.shadowOf(manager).setMemoryInfo(android.app.ActivityManager.MemoryInfo().apply { totalMem = 11113L shl 20 }) + val scope = BattleNet.APP_ID.toString() + assertTrue(BattleNet.ensureVideoMemory(context)) + assertEquals(BattleNet.videoMemoryOptions(2048), GameEnvironmentStore.read(context).games[scope]?.get("DXVK_CONFIG")) + val published = File(LinuxRuntime.rootDir(context), "root/.config/droiddeck/game-environment.json").readText() + assertTrue("dxgi.maxDeviceMemory = 2048" in JSONObject(published).getJSONObject("games").getJSONObject(scope).getString("DXVK_CONFIG")) + assertFalse(BattleNet.ensureVideoMemory(context)) + for (own in listOf("dxvk.maxFrameRate = 30", null)) { + GameEnvironmentStore.save(context, GameEnvironmentStore.read(context).let { it.withEntries(scope, it.entries(scope) + ("DXVK_CONFIG" to own)) }) + assertFalse(BattleNet.ensureVideoMemory(context)) + assertEquals(own, GameEnvironmentStore.read(context).games[scope]?.get("DXVK_CONFIG")) + } + GameEnvironmentStore.save(context, GameEnvironmentStore.read(context).let { it.withEntries(scope, it.entries(scope) - "DXVK_CONFIG") }) + assertTrue(BattleNet.ensureVideoMemory(context)) + } + + private fun launcher() = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Battle.net/Battle.net Launcher.exe") + + private fun varint(value: Long): ByteArray { + val out = java.io.ByteArrayOutputStream() + var v = value + while (v >= 0x80) { out.write(((v and 0x7f) or 0x80).toInt()); v = v ushr 7 } + out.write(v.toInt()) + return out.toByteArray() + } + + private fun field(number: Int, bytes: ByteArray) = varint((number shl 3 or 2).toLong()) + varint(bytes.size.toLong()) + bytes + private fun field(number: Int, text: String) = field(number, text.toByteArray()) + private fun varintField(number: Int, value: Long) = varint((number shl 3).toLong()) + varint(value) + private fun message(vararg fields: ByteArray) = fields.fold(ByteArray(0)) { all, f -> all + f } + + private fun noRefresh(context: Context): List<ComponentsManager.CatalogItem> = error("the cached listing was fresh") + + private fun item(file: String, comp: String = "fex") = ComponentsManager.CatalogItem( + file, comp, "FexCore-Linux", "https://github.com/The412Banner/Nightlies/releases/download/FexCore-Linux/$file", 4, "sha256:" + "ab".repeat(32), + ) + + private fun catalog(vararg files: String, fetchedAt: Long = System.currentTimeMillis() / 1000) { + val cache = File(context.filesDir, "components/catalog.json") + cache.parentFile!!.mkdirs() + val items = JSONArray() + for (file in files) items.put(JSONObject().put("file", file).put("comp", "fex").put("release", "FexCore-Linux") + .put("url", item(file).url).put("size", 4).put("digest", item(file).digest)) + cache.writeText(JSONObject().put("items", items).put("fetchedAt", fetchedAt).toString()) + } + + private fun store(file: String) { + val wcp = File(context.filesDir, "components/packages/$file") + wcp.parentFile!!.mkdirs() + TarArchiveOutputStream(ZstdOutputStream(wcp.outputStream())).use { tar -> + fun put(name: String, bytes: ByteArray) { + tar.putArchiveEntry(TarArchiveEntry(name).apply { size = bytes.size.toLong() }) + tar.write(bytes) + tar.closeArchiveEntry() + } + put("profile.json", JSONObject().put("type", "FEXCore-Linux").put("versionName", file.removeSuffix(".wcp")).toString().toByteArray()) + put("files/lib/wine/aarch64-windows/libarm64ecfex.dll", "arm64ec $file".toByteArray()) + put("files/lib/wine/aarch64-windows/libwow64fex.dll", "wow64 $file".toByteArray()) + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/MemoryReadoutTest.kt b/app/src/test/java/com/droiddeck/launcher/session/MemoryReadoutTest.kt new file mode 100644 index 0000000000..a4e4951310 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/MemoryReadoutTest.kt @@ -0,0 +1,66 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class MemoryReadoutTest { + private val meminfo = """ + MemTotal: 11379920 kB + MemFree: 527864 kB + MemAvailable: 3235768 kB + Buffers: 1024 kB + SwapTotal: 16777212 kB + SwapFree: 10358080 kB + """.trimIndent() + + @Test fun memoryAndSwapInUseComeFromMeminfo() { + val device = MemoryReadout.parseMeminfo(meminfo)!! + assertEquals(11379920L - 3235768L, device.usedKb) + assertEquals(16777212L - 10358080L, device.swapUsedKb) + assertEquals("7.8", MemoryReadout.gb(device.usedKb)) + assertEquals("10.9", MemoryReadout.gb(device.totalKb)) + assertEquals(0L, MemoryReadout.parseMeminfo("MemTotal: 100 kB\nMemAvailable: 40 kB\n")!!.swapUsedKb) + assertNull(MemoryReadout.parseMeminfo("MemTotal: 100 kB\n")) + } + + @Test fun aProcessCountsItsResidentAnonymousAndSharedMemory() { + val status = """ + Name: Diablo IV.exe + VmRSS: 2000000 kB + RssAnon: 1500000 kB + RssFile: 400000 kB + RssShmem: 100000 kB + VmSwap: 300000 kB + """.trimIndent() + assertEquals(1600000L, MemoryReadout.residentKb(status)) + assertEquals(0L, MemoryReadout.residentKb("Name:\tkthreadd\n")) + } + + @Test fun theGameIsWhatRunsInAWinePrefix() { + fun env(vararg vars: String) = vars.joinToString("\u0000", postfix = "\u0000").toByteArray() + assertTrue(MemoryReadout.inWinePrefix(env("HOME=/root", "WINEPREFIX=/root/pfx", "DISPLAY=:0"))) + assertTrue(MemoryReadout.inWinePrefix("WINEPREFIX=/x".toByteArray())) + assertFalse(MemoryReadout.inWinePrefix(env("HOME=/root", "STEAM_COMPAT_DATA_PATH=/x", "MY_WINEPREFIX=/y"))) + assertFalse(MemoryReadout.inWinePrefix(ByteArray(0))) + } + + @Test fun androidIsWhatIsLeftOfTheMemoryInUse() { + val device = MemoryReadout.Device(totalKb = 10_000, availableKb = 3_000, swapTotalKb = 0, swapFreeKb = 0) + assertEquals(3_000L, MemoryReadout.androidKb(device, MemoryReadout.Split(gameKb = 2_000, droiddeckKb = 1_000, gpuKb = 1_000))) + assertEquals(4_000L, MemoryReadout.androidKb(device, MemoryReadout.Split(gameKb = 2_000, droiddeckKb = 1_000, gpuKb = null))) + assertEquals(0L, MemoryReadout.androidKb(device, MemoryReadout.Split(gameKb = 6_000, droiddeckKb = 2_000, gpuKb = 1_000))) + } + + @Test fun theLogLineSaysEveryPartInMegabytes() { + val device = MemoryReadout.Device(totalKb = 11_379_920, availableKb = 1_048_576, swapTotalKb = 16_777_212, swapFreeKb = 8_388_606) + val split = MemoryReadout.Split(gameKb = 2_097_152, droiddeckKb = 524_288, gpuKb = 3_145_728) + assertEquals( + "used 10089/11113 MB, available 1024 MB, swap 8191/16383 MB | game 2048, droiddeck 512, android 4457, gpu 3072 MB", + MemoryLog.line(device, split), + ) + assertTrue(MemoryLog.line(device, split.copy(gpuKb = null)).endsWith("gpu ? MB")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/WineProcessesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/WineProcessesTest.kt new file mode 100644 index 0000000000..ee591d7134 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/WineProcessesTest.kt @@ -0,0 +1,23 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class WineProcessesTest { + private fun argv(vararg args: String) = args.joinToString("\u0000", postfix = "\u0000").toByteArray() + + @Test fun aWineserverIsKnownByItsProgramOrItsName() { + assertTrue(WineProcesses.isWineserver(argv("/root/.local/share/droiddeck-esync/dist/valve-11/files/bin-arm64/wineserver"), "wineserver\n")) + assertTrue(WineProcesses.isWineserver(argv("wineserver", "-p0"), null)) + assertTrue(WineProcesses.isWineserver(null, "wineserver\n")) + assertTrue(WineProcesses.isWineserver(ByteArray(0), "wineserver")) + } + + @Test fun nothingElseIs() { + assertFalse(WineProcesses.isWineserver(argv("C:\\windows\\system32\\services.exe"), "services.exe\n")) + assertFalse(WineProcesses.isWineserver(argv("/usr/bin/python3", "/x/files/bin-arm64/wineserver"), "python3\n")) + assertFalse(WineProcesses.isWineserver(argv("/opt/wineserver-helper"), "wineserver-help")) + assertFalse(WineProcesses.isWineserver(null, null)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetRequestTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetRequestTest.kt new file mode 100644 index 0000000000..f1141a8715 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetRequestTest.kt @@ -0,0 +1,38 @@ +package com.droiddeck.launcher.stores.battlenet + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class BattleNetRequestTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun requestsLeftBeforeThePollAreAllKeptInOrder() { + val root = tmp.root + assertTrue(BattleNetClient.request(root, listOf("install-game", "wow"))) + assertTrue(BattleNetClient.request(root, listOf("install-game", "fenris"))) + assertTrue(BattleNetClient.request(root, listOf("launch", "OSI"))) + val names = root.list()!!.sorted() + assertEquals(3, names.size) + assertTrue(names.all { Regex("battlenet-request\\.\\d{20}").matches(it) }) + assertEquals(listOf("install-game\nwow\n", "install-game\nfenris\n", "launch\nOSI\n"), names.map { java.io.File(root, it).readText() }) + } + + @Test fun aLineBreakInAnArgumentIsRefused() { + assertFalse(BattleNetClient.request(tmp.root, listOf("launch", "OSI\nreboot"))) + assertEquals(0, tmp.root.list()!!.size) + } + + @Test fun aNewSessionClearsEveryLeftRequest() { + val root = tmp.root + BattleNetClient.request(root, listOf("launch", "WTCG")) + java.io.File(root, "battlenet-request").writeText("launch\nPro\n") + java.io.File(root, "battlenet-request.1.tmp").writeText("launch\nPro\n") + java.io.File(root, "battlenet-fex.request").writeText("x") + BattleNetClient.clearRequests(root) + assertEquals(listOf("battlenet-fex.request"), root.list()!!.toList()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BlizzardArtTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BlizzardArtTest.kt new file mode 100644 index 0000000000..415c6c7cfe --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BlizzardArtTest.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.stores.battlenet + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class BlizzardArtTest { + @Test fun theShopsKeyArtIsUsed() { + val page = """<meta property="og:image" content="https://blz-contentstack-images.akamaized.net/v3/assets/a/b/c/art.png">""" + assertEquals("https://blz-contentstack-images.akamaized.net/v3/assets/a/b/c/art.png", BlizzardArt.imageUrl(page)) + } + + @Test fun aVideoStillFallsBackToTheFirstThumbnailThatIsNotABundle() { + val page = """<meta property="og:image" content="https://img.youtube.com/vi/x/maxresdefault.jpg">""" + + """\"imageUrl\":\"//catalog.blzstatic.com//ff9/a-prod-thumb_bundle.jpg\",""" + + """\"imageUrl\":\"//catalog.blzstatic.com//feb/b-prod-thumb.jpg\"""" + assertEquals("https://catalog.blzstatic.com//feb/b-prod-thumb.jpg", BlizzardArt.imageUrl(page)) + } + + @Test fun anOpenGraphImageFromAnotherHostFallsBackToTheThumbnail() { + val page = """<meta property="og:image" content="https://example.com/art.png">""" + + """\"imageUrl\":\"//catalog.blzstatic.com//feb/b-prod-thumb.jpg\"""" + assertEquals("https://catalog.blzstatic.com//feb/b-prod-thumb.jpg", BlizzardArt.imageUrl(page)) + } + + @Test fun artFromOtherHostsIsRefused() { + assertNull(BlizzardArt.imageUrl("""<meta property="og:image" content="https://example.com/art.png">""")) + assertNull(BlizzardArt.imageUrl("""\"imageUrl\":\"//catalog.blzstatic.com//ff9/a-prod-thumb_bundle.jpg\"""")) + } +} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet new file mode 100755 index 0000000000..6e695d930c --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -0,0 +1,933 @@ +#!/usr/bin/python3 +import fcntl +import http.client +import json +import math +import os +import re +import shutil +import signal +import subprocess +import sys +import threading +import time +import urllib.request + +HOME = os.environ.get("HOME") or "/root" +BIN = "/usr/local/bin" +PROTON_RUN = os.path.join(BIN, "droiddeck-proton-run") +APP_ID = "2596113170" +INSTALLER_URL = "https://downloader.battle.net/download/getInstallerForGame?os=win&gameProgram=BATTLENET_APP&version=Live" +CLIENT_DIR = ("Program Files (x86)", "Battle.net") +LAUNCHER = "Battle.net Launcher.exe" +CLIENT = "Battle.net.exe" +CONFIG = ("users", "steamuser", "AppData", "Roaming", "Battle.net", "Battle.net.config") +DEFAULT_CONFIG = {"Client": {"HardwareAcceleration": "false", "Streaming": {"StreamingEnabled": "false"}}} +LAUNCH_BEHAVIOR = ("GameLaunchWindowBehavior", "2") +CACHE = os.path.join(HOME, ".cache", "droiddeck", "battlenet") +MENU = "/usr/local/share/applications/droiddeck-battlenet.desktop" +WALLPAPER_DIR = ("users", "steamuser", "AppData", "Local", "DroidDeck") +DESKTOP_KEY = "[Control Panel\\\\Desktop]" +COLORS_KEY = "[Control Panel\\\\Colors]" +WALLPAPER_EDGE = (4, 6, 11) +WALLPAPER_MAX = (1280, 720) +FEX_REQUEST = "battlenet-fex.request" +FEX_RESULT = "battlenet-fex.result" +FEX_WAIT = 120 +START_GRACE = 90 +POLL = 2 +STOP_WAIT = 5 +CLOSE_GRACE = 15 +HANDOFF_WAIT = 120 +GAME_SETTLE = 20 +AGENT_GONE = 30 +AGENT = "agent.exe" +CODE = re.compile(r"[A-Za-z0-9_]{1,16}") +GAME_UID = re.compile(r"[a-z0-9_]{1,32}") +HANDOVER_WAIT = 1800 +CLIENT_READY = 5 +READY_SETTLE = 5 +CLIENT_WAIT = 300 +GAME_GRACE = 15 +LAUNCH_WAIT = 15 +LAUNCH_ASKS = 3 +CLIENT_PATH = re.compile(r"[a-z]:\\(program files \(x86\)|programdata)\\battle\.net\\") +IDLE = {"agent.exe", "conhost.exe", "explorer.exe", "lsass.exe", "plugplay.exe", "rpcss.exe", "services.exe", + "start.exe", "steam.exe", "svchost.exe", "tabtip.exe", "winedevice.exe", "wineserver"} +NOT_GAME = IDLE | {"rundll32.exe", "wineboot.exe", "winemenubuilder.exe"} +MIN_INSTALLER = 1 << 20 +SETUP = "Battle.net-Setup.exe" +REQUEST = "battlenet-request" +REQUEST_FILE = re.compile(re.escape(REQUEST) + r"\.\d+") +LIBRARY = None +WOW_UID = re.compile(r"--uid=wow[a-z0-9_]*", re.I) +GAMEPAD_SETTING = re.compile(r"(?im)^\s*SET\s+GamePadEnable\s") +STEAM_CLIENT = {"steam", "steamwebhelper"} +LOG = os.path.join(CACHE, "battlenet.log") +LOG_LIMIT = 512 << 10 + + +def say(message): + line = "droiddeck-battlenet: %s" % message + print(line, file=sys.stderr, flush=True) + try: + os.makedirs(CACHE, exist_ok=True) + if os.path.exists(LOG) and os.path.getsize(LOG) > LOG_LIMIT: + os.replace(LOG, LOG + ".1") + with open(LOG, "a", encoding="utf-8") as f: + f.write("%s [%d] %s\n" % (time.strftime("%Y-%m-%d %H:%M:%S"), os.getpid(), message)) + except OSError: + pass + + +def notify(title, body, icon="dialog-information"): + if not os.environ.get("DBUS_SESSION_BUS_ADDRESS") or not shutil.which("notify-send"): + return + try: + subprocess.run(["notify-send", "-a", "DroidDeck", "-i", icon, title, body], + stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=5) + except (OSError, subprocess.SubprocessError): + pass + + +def steam_root(): + return os.environ.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or os.path.join(HOME, ".local", "share", "Steam") + + +def prefix(root): + return os.path.join(root, "steamapps", "compatdata", APP_ID) + + +def drive_c(root): + return os.path.join(prefix(root), "pfx", "drive_c") + + +def client_dir(root): + return os.path.join(drive_c(root), *CLIENT_DIR) + + +def launcher(root): + return os.path.join(client_dir(root), LAUNCHER) + + +def installed(root): + return os.path.isfile(launcher(root)) + + +def install_path(library): + return "Z:" + library.rstrip("/") + + +def write_config(root, library=None): + path = os.path.join(drive_c(root), *CONFIG) + key, value = LAUNCH_BEHAVIOR + try: + with open(path, encoding="utf-8-sig") as f: + config = json.load(f) + except FileNotFoundError: + config = None + except (OSError, ValueError): + return None + first = config is None + if first: + config = json.loads(json.dumps(DEFAULT_CONFIG)) + elif not (isinstance(config, dict) and isinstance(config.setdefault("Client", {}), dict)): + return None + client = config["Client"] + changes = [] + if client.get(key) != value: + client[key] = value + changes.append("launch") + if client.get("HardwareAcceleration") != "false": + client["HardwareAcceleration"] = "false" + changes.append("acceleration") + if library and isinstance(client.setdefault("Install", {}), dict) \ + and str(client["Install"].get("DefaultInstallPath", "")).rstrip("/\\") != install_path(library): + client["Install"]["DefaultInstallPath"] = install_path(library) + changes.append("library") + if not changes: + return None + os.makedirs(os.path.dirname(path), exist_ok=True) + with open(path + ".tmp", "w", encoding="utf-8") as f: + json.dump(config, f, indent=4) + os.replace(path + ".tmp", path) + return "first" if first else " ".join(changes) + + +def wallpaper_bmp(width, height): + scale = min(width / 1920.0, height / 1080.0) + ox, oy = (width - 1920 * scale) / 2, (height - 1080 * scale) / 2 + stops = ((0.0, (20, 33, 58)), (0.5, (10, 17, 32)), (1.0, WALLPAPER_EDGE)) + glow = (26, 159, 255) + logo_px = scale * 1.6 + + def background(u, v): + t = min(math.hypot(u - 960, v - 540) / 1150, 1.0) + (t0, c0), (t1, c1) = (stops[0], stops[1]) if t <= 0.5 else (stops[1], stops[2]) + f = (t - t0) / (t1 - t0) + color = [c0[i] + (c1[i] - c0[i]) * f for i in range(3)] + d = math.hypot(u - 947.21, v - 540) / 420 + if d < 1: + a = 0.22 * (1 - d) + color = [color[i] * (1 - a) + glow[i] * a for i in range(3)] + return color + + def box(x, y, x0, y0, x1, y1): + dx, dy = max(x0 - x, x - x1), max(y0 - y, y - y1) + return math.hypot(max(dx, 0), max(dy, 0)) + min(max(dx, dy), 0) + + def white(x, y): + half = max(math.hypot(x - 63.97, y - 111.86) - 111.86, 63.97 - x) + shape = min(box(x, y, -31.98, 0, 63.97, 223.72), half) + hole = min(math.hypot(x - 63.98, y - 111.86) - 71.81, + box(x, y, 56.055, -1, 71.885, 45), box(x, y, 56.055, 178.72, 71.885, 225)) + return max(shape, -hole) + + rows = [] + pad = b"\0" * ((4 - width * 3 % 4) % 4) + for y in range(height - 1, -1, -1): + v = (y + 0.5 - oy) / scale + ly = (v - 361.02) / 1.6 + row = bytearray() + for x in range(width): + u = (x + 0.5 - ox) / scale + color = background(u, v) + lx = (u - 844.84) / 1.6 + if -40 < lx < 185 and -8 < ly < 232: + for sd, ink in ((white(lx, ly), (255, 255, 255)), (math.hypot(lx - 63.98, ly - 111.86) - 55.98, glow)): + cover = min(max(0.5 - sd * logo_px, 0.0), 1.0) + if cover: + color = [color[i] * (1 - cover) + ink[i] * cover for i in range(3)] + row += bytes((int(color[2] + 0.5), int(color[1] + 0.5), int(color[0] + 0.5))) + rows.append(bytes(row) + pad) + pixels = b"".join(rows) + header = b"BM" + (54 + len(pixels)).to_bytes(4, "little") + b"\0\0\0\0" + (54).to_bytes(4, "little") + info = (40).to_bytes(4, "little") + width.to_bytes(4, "little") + height.to_bytes(4, "little") + \ + (1).to_bytes(2, "little") + (24).to_bytes(2, "little") + b"\0" * 4 + len(pixels).to_bytes(4, "little") + \ + (2835).to_bytes(4, "little") * 2 + b"\0" * 8 + return header + info + pixels + + +def reg_value(reg, key, name, value): + line = '"%s"="%s"' % (name, value.replace("\\", "\\\\").replace('"', '\\"')) + try: + with open(reg, encoding="utf-8", errors="replace") as f: + rows = f.read().splitlines() + except OSError: + return False + inside, last = False, None + for row in rows: + if row.startswith("["): + inside = row.startswith(key + " ") or row == key + elif inside and row.startswith('"%s"=' % name): + last = row + if last != line: + with open(reg, "a", encoding="utf-8") as out: + out.write("\n%s %d\n%s\n" % (key, int(time.time()), line)) + return True + + +def desktop_size(): + width, height = os.environ.get("BL_WIDTH", ""), os.environ.get("BL_HEIGHT", "") + if width.isdigit() and height.isdigit() and 0 < int(width) <= 7680 and 0 < int(height) <= 4320: + return int(width), int(height) + return 1280, 720 + + +def wallpaper(root): + width, height = desktop_size() + shrink = min(1.0, WALLPAPER_MAX[0] / width, WALLPAPER_MAX[1] / height) + width, height = max(1, round(width * shrink)), max(1, round(height * shrink)) + name = "wallpaper-%dx%d.bmp" % (width, height) + folder = os.path.join(drive_c(root), *WALLPAPER_DIR) + path = os.path.join(folder, name) + reg = os.path.join(prefix(root), "pfx", "user.reg") + if not os.path.isfile(reg): + return False + if not os.path.isfile(path): + os.makedirs(folder, exist_ok=True) + with open(path + ".tmp", "wb") as f: + f.write(wallpaper_bmp(width, height)) + os.replace(path + ".tmp", path) + say("drew DroidDeck's wallpaper for Battle.net's %dx%d desktop" % (width, height)) + windows = "C:\\" + "\\".join(WALLPAPER_DIR + (name,)) + reg_value(reg, DESKTOP_KEY, "Wallpaper", windows) + reg_value(reg, DESKTOP_KEY, "TileWallpaper", "0") + reg_value(reg, DESKTOP_KEY, "WallpaperStyle", "2" if shrink < 1 else "0") + reg_value(reg, COLORS_KEY, "Background", "%d %d %d" % WALLPAPER_EDGE) + return True + + +def windows_path(root, path): + found = re.match(r"(?i)^([cz]):[\\/](.*)$", path.strip()) + if not found: + return None + parts = [part for part in re.split(r"[\\/]+", found.group(2)) if part] + if not parts or ".." in parts: + return None + return os.path.join(drive_c(root) if found.group(1).lower() == "c" else "/", *parts) + + +def wow_folders(root): + try: + with open(os.path.join(prefix(root), "pfx", "system.reg"), encoding="utf-8", errors="replace") as f: + rows = f.read().splitlines() + except OSError: + return [] + folders, location, wow = [], None, False + for row in rows + ["["]: + if row.startswith("["): + if wow and location: + folders.append(location) + location, wow = None, False + elif row.startswith('"InstallLocation"='): + location = windows_path(root, row.split("=", 1)[1].strip().strip('"').replace("\\\\", "\\")) + elif row.startswith('"UninstallString"=') and WOW_UID.search(row): + wow = True + return [folder for folder in dict.fromkeys(folders) if os.path.isdir(folder)] + + +def enable_gamepad(root): + changed = [] + for folder in wow_folders(root): + try: + flavors = sorted(name for name in os.listdir(folder) if len(name) > 2 and name.startswith("_") and name.endswith("_")) + except OSError: + continue + for name in flavors: + if not os.path.isdir(os.path.join(folder, name)): + continue + path = os.path.join(folder, name, "WTF", "Config.wtf") + try: + with open(path, encoding="utf-8", errors="replace") as f: + text = f.read() + except FileNotFoundError: + text = "" + except OSError: + continue + if GAMEPAD_SETTING.search(text): + continue + try: + os.makedirs(os.path.dirname(path), exist_ok=True) + with open(path, "a", encoding="utf-8") as f: + f.write(("\n" if text and not text.endswith("\n") else "") + 'SET GamePadEnable "1"\n') + except OSError as error: + say("controllers not turned on in %s: %s" % (path, error)) + continue + changed.append(path) + say("World of Warcraft's controller support turned on in %s" % path) + return changed + + +def steam_running(proc="/proc"): + try: + pids = [p for p in os.listdir(proc) if p.isdigit()] + except OSError: + return False + for pid in pids: + try: + with open(os.path.join(proc, pid, "cmdline"), "rb") as f: + argv = [os.path.basename(a.decode("utf-8", "replace")) for a in f.read().split(b"\0")[:2] if a] + except OSError: + continue + if argv[:1] and argv[0] in ("FEX", "FEXInterpreter"): + argv = argv[1:] + if argv[:1] and argv[0] in STEAM_CLIENT: + return True + return False + + +def proton_env(): + env = dict(os.environ) + if not steam_running(): + env.setdefault("PROTON_SPOOF_STEAMINPUT_VIDPID", "1") + return env + + +def configure(root, library=None): + if library: + try: + os.makedirs(library, exist_ok=True) + except OSError as error: + say("%s not made: %s" % (library, error)) + try: + change = write_config(root, library) + except OSError as error: + say("Battle.net's config not written: %s" % error) + return + try: + wallpaper(root) + except OSError as error: + say("Battle.net's desktop wallpaper not set: %s" % error) + enable_gamepad(root) + if change == "first": + say("wrote Battle.net's first config: hardware acceleration off, streaming off, closing itself as it launches a game") + elif change: + if "launch" in change: + say("Battle.net's config: closing itself as it launches a game") + if "library" in change: + say("Battle.net's config: games install to %s" % library) + if "acceleration" in change: + say("Battle.net's config: browser hardware acceleration off") + + +def write_menu(path=MENU): + body = ("[Desktop Entry]\nType=Application\nName=Battle.net\nComment=Blizzard's games and launcher\n" + "Exec=%s\nIcon=applications-games\nTerminal=false\nCategories=Network;\n" + % os.path.join(BIN, "droiddeck-battlenet")) + try: + with open(path, encoding="utf-8") as f: + if f.read() == body: + return + except OSError: + pass + try: + os.makedirs(os.path.dirname(path), exist_ok=True) + with open(path + ".tmp", "w", encoding="utf-8") as f: + f.write(body) + os.replace(path + ".tmp", path) + except OSError as error: + say("menu entry not written: %s" % error) + + +def ask_fex(launch_dir, wait=FEX_WAIT): + if not launch_dir or not os.path.isdir(launch_dir): + say("not inside a DroidDeck session; FEX stays as Components has it") + return None + result = os.path.join(launch_dir, FEX_RESULT) + request = os.path.join(launch_dir, FEX_REQUEST) + try: + os.unlink(result) + except OSError: + pass + with open(request + ".tmp", "w", encoding="utf-8") as f: + f.write("appid=%s\n" % APP_ID) + os.replace(request + ".tmp", request) + deadline = time.monotonic() + wait + while time.monotonic() < deadline: + try: + with open(result, encoding="utf-8") as f: + answer = f.read().strip() + except OSError: + time.sleep(0.5) + continue + os.unlink(result) + return answer + return None + + +def wine_processes(pfx, proc="/proc"): + want = os.path.realpath(pfx).rstrip("/") + found = [] + try: + pids = [p for p in os.listdir(proc) if p.isdigit()] + except OSError: + return found + for pid in pids: + try: + with open(os.path.join(proc, pid, "environ"), "rb") as f: + env = f.read().split(b"\0") + with open(os.path.join(proc, pid, "cmdline"), "rb") as f: + argv = [a.decode("utf-8", "replace") for a in f.read().split(b"\0") if a] + except OSError: + continue + for item in env: + if item.startswith(b"WINEPREFIX="): + value = item[len(b"WINEPREFIX="):].decode("utf-8", "replace") + if os.path.realpath(value).rstrip("/") == want: + found.append((int(pid), argv)) + break + return found + + +def program(argv): + return re.split(r"[\\/]", argv[0])[-1].lower() if argv else "" + + +def is_client(argv): + return program(argv) == CLIENT.lower() + + +def idle(processes): + return all(program(argv) in IDLE for _, argv in processes) + + +def running(pfx): + return any(is_client(argv) for _, argv in wine_processes(pfx)) + + +def is_battlenet(argv): + return bool(argv) and bool(CLIENT_PATH.match(argv[0].replace("/", "\\").lower())) + + +def is_game(argv): + if not argv or program(argv) in NOT_GAME or not re.match(r"[A-Za-z]:[\\/]", argv[0]): + return False + return not is_battlenet(argv) + + +def launched(argv): + return is_game(argv) and "-uid" in (arg.lower() for arg in argv[1:]) + + +def shares_sign_in(argv): + return "-sso" in (arg.lower() for arg in argv[1:]) + + +def agent_up(processes): + return any(is_client(argv) for _, argv in processes) and any(program(argv) == AGENT for _, argv in processes) + + +class Tidy: + + def __init__(self, settle=None, gone=None): + self.settle = GAME_SETTLE if settle is None else settle + self.gone = AGENT_GONE if gone is None else gone + self.game_since = None + self.closed_for_game = False + self.agent_seen = False + self.agent_lost = None + + def __call__(self, processes, now): + own = [(pid, argv) for pid, argv in processes if is_battlenet(argv)] + games = [argv for _, argv in processes if launched(argv)] + if games: + self.game_since = self.game_since if self.game_since is not None else now + if own and not self.closed_for_game and now - self.game_since >= self.settle: + self.closed_for_game, self.agent_seen, self.agent_lost = True, False, None + if any(is_client(argv) for _, argv in own) and any(shares_sign_in(argv) for argv in games): + say("Battle.net stayed open beside a game signing in with its token: left open") + return False + say("the game is up: closing what is left of Battle.net (%d process(es)) to leave it their memory" % len(own)) + stop(own) + return True + return False + self.game_since, self.closed_for_game = None, False + if not any(is_client(argv) for _, argv in processes): + self.agent_seen, self.agent_lost = False, None + elif agent_up(processes): + self.agent_seen, self.agent_lost = True, None + elif self.agent_seen: + self.agent_lost = self.agent_lost if self.agent_lost is not None else now + if now - self.agent_lost >= self.gone: + say("Battle.net has outlived its Agent: closing it (%d process(es))" % len(own)) + stop(own) + notify("Battle.net was closed", "It had lost Blizzard's update service. Open it again to reconnect.", + "dialog-warning") + self.agent_seen, self.agent_lost = False, None + return True + return False + + +def proton_options(): + if os.environ.get("BL_DESKTOP") == "1": + return ["--window"] + width, height = os.environ.get("BL_WIDTH", ""), os.environ.get("BL_HEIGHT", "") + options = ["--desktop", "%sx%s" % (width, height)] if width.isdigit() and height.isdigit() else [] + game = os.environ.get("SteamGameId", "") + return options + (["--game-id", game] if game.isdigit() and game != "0" else []) + + +def stop(processes, wait=STOP_WAIT): + pids = [pid for pid, _ in processes] + for sig in (signal.SIGTERM, signal.SIGKILL): + for pid in pids: + try: + os.kill(pid, sig) + except OSError: + pass + deadline = time.monotonic() + wait + while time.monotonic() < deadline: + pids = [pid for pid in pids if os.path.exists("/proc/%d" % pid)] + if not pids: + return + time.sleep(0.2) + + +def queued_requests(launch_dir): + try: + names = os.listdir(launch_dir) + except OSError: + return [] + return sorted(name for name in names if REQUEST_FILE.fullmatch(name)) + + +def serve_requests(pfx, processes=None, launch_dir=None): + launch_dir = launch_dir or os.environ.get("BL_LAUNCH_DIR") + names = queued_requests(launch_dir) if launch_dir else [] + if not names or not agent_up(wine_processes(pfx) if processes is None else processes): + return False + client = os.path.join(pfx, "drive_c", *CLIENT_DIR, CLIENT) + served = False + for name in names: + path = os.path.join(launch_dir, name) + try: + with open(path, encoding="utf-8") as f: + args = [line for line in f.read().splitlines() if line] + os.unlink(path) + except OSError: + continue + if len(args) == 2 and args[0] == "install-game" and GAME_UID.fullmatch(args[1]): + spawn(client, "run", ["--install", "--game=%s" % args[1]]) + elif len(args) == 2 and args[0] == "launch" and CODE.fullmatch(args[1]): + spawn(client, "run", ["--exec=launch %s" % args[1]]) + else: + say("not a request: %s" % " ".join(args)) + continue + say("the app asked for %s" % " ".join(args)) + served = True + return served + + +def wait_while_open(pfx, grace, poll=None): + deadline = time.monotonic() + grace + seen = False + while True: + serve_requests(pfx) + if running(pfx): + seen = True + elif seen or time.monotonic() >= deadline: + return seen + time.sleep(POLL if poll is None else poll) + + +def proton(exe, args=(), verb=None, watch=None, poll=None, close_grace=None, tidy=None): + cmd = [PROTON_RUN] + proton_options() + ["--prefix", APP_ID] + (["--verb", verb] if verb else []) + [exe] + list(args) + say(" ".join(cmd)) + try: + process = subprocess.Popen(cmd, env=proton_env()) + except OSError as error: + say("%s: %s" % (PROTON_RUN, error)) + return 127, False + seen = False + closed_at = None + grace = CLOSE_GRACE if close_grace is None else close_grace + tidy = Tidy() if tidy is None else tidy + while True: + try: + status = process.wait(timeout=POLL if poll is None else poll) + return status, seen + except subprocess.TimeoutExpired: + pass + if watch is None: + continue + processes = wine_processes(watch) + serve_requests(watch, processes) + now = time.monotonic() + if tidy(processes, now): + seen = True + processes = wine_processes(watch) + if any(is_client(argv) for _, argv in processes): + seen, closed_at = True, None + elif seen and idle(processes): + closed_at = closed_at if closed_at is not None else now + if now - closed_at >= grace: + say("Battle.net closed; stopping %d process(es) it left in its prefix" % len(processes)) + stop(processes) + closed_at = None + else: + closed_at = None + + +def setup_ready(path): + try: + with open(path, "rb") as f: + return f.read(2) == b"MZ" and os.path.getsize(path) >= MIN_INSTALLER + except OSError: + return False + + +def download(url=INSTALLER_URL, folder=CACHE): + os.makedirs(folder, exist_ok=True) + dest = os.path.join(folder, SETUP) + if setup_ready(dest): + return dest + part = dest + ".part" + try: + try: + request = urllib.request.Request(url, headers={"User-Agent": "DroidDeck"}) + with urllib.request.urlopen(request, timeout=60) as response, open(part, "wb") as f: + shutil.copyfileobj(response, f) + length = response.headers.get("Content-Length", "") + if length.isdigit() and f.tell() != int(length): + raise OSError("the download ended early") + except (OSError, http.client.HTTPException) as error: + if not shutil.which("curl"): + raise + say("download through Python failed (%s); trying curl" % error) + if subprocess.call(["curl", "-fsSL", "--max-time", "300", "-o", part, url]) != 0: + raise OSError("curl could not download it") + if not setup_ready(part): + raise OSError("not a Windows program") + os.replace(part, dest) + except (OSError, http.client.HTTPException) as error: + say("installer download failed: %s" % error) + try: + os.unlink(part) + except OSError: + pass + return dest if os.path.isfile(dest) else None + + +def install(root, pfx, verb=None): + setup = download() + if setup is None: + notify("Battle.net could not be downloaded", "Check the connection and try again.", "dialog-error") + return False, False + configure(root, LIBRARY) + notify("Installing Battle.net", "Blizzard's installer opens in a window. It can take a few minutes.") + _, seen = proton(setup, verb=verb, watch=pfx) + return installed(root), seen + + +def acquire(folder=CACHE): + os.makedirs(folder, exist_ok=True) + handle = open(os.path.join(folder, "battlenet.lock"), "w") + try: + fcntl.flock(handle, fcntl.LOCK_EX | fcntl.LOCK_NB) + except OSError: + handle.close() + return None + return handle + + +def status(root): + pfx = os.path.join(prefix(root), "pfx") + return {"appid": int(APP_ID), "prefix": prefix(root), "installed": installed(root), + "launcher": launcher(root), "running": running(pfx)} + + +def spawn(program, verb, args=()): + cmd = [PROTON_RUN] + proton_options() + ["--prefix", APP_ID, "--verb", verb, program] + list(args) + say(" ".join(cmd)) + try: + os.makedirs(CACHE, exist_ok=True) + with open(os.path.join(CACHE, "spawned.log"), "ab") as log: + child = subprocess.Popen(cmd, stdin=subprocess.DEVNULL, stdout=log, stderr=log, start_new_session=True, env=proton_env()) + threading.Thread(target=child.wait, daemon=True).start() + except OSError as error: + say("%s: %s" % (PROTON_RUN, error)) + return 127 + return 0 + + +def show(root, wait=None, poll=None, args=()): + pfx = os.path.join(prefix(root), "pfx") + client = os.path.join(client_dir(root), CLIENT) + deadline = time.monotonic() + (HANDOFF_WAIT if wait is None else wait) + while True: + processes = wine_processes(pfx) + if any(is_client(argv) for _, argv in processes) and os.path.isfile(client) \ + and (agent_up(processes) or time.monotonic() >= deadline): + spawn(client, "run", args) + return None + lock = acquire() + if lock is not None: + say("the other start has ended; opening Battle.net") + return lock + if time.monotonic() >= deadline: + say("the other start neither opened Battle.net nor ended") + notify("Battle.net is busy", "Another start is still running; try again in a moment.", "dialog-warning") + return None + time.sleep(POLL if poll is None else poll) + + +def stop_leftovers(pfx): + processes = wine_processes(pfx) + if not processes: + return True + if not idle(processes): + say("the prefix is in use (%s); Battle.net starts beside it" % ", ".join(sorted({program(a) for _, a in processes} - IDLE))) + return False + say("stopping %d process(es) a closed Battle.net left in its prefix" % len(processes)) + stop(processes) + return True + + +def open_client(root, reinstall=False): + pfx = os.path.join(prefix(root), "pfx") + write_menu() + answer = ask_fex(os.environ.get("BL_LAUNCH_DIR")) + say("FEX: %s" % (answer or "no answer from the app; Components' choice stays")) + if running(pfx): + say("Battle.net is already running in its prefix; waiting for it to close") + wait_while_open(pfx, grace=0) + return 0 + verb = None if stop_leftovers(pfx) else "run" + if reinstall or not installed(root): + done, seen = install(root, pfx, verb) + if not done: + notify("Battle.net did not install", "The session's desktop.log says why.", "dialog-error") + return 1 + if wait_while_open(pfx, grace=0 if seen else START_GRACE) or seen: + return 0 + verb = None if stop_leftovers(pfx) else "run" + configure(root, LIBRARY) + status_code, seen = proton(launcher(root), verb=verb, watch=pfx) + say("Proton returned %d; Battle.net %s" % (status_code, "ran" if seen else "has not been seen yet")) + if not (wait_while_open(pfx, grace=0 if seen else START_GRACE) or seen): + say("Battle.net did not start (the launcher exited with %d)" % status_code) + notify("Battle.net did not start", "The session's desktop.log says why.", "dialog-error") + return status_code or 1 + say("Battle.net closed") + return 0 + + +def start(exe, verb=None): + cmd = [PROTON_RUN] + proton_options() + ["--prefix", APP_ID] + (["--verb", verb] if verb else []) + [exe] + say(" ".join(cmd)) + try: + return subprocess.Popen(cmd, env=proton_env()) + except OSError as error: + say("%s: %s" % (PROTON_RUN, error)) + return None + + +def wait_ready(pfx, wait=None, poll=None, settle=None): + deadline = time.monotonic() + (CLIENT_WAIT if wait is None else wait) + while True: + count = sum(1 for _, argv in wine_processes(pfx) if is_client(argv)) + if count >= CLIENT_READY: + time.sleep(READY_SETTLE if settle is None else settle) + return True + if time.monotonic() >= deadline: + return count > 0 + time.sleep(POLL if poll is None else poll) + + +def follow(pfx, poll=None, grace=None, tidy=None, ask=None): + seen, gone_at = False, None + asked, asks = None, 1 + grace = GAME_GRACE if grace is None else grace + tidy = Tidy() if tidy is None else tidy + while True: + processes = wine_processes(pfx) + serve_requests(pfx, processes) + now = time.monotonic() + if tidy(processes, now): + processes = wine_processes(pfx) + games = sorted({program(argv) for _, argv in processes if is_game(argv)}) + if games: + if not seen: + say("game running: %s" % ", ".join(games)) + seen, gone_at = True, None + elif seen or not any(is_client(argv) for _, argv in processes): + gone_at = gone_at if gone_at is not None else now + if now - gone_at >= grace: + say("the game has exited" if seen else "Battle.net closed before a game started") + return seen + else: + gone_at = None + asked = now if asked is None else asked + if ask is not None and asks < LAUNCH_ASKS and now - asked >= LAUNCH_WAIT: + say("Battle.net has not started the game yet; asking again") + ask() + asked, asks = now, asks + 1 + time.sleep(POLL if poll is None else poll) + + +def launch(root, code): + pfx = os.path.join(prefix(root), "pfx") + client = os.path.join(client_dir(root), CLIENT) + if not installed(root) or not os.path.isfile(client): + say("Battle.net is not installed; %s is not launched" % code) + notify("Battle.net is not installed", "Install it from its tile on DroidDeck's Desktop tab.", "dialog-error") + return 1 + lock = acquire() + try: + own = None + if lock is not None and not running(pfx): + answer = ask_fex(os.environ.get("BL_LAUNCH_DIR")) + say("FEX: %s" % (answer or "no answer from the app; Components' choice stays")) + verb = None if stop_leftovers(pfx) else "run" + configure(root, LIBRARY) + own = start(launcher(root), verb) + if own is None: + return 127 + if not wait_ready(pfx): + say("Battle.net did not open; %s is not launched" % code) + notify("Battle.net did not start", "The session's desktop.log says why.", "dialog-error") + return 1 + if code.lower().startswith("wow"): + enable_gamepad(root) + say("launching %s" % code) + spawn(client, "run", ["--exec=launch %s" % code]) + played = follow(pfx, ask=lambda: spawn(client, "run", ["--exec=launch %s" % code])) + if own is not None: + leftovers = wine_processes(pfx) + say("stopping what the Battle.net opened for %s left: %d process(es)" % (code, len(leftovers))) + stop(leftovers) + try: + own.wait(timeout=STOP_WAIT * 4) + except subprocess.TimeoutExpired: + say("its Proton is still ending") + return 0 if played else 1 + finally: + if lock is not None: + lock.close() + + +def hand_over(root, args, wait=None): + if not wait_ready(os.path.join(prefix(root), "pfx"), wait=HANDOVER_WAIT if wait is None else wait): + say("Battle.net did not come up; %s not asked for" % " ".join(args)) + return False + spawn(os.path.join(client_dir(root), CLIENT), "run", args) + return True + + +def install_game(root, uid): + args = ["--install", "--game=%s" % uid] + if installed(root) and agent_up(wine_processes(os.path.join(prefix(root), "pfx"))): + say("asking the open Battle.net to install %s" % uid) + spawn(os.path.join(client_dir(root), CLIENT), "run", args) + return 0 + lock = acquire() + if lock is None: + say("another start holds the lock") + lock = show(root, args=args) + if lock is None: + return 0 + threading.Thread(target=hand_over, args=(root, args), daemon=True).start() + with lock: + return open_client(root) + + +def main(argv): + global LIBRARY + argv = list(argv) + if len(argv) >= 2 and argv[0] == "--library": + if not argv[1].startswith("/") or "\n" in argv[1]: + say("%s is not a folder" % argv[1]) + return 2 + LIBRARY = os.path.normpath(argv[1]) + argv = argv[2:] + action = argv[0] if argv else "open" + launching = action == "launch" and len(argv) == 2 and CODE.fullmatch(argv[1]) + getting = action == "install-game" and len(argv) == 2 and GAME_UID.fullmatch(argv[1]) + if not (launching or getting) and (action not in ("open", "install", "status") or len(argv) > 1): + say("usage: droiddeck-battlenet [--library DIR] [open | install | status | launch CODE | install-game ID]") + return 2 + root = steam_root() + if action == "status": + print(json.dumps(status(root))) + return 0 + os.environ["BL_BATTLENET"] = "1" + if launching: + say("launch %s" % argv[1]) + return launch(root, argv[1]) + if getting: + say("install-game %s" % argv[1]) + return install_game(root, argv[1]) + say("%s (%s)" % (action, "from the menu" if not sys.stderr.isatty() else "from a terminal")) + lock = acquire() + if lock is None: + say("another start holds the lock") + lock = show(root) + if lock is None: + return 0 + with lock: + return open_client(root, reinstall=action == "install") + + +if __name__ == "__main__": + sys.exit(main(sys.argv[1:])) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run index 8d0805a878..3648ddede3 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run @@ -1,7 +1,7 @@ #!/usr/bin/python3 """Runs a Windows program with the Proton the Steam client has chosen for it. - droiddeck-proton-run [--window] PROGRAM [ARGS...] + droiddeck-proton-run [--window] [--prefix ID] [--verb run] [--game-id ID] [--desktop WxH] PROGRAM [ARGS...] droiddeck-proton-run --app ID [--dir FOLDER] [--options TEXT] [PROGRAM [ARGS...]] The program belongs to an installed Steam game when it sits in one's folder, to a prefix when it @@ -10,7 +10,11 @@ its own, under the id the client gives a new shortcut. That title's CompatToolMa config.vdf picks the tool, else the client's default for all other titles ("0"). The tool is started as the client starts it - its toolmanifest's command line, the waitforexitandrun verb and the STEAM_COMPAT_* environment - so its wrapper applies the game's settings, components and audio. ---window keeps the program in the desktop's own window, drawn with WineD3D. +--window keeps the program in the desktop's own window, drawn with WineD3D on the desktop's software +GL (llvmpipe): KWin there composites in software, and the session's zink finds no device. +--prefix ID puts the program in compatdata/ID whatever it is. --verb run starts it beside what already +runs in the prefix, which waitforexitandrun would wait for; the wrapper's launch-time steps are skipped. +--game-id ID keeps the id of the launch it runs for: gamescope shows the windows that carry the id Steam launched. --app starts one game without the Steam client (its Start without Steam): a Steam game's default Windows launch option from appinfo.vdf when no program is given, else the program in that shortcut's own prefix, started in --dir with the shortcut's launch options (--options). Without @@ -31,7 +35,10 @@ BIN_DIR = os.path.dirname(os.path.abspath(__file__)) STATE = os.path.join(HOME, ".local", "share", "droiddeck-compat", "state.json") EXTRA_LIBRARIES = ("/mnt/droiddeck", "/mnt/droiddeck-sd") SYSTEM_TOOLS = ("/usr/share/steam/compatibilitytools.d", "/usr/local/share/steam/compatibilitytools.d") +DESKTOP_GL = {"LIBGL_ALWAYS_SOFTWARE": "1", "GALLIUM_DRIVER": "llvmpipe"} +NOT_DESKTOP_GL = ("MESA_LOADER_DRIVER_OVERRIDE", "LIBGL_KOPPER_DRI2") VERB = "waitforexitandrun" +VERBS = (VERB, "run") SHORTCUT_BIT = 0x80000000 STEAM_APP_LIMIT = 2 ** 31 @@ -289,6 +296,15 @@ def locate(program, root): os.path.dirname(program), root, "own") +def fixed(program, root, appid): + return Target(appid, os.path.join(root, "steamapps", "compatdata", str(appid)), + os.path.dirname(program), root, "fixed") + + +def prefix_id(value): + return value if value.isdigit() and not value.startswith("0") and int(value) <= 0xFFFFFFFF else None + + def split_words(text): try: return shlex.split(text or "") @@ -372,7 +388,7 @@ def steam_launches(target, program, root): return os.path.relpath(program, target.install).replace(os.sep, "/").lower() in entry.get("launch", ()) -def environment(env, target, tool_folder, root, window=False): +def environment(env, target, tool_folder, root, window=False, game_id=None): env = dict(env) steamapps = [os.path.join(lib, "steamapps") for lib in libraries(root)] env.update({ @@ -390,28 +406,52 @@ def environment(env, target, tool_folder, root, window=False): else: game = str(number << 32 | 0x02000000) env.update(SteamAppId="0", STEAM_COMPAT_APP_ID="0", SteamGameId=game, SteamOverlayGameId=game) + if game_id: + env.update(SteamGameId=game_id, SteamOverlayGameId=game_id) if window: env.setdefault("PROTON_USE_WINED3D", "1") + env.update(DESKTOP_GL) + for name in NOT_DESKTOP_GL: + env.pop(name, None) return env -def windows_path(path): +def windows_path(path, compatdata=None): + if compatdata: + drive = os.path.join(compatdata, "pfx", "drive_c") + inside = os.path.relpath(path, drive) + if inside != "." and not inside.startswith(".."): + return "C:\\" + inside.replace("/", "\\") return "Z:" + path.replace("/", "\\") -def arguments(program, args): +def arguments(program, args, desktop=None, compatdata=None): if program.lower().endswith(".msi"): return ["msiexec", "/i", windows_path(program)] + args + if desktop: + return ["explorer.exe", "/desktop=droiddeck,%s" % desktop, windows_path(program, compatdata)] + args return [program] + args def main(argv): window = False + prefix = None + verb = VERB + game_id = None + desktop = None app, start, options = None, None, None while argv and argv[0].startswith("--"): option = argv.pop(0) if option == "--window": window = True + elif option == "--prefix" and argv and prefix_id(argv[0]): + prefix = argv.pop(0) + elif option == "--verb" and argv and argv[0] in VERBS: + verb = argv.pop(0) + elif option == "--game-id" and argv and argv[0].isdigit() and argv[0] != "0": + game_id = argv.pop(0) + elif option == "--desktop" and argv and re.fullmatch(r"[1-9][0-9]{2,4}x[1-9][0-9]{2,4}", argv[0]): + desktop = argv.pop(0) elif option in ("--app", "--dir", "--options") and argv: value = argv.pop(0) if option == "--app": @@ -429,7 +469,7 @@ def main(argv): say("%s is not an app id" % app) return 2 if not argv and app is None: - say("usage: droiddeck-proton-run [--window] PROGRAM [ARGS...]") + say("usage: droiddeck-proton-run [--window] [--prefix ID] [--verb run] [--game-id ID] [--desktop WxH] PROGRAM [ARGS...]") return 2 root = os.environ.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or STEAM_ROOT if options is None: @@ -453,6 +493,8 @@ def main(argv): args = args + argv[1:] if app is not None and int(app) >= STEAM_APP_LIMIT: target = shortcut_target(app, program, start, root) + elif prefix: + target = fixed(program, root, prefix) else: target = locate(program, root) available = tools(root) @@ -462,7 +504,7 @@ def main(argv): return 69 folder, command = available[name] os.makedirs(target.compatdata, exist_ok=True) - env = environment(os.environ, target, folder, root, window) + env = environment(os.environ, target, folder, root, window, game_id) env.update(extra) say("%s with %s (%s), %s prefix %s%s" % (program, name, why, target.kind, target.compatdata, ", without the Steam client" if app is not None else "")) @@ -471,7 +513,7 @@ def main(argv): except OSError: os.chdir(os.path.dirname(program)) entry = os.path.join(folder, command) - os.execve(entry, [entry, VERB] + arguments(program, args), env) + os.execve(entry, [entry, verb] + arguments(program, args, desktop, target.compatdata), env) if __name__ == "__main__": diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index f59c560523..718498dff8 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -25,6 +25,8 @@ Android: an EOS sign-in step that falls back to a browser (a consent Epic asks f is finished there. An EOS overlay pointer (HKCU\Software\Epic Games\EOS "OverlayPath") an earlier build wrote is removed - with it the game exited while loading. +Battle.net.exe in Battle.net's prefix is handed to droiddeck-battlenet, which runs the whole launch. + droiddeck-store-launch <the arguments Steam gave the compat tool> """ @@ -291,6 +293,27 @@ def create_prefix(compat_data, proton, timeout=120): CLOUD_TIMEOUT = 15.0 CLOUD_STORES = ("gog", "epic") STORE_GAME = 10 +RAN = 11 +RAN_FAILED = 12 +BATTLENET = "/usr/local/bin/droiddeck-battlenet" +BATTLENET_EXE = re.compile(r"(?i)/compatdata/2596113170/pfx/drive_c/Program Files \(x86\)/Battle\.net/Battle\.net\.exe$") +BATTLENET_LAUNCH = re.compile(r'(?i)^--exec=\s*"?launch\s+([A-Za-z0-9_]{1,16})"?$') + + +def battlenet(argv, env=os.environ): + if env.get("BL_BATTLENET"): + return None + exe, code = False, None + for raw in argv: + arg = raw.strip().strip('"').strip("'") + if BATTLENET_EXE.search(arg.replace("\\", "/")): + exe = True + found = BATTLENET_LAUNCH.match(arg) + if found: + code = found.group(1) + if not exe: + return None + return [BATTLENET, "launch", code] if code else [BATTLENET, "open"] def cloud_on(sidecar): @@ -511,6 +534,10 @@ def main(argv): pass rest = rest[2:] return exited(rest, code) + command = battlenet(argv) + if command is not None: + log("battlenet " + " ".join(command[1:])) + return RAN if subprocess.call(command) == 0 else RAN_FAILED found = find_store_game(argv) if found is None: return 0 diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 601fea186c..09dd3dd02b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -69,7 +69,10 @@ bl_store_launch() { fi [ -x /usr/local/bin/droiddeck-store-launch ] || return 0 /usr/local/bin/droiddeck-store-launch "$@" - [ $? -eq 10 ] && BL_STORE_EXIT=1 + rc=$? + [ $rc -eq 10 ] && BL_STORE_EXIT=1 + [ $rc -eq 11 ] && exit 0 + [ $rc -eq 12 ] && exit 1 return 0 } diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py new file mode 100644 index 0000000000..34edd448ec --- /dev/null +++ b/tools/tests/test_battlenet.py @@ -0,0 +1,1013 @@ +import json +import os +from pathlib import Path +import re +import runpy +import shutil +import tempfile +import threading +import time +import unittest +from unittest import mock +import zlib + +REPO = Path(__file__).resolve().parents[2] +BIN = REPO / "tools/linuxfs/overlay/usr/local/bin" +BNET = runpy.run_path(str(BIN / "droiddeck-battlenet"))["main"].__globals__ +BNET["CACHE"] = tempfile.mkdtemp(prefix="bnet-test-cache-") +BNET["LOG"] = os.path.join(BNET["CACHE"], "battlenet.log") +RUN = runpy.run_path(str(BIN / "droiddeck-proton-run"))["main"].__globals__ +STORE = runpy.run_path(str(BIN / "droiddeck-store-launch"))["main"].__globals__ +KOTLIN = REPO / "app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt" + + +class Temp(unittest.TestCase): + def setUp(self): + self.tmp = Path(tempfile.mkdtemp()) + self.addCleanup(shutil.rmtree, self.tmp, True) + + def write(self, relative, data, mode=0o644): + path = self.tmp / relative + path.parent.mkdir(parents=True, exist_ok=True) + path.write_bytes(data if isinstance(data, bytes) else data.encode()) + path.chmod(mode) + return path + + +class LogTest(Temp): + def test_each_line_is_kept_and_a_long_log_rotates(self): + log = self.tmp / "battlenet.log" + with open(os.devnull, "w") as null, \ + mock.patch.dict(BNET, {"CACHE": str(self.tmp), "LOG": str(log), "LOG_LIMIT": 64}), \ + mock.patch.object(BNET["sys"], "stderr", null): + BNET["say"]("first line, long enough to pass the limit of sixty-four bytes") + BNET["say"]("second") + self.assertIn("first line", (self.tmp / "battlenet.log.1").read_text()) + self.assertRegex(log.read_text(), r"^\d{4}-\d\d-\d\d \d\d:\d\d:\d\d \[\d+\] second\n$") + + +class IdTest(unittest.TestCase): + def test_the_prefix_id_is_the_shortcut_id_the_app_names(self): + self.assertEqual(int(BNET["APP_ID"]), zlib.crc32(b'"droiddeck-battlenet"Battle.net') | 0x80000000) + found = re.search(r"const val APP_ID = (\d+)L", KOTLIN.read_text()) + self.assertEqual(found.group(1), BNET["APP_ID"]) + for name in ("FEX_REQUEST", "FEX_RESULT"): + self.assertIn('const val %s = "%s"' % (name, BNET[name]), KOTLIN.read_text()) + + +class ProtonRunOptionsTest(Temp): + def setUp(self): + super().setUp() + self.root = self.tmp / "Steam" + folder = self.root / "compatibilitytools.d/droiddeck-proton-arm64" + self.write("Steam/compatibilitytools.d/droiddeck-proton-arm64/compatibilitytool.vdf", + '"compatibilitytools"\n{\n "compat_tools"\n {\n "droiddeck-proton-arm64"\n {\n' + ' "install_path" "."\n "display_name" "x"\n "from_oslist" "windows"\n' + ' "to_oslist" "linux"\n }\n }\n}\n') + self.write("Steam/compatibilitytools.d/droiddeck-proton-arm64/toolmanifest.vdf", + '"manifest"\n{\n "commandline" "/droiddeck-proton %verb%"\n}\n') + self.write("Steam/compatibilitytools.d/droiddeck-proton-arm64/droiddeck-proton", b"#!/bin/sh\n", 0o755) + self.entry = str(folder / "droiddeck-proton") + patcher = mock.patch.dict(RUN, {"EXTRA_LIBRARIES": (), "SYSTEM_TOOLS": (), "STATE": str(self.tmp / "state.json"), + "say": lambda message: None}) + patcher.start() + self.addCleanup(patcher.stop) + + def run_main(self, argv): + calls = [] + with mock.patch.dict(os.environ, {"STEAM_COMPAT_CLIENT_INSTALL_PATH": str(self.root)}), \ + mock.patch.object(RUN["os"], "execve", lambda *a: calls.append(a)), mock.patch.object(RUN["os"], "chdir"): + status = RUN["main"](argv) + return status, calls + + def test_a_named_prefix_wins_over_where_the_program_lies(self): + setup = str(self.write("Download/Battle.net-Setup.exe", b"MZ")) + status, calls = self.run_main(["--window", "--prefix", "2596113170", setup]) + self.assertIsNone(status) + entry, argv, env = calls[0] + self.assertEqual(argv, [self.entry, "waitforexitandrun", setup]) + self.assertEqual(env["STEAM_COMPAT_DATA_PATH"], str(self.root / "steamapps/compatdata/2596113170")) + self.assertEqual((env["SteamAppId"], env["SteamGameId"], env["PROTON_USE_WINED3D"]), + ("0", str(2596113170 << 32 | 0x02000000), "1")) + self.assertTrue((self.root / "steamapps/compatdata/2596113170").is_dir()) + + def test_run_starts_beside_what_runs_in_the_prefix(self): + client = str(self.write("Steam/steamapps/compatdata/2596113170/pfx/drive_c/Battle.net.exe", b"MZ")) + _, calls = self.run_main(["--verb", "run", client]) + self.assertEqual(calls[0][1], [self.entry, "run", client]) + + def test_a_launch_from_steam_keeps_its_game_id_for_gamescope(self): + client = str(self.write("Steam/steamapps/compatdata/2596113170/pfx/drive_c/Battle.net.exe", b"MZ")) + _, calls = self.run_main(["--prefix", "2596113170", "--game-id", "11151176786366644224", client]) + env = calls[0][2] + self.assertEqual((env["SteamGameId"], env["SteamOverlayGameId"]), ("11151176786366644224", "11151176786366644224")) + self.assertEqual(env["STEAM_COMPAT_DATA_PATH"], str(self.root / "steamapps/compatdata/2596113170")) + self.assertNotIn("PROTON_USE_WINED3D", env) + self.assertEqual(self.run_main(["--game-id", "0", client]), (2, [])) + + def test_start_without_steam_has_droiddeck_battlenet_launch_a_games_shortcut(self): + client = str(self.write("Steam/steamapps/compatdata/2596113170/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe", b"MZ")) + prefix = str(self.root / "steamapps/compatdata/2596113170") + options = 'STEAM_COMPAT_DATA_PATH=%s %%command%% --exec="launch Fen"' % prefix + status, calls = self.run_main(["--app", "3000000000", "--dir", os.path.dirname(client), "--options", options, "--", client]) + self.assertIsNone(status) + _, argv, env = calls[0] + self.assertEqual(argv, [self.entry, "waitforexitandrun", client, "--exec=launch Fen"]) + self.assertEqual(env["STEAM_COMPAT_DATA_PATH"], prefix) + self.assertEqual(STORE["battlenet"](argv[2:], env={}), [STORE["BATTLENET"], "launch", "Fen"]) + + def test_a_bad_prefix_or_verb_is_refused(self): + setup = str(self.write("Download/setup.exe", b"MZ")) + for argv in (["--prefix", "0", setup], ["--prefix", "07", setup], ["--prefix", "4294967296", setup], + ["--prefix", "abc", setup], ["--prefix"], ["--verb", "getcompatpath", setup]): + with self.subTest(argv): + self.assertEqual(self.run_main(list(argv)), (2, [])) + + +class ConfigAndMenuTest(Temp): + def config_path(self): + return self.tmp / ("steamapps/compatdata/%s/pfx/drive_c/users/steamuser/AppData/Roaming/Battle.net/Battle.net.config" + % BNET["APP_ID"]) + + def test_the_config_keeps_browser_hardware_acceleration_off(self): + root = str(self.tmp) + self.assertEqual(BNET["write_config"](root), "first") + path = self.config_path() + config = json.loads(path.read_text()) + self.assertEqual(config["Client"]["HardwareAcceleration"], "false") + self.assertEqual(config["Client"]["Streaming"]["StreamingEnabled"], "false") + self.assertEqual(config["Client"]["GameLaunchWindowBehavior"], "2") + self.assertIsNone(BNET["write_config"](root)) + path.write_text('{"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "0"}, "Games": {"osi": {}}}') + self.assertEqual(BNET["write_config"](root), "launch") + config = json.loads(path.read_text()) + self.assertEqual(config, {"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "2"}, "Games": {"osi": {}}}) + path.write_text('{"Client": {"HardwareAcceleration": "true", "GameLaunchWindowBehavior": "2"}}') + self.assertEqual(BNET["write_config"](root), "acceleration") + self.assertEqual(json.loads(path.read_text())["Client"]["HardwareAcceleration"], "false") + + def test_games_install_to_the_chosen_library(self): + root = str(self.tmp) + BNET["write_config"](root) + self.assertEqual(BNET["write_config"](root, "/root/Games/Stores/Battle.net"), "library") + config = json.loads(self.config_path().read_text()) + self.assertEqual(config["Client"]["Install"]["DefaultInstallPath"], "Z:/root/Games/Stores/Battle.net") + self.assertIsNone(BNET["write_config"](root, "/root/Games/Stores/Battle.net/")) + config["Client"]["Install"]["DefaultInstallPath"] = "Z:/root/Games/Stores/Battle.net/" + self.config_path().write_text(json.dumps(config)) + self.assertIsNone(BNET["write_config"](root, "/root/Games/Stores/Battle.net")) + self.assertEqual(BNET["write_config"](root, "/mnt/droiddeck-sd/Games/Battle.net"), "library") + + def test_a_config_that_is_not_json_is_left_alone(self): + path = self.config_path() + path.parent.mkdir(parents=True) + for text in ("{not json", "[1, 2]", '{"Client": "x"}'): + with self.subTest(text): + path.write_text(text) + self.assertIsNone(BNET["write_config"](str(self.tmp))) + self.assertEqual(path.read_text(), text) + + def test_the_menu_entry_is_a_window_not_a_game(self): + path = self.tmp / "applications/droiddeck-battlenet.desktop" + BNET["write_menu"](str(path)) + text = path.read_text() + self.assertIn("Exec=/usr/local/bin/droiddeck-battlenet\n", text) + self.assertIn("Name=Battle.net\n", text) + self.assertNotIn("Game", re.search(r"^Categories=(.*)$", text, re.M).group(1)) + self.assertNotIn("StartupWMClass", text) + mtime = path.stat().st_mtime_ns + time.sleep(0.01) + BNET["write_menu"](str(path)) + self.assertEqual(path.stat().st_mtime_ns, mtime) + + +class GamepadTest(Temp): + def registry(self, *entries): + rows = ["WINE REGISTRY Version 2"] + for name, uid, location in entries: + rows += ["", "[Software\\\\Wow6432Node\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\%s] 1" % name, + '"InstallLocation"="%s"' % location.replace("\\", "\\\\"), + '"UninstallString"="\\"C:\\\\ProgramData\\\\Battle.net\\\\Agent\\\\Blizzard Uninstaller.exe\\" --uid=%s"' % uid] + self.write("Steam/steamapps/compatdata/%s/pfx/system.reg" % BNET["APP_ID"], "\n".join(rows) + "\n") + + def z(self, path): + return "Z:" + str(path).replace("/", "\\") + + def test_every_world_of_warcraft_flavor_gets_controllers_on(self): + wow = self.tmp / "Games/World of Warcraft" + retail = self.write("Games/World of Warcraft/_retail_/WTF/Config.wtf", 'SET gxApi "D3D11"') + (wow / "_classic_era_").mkdir(parents=True) + (wow / "Data").mkdir() + self.registry(("World of Warcraft", "wow", self.z(wow))) + with mock.patch.dict(BNET, {"say": lambda message: None}): + self.assertEqual(len(BNET["enable_gamepad"](str(self.tmp / "Steam"))), 2) + self.assertEqual(BNET["enable_gamepad"](str(self.tmp / "Steam")), []) + self.assertEqual(retail.read_text(), 'SET gxApi "D3D11"\nSET GamePadEnable "1"\n') + self.assertEqual((wow / "_classic_era_/WTF/Config.wtf").read_text(), 'SET GamePadEnable "1"\n') + self.assertFalse((wow / "Data/WTF").exists()) + + def test_a_players_own_choice_and_other_games_are_left_alone(self): + wow = self.tmp / "Games/World of Warcraft Classic" + config = self.write("Games/World of Warcraft Classic/_anniversary_/WTF/Config.wtf", 'SET GamePadEnable "0"\n') + other = self.tmp / "Games/Diablo IV" + (other / "_retail_").mkdir(parents=True) + self.registry(("World of Warcraft Classic", "wow_classic_anniversary", self.z(wow)), ("Diablo IV", "fenris", self.z(other))) + with mock.patch.dict(BNET, {"say": lambda message: None}): + self.assertEqual(BNET["enable_gamepad"](str(self.tmp / "Steam")), []) + self.assertEqual(config.read_text(), 'SET GamePadEnable "0"\n') + self.assertFalse((other / "_retail_/WTF").exists()) + + def test_pads_look_like_an_xbox_360_pad_only_without_the_steam_client(self): + proc = self.tmp / "proc" + self.write("proc/10/cmdline", b"/usr/bin/python3\0/usr/local/bin/droiddeck-battlenet\0") + self.write("proc/11/cmdline", b"c:\\windows\\system32\\steam.exe\0") + self.assertFalse(BNET["steam_running"](str(proc))) + with mock.patch.dict(os.environ, {}, clear=False): + os.environ.pop("PROTON_SPOOF_STEAMINPUT_VIDPID", None) + with mock.patch.dict(BNET, {"steam_running": lambda: False}): + self.assertEqual(BNET["proton_env"]()["PROTON_SPOOF_STEAMINPUT_VIDPID"], "1") + with mock.patch.dict(BNET, {"steam_running": lambda: True}): + self.assertNotIn("PROTON_SPOOF_STEAMINPUT_VIDPID", BNET["proton_env"]()) + os.environ["PROTON_SPOOF_STEAMINPUT_VIDPID"] = "0" + with mock.patch.dict(BNET, {"steam_running": lambda: False}): + self.assertEqual(BNET["proton_env"]()["PROTON_SPOOF_STEAMINPUT_VIDPID"], "0") + self.write("proc/12/cmdline", b"/usr/bin/FEX\0/root/.local/share/Steam/ubuntu12_32/steam\0-silent\0") + self.assertTrue(BNET["steam_running"](str(proc))) + + +class ProcessTest(Temp): + def proc(self, pid, argv, prefix=None): + env = b"HOME=/root\0" + (("WINEPREFIX=%s\0" % prefix).encode() if prefix else b"") + self.write("proc/%d/environ" % pid, env) + self.write("proc/%d/cmdline" % pid, b"\0".join(a.encode() for a in argv) + b"\0") + + def test_the_prefixs_processes_are_found_by_their_wineprefix(self): + pfx = self.tmp / "compatdata/2596113170/pfx" + pfx.mkdir(parents=True) + self.proc(10, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe", "--from-launcher"], str(pfx) + "/") + self.proc(11, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9142\\Agent.exe"], str(pfx)) + self.proc(12, ["C:\\Games\\Other.exe"], str(self.tmp / "compatdata/42/pfx")) + self.proc(13, ["/usr/bin/bash"]) + self.write("proc/self/environ", b"") + found = BNET["wine_processes"](str(pfx), str(self.tmp / "proc")) + self.assertEqual(sorted(pid for pid, _ in found), [10, 11]) + self.assertEqual([pid for pid, argv in found if BNET["is_client"](argv)], [10]) + + def test_only_battle_net_itself_counts_as_open(self): + self.assertTrue(BNET["is_client"](["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"])) + self.assertTrue(BNET["is_client"](["/root/.local/share/Steam/x/Battle.net.exe", "--x"])) + self.assertTrue(BNET["is_client"](["battle.net.exe"])) + self.assertFalse(BNET["is_client"](["C:\\Program Files (x86)\\Battle.net\\Battle.net Launcher.exe"])) + self.assertFalse(BNET["is_client"](["C:\\users\\steamuser\\Temp\\Battle.net-Setup.exe"])) + self.assertFalse(BNET["is_client"]([])) + + def test_battle_nets_own_processes_are_those_under_its_folders(self): + for argv in (["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe", "--type=renderer"], + ["C:/ProgramData/Battle.net/Agent/Agent.9824/Agent.exe"], + ["C:\\Program Files (x86)\\Battle.net\\Battle.net Launcher.exe"]): + with self.subTest(argv): + self.assertTrue(BNET["is_battlenet"](argv)) + for argv in (["Z:\\root\\.cache\\droiddeck\\battlenet\\Battle.net-Setup.exe"], + ["Z:\\root\\Games\\Stores\\Battle.net\\Hearthstone\\Hearthstone.exe"], + ["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe"], ["C:\\windows\\system32\\services.exe"], []): + with self.subTest(argv): + self.assertFalse(BNET["is_battlenet"](argv)) + + def test_a_game_battle_net_launched_carries_its_uid(self): + self.assertTrue(BNET["launched"](["C:\\Program Files (x86)\\Diablo II Resurrected\\D2R.exe", "-uid", "osi"])) + self.assertTrue(BNET["launched"](["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe", "-launch", "-UID", "fenris"])) + for argv in (["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe"], + ["C:\\Program Files (x86)\\Diablo IV\\vc_redist.x64.exe", "/quiet"], + ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe", "-uid", "battle.net"]): + with self.subTest(argv): + self.assertFalse(BNET["launched"](argv)) + + def test_a_game_that_signs_in_with_battle_nets_token_says_so(self): + self.assertTrue(BNET["shares_sign_in"](["Diablo IV.exe", "-nostreamline", "-sso", "-launch", "-uid", "fenris"])) + self.assertFalse(BNET["shares_sign_in"](["D2R.exe", "-uid", "osi"])) + self.assertFalse(BNET["shares_sign_in"](["-sso.exe"])) + + def test_battle_net_takes_work_once_its_agent_is_up(self): + client = (1, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"]) + agent = (2, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9824\\Agent.exe"]) + self.assertTrue(BNET["agent_up"]([client, agent])) + self.assertFalse(BNET["agent_up"]([client])) + self.assertFalse(BNET["agent_up"]([agent])) + + def test_open_is_waited_for_then_closed(self): + states = iter([False, False, True, True, False]) + with mock.patch.dict(BNET, {"running": lambda pfx: next(states)}), mock.patch.object(BNET["time"], "sleep"): + self.assertTrue(BNET["wait_while_open"]("/pfx", grace=60, poll=0)) + with mock.patch.dict(BNET, {"running": lambda pfx: False}): + self.assertFalse(BNET["wait_while_open"]("/pfx", grace=0, poll=0)) + + +class ProtonWaitTest(Temp): + class Process: + def __init__(self, test, waits): + self.test, self.waits = test, waits + + def wait(self, timeout=None): + self.waits -= 1 + if self.test.stopped or self.waits < 0: + return 0 + raise BNET["subprocess"].TimeoutExpired("proton", timeout) + + def setUp(self): + super().setUp() + self.stopped = [] + + def run_proton(self, states, close_grace=0, waits=100): + states = iter(states) + last = [] + + def processes(pfx, proc="/proc"): + last[:] = next(states, last) + return list(last) + + with mock.patch.dict(BNET, {"wine_processes": processes, "say": lambda message: None, + "stop": lambda found, wait=0: self.stopped.extend(pid for pid, _ in found)}), \ + mock.patch.object(BNET["subprocess"], "Popen", lambda cmd, **kw: self.Process(self, waits)): + return BNET["proton"]("launcher.exe", watch="/pfx", poll=0, close_grace=close_grace) + + def test_agent_and_wine_left_behind_are_stopped_once_battle_net_closed(self): + client = (1, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"]) + agent = (2, ["C:/ProgramData/Battle.net/Agent/Agent.9824/Agent.exe", "--locale=enUS"]) + wine = (3, ["C:\\windows\\system32\\services.exe"]) + self.assertEqual(self.run_proton([[client, agent, wine], [agent, wine], [agent, wine]]), (0, True)) + self.assertEqual(sorted(self.stopped), [2, 3]) + + def test_nothing_is_stopped_while_a_game_still_runs(self): + client = (1, ["Battle.net.exe"]) + game = (4, ["C:\\Games\\Diablo IV\\Diablo IV.exe"]) + self.assertEqual(self.run_proton([[client, game]] + [[game]] * 5, waits=6), (0, True)) + self.assertEqual(self.stopped, []) + + def test_a_restart_to_update_is_not_a_close(self): + client = (1, ["Battle.net.exe"]) + agent = (2, ["Agent.exe"]) + states = [[client, agent], [agent], [client, agent], [agent]] + with mock.patch.object(BNET["time"], "monotonic", side_effect=[0, 0, 5, 5, 10, 10, 30, 30, 30, 30]): + self.run_proton(states, close_grace=15) + self.assertEqual(self.stopped, [2]) + + def test_battle_net_is_closed_once_a_game_is_up_and_what_is_left_once_it_exits(self): + client = (1, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"]) + agent = (2, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9824\\Agent.exe"]) + wine = (3, ["C:\\windows\\system32\\services.exe"]) + game = (4, ["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe", "-launch", "-uid", "fenris"]) + tidy = BNET["Tidy"](settle=0, gone=60) + states = [[client, agent, wine], [client, agent, wine, game], [wine, game], [wine, game], [wine], [wine]] + with mock.patch.dict(BNET, {"notify": lambda *a, **k: self.fail("notified")}): + self.assertEqual(self.run_proton_tidy(states, tidy), (0, True)) + self.assertEqual(self.stopped, [1, 2, 3]) + + def run_proton_tidy(self, states, tidy): + states = iter(states) + last = [] + test = self + + def processes(pfx, proc="/proc"): + last[:] = next(states, last) + return list(last) + + class Process: + def wait(self, timeout=None): + if 3 in test.stopped: + return 0 + raise BNET["subprocess"].TimeoutExpired("proton", timeout) + + with mock.patch.dict(BNET, {"wine_processes": processes, "say": lambda message: None, + "stop": lambda found, wait=0: self.stopped.extend(pid for pid, _ in found)}), \ + mock.patch.object(BNET["subprocess"], "Popen", lambda cmd, **kw: Process()): + return BNET["proton"]("launcher.exe", watch="/pfx", poll=0, close_grace=0, tidy=tidy) + + def test_only_wine_and_agent_are_idle(self): + self.assertTrue(BNET["idle"]([(1, ["C:\\windows\\system32\\explorer.exe", "/desktop"]), + (2, ["/x/files/bin/wineserver"]), (3, ["c:\\windows\\system32\\steam.exe", "a"])])) + self.assertFalse(BNET["idle"]([(1, ["Battle.net.exe"])])) + self.assertFalse(BNET["idle"]([(1, ["Z:\\root\\.cache\\droiddeck\\battlenet\\Battle.net-Setup.exe"])])) + + +class RequestTest(Temp): + UP = [(1, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"]), + (2, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9437\\Agent.exe"])] + + def test_the_apps_request_waits_for_battle_net_then_goes_to_it(self): + (self.tmp / "battlenet-request.00000000000000000001").write_text("install-game\nhs_beta\n") + calls = [] + with mock.patch.dict(BNET, {"spawn": lambda exe, verb, args=(): calls.append((exe, verb, list(args))) or 0}): + self.assertFalse(BNET["serve_requests"]("/p/pfx", self.UP[:1], str(self.tmp))) + self.assertTrue((self.tmp / "battlenet-request.00000000000000000001").exists()) + self.assertTrue(BNET["serve_requests"]("/p/pfx", self.UP, str(self.tmp))) + (self.tmp / "battlenet-request.00000000000000000002").write_text("launch\nWTCG\n") + self.assertTrue(BNET["serve_requests"]("/p/pfx", self.UP, str(self.tmp))) + (self.tmp / "battlenet-request.00000000000000000003").write_text("launch\nWTCG;reboot\n") + self.assertFalse(BNET["serve_requests"]("/p/pfx", self.UP, str(self.tmp))) + client = "/p/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe" + self.assertEqual(calls, [(client, "run", ["--install", "--game=hs_beta"]), (client, "run", ["--exec=launch WTCG"])]) + self.assertEqual(list(self.tmp.iterdir()), []) + + def test_requests_left_before_the_poll_are_all_served_in_order(self): + (self.tmp / "battlenet-request.00000000000000000020").write_text("launch\nOSI\n") + (self.tmp / "battlenet-request.00000000000000000010").write_text("install-game\nwow\n") + (self.tmp / "battlenet-request.00000000000000000030.tmp").write_text("install-game\nfenris\n") + calls = [] + with mock.patch.dict(BNET, {"spawn": lambda exe, verb, args=(): calls.append(list(args)) or 0}): + self.assertTrue(BNET["serve_requests"]("/p/pfx", self.UP, str(self.tmp))) + self.assertEqual(calls, [["--install", "--game=wow"], ["--exec=launch OSI"]]) + self.assertEqual([p.name for p in self.tmp.iterdir()], ["battlenet-request.00000000000000000030.tmp"]) + + +class TidyTest(unittest.TestCase): + CLIENT = (1, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"]) + PAGE = (2, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe", "--type=renderer"]) + AGENT = (3, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9824\\Agent.exe"]) + WINE = (4, ["C:\\windows\\system32\\services.exe"]) + GAME = (5, ["C:\\Program Files (x86)\\Diablo II Resurrected\\D2R.exe", "-uid", "osi"]) + + def setUp(self): + self.stopped = [] + self.notified = [] + patcher = mock.patch.dict(BNET, { + "say": lambda message: None, + "stop": lambda found, wait=0: self.stopped.append(sorted(pid for pid, _ in found)), + "notify": lambda title, body, icon=None: self.notified.append(title), + }) + patcher.start() + self.addCleanup(patcher.stop) + + def run_tidy(self, tidy, timeline): + return [tidy(processes, now) for now, processes in timeline] + + def test_battle_net_and_its_agent_close_once_the_game_has_run_a_while(self): + up = [self.CLIENT, self.PAGE, self.AGENT, self.WINE] + tidy = BNET["Tidy"](settle=20, gone=30) + closed = self.run_tidy(tidy, [(0, up), (5, up + [self.GAME]), (24, up + [self.GAME]), (25, up + [self.GAME]), + (40, up + [self.GAME])]) + self.assertEqual(closed, [False, False, False, True, False]) + self.assertEqual(self.stopped, [[1, 2, 3]]) + self.assertEqual(self.notified, []) + + def test_battle_net_beside_a_game_signing_in_with_its_token_is_left_open(self): + d4 = (6, ["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe", "-nostreamline", "-sso", "-launch", "-uid", "fenris"]) + up = [self.CLIENT, self.PAGE, self.AGENT] + tidy = BNET["Tidy"](settle=20, gone=30) + closed = self.run_tidy(tidy, [(0, up + [d4]), (25, up + [d4]), (30, [self.CLIENT, self.PAGE, d4]), + (100, [self.CLIENT, self.PAGE, d4])]) + self.assertEqual(closed, [False, False, False, False]) + self.assertEqual(self.stopped, []) + self.assertEqual(self.notified, []) + + def test_what_battle_net_left_beside_such_a_game_once_closed_itself_is_stopped(self): + d4 = (6, ["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe", "-sso", "-launch", "-uid", "fenris"]) + tidy = BNET["Tidy"](settle=20, gone=30) + self.run_tidy(tidy, [(0, [self.CLIENT, self.AGENT, d4]), (5, [self.AGENT, d4]), (20, [self.AGENT, d4])]) + self.assertEqual(self.stopped, [[3]]) + + def test_what_battle_net_did_not_launch_closes_nothing(self): + up = [self.CLIENT, self.AGENT] + redist = (6, ["C:\\Program Files (x86)\\Diablo IV\\vc_redist.x64.exe", "/install"]) + tidy = BNET["Tidy"](settle=0, gone=30) + self.assertEqual(self.run_tidy(tidy, [(0, up + [redist]), (100, up + [redist])]), [False, False]) + self.assertEqual(self.stopped, []) + + def test_a_game_that_exits_and_starts_again_counts_afresh(self): + tidy = BNET["Tidy"](settle=20, gone=30) + up = [self.CLIENT, self.AGENT] + self.run_tidy(tidy, [(0, up + [self.GAME]), (20, up + [self.GAME]), (30, up), (40, up + [self.GAME]), + (55, up + [self.GAME]), (60, up + [self.GAME])]) + self.assertEqual(self.stopped, [[1, 3], [1, 3]]) + + def test_battle_net_outliving_its_agent_is_closed(self): + tidy = BNET["Tidy"](settle=20, gone=30) + with_agent = [self.CLIENT, self.PAGE, self.AGENT, self.WINE] + without = [self.CLIENT, self.PAGE, self.WINE] + closed = self.run_tidy(tidy, [(0, with_agent), (10, without), (39, without), (40, without), (41, without)]) + self.assertEqual(closed, [False, False, False, True, False]) + self.assertEqual(self.stopped, [[1, 2]]) + self.assertEqual(self.notified, ["Battle.net was closed"]) + + def test_an_agent_back_within_the_grace_keeps_battle_net(self): + tidy = BNET["Tidy"](settle=20, gone=30) + with_agent = [self.CLIENT, self.AGENT] + without = [self.CLIENT] + self.run_tidy(tidy, [(0, with_agent), (10, without), (35, with_agent), (50, without), (79, without)]) + self.assertEqual(self.stopped, []) + + def test_a_battle_net_still_starting_its_agent_is_left_alone(self): + tidy = BNET["Tidy"](settle=20, gone=30) + self.run_tidy(tidy, [(0, [self.CLIENT]), (100, [self.CLIENT]), (1000, [self.CLIENT, self.WINE])]) + self.assertEqual(self.stopped, []) + + def test_a_closed_battle_net_starts_its_count_over(self): + tidy = BNET["Tidy"](settle=20, gone=30) + self.run_tidy(tidy, [(0, [self.CLIENT, self.AGENT]), (10, [self.AGENT]), (20, [self.CLIENT]), (100, [self.CLIENT])]) + self.assertEqual(self.stopped, []) + + +class FexRequestTest(Temp): + def answer(self, text, delay=0.2): + def respond(): + request = self.tmp / BNET["FEX_REQUEST"] + deadline = time.monotonic() + 5 + while not request.exists() and time.monotonic() < deadline: + time.sleep(0.02) + self.requested = request.read_text() + request.unlink() + time.sleep(delay) + (self.tmp / (BNET["FEX_RESULT"] + ".tmp")).write_text(text + "\n") + os.replace(self.tmp / (BNET["FEX_RESULT"] + ".tmp"), self.tmp / BNET["FEX_RESULT"]) + thread = threading.Thread(target=respond) + thread.start() + self.addCleanup(thread.join) + + def test_the_apps_answer_comes_back(self): + (self.tmp / BNET["FEX_RESULT"]).write_text("ok an-old-answer\n") + self.answer("ok FEXCore-2610-d2rfix28-linux.wcp") + self.assertEqual(BNET["ask_fex"](str(self.tmp), wait=5), "ok FEXCore-2610-d2rfix28-linux.wcp") + self.assertEqual(self.requested, "appid=%s\n" % BNET["APP_ID"]) + self.assertFalse((self.tmp / BNET["FEX_RESULT"]).exists()) + + def test_no_answer_or_no_session_starts_without_one(self): + with mock.patch.dict(BNET, {"say": lambda message: None}): + self.assertIsNone(BNET["ask_fex"](str(self.tmp), wait=0.3)) + self.assertIsNone(BNET["ask_fex"](None)) + self.assertIsNone(BNET["ask_fex"](str(self.tmp / "gone"))) + + +class OpenTest(Temp): + def setUp(self): + super().setUp() + self.root = str(self.tmp / "Steam") + self.calls = [] + self.alive = [] + self.menu = self.tmp / "droiddeck-battlenet.desktop" + patcher = mock.patch.dict(BNET, { + "ask_fex": lambda launch_dir, wait=0: "ok fex.wcp", + "say": lambda message: None, "notify": lambda *a, **k: self.calls.append(("notify", a[0])), + "wine_processes": lambda pfx, proc="/proc": list(self.alive), + "stop": lambda processes, wait=0: self.calls.append(("stop", [pid for pid, _ in processes])) or self.alive.clear(), + "write_menu": lambda path=None: self.calls.append(("menu",)), + "START_GRACE": 0, "POLL": 0, + }) + patcher.start() + self.addCleanup(patcher.stop) + + def client(self): + return self.write("Steam/steamapps/compatdata/%s/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net Launcher.exe" + % BNET["APP_ID"], b"MZ") + + def proton(self, effects): + effects = iter(effects) + + def fake(program, args=(), verb=None, watch=None, poll=0): + status, seen, side = next(effects) + self.calls.append(("proton", os.path.basename(program), verb)) + if side: + side() + return status, seen + return fake + + def test_an_installed_client_opens_and_the_start_waits_for_it(self): + self.client() + with mock.patch.dict(BNET, {"proton": self.proton([(0, True, None)])}): + self.assertEqual(BNET["open_client"](self.root), 0) + self.assertEqual(self.calls, [("menu",), ("proton", "Battle.net Launcher.exe", None)]) + + def test_what_a_closed_battle_net_left_is_stopped_first(self): + self.client() + self.alive.append((40, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.exe"])) + with mock.patch.dict(BNET, {"proton": self.proton([(0, True, None)])}): + self.assertEqual(BNET["open_client"](self.root), 0) + self.assertEqual(self.calls[:2], [("menu",), ("stop", [40])]) + + def test_without_a_client_the_installer_runs_and_hands_over(self): + setup = self.write("cache/Battle.net-Setup.exe", b"MZ") + with mock.patch.dict(BNET, {"download": lambda: str(setup), "proton": self.proton([(0, True, self.client)])}): + self.assertEqual(BNET["open_client"](self.root), 0) + self.assertEqual([c for c in self.calls if c[0] != "notify"], [("menu",), ("proton", "Battle.net-Setup.exe", None)]) + config = Path(self.root) / ("steamapps/compatdata/%s/pfx/drive_c/users/steamuser/AppData/Roaming/Battle.net/Battle.net.config" + % BNET["APP_ID"]) + self.assertTrue(config.is_file()) + + def test_an_installer_that_did_not_start_it_is_followed_by_the_launcher(self): + setup = self.write("cache/Battle.net-Setup.exe", b"MZ") + effects = [(0, False, self.client), (0, True, None)] + with mock.patch.dict(BNET, {"download": lambda: str(setup), "proton": self.proton(effects)}): + self.assertEqual(BNET["open_client"](self.root), 0) + self.assertEqual([c[1] for c in self.calls if c[0] == "proton"], ["Battle.net-Setup.exe", "Battle.net Launcher.exe"]) + + def test_a_failed_install_says_so(self): + setup = self.write("cache/Battle.net-Setup.exe", b"MZ") + with mock.patch.dict(BNET, {"download": lambda: str(setup), "proton": self.proton([(1, False, None)])}): + self.assertEqual(BNET["open_client"](self.root), 1) + self.assertIn(("notify", "Battle.net did not install"), self.calls) + + def test_no_download_is_no_install(self): + with mock.patch.dict(BNET, {"download": lambda: None, "proton": self.proton([])}): + self.assertEqual(BNET["open_client"](self.root), 1) + self.assertIn(("notify", "Battle.net could not be downloaded"), self.calls) + self.assertEqual(self.calls[0], ("menu",)) + + def test_a_cut_off_installer_download_is_not_kept(self): + import http.client + import io + + class Response(io.BytesIO): + def __init__(self, body, length): + super().__init__(body) + self.headers = {"Content-Length": str(length)} + + folder = str(self.tmp / "dl") + body = b"MZ" + b"\0" * (BNET["MIN_INSTALLER"] + 10) + with mock.patch.object(BNET["urllib"].request, "urlopen", lambda *a, **k: Response(body, len(body) + 100)), \ + mock.patch.object(BNET["shutil"], "which", lambda name: None): + self.assertIsNone(BNET["download"]("https://example.invalid/setup.exe", folder)) + self.assertEqual(os.listdir(folder), []) + + def broken(*a, **k): + raise http.client.IncompleteRead(b"MZ") + with mock.patch.object(BNET["urllib"].request, "urlopen", broken), \ + mock.patch.object(BNET["shutil"], "which", lambda name: None): + self.assertIsNone(BNET["download"]("https://example.invalid/setup.exe", folder)) + self.assertEqual(os.listdir(folder), []) + + with mock.patch.object(BNET["urllib"].request, "urlopen", lambda *a, **k: Response(body, len(body))): + self.assertEqual(BNET["download"]("https://example.invalid/setup.exe", folder), os.path.join(folder, BNET["SETUP"])) + + def test_a_client_that_never_starts_is_reported(self): + self.client() + with mock.patch.dict(BNET, {"proton": self.proton([(3, False, None)])}): + self.assertEqual(BNET["open_client"](self.root), 3) + self.assertIn(("notify", "Battle.net did not start"), self.calls) + + def test_a_second_start_shows_the_open_window_and_returns(self): + client = self.write("Steam/steamapps/compatdata/%s/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe" + % BNET["APP_ID"], b"MZ") + self.alive.extend([(50, [str(client)]), (51, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9824\\Agent.exe"])]) + started = [] + with mock.patch.object(BNET["subprocess"], "Popen", lambda cmd, **kw: started.append((cmd, kw)) or mock.Mock()), \ + mock.patch.dict(os.environ, {"BL_DESKTOP": "1"}), \ + mock.patch.dict(BNET, {"CACHE": str(self.tmp / "cache"), "acquire": lambda: self.fail("took the lock")}): + self.assertIsNone(BNET["show"](self.root, wait=60, poll=0)) + cmd, kw = started[0] + self.assertEqual(cmd, [BNET["PROTON_RUN"], "--window", "--prefix", BNET["APP_ID"], "--verb", "run", str(client)]) + self.assertTrue(kw["start_new_session"]) + self.assertEqual(kw["stdin"], BNET["subprocess"].DEVNULL) + self.assertEqual(kw["stdout"].name, str(self.tmp / "cache/spawned.log")) + self.assertIs(kw["stderr"], kw["stdout"]) + + def test_a_battle_net_without_its_agent_is_not_handed_the_start(self): + self.write("Steam/steamapps/compatdata/%s/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe" + % BNET["APP_ID"], b"MZ") + self.alive.append((50, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"])) + tries = iter([None, None, "the lock"]) + with mock.patch.dict(BNET, {"acquire": lambda: next(tries), "spawn": lambda *a, **k: self.fail("handed over")}): + self.assertEqual(BNET["show"](self.root, wait=60, poll=0), "the lock") + + def test_a_second_start_while_the_first_ends_opens_battle_net_itself(self): + tries = iter([None, None, "the lock"]) + with mock.patch.dict(BNET, {"acquire": lambda: next(tries)}): + self.assertEqual(BNET["show"](self.root, wait=60, poll=0), "the lock") + + def test_a_second_start_gives_up_when_the_first_neither_opens_nor_ends(self): + with mock.patch.dict(BNET, {"acquire": lambda: None}): + self.assertIsNone(BNET["show"](self.root, wait=0, poll=0)) + self.assertEqual(self.calls[-1], ("notify", "Battle.net is busy")) + + def test_a_game_in_the_prefix_is_left_running_and_battle_net_starts_beside_it(self): + self.client() + self.alive.append((41, ["C:\\Program Files (x86)\\Overwatch\\_retail_\\Overwatch.exe"])) + with mock.patch.dict(BNET, {"proton": self.proton([(0, True, None)])}): + self.assertEqual(BNET["open_client"](self.root), 0) + self.assertNotIn("stop", [c[0] for c in self.calls]) + self.assertIn(("proton", "Battle.net Launcher.exe", "run"), self.calls) + + def test_one_start_at_a_time(self): + first = BNET["acquire"](str(self.tmp / "lock")) + self.assertIsNotNone(first) + self.assertIsNone(BNET["acquire"](str(self.tmp / "lock"))) + first.close() + again = BNET["acquire"](str(self.tmp / "lock")) + self.assertIsNotNone(again) + again.close() + + def test_status_says_where_it_is(self): + self.client() + status = BNET["status"](self.root) + self.assertEqual((status["appid"], status["installed"], status["running"]), (int(BNET["APP_ID"]), True, False)) + self.assertTrue(status["launcher"].endswith("Battle.net/Battle.net Launcher.exe")) + + +class Harness(Temp): + CLIENT = ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"] + GAME = ["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe"] + AGENT = ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9824\\Agent.exe"] + + class Lock: + def __init__(self): + self.closed = False + + def close(self): + self.closed = True + + def __enter__(self): + return self + + def __exit__(self, *exc): + self.close() + + class Proton: + def wait(self, timeout=None): + return 0 + + def setUp(self): + super().setUp() + env = mock.patch.dict(os.environ) + env.start() + self.addCleanup(env.stop) + self.root = str(self.tmp / "Steam") + self.calls = [] + self.lock = self.Lock() + self.states = [] + self.last = [] + patcher = mock.patch.dict(BNET, { + "ask_fex": lambda launch_dir, wait=0: self.calls.append(("fex",)) or "ok fex.wcp", + "say": lambda message: None, "notify": lambda *a, **k: self.calls.append(("notify", a[0])), + "wine_processes": self.processes, + "stop": lambda processes, wait=0: self.calls.append(("stop", sorted(pid for pid, _ in processes))), + "start": lambda exe, verb=None: self.calls.append(("start", os.path.basename(exe), verb)) or self.Proton(), + "spawn": lambda program, verb, args=(): self.calls.append(("spawn", os.path.basename(program), verb, list(args))), + "acquire": lambda folder=None: self.lock, + "POLL": 0, "READY_SETTLE": 0, "GAME_GRACE": 0, "CLIENT_WAIT": 0, + }) + patcher.start() + self.addCleanup(patcher.stop) + + def processes(self, pfx, proc="/proc"): + if self.states: + self.last = self.states.pop(0) + return list(self.last) + + def install(self): + for name in ("Battle.net Launcher.exe", "Battle.net.exe"): + self.write("Steam/steamapps/compatdata/%s/pfx/drive_c/Program Files (x86)/Battle.net/%s" % (BNET["APP_ID"], name), b"MZ") + + def clients(self, n=5, first=10): + return [(first + i, self.CLIENT + (["--type=renderer"] if i else [])) for i in range(n)] + +class LaunchTest(Harness): + def test_battle_net_is_opened_for_the_game_and_closed_after_it(self): + self.install() + up = self.clients() + [(30, self.AGENT)] + self.states = [[], [], up, up + [(40, self.GAME)], up, up] + self.assertEqual(BNET["launch"](self.root, "Fen"), 0) + self.assertEqual(self.calls, [ + ("fex",), ("start", "Battle.net Launcher.exe", None), + ("spawn", "Battle.net.exe", "run", ["--exec=launch Fen"]), + ("stop", [10, 11, 12, 13, 14, 30]), + ]) + self.assertTrue(self.lock.closed) + + def test_battle_net_is_closed_once_the_game_is_up(self): + self.install() + up = self.clients() + [(30, self.AGENT)] + game = (40, self.GAME + ["-launch", "-uid", "fenris"]) + wine = (50, ["C:\\windows\\system32\\services.exe"]) + self.states = [[], [], up, up + [game, wine], [game, wine], [game, wine], [wine], [wine]] + with mock.patch.dict(BNET, {"GAME_SETTLE": 0}): + self.assertEqual(BNET["launch"](self.root, "Fen"), 0) + self.assertEqual(self.calls, [ + ("fex",), ("start", "Battle.net Launcher.exe", None), + ("spawn", "Battle.net.exe", "run", ["--exec=launch Fen"]), + ("stop", [10, 11, 12, 13, 14, 30]), + ("stop", [50]), + ]) + + def test_a_battle_net_opened_for_a_game_closes_itself_as_it_launches_it(self): + self.install() + self.states = [[], [], [], []] + BNET["launch"](self.root, "Fen") + config = Path(self.root) / ("steamapps/compatdata/%s/pfx/drive_c/users/steamuser/AppData/Roaming/Battle.net/Battle.net.config" + % BNET["APP_ID"]) + self.assertEqual(json.loads(config.read_text())["Client"]["GameLaunchWindowBehavior"], "2") + + def test_battle_net_beside_a_game_signing_in_with_its_token_closes_only_after_it(self): + self.install() + up = self.clients() + [(30, self.AGENT)] + d4 = (40, self.GAME + ["-sso", "-launch", "-uid", "fenris"]) + self.states = [[], [], up, up + [d4], up + [d4], up + [d4], up, up] + with mock.patch.dict(BNET, {"GAME_SETTLE": 0}): + self.assertEqual(BNET["launch"](self.root, "Fen"), 0) + self.assertEqual([c for c in self.calls if c[0] == "stop"], [("stop", [10, 11, 12, 13, 14, 30])]) + + def test_battle_net_closing_itself_as_it_launches_the_game_is_not_an_end(self): + game = (40, self.GAME + ["-uid", "fenris"]) + self.states = [[], [game], [game], [], []] + times = iter([0, 5, 6, 10, 30]) + with mock.patch.object(BNET["time"], "monotonic", lambda: next(times)): + self.assertTrue(BNET["follow"]("/pfx", poll=0, grace=15)) + + def test_battle_net_that_only_selected_the_game_is_asked_again(self): + up = self.clients() + game = (40, self.GAME + ["-uid", "s1"]) + self.states = [up, up, up, up + [game], [game], [], []] + asks = [] + times = iter([0, 16, 32, 33, 34, 50, 70]) + with mock.patch.object(BNET["time"], "monotonic", lambda: next(times)): + self.assertTrue(BNET["follow"]("/pfx", poll=0, grace=15, ask=lambda: asks.append(1))) + self.assertEqual(len(asks), 2) + + def test_battle_net_is_asked_at_most_three_times(self): + up = self.clients() + self.states = [up] * 6 + [[], []] + asks = [] + times = iter([0, 20, 40, 60, 80, 100, 101, 130]) + with mock.patch.object(BNET["time"], "monotonic", lambda: next(times)): + self.assertFalse(BNET["follow"]("/pfx", poll=0, grace=15, ask=lambda: asks.append(1))) + self.assertEqual(len(asks), 2) + + def test_the_wallpaper_is_droiddecks_logo_on_its_dark_gradient(self): + bmp = BNET["wallpaper_bmp"](192, 108) + self.assertEqual(bmp[:2], b"BM") + self.assertEqual(int.from_bytes(bmp[2:6], "little"), len(bmp)) + self.assertEqual((int.from_bytes(bmp[18:22], "little"), int.from_bytes(bmp[22:26], "little")), (192, 108)) + + def pixel(x, y): + at = 54 + (107 - y) * 192 * 3 + x * 3 + return tuple(bmp[at + 2 - i] for i in range(3)) + self.assertEqual(pixel(95, 54), (26, 159, 255)) + self.assertTrue(all(c < 16 for c in pixel(0, 0))) + + def test_battle_nets_desktop_shows_the_wallpaper(self): + self.install() + pfx = Path(self.root) / ("steamapps/compatdata/%s/pfx" % BNET["APP_ID"]) + (pfx / "user.reg").write_text("WINE REGISTRY Version 2\n") + with mock.patch.dict(os.environ, {"BL_WIDTH": "160", "BL_HEIGHT": "90"}), \ + mock.patch.dict(BNET, {"wallpaper_bmp": lambda w, h: b"BM%dx%d" % (w, h)}): + self.assertTrue(BNET["wallpaper"](self.root)) + self.assertTrue(BNET["wallpaper"](self.root)) + image = pfx / "drive_c/users/steamuser/AppData/Local/DroidDeck/wallpaper-160x90.bmp" + self.assertEqual(image.read_bytes(), b"BM160x90") + reg = (pfx / "user.reg").read_text() + self.assertEqual(reg.count('"Wallpaper"="C:\\\\users\\\\steamuser\\\\AppData\\\\Local\\\\DroidDeck\\\\wallpaper-160x90.bmp"'), 1) + self.assertIn('[Control Panel\\\\Desktop]', reg) + self.assertIn('"Background"="4 6 11"', reg) + self.assertIn('"WallpaperStyle"="0"', reg) + + def test_a_large_desktop_gets_a_stretched_smaller_wallpaper(self): + self.install() + pfx = Path(self.root) / ("steamapps/compatdata/%s/pfx" % BNET["APP_ID"]) + (pfx / "user.reg").write_text("WINE REGISTRY Version 2\n") + with mock.patch.dict(os.environ, {"BL_WIDTH": "2560", "BL_HEIGHT": "1600"}), \ + mock.patch.dict(BNET, {"wallpaper_bmp": lambda w, h: b"BM%dx%d" % (w, h)}): + self.assertTrue(BNET["wallpaper"](self.root)) + image = pfx / "drive_c/users/steamuser/AppData/Local/DroidDeck/wallpaper-1152x720.bmp" + self.assertEqual(image.read_bytes(), b"BM1152x720") + self.assertIn('"WallpaperStyle"="2"', (pfx / "user.reg").read_text()) + + def test_an_open_battle_net_is_handed_the_game(self): + self.install() + up = self.clients() + self.states = [up, up, up + [(40, self.GAME)], up] + self.assertEqual(BNET["launch"](self.root, "OSI"), 0) + self.assertEqual(self.calls, [("spawn", "Battle.net.exe", "run", ["--exec=launch OSI"])]) + + def test_the_desktops_battle_net_holding_the_lock_is_handed_the_game(self): + self.install() + up = self.clients() + self.states = [up, up + [(40, self.GAME)], up] + with mock.patch.dict(BNET, {"acquire": lambda folder=None: None}): + self.assertEqual(BNET["launch"](self.root, "Pro"), 0) + self.assertEqual(self.calls, [("spawn", "Battle.net.exe", "run", ["--exec=launch Pro"])]) + + def test_battle_net_closed_before_the_game_started(self): + self.install() + up = self.clients() + self.states = [[], [], up, up, [(30, self.AGENT)], [(30, self.AGENT)]] + self.assertEqual(BNET["launch"](self.root, "Fen"), 1) + self.assertEqual(self.calls[-1], ("stop", [30])) + + def test_no_client_no_launch(self): + self.assertEqual(BNET["launch"](self.root, "Fen"), 1) + self.assertEqual(self.calls, [("notify", "Battle.net is not installed")]) + + def test_a_battle_net_that_never_opens_launches_nothing(self): + self.install() + self.states = [[], [], []] + self.assertEqual(BNET["launch"](self.root, "Fen"), 1) + self.assertNotIn("spawn", [c[0] for c in self.calls]) + self.assertIn(("notify", "Battle.net did not start"), self.calls) + + def test_a_game_is_a_windows_program_neither_wines_nor_battle_nets(self): + self.assertTrue(BNET["is_game"](self.GAME)) + self.assertTrue(BNET["is_game"](["c:/Program Files (x86)/Overwatch/_retail_/Overwatch.exe", "-uid", "prometheus"])) + self.assertTrue(BNET["is_game"](["C:\\Program Files (x86)\\Diablo IV\\BlizzardError\\BlizzardError.exe"])) + for argv in (self.CLIENT, self.AGENT, ["C:\\Program Files (x86)\\Battle.net\\Battle.net Launcher.exe"], + ["C:\\windows\\system32\\services.exe"], ["C:\\windows\\system32\\lsass.exe"], ["C:\\windows\\system32\\rundll32.exe", "setupapi"], + ["c:\\windows\\system32\\steam.exe", "x"], ["/x/files/bin/wineserver"], ["/usr/bin/python3", "proton"], []): + with self.subTest(argv): + self.assertFalse(BNET["is_game"](argv)) + + def test_battle_net_shows_in_the_desktops_window_or_as_the_steam_launch(self): + with mock.patch.dict(os.environ, {"BL_DESKTOP": "1", "SteamGameId": "123"}): + self.assertEqual(BNET["proton_options"](), ["--window"]) + with mock.patch.dict(os.environ, {"SteamGameId": "11151176786366644224"}): + os.environ.pop("BL_DESKTOP", None) + self.assertEqual(BNET["proton_options"](), ["--game-id", "11151176786366644224"]) + os.environ["SteamGameId"] = "0" + self.assertEqual(BNET["proton_options"](), []) + + def test_under_gamescope_battle_net_gets_a_desktop_of_the_screens_size(self): + with mock.patch.dict(os.environ, {"BL_WIDTH": "1280", "BL_HEIGHT": "720", "SteamGameId": "0"}): + os.environ.pop("BL_DESKTOP", None) + self.assertEqual(BNET["proton_options"](), ["--desktop", "1280x720"]) + os.environ["BL_DESKTOP"] = "1" + self.assertEqual(BNET["proton_options"](), ["--window"]) + + def test_the_library_comes_before_the_action(self): + seen = [] + self.addCleanup(BNET.__setitem__, "LIBRARY", None) + with mock.patch.dict(BNET, {"launch": lambda root, code: seen.append((BNET["LIBRARY"], code)) or 0}): + self.assertEqual(BNET["main"](["--library", "/root/Games/Stores/Battle.net", "launch", "WTCG"]), 0) + self.assertEqual(BNET["main"](["--library", "Games", "launch", "WTCG"]), 2) + self.assertEqual(seen, [("/root/Games/Stores/Battle.net", "WTCG")]) + + def test_only_a_code_is_launched(self): + with mock.patch.dict(BNET, {"launch": lambda root, code: self.calls.append(("launch", code)) or 0}): + for argv in (["launch"], ["launch", "Fen;rm -rf /"], ["launch", "Fen", "x"], ["open", "x"], ["bogus"]): + with self.subTest(argv): + self.assertEqual(BNET["main"](argv), 2) + self.assertEqual(BNET["main"](["launch", "Fen"]), 0) + self.assertEqual(self.calls, [("launch", "Fen")]) + self.assertEqual(os.environ.get("BL_BATTLENET"), "1") + + +class InstallGameTest(Harness): + def setUp(self): + super().setUp() + BNET_PATCH = mock.patch.dict(BNET, { + "open_client": lambda root, reinstall=False: self.calls.append(("open",)) or 0, + "hand_over": lambda root, args, wait=None: self.calls.append(("hand_over", list(args))), + "show": lambda root, wait=None, poll=None, args=(): self.calls.append(("show", list(args))), + }) + BNET_PATCH.start() + self.addCleanup(BNET_PATCH.stop) + thread = mock.patch.object(BNET["threading"], "Thread", lambda target, args, daemon: mock.Mock(start=lambda: target(*args))) + thread.start() + self.addCleanup(thread.stop) + + def test_the_open_battle_net_is_asked(self): + self.install() + self.states = [self.clients() + [(30, self.AGENT)]] + self.assertEqual(BNET["install_game"](self.root, "fenris"), 0) + self.assertEqual(self.calls, [("spawn", "Battle.net.exe", "run", ["--install", "--game=fenris"])]) + self.assertFalse(self.lock.closed) + + def test_an_open_battle_net_without_its_agent_is_asked_once_it_has_one(self): + self.install() + self.states = [self.clients()] + with mock.patch.dict(BNET, {"acquire": lambda folder=None: None}): + self.assertEqual(BNET["install_game"](self.root, "fenris"), 0) + self.assertEqual(self.calls, [("show", ["--install", "--game=fenris"])]) + + def test_battle_net_is_opened_and_asked_once_it_is_up(self): + self.install() + self.assertEqual(BNET["install_game"](self.root, "osi"), 0) + self.assertEqual(self.calls, [("hand_over", ["--install", "--game=osi"]), ("open",)]) + + def test_without_battle_net_it_is_installed_first_then_asked(self): + self.assertEqual(BNET["install_game"](self.root, "hs_beta"), 0) + self.assertEqual(self.calls, [("hand_over", ["--install", "--game=hs_beta"]), ("open",)]) + + def test_another_start_holding_the_lock_hands_it_on(self): + with mock.patch.dict(BNET, {"acquire": lambda folder=None: None}): + self.assertEqual(BNET["install_game"](self.root, "prometheus"), 0) + self.assertEqual(self.calls, [("show", ["--install", "--game=prometheus"])]) + + def test_only_an_id_is_asked_for(self): + with mock.patch.dict(BNET, {"install_game": lambda root, uid: self.calls.append(("get", uid)) or 0}): + for argv in (["install-game"], ["install-game", "Fenris"], ["install-game", "osi;rm"], ["install-game", "osi", "x"]): + with self.subTest(argv): + self.assertEqual(BNET["main"](argv), 2) + self.assertEqual(BNET["main"](["install-game", "hs_beta"]), 0) + self.assertEqual(self.calls, [("get", "hs_beta")]) + + +class HandOverTest(Harness): + def test_once_battle_net_is_up_it_is_asked(self): + self.install() + self.states = [[], self.clients()] + self.assertTrue(BNET["hand_over"](self.root, ["--install", "--game=osi"], wait=60)) + self.assertEqual(self.calls, [("spawn", "Battle.net.exe", "run", ["--install", "--game=osi"])]) + + def test_a_battle_net_that_never_comes_up_is_not_asked(self): + self.install() + self.states = [[]] + self.assertFalse(BNET["hand_over"](self.root, ["--install", "--game=osi"], wait=0)) + self.assertEqual(self.calls, []) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_desktop_open.py b/tools/tests/test_desktop_open.py index 085b1a7479..227fd31ba7 100644 --- a/tools/tests/test_desktop_open.py +++ b/tools/tests/test_desktop_open.py @@ -456,6 +456,15 @@ class ProtonRunTest(Temp): ("0", "0", str(appid << 32 | 0x02000000), "1")) self.assertEqual(env["STEAM_COMPAT_DATA_PATH"], str(self.root / ("steamapps/compatdata/%d" % appid))) + def test_a_window_draws_with_the_desktops_software_gl(self): + target = RUN["Target"]("2596113170", "/c", "/i", str(self.root), "fixed") + session = {"MESA_LOADER_DRIVER_OVERRIDE": "zink", "GALLIUM_DRIVER": "zink", "LIBGL_KOPPER_DRI2": "true"} + env = RUN["environment"](session, target, "/tool", str(self.root), window=True) + self.assertEqual((env["LIBGL_ALWAYS_SOFTWARE"], env["GALLIUM_DRIVER"]), ("1", "llvmpipe")) + self.assertNotIn("MESA_LOADER_DRIVER_OVERRIDE", env) + self.assertNotIn("LIBGL_KOPPER_DRI2", env) + self.assertEqual(RUN["environment"](session, target, "/tool", str(self.root))["GALLIUM_DRIVER"], "zink") + def test_a_steam_game_keeps_its_own_id(self): target = RUN["Target"]("413150", "/c", "/i", str(self.root), "steam") env = RUN["environment"]({"PROTON_USE_WINED3D": "0"}, target, "/tool", str(self.root), window=True) @@ -465,6 +474,13 @@ class ProtonRunTest(Temp): self.assertEqual(RUN["arguments"]("/root/x/setup.msi", ["/qn"]), ["msiexec", "/i", "Z:\\root\\x\\setup.msi", "/qn"]) self.assertEqual(RUN["arguments"]("/root/x/a.exe", ["-w"]), ["/root/x/a.exe", "-w"]) + def test_a_virtual_desktop_runs_the_program_by_its_windows_path(self): + pfx = "/root/Steam/steamapps/compatdata/2596113170" + self.assertEqual(RUN["arguments"](pfx + "/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net Launcher.exe", [], "1280x720", pfx), + ["explorer.exe", "/desktop=droiddeck,1280x720", "C:\\Program Files (x86)\\Battle.net\\Battle.net Launcher.exe"]) + self.assertEqual(RUN["arguments"]("/root/.cache/setup.exe", ["--lang=enUS"], "1920x1080", pfx), + ["explorer.exe", "/desktop=droiddeck,1920x1080", "Z:\\root\\.cache\\setup.exe", "--lang=enUS"]) + def test_a_games_own_program_is_left_to_steam(self): self.write("Steam/appcache/appinfo.vdf", appinfo({413150: STARDEW})) self.assertEqual(RUN["compat"]()["launch_programs"](STARDEW["config"]), diff --git a/tools/tests/test_store_launch.py b/tools/tests/test_store_launch.py index 5da2972ed9..c42448424a 100644 --- a/tools/tests/test_store_launch.py +++ b/tools/tests/test_store_launch.py @@ -277,11 +277,40 @@ class CloudHooks(unittest.TestCase): for sh in (compat.LAUNCHER_SH, compat.EXTRA_WRAPPER_SH): self.assertIn('bl_run ${BL_TASKSET:-} /usr/local/bin/droiddeck-game-env', sh) self.assertNotIn('exec ${BL_TASKSET:-} /usr/local/bin/droiddeck-game-env', sh) - self.assertIn('[ $? -eq 10 ] && BL_STORE_EXIT=1', compat.BL_STORE_SETUP) + self.assertIn('[ $rc -eq 10 ] && BL_STORE_EXIT=1', compat.BL_STORE_SETUP) self.assertIn('droiddeck-store-launch --exited --code "$rc" "${BL_STORE_ARGS[@]}"', compat.BL_STORE_SETUP) self.assertIn('exec "$@"', compat.BL_STORE_SETUP) +BNET_EXE = '/root/.local/share/Steam/steamapps/compatdata/2596113170/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe' + + +class BattleNet(unittest.TestCase): + def test_a_games_shortcut_is_handed_to_droiddeck_battlenet(self): + self.assertEqual([store.BATTLENET, 'launch', 'Fen'], store.battlenet(['waitforexitandrun', BNET_EXE, '--exec=launch Fen'], env={})) + self.assertEqual([store.BATTLENET, 'launch', 'OSI'], store.battlenet(['"%s"' % BNET_EXE, '--exec="launch OSI"'], env={})) + self.assertEqual([store.BATTLENET, 'open'], store.battlenet([BNET_EXE], env={})) + + def test_anything_else_and_its_own_starts_are_left_alone(self): + other = BNET_EXE.replace('2596113170', '123') + self.assertIsNone(store.battlenet([other, '--exec=launch Fen'], env={})) + self.assertIsNone(store.battlenet(['/x/Diablo IV/Diablo IV.exe'], env={})) + self.assertIsNone(store.battlenet([BNET_EXE, '--exec=launch Fen'], env={'BL_BATTLENET': '1'})) + self.assertEqual([store.BATTLENET, 'open'], store.battlenet([BNET_EXE, '--exec=launch Fen;rm'], env={})) + + def test_the_launch_runs_there_and_the_wrapper_ends_with_it(self): + with patch.dict(os.environ, {}, clear=False), patch.object(store.subprocess, 'call', return_value=0) as call: + os.environ.pop('BL_BATTLENET', None) + self.assertEqual(store.RAN, store.main([BNET_EXE, '--exec=launch Pro'])) + call.assert_called_once_with([store.BATTLENET, 'launch', 'Pro']) + with patch.dict(os.environ, {}, clear=False), patch.object(store.subprocess, 'call', return_value=1): + os.environ.pop('BL_BATTLENET', None) + self.assertEqual(store.RAN_FAILED, store.main([BNET_EXE, '--exec=launch Pro'])) + self.assertIn('[ $rc -eq 11 ] && exit 0', compat.BL_STORE_SETUP) + self.assertIn('[ $rc -eq 12 ] && exit 1', compat.BL_STORE_SETUP) + self.assertLess(compat.BL_STORE_SETUP.index('droiddeck-store-launch "$@"'), compat.BL_STORE_SETUP.index('[ $rc -eq 11 ] && exit 0')) + + class Launchers(unittest.TestCase): def test_both_proton_launchers_ask_before_proton_starts(self): sh = compat.LAUNCHER_SH From 0ad4b7cc148f6f615e2df376275ecd17f721e2fe Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 12:55:11 -0400 Subject: [PATCH 025/135] feat: Back in the file manager returns to the folder you came from (#1562) * feat: Back in the file manager returns to the folder you came from * fix: the file manager's up arrow closes favorites first, as before --- .../launcher/files/FileManagerScreen.kt | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt index 627761c2da..8d60241c89 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -70,6 +70,7 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableFloatStateOf import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope @@ -99,7 +100,9 @@ import kotlinx.coroutines.withContext import java.io.File import java.util.Date -private enum class FileManagerNavigation { EXIT, RETURN_TO_START, BACK } +private enum class FileManagerNavigation { EXIT, RETURN_TO_START, BACK, UP } + +private const val HISTORY_LIMIT = 50 internal fun canNavigateUp(currentDir: File, currentRoot: File): Boolean = currentDir != currentRoot && currentDir.parentFile?.exists() == true @@ -193,10 +196,17 @@ fun FileManagerScreen( var favTick by remember { mutableIntStateOf(0) } var listingJob by remember { mutableStateOf<Job?>(null) } + val history = remember { mutableStateListOf<Pair<File, File>>() } + var shownRoot by remember { mutableStateOf(initialRoot) } - fun loadDirectory(dir: File, resetScroll: Boolean = true) { + fun loadDirectory(dir: File, resetScroll: Boolean = true, record: Boolean = true) { if (cancellingNavigation) return + if (record && dir != currentDir) { + history.add(currentDir to shownRoot) + if (history.size > HISTORY_LIMIT) history.removeAt(0) + } currentDir = dir + shownRoot = currentRoot if (pickMode) pickPrefs.edit().putString("lastFilePickerDir", dir.absolutePath).apply() listingJob?.cancel() listingJob = scope.launch { @@ -251,6 +261,18 @@ fun FileManagerScreen( FileManagerNavigation.EXIT -> onExit?.invoke() FileManagerNavigation.RETURN_TO_START -> returnToStart() FileManagerNavigation.BACK -> { + if (showFavorites) showFavorites = false + else { + while (history.isNotEmpty() && !history.last().first.isDirectory) history.removeAt(history.lastIndex) + val previous = history.removeLastOrNull() + if (previous != null) { + currentRoot = previous.second + loadDirectory(previous.first, record = false) + } else if (canNavigateUp(currentDir, currentRoot)) currentDir.parentFile?.let { loadDirectory(it, record = false) } + else onExit?.invoke() + } + } + FileManagerNavigation.UP -> { if (showFavorites) showFavorites = false else if (canNavigateUp(currentDir, currentRoot)) currentDir.parentFile?.let { loadDirectory(it) } else onExit?.invoke() @@ -263,7 +285,7 @@ fun FileManagerScreen( if (isOperationActive()) pendingNavigation = action else navigate(action) } - BackHandler(enabled = operationActive || cancellingNavigation || showFavorites || currentDir != currentRoot) { + BackHandler(enabled = operationActive || cancellingNavigation || showFavorites || currentDir != currentRoot || history.isNotEmpty()) { requestNavigation(FileManagerNavigation.BACK) } @@ -673,7 +695,7 @@ fun FileManagerScreen( .background(MaterialTheme.colorScheme.surfaceContainer) .padding(horizontal = 8.dp, vertical = 6.dp), ) { - IconButton(onClick = { requestNavigation(FileManagerNavigation.BACK) }, enabled = canGoUp && !cancellingNavigation) { + IconButton(onClick = { requestNavigation(FileManagerNavigation.UP) }, enabled = canGoUp && !cancellingNavigation) { Icon(Icons.Filled.ArrowBack, stringResource(R.string.fm_back), tint = MaterialTheme.colorScheme.primary) } @@ -1089,7 +1111,7 @@ fun FileManagerScreen( contentPadding = PaddingValues(8.dp), ) { if (canGoUp) item(key = "..", span = { GridItemSpan(maxLineSpan) }) { - ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.BACK) }) + ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.UP) }) } items(shownEntries, key = { it.absolutePath }) { file -> val isFav = remember(file.absolutePath, favTick) { @@ -1155,7 +1177,7 @@ fun FileManagerScreen( } else LazyColumn(state = listState, modifier = Modifier.fillMaxSize()) { if (canGoUp) item(key = "..") { - ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.BACK) }) + ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.UP) }) } if (entries.isEmpty()) { item { From 0de672f94ecf25d767166300a055c85cd4f42905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Sun, 25 Oct 2026 19:57:04 +0300 Subject: [PATCH 026/135] fix: a Linux runtime update keeps imported apps and catalog AppImages (#1062) * fix: a Linux runtime update keeps imported apps and catalog AppImages The update carried only /root into the new tree and then discarded the old one, so every imported AppImage, script app, Flatpak override and catalog emulator AppImage was deleted. User-owned paths are now moved across as a list, moved back if the carry or swap fails partway, and recovered after an interrupted update. * fix(runtime): retain user data when carry and recovery fail * fix(runtime): mark staging carry start so interrupted extraction is discardable * test: mark interrupted runtime data for recovery * fix: make runtime data carry recoverable * fix: the runtime update with carried user data builds again carryUserData passed the de-duplicated Set of user paths where a List is expected after the two carry changes met; copy it into a List. * fix: a runtime update stops instead of dropping app markers it cannot inspect, and keeps app names with line breaks userPaths now uses the throwing exists() helper for the AppImage, menu entry and marker checks. The carry marker stores each path URL-encoded on its own line, so a name containing a newline cannot split into two paths. The symlink test now links a parent directory, which is what safePath rejects. * fix: retain conflicting runtime recovery data on every retry Stop on unreadable carry markers and keep rollback tests independent of add-on downloads. --------- Co-authored-by: ovurrsl <ovurrsl@users.noreply.github.com> Co-authored-by: xXJsonDeruloXx <danielhimebauch@gmail.com> Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- .../runtime/LinuxRuntimeInstaller.java | 76 +++++- .../launcher/runtime/RuntimeFileTree.java | 157 +++++++++++ .../runtime/RuntimeInstallRollbackTest.kt | 140 ++++++++++ .../launcher/runtime/RuntimeRemovalTest.kt | 1 + .../runtime/RuntimeUserDataCarryTest.kt | 243 ++++++++++++++++++ 5 files changed, 603 insertions(+), 14 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/RuntimeInstallRollbackTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/RuntimeUserDataCarryTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java index d6f6b00762..cd8c6c44d4 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java @@ -299,27 +299,50 @@ public final class LinuxRuntimeInstaller { discard(staging, null); return false; } + java.util.List<String> carryPaths = root.isDirectory() + ? RuntimeFileTree.existingUserPaths(root, staging) : java.util.Collections.emptyList(); if (root.isDirectory() && !root.renameTo(old)) { RuntimeFileTree.delete(staging, null); return false; } + File carryMarker = new File(staging, CARRY_MARKER); + java.util.List<String> encodedPaths = new java.util.ArrayList<>(); + for (String rel : carryPaths) encodedPaths.add(java.net.URLEncoder.encode(rel, "UTF-8")); + if (!FileUtils.writeString(carryMarker, String.join("\n", encodedPaths))) { + if (old.isDirectory() && !old.renameTo(root)) + Log.w(TAG, "could not restore the previous runtime; retained at " + old); + discard(staging, null); + return false; + } + java.util.List<String> carried; try { - RuntimeFileTree.carryHome(old, staging); + carried = RuntimeFileTree.carryUserData(old, staging, false, carryPaths); } catch (IOException e) { - Log.w(TAG, "could not carry root across the update; rolling back", e); - old.renameTo(root); - try { RuntimeFileTree.delete(staging, null); } - catch (IOException cleanup) { Log.w(TAG, "could not clear the failed staging tree", cleanup); } + Log.w(TAG, "could not carry user data across the update; rolling back", e); + if (old.isDirectory() && !old.renameTo(root)) + Log.w(TAG, "could not restore the previous runtime; retained at " + old); + if (e.getSuppressed().length == 0) { + new File(staging, CARRY_MARKER).delete(); + try { RuntimeFileTree.delete(staging, null); } + catch (IOException cleanup) { Log.w(TAG, "could not clear the failed staging tree", cleanup); } + } else { + Log.w(TAG, "incomplete rollback; retaining user data in " + staging); + } return false; } if (!staging.renameTo(root)) { - File keptTo = new File(staging, USER_DATA); - if (keptTo.isDirectory() && old.isDirectory()) keptTo.renameTo(new File(old, USER_DATA)); - if (old.isDirectory()) old.renameTo(root); + if (old.isDirectory()) { + try { + RuntimeFileTree.carryBack(staging, old, carried); + new File(staging, CARRY_MARKER).delete(); + } catch (IOException e) { Log.w(TAG, "could not move all user data back after a failed swap", e); } + old.renameTo(root); + } return false; } + new File(root, CARRY_MARKER).delete(); discard(old, null); return LinuxRuntime.isInstalled(context); } catch (Exception e) { @@ -330,17 +353,41 @@ public final class LinuxRuntimeInstaller { } } + static final String CARRY_MARKER = ".droiddeck-carry"; + static void recoverInterruptedSwap(File root, File staging, File old) throws IOException { + if (!root.isDirectory() && old.isDirectory()) { + if (!old.renameTo(root)) throw new IOException("Cannot restore the previous runtime at " + old); + Log.w(TAG, "restored the previous runtime after an interrupted update"); + } + File marker = new File(staging, CARRY_MARKER); + if (!RuntimeFileTree.exists(marker.toPath())) return; File target = root.isDirectory() ? root : old; + String markerContent = FileUtils.readString(marker); + if (markerContent == null) throw new IOException("Cannot read runtime recovery marker: " + marker); + if (!markerContent.equals("1")) { + java.util.List<String> intended = new java.util.ArrayList<>(); + for (String rel : markerContent.split("\\n")) + if (!rel.isEmpty()) intended.add(java.net.URLDecoder.decode(rel, "UTF-8")); + if (target.isDirectory()) RuntimeFileTree.recoverCarriedPaths(staging, target, intended); + if (staging.isDirectory() && RuntimeFileTree.hasPaths(staging, intended)) + throw new IOException("User data still needs recovery from " + staging); + marker.delete(); + return; + } File stagedHome = new File(staging, USER_DATA); File home = new File(target, USER_DATA); - if (target.isDirectory() && stagedHome.isDirectory() && (!home.exists() || isEmptyDir(home))) { + if (target.isDirectory() && stagedHome.isDirectory() && (!RuntimeFileTree.exists(home.toPath()) || isEmptyDir(home))) { RuntimeFileTree.carryHome(staging, target); Log.w(TAG, "recovered " + USER_DATA + " from an interrupted update"); } - if (!root.isDirectory() && old.isDirectory() && old.renameTo(root)) { - Log.w(TAG, "restored the previous runtime after an interrupted update"); + if (target.isDirectory() && staging.isDirectory()) { + java.util.List<String> rest = RuntimeFileTree.carryUserData(staging, target, true); + if (!rest.isEmpty()) Log.w(TAG, "recovered " + rest + " from an interrupted update"); } + if (staging.isDirectory() && RuntimeFileTree.hasUserData(staging, target)) + throw new IOException("User data still needs recovery from " + staging); + new File(staging, CARRY_MARKER).delete(); } static final String TRASH = ".runtime-trash"; @@ -364,9 +411,10 @@ public final class LinuxRuntimeInstaller { Log.i(TAG, "some runtime leftovers still cannot be deleted: " + trash); } - private static boolean isEmptyDir(File dir) { - String[] names = dir.list(); - return dir.isDirectory() && names != null && names.length == 0; + private static boolean isEmptyDir(File dir) throws IOException { + try (java.nio.file.DirectoryStream<java.nio.file.Path> entries = java.nio.file.Files.newDirectoryStream(dir.toPath())) { + return !entries.iterator().hasNext(); + } } public static Removal beginUninstall(Context context) { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java index 5fb94de051..42e7f5b110 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java @@ -74,6 +74,163 @@ public final class RuntimeFileTree { throw new IOException("Cannot make directory removable: " + dir); } + /** + * Paths in a runtime tree that belong to the user: the home folder, imported AppImages and script apps, and catalog + * AppImages with their menu entries and markers. Tar-kind catalog packages (the desktop) unpack over /usr and cannot + * be carried. + */ + static java.util.List<String> userPaths(File tree) throws IOException { + java.util.List<String> paths = new java.util.ArrayList<>(java.util.Arrays.asList("root", "opt/appimages/user", "opt/droiddeck-apps")); + for (String n : children(new File(tree, "usr/local/share/applications"))) { + if (n.endsWith(".desktop") && (n.startsWith("droiddeck-app-") || n.startsWith("droiddeck-appimage-"))) + paths.add("usr/local/share/applications/" + n); + } + for (String n : children(new File(tree, "opt/appimages"))) { + if (!n.endsWith(".AppImage")) continue; + String id = n.substring(0, n.length() - ".AppImage".length()); + java.util.Collections.addAll(paths, "opt/appimages/" + n, + "usr/share/applications/droiddeck-" + id + ".desktop", ".droiddeck-pkg-" + id); + } + for (String n : children(new File(tree, "usr/share/applications"))) { + if (!n.startsWith("droiddeck-") || !n.endsWith(".desktop")) continue; + String id = n.substring("droiddeck-".length(), n.length() - ".desktop".length()); + if (!exists(new File(tree, "opt/appimages/" + id + ".AppImage").toPath())) + paths.add("usr/share/applications/" + n); + } + for (String n : children(tree)) { + if (!n.startsWith(".droiddeck-pkg-")) continue; + String id = n.substring(".droiddeck-pkg-".length()); + boolean hasMenu = exists(new File(tree, "usr/share/applications/droiddeck-" + id + ".desktop").toPath()); + if (hasMenu && !exists(new File(tree, "opt/appimages/" + id + ".AppImage").toPath())) + paths.add(n); + } + return paths; + } + + static java.util.List<String> existingUserPaths(File from, File to) throws IOException { + java.util.List<String> paths = new java.util.ArrayList<>(); + for (String rel : userPaths(from, to)) if (exists(safePath(from, rel).toPath())) paths.add(rel); + return paths; + } + + private static java.util.List<String> children(File dir) throws IOException { + java.util.List<String> names = new java.util.ArrayList<>(); + try (DirectoryStream<Path> entries = Files.newDirectoryStream(dir.toPath())) { + for (Path entry : entries) names.add(entry.getFileName().toString()); + } catch (NoSuchFileException e) { + return names; + } + return names; + } + + static boolean exists(Path path) throws IOException { + try { Files.readAttributes(path, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS); return true; } + catch (NoSuchFileException e) { return false; } + } + + private static java.util.Set<String> userPaths(File from, File to) throws IOException { + java.util.Set<String> paths = new java.util.LinkedHashSet<>(userPaths(from)); + paths.addAll(userPaths(to)); + return paths; + } + + static boolean hasUserData(File from, File to) throws IOException { + for (String rel : userPaths(from, to)) if (exists(new File(from, rel).toPath())) return true; + return false; + } + + /** + * Moves each user path that exists in {@code from} into {@code to}, replacing what {@code to} ships there. With + * {@code onlyMissing}, a path already present in {@code to} is left alone. On failure the paths already moved go back + * before the exception is thrown. Rollback failures are suppressed on that exception; callers must retain the source + * of any incomplete rollback. + * Returns the moved paths. + */ + static java.util.List<String> carryUserData(File from, File to, boolean onlyMissing) throws IOException { + return carryUserData(from, to, onlyMissing, new java.util.ArrayList<>(userPaths(from, to))); + } + + static java.util.List<String> carryUserData(File from, File to, boolean onlyMissing, java.util.List<String> paths) throws IOException { + java.util.List<String> moved = new java.util.ArrayList<>(); + try { + for (String rel : paths) { + File src = safePath(from, rel); + if (!exists(src.toPath())) continue; + File dst = safePath(to, rel); + if (onlyMissing && exists(dst.toPath())) continue; + move(from, to, rel); + moved.add(rel); + } + } catch (IOException e) { + for (int i = moved.size() - 1; i >= 0; i--) { + try { move(to, from, moved.get(i)); } + catch (IOException back) { e.addSuppressed(back); } + } + throw e; + } + return moved; + } + + /** Puts the given paths back from {@code from} into {@code to}; failures are collected, not stopped on. */ + static void carryBack(File from, File to, java.util.List<String> paths) throws IOException { + IOException failed = null; + for (int i = paths.size() - 1; i >= 0; i--) { + try { move(from, to, paths.get(i)); } + catch (IOException e) { if (failed == null) failed = e; else failed.addSuppressed(e); } + } + if (failed != null) throw failed; + } + + private static void move(File from, File to, String rel) throws IOException { + File src = safePath(from, rel); + File dst = safePath(to, rel); + File parent = src.getParentFile(); + if (parent != null) makeWritable(parent); + java.util.List<File> made = new java.util.ArrayList<>(); + for (File d = dst.getParentFile(); d != null; d = d.getParentFile()) { + made.add(d); + if (d.equals(to)) break; + } + for (int i = made.size() - 1; i >= 0; i--) { + File d = made.get(i); + if (!d.isDirectory() && !d.mkdirs()) throw new IOException("Cannot create " + d); + makeWritable(d); + } + delete(dst, null); + if (!src.renameTo(dst)) throw new IOException("Cannot carry " + rel + " across the update"); + } + + static void recoverCarriedPaths(File staging, File target, java.util.List<String> paths) throws IOException { + for (String rel : paths) { + File src = safePath(staging, rel); + if (!exists(src.toPath())) continue; + File dst = safePath(target, rel); + if (!exists(dst.toPath())) move(staging, target, rel); + } + } + + static boolean hasPaths(File tree, java.util.List<String> paths) throws IOException { + for (String rel : paths) if (exists(safePath(tree, rel).toPath())) return true; + return false; + } + + private static File safePath(File tree, String rel) throws IOException { + Path relative = java.nio.file.Paths.get(rel); + if (relative.isAbsolute() || relative.getNameCount() == 0) throw new IOException("Invalid runtime path: " + rel); + for (Path part : relative) if (part.toString().equals("..")) throw new IOException("Invalid runtime path: " + rel); + Path current = tree.toPath(); + for (int i = 0; i < relative.getNameCount() - 1; i++) { + current = current.resolve(relative.getName(i)); + try { + BasicFileAttributes attrs = Files.readAttributes(current, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS); + if (!attrs.isDirectory()) throw new IOException("Runtime path has a non-directory parent: " + current); + } catch (NoSuchFileException ignored) { + break; + } + } + return tree.toPath().resolve(relative).toFile(); + } + static void carryHome(File old, File staging) throws IOException { File home = new File(old, "root"); if (!home.isDirectory()) return; diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeInstallRollbackTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeInstallRollbackTest.kt new file mode 100644 index 0000000000..45b8019bb8 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeInstallRollbackTest.kt @@ -0,0 +1,140 @@ +package com.droiddeck.launcher.runtime + +import android.app.Application +import android.content.Context +import android.content.ContextWrapper +import com.droiddeck.launcher.BuildConfig +import com.droiddeck.launcher.core.AddonPack +import java.io.ByteArrayOutputStream +import java.io.File +import java.net.ServerSocket +import java.security.MessageDigest +import java.util.concurrent.atomic.AtomicBoolean +import java.util.function.Predicate +import org.apache.commons.compress.archivers.tar.TarArchiveEntry +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream +import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertThrows +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], application = Application::class) +class RuntimeInstallRollbackTest { + @get:Rule val tmp = TemporaryFolder() + @After fun resetFaults() { RuntimeFileTree.refuseForTest = null } + + private fun put(root: File, rel: String, data: String) = File(root, rel).apply { + checkNotNull(parentFile).mkdirs() + writeText(data) + } + + private data class Attempt(val root: File, val staging: File, val old: File, val result: Boolean) + + private fun attempt(failRollback: Boolean): Attempt { + val files = tmp.newFolder("files") + val cache = tmp.newFolder("cache") + val context = object : ContextWrapper(RuntimeEnvironment.getApplication()) { + override fun getFilesDir(): File = files + override fun getCacheDir(): File = cache + override fun getApplicationContext(): Context = this + } + for ((pack, pin, required) in listOf( + Triple(AddonPack.PROOT, BuildConfig.PACK_PROOT_SHA256, listOf("libproot.so", "libproot-loader.so")), + Triple(AddonPack.DIRECTAUDIO, BuildConfig.PACK_DIRECTAUDIO_SHA256, + listOf("linux-wine11/version.txt", "linux-wine11-systhread/version.txt")), + )) { + val version = pin.ifEmpty { "0".repeat(64) } + val directory = File(files, "addons/${pack.name}/$version") + required.forEach { put(directory, it, "test pack") } + put(directory, AddonPack.COMPLETE, version) + } + val root = LinuxRuntime.rootDir(context) + val staging = File(files, LinuxRuntime.DIR + ".new") + val old = File(files, LinuxRuntime.DIR + ".old") + put(root, "root/save.dat", "original user data") + put(root, "opt/appimages/user/game/app.AppImage", "original app") + put(root, "usr/bin/usable", "previous runtime") + + val payload = ByteArrayOutputStream().also { bytes -> + ZstdCompressorOutputStream(bytes).use { zstd -> + TarArchiveOutputStream(zstd).use { tar -> + for ((name, value) in listOf("root/.bashrc" to "shipped home", "usr/bin/new" to "new runtime", + "opt/appimages/user/block" to "shipped app")) { + val data = value.toByteArray() + tar.putArchiveEntry(TarArchiveEntry(name).apply { size = data.size.toLong() }) + tar.write(data) + tar.closeArchiveEntry() + } + } + } + }.toByteArray() + val digest = MessageDigest.getInstance("SHA-256").digest(payload).joinToString("") { "%02x".format(it) } + val faultSeen = AtomicBoolean() + RuntimeFileTree.refuseForTest = Predicate { path -> + if (path == File(staging, "opt/appimages/user/block").toPath() && faultSeen.compareAndSet(false, true)) { + if (failRollback) put(old, "root/rollback-block", "concurrent data") + true + } else failRollback && path == File(old, "root/rollback-block").toPath() + } + val server = ServerSocket(0) + val thread = Thread { + runCatching { + server.accept().use { socket -> + socket.soTimeout = 5000 + val input = socket.getInputStream().bufferedReader(Charsets.ISO_8859_1) + while (true) { + val line = input.readLine() ?: break + if (line.isEmpty()) break + } + val out = socket.getOutputStream() + out.write(("HTTP/1.1 200 OK\r\nContent-Length: ${payload.size}\r\nConnection: close\r\n\r\n").toByteArray()) + out.write(payload) + out.flush() + } + } + }.apply { isDaemon = true; start() } + try { + val release = LinuxRuntimeInstaller.Release("synthetic", "http://127.0.0.1:${server.localPort}/runtime.tar.zst", digest, payload.size.toLong()) + val result = LinuxRuntimeInstaller.install(context, release, null) + assertTrue("the intended carry fault was not reached", faultSeen.get()) + return Attempt(root, staging, old, result) + } finally { + server.close() + thread.join(1000) + RuntimeFileTree.refuseForTest = null + } + } + + @Test fun aFailedCarryAndFailedRollbackKeepTheOnlyStagedCopy() { + val attempt = attempt(failRollback = true) + assertFalse(attempt.result) + assertTrue("the only staged copy was deleted", File(attempt.staging, "root/save.dat").isFile) + assertEquals("original user data", File(attempt.staging, "root/save.dat").readText()) + assertEquals("original app", File(attempt.root, "opt/appimages/user/game/app.AppImage").readText()) + assertEquals("previous runtime", File(attempt.root, "usr/bin/usable").readText()) + repeat(2) { + assertThrows(java.io.IOException::class.java) { + LinuxRuntimeInstaller.recoverInterruptedSwap(attempt.root, attempt.staging, attempt.old) + } + assertEquals("original user data", File(attempt.staging, "root/save.dat").readText()) + } + } + + @Test fun aCompleteRollbackStillRestoresAndCleansTheFailedCandidate() { + val attempt = attempt(failRollback = false) + assertFalse(attempt.result) + assertEquals("original user data", File(attempt.root, "root/save.dat").readText()) + assertEquals("original app", File(attempt.root, "opt/appimages/user/game/app.AppImage").readText()) + assertFalse(attempt.staging.exists()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeRemovalTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeRemovalTest.kt index 318e6b9804..83d43250fd 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeRemovalTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeRemovalTest.kt @@ -69,6 +69,7 @@ class RuntimeRemovalTest { val old = File(dir, "linuxfs.old").apply { File(this, "root").mkdirs() } val staging = File(dir, "linuxfs.new").apply { File(this, "root").mkdirs() } File(staging, "root/save").writeText("user data") + File(staging, LinuxRuntimeInstaller.CARRY_MARKER).writeText("1") for (tree in listOf(old, staging)) Files.setPosixFilePermissions(tree.toPath(), PosixFilePermissions.fromString("r-xr-xr-x")) LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeUserDataCarryTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeUserDataCarryTest.kt new file mode 100644 index 0000000000..d977ffb8cc --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeUserDataCarryTest.kt @@ -0,0 +1,243 @@ +package com.droiddeck.launcher.runtime + +import java.io.File +import java.io.IOException +import java.nio.file.Files +import org.junit.After +import org.junit.Assume.assumeTrue +import org.junit.Assert.assertThrows +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Assert.fail +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class RuntimeUserDataCarryTest { + @get:Rule val tmp = TemporaryFolder() + + @After fun resetFaults() { RuntimeFileTree.refuseForTest = null } + + private fun put(root: File, rel: String, text: String = rel) = File(root, rel).apply { parentFile.mkdirs(); writeText(text) } + + private fun userTree(): File = tmp.newFolder("old").also { old -> + put(old, "root/save.dat", "mine") + put(old, "opt/appimages/user/app1/app.AppImage") + put(old, "opt/droiddeck-apps/game/run.sh") + put(old, "usr/local/share/applications/droiddeck-app-game.desktop") + put(old, "usr/local/share/applications/droiddeck-appimage-app1.desktop") + put(old, "usr/local/share/applications/other.desktop") + put(old, "opt/appimages/dolphin.AppImage") + put(old, "usr/share/applications/droiddeck-dolphin.desktop") + put(old, ".droiddeck-pkg-dolphin", "1.0") + put(old, "usr/bin/tool", "old system file") + } + + @Test fun anUpdateKeepsImportedAppsCatalogAppImagesAndHome() { + val old = userTree() + val staging = tmp.newFolder("new").also { put(it, "root/.bashrc", "shipped"); put(it, "usr/bin/tool", "new system file") } + + val moved = RuntimeFileTree.carryUserData(old, staging, false) + + assertEquals("mine", File(staging, "root/save.dat").readText()) + assertFalse("the shipped home is replaced, not merged", File(staging, "root/.bashrc").exists()) + for (rel in listOf("opt/appimages/user/app1/app.AppImage", "opt/droiddeck-apps/game/run.sh", + "usr/local/share/applications/droiddeck-app-game.desktop", "usr/local/share/applications/droiddeck-appimage-app1.desktop", + "opt/appimages/dolphin.AppImage", "usr/share/applications/droiddeck-dolphin.desktop", ".droiddeck-pkg-dolphin")) { + assertTrue(rel, File(staging, rel).exists()) + assertTrue(rel, rel in moved || moved.any { rel.startsWith("$it/") }) + } + assertEquals("system files come from the new runtime", "new system file", File(staging, "usr/bin/tool").readText()) + assertFalse("only DroidDeck's own menu entries are user data", File(staging, "usr/local/share/applications/other.desktop").exists()) + } + + @Test fun aFailureHalfwayPutsEverythingBack() { + val old = userTree() + val staging = tmp.newFolder("new") + put(staging, "usr/local", "a file where a folder is needed") + + try { + RuntimeFileTree.carryUserData(old, staging, false) + fail("expected the carry to fail") + } catch (expected: IOException) { + } + + assertEquals("mine", File(old, "root/save.dat").readText()) + assertTrue(File(old, "opt/appimages/user/app1/app.AppImage").exists()) + assertTrue(File(old, "opt/droiddeck-apps/game/run.sh").exists()) + assertFalse(File(staging, "root").exists()) + } + + @Test fun recoveryOnlyFillsWhatIsMissing() { + val target = tmp.newFolder("target").also { put(it, "opt/droiddeck-apps/game/run.sh", "kept") } + val staging = tmp.newFolder("staging").also { + put(it, "opt/droiddeck-apps/game/run.sh", "stale") + put(it, "opt/appimages/user/app1/app.AppImage") + } + + val moved = RuntimeFileTree.carryUserData(staging, target, true) + + assertEquals(listOf("opt/appimages/user"), moved) + assertEquals("kept", File(target, "opt/droiddeck-apps/game/run.sh").readText()) + assertTrue(File(target, "opt/appimages/user/app1/app.AppImage").exists()) + } + @Test fun recoveryFindsCompanionsWhoseAppImageWasAlreadyPutBack() { + val root = tmp.newFolder("runtime") + val staging = tmp.newFolder("runtime.new") + val old = File(tmp.root, "runtime.old") + put(root, "opt/appimages/dolphin.AppImage", "user app") + put(staging, LinuxRuntimeInstaller.CARRY_MARKER, "1") + put(staging, "usr/share/applications/droiddeck-dolphin.desktop", "menu") + put(staging, ".droiddeck-pkg-dolphin", "version") + put(staging, ".droiddeck-pkg-desktop-kde", "system package marker") + + LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) + assertEquals("menu", File(root, "usr/share/applications/droiddeck-dolphin.desktop").readText()) + assertEquals("version", File(root, ".droiddeck-pkg-dolphin").readText()) + assertFalse(File(root, ".droiddeck-pkg-desktop-kde").exists()) + assertEquals("user app", File(root, "opt/appimages/dolphin.AppImage").readText()) + } + + @Test fun unmarkedExtractedStagingDoesNotBlockRecovery() { + val root = tmp.newFolder("runtime") + val staging = tmp.newFolder("runtime.new") + val old = File(tmp.root, "runtime.old") + put(root, "root/save.dat", "current user data") + put(staging, "root/.bashrc", "shipped home from interrupted extract") + + LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) + assertEquals("current user data", File(root, "root/save.dat").readText()) + assertEquals("shipped home from interrupted extract", File(staging, "root/.bashrc").readText()) + } + + @Test fun anUnreadableAppImageDirectoryAbortsBeforeMovingHome() { + assumeTrue(Files.getFileStore(tmp.root.toPath()).supportsFileAttributeView("posix")) + val old = userTree() + val images = File(old, "opt/appimages") + val staging = tmp.newFolder("staging") + assertTrue(images.setReadable(false, false)) + assertTrue(images.setExecutable(false, false)) + try { + assertThrows(IOException::class.java) { RuntimeFileTree.carryUserData(old, staging, false) } + assertEquals("mine", File(old, "root/save.dat").readText()) + assertFalse(File(staging, "root/save.dat").exists()) + } finally { + images.setReadable(true, true) + images.setExecutable(true, true) + } + } + + @Test fun recoveryRestoresTheRuntimeBeforeTryingAFallibleHomeMove() { + val root = File(tmp.root, "runtime") + val old = tmp.newFolder("runtime.old") + val staging = tmp.newFolder("runtime.new") + put(old, "usr/bin/usable", "previous runtime") + File(old, "root").mkdirs() + put(staging, LinuxRuntimeInstaller.CARRY_MARKER, "1") + put(staging, "root/save.dat", "staged user data") + RuntimeFileTree.refuseForTest = java.util.function.Predicate { it.fileName.toString() == "root" } + + assertThrows(IOException::class.java) { LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) } + assertTrue("the previous runtime was not restored", root.isDirectory) + assertEquals("previous runtime", File(root, "usr/bin/usable").readText()) + assertEquals("staged user data", File(staging, "root/save.dat").readText()) + } + + @Test fun conflictingRecoveryDataIsRetainedOnEveryRetry() { + val root = tmp.newFolder("runtime") + val staging = tmp.newFolder("runtime.new") + val old = File(tmp.root, "runtime.old") + put(root, "root/current.dat", "current user data") + put(staging, LinuxRuntimeInstaller.CARRY_MARKER, "1") + put(staging, "root/older.dat", "unrecovered user data") + + repeat(2) { + assertThrows(IOException::class.java) { LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) } + assertEquals("current user data", File(root, "root/current.dat").readText()) + assertEquals("unrecovered user data", File(staging, "root/older.dat").readText()) + } + } + + @Test fun stagedDataWithoutASurvivingRuntimeIsKeptForRecovery() { + val root = File(tmp.root, "runtime") + val old = File(tmp.root, "runtime.old") + val staging = tmp.newFolder("runtime.new") + put(staging, LinuxRuntimeInstaller.CARRY_MARKER, "1") + put(staging, "root/save.dat", "only surviving user data") + assertThrows(IOException::class.java) { LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) } + assertEquals("only surviving user data", File(staging, "root/save.dat").readText()) + } + + @Test fun conflictingIntendedHomesAreRetainedWithoutProofOfTheirContents() { + val root = File(tmp.root, "runtime") + val old = tmp.newFolder("runtime.old") + val staging = tmp.newFolder("runtime.new") + put(old, "root/save.dat", "user data") + put(staging, LinuxRuntimeInstaller.CARRY_MARKER, "root") + put(staging, "root/.bashrc", "shipped default") + + assertThrows(IOException::class.java) { LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) } + + assertEquals("user data", File(root, "root/save.dat").readText()) + assertEquals("shipped default", File(staging, "root/.bashrc").readText()) + assertTrue(File(staging, LinuxRuntimeInstaller.CARRY_MARKER).exists()) + } + + @Test fun anUnreadableCarryMarkerStopsRecovery() { + val root = tmp.newFolder("runtime") + val staging = tmp.newFolder("runtime.new") + val old = File(tmp.root, "runtime.old") + val marker = File(staging, LinuxRuntimeInstaller.CARRY_MARKER).apply { mkdirs() } + + assertThrows(IOException::class.java) { LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) } + assertTrue(marker.isDirectory) + } + + @Test fun recoveryMovesOnlyAnIntendedPathThatWasAlreadyCarried() { + val root = File(tmp.root, "runtime") + val old = tmp.newFolder("runtime.old") + val staging = tmp.newFolder("runtime.new") + put(staging, LinuxRuntimeInstaller.CARRY_MARKER, "root") + put(staging, "root/save.dat", "moved user data") + + LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) + + assertEquals("moved user data", File(root, "root/save.dat").readText()) + assertFalse(File(staging, LinuxRuntimeInstaller.CARRY_MARKER).exists()) + } + + @Test fun aSymlinkedParentCannotRedirectAUserDataMoveOutsideTheRuntime() { + val old = tmp.newFolder("old") + val staging = tmp.newFolder("staging") + val outside = tmp.newFolder("outside") + put(outside, "droiddeck-apps/game/run.sh", "outside data") + Files.createSymbolicLink(File(old, "opt").toPath(), outside.toPath()) + + assertThrows(IOException::class.java) { RuntimeFileTree.carryUserData(old, staging, false) } + + assertEquals("outside data", File(outside, "droiddeck-apps/game/run.sh").readText()) + assertFalse(File(staging, "opt/droiddeck-apps").exists()) + } + + @Test fun anInaccessibleLiveHomeIsNeverTreatedAsMissing() { + assumeTrue(Files.getFileStore(tmp.root.toPath()).supportsFileAttributeView("posix")) + val root = tmp.newFolder("runtime") + val staging = tmp.newFolder("runtime.new") + val old = File(tmp.root, "runtime.old") + put(root, "root/keep.dat", "current user data") + put(staging, LinuxRuntimeInstaller.CARRY_MARKER, "1") + put(staging, "root/staged.dat", "staged user data") + assertTrue(root.setExecutable(false, false)) + val failure = try { + runCatching { LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) }.exceptionOrNull() + } finally { + root.setExecutable(true, true) + } + + assertTrue("the existing live home was deleted", File(root, "root/keep.dat").isFile) + assertEquals("current user data", File(root, "root/keep.dat").readText()) + assertEquals("staged user data", File(staging, "root/staged.dat").readText()) + assertTrue("inaccessible data must abort recovery", failure is IOException) + } +} From 7ef52865d22ae1146828cb66e66a185a508f164a Mon Sep 17 00:00:00 2001 From: Moroni Granja <moronigranja@gmail.com> Date: Sun, 25 Oct 2026 13:58:54 -0300 Subject: [PATCH 027/135] fix: place GOG cloud saves at the location root (#1178) GOG lists every cloud object as <location name>/<path>. The location name is not part of the local folder, so Silksong's saves/user1.dat belongs at default/user1.dat, not default/saves/user1.dat. Strip the segment for local paths and add it back for HEAD/GET/PUT, cache the location name, and migrate files written by the old layout without touching files the game wrote. Co-authored-by: xXJsonDeruloXx <danielhimebauch@gmail.com> Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- .../droiddeck/launcher/stores/CloudSaves.kt | 119 +++++++++++++++++- .../launcher/stores/CloudTransport.kt | 57 +++++++-- .../stores/CloudSavesMigrationTest.kt | 76 +++++++++++ .../launcher/stores/GogCloudNamesTest.kt | 52 ++++++++ docs/development/stores.md | 8 ++ 5 files changed, 299 insertions(+), 13 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/CloudSavesMigrationTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/GogCloudNamesTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt index e81d594e04..9aaa8e98a1 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt @@ -22,6 +22,7 @@ object CloudSaves { private const val TAG = "CloudSaves" private const val BACKUPS = 3 private const val PARALLEL = 6 + private const val CLOUD_LAYOUT = 2 class Result(val result: String, val files: Int, val bytes: Long, val reason: String, val conflicts: Int = 0) { val ok: Boolean get() = result != "failed" @@ -69,8 +70,10 @@ object CloudSaves { GogPrefs.get(context).getString("client_id_$id", null)?.ifEmpty { null } ?: runCatching { JSONObject(File(folder, "goggame-$id.info").readText()).optString("clientId").ifEmpty { null } }.getOrNull() - private fun gogTemplate(context: Context, id: String, folder: File): String? { - val clientId = gogClientId(context, id, folder) ?: return "" + private class GogConfig(val name: String, val location: String) + + private fun gogConfig(context: Context, id: String, folder: File): GogConfig? { + val clientId = gogClientId(context, id, folder) ?: return GogConfig("", "") return try { val c = URL("https://remote-config.gog.com/components/galaxy_client/clients/$clientId?component_version=2.0.45").openConnection() as HttpURLConnection c.connectTimeout = 15_000; c.readTimeout = 15_000 @@ -78,16 +81,42 @@ object CloudSaves { if (c.responseCode !in 200..299) { c.disconnect(); return null } val cloud = JSONObject(c.inputStream.bufferedReader().readText()).optJSONObject("content")?.optJSONObject("Windows")?.optJSONObject("cloudStorage") c.disconnect() - if (cloud?.optBoolean("enabled", false) != true) return "" - val locations = cloud.optJSONArray("locations") ?: return "" + if (cloud?.optBoolean("enabled", false) != true) return GogConfig("", "") + val locations = cloud.optJSONArray("locations") ?: return GogConfig("", "") val all = (0 until locations.length()).mapNotNull { locations.optJSONObject(it) } - (all.firstOrNull { it.optString("name").equals("saves", true) } ?: all.firstOrNull())?.optString("location").orEmpty() + val chosen = all.firstOrNull { it.optString("name").equals("saves", true) } ?: all.firstOrNull() + val location = chosen?.optString("location").orEmpty() + val name = chosen?.optString("name").orEmpty() + if (location.isEmpty()) GogConfig("", "") else GogConfig(name, location) } catch (e: Exception) { Log.w(TAG, "gog remote-config: ${e.javaClass.simpleName}") null } } + private fun gogTemplate(context: Context, id: String, folder: File): String? { + val p = GogPrefs.get(context) + if (p.contains("cloud_template_$id")) return p.getString("cloud_template_$id", "") + val config = gogConfig(context, id, folder) ?: return null + p.edit().putString("cloud_template_$id", config.location).apply { + if (config.name.isNotEmpty()) putString("cloud_location_$id", config.name) + }.apply() + return config.location + } + + /** + * The selected cloud location's name: GOG prefixes every cloud file with it, and the local folder + * is the location itself. Older builds had no name cached; fetch it once for those. + */ + private fun gogLocationName(context: Context, id: String, folder: File): String? { + val p = GogPrefs.get(context) + p.getString("cloud_location_$id", null)?.ifEmpty { null }?.let { return it } + if (p.getString("cloud_template_$id", null)?.isEmpty() == true) return null + val config = gogConfig(context, id, folder) ?: return null + if (config.name.isNotEmpty()) p.edit().putString("cloud_location_$id", config.name).apply() + return config.name.ifEmpty { null } + } + private fun saveFolder(context: Context, store: Store, id: String): Pair<File?, String> { val (folder, sidecar) = game(context, store, id) ?: return null to "not-installed" val template = template(context, store, id, folder, sidecar) ?: return null to "store-unreachable" @@ -114,7 +143,7 @@ object CloudSaves { val galaxy = GogAuth.validToken(context) val clientId = gogClientId(context, id, folder) if (userId.isEmpty() || galaxy == null || clientId == null) null - else GogCloud(userId, clientId, gogScopedToken(context, id, clientId) ?: galaxy) + else GogCloud(userId, clientId, gogScopedToken(context, id, clientId) ?: galaxy, gogLocationName(context, id, folder)) } Store.EPIC -> { val token = EpicCredentialStore.getValidAccessToken(context) @@ -136,6 +165,83 @@ object CloudSaves { private fun saveBaseline(context: Context, store: Store, id: String, b: Map<String, CloudPlan.Entry>) = prefs(context, store).edit().putString("cloud_baseline_$id", CloudPlan.toJson(b)).apply() + internal class Migration(val baseline: Map<String, CloudPlan.Entry>, val moved: Int, val cleaned: Int, val failed: Int) + + /** + * Moves only files whose `"<location>/<path>"` key proves the old mapping wrote them; anything + * the game itself created under that name is left where it is. Identical duplicates are removed + * only when they prove the same. The name must be one path segment: it comes from remote config. + */ + internal fun migrateNested(dir: File, name: String, base: Map<String, CloudPlan.Entry>): Migration? { + if (name.isEmpty() || name == "." || name == ".." || name.contains('/') || name.contains('\\')) return null + val nested = File(dir, name) + if (!nested.isDirectory) return null + val root = runCatching { dir.canonicalFile }.getOrNull() ?: return null + if (runCatching { nested.canonicalFile }.getOrNull()?.parentFile != root) return null + val prefix = "$name/" + val next = HashMap(base) + var moved = 0 + var cleaned = 0 + var failed = 0 + for (src in nested.walkTopDown().filter { it.isFile }.toList()) { + if (runCatching { java.nio.file.Files.isSymbolicLink(src.toPath()) }.getOrDefault(true)) continue + val srcCanon = runCatching { src.canonicalFile }.getOrNull() ?: continue + if (!srcCanon.path.startsWith(root.path + File.separator)) continue + val rel = src.relativeTo(nested).path.replace(File.separatorChar, '/') + val key = prefix + rel + val entry = base[key] ?: continue + val dest = File(dir, rel) + val destCanon = runCatching { dest.canonicalFile }.getOrNull() ?: continue + if (!destCanon.path.startsWith(root.path + File.separator)) continue + if (dest.isFile && runCatching { md5(dest) == md5(src) }.getOrDefault(false)) { + if (!src.delete()) { failed++; continue } + cleaned++ + next[rel] = entry + next.remove(key) + continue + } + if (dest.exists()) continue + val copied = runCatching { + dest.parentFile?.mkdirs() + val tmp = File.createTempFile(dest.name + ".", ".migrate", dest.parentFile) + try { + src.copyTo(tmp, overwrite = true) + if (md5(tmp) != md5(src)) false + else { + java.nio.file.Files.move(tmp.toPath(), dest.toPath(), java.nio.file.StandardCopyOption.ATOMIC_MOVE) + true + } + } finally { + if (tmp.exists()) tmp.delete() + } + }.getOrDefault(false) + if (!copied) { failed++; continue } + if (!src.delete()) { failed++; continue } + moved++ + next[rel] = entry + next.remove(key) + } + if (nested.walkTopDown().none { it.isFile }) nested.deleteRecursively() + return Migration(next, moved, cleaned, failed) + } + + private fun migrateGogNested(context: Context, id: String, folder: File, dir: File) { + val p = GogPrefs.get(context) + // Run once per game: after this the flat layout is authoritative, even if the game itself + // keeps a folder named like the cloud location. + if (p.getInt("cloud_layout_$id", 0) >= CLOUD_LAYOUT) return + val name = gogLocationName(context, id, folder) ?: return + val base = baseline(context, Store.GOG, id).orEmpty() + val result = migrateNested(dir, name, base) + if (result != null) { + if (result.baseline != base) saveBaseline(context, Store.GOG, id, result.baseline) + if (result.moved + result.cleaned > 0) { + StoresState.logLine("cloud gog $id migrate result=ok moved=${result.moved} cleaned=${result.cleaned} from=$name") + } + } + if (result == null || result.failed == 0) p.edit().putInt("cloud_layout_$id", CLOUD_LAYOUT).apply() + } + fun conflicts(context: Context, store: Store, id: String): List<String> = prefs(context, store).getString("cloud_conflicts_$id", "").orEmpty().split('\n').filter { it.isNotEmpty() } @@ -180,6 +286,7 @@ object CloudSaves { !g.second.cloud -> Result("skipped", 0, 0, "off") else -> { val (dir, reason) = saveFolder(context, store, id) + if (dir != null && store == Store.GOG) migrateGogNested(context, id, g.first, dir) val cloud = if (dir != null) transport(context, store, id, g.first) else null when { dir == null -> Result("skipped", 0, 0, reason) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt index 33c34196ff..2b2be1bc48 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt @@ -51,12 +51,43 @@ internal fun isoDate(s: String?): Long { class NoCloudSaves : Exception("no cloud saves") -class GogCloud(private val userId: String, private val clientId: String, private val token: String) : CloudTransport { +/** GOG cloud names are `<location name>/<path under that location>`; the name is not part of the folder. */ +internal fun splitGogName(name: String): Pair<String?, String> { + val slash = name.indexOf('/') + return if (slash <= 0 || slash == name.length - 1) null to name + else name.substring(0, slash) to name.substring(slash + 1) +} + +/** Maps cloud names to paths under the selected location's folder; the chosen location name is returned. */ +internal fun gogRelativeNames(files: List<CloudFile>, location: String?): Pair<String?, List<CloudFile>> { + val locations = files.mapNotNull { splitGogName(it.name).first }.distinct() + // Only infer a location when every name is prefixed; a mixed listing keeps its old shape. + val allPrefixed = files.isNotEmpty() && files.all { splitGogName(it.name).first != null } + val chosen = when { + location != null && (location in locations || allPrefixed) -> location + location == null && allPrefixed -> locations.singleOrNull() + else -> null + } ?: return null to files + return chosen to files.mapNotNull { file -> + val (dir, rel) = splitGogName(file.name) + if (dir == chosen) CloudFile(rel, file.modifiedMs, file.md5, file.readLink) else null + } +} + +class GogCloud( + private val userId: String, + private val clientId: String, + private val token: String, + private val location: String? = null, +) : CloudTransport { private val base = "https://cloudstorage.gog.com/v1/$userId/$clientId" private val ua = "GOG Galaxy" + private var prefix: String? = location?.let { "$it/" } private fun key(name: String) = URLEncoder.encode(name, "UTF-8").replace("+", "%20") + private fun cloudKey(name: String) = key((prefix ?: "") + name) + override fun list(): List<CloudFile> { val c = open(base, "GET", token, ua) val code = c.responseCode @@ -70,20 +101,32 @@ class GogCloud(private val userId: String, private val clientId: String, private val text = c.body().decodeToString().trim() c.disconnect() if (text.isEmpty() || text == "[]") return emptyList() - if (text.startsWith("[")) { + val raw = if (text.startsWith("[")) { val a = JSONArray(text) - return (0 until a.length()).mapNotNull { a.optJSONObject(it) }.mapNotNull { o -> + (0 until a.length()).mapNotNull { a.optJSONObject(it) }.mapNotNull { o -> val n = o.optString("name").ifEmpty { return@mapNotNull null } val lm = o.optLong("last_modified", 0L) CloudFile(n, if (lm > 1_000_000_000_000L) lm else if (lm > 0) lm * 1000 else -1L) } + } else { + text.lines().map { it.trim() }.filter { it.isNotEmpty() }.map { CloudFile(it, -1L) } } - return text.lines().map { it.trim() }.filter { it.isNotEmpty() }.map { CloudFile(it, -1L) } + return relative(raw) + } + + /** + * The API names every file `<location>/<path>`. The location's folder is the sync root, so the + * first segment is dropped. Older builds kept it, writing saves one folder too deep. + */ + private fun relative(raw: List<CloudFile>): List<CloudFile> { + val (chosen, files) = gogRelativeNames(raw, location) + prefix = chosen?.let { "$it/" } + return files } override fun details(file: CloudFile) { if (file.modifiedMs > 0 && file.md5 != null) return - val c = open("$base/${key(file.name)}", "HEAD", token, ua) + val c = open("$base/${cloudKey(file.name)}", "HEAD", token, ua) if (c.responseCode in 200..299) { httpDate(c.getHeaderField("Last-Modified")).takeIf { it > 0 }?.let { file.modifiedMs = it } c.getHeaderField("ETag")?.replace("\"", "")?.trim()?.ifEmpty { null }?.let { file.md5 = it } @@ -92,14 +135,14 @@ class GogCloud(private val userId: String, private val clientId: String, private } override fun get(file: CloudFile): Pair<ByteArray, Long> { - val c = open("$base/${key(file.name)}", "GET", token, ua) + val c = open("$base/${cloudKey(file.name)}", "GET", token, ua) if (c.responseCode !in 200..299) { val code = c.responseCode; c.disconnect(); throw java.io.IOException("GOG cloud get HTTP $code") } val modified = httpDate(c.getHeaderField("Last-Modified")) return c.body().also { c.disconnect() } to modified } override fun put(files: Map<String, ByteArray>): Map<String, Long> = files.mapValues { (name, data) -> - val c = open("$base/${key(name)}", "PUT", token, ua) + val c = open("$base/${cloudKey(name)}", "PUT", token, ua) c.doOutput = true c.setRequestProperty("Content-Type", "application/octet-stream") c.setFixedLengthStreamingMode(data.size) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesMigrationTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesMigrationTest.kt new file mode 100644 index 0000000000..ea4e953e0d --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesMigrationTest.kt @@ -0,0 +1,76 @@ +package com.droiddeck.launcher.stores + +import java.io.File +import java.nio.file.Files +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class CloudSavesMigrationTest { + private val dir = Files.createTempDirectory("cloud-migrate").toFile() + private fun entry(bytes: ByteArray) = CloudPlan.Entry(CloudSaves.md5(bytes), null, 1000L) + + private fun nested(name: String, path: String, text: String): File = + File(dir, "$name/$path").apply { parentFile?.mkdirs(); writeText(text) } + + @Test fun movesOnlyFilesTheOldBaselineOwns() { + val a = "old save".toByteArray() + val game = "game wrote this".toByteArray() + nested("saves", "a.dat", String(a)) + nested("saves", "game.dat", String(game)) + val base = mapOf("saves/a.dat" to entry(a)) + val result = CloudSaves.migrateNested(dir, "saves", base)!! + assertEquals(1, result.moved) + assertEquals(0, result.cleaned) + assertEquals(String(a), File(dir, "a.dat").readText()) + assertEquals(String(game), File(dir, "saves/game.dat").readText()) + assertTrue("saves/a.dat" !in result.baseline) + assertEquals(entry(a), result.baseline["a.dat"]) + } + + @Test fun anIdenticalLeftoverIsRemovedAndItsBaselineKeyRewritten() { + val a = "old save".toByteArray() + File(dir, "a.dat").writeText(String(a)) + nested("saves", "a.dat", String(a)) + val result = CloudSaves.migrateNested(dir, "saves", mapOf("saves/a.dat" to entry(a)))!! + assertEquals(0, result.moved) + assertEquals(1, result.cleaned) + assertFalse(File(dir, "saves").exists()) + assertEquals(entry(a), result.baseline["a.dat"]) + assertTrue("saves/a.dat" !in result.baseline) + } + + @Test fun aDifferentDestinationKeepsTheGameFileAndTheBaseline() { + val a = "old save".toByteArray() + File(dir, "a.dat").writeText("newer game save") + nested("saves", "a.dat", String(a)) + val base = mapOf("saves/a.dat" to entry(a)) + val result = CloudSaves.migrateNested(dir, "saves", base)!! + assertEquals(0, result.moved) + assertEquals(0, result.cleaned) + assertEquals("newer game save", File(dir, "a.dat").readText()) + assertEquals(String(a), File(dir, "saves/a.dat").readText()) + assertEquals(base, result.baseline) + } + + @Test fun aSymlinkedAncestorIsNotMigrated() { + val outside = Files.createTempDirectory("cloud-outside").toFile() + File(outside, "a.dat").writeText("outside") + File(dir, "saves").mkdirs() + Files.createSymbolicLink(File(dir, "saves/link").toPath(), outside.toPath()) + val result = CloudSaves.migrateNested(dir, "saves", + mapOf("saves/link/a.dat" to entry("outside".toByteArray())))!! + assertEquals(0, result.moved) + assertEquals(0, result.cleaned) + assertTrue(File(outside, "a.dat").isFile) + } + + @Test fun aLocationNameThatCanLeaveTheFolderIsRefused() { + nested("saves", "a.dat", "x") + assertNull(CloudSaves.migrateNested(dir, "../saves", emptyMap())) + assertNull(CloudSaves.migrateNested(dir, "..", emptyMap())) + assertNull(CloudSaves.migrateNested(dir, "saves/..", emptyMap())) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/GogCloudNamesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/GogCloudNamesTest.kt new file mode 100644 index 0000000000..33959c7314 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/GogCloudNamesTest.kt @@ -0,0 +1,52 @@ +package com.droiddeck.launcher.stores + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class GogCloudNamesTest { + private fun files(vararg names: String) = names.map { CloudFile(it, 1000L) } + + @Test fun silksongLocationIsDroppedFromThePath() { + val (location, mapped) = gogRelativeNames( + files("saves/user1.dat", "saves/shared.dat", "saves/Restore_Points1/restoreData2.dat"), "saves") + assertEquals("saves", location) + assertEquals(listOf("user1.dat", "shared.dat", "Restore_Points1/restoreData2.dat"), mapped.map { it.name }) + } + + @Test fun anotherLocationIsFilteredOut() { + val (_, mapped) = gogRelativeNames(files("saves/a.dat", "__default/settings.ini"), "saves") + assertEquals(listOf("a.dat"), mapped.map { it.name }) + } + + @Test fun theOnlyLocationIsInferredWhenItsNameWasNotCached() { + val (location, mapped) = gogRelativeNames(files("saves/a.dat", "saves/b.dat"), null) + assertEquals("saves", location) + assertEquals(listOf("a.dat", "b.dat"), mapped.map { it.name }) + } + + @Test fun namesWithoutALocationPrefixAreLeftAlone() { + val (location, mapped) = gogRelativeNames(files("a.dat", "b.dat"), null) + assertNull(location) + assertEquals(listOf("a.dat", "b.dat"), mapped.map { it.name }) + } + + @Test fun aConfiguredLocationDoesNotYieldToAnotherLocation() { + val (location, mapped) = gogRelativeNames(files("__default/settings.ini"), "saves") + assertEquals("saves", location) + assertTrue(mapped.isEmpty()) + } + + @Test fun aMixedListingWithOneSubfolderIsLeftAlone() { + val (location, mapped) = gogRelativeNames(files("a.dat", "sub/b.dat"), "saves") + assertNull(location) + assertEquals(listOf("a.dat", "sub/b.dat"), mapped.map { it.name }) + } + + @Test fun aMissingCachedLocationDoesNotHideUnprefixedNames() { + val (location, mapped) = gogRelativeNames(files("a.dat"), "saves") + assertNull(location) + assertEquals(listOf("a.dat"), mapped.map { it.name }) + } +} diff --git a/docs/development/stores.md b/docs/development/stores.md index 0d35745b6d..97b119238b 100644 --- a/docs/development/stores.md +++ b/docs/development/stores.md @@ -269,6 +269,14 @@ the prefix's user folder appears, within a minute. Every path logs game's prefix (`compatdata/<shortcut appid>/pfx/drive_c/users/steamuser`) or its install folder, case-insensitively, and refuses a path that leaves its boundary. A game whose store gives none has no cloud saves. +- **GOG names are location-qualified:** the cloud API lists `saves/user1.dat`, where `saves` is the + `name` of the selected `cloudStorage.locations` entry and the folder is that entry's `location` + (`.../Hollow Knight Silksong/default`). `GogCloud` strips the location segment for the local path + and puts it back for `HEAD`/`GET`/`PUT`; files from other locations are ignored. Builds before + this wrote `<location>/...` one folder too deep (`default/saves/user1.dat`); `migrateGogNested` + moves those copies up, deletes byte-identical leftovers and rewrites their baseline keys. The + migration runs once per game (`cloud_layout_<id>`), so a game that legitimately keeps a folder + named like the location is not relocated again; a non-prefixed listing is left unchanged. - **The services:** GOG `cloudstorage.gog.com/v1/<user>/<client>` with a token issued to the game's own client (the client secret is kept at install; the Galaxy token is the fallback); Epic's savesync data storage with signed read and write links (`EpicCloud` → `EpicSaveSync` → the Rust From 067f82e5e2725ce79b35bade80bb71fbca1f1473 Mon Sep 17 00:00:00 2001 From: MaxsTechReview <maxjividen@gmail.com> Date: Sun, 25 Oct 2026 12:59:58 -0400 Subject: [PATCH 028/135] fix(stores): let a game's description fill the free height of the page (#1493) Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- .../java/com/droiddeck/launcher/ui/CardDetailHost.kt | 11 +++++++++-- .../main/java/com/droiddeck/launcher/ui/GameDetail.kt | 10 +++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt b/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt index d94ee25a7d..f606e6008a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.verticalScroll import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.compositionLocalOf import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember @@ -37,6 +38,8 @@ import androidx.compose.runtime.setValue import androidx.compose.runtime.getValue /** A grid of cards with a game page that floods out of the opened card and drains back into it. */ +internal val LocalDetailFloor = compositionLocalOf<() -> Float> { { Float.MAX_VALUE } } + @OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class) @Composable internal fun CardDetailHost( @@ -57,6 +60,7 @@ internal fun CardDetailHost( var from by remember { mutableStateOf<Origin?>(null) } var art by remember { mutableStateOf<String?>(null) } var viewportAt by remember { mutableStateOf(Offset.Zero) } + var viewportH by remember { mutableStateOf(0) } LaunchedEffect(open) { if (open != null) { val mark = StoresMotion.takeCard(open) @@ -83,7 +87,7 @@ internal fun CardDetailHost( val fade = with(density) { 14.dp.toPx() } Box( modifier.clipToBounds() - .onGloballyPositioned { viewportAt = it.positionInRoot() } + .onGloballyPositioned { viewportAt = it.positionInRoot(); viewportH = it.size.height } .graphicsLayer { compositingStrategy = androidx.compose.ui.graphics.CompositingStrategy.Offscreen } .drawWithContent { drawContent() @@ -114,7 +118,10 @@ internal fun CardDetailHost( .onFocusChanged { onDetailFocus(it.hasFocus) } .focusProperties { exit = { if (coveringNow.value && Steps.step == null && StoresMotion.step == null) FocusRequester.Cancel else FocusRequester.Default } } .focusGroup(), - ) { detail(key) } + ) { + val floor = { viewportAt.y + viewportH - with(density) { 16.dp.toPx() } - detailScroll.value } + CompositionLocalProvider(LocalDetailFloor provides floor) { detail(key) } + } } } val origin = from diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index 32be30564e..7c9cdc74c2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -56,6 +56,8 @@ import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.boundsInRoot import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.layout.positionInRoot +import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag @@ -599,7 +601,13 @@ private fun AboutTab(developer: String, publisher: String, releaseDate: String, val parts = listOf(developer, publisher, com.droiddeck.launcher.stores.GameFacts.releaseLabel(releaseDate).orEmpty()).filter { it.isNotBlank() }.distinct() Text(parts.joinToString(" · "), fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.readable()) } - if (description.isNotBlank()) StoreAbout(description, AboutHeight, Modifier.fillMaxWidth()) + if (description.isNotBlank()) { + val floor = LocalDetailFloor.current + val density = LocalDensity.current + var room by remember { mutableStateOf(AboutHeight) } + val fill = Modifier.onGloballyPositioned { c -> room = maxOf(AboutHeight, with(density) { (floor() - c.positionInRoot().y).toDp() - 14.dp }) } + StoreAbout(description, room, Modifier.fillMaxWidth().then(fill)) + } } } From 27e390a846b9b5cd8d0b450f0d1bea6e5f04bcf3 Mon Sep 17 00:00:00 2001 From: MaxsTechReview <maxjividen@gmail.com> Date: Sun, 25 Oct 2026 13:10:28 -0400 Subject: [PATCH 029/135] fix: StarCraft starts its 32-bit client from Battle.net (#1564) --- .../overlay/usr/local/bin/droiddeck-battlenet | 12 +++++++++- tools/tests/test_battlenet.py | 22 ++++++++++++++++--- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index 6e695d930c..68c3ea6d75 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -24,6 +24,7 @@ CLIENT = "Battle.net.exe" CONFIG = ("users", "steamuser", "AppData", "Roaming", "Battle.net", "Battle.net.config") DEFAULT_CONFIG = {"Client": {"HardwareAcceleration": "false", "Streaming": {"StreamingEnabled": "false"}}} LAUNCH_BEHAVIOR = ("GameLaunchWindowBehavior", "2") +CLIENT_32_BIT = ("s1",) CACHE = os.path.join(HOME, ".cache", "droiddeck", "battlenet") MENU = "/usr/local/share/applications/droiddeck-battlenet.desktop" WALLPAPER_DIR = ("users", "steamuser", "AppData", "Local", "DroidDeck") @@ -145,6 +146,12 @@ def write_config(root, library=None): and str(client["Install"].get("DefaultInstallPath", "")).rstrip("/\\") != install_path(library): client["Install"]["DefaultInstallPath"] = install_path(library) changes.append("library") + games = config.setdefault("Games", {}) + for uid in CLIENT_32_BIT if isinstance(games, dict) else (): + game = games.setdefault(uid, {}) + if isinstance(game, dict) and game.get("Run64BitSet") != "true": + game.update(Run64Bit="false", Run64BitSet="true") + changes.append("32-bit") if not changes: return None os.makedirs(os.path.dirname(path), exist_ok=True) @@ -361,7 +368,8 @@ def configure(root, library=None): say("Battle.net's desktop wallpaper not set: %s" % error) enable_gamepad(root) if change == "first": - say("wrote Battle.net's first config: hardware acceleration off, streaming off, closing itself as it launches a game") + say("wrote Battle.net's first config: hardware acceleration off, streaming off, closing itself as it launches a game, " + "StarCraft on its 32-bit client") elif change: if "launch" in change: say("Battle.net's config: closing itself as it launches a game") @@ -369,6 +377,8 @@ def configure(root, library=None): say("Battle.net's config: games install to %s" % library) if "acceleration" in change: say("Battle.net's config: browser hardware acceleration off") + if "32-bit" in change: + say("Battle.net's config: StarCraft starts its 32-bit client") def write_menu(path=MENU): diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index 34edd448ec..1c0bc19215 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -139,13 +139,29 @@ class ConfigAndMenuTest(Temp): self.assertEqual(config["Client"]["GameLaunchWindowBehavior"], "2") self.assertIsNone(BNET["write_config"](root)) path.write_text('{"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "0"}, "Games": {"osi": {}}}') - self.assertEqual(BNET["write_config"](root), "launch") + self.assertEqual(BNET["write_config"](root), "launch 32-bit") config = json.loads(path.read_text()) - self.assertEqual(config, {"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "2"}, "Games": {"osi": {}}}) + self.assertEqual(config, {"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "2"}, + "Games": {"osi": {}, "s1": {"Run64Bit": "false", "Run64BitSet": "true"}}}) path.write_text('{"Client": {"HardwareAcceleration": "true", "GameLaunchWindowBehavior": "2"}}') - self.assertEqual(BNET["write_config"](root), "acceleration") + self.assertEqual(BNET["write_config"](root), "acceleration 32-bit") self.assertEqual(json.loads(path.read_text())["Client"]["HardwareAcceleration"], "false") + def test_starcraft_starts_its_32_bit_client_until_a_player_picks_one(self): + root = str(self.tmp) + BNET["write_config"](root) + self.assertEqual(json.loads(self.config_path().read_text())["Games"], {"s1": {"Run64Bit": "false", "Run64BitSet": "true"}}) + self.config_path().write_text('{"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "2"}, ' + '"Games": {"s1": {"ServerUid": "s1", "Run64Bit": "true"}}}') + self.assertEqual(BNET["write_config"](root), "32-bit") + self.assertEqual(json.loads(self.config_path().read_text())["Games"]["s1"], + {"ServerUid": "s1", "Run64Bit": "false", "Run64BitSet": "true"}) + self.config_path().write_text('{"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "2"}, ' + '"Games": {"s1": {"Run64Bit": "true", "Run64BitSet": "true"}}}') + self.assertIsNone(BNET["write_config"](root)) + self.config_path().write_text('{"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "2"}, "Games": []}') + self.assertIsNone(BNET["write_config"](root)) + def test_games_install_to_the_chosen_library(self): root = str(self.tmp) BNET["write_config"](root) From ae193e9b8d72046b41ce2b784422853e4a9e03cc Mon Sep 17 00:00:00 2001 From: Hector Osuna <55816095+FanGoH@users.noreply.github.com> Date: Sun, 25 Oct 2026 11:20:29 -0600 Subject: [PATCH 030/135] fix: find GOG Galaxy SDK cloud saves when remote-config lists no locations (#970) * fix: find GOG Galaxy SDK cloud saves when remote-config lists no locations cloudStorage.enabled with an empty locations list is Galaxy SDK IStorage under __default. DroidDeck treated that as no cloud. Use the SDK folder, strip/prefix the __default namespace, and inflate gzip bodies GOG stores on download. An empty cached template is fetched again so devices that already recorded "no cloud" recover. * fix: keep an empty GOG namespace, expire cached none, close gzip An explicit empty cloud_namespace is Auto Cloud and must not become __default just because the path template looks like Galaxy storage. A cached none is retried after a day so a later enablement is picked up. GZIPInputStream is closed after a compressed download. * fix: peel GOG cloud gzip only when the service or PUT compressor says so GET asks for identity encoding so the body is what GOG stored. A Content-Encoding of gzip is inflated once. Otherwise a gzip body is inflated only when it round-trips as GOG's PUT gzip (deflate 6, mtime 0), so a gzip-format save is not rewritten. * Reject corrupt GOG cloud downloads --------- Co-authored-by: xXJsonDeruloXx <danielhimebauch@gmail.com> Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- .../launcher/stores/CloudSavePaths.kt | 20 +++++ .../droiddeck/launcher/stores/CloudSaves.kt | 71 +++++++++++------ .../launcher/stores/CloudTransport.kt | 77 ++++++++++++++++--- .../launcher/stores/CloudSavePathsTest.kt | 30 ++++++++ .../launcher/stores/CloudSavesTest.kt | 13 +++- .../launcher/stores/GogCloudKeysTest.kt | 61 +++++++++++++++ docs/development/stores.md | 7 +- 7 files changed, 245 insertions(+), 34 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/GogCloudKeysTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSavePaths.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSavePaths.kt index 194448f0c8..9dfc6b6658 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSavePaths.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSavePaths.kt @@ -3,8 +3,28 @@ package com.droiddeck.launcher.stores import java.io.File object CloudSavePaths { + const val GOG_DEFAULT_NAMESPACE = "__default" + fun profile(prefix: File): File = File(prefix, "drive_c/users/steamuser") + fun gogGalaxySdkTemplate(clientId: String) = + "%LocalAppData%/GOG.com/Galaxy/Applications/$clientId/Storage/Shared/Files" + + class GogCloudLocation(val name: String, val template: String) + + /** + * cloudStorage.enabled with an empty locations list is Galaxy SDK IStorage, whose objects the + * API names under a location called `__default`. + */ + fun gogSaveFromRemote(enabled: Boolean, locations: List<Pair<String, String>>, clientId: String): GogCloudLocation? { + if (!enabled) return null + val named = locations.filter { it.second.isNotEmpty() } + val pick = named.firstOrNull { it.first.equals("saves", true) } ?: named.firstOrNull() + if (pick != null) return GogCloudLocation(pick.first, pick.second) + if (clientId.isEmpty()) return null + return GogCloudLocation(GOG_DEFAULT_NAMESPACE, gogGalaxySdkTemplate(clientId)) + } + fun gog(template: String, prefix: File, install: File): File? { val norm = template.replace('\\', '/').trim().trimStart('/') val match = Regex("^(<\\?[^?>]+\\?>|%[^%]+%)").find(norm) ?: return null diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt index 9aaa8e98a1..659ae7005c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.stores import android.content.Context +import android.content.SharedPreferences import android.util.Log import com.droiddeck.launcher.frontend.AddedGames import com.droiddeck.launcher.frontend.Library @@ -48,11 +49,38 @@ object CloudSaves { private fun markSynced(context: Context, store: Store, id: String) = prefs(context, store).edit().putLong("cloud_sync_$id", System.currentTimeMillis()).apply() + private const val TEMPLATE_NONE = "none" + internal const val TEMPLATE_NONE_TTL_MS = 24 * 60 * 60 * 1000L + + internal fun noneTemplateIsCurrent(storedAtMs: Long, nowMs: Long) = + storedAtMs > 0L && nowMs - storedAtMs < TEMPLATE_NONE_TTL_MS + + private fun rememberNoCloud(p: SharedPreferences, id: String) { + p.edit().putString("cloud_template_$id", TEMPLATE_NONE) + .putLong("cloud_template_at_$id", System.currentTimeMillis()).apply() + } + fun template(context: Context, store: Store, id: String, folder: File, sidecar: StoreGameSidecar): String? { val p = prefs(context, store) - if (p.contains("cloud_template_$id")) return p.getString("cloud_template_$id", "") + var retryNone = false + if (p.contains("cloud_template_$id")) { + val cached = p.getString("cloud_template_$id", "") ?: "" + if (cached == TEMPLATE_NONE) { + if (noneTemplateIsCurrent(p.getLong("cloud_template_at_$id", 0L), System.currentTimeMillis())) return "" + retryNone = true + } else if (cached.isNotEmpty()) return cached + } + var gogLocation = "" val fetched = when (store) { - Store.GOG -> gogTemplate(context, id, folder) + Store.GOG -> { + val config = gogConfig(context, id, folder) + if (config == null) { + if (retryNone) { rememberNoCloud(p, id); return "" } + return null + } + gogLocation = config.name + config.location + } Store.EPIC -> { val token = EpicCredentialStore.getValidAccessToken(context) ?: return null val ns = sidecar.extra["namespace"].orEmpty() @@ -61,7 +89,14 @@ object CloudSaves { } Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> "" } ?: return null - p.edit().putString("cloud_template_$id", fetched).apply() + p.edit() + .putString("cloud_template_$id", fetched.ifEmpty { TEMPLATE_NONE }) + .apply { + if (fetched.isEmpty()) putLong("cloud_template_at_$id", System.currentTimeMillis()) + else remove("cloud_template_at_$id") + if (store == Store.GOG && gogLocation.isNotEmpty()) putString("cloud_location_$id", gogLocation) + } + .apply() Log.i(TAG, "cloud ${store.id} $id template ${if (fetched.isEmpty()) "none" else "found"}") return fetched } @@ -81,29 +116,21 @@ object CloudSaves { if (c.responseCode !in 200..299) { c.disconnect(); return null } val cloud = JSONObject(c.inputStream.bufferedReader().readText()).optJSONObject("content")?.optJSONObject("Windows")?.optJSONObject("cloudStorage") c.disconnect() - if (cloud?.optBoolean("enabled", false) != true) return GogConfig("", "") - val locations = cloud.optJSONArray("locations") ?: return GogConfig("", "") - val all = (0 until locations.length()).mapNotNull { locations.optJSONObject(it) } - val chosen = all.firstOrNull { it.optString("name").equals("saves", true) } ?: all.firstOrNull() - val location = chosen?.optString("location").orEmpty() - val name = chosen?.optString("name").orEmpty() - if (location.isEmpty()) GogConfig("", "") else GogConfig(name, location) + val locations = cloud?.optJSONArray("locations") + val picked = CloudSavePaths.gogSaveFromRemote( + enabled = cloud?.optBoolean("enabled", false) == true, + locations = (0 until (locations?.length() ?: 0)).mapNotNull { i -> + locations!!.optJSONObject(i)?.let { it.optString("name") to it.optString("location") } + }, + clientId = clientId, + ) + if (picked == null) GogConfig("", "") else GogConfig(picked.name, picked.template) } catch (e: Exception) { Log.w(TAG, "gog remote-config: ${e.javaClass.simpleName}") null } } - private fun gogTemplate(context: Context, id: String, folder: File): String? { - val p = GogPrefs.get(context) - if (p.contains("cloud_template_$id")) return p.getString("cloud_template_$id", "") - val config = gogConfig(context, id, folder) ?: return null - p.edit().putString("cloud_template_$id", config.location).apply { - if (config.name.isNotEmpty()) putString("cloud_location_$id", config.name) - }.apply() - return config.location - } - /** * The selected cloud location's name: GOG prefixes every cloud file with it, and the local folder * is the location itself. Older builds had no name cached; fetch it once for those. @@ -111,7 +138,7 @@ object CloudSaves { private fun gogLocationName(context: Context, id: String, folder: File): String? { val p = GogPrefs.get(context) p.getString("cloud_location_$id", null)?.ifEmpty { null }?.let { return it } - if (p.getString("cloud_template_$id", null)?.isEmpty() == true) return null + if (p.getString("cloud_template_$id", null)?.let { it.isEmpty() || it == TEMPLATE_NONE } == true) return null val config = gogConfig(context, id, folder) ?: return null if (config.name.isNotEmpty()) p.edit().putString("cloud_location_$id", config.name).apply() return config.name.ifEmpty { null } @@ -296,7 +323,7 @@ object CloudSaves { } } } catch (e: NoCloudSaves) { - prefs(context, store).edit().putString("cloud_template_$id", "").apply() + rememberNoCloud(prefs(context, store), id) Result("skipped", 0, 0, "no-cloud-saves") } catch (e: Exception) { Result("failed", 0, 0, e.javaClass.simpleName) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt index 2b2be1bc48..9c32bd4c1a 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt @@ -7,6 +7,8 @@ import java.net.URLEncoder import java.text.SimpleDateFormat import java.util.Locale import java.util.TimeZone +import java.util.zip.CRC32 +import java.util.zip.Deflater import org.json.JSONArray import org.json.JSONObject @@ -38,15 +40,60 @@ private fun httpDate(s: String?): Long = try { SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US).apply { timeZone = TimeZone.getTimeZone("GMT") }.parse(s!!.trim())?.time ?: -1L } catch (e: Exception) { -1L } +internal fun isGzip(data: ByteArray) = + data.size >= 10 && data[0] == 0x1f.toByte() && data[1] == 0x8b.toByte() && data[2] == 0x08.toByte() + +internal fun gunzip(data: ByteArray): ByteArray? = try { + java.util.zip.GZIPInputStream(data.inputStream()).use { it.readBytes() } +} catch (e: Exception) { null } + +/** Same gzip GOG uses on PUT: deflate level 6, mtime 0, OS Unix. */ +internal fun gzipGogPut(data: ByteArray): ByteArray { + val deflater = Deflater(6, true) + val raw = ByteArrayOutputStream() + try { + deflater.setInput(data) + deflater.finish() + val buf = ByteArray(512) + while (!deflater.finished()) { + val n = deflater.deflate(buf) + if (n > 0) raw.write(buf, 0, n) + } + } finally { + deflater.end() + } + val crc = CRC32().also { it.update(data) } + return ByteArrayOutputStream(18 + raw.size()).apply { + write(byteArrayOf(0x1f, 0x8b.toByte(), 8, 0, 0, 0, 0, 0, 0, 3)) + write(raw.toByteArray()) + writeIntLe(crc.value.toInt()) + writeIntLe(data.size) + }.toByteArray() +} + +private fun ByteArrayOutputStream.writeIntLe(v: Int) { + write(v and 0xff) + write(v ushr 8 and 0xff) + write(v ushr 16 and 0xff) + write(v ushr 24 and 0xff) +} + +internal fun gogDecodeCloudBody(data: ByteArray, contentEncoding: String?): ByteArray { + val encodings = contentEncoding.orEmpty().split(',').map { it.trim().lowercase() } + if ("gzip" in encodings || "x-gzip" in encodings) { + if (!isGzip(data)) return data + return gunzip(data) ?: throw java.io.IOException("Invalid GOG cloud gzip body") + } + if (!isGzip(data)) return data + val inflated = gunzip(data) ?: return data + return if (gzipGogPut(inflated).contentEquals(data)) inflated else data +} + internal fun isoDate(s: String?): Long { - if (s == null || s.length < 19) return -1L - return try { - java.util.Calendar.getInstance(TimeZone.getTimeZone("UTC")).apply { - clear() - set(s.substring(0, 4).toInt(), s.substring(5, 7).toInt() - 1, s.substring(8, 10).toInt(), - s.substring(11, 13).toInt(), s.substring(14, 16).toInt(), s.substring(17, 19).toInt()) - }.timeInMillis - } catch (e: Exception) { -1L } + if (s == null) return -1L + return runCatching { java.time.OffsetDateTime.parse(s).toInstant().toEpochMilli() } + .recoverCatching { java.time.LocalDateTime.parse(s).toInstant(java.time.ZoneOffset.UTC).toEpochMilli() } + .getOrDefault(-1L) } class NoCloudSaves : Exception("no cloud saves") @@ -106,7 +153,13 @@ class GogCloud( (0 until a.length()).mapNotNull { a.optJSONObject(it) }.mapNotNull { o -> val n = o.optString("name").ifEmpty { return@mapNotNull null } val lm = o.optLong("last_modified", 0L) - CloudFile(n, if (lm > 1_000_000_000_000L) lm else if (lm > 0) lm * 1000 else -1L) + val iso = isoDate(o.optString("last_modified").takeIf { it.isNotEmpty() }) + CloudFile(n, when { + lm > 1_000_000_000_000L -> lm + lm > 0 -> lm * 1000 + iso > 0 -> iso + else -> -1L + }) } } else { text.lines().map { it.trim() }.filter { it.isNotEmpty() }.map { CloudFile(it, -1L) } @@ -136,9 +189,13 @@ class GogCloud( override fun get(file: CloudFile): Pair<ByteArray, Long> { val c = open("$base/${cloudKey(file.name)}", "GET", token, ua) + c.setRequestProperty("Accept-Encoding", "identity") if (c.responseCode !in 200..299) { val code = c.responseCode; c.disconnect(); throw java.io.IOException("GOG cloud get HTTP $code") } val modified = httpDate(c.getHeaderField("Last-Modified")) - return c.body().also { c.disconnect() } to modified + val encoding = c.getHeaderField("Content-Encoding") + val data = c.body() + c.disconnect() + return gogDecodeCloudBody(data, encoding) to modified } override fun put(files: Map<String, ByteArray>): Map<String, Long> = files.mapValues { (name, data) -> diff --git a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavePathsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavePathsTest.kt index a88c8b9548..675c1e009e 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavePathsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavePathsTest.kt @@ -47,4 +47,34 @@ class CloudSavePathsTest { File(profile, "AppData/Local/My-Game").mkdirs() assertEquals(File(profile, "AppData/Local/My-Game").path, CloudSavePaths.epic("{AppData}/MyGame", prefix, install, "acc", "app")!!.path) } + + @Test fun gogGalaxySdkEmptyLocationsUseDefaultLocation() { + val loc = CloudSavePaths.gogSaveFromRemote(true, emptyList(), "1")!! + assertEquals( + "%LocalAppData%/GOG.com/Galaxy/Applications/1/Storage/Shared/Files", + loc.template, + ) + assertEquals(CloudSavePaths.GOG_DEFAULT_NAMESPACE, loc.name) + val dir = CloudSavePaths.gog(loc.template, prefix, install) + assertEquals( + File(profile, "AppData/Local/GOG.com/Galaxy/Applications/1/Storage/Shared/Files").path, + dir!!.path, + ) + } + + @Test fun gogCloudDisabledOrUnknownClientIsNone() { + assertNull(CloudSavePaths.gogSaveFromRemote(false, emptyList(), "1")) + assertNull(CloudSavePaths.gogSaveFromRemote(true, emptyList(), "")) + assertNull(CloudSavePaths.gogSaveFromRemote(true, listOf("saves" to ""), "")) + } + + @Test fun gogNamedLocationKeepsItsNameAndPreferSaves() { + val loc = CloudSavePaths.gogSaveFromRemote( + true, + listOf("other" to "<?SAVED_GAMES?>/A", "Saves" to "<?APPLICATION_DATA_LOCAL_LOW?>/Hyperstrange/ELDERBORN"), + "1", + )!! + assertEquals("<?APPLICATION_DATA_LOCAL_LOW?>/Hyperstrange/ELDERBORN", loc.template) + assertEquals("Saves", loc.name) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt index 0c30447430..0b80032627 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt @@ -4,6 +4,7 @@ import java.io.File import java.util.concurrent.Executor import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith @@ -77,12 +78,22 @@ class CloudSavesTest { assertTrue(CloudSaves.dirty(app).contains(Store.GOG to gameId)) CloudSaves.uploadAllDirty(app, "recovery", running = true) assertTrue(CloudSaves.dirty(app).contains(Store.GOG to gameId)) - com.droiddeck.launcher.stores.gog.GogPrefs.get(app).edit().putString("cloud_template_$gameId", "").apply() + com.droiddeck.launcher.stores.gog.GogPrefs.get(app).edit() + .putString("cloud_template_$gameId", "none") + .putLong("cloud_template_at_$gameId", System.currentTimeMillis()) + .apply() assertEquals("no-cloud-saves", CloudSaves.uploadDirty(app, Store.GOG, gameId, "exit")!!.reason) assertTrue(CloudSaves.dirty(app).none { it.second == gameId }) assertEquals(null, CloudSaves.uploadDirty(app, Store.GOG, gameId, "session-end")) } + @Test fun aNegativeCloudTemplateIsRetriedAfterADay() { + val now = 1_000_000L + assertTrue(CloudSaves.noneTemplateIsCurrent(now, now + 60_000L)) + assertFalse(CloudSaves.noneTemplateIsCurrent(now, now + CloudSaves.TEMPLATE_NONE_TTL_MS)) + assertFalse(CloudSaves.noneTemplateIsCurrent(0L, now)) + } + @Test fun aFirstLaunchWithoutAPrefixIsDeferredNotBlocked() { val deferred = ArrayList<Runnable>() val folder = File(StoreInstallRoot.storeDir(StoreInstallRoot.internalRoot(app), Store.GOG), "ELDERBORN").apply { mkdirs() } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/GogCloudKeysTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/GogCloudKeysTest.kt new file mode 100644 index 0000000000..df7ba8f2ba --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/GogCloudKeysTest.kt @@ -0,0 +1,61 @@ +package com.droiddeck.launcher.stores + +import java.io.ByteArrayOutputStream +import java.util.zip.GZIPOutputStream +import org.junit.Assert.assertArrayEquals +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class GogCloudKeysTest { + @Test fun defaultLocationIsStrippedLikeAnyNamedLocation() { + val files = listOf(CloudFile("__default/savegame0.sav", 1L), CloudFile("saves/slot0.sav", 2L)) + val (chosen, relative) = gogRelativeNames(files, "__default") + assertEquals("__default", chosen) + assertEquals(listOf("savegame0.sav"), relative.map { it.name }) + } + + @Test fun gzipGogPutMatchesPythonGzipCompressLevel6Mtime0() { + val raw = "savegame0".toByteArray() + val expected = "1f8b08000000000000032b4e2c4b4d4fcc4d35000065fc333209000000".hex() + assertArrayEquals(expected, gzipGogPut(raw)) + assertArrayEquals(raw, gunzip(expected)) + } + + @Test fun contentEncodingGzipIsPeeledOnce() { + val raw = "savegame0".toByteArray() + val gz = ByteArrayOutputStream().also { GZIPOutputStream(it).use { z -> z.write(raw) } }.toByteArray() + assertArrayEquals(raw, gogDecodeCloudBody(gz, "gzip")) + assertArrayEquals(raw, gogDecodeCloudBody(raw, "gzip")) + } + + @Test fun corruptDeclaredGzipIsRejected() { + val corrupt = gzipGogPut("savegame0".toByteArray()).dropLast(2).toByteArray() + assertTrue(isGzip(corrupt)) + assertTrue(runCatching { gogDecodeCloudBody(corrupt, "gzip") }.isFailure) + } + + @Test fun isoDateHonorsOffsetAndFractionalSeconds() { + val expected = java.time.Instant.parse("2024-01-02T01:04:05.123Z").toEpochMilli() + assertEquals(expected, isoDate("2024-01-02T03:04:05.123+02:00")) + assertEquals(expected, isoDate("2024-01-02T01:04:05.123")) + } + + @Test fun gogPutWrappedBodyWithoutEncodingIsPeeled() { + val raw = "savegame0".toByteArray() + assertArrayEquals(raw, gogDecodeCloudBody(gzipGogPut(raw), null)) + assertArrayEquals(raw, gogDecodeCloudBody(raw, null)) + } + + @Test fun gzipThatIsTheSaveIsLeftIntact() { + val raw = "savegame0".toByteArray() + val gameGz = ByteArrayOutputStream().also { GZIPOutputStream(it).use { z -> z.write(raw) } }.toByteArray() + assertTrue(isGzip(gameGz)) + assertFalse(gzipGogPut(raw).contentEquals(gameGz)) + assertArrayEquals(gameGz, gogDecodeCloudBody(gameGz, null)) + } +} + +private fun String.hex() = chunked(2).map { it.toInt(16).toByte() }.toByteArray() diff --git a/docs/development/stores.md b/docs/development/stores.md index 97b119238b..cac5f58d8c 100644 --- a/docs/development/stores.md +++ b/docs/development/stores.md @@ -268,7 +268,12 @@ the prefix's user folder appears, within a minute. Every path logs `CloudSaveFolder`, e.g. `{AppData}/Game/Saved/SaveGames`. `CloudSavePaths` expands it inside the game's prefix (`compatdata/<shortcut appid>/pfx/drive_c/users/steamuser`) or its install folder, case-insensitively, and refuses a path that leaves its boundary. A game whose store gives none - has no cloud saves. + has no cloud saves; a cached none is retried after a day. +- **Galaxy SDK saves:** `cloudStorage.enabled` with an empty `locations` list is Galaxy SDK + IStorage, whose objects live under a location named `__default` in + `%LocalAppData%/GOG.com/Galaxy/Applications/<clientId>/Storage/Shared/Files`. It goes through the + same location-qualified handling below. GET peels gzip when `Content-Encoding` is gzip, or when + the object round-trips as GOG's PUT gzip (deflate 6, mtime 0); a gzip-format save is left intact. - **GOG names are location-qualified:** the cloud API lists `saves/user1.dat`, where `saves` is the `name` of the selected `cloudStorage.locations` entry and the folder is that entry's `location` (`.../Hollow Knight Silksong/default`). `GogCloud` strips the location segment for the local path From 9593529197f3422a7ace53b2b2be6ff5037c2f75 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 13:20:33 -0400 Subject: [PATCH 031/135] feat: a setting to keep Steam uncompressed while games run (#1565) * feat: a setting to keep Steam uncompressed while games run * fix: say that the RAM cap still compresses Steam when this is off --- .../main/java/com/droiddeck/launcher/FrontEndActivity.kt | 5 ++++- .../main/java/com/droiddeck/launcher/core/DeviceReport.kt | 1 + .../java/com/droiddeck/launcher/session/SessionPrefs.kt | 6 ++++++ .../java/com/droiddeck/launcher/session/SessionService.kt | 1 + .../java/com/droiddeck/launcher/session/SettingsReset.kt | 2 +- .../java/com/droiddeck/launcher/ui/PerformanceDialog.kt | 7 +++++++ app/src/main/res/values/strings.xml | 2 ++ tools/linuxfs/overlay/usr/local/bin/droiddeck-session | 3 ++- 8 files changed, 24 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index caefd04e92..9e8d2f50a8 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -154,6 +154,7 @@ class FrontEndActivity : ComponentActivity() { private var fsyncFirst by mutableStateOf(false) private var gamescopeRealtime by mutableStateOf(false) private var ramCapMb by mutableStateOf(0) + private var zramClient by mutableStateOf(true) private var vramCapMb by mutableStateOf(0) private var gpuClockPin by mutableStateOf(false) private var prootNoSeccomp by mutableStateOf(false) @@ -1871,7 +1872,7 @@ class FrontEndActivity : ComponentActivity() { fsyncFirst = fsyncFirst, gamescopeRealtime = gamescopeRealtime, gpuClockPin = gpuClockPin, - ramCapMb = ramCapMb, vramCapMb = vramCapMb, + ramCapMb = ramCapMb, vramCapMb = vramCapMb, zramClient = zramClient, deviceRamMb = (android.app.ActivityManager.MemoryInfo() .also((getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager)::getMemoryInfo).totalMem / (1024 * 1024)).toInt(), ramCapAvailable = com.droiddeck.launcher.core.ZramSupport.supported(), @@ -1889,6 +1890,7 @@ class FrontEndActivity : ComponentActivity() { onGamescopeRealtime = { on -> SessionPrefs.setGamescopeRealtime(this, on); gamescopeRealtime = on }, onGpuClockPin = { on -> SessionPrefs.setGpuClockPin(this, on); gpuClockPin = on }, onRamCapMb = { mb -> SessionPrefs.setRamCapMb(this, mb); ramCapMb = mb }, + onZramClient = { on -> SessionPrefs.setZramClient(this, on); zramClient = on }, onVramCapMb = { mb -> SessionPrefs.setVramCapMb(this, mb); vramCapMb = mb }, onProotNoSeccomp = { on -> SessionPrefs.setProotNoSeccomp(this, on); prootNoSeccomp = on }, onProotFastPath = { on -> SessionPrefs.setProotFastPath(this, on); prootFastPath = on }, @@ -2086,6 +2088,7 @@ class FrontEndActivity : ComponentActivity() { fsyncFirst = SessionPrefs.fsyncFirst(this) gamescopeRealtime = SessionPrefs.gamescopeRealtime(this) ramCapMb = SessionPrefs.ramCapMb(this) + zramClient = SessionPrefs.zramClient(this) vramCapMb = SessionPrefs.vramCapMb(this) gpuClockPin = SessionPrefs.gpuClockPin(this) prootNoSeccomp = SessionPrefs.prootNoSeccomp(this) 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 0246ed8e6b..9d62261667 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -256,6 +256,7 @@ object DeviceReport { EsyncPacks.status(LinuxRuntime.rootDir(context)).let { k("droiddeck-esync packs", "${it.installed} installed, ${it.wanted} wanted") } k("Linux x86 (FEX)", if (com.droiddeck.launcher.runtime.LinuxFex.ready(context)) "ready" else "not set up") k("gamescope realtime", SessionPrefs.gamescopeRealtime(context)) + k("zRAM: compress Steam during games", SessionPrefs.zramClient(context)) k("RAM cap", SessionPrefs.ramCapMb(context).let { if (it > 0) "$it MB" else "off" }) k("VRAM cap", SessionPrefs.vramCapMb(context).let { if (it > 0) "$it MB" else "driver default" }) k("proot without seccomp", SessionPrefs.prootNoSeccomp(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 01d00c8d43..9756aa0515 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -459,6 +459,12 @@ object SessionPrefs { prefs(context).edit().putInt("ramCapMb", mb.coerceAtLeast(0)).apply() } + fun zramClient(context: Context): Boolean = prefs(context).getBoolean("zramClient", true) + + fun setZramClient(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("zramClient", on).apply() + } + fun vramCapMb(context: Context): Int = prefs(context).getInt("vramCapMb", 0).coerceAtLeast(0) fun setVramCapMb(context: Context, mb: Int) { 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 0fa1182ccc..363993c713 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -746,6 +746,7 @@ class SessionService : Service() { if (com.droiddeck.launcher.core.ZramSupport.supported()) { guest.add("BL_ZRAM=1") if (steamHere) SessionPrefs.ramCapMb(this).takeIf { it > 0 }?.let { guest.add("BL_RAM_CAP_MB=$it") } + if (!SessionPrefs.zramClient(this)) guest.add("BL_ZRAM_CLIENT=0") } SessionPrefs.vramCapMb(this).takeIf { it > 0 }?.let { guest.add("BL_VRAM_MB=$it") } guest.add("BANNER_AUDIO_DIRECT_DECAY=0") diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 7d7f0cff52..62222ed3ef 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -18,7 +18,7 @@ object SettingsReset { "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", "stretch16x9", "picturePosition", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", - "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", + "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", "zramClient", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "cursorComposite", "guestHostname", "fexPreset", "forceSsbs", "logs", "storageDiagnostics", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt index d8c83c9a0b..9c1424dd4f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt @@ -47,6 +47,7 @@ fun PerformancePage( gamescopeRealtime: Boolean, gpuClockPin: Boolean, ramCapMb: Int, + zramClient: Boolean, vramCapMb: Int, deviceRamMb: Int, ramCapAvailable: Boolean, @@ -67,6 +68,7 @@ fun PerformancePage( onGamescopeRealtime: (Boolean) -> Unit, onGpuClockPin: (Boolean) -> Unit, onRamCapMb: (Int) -> Unit, + onZramClient: (Boolean) -> Unit, onVramCapMb: (Int) -> Unit, onProotNoSeccomp: (Boolean) -> Unit, onProotFastPath: (Boolean) -> Unit, @@ -135,6 +137,11 @@ fun PerformancePage( val top = (deviceRamMb / MEMORY_CAP_STEP_MB * MEMORY_CAP_STEP_MB).coerceAtLeast(MEMORY_CAP_STEP_MB) val off = stringResource(R.string.perf_cap_off) val auto = stringResource(R.string.perf_cap_auto) + ToggleRow( + host, "zramclient", stringResource(R.string.perf_zram_client), + if (ramCapAvailable) stringResource(R.string.perf_zram_client_hint) else stringResource(R.string.perf_ram_cap_unavailable), + zramClient && ramCapAvailable, enabled = ramCapAvailable, onChange = onZramClient, + ) SliderRow( stringResource(R.string.perf_ram_cap), if (ramCapAvailable) stringResource(R.string.perf_ram_cap_hint) else stringResource(R.string.perf_ram_cap_unavailable), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 018f681a4d..1ca16f9100 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -556,6 +556,8 @@ <string name="perf_memory">Memory</string> <string name="perf_cap_off">Off</string> <string name="perf_cap_auto">Driver default</string> + <string name="perf_zram_client">Compress Steam while a game runs</string> + <string name="perf_zram_client_hint">20 s after a game starts, the Steam client is compressed into zRAM to leave the game more memory, and read back when the game closes. Turn this off if the session closes shortly after games start. A RAM cap above still compresses Steam when the session goes over it.</string> <string name="perf_ram_cap">RAM cap</string> <string name="perf_ram_cap_hint">Applies while the Steam client runs, in Steam mode or from the desktop. When the session uses more than this, Steam and then the session\'s other supported processes are compressed into zRAM. A soft cap: nothing is closed, but games may stutter while pages come back.</string> <string name="perf_ram_cap_unavailable">Needs zRAM swap, which this device does not have.</string> diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 2688d9a8a6..bc3febb332 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -455,6 +455,7 @@ case $mode in fi if [ "${BL_ZRAM:-0}" = 1 ]; then step "zRAM compression: on" + [ "${BL_ZRAM_CLIENT:-1}" = 1 ] || step "zRAM: Steam is not compressed while games run (turned off in Performance)" _bl_ram_cap=0 case ${BL_RAM_CAP_MB:-} in ''|0) ;; @@ -574,7 +575,7 @@ case $mode in fi if [ "$_bl_game" = 1 ]; then [ "$_bl_since" -ge 0 ] || _bl_since=$SECONDS - if [ $((SECONDS - _bl_since)) -ge 20 ] && [ "${#_bl_pids[@]}" -gt 0 ] && + if [ "${BL_ZRAM_CLIENT:-1}" = 1 ] && [ $((SECONDS - _bl_since)) -ge 20 ] && [ "${#_bl_pids[@]}" -gt 0 ] && { [ "$_bl_packed" -lt 0 ] || [ $((SECONDS - _bl_packed)) -ge 300 ]; }; then bl_zram_send 1 "compressing the client" client _bl_packed=$SECONDS From 645dc3e7817bddea9db12c5e70dcdba90a37b196 Mon Sep 17 00:00:00 2001 From: MaxsTechReview <maxjividen@gmail.com> Date: Sun, 25 Oct 2026 14:25:39 -0400 Subject: [PATCH 032/135] fix: close the Stores and Library search with its X or Back (#1567) --- .../com/droiddeck/launcher/ui/LibraryPage.kt | 1 + .../com/droiddeck/launcher/ui/StoresPage.kt | 28 +++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index d4dd41fe8b..773f44ce7f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -206,6 +206,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val open = selected.takeIf { it.startsWith("app:") } val back = { onSelect("games") } + BackHandler(enabled = open == null && LibraryView.query.isNotEmpty()) { LibraryView.query = "" } BackHandler(enabled = open != null) { back() } val lead = remember { FocusRequester() } var detailFocused by remember { mutableStateOf(false) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index e00ae0f096..a08342743b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -86,6 +86,7 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.lazy.grid.items import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Check +import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.automirrored.filled.Login import androidx.compose.foundation.basicMarquee @@ -833,6 +834,7 @@ private fun Storefront( clearSearchFocus: Boolean, onQuery: (String) -> Unit, onOpen: (String) -> Unit, ) { + BackHandler(enabled = query.isNotEmpty() && !clearSearchFocus) { onQuery("") } val ctx = LocalContext.current val library = StoresState.library[store] ?: emptyList() val shelves = StoresState.shelves[store] @@ -1072,6 +1074,12 @@ internal fun ModeHeader( var searching by remember { mutableStateOf(query.isNotEmpty()) } var focusOnOpen by remember { mutableStateOf(false) } val open by animateFloatAsState(if (searching) 1f else 0f, Motion.sp(0.75f, 420f), label = "searchOpen") + val close = { + searching = false + focusOnOpen = false + if (query.isNotEmpty()) onQuery("") + } + BackHandler(enabled = searching && !clearSearchFocus) { close() } Column(Modifier.fillMaxWidth()) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth().heightIn(min = 52.dp).padding(vertical = 4.dp)) { if (lead != null) lead() @@ -1081,14 +1089,18 @@ internal fun ModeHeader( ) BoxWithConstraints(Modifier.weight(1f), contentAlignment = Alignment.CenterStart) { if (searching || open > 0.01f) { - val w = androidx.compose.ui.unit.lerp(44.dp, maxWidth.coerceAtMost(520.dp), open) - Box(Modifier.width(w).graphicsLayer { alpha = (open * 1.6f).coerceAtMost(1f) }) { - AdbTextField( - value = query, onValueChange = onQuery, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, - placeholder = placeholder, compact = true, focusOnShow = focusOnOpen, - clearFocus = clearSearchFocus, - onFocusChange = { focused -> if (!focused && query.isEmpty()) { searching = false; focusOnOpen = false } }, - ) + val closable = maxWidth >= 80.dp + val w = androidx.compose.ui.unit.lerp(44.dp, (maxWidth - if (closable) 36.dp else 0.dp).coerceIn(44.dp, 520.dp), open) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) { + Box(Modifier.width(w).graphicsLayer { alpha = (open * 1.6f).coerceAtMost(1f) }) { + AdbTextField( + value = query, onValueChange = onQuery, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, + placeholder = placeholder, compact = true, focusOnShow = focusOnOpen, + clearFocus = clearSearchFocus || !searching, + onFocusChange = { focused -> if (!focused && query.isEmpty()) { searching = false; focusOnOpen = false } }, + ) + } + if (searching && closable) SmallIconButton(Icons.Filled.Close, stringResource(R.string.common_close), tint = colors.onSurfaceVariant, onClick = close) } } else SearchIcon(stringResource(R.string.stores_search_open)) { searching = true; focusOnOpen = true } } From 1f3f1ebc6a4e1a389bb09fcef825d4eb9b8dfe85 Mon Sep 17 00:00:00 2001 From: MaxsTechReview <maxjividen@gmail.com> Date: Sun, 25 Oct 2026 14:25:43 -0400 Subject: [PATCH 033/135] fix: Arabic text reads right to left when it mixes in English words (#1568) --- .../com/droiddeck/launcher/SessionActivity.kt | 4 +++- .../java/com/droiddeck/launcher/ui/Theme.kt | 21 ++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 67227b8615..b6689b3f03 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1969,7 +1969,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { repairOffered = hint?.repair == true loading.showEnded( hint?.text ?: stopped, - getString(R.string.session_ended_detail, status, SessionState.logFile?.path ?: getString(R.string.session_ended_no_log)), + getString(R.string.session_ended_detail, status, + SessionState.logFile?.path?.let { android.text.BidiFormatter.getInstance().unicodeWrap(it, android.text.TextDirectionHeuristics.LTR) } + ?: getString(R.string.session_ended_no_log)), ) focusEndedScreen() } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt index 14527f5949..a02eb8d365 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -2,6 +2,10 @@ package com.droiddeck.launcher.ui import androidx.annotation.StringRes import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ProvideTextStyle +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.style.TextDirection import androidx.compose.material3.darkColorScheme import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.RepeatMode @@ -164,7 +168,22 @@ fun DroidDeckTheme(theme: String? = null, appScale: Int = AppUiPrefs.DEFAULT_SCA LocalPalette provides p, LocalDensity provides density, LocalConfiguration provides configuration, - ) { MaterialTheme(colorScheme = scheme, content = content) } + ) { + MaterialTheme(colorScheme = scheme, typography = ContentDirected) { + ProvideTextStyle(TextStyle(textDirection = TextDirection.Content), content) + } + } +} + +private val ContentDirected = Typography().run { + fun TextStyle.byContent() = copy(textDirection = TextDirection.Content) + Typography( + displayLarge.byContent(), displayMedium.byContent(), displaySmall.byContent(), + headlineLarge.byContent(), headlineMedium.byContent(), headlineSmall.byContent(), + titleLarge.byContent(), titleMedium.byContent(), titleSmall.byContent(), + bodyLarge.byContent(), bodyMedium.byContent(), bodySmall.byContent(), + labelLarge.byContent(), labelMedium.byContent(), labelSmall.byContent(), + ) } /** Turns the colour wheel on the system's own animation clock; with animations off, in the app or in Android, the colour holds still. */ From 8addf7d7f05f0708c3e576364e8b1eceb3b04cf2 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 14:40:14 -0400 Subject: [PATCH 034/135] fix: correct Nova M1 and M2 mapping (#1571) * fix: correct Nova M1 and M2 mapping * fix: recognize Nova Xbox controller ID --- .../droiddeck/launcher/input/PadBridge.java | 11 ++++- .../droiddeck/launcher/input/JoyConPadTest.kt | 46 ++++++++++++++++++- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index cfb0978cb8..0811cab05e 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -1,5 +1,6 @@ package com.droiddeck.launcher.input; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.util.Log; @@ -308,10 +309,10 @@ public final class PadBridge { case KeyEvent.KEYCODE_BUTTON_MODE: case KeyEvent.KEYCODE_HOME: pad.press(PadState.GUIDE, pressed); break; case KeyEvent.KEYCODE_BUTTON_Z: - if (isPrimary(event)) DeckControls.INSTANCE.setGrip(DeckControls.L4, pressed); + if (isPrimary(event)) DeckControls.INSTANCE.setGrip(isNovaController(event.getDevice()) ? DeckControls.R4 : DeckControls.L4, pressed); break; case KeyEvent.KEYCODE_BUTTON_C: - if (isPrimary(event)) DeckControls.INSTANCE.setGrip(DeckControls.R4, pressed); + if (isPrimary(event)) DeckControls.INSTANCE.setGrip(isNovaController(event.getDevice()) ? DeckControls.L4 : DeckControls.R4, pressed); break; case KeyEvent.KEYCODE_BUTTON_L2: pad.leftTrigger = pressed ? 1f : 0f; break; case KeyEvent.KEYCODE_BUTTON_R2: pad.rightTrigger = pressed ? 1f : 0f; break; @@ -573,6 +574,12 @@ public final class PadBridge { return slot == 0 ? state : playerStates[slot]; } + private static boolean isNovaController(InputDevice device) { + return "Retroid Pocket Nova".equalsIgnoreCase(Build.MODEL) + && device.getVendorId() == 0x2022 + && (device.getProductId() == 0x3001 || device.getProductId() == 0x3002); + } + private boolean isPrimary(KeyEvent event) { int id = event.getDevice().getId(); int first = firstPlayerSlot(); diff --git a/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt b/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt index 43f0a8d82a..a325632132 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt @@ -19,6 +19,7 @@ import org.robolectric.annotation.Config import org.robolectric.annotation.Implementation import org.robolectric.annotation.Implements import org.robolectric.shadows.InputDeviceBuilder +import org.robolectric.shadows.ShadowBuild @RunWith(RobolectricTestRunner::class) @Config(sdk = [34], manifest = Config.NONE, instrumentedPackages = ["com.droiddeck.launcher.input.FakeInputWriter"], @@ -82,6 +83,34 @@ class JoyConPadTest { assertEquals(0, RecordingWriter.grips) } + @Test fun novaControllerUsesCForTheLeftPaddleAndZForTheRight() { + ShadowBuild.setModel("Retroid Pocket Nova") + for (product in listOf(0x3001, 0x3002)) { + val pad = controller(0x2022, product) + assertPaddles(pad, KeyEvent.KEYCODE_BUTTON_C, KeyEvent.KEYCODE_BUTTON_Z) + bridge.onDeviceRemoved(pad.id) + } + } + + @Test fun theSameControllerIdsKeepTheDefaultPaddlesOnOtherHandhelds() { + for (product in listOf(0x3001, 0x3002)) { + val pad = controller(0x2022, product) + for (model in listOf("Retroid Pocket 6", "Retroid Pocket 5", "AYN Thor")) { + ShadowBuild.setModel(model) + assertPaddles(pad, KeyEvent.KEYCODE_BUTTON_Z, KeyEvent.KEYCODE_BUTTON_C) + } + bridge.onDeviceRemoved(pad.id) + } + } + + @Test fun otherControllerIdsKeepTheDefaultPaddlesOnANova() { + ShadowBuild.setModel("Retroid Pocket Nova") + for (pad in listOf(controller(0x045e, 0x0b13), controller(0x2022, 0x3003), controller(0x2020, 0x3001))) { + assertPaddles(pad, KeyEvent.KEYCODE_BUTTON_Z, KeyEvent.KEYCODE_BUTTON_C) + bridge.onDeviceRemoved(pad.id) + } + } + @Test fun whenOneJoyConLeavesTheOtherKeepsThePlayer() { pair() assertTrue(press(right, KeyEvent.KEYCODE_BUTTON_A, BTN_SOUTH)) @@ -140,6 +169,17 @@ class JoyConPadTest { private fun pad(slot: Int): PadState = RecordingWriter.pads[slot] ?: PadState() + private fun assertPaddles(device: InputDevice, leftCode: Int, rightCode: Int) { + assertTrue(bridge.onKeyEvent(key(device, leftCode, 0))) + assertEquals(DeckControls.L4, RecordingWriter.grips) + assertTrue(bridge.onKeyEvent(key(device, rightCode, 0))) + assertEquals(DeckControls.L4 or DeckControls.R4, RecordingWriter.grips) + assertTrue(bridge.onKeyEvent(key(device, leftCode, 0, KeyEvent.ACTION_UP))) + assertEquals(DeckControls.R4, RecordingWriter.grips) + assertTrue(bridge.onKeyEvent(key(device, rightCode, 0, KeyEvent.ACTION_UP))) + assertEquals(0, RecordingWriter.grips) + } + private fun press(device: InputDevice, code: Int, scanCode: Int): Boolean = bridge.onKeyEvent(JoyCon.normalize(key(device, code, scanCode))) @@ -162,10 +202,12 @@ class JoyConPadTest { private var nextId = 60 - private fun joyCon(product: Int, vararg axes: Int): InputDevice { + private fun joyCon(product: Int, vararg axes: Int): InputDevice = controller(NINTENDO, product, *axes) + + private fun controller(vendor: Int, product: Int, vararg axes: Int): InputDevice { val id = nextId++ val builder = InputDeviceBuilder.newBuilder().setId(id).setName("Joy-Con $id").setDescriptor("joycon-$id") - .setExternal(true).setVendorId(NINTENDO).setProductId(product) + .setExternal(true).setVendorId(vendor).setProductId(product) .setSources(InputDevice.SOURCE_GAMEPAD or InputDevice.SOURCE_JOYSTICK or InputDevice.SOURCE_KEYBOARD) .setKeyboardType(InputDevice.KEYBOARD_TYPE_NON_ALPHABETIC) .setKeyCharacterMap(KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD)) From 679e9476c3744450e923d5697a59d4592c3aeca5 Mon Sep 17 00:00:00 2001 From: MaxsTechReview <maxjividen@gmail.com> Date: Sun, 25 Oct 2026 15:21:27 -0400 Subject: [PATCH 035/135] Add Battle.net logs to Share logs (#1573) --- .../droiddeck/launcher/core/LogRedactor.kt | 2 +- .../launcher/session/SessionLogShare.kt | 26 ++++++++++++++++- .../launcher/core/LogRedactorTest.kt | 1 + .../session/SessionLogShareZipTest.kt | 28 +++++++++++++++++++ 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt index 491101dba2..20073c4ca3 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt @@ -76,7 +76,7 @@ object LogRedactor { private const val ACCOUNT_VALUE = "(\"[^\"<\\r\\n]+\"|'[^'<\\r\\n]+'|[^\\s\"'<>&;,}]+)" private val ACCOUNT_KV = Regex( - "(?i)(?<![A-Za-z0-9_])(account[_-]?name|user[_-]?name|epicusername)" + + "(?i)(?<![A-Za-z0-9_])(account[_-]?name|account[_-]?id|user[_-]?name|epicusername)" + "([\"']?\\s*[=:]\\s*|[\"']\\s+)" + ACCOUNT_VALUE ) private val LOGIN_KV = Regex( diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt index b44c5c6260..ded53162c6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt @@ -12,6 +12,7 @@ import androidx.compose.runtime.setValue import androidx.core.content.FileProvider import com.droiddeck.launcher.R import com.droiddeck.launcher.core.LogRedactor +import com.droiddeck.launcher.runtime.BattleNet import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File import java.util.zip.ZipEntry @@ -49,7 +50,8 @@ object SessionLogShare { val logs = LinuxRuntime.logDir(context) val stores = recent(File(logs, STORES_DIR)) val tools = recent(File(logs, SessionPaths.TOOLS_DIR)) - val total = (files + live + stores + tools).sumOf { it.length() }.coerceAtLeast(1L) + val battleNet = battleNetLogs(context) + val total = (files + live + stores + tools + battleNet.map { it.second }).sumOf { it.length() }.coerceAtLeast(1L) var done = 0L var shown = -1 fun advance(f: File) { @@ -62,6 +64,7 @@ object SessionLogShare { live.forEach { f -> addEntry(z, folder.name + "/steam/" + f.name, f); advance(f) } stores.forEach { f -> addEntry(z, "$STORES_DIR/" + f.name, f); advance(f) } tools.forEach { f -> addEntry(z, SessionPaths.TOOLS_DIR + "/" + f.name, f); advance(f) } + battleNet.forEach { (name, f) -> addEntry(z, "$BATTLENET_DIR/$name", f); advance(f) } } return zip } @@ -88,6 +91,27 @@ object SessionLogShare { private fun shareDir(context: Context): File = File(context.cacheDir, "share") + private const val BATTLENET_DIR = "battlenet" + + private fun battleNetLogs(context: Context): List<Pair<String, File>> { + val drive = File(BattleNet.prefix(context), "pfx/drive_c") + val data = File(drive, "ProgramData/Battle.net") + fun logsUnder(dir: File, prefix: String) = dir.listFiles { f -> f.isDirectory && f.name.startsWith(prefix) }.orEmpty().map { File(it, "Logs") } + return newest("droiddeck", listOf(File(LinuxRuntime.rootDir(context), "root/.cache/droiddeck/battlenet")), 2, setOf("battlenet.log", "spawned.log")) + + newest("client", listOf(File(drive, "users/steamuser/AppData/Local/Battle.net/Logs")), 6) + + newest("agent", listOf(File(data, "Agent/Logs")) + logsUnder(File(data, "Agent"), "Agent."), 10, byDir = true) + + newest("setup", logsUnder(File(data, "Setup"), ""), 3, byDir = true) + } + + private fun newest(folder: String, dirs: List<File>, count: Int, names: Set<String>? = null, byDir: Boolean = false): List<Pair<String, File>> { + val since = System.currentTimeMillis() - RECENT_DAYS * 86_400_000L + return dirs.flatMap { dir -> + dir.listFiles { f -> f.isFile && f.name.endsWith(".log") && (names == null || f.name in names) && f.lastModified() >= since && f.length() <= STEAM_LOG_MAX_BYTES }.orEmpty().toList() + }.sortedByDescending { it.lastModified() }.take(count).map { f -> + (if (byDir) "$folder/${f.parentFile?.parentFile?.name}/${f.name}" else "$folder/${f.name}") to f + } + } + private fun recent(dir: File): List<File> { val since = System.currentTimeMillis() - RECENT_DAYS * 86_400_000L return dir.listFiles { f -> f.isFile && f.lastModified() >= since }?.sortedBy { it.name }.orEmpty() diff --git a/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt b/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt index a67093e935..38849c41a8 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt @@ -195,6 +195,7 @@ class LogRedactorTest { "auth: login=maskeduser42&remember=1", "accountName: maskeduser42", "{\"username\": \"masked user 42\"}", + "[Clubs] {Main} Club membership subscription created: |accountId=maskeduser42", ) for (line in lines) { val out = LogRedactor.redactForShare(line) diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt index 95893adde6..012d2a916d 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt @@ -50,6 +50,34 @@ class SessionLogShareZipTest { assertFalse(zip.exists()) } + @Test fun battleNetAndBlizzardLogsComeAlongScrubbedAndNewestFirst() { + val session = File(LinuxRuntime.logDir(app), "2026-10-25-05-battle-net").apply { mkdirs() } + File(session, "session.log").writeText("droiddeck-battlenet: open (from the menu)\n") + val root = LinuxRuntime.rootDir(app) + File(root, "root/.cache/droiddeck/battlenet").apply { mkdirs() }.apply { + resolve("battlenet.log").writeText("launching WoW\n") + resolve("other.log").writeText("other\n") + } + val drive = File(com.droiddeck.launcher.runtime.BattleNet.prefix(app), "pfx/drive_c") + val client = File(drive, "users/steamuser/AppData/Local/Battle.net/Logs").apply { mkdirs() } + val now = System.currentTimeMillis() + for (i in 1..8) client.resolve("battle.net-$i.log").apply { writeText("client $i accountId=1:0:5ca1ab1e\n"); setLastModified(now - i * 60_000L) } + client.resolve("battle.net-old.log").apply { writeText("old\n"); setLastModified(now - 30L * 86_400_000L) } + File(drive, "ProgramData/Battle.net/Agent/Agent.9824/Logs").apply { mkdirs() }.resolve("Agent-1.log").writeText("agent someone@example.com\n") + File(drive, "ProgramData/Battle.net/Agent/Agent.9900/Logs").apply { mkdirs() }.resolve("Agent-1.log").writeText("agent 9900\n") + File(drive, "ProgramData/Battle.net/Setup/bna_2/Logs").apply { mkdirs() }.resolve("battle.net-setup-1.log").writeText("setup\n") + + val zip = SessionLogShare.zipFolder(app, session)!! + val text = ZipFile(zip).use { z -> z.entries().toList().associate { e -> e.name to z.getInputStream(e).bufferedReader().readText() } } + assertTrue(text.keys.containsAll(listOf("battlenet/droiddeck/battlenet.log", "battlenet/agent/Agent.9824/Agent-1.log", "battlenet/agent/Agent.9900/Agent-1.log", "battlenet/setup/bna_2/battle.net-setup-1.log"))) + assertFalse(text.containsKey("battlenet/droiddeck/other.log")) + assertEquals((1..6).map { "battlenet/client/battle.net-$it.log" }.toSet(), text.keys.filter { it.startsWith("battlenet/client/") }.toSet()) + val all = text.values.joinToString("\n") + assertFalse(all.contains("5ca1ab1e")) + assertFalse(all.contains("someone@example.com")) + SessionLogShare.clear(app) + } + @Test fun theSharePassChangesNothingInACleanLine() { val line = "dxvk: Device 0x5 (Adreno 750) https://github.com/doitsujin/dxvk/releases code 403" assertEquals(line, com.droiddeck.launcher.core.LogRedactor.redactForShare(line)) From 12eac3e9ee18dc61974e72a6ce7a7db4e70d97e8 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 16:06:19 -0400 Subject: [PATCH 036/135] Fix Nova layouts and session drawer shortcuts (#1574) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Improve Nova’s compact layouts with scrolling store tabs and build details, remove the redundant Updates heading, preserve full portrait artwork, and add drawer PiP and Select/Start shortcuts for Guide/QAM. --- .../com/droiddeck/launcher/SessionActivity.kt | 15 ++++ .../droiddeck/launcher/ui/FrontEndSetup.kt | 12 +-- .../droiddeck/launcher/ui/SessionOverlay.kt | 16 ++-- .../com/droiddeck/launcher/ui/StoresPage.kt | 73 +++++++++++-------- .../com/droiddeck/launcher/ui/UpdatesPage.kt | 10 ++- .../launcher/ui/SessionSecondScreenTest.kt | 27 +++++++ 6 files changed, 112 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index b6689b3f03..9a5b1ddc93 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -271,6 +271,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } private val resumeKeysDown = mutableSetOf<Pair<Int, Int>>() + private val drawerShortcutKeysDown = mutableSetOf<Pair<Int, Int>>() private var drawerOpen by mutableStateOf(false) private var quitFrom by mutableStateOf<androidx.compose.ui.geometry.Rect?>(null) @@ -2071,6 +2072,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } return super.dispatchKeyEvent(event) } + val drawerShortcutKey = event.deviceId to event.keyCode + if (fromController && (event.keyCode == KeyEvent.KEYCODE_BUTTON_SELECT || event.keyCode == KeyEvent.KEYCODE_BUTTON_START) && + ((drawerOpen && SessionState.mode == SessionService.MODE_STEAM) || drawerShortcutKey in drawerShortcutKeysDown)) { + if (event.action == KeyEvent.ACTION_DOWN) { + drawerShortcutKeysDown.add(drawerShortcutKey) + if (event.repeatCount == 0) { + releaseDrawerDirection() + if (event.keyCode == KeyEvent.KEYCODE_BUTTON_SELECT) sendSteamGuide() else triggerSteamQam() + } + } else if (event.action == KeyEvent.ACTION_UP) { + drawerShortcutKeysDown.remove(drawerShortcutKey) + } + return true + } if (drawerOpen) { if (fromController && (event.keyCode == KeyEvent.KEYCODE_BUTTON_L1 || event.keyCode == KeyEvent.KEYCODE_BUTTON_R1)) { if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 69aa9cee0d..1bf99f0697 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -21,6 +21,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsPressedAsState import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.Row @@ -206,7 +207,6 @@ internal fun SetupPanel( runCatching { chipFocus[tab].requestFocus() } } } - val wide = !LocalNarrowPane.current val runtimeOk = s.ready && !s.busy && !s.removalPending val checks = listOf(gpuOk, runtimeOk, !limitBlocks, signedIn) val passing = checks.count { it } @@ -453,10 +453,12 @@ internal fun SetupPanel( ) } } - if (wide) Row(horizontalArrangement = Arrangement.spacedBy(16.dp), verticalAlignment = Alignment.Top) { - Column(Modifier.weight(1f)) { look() } - Column(Modifier.weight(1f)) { device(); art(); download() } - } else { look(); device(); art(); download() } + BoxWithConstraints(Modifier.fillMaxWidth()) { + if (maxWidth >= 840.dp && !LocalNarrowPane.current) Row(horizontalArrangement = Arrangement.spacedBy(16.dp), verticalAlignment = Alignment.Top) { + Column(Modifier.weight(1f)) { look() } + Column(Modifier.weight(1f)) { device(); art(); download() } + } else Column { look(); device(); art(); download() } + } } STORAGE_TAB -> StoragePanel(s, a) 4 -> { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index ef90316ea7..ecf43901d7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -426,6 +426,9 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont ) { Text(a.title ?: if (a.steam) stringResource(R.string.drawer_steam) else stringResource(R.string.drawer_desktop), fontSize = if (short) 18.sp else 20.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + if (a.pipSupported) SteamActionPill( + stringResource(R.string.pip_title), Icons.Outlined.PictureInPictureAlt, focus.track(page, "pip"), + ) { host.open = null; a.onPip() } if (a.onSteamMenu != null && a.onQam != null) { val qamInteraction = remember { MutableInteractionSource() } var qamStartedOnPress by remember { mutableStateOf(false) } @@ -438,13 +441,13 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont } } } - SteamActionPill(stringResource(R.string.drawer_steam_menu), Icons.Outlined.Home, focus.track(page, "steam")) { + SteamActionPill(stringResource(R.string.drawer_steam_menu), Icons.Outlined.Home, focus.track(page, "steam"), shortcut = "⧉") { host.open = null a.onSteamMenu.invoke() } SteamActionPill( stringResource(R.string.drawer_open_qam), Icons.Outlined.MoreHoriz, focus.track(page, "qam"), - interactionSource = qamInteraction, + interactionSource = qamInteraction, shortcut = "☰", onConfirm = { host.open = null; a.onQam.invoke() }, ) { host.open = null @@ -711,8 +714,6 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont a.pipAutoEnter, onChange = a.onPipAutoEnter) } Column(Modifier.fillMaxWidth().padding(top = 12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) { - if (a.pipSupported) DrawerActionButton(stringResource(R.string.pip_title), Icons.Outlined.PictureInPictureAlt, - modifier = focus.track(page, "pip")) { host.open = null; a.onPip() } if (!a.isHomeApp) DrawerActionButton(stringResource(R.string.drawer_background), Icons.AutoMirrored.Outlined.ExitToApp, modifier = focus.track(page, "background")) { host.open = null; a.onBackground() } } @@ -818,6 +819,7 @@ private fun SteamActionPill( description: String, icon: androidx.compose.ui.graphics.vector.ImageVector, modifier: Modifier, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, onConfirm: (() -> Unit)? = null, + shortcut: String? = null, onClick: () -> Unit, ) { val colors = MaterialTheme.colorScheme @@ -826,7 +828,7 @@ private fun SteamActionPill( val shape = RoundedCornerShape(22.dp) Box( contentAlignment = Alignment.Center, - modifier = modifier.size(width = 52.dp, height = 44.dp).semantics { contentDescription = description } + modifier = modifier.size(44.dp).semantics { contentDescription = description } .clip(shape).background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) .glideBorder(hot, shape, pal.signal, pal.line) .hoverable(interactionSource) @@ -834,6 +836,10 @@ private fun SteamActionPill( .controllerConfirm(onClick = onConfirm ?: onClick), ) { Icon(icon, contentDescription = null, tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(20.dp)) + if (shortcut != null) Text( + shortcut, fontSize = 8.sp, lineHeight = 9.sp, color = colors.onSurfaceVariant, + modifier = Modifier.align(Alignment.BottomEnd).padding(end = 8.dp, bottom = 6.dp), + ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index a08342743b..23a996fb9d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -53,6 +53,8 @@ import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.focusGroup +import androidx.compose.foundation.relocation.BringIntoViewRequester +import androidx.compose.foundation.relocation.bringIntoViewRequester import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.hoverable import androidx.compose.foundation.selection.selectable @@ -611,6 +613,7 @@ private fun RowScope.ArrangeStoreChip( ) { onToggleTab(store) } } +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) @Composable private fun StoreChips( selected: String, focused: String?, active: Int, tabs: List<StoreTab>, arranging: Boolean, @@ -620,7 +623,6 @@ private fun StoreChips( val pal = LocalPalette.current val keys = tabs.filter { it.shown }.map { it.store.id } + DOWNLOADS val bounds = remember { androidx.compose.runtime.mutableStateMapOf<String, Rect>() } - val rootBounds = remember { HashMap<String, Rect>() } val highlighted = focused ?: selected val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current.inputMode val fillShown = inputMode != androidx.compose.ui.input.InputMode.Keyboard && !arranging @@ -630,47 +632,59 @@ private fun StoreChips( val gap = 8.dp val gapPx = with(androidx.compose.ui.platform.LocalDensity.current) { gap.toPx() } val drag = remember { ChipDrag() } + val tabScroll = rememberScrollState() Box(Modifier.fillMaxWidth()) { Row(horizontalArrangement = Arrangement.spacedBy(gap), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { - for (tab in tabs) { - val store = tab.store - if (arranging) { - val index = tabs.indexOfFirst { it.store == store } - key(store) { ArrangeStoreChip(tab, index, tabs.lastIndex, gapPx, drag, onFocusChip, onMoveTab, onToggleTab) } - } else if (tab.shown) { - val signedIn = StoresState.isSignedIn(store) && StoresState.expired[store] != true - key(store) { - StoreChip( - label = store.shortLabel, on = selected == store.id, under = fillShown && highlighted == store.id, key = store.id, mark = sourceColours(store.id).dot, - modifier = Modifier.weight(1f).onGloballyPositioned { bounds[store.id] = it.boundsInParent(); rootBounds[store.id] = it.boundsInRoot() }, - lead = { StoreDot(store, signedIn) }, - description = store.label + if (signedIn || !StoresState.accountsLoaded) "" else " " + stringResource(R.string.stores_chip_signed_out), - onFocused = onFocusChip, - ) { onStore(store) } + Box(Modifier.weight(1f).then(if (arranging) Modifier else Modifier.edgeFade(tabScroll).horizontalScroll(tabScroll))) { + Row(horizontalArrangement = Arrangement.spacedBy(gap), verticalAlignment = Alignment.CenterVertically, + modifier = (if (arranging) Modifier.fillMaxWidth() else Modifier).focusGroup(), + ) { + for (tab in tabs) { + val store = tab.store + if (arranging) { + val index = tabs.indexOfFirst { it.store == store } + key(store) { ArrangeStoreChip(tab, index, tabs.lastIndex, gapPx, drag, onFocusChip, onMoveTab, onToggleTab) } + } else if (tab.shown) { + val signedIn = StoresState.isSignedIn(store) && StoresState.expired[store] != true + key(store) { + val reveal = remember { BringIntoViewRequester() } + LaunchedEffect(selected) { if (selected == store.id) reveal.bringIntoView() } + StoreChip( + label = store.shortLabel, on = selected == store.id, under = fillShown && highlighted == store.id, key = store.id, mark = sourceColours(store.id).dot, + modifier = Modifier.bringIntoViewRequester(reveal).onGloballyPositioned { bounds[store.id] = it.boundsInParent() }, + lead = { StoreDot(store, signedIn) }, + description = store.label + if (signedIn || !StoresState.accountsLoaded) "" else " " + stringResource(R.string.stores_chip_signed_out), + onFocused = onFocusChip, + ) { onStore(store) } + } + } } } + ChipGlide(keys.indexOf(highlighted), bounds[highlighted], tint, visible = fillShown && highlighted != DOWNLOADS) } if (arranging) { IconChip(Icons.Filled.Check, stringResource(R.string.stores_tabs_arrange_done)) { onArrangeDone() } } else { - StoreChip( - label = null, on = selected == DOWNLOADS, under = fillShown && highlighted == DOWNLOADS, key = DOWNLOADS, mark = pal.signal, - modifier = Modifier.onGloballyPositioned { - bounds[DOWNLOADS] = it.boundsInParent() - StoresMotion.downloadsChip = it.boundsInRoot() - }, - lead = { Icon(Icons.Outlined.Download, null, modifier = Modifier.size(18.dp)) }, - trail = if (active > 0) { { CountPill(active) } } else null, - description = stringResource(R.string.stores_tab_downloads), - onFocused = onFocusChip, - ) { onDownloads() } + Box { + StoreChip( + label = null, on = selected == DOWNLOADS, under = fillShown && highlighted == DOWNLOADS, key = DOWNLOADS, mark = pal.signal, + modifier = Modifier.onGloballyPositioned { + bounds[DOWNLOADS] = it.boundsInParent() + StoresMotion.downloadsChip = it.boundsInRoot() + }, + lead = { Icon(Icons.Outlined.Download, null, modifier = Modifier.size(18.dp)) }, + trail = if (active > 0) { { CountPill(active) } } else null, + description = stringResource(R.string.stores_tab_downloads), + onFocused = onFocusChip, + ) { onDownloads() } + ChipGlide(keys.indexOf(DOWNLOADS), bounds[DOWNLOADS], tint, visible = fillShown && highlighted == DOWNLOADS) + } var cogAt by remember { mutableStateOf<Rect?>(null) } Box(Modifier.onGloballyPositioned { cogAt = it.boundsInRoot() }) { IconChip(Icons.Filled.Settings, stringResource(R.string.stores_settings)) { onSettings(cogAt) } } } } - ChipGlide(keys.indexOf(highlighted), bounds[highlighted], tint, visible = fillShown) } } @@ -1323,7 +1337,8 @@ internal fun CardFace( Spacer(Modifier.matchParentSize().background(Color.Black.copy(alpha = if (blurs) 0.35f else 0.7f))) AsyncImage(model = art, contentDescription = null, contentScale = ContentScale.Fit, modifier = Modifier.matchParentSize().padding(bottom = CardStrip)) } else if (art != null) AsyncImage( - model = art, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize(), + model = art, contentDescription = null, contentScale = if (capsule) ContentScale.Fit else ContentScale.Crop, + modifier = Modifier.matchParentSize().padding(bottom = if (capsule) CardStrip else 0.dp), onSuccess = { r -> val drawn = r.result.drawable if (capsule && drawn.intrinsicWidth > 0 && drawn.intrinsicHeight > 0) landscape = drawn.intrinsicWidth > drawn.intrinsicHeight * 0.95f diff --git a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt index a44f5ca19e..c11d5874dc 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt @@ -9,6 +9,7 @@ import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut import androidx.compose.animation.shrinkVertically import androidx.compose.foundation.background +import androidx.compose.foundation.basicMarquee import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.hoverable @@ -88,6 +89,7 @@ class UpdatesActions( val onDismissPermission: () -> Unit = {}, ) +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) @Composable internal fun UpdatesPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier) { val u = s.updates @@ -95,10 +97,14 @@ internal fun UpdatesPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie val me = remember { AppUpdates.installed() } val colors = MaterialTheme.colorScheme Column(modifier = modifier) { - PageHeader(stringResource(R.string.upd_title)) { + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), + modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp), + ) { Text( stringResource(R.string.upd_build, me.version, s.buildLabel), fontSize = 12.5.sp, color = colors.onSurfaceVariant, - maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f).padding(top = 6.dp), + maxLines = 1, modifier = Modifier.weight(1f) + .basicMarquee(iterations = Int.MAX_VALUE, initialDelayMillis = 700, velocity = 40.dp), ) val checked = u.catalog?.checkedAt?.takeIf { it > 0 } if (!LocalNarrowPane.current) Text( diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt index 735632e61b..d4c5aa4b2b 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt @@ -98,6 +98,33 @@ class SessionSecondScreenTest { } } + @Test + @Config(sdk = [34], shadows = [PadBridgeRoutingTest.RegisteredKeyEvent::class]) + fun drawerShortcutsConsumeRepeatsAndReleasesAfterClosing() { + val device = InputDeviceBuilder.newBuilder().setId(43).setName("Drawer shortcut test pad") + .setDescriptor("drawer-shortcut-pad").setExternal(true).setSources(InputDevice.SOURCE_GAMEPAD).build() + shadowOf(context.getSystemService(InputManager::class.java)).addInputDevice(device) + SessionState.mode = SessionService.MODE_STEAM + val activity = Robolectric.buildActivity(SessionActivity::class.java).get() + val open: MutableState<Boolean> = ReflectionHelpers.getField(activity, "drawerOpen\$delegate") + val controller: MutableState<Boolean> = ReflectionHelpers.getField(activity, "drawerControllerActive\$delegate") + controller.value = true + for (button in listOf(KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BUTTON_START)) { + fun event(action: Int, repeat: Int = 0) = KeyEvent(0L, 0L, action, button, repeat, 0, + device.id, 0, 0, InputDevice.SOURCE_GAMEPAD) + open.value = true + assertTrue(activity.dispatchKeyEvent(event(KeyEvent.ACTION_DOWN))) + assertEquals(false, open.value) + open.value = true + assertTrue(activity.dispatchKeyEvent(event(KeyEvent.ACTION_DOWN, 1))) + assertEquals(true, open.value) + open.value = false + assertTrue(activity.dispatchKeyEvent(event(KeyEvent.ACTION_UP))) + val held: Set<Pair<Int, Int>> = ReflectionHelpers.getField(activity, "drawerShortcutKeysDown") + assertTrue(held.isEmpty()) + } + } + @Test fun sessionMicrophoneCanBeTurnedOff() { val changes = mutableListOf<Boolean>() compose.setContent { From 38926b315727bb2de7539b1ebb1cfebe838895c7 Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Sun, 25 Oct 2026 16:29:26 -0400 Subject: [PATCH 037/135] feat: Performance mode puts frame pacing and per-frame window-check fixes behind one switch (#1563) Adds a Performance mode switch under Mode settings > Frame rate, off by default and stored per mode like the frame limit. Off keeps today's behaviour. On: - with no frame limit, the compositor hands buffers back to the game as soon as they are replaced instead of once per refresh, and gamescope's WSI layer is asked for at least 8 swapchain images; a chosen frame limit still paces - DROIDDECK_WSI_BYPASS_CHECK_MS=100 lets gamescope's WSI layer reuse its present-time Xwayland bypass check (patch 0117, gamescope-3.16.29-p13); WINE_OFFSCREEN_CHECK_MS=100 does the same for winex11 once a DroidDeck-Proton release carries that fix. Off sets both to 0. The gamescope pack now ships the patched WSI layer and SessionFiles stages it over the runtime's stock copy. Two per-game options, off by default: PROTON_DXVK_D3D8 and WINE_D3D_CONFIG renderer=vulkan|gl. AIO Graphics Test on an AYANEO Pocket FIT (Adreno 750), off -> on: Vulkan 204 -> 1787, OpenGL 296 -> 2169, D3D12 308 -> 3563, D3D11 1133 -> 2874, D3D9 1253 -> 3098 fps; DiRT Showdown 92.2 -> 93.4 (GPU-bound). --- app/src/main/cpp/waylandcomp/src/compositor.c | 4 +- .../cpp/waylandcomp/src/waylandcomp_jni.c | 2 + .../droiddeck/launcher/FrontEndActivity.kt | 5 +- .../com/droiddeck/launcher/SessionActivity.kt | 10 ++-- .../launcher/core/GameEnvironmentOptions.kt | 2 + .../launcher/session/SessionFiles.kt | 2 + .../launcher/session/SessionPrefs.kt | 18 +++++- .../launcher/session/SessionService.kt | 10 ++++ .../launcher/session/SessionState.kt | 3 + .../launcher/session/SettingsReset.kt | 2 +- .../launcher/ui/ModeSettingsDialog.kt | 4 ++ app/src/main/res/values/strings.xml | 4 ++ .../launcher/session/PerformanceModeTest.kt | 42 ++++++++++++++ tools/gamescope/PATCHES.md | 14 +++++ tools/gamescope/build-in-arch.sh | 6 +- .../0117-wsi-cache-present-bypass-check.patch | 55 +++++++++++++++++++ tools/gamescope/release.env | 4 +- 17 files changed, 176 insertions(+), 11 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/PerformanceModeTest.kt create mode 100644 tools/gamescope/patches/0117-wsi-cache-present-bypass-check.patch diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 562a83a750..0718623cfa 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -264,6 +264,8 @@ static struct wl_event_source *g_fallback_timer; static int g_fallback_armed; volatile int g_fps_limit; +/* fps limit -1 (Performance mode without a limit): replaced buffers go back to the client at once instead of once per refresh. */ +volatile int g_release_unpaced; volatile int g_hide_shell; @@ -371,7 +373,7 @@ static int on_release_timer(int fd, uint32_t mask, void *data) { static void release_buffer(struct surface *s, struct wl_resource *buffer, int64_t since_ns) { const int limit = g_fps_limit; const int64_t interval = limit > 0 ? 1000000000LL / limit : g_refresh_ns; - if (interval <= 0 || g_release_timer_fd < 0) { wl_buffer_send_release(buffer); perf_note_release(since_ns); return; } + if (g_release_unpaced || interval <= 0 || g_release_timer_fd < 0) { wl_buffer_send_release(buffer); perf_note_release(since_ns); return; } int64_t now = now_ns(); int64_t at = s->next_release_ns + interval; int64_t latest = now + interval * (int64_t)(s->releases_pending + 1); diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c index 16e42d1b5d..e6bb03027c 100644 --- a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c +++ b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c @@ -34,6 +34,7 @@ extern unsigned droiddeck_stream_frames(void); extern void droiddeck_wayland_output_resized(void); extern void droiddeck_wayland_set_output_refresh_rate(int mhz); extern volatile int g_fps_limit; +extern volatile int g_release_unpaced; extern volatile int g_hide_shell; extern volatile int g_zero_copy; extern volatile unsigned g_zero_copy_last; @@ -574,6 +575,7 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetLookName(JNIEnv * JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetFpsLimit(JNIEnv *env, jclass clazz, jint fps) { g_fps_limit = fps > 0 ? fps : 0; + g_release_unpaced = fps < 0; __android_log_print(ANDROID_LOG_INFO, TAG, "fps limit %d", fps); } diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 9e8d2f50a8..0d59c8da9d 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -392,6 +392,7 @@ class FrontEndActivity : ComponentActivity() { private var appScale by mutableStateOf(com.droiddeck.launcher.core.AppUiPrefs.DEFAULT_SCALE) private var hdrOn by mutableStateOf(false) private var fpsLimit by mutableStateOf(0) + private var performanceMode by mutableStateOf(false) private var upscaler by mutableStateOf(0) private var upscaleSharpness by mutableStateOf(75) private var hdrReason by mutableStateOf<String?>(null) @@ -1711,7 +1712,7 @@ class FrontEndActivity : ComponentActivity() { ModeSettings( mode = mode, resolution = resolution, panelSize = com.droiddeck.launcher.session.SessionDisplay.panelSize(this), - hdr = hdrOn, hdrReason = hdrReason, fpsLimit = fpsLimit, + hdr = hdrOn, hdrReason = hdrReason, fpsLimit = fpsLimit, performanceMode = performanceMode, upscaler = upscaler, upscaleSharpness = upscaleSharpness, gpuDrivers = drivers.summary(), touchMode = touchMode, @@ -1778,6 +1779,7 @@ class FrontEndActivity : ComponentActivity() { onHdr = { on -> SessionPrefs.setHdr(this, mode, on); hdrOn = on }, onGpuDrivers = { openComponents(focusContent = true, tab = com.droiddeck.launcher.ui.GPU_TAB) }, onFpsLimit = { fps -> SessionPrefs.setFpsLimit(this, mode, fps); fpsLimit = fps }, + onPerformanceMode = { on -> SessionPrefs.setPerformanceMode(this, mode, on); performanceMode = on }, onUpscaler = { m -> SessionPrefs.setUpscaler(this, m); upscaler = m }, onUpscaleSharpness = { pct -> SessionPrefs.setUpscaleSharpness(this, pct); upscaleSharpness = pct }, onTouch = { t -> SessionPrefs.setTouchMode(this, t); touchMode = t }, @@ -2029,6 +2031,7 @@ class FrontEndActivity : ComponentActivity() { loadBootMovie() hdrOn = SessionPrefs.hdr(this, mode) fpsLimit = SessionPrefs.fpsLimit(this, mode) + performanceMode = SessionPrefs.performanceMode(this, mode) upscaler = SessionPrefs.upscaler(this) upscaleSharpness = SessionPrefs.upscaleSharpness(this) hdrReason = com.droiddeck.launcher.wayland.HdrSupport.probe(this).reason diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 9a5b1ddc93..2740c71248 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -477,9 +477,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { com.droiddeck.launcher.gpu.SteamVrHealth.begin(this, SessionState.sessionId) window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) if (!SessionState.running) { - SessionState.fpsLimit = SessionPrefs.fpsLimit( - this, SessionPrefs.prefMode(intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM), - ) + val prefMode = SessionPrefs.prefMode(intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM) + SessionState.fpsLimit = SessionPrefs.fpsLimit(this, prefMode) + SessionState.performanceMode = SessionPrefs.performanceMode(this, prefMode) } applyOutputPacing() if (!SessionState.running) SessionState.followScreen = followChoice() @@ -1851,7 +1851,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun mirrorRefreshLimit(): Int = GlassesRendering.mirrorRefreshLimit(glassesSettings, glasses, glassesScreen != null) - private fun outputFpsLimit(): Int = GlassesRendering.fpsLimit(SessionState.fpsLimit, mirrorRefreshLimit()) + private fun outputFpsLimit(): Int = SessionPrefs.compositorFpsLimit( + GlassesRendering.fpsLimit(SessionState.fpsLimit, mirrorRefreshLimit()), SessionState.performanceMode, + ) private fun applyOutputPacing() { Log.i(TAG, "perf: " + PerfMode.apply(this, outputFpsLimit(), mirrorRefreshLimit())) diff --git a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt index 3ad45c1fa6..e339f38df1 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt @@ -14,6 +14,8 @@ object GameEnvironmentOptions { Option("MESA_SHADER_CACHE_MAX_SIZE", "1G", R.string.game_env_cache_size, Type.CHOICE, listOf("512M", "1G", "2G", "4G")), Option("PROTON_LOG", "1", R.string.game_env_proton_log, Type.TOGGLE, listOf("0", "1")), Option("PROTON_USE_WINED3D", "1", R.string.game_env_wined3d, Type.TOGGLE, listOf("0", "1")), + Option("PROTON_DXVK_D3D8", "1", R.string.game_env_dxvk_d3d8, Type.TOGGLE, listOf("0", "1")), + Option("WINE_D3D_CONFIG", "renderer=vulkan", R.string.game_env_wined3d_renderer, Type.CHOICE, listOf("renderer=vulkan", "renderer=gl")), Option("PROTON_USE_XALIA", "0", R.string.game_env_xalia, Type.TOGGLE, listOf("0", "1")), Option("PROTON_NO_NTSYNC", "1", R.string.game_env_no_ntsync, Type.TOGGLE, listOf("0", "1")), Option("PROTON_NO_ESYNC", "1", R.string.game_env_no_esync, Type.TOGGLE, listOf("0", "1")), 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 2991b559c5..958aa2df52 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -142,6 +142,8 @@ object SessionFiles { } + listOf("libvulkan-thunk.so", "libwebkitinput.so").map { "x86_64/$it" to "usr/local/lib/droiddeck-fex/x86_64/$it" } val optional = (arrayOf( "usr/local/bin/gamescope" to "usr/local/bin/gamescope", + // The gamescope pack carries its own WSI layer (patch 0117); it replaces the runtime's stock copy. + "usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so" to "usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so", "usr/local/lib/droiddeck/uruntime" to "usr/local/lib/droiddeck/uruntime", "usr/local/lib/droiddeck-pipewire.tzst" to "usr/local/lib/droiddeck-pipewire.tzst", "usr/local/share/licenses/uruntime/LICENSE" to "usr/local/share/licenses/uruntime/LICENSE", 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 9756aa0515..975ca45905 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -875,7 +875,7 @@ object SessionPrefs { prefs(context).edit().putBoolean("hdr.$mode", on).apply() } - fun fpsLimit(context: Context, mode: String): Int = prefs(context).getInt("fpsLimit.$mode", 0) + fun fpsLimit(context: Context, mode: String): Int = prefs(context).getInt("fpsLimit.$mode", 0).coerceAtLeast(0) fun setFpsLimit(context: Context, mode: String, fps: Int) { prefs(context).edit().putInt("fpsLimit.$mode", fps.coerceAtLeast(0)).apply() @@ -886,6 +886,22 @@ object SessionPrefs { fun fpsLimitChoices(context: Context): List<Pair<Int, String>> = fpsLimitChoices.map { (fps, label) -> fps to if (fps == 0) context.getString(R.string.frame_gen_off) else label } + /** + * Performance mode: without a frame limit, buffers go back to the game as soon as they are replaced + * instead of once per refresh, and gamescope's WSI layer and winex11 reuse their per-present window checks. + */ + fun performanceMode(context: Context, mode: String): Boolean = prefs(context).getBoolean("performanceMode.$mode", false) + + fun setPerformanceMode(context: Context, mode: String, on: Boolean) { + prefs(context).edit().putBoolean("performanceMode.$mode", on).apply() + } + + /** Compositor frame limit that releases buffers to the game unpaced. */ + const val FPS_UNPACED = -1 + + /** The limit handed to the compositor: Performance mode without a limit is unpaced, a chosen limit still paces. */ + fun compositorFpsLimit(limit: Int, performanceMode: Boolean): Int = if (performanceMode && limit <= 0) FPS_UNPACED else limit + val upscalerChoices = listOf( 0 to "Linear", 2 to "Nearest", 4 to "AMD FSR 1", 3 to "Snapdragon GSR", 8 to "Snapdragon GSR (quality)", 7 to "NVIDIA NIS", 6 to "Sharpen only", 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 363993c713..630feeb921 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -475,6 +475,16 @@ class SessionService : Service() { Log.i(TAG, "hdr: gamescope --hdr-enabled, DXVK_HDR=1") } guest.add("BL_FPS=" + SessionState.fpsLimit) + // gamescope's WSI layer and winex11 reuse their per-present window checks for this long; 0 checks on every present. + val windowCheckMs = if (SessionState.performanceMode) 100 else 0 + guest.add("DROIDDECK_WSI_BYPASS_CHECK_MS=$windowCheckMs") + guest.add("WINE_OFFSCREEN_CHECK_MS=$windowCheckMs") + if (SessionPrefs.compositorFpsLimit(SessionState.fpsLimit, SessionState.performanceMode) == SessionPrefs.FPS_UNPACED) { + // gamescope turns buffers around slower than an unpaced game draws; more images keep it drawing. + guest.add("GAMESCOPE_WSI_MIN_IMAGE_COUNT=8") + guest.add("GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT=1") + } + Log.i(TAG, "performance mode " + (if (SessionState.performanceMode) "on" else "off") + ", frame limit " + SessionState.fpsLimit) guest.add("BL_REFRESH=" + Math.round(SessionState.refreshHz)) guest.add("BL_LOG=" + sessionLog.path) guest.add("BL_DEBUG_DIR=" + sessionDir.path) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt index 6bdece304d..4b57a10689 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -104,6 +104,9 @@ object SessionState { @Volatile var fpsLimit: Int = 0 + @Volatile + var performanceMode = false + @Volatile var firstFrameSeen = false diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 62222ed3ef..c933229a88 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -29,7 +29,7 @@ object SettingsReset { ) internal val SESSION_PREFIXES = listOf( - "resolutionCap.", "displayResolution.", "customRes.", "hdr.", "fpsLimit.", "suspendPolicy.", + "resolutionCap.", "displayResolution.", "customRes.", "hdr.", "fpsLimit.", "performanceMode.", "suspendPolicy.", ) private val STEAM_TOUCH_KEYS = listOf("feedback", "autoFade", "gyro", "shake") 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 8e83598386..393971446e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -60,6 +60,7 @@ class ModeSettings( val hdrReason: String?, val gpuDrivers: String? = null, val fpsLimit: Int = 0, + val performanceMode: Boolean = false, val upscaler: Int = 0, val upscaleSharpness: Int = 75, val touchMode: String, @@ -116,6 +117,7 @@ class ModeSettingsActions( val onHdr: (Boolean) -> Unit, val onGpuDrivers: () -> Unit = {}, val onFpsLimit: (Int) -> Unit = {}, + val onPerformanceMode: (Boolean) -> Unit = {}, val onUpscaler: (Int) -> Unit = {}, val onUpscaleSharpness: (Int) -> Unit = {}, val onTouch: (String) -> Unit, @@ -241,6 +243,8 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: ) } SettingsGroup(stringResource(R.string.display_frame_rate)) { + ToggleRow(host, "performance", stringResource(R.string.mode_performance), stringResource(R.string.mode_performance_hint), + s.performanceMode, onChange = a.onPerformanceMode) ChoiceRow(host, "fps", stringResource(R.string.mode_fps), stringResource(R.string.common_applies_next_session), SessionPrefs.fpsLimitChoices(LocalContext.current), s.fpsLimit, note = stringResource(R.string.mode_fps_note), onPick = a.onFpsLimit) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1ca16f9100..a0d9672c4d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -85,6 +85,8 @@ <string name="game_env_vkd3d_config">VKD3D options for D3D12. nodxr disables ray tracing; use only for a game that needs it.</string> <string name="game_env_proton_log">Set to 1 for a Proton diagnostic log. Logging can reduce performance and use storage.</string> <string name="game_env_wined3d">Set to 1 to use OpenGL-based WineD3D instead of DXVK for D3D9–11 compatibility testing.</string> + <string name="game_env_wined3d_renderer">Renderer for DirectDraw, Direct3D 1-7 and games run with WineD3D. Vulkan skips the OpenGL-on-Zink path and is much faster for old DirectDraw and Direct3D 7 games on Adreno.</string> + <string name="game_env_dxvk_d3d8">Set to 1 to run Direct3D 8 through DXVK instead of WineD3D. Faster in AIO Graphics Test\'s Direct3D 8 test on Adreno.</string> <string name="game_env_no_ntsync">Set to 1 to keep this game off ntsync (droiddeck-ntsync or a kernel driver); it uses droiddeck-esync where a pack exists, otherwise droiddeck-fsync.</string> <string name="game_env_no_esync">Set to 1 to turn droiddeck-esync off for this game; it uses droiddeck-fsync instead, or droiddeck-ntsync where fsync is off too.</string> <string name="game_env_no_fsync">Set to 1 to keep this game off droiddeck-fsync; it uses droiddeck-esync where a pack exists, otherwise droiddeck-ntsync.</string> @@ -254,6 +256,8 @@ <string name="mode_ratio_custom">Set by the custom resolution.</string> <string name="mode_ratio_auto">Auto uses at least 16:9.</string> <string name="mode_fps">Frame limit</string> + <string name="mode_performance">Performance mode</string> + <string name="mode_performance_hint">With no frame limit, games run as fast as they can: frames go back to the game without waiting for the screen. With a frame limit, frames stay paced to it. Either way, gamescope and Wine skip repeated window checks. Uses more power and runs warmer without a limit. Applies next session.</string> <string name="mode_fps_note">Caps the whole session. The display switches to a refresh rate the cap divides evenly.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 output</string> diff --git a/app/src/test/java/com/droiddeck/launcher/session/PerformanceModeTest.kt b/app/src/test/java/com/droiddeck/launcher/session/PerformanceModeTest.kt new file mode 100644 index 0000000000..f59157c3be --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/PerformanceModeTest.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class PerformanceModeTest { + private val app get() = RuntimeEnvironment.getApplication() + private val session get() = app.getSharedPreferences("session", Context.MODE_PRIVATE) + + @Before fun clear() { session.edit().clear().commit() } + + @Test fun offByDefaultAndPerMode() { + assertFalse(SessionPrefs.performanceMode(app, SessionService.MODE_STEAM)) + SessionPrefs.setPerformanceMode(app, SessionService.MODE_STEAM, true) + assertTrue(SessionPrefs.performanceMode(app, SessionService.MODE_STEAM)) + assertFalse(SessionPrefs.performanceMode(app, SessionService.MODE_DESKTOP)) + } + + @Test fun offKeepsTodaysPacing() { + assertEquals(0, SessionPrefs.compositorFpsLimit(0, false)) + assertEquals(60, SessionPrefs.compositorFpsLimit(60, false)) + } + + @Test fun onWithoutALimitIsUnpacedAndAChosenLimitStillPaces() { + assertEquals(SessionPrefs.FPS_UNPACED, SessionPrefs.compositorFpsLimit(0, true)) + assertEquals(60, SessionPrefs.compositorFpsLimit(60, true)) + } + + @Test fun anOldUncappedFrameLimitReadsAsOff() { + session.edit().putInt("fpsLimit.steam", -1).commit() + assertEquals(0, SessionPrefs.fpsLimit(app, SessionService.MODE_STEAM)) + assertFalse(SessionPrefs.fpsLimitChoices.any { it.first < 0 }) + } +} diff --git a/tools/gamescope/PATCHES.md b/tools/gamescope/PATCHES.md index a34e97e356..ab53e5ad99 100644 --- a/tools/gamescope/PATCHES.md +++ b/tools/gamescope/PATCHES.md @@ -85,3 +85,17 @@ the patched component retained 1/20, then 0 after destruction. The unassigned control retained 20/20 and then 0. In Backpack Battles, two batches of ten touch drags leaked 188 and 197 SHM descriptors before the fix; the same batches added zero after the fix (112 total descriptors before and after each batch). + +## 0117 WSI: cache the present-time Xwayland bypass check + +`QueuePresentKHR` in the WSI layer calls `canBypassXWayland` for every swapchain on +every present. Each call makes several synchronous X requests (window geometry, +`_WINE_ALLOW_FLIP`, parent window, a child-window scan, the toplevel window). At +high frame rates that is thousands of round trips a second: on an AYANEO Pocket FIT +running AIO Graphics Test uncapped, Xwayland used 24-32% of a core and the game's +present thread sat about half idle. + +The patch can keep the result for `DROIDDECK_WSI_BYPASS_CHECK_MS` milliseconds. Unset +or 0 keeps the per-present check; the app sets 100 only in Performance mode and 0 +otherwise. With 100, a window resize or a flip/obscure change is seen up to 100 ms +later than before; surface creation and capability queries still check every time. diff --git a/tools/gamescope/build-in-arch.sh b/tools/gamescope/build-in-arch.sh index 2853e593ab..79d4fd8692 100755 --- a/tools/gamescope/build-in-arch.sh +++ b/tools/gamescope/build-in-arch.sh @@ -49,7 +49,11 @@ tar --use-compress-program=unzstd -xf "$PKG" -C out --strip-components=2 usr/bin mv out/gamescope out/usr/local/bin/gamescope chmod 755 out/usr/local/bin/gamescope strip --strip-unneeded out/usr/local/bin/gamescope || true -NEEDED=$(readelf -d out/usr/local/bin/gamescope | sed -n 's/.*NEEDED.*\[\(.*\)\]/\1/p') +# The WSI layer carries patches too (0117); the runtime's stock copy is replaced. +mkdir -p out/usr/lib +tar --use-compress-program=unzstd -xf "$PKG" -C out usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so +strip --strip-unneeded out/usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so || true +NEEDED=$(for f in out/usr/local/bin/gamescope out/usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so; do readelf -d "$f" | sed -n 's/.*NEEDED.*\[\(.*\)\]/\1/p'; done | sort -u) echo "NEEDED: $NEEDED" MISSING="" for lib in $NEEDED; do grep -qx "$lib" tools/gamescope/runtime-sonames.txt || MISSING="$MISSING $lib"; done diff --git a/tools/gamescope/patches/0117-wsi-cache-present-bypass-check.patch b/tools/gamescope/patches/0117-wsi-cache-present-bypass-check.patch new file mode 100644 index 0000000000..7ce0ec48d1 --- /dev/null +++ b/tools/gamescope/patches/0117-wsi-cache-present-bypass-check.patch @@ -0,0 +1,55 @@ +--- a/layer/VkLayer_FROG_gamescope_wsi.cpp 2026-10-25 07:56:48.179978889 +0000 ++++ b/layer/VkLayer_FROG_gamescope_wsi.cpp 2026-10-25 07:56:48.207978889 +0000 +@@ -23,6 +23,8 @@ + #include <optional> + + #include <poll.h> ++#include <time.h> ++#include <cstdlib> + #include <sys/stat.h> + // For limiter file. + #include <time.h> +@@ -476,6 +478,34 @@ + // Cached for comparison. + std::optional<VkRect2D> cachedWindowRect; + ++ // canBypassXWayland costs several X round trips; at present time it is refreshed at most ++ // every DROIDDECK_WSI_BYPASS_CHECK_MS (default 0 = every present; DroidDeck's Performance mode sets 100). ++ std::optional<bool> presentBypass; ++ bool presentBypassHdr = false; ++ uint64_t presentBypassNs = 0; ++ ++ static uint64_t presentBypassIntervalNs() { ++ static const uint64_t interval = [] { ++ const char *v = getenv("DROIDDECK_WSI_BYPASS_CHECK_MS"); ++ return uint64_t(v && *v ? strtoull(v, nullptr, 10) : 0) * 1000000ull; ++ }(); ++ return interval; ++ } ++ ++ bool canBypassXWaylandAtPresent(bool hdrColorspace) { ++ if (isWayland()) ++ return true; ++ timespec ts; ++ clock_gettime(CLOCK_MONOTONIC, &ts); ++ const uint64_t now = uint64_t(ts.tv_sec) * 1000000000ull + uint64_t(ts.tv_nsec); ++ if (!presentBypass || presentBypassHdr != hdrColorspace || now - presentBypassNs >= presentBypassIntervalNs()) { ++ presentBypass = canBypassXWayland(hdrColorspace); ++ presentBypassHdr = hdrColorspace; ++ presentBypassNs = now; ++ } ++ return *presentBypass; ++ } ++ + bool isWayland() const { + // Is native Wayland? + return connection == nullptr; +@@ -1597,7 +1627,7 @@ + continue; + } + +- const bool canBypass = gamescopeSurface->canBypassXWayland(gamescopeSwapchain->isHdrColorspace); ++ const bool canBypass = gamescopeSurface->canBypassXWaylandAtPresent(gamescopeSwapchain->isHdrColorspace); + if (canBypass != gamescopeSwapchain->isBypassingXWayland) { + if (canBypass) { + if (!(gamescopeSurface->flags & GamescopeLayerClient::Flag::NoSuboptimal)) diff --git a/tools/gamescope/release.env b/tools/gamescope/release.env index 1e741f4aa0..a505f40a87 100644 --- a/tools/gamescope/release.env +++ b/tools/gamescope/release.env @@ -1,3 +1,3 @@ GAMESCOPE_REPO=Droid-Deck/DroidDeck-Components -GAMESCOPE_TAG=gamescope-3.16.29-p12 -GAMESCOPE_SHA256=07b69944a1ebf2741d4a867afa6327dcc63ec458f432a8f7483089dce2197010 +GAMESCOPE_TAG=gamescope-3.16.29-p13 +GAMESCOPE_SHA256=93c789dc9e08828496f1caa2849d56acdf205838de723a24b296547a29c0b6af From ee3f32d31e8a5f79d54c716bd108e35634e9fe7d Mon Sep 17 00:00:00 2001 From: ian <lutfiandwica@gmail.com> Date: Mon, 26 Oct 2026 03:38:06 +0700 Subject: [PATCH 038/135] feat: default storage for new installs, with USB/SDCARD/SSD detection (#1520) * feat: choose default storage for new store installs Store installs and the Epic Games Launcher can use internal storage, external storage, a folder picked through Choose folder..., or ask every time. The choice is stored in SessionPrefs and used by StoreInstallRoot; Storage > Default storage exposes it. * fix: allow choosing any folder for default storage The default storage choice can now hold an arbitrary folder path, not just internal or app-specific external storage. StoreInstallRoot resolves and validates picked folders, keeps a disconnected choice instead of silently falling back, and the folder picker stays available from Storage. * fix: keep the Epic install folder when external storage is away * test: use a unique missing folder for the Epic storage check * fix: detect USB SSDs that the storage manager hides List storage volumes that have no UUID instead of dropping them, keep volumes that are present but not yet mounted, and fall back to parsing /proc/mounts so USB OTG drives appear even when Android does not expose them as storage volumes or app directories. Prefer the system's volume description for removable drives. (Raw removable drives as move targets, the folder-picker fallback, and the unreadable-drive guidance follow with the move stack.) * fix: compare mount paths as strings in StorageRootsTest * fix: never drop a present storage volume from the drive list Key volumes by description or index when they report no UUID and no directory, keep nofs/unmountable states so a plugged-in drive stays visible with guidance, only attach app directories on strict UUID matches, and accept any fstype under vold-managed locations plus usb-ish mounts directly under /mnt. * fix: probe folder writes with a fresh temp file and keep Epic's folder unset while external storage is away --------- Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- .../droiddeck/launcher/files/StorageRoots.kt | 87 +++++++++++-- .../droiddeck/launcher/session/GameStorage.kt | 7 +- .../launcher/session/SessionPrefs.kt | 28 +++++ .../launcher/stores/StoreInstallRoot.kt | 76 ++++++++++-- .../droiddeck/launcher/stores/StoresState.kt | 18 ++- .../launcher/stores/epic/EpicClient.kt | 16 ++- .../com/droiddeck/launcher/ui/StoragePage.kt | 117 ++++++++++++++++++ app/src/main/res/values-in/strings.xml | 15 +++ app/src/main/res/values/strings.xml | 15 +++ .../launcher/files/StorageRootsTest.kt | 71 +++++++++++ .../launcher/stores/StoreInstallRootTest.kt | 75 +++++++++++ .../launcher/stores/epic/EpicClientTest.kt | 22 ++++ docs/development/stores.md | 8 +- 13 files changed, 526 insertions(+), 29 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/files/StorageRootsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt b/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt index 99e9401570..273917b007 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt @@ -29,6 +29,50 @@ object StorageRoots { val seeds = LinkedHashSet<File>() } + private val EXTERNAL_MOUNT_TYPES = setOf( + "vfat", "exfat", "texfat", "ntfs", "ntfs3", "fuseblk", "fuse", "sdcardfs", + ) + + internal data class MountPoint(val target: File, val type: String) + + internal fun parseMountPoints(mounts: String): List<MountPoint> { + val out = ArrayList<MountPoint>() + for (line in mounts.lineSequence()) { + val parts = line.split(' ') + if (parts.size < 3) continue + out.add(MountPoint(File(parts[1].replace("\\040", " ")), parts[2].lowercase())) + } + return out.distinct() + } + + internal fun isExternalMount(mount: MountPoint): Boolean { + val path = mount.target.path + val name = when { + path.startsWith("/storage/") -> path.removePrefix("/storage/") + path.startsWith("/mnt/media_rw/") -> path.removePrefix("/mnt/media_rw/") + path.startsWith("/mnt/") -> path.removePrefix("/mnt/") + else -> return false + } + if ('/' in name || name.isEmpty() || name == "emulated" || name == "self") return false + if (mount.type in EXTERNAL_MOUNT_TYPES) { + if (path.startsWith("/mnt/") && !path.startsWith("/mnt/media_rw/")) { + val lower = name.lowercase() + if (!lower.contains("usb") && !lower.contains("otg") && + !lower.contains("udisk") && !lower.contains("disk") + ) return false + } + return true + } + // vold-managed locations only hold removable volumes, whatever the fstype is. + return path.startsWith("/storage/") || path.startsWith("/mnt/media_rw/") + } + + internal fun parseExternalMounts(mounts: String): List<File> = + parseMountPoints(mounts).filter(::isExternalMount).map { it.target } + + fun externalMounts(): List<File> = + runCatching { parseExternalMounts(File("/proc/mounts").readText()) }.getOrDefault(emptyList()) + fun list(context: Context): List<StorageRoot> { val volumes = LinkedHashMap<String, Volume>() @@ -44,21 +88,31 @@ object StorageRoots { val storageManager = context.getSystemService(StorageManager::class.java) storageManager?.storageVolumes.orEmpty() - .filter { isMounted(it.state) } - .forEach { volume -> + .filter { present(it.state) } + .forEachIndexed { index, volume -> val uuid = volume.uuid?.takeIf { it.isNotBlank() } - val entry = volumeOf(if (volume.isPrimary) PRIMARY_KEY else uuid ?: return@forEach) + val dirName = volume.directory?.name?.takeIf { it.isNotBlank() } + // Unmounted volumes often report neither uuid nor directory; never drop the + // volume or a plugged-in drive stays invisible with no explanation. + val descSlug = volume.getDescription(context)?.trim() + ?.takeIf { it.isNotBlank() && !it.equals("android", ignoreCase = true) } + ?.replace(Regex("[^A-Za-z0-9._-]+"), "-") + val entry = volumeOf(if (volume.isPrimary) PRIMARY_KEY else uuid ?: dirName ?: descSlug ?: "volume-$index") entry.removable = !volume.isPrimary && volume.isRemovable - if (entry.label == null) entry.label = labelFor(context, volume, uuid) + if (entry.label == null) entry.label = labelFor(context, volume, uuid ?: dirName ?: descSlug) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { volume.directory?.let { entry.candidates += it } } - if (uuid != null) { - entry.candidates += File("/storage/$uuid") - entry.candidates += File("/mnt/media_rw/$uuid") + val name = uuid ?: dirName + if (name != null) { + entry.candidates += File("/storage/$name") + entry.candidates += File("/mnt/media_rw/$name") + // Only strict uuid matches own an app directory; a loose match would + // attach another volume's folder to this entry. + if (uuid != null) appDirs.filter { belongsTo(storageManager!!, it, volume) } + .forEach { entry.seeds += it } } - appDirs.filter { belongsTo(storageManager!!, it, volume) }.forEach { entry.seeds += it } } File("/storage").listFiles().orEmpty().forEach { child -> @@ -68,6 +122,13 @@ object StorageRoots { File("/mnt/media_rw").listFiles().orEmpty().forEach { child -> if (child.isDirectory) volumeOf(child.name).candidates += child } + // USB OTG drives do not always appear as storage volumes or under /storage for + // third-party apps, but their kernel mounts are still visible in /proc/mounts. + for (mount in externalMounts()) { + val entry = volumeOf(mount.name) + if (entry.label == null) entry.label = mount.name + entry.candidates += mount + } appDirs.forEach { dir -> val root = volumeRootOf(dir) ?: return@forEach @@ -141,15 +202,19 @@ object StorageRoots { private fun labelFor(context: Context, volume: StorageVolume, uuid: String?): String { if (volume.isPrimary) return context.getString(R.string.fm_drive_internal) - if (volume.isRemovable) return context.getString(R.string.fm_drive_sd) val description = volume.getDescription(context)?.trim() - return description?.takeIf { it.isNotBlank() && !it.equals("android", ignoreCase = true) } - ?: uuid + if (!description.isNullOrBlank() && !description.equals("android", ignoreCase = true)) return description + if (volume.isRemovable) return context.getString(R.string.fm_drive_sd) + return uuid ?: context.getString(R.string.fm_drive_storage) } private fun isEmulated(dir: File): Boolean = dir.absolutePath.startsWith(EMULATED_PREFIX) + private fun present(state: String?): Boolean = + isMounted(state) || state == Environment.MEDIA_UNMOUNTED || state == Environment.MEDIA_CHECKING || + state == Environment.MEDIA_NOFS || state == Environment.MEDIA_UNMOUNTABLE + private fun isMounted(state: String?): Boolean = state == Environment.MEDIA_MOUNTED || state == Environment.MEDIA_MOUNTED_READ_ONLY diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt index 90feec16e1..447fb254c9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt @@ -14,9 +14,12 @@ object GameStorage { fun options(context: Context): List<Option> { val sm = context.getSystemService(StorageManager::class.java) + val primary = context.getExternalFilesDir(null)?.absolutePath + val primaryStorage = Environment.getExternalStorageDirectory()?.absolutePath return context.getExternalFilesDirs(null).orEmpty().filterNotNull().mapNotNull { dir -> - val removable = try { Environment.isExternalStorageRemovable(dir) } catch (e: Exception) { false } - if (!removable) return@mapNotNull null + // Non-primary app dirs are usable even when Android reports the volume as non-removable (USB SSDs often do). + if (primary != null && dir.absolutePath == primary) return@mapNotNull null + if (!primaryStorage.isNullOrBlank() && dir.absolutePath.startsWith("$primaryStorage/")) return@mapNotNull null val volume = try { sm?.getStorageVolume(dir) } catch (e: Exception) { null } val name = volume?.getDescription(context)?.takeIf { it.isNotBlank() && !it.equals("android", true) } ?: context.getString(R.string.gstore_sd_card) Option(context.getString(R.string.gstore_volume_free, name, free(dir)), File(dir, "steam").absolutePath, name) 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 975ca45905..ec502a279f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -141,6 +141,34 @@ object SessionPrefs { prefs(context).edit().putString("storesInstallLanguage", code).apply() } + const val DEFAULT_STORAGE_ASK = "ask" + const val DEFAULT_STORAGE_INTERNAL = "internal" + const val DEFAULT_STORAGE_EXTERNAL = "external" + private val DEFAULT_STORAGE_VALUES = setOf(DEFAULT_STORAGE_ASK, DEFAULT_STORAGE_INTERNAL, DEFAULT_STORAGE_EXTERNAL) + + fun defaultStorage(context: Context): String = + prefs(context).getString("defaultStorage", DEFAULT_STORAGE_ASK) + ?.takeIf { it in DEFAULT_STORAGE_VALUES } ?: DEFAULT_STORAGE_ASK + + fun setDefaultStorage(context: Context, value: String) { + prefs(context).edit().putString("defaultStorage", value.takeIf { it in DEFAULT_STORAGE_VALUES } ?: DEFAULT_STORAGE_ASK).apply() + } + + fun defaultStorageFolder(context: Context): String = prefs(context).getString("defaultStorageFolder", "") ?: "" + + fun defaultStorageFolderLabel(context: Context): String = prefs(context).getString("defaultStorageFolderLabel", "") ?: "" + + fun setDefaultStorageFolder(context: Context, path: String, label: String) { + prefs(context).edit() + .putString("defaultStorageFolder", path) + .putString("defaultStorageFolderLabel", label) + .apply() + } + + fun clearDefaultStorageFolder(context: Context) { + prefs(context).edit().remove("defaultStorageFolder").remove("defaultStorageFolderLabel").apply() + } + fun gameStoresParallel(context: Context): Int = prefs(context).getInt("gameStoresParallel", 1).coerceIn(1, 3) fun setGameStoresParallel(context: Context, count: Int) { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt index 7b13428d7a..c4faac54e5 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt @@ -5,6 +5,7 @@ import android.os.StatFs import android.os.storage.StorageManager import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.GameStorage +import com.droiddeck.launcher.session.SessionPrefs import java.io.File import java.util.zip.CRC32 @@ -76,34 +77,93 @@ object StoreInstallRoot { fun targets(context: Context): List<Target> { val internal = Target(internalRoot(context), context.getString(com.droiddeck.launcher.R.string.games_internal), removable = false) + val custom = customTarget(context) val cards = GameStorage.options(context).map { Target(File(it.path, ON_VOLUME), it.name, removable = true) } val library = GameStorage.effective(context)?.let { lib -> val root = File(lib.path, ON_VOLUME) if (cards.any { it.root.absolutePath == root.absolutePath }) return@let null - val volume = runCatching { context.getSystemService(StorageManager::class.java)?.getStorageVolume(File(lib.path)) }.getOrNull() - val name = File(lib.path).name.ifBlank { lib.label } - val where = volume?.takeUnless { it.isPrimary }?.getDescription(context) - val label = if (where.isNullOrBlank()) name else context.getString(com.droiddeck.launcher.R.string.gstore_folder_on_volume, name, where) - Target(root, label, removable = true, folder = true) + Target(root, folderLabel(context, File(lib.path)), removable = true, folder = true) } - return listOf(internal) + cards + listOfNotNull(library) + return (listOf(internal) + listOfNotNull(custom) + cards + listOfNotNull(library)) + .distinctBy { it.root.absolutePath } + } + + fun defaultStorageFolder(context: Context): File? = + SessionPrefs.defaultStorageFolder(context).takeIf { it.isNotBlank() }?.let(::File) + + fun customTarget(context: Context): Target? { + val folder = defaultStorageFolder(context) ?: return null + // Writes are probed when the folder is chosen; File.canWrite() is unreliable on FUSE volumes. + if (!folder.isDirectory) return null + val label = SessionPrefs.defaultStorageFolderLabel(context).ifBlank { folderLabel(context, folder) } + return Target(File(folder, ON_VOLUME), label, removable = true, folder = true) + } + + fun detectedExternalTarget(context: Context): Target? { + val custom = defaultStorageFolder(context)?.let { File(it, ON_VOLUME) }?.absolutePath + return externalTarget(targets(context).filter { it.root.absolutePath != custom }, internalRoot(context)) } fun installRoot(context: Context): File = internalRoot(context) + fun externalTarget(context: Context): Target? = + if (SessionPrefs.defaultStorageFolder(context).isNotBlank()) customTarget(context) + else detectedExternalTarget(context) + + internal fun externalTarget(targets: List<Target>, internalRoot: File): Target? = + targets.firstOrNull { it.folder && it.root.absolutePath != internalRoot.absolutePath } + ?: targets.firstOrNull { it.removable && it.root.absolutePath != internalRoot.absolutePath } + + fun defaultTarget(context: Context): Target? = when (SessionPrefs.defaultStorage(context)) { + SessionPrefs.DEFAULT_STORAGE_INTERNAL -> Target(internalRoot(context), context.getString(com.droiddeck.launcher.R.string.games_internal), removable = false) + SessionPrefs.DEFAULT_STORAGE_EXTERNAL -> externalTarget(context) + else -> null + } + fun libraryRoot(context: Context): File? = GameStorage.effective(context)?.let { File(it.path, ON_VOLUME) } fun roots(context: Context): List<File> { val cards = GameStorage.options(context).map { File(it.path, ON_VOLUME) } + val custom = defaultStorageFolder(context)?.takeIf { it.isDirectory }?.let { File(it, ON_VOLUME) } val library = GameStorage.effective(context)?.let { File(it.path, ON_VOLUME) } - return (listOf(internalRoot(context)) + cards + listOfNotNull(library)).distinctBy { it.absolutePath } + return (listOf(internalRoot(context)) + cards + listOfNotNull(custom) + listOfNotNull(library)) + .distinctBy { it.absolutePath } } fun externalRoots(context: Context): List<Pair<File, String>> { val library = GameStorage.effective(context)?.path + val used = mutableSetOf<String>() return roots(context) .filter { !isInternal(context, it) && (library == null || !it.absolutePath.startsWith("$library/")) } - .map { it to guestFor(context, it) } + .map { root -> + val base = guestFor(context, root) + val guest = if (used.add(base)) base else { + val suffix = "%08x".format(CRC32().apply { update(root.absolutePath.toByteArray()) }.value) + "$base-$suffix".also { used.add(it) } + } + root to guest + } + } + + fun folderLabel(context: Context, folder: File): String { + val name = folder.name.ifBlank { context.getString(com.droiddeck.launcher.R.string.gstore_folder) } + val volume = runCatching { + context.getSystemService(StorageManager::class.java)?.getStorageVolume(folder)?.getDescription(context) + }.getOrNull() + return if (volume.isNullOrBlank() || volume.equals("android", true) || volume.equals(name, true)) name + else context.getString(com.droiddeck.launcher.R.string.gstore_folder_on_volume, name, volume) + } + + fun prepareDefaultFolder(context: Context, folder: File): String? { + if (!folder.isDirectory) return context.getString(com.droiddeck.launcher.R.string.gstore_cannot_create, folder.path) + val root = File(folder, ON_VOLUME) + if (!root.isDirectory && !root.mkdirs()) return context.getString(com.droiddeck.launcher.R.string.gstore_cannot_create, folder.path) + return try { + File.createTempFile(".droiddeck-write-probe", null, root).delete() + null + } catch (e: Exception) { + context.getString(com.droiddeck.launcher.R.string.gstore_cannot_write_detail, root.path, e.message) + } } /** Xodus has its own PRoot mount table and cannot see the selected Steam library's SD bind. */ diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index f09712b78a..e15f19dd48 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -9,6 +9,7 @@ import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue +import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.stores.download.DownloadEntry object StoresState { @@ -220,17 +221,26 @@ object StoresState { if (item.store == Store.ITCH && item.extra["uploadId"].isNullOrEmpty()) { itchPicking = item; return } if (isUnfinished(item)) { install(context, item); return } val targets = StoreInstallRoot.targets(context) - if (targets.size > 1 || StoreLanguage.selectable(item.store)) pendingInstall = item - else install(context, item, targets.first().root) + val preferred = StoreInstallRoot.defaultTarget(context) + val wantedExternal = SessionPrefs.defaultStorage(context) == SessionPrefs.DEFAULT_STORAGE_EXTERNAL + if (preferred != null) SessionPrefs.setStoresInstallTarget(context, preferred.root.absolutePath) + when { + preferred != null && !StoreLanguage.selectable(item.store) -> { + install(context, item, preferred.root) + } + targets.size > 1 || wantedExternal || StoreLanguage.selectable(item.store) -> pendingInstall = item + else -> install(context, item, targets.first().root) + } } fun install(context: Context, item: CatalogItem, root: java.io.File? = null, language: String? = null) { val app = context.applicationContext + val targetRoot = root ?: StoreInstallRoot.defaultTarget(app)?.root ?: StoreInstallRoot.installRoot(app) if (item.store == Store.BATTLENET) { - backends[item.store]?.install(app, item, root ?: StoreInstallRoot.installRoot(app)) + backends[item.store]?.install(app, item, targetRoot) return } - val folder = StoreInstallRoot.folderFor(app, item.store, item.id, item.title, root ?: StoreInstallRoot.installRoot(app)) + val folder = StoreInstallRoot.folderFor(app, item.store, item.id, item.title, targetRoot) val target = folder.parentFile!!.parentFile!! val code = language?.takeIf { it.isNotBlank() } ?: StoreLanguage.preferredCode(app) val tagged = if (StoreLanguage.selectable(item.store)) item.copy(extra = item.extra + (StoreLanguage.EXTRA to code)) else item diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt index 8da3a96ad4..454d94826c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt @@ -292,10 +292,24 @@ object EpicClient { AddedGames.guestPath(app, folder)?.let { t.root.absolutePath to (folder to it) } }.toMap() if (dirs.isEmpty()) return null - val chosen = dirs[SessionPrefs.storesInstallTarget(app)] ?: dirs[StoreInstallRoot.internalRoot(app).absolutePath] ?: dirs.values.first() + val preferred = StoreInstallRoot.defaultTarget(app)?.root?.absolutePath + val chosen = preferred?.let { dirs[it] } + ?: dirs[SessionPrefs.storesInstallTarget(app)] + ?: dirs[StoreInstallRoot.internalRoot(app).absolutePath] + ?: dirs.values.first() val file = File(dataDir(app), SETTINGS) val settings = runCatching { JSONObject(file.readText()) }.getOrNull() ?: JSONObject() val current = settings.optString("defaultInstallDir").trimEnd('/') + val externalMissing = SessionPrefs.defaultStorage(app) == SessionPrefs.DEFAULT_STORAGE_EXTERNAL && preferred == null + if (externalMissing && current.isNotEmpty() && + (current.startsWith("/mnt/droiddeck-") || current.startsWith("/root/Storage/"))) { + Log.w(TAG, "the configured external storage is disconnected; keeping $current") + return current + } + if (externalMissing && current.isEmpty()) { + Log.w(TAG, "the configured external storage is disconnected; not choosing an install folder") + return null + } if (current.isNotEmpty() && current != STOCK_INSTALL_DIR && dirs.values.none { it.second == current } && !(current.endsWith("/${Store.EPIC.shortLabel}") && (current.startsWith("/mnt/droiddeck-") || current.startsWith("/root/Storage/")))) return current if (!chosen.first.isDirectory && !chosen.first.mkdirs()) return null if (current == chosen.second) return current diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt index 8b1ec5340c..e820ed8eed 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt @@ -1,5 +1,9 @@ package com.droiddeck.launcher.ui +import android.app.Activity +import android.widget.Toast +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.animation.core.Spring import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.LocalIndication @@ -51,6 +55,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable @@ -65,6 +70,7 @@ import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role @@ -74,6 +80,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import com.droiddeck.launcher.R +import com.droiddeck.launcher.files.InAppFilePicker import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.storage.Bucket import com.droiddeck.launcher.storage.CleanItem @@ -84,6 +91,8 @@ import com.droiddeck.launcher.storage.StorageState import com.droiddeck.launcher.storage.ToolReason import com.droiddeck.launcher.storage.ToolState import com.droiddeck.launcher.storage.ToolUsage +import com.droiddeck.launcher.stores.StoreInstallRoot +import java.io.File import java.text.DateFormat import java.util.Date @@ -144,6 +153,113 @@ internal fun StoragePanel(s: FrontEndState, a: FrontEndActions) { } } +@Composable +private fun DefaultStorageGroup() { + val ctx = LocalContext.current + var value by remember { mutableStateOf(SessionPrefs.defaultStorage(ctx)) } + var open by remember { mutableStateOf(false) } + var revision by remember { mutableIntStateOf(0) } + val customPath = SessionPrefs.defaultStorageFolder(ctx) + val customTarget = remember(customPath, revision) { StoreInstallRoot.customTarget(ctx) } + val detected = remember(customPath, revision) { StoreInstallRoot.detectedExternalTarget(ctx) } + val customLabel = SessionPrefs.defaultStorageFolderLabel(ctx).ifBlank { + customPath.takeIf { it.isNotBlank() }?.let { File(it).name }.orEmpty() + } + val pickFolder = rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> + if (result.resultCode != Activity.RESULT_OK) return@rememberLauncherForActivityResult + val path = InAppFilePicker.pickedPath(result.data) ?: return@rememberLauncherForActivityResult + val problem = StoreInstallRoot.prepareDefaultFolder(ctx, File(path)) + if (problem != null) { + Toast.makeText(ctx, ctx.getString(R.string.main_storage_not_usable, problem), Toast.LENGTH_LONG).show() + return@rememberLauncherForActivityResult + } + SessionPrefs.setDefaultStorageFolder(ctx, path, StoreInstallRoot.folderLabel(ctx, File(path))) + SessionPrefs.setDefaultStorage(ctx, SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + value = SessionPrefs.DEFAULT_STORAGE_EXTERNAL + revision++ + open = false + } + fun chooseFolder() { + open = false + val initial = customPath.takeIf { it.isNotBlank() && File(it).isDirectory } + ?: detected?.root?.parentFile?.takeIf { it.isDirectory }?.absolutePath + pickFolder.launch(InAppFilePicker.buildDirIntent(ctx, ctx.getString(R.string.storage_default_choose_folder), initial)) + } + val title = stringResource(R.string.storage_default_title) + val chip = when (value) { + SessionPrefs.DEFAULT_STORAGE_INTERNAL -> stringResource(R.string.storage_default_internal) + SessionPrefs.DEFAULT_STORAGE_EXTERNAL -> when { + customPath.isNotBlank() -> customTarget?.label + ?: "$customLabel · ${stringResource(R.string.storage_default_folder_missing)}" + detected != null -> detected.label + else -> stringResource(R.string.storage_default_external) + } + else -> stringResource(R.string.storage_default_ask) + } + fun pick(next: String) { + SessionPrefs.setDefaultStorage(ctx, next) + value = next + open = false + } + SettingsGroup(stringResource(R.string.storage_default_group)) { + SettingsRow(label = title, hint = stringResource(R.string.storage_default_hint)) { + Box { + ValueChip(chip, open, modifier = Modifier.testTag("setting-default-storage")) { open = !open } + AnchoredMenu( + open, onDismiss = { open = false }, title = title, + note = stringResource(R.string.storage_default_note), + ) { firstItemFocus -> + MenuItem( + stringResource(R.string.storage_default_ask), value == SessionPrefs.DEFAULT_STORAGE_ASK, + detail = stringResource(R.string.storage_default_ask_detail), + focusRequester = firstItemFocus, + ) { pick(SessionPrefs.DEFAULT_STORAGE_ASK) } + MenuItem( + stringResource(R.string.storage_default_internal), value == SessionPrefs.DEFAULT_STORAGE_INTERNAL, + ) { pick(SessionPrefs.DEFAULT_STORAGE_INTERNAL) } + if (detected == null && customPath.isBlank()) { + MenuItem( + stringResource(R.string.storage_default_external), value == SessionPrefs.DEFAULT_STORAGE_EXTERNAL, + detail = stringResource(R.string.storage_default_choose_folder_detail), + ) { chooseFolder() } + } else { + if (detected != null) { + MenuItem( + stringResource(R.string.storage_default_external), + value == SessionPrefs.DEFAULT_STORAGE_EXTERNAL && customPath.isBlank(), + detail = detected.let { target -> + val free = target.freeBytes + if (free >= 0) stringResource(R.string.storage_default_external_detail, target.label, gb(free)) + else target.label + }, + ) { + SessionPrefs.clearDefaultStorageFolder(ctx) + pick(SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + revision++ + } + } + if (customPath.isNotBlank()) { + MenuItem( + stringResource(R.string.storage_default_folder, customLabel), + value == SessionPrefs.DEFAULT_STORAGE_EXTERNAL, + detail = customTarget?.let { target -> + val free = target.freeBytes + if (free >= 0) stringResource(R.string.storage_default_folder_free, gb(free)) + else stringResource(R.string.storage_default_folder_missing) + } ?: stringResource(R.string.storage_default_folder_missing), + ) { if (customTarget != null) pick(SessionPrefs.DEFAULT_STORAGE_EXTERNAL) else chooseFolder() } + } + MenuItem( + stringResource(R.string.storage_default_choose_folder), checked = false, + detail = stringResource(R.string.storage_default_choose_folder_detail), + ) { chooseFolder() } + } + } + } + } + } +} + @OptIn(ExperimentalLayoutApi::class) @Composable private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: () -> Unit, onOpen: (String) -> Unit) { @@ -189,6 +305,7 @@ private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: Spacer(Modifier.height(8.dp)) Note(stringResource(R.string.storage_session_running)) } + DefaultStorageGroup() SectionTitle(stringResource(R.string.storage_where), null) val unused = report.unusedTools.sumOf { it.bytes } val tiles = listOf<@Composable (Modifier) -> Unit>( diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index dbc2d16c36..6fe298c0d9 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2562,6 +2562,21 @@ <string name="storage_safe_hint">Runtime yang tidak dipakai, sisa, log lama</string> <string name="storage_clean_up">Membersihkan…</string> <string name="storage_session_running">Hentikan sesi untuk membersihkan atau menghapus apa pun. Ukuran tetap terlihat.</string> + <string name="storage_default_group">Lokasi instalasi</string> + <string name="storage_default_title">Penyimpanan default</string> + <string name="storage_default_hint">Instalasi toko baru akan disimpan di lokasi yang dipilih. Game yang sudah ada tetap di lokasinya. Library Steam memakai pengaturannya sendiri.</string> + <string name="storage_default_ask">Tanyakan setiap kali</string> + <string name="storage_default_ask_detail">Pilih target untuk setiap instalasi</string> + <string name="storage_default_internal">Penyimpanan internal</string> + <string name="storage_default_external">Penyimpanan eksternal</string> + <string name="storage_default_external_detail">%1$s · %2$s tersedia</string> + <string name="storage_default_external_missing">Tidak terhubung</string> + <string name="storage_default_folder">Folder · %1$s</string> + <string name="storage_default_folder_free">%1$s tersedia</string> + <string name="storage_default_folder_missing">Tidak terhubung</string> + <string name="storage_default_choose_folder">Pilih folder…</string> + <string name="storage_default_choose_folder_detail">Gunakan folder apa pun di kartu SD atau drive USB</string> + <string name="storage_default_note">Game akan disimpan di folder Games di dalam lokasi yang dipilih. Game yang sudah terpasang tidak dipindahkan.</string> <string name="storage_where">Ke mana perginya</string> <string name="storage_games">Gim Steam</string> <string name="storage_game_data">Data gim</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a0d9672c4d..7f242f6873 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2731,6 +2731,21 @@ <string name="storage_safe_hint">Unused runtimes, leftovers, old logs</string> <string name="storage_clean_up">Clean up…</string> <string name="storage_session_running">Stop the session to clean up or remove anything. Sizes are still shown.</string> + <string name="storage_default_group">Install location</string> + <string name="storage_default_title">Default storage</string> + <string name="storage_default_hint">New store installs go to the selected location. Existing games stay where they are. Steam libraries keep their own setting.</string> + <string name="storage_default_ask">Ask every time</string> + <string name="storage_default_ask_detail">Choose a target for each install</string> + <string name="storage_default_internal">Internal storage</string> + <string name="storage_default_external">External storage</string> + <string name="storage_default_external_detail">%1$s · %2$s free</string> + <string name="storage_default_external_missing">Not connected</string> + <string name="storage_default_folder">Folder · %1$s</string> + <string name="storage_default_folder_free">%1$s free</string> + <string name="storage_default_folder_missing">Not connected</string> + <string name="storage_default_choose_folder">Choose folder…</string> + <string name="storage_default_choose_folder_detail">Use any folder on an SD card or USB drive</string> + <string name="storage_default_note">Games go into a Games folder inside the selected location. Existing games are not moved.</string> <string name="storage_where">Where it goes</string> <string name="storage_games">Steam games</string> <string name="storage_game_data">Game data</string> diff --git a/app/src/test/java/com/droiddeck/launcher/files/StorageRootsTest.kt b/app/src/test/java/com/droiddeck/launcher/files/StorageRootsTest.kt new file mode 100644 index 0000000000..279c69b2a7 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/files/StorageRootsTest.kt @@ -0,0 +1,71 @@ +package com.droiddeck.launcher.files + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class StorageRootsTest { + @Test fun usbAndSdMountsAreFound() { + val mounts = """ + /dev/fuse /mnt/user/0/emulated fuse rw,nosuid,nodev 0 0 + /dev/block/vold/public:8,1 /mnt/media_rw/A1B2-C3D4 vfat rw,dirsync 0 0 + /mnt/media_rw/A1B2-C3D4 /storage/A1B2-C3D4 fuse rw,nosuid,nodev 0 0 + /dev/block/vold/public:179,65 /mnt/media_rw/9C33-1A2B exfat rw,dirsync 0 0 + /mnt/media_rw/9C33-1A2B /storage/9C33-1A2B fuse rw,nosuid,nodev 0 0 + /dev/block/dm-5 /data ext4 rw,seclabel 0 0 + """.trimIndent() + + val points = StorageRoots.parseExternalMounts(mounts).map { it.path } + + assertTrue(points.contains("/storage/A1B2-C3D4")) + assertTrue(points.contains("/storage/9C33-1A2B")) + assertTrue(points.contains("/mnt/media_rw/A1B2-C3D4")) + } + + @Test fun voldLocationsCountWhateverTheFstypeIs() { + val mounts = """ + /dev/block/sda1 /storage/0D19-CC0A fuse rw,nosuid,nodev 0 0 + /dev/block/sda1 /mnt/media_rw/0D19-CC0A exfat rw,dirsync 0 0 + """.trimIndent() + + val points = StorageRoots.parseExternalMounts(mounts).map { it.path } + + assertTrue(points.contains("/storage/0D19-CC0A")) + assertTrue(points.contains("/mnt/media_rw/0D19-CC0A")) + } + + @Test fun usbMountsDirectlyUnderMntAreFound() { + val mounts = """ + /dev/block/sda1 /mnt/usb_storage exfat rw,dirsync 0 0 + tmpfs /mnt/media_rw tmpfs rw,seclabel 0 0 + /dev/fuse /mnt/user/0/emulated fuse rw,nosuid,nodev 0 0 + """.trimIndent() + + val points = StorageRoots.parseExternalMounts(mounts).map { it.path } + + assertTrue(points.contains("/mnt/usb_storage")) + assertEquals(1, points.size) + } + + @Test fun emulatedAndSystemMountsAreIgnored() { + val mounts = """ + /dev/fuse /mnt/user/0/emulated fuse rw,nosuid,nodev 0 0 + /mnt/media_rw/emulated /storage/emulated sdcardfs rw,nosuid,nodev 0 0 + tmpfs /storage/self tmpfs rw,seclabel 0 0 + overlay /system ext4 ro,seclabel 0 0 + /dev/block/sda1 /data ext4 rw,seclabel 0 0 + """.trimIndent() + + assertEquals(emptyList<String>(), StorageRoots.parseExternalMounts(mounts).map { it.path }) + } + + @Test fun escapedSpacesAndNtfsAreHandled() { + val mounts = "/dev/block/vold/public:8,1 /mnt/media_rw/My\\040USB ntfs rw,dirsync 0 0\n" + + "/mnt/media_rw/My\\040USB /storage/My\\040USB fuse rw,nosuid,nodev 0 0\n" + + val points = StorageRoots.parseExternalMounts(mounts).map { it.path } + + assertTrue(points.contains("/mnt/media_rw/My USB")) + assertTrue(points.contains("/storage/My USB")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt index 78e9bbc0d0..126001797d 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt @@ -5,7 +5,10 @@ import com.droiddeck.launcher.session.SessionPrefs import java.io.File import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull import org.junit.Assert.assertTrue +import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner @@ -18,6 +21,12 @@ import org.robolectric.shadows.ShadowStatFs class StoreInstallRootTest { private val app get() = RuntimeEnvironment.getApplication() + @Before fun resetStoragePreferences() { + SessionPrefs.setDefaultStorageFolder(app, "", "") + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_ASK) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + @Test fun theDefaultRootIsInternalWhateverTheSteamLibrarySettingSays() { val card = File(app.filesDir, "fake-card/steam").apply { mkdirs() } SessionPrefs.setGameStorage(app, card.path, "Card") @@ -26,6 +35,72 @@ class StoreInstallRootTest { assertFalse(StoreInstallRoot.targets(app).first().removable) } + @Test fun defaultStoragePicksTheInternalOrTheConfiguredExternalTarget() { + val library = File(app.filesDir, "default-card/steam").apply { mkdirs() } + SessionPrefs.setGameStorage(app, library.path, "Card") + val external = File(library, "Games") + + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_INTERNAL) + assertEquals(StoreInstallRoot.internalRoot(app).absolutePath, StoreInstallRoot.defaultTarget(app)?.root?.absolutePath) + + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + assertEquals(external.absolutePath, StoreInstallRoot.defaultTarget(app)?.root?.absolutePath) + + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_ASK) + assertNull(StoreInstallRoot.defaultTarget(app)) + + SessionPrefs.setDefaultStorage(app, "bogus") + assertEquals(SessionPrefs.DEFAULT_STORAGE_ASK, SessionPrefs.defaultStorage(app)) + } + + @Test fun defaultExternalStorageFallsBackToTheInstallDialogWhenNoCardIsPresent() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + assertNull(StoreInstallRoot.defaultTarget(app)) + } + + @Test fun aChosenFolderIsUsedForDefaultExternalStorage() { + val folder = File(app.filesDir, "usb/SSD").apply { mkdirs() } + assertNull(StoreInstallRoot.prepareDefaultFolder(app, folder)) + val root = File(folder, "Games") + assertTrue(root.isDirectory) + SessionPrefs.setDefaultStorageFolder(app, folder.path, "SSD") + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + + assertEquals(root.absolutePath, StoreInstallRoot.defaultTarget(app)?.root?.absolutePath) + assertTrue(StoreInstallRoot.targets(app).any { it.root.absolutePath == root.absolutePath && it.folder }) + assertTrue(StoreInstallRoot.roots(app).any { it.absolutePath == root.absolutePath }) + assertTrue(StoreInstallRoot.externalRoots(app).any { it.first.absolutePath == root.absolutePath }) + assertFalse(File(root, ".droiddeck-write-probe").exists()) + } + + @Test fun aDisconnectedChosenFolderDoesNotFallBackToAnotherTarget() { + val card = File(app.filesDir, "card/steam").apply { mkdirs() } + SessionPrefs.setGameStorage(app, card.path, "Card") + val folder = File(app.filesDir, "usb/SSD").apply { mkdirs() } + SessionPrefs.setDefaultStorageFolder(app, folder.path, "SSD") + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + assertNotNull(StoreInstallRoot.defaultTarget(app)) + + assertTrue(folder.delete()) + assertNull(StoreInstallRoot.defaultTarget(app)) + assertEquals(File(card, "Games").absolutePath, StoreInstallRoot.detectedExternalTarget(app)?.root?.absolutePath) + } + + @Test fun filesOnAChosenFolderAreMappedIntoTheGuest() { + val folder = File(app.filesDir, "usb/SSD").apply { mkdirs() } + SessionPrefs.setDefaultStorageFolder(app, folder.path, "SSD") + val game = File(folder, "Games/GOG/Test/game.exe").apply { + parentFile?.mkdirs() + writeText("MZ") + } + + val guest = StoreInstallRoot.externalGuestPath(app, game) + assertNotNull(guest) + assertTrue(guest!!.startsWith(StoreInstallRoot.GUEST_EXTERNAL + "/")) + assertTrue(guest.endsWith("/GOG/Test/game.exe")) + } + @Test fun theSteamLibraryFolderIsOfferedAsAnInstallTarget() { val library = File(app.filesDir, "Documents/Games").apply { mkdirs() } SessionPrefs.setGameStorage(app, library.path, "Games") diff --git a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt index f5ba463843..60df152e05 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt @@ -456,4 +456,26 @@ class EpicClientTest { settings.writeText("""{"defaultInstallDir":"/mnt/droiddeck-sd/Stores/Epic"}""") assertEquals("/root/Games/Stores/Epic", EpicClient.prepareInstallDir(context)) } + + @Test fun aDisconnectedDefaultFolderKeepsTheLauncherInstallDir() { + val context = org.robolectric.RuntimeEnvironment.getApplication() + val previousStorage = com.droiddeck.launcher.session.SessionPrefs.defaultStorage(context) + val previousFolder = com.droiddeck.launcher.session.SessionPrefs.defaultStorageFolder(context) + val previousLabel = com.droiddeck.launcher.session.SessionPrefs.defaultStorageFolderLabel(context) + val settings = File(EpicClient.dataDir(context), "settings/app-settings.json").apply { parentFile!!.mkdirs() } + val current = "/mnt/droiddeck-stores/1234/Epic" + settings.writeText("""{"defaultInstallDir":"$current"}""") + com.droiddeck.launcher.session.SessionPrefs.setDefaultStorage( + context, com.droiddeck.launcher.session.SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + com.droiddeck.launcher.session.SessionPrefs.setDefaultStorageFolder( + context, File(context.filesDir, "missing-${System.nanoTime()}").path, "SSD") + try { + assertEquals(current, EpicClient.prepareInstallDir(context)) + assertEquals(current, org.json.JSONObject(settings.readText()).getString("defaultInstallDir")) + } finally { + com.droiddeck.launcher.session.SessionPrefs.setDefaultStorage(context, previousStorage) + if (previousFolder.isBlank()) com.droiddeck.launcher.session.SessionPrefs.clearDefaultStorageFolder(context) + else com.droiddeck.launcher.session.SessionPrefs.setDefaultStorageFolder(context, previousFolder, previousLabel) + } + } } diff --git a/docs/development/stores.md b/docs/development/stores.md index cac5f58d8c..1209b7c478 100644 --- a/docs/development/stores.md +++ b/docs/development/stores.md @@ -29,9 +29,11 @@ Library pages are `app:<appId>` for an installed game and `app:<store>:<id>` for ``` The default root is the app's internal storage - the runtime's tree, `/root/Games/Stores`, no bind -needed - whatever the session's Game storage setting says. When a card the app may write is in the -device (`GameStorage.options`), Install asks "Install to" (internal / the card, free space shown; -the last pick is only the dialog's default). A card's root is `<card app folder>/Games`; when the +needed - whatever the session's Game storage setting says. **Setup > Storage > Default storage** +can send new installs straight to internal storage or the first external target; with **Ask every +time**, Install asks "Install to" when more than one target exists (internal / the card, free space +shown; the last pick is only the dialog's default). An existing install is always resumed in place, +and changing the default does not move it. A card's root is `<card app folder>/Games`; when the card is the Steam library the library's bind (`/mnt/droiddeck-sd`) already covers it, otherwise `SessionService` binds the root at `/mnt/droiddeck-stores/<volume uuid>`, so a shortcut's guest path - and its appid - is the same from one session to the next. Every root is From 8d858b4334948fec6c96a14bc88691ca5178e50d Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 16:38:11 -0400 Subject: [PATCH 039/135] feat: pick a game's CPU cores in its game profile (#1566) * feat: pick a game's CPU cores in its game profile * fix: match per-game cores against the online CPU list --- .../launcher/core/GameEnvironmentOptions.kt | 1 + app/src/main/res/values/strings.xml | 1 + .../overlay/usr/local/bin/droiddeck-game-env | 41 +++++++++++++++++++ tools/tests/test_game_environment.py | 20 +++++++++ 4 files changed, 63 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt index e339f38df1..bcf3a0448c 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt @@ -34,6 +34,7 @@ object GameEnvironmentOptions { Option("MESA_EXTENSION_MAX_YEAR", "", 0, Type.TEXT), Option("MESA_GL_VERSION_OVERRIDE", "", 0, Type.TEXT), Option("PULSE_LATENCY_MSEC", "", 0, Type.NUMBER), + Option("DROIDDECK_GAME_CORES", "", R.string.game_env_cores, Type.TEXT), Option("DROIDDECK_ANTICHEAT_OFFLINE", "1", R.string.game_env_anticheat_offline, Type.TOGGLE, listOf("0", "1")), Option("WINE_LARGE_ADDRESS_AWARE", "0", 0, Type.TOGGLE, listOf("0", "1")), Option("WINEDLLOVERRIDES", "", 0, Type.TEXT), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7f242f6873..4e0b1e55d2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -95,6 +95,7 @@ <string name="game_env_anticheat_offline">On by default. Starts an Easy Anti-Cheat game without its anti-cheat when the game supports offline play. Turn off to launch through Easy Anti-Cheat as usual. Online modes that require Easy Anti-Cheat remain unavailable.</string> <string name="game_env_hud">DXVK overlay for D3D9–11. fps displays frame rate; unset hides it.</string> <string name="game_env_dxvk_config">DXVK settings separated by semicolons. Recent builds use dxvk.maxFrameRate for frame limiting; prefer the session frame limiter for ordinary play.</string> + <string name="game_env_cores">CPU cores for this game, such as 0-4 or 0,2,4, in place of the session\'s game cores. Fewer cores run cooler.</string> <string name="game_env_vkd3d_limit">D3D12 frame-rate limit. 0 disables the limit.</string> <string name="game_env_glthread">Mesa OpenGL threading. true can help CPU-limited OpenGL games; test per game.</string> <string name="sync_backend_title">Wine sync</string> diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 43f24138d7..f8b4acaebb 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -299,6 +299,46 @@ def vram_cap(env): return result +def parse_cores(text): + """CPU numbers from a list such as "0-3,6"; None when the text is not one.""" + cores = set() + for part in text.replace(" ", "").split(","): + match = re.fullmatch(r"(\d{1,3})(?:-(\d{1,3}))?", part) + if not match: + return None + first, last = int(match.group(1)), int(match.group(2) or match.group(1)) + if last < first: + return None + cores.update(range(first, last + 1)) + return cores or None + + +def online_cores(): + try: + with open("/sys/devices/system/cpu/online") as f: + cores = parse_cores(f.read().strip()) + except OSError: + cores = None + return cores or os.sched_getaffinity(0) | set(range(os.cpu_count() or 0)) + + +def game_cores(env): + """Pins the game to the cores its profile names, in place of the session's game cores.""" + text = env.get("DROIDDECK_GAME_CORES", "").strip() + if not text: + return + cores = parse_cores(text) + chosen = cores & online_cores() if cores else None + if not chosen: + print("droiddeck-game-env: ignoring game cores %r" % text, file=sys.stderr) + return + try: + os.sched_setaffinity(0, chosen) + print("droiddeck-game-env: game cores %s" % ",".join(map(str, sorted(chosen))), file=sys.stderr) + except OSError as error: + print("droiddeck-game-env: could not use game cores %r (%s)" % (text, error), file=sys.stderr) + + def apply_config(env, config, app_id, fixes=None): if config.get("version") != 1: raise ValueError("unsupported environment configuration") @@ -574,6 +614,7 @@ def main(): env["BANNER_AUDIO_DIRECT_MIC"] = "0" env = vram_cap(env) env = force_ssbs(command, env) + game_cores(env) try: xbox = runpy.run_path(str(Path(__file__).with_name("droiddeck-xbox"))) except Exception as error: diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 817281af5b..3895ebc695 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -8,6 +8,7 @@ import shlex import subprocess import sys import tempfile +from unittest import mock import unittest BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" @@ -372,6 +373,25 @@ class GameEnvironmentTest(unittest.TestCase): self.assertTrue(notes) self.assertEqual(MODULE["engine_fixes"]("/game/Game/DarkSoulsII.exe", []), ({}, [], [])) + def test_game_cores_are_parsed_from_lists_and_ranges(self): + parse = MODULE["parse_cores"] + self.assertEqual(parse("0-3,6"), {0, 1, 2, 3, 6}) + self.assertEqual(parse(" 4, 5 "), {4, 5}) + for bad in ("", "a", "3-1", "1,,2", "-1", "1-"): + self.assertIsNone(parse(bad), bad) + + def test_a_profiles_game_cores_pin_the_game_within_the_online_cores(self): + calls = [] + os_mod = MODULE["os"] + with mock.patch.dict(MODULE["game_cores"].__globals__, {"online_cores": lambda: {0, 1, 2, 3, 4, 5, 6, 7}}), \ + mock.patch.object(os_mod, "sched_setaffinity", side_effect=lambda pid, cores: calls.append(set(cores)), create=True): + MODULE["game_cores"]({"DROIDDECK_GAME_CORES": "0-2,9"}) + MODULE["game_cores"]({"DROIDDECK_GAME_CORES": "junk"}) + MODULE["game_cores"]({"DROIDDECK_GAME_CORES": "12-13"}) + MODULE["game_cores"]({}) + self.assertEqual(calls, [{0, 1, 2}]) + self.assertEqual(MODULE["parse_cores"]("0,2-7"), {0, 2, 3, 4, 5, 6, 7}) + def test_caravan_sandwitch_robocop_and_cyberpunk_run_at_feature_level_12_1(self): with tempfile.TemporaryDirectory() as tmp: caravan = Path(tmp) / "Caravan SandWitch" From aca4b5dd3e6e9e1cd5861493e2922f94f765d905 Mon Sep 17 00:00:00 2001 From: MaxsTechReview <maxjividen@gmail.com> Date: Sun, 25 Oct 2026 16:41:41 -0400 Subject: [PATCH 040/135] Start World of Warcraft on DirectX 11 by default (#1576) --- .../overlay/usr/local/bin/droiddeck-battlenet | 44 ++++++++++++++----- tools/tests/test_battlenet.py | 22 +++++++--- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index 68c3ea6d75..d3f3fd7707 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -63,6 +63,8 @@ REQUEST_FILE = re.compile(re.escape(REQUEST) + r"\.\d+") LIBRARY = None WOW_UID = re.compile(r"--uid=wow[a-z0-9_]*", re.I) GAMEPAD_SETTING = re.compile(r"(?im)^\s*SET\s+GamePadEnable\s") +GX_API_SETTING = re.compile(r"(?im)^[ \t]*SET[ \t]+gxApi[ \t].*$") +GX_API_MARK = ".droiddeck-d3d11" STEAM_CLIENT = {"steam", "steamwebhelper"} LOG = os.path.join(CACHE, "battlenet.log") LOG_LIMIT = 512 << 10 @@ -294,7 +296,7 @@ def wow_folders(root): return [folder for folder in dict.fromkeys(folders) if os.path.isdir(folder)] -def enable_gamepad(root): +def wow_settings(root): changed = [] for folder in wow_folders(root): try: @@ -304,7 +306,9 @@ def enable_gamepad(root): for name in flavors: if not os.path.isdir(os.path.join(folder, name)): continue - path = os.path.join(folder, name, "WTF", "Config.wtf") + wtf = os.path.join(folder, name, "WTF") + path = os.path.join(wtf, "Config.wtf") + mark = os.path.join(wtf, GX_API_MARK) try: with open(path, encoding="utf-8", errors="replace") as f: text = f.read() @@ -312,17 +316,35 @@ def enable_gamepad(root): text = "" except OSError: continue - if GAMEPAD_SETTING.search(text): + updated, notes = text, [] + if not GAMEPAD_SETTING.search(updated): + updated += ("\n" if updated and not updated.endswith("\n") else "") + 'SET GamePadEnable "1"\n' + notes.append("controller support on") + first = not os.path.exists(mark) + if first: + before = updated + updated, found = GX_API_SETTING.subn('SET gxApi "D3D11"', updated) + if not found: + updated += ("\n" if updated and not updated.endswith("\n") else "") + 'SET gxApi "D3D11"\n' + if updated != before: + notes.append("DirectX 11") + if updated == text and not first: continue try: - os.makedirs(os.path.dirname(path), exist_ok=True) - with open(path, "a", encoding="utf-8") as f: - f.write(("\n" if text and not text.endswith("\n") else "") + 'SET GamePadEnable "1"\n') + os.makedirs(wtf, exist_ok=True) + if updated != text: + with open(path + ".tmp", "w", encoding="utf-8") as f: + f.write(updated) + os.replace(path + ".tmp", path) + if first: + with open(mark, "w", encoding="utf-8"): + pass except OSError as error: - say("controllers not turned on in %s: %s" % (path, error)) + say("World of Warcraft's settings not written in %s: %s" % (path, error)) continue - changed.append(path) - say("World of Warcraft's controller support turned on in %s" % path) + if notes: + changed.append(path) + say("World of Warcraft's settings in %s: %s" % (path, ", ".join(notes))) return changed @@ -366,7 +388,7 @@ def configure(root, library=None): wallpaper(root) except OSError as error: say("Battle.net's desktop wallpaper not set: %s" % error) - enable_gamepad(root) + wow_settings(root) if change == "first": say("wrote Battle.net's first config: hardware acceleration off, streaming off, closing itself as it launches a game, " "StarCraft on its 32-bit client") @@ -859,7 +881,7 @@ def launch(root, code): notify("Battle.net did not start", "The session's desktop.log says why.", "dialog-error") return 1 if code.lower().startswith("wow"): - enable_gamepad(root) + wow_settings(root) say("launching %s" % code) spawn(client, "run", ["--exec=launch %s" % code]) played = follow(pfx, ask=lambda: spawn(client, "run", ["--exec=launch %s" % code])) diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index 1c0bc19215..fe5aed7202 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -216,12 +216,24 @@ class GamepadTest(Temp): (wow / "Data").mkdir() self.registry(("World of Warcraft", "wow", self.z(wow))) with mock.patch.dict(BNET, {"say": lambda message: None}): - self.assertEqual(len(BNET["enable_gamepad"](str(self.tmp / "Steam"))), 2) - self.assertEqual(BNET["enable_gamepad"](str(self.tmp / "Steam")), []) + self.assertEqual(len(BNET["wow_settings"](str(self.tmp / "Steam"))), 2) + self.assertEqual(BNET["wow_settings"](str(self.tmp / "Steam")), []) self.assertEqual(retail.read_text(), 'SET gxApi "D3D11"\nSET GamePadEnable "1"\n') - self.assertEqual((wow / "_classic_era_/WTF/Config.wtf").read_text(), 'SET GamePadEnable "1"\n') + self.assertEqual((wow / "_classic_era_/WTF/Config.wtf").read_text(), 'SET GamePadEnable "1"\nSET gxApi "D3D11"\n') self.assertFalse((wow / "Data/WTF").exists()) + def test_directx_11_is_set_once_and_a_later_pick_is_kept(self): + wow = self.tmp / "Games/World of Warcraft" + retail = self.write("Games/World of Warcraft/_retail_/WTF/Config.wtf", 'SET GxApi "D3D12"\nSET GamePadEnable "1"\nSET vsync "1"\n') + self.registry(("World of Warcraft", "wow", self.z(wow))) + with mock.patch.dict(BNET, {"say": lambda message: None}): + self.assertEqual(len(BNET["wow_settings"](str(self.tmp / "Steam"))), 1) + self.assertEqual(retail.read_text(), 'SET gxApi "D3D11"\nSET GamePadEnable "1"\nSET vsync "1"\n') + self.assertTrue((wow / "_retail_/WTF/.droiddeck-d3d11").exists()) + retail.write_text('SET gxApi "d3d12"\nSET GamePadEnable "1"\nSET vsync "1"\n') + self.assertEqual(BNET["wow_settings"](str(self.tmp / "Steam")), []) + self.assertEqual(retail.read_text(), 'SET gxApi "d3d12"\nSET GamePadEnable "1"\nSET vsync "1"\n') + def test_a_players_own_choice_and_other_games_are_left_alone(self): wow = self.tmp / "Games/World of Warcraft Classic" config = self.write("Games/World of Warcraft Classic/_anniversary_/WTF/Config.wtf", 'SET GamePadEnable "0"\n') @@ -229,8 +241,8 @@ class GamepadTest(Temp): (other / "_retail_").mkdir(parents=True) self.registry(("World of Warcraft Classic", "wow_classic_anniversary", self.z(wow)), ("Diablo IV", "fenris", self.z(other))) with mock.patch.dict(BNET, {"say": lambda message: None}): - self.assertEqual(BNET["enable_gamepad"](str(self.tmp / "Steam")), []) - self.assertEqual(config.read_text(), 'SET GamePadEnable "0"\n') + self.assertEqual(len(BNET["wow_settings"](str(self.tmp / "Steam"))), 1) + self.assertEqual(config.read_text(), 'SET GamePadEnable "0"\nSET gxApi "D3D11"\n') self.assertFalse((other / "_retail_/WTF").exists()) def test_pads_look_like_an_xbox_360_pad_only_without_the_steam_client(self): From 815b93db5f280e6fa0ddc98c15058df3380bc85f Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 16:49:35 -0400 Subject: [PATCH 041/135] feat: profile PRoot costs and test fast-path libraries without an APK rebuild (#1528) --- .../com/droiddeck/launcher/agent/AgentEnv.kt | 47 ++++++++- .../droiddeck/launcher/core/HostProcess.kt | 11 ++- .../launcher/session/SessionFiles.kt | 6 +- .../launcher/session/SessionService.kt | 12 ++- .../launcher/agent/AgentSecurityTest.kt | 27 +++++ .../launcher/core/HostProcessTest.kt | 37 +++++++ docs/agent-control.md | 15 +++ docs/development/proot-performance.md | 90 +++++++++++++++++ tools/droiddeckctl | 33 ++++++- tools/proot/PATCHES.md | 8 ++ tools/proot/build.sh | 1 + .../0018-syscall-handler-profile.patch | 38 +++++++ tools/proot/profile.h | 99 +++++++++++++++++++ tools/proot_profile.py | 56 +++++++++++ tools/tests/test_droiddeckctl.py | 15 +++ tools/tests/test_proot_profile.py | 91 +++++++++++++++++ tools/tests/test_session_guest_command.py | 2 +- 17 files changed, 578 insertions(+), 10 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/core/HostProcessTest.kt create mode 100644 tools/proot/patches/0018-syscall-handler-profile.patch create mode 100644 tools/proot/profile.h create mode 100644 tools/proot_profile.py create mode 100644 tools/tests/test_proot_profile.py diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt index 5f7f092628..e15fbab41f 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt @@ -3,9 +3,13 @@ package com.droiddeck.launcher.agent import android.content.Context import android.util.Log import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.runtime.ProotFastPath +import com.droiddeck.launcher.session.SessionPhase +import com.droiddeck.launcher.session.SessionState import org.json.JSONArray import org.json.JSONObject import java.io.File +import java.security.MessageDigest import java.nio.file.Files import java.nio.file.LinkOption.NOFOLLOW_LINKS import java.nio.file.StandardOpenOption.READ @@ -55,6 +59,9 @@ object AgentEnv { fun override(context: Context, name: String): JSONObject = synchronized(lock) { AgentAccess.requireCommands(context) if (NAME.matchEntire(name) == null || name in setOf(".", "..")) throw AgentException("INVALID_NAME", "Override names are letters, digits, '.', '_' and '-'") + if (name == "libblfastpath.so" && (SessionState.running || SessionState.guestPid > 0 || SessionState.phase == SessionPhase.STOPPING)) { + throw AgentException("SESSION_ACTIVE", "Stop the session before installing a fast-path library") + } val source = File(inbox(context), name) if (Files.isSymbolicLink(source.toPath())) throw AgentException("INVALID_NAME", "The override must be a regular file") if (!source.isFile) throw AgentException("NO_SUCH_FILE", "Push the binary to ${source.path} first") @@ -67,6 +74,10 @@ object AgentEnv { staged.delete() throw AgentException("OVERRIDE_FAILED", "Could not stage the override") } + if (name == "libblfastpath.so" && !arm64SharedLibrary(staged)) { + staged.delete() + throw AgentException("INVALID_LIBRARY", "The fast path must be a 64-bit little-endian ARM64 ELF shared library") + } if (!staged.setExecutable(true, false) || !staged.renameTo(target)) { staged.delete() throw AgentException("OVERRIDE_FAILED", "Could not install $name in the rootfs") @@ -76,6 +87,40 @@ object AgentEnv { state.put("pendingOverrides", JSONArray(merge(strings(state.optJSONArray("pendingOverrides")), listOf(name)))) save(context, state) state.put("installed", "$GUEST_BIN/$name") + if (name == "libblfastpath.so") { + val digest = MessageDigest.getInstance("SHA-256") + target.inputStream().use { input -> + val buffer = ByteArray(65536) + while (true) { + val count = input.read(buffer) + if (count < 0) break + digest.update(buffer, 0, count) + } + } + state.put("sha256", digest.digest().joinToString("") { "%02x".format(it) }) + } + state + } + + fun fastPathLibrary(context: Context): String = synchronized(lock) { + if (!AgentAccess.commandsAllowed(context)) return@synchronized ProotFastPath.LIBRARY + if ("libblfastpath.so" !in strings(load(context).optJSONArray("activeOverrides"))) return@synchronized ProotFastPath.LIBRARY + val file = File(bin(context), "libblfastpath.so") + if (!file.isFile || Files.isSymbolicLink(file.toPath())) return@synchronized ProotFastPath.LIBRARY + "$GUEST_BIN/libblfastpath.so" + } + + private fun arm64SharedLibrary(file: File): Boolean = file.inputStream().use { input -> + val header = ByteArray(20) + var count = 0 + while (count < header.size) { + val read = input.read(header, count, header.size - count) + if (read < 0) return@use false + count += read + } + header.take(7) == listOf<Byte>(0x7f, 0x45, 0x4c, 0x46, 2, 1, 1) && + header[16] == 3.toByte() && header[17] == 0.toByte() && + header[18] == 183.toByte() && header[19] == 0.toByte() } fun beginSession(context: Context): List<String> = synchronized(lock) { @@ -92,7 +137,7 @@ object AgentEnv { bin(context).listFiles() ?.filter { it.name !in overrides }?.forEach { it.delete() } val lines = strings(state.optJSONArray("persistent")) + active - val withPath = if (overrides.isEmpty()) lines else lines + "PATH=$GUEST_BIN:${pathOf(lines)}" + val withPath = if (overrides.none { it != "libblfastpath.so" }) lines else lines + "PATH=$GUEST_BIN:${pathOf(lines)}" if (withPath.isNotEmpty()) Log.i(TAG, "agent environment keys for this session: ${withPath.map { it.substringBefore('=') }}") withPath } diff --git a/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt b/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt index 4a8b12934e..0757192461 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt @@ -8,7 +8,11 @@ object HostProcess { private const val TAG = "HostProcess" @JvmStatic - fun start(command: String, env: Array<String>?, dir: File?, onExit: Consumer<Int>?, onLine: Consumer<String>?): Int { + fun start(command: String, env: Array<String>?, dir: File?, onExit: Consumer<Int>?, onLine: Consumer<String>?): Int = + start(command, env, dir, onExit, onLine, null) + + @JvmStatic + fun start(command: String, env: Array<String>?, dir: File?, onExit: Consumer<Int>?, onLine: Consumer<String>?, outputFile: File?): Int { val argv = split(command) if (argv.isEmpty()) return -1 return try { @@ -19,7 +23,10 @@ object HostProcess { if (eq > 0) builder.environment()[line.substring(0, eq)] = line.substring(eq + 1) } builder.redirectErrorStream(true) - if (onLine == null) builder.redirectOutput(File("/dev/null")) + if (onLine == null) { + if (outputFile == null) builder.redirectOutput(File("/dev/null")) + else builder.redirectOutput(ProcessBuilder.Redirect.appendTo(outputFile)) + } val process = builder.start() val pid = pidOf(process) Log.i(TAG, "started pid $pid: ${argv.first()} (${argv.size - 1} arguments)") 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 958aa2df52..73c2c915ff 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -208,7 +208,11 @@ object SessionFiles { if (!File(Environment.getExternalStorageDirectory(), NO_PAD_SWITCH).exists()) { preload.append("/usr/local/lib/libfakeinput.so\n") } - if (ProotFastPath.enabled(context)) preload.append(ProotFastPath.LIBRARY + "\n") + if (ProotFastPath.enabled(context)) { + val library = com.droiddeck.launcher.agent.AgentEnv.fastPathLibrary(context) + preload.append(library + "\n") + if (startsSession && library != ProotFastPath.LIBRARY) Log.i(TAG, "fast path preload: $library (debugging override)") + } val etc = File(root, "etc").apply { mkdirs() } val staged = File(etc, "ld.so.preload.staged") if (!FileUtils.writeString(staged, preload.toString()) 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 630feeb921..979c737a4c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -431,6 +431,7 @@ class SessionService : Service() { killStragglers() for (pack in listOf(AddonPack.PROOT, AddonPack.DIRECTAUDIO)) if (!pack.await(this, { gen == sessionGen && SessionState.running })) Log.w(TAG, "${pack.name} pack unavailable") + val agentEnvironment = com.droiddeck.launcher.agent.AgentEnv.beginSession(this) SessionFiles.stage(this, root, startsSession = true) // Earlier sessions' reports still read the Steam logs and VAC marker this session replaces. SessionArtifacts.awaitCollections() @@ -454,7 +455,7 @@ class SessionService : Service() { .onSuccess { if (it != null) Log.i(TAG, it) } .onFailure { Log.w(TAG, "forced components", it) } } - addClientEnvironment(guest, steamHere) + addClientEnvironment(guest, steamHere, agentEnvironment) if (steamHere) guest.add("BL_EPIC_APP_ID=" + com.droiddeck.launcher.stores.epic.EpicClient.shortcutAppId) val fastPathAt = guest.size @@ -574,6 +575,9 @@ class SessionService : Service() { Log.i(TAG, "proot: seccomp acceleration off by request") } fastPathKey?.let { ProotFastPath.hostEnv(it).let { (k, v) -> hostEnv[k] = v } } + for (key in listOf("PROOT_PROFILE", "PROOT_PROFILE_SLOW_US")) { + guest.lastOrNull { it.startsWith("$key=") }?.substringAfter('=')?.let { hostEnv[key] = it } + } val prootLibs = LinuxRuntime.prootLibraryPath(this) if (prootLibs.isNotEmpty()) hostEnv["LD_LIBRARY_PATH"] = prootLibs @@ -616,7 +620,7 @@ class SessionService : Service() { val program = programStatus(sessionRoot) Log.i(TAG, "session ended: $status" + if (program != null) " (program $program)" else "") stopSession(program ?: status ?: -1) - }, null) + }, null, sessionLog.takeIf { "PROOT_PROFILE=1" in hostEnv.asArray() }) Log.i(TAG, "session pid $pid, log ${sessionLog.path}") if (gen != sessionGen || !SessionState.running) { Log.i(TAG, "session stopped while its guest was starting; taking it down") @@ -689,7 +693,7 @@ class SessionService : Service() { return sessionDir } - private fun addClientEnvironment(guest: MutableList<String>, steamHere: Boolean) { + private fun addClientEnvironment(guest: MutableList<String>, steamHere: Boolean, agentEnvironment: List<String>) { guest.add("/usr/bin/env") guest.add("-i") guest.add("DROIDDECK_BWRAP_SOCKET=" + com.droiddeck.launcher.runtime.BwrapSpawner.socket(this)) @@ -760,7 +764,7 @@ class SessionService : Service() { } SessionPrefs.vramCapMb(this).takeIf { it > 0 }?.let { guest.add("BL_VRAM_MB=$it") } guest.add("BANNER_AUDIO_DIRECT_DECAY=0") - val extra = extraEnv() + com.droiddeck.launcher.agent.AgentEnv.beginSession(this) + val extra = extraEnv() + agentEnvironment if (extra.none { it.startsWith("TU_DEBUG=") }) guest.add("$GAME_TU_DEBUG=" + (tuOverride ?: if (tuDriver) "sysmem" else "")) extra.forEach { guest.add(it) } com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice(this)?.let { guest.add("${com.droiddeck.launcher.gpu.TpUbwcHint.ENV}=$it") } diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt index df4bb15fc9..f625d6b41b 100644 --- a/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt @@ -9,6 +9,8 @@ import androidx.compose.ui.semantics.SemanticsProperties import androidx.compose.ui.text.AnnotatedString import com.droiddeck.launcher.R import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.runtime.ProotFastPath +import com.droiddeck.launcher.session.SessionState import org.json.JSONObject import org.junit.Assert.* import org.junit.After @@ -179,6 +181,31 @@ class AgentSecurityTest { assertEquals(listOf("TEST=old", "STICKY=1"), AgentEnv.beginSession(context)) } + @Test fun fastPathLibraryIsValidatedAndSelectedForOneSession() { + AgentAccess.setCommandsEnabled(context, true) + val source = File(AgentEnv.inbox(context).apply { mkdirs() }, "libblfastpath.so") + source.writeText("wrong architecture") + refused("INVALID_LIBRARY") { AgentEnv.override(context, source.name) } + val header = ByteArray(64) + byteArrayOf(0x7f, 0x45, 0x4c, 0x46, 2, 1, 1).copyInto(header) + header[16] = 3 + header[18] = 183.toByte() + source.writeBytes(header) + SessionState.running = true + try { + refused("SESSION_ACTIVE") { AgentEnv.override(context, source.name) } + } finally { + SessionState.running = false + } + val response = AgentEnv.override(context, source.name) + assertEquals(64, response.getString("sha256").length) + assertEquals(ProotFastPath.LIBRARY, AgentEnv.fastPathLibrary(context)) + AgentEnv.beginSession(context) + assertEquals("/opt/droiddeck-agent/bin/libblfastpath.so", AgentEnv.fastPathLibrary(context)) + AgentEnv.endSession(context) + assertEquals(ProotFastPath.LIBRARY, AgentEnv.fastPathLibrary(context)) + } + @Test fun environmentValuesAreNotLogged() { AgentAccess.setCommandsEnabled(context, true) AgentEnv.set(context, listOf("CUSTOM=synthetic-private-value"), false) diff --git a/app/src/test/java/com/droiddeck/launcher/core/HostProcessTest.kt b/app/src/test/java/com/droiddeck/launcher/core/HostProcessTest.kt new file mode 100644 index 0000000000..6fbe7ed10f --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/HostProcessTest.kt @@ -0,0 +1,37 @@ +package com.droiddeck.launcher.core + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class HostProcessTest { + @get:Rule val temporary = TemporaryFolder() + + @Test fun appendsBothOutputStreamsToTheExistingLog() { + val windows = System.getProperty("os.name").orEmpty().startsWith("Windows") + val log = temporary.newFile("session.log").apply { writeText("guest output\n") } + val script = temporary.newFile(if (windows) "tracer.cmd" else "tracer.sh").apply { + writeText(if (windows) "@echo off\r\necho tracer stdout\r\necho tracer stderr>&2\r\n" + else "printf 'tracer stdout\\n'\nprintf 'tracer stderr\\n' >&2\n") + } + val finished = CountDownLatch(1) + var exitCode = -1 + val shell = if (windows) "cmd.exe /c" else "/bin/sh" + HostProcess.start("$shell ${script.name}", null, temporary.root, { + exitCode = it + finished.countDown() + }, null, log) + assertTrue(finished.await(5, TimeUnit.SECONDS)) + assertEquals(0, exitCode) + assertEquals(listOf("guest output", "tracer stdout", "tracer stderr"), log.readLines()) + } +} diff --git a/docs/agent-control.md b/docs/agent-control.md index b3ec1c0736..5dc16253ed 100644 --- a/docs/agent-control.md +++ b/docs/agent-control.md @@ -113,6 +113,10 @@ tools/droiddeckctl env set DXVK_HUD=fps tools/droiddeckctl env list tools/droiddeckctl env clear [next|persistent|all] tools/droiddeckctl override gamescope ./gamescope +tools/droiddeckctl override libblfastpath.so ./libblfastpath.so +tools/droiddeckctl proot-profile enable --slow-us 1000 +tools/droiddeckctl proot-profile disable +tools/droiddeckctl proot-profile report ./session.log --sort wall tools/droiddeckctl prefs get session tools/droiddeckctl prefs set session some_key true --type bool @@ -367,3 +371,14 @@ sees it, and quits it: the test that catches a game left behind Steam's loading shows up in some fraction of launches. A game with a launcher of its own needs the launcher pressed through first, since the launcher window carries the game's app id too: `tools/scenarios/skyrim-launcher-focus.json` taps Skyrim's Play before checking. + +## PRoot performance experiments + +`proot-profile enable` queues handler profiling for the next session using the existing debugging +consent gate. Counters and bounded slow samples appear in `session.log`; `proot-profile report` +ranks a saved local log without ADB. This measures PRoot handler work, not full syscall latency. +`override libblfastpath.so FILE` selects a glibc ARM64 shared library in the next session's preload +list, reports its SHA-256, and refuses installation until the current session stops. It lasts for +one session; the next session stages the bundled library again. See +[the profiling workflow](development/proot-performance.md#finding-the-next-fast-path) for timing +boundaries, build commands, path diagnostics, and A/B validation. diff --git a/docs/development/proot-performance.md b/docs/development/proot-performance.md index 217650b53f..bcf3424c1e 100644 --- a/docs/development/proot-performance.md +++ b/docs/development/proot-performance.md @@ -314,3 +314,93 @@ it needs `patches/0014`, enabled with `PROOT_FASTPATH=1`. and `PROOT_FP_STATS` hit rates for steam, steamwebhelper, wine and wineserver. - **FEX**, inside Proton as a DLL, translates x86 path syscalls through glibc's `syscall()`, not the wrappers, so they still trap. A `syscall()` hook could route `openat` and `newfstatat` there too. + +## Finding the next fast path + +The prototype notes above describe the original experiments. Main now includes the fast path, +expanded wrappers, FEX raw-open routing ([#1283](https://github.com/Droid-Deck/DroidDeck/pull/1283)), +and SD-library bind-name resolution ([#1331](https://github.com/Droid-Deck/DroidDeck/pull/1331)). +Those fixes show why wrapper hit rates alone are insufficient: a caller can bypass the wrappers, +or repeatedly hit a path the wrappers cannot resolve. + +### Opt-in tracer profiling + +With **Setup > Diagnostics > Debugging tools** enabled, queue profiling for one session: + +```sh +tools/droiddeckctl proot-profile enable --slow-us 1000 +tools/droiddeckctl start steam --wait +# Reproduce the startup, game load, or streaming workload. +tools/droiddeckctl stop +tools/droiddeckctl logs latest ./profile-run +tools/droiddeckctl proot-profile report ./profile-run/session.log --sort wall +# Also inspect --sort cpu and --sort calls. +``` + +`PROOT_PROFILE=1` is forwarded from the session environment to the host tracer. Patch 0018 records +entry/exit **handler visits**, including PRoot's chained calls, by portable syscall name. It emits +`proot-profile` JSON lines to the existing `session.log`: cumulative totals every five seconds while +handling calls, totals at normal exit, and up to 32 slow-handler samples per five-second window exceeding `PROOT_PROFILE_SLOW_US` +(default 1,000 microseconds). The report uses each counter's last snapshot rather than adding +snapshots together and retains the most recent 128 slow samples. Logs can be pulled and reported while the session is running; final totals can +be lost if the tracer is killed. An empty report (`hasCounters: false`) is not evidence of zero +PRoot cost: check for the `start` record and that the installed PRoot pack contains patch 0018. + +**What the clocks mean:** handler wall time includes PRoot's path translation, filesystem waits +inside the tracer, and time the tracer is descheduled inside the handler. Thread CPU time measures +CPU used by that handler. Neither clock includes the tracee's subsequent kernel syscall, the +wake-up/queue delay before handler entry, or work outside `translate_syscall` (such as standalone +SIGSYS emulation, signal delivery, and process-event handling). Fast-path calls that avoid PRoot +are absent. Counts are handler visits, not a count of all guest syscalls. No extra ptrace stops or +syscall-exit interception are enabled for profiling. Profiling still costs clock reads, counters, +and log output; turn it off for final performance measurements. + +Rank cumulative time and frequency before chasing individual outliers. High handler CPU suggests +translation work; high handler wall with low CPU suggests filesystem or scheduling waits. Neither +proves how much a new fast path would save. Reproduce with the same app/PRoot/library build, +workload, storage, CPU policy, and cache state, then alternate A/B runs and measure the real load +milestone without profiling too. Keep `PROOT_FP_OFF=1` runs for correctness comparisons. + +For path context, the existing `PROOT_FP_LOG=/tmp/fastpath-misses.log` logs wrapper fallbacks and +`PROOT_FP_STATS=1` prints per-process hit/miss counts at normal exit. These are separate opt-ins: +miss logging writes on every fallback, may contain personal paths, and cannot see callers that +bypass the wrappers. Capture it separately from the session artifact folder. The new profiler +records syscall names, numeric IDs, and timings without paths or arguments. + +### Test a replacement library without rebuilding the APK + +Build a **glibc ARM64** library using the same toolchain as the shipped fast path: + +```sh +docker run --rm --platform linux/amd64 --user "$(id -u):$(id -g)" \ + -v "$PWD:/src" -w /src droiddeck-local-cross:24.04-v3 \ + aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ + -o /src/libblfastpath.so tools/proot/fastpath/fastpath.c -ldl + +tools/droiddeckctl stop +tools/droiddeckctl override libblfastpath.so ./libblfastpath.so +tools/droiddeckctl proot-profile enable +tools/droiddeckctl start steam --wait +``` + +The existing override bridge now recognizes `libblfastpath.so`: it checks ELF class, endianness, +type, and machine, reports SHA-256, and selects that file in `/etc/ld.so.preload` for one session. +It rejects installation while a session is active. This is an architecture check, not validation +of libc compatibility or the library's behavior. The fast path still requires its normal enabled +setting and the patched PRoot pack. Its basename stays `libblfastpath.so`, so `libblsession`'s FEX +routing finds it. Guest-command restaging retains the active selection. After stopping, the next +session stages the bundled preload again; `env clear all` cancels queued overrides. + +This replaces a library **for a fresh session**. It does not rebind already-resolved symbols in +running Wine/FEX processes, unload old code, or load arbitrary plug-ins through a new ABI. True +in-process patching would need an explicit dispatch API and synchronization across every process. +[The dynamic loader](https://man7.org/linux/man-pages/man3/dlopen.3.html) resolves symbols within each process. +For now, restarting the session avoids those lifetime and binding problems while removing APK +build/install time from a fast-path iteration. Changes to the trampoline/filter contract still +require a matching PRoot build, not just a library swap. The profiler itself also needs a new +PRoot pack; CI builds and pins that pack alongside the APK. + +The next useful extensions are bounded path sampling tied to handler time, separate process/signal +stop counters, and scenario reports that compare the same game-load milestone across builds. +Keep candidate fast paths behind equivalence tests: a slow symlink, `/proc` lookup, unsupported +flag, or ambiguous bind must retain PRoot's semantics. diff --git a/tools/droiddeckctl b/tools/droiddeckctl index 9544e65c7d..b3a6c2d5b7 100755 --- a/tools/droiddeckctl +++ b/tools/droiddeckctl @@ -21,6 +21,7 @@ from pathlib import Path sys.path.insert(0, str(Path(__file__).resolve().parent)) from adb_device import DeviceResolutionError, resolve_serial +from proot_profile import report as proot_profile_report # tools/release/variants.txt: the same app also ships as other packages (e.g. com.antutu.benchmark.full). @@ -37,6 +38,13 @@ class ControlError(RuntimeError): self.code = code +def profile_slow_us(value: str) -> int: + number = int(value) + if not 1 <= number <= 1_000_000_000: + raise argparse.ArgumentTypeError("--slow-us must be between 1 and 1000000000") + return number + + def adb_path(configured: str | None) -> str: if configured: return configured @@ -628,6 +636,10 @@ def execute(args: argparse.Namespace, adb: str, serial: str) -> dict: request["text"] = args.text return add_serial(checked(provider_call(adb, serial, "ui", request=request), "UI_FAILED"), serial) + if command == "proot-profile": + lines = ["PROOT_PROFILE=1", f"PROOT_PROFILE_SLOW_US={args.slow_us}"] if args.profile_op == "enable" else ["PROOT_PROFILE=0"] + return add_serial(checked(provider_call(adb, serial, "env", request={"op": "set", "lines": lines, "persistent": False}), "ENV_FAILED"), serial) + if command == "env": if args.env_op == "set": request = {"op": "set", "lines": args.lines, "persistent": args.persistent} @@ -828,6 +840,16 @@ def build_parser() -> argparse.ArgumentParser: if name == "set-text": op.add_argument("--text", required=True) + profile = commands.add_parser("proot-profile", help="profile PRoot syscall handlers in the next session, or rank a saved log") + profile_ops = profile.add_subparsers(dest="profile_op", required=True) + profile_enable = profile_ops.add_parser("enable", help="enable counters and bounded slow samples for the next session") + profile_enable.add_argument("--slow-us", type=profile_slow_us, default=1000, metavar="US") + profile_ops.add_parser("disable", help="disable profiling for the next session") + profile_report = profile_ops.add_parser("report", help="read a local session.log without a device") + profile_report.add_argument("path", type=Path) + profile_report.add_argument("--sort", choices=["wall", "cpu", "calls"], default="wall") + profile_report.add_argument("--limit", type=int, default=20) + env = commands.add_parser("env", help="session environment lines (debugging tools)") env_ops = env.add_subparsers(dest="env_op", required=True) env_ops.add_parser("list") @@ -837,7 +859,7 @@ def build_parser() -> argparse.ArgumentParser: env_clear = env_ops.add_parser("clear") env_clear.add_argument("scope", nargs="?", choices=["next", "persistent", "all"], default="next") - override = commands.add_parser("override", help="put a binary first on the next session's PATH (debugging tools)") + override = commands.add_parser("override", help="override a program or libblfastpath.so for the next session (debugging tools)") override.add_argument("name", help="the program name, e.g. gamescope") override.add_argument("path", help="the local file to push") @@ -941,6 +963,15 @@ def main(argv: list[str] | None = None) -> int: try: if not PACKAGE_NAME.fullmatch(PACKAGE): # it reaches the device shell through `am start` and `content call` raise ControlError(f"DROIDDECK_PACKAGE is not an Android package name: {PACKAGE!r}", "INVALID_REQUEST") + if args.command == "proot-profile" and args.profile_op == "report": + if args.limit < 1: + raise ControlError("--limit must be positive", "INVALID_ARGUMENTS") + try: + result = proot_profile_report(args.path.expanduser(), args.sort, args.limit) + except OSError as exc: + raise ControlError(str(exc), "FILE_IO") from exc + print(json.dumps(result, indent=2, sort_keys=True)) + return 0 adb = adb_path(args.adb) serial = resolve_serial(adb, args.serial, log=True) result = execute(args, adb, serial) diff --git a/tools/proot/PATCHES.md b/tools/proot/PATCHES.md index f379b4d7dc..a0faf47043 100644 --- a/tools/proot/PATCHES.md +++ b/tools/proot/PATCHES.md @@ -124,3 +124,11 @@ Old kernel fixes: by the kernel instead. The original clone flags are preserved. When the kernel supplies a valid ID in the notification, normal setup is unchanged. No timers or background polling are added. Completely missing notifications and ambiguous matches for separate processes are not recovered. + +Development diagnostics: + +- `0018-syscall-handler-profile.patch` - `PROOT_PROFILE=1` enables per-syscall entry/exit handler + counts, wall/CPU time, periodic cumulative JSON totals, and bounded slow-handler samples on + stderr. `profile.h` is copied into the source tree by `build.sh`. It adds no ptrace stops; + handler timing excludes tracee kernel time and scheduling before handler entry. See + `docs/development/proot-performance.md` for the capture and library-override workflow. diff --git a/tools/proot/build.sh b/tools/proot/build.sh index 718190552c..5b76dd38f0 100755 --- a/tools/proot/build.sh +++ b/tools/proot/build.sh @@ -31,6 +31,7 @@ fetch() { fetch proot.tar.gz "https://github.com/termux/proot/archive/${PROOT_COMMIT}.tar.gz" "$PROOT_SHA256" fetch talloc.tar.gz "https://www.samba.org/ftp/talloc/talloc-${TALLOC_VERSION}.tar.gz" "$TALLOC_SHA256" cp "$HERE/statx_mnt_id.h" "$WORK/proot/src/tracee/statx_mnt_id.h" +cp "$HERE/profile.h" "$WORK/proot/src/syscall/profile.h" for patch in "$HERE"/patches/*.patch; do patch -d "$WORK/proot" -p1 --forward --quiet < "$patch" done diff --git a/tools/proot/patches/0018-syscall-handler-profile.patch b/tools/proot/patches/0018-syscall-handler-profile.patch new file mode 100644 index 0000000000..20d4859c5a --- /dev/null +++ b/tools/proot/patches/0018-syscall-handler-profile.patch @@ -0,0 +1,38 @@ +--- a/src/syscall/syscall.c ++++ b/src/syscall/syscall.c +@@ -32,6 +32,7 @@ + #include "tracee/reg.h" + #include "tracee/mem.h" + #include "cli/note.h" ++#include "syscall/profile.h" + + /** + * Copy in @path a C string (PATH_MAX bytes max.) from the @tracee's +@@ -100,7 +101,7 @@ + return set_sysarg_data(tracee, path, strlen(path) + 1, reg); + } + +-void translate_syscall(Tracee *tracee) ++static void translate_syscall_impl(Tracee *tracee) + { + const bool is_enter_stage = IS_IN_SYSENTER(tracee); + int status; +@@ -283,3 +284,18 @@ + else + print_current_regs(tracee, 4, "sysexit end"); + } ++ ++void translate_syscall(Tracee *tracee) ++{ ++ if (!dd_profile_enabled()) { ++ translate_syscall_impl(tracee); ++ return; ++ } ++ int saved = errno; ++ const bool entering = IS_IN_SYSENTER(tracee); ++ uint64_t wall = dd_profile_clock(CLOCK_MONOTONIC); ++ uint64_t cpu = dd_profile_clock(CLOCK_THREAD_CPUTIME_ID); ++ errno = saved; ++ translate_syscall_impl(tracee); ++ dd_profile_record(get_sysnum(tracee, ORIGINAL), entering, tracee->pid, wall, cpu); ++} diff --git a/tools/proot/profile.h b/tools/proot/profile.h new file mode 100644 index 0000000000..71173b31e8 --- /dev/null +++ b/tools/proot/profile.h @@ -0,0 +1,99 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef DROIDDECK_PROOT_PROFILE_H +#define DROIDDECK_PROOT_PROFILE_H + +#include <errno.h> +#include <inttypes.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <unistd.h> + +struct dd_profile_counter { + uint64_t calls, wall_ns, cpu_ns, max_ns; +}; +static struct dd_profile_counter dd_profile_counts[PR_NB_SYSNUM][2]; +static int dd_profile_on = -1; +static uint64_t dd_profile_id, dd_profile_next, dd_profile_slow_ns = 1000000; +static unsigned dd_profile_samples; + +static uint64_t dd_profile_clock(clockid_t clock) +{ + struct timespec ts; + if (clock_gettime(clock, &ts) != 0) return 0; + return (uint64_t)ts.tv_sec * 1000000000 + ts.tv_nsec; +} + +static void dd_profile_flush(void) +{ + int saved = errno; + for (unsigned nr = 0; nr < PR_NB_SYSNUM; nr++) { + for (unsigned stage = 0; stage < 2; stage++) { + const struct dd_profile_counter *c = &dd_profile_counts[nr][stage]; + if (!c->calls) continue; + fprintf(stderr, "proot-profile {\"type\":\"total\",\"tracer\":%d,\"id\":%" PRIu64 + ",\"syscall\":\"%s\",\"stage\":\"%s\",\"calls\":%" PRIu64 + ",\"wall_ns\":%" PRIu64 ",\"cpu_ns\":%" PRIu64 ",\"max_ns\":%" PRIu64 "}\n", + getpid(), dd_profile_id, stringify_sysnum(nr), stage ? "exit" : "enter", + c->calls, c->wall_ns, c->cpu_ns, c->max_ns); + } + } + errno = saved; +} + +static int dd_profile_enabled(void) +{ + if (dd_profile_on >= 0) return dd_profile_on; + int saved = errno; + const char *value = getenv("PROOT_PROFILE"); + dd_profile_on = value && strcmp(value, "1") == 0; + if (dd_profile_on) { + value = getenv("PROOT_PROFILE_SLOW_US"); + if (value && *value) { + char *end; + unsigned long long us = strtoull(value, &end, 10); + if (!*end && us > 0 && us <= 1000000000ULL) dd_profile_slow_ns = us * 1000; + } + dd_profile_id = dd_profile_clock(CLOCK_MONOTONIC); + dd_profile_next = dd_profile_id + 5000000000ULL; + atexit(dd_profile_flush); + fprintf(stderr, "proot-profile {\"type\":\"start\",\"tracer\":%d,\"id\":%" PRIu64 + ",\"slow_ns\":%" PRIu64 ",\"sample_limit\":32,\"sample_window_ms\":5000,\"scope\":\"syscall-handler\"}\n", + getpid(), dd_profile_id, dd_profile_slow_ns); + } + errno = saved; + return dd_profile_on; +} + +static void dd_profile_record(unsigned nr, int entering, pid_t pid, + uint64_t start_wall, uint64_t start_cpu) +{ + int saved = errno; + uint64_t cpu = dd_profile_clock(CLOCK_THREAD_CPUTIME_ID); + uint64_t wall = dd_profile_clock(CLOCK_MONOTONIC); + if (nr >= PR_NB_SYSNUM) nr = PR_void; + if (!start_wall || !start_cpu || wall < start_wall || cpu < start_cpu) goto done; + uint64_t elapsed = wall - start_wall, used = cpu - start_cpu; + struct dd_profile_counter *c = &dd_profile_counts[nr][!entering]; + c->calls++; + c->wall_ns += elapsed; + c->cpu_ns += used; + if (elapsed > c->max_ns) c->max_ns = elapsed; + if (wall >= dd_profile_next) { + dd_profile_flush(); + dd_profile_next = wall + 5000000000ULL; + dd_profile_samples = 0; + } + if (elapsed >= dd_profile_slow_ns && dd_profile_samples < 32) { + dd_profile_samples++; + fprintf(stderr, "proot-profile {\"type\":\"slow\",\"tracer\":%d,\"id\":%" PRIu64 + ",\"pid\":%d,\"syscall\":\"%s\",\"stage\":\"%s\",\"wall_ns\":%" PRIu64 + ",\"cpu_ns\":%" PRIu64 "}\n", getpid(), dd_profile_id, pid, + stringify_sysnum(nr), entering ? "enter" : "exit", elapsed, used); + } + done: + errno = saved; +} +#endif diff --git a/tools/proot_profile.py b/tools/proot_profile.py new file mode 100644 index 0000000000..bfe4418f42 --- /dev/null +++ b/tools/proot_profile.py @@ -0,0 +1,56 @@ +"""Read cumulative PRoot handler counters from a session log without double counting snapshots.""" +from __future__ import annotations + +import json +from collections import deque +from pathlib import Path + +PREFIX = "proot-profile " + + +def report(path: Path, sort: str = "wall", limit: int = 20) -> dict: + latest = {} + starts = set() + samples = deque(maxlen=128) + malformed = 0 + with path.open(errors="replace") as stream: + for line in stream: + if PREFIX not in line: + continue + try: + row = json.loads(line.split(PREFIX, 1)[1]) + identity = (int(row["tracer"]), int(row["id"])) + if row["type"] == "start": + starts.add(identity) + elif row["type"] in {"total", "slow"}: + if row["stage"] not in {"enter", "exit"} or not isinstance(row["syscall"], str): + raise ValueError("invalid syscall/stage") + fields = ("calls", "wall_ns", "cpu_ns", "max_ns") if row["type"] == "total" else ("wall_ns", "cpu_ns", "pid") + if any(type(row[key]) is not int or row[key] < 0 for key in fields): + raise ValueError("invalid counter") + if row["type"] == "total": + latest[identity + (row["syscall"], row["stage"])] = row + else: + samples.append(row) + except (ValueError, TypeError, KeyError): + malformed += 1 + groups = {} + for (_, _, syscall, stage), row in latest.items(): + total = groups.setdefault((syscall, stage), dict(syscall=syscall, stage=stage, calls=0, wall_ns=0, cpu_ns=0, max_ns=0)) + for key in ("calls", "wall_ns", "cpu_ns"): + total[key] += row[key] + total["max_ns"] = max(total["max_ns"], row["max_ns"]) + for row in groups.values(): + row["wallMs"] = round(row["wall_ns"] / 1_000_000, 3) + row["cpuMs"] = round(row["cpu_ns"] / 1_000_000, 3) + row["meanUs"] = round(row["wall_ns"] / max(row["calls"], 1) / 1000, 3) + row["maxUs"] = round(row["max_ns"] / 1000, 3) + rows = sorted(groups.values(), key=lambda row: row[{"wall": "wall_ns", "cpu": "cpu_ns", "calls": "calls"}[sort]], reverse=True) + return dict(ok=True, command="proot-profile", scope="syscall-handler", + note="Handler wall time includes tracer descheduling and filesystem waits; it excludes tracee kernel time and wake-up/queue delay before the handler. Counts are handler visits, including chained calls, not unique syscalls.", + path=str(path), tracers=len(starts | {key[:2] for key in latest}), + handlerCalls=sum(row["calls"] for row in rows), + handlerWallNs=sum(row["wall_ns"] for row in rows), + handlerCpuNs=sum(row["cpu_ns"] for row in rows), + malformedRecords=malformed, totals=rows[:limit], slowSamples=list(samples), + hasCounters=bool(latest)) diff --git a/tools/tests/test_droiddeckctl.py b/tools/tests/test_droiddeckctl.py index f6d29030a5..82ff7daa06 100644 --- a/tools/tests/test_droiddeckctl.py +++ b/tools/tests/test_droiddeckctl.py @@ -413,6 +413,21 @@ class DroiddeckctlTest(FakeAdbTest): self.assertEqual("Awake", out["wakefulness"]) self.assertIn(["shell", "input", "keyevent", "KEYCODE_WAKEUP"], [c["args"] for c in self.calls()]) + def test_proot_profile_queues_only_the_next_session(self): + self.configure({"env": {"ok": True}}) + code, out = self.run_ctl("proot-profile", "enable", "--slow-us", "250") + self.assertEqual(0, code, out) + self.assertEqual({"op": "set", "lines": ["PROOT_PROFILE=1", "PROOT_PROFILE_SLOW_US=250"], "persistent": False}, + self.calls("env")[0]["request"]) + + def test_proot_profile_report_needs_no_adb_or_device(self): + path = self.dir / "session.log" + path.write_text('ordinary log') + with unittest.mock.patch.object(ctl, "adb_path", side_effect=AssertionError("must stay offline")): + code, out = self.run_ctl("proot-profile", "report", str(path)) + self.assertEqual(0, code, out) + self.assertFalse(out["hasCounters"]) + def test_override_pushes_to_the_inbox_first(self): self.configure({ "access": {"ok": True, "commands": True, "inbox": "/sdcard/Android/data/x/files/agent-inbox"}, diff --git a/tools/tests/test_proot_profile.py b/tools/tests/test_proot_profile.py new file mode 100644 index 0000000000..9548705157 --- /dev/null +++ b/tools/tests/test_proot_profile.py @@ -0,0 +1,91 @@ +import json +import os +from pathlib import Path +import shutil +import subprocess +import sys +import tempfile +import unittest + +TOOLS = Path(__file__).resolve().parents[1] +sys.path.insert(0, str(TOOLS)) +from proot_profile import report + +PROGRAM = r''' +#define _POSIX_C_SOURCE 200809L +#define PR_NB_SYSNUM 2 +#define PR_void 0 +static const char *stringify_sysnum(unsigned nr) { return nr ? "openat" : "void"; } +#include "profile.h" +int main(void) { + errno = EBUSY; + if (!dd_profile_enabled()) return errno != EBUSY; + if (errno != EBUSY) return 1; + for (int i = 0; i < 40; i++) { + uint64_t wall = dd_profile_clock(CLOCK_MONOTONIC); + uint64_t cpu = dd_profile_clock(CLOCK_THREAD_CPUTIME_ID); + struct timespec wait = {0, 2000000}; + nanosleep(&wait, 0); + errno = ENOENT; + dd_profile_record(1, 1, 123, wall, cpu); + if (errno != ENOENT) return 2; + if (i == 9) dd_profile_flush(); + } + dd_profile_next = 0; + uint64_t wall = dd_profile_clock(CLOCK_MONOTONIC); + uint64_t cpu = dd_profile_clock(CLOCK_THREAD_CPUTIME_ID); + struct timespec wait = {0, 2000000}; + nanosleep(&wait, 0); + dd_profile_record(1, 0, 123, wall, cpu); + return 0; +} +''' + + +class ProotProfileTest(unittest.TestCase): + def test_snapshots_replace_instead_of_adding_and_tracers_remain_separate(self): + with tempfile.TemporaryDirectory() as work: + path = Path(work) / 'session.log' + records = [dict(type='total', tracer=1, id=2, syscall='statx', stage='enter', + calls=n, wall_ns=n * 100, cpu_ns=n * 10, max_ns=100) for n in (3, 8)] + records.append(dict(records[-1], tracer=2, calls=2)) + records += [dict(type='total', tracer=1, id=3, syscall='openat', stage='enter', + calls=1, wall_ns=1000, cpu_ns=1000, max_ns=1000)] + path.write_text('unrelated log\n' + ''.join('prefix proot-profile ' + json.dumps(r) + '\n' for r in records) + + 'proot-profile {truncated\n' + 'proot-profile []\n') + result = report(path) + self.assertEqual(11, result['handlerCalls']) + self.assertEqual(3, result['tracers']) + self.assertEqual(2, result['malformedRecords']) + self.assertEqual('statx', result['totals'][0]['syscall']) + self.assertEqual('openat', report(path, 'cpu')['totals'][0]['syscall']) + + def test_empty_logs_do_not_claim_profiling_ran(self): + with tempfile.TemporaryDirectory() as work: + path = Path(work) / 'session.log' + path.write_text('ordinary log\n') + self.assertFalse(report(path)['hasCounters']) + + @unittest.skipUnless(shutil.which('cc'), 'C compiler required') + def test_real_clocks_bounded_samples_errno_and_periodic_counters(self): + with tempfile.TemporaryDirectory() as work: + source = Path(work) / 'profile.c' + binary = Path(work) / 'profile' + source.write_text(PROGRAM) + subprocess.run(['cc', '-Wall', '-Wextra', '-Werror', '-std=c99', '-I', str(TOOLS / 'proot'), + str(source), '-o', str(binary)], check=True) + for setting in ('0', ''): + result = subprocess.run([binary], env=dict(os.environ, PROOT_PROFILE=setting), capture_output=True, check=True) + self.assertEqual(b'', result.stderr) + result = subprocess.run([binary], env=dict(os.environ, PROOT_PROFILE='1', PROOT_PROFILE_SLOW_US='1'), + capture_output=True, check=True) + rows = [json.loads(line.split(b'proot-profile ', 1)[1]) for line in result.stderr.splitlines()] + self.assertEqual(33, sum(row['type'] == 'slow' for row in rows)) + self.assertEqual(32, sum(row['type'] == 'slow' and row['stage'] == 'enter' for row in rows)) + self.assertGreater(sum(row['type'] == 'total' for row in rows), 2) + log = Path(work) / 'session.log' + log.write_bytes(result.stderr) + counters = report(log) + self.assertEqual(41, counters['handlerCalls']) + self.assertGreater(counters['handlerWallNs'], counters['handlerCpuNs']) + self.assertEqual(40, counters['totals'][0]['calls']) diff --git a/tools/tests/test_session_guest_command.py b/tools/tests/test_session_guest_command.py index 9c319ce951..d6f352a8e9 100644 --- a/tools/tests/test_session_guest_command.py +++ b/tools/tests/test_session_guest_command.py @@ -22,7 +22,7 @@ PACKAGES = [line.split()[1] for line in VARIANTS.read_text().splitlines() def guest_prefix(package): source = SERVICE.read_text() before_environment = source.split("val guest = ArrayList<String>()", 1)[1].split( - "addClientEnvironment(guest, steamHere)", 1)[0] + "addClientEnvironment(guest,", 1)[0] environment = source.split("private fun addClientEnvironment(", 1)[1].split( 'guest.add("HOME=/root")', 1)[0] prefix = [] From 19c655bd7e9935c2ad91e0871ce49e6b6bb313bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Mon, 26 Oct 2026 00:03:25 +0300 Subject: [PATCH 042/135] fix: update status receiver only acts on DroidDeck's own install session (#1015) * fix: the update status receiver only acts on this app's own install session Before Android 13 the receiver was exported, so any app could send a fake PENDING_USER_ACTION broadcast and have DroidDeck launch an arbitrary intent. The receiver now ignores broadcasts whose session id does not match the running install, launches only a system installer activity, and strips URI grant flags. * fix: record the install session id before committing it CodeRabbit: the status broadcast could arrive between commit() and install() returning, while session was still -1, and be dropped. The id is now reported through a callback before commit, and reset to -1 at the start of each attempt so a late broadcast from an earlier session is ignored. * fix: declare package installer confirmation query * Query current PackageInstaller confirmation action --------- Co-authored-by: ovurrsl <ovurrsl@users.noreply.github.com> Co-authored-by: xXJsonDeruloXx <danielhimebauch@gmail.com> Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- app/src/main/AndroidManifest.xml | 9 +++++++++ .../java/com/droiddeck/launcher/UpdatesMenu.kt | 10 +++++++--- .../droiddeck/launcher/update/SelfInstaller.kt | 16 +++++++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 29718e0879..a1c126962a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,15 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"> + <queries> + <intent> + <action android:name="android.content.pm.action.CONFIRM_INSTALL" /> + </intent> + <intent> + <action android:name="android.content.pm.action.CONFIRM_PERMISSIONS" /> + </intent> + </queries> + <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt b/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt index 8459bc7d95..5eb9ff4500 100644 --- a/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt @@ -29,6 +29,7 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl private var pending: AppUpdates.Release? = null private var lastCheck = 0L private var request = 0 + @Volatile private var session = -1 fun state() = UpdatesState(catalog, follow, checking, error, stage, percent, askPermission) @@ -87,13 +88,14 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl if (SessionState.running) { error = activity.getString(R.string.upd_stop_first); return } if (!SelfInstaller.canInstall(activity)) { pending = r; askPermission = true; return } error = null + session = -1 stage = activity.getString(R.string.upd_stage_downloading) percent = 0 Thread({ val result = runCatching { val file = SelfInstaller.download(activity, apk) { pct -> ui.post { percent = pct } } ui.post { stage = activity.getString(R.string.upd_stage_installing); percent = -1 } - SelfInstaller.install(activity, file) + SelfInstaller.install(activity, file) { id -> session = id } } result.onFailure { e -> ui.post { stage = null; error = e.message ?: activity.getString(R.string.upd_failed) } } }, "app-update-install").start() @@ -101,13 +103,15 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl private val receiver = object : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { + if (intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID, -1).let { it < 0 || it != session }) return when (val status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_FAILURE)) { PackageInstaller.STATUS_PENDING_USER_ACTION -> { val confirm = if (Build.VERSION.SDK_INT >= 33) intent.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java) else @Suppress("DEPRECATION") intent.getParcelableExtra(Intent.EXTRA_INTENT) - if (confirm == null) { stage = null; error = activity.getString(R.string.upd_not_offered); return } + val safe = confirm?.let { SelfInstaller.safeConfirmIntent(activity, it) } + if (safe == null) { stage = null; error = activity.getString(R.string.upd_not_offered); return } stage = activity.getString(R.string.upd_stage_confirm) - activity.startActivity(confirm.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + if (runCatching { activity.startActivity(safe) }.isFailure) { stage = null; error = activity.getString(R.string.upd_not_offered) } } PackageInstaller.STATUS_SUCCESS -> stage = null else -> { diff --git a/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt b/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt index 4ba3a20cc4..87d958889e 100644 --- a/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt @@ -91,7 +91,8 @@ object SelfInstaller { } } - fun install(context: Context, apk: File) { + /** Reports the session id before the commit, so a status broadcast that arrives right away is recognised. */ + fun install(context: Context, apk: File, onSession: (Int) -> Unit = {}) { val installer = context.packageManager.packageInstaller val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL).apply { setAppPackageName(context.packageName) @@ -108,10 +109,23 @@ object SelfInstaller { } val status = Intent(ACTION_STATUS).setPackage(context.packageName) val flags = PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= 31) PendingIntent.FLAG_MUTABLE else 0) + onSession(id) session.commit(PendingIntent.getBroadcast(context, id, status, flags).intentSender) } } + /** Only a system installer activity may be launched from the status broadcast, without URI grants. */ + fun safeConfirmIntent(context: Context, confirm: Intent): Intent? { + val target = confirm.resolveActivity(context.packageManager) ?: return null + val info = runCatching { context.packageManager.getApplicationInfo(target.packageName, 0) }.getOrNull() ?: return null + if (info.flags and android.content.pm.ApplicationInfo.FLAG_SYSTEM == 0) return null + return Intent(confirm).setComponent(target).apply { + flags = flags and (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION or + Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION or Intent.FLAG_GRANT_PREFIX_URI_PERMISSION).inv() + addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + } + } + fun describeFailure(context: Context, status: Int, message: String?): String = when { message?.contains("VERSION_DOWNGRADE") == true -> context.getString(R.string.upd_fail_downgrade) status == PackageInstaller.STATUS_FAILURE_CONFLICT || message?.contains("UPDATE_INCOMPATIBLE") == true -> From 6e67dbb5be8ad8918c888642273fe7510d928d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Mon, 26 Oct 2026 00:18:31 +0300 Subject: [PATCH 043/135] fix: chosen game art survives a Steam account switch or runtime reset (#1026) Every grid-<slot> record held only a file signature, not which grid folder it came from. After switching accounts or reinstalling the runtime, the new, empty grid folder looked like the user removed every image in Steam, and all chosen art was deleted. The grid folder now carries a random id and records store it; a record from another folder counts as a first look, so the choice is placed again. fix: never accept a record made with the fallback grid id CodeRabbit: when the grid id could not be read or written, "?" was stored in records and a later "?" matched it, so an empty grid could still delete local art. Records now never match the fallback id, and a blank .droiddeck-grid file is replaced instead of blocking the rename. Co-authored-by: ovurrsl <ovurrsl@users.noreply.github.com> Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- .../droiddeck/launcher/frontend/SteamGrid.kt | 71 +++++++++++++------ .../launcher/frontend/SteamGridTest.kt | 13 ++++ 2 files changed, 62 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamGrid.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamGrid.kt index 47b679031f..88526f1bf7 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamGrid.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamGrid.kt @@ -5,6 +5,7 @@ import android.util.Log import com.droiddeck.launcher.session.SessionPrefs import org.json.JSONObject import java.io.File +import java.util.UUID /** Steam keeps a game's custom art in `userdata/<account>/config/grid`; this is where DroidDeck's choices and Steam's meet. */ object SteamGrid { @@ -41,14 +42,42 @@ object SteamGrid { private fun sigFile(context: Context, target: Target, slot: AddedGameArt.Slot) = File(target.artDir, sigName(context, slot.key)) - private fun recorded(context: Context, target: Target, slot: AddedGameArt.Slot): String? = - sigFile(context, target, slot).takeIf { it.isFile }?.readText() + private const val GRID_ID = ".droiddeck-grid" + private const val UNKNOWN_GRID = "?" - private fun record(context: Context, target: Target, slot: AddedGameArt.Slot, value: String) { - target.artDir.mkdirs() - sigFile(context, target, slot).writeText(value) + /** + * A random id kept in the grid folder, so a record made against another account's folder, or one wiped with the + * runtime, reads as "not seen yet" instead of "removed in Steam". "?" never matches, so nothing is dropped. + */ + private fun gridId(grid: File): String = runCatching { + val f = File(grid, GRID_ID) + f.takeIf { it.isFile }?.readText()?.trim()?.takeIf { it.isNotEmpty() } ?: UUID.randomUUID().toString().also { id -> + grid.mkdirs() + val tmp = File(grid, "$GRID_ID.tmp") + tmp.writeText(id) + if (f.isFile) f.delete() + if (!tmp.renameTo(f)) error("grid id") + } + }.getOrDefault(UNKNOWN_GRID) + + private fun readRecord(grid: File, file: File): String? { + val text = file.takeIf { it.isFile }?.readText() ?: return null + val cut = text.indexOf('\n') + val id = gridId(grid) + return if (cut > 0 && id != UNKNOWN_GRID && text.substring(0, cut) == id) text.substring(cut + 1) else null } + private fun writeRecord(grid: File, target: Target, file: File, value: String) { + target.artDir.mkdirs() + file.writeText("${gridId(grid)}\n$value") + } + + private fun recorded(context: Context, grid: File, target: Target, slot: AddedGameArt.Slot): String? = + readRecord(grid, sigFile(context, target, slot)) + + private fun record(context: Context, grid: File, target: Target, slot: AddedGameArt.Slot, value: String) = + writeRecord(grid, target, sigFile(context, target, slot), value) + private fun writtenByDroidDeck(grid: File): Set<String> = runCatching { val manifest = JSONObject(File(grid, MANIFEST).readText()) manifest.keys().asSequence().filter { name -> File(grid, name).let { it.isFile && it.length() == manifest.optLong(name, -1L) } }.toSet() @@ -62,7 +91,7 @@ object SteamGrid { val grid = dir(context) ?: return true if (file == null) { if (files(grid, target.id, slot).map { it.delete() }.any { !it }) return false - record(context, target, slot, "") + record(context, grid, target, slot, "") return true } val ext = file.extension.lowercase().let { if (it == "jpeg") "jpg" else it } @@ -76,7 +105,7 @@ object SteamGrid { return false } if (files(grid, target.id, slot).filter { it != dst }.map { it.delete() }.any { !it }) return false - record(context, target, slot, signature(placed)) + record(context, grid, target, slot, signature(placed)) return true } @@ -90,13 +119,11 @@ object SteamGrid { /** The logo position chosen here (or taken over from Steam) for a game; null when Steam's own default applies. */ fun position(target: Target): LogoPosition.Value? = positionIn(File(target.artDir, POSITION)) - private fun positionRecorded(context: Context, target: Target): String? = - File(target.artDir, sigName(context, POSITION_SIG)).takeIf { it.isFile }?.readText() + private fun positionRecorded(context: Context, grid: File, target: Target): String? = + readRecord(grid, File(target.artDir, sigName(context, POSITION_SIG))) - private fun recordPosition(context: Context, target: Target, value: String) { - target.artDir.mkdirs() - File(target.artDir, sigName(context, POSITION_SIG)).writeText(value) - } + private fun recordPosition(context: Context, grid: File, target: Target, value: String) = + writeRecord(grid, target, File(target.artDir, sigName(context, POSITION_SIG)), value) private fun storePosition(target: Target, value: LogoPosition.Value?): Boolean { val file = File(target.artDir, POSITION) @@ -119,7 +146,7 @@ object SteamGrid { val next = if (value == null) existing?.let(LogoPosition::without) else LogoPosition.toJson(value, existing ?: JSONObject()) if (next == null) { if (file.isFile && !file.delete()) return false - recordPosition(context, target, "") + recordPosition(context, grid, target, "") return true } grid.mkdirs() @@ -129,7 +156,7 @@ object SteamGrid { tmp.delete() return false } - recordPosition(context, target, signature(file)) + recordPosition(context, grid, target, signature(file)) return true } @@ -144,16 +171,16 @@ object SteamGrid { if (hasUnknownPosition(file)) return val theirs = positionIn(file) val now = if (theirs != null) signature(file) else "" - val before = positionRecorded(context, target) + val before = positionRecorded(context, grid, target) val own = position(target) when { before == null && own != null && theirs == null -> placePosition(context, target, own) before == null || now != before -> { // Recorded only once the local side agrees, so a failed take-over is tried again on the next scan. if (theirs != null) { - if (own == theirs || storePosition(target, theirs)) recordPosition(context, target, now) + if (own == theirs || storePosition(target, theirs)) recordPosition(context, grid, target, now) } else { - if (own == null || storePosition(target, null)) recordPosition(context, target, "") + if (own == null || storePosition(target, null)) recordPosition(context, grid, target, "") } } own != null && own != theirs -> placePosition(context, target, own) @@ -173,20 +200,20 @@ object SteamGrid { val present = files(grid, target.id, slot) val theirs = present.filter { it.name !in ours }.maxByOrNull { it.lastModified() } val now = signature(theirs) - val before = recorded(context, target, slot) + val before = recorded(context, grid, target, slot) when { before == null && own != null && theirs == null -> write(context, target, slot, own) before == null || now != before -> { if (theirs != null) { - if (own != null && own.length() == theirs.length() && own.readBytes().contentEquals(theirs.readBytes())) record(context, target, slot, now) + if (own != null && own.length() == theirs.length() && own.readBytes().contentEquals(theirs.readBytes())) record(context, grid, target, slot, now) else if (AddedGameArt.store(target.artDir, slot, AddedGameArt.Option(AddedGameArt.STEAM, theirs.path, theirs.path))) { target.setSource(slot, AddedGameArt.STEAM + "|steam-client") - record(context, target, slot, now) + record(context, grid, target, slot, now) changed = true } } else { if (own != null && present.isEmpty()) { own.delete(); target.setSource(slot, ""); changed = true } - record(context, target, slot, "") + record(context, grid, target, slot, "") } } own != null && theirs != null && now == before && own.length() != theirs.length() -> write(context, target, slot, own) diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SteamGridTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SteamGridTest.kt index cc243e7438..7d0618d03e 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/SteamGridTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SteamGridTest.kt @@ -238,4 +238,17 @@ class SteamGridTest { assertEquals(names.sorted(), names) assertEquals(5L, AddedGameArt.chosen(dir, AddedGameArt.Slot.COVER)?.length()) } + + @Test fun aChoiceSurvivesTheGridFolderBeingWipedAndIsPlacedAgain() { + File(LinuxRuntime.rootDir(app), "root/.local/share/Steam/userdata/123/config").mkdirs() + val picked = image("mine.png", 12) + SteamGameArt.choose(app, game(), AddedGameArt.Slot.COVER, AddedGameArt.Option(AddedGameArt.FILE, picked.path, picked.path)) + assertEquals(12L, File(grid, "620p.png").length()) + + assertTrue(grid.deleteRecursively()) + grid.mkdirs() + assertFalse(SteamGrid.sync(app, listOf(target()))) + assertEquals(12L, SteamGameArt.chosenFile(app, 620, AddedGameArt.Slot.COVER)?.length()) + assertEquals(12L, File(grid, "620p.png").length()) + } } From 9f4794769c0d5c399f3299d155faf2f61aa22929 Mon Sep 17 00:00:00 2001 From: kingokksa <47888451+kingokksa@users.noreply.github.com> Date: Mon, 26 Oct 2026 05:27:07 +0800 Subject: [PATCH 044/135] feat: on-screen keys for any key or key combo (#1305) --- .../com/droiddeck/launcher/SessionActivity.kt | 142 ++- .../launcher/input/ControllerPrefs.kt | 50 + .../launcher/input/GestureTouchStreamGate.kt | 21 + .../com/droiddeck/launcher/input/PcKeys.kt | 60 + .../com/droiddeck/launcher/input/ScreenKey.kt | 63 + .../launcher/input/ScreenKeyIcons.kt | 148 +++ .../droiddeck/launcher/input/ScreenKeys.kt | 1122 +++++++++++++++++ .../launcher/input/ScreenLayoutFile.kt | 140 ++ .../launcher/input/SteamTouchControls.kt | 7 +- .../com/droiddeck/launcher/ui/PcKeyboard.kt | 50 +- .../droiddeck/launcher/ui/ScreenKeyEditor.kt | 368 ++++++ .../droiddeck/launcher/ui/ScreenKeyPicker.kt | 168 +++ .../launcher/ui/ScreenLayoutPanel.kt | 138 ++ .../droiddeck/launcher/ui/SessionOverlay.kt | 21 + app/src/main/res/values-ar/strings.xml | 18 + app/src/main/res/values-b+es+419/strings.xml | 18 + app/src/main/res/values-bg/strings.xml | 18 + app/src/main/res/values-cs/strings.xml | 18 + app/src/main/res/values-da/strings.xml | 18 + app/src/main/res/values-de/strings.xml | 18 + app/src/main/res/values-el/strings.xml | 18 + app/src/main/res/values-es/strings.xml | 18 + app/src/main/res/values-fi/strings.xml | 18 + app/src/main/res/values-fr/strings.xml | 18 + app/src/main/res/values-hi/strings.xml | 18 + app/src/main/res/values-hu/strings.xml | 18 + app/src/main/res/values-in/strings.xml | 18 + app/src/main/res/values-it/strings.xml | 18 + app/src/main/res/values-ja/strings.xml | 18 + app/src/main/res/values-ko/strings.xml | 18 + app/src/main/res/values-ms/strings.xml | 18 + app/src/main/res/values-nb/strings.xml | 18 + app/src/main/res/values-nl/strings.xml | 18 + app/src/main/res/values-pl/strings.xml | 18 + app/src/main/res/values-pt-rPT/strings.xml | 18 + app/src/main/res/values-pt/strings.xml | 18 + app/src/main/res/values-ro/strings.xml | 18 + app/src/main/res/values-ru/strings.xml | 18 + app/src/main/res/values-sv/strings.xml | 18 + app/src/main/res/values-th/strings.xml | 18 + app/src/main/res/values-tr/strings.xml | 18 + app/src/main/res/values-uk/strings.xml | 18 + app/src/main/res/values-vi/strings.xml | 18 + app/src/main/res/values-zh-rCN/strings.xml | 18 + app/src/main/res/values-zh-rHK/strings.xml | 18 + app/src/main/res/values-zh-rTW/strings.xml | 18 + app/src/main/res/values/strings.xml | 18 + .../launcher/input/ScreenKeysTest.kt | 124 ++ 48 files changed, 3169 insertions(+), 47 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/input/ScreenKeyIcons.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/input/ScreenLayoutFile.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyEditor.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyPicker.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/ScreenLayoutPanel.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 2740c71248..a5868ca8b9 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -75,8 +75,10 @@ import com.droiddeck.launcher.input.OnScreenControls import com.droiddeck.launcher.input.PadBridge import com.droiddeck.launcher.input.PadMouse import com.droiddeck.launcher.input.PadState +import com.droiddeck.launcher.input.ScreenKeys import com.droiddeck.launcher.input.SteamControllerBle import com.droiddeck.launcher.input.DirectTouchHold +import com.droiddeck.launcher.input.GestureTouchStreamGate import com.droiddeck.launcher.input.PointerGestures import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.input.SecondScreenDisplays @@ -199,10 +201,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var gestureConfig = com.droiddeck.launcher.input.TouchGestureConfig() private var gestureGame: String? = null private var gestureSettingsOpen by mutableStateOf(false) + private var screenKeyPickerOpen by mutableStateOf(false) + private var screenKeyBind: List<Int>? = null + private var screenKeyDir: Int? = null + private var screenKeyTextFocus = false + private var screenKeyEdit by mutableStateOf<com.droiddeck.launcher.input.ScreenKey?>(null) + private var screenLayoutsOpen by mutableStateOf(false) + private var screenKeysShown by mutableStateOf(true) + private var screenLayoutNames by mutableStateOf(listOf<String>()) + private var screenKeys: ScreenKeys? = null private var recognizedGesture by mutableStateOf<TouchscreenGestures.Gesture?>(null) private var gesturePointerX = 0f private var gesturePointerY = 0f private var gesturePointerReady = false + private val gestureTouchStreamGate = GestureTouchStreamGate() private val clearRecognizedGesture = Runnable { recognizedGesture = null } private val gestureKeysDown = mutableSetOf<Int>() private lateinit var scrollTouch: ScrollTouchGestures @@ -536,6 +548,21 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { cursorVisible = false } onScreenControls = OnScreenControls(this, bridge, onKeyboard = ::togglePcKeyboard).also { root.addView(it) } + screenKeysShown = com.droiddeck.launcher.input.ControllerPrefs.screenKeysShown(this) + screenKeys = ScreenKeys(this) { code, down -> if (CompositorHost.isStarted) sendGuestKey(code, down) }.also { keys -> + keys.onTouchMiss = miss@{ event -> + if (routedTouchMode == SessionPrefs.TOUCH_GESTURES && + !gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, event)) return@miss + event.offsetLocation(keys.left - surfaceView.left.toFloat(), keys.top - surfaceView.top.toFloat()) + onTouchEvent(event) + } + keys.onAdd = { screenKeyPickerOpen = true } + keys.onSelect = { codes -> screenKeyEdit = screenKeys?.stateOf(codes) } + keys.onEditingChanged = { if (!it) screenKeyEdit = null } + keys.steamStyle = { steamTouchControls?.style } + keys.visibility = if (screenKeysShown) View.VISIBLE else View.GONE + root.addView(keys) + } keyboard = KeyboardHost(this).also { root.addView(it) } touchpad = TouchpadGestures(PointerGestures.slop(this), pointerListener) directTouchHold = DirectTouchHold(PointerGestures.slop(this), pointerListener) { @@ -550,7 +577,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { // game surface and on-screen buttons, in either finger-down order. root.isMotionEventSplittingEnabled = true surfaceView.setOnTouchListener { _, event -> - routedTouchMode == SessionPrefs.TOUCH_GESTURES && onTouchEvent(event) + if (routedTouchMode != SessionPrefs.TOUCH_GESTURES) { + gestureTouchStreamGate.reset() + false + } else if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SURFACE, event)) { + false + } else onTouchEvent(event) } padMouse = PadMouse(padMouseListener) bridge.setTouchRoute(object : PadBridge.TouchRoute { @@ -741,6 +773,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, gestureSettingsOpen, pipUi, SessionState.suspended) { if (drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || pipUi || SessionState.suspended) { cancelTouchGestures() + screenKeys?.stopEditing() } } com.droiddeck.launcher.ui.GestureFeedback(recognizedGesture) @@ -749,6 +782,84 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onDismiss = { gestureSettingsOpen = false }, onSaved = { gestureSettingsOpen = false; refreshGestureConfig() }, ) + if (screenKeyPickerOpen) { + val dir = screenKeyDir + com.droiddeck.launcher.ui.ScreenKeyPicker( + initial = if (dir != null) { + listOfNotNull((screenKeyEdit?.codes?.getOrNull(dir) ?: 0).takeIf { it != 0 }) + } else { + screenKeyBind ?: emptyList() + }, + onDismiss = { screenKeyPickerOpen = false; screenKeyBind = null; screenKeyDir = null }, + onAdd = { codes -> + val bind = screenKeyBind + if (dir != null && bind != null) { + screenKeys?.setDirection(bind, dir, codes.lastOrNull() ?: 0)?.let { screenKeyEdit = it } + } else if (bind != null) { + screenKeys?.setCodes(bind, codes)?.let { screenKeyEdit = it } + } else { + screenKeys?.add(codes) + screenKeyEdit = screenKeys?.stateOf(codes) + } + screenKeyPickerOpen = false + screenKeyBind = null + screenKeyDir = null + }, + ) + } + screenKeyEdit?.let { key -> + com.droiddeck.launcher.ui.ScreenKeyEditor( + codes = key.codes, keyY = key.y, + size = key.size, opacity = key.opacity, shape = key.shape, toggle = key.toggle, + labels = key.labels, + text = key.text, hasImage = key.image.isNotEmpty(), + onResize = { screenKeys?.resize(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onOpacity = { screenKeys?.setOpacity(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onShape = { screenKeys?.setShape(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onToggle = { on -> screenKeys?.setToggle(key.codes, on); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onLabels = { on -> screenKeys?.setLabels(key.codes, on); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onDirection = { index -> screenKeyBind = key.codes; screenKeyDir = index; screenKeyPickerOpen = true }, + onText = { screenKeys?.setText(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onImage = { screenKeys?.setImage(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onClearImage = { screenKeys?.setImage(key.codes, ""); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onBind = { screenKeyBind = key.codes; screenKeyDir = null; screenKeyPickerOpen = true }, + onTextFocus = { screenKeyTextFocus = true; keyboard?.hide() }, + onTextBlur = { screenKeyTextFocus = false }, + onRemove = { screenKeys?.remove(key.codes); screenKeyEdit = null }, + onDismiss = { screenKeyEdit = null; screenKeyTextFocus = false; screenKeys?.deselect() }, + ) + } + if (screenLayoutsOpen) com.droiddeck.launcher.ui.ScreenLayoutPanel( + layouts = screenLayoutNames, + onSave = { name -> + screenKeys?.let { keys -> + com.droiddeck.launcher.input.ControllerPrefs.saveScreenLayout(this@SessionActivity, name, keys.export()) + } + screenLayoutNames = layoutNames() + }, + onLoad = { name -> + com.droiddeck.launcher.input.ControllerPrefs.screenLayouts(this@SessionActivity)[name]?.let { screenKeys?.load(it) } + screenLayoutsOpen = false + }, + onDelete = { name -> + com.droiddeck.launcher.input.ControllerPrefs.deleteScreenLayout(this@SessionActivity, name) + screenLayoutNames = layoutNames() + }, + onImport = { text -> + val width = (screenKeys?.width ?: 0).takeIf { it > 0 } ?: resources.displayMetrics.widthPixels + val keys = com.droiddeck.launcher.input.importScreenLayout(text, width, resources.displayMetrics.density) + if (keys != null) { + screenKeys?.load(com.droiddeck.launcher.input.ControllerPrefs.encodeScreenKeys(keys)) + screenLayoutsOpen = false + } + }, + exportText = { + val width = (screenKeys?.width ?: 0).takeIf { it > 0 } ?: resources.displayMetrics.widthPixels + val keys = com.droiddeck.launcher.input.ControllerPrefs.decodeScreenKeys(screenKeys?.export().orEmpty()) + com.droiddeck.launcher.input.exportScreenLayout(keys, width, resources.displayMetrics.density) + }, + onDismiss = { screenLayoutsOpen = false }, + ) androidx.compose.runtime.LaunchedEffect(drawerOpen) { if (drawerOpen) { syncLossless() @@ -939,6 +1050,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }, onTouch = { v -> SessionPrefs.setTouchMode(this@SessionActivity, v); readPrefs() }, onGestureSettings = { drawerOpen = false; gestureSettingsOpen = true }, + onScreenKeys = { drawerOpen = false; screenKeys?.startEditing() }, + screenKeysShown = screenKeysShown, + onScreenKeysShown = { shown -> + screenKeysShown = shown + com.droiddeck.launcher.input.ControllerPrefs.setScreenKeysShown(this@SessionActivity, shown) + screenKeys?.stopEditing() + screenKeys?.visibility = if (shown) View.VISIBLE else View.GONE + }, + onScreenLayouts = { + drawerOpen = false + screenLayoutNames = layoutNames() + screenLayoutsOpen = true + }, onFexPreset = { v -> SessionPrefs.setFexPreset(this@SessionActivity, v); readPrefs() }, onSecondScreenMode = ::selectSecondScreenMode, onSecondScreenDisplay = ::selectSecondScreenDisplay, @@ -1495,7 +1619,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (nextTouchMode == SessionPrefs.TOUCH_OFF || !usingTouchpad()) cursorVisible = false } touchMode = nextTouchMode - routedTouchMode = effectiveTouchMode() + val nextRoutedTouchMode = effectiveTouchMode() + if (routedTouchMode != nextRoutedTouchMode) gestureTouchStreamGate.reset() + routedTouchMode = nextRoutedTouchMode frameGen = FrameGen.mode(this) fexPreset = SessionPrefs.fexPreset(this) suspendPolicy = SessionPrefs.suspendPolicy(this, SessionState.mode) @@ -2053,6 +2179,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return super.dispatchKeyEvent(event) } if (pipUi) return true + if (screenKeyTextFocus) return super.dispatchKeyEvent(event) val pad = com.droiddeck.launcher.input.JoyCon.normalize(event) if (pad !== event) return dispatchKeyEvent(pad) val fromController = PadBridge.isControllerKeyEvent(event) @@ -2254,8 +2381,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { super.dispatchKeyEvent(event) } + private fun layoutNames(): List<String> = + com.droiddeck.launcher.input.ControllerPrefs.screenLayouts(this).keys.sorted() + private fun refreshGestureConfig() { gestureConfig = com.droiddeck.launcher.input.GesturePrefs.read(this, gestureGame) + gestureTouchStreamGate.reset() if (::touchscreenGestures.isInitialized) touchscreenGestures.configure(gestureConfig) gesturePointerReady = false recognizedGesture = null @@ -2544,6 +2675,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun refreshControls() { applyUnfoldedControls() updateOnScreenControls() + screenKeys?.refreshAppearance() } private fun applyUnfoldedControls() { @@ -2629,6 +2761,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (::scrollTouch.isInitialized) scrollTouch.cancel() if (CompositorHost.isStarted) WaylandCompositor.nativeSendTouch(3, -1, 0, 0) if (next == SessionPrefs.TOUCH_OFF) cursorVisible = false + gestureTouchStreamGate.reset() routedTouchMode = next } @@ -2819,6 +2952,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { device.plugged = false uiHandler.postDelayed({ updateOnScreenControls() }, 700) } + view.onStyle = { screenKeys?.refreshAppearance() } root.addView(view, root.indexOfChild(onScreenControls) + 1) steamTouchControls = view steamTouchAvailable = true @@ -2849,6 +2983,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { controls.visibility = View.GONE steamTouchControls?.let { it.releaseAll(); it.visibility = View.GONE } com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false + screenKeys?.followSteam = false applyTouchRouting() return } @@ -2877,6 +3012,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onScreenButtonsVisible = show val drawn = show && !keyboardCoversPad() if (steam != null) { + screenKeys?.followSteam = drawn if (controls.visibility == View.VISIBLE) { controls.releaseAll(); controls.visibility = View.GONE } if (!drawn) steam.releaseAll() steam.visibility = if (drawn) View.VISIBLE else View.GONE @@ -2885,6 +3021,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { Log.i(TAG, "on-screen controls: Steam's touch controller " + if (drawn) "shown" else "hidden") return } + screenKeys?.followSteam = false if (drawn == (controls.visibility == View.VISIBLE)) return if (!drawn) controls.releaseAll() controls.visibility = if (drawn) View.VISIBLE else View.GONE @@ -2970,6 +3107,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { pendingBackAction = null releaseDrawerDirection() onScreenControls?.releaseAll() + screenKeys?.releaseAll() releasePads() touchpad.cancel() scrollTouch.cancel() diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt b/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt index 9b08fd8adb..c784bc3bf6 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt @@ -157,6 +157,56 @@ object ControllerPrefs { prefs(context).edit().remove("layout.${width}x$height").apply() } + fun screenKeysShown(context: Context): Boolean = prefs(context).getBoolean("screenKeysShown", true) + + fun setScreenKeysShown(context: Context, shown: Boolean) { + prefs(context).edit().putBoolean("screenKeysShown", shown).apply() + } + + fun screenKeys(context: Context): List<ScreenKey> = decodeScreenKeys(prefs(context).getString("screenKeys", null).orEmpty()) + + fun setScreenKeys(context: Context, keys: List<ScreenKey>) { + prefs(context).edit().putString("screenKeys", encodeScreenKeys(keys)).apply() + } + + fun encodeScreenKeys(keys: List<ScreenKey>): String = keys.joinToString(";") { + "${it.codes.joinToString("+")}:${it.x},${it.y},${it.size}:${escape(it.glyph)}:${escape(it.text)}:${escape(it.image)}:${it.opacity}:${it.shape}:${if (it.toggle) 1 else 0}:${if (it.labels) 1 else 0}" + } + + fun decodeScreenKeys(raw: String): List<ScreenKey> = raw.split(';').mapNotNull { entry -> + val parts = entry.split(':') + if (parts.size < 2) return@mapNotNull null + val keys = parts[0].split('+').mapNotNull { it.toIntOrNull() }.takeIf { it.isNotEmpty() } ?: return@mapNotNull null + val nums = parts[1].split(',').mapNotNull { it.toFloatOrNull() }.takeIf { it.size == 3 } ?: return@mapNotNull null + ScreenKey( + keys, nums[0], nums[1], nums[2].toInt(), + parts.getOrNull(2)?.let(::unescape).orEmpty(), + parts.getOrNull(3)?.let(::unescape).orEmpty(), + parts.getOrNull(4)?.let(::unescape).orEmpty(), + parts.getOrNull(5)?.toFloatOrNull()?.coerceIn(0.2f, 1f) ?: 1f, + parts.getOrNull(6)?.toIntOrNull()?.coerceIn(SCREEN_KEY_PILL, SCREEN_KEY_STICK) ?: SCREEN_KEY_PILL, + parts.getOrNull(7) == "1", + parts.getOrNull(8) != "0", + ) + } + + fun screenLayouts(context: Context): Map<String, String> = + prefs(context).all.mapNotNull { (key, value) -> + if (!key.startsWith("screenLayout.") || value !is String) null else key.removePrefix("screenLayout.") to value + }.toMap() + + fun saveScreenLayout(context: Context, name: String, raw: String) { + prefs(context).edit().putString("screenLayout.$name", raw).apply() + } + + fun deleteScreenLayout(context: Context, name: String) { + prefs(context).edit().remove("screenLayout.$name").apply() + } + + private fun escape(value: String) = value.replace("%", "%25").replace(";", "%3B").replace(":", "%3A").replace(",", "%2C") + + private fun unescape(value: String) = value.replace("%2C", ",").replace("%3A", ":").replace("%3B", ";").replace("%25", "%") + fun resetAll(context: Context) { prefs(context).edit().clear().putBoolean("rumble", true).apply() } diff --git a/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt b/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt new file mode 100644 index 0000000000..e4ad4f655d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt @@ -0,0 +1,21 @@ +package com.droiddeck.launcher.input + +import android.view.MotionEvent + +/** Keeps split Android touch targets from restarting one shared gesture recognizer. */ +internal class GestureTouchStreamGate { + enum class Source { SURFACE, SCREEN_KEYS } + + private var owner: Source? = null + + fun accepts(source: Source, event: MotionEvent): Boolean { + if (owner == null && event.actionMasked == MotionEvent.ACTION_DOWN) owner = source + val accepted = owner == source + if (accepted && (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL)) { + owner = null + } + return accepted + } + + fun reset() { owner = null } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt new file mode 100644 index 0000000000..f3ab1d4c6a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt @@ -0,0 +1,60 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import androidx.annotation.StringRes +import com.droiddeck.launcher.R + +data class PcKey( + val label: String, + val code: Int, + val weight: Float = 1f, + val shifted: String? = null, + @StringRes val labelRes: Int = 0, +) + +internal fun k(label: String, code: Int, weight: Float = 1f, shifted: String? = null) = PcKey(label, code, weight, shifted) + +internal fun k(@StringRes labelRes: Int, code: Int, weight: Float = 1f) = PcKey("", code, weight, null, labelRes) + +val PC_KEY_ROWS: List<List<PcKey>> = listOf( + listOf( + k(R.string.pckb_key_esc, 1), k("F1", 59), k("F2", 60), k("F3", 61), k("F4", 62), k("F5", 63), k("F6", 64), + k("F7", 65), k("F8", 66), k("F9", 67), k("F10", 68), k("F11", 87), k("F12", 88), + k(R.string.pckb_key_ins, 110), k(R.string.pckb_key_del, 111), k(R.string.pckb_key_home, 102), k(R.string.pckb_key_end, 107), k(R.string.pckb_key_pgup, 104), k(R.string.pckb_key_pgdn, 109), + ), + listOf( + k("`", 41, shifted = "~"), k("1", 2, shifted = "!"), k("2", 3, shifted = "@"), k("3", 4, shifted = "#"), + k("4", 5, shifted = "$"), k("5", 6, shifted = "%"), k("6", 7, shifted = "^"), k("7", 8, shifted = "&"), + k("8", 9, shifted = "*"), k("9", 10, shifted = "("), k("0", 11, shifted = ")"), k("-", 12, shifted = "_"), + k("=", 13, shifted = "+"), k(R.string.pckb_key_backspace, 14, 2f), + ), + listOf( + k(R.string.pckb_key_tab, 15, 1.5f), k("q", 16), k("w", 17), k("e", 18), k("r", 19), k("t", 20), k("y", 21), + k("u", 22), k("i", 23), k("o", 24), k("p", 25), k("[", 26, shifted = "{"), k("]", 27, shifted = "}"), + k("\\", 43, 1.5f, shifted = "|"), + ), + listOf( + k(R.string.pckb_key_caps, 58, 1.75f), k("a", 30), k("s", 31), k("d", 32), k("f", 33), k("g", 34), k("h", 35), + k("j", 36), k("k", 37), k("l", 38), k(";", 39, shifted = ":"), k("'", 40, shifted = "\""), + k(R.string.pckb_key_enter, 28, 2.25f), + ), + listOf( + k(R.string.pckb_key_shift, 42, 2.25f), k("z", 44), k("x", 45), k("c", 46), k("v", 47), k("b", 48), k("n", 49), + k("m", 50), k(",", 51, shifted = "<"), k(".", 52, shifted = ">"), k("/", 53, shifted = "?"), + k(R.string.pckb_key_shift, 54, 1.75f), k("↑", 103), + ), + listOf( + k(R.string.pckb_key_ctrl, 29, 1.5f), k(R.string.pckb_key_super, 125, 1.25f), k(R.string.pckb_key_alt, 56, 1.25f), k(R.string.pckb_key_space, 57, 6.25f), + k(R.string.pckb_key_altgr, 100, 1.25f), k(R.string.pckb_key_ctrl, 97, 1.25f), k("←", 105), k("↓", 108), k("→", 106), + ), +) + +val PC_MODIFIERS: Set<Int> = setOf(42, 54, 29, 97, 56, 100, 125) + +val PC_KEYS: Map<Int, PcKey> = PC_KEY_ROWS.flatten().associateBy { it.code } + +fun pcKeyLabel(context: Context, code: Int): String { + val key = PC_KEYS[code] ?: return code.toString() + val text = if (key.labelRes != 0) context.getString(key.labelRes) else key.label + return if (text.length == 1 && text[0].isLetter()) text.uppercase() else text +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt new file mode 100644 index 0000000000..2967a06f6a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt @@ -0,0 +1,63 @@ +package com.droiddeck.launcher.input + +import android.content.Context + +fun screenKeyLabel(context: Context, codes: List<Int>): String = + codes.filter { it != 0 }.joinToString("+") { short(context, it) } + +private fun short(context: Context, code: Int): String = when (code) { + 28 -> "⏎" + 14 -> "⌫" + 15 -> "Tab" + 57 -> "Space" + 58 -> "Caps" + 42, 54 -> "Shift" + 29, 97 -> "Ctrl" + 56 -> "Alt" + 100 -> "AltGr" + 125 -> "Super" + else -> pcKeyLabel(context, code) +} + +const val SCREEN_KEY_PILL = 0 +const val SCREEN_KEY_ROUND = 1 +const val SCREEN_KEY_CIRCLE = 2 +const val SCREEN_KEY_RECT = 3 +const val SCREEN_KEY_TRIGGER = 4 +const val SCREEN_KEY_DPAD = 5 +const val SCREEN_KEY_STICK = 6 + +val SCREEN_KEY_DPAD_DIRS = listOf("↑", "→", "↓", "←") +val SCREEN_KEY_STICK_DIRS = listOf("↑", "↗", "→", "↘", "↓", "↙", "←", "↖") + +fun screenKeyDirections(shape: Int): List<String> = when (shape) { + SCREEN_KEY_DPAD -> SCREEN_KEY_DPAD_DIRS + SCREEN_KEY_STICK -> SCREEN_KEY_STICK_DIRS + else -> emptyList() +} + +val SCREEN_KEY_SHAPES = + listOf( + SCREEN_KEY_PILL, SCREEN_KEY_ROUND, SCREEN_KEY_CIRCLE, SCREEN_KEY_RECT, + SCREEN_KEY_TRIGGER, SCREEN_KEY_DPAD, SCREEN_KEY_STICK, + ) + +data class ScreenKey( + val codes: List<Int>, + val x: Float, + val y: Float, + val size: Int, + val glyph: String = "", + val text: String = "", + val image: String = "", + val opacity: Float = 1f, + val shape: Int = SCREEN_KEY_PILL, + val toggle: Boolean = false, + val labels: Boolean = true, +) { + fun shownLabel(context: Context): String = when { + text.isNotEmpty() -> text + glyph.isNotEmpty() -> glyph + else -> screenKeyLabel(context, codes) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenKeyIcons.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeyIcons.kt new file mode 100644 index 0000000000..b1ea677b99 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeyIcons.kt @@ -0,0 +1,148 @@ +package com.droiddeck.launcher.input + +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.Path + +object ScreenKeyIcons { + fun has(code: Int): Boolean = code in SET + + private val SET = setOf(28, 14, 15, 57, 42, 54, 29, 97, 125, 103, 108, 105, 106) + + fun draw(canvas: Canvas, code: Int, cx: Float, cy: Float, box: Float, paint: Paint): Boolean { + if (!has(code)) return false + val h = box / 2f + val stroke = box * 0.085f + val path = Path() + paint.style = Paint.Style.STROKE + paint.strokeWidth = stroke + paint.strokeCap = Paint.Cap.ROUND + paint.strokeJoin = Paint.Join.ROUND + when (code) { + 28 -> { + path.moveTo(cx - 0.34f * h, cy - 0.22f * h) + path.lineTo(cx + 0.30f * h, cy - 0.22f * h) + path.lineTo(cx + 0.30f * h, cy + 0.24f * h) + path.lineTo(cx - 0.04f * h, cy + 0.24f * h) + canvas.drawPath(path, paint) + path.reset() + path.moveTo(cx + 0.12f * h, cy + 0.06f * h) + path.lineTo(cx - 0.04f * h, cy + 0.24f * h) + path.lineTo(cx + 0.12f * h, cy + 0.42f * h) + canvas.drawPath(path, paint) + } + + 14 -> { + path.moveTo(cx - 0.72f * h, cy) + path.lineTo(cx - 0.10f * h, cy - 0.50f * h) + path.lineTo(cx + 0.74f * h, cy - 0.50f * h) + path.lineTo(cx + 0.74f * h, cy + 0.50f * h) + path.lineTo(cx - 0.10f * h, cy + 0.50f * h) + path.close() + canvas.drawPath(path, paint) + path.reset() + path.moveTo(cx + 0.10f * h, cy - 0.20f * h) + path.lineTo(cx + 0.44f * h, cy + 0.20f * h) + path.moveTo(cx + 0.44f * h, cy - 0.20f * h) + path.lineTo(cx + 0.10f * h, cy + 0.20f * h) + canvas.drawPath(path, paint) + } + + 15 -> { + path.moveTo(cx - 0.72f * h, cy) + path.lineTo(cx + 0.44f * h, cy) + path.moveTo(cx + 0.14f * h, cy - 0.30f * h) + path.lineTo(cx + 0.46f * h, cy) + path.lineTo(cx + 0.14f * h, cy + 0.30f * h) + canvas.drawPath(path, paint) + path.reset() + path.moveTo(cx + 0.70f * h, cy - 0.48f * h) + path.lineTo(cx + 0.70f * h, cy + 0.48f * h) + canvas.drawPath(path, paint) + } + + 57 -> { + path.moveTo(cx - 0.64f * h, cy - 0.22f * h) + path.lineTo(cx - 0.64f * h, cy + 0.20f * h) + path.lineTo(cx + 0.64f * h, cy + 0.20f * h) + path.lineTo(cx + 0.64f * h, cy - 0.22f * h) + canvas.drawPath(path, paint) + } + + 42, 54 -> { + paint.style = Paint.Style.FILL + path.moveTo(cx, cy - 0.55f * h) + path.lineTo(cx + 0.62f * h, cy + 0.02f * h) + path.lineTo(cx + 0.26f * h, cy + 0.02f * h) + path.lineTo(cx + 0.26f * h, cy + 0.32f * h) + path.lineTo(cx - 0.26f * h, cy + 0.32f * h) + path.lineTo(cx - 0.26f * h, cy + 0.02f * h) + path.lineTo(cx - 0.62f * h, cy + 0.02f * h) + path.close() + canvas.drawPath(path, paint) + path.reset() + path.moveTo(cx - 0.26f * h, cy + 0.44f * h) + path.lineTo(cx + 0.26f * h, cy + 0.44f * h) + path.lineTo(cx + 0.26f * h, cy + 0.58f * h) + path.lineTo(cx - 0.26f * h, cy + 0.58f * h) + path.close() + canvas.drawPath(path, paint) + } + + 29, 97 -> { + path.moveTo(cx - 0.58f * h, cy + 0.26f * h) + path.lineTo(cx, cy - 0.28f * h) + path.lineTo(cx + 0.58f * h, cy + 0.26f * h) + canvas.drawPath(path, paint) + } + + 125 -> { + paint.style = Paint.Style.FILL + val gap = 0.07f * h + val side = 0.34f * h + for (dxi in -1..1 step 2) for (dyi in -1..1 step 2) { + val left = cx + dxi * (gap + side / 2f) - side / 2f + val top = cy + dyi * (gap + side / 2f) - side / 2f + path.addRect(left, top, left + side, top + side, Path.Direction.CW) + } + canvas.drawPath(path, paint) + } + + 103, 108, 105, 106 -> { + paint.style = Paint.Style.FILL + val r = 0.52f * h + when (code) { + 103 -> { + path.moveTo(cx, cy - r) + path.lineTo(cx + r * 0.80f, cy + r * 0.55f) + path.lineTo(cx - r * 0.80f, cy + r * 0.55f) + } + + 108 -> { + path.moveTo(cx, cy + r) + path.lineTo(cx + r * 0.80f, cy - r * 0.55f) + path.lineTo(cx - r * 0.80f, cy - r * 0.55f) + } + + 105 -> { + path.moveTo(cx - r, cy) + path.lineTo(cx + r * 0.55f, cy - r * 0.80f) + path.lineTo(cx + r * 0.55f, cy + r * 0.80f) + } + + else -> { + path.moveTo(cx + r, cy) + path.lineTo(cx - r * 0.55f, cy - r * 0.80f) + path.lineTo(cx - r * 0.55f, cy + r * 0.80f) + } + } + path.close() + canvas.drawPath(path, paint) + } + } + paint.style = Paint.Style.FILL + paint.strokeCap = Paint.Cap.BUTT + paint.strokeJoin = Paint.Join.MITER + return true + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt new file mode 100644 index 0000000000..4cc87ef0b8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt @@ -0,0 +1,1122 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.graphics.PointF +import android.graphics.Rect +import android.graphics.RectF +import android.graphics.Typeface +import android.os.Build +import android.view.MotionEvent +import android.view.View +import android.view.WindowInsets +import java.io.File +import kotlin.math.abs +import kotlin.math.hypot +import kotlin.math.round + +class ScreenKeys(context: Context, private val sendKey: (Int, Boolean) -> Unit) : View(context) { + private class Entry(val codes: List<Int>) { + var glyph = "" + var text = "" + var image = "" + var bitmap: Bitmap? = null + var bitmapFor = "" + var x = 0.5f + var y = 0.5f + var size = DEFAULT_SIZE + var opacity = 1f + var shape = SCREEN_KEY_PILL + var toggle = false + var labels = true + var armed = -1 + var cx = 0f + var cy = 0f + var halfW = 0f + var halfH = 0f + } + + private val entries = mutableListOf<Entry>() + private val down = HashMap<Int, Entry>() + private val latched = mutableListOf<Entry>() + private val dpadDown = HashMap<Int, Int>() + private val stickEntries = HashMap<Int, Entry>() + private val stickCodes = HashMap<Int, List<Int>>() + private val held = HashMap<Int, Int>() + private var forwardedPointerBits = 0 + private var addX = -1f + private var addY = -1f + private var pressX = 0f + private var pressY = 0f + private var guideX = -1f + private var guideY = -1f + private val addPress = Runnable { addX = pressX; addY = pressY; onAdd?.invoke() } + private var editing = false + private var selected: Entry? = null + private var dragX = 0f + private var dragY = 0f + private var dragging = false + private var moved = false + private var toolbarDrag = false + private var safe = Rect() + private var tint = ControllerPrefs.STEAM_BLUE + + init { + ControllerPrefs.screenKeys(context).forEach { key -> entries += entryOf(key) } + } + + var followSteam = false + set(value) { + if (field == value) return + field = value + invalidate() + } + + var steamStyle: () -> Pair<Int, Float>? = { null } + + var onAdd: (() -> Unit)? = null + var onSelect: ((List<Int>) -> Unit)? = null + var onEditingChanged: ((Boolean) -> Unit)? = null + var onTouchMiss: ((MotionEvent) -> Unit)? = null + + private val fillPaint = Paint(Paint.ANTI_ALIAS_FLAG) + private val strokePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE } + private val ringPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE } + private val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + textAlign = Paint.Align.CENTER + typeface = Typeface.DEFAULT_BOLD + } + private val gridPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE } + private val rect = RectF() + private val bodyPathRect = RectF() + private val bodyPath = android.graphics.Path() + private val clipPath = android.graphics.Path() + private val imageRect = RectF() + private val bitmapRect = RectF() + + private val capsuleRadius = dp(24f) + private val capsuleGap = dp(62f) + private val toolbar = PointF() + private val addCenter = PointF() + private val doneCenter = PointF() + + fun startEditing() { + if (editing) return + editing = true + releaseAll() + selected = null + placeToolbar() + invalidate() + onEditingChanged?.invoke(true) + } + + fun stopEditing() { + if (!editing) return + releaseAll() + editing = false + selected = null + save() + invalidate() + onEditingChanged?.invoke(false) + } + + fun add(codes: List<Int>) { + if (codes.isEmpty()) return + entries.firstOrNull { it.codes == codes }?.let { + selected = it + invalidate() + return + } + val entry = Entry(codes) + if (addX >= 0f && width > 0) { + entry.x = (addX / width).coerceIn(0.05f, 0.95f) + entry.y = (addY / height).coerceIn(0.05f, 0.95f) + } else { + entry.x = (0.30f + 0.08f * (entries.size % 5)).coerceAtMost(0.70f) + entry.y = 0.62f + } + addX = -1f + addY = -1f + entries += entry + if (width > 0) measure(entry) + selected = entry + save() + invalidate() + } + + fun remove(codes: List<Int>) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + entries.remove(entry) + if (selected === entry) selected = null + save() + invalidate() + } + + fun setCodes(from: List<Int>, to: List<Int>): ScreenKey? { + if (to.isEmpty()) return null + val index = entries.indexOfFirst { it.codes == from } + if (index < 0) return null + val old = entries[index] + if (to != from && entries.any { it !== old && it.codes == to }) return null + val fresh = Entry(to).also { + it.glyph = old.glyph + it.text = old.text + it.image = old.image + it.bitmap = old.bitmap + it.bitmapFor = old.bitmapFor + it.x = old.x + it.y = old.y + it.size = old.size + it.opacity = old.opacity + it.shape = old.shape + it.toggle = old.toggle + it.labels = old.labels + } + entries[index] = fresh + measure(fresh) + if (selected === old) selected = fresh + save() + invalidate() + return stateOf(fresh.codes) + } + + fun setText(codes: List<Int>, text: String) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + entry.text = text + measure(entry) + save() + invalidate() + } + + fun setImage(codes: List<Int>, image: String) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + val previous = entry.image + entry.image = image + entry.bitmap = null + entry.bitmapFor = "" + if (previous.isNotEmpty() && previous != image) File(File(context.filesDir, IMAGE_DIR), previous).delete() + measure(entry) + save() + invalidate() + } + + fun resize(codes: List<Int>, size: Int) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + entry.size = size.coerceIn(MIN_SIZE, MAX_SIZE) + measure(entry) + save() + invalidate() + } + + fun setOpacity(codes: List<Int>, opacity: Float) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + entry.opacity = opacity.coerceIn(0.2f, 1f) + save() + invalidate() + } + + fun setShape(codes: List<Int>, shape: Int) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + entry.shape = shape.coerceIn(SCREEN_KEY_PILL, SCREEN_KEY_STICK) + measure(entry) + save() + invalidate() + } + + fun setToggle(codes: List<Int>, toggle: Boolean) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + entry.toggle = toggle + if (!toggle && latched.remove(entry)) release(entry) + save() + invalidate() + } + + fun setLabels(codes: List<Int>, labels: Boolean) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + entry.labels = labels + save() + invalidate() + } + + fun setDirection(codes: List<Int>, index: Int, code: Int): ScreenKey? { + val entry = entries.firstOrNull { it.codes == codes } ?: entries.firstOrNull { it.codes == trimmed(codes) } ?: return null + val next = entry.codes.toMutableList() + while (next.size <= index) next += 0 + next[index] = code + val nextCodes = trimmed(next) + if (entries.any { it !== entry && it.codes == nextCodes }) return null + val updated = Entry(nextCodes).also { + it.glyph = entry.glyph + it.text = entry.text + it.image = entry.image + it.bitmap = entry.bitmap + it.bitmapFor = entry.bitmapFor + it.x = entry.x + it.y = entry.y + it.size = entry.size + it.opacity = entry.opacity + it.shape = entry.shape + it.toggle = entry.toggle + it.labels = entry.labels + } + entries[entries.indexOf(entry)] = updated + measure(updated) + if (selected === entry) selected = updated + save() + invalidate() + return stateOf(updated.codes) + } + + private fun trimmed(codes: List<Int>): List<Int> = codes.dropLastWhile { it == 0 }.ifEmpty { listOf(0) } + + fun stateOf(codes: List<Int>): ScreenKey? = entries.firstOrNull { it.codes == codes }?.let { + ScreenKey(it.codes, it.x, it.y, it.size, it.glyph, it.text, it.image, it.opacity, it.shape, it.toggle, it.labels) + } + + fun deselect() { + if (selected == null) return + selected = null + invalidate() + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + refreshAppearance() + } + + fun refreshAppearance() { + tint = ControllerPrefs.read(context).tint + invalidate() + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + entries.forEach { measure(it) } + placeToolbar() + } + + override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { + val cutout = if (Build.VERSION.SDK_INT >= 28) insets.displayCutout else null + val fresh = Rect( + cutout?.safeInsetLeft ?: 0, cutout?.safeInsetTop ?: 0, + cutout?.safeInsetRight ?: 0, cutout?.safeInsetBottom ?: 0, + ) + if (fresh != safe) { + safe = fresh + placeToolbar() + invalidate() + } + return super.onApplyWindowInsets(insets) + } + + override fun onDetachedFromWindow() { + releaseAll() + super.onDetachedFromWindow() + } + + override fun onVisibilityChanged(changedView: View, visibility: Int) { + super.onVisibilityChanged(changedView, visibility) + if (visibility != VISIBLE) releaseAll() + } + + override fun setVisibility(visibility: Int) { + super.setVisibility(visibility) + if (visibility != VISIBLE) releaseAll() + } + + fun releaseAll() { + dpadDown.values.forEach { releaseKey(it) } + dpadDown.clear() + entries.forEach { it.armed = -1 } + stickCodes.values.flatten().forEach { if (it != 0) releaseKey(it) } + stickCodes.clear() + stickEntries.clear() + down.values.forEach { release(it) } + down.clear() + latched.toList().forEach { release(it) } + latched.clear() + invalidate() + } + + private fun snap(value: Float) = if (width > 0) round(value / (width / 100f)) * (width / 100f) else value + + private fun placeToolbar() { + if (width == 0 || height == 0) return + if (toolbar.x == 0f && toolbar.y == 0f) { + toolbar.set(width - safe.right - capsuleGap - capsuleRadius, height - safe.bottom - capsuleRadius - dp(20f)) + } + addCenter.set(toolbar.x - capsuleGap / 2f, toolbar.y) + doneCenter.set(toolbar.x + capsuleGap / 2f, toolbar.y) + } + + private fun entryOf(key: ScreenKey): Entry = Entry(key.codes).also { + it.glyph = key.glyph + it.text = key.text + it.image = key.image + it.x = key.x + it.y = key.y + it.size = key.size + it.opacity = key.opacity + it.shape = key.shape + it.toggle = key.toggle + it.labels = key.labels + } + + private fun label(entry: Entry) = when { + entry.text.isNotEmpty() -> entry.text + entry.glyph.isNotEmpty() -> entry.glyph + else -> screenKeyLabel(context, entry.codes) + } + + private fun bitmapFor(entry: Entry): Bitmap? { + if (entry.image.isEmpty()) return null + if (entry.bitmapFor == entry.image) return entry.bitmap + val file = File(File(context.filesDir, IMAGE_DIR), entry.image) + val bitmap = if (file.isFile) BitmapFactory.decodeFile(file.absolutePath) else null + entry.bitmap = bitmap + entry.bitmapFor = entry.image + return bitmap + } + + private fun measure(entry: Entry) { + val h = dp(entry.size.toFloat()) + entry.halfH = h / 2f + entry.halfW = when { + entry.shape == SCREEN_KEY_CIRCLE -> entry.halfH + entry.shape == SCREEN_KEY_TRIGGER -> entry.halfH * 1.7f + entry.shape == SCREEN_KEY_DPAD || entry.shape == SCREEN_KEY_STICK -> entry.halfH * 1.15f + entry.image.isNotEmpty() -> entry.halfH * 1.15f + hasIcon(entry) -> entry.halfH * 1.15f + else -> { + val chars = label(entry).length + entry.halfH * (0.55f * chars + 1.05f).coerceIn(1.7f, 4.6f) + } + } + entry.cx = entry.x * width + entry.cy = entry.y * height + } + + private fun hasIcon(entry: Entry): Boolean = + entry.text.isEmpty() && entry.glyph.isEmpty() && entry.codes.size == 1 && ScreenKeyIcons.has(entry.codes[0]) + + private fun unit() = minOf(width / 1280f, height / 720f) + + private fun accent(): Pair<Int, Float> { + val style = if (followSteam) steamStyle() else null + return (style?.first ?: tint) to (style?.second ?: 1f) + } + + private fun tinted(color: Int, alpha: Float): Int { + val scale = accent().second + return Color.argb( + (alpha * scale * 255f).toInt().coerceIn(0, 255), + Color.red(color), Color.green(color), Color.blue(color), + ) + } + + private fun triggerPath(entry: Entry, path: android.graphics.Path, inset: Float = 0f) { + val lean = (entry.halfH - inset) * 0.6f + val left = entry.cx - entry.halfW + inset + val right = entry.cx + entry.halfW - inset + val top = entry.cy - entry.halfH + inset + val bottom = entry.cy + entry.halfH - inset + path.reset() + path.moveTo(left + lean, top) + path.lineTo(right, top) + path.lineTo(right - lean, bottom) + path.lineTo(left, bottom) + path.close() + } + + private fun body(canvas: Canvas, entry: Entry, radius: Float, paint: Paint, inset: Float = 0f) { + if (entry.shape != SCREEN_KEY_TRIGGER) { + canvas.drawRoundRect(rect, radius, radius, paint) + return + } + triggerPath(entry, bodyPath, inset) + canvas.drawPath(bodyPath, paint) + } + + private fun drawDpad(canvas: Canvas, entry: Entry) { + val color = accent().first + val alpha = entry.opacity + val r = minOf(entry.halfW, entry.halfH) + val t = r * 0.42f + val hairline = maxOf(dp(1.2f), entry.halfH * 0.032f) + val engaged = entry.armed >= 0 + crossPath(entry, bodyPath, r, t) + fillPaint.style = Paint.Style.FILL + fillPaint.color = tinted(color, if (entry.armed >= 0) 0.26f * alpha else 0.10f * alpha) + canvas.drawPath(bodyPath, fillPaint) + if (entry.armed >= 0) { + armRect(entry, bodyPathRect, entry.armed, r, t) + fillPaint.color = tinted(color, 0.55f * alpha) + canvas.drawRoundRect(bodyPathRect, t * 0.6f, t * 0.6f, fillPaint) + } + strokePaint.strokeJoin = Paint.Join.ROUND + strokePaint.strokeWidth = if (engaged) hairline * 1.6f else hairline + strokePaint.color = tinted(color, (if (editing) 0.90f else 0.80f) * alpha) + canvas.drawPath(bodyPath, strokePaint) + textPaint.setShadowLayer(0f, 0f, 0f, 0) + fillPaint.color = tinted(color, if (editing) 0.90f else 0.80f) + DPAD_DIRS.forEachIndexed { index, dir -> + val on = entry.armed == index + val code = entry.codes.getOrNull(index) ?: 0 + val name = if (code == 0) "" else screenKeyLabel(context, listOf(code)) + if (entry.labels && name.isNotEmpty()) { + textPaint.color = if (on) Color.WHITE else tinted(color, alpha) + textPaint.textSize = dp(48f) + val fit = 48f * (t * 1.9f) / textPaint.measureText(name).coerceAtLeast(1f) + textPaint.textSize = minOf(fit, t * 1.7f).coerceIn(dp(8f), dp(60f)) + val tx = entry.cx + dir.first * (r - t * 0.6f) + val ty = entry.cy + dir.second * (r - t * 0.6f) + canvas.drawText(name, tx, ty - (textPaint.ascent() + textPaint.descent()) / 2f, textPaint) + } else { + fillPaint.color = if (on) Color.WHITE else tinted(color, if (editing) 0.90f else 0.80f) + arrow(canvas, fillPaint, entry.cx, entry.cy, r - t * 0.55f, dir.first, dir.second, t * 0.8f) + } + } + if (editing && selected === entry) { + ringPaint.strokeWidth = hairline * 0.8f + ringPaint.color = tinted(color, 0.9f) + ringPaint.style = Paint.Style.STROKE + canvas.drawCircle(entry.cx, entry.cy, r + hairline * 3f, ringPaint) + } + } + + private fun crossPath(entry: Entry, path: android.graphics.Path, r: Float, t: Float) { + val cx = entry.cx + val cy = entry.cy + path.reset() + path.moveTo(cx - t, cy - r) + path.lineTo(cx + t, cy - r) + path.lineTo(cx + t, cy - t) + path.lineTo(cx + r, cy - t) + path.lineTo(cx + r, cy + t) + path.lineTo(cx + t, cy + t) + path.lineTo(cx + t, cy + r) + path.lineTo(cx - t, cy + r) + path.lineTo(cx - t, cy + t) + path.lineTo(cx - r, cy + t) + path.lineTo(cx - r, cy - t) + path.lineTo(cx - t, cy - t) + path.close() + } + + private fun armRect(entry: Entry, rect: RectF, index: Int, r: Float, t: Float) { + when (index) { + 0 -> rect.set(entry.cx - t, entry.cy - r, entry.cx + t, entry.cy - t) + 1 -> rect.set(entry.cx + t, entry.cy - t, entry.cx + r, entry.cy + t) + 2 -> rect.set(entry.cx - t, entry.cy + t, entry.cx + t, entry.cy + r) + else -> rect.set(entry.cx - r, entry.cy - t, entry.cx - t, entry.cy + t) + } + } + + private fun arrow(canvas: Canvas, paint: Paint, cx: Float, cy: Float, dist: Float, dx: Float, dy: Float, size: Float) { + val tipX = cx + dx * dist + val tipY = cy + dy * dist + val baseX = cx + dx * (dist - size) + val baseY = cy + dy * (dist - size) + val nx = -dy * size * 0.62f + val ny = dx * size * 0.62f + bodyPath.reset() + bodyPath.moveTo(tipX, tipY) + bodyPath.lineTo(baseX + nx, baseY + ny) + bodyPath.lineTo(baseX - nx, baseY - ny) + bodyPath.close() + canvas.drawPath(bodyPath, paint) + } + + private fun armOf(entry: Entry, x: Float, y: Float): Int { + val dx = x - entry.cx + val dy = y - entry.cy + return if (abs(dx) > abs(dy)) (if (dx > 0f) 1 else 3) else (if (dy > 0f) 2 else 0) + } + + private fun drawStick(canvas: Canvas, entry: Entry) { + val color = accent().first + val alpha = entry.opacity + val engaged = entry.armed >= 0 + val radius = minOf(entry.halfW, entry.halfH) + val hairline = maxOf(dp(1.2f), entry.halfH * 0.032f) + fillPaint.style = Paint.Style.FILL + fillPaint.color = tinted(color, 0.14f * alpha) + canvas.drawCircle(entry.cx, entry.cy, radius - hairline, fillPaint) + strokePaint.strokeWidth = if (engaged) hairline * 1.6f else hairline + strokePaint.color = tinted(color, (if (editing) 0.90f else 0.80f) * alpha) + canvas.drawCircle(entry.cx, entry.cy, radius - hairline / 2f, strokePaint) + val dir = if (engaged) STICK_DIRS[entry.armed.coerceIn(0, 7)] else 0f to 0f + val knob = radius * 0.36f + fillPaint.color = tinted(color, if (engaged) 0.55f * alpha else 0.24f * alpha) + canvas.drawCircle(entry.cx + dir.first * radius * 0.40f, entry.cy + dir.second * radius * 0.40f, knob, fillPaint) + strokePaint.strokeWidth = hairline + strokePaint.color = tinted(color, (if (editing) 0.90f else 0.80f) * alpha) + canvas.drawCircle(entry.cx + dir.first * radius * 0.40f, entry.cy + dir.second * radius * 0.40f, knob, strokePaint) + textPaint.setShadowLayer(0f, 0f, 0f, 0) + STICK_DIRS.forEachIndexed { index, unit -> + val on = entry.armed == index + val code = entry.codes.getOrNull(index) ?: 0 + val name = if (code == 0) "" else screenKeyLabel(context, listOf(code)) + if (entry.labels && name.isNotEmpty()) { + textPaint.color = if (on) Color.WHITE else tinted(color, 0.85f * alpha) + textPaint.textSize = dp(48f) + val fit = 48f * (radius * 0.34f) / textPaint.measureText(name).coerceAtLeast(1f) + textPaint.textSize = minOf(fit, radius * 0.22f).coerceAtLeast(dp(6f)) + val tx = entry.cx + unit.first * radius * 0.66f + val ty = entry.cy + unit.second * radius * 0.66f + canvas.drawText(name, tx, ty - (textPaint.ascent() + textPaint.descent()) / 2f, textPaint) + } else { + fillPaint.color = if (on) Color.WHITE else tinted(color, if (editing) 0.88f else 0.72f) + arrow(canvas, fillPaint, entry.cx, entry.cy, radius * 0.88f, unit.first, unit.second, radius * 0.16f) + } + } + if (editing && selected === entry) { + ringPaint.strokeWidth = hairline * 0.8f + ringPaint.color = tinted(color, 0.9f) + ringPaint.style = Paint.Style.STROKE + canvas.drawCircle(entry.cx, entry.cy, radius + hairline * 3f, ringPaint) + } + } + + private fun directionCodes(entry: Entry, index: Int): List<Int> { + if (index < 0) return emptyList() + val code = entry.codes.getOrNull(index) ?: 0 + if (code != 0) return listOf(code) + if (entry.shape != SCREEN_KEY_STICK || index % 2 == 0) return emptyList() + return listOfNotNull( + entry.codes.getOrNull((index + 7) % 8)?.takeIf { it != 0 }, + entry.codes.getOrNull((index + 1) % 8)?.takeIf { it != 0 }, + ) + } + + private fun stickSector(entry: Entry, x: Float, y: Float): Int { + val dx = x - entry.cx + val dy = y - entry.cy + if (hypot(dx, dy) < minOf(entry.halfW, entry.halfH) * 0.24f) return -1 + val degrees = Math.toDegrees(kotlin.math.atan2(dy, dx).toDouble()).toFloat() + val index = (round(degrees / 45f).toInt() + 2) % 8 + return (index + 8) % 8 + } + + private fun radiusOf(entry: Entry): Float = when (entry.shape) { + SCREEN_KEY_ROUND -> entry.halfH * 0.30f + SCREEN_KEY_RECT -> entry.halfH * 0.12f + SCREEN_KEY_TRIGGER -> entry.halfH * 0.45f + else -> entry.halfH + } + + private fun entryAt(x: Float, y: Float): Entry? = entries.lastOrNull { entry -> + x >= entry.cx - entry.halfW && x <= entry.cx + entry.halfW && y >= entry.cy - entry.halfH && y <= entry.cy + entry.halfH + } + + private fun inCircle(center: PointF, x: Float, y: Float, radius: Float) = hypot(x - center.x, y - center.y) <= radius + + private fun inToolbar(x: Float, y: Float): Boolean = + editing && x >= toolbar.x - capsuleGap / 2f - capsuleRadius && x <= toolbar.x + capsuleGap / 2f + capsuleRadius && + y >= toolbar.y - capsuleRadius && y <= toolbar.y + capsuleRadius + + override fun onDraw(canvas: Canvas) { + if (editing) drawGrid(canvas) + entries.forEach { draw(canvas, it) } + if (editing) { + drawGuides(canvas) + drawToolbar(canvas) + } + } + + private fun drawGuides(canvas: Canvas) { + if (guideX < 0f && guideY < 0f) return + gridPaint.strokeWidth = dp(1f) + gridPaint.color = tinted(accent().first, 0.9f) + if (guideX >= 0f) canvas.drawLine(guideX, 0f, guideX, height.toFloat(), gridPaint) + if (guideY >= 0f) canvas.drawLine(0f, guideY, width.toFloat(), guideY, gridPaint) + } + + private fun drawGrid(canvas: Canvas) { + if (width == 0 || height == 0) return + val step = width / 100f + gridPaint.strokeWidth = dp(1f) + gridPaint.color = Color.argb(38, 255, 255, 255) + var x = step + while (x < width) { + canvas.drawLine(x, 0f, x, height.toFloat(), gridPaint) + x += step + } + var y = step + while (y < height) { + canvas.drawLine(0f, y, width.toFloat(), y, gridPaint) + y += step + } + gridPaint.color = Color.argb(96, 255, 255, 255) + gridPaint.strokeWidth = dp(1f) + canvas.drawLine(width / 2f, 0f, width / 2f, height.toFloat(), gridPaint) + canvas.drawLine(0f, height / 2f, width.toFloat(), height / 2f, gridPaint) + } + + private fun draw(canvas: Canvas, entry: Entry) { + if (entry.shape == SCREEN_KEY_DPAD) { + drawDpad(canvas, entry) + return + } + if (entry.shape == SCREEN_KEY_STICK) { + drawStick(canvas, entry) + return + } + val style = if (followSteam) steamStyle() else null + val engaged = down.values.any { it === entry } || latched.contains(entry) + val bitmap = bitmapFor(entry) + val icon = bitmap == null && hasIcon(entry) + val frameless = entry.text.isBlank() && (bitmap != null || icon) + val alpha = entry.opacity + val h2 = entry.halfH * 2f + val radius = radiusOf(entry) + val selectedNow = editing && selected === entry + val hairline = maxOf(dp(1.2f), h2 * 0.032f) + rect.set(entry.cx - entry.halfW, entry.cy - entry.halfH, entry.cx + entry.halfW, entry.cy + entry.halfH) + val inkColor: Int + if (style != null) { + val inkAlpha = (255f * style.second * alpha).toInt().coerceIn(30, 255) + inkColor = Color.argb(inkAlpha, Color.red(style.first), Color.green(style.first), Color.blue(style.first)) + fillPaint.style = Paint.Style.FILL + if (engaged) { + fillPaint.color = Color.argb((inkAlpha * 0.85f).toInt(), 230, 233, 236) + body(canvas, entry, radius, fillPaint) + } + if (frameless) { + if (engaged) { + fillPaint.color = Color.argb((inkAlpha * 0.45f).toInt(), 230, 233, 236) + body(canvas, entry, radius, fillPaint) + } + } else { + strokePaint.color = if (selectedNow) Color.rgb(26, 159, 255) else inkColor + strokePaint.strokeWidth = if (engaged) hairline * 1.6f else hairline + body(canvas, entry, radius, strokePaint) + } + } else { + fillPaint.style = Paint.Style.FILL + if (!frameless) { + fillPaint.color = tinted(BODY, 0.60f * alpha) + canvas.drawRoundRect(rect, radius, radius, fillPaint) + } + if (engaged) { + fillPaint.color = tinted(accent().first, if (frameless) 0.32f * alpha else 0.42f * alpha) + canvas.drawRoundRect(rect, radius, radius, fillPaint) + } + if (!frameless) { + strokePaint.strokeWidth = if (engaged) hairline * 1.6f else hairline + strokePaint.color = tinted( + accent().first, + (if (engaged) 0.96f else if (editing) 0.80f else 0.68f) * alpha, + ) + body(canvas, entry, radius, strokePaint) + } + inkColor = if (engaged) Color.WHITE else tinted(accent().first, alpha) + } + if (editing && selected === entry) { + ringPaint.strokeWidth = hairline * 0.8f + ringPaint.color = tinted(accent().first, 0.9f) + val gap = hairline * 2.4f + rect.set( + entry.cx - entry.halfW - gap, entry.cy - entry.halfH - gap, + entry.cx + entry.halfW + gap, entry.cy + entry.halfH + gap, + ) + if (entry.shape == SCREEN_KEY_TRIGGER) { + body(canvas, entry, radius + gap, ringPaint, gap) + } else { + canvas.drawRoundRect(rect, radius + gap, radius + gap, ringPaint) + } + rect.set(entry.cx - entry.halfW, entry.cy - entry.halfH, entry.cx + entry.halfW, entry.cy + entry.halfH) + } + + if (bitmap != null) { + imageRect.set(rect) + canvas.save() + clipPath.reset() + when (entry.shape) { + SCREEN_KEY_CIRCLE -> clipPath.addCircle( + entry.cx, entry.cy, minOf(entry.halfW, entry.halfH), android.graphics.Path.Direction.CW, + ) + SCREEN_KEY_TRIGGER -> triggerPath(entry, clipPath, 0f) + else -> clipPath.addRoundRect(rect, radius, radius, android.graphics.Path.Direction.CW) + } + canvas.clipPath(clipPath) + val scale = maxOf(imageRect.width() / bitmap.width, imageRect.height() / bitmap.height) + val w = bitmap.width * scale + val h = bitmap.height * scale + bitmapRect.set( + imageRect.centerX() - w / 2f, imageRect.centerY() - h / 2f, + imageRect.centerX() + w / 2f, imageRect.centerY() + h / 2f, + ) + canvas.drawBitmap(bitmap, null, bitmapRect, fillPaint) + canvas.restore() + } + + val name = label(entry) + textPaint.color = inkColor + if (bitmap != null && name.isEmpty()) return + var iconDrawn = false + if (icon) { + val box = minOf(entry.halfW, entry.halfH) * 1.35f + iconDrawn = ScreenKeyIcons.draw(canvas, entry.codes[0], entry.cx, entry.cy, box, textPaint) + textPaint.color = inkColor + } + if (iconDrawn || name.isEmpty()) return + val overImage = bitmap != null + if (overImage) textPaint.color = Color.WHITE + textPaint.setShadowLayer(if (overImage) dp(3f) else 0f, 0f, 0f, Color.argb(200, 0, 0, 0)) + textPaint.textSize = dp(48f) + val available = rect.width() - hairline * 4f + val fit = 48f * available / textPaint.measureText(name).coerceAtLeast(1f) + textPaint.textSize = minOf(fit, entry.halfH * 1.15f).coerceIn(dp(8f), dp(120f)) + canvas.drawText(name, entry.cx, entry.cy - (textPaint.ascent() + textPaint.descent()) / 2f, textPaint) + textPaint.clearShadowLayer() + } + + private fun drawToolbar(canvas: Canvas) { + val (color, _) = accent() + val capsule = RectF( + toolbar.x - capsuleGap / 2f - capsuleRadius, toolbar.y - capsuleRadius, + toolbar.x + capsuleGap / 2f + capsuleRadius, toolbar.y + capsuleRadius, + ) + fillPaint.style = Paint.Style.FILL + fillPaint.color = tinted(color, 0.30f) + canvas.drawRoundRect(capsule, capsuleRadius, capsuleRadius, fillPaint) + strokePaint.strokeWidth = dp(1.5f) + strokePaint.color = tinted(color, 0.85f) + canvas.drawRoundRect(capsule, capsuleRadius, capsuleRadius, strokePaint) + + textPaint.color = Color.WHITE + textPaint.setShadowLayer(0f, 0f, 0f, 0) + textPaint.textSize = capsuleRadius * 1.15f + val plus = "+" + canvas.drawText(plus, addCenter.x, addCenter.y - (textPaint.ascent() + textPaint.descent()) / 2f, textPaint) + val path = android.graphics.Path() + val check = capsuleRadius * 0.42f + path.moveTo(doneCenter.x - check, doneCenter.y) + path.lineTo(doneCenter.x - check * 0.25f, doneCenter.y + check * 0.7f) + path.lineTo(doneCenter.x + check, doneCenter.y - check * 0.7f) + ringPaint.strokeWidth = dp(3f) + ringPaint.strokeCap = Paint.Cap.ROUND + ringPaint.color = Color.WHITE + canvas.drawPath(path, ringPaint) + ringPaint.strokeCap = Paint.Cap.BUTT + } + + override fun onTouchEvent(event: MotionEvent): Boolean = if (editing) editTouch(event) else playTouch(event) + + private fun playTouch(event: MotionEvent): Boolean { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> { + val index = event.actionIndex + val entry = entryAt(event.getX(index), event.getY(index)) + if (entry == null) { + if (event.actionMasked == MotionEvent.ACTION_DOWN) return false + forwardedPointerBits = forwardedPointerBits or (1 shl event.getPointerId(index)) + forwardPointers(event, forwardedPointerBits) + return true + } + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) + if (entry.shape == SCREEN_KEY_DPAD) { + val arm = armOf(entry, event.getX(index), event.getY(index)) + val code = entry.codes.getOrNull(arm) ?: 0 + if (code == 0) return true + val pid = event.getPointerId(index) + dpadDown.remove(pid)?.let { releaseKey(it) } + dpadDown[pid] = code + entry.armed = arm + pressKey(code) + invalidate() + return true + } + if (entry.shape == SCREEN_KEY_STICK) { + val sector = stickSector(entry, event.getX(index), event.getY(index)) + val pid = event.getPointerId(index) + stickCodes.remove(pid)?.forEach { if (it != 0) releaseKey(it) } + val codes = directionCodes(entry, sector) + stickEntries[pid] = entry + stickCodes[pid] = codes + entry.armed = if (codes.isEmpty()) -1 else sector + codes.forEach { pressKey(it) } + invalidate() + return true + } + if (entry.toggle) { + if (latched.remove(entry)) release(entry) else { + latched += entry + entry.codes.forEach { pressKey(it) } + } + invalidate() + return true + } + if (down.values.any { it === entry }) return true + down[event.getPointerId(index)] = entry + entry.codes.forEach { pressKey(it) } + invalidate() + return true + } + + MotionEvent.ACTION_MOVE -> { + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) + if (stickEntries.isEmpty()) return true + repeat(event.pointerCount) { index -> + val pid = event.getPointerId(index) + val entry = stickEntries[pid] ?: return@repeat + val sector = stickSector(entry, event.getX(index), event.getY(index)) + val codes = directionCodes(entry, sector) + val previous = stickCodes[pid].orEmpty() + if (codes != previous) { + previous.filterNot { it in codes }.forEach { releaseKey(it) } + codes.filterNot { it in previous }.forEach { pressKey(it) } + stickCodes[pid] = codes + entry.armed = if (codes.isEmpty()) -1 else sector + invalidate() + } + } + return true + } + + MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> { + val pid = event.getPointerId(event.actionIndex) + if (forwardedPointerBits and (1 shl pid) != 0) { + forwardPointers(event, forwardedPointerBits) + forwardedPointerBits = forwardedPointerBits and (1 shl pid).inv() + if (stickCodes.containsKey(pid) || dpadDown.containsKey(pid)) return true + down.remove(pid)?.let(::release) + return true + } + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) + if (stickCodes.containsKey(pid)) { + stickCodes.remove(pid)?.forEach { if (it != 0) releaseKey(it) } + stickEntries.remove(pid)?.armed = -1 + invalidate() + return true + } + val armedCode = dpadDown.remove(pid) + if (armedCode != null) { + releaseKey(armedCode) + entries.firstOrNull { it.armed >= 0 && it.codes.contains(armedCode) }?.armed = -1 + invalidate() + return true + } + val entry = down.remove(pid) + if (entry != null) release(entry) + return true + } + + MotionEvent.ACTION_CANCEL -> { + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) + forwardedPointerBits = 0 + stickCodes.values.flatten().forEach { if (it != 0) releaseKey(it) } + stickCodes.clear() + stickEntries.clear() + entries.forEach { it.armed = -1 } + dpadDown.values.forEach { releaseKey(it) } + dpadDown.clear() + entries.forEach { it.armed = -1 } + down.values.forEach { release(it) } + down.clear() + return true + } + } + return true + } + + private fun forwardPointers(event: MotionEvent, pointerIdBits: Int) { + val indices = (0 until event.pointerCount).filter { index -> + pointerIdBits and (1 shl event.getPointerId(index)) != 0 + } + if (indices.isEmpty()) return + val actionIndex = indices.indexOf(event.actionIndex) + val action = when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> if (actionIndex >= 0) MotionEvent.ACTION_DOWN else MotionEvent.ACTION_MOVE + MotionEvent.ACTION_POINTER_DOWN -> if (actionIndex >= 0) { + if (indices.size == 1) MotionEvent.ACTION_DOWN + else MotionEvent.ACTION_POINTER_DOWN or (actionIndex shl MotionEvent.ACTION_POINTER_INDEX_SHIFT) + } else MotionEvent.ACTION_MOVE + MotionEvent.ACTION_UP -> if (actionIndex >= 0) MotionEvent.ACTION_UP else MotionEvent.ACTION_MOVE + MotionEvent.ACTION_POINTER_UP -> if (actionIndex >= 0) { + if (indices.size == 1) MotionEvent.ACTION_UP + else MotionEvent.ACTION_POINTER_UP or (actionIndex shl MotionEvent.ACTION_POINTER_INDEX_SHIFT) + } else MotionEvent.ACTION_MOVE + else -> event.action + } + val properties = Array(indices.size) { MotionEvent.PointerProperties() } + val coordinates = Array(indices.size) { MotionEvent.PointerCoords() } + indices.forEachIndexed { target, source -> + event.getPointerProperties(source, properties[target]) + event.getPointerCoords(source, coordinates[target]) + } + val split = MotionEvent.obtain( + event.downTime, event.eventTime, action, indices.size, properties, coordinates, + event.metaState, event.buttonState, event.xPrecision, event.yPrecision, + event.deviceId, event.edgeFlags, event.source, event.flags, + ) + try { + onTouchMiss?.invoke(split) + } finally { + split.recycle() + } + } + + private fun editTouch(event: MotionEvent): Boolean { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> { + val x = event.x + val y = event.y + if (inCircle(addCenter, x, y, capsuleRadius)) { + onAdd?.invoke() + return true + } + if (inCircle(doneCenter, x, y, capsuleRadius)) { + stopEditing() + return true + } + if (inToolbar(x, y)) { + toolbarDrag = true + dragX = toolbar.x - x + dragY = toolbar.y - y + return true + } + val entry = entryAt(x, y) + if (entry == null) { + pressX = x + pressY = y + postDelayed(addPress, 520) + selected = null + invalidate() + return true + } + selected = entry + dragging = true + moved = false + dragX = entry.cx - x + dragY = entry.cy - y + invalidate() + return true + } + + MotionEvent.ACTION_MOVE -> { + if (toolbarDrag) { + val maxX = width - safe.right - capsuleGap / 2f - capsuleRadius + val maxY = height - safe.bottom - capsuleRadius + toolbar.x = (event.x + dragX).coerceIn(safe.left + capsuleGap / 2f + capsuleRadius, maxOf(safe.left + capsuleGap / 2f + capsuleRadius, maxX)) + toolbar.y = (event.y + dragY).coerceIn(safe.top + capsuleRadius, maxOf(safe.top + capsuleRadius, maxY)) + addCenter.set(toolbar.x - capsuleGap / 2f, toolbar.y) + doneCenter.set(toolbar.x + capsuleGap / 2f, toolbar.y) + invalidate() + return true + } + val entry = selected + if (entry == null) { + if (hypot(event.x - pressX, event.y - pressY) > dp(10f)) removeCallbacks(addPress) + return true + } + if (!dragging) return true + if (hypot(event.x - (entry.cx - dragX), event.y - (entry.cy - dragY)) > dp(10f)) removeCallbacks(addPress) + var nextX = snap((event.x + dragX).coerceIn(entry.halfW + safe.left, width - entry.halfW - safe.right)) + var nextY = snap((event.y + dragY).coerceIn(entry.halfH + safe.top, height - entry.halfH - safe.bottom)) + guideX = -1f + guideY = -1f + entries.forEach { other -> + if (other === entry) return@forEach + if (abs(nextX - other.cx) < dp(8f)) { nextX = other.cx; guideX = other.cx } + if (abs(nextY - other.cy) < dp(8f)) { nextY = other.cy; guideY = other.cy } + } + if (abs(nextX - width / 2f) < dp(8f)) { nextX = width / 2f; guideX = nextX } + if (abs(nextY - height / 2f) < dp(8f)) { nextY = height / 2f; guideY = nextY } + if (hypot(nextX - entry.cx, nextY - entry.cy) > dp(4f)) moved = true + entry.cx = nextX + entry.cy = nextY + entry.x = entry.cx / width + entry.y = entry.cy / height + invalidate() + return true + } + + MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> { + removeCallbacks(addPress) + guideX = -1f + guideY = -1f + if (toolbarDrag) { + toolbarDrag = false + return true + } + val entry = selected + if (entry != null && dragging) { + dragging = false + if (moved) { + save() + invalidate() + } else { + onSelect?.invoke(entry.codes) + } + } + return true + } + } + return true + } + + private fun pressKey(code: Int) { + val owners = held[code] ?: 0 + held[code] = owners + 1 + if (owners == 0) sendKey(code, true) + } + + private fun releaseKey(code: Int) { + val owners = held[code] ?: return + if (owners > 1) { + held[code] = owners - 1 + return + } + held.remove(code) + sendKey(code, false) + } + + private fun release(entry: Entry) { + entry.codes.asReversed().forEach { releaseKey(it) } + invalidate() + } + + fun export(): String = ControllerPrefs.encodeScreenKeys( + entries.map { ScreenKey(it.codes, it.x, it.y, it.size, it.glyph, it.text, it.image, it.opacity, it.shape, it.toggle, it.labels) }, + ) + + fun load(raw: String) { + releaseAll() + entries.clear() + ControllerPrefs.decodeScreenKeys(raw).forEach { entries += entryOf(it) } + entries.forEach { measure(it) } + selected = null + save() + invalidate() + } + + private fun save() { + ControllerPrefs.setScreenKeys( + context, + entries.map { ScreenKey(it.codes, it.x, it.y, it.size, it.glyph, it.text, it.image, it.opacity, it.shape, it.toggle, it.labels) }, + ) + } + + private fun dp(value: Float) = value * resources.displayMetrics.density + + companion object { + private val DPAD_DIRS = listOf( + 0f to -1f, 1f to 0f, 0f to 1f, -1f to 0f, + ) + private val STICK_DIRS = listOf( + 0f to -1f, 0.7071f to -0.7071f, 1f to 0f, 0.7071f to 0.7071f, + 0f to 1f, -0.7071f to 0.7071f, -1f to 0f, -0.7071f to -0.7071f, + ) + const val DEFAULT_SIZE = 44 + const val MIN_SIZE = 24 + const val MAX_SIZE = 140 + const val IMAGE_DIR = "screenkeys" + private const val BODY = 0xFF14181F.toInt() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenLayoutFile.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenLayoutFile.kt new file mode 100644 index 0000000000..fc25940719 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/ScreenLayoutFile.kt @@ -0,0 +1,140 @@ +package com.droiddeck.launcher.input + +import org.json.JSONArray +import org.json.JSONObject +import kotlin.math.roundToInt + +private val ICP_NAMES: Map<Int, String> = mapOf( + 103 to "KEY_UP", 106 to "KEY_RIGHT", 108 to "KEY_DOWN", 105 to "KEY_LEFT", + 28 to "KEY_ENTER", 1 to "KEY_ESC", 14 to "KEY_BKSP", 111 to "KEY_DEL", 15 to "KEY_TAB", + 57 to "KEY_SPACE", 29 to "KEY_CTRL_L", 97 to "KEY_CTRL_R", 110 to "KEY_INSERT", + 42 to "KEY_SHIFT_L", 54 to "KEY_SHIFT_R", 56 to "KEY_ALT_L", 100 to "KEY_ALT_R", + 102 to "KEY_HOME", 107 to "KEY_END", 99 to "KEY_PRTSCN", 104 to "KEY_PG_UP", 109 to "KEY_PG_DOWN", + 58 to "KEY_CAPS_LOCK", 69 to "KEY_NUM_LOCK", 41 to "KEY_GRAVE", 12 to "KEY_MINUS", + 11 to "KEY_0", 2 to "KEY_1", 3 to "KEY_2", 4 to "KEY_3", 5 to "KEY_4", 6 to "KEY_5", + 7 to "KEY_6", 8 to "KEY_7", 9 to "KEY_8", 10 to "KEY_9", + 30 to "KEY_A", 48 to "KEY_B", 46 to "KEY_C", 32 to "KEY_D", 18 to "KEY_E", 33 to "KEY_F", + 34 to "KEY_G", 35 to "KEY_H", 23 to "KEY_I", 36 to "KEY_J", 37 to "KEY_K", 38 to "KEY_L", + 50 to "KEY_M", 49 to "KEY_N", 24 to "KEY_O", 25 to "KEY_P", 16 to "KEY_Q", 19 to "KEY_R", + 31 to "KEY_S", 20 to "KEY_T", 22 to "KEY_U", 47 to "KEY_V", 17 to "KEY_W", 45 to "KEY_X", + 21 to "KEY_Y", 44 to "KEY_Z", + 26 to "KEY_BRACKET_LEFT", 27 to "KEY_BRACKET_RIGHT", 43 to "KEY_BACKSLASH", 53 to "KEY_SLASH", + 39 to "KEY_SEMICOLON", 51 to "KEY_COMMA", 52 to "KEY_PERIOD", 40 to "KEY_APOSTROPHE", + 59 to "KEY_F1", 60 to "KEY_F2", 61 to "KEY_F3", 62 to "KEY_F4", 63 to "KEY_F5", 64 to "KEY_F6", + 65 to "KEY_F7", 66 to "KEY_F8", 67 to "KEY_F9", 68 to "KEY_F10", 87 to "KEY_F11", 88 to "KEY_F12", + 79 to "KEY_KP_1", 80 to "KEY_KP_2", 81 to "KEY_KP_3", 75 to "KEY_KP_4", 76 to "KEY_KP_5", + 77 to "KEY_KP_6", 71 to "KEY_KP_7", 72 to "KEY_KP_8", 73 to "KEY_KP_9", 82 to "KEY_KP_0", +) + +private val ICP_CODES: Map<String, Int> = ICP_NAMES.entries.associate { (code, name) -> name to code } + +private fun icpShape(shape: Int): String = when (shape) { + SCREEN_KEY_CIRCLE -> "CIRCLE" + SCREEN_KEY_RECT -> "RECT" + SCREEN_KEY_ROUND -> "ROUND_RECT" + SCREEN_KEY_DPAD -> "ROUND_RECT" + SCREEN_KEY_STICK -> "ROUND_RECT" + SCREEN_KEY_TRIGGER -> "ROUND_RECT" + else -> "ROUND_RECT" +} + +private fun screenKeyShape(shape: String): Int = when (shape) { + "CIRCLE" -> SCREEN_KEY_CIRCLE + "RECT" -> SCREEN_KEY_RECT + "SQUARE" -> SCREEN_KEY_ROUND + else -> SCREEN_KEY_PILL +} + +fun exportScreenLayout(keys: List<ScreenKey>, widthPx: Int, density: Float): String { + val snap = widthPx / 100f + val elements = JSONArray() + keys.forEach { key -> + val binds = JSONArray() + val directional = key.shape == SCREEN_KEY_DPAD || key.shape == SCREEN_KEY_STICK + key.codes.forEach { code -> + val name = ICP_NAMES[code] + if (name != null) binds.put(name) else if (directional) binds.put("") + } + if (binds.length() == 0) return@forEach + val shape = icpShape(key.shape) + val sizePx = key.size * density + val scale = when { + key.shape == SCREEN_KEY_DPAD -> sizePx * 2.3f / (14f * snap) + key.shape == SCREEN_KEY_STICK -> sizePx * 2.3f / (14f * snap) + shape == "CIRCLE" -> sizePx / (6f * snap) + else -> sizePx / (4f * snap) + } + elements.put( + JSONObject() + .put( + "type", + when (key.shape) { + SCREEN_KEY_DPAD -> "D_PAD" + SCREEN_KEY_STICK -> "STICK" + else -> "BUTTON" + }, + ) + .put("shape", shape) + .put("customColor", 0) + .put("bindings", binds) + .put("scale", scale) + .put("x", key.x) + .put("y", key.y) + .put("toggleSwitch", key.toggle) + .put("swipeable", false) + .put("text", key.text) + .put("iconId", 0) + .apply { if (key.opacity < 1f) put("opacity", key.opacity) }, + ) + } + return JSONObject() + .put("id", 0) + .put("name", "DroidDeck") + .put("cursorSpeed", 1.5f) + .put("elements", elements) + .toString() +} + +fun importScreenLayout(raw: String, widthPx: Int, density: Float): List<ScreenKey>? { + val root = runCatching { JSONObject(raw) }.getOrNull() ?: return null + val elements = root.optJSONArray("elements") ?: return null + val snap = widthPx / 100f + val keys = mutableListOf<ScreenKey>() + for (i in 0 until elements.length()) { + val element = elements.optJSONObject(i) ?: continue + val type = element.optString("type", "BUTTON") + if (type != "BUTTON" && type != "D_PAD" && type != "STICK") continue + val binds = element.optJSONArray("bindings") ?: continue + val raw = (0 until binds.length()).map { ICP_CODES[binds.optString(it)] ?: 0 } + val codes = if (type == "D_PAD" || type == "STICK") { + raw.dropLastWhile { it == 0 }.ifEmpty { listOf(0) } + } else { + raw.filter { it != 0 } + } + if (codes.isEmpty()) continue + val dpad = type == "D_PAD" + val stick = type == "STICK" + val shape = when { + dpad -> SCREEN_KEY_DPAD + stick -> SCREEN_KEY_STICK + else -> screenKeyShape(element.optString("shape")) + } + val scale = element.optDouble("scale", 1.0).toFloat().takeIf { it > 0f } ?: 1f + val sizePx = when { + dpad || stick -> 14f * snap * scale / 2.3f + shape == SCREEN_KEY_CIRCLE -> 6f * snap * scale + else -> 4f * snap * scale + } + keys += ScreenKey( + codes = codes, + x = element.optDouble("x", 0.5).toFloat().coerceIn(0f, 1f), + y = element.optDouble("y", 0.5).toFloat().coerceIn(0f, 1f), + size = (sizePx / density).roundToInt().coerceIn(ScreenKeys.MIN_SIZE, ScreenKeys.MAX_SIZE), + text = element.optString("text").take(24), + opacity = element.optDouble("opacity", 1.0).toFloat().coerceIn(0.2f, 1f), + shape = shape, + toggle = element.optBoolean("toggleSwitch"), + ) + } + return keys +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt index 1c6921a890..ca5157372a 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt @@ -93,7 +93,10 @@ class SteamTouchControls( private var opened = 0 private var elements: List<Element> = emptyList() private var tint = Color.WHITE - private var alphaScale = 0.45f + private var alphaScale = 0.99f + var style: Pair<Int, Float> = Color.WHITE to 0.99f + private set + var onStyle: (() -> Unit)? = null private class Visual(val ref: SteamTouchBindings.Ref?, val binding: SteamTouchBindings.Binding?) private var visuals: Map<Int, List<Visual>> = emptyMap() @@ -191,6 +194,8 @@ class SteamTouchControls( private fun applyColor(color: FloatArray?) { tint = if (color != null) Color.rgb((color[0] * 255).toInt(), (color[1] * 255).toInt(), (color[2] * 255).toInt()) else Color.WHITE alphaScale = ((color?.get(3) ?: 0.45f) * 2.2f).coerceIn(0.15f, 1f) + style = tint to alphaScale + onStyle?.invoke() } private fun rebuildVisuals() { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt index 0fc5762777..6c68c9cfc6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt @@ -1,7 +1,9 @@ package com.droiddeck.launcher.ui import com.droiddeck.launcher.R -import androidx.annotation.StringRes +import com.droiddeck.launcher.input.PC_KEY_ROWS +import com.droiddeck.launcher.input.PC_MODIFIERS +import com.droiddeck.launcher.input.PcKey import androidx.compose.ui.res.stringResource import android.view.KeyEvent import androidx.compose.animation.animateColorAsState @@ -54,46 +56,6 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -private data class PcKey(val label: String, val code: Int, val weight: Float = 1f, val shifted: String? = null, @StringRes val labelRes: Int = 0) - -private fun k(label: String, code: Int, weight: Float = 1f, shifted: String? = null) = PcKey(label, code, weight, shifted) - -private fun k(@StringRes labelRes: Int, code: Int, weight: Float = 1f) = PcKey("", code, weight, null, labelRes) - -private val ROWS: List<List<PcKey>> = listOf( - listOf( - k(R.string.pckb_key_esc, 1), k("F1", 59), k("F2", 60), k("F3", 61), k("F4", 62), k("F5", 63), k("F6", 64), - k("F7", 65), k("F8", 66), k("F9", 67), k("F10", 68), k("F11", 87), k("F12", 88), - k(R.string.pckb_key_ins, 110), k(R.string.pckb_key_del, 111), k(R.string.pckb_key_home, 102), k(R.string.pckb_key_end, 107), k(R.string.pckb_key_pgup, 104), k(R.string.pckb_key_pgdn, 109), - ), - listOf( - k("`", 41, shifted = "~"), k("1", 2, shifted = "!"), k("2", 3, shifted = "@"), k("3", 4, shifted = "#"), - k("4", 5, shifted = "$"), k("5", 6, shifted = "%"), k("6", 7, shifted = "^"), k("7", 8, shifted = "&"), - k("8", 9, shifted = "*"), k("9", 10, shifted = "("), k("0", 11, shifted = ")"), k("-", 12, shifted = "_"), - k("=", 13, shifted = "+"), k(R.string.pckb_key_backspace, 14, 2f), - ), - listOf( - k(R.string.pckb_key_tab, 15, 1.5f), k("q", 16), k("w", 17), k("e", 18), k("r", 19), k("t", 20), k("y", 21), - k("u", 22), k("i", 23), k("o", 24), k("p", 25), k("[", 26, shifted = "{"), k("]", 27, shifted = "}"), - k("\\", 43, 1.5f, shifted = "|"), - ), - listOf( - k(R.string.pckb_key_caps, 58, 1.75f), k("a", 30), k("s", 31), k("d", 32), k("f", 33), k("g", 34), k("h", 35), - k("j", 36), k("k", 37), k("l", 38), k(";", 39, shifted = ":"), k("'", 40, shifted = "\""), - k(R.string.pckb_key_enter, 28, 2.25f), - ), - listOf( - k(R.string.pckb_key_shift, 42, 2.25f), k("z", 44), k("x", 45), k("c", 46), k("v", 47), k("b", 48), k("n", 49), - k("m", 50), k(",", 51, shifted = "<"), k(".", 52, shifted = ">"), k("/", 53, shifted = "?"), - k(R.string.pckb_key_shift, 54, 1.75f), k("↑", 103), - ), - listOf( - k(R.string.pckb_key_ctrl, 29, 1.5f), k(R.string.pckb_key_super, 125, 1.25f), k(R.string.pckb_key_alt, 56, 1.25f), k(R.string.pckb_key_space, 57, 6.25f), - k(R.string.pckb_key_altgr, 100, 1.25f), k(R.string.pckb_key_ctrl, 97, 1.25f), k("←", 105), k("↓", 108), k("→", 106), - ), -) - -private val MODIFIERS = setOf(42, 54, 29, 97, 56, 100, 125) private const val MOD_OFF = 0 private const val MOD_ONCE = 1 private const val MOD_LOCKED = 2 @@ -115,7 +77,7 @@ fun PcKeyboard( for ((code, state) in mods.toMap()) if (state == MOD_ONCE) { sendKey(code, false); mods[code] = MOD_OFF } } fun press(key: PcKey) { - if (key.code in MODIFIERS) { + if (key.code in PC_MODIFIERS) { when (mods[key.code] ?: MOD_OFF) { MOD_OFF -> { sendKey(key.code, true); mods[key.code] = MOD_ONCE } MOD_ONCE -> mods[key.code] = MOD_LOCKED @@ -126,7 +88,7 @@ fun PcKeyboard( sendKey(key.code, true) } fun release(key: PcKey) { - if (key.code in MODIFIERS) return + if (key.code in PC_MODIFIERS) return sendKey(key.code, false) if (key.code == 58) capsOn = !capsOn releaseOnceModifiers() @@ -153,7 +115,7 @@ fun PcKeyboard( Spacer(Modifier.width(8.dp)) HeaderButton(stringResource(R.string.pckb_hide), onClose) } - ROWS.forEachIndexed { r, row -> + PC_KEY_ROWS.forEachIndexed { r, row -> Row(horizontalArrangement = Arrangement.spacedBy(3.dp), modifier = Modifier.fillMaxWidth().height(rowHeight)) { row.forEachIndexed { i, key -> val state = mods[key.code] ?: MOD_OFF diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyEditor.kt new file mode 100644 index 0000000000..3cb99d6051 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyEditor.kt @@ -0,0 +1,368 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.net.Uri +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.gestures.detectDragGestures +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.BasicTextField +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.DragIndicator +import androidx.compose.material.icons.filled.Image +import androidx.compose.material.icons.filled.Keyboard +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Slider +import androidx.compose.material3.Surface +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.IntOffset +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.input.SCREEN_KEY_CIRCLE +import com.droiddeck.launcher.input.SCREEN_KEY_DPAD +import com.droiddeck.launcher.input.SCREEN_KEY_PILL +import com.droiddeck.launcher.input.SCREEN_KEY_RECT +import com.droiddeck.launcher.input.SCREEN_KEY_ROUND +import com.droiddeck.launcher.input.SCREEN_KEY_STICK +import com.droiddeck.launcher.input.SCREEN_KEY_TRIGGER +import com.droiddeck.launcher.input.ScreenKeys +import com.droiddeck.launcher.input.pcKeyLabel +import com.droiddeck.launcher.input.screenKeyDirections +import java.io.File +import kotlin.math.roundToInt + +private val PANEL_WIDTH = 600.dp +private val CHIP_PADDING = androidx.compose.foundation.layout.PaddingValues(horizontal = 6.dp, vertical = 2.dp) + +@Composable +fun ScreenKeyEditor( + codes: List<Int>, + keyY: Float, + size: Int, + opacity: Float, + shape: Int, + toggle: Boolean, + labels: Boolean, + text: String, + hasImage: Boolean, + onResize: (Int) -> Unit, + onOpacity: (Float) -> Unit, + onShape: (Int) -> Unit, + onToggle: (Boolean) -> Unit, + onLabels: (Boolean) -> Unit, + onText: (String) -> Unit, + onImage: (String) -> Unit, + onClearImage: () -> Unit, + onBind: () -> Unit, + onTextFocus: () -> Unit, + onTextBlur: () -> Unit, + onDirection: (Int) -> Unit, + onRemove: () -> Unit, + onDismiss: () -> Unit, +) { + val p = LocalPalette.current + val context = LocalContext.current + var offset by remember(codes) { mutableStateOf(Offset.Zero) } + val density = LocalDensity.current + val screen = LocalConfiguration.current + val panelWidthPx = with(density) { PANEL_WIDTH.toPx() } + val screenWidthPx = screen.screenWidthDp * density.density + val screenHeightPx = screen.screenHeightDp * density.density + val atTop = keyY > 0.45f + val button = shape <= SCREEN_KEY_RECT + val directions = screenKeyDirections(shape) + val pickImage = rememberLauncherForActivityResult(ActivityResultContracts.GetContent()) { uri -> + if (uri != null) importImage(context, uri, codes)?.let(onImage) + } + Box( + Modifier.fillMaxSize().systemBarsPadding().padding(horizontal = 10.dp, vertical = 6.dp), + contentAlignment = if (atTop) Alignment.TopCenter else Alignment.BottomCenter, + ) { + Surface( + Modifier.widthIn(max = PANEL_WIDTH).fillMaxWidth() + .offset { IntOffset(offset.x.roundToInt(), offset.y.roundToInt()) }, + shape = RoundedCornerShape(18.dp), + color = p.background, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2), + ) { + Column(Modifier.padding(start = 10.dp, end = 6.dp, top = 2.dp, bottom = 6.dp)) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Icon( + Icons.Default.DragIndicator, null, + tint = p.onBackground.copy(alpha = 0.45f), + modifier = Modifier.pointerInput(panelWidthPx, screenWidthPx, screenHeightPx) { + detectDragGestures { change, drag -> + change.consume() + offset = Offset( + (offset.x + drag.x).coerceIn( + -(screenWidthPx - panelWidthPx) / 2f + 8f, + (screenWidthPx - panelWidthPx) / 2f - 8f, + ), + (offset.y + drag.y).coerceIn( + -screenHeightPx * if (atTop) 0f else 0.75f, + screenHeightPx * if (atTop) 0.75f else 0f, + ), + ) + } + }, + ) + Box( + Modifier.weight(1f).height(36.dp) + .background(p.line2.copy(alpha = 0.24f), RoundedCornerShape(9.dp)) + .padding(horizontal = 10.dp), + contentAlignment = Alignment.CenterStart, + ) { + BasicTextField( + value = text, + onValueChange = { onText(it.take(24)) }, + singleLine = true, + textStyle = TextStyle( + color = p.onBackground, fontSize = 13.sp, + fontWeight = FontWeight.Medium, + ), + cursorBrush = androidx.compose.ui.graphics.SolidColor(p.primary), + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), + modifier = Modifier.fillMaxWidth().onFocusChanged { + if (it.isFocused) onTextFocus() else onTextBlur() + }, + ) + if (text.isEmpty()) { + Text( + stringResource(R.string.screen_key_text), + color = p.onBackground.copy(alpha = 0.4f), + style = MaterialTheme.typography.bodySmall, + ) + } + } + if (button) { + IconButton(onClick = onBind, modifier = Modifier.width(38.dp)) { + Icon( + Icons.Default.Keyboard, stringResource(R.string.screen_key_bind), + tint = p.onBackground.copy(alpha = 0.8f), + ) + } + } + IconButton(onClick = { pickImage.launch("image/*") }, modifier = Modifier.width(38.dp)) { + Icon( + Icons.Default.Image, stringResource(R.string.screen_key_image), + tint = p.onBackground.copy(alpha = 0.8f), + ) + } + if (hasImage) IconButton(onClick = onClearImage, modifier = Modifier.width(34.dp)) { + Icon(Icons.Default.Close, stringResource(R.string.screen_key_image_clear), tint = p.error) + } + IconButton(onClick = onRemove, modifier = Modifier.width(38.dp)) { + Icon(Icons.Default.Delete, stringResource(R.string.common_delete), tint = p.error) + } + IconButton(onClick = onDismiss, modifier = Modifier.width(34.dp)) { + Icon(Icons.Default.Close, null, tint = p.onBackground) + } + } + Row( + Modifier.fillMaxWidth().padding(vertical = 2.dp), + horizontalArrangement = Arrangement.spacedBy(4.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + listOf<Pair<Int?, Int>>( + (if (button) SCREEN_KEY_PILL else null) to R.string.screen_key_type_button, + SCREEN_KEY_TRIGGER to R.string.screen_key_shape_trigger, + SCREEN_KEY_DPAD to R.string.touch_dpad, + SCREEN_KEY_STICK to R.string.deck_surface_stick, + ).forEach { (value, label) -> + val selected = if (value == null) button else shape == value + Chip(stringResource(label), selected, Modifier.weight(1f)) { + onShape(if (value == null) (if (button) shape else SCREEN_KEY_PILL) else value) + } + } + Box(Modifier.width(1.dp).height(20.dp).background(p.line2)) + listOf( + SCREEN_KEY_PILL to R.string.screen_key_shape_pill, + SCREEN_KEY_ROUND to R.string.screen_key_shape_round, + SCREEN_KEY_CIRCLE to R.string.screen_key_shape_circle, + SCREEN_KEY_RECT to R.string.screen_key_shape_rect, + ).forEach { (value, label) -> + Chip( + stringResource(label), button && shape == value, Modifier.weight(1f), enabled = button, + ) { onShape(value) } + } + Box(Modifier.width(1.dp).height(20.dp).background(p.line2)) + Text( + stringResource(R.string.screen_key_toggle), Modifier.padding(start = 6.dp, end = 2.dp), + style = MaterialTheme.typography.bodySmall, maxLines = 1, + ) + Switch(checked = toggle, onCheckedChange = onToggle, modifier = Modifier.height(30.dp)) + } + if (directions.isNotEmpty()) { + Row( + Modifier.fillMaxWidth().padding(vertical = 2.dp), + horizontalArrangement = Arrangement.spacedBy(4.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + directions.forEachIndexed { index, arrow -> + val code = codes.getOrNull(index) ?: 0 + Chip( + if (code == 0) arrow else "$arrow ${pcKeyLabel(context, code)}", + code != 0, Modifier.weight(1f), + ) { onDirection(index) } + } + Text( + stringResource(R.string.screen_key_text), Modifier.padding(start = 6.dp, end = 2.dp), + style = MaterialTheme.typography.bodySmall, maxLines = 1, + ) + Switch(checked = labels, onCheckedChange = onLabels, modifier = Modifier.height(30.dp)) + } + } + Row( + Modifier.fillMaxWidth().padding(top = 2.dp), + horizontalArrangement = Arrangement.spacedBy(6.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + KeySlider( + label = stringResource(R.string.screen_key_size), + value = "$size", + current = size.toFloat(), + min = ScreenKeys.MIN_SIZE.toFloat(), + max = ScreenKeys.MAX_SIZE.toFloat(), + modifier = Modifier.weight(1f), + ) { onResize(it.roundToInt()) } + KeySlider( + label = stringResource(R.string.screen_key_opacity), + value = "${(opacity * 100).roundToInt()}%", + current = opacity, + min = 0.2f, + max = 1f, + modifier = Modifier.weight(1f), + onChange = onOpacity, + ) + } + } + } + } +} + +@Composable +private fun KeySlider( + label: String, + value: String, + current: Float, + min: Float, + max: Float, + modifier: Modifier, + onChange: (Float) -> Unit, +) { + Row(modifier, verticalAlignment = Alignment.CenterVertically) { + Text(label, style = MaterialTheme.typography.bodySmall, maxLines = 1) + Slider(current, onChange, Modifier.weight(1f).height(28.dp), valueRange = min..max) + Text( + value, Modifier.width(32.dp), style = MaterialTheme.typography.bodySmall, + fontWeight = FontWeight.SemiBold, maxLines = 1, + ) + } +} + +@Composable +private fun Chip( + label: String, + selected: Boolean, + modifier: Modifier = Modifier, + enabled: Boolean = true, + onClick: () -> Unit, +) { + val p = LocalPalette.current + Box( + modifier + .background( + if (selected) p.primary.copy(alpha = 0.18f) else p.line2.copy(alpha = 0.28f), + CircleShape, + ) + .clickable(enabled = enabled, onClick = onClick) + .padding(vertical = 6.dp), + contentAlignment = Alignment.Center, + ) { + Text( + label, style = MaterialTheme.typography.labelSmall, maxLines = 1, overflow = TextOverflow.Ellipsis, + color = when { + !enabled -> p.onBackground.copy(alpha = 0.28f) + selected -> p.primary + else -> p.onBackground.copy(alpha = 0.7f) + }, + ) + } +} + +private fun importImage(context: Context, uri: Uri, codes: List<Int>): String? { + val dir = File(context.filesDir, ScreenKeys.IMAGE_DIR).apply { mkdirs() } + val name = "key_" + codes.joinToString("_") + "_" + System.currentTimeMillis() + ".png" + val longest = (ScreenKeys.MAX_SIZE * context.resources.displayMetrics.density).toInt() + return runCatching { + val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true } + context.contentResolver.openInputStream(uri)?.use { BitmapFactory.decodeStream(it, null, bounds) } + val source = maxOf(bounds.outWidth, bounds.outHeight) + if (source <= 0) return@runCatching null + var sample = 1 + while (source / (sample * 2) >= longest) sample *= 2 + val bitmap = context.contentResolver.openInputStream(uri)?.use { + BitmapFactory.decodeStream(it, null, BitmapFactory.Options().apply { inSampleSize = sample }) + } ?: return@runCatching null + val scale = longest.toFloat() / maxOf(bitmap.width, bitmap.height) + val scaled = if (scale < 1f) { + Bitmap.createScaledBitmap( + bitmap, + (bitmap.width * scale).toInt().coerceAtLeast(1), + (bitmap.height * scale).toInt().coerceAtLeast(1), + true, + ) + } else { + bitmap + } + try { + val saved = File(dir, name).outputStream().use { scaled.compress(Bitmap.CompressFormat.PNG, 100, it) } + if (saved) name else null + } finally { + if (scaled !== bitmap) bitmap.recycle() + scaled.recycle() + } + }.getOrNull().also { if (it == null) File(dir, name).delete() } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyPicker.kt b/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyPicker.kt new file mode 100644 index 0000000000..787854d080 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyPicker.kt @@ -0,0 +1,168 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.Button +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.window.Dialog +import androidx.compose.ui.window.DialogProperties +import com.droiddeck.launcher.R +import com.droiddeck.launcher.input.PC_KEYS +import com.droiddeck.launcher.input.PC_KEY_ROWS +import com.droiddeck.launcher.input.PC_MODIFIERS +import com.droiddeck.launcher.input.PcKey +import com.droiddeck.launcher.input.pcKeyLabel + +@Composable +fun ScreenKeyPicker( + onDismiss: () -> Unit, + onAdd: (List<Int>) -> Unit, + initial: List<Int> = emptyList(), + sequence: Boolean = false, + sequenceLimit: Int = 4, + slots: List<String> = emptyList(), +) { + var picked by remember { mutableStateOf(initial) } + val p = LocalPalette.current + val toggle: (Int) -> Unit = { code -> + picked = if (sequence) { + if (code in picked) picked - code else (picked + code).take(sequenceLimit) + } else if (code in PC_MODIFIERS) { + if (code in picked) picked - code else picked + code + } else { + picked.filter { it in PC_MODIFIERS } + code + } + } + val rows = remember { + val functionRow = PC_KEY_ROWS[0] + val nav = listOfNotNull(PC_KEYS[110], PC_KEYS[111], PC_KEYS[102], PC_KEYS[107], PC_KEYS[104], PC_KEYS[109]) + + listOfNotNull(PC_KEYS[103], PC_KEYS[105], PC_KEYS[108], PC_KEYS[106]) + listOf(functionRow.take(13), nav) + PC_KEY_ROWS.drop(1) + } + val unit = remember { rows.maxOf { row -> row.fold(0f) { sum, key -> sum + key.weight } } } + Dialog(onDismissRequest = onDismiss, properties = DialogProperties(usePlatformDefaultWidth = false)) { + Box(Modifier.fillMaxSize().systemBarsPadding().padding(10.dp), contentAlignment = Alignment.Center) { + Surface( + Modifier.widthIn(max = 820.dp).fillMaxWidth().fillMaxHeight(), shape = RoundedCornerShape(20.dp), + color = p.background, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2), + ) { + Column { + Row(Modifier.fillMaxWidth().padding(start = 16.dp, end = 6.dp), verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.screen_keys_add), Modifier.weight(1f), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + IconButton(onClick = onDismiss) { Icon(Icons.Default.Close, null) } + } + Row( + Modifier.fillMaxWidth().heightIn(min = 26.dp).horizontalScroll(rememberScrollState()).padding(horizontal = 16.dp), + horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically, + ) { + if (sequence && slots.size >= sequenceLimit) { + slots.take(sequenceLimit).forEachIndexed { index, arrow -> + val code = picked.getOrNull(index) + Surface( + shape = RoundedCornerShape(8.dp), + color = if (code == null) p.line2.copy(alpha = 0.2f) else p.primary.copy(alpha = 0.16f), + modifier = if (code == null) Modifier else Modifier.clickable { picked = picked - code }, + ) { + Text( + if (code == null) arrow else "$arrow ${pcKeyLabel(LocalContext.current, code)}", + Modifier.padding(horizontal = 8.dp, vertical = 2.dp), + style = MaterialTheme.typography.labelMedium, + ) + } + } + } else { + picked.forEach { code -> + Surface( + shape = RoundedCornerShape(8.dp), color = p.primary.copy(alpha = 0.16f), + modifier = Modifier.clickable { picked = picked - code }, + ) { + Text(pcKeyLabel(LocalContext.current, code), Modifier.padding(horizontal = 8.dp, vertical = 2.dp), style = MaterialTheme.typography.labelMedium) + } + } + } + } + LazyColumn(Modifier.weight(1f).fillMaxWidth(), contentPadding = PaddingValues(vertical = 6.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { + items(rows.size) { index -> + val row = rows[index] + Row( + Modifier.fillMaxWidth().padding(horizontal = 16.dp), + horizontalArrangement = Arrangement.spacedBy(4.dp), + ) { + row.forEach { key -> KeyCell(key, key.code in picked, Modifier.weight(key.weight)) { toggle(key.code) } } + if (row.sumOf { it.weight.toDouble() } < unit) { + Spacer(Modifier.weight(unit - row.fold(0f) { sum, key -> sum + key.weight })) + } + } + } + } + Row(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Button( + onClick = { onAdd(picked) }, + enabled = picked.isNotEmpty(), + modifier = Modifier.weight(1f), + ) { + Text(stringResource(R.string.screen_keys_add)) + } + } + } + } + } + } +} + +@Composable +private fun KeyCell(key: PcKey, selected: Boolean, modifier: Modifier, onClick: () -> Unit) { + val p = LocalPalette.current + val label = pcKeyLabel(LocalContext.current, key.code) + Surface( + shape = RoundedCornerShape(8.dp), + color = if (selected) p.primary.copy(alpha = 0.2f) else p.surface, + border = BorderStroke(1.dp, if (selected) p.primary else p.line), + modifier = modifier.height(36.dp).clickable(onClick = onClick), + ) { + Box(Modifier.fillMaxSize().padding(horizontal = 2.dp), contentAlignment = Alignment.Center) { + Text( + label, style = MaterialTheme.typography.labelMedium, maxLines = 1, + overflow = TextOverflow.Ellipsis, + fontSize = if (label.length > 4) 10.sp else 12.sp, + ) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ScreenLayoutPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/ScreenLayoutPanel.kt new file mode 100644 index 0000000000..7e195d5e8c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/ScreenLayoutPanel.kt @@ -0,0 +1,138 @@ +package com.droiddeck.launcher.ui + +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.Button +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog +import androidx.compose.ui.window.DialogProperties +import com.droiddeck.launcher.R + +@Composable +fun ScreenLayoutPanel( + layouts: List<String>, + onSave: (String) -> Unit, + onLoad: (String) -> Unit, + onDelete: (String) -> Unit, + onImport: (String) -> Unit, + exportText: () -> String, + onDismiss: () -> Unit, +) { + val p = LocalPalette.current + val context = LocalContext.current + var naming by remember { mutableStateOf(false) } + var name by remember { mutableStateOf("") } + + val importer = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri -> + if (uri == null) return@rememberLauncherForActivityResult + val text = runCatching { + context.contentResolver.openInputStream(uri)?.use { it.readBytes().toString(Charsets.UTF_8) } + }.getOrNull() + if (text != null) onImport(text) + } + val exporter = rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/json")) { uri -> + if (uri == null) return@rememberLauncherForActivityResult + runCatching { context.contentResolver.openOutputStream(uri)?.use { it.write(exportText().toByteArray()) } } + } + + Dialog(onDismissRequest = onDismiss, properties = DialogProperties(usePlatformDefaultWidth = false)) { + Box(Modifier.fillMaxSize().systemBarsPadding().padding(16.dp), contentAlignment = Alignment.Center) { + Surface( + Modifier.widthIn(max = 520.dp).fillMaxWidth(), shape = RoundedCornerShape(22.dp), + color = p.background, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2), + ) { + Column(Modifier.padding(start = 20.dp, end = 8.dp, top = 6.dp, bottom = 12.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text( + stringResource(R.string.screen_key_layout), Modifier.weight(1f), + style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold, + ) + IconButton(onClick = onDismiss) { Icon(Icons.Default.Close, null) } + } + Row(Modifier.fillMaxWidth().padding(end = 12.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + TextButton(onClick = { naming = true }) { Text(stringResource(R.string.screen_key_layout_save)) } + TextButton(onClick = { importer.launch(arrayOf("application/json", "text/plain", "*/*")) }) { + Text(stringResource(R.string.boot_movie_import)) + } + TextButton(onClick = { exporter.launch("droiddeck-layout.icp") }) { + Text(stringResource(R.string.screen_key_layout_export)) + } + } + Column(Modifier.padding(end = 12.dp).heightIn(max = 320.dp).verticalScroll(rememberScrollState())) { + layouts.forEach { layout -> + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text( + layout, Modifier.weight(1f).clickable { onLoad(layout) }.padding(vertical = 14.dp), + style = MaterialTheme.typography.bodyLarge, + ) + TextButton(onClick = { onDelete(layout) }) { + Text(stringResource(R.string.common_delete), color = p.error) + } + } + } + } + } + } + } + } + + if (naming) { + Dialog(onDismissRequest = { naming = false }, properties = DialogProperties(usePlatformDefaultWidth = false)) { + Box(Modifier.fillMaxSize().systemBarsPadding().padding(16.dp), contentAlignment = Alignment.Center) { + Surface( + Modifier.widthIn(max = 520.dp).fillMaxWidth(), shape = RoundedCornerShape(22.dp), + color = p.background, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2), + ) { + Column(Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) { + OutlinedTextField( + name, { name = it.take(24) }, Modifier.fillMaxWidth(), singleLine = true, + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), + ) + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) { + TextButton(onClick = { naming = false }) { Text(stringResource(R.string.common_cancel)) } + Button(onClick = { onSave(name.trim()); naming = false }, enabled = name.isNotBlank()) { + Text(stringResource(R.string.screen_key_layout_save)) + } + } + } + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index ecf43901d7..addb55473a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -261,6 +261,10 @@ class DrawerActions( val onLowLatencyTouch: (Boolean) -> Unit = {}, val onTouch: (String) -> Unit, val onGestureSettings: () -> Unit = {}, + val onScreenKeys: (() -> Unit)? = null, + val onScreenLayouts: (() -> Unit)? = null, + val screenKeysShown: Boolean = true, + val onScreenKeysShown: (Boolean) -> Unit = {}, val onFexPreset: (String) -> Unit, val onUpscaler: (Int) -> Unit = {}, val onUpscaleSharpness: (Int) -> Unit = {}, @@ -555,6 +559,23 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont ActionRow(stringResource(R.string.gesture_settings), stringResource(R.string.gesture_settings_hint), stringResource(R.string.ctrl_edit), a.onGestureSettings, modifier = focus.track(page, "gesture-settings")) + if (a.onScreenKeys != null) { + SettingsRow(stringResource(R.string.screen_keys), null) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(10.dp), + ) { + SecondaryButton(stringResource(R.string.ctrl_edit), + modifier = focus.track(page, "screen-keys"), onClick = a.onScreenKeys) + a.onScreenLayouts?.let { open -> + SecondaryButton(stringResource(R.string.screen_key_layout), + modifier = focus.track(page, "screen-key-layouts"), onClick = open) + } + ToggleSwitch(a.screenKeysShown, true, + modifier = focus.track(page, "screen-keys-shown"), onChange = a.onScreenKeysShown) + } + } + } ChoiceRow(host, "osc", stringResource(R.string.mode_osc), null, if (a.steam) listOf(SessionPrefs.OSC_AUTO to stringResource(R.string.common_auto), SessionPrefs.OSC_ALWAYS to stringResource(R.string.common_always), SessionPrefs.OSC_STEAM_TOUCH to stringResource(R.string.osc_steam_touch), SessionPrefs.OSC_STEAM_QAM to stringResource(R.string.mode_osc_qam), SessionPrefs.OSC_NEVER to stringResource(R.string.common_never)) else listOf(SessionPrefs.OSC_AUTO to stringResource(R.string.common_auto), SessionPrefs.OSC_ALWAYS to stringResource(R.string.common_always), SessionPrefs.OSC_NEVER to stringResource(R.string.common_never)), diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 5416c2d32e..fa1c13e5e5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">لمس Steam (تجريبي)</string> <string name="osc_style_next_session">تبدأ عناصر التحكم باللمس من Steam مع جلسة Steam التالية</string> <string name="osc_steam_layout">تخطيط لمس Steam</string> + <string name="screen_keys">مفاتيح الشاشة</string> + <string name="screen_keys_add">إضافة مفتاح</string> + <string name="screen_key_text">نص</string> + <string name="screen_key_size">الحجم</string> + <string name="screen_key_opacity">العتامة</string> + <string name="screen_key_type_button">مفتاح</string> + <string name="screen_key_shape_trigger">زناد</string> + <string name="screen_key_toggle">تبديل</string> + <string name="screen_key_layout_export">تصدير</string> + <string name="screen_key_shape_pill">كبسولة</string> + <string name="screen_key_shape_round">مستدير</string> + <string name="screen_key_shape_circle">دائرة</string> + <string name="screen_key_shape_rect">مستطيل</string> + <string name="screen_key_bind">مفتاح</string> + <string name="screen_key_image">صورة</string> + <string name="screen_key_image_clear">مسح</string> + <string name="screen_key_layout">التخطيط</string> + <string name="screen_key_layout_save">حفظ</string> <string name="osc_steam_layout_hint">انقل عناصر التحكم باللمس لهذه اللعبة أو غيّر حجمها أو أخفها؛ ويتم الحفظ في Steam</string> <string name="mode_controller">وحدة التحكم</string> <string name="mode_controller_hint">كيف يرى Steam وحدة التحكم لديك. يُطبَّق في الجلسة التالية.</string> diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 79b3ebf1be..acbf053f10 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Táctil de Steam (beta)</string> <string name="osc_style_next_session">Los controles táctiles de Steam se activan en la próxima sesión de Steam</string> <string name="osc_steam_layout">Disposición táctil de Steam</string> + <string name="screen_keys">Teclas en pantalla</string> + <string name="screen_keys_add">Agregar tecla</string> + <string name="screen_key_text">Texto</string> + <string name="screen_key_size">Tamaño</string> + <string name="screen_key_opacity">Opacidad</string> + <string name="screen_key_type_button">Tecla</string> + <string name="screen_key_shape_trigger">Gatillo</string> + <string name="screen_key_toggle">Alternar</string> + <string name="screen_key_layout_export">Exportar</string> + <string name="screen_key_shape_pill">Píldora</string> + <string name="screen_key_shape_round">Redondeado</string> + <string name="screen_key_shape_circle">Círculo</string> + <string name="screen_key_shape_rect">Rectángulo</string> + <string name="screen_key_bind">Tecla</string> + <string name="screen_key_image">Imagen</string> + <string name="screen_key_image_clear">Borrar</string> + <string name="screen_key_layout">Disposición</string> + <string name="screen_key_layout_save">Guardar</string> <string name="osc_steam_layout_hint">Mueve, cambia de tamaño u oculta los controles táctiles de este juego; se guarda en Steam</string> <string name="mode_controller">Control</string> <string name="mode_controller_hint">Cómo ve Steam tu control. Se aplica en la próxima sesión.</string> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 3c052c8586..137b761f8b 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Докосване в Steam (бета)</string> <string name="osc_style_next_session">Сензорните контроли на Steam ще стартират от следващата сесия на Steam</string> <string name="osc_steam_layout">Разположение на докосването в Steam</string> + <string name="screen_keys">Клавиши на екрана</string> + <string name="screen_keys_add">Добавяне на клавиш</string> + <string name="screen_key_text">Текст</string> + <string name="screen_key_size">Размер</string> + <string name="screen_key_opacity">Прозрачност</string> + <string name="screen_key_type_button">Клавиш</string> + <string name="screen_key_shape_trigger">Спускът</string> + <string name="screen_key_toggle">Превключване</string> + <string name="screen_key_layout_export">Експорт</string> + <string name="screen_key_shape_pill">Капсула</string> + <string name="screen_key_shape_round">Заоблено</string> + <string name="screen_key_shape_circle">Кръг</string> + <string name="screen_key_shape_rect">Правоъгълник</string> + <string name="screen_key_bind">Клавиш</string> + <string name="screen_key_image">Изображение</string> + <string name="screen_key_image_clear">Изчистване</string> + <string name="screen_key_layout">Разположение</string> + <string name="screen_key_layout_save">Запиши</string> <string name="osc_steam_layout_hint">Премествайте, преоразмерявайте или скривайте сензорните контроли на тази игра; записва се в Steam</string> <string name="mode_controller">Контролер</string> <string name="mode_controller_hint">Как Steam разпознава контролера ви. Прилага се от следващата сесия.</string> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 8dec40660e..d12e8ff408 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Dotykové ovládání Steamu (beta)</string> <string name="osc_style_next_session">Dotykové ovládání Steamu se spustí od příští relace Steamu</string> <string name="osc_steam_layout">Rozvržení dotykového ovládání Steamu</string> + <string name="screen_keys">Klávesy na obrazovce</string> + <string name="screen_keys_add">Přidat klávesu</string> + <string name="screen_key_text">Text</string> + <string name="screen_key_size">Velikost</string> + <string name="screen_key_opacity">Průhlednost</string> + <string name="screen_key_type_button">Klávesa</string> + <string name="screen_key_shape_trigger">Spoušť</string> + <string name="screen_key_toggle">Přepínač</string> + <string name="screen_key_layout_export">Exportovat</string> + <string name="screen_key_shape_pill">Kapsle</string> + <string name="screen_key_shape_round">Zaoblené</string> + <string name="screen_key_shape_circle">Kruh</string> + <string name="screen_key_shape_rect">Obdélník</string> + <string name="screen_key_bind">Klávesa</string> + <string name="screen_key_image">Obrázek</string> + <string name="screen_key_image_clear">Vymazat</string> + <string name="screen_key_layout">Rozložení</string> + <string name="screen_key_layout_save">Uložit</string> <string name="osc_steam_layout_hint">Přesuňte, změňte velikost nebo skryjte dotykové ovládání této hry; uloží se do Steamu</string> <string name="mode_controller">Ovladač</string> <string name="mode_controller_hint">Jak Steam vidí váš ovladač. Použije se od příští relace.</string> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 41e94a3c7c..caf758e572 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Steam-berøring (beta)</string> <string name="osc_style_next_session">Steams berøringskontroller starter med næste Steam-session</string> <string name="osc_steam_layout">Steam-berøringslayout</string> + <string name="screen_keys">Skærmtaster</string> + <string name="screen_keys_add">Tilføj tast</string> + <string name="screen_key_text">Tekst</string> + <string name="screen_key_size">Størrelse</string> + <string name="screen_key_opacity">Gennemsigtighed</string> + <string name="screen_key_type_button">Tast</string> + <string name="screen_key_shape_trigger">Udløser</string> + <string name="screen_key_toggle">Skift</string> + <string name="screen_key_layout_export">Eksportér</string> + <string name="screen_key_shape_pill">Kapsel</string> + <string name="screen_key_shape_round">Afrundet</string> + <string name="screen_key_shape_circle">Cirkel</string> + <string name="screen_key_shape_rect">Rektangel</string> + <string name="screen_key_bind">Tast</string> + <string name="screen_key_image">Billede</string> + <string name="screen_key_image_clear">Ryd</string> + <string name="screen_key_layout">Layout</string> + <string name="screen_key_layout_save">Gem</string> <string name="osc_steam_layout_hint">Flyt, tilpas størrelsen på eller skjul dette spils berøringskontroller; gemmes til Steam</string> <string name="mode_controller">Controller</string> <string name="mode_controller_hint">Hvordan Steam ser din controller. Gælder fra næste session.</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e4d34fe62a..fbdf383abb 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Steam-Touch (Beta)</string> <string name="osc_style_next_session">Steams Touch-Steuerung startet mit der nächsten Steam-Sitzung</string> <string name="osc_steam_layout">Steam-Touch-Layout</string> + <string name="screen_keys">Bildschirmtasten</string> + <string name="screen_keys_add">Taste hinzufügen</string> + <string name="screen_key_text">Text</string> + <string name="screen_key_size">Größe</string> + <string name="screen_key_opacity">Deckkraft</string> + <string name="screen_key_type_button">Taste</string> + <string name="screen_key_shape_trigger">Trigger</string> + <string name="screen_key_toggle">Umschalten</string> + <string name="screen_key_layout_export">Exportieren</string> + <string name="screen_key_shape_pill">Kapsel</string> + <string name="screen_key_shape_round">Rund</string> + <string name="screen_key_shape_circle">Kreis</string> + <string name="screen_key_shape_rect">Rechteck</string> + <string name="screen_key_bind">Taste</string> + <string name="screen_key_image">Bild</string> + <string name="screen_key_image_clear">Entfernen</string> + <string name="screen_key_layout">Layout</string> + <string name="screen_key_layout_save">Speichern</string> <string name="osc_steam_layout_hint">Touch-Steuerung dieses Spiels verschieben, skalieren oder ausblenden; wird in Steam gespeichert</string> <string name="mode_controller">Controller</string> <string name="mode_controller_hint">Wie Steam deinen Controller erkennt. Gilt ab der nächsten Sitzung.</string> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 3518c85469..7e21ae76cd 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Αφή Steam (beta)</string> <string name="osc_style_next_session">Τα χειριστήρια αφής του Steam ξεκινούν από την επόμενη συνεδρία Steam</string> <string name="osc_steam_layout">Διάταξη αφής Steam</string> + <string name="screen_keys">Πλήκτρα οθόνης</string> + <string name="screen_keys_add">Προσθήκη πλήκτρου</string> + <string name="screen_key_text">Κείμενο</string> + <string name="screen_key_size">Μέγεθος</string> + <string name="screen_key_opacity">Διαφάνεια</string> + <string name="screen_key_type_button">Πλήκτρο</string> + <string name="screen_key_shape_trigger">Σκανδάλη</string> + <string name="screen_key_toggle">Εναλλαγή</string> + <string name="screen_key_layout_export">Εξαγωγή</string> + <string name="screen_key_shape_pill">Κάψουλα</string> + <string name="screen_key_shape_round">Στρογγυλεμένο</string> + <string name="screen_key_shape_circle">Κύκλος</string> + <string name="screen_key_shape_rect">Ορθογώνιο</string> + <string name="screen_key_bind">Πλήκτρο</string> + <string name="screen_key_image">Εικόνα</string> + <string name="screen_key_image_clear">Εκκαθάριση</string> + <string name="screen_key_layout">Διάταξη</string> + <string name="screen_key_layout_save">Αποθήκευση</string> <string name="osc_steam_layout_hint">Μετακινήστε, αλλάξτε μέγεθος ή αποκρύψτε τα χειριστήρια αφής αυτού του παιχνιδιού· αποθηκεύεται στο Steam</string> <string name="mode_controller">Χειριστήριο</string> <string name="mode_controller_hint">Πώς βλέπει το Steam το χειριστήριό σας. Εφαρμόζεται στην επόμενη συνεδρία.</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ac6933cad1..1e3859f582 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Táctil de Steam (beta)</string> <string name="osc_style_next_session">Los controles táctiles de Steam se activan en la próxima sesión de Steam</string> <string name="osc_steam_layout">Disposición táctil de Steam</string> + <string name="screen_keys">Teclas en pantalla</string> + <string name="screen_keys_add">Añadir tecla</string> + <string name="screen_key_text">Texto</string> + <string name="screen_key_size">Tamaño</string> + <string name="screen_key_opacity">Opacidad</string> + <string name="screen_key_type_button">Tecla</string> + <string name="screen_key_shape_trigger">Gatillo</string> + <string name="screen_key_toggle">Alternar</string> + <string name="screen_key_layout_export">Exportar</string> + <string name="screen_key_shape_pill">Píldora</string> + <string name="screen_key_shape_round">Redondeado</string> + <string name="screen_key_shape_circle">Círculo</string> + <string name="screen_key_shape_rect">Rectángulo</string> + <string name="screen_key_bind">Tecla</string> + <string name="screen_key_image">Imagen</string> + <string name="screen_key_image_clear">Borrar</string> + <string name="screen_key_layout">Disposición</string> + <string name="screen_key_layout_save">Guardar</string> <string name="osc_steam_layout_hint">Mueve, cambia de tamaño u oculta los controles táctiles de este juego; se guarda en Steam</string> <string name="mode_controller">Mando</string> <string name="mode_controller_hint">Cómo ve Steam tu mando. Se aplica en la próxima sesión.</string> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 8359d4cf8c..30f3341610 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Steam-kosketus (beta)</string> <string name="osc_style_next_session">Steamin kosketusohjaimet otetaan käyttöön seuraavassa Steam-istunnossa</string> <string name="osc_steam_layout">Steamin kosketusasettelu</string> + <string name="screen_keys">Näytön näppäimet</string> + <string name="screen_keys_add">Lisää näppäin</string> + <string name="screen_key_text">Teksti</string> + <string name="screen_key_size">Koko</string> + <string name="screen_key_opacity">Peittävyys</string> + <string name="screen_key_type_button">Näppäin</string> + <string name="screen_key_shape_trigger">Liipaisin</string> + <string name="screen_key_toggle">Vaihda</string> + <string name="screen_key_layout_export">Vie</string> + <string name="screen_key_shape_pill">Kapseli</string> + <string name="screen_key_shape_round">Pyöristetty</string> + <string name="screen_key_shape_circle">Ympyrä</string> + <string name="screen_key_shape_rect">Suorakaide</string> + <string name="screen_key_bind">Näppäin</string> + <string name="screen_key_image">Kuva</string> + <string name="screen_key_image_clear">Tyhjennä</string> + <string name="screen_key_layout">Asettelu</string> + <string name="screen_key_layout_save">Tallenna</string> <string name="osc_steam_layout_hint">Siirrä, muuta kokoa tai piilota tämän pelin kosketusohjaimet; tallennetaan Steamiin</string> <string name="mode_controller">Ohjain</string> <string name="mode_controller_hint">Miten Steam näkee ohjaimesi. Tulee voimaan seuraavassa istunnossa.</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 18936f64a6..76bf5abc2c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Tactile Steam (bêta)</string> <string name="osc_style_next_session">Les commandes tactiles de Steam s\'activeront à la prochaine session Steam</string> <string name="osc_steam_layout">Disposition tactile Steam</string> + <string name="screen_keys">Touches à l\'écran</string> + <string name="screen_keys_add">Ajouter une touche</string> + <string name="screen_key_text">Texte</string> + <string name="screen_key_size">Taille</string> + <string name="screen_key_opacity">Opacité</string> + <string name="screen_key_type_button">Touche</string> + <string name="screen_key_shape_trigger">Gâchette</string> + <string name="screen_key_toggle">Basculer</string> + <string name="screen_key_layout_export">Exporter</string> + <string name="screen_key_shape_pill">Pilule</string> + <string name="screen_key_shape_round">Arrondi</string> + <string name="screen_key_shape_circle">Cercle</string> + <string name="screen_key_shape_rect">Rectangle</string> + <string name="screen_key_bind">Touche</string> + <string name="screen_key_image">Image</string> + <string name="screen_key_image_clear">Effacer</string> + <string name="screen_key_layout">Disposition</string> + <string name="screen_key_layout_save">Enregistrer</string> <string name="osc_steam_layout_hint">Déplacez, redimensionnez ou masquez les commandes tactiles de ce jeu ; enregistré dans Steam</string> <string name="mode_controller">Manette</string> <string name="mode_controller_hint">Comment Steam reconnaît votre manette. Prendra effet à la prochaine session.</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 7acad5ccd0..68cb4c185a 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Steam टच (बीटा)</string> <string name="osc_style_next_session">Steam के टच कंट्रोल अगले Steam सेशन से शुरू होंगे</string> <string name="osc_steam_layout">Steam टच लेआउट</string> + <string name="screen_keys">स्क्रीन कुंजियाँ</string> + <string name="screen_keys_add">कुंजी जोड़ें</string> + <string name="screen_key_text">टेक्स्ट</string> + <string name="screen_key_size">आकार</string> + <string name="screen_key_opacity">ओपैसिटी</string> + <string name="screen_key_type_button">कुंजी</string> + <string name="screen_key_shape_trigger">ट्रिगर</string> + <string name="screen_key_toggle">टॉगल</string> + <string name="screen_key_layout_export">निर्यात</string> + <string name="screen_key_shape_pill">कैप्सूल</string> + <string name="screen_key_shape_round">गोल</string> + <string name="screen_key_shape_circle">वृत्त</string> + <string name="screen_key_shape_rect">आयत</string> + <string name="screen_key_bind">कुंजी</string> + <string name="screen_key_image">छवि</string> + <string name="screen_key_image_clear">हटाएं</string> + <string name="screen_key_layout">लेआउट</string> + <string name="screen_key_layout_save">सेव करें</string> <string name="osc_steam_layout_hint">इस गेम के टच कंट्रोल को घुमाएं, आकार बदलें या छिपाएं; Steam में सेव होता है</string> <string name="mode_controller">कंट्रोलर</string> <string name="mode_controller_hint">Steam आपके कंट्रोलर को किस तरह पहचानता है। अगले सेशन से लागू होता है।</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 86f9d00962..a7e0ca9754 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Steam érintés (béta)</string> <string name="osc_style_next_session">A Steam érintésvezérlői a következő Steam-munkamenettől lépnek életbe</string> <string name="osc_steam_layout">Steam érintéskiosztás</string> + <string name="screen_keys">Képernyőgombok</string> + <string name="screen_keys_add">Gomb hozzáadása</string> + <string name="screen_key_text">Szöveg</string> + <string name="screen_key_size">Méret</string> + <string name="screen_key_opacity">Átlátszatlanság</string> + <string name="screen_key_type_button">Gomb</string> + <string name="screen_key_shape_trigger">Trigger</string> + <string name="screen_key_toggle">Váltás</string> + <string name="screen_key_layout_export">Exportálás</string> + <string name="screen_key_shape_pill">Kapszula</string> + <string name="screen_key_shape_round">Lekerekített</string> + <string name="screen_key_shape_circle">Kör</string> + <string name="screen_key_shape_rect">Téglalap</string> + <string name="screen_key_bind">Billentyű</string> + <string name="screen_key_image">Kép</string> + <string name="screen_key_image_clear">Törlés</string> + <string name="screen_key_layout">Elrendezés</string> + <string name="screen_key_layout_save">Mentés</string> <string name="osc_steam_layout_hint">Mozgassa, méretezze vagy rejtse el a játék érintésvezérlőit; a Steamben mentve</string> <string name="mode_controller">Kontroller</string> <string name="mode_controller_hint">Hogyan látja a Steam a kontrollerét. A következő munkamenettől érvényes.</string> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 6fe298c0d9..d5fc612c3f 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Sentuhan Steam (beta)</string> <string name="osc_style_next_session">Kontrol sentuh Steam dimulai pada sesi Steam berikutnya</string> <string name="osc_steam_layout">Tata letak sentuh Steam</string> + <string name="screen_keys">Tombol layar</string> + <string name="screen_keys_add">Tambah tombol</string> + <string name="screen_key_text">Teks</string> + <string name="screen_key_size">Ukuran</string> + <string name="screen_key_opacity">Opasitas</string> + <string name="screen_key_type_button">Tombol</string> + <string name="screen_key_shape_trigger">Pemicu</string> + <string name="screen_key_toggle">Alih</string> + <string name="screen_key_layout_export">Ekspor</string> + <string name="screen_key_shape_pill">Kapsul</string> + <string name="screen_key_shape_round">Membulat</string> + <string name="screen_key_shape_circle">Lingkaran</string> + <string name="screen_key_shape_rect">Persegi panjang</string> + <string name="screen_key_bind">Tombol</string> + <string name="screen_key_image">Gambar</string> + <string name="screen_key_image_clear">Hapus</string> + <string name="screen_key_layout">Tata letak</string> + <string name="screen_key_layout_save">Simpan</string> <string name="osc_steam_layout_hint">Pindahkan, ubah ukuran, atau sembunyikan kontrol sentuh gim ini; disimpan ke Steam</string> <string name="mode_controller">Pengontrol</string> <string name="mode_controller_hint">Cara Steam mendeteksi pengontrol Anda. Berlaku pada sesi berikutnya.</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e3c5cc25c9..d070b01e32 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Touch di Steam (beta)</string> <string name="osc_style_next_session">I controlli touch di Steam partono dalla prossima sessione Steam</string> <string name="osc_steam_layout">Layout touch di Steam</string> + <string name="screen_keys">Tasti a schermo</string> + <string name="screen_keys_add">Aggiungi tasto</string> + <string name="screen_key_text">Testo</string> + <string name="screen_key_size">Dimensione</string> + <string name="screen_key_opacity">Opacità</string> + <string name="screen_key_type_button">Tasto</string> + <string name="screen_key_shape_trigger">Grilletto</string> + <string name="screen_key_toggle">Attiva</string> + <string name="screen_key_layout_export">Esporta</string> + <string name="screen_key_shape_pill">Capsula</string> + <string name="screen_key_shape_round">Arrotondato</string> + <string name="screen_key_shape_circle">Cerchio</string> + <string name="screen_key_shape_rect">Rettangolo</string> + <string name="screen_key_bind">Tasto</string> + <string name="screen_key_image">Immagine</string> + <string name="screen_key_image_clear">Cancella</string> + <string name="screen_key_layout">Layout</string> + <string name="screen_key_layout_save">Salva</string> <string name="osc_steam_layout_hint">Sposta, ridimensiona o nascondi i controlli touch di questo gioco; vengono salvati su Steam</string> <string name="mode_controller">Controller</string> <string name="mode_controller_hint">Come Steam vede il tuo controller. Si applica dalla prossima sessione.</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f0b2b83310..9bb40dcd11 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Steamタッチ(ベータ版)</string> <string name="osc_style_next_session">Steamのタッチコントロールは次回のSteamセッションから有効になります</string> <string name="osc_steam_layout">Steamタッチのレイアウト</string> + <string name="screen_keys">画面のキー</string> + <string name="screen_keys_add">キーを追加</string> + <string name="screen_key_text">テキスト</string> + <string name="screen_key_size">サイズ</string> + <string name="screen_key_opacity">不透明度</string> + <string name="screen_key_type_button">キー</string> + <string name="screen_key_shape_trigger">トリガー</string> + <string name="screen_key_toggle">トグル</string> + <string name="screen_key_layout_export">エクスポート</string> + <string name="screen_key_shape_pill">カプセル</string> + <string name="screen_key_shape_round">角丸</string> + <string name="screen_key_shape_circle">円</string> + <string name="screen_key_shape_rect">四角</string> + <string name="screen_key_bind">キー</string> + <string name="screen_key_image">画像</string> + <string name="screen_key_image_clear">クリア</string> + <string name="screen_key_layout">レイアウト</string> + <string name="screen_key_layout_save">保存</string> <string name="osc_steam_layout_hint">このゲームのタッチコントロールを移動、サイズ変更、非表示にします。Steamに保存されます</string> <string name="mode_controller">コントローラー</string> <string name="mode_controller_hint">Steamがコントローラーを認識する方法。次回のセッションで有効になります。</string> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 4c30f8ed68..b76da8d131 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Steam 터치(베타)</string> <string name="osc_style_next_session">Steam 터치 컨트롤은 다음 Steam 세션부터 적용됩니다</string> <string name="osc_steam_layout">Steam 터치 레이아웃</string> + <string name="screen_keys">화면 키</string> + <string name="screen_keys_add">키 추가</string> + <string name="screen_key_text">텍스트</string> + <string name="screen_key_size">크기</string> + <string name="screen_key_opacity">불투명도</string> + <string name="screen_key_type_button">키</string> + <string name="screen_key_shape_trigger">트리거</string> + <string name="screen_key_toggle">토글</string> + <string name="screen_key_layout_export">내보내기</string> + <string name="screen_key_shape_pill">캡슐</string> + <string name="screen_key_shape_round">둥근 모서리</string> + <string name="screen_key_shape_circle">원</string> + <string name="screen_key_shape_rect">사각형</string> + <string name="screen_key_bind">키</string> + <string name="screen_key_image">이미지</string> + <string name="screen_key_image_clear">지우기</string> + <string name="screen_key_layout">레이아웃</string> + <string name="screen_key_layout_save">저장</string> <string name="osc_steam_layout_hint">이 게임의 터치 컨트롤을 옮기거나 크기를 바꾸거나 숨깁니다. Steam에 저장됩니다</string> <string name="mode_controller">컨트롤러</string> <string name="mode_controller_hint">Steam이 컨트롤러를 인식하는 방식입니다. 다음 세션에 적용됩니다.</string> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 3047eae83f..e036753b5d 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Sentuhan Steam (beta)</string> <string name="osc_style_next_session">Kawalan sentuh Steam bermula pada sesi Steam seterusnya</string> <string name="osc_steam_layout">Susun atur sentuh Steam</string> + <string name="screen_keys">Kekunci skrin</string> + <string name="screen_keys_add">Tambah kekunci</string> + <string name="screen_key_text">Teks</string> + <string name="screen_key_size">Saiz</string> + <string name="screen_key_opacity">Kelegapan</string> + <string name="screen_key_type_button">Kekunci</string> + <string name="screen_key_shape_trigger">Pencetus</string> + <string name="screen_key_toggle">Togol</string> + <string name="screen_key_layout_export">Eksport</string> + <string name="screen_key_shape_pill">Kapsul</string> + <string name="screen_key_shape_round">Bulat</string> + <string name="screen_key_shape_circle">Bulatan</string> + <string name="screen_key_shape_rect">Segi empat</string> + <string name="screen_key_bind">Kekunci</string> + <string name="screen_key_image">Imej</string> + <string name="screen_key_image_clear">Kosongkan</string> + <string name="screen_key_layout">Susun atur</string> + <string name="screen_key_layout_save">Simpan</string> <string name="osc_steam_layout_hint">Gerakkan, ubah saiz atau sembunyikan kawalan sentuh permainan ini; disimpan ke Steam</string> <string name="mode_controller">Pengawal</string> <string name="mode_controller_hint">Cara Steam mengesan pengawal anda. Berkuat kuasa pada sesi seterusnya.</string> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 2ca4cc2335..a9f9489c15 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Steam-berøring (beta)</string> <string name="osc_style_next_session">Steams berøringskontroller starter med neste Steam-sesjon</string> <string name="osc_steam_layout">Steam-berøringslayout</string> + <string name="screen_keys">Skjermtaster</string> + <string name="screen_keys_add">Legg til tast</string> + <string name="screen_key_text">Tekst</string> + <string name="screen_key_size">Størrelse</string> + <string name="screen_key_opacity">Opasitet</string> + <string name="screen_key_type_button">Tast</string> + <string name="screen_key_shape_trigger">Utløser</string> + <string name="screen_key_toggle">Veksle</string> + <string name="screen_key_layout_export">Eksporter</string> + <string name="screen_key_shape_pill">Kapsel</string> + <string name="screen_key_shape_round">Avrundet</string> + <string name="screen_key_shape_circle">Sirkel</string> + <string name="screen_key_shape_rect">Rektangel</string> + <string name="screen_key_bind">Tast</string> + <string name="screen_key_image">Bilde</string> + <string name="screen_key_image_clear">Fjern</string> + <string name="screen_key_layout">Oppsett</string> + <string name="screen_key_layout_save">Lagre</string> <string name="osc_steam_layout_hint">Flytt, endre størrelse på eller skjul dette spillets berøringskontroller; lagres til Steam</string> <string name="mode_controller">Kontroller</string> <string name="mode_controller_hint">Hvordan Steam ser kontrolleren din. Gjelder fra neste sesjon.</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d5c217f93a..d74633be94 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Steam-aanraakbediening (bèta)</string> <string name="osc_style_next_session">De aanraakbediening van Steam start bij de volgende Steam-sessie</string> <string name="osc_steam_layout">Steam-aanraakindeling</string> + <string name="screen_keys">Schermtoetsen</string> + <string name="screen_keys_add">Toets toevoegen</string> + <string name="screen_key_text">Tekst</string> + <string name="screen_key_size">Grootte</string> + <string name="screen_key_opacity">Transparantie</string> + <string name="screen_key_type_button">Toets</string> + <string name="screen_key_shape_trigger">Trigger</string> + <string name="screen_key_toggle">Schakelen</string> + <string name="screen_key_layout_export">Exporteren</string> + <string name="screen_key_shape_pill">Capsule</string> + <string name="screen_key_shape_round">Afgerond</string> + <string name="screen_key_shape_circle">Cirkel</string> + <string name="screen_key_shape_rect">Rechthoek</string> + <string name="screen_key_bind">Toets</string> + <string name="screen_key_image">Afbeelding</string> + <string name="screen_key_image_clear">Wissen</string> + <string name="screen_key_layout">Indeling</string> + <string name="screen_key_layout_save">Opslaan</string> <string name="osc_steam_layout_hint">Verplaats, schaal of verberg de aanraakbediening van deze game; opgeslagen in Steam</string> <string name="mode_controller">Controller</string> <string name="mode_controller_hint">Hoe Steam je controller ziet. Geldt vanaf de volgende sessie.</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 02d9de52d6..121d781649 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Dotyk Steam (beta)</string> <string name="osc_style_next_session">Sterowanie dotykowe Steam zacznie działać od następnej sesji Steam</string> <string name="osc_steam_layout">Układ dotykowy Steam</string> + <string name="screen_keys">Klawisze ekranu</string> + <string name="screen_keys_add">Dodaj klawisz</string> + <string name="screen_key_text">Tekst</string> + <string name="screen_key_size">Rozmiar</string> + <string name="screen_key_opacity">Przezroczystość</string> + <string name="screen_key_type_button">Klawisz</string> + <string name="screen_key_shape_trigger">Spust</string> + <string name="screen_key_toggle">Przełącznik</string> + <string name="screen_key_layout_export">Eksportuj</string> + <string name="screen_key_shape_pill">Kapsułka</string> + <string name="screen_key_shape_round">Zaokrąglony</string> + <string name="screen_key_shape_circle">Koło</string> + <string name="screen_key_shape_rect">Prostokąt</string> + <string name="screen_key_bind">Klawisz</string> + <string name="screen_key_image">Obraz</string> + <string name="screen_key_image_clear">Wyczyść</string> + <string name="screen_key_layout">Układ</string> + <string name="screen_key_layout_save">Zapisz</string> <string name="osc_steam_layout_hint">Przesuwaj, zmieniaj rozmiar lub ukrywaj sterowanie dotykowe tej gry; zapisywane w Steam</string> <string name="mode_controller">Kontroler</string> <string name="mode_controller_hint">Jak Steam widzi Twój kontroler. Działa od następnej sesji.</string> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 73658c0f23..61fe3b5ff4 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Controlos táteis do Steam (beta)</string> <string name="osc_style_next_session">Os controlos táteis do Steam começam na próxima sessão do Steam</string> <string name="osc_steam_layout">Esquema tátil do Steam</string> + <string name="screen_keys">Teclas no ecrã</string> + <string name="screen_keys_add">Adicionar tecla</string> + <string name="screen_key_text">Texto</string> + <string name="screen_key_size">Tamanho</string> + <string name="screen_key_opacity">Opacidade</string> + <string name="screen_key_type_button">Tecla</string> + <string name="screen_key_shape_trigger">Gatilho</string> + <string name="screen_key_toggle">Alternar</string> + <string name="screen_key_layout_export">Exportar</string> + <string name="screen_key_shape_pill">Cápsula</string> + <string name="screen_key_shape_round">Arredondado</string> + <string name="screen_key_shape_circle">Círculo</string> + <string name="screen_key_shape_rect">Retângulo</string> + <string name="screen_key_bind">Tecla</string> + <string name="screen_key_image">Imagem</string> + <string name="screen_key_image_clear">Limpar</string> + <string name="screen_key_layout">Esquema</string> + <string name="screen_key_layout_save">Guardar</string> <string name="osc_steam_layout_hint">Mova, redimensione ou oculte os controlos táteis deste jogo; é guardado no Steam</string> <string name="mode_controller">Comando</string> <string name="mode_controller_hint">Como o Steam vê o seu comando. Aplica-se na próxima sessão.</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 16cd8eb468..c9e1e7b1b7 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Toque da Steam (beta)</string> <string name="osc_style_next_session">Os controles de toque da Steam começam na próxima sessão da Steam</string> <string name="osc_steam_layout">Layout de toque da Steam</string> + <string name="screen_keys">Teclas na tela</string> + <string name="screen_keys_add">Adicionar tecla</string> + <string name="screen_key_text">Texto</string> + <string name="screen_key_size">Tamanho</string> + <string name="screen_key_opacity">Opacidade</string> + <string name="screen_key_type_button">Tecla</string> + <string name="screen_key_shape_trigger">Gatilho</string> + <string name="screen_key_toggle">Alternar</string> + <string name="screen_key_layout_export">Exportar</string> + <string name="screen_key_shape_pill">Cápsula</string> + <string name="screen_key_shape_round">Arredondado</string> + <string name="screen_key_shape_circle">Círculo</string> + <string name="screen_key_shape_rect">Retângulo</string> + <string name="screen_key_bind">Tecla</string> + <string name="screen_key_image">Imagem</string> + <string name="screen_key_image_clear">Limpar</string> + <string name="screen_key_layout">Layout</string> + <string name="screen_key_layout_save">Salvar</string> <string name="osc_steam_layout_hint">Mova, redimensione ou oculte os controles de toque deste jogo; salvo na Steam</string> <string name="mode_controller">Controle</string> <string name="mode_controller_hint">Como a Steam vê seu controle. Vale a partir da próxima sessão.</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index d9e87c4465..b8e3b4954c 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Atingere Steam (beta)</string> <string name="osc_style_next_session">Comenzile tactile Steam pornesc odată cu următoarea sesiune Steam</string> <string name="osc_steam_layout">Aranjament tactil Steam</string> + <string name="screen_keys">Taste pe ecran</string> + <string name="screen_keys_add">Adaugă tastă</string> + <string name="screen_key_text">Text</string> + <string name="screen_key_size">Dimensiune</string> + <string name="screen_key_opacity">Opacitate</string> + <string name="screen_key_type_button">Tastă</string> + <string name="screen_key_shape_trigger">Trăgaci</string> + <string name="screen_key_toggle">Comutare</string> + <string name="screen_key_layout_export">Exportă</string> + <string name="screen_key_shape_pill">Capsulă</string> + <string name="screen_key_shape_round">Rotunjit</string> + <string name="screen_key_shape_circle">Cerc</string> + <string name="screen_key_shape_rect">Dreptunghi</string> + <string name="screen_key_bind">Tastă</string> + <string name="screen_key_image">Imagine</string> + <string name="screen_key_image_clear">Șterge</string> + <string name="screen_key_layout">Aranjament</string> + <string name="screen_key_layout_save">Salvează</string> <string name="osc_steam_layout_hint">Mută, redimensionează sau ascunde comenzile tactile ale acestui joc; salvate în Steam</string> <string name="mode_controller">Controller</string> <string name="mode_controller_hint">Cum vede Steam controllerul tău. Se aplică la sesiunea următoare.</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 060c7469f8..59e74118e7 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Сенсорное управление Steam (бета)</string> <string name="osc_style_next_session">Сенсорное управление Steam включится со следующей сессии Steam</string> <string name="osc_steam_layout">Сенсорная раскладка Steam</string> + <string name="screen_keys">Экранные клавиши</string> + <string name="screen_keys_add">Добавить клавишу</string> + <string name="screen_key_text">Текст</string> + <string name="screen_key_size">Размер</string> + <string name="screen_key_opacity">Непрозрачность</string> + <string name="screen_key_type_button">Клавиша</string> + <string name="screen_key_shape_trigger">Триггер</string> + <string name="screen_key_toggle">Переключение</string> + <string name="screen_key_layout_export">Экспорт</string> + <string name="screen_key_shape_pill">Капсула</string> + <string name="screen_key_shape_round">Скругление</string> + <string name="screen_key_shape_circle">Круг</string> + <string name="screen_key_shape_rect">Прямоугольник</string> + <string name="screen_key_bind">Клавиша</string> + <string name="screen_key_image">Изображение</string> + <string name="screen_key_image_clear">Очистить</string> + <string name="screen_key_layout">Раскладка</string> + <string name="screen_key_layout_save">Сохранить</string> <string name="osc_steam_layout_hint">Перемещайте, меняйте размер или скрывайте сенсорные кнопки этой игры; сохраняется в Steam</string> <string name="mode_controller">Контроллер</string> <string name="mode_controller_hint">Как Steam распознает ваш контроллер. Вступит в силу в следующей сессии.</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 1fc734869b..2c62e8b139 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Steam-pekstyrning (beta)</string> <string name="osc_style_next_session">Steams pekstyrning startar med nästa Steam-session</string> <string name="osc_steam_layout">Steams peklayout</string> + <string name="screen_keys">Skärmtangenter</string> + <string name="screen_keys_add">Lägg till tangent</string> + <string name="screen_key_text">Text</string> + <string name="screen_key_size">Storlek</string> + <string name="screen_key_opacity">Opacitet</string> + <string name="screen_key_type_button">Tangent</string> + <string name="screen_key_shape_trigger">Avtryckare</string> + <string name="screen_key_toggle">Växla</string> + <string name="screen_key_layout_export">Exportera</string> + <string name="screen_key_shape_pill">Kapsel</string> + <string name="screen_key_shape_round">Rundad</string> + <string name="screen_key_shape_circle">Cirkel</string> + <string name="screen_key_shape_rect">Rektangel</string> + <string name="screen_key_bind">Tangent</string> + <string name="screen_key_image">Bild</string> + <string name="screen_key_image_clear">Rensa</string> + <string name="screen_key_layout">Layout</string> + <string name="screen_key_layout_save">Spara</string> <string name="osc_steam_layout_hint">Flytta, ändra storlek på eller dölj spelets pekkontroller; sparas i Steam</string> <string name="mode_controller">Handkontroll</string> <string name="mode_controller_hint">Hur Steam ser din handkontroll. Gäller från nästa session.</string> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index d0a3c6cd8c..38337b0fda 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">การสัมผัสของ Steam (ทดลอง)</string> <string name="osc_style_next_session">ปุ่มสัมผัสของ Steam จะเริ่มใช้งานในเซสชัน Steam ถัดไป</string> <string name="osc_steam_layout">รูปแบบปุ่มสัมผัสของ Steam</string> + <string name="screen_keys">ปุ่มบนหน้าจอ</string> + <string name="screen_keys_add">เพิ่มปุ่ม</string> + <string name="screen_key_text">ข้อความ</string> + <string name="screen_key_size">ขนาด</string> + <string name="screen_key_opacity">ความโปร่งใส</string> + <string name="screen_key_type_button">ปุ่ม</string> + <string name="screen_key_shape_trigger">ไก</string> + <string name="screen_key_toggle">สลับ</string> + <string name="screen_key_layout_export">ส่งออก</string> + <string name="screen_key_shape_pill">แคปซูล</string> + <string name="screen_key_shape_round">มน</string> + <string name="screen_key_shape_circle">วงกลม</string> + <string name="screen_key_shape_rect">สี่เหลี่ยม</string> + <string name="screen_key_bind">ปุ่ม</string> + <string name="screen_key_image">รูปภาพ</string> + <string name="screen_key_image_clear">ล้าง</string> + <string name="screen_key_layout">การจัดวาง</string> + <string name="screen_key_layout_save">บันทึก</string> <string name="osc_steam_layout_hint">ย้าย ปรับขนาด หรือซ่อนปุ่มสัมผัสของเกมนี้ บันทึกไปยัง Steam</string> <string name="mode_controller">คอนโทรลเลอร์</string> <string name="mode_controller_hint">วิธีที่ Steam มองเห็นคอนโทรลเลอร์ของคุณ จะมีผลในเซสชันถัดไป</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 21fcaa6a5c..c1bbb9d33d 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Steam dokunmatik (beta)</string> <string name="osc_style_next_session">Steam\'in dokunmatik kontrolleri sonraki Steam oturumunda başlar</string> <string name="osc_steam_layout">Steam dokunmatik düzeni</string> + <string name="screen_keys">Ekran tuşları</string> + <string name="screen_keys_add">Tuş ekle</string> + <string name="screen_key_text">Metin</string> + <string name="screen_key_size">Boyut</string> + <string name="screen_key_opacity">Opaklık</string> + <string name="screen_key_type_button">Tuş</string> + <string name="screen_key_shape_trigger">Tetik</string> + <string name="screen_key_toggle">Aç/Kapa</string> + <string name="screen_key_layout_export">Dışa aktar</string> + <string name="screen_key_shape_pill">Kapsül</string> + <string name="screen_key_shape_round">Yuvarlak</string> + <string name="screen_key_shape_circle">Daire</string> + <string name="screen_key_shape_rect">Dikdörtgen</string> + <string name="screen_key_bind">Tuş</string> + <string name="screen_key_image">Görsel</string> + <string name="screen_key_image_clear">Temizle</string> + <string name="screen_key_layout">Düzen</string> + <string name="screen_key_layout_save">Kaydet</string> <string name="osc_steam_layout_hint">Bu oyunun dokunmatik kontrollerini taşıyın, boyutlandırın veya gizleyin; Steam\'e kaydedilir</string> <string name="mode_controller">Kumanda</string> <string name="mode_controller_hint">Steam\'in kumandanızı nasıl gördüğü. Sonraki oturumda uygulanır.</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 972d389301..2cadb53c52 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Сенсорне керування Steam (бета)</string> <string name="osc_style_next_session">Сенсорне керування Steam увімкнеться з наступним сеансом Steam</string> <string name="osc_steam_layout">Розкладка сенсорного керування Steam</string> + <string name="screen_keys">Екранні клавіші</string> + <string name="screen_keys_add">Додати клавішу</string> + <string name="screen_key_text">Текст</string> + <string name="screen_key_size">Розмір</string> + <string name="screen_key_opacity">Непрозорість</string> + <string name="screen_key_type_button">Клавіша</string> + <string name="screen_key_shape_trigger">Тригер</string> + <string name="screen_key_toggle">Перемикання</string> + <string name="screen_key_layout_export">Експорт</string> + <string name="screen_key_shape_pill">Капсула</string> + <string name="screen_key_shape_round">Заокруглення</string> + <string name="screen_key_shape_circle">Коло</string> + <string name="screen_key_shape_rect">Прямокутник</string> + <string name="screen_key_bind">Клавіша</string> + <string name="screen_key_image">Зображення</string> + <string name="screen_key_image_clear">Очистити</string> + <string name="screen_key_layout">Розкладка</string> + <string name="screen_key_layout_save">Зберегти</string> <string name="osc_steam_layout_hint">Переміщуйте, змінюйте розмір або приховуйте сенсорні елементи керування цієї гри; зберігається в Steam</string> <string name="mode_controller">Контролер</string> <string name="mode_controller_hint">Яким Steam бачить ваш контролер. Застосовується в наступному сеансі.</string> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a7b2ee7483..b8a7da87a9 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Chạm Steam (beta)</string> <string name="osc_style_next_session">Các nút chạm của Steam bắt đầu từ phiên Steam kế tiếp</string> <string name="osc_steam_layout">Bố cục chạm Steam</string> + <string name="screen_keys">Phím trên màn hình</string> + <string name="screen_keys_add">Thêm phím</string> + <string name="screen_key_text">Văn bản</string> + <string name="screen_key_size">Kích thước</string> + <string name="screen_key_opacity">Độ mờ</string> + <string name="screen_key_type_button">Phím</string> + <string name="screen_key_shape_trigger">Cò</string> + <string name="screen_key_toggle">Bật tắt</string> + <string name="screen_key_layout_export">Xuất</string> + <string name="screen_key_shape_pill">Viên nang</string> + <string name="screen_key_shape_round">Bo tròn</string> + <string name="screen_key_shape_circle">Tròn</string> + <string name="screen_key_shape_rect">Chữ nhật</string> + <string name="screen_key_bind">Phím</string> + <string name="screen_key_image">Hình ảnh</string> + <string name="screen_key_image_clear">Xóa</string> + <string name="screen_key_layout">Bố cục</string> + <string name="screen_key_layout_save">Lưu</string> <string name="osc_steam_layout_hint">Di chuyển, đổi kích thước hoặc ẩn các nút chạm của game này; được lưu vào Steam</string> <string name="mode_controller">Tay cầm</string> <string name="mode_controller_hint">Cách Steam nhận dạng tay cầm của bạn. Áp dụng từ phiên sau.</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index b740148990..2726014a0b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Steam 触控(测试版)</string> <string name="osc_style_next_session">Steam 的触控按键将从下次 Steam 会话开始生效</string> <string name="osc_steam_layout">Steam 触控布局</string> + <string name="screen_keys">屏幕按键</string> + <string name="screen_keys_add">添加按键</string> + <string name="screen_key_text">文本</string> + <string name="screen_key_size">大小</string> + <string name="screen_key_opacity">透明</string> + <string name="screen_key_type_button">单键</string> + <string name="screen_key_shape_trigger">扳机</string> + <string name="screen_key_toggle">切换</string> + <string name="screen_key_layout_export">导出</string> + <string name="screen_key_shape_pill">胶囊</string> + <string name="screen_key_shape_round">圆角</string> + <string name="screen_key_shape_circle">圆形</string> + <string name="screen_key_shape_rect">矩形</string> + <string name="screen_key_bind">绑定</string> + <string name="screen_key_image">图片</string> + <string name="screen_key_image_clear">清除</string> + <string name="screen_key_layout">布局</string> + <string name="screen_key_layout_save">保存</string> <string name="osc_steam_layout_hint">移动、调整大小或隐藏此游戏的触控按键;保存到 Steam</string> <string name="mode_controller">手柄</string> <string name="mode_controller_hint">决定 Steam 把你的手柄识别为哪种类型,将在下次会话生效。</string> diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 310ac68d8b..cdcc40b76a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Steam 觸控(測試版)</string> <string name="osc_style_next_session">Steam 的觸控控制會在下次 Steam 會話啟用</string> <string name="osc_steam_layout">Steam 觸控佈局</string> + <string name="screen_keys">螢幕按鍵</string> + <string name="screen_keys_add">新增按鍵</string> + <string name="screen_key_text">文本</string> + <string name="screen_key_size">大小</string> + <string name="screen_key_opacity">透明</string> + <string name="screen_key_type_button">單鍵</string> + <string name="screen_key_shape_trigger">扳機</string> + <string name="screen_key_toggle">切換</string> + <string name="screen_key_layout_export">匯出</string> + <string name="screen_key_shape_pill">膠囊</string> + <string name="screen_key_shape_round">圓角</string> + <string name="screen_key_shape_circle">圓形</string> + <string name="screen_key_shape_rect">矩形</string> + <string name="screen_key_bind">綁定</string> + <string name="screen_key_image">圖片</string> + <string name="screen_key_image_clear">清除</string> + <string name="screen_key_layout">佈局</string> + <string name="screen_key_layout_save">儲存</string> <string name="osc_steam_layout_hint">移動、調整大小或隱藏此遊戲的觸控控制;會儲存至 Steam</string> <string name="mode_controller">控制器</string> <string name="mode_controller_hint">Steam 如何識別你的控制器。下次會話生效。</string> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 841644eb10..43fb5e4434 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -267,6 +267,24 @@ <string name="osc_steam_touch">Steam 觸控(測試版)</string> <string name="osc_style_next_session">Steam 觸控控制會在下次 Steam 工作階段啟用</string> <string name="osc_steam_layout">Steam 觸控版面配置</string> + <string name="screen_keys">螢幕按鍵</string> + <string name="screen_keys_add">新增按鍵</string> + <string name="screen_key_text">文本</string> + <string name="screen_key_size">大小</string> + <string name="screen_key_opacity">透明</string> + <string name="screen_key_type_button">單鍵</string> + <string name="screen_key_shape_trigger">扳機</string> + <string name="screen_key_toggle">切換</string> + <string name="screen_key_layout_export">匯出</string> + <string name="screen_key_shape_pill">膠囊</string> + <string name="screen_key_shape_round">圓角</string> + <string name="screen_key_shape_circle">圓形</string> + <string name="screen_key_shape_rect">矩形</string> + <string name="screen_key_bind">綁定</string> + <string name="screen_key_image">圖片</string> + <string name="screen_key_image_clear">清除</string> + <string name="screen_key_layout">版面配置</string> + <string name="screen_key_layout_save">儲存</string> <string name="osc_steam_layout_hint">移動、調整大小或隱藏這款遊戲的觸控控制;會儲存到 Steam</string> <string name="mode_controller">控制器</string> <string name="mode_controller_hint">Steam 辨識你的控制器的方式。下次工作階段生效。</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4e0b1e55d2..416e25e4e2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -278,6 +278,24 @@ <string name="osc_steam_touch">Steam touch (beta)</string> <string name="osc_style_next_session">Steam\'s touch controls start with the next Steam session</string> <string name="osc_steam_layout">Steam touch layout</string> + <string name="screen_keys">Screen keys</string> + <string name="screen_keys_add">Add key</string> + <string name="screen_key_text">Text</string> + <string name="screen_key_size">Size</string> + <string name="screen_key_opacity">Alpha</string> + <string name="screen_key_type_button">Key</string> + <string name="screen_key_shape_pill">Pill</string> + <string name="screen_key_shape_round">Round</string> + <string name="screen_key_shape_circle">Circle</string> + <string name="screen_key_shape_rect">Rect</string> + <string name="screen_key_shape_trigger">Trigger</string> + <string name="screen_key_bind">Bind</string> + <string name="screen_key_image">Image</string> + <string name="screen_key_image_clear">Clear</string> + <string name="screen_key_toggle">Toggle</string> + <string name="screen_key_layout">Layout</string> + <string name="screen_key_layout_save">Save</string> + <string name="screen_key_layout_export">Export</string> <string name="osc_steam_layout_hint">Move, resize or hide this game\'s touch controls; saved to Steam</string> <string name="mode_controller">Controller</string> <string name="mode_controller_hint">How Steam sees your controller. Applies next session.</string> diff --git a/app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt b/app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt new file mode 100644 index 0000000000..8a95dd5128 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt @@ -0,0 +1,124 @@ +package com.droiddeck.launcher.input + +import android.view.InputDevice +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.View +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class ScreenKeysTest { + private val context = RuntimeEnvironment.getApplication() + + @Before fun clearKeys() { + ControllerPrefs.setScreenKeys(context, emptyList()) + } + + @Test fun missesAreForwardedAsTheirOwnTouchStreamWhileAKeyIsHeld() { + val sent = mutableListOf<Pair<Int, Boolean>>() + val keys = ScreenKeys(context) { code, down -> sent += code to down } + keys.layout(0, 0, 1000, 600) + keys.add(listOf(KeyEvent.KEYCODE_W)) + val forwarded = mutableListOf<Pair<Int, Int>>() + keys.onTouchMiss = { forwarded += it.actionMasked to it.getPointerId(0) } + + send(keys, MotionEvent.ACTION_DOWN, listOf(0), listOf(300f), listOf(372f)) + send(keys, MotionEvent.ACTION_POINTER_DOWN or (1 shl MotionEvent.ACTION_POINTER_INDEX_SHIFT), listOf(0, 1), listOf(300f, 900f), listOf(372f, 550f)) + send(keys, MotionEvent.ACTION_MOVE, listOf(0, 1), listOf(310f, 880f), listOf(372f, 530f)) + send(keys, MotionEvent.ACTION_POINTER_UP or (1 shl MotionEvent.ACTION_POINTER_INDEX_SHIFT), listOf(0, 1), listOf(310f, 880f), listOf(372f, 530f)) + send(keys, MotionEvent.ACTION_UP, listOf(0), listOf(310f), listOf(372f)) + + assertEquals( + listOf( + MotionEvent.ACTION_DOWN to 1, + MotionEvent.ACTION_MOVE to 1, + MotionEvent.ACTION_UP to 1, + ), + forwarded, + ) + assertEquals(listOf(KeyEvent.KEYCODE_W to true, KeyEvent.KEYCODE_W to false), sent) + } + + @Test fun gestureRecognizerKeepsOneSplitTargetOwnerUntilItsStreamEnds() { + val gate = GestureTouchStreamGate() + fun accepts(source: GestureTouchStreamGate.Source, action: Int): Boolean { + val event = MotionEvent.obtain(0L, 1L, action, 1f, 1f, 0) + return try { gate.accepts(source, event) } finally { event.recycle() } + } + + assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_DOWN)) + assertFalse(accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, MotionEvent.ACTION_DOWN)) + assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_MOVE)) + assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_UP)) + assertTrue(accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, MotionEvent.ACTION_DOWN)) + assertFalse(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_DOWN)) + assertTrue(accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, MotionEvent.ACTION_CANCEL)) + assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_DOWN)) + assertFalse(accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, MotionEvent.ACTION_DOWN)) + gate.reset() + assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_DOWN)) + } + + @Test fun loadingLayoutReleasesLatchedKeysBeforeReplacingEntries() { + val sent = mutableListOf<Pair<Int, Boolean>>() + val keys = ScreenKeys(context) { code, down -> sent += code to down } + keys.layout(0, 0, 1000, 600) + keys.add(listOf(KeyEvent.KEYCODE_SHIFT_LEFT)) + keys.setToggle(listOf(KeyEvent.KEYCODE_SHIFT_LEFT), true) + send(keys, MotionEvent.ACTION_DOWN, listOf(0), listOf(300f), listOf(372f)) + send(keys, MotionEvent.ACTION_UP, listOf(0), listOf(300f), listOf(372f)) + + keys.load("") + + assertEquals(listOf(KeyEvent.KEYCODE_SHIFT_LEFT to true, KeyEvent.KEYCODE_SHIFT_LEFT to false), sent) + } + + @Test fun hidingTheViewReleasesLatchedKeys() { + val sent = mutableListOf<Pair<Int, Boolean>>() + val keys = ScreenKeys(context) { code, down -> sent += code to down } + keys.layout(0, 0, 1000, 600) + keys.add(listOf(KeyEvent.KEYCODE_SHIFT_LEFT)) + keys.setToggle(listOf(KeyEvent.KEYCODE_SHIFT_LEFT), true) + send(keys, MotionEvent.ACTION_DOWN, listOf(0), listOf(300f), listOf(372f)) + send(keys, MotionEvent.ACTION_UP, listOf(0), listOf(300f), listOf(372f)) + + keys.visibility = View.GONE + + assertEquals(listOf(KeyEvent.KEYCODE_SHIFT_LEFT to true, KeyEvent.KEYCODE_SHIFT_LEFT to false), sent) + } + + private fun send(view: View, action: Int, ids: List<Int>, xs: List<Float>, ys: List<Float>) { + val properties = Array(ids.size) { index -> + MotionEvent.PointerProperties().apply { + id = ids[index] + toolType = MotionEvent.TOOL_TYPE_FINGER + } + } + val coordinates = Array(ids.size) { index -> + MotionEvent.PointerCoords().apply { + x = xs[index] + y = ys[index] + pressure = 1f + size = 1f + } + } + val event = MotionEvent.obtain( + 0L, 1L, action, ids.size, properties, coordinates, 0, 0, + 1f, 1f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0, + ) + try { + view.onTouchEvent(event) + } finally { + event.recycle() + } + } +} From cf13762939c810f10c810e32e7b700dc7b8c727b Mon Sep 17 00:00:00 2001 From: kingokksa <47888451+kingokksa@users.noreply.github.com> Date: Mon, 26 Oct 2026 05:29:39 +0800 Subject: [PATCH 045/135] feat: Show the drawer's game settings when a game starts without Steam (#1113) * feat: Show the drawer's game settings when a game starts without Steam A session started without the client has no Steam overview to read the current title from, so the drawer's game profile group stayed empty and the per-game settings, FEX preset, environment and unfolded controls were hidden. The launch already knows which game it starts, so carry its id into the session and fall back to it when Steam has nothing to report. * fix: Pass the game id into the service start, and keep the unfolded toggle to Steam SessionActivity.surfaceCreated() hands the mode, program and args to SessionService.start(), which builds the service intent. EXTRA_GAME_ID was only put on the activity intent, so a new no-Steam session never received it and the drawer fallback stayed empty. Pass it through. The unfolded-controls toggle also went out for direct sessions, but applyUnfoldedControls() still requires Steam mode and a Deck pad, neither of which a direct session sets up. Keep the toggle to Steam. * fix: hide Steam controls in direct session drawer --------- Co-authored-by: xXJsonDeruloXx <danielhimebauch@gmail.com> Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- .../main/java/com/droiddeck/launcher/FrontEndActivity.kt | 1 + .../main/java/com/droiddeck/launcher/SessionActivity.kt | 6 ++++++ .../java/com/droiddeck/launcher/session/SessionService.kt | 3 +++ .../java/com/droiddeck/launcher/session/SessionState.kt | 2 ++ .../main/java/com/droiddeck/launcher/ui/SessionOverlay.kt | 7 ++++--- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 0d59c8da9d..18244ae660 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -598,6 +598,7 @@ class FrontEndActivity : ComponentActivity() { .putExtra(SessionService.EXTRA_MODE, SessionService.MODE_RUN) .putExtra(SessionService.EXTRA_PROGRAM, command.program) .putExtra(SessionService.EXTRA_PROGRAM_ARGS, command.args.toTypedArray()) + .putExtra(SessionService.EXTRA_GAME_ID, com.droiddeck.launcher.session.NoSteamLaunch.scope(game)) when { !SessionState.running -> startSessionOrWait(next) SessionState.stopRequested -> android.widget.Toast.makeText(this, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show() diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index a5868ca8b9..bc42fa7e41 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -294,6 +294,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var drawerDefaultProton by mutableStateOf<String?>(null) private val drawerComponentMenu by lazy { ComponentsMenu(this, uiHandler) } private var drawerGameProfileId by mutableStateOf<Long?>(null) + + private fun noSteamSession(): Boolean = SessionState.mode == SessionService.MODE_RUN && + SessionState.program in setOf(com.droiddeck.launcher.session.NoSteamLaunch.PROTON_RUN, com.droiddeck.launcher.session.NoSteamLaunch.EPIC) private val drawerGameInventory = GameProfileInventoryCache<Library.SteamGame>() private var drawerGameInventoryRevision = 0L private var drawerGameFexPresetSaving by mutableStateOf(false) @@ -906,6 +909,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { ) SessionDrawer(drawerOpen, drawerPage, drawerControllerActive, onPageChange = { drawerPage = it }, a = DrawerActions( steam = SessionState.mode == SessionService.MODE_STEAM, + direct = noSteamSession(), title = if (SessionState.mode == SessionService.MODE_RUN) com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) ?: getString(R.string.session_title_game) else null, isHomeApp = isHomeApp, @@ -1373,6 +1377,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val activeAppId = AgentGuest.activeSteamAppId(this, installedAppIds) val selectedSteamAppId = runCatching { AgentGuest.selectedSteamAppId(this) } AgentGuest.selectedOrActiveInstalledSteamAppId(selectedSteamAppId, activeAppId, installedAppIds) + ?: SessionState.gameId?.toLongOrNull() ?: refresh.requestedAppId } else { refresh.requestedAppId @@ -1861,6 +1866,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { intent.getStringExtra(SessionService.EXTRA_STEAM_UI), intent.getStringExtra(SessionService.EXTRA_STEAM_URL), intent.getStringArrayExtra(SessionService.EXTRA_PROGRAM_ARGS), + intent.getStringExtra(SessionService.EXTRA_GAME_ID), sessionActivityDisplayId, ) } 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 979c737a4c..4584cb53e0 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -349,6 +349,7 @@ class SessionService : Service() { pipTask = false SessionState.program = intent?.getStringExtra(EXTRA_PROGRAM) SessionState.programArgs = intent?.getStringArrayExtra(EXTRA_PROGRAM_ARGS)?.toList().orEmpty() + SessionState.gameId = intent?.getStringExtra(EXTRA_GAME_ID) SessionState.steamUi = intent?.getStringExtra(EXTRA_STEAM_UI) SessionState.steamUrl = intent?.getStringExtra(EXTRA_STEAM_URL) com.droiddeck.launcher.stores.battlenet.BattleNetClient.clearRequests(LinuxRuntime.sessionRoot(this)) @@ -2084,6 +2085,7 @@ class SessionService : Service() { fun start( context: Context, mode: String = MODE_STEAM, program: String? = null, steamUi: String? = null, steamUrl: String? = null, programArgs: Array<String>? = null, + gameId: String? = null, displayId: Int = Display.DEFAULT_DISPLAY, ) { SessionState.activityDisplayId = displayId @@ -2094,6 +2096,7 @@ class SessionService : Service() { if (programArgs != null) intent.putExtra(EXTRA_PROGRAM_ARGS, programArgs) if (steamUi != null) intent.putExtra(EXTRA_STEAM_UI, steamUi) if (steamUrl != null) intent.putExtra(EXTRA_STEAM_URL, steamUrl) + if (gameId != null) intent.putExtra(EXTRA_GAME_ID, gameId) if (Build.VERSION.SDK_INT >= 26) context.startForegroundService(intent) else context.startService(intent) } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt index 4b57a10689..5db2211a13 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -59,6 +59,8 @@ object SessionState { @Volatile var programArgs: List<String> = emptyList() @Volatile + var gameId: String? = null + @Volatile var steamUi: String? = null @Volatile var steamUrl: String? = null diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index addb55473a..9f8ceb2708 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -193,6 +193,7 @@ private class DrawerFocus { class DrawerActions( val steam: Boolean, + val direct: Boolean = false, val title: String? = null, val isHomeApp: Boolean, val androidApps: List<HomeApp.LaunchableApp>, @@ -433,7 +434,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont if (a.pipSupported) SteamActionPill( stringResource(R.string.pip_title), Icons.Outlined.PictureInPictureAlt, focus.track(page, "pip"), ) { host.open = null; a.onPip() } - if (a.onSteamMenu != null && a.onQam != null) { + if (a.steam && a.onSteamMenu != null && a.onQam != null) { val qamInteraction = remember { MutableInteractionSource() } var qamStartedOnPress by remember { mutableStateOf(false) } LaunchedEffect(qamInteraction) { @@ -640,11 +641,11 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont steamVr = { SteamVrRow(a) }) } SessionDrawerPage.GAMES -> { - if (a.steam) SelectedGameProfileGroup(host, a) { key -> focus.track(page, key) } + if (a.steam || a.direct) SelectedGameProfileGroup(host, a) { key -> focus.track(page, key) } Text(stringResource(R.string.fex_next_launch), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 14.dp, vertical = 8.dp)) TextureFilteringGroup(host, a) { key -> focus.track(page, key) } - if (a.steam) SettingsGroup(stringResource(R.string.game_settings_title)) { + if (a.steam || a.direct) SettingsGroup(stringResource(R.string.game_settings_title)) { DrawerFexPresetRow(host, a, focus.track(page, "fex")) DrawerNoSteamRow(host, a, focus.track(page, "no-steam")) GameEnvironmentRow( From 02767b7e6c8a16db48fba6770f245809e8003486 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 17:29:43 -0400 Subject: [PATCH 046/135] fix: report a full battery at 100% while charging, so Steam stops showing 99% (#1577) * fix: report a full battery at 100% while charging, so Steam stops showing 99% * test: charging at 100% is reported full --- .../launcher/session/BatteryComponent.kt | 3 ++- .../launcher/session/BatteryComponentTest.kt | 20 ++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt index 252e06a9e2..517fa6c74f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt @@ -56,8 +56,9 @@ class BatteryComponent(val dir: File, private val vpowerDir: File) : SessionPart val timeToEmptyS = if (discharging && chargeNowUah > 0 && abs(currentAvgUa) > 0) chargeNowUah * 3600L / abs(currentAvgUa) else 0L val charging = status == BatteryManager.BATTERY_STATUS_CHARGING val timeToFullS = if (charging && chargeFullUah > chargeNowUah && abs(currentAvgUa) > 0) (chargeFullUah - chargeNowUah) * 3600L / abs(currentAvgUa) else 0L + // Android can keep reporting charging at 100%; Linux reports Full there, and Steam shows 99% until it does. val statusText = when (status) { - BatteryManager.BATTERY_STATUS_CHARGING -> "Charging" + BatteryManager.BATTERY_STATUS_CHARGING -> if (pct >= 100) "Full" else "Charging" BatteryManager.BATTERY_STATUS_DISCHARGING -> "Discharging" BatteryManager.BATTERY_STATUS_FULL -> "Full" BatteryManager.BATTERY_STATUS_NOT_CHARGING -> "Not charging" diff --git a/app/src/test/java/com/droiddeck/launcher/session/BatteryComponentTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BatteryComponentTest.kt index 0c94f8225c..443559cf1e 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/BatteryComponentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/BatteryComponentTest.kt @@ -49,11 +49,25 @@ class BatteryComponentTest { assertEquals("-2000000", File(supplies, "BAT1/current_now").readText().trim()) } - private fun start(supplies: File, vpower: File, currentUa: Long) { + @Test fun chargingAtFullLevelIsReportedFullSoSteamStopsSaying99() { + val supplies = tmp.newFolder("power_supply") + val vpower = tmp.newFolder("vpower") + start(supplies, vpower, 2_000_000L, BatteryManager.BATTERY_STATUS_CHARGING, 100) + assertEquals("Full", File(supplies, "BAT1/status").readText().trim()) + assertEquals("Full", File(vpower, "battery_status").readText().trim()) + battery?.stop() + start(supplies, vpower, 2_000_000L, BatteryManager.BATTERY_STATUS_CHARGING, 99) + assertEquals("Charging", File(supplies, "BAT1/status").readText().trim()) + } + + private fun start( + supplies: File, vpower: File, currentUa: Long, + status: Int = BatteryManager.BATTERY_STATUS_DISCHARGING, level: Int = 50, + ) { val context = RuntimeEnvironment.getApplication() context.sendStickyBroadcast(Intent(Intent.ACTION_BATTERY_CHANGED).apply { - putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_DISCHARGING) - putExtra(BatteryManager.EXTRA_LEVEL, 50) + putExtra(BatteryManager.EXTRA_STATUS, status) + putExtra(BatteryManager.EXTRA_LEVEL, level) putExtra(BatteryManager.EXTRA_SCALE, 100) putExtra(BatteryManager.EXTRA_VOLTAGE, 4000) }) From 007166753cd5972490151c981ff691a6a2c5e7b7 Mon Sep 17 00:00:00 2001 From: ovurrsl <ovurrsl@users.noreply.github.com> Date: Sun, 25 Oct 2026 17:35:36 -0400 Subject: [PATCH 047/135] fix: start the session even when the agent environment can't be prepared --- .../java/com/droiddeck/launcher/session/SessionService.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 4584cb53e0..1df7ea31b7 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -432,7 +432,9 @@ class SessionService : Service() { killStragglers() for (pack in listOf(AddonPack.PROOT, AddonPack.DIRECTAUDIO)) if (!pack.await(this, { gen == sessionGen && SessionState.running })) Log.w(TAG, "${pack.name} pack unavailable") - val agentEnvironment = com.droiddeck.launcher.agent.AgentEnv.beginSession(this) + val agentEnvironment = runCatching { com.droiddeck.launcher.agent.AgentEnv.beginSession(this) } + .onFailure { Log.w(TAG, "agent environment skipped", it) } + .getOrDefault(emptyList()) SessionFiles.stage(this, root, startsSession = true) // Earlier sessions' reports still read the Steam logs and VAC marker this session replaces. SessionArtifacts.awaitCollections() From b4b78836484f3f30fd50847bbcb00727de0bb9cf Mon Sep 17 00:00:00 2001 From: kingokksa <47888451+kingokksa@users.noreply.github.com> Date: Mon, 26 Oct 2026 05:49:58 +0800 Subject: [PATCH 048/135] fix: Reuse the prefix the client made for a shortcut id (#1107) * fix: Reuse the prefix the client made for a shortcut id droiddeck-proton-run builds the prefix path as steamapps/compatdata/<appid>, but the client names that folder with the signed 32-bit form of the shortcut id. A shortcut whose id has the top bit set therefore got a second, empty prefix, and the first launch after that ran wineboot from scratch: the session sat on a black screen for the length of a full prefix init, and the old prefix was never reused. Match the folder by its unsigned value instead, the way the client does: int(name) % 2 ** 32 == appid % 2 ** 32. prefix_of() also accepts a negative folder name now, and reports its unsigned id so the Steam environment it sets up stays valid. * fix: Reject folder names int() cannot read, and skip files lstrip("-").isdigit() accepts "--1" and superscript digits, which int() then raises on, and one such entry in compatdata would stop shortcut resolution. Match r"-?[0-9]+" instead. A matching name is also only used when it is a directory, so a stray file cannot take STEAM_COMPAT_DATA_PATH. * fix: reuse signed shortcut compatdata prefix * fix: prefer initialized Proton shortcut prefixes --------- Co-authored-by: xXJsonDeruloXx <danielhimebauch@gmail.com> Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- .../usr/local/bin/droiddeck-proton-run | 35 ++++++++++++--- tools/tests/test_desktop_open.py | 44 +++++++++++++++++++ 2 files changed, 74 insertions(+), 5 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run index 3648ddede3..624d420741 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run @@ -193,9 +193,9 @@ def steam_game(program, libs): def prefix_of(program): for folder, below in ancestors(program): parent = os.path.dirname(folder) - if below == "pfx" and os.path.basename(parent) == "compatdata" and os.path.basename(folder).isdigit(): + if below == "pfx" and os.path.basename(parent) == "compatdata" and re.fullmatch(r"-?[0-9]+", os.path.basename(folder)): library = os.path.dirname(os.path.dirname(parent)) - return Target(os.path.basename(folder), folder, os.path.dirname(program), library, "prefix") + return Target(str(int(os.path.basename(folder)) % 2 ** 32), folder, os.path.dirname(program), library, "prefix") return None @@ -238,6 +238,30 @@ def shortcut_entries(root): return entries +def prefix_folder(root, appid): + """The prefix folder the client made for [appid], under either spelling of the id.""" + folder = os.path.join(root, "steamapps", "compatdata") + try: + names = sorted(os.listdir(folder)) + except OSError: + names = [] + candidates = [] + for name in names: + if not re.fullmatch(r"-?[0-9]+", name): + continue + try: + matches = int(name) % 2 ** 32 == appid % 2 ** 32 + except ValueError: + continue + match = os.path.join(folder, name) + if matches and os.path.isdir(match): + candidates.append((os.path.isdir(os.path.join(match, "pfx")), + name == str(appid % 2 ** 32), name, match)) + if candidates: + return min(candidates, key=lambda item: (not item[0], not item[1], item[2]))[3] + return os.path.join(folder, str(appid % 2 ** 32)) + + def vdf_string(token): return re.sub(r'\\(.)', r'\1', token[1:-1]) if token.startswith('"') else "" @@ -275,7 +299,7 @@ def steam_options(app, root): def shortcut(program, root): for appid, exe, start in shortcut_entries(root): if same_file(program, exe): - return Target(appid, os.path.join(root, "steamapps", "compatdata", str(appid)), + return Target(appid, prefix_folder(root, appid), os.path.dirname(program), root, "shortcut", start if os.path.isdir(start) else None) return None @@ -292,7 +316,7 @@ def locate(program, root): if found: return found appid = own_id(program) - return Target(appid, os.path.join(root, "steamapps", "compatdata", str(appid)), + return Target(appid, prefix_folder(root, appid), os.path.dirname(program), root, "own") @@ -376,7 +400,8 @@ def steam_launch(appid, root): def shortcut_target(appid, program, start, root): - return Target(appid, os.path.join(root, "steamapps", "compatdata", str(appid)), os.path.dirname(program), root, + appid = int(appid) % 2 ** 32 + return Target(str(appid), prefix_folder(root, appid), os.path.dirname(program), root, "shortcut", start if start and os.path.isdir(start) else None) diff --git a/tools/tests/test_desktop_open.py b/tools/tests/test_desktop_open.py index 227fd31ba7..ef299963b7 100644 --- a/tools/tests/test_desktop_open.py +++ b/tools/tests/test_desktop_open.py @@ -570,6 +570,50 @@ class ProtonRunTest(Temp): self.game("70", "Linux Game", "run.sh") self.assertEqual(self.run_main(["--app", "70"])[0], 2) + def test_without_steam_a_shortcut_reuses_a_signed_prefix_folder(self): + bat = self.write("Games/Epic/Game/.droiddeck-launch.bat", b"@echo off") + start = self.tmp / "Games/Epic/Game/Binaries" + start.mkdir() + signed = self.root / "steamapps/compatdata/-1561598272" + signed.mkdir(parents=True) + code, calls, dirs = self.run_main(["--app", "2733369024", "--dir", str(start), "--", str(bat)]) + self.assertIsNone(code) + env = calls[0][2] + self.assertEqual(env["STEAM_COMPAT_DATA_PATH"], str(signed)) + self.assertFalse((self.root / "steamapps/compatdata/2733369024").exists()) + + def test_prefix_folder_prefers_initialized_unsigned_over_empty_signed(self): + signed = self.root / "steamapps/compatdata/-1561598272" + signed.mkdir(parents=True) + initialized = self.root / "steamapps/compatdata/2733369024/pfx" + initialized.mkdir(parents=True) + + self.assertEqual(RUN["prefix_folder"](str(self.root), 2733369024), str(initialized.parent)) + + def test_prefix_folder_prefers_initialized_signed_over_empty_unsigned(self): + unsigned = self.root / "steamapps/compatdata/2733369024" + unsigned.mkdir(parents=True) + initialized = self.root / "steamapps/compatdata/-1561598272/pfx" + initialized.mkdir(parents=True) + + self.assertEqual(RUN["prefix_folder"](str(self.root), 2733369024), str(initialized.parent)) + + def test_prefix_folder_prefers_unsigned_when_initialization_ties(self): + unsigned = self.root / "steamapps/compatdata/2733369024/pfx" + unsigned.mkdir(parents=True) + signed = self.root / "steamapps/compatdata/-1561598272/pfx" + signed.mkdir(parents=True) + + self.assertEqual(RUN["prefix_folder"](str(self.root), 2733369024), str(unsigned.parent)) + + def test_prefix_folder_skips_numeric_names_too_long_to_convert(self): + from unittest.mock import patch + folder = self.root / "steamapps/compatdata" + folder.mkdir(parents=True) + with patch.object(RUN["os"], "listdir", return_value=["9" * 5000]): + self.assertEqual(RUN["prefix_folder"](str(self.root), 2733369024), + str(folder / "2733369024")) + def test_without_steam_a_shortcut_keeps_its_prefix_folder_and_launch_options(self): bat = self.write("Games/Epic/Game/.droiddeck-launch.bat", b"@echo off") start = self.tmp / "Games/Epic/Game/Binaries" From e76489cceac703f8321dbe1a046e95e78410cca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Mon, 26 Oct 2026 00:50:03 +0300 Subject: [PATCH 049/135] fix: refuse overwriting in-use component packages and clear unpacked store on replace (#1144) * fix: refuse overwriting in-use component packages and clear unpacked store on replace * fix: preserve component store until replacement succeeds * fix: invalidate completed component cache before replace * fix: constrain unpacked component cache path * Test rejected package cache dot segments --------- Co-authored-by: ovurrsl <ovurrsl@users.noreply.github.com> Co-authored-by: xXJsonDeruloXx <danielhimebauch@gmail.com> Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- .../launcher/session/ComponentsManager.kt | 52 ++++++- .../launcher/session/ComponentImportTest.kt | 135 ++++++++++++++++++ .../launcher/session/ForcedPackageTest.kt | 12 ++ 3 files changed, 197 insertions(+), 2 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/ComponentImportTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index db387833b0..f10ab12448 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -780,6 +780,27 @@ object ComponentsManager { true } + private fun checkPackageUnused(context: Context, state: JSONObject, name: String) { + val installed = protons(context).distinctBy { it.id }.associateBy { it.id } + for (key in listOf("queued", "active")) { + val byProton = state.sub(key) + for (pid in byProton.keys()) { + val comps = byProton.optJSONObject(pid) ?: continue + for (comp in comps.keys()) { + val entry = comps.optJSONObject(comp) ?: continue + check(entry.optString("file") != name || !liveSelection(key, entry, installed[pid])) { + context.getString(R.string.cmgr_package_in_use, name, installed[pid]?.name ?: pid) + } + } + } + } + val profiles = state.sub("profiles") + for (scope in profiles.keys()) { + val profile = profiles.optJSONObject(scope) ?: continue + check(COMPONENTS.none { profile.optString(it) == name }) { context.getString(R.string.cmgr_package_in_use, name, scope) } + } + } + fun carryOver(context: Context, fromDir: String, toDir: String) { synchronized(lock) { val target = protons(context).firstOrNull { it.id == safeName(toDir) } ?: return @@ -828,6 +849,33 @@ object ComponentsManager { } } + private fun storePackage(context: Context, part: File, dest: File) { + try { + if (dest.isFile && runCatching { Hashes.sha256(dest) }.getOrNull()?.equals(Hashes.sha256(part), true) == true) return + if (dest.exists()) checkPackageUnused(context, loadState(context), dest.name) + val store = File(launchDir(context), "store").canonicalFile + val cacheKey = unpackedCacheKey(dest.name) + val unpacked = File(store, cacheKey).canonicalFile + check(unpacked.parentFile == store) { "Invalid unpacked component cache path for ${dest.name}" } + val complete = File(unpacked, ".complete") + if (complete.exists()) check(complete.delete()) { "Could not invalidate unpacked component ${dest.name}" } + if (!part.renameTo(dest)) { + dest.delete() + check(part.renameTo(dest)) { "Could not store ${dest.name}" } + } + if (!unpacked.deleteRecursively() && unpacked.exists()) { + check(!complete.exists()) { "Could not invalidate unpacked component ${dest.name}" } + Log.w(TAG, "Could not remove stale unpacked files for ${dest.name}; cache marker is invalidated") + } + } finally { + part.delete() + } + } + + internal fun unpackedCacheKey(filename: String): String = safeName(filename.removeSuffix(".wcp")).also { + require(it != "." && it != "..") { "Invalid component cache name" } + } + fun deletePackage(context: Context, file: String): String = synchronized(lock) { val name = safeName(file) val state = loadState(context) @@ -877,7 +925,7 @@ object ComponentsManager { fun importPackage(context: Context, source: File, name: String): Package = synchronized(lock) { val info = packageInfo(context, source) val dest = File(packagesDir(context), safeName(name).let { if (it.endsWith(".wcp")) it else "$it.wcp" }) - source.copyTo(File(dest.parentFile, dest.name + ".part"), overwrite = true).renameTo(dest) + storePackage(context, source.copyTo(File(dest.parentFile, dest.name + ".part"), overwrite = true), dest) info.copy(file = dest.name) } @@ -1030,7 +1078,7 @@ object ComponentsManager { } if (!Hashes.sha256(part).equals(item.digest.substringAfter(':'), true)) { part.delete(); error(context.getString(R.string.cmgr_checksum_mismatch)) } val info = runCatching { packageInfo(context, part) }.getOrElse { part.delete(); throw it } - synchronized(lock) { part.renameTo(dest) } + synchronized(lock) { storePackage(context, part, dest) } return info.copy(file = dest.name) } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentImportTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentImportTest.kt new file mode 100644 index 0000000000..db42f4df1e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentImportTest.kt @@ -0,0 +1,135 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import com.droiddeck.launcher.core.Hashes +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.github.luben.zstd.ZstdOutputStream +import org.apache.commons.compress.archivers.tar.TarArchiveEntry +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertThrows +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.io.BufferedOutputStream +import java.io.File +import java.io.FileOutputStream + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class ComponentImportTest { + private lateinit var context: Context + + @Before fun setUp() { + context = RuntimeEnvironment.getApplication() + File(context.filesDir, "components").deleteRecursively() + LinuxRuntime.rootDir(context).deleteRecursively() + } + + @Test fun refusesOverwritingReferencedPackageWithDifferentContent() { + val wcpA = createWcp("src-a.wcp", "A") + val wcpB = createWcp("src-b.wcp", "B") + val shaA = Hashes.sha256(wcpA) + + ComponentsManager.importPackage(context, wcpA, "dxvk.wcp") + ComponentsManager.setGameComponent(context, "10", "dxvk", "dxvk.wcp") + + assertThrows(IllegalStateException::class.java) { + ComponentsManager.importPackage(context, wcpB, "dxvk.wcp") + } + + val stored = File(context.filesDir, "components/packages/dxvk.wcp") + assertEquals(shaA, Hashes.sha256(stored)) + assertFalse(File(context.filesDir, "components/packages/dxvk.wcp.part").exists()) + } + + @Test fun allowsReimportingIdenticalPackageWhileReferenced() { + val wcpA = createWcp("src-a.wcp", "A") + val shaA = Hashes.sha256(wcpA) + + ComponentsManager.importPackage(context, wcpA, "dxvk.wcp") + ComponentsManager.setGameComponent(context, "10", "dxvk", "dxvk.wcp") + + val reimported = ComponentsManager.importPackage(context, wcpA, "dxvk.wcp") + assertEquals("A", reimported.version) + assertEquals("dxvk.wcp", reimported.file) + + val stored = File(context.filesDir, "components/packages/dxvk.wcp") + assertEquals(shaA, Hashes.sha256(stored)) + assertFalse(File(context.filesDir, "components/packages/dxvk.wcp.part").exists()) + } + + @Test fun invalidatesUnpackedStoreWhenReplacingUnreferencedPackage() { + val wcpA = createWcp("src-a.wcp", "A") + val wcpB = createWcp("src-b.wcp", "B") + val shaB = Hashes.sha256(wcpB) + + ComponentsManager.importPackage(context, wcpA, "dxvk.wcp") + val unpacked = File(LinuxRuntime.rootDir(context), "root/.local/share/droiddeck-components/store/dxvk") + unpacked.mkdirs() + File(unpacked, ".complete").writeText("ok") + assertTrue(File(unpacked, ".complete").isFile) + + val replaced = ComponentsManager.importPackage(context, wcpB, "dxvk.wcp") + assertEquals("B", replaced.version) + + val stored = File(context.filesDir, "components/packages/dxvk.wcp") + assertEquals(shaB, Hashes.sha256(stored)) + assertFalse(unpacked.exists()) + } + + @Test fun deletingAPackageAGameProfileUsesClearsThatProfileEntry() { + val wcpA = createWcp("src-a.wcp", "A") + ComponentsManager.importPackage(context, wcpA, "dxvk.wcp") + writeGameProfile("10", "dxvk", "dxvk.wcp") + + ComponentsManager.deletePackage(context, "dxvk.wcp") + + assertFalse(File(context.filesDir, "components/packages/dxvk.wcp").exists()) + val state = JSONObject(File(context.filesDir, "components/state.json").readText()) + assertFalse(state.optJSONObject("profiles")?.optJSONObject("10")?.has("dxvk") == true) + } + + private fun writeGameProfile(scope: String, comp: String, file: String) { + val state = File(context.filesDir, "components/state.json") + state.parentFile!!.mkdirs() + state.writeText( + JSONObject() + .put("active", JSONObject()) + .put("queued", JSONObject()) + .put("profiles", JSONObject().put(scope, JSONObject().put(comp, file))) + .toString(), + ) + } + + private fun createWcp(fileName: String, version: String): File { + val out = File(context.cacheDir, fileName) + val profile = JSONObject() + .put("type", "DXVK-Linux") + .put("versionName", version) + .put("description", "DXVK $version") + .toString() + .toByteArray(Charsets.UTF_8) + val dll = "dxvk-dll-$version".toByteArray(Charsets.UTF_8) + + TarArchiveOutputStream(ZstdOutputStream(BufferedOutputStream(FileOutputStream(out)))).use { tar -> + tar.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX) + val profEntry = TarArchiveEntry("profile.json").apply { size = profile.size.toLong() } + tar.putArchiveEntry(profEntry) + tar.write(profile) + tar.closeArchiveEntry() + + val dllEntry = TarArchiveEntry("files/lib/wine/dxvk/aarch64-windows/d3d11.dll").apply { size = dll.size.toLong() } + tar.putArchiveEntry(dllEntry) + tar.write(dll) + tar.closeArchiveEntry() + } + return out + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt index 3f5e6e8e41..ba026b4742 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt @@ -29,6 +29,18 @@ class ForcedPackageTest { LinuxRuntime.rootDir(context).deleteRecursively() } + @Test fun unpackedCacheNameCannotEscapeStoreDirectory() { + assertEquals("dxvk-2.7.1-linux", ComponentsManager.unpackedCacheKey(dxvk2)) + for (filename in listOf("..wcp", "...wcp")) { + try { + ComponentsManager.unpackedCacheKey(filename) + fail("Expected cache traversal name to be rejected: $filename") + } catch (_: IllegalArgumentException) { + // Expected: the derived path would be a dot segment. + } + } + } + @Test fun adreno6xxForcesDxvk2AndNothingElseDoes() { val rule = ComponentsManager.FORCED_PACKAGES.single { GpuInfo.Family.A6XX in it.families } assertEquals("dxvk", rule.comp) From 53ac21b4d05104473fc108f5d68a11b56e671ef8 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 17:50:51 -0400 Subject: [PATCH 050/135] fix: keep pending agent entries until the session's environment is ready --- app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt index e15fbab41f..0842f6b5a4 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt @@ -131,13 +131,13 @@ object AgentEnv { val state = load(context) val active = strings(state.optJSONArray("pending")) val overrides = strings(state.optJSONArray("pendingOverrides")) - state.put("active", JSONArray(active)).put("pending", JSONArray()) - state.put("activeOverrides", JSONArray(overrides)).put("pendingOverrides", JSONArray()) - save(context, state) bin(context).listFiles() ?.filter { it.name !in overrides }?.forEach { it.delete() } val lines = strings(state.optJSONArray("persistent")) + active val withPath = if (overrides.none { it != "libblfastpath.so" }) lines else lines + "PATH=$GUEST_BIN:${pathOf(lines)}" + state.put("active", JSONArray(active)).put("pending", JSONArray()) + state.put("activeOverrides", JSONArray(overrides)).put("pendingOverrides", JSONArray()) + save(context, state) if (withPath.isNotEmpty()) Log.i(TAG, "agent environment keys for this session: ${withPath.map { it.substringBefore('=') }}") withPath } From 8cf2ffe2ad7161fbfc729a114fcd0418dd4891ce Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 18:05:41 -0400 Subject: [PATCH 051/135] fix: say why Flatpak setup failed instead of blaming the mirrors (#1580) --- .../usr/local/bin/droiddeck-flatpak-setup | 12 +++-- tools/tests/test_flatpak_setup.py | 45 +++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 tools/tests/test_flatpak_setup.py diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup index 24806fa2e8..bd25b6089e 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup @@ -3,6 +3,7 @@ set -u export LANG=C.UTF-8 step() { echo "== STEP $*"; } fail() { echo "== FAIL $*"; exit 1; } +[ "$(id -u)" = 0 ] || fail "needs root: install Flatpak from the launcher's Store, which runs this as root" PACKAGES="flatpak ostree appstream libxmlb libmalcontent libfyaml accountsservice composefs xdg-dbus-proxy" while read -r pkg probe; do @@ -48,10 +49,13 @@ if [ ! -f /etc/pacman.d/gnupg/pubring.gpg ] && [ ! -f /etc/pacman.d/gnupg/pubrin fi step "Reading the package lists" -pacman --config "$CONF" --dbpath "$WORK/db" --noconfirm -Sy >/dev/null 2>&1 \ - || pacman --config "$CONF" --dbpath "$WORK/db" --noconfirm -Sy 2>&1 | tail -3 \ - || fail "could not reach the Arch Linux ARM mirrors" -[ -f "$WORK/db/sync/extra.db" ] || fail "could not reach the Arch Linux ARM mirrors" +sync_log=$(pacman --config "$CONF" --dbpath "$WORK/db" --noconfirm -Sy 2>&1) \ + || sync_log=$(pacman --config "$CONF" --dbpath "$WORK/db" --noconfirm -Sy 2>&1) +if [ ! -f "$WORK/db/sync/extra.db" ]; then + printf '%s\n' "$sync_log" | tail -3 + reason=$(printf '%s\n' "$sync_log" | grep -m1 -i '^error' | cut -c1-160) + fail "could not reach the Arch Linux ARM mirrors${reason:+ ($reason)}" +fi step "Downloading Flatpak" out=$(pacman --config "$CONF" --dbpath "$WORK/db" --cachedir "$WORK/pkg" --noconfirm -Sw -dd $PACKAGES 2>&1) diff --git a/tools/tests/test_flatpak_setup.py b/tools/tests/test_flatpak_setup.py new file mode 100644 index 0000000000..b5714b9a46 --- /dev/null +++ b/tools/tests/test_flatpak_setup.py @@ -0,0 +1,45 @@ +import os +from pathlib import Path +import subprocess +import tempfile +import unittest + + +SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup" + + +class FlatpakSetupTest(unittest.TestCase): + def run_setup(self, uid, pacman): + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + bin_dir = root / "bin" + bin_dir.mkdir() + stubs = {"id": "echo %d" % uid, "curl": "exit 7", "pacman": pacman, "pacman-key": "exit 0"} + for name, body in stubs.items(): + (bin_dir / name).write_text("#!/bin/sh\n%s\n" % body) + (bin_dir / name).chmod(0o755) + script = root / "setup" + script.write_text(SCRIPT.read_text().replace("WORK=/var/cache/droiddeck-flatpak", "WORK=%s/work" % root) + .replace("/etc/pacman.d/gnupg/pubring.gpg", str(root / "pubring.gpg")) + .replace(" /etc/pacman.conf >", " %s >" % (root / "pacman.conf"))) + (root / "pacman.conf").write_text("[options]\n[core]\nInclude = /etc/pacman.d/mirrorlist\n") + (root / "pubring.gpg").write_text("") + env = dict(os.environ, PATH="%s:%s" % (bin_dir, os.environ["PATH"])) + result = subprocess.run(["bash", str(script)], env=env, capture_output=True, text=True, timeout=30) + return result.returncode, result.stdout + + def test_a_manual_run_without_root_says_so(self): + code, out = self.run_setup(1000, "exit 0") + self.assertEqual(code, 1) + self.assertIn("== FAIL needs root", out) + self.assertNotIn("Reading the package lists", out) + + def test_an_unreachable_mirror_reports_pacmans_error(self): + code, out = self.run_setup(0, "echo \"error: failed retrieving file 'core.db' : Could not resolve host\" >&2; exit 1") + self.assertEqual(code, 1) + self.assertIn("== FAIL could not reach the Arch Linux ARM mirrors (error: failed retrieving file 'core.db' : " + "Could not resolve host)", out) + + +if __name__ == "__main__": + unittest.main() From 71fee6b3cc7fa6b6735a26d48573ef86d1093fa8 Mon Sep 17 00:00:00 2001 From: MaxsTechReview <maxjividen@gmail.com> Date: Sun, 25 Oct 2026 18:32:28 -0400 Subject: [PATCH 052/135] Keep a still direct touch held unless Long press is on (#1578) --- .../com/droiddeck/launcher/SessionActivity.kt | 1 + .../launcher/input/DirectTouchHold.kt | 8 ++++++- .../launcher/input/DirectTouchHoldTest.kt | 21 ++++++++++++++++++- .../input/SessionGestureRoutingTest.kt | 4 ++-- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index bc42fa7e41..5d8ad8e393 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2394,6 +2394,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { gestureConfig = com.droiddeck.launcher.input.GesturePrefs.read(this, gestureGame) gestureTouchStreamGate.reset() if (::touchscreenGestures.isInitialized) touchscreenGestures.configure(gestureConfig) + if (::directTouchHold.isInitialized) directTouchHold.configure(gestureConfig) gesturePointerReady = false recognizedGesture = null } diff --git a/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt b/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt index 318941c71c..8bf852fdbd 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt @@ -15,6 +15,7 @@ class DirectTouchHold( private var y = 0f private var consumed = false private var pressed = false + private var delayMs = 0L private val release = Runnable { if (pressed) listener.onButton(PointerGestures.BTN_RIGHT, false, x, y) pressed = false @@ -28,6 +29,11 @@ class DirectTouchHold( handler.postDelayed(release, 50L) } + fun configure(config: TouchGestureConfig) { + cancel() + delayMs = if (config.longPressEnabled) config.longPressDelay.toLong().coerceAtLeast(1L) else 0L + } + fun cancel() { handler.removeCallbacks(hold) handler.removeCallbacks(release) @@ -40,7 +46,7 @@ class DirectTouchHold( MotionEvent.ACTION_DOWN -> { cancel() x = event.x; y = event.y - handler.postDelayed(hold, 500L) + if (delayMs > 0L) handler.postDelayed(hold, delayMs) } MotionEvent.ACTION_MOVE -> if (event.pointerCount > 1 || abs(event.x - x) > slopPx || abs(event.y - y) > slopPx) handler.removeCallbacks(hold) diff --git a/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt b/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt index d7dd5307a9..513ee330f3 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt @@ -22,7 +22,7 @@ class DirectTouchHoldTest { } override fun onWheel(steps: Int) {} override fun onLongPress() {} - }) { events += "cancel touch" } + }) { events += "cancel touch" }.also { it.configure(TouchGestureConfig(longPressEnabled = true, longPressDelay = 500)) } @Test fun holdReleasesRawTouchBeforeClickAndConsumesTheLift() { assertFalse(touch(MotionEvent.ACTION_DOWN)) @@ -35,6 +35,25 @@ class DirectTouchHoldTest { hold.cancel() } + @Test fun stillHoldKeepsTheTouchWhenLongPressIsOff() { + hold.configure(TouchGestureConfig()) + assertFalse(touch(MotionEvent.ACTION_DOWN)) + advance(2000) + assertFalse(touch(MotionEvent.ACTION_MOVE)) + assertFalse(touch(MotionEvent.ACTION_UP)) + assertTrue(events.isEmpty()) + } + + @Test fun longPressFollowsTheConfiguredDelay() { + hold.configure(TouchGestureConfig(longPressEnabled = true, longPressDelay = 800)) + touch(MotionEvent.ACTION_DOWN) + advance(700) + assertTrue(events.isEmpty()) + advance(100) + assertEquals(listOf("cancel touch", "true at 40.0,30.0"), events) + hold.cancel() + } + @Test fun tapDragSecondFingerAndCancellationDoNotRightClick() { for (action in listOf(MotionEvent.ACTION_UP, MotionEvent.ACTION_MOVE, MotionEvent.ACTION_POINTER_DOWN, MotionEvent.ACTION_CANCEL)) { diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionGestureRoutingTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionGestureRoutingTest.kt index 7b2a55e2e0..7b33c71705 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SessionGestureRoutingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionGestureRoutingTest.kt @@ -172,7 +172,7 @@ class SessionGestureRoutingTest { val event = MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, 400f, 300f, 0) try { assertTrue(activity.onTouchEvent(event)) } finally { event.recycle() } val gestureMode = mode == SessionPrefs.TOUCH_GESTURES - shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(if (gestureMode) 350 else 500)) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(if (gestureMode) 350 else 320)) assertEquals(if (gestureMode) listOf(18 to true) else emptyList(), keys) assertEquals(if (gestureMode) emptyList() else listOf(PointerGestures.BTN_RIGHT to true), directButtons) ReflectionHelpers.callInstanceMethod<Unit>(activity, "onPause") @@ -220,7 +220,7 @@ class SessionGestureRoutingTest { override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { directButtons += button to pressed } override fun onWheel(steps: Int) {} override fun onLongPress() {} - }) {} + }) {}.also { it.configure(config) } setField("directTouchHold", directHold) launcherScroll = ScrollTouchGestures(8f, 50f, object : ScrollTouchGestures.Listener { override fun onMove(x: Float, y: Float) { scrollPositions += x to y } From 4922d309c87acecb5565d2aaea2c3bfbe2234bac Mon Sep 17 00:00:00 2001 From: Thomas Lee <88711221+ddd-ms@users.noreply.github.com> Date: Mon, 26 Oct 2026 07:21:40 +0800 Subject: [PATCH 053/135] perf: allocate only solved DD-FG flow levels (#1556) The flow solver starts at flowFinest_, but its images, uniform buffers and descriptor sets were allocated for every pyramid level. Keep the seven-level indices and allocate flow resources only where the solver reads and writes them. The default preset avoids three unused RGBA16F images, saving 38,707,200 bytes of pixel payload at 2560x1440 without changing the shaders or recorded GPU work. Add native allocation/dispatch regressions and document the resource budgets. --- app/src/main/cpp/framegen/ddfg/framegen.cpp | 3 +- .../main/cpp/framegen/ddfg/record_impl.inc | 7 +- docs/development/dd-fg.md | 38 ++ tools/tests/ddfg_flow_levels_harness.cpp | 359 ++++++++++++++++++ tools/tests/test_ddfg_flow_levels.py | 102 +++++ 5 files changed, 504 insertions(+), 5 deletions(-) create mode 100644 docs/development/dd-fg.md create mode 100644 tools/tests/ddfg_flow_levels_harness.cpp create mode 100644 tools/tests/test_ddfg_flow_levels.py diff --git a/app/src/main/cpp/framegen/ddfg/framegen.cpp b/app/src/main/cpp/framegen/ddfg/framegen.cpp index 82d0a764b7..5200f6b094 100644 --- a/app/src/main/cpp/framegen/ddfg/framegen.cpp +++ b/app/src/main/cpp/framegen/ddfg/framegen.cpp @@ -184,8 +184,9 @@ bool FrameGen::onResize(VkExtent2D extent, VkFormat , bool force) { VkExtent2D e = levelExtent(extent, l); if (!makeImage(pyrA_[l], e, VK_FORMAT_R32_SFLOAT, lumaUsage)) return false; if (!makeImage(pyrB_[l], e, VK_FORMAT_R32_SFLOAT, lumaUsage)) return false; - if (!makeImage(flowLvl_[l], e, VK_FORMAT_R16G16B16A16_SFLOAT, flowUsage)) return false; } + for (int l = flowFinest_; l < kLevels; ++l) + if (!makeImage(flowLvl_[l], levelExtent(extent, l), VK_FORMAT_R16G16B16A16_SFLOAT, flowUsage)) return false; pyrAs_.resize(kLevels); for (int l = flowFinest_; l < kLevels; ++l) if (!makeImage(pyrAs_[l], levelExtent(extent, l), VK_FORMAT_R32_SFLOAT, lumaUsage)) return false; diff --git a/app/src/main/cpp/framegen/ddfg/record_impl.inc b/app/src/main/cpp/framegen/ddfg/record_impl.inc index 554c05c7fc..734d94cdc9 100644 --- a/app/src/main/cpp/framegen/ddfg/record_impl.inc +++ b/app/src/main/cpp/framegen/ddfg/record_impl.inc @@ -439,7 +439,7 @@ static bool ensureScratch(FrameGen* fg, const DeviceDispatch* dd, VkDevice dev, makeUbo(dd, dev, mp, sizeof(FlowRegUBO), S.flowRegUbo, S.flowRegUboMem, S.flowRegUboPtr); if (S.flowRegUboPtr) { FlowRegUBO fu{cfg.frDt, cfg.frLambda, cfg.frEdge, cfg.frEps}; std::memcpy(S.flowRegUboPtr, &fu, sizeof(fu)); } S.flowUbo.resize(kLevels); S.flowUboMem.resize(kLevels); S.flowUboPtr.resize(kLevels); - for (int l = 0; l < kLevels; ++l) { + for (int l = fg->flowFinest(); l < kLevels; ++l) { makeUbo(dd, dev, mp, sizeof(FlowUBO), S.flowUbo[l], S.flowUboMem[l], S.flowUboPtr[l]); if (S.flowUboPtr[l]) { FlowUBO u{cfg.flowScale, (uint32_t)l, 0.6f, 1.6f}; std::memcpy(S.flowUboPtr[l], &u, sizeof(u)); } } @@ -464,13 +464,12 @@ static bool ensureScratch(FrameGen* fg, const DeviceDispatch* dd, VkDevice dev, } S.sFlow.resize(kLevels); - for (int l = 0; l < kLevels; ++l) { + for (int l = fg->flowFinest(); l < kLevels; ++l) { S.sFlow[l] = allocSet(dd, dev, pool, pFlow.setLayout); int pred = (l + 1 < kLevels) ? l + 1 : l; - VkImageView currLvl = (l >= fg->flowFinest()) ? pyrAs[l].view : pyrA[l].view; wUbo(dd, dev, S.sFlow[l], 0, S.flowUbo[l], sizeof(FlowUBO)); wImg(dd, dev, S.sFlow[l], 32, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, pyrB[l].view, samp, GEN); - wImg(dd, dev, S.sFlow[l], 33, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, currLvl, samp, GEN); + wImg(dd, dev, S.sFlow[l], 33, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, pyrAs[l].view, samp, GEN); wImg(dd, dev, S.sFlow[l], 34, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, flowLvl[pred].view, samp, GEN); wImg(dd, dev, S.sFlow[l], 48, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, flowLvl[l].view, VK_NULL_HANDLE, GEN); } diff --git a/docs/development/dd-fg.md b/docs/development/dd-fg.md new file mode 100644 index 0000000000..81cb43a9ea --- /dev/null +++ b/docs/development/dd-fg.md @@ -0,0 +1,38 @@ +# DD-FG flow resources + +DD-FG keeps seven luminance pyramid levels for both input frames. Its performance +preset chooses the finest level at which optical flow is solved: + +| Preset | Finest solved level | Allocated flow levels | +|---|---:|---| +| 0 | 1 | 1 through 6 | +| 1 | 2 | 2 through 6 | +| 2 (the app default) | 3 | 3 through 6 | + +Only those solved levels need RGBA16F flow images, flow UBOs and flow descriptor +sets. The vectors keep their original level indices; unused entries are null. +The full luminance pyramids, full-resolution expanded flow images, regularization +and synthesis are unchanged. + +At the default preset this avoids three flow images, three uniform buffers and +three descriptor sets. The removed image payload is +`8 * (width * height + (width >> 1) * (height >> 1) + (width >> 2) * (height >> 2))` +bytes for dimensions at least four pixels: + +| Input size | Removed image payload | +|---|---:| +| 1280 x 720 | 9,676,800 bytes | +| 1920 x 1080 | 21,772,800 bytes | +| 2560 x 1440 | 38,707,200 bytes | + +These are pixel payloads, not driver allocation sizes or measured FPS gains. + +## Validation + +Run `python3 -m unittest discover -s tools/tests -p 'test_ddfg_flow_levels.py'`. +The host test needs a C++17 compiler and system Vulkan headers or an Android NDK +selected through the usual SDK/NDK environment variables. It compiles the actual +DD-FG chain against a mock Vulkan dispatch table and checks resource counts, +dispatch order and sizes, valid descriptor bindings, both models, every preset, +2x/3x/4x generation, small/odd extents, resize and live preset changes. +It does not execute shaders on a GPU or replace on-device validation. diff --git a/tools/tests/ddfg_flow_levels_harness.cpp b/tools/tests/ddfg_flow_levels_harness.cpp new file mode 100644 index 0000000000..e5cf7bf701 --- /dev/null +++ b/tools/tests/ddfg_flow_levels_harness.cpp @@ -0,0 +1,359 @@ +#include "framegen.hpp" +#include <algorithm> +#include <cassert> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <map> +#include <memory> +#include <string> +#include <vector> + +namespace { + +constexpr int levels = 7; +constexpr VkImageUsageFlags flow_usage = + VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT; +enum Pipeline { LUMA, DOWNSAMPLE, FLOW3, FLOW4, EXPAND3, EXPAND4, GLOBAL_MOTION, PREWARP, FLOW_REG, SYNTH }; +struct Image { VkExtent3D extent; VkFormat format; VkImageUsageFlags usage; }; +struct Allocation { VkDeviceSize size; std::unique_ptr<uint8_t[]> data; }; +struct Binding { VkDescriptorType type; VkImageView view; VkBuffer buffer; VkDeviceSize range; }; +struct Dispatch { unsigned pipeline; uint32_t x, y, z; }; +std::map<VkImage, Image> images; +std::map<VkImageView, VkImage> views; +std::map<VkBuffer, VkBufferCreateInfo> buffers; +std::map<VkDeviceMemory, Allocation> allocations; +std::map<VkBuffer, VkDeviceMemory> buffer_memory; +std::map<VkDescriptorSet, std::map<uint32_t, Binding>> descriptors; +std::map<VkPipeline, unsigned> pipelines; +std::map<VkImage, unsigned> image_ids; +std::map<VkBuffer, unsigned> buffer_ids; +std::vector<Dispatch> dispatches; +uintptr_t serial = 100; +unsigned buffer_creates, set_creates; +VkPipeline bound_pipeline; +VkDescriptorSet bound_set; +uint64_t command_hash = 14695981039346656037ull; + +template<class T> T handle() { return reinterpret_cast<T>(++serial); } + +void hash(uint64_t value) { + for (unsigned i = 0; i < 8; i++) { + command_hash = (command_hash ^ (value & 255)) * 1099511628211ull; + value >>= 8; + } +} + +void hash_image(VkImage image) { + assert(images.count(image)); + if (!image_ids.count(image)) image_ids[image] = static_cast<unsigned>(image_ids.size() + 1); + const auto &info = images.at(image); + hash(image_ids.at(image)); + hash(info.extent.width); hash(info.extent.height); hash(info.format); hash(info.usage); +} + +template<class Info, class Out> +VkResult VKAPI_CALL create(VkDevice, const Info *, const VkAllocationCallbacks *, Out *out) { + *out = handle<Out>(); + return VK_SUCCESS; +} +template<class T> void VKAPI_CALL destroy(VkDevice, T, const VkAllocationCallbacks *) {} + +VkResult VKAPI_CALL create_image(VkDevice, const VkImageCreateInfo *info, + const VkAllocationCallbacks *, VkImage *out) { + *out = handle<VkImage>(); + images[*out] = {info->extent, info->format, info->usage}; + return VK_SUCCESS; +} +VkResult VKAPI_CALL create_view(VkDevice, const VkImageViewCreateInfo *info, + const VkAllocationCallbacks *, VkImageView *out) { + assert(images.count(info->image)); + *out = handle<VkImageView>(); + views[*out] = info->image; + return VK_SUCCESS; +} +void VKAPI_CALL destroy_image(VkDevice, VkImage image, const VkAllocationCallbacks *) { + assert(images.erase(image) == 1); +} +void VKAPI_CALL destroy_view(VkDevice, VkImageView view, const VkAllocationCallbacks *) { + assert(views.erase(view) == 1); +} +VkResult VKAPI_CALL create_buffer(VkDevice, const VkBufferCreateInfo *info, + const VkAllocationCallbacks *, VkBuffer *out) { + *out = handle<VkBuffer>(); + buffers[*out] = *info; + buffer_creates++; + return VK_SUCCESS; +} +void VKAPI_CALL destroy_buffer(VkDevice, VkBuffer buffer, const VkAllocationCallbacks *) { + assert(buffers.erase(buffer) == 1); + buffer_memory.erase(buffer); +} +void VKAPI_CALL image_requirements(VkDevice, VkImage image, VkMemoryRequirements *out) { + const auto &info = images.at(image); + const uint64_t bytes = info.format == VK_FORMAT_R32_SFLOAT ? 4 : 8; + *out = {uint64_t(info.extent.width) * info.extent.height * bytes, 1, 1}; +} +void VKAPI_CALL buffer_requirements(VkDevice, VkBuffer buffer, VkMemoryRequirements *out) { + *out = {buffers.at(buffer).size, 1, 1}; +} +VkResult VKAPI_CALL allocate(VkDevice, const VkMemoryAllocateInfo *info, + const VkAllocationCallbacks *, VkDeviceMemory *out) { + *out = handle<VkDeviceMemory>(); + allocations[*out].size = info->allocationSize; + return VK_SUCCESS; +} +void VKAPI_CALL free_memory(VkDevice, VkDeviceMemory memory, const VkAllocationCallbacks *) { + assert(allocations.erase(memory) == 1); +} +VkResult VKAPI_CALL bind_image(VkDevice, VkImage image, VkDeviceMemory memory, VkDeviceSize) { + assert(images.count(image) && allocations.count(memory)); + return VK_SUCCESS; +} +VkResult VKAPI_CALL bind_buffer(VkDevice, VkBuffer buffer, VkDeviceMemory memory, VkDeviceSize) { + assert(buffers.count(buffer) && allocations.count(memory)); + buffer_memory[buffer] = memory; + return VK_SUCCESS; +} +VkResult VKAPI_CALL map_memory(VkDevice, VkDeviceMemory memory, VkDeviceSize offset, + VkDeviceSize size, VkMemoryMapFlags, void **out) { + auto &allocation = allocations.at(memory); + assert(offset == 0 && size <= allocation.size); + allocation.data = std::make_unique<uint8_t[]>(allocation.size); + *out = allocation.data.get(); + return VK_SUCCESS; +} +void VKAPI_CALL unmap(VkDevice, VkDeviceMemory memory) { assert(allocations.count(memory)); } +VkResult VKAPI_CALL idle(VkDevice) { return VK_SUCCESS; } +void VKAPI_CALL memory_properties(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties *out) { + *out = {}; + out->memoryTypeCount = 1; + out->memoryTypes[0].propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; +} +VkResult VKAPI_CALL allocate_sets(VkDevice, const VkDescriptorSetAllocateInfo *info, VkDescriptorSet *out) { + for (uint32_t i = 0; i < info->descriptorSetCount; i++) { + out[i] = handle<VkDescriptorSet>(); + descriptors[out[i]] = {}; + set_creates++; + } + return VK_SUCCESS; +} +VkResult VKAPI_CALL reset_pool(VkDevice, VkDescriptorPool, VkDescriptorPoolResetFlags) { + descriptors.clear(); + return VK_SUCCESS; +} +void VKAPI_CALL update_sets(VkDevice, uint32_t count, const VkWriteDescriptorSet *writes, + uint32_t, const VkCopyDescriptorSet *) { + for (uint32_t i = 0; i < count; i++) { + const auto &write = writes[i]; + assert(descriptors.count(write.dstSet) && write.descriptorCount == 1); + Binding binding{write.descriptorType, VK_NULL_HANDLE, VK_NULL_HANDLE, 0}; + if (write.pImageInfo) { + binding.view = write.pImageInfo->imageView; + assert(views.count(binding.view)); + } else { + binding.buffer = write.pBufferInfo->buffer; + binding.range = write.pBufferInfo->range; + assert(buffers.count(binding.buffer)); + } + descriptors.at(write.dstSet)[write.dstBinding] = binding; + } +} +VkResult VKAPI_CALL create_pipelines(VkDevice, VkPipelineCache, uint32_t count, + const VkComputePipelineCreateInfo *, const VkAllocationCallbacks *, + VkPipeline *out) { + for (uint32_t i = 0; i < count; i++) { + const auto index = static_cast<unsigned>(pipelines.size()); + out[i] = handle<VkPipeline>(); + pipelines[out[i]] = index; + } + return VK_SUCCESS; +} +void VKAPI_CALL bind_pipeline(VkCommandBuffer, VkPipelineBindPoint, VkPipeline pipeline) { + assert(pipelines.count(pipeline)); + bound_pipeline = pipeline; +} +void VKAPI_CALL bind_sets(VkCommandBuffer, VkPipelineBindPoint, VkPipelineLayout, + uint32_t, uint32_t count, const VkDescriptorSet *sets, + uint32_t, const uint32_t *) { + assert(count == 1 && descriptors.count(sets[0])); + bound_set = sets[0]; +} +void VKAPI_CALL dispatch(VkCommandBuffer, uint32_t x, uint32_t y, uint32_t z) { + const unsigned pipeline = pipelines.at(bound_pipeline); + dispatches.push_back({pipeline, x, y, z}); + hash(1); hash(pipeline); hash(x); hash(y); hash(z); + for (const auto &[slot, binding] : descriptors.at(bound_set)) { + hash(slot); hash(binding.type); + if (binding.view) { + hash_image(views.at(binding.view)); + } else { + if (!buffer_ids.count(binding.buffer)) + buffer_ids[binding.buffer] = static_cast<unsigned>(buffer_ids.size() + 1); + const auto &allocation = allocations.at(buffer_memory.at(binding.buffer)); + const auto size = binding.range == VK_WHOLE_SIZE ? allocation.size : binding.range; + assert(allocation.data && size <= allocation.size); + hash(buffer_ids.at(binding.buffer)); hash(size); + for (VkDeviceSize i = 0; i < size; i++) hash(allocation.data[i]); + } + } +} +void VKAPI_CALL barrier(VkCommandBuffer, VkPipelineStageFlags src, VkPipelineStageFlags dst, + VkDependencyFlags flags, uint32_t nm, const VkMemoryBarrier *memory, + uint32_t nb, const VkBufferMemoryBarrier *, uint32_t ni, + const VkImageMemoryBarrier *image) { + assert(nb == 0); + hash(2); hash(src); hash(dst); hash(flags); hash(nm); hash(ni); + for (uint32_t i = 0; i < nm; i++) { + hash(memory[i].srcAccessMask); hash(memory[i].dstAccessMask); + } + for (uint32_t i = 0; i < ni; i++) { + hash_image(image[i].image); + hash(image[i].oldLayout); hash(image[i].newLayout); + hash(image[i].srcAccessMask); hash(image[i].dstAccessMask); + hash(image[i].srcQueueFamilyIndex); hash(image[i].dstQueueFamilyIndex); + } +} +void VKAPI_CALL clear_image(VkCommandBuffer, VkImage image, VkImageLayout layout, + const VkClearColorValue *color, uint32_t count, const VkImageSubresourceRange *) { + assert(count == 1); + hash(3); hash_image(image); hash(layout); + for (unsigned i = 0; i < 4; i++) hash(color->uint32[i]); +} +void VKAPI_CALL copy_image(VkCommandBuffer, VkImage src, VkImageLayout sl, VkImage dst, + VkImageLayout dl, uint32_t count, const VkImageCopy *region) { + assert(count == 1); + hash(4); hash_image(src); hash(sl); hash_image(dst); hash(dl); + hash(region->extent.width); hash(region->extent.height); hash(region->extent.depth); +} + +uint32_t dimension(uint32_t full, int level) { return std::max(full >> level, 1u); } + +void check_images(uint32_t width, uint32_t height, int finest) { + assert(images.size() == static_cast<size_t>(32 - 2 * finest)); + for (int level = finest; level < levels; level++) { + const auto w = dimension(width, level), h = dimension(height, level); + assert(std::any_of(images.begin(), images.end(), [=](const auto &entry) { + const auto &image = entry.second; + return image.format == VK_FORMAT_R16G16B16A16_SFLOAT && image.usage == flow_usage && + image.extent.width == w && image.extent.height == h; + })); + } +} + +VkImageView external_image(uint32_t width, uint32_t height) { + VkImage image = handle<VkImage>(); + VkImageView view = handle<VkImageView>(); + images[image] = {{width, height, 1}, VK_FORMAT_R8G8B8A8_UNORM, + VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT}; + views[view] = image; + return view; +} + +void record(ddfg::FrameGen &fg, int model, uint32_t width, uint32_t height, unsigned generations) { + const auto previous = external_image(width, height), current = external_image(width, height); + const auto first = dispatches.size(); + for (unsigned i = 0; i < generations; i++) + fg.record(reinterpret_cast<VkCommandBuffer>(1), previous, current, external_image(width, height), + float(i + 1) / float(generations + 1), 0, i, i != 0); + std::vector<Dispatch> expected; + auto add = [&](unsigned pipeline, int level) { + expected.push_back({pipeline, (dimension(width, level) + 15) / 16, + (dimension(height, level) + 15) / 16, 1}); + }; + add(LUMA, 0); add(LUMA, 0); + for (int level = 1; level < levels; level++) { add(DOWNSAMPLE, level); add(DOWNSAMPLE, level); } + expected.push_back({GLOBAL_MOTION, 8, 1, 1}); + for (int level = fg.flowFinest(); level < levels; level++) add(PREWARP, level); + for (int level = levels - 1; level >= fg.flowFinest(); level--) add(model == 4 ? FLOW4 : FLOW3, level); + for (int i = 0; i < 4; i++) add(FLOW_REG, fg.flowFinest()); + add(model == 4 ? EXPAND4 : EXPAND3, 0); + for (unsigned i = 0; i < generations; i++) add(SYNTH, 0); + assert(dispatches.size() - first == expected.size()); + for (size_t i = 0; i < expected.size(); i++) { + const auto &actual = dispatches[first + i], &want = expected[i]; + assert(actual.pipeline == want.pipeline && actual.x == want.x && actual.y == want.y && actual.z == want.z); + } + for (auto it = views.begin(); it != views.end();) { + if (images.at(it->second).format == VK_FORMAT_R8G8B8A8_UNORM) { + images.erase(it->second); + it = views.erase(it); + } else ++it; + } +} + +} + +int main(int argc, char **argv) { + assert(argc == 8); + const std::string mode = argv[1]; + const int model = std::atoi(argv[2]), preset = std::atoi(argv[3]); + uint32_t width = static_cast<uint32_t>(std::atoi(argv[4])); + uint32_t height = static_cast<uint32_t>(std::atoi(argv[5])); + const unsigned generations = static_cast<unsigned>(std::atoi(argv[6])); + const unsigned repeats = static_cast<unsigned>(std::atoi(argv[7])); + assert((model == 3 || model == 4) && preset >= 0 && preset <= 2); + assert(width && height && generations >= 1 && generations <= 3 && repeats > 0); + ddfg::DeviceDispatch dd; + ddfg::InstanceDispatch id; + id.GetPhysicalDeviceMemoryProperties = memory_properties; + dd.CreateImage = create_image; dd.DestroyImage = destroy_image; + dd.CreateImageView = create_view; dd.DestroyImageView = destroy_view; + dd.CreateBuffer = create_buffer; dd.DestroyBuffer = destroy_buffer; + dd.GetImageMemoryRequirements = image_requirements; dd.GetBufferMemoryRequirements = buffer_requirements; + dd.AllocateMemory = allocate; dd.FreeMemory = free_memory; + dd.BindImageMemory = bind_image; dd.BindBufferMemory = bind_buffer; + dd.MapMemory = map_memory; dd.UnmapMemory = unmap; dd.DeviceWaitIdle = idle; + dd.CreateSampler = create<VkSamplerCreateInfo, VkSampler>; dd.DestroySampler = destroy<VkSampler>; + dd.CreateShaderModule = create<VkShaderModuleCreateInfo, VkShaderModule>; + dd.DestroyShaderModule = destroy<VkShaderModule>; + dd.CreateDescriptorSetLayout = create<VkDescriptorSetLayoutCreateInfo, VkDescriptorSetLayout>; + dd.DestroyDescriptorSetLayout = destroy<VkDescriptorSetLayout>; + dd.CreatePipelineLayout = create<VkPipelineLayoutCreateInfo, VkPipelineLayout>; + dd.DestroyPipelineLayout = destroy<VkPipelineLayout>; + dd.CreateDescriptorPool = create<VkDescriptorPoolCreateInfo, VkDescriptorPool>; + dd.DestroyDescriptorPool = destroy<VkDescriptorPool>; dd.ResetDescriptorPool = reset_pool; + dd.AllocateDescriptorSets = allocate_sets; dd.UpdateDescriptorSets = update_sets; + dd.CreateComputePipelines = create_pipelines; dd.DestroyPipeline = destroy<VkPipeline>; + dd.CmdBindPipeline = bind_pipeline; dd.CmdBindDescriptorSets = bind_sets; dd.CmdDispatch = dispatch; + dd.CmdPipelineBarrier = barrier; dd.CmdClearColorImage = clear_image; dd.CmdCopyImage = copy_image; + ddfg::FrameGen fg; + assert(fg.init(&dd, &id, reinterpret_cast<VkPhysicalDevice>(1), reinterpret_cast<VkDevice>(2), + 0, reinterpret_cast<VkQueue>(3))); + ddfg::Config cfg; + cfg.enabled = true; cfg.model = model; cfg.perfPreset = preset; cfg.flowScale = 0.6f; + fg.configure(cfg); + assert(fg.onResize({width, height}, VK_FORMAT_R8G8B8A8_UNORM)); + assert(mode == "resources" || mode == "record" || mode == "resize" || mode == "preset"); + for (unsigned repeat = 0; repeat < repeats; repeat++) { + const auto old_buffers = buffer_creates, old_sets = set_creates; + if (mode != "record") check_images(width, height, fg.flowFinest()); + record(fg, model, width, height, generations); + if (mode != "record") { + assert(buffer_creates - old_buffers == static_cast<unsigned>(15 - fg.flowFinest())); + assert(set_creates - old_sets == static_cast<unsigned>(54 - 4 * fg.flowFinest())); + } + if (repeat + 1 == repeats) break; + if (mode == "resize") { + width += 17; height += 9; + assert(fg.onResize({width, height}, VK_FORMAT_R8G8B8A8_UNORM)); + } else if (mode == "preset") { + cfg.perfPreset = (cfg.perfPreset + 1) % 3; + fg.configure(cfg); + } else { + assert(mode == "record"); + } + } + uint64_t bytes = 0; + for (const auto &[image, info] : images) { + (void)image; + bytes += uint64_t(info.extent.width) * info.extent.height * + (info.format == VK_FORMAT_R32_SFLOAT ? 4 : 8); + } + std::printf("PASS images=%zu bytes=%llu buffers=%u sets=%u dispatches=%zu trace=%016llx\n", + images.size(), static_cast<unsigned long long>(bytes), buffer_creates, set_creates, + dispatches.size(), static_cast<unsigned long long>(command_hash)); + fg.destroy(); + assert(images.empty() && views.empty()); +} diff --git a/tools/tests/test_ddfg_flow_levels.py b/tools/tests/test_ddfg_flow_levels.py new file mode 100644 index 0000000000..d5efd6355d --- /dev/null +++ b/tools/tests/test_ddfg_flow_levels.py @@ -0,0 +1,102 @@ +import os +from pathlib import Path +import re +import shutil +import subprocess +import tempfile +import unittest + + +ROOT = Path(__file__).resolve().parents[2] +CHAIN = ROOT / "app/src/main/cpp/framegen/ddfg" + + +class DdfgFlowLevelsTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + compiler = shutil.which(os.environ.get("CXX", "c++")) + if compiler is None: + raise unittest.SkipTest("A host C++ compiler is required") + candidates = [Path("/usr/include/vulkan"), Path("/opt/homebrew/include/vulkan")] + for key in ("ANDROID_NDK_HOME", "ANDROID_NDK_ROOT", "NDK_HOME"): + if os.environ.get(key): + candidates.extend(Path(os.environ[key]).glob("toolchains/llvm/prebuilt/*/sysroot/usr/include/vulkan")) + for sdk in {Path(os.environ.get("ANDROID_HOME", "/nonexistent")), + Path(os.environ.get("ANDROID_SDK_ROOT", "/nonexistent")), + Path.home() / "Library/Android/sdk", Path.home() / "Android/Sdk"}: + candidates.extend(sdk.glob("ndk/*/toolchains/llvm/prebuilt/*/sysroot/usr/include/vulkan")) + headers = next((p for p in candidates if (p / "vulkan.h").is_file()), None) + if headers is None: + raise unittest.SkipTest("Vulkan headers from the Android NDK or system SDK are required") + cls.temp = tempfile.TemporaryDirectory(prefix="droiddeck-ddfg-levels-") + cls.addClassCleanup(cls.temp.cleanup) + work = Path(cls.temp.name) + shutil.copytree(headers, work / "include/vulkan", ignore=shutil.ignore_patterns("*.hpp")) + if (headers.parent / "vk_video").is_dir(): + shutil.copytree(headers.parent / "vk_video", work / "include/vk_video") + cls.binary = work / "ddfg-flow-levels" + build = subprocess.run([ + compiler, "-std=c++17", "-O2", "-Wall", "-Wextra", + "-Wno-missing-field-initializers", "-Wno-misleading-indentation", + "-I" + str(work / "include"), "-I" + str(CHAIN), + str(ROOT / "tools/tests/ddfg_flow_levels_harness.cpp"), str(CHAIN / "framegen.cpp"), + "-o", str(cls.binary), + ], capture_output=True, text=True, timeout=120) + if build.returncode: + raise RuntimeError(build.stdout + build.stderr) + + def run_case(self, mode="resources", model=4, preset=2, width=1280, height=720, generations=1, repeats=1): + result = subprocess.run([ + str(self.binary), mode, str(model), str(preset), str(width), str(height), + str(generations), str(repeats), + ], capture_output=True, text=True, timeout=10) + self.assertEqual(result.returncode, 0, result.stdout + result.stderr) + self.assertTrue(result.stdout.startswith("PASS "), result.stdout) + return dict(re.findall(r"(\w+)=(\w+)", result.stdout)) + + def test_each_model_and_preset_allocates_only_solved_flow_levels(self): + for model in (3, 4): + for preset, finest in enumerate((1, 2, 3)): + with self.subTest(model=model, preset=preset): + values = self.run_case(model=model, preset=preset) + self.assertEqual(int(values["images"]), 32 - 2 * finest) + self.assertEqual(int(values["buffers"]), 18 - finest) + self.assertEqual(int(values["sets"]), 54 - 4 * finest) + + def test_default_preset_saves_the_exact_high_resolution_flow_payload(self): + for width, height in ((1280, 720), (1920, 1080), (2560, 1440)): + with self.subTest(width=width, height=height): + values = self.run_case(width=width, height=height) + pixels = lambda level: max(width >> level, 1) * max(height >> level, 1) + luma_bytes = 4 * (2 * sum(pixels(l) for l in range(7)) + + sum(pixels(l) for l in range(3, 7))) + flow_bytes = 8 * (sum(pixels(l) for l in range(3, 7)) + + 2 * width * height + 2 * pixels(3)) + self.assertEqual(int(values["bytes"]), luma_bytes + flow_bytes) + + def test_small_and_odd_extents_keep_valid_bindings_and_dispatch_sizes(self): + for width, height in ((1, 1), (17, 9), (135, 73)): + for preset in range(3): + with self.subTest(width=width, height=height, preset=preset): + self.run_case(width=width, height=height, preset=preset) + + def test_two_three_and_four_times_generation_keep_the_same_dispatch_schedule(self): + for model in (3, 4): + for preset in range(3): + for generations in (1, 2, 3): + with self.subTest(model=model, preset=preset, generations=generations): + self.run_case("record", model=model, preset=preset, generations=generations, repeats=3) + + def test_resize_rebuilds_every_solved_level(self): + for preset in range(3): + with self.subTest(preset=preset): + self.run_case("resize", preset=preset, generations=3, repeats=3) + + def test_live_preset_changes_rebuild_the_level_range(self): + for model in (3, 4): + with self.subTest(model=model): + self.run_case("preset", model=model, generations=3, repeats=4) + + +if __name__ == "__main__": + unittest.main() From cce742766d9144ab6b33da691a221dce127b7ea4 Mon Sep 17 00:00:00 2001 From: DrummingBird1 <1979036+DrummingBird1@users.noreply.github.com> Date: Mon, 26 Oct 2026 01:25:31 +0200 Subject: [PATCH 054/135] =?UTF-8?q?fix:=20zero-copy=20launch=20log=20no=20?= =?UTF-8?q?longer=20points=20at=20a=20drawer=20switch=20that=20do=E2=80=A6?= =?UTF-8?q?=20(#1354)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: describe the actual HDR zero-copy launch policy --- app/src/main/cpp/waylandcomp/src/ahb_swapchain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/ahb_swapchain.c b/app/src/main/cpp/waylandcomp/src/ahb_swapchain.c index 6cf0c80373..cb44478354 100644 --- a/app/src/main/cpp/waylandcomp/src/ahb_swapchain.c +++ b/app/src/main/cpp/waylandcomp/src/ahb_swapchain.c @@ -371,8 +371,8 @@ void ahb_swapchain_set_mode(int on, int live) { : "; gralloc frames still in flight stay on the layer (or take the copy path) until then"); else droiddeck_log("layer", "zero-copy: %s at launch (%s)", on ? "on" : "off", - on ? "DROIDDECK_WAYLAND_ZERO_COPY=1: games present their own gralloc buffers on the display layer" - : "the drawer's Zero-copy presentation switch turns it on live"); + on ? "HDR session: games present their own gralloc buffers on the display layer" + : "only HDR sessions turn it on"); if (live) wl_display_flush_clients(droiddeck_get_display()); droiddeck_request_redraw(); } From c71ba6da96c7f1437c3871ac3a05d39bd578d526 Mon Sep 17 00:00:00 2001 From: MaxsTechReview <maxjividen@gmail.com> Date: Sun, 25 Oct 2026 21:09:24 -0400 Subject: [PATCH 055/135] Run desktop games on the GPU in a window (#1584) Steam games and Battle.net started from the KDE desktop run on the GPU in gamescope, opened as a KDE window, and Plasma no longer leaves programs with a zero realtime CPU limit that got games killed. --- tools/linuxfs/desktop/droiddeck-desktop | 3 + tools/linuxfs/desktop/droiddeck-gpu | 29 +++++++- .../overlay/usr/local/bin/droiddeck-battlenet | 15 +++- .../usr/local/bin/droiddeck-gpu-window | 7 ++ .../overlay/usr/local/bin/droiddeck-open | 8 +- .../overlay/usr/local/bin/steam-compatibility | 34 ++++++++- tools/tests/test_battlenet.py | 27 +++++++ tools/tests/test_desktop_gpu_window.py | 74 +++++++++++++++++++ tools/tests/test_game_environment.py | 29 ++++++++ 9 files changed, 214 insertions(+), 12 deletions(-) create mode 100644 tools/tests/test_desktop_gpu_window.py diff --git a/tools/linuxfs/desktop/droiddeck-desktop b/tools/linuxfs/desktop/droiddeck-desktop index 71377fed64..83b67d6225 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop +++ b/tools/linuxfs/desktop/droiddeck-desktop @@ -12,6 +12,9 @@ export MOZ_DISABLE_SOCKET_PROCESS_SANDBOX=1 MOZ_DISABLE_UTILITY_SANDBOX=1 export MOZ_SHM_NO_SEALS=1 export KWIN_COMPOSE=Q QT_QUICK_BACKEND=software LIBGL_ALWAYS_SOFTWARE=1 GALLIUM_DRIVER=llvmpipe [ -e /etc/mpv/mpv.conf ] || { mkdir -p /etc/mpv && echo gpu-sw=yes >/etc/mpv/mpv.conf; } 2>/dev/null +for conf in client client-rt; do + mkdir -p "/etc/pipewire/$conf.conf.d" && printf 'context.properties = {\n module.rt = false\n}\n' >"/etc/pipewire/$conf.conf.d/droiddeck-rt.conf" +done 2>/dev/null export DROIDDECK_NESTED_SCALE=1 export DROIDDECK_GLTHREAD=${mesa_glthread:-} unset MESA_LOADER_DRIVER_OVERRIDE LIBGL_KOPPER_DRI2 mesa_glthread diff --git a/tools/linuxfs/desktop/droiddeck-gpu b/tools/linuxfs/desktop/droiddeck-gpu index 40a346085b..f759d3ad01 100644 --- a/tools/linuxfs/desktop/droiddeck-gpu +++ b/tools/linuxfs/desktop/droiddeck-gpu @@ -6,21 +6,42 @@ if [ -n "${BL_DEBUG_DIR:-}" ]; then fi width=${BL_WIDTH:-1280} height=${BL_HEIGHT:-720} -args=(--backend wayland --expose-wayland -f -W "$width" -H "$height" -w "$width" -h "$height") +window=0 +if [ "${BL_DESKTOP_GPU_WINDOW:-1}" != 0 ] && [ -n "${WAYLAND_DISPLAY:-}" ] && [ "$WAYLAND_DISPLAY" != wayland-0 ]; then + window=1 + parent=$WAYLAND_DISPLAY + args=(--backend sdl --expose-wayland -W "$width" -H "$height" -w "$width" -h "$height") +else + args=(--backend wayland --expose-wayland -f -W "$width" -H "$height" -w "$width" -h "$height") +fi if [ "${BL_FPS:-0}" -gt 0 ]; then args+=(-r "$BL_FPS") elif [ "${BL_REFRESH:-0}" -gt 0 ]; then args+=(-r "$BL_REFRESH") fi [ "${BL_HDR:-0}" = 1 ] && args+=(--hdr-enabled) -echo "== droiddeck-gpu $(date -u +%H:%M:%S): $* (gamescope ${width}x${height} on wayland-0)" -export WAYLAND_DISPLAY=wayland-0 +if [ "$window" = 1 ]; then + echo "== droiddeck-gpu $(date -u +%H:%M:%S): $* (gamescope ${width}x${height} in a window on $parent)" +else + echo "== droiddeck-gpu $(date -u +%H:%M:%S): $* (gamescope ${width}x${height} on wayland-0)" + export WAYLAND_DISPLAY=wayland-0 +fi export GDK_BACKEND=x11 QT_QPA_PLATFORM=xcb SDL_VIDEODRIVER=x11 unset LIBGL_ALWAYS_SOFTWARE QT_QUICK_BACKEND KWIN_COMPOSE +wsi=",${MESA_VK_WSI_DEBUG:-}," +while [[ $wsi == *,sw,* ]]; do wsi=${wsi//,sw,/,}; done +wsi=${wsi#,}; wsi=${wsi%,} +if [ -n "$wsi" ]; then export MESA_VK_WSI_DEBUG=$wsi; else unset MESA_VK_WSI_DEBUG; fi +export BL_DESKTOP_GPU_CHILD=1 export MESA_LOADER_DRIVER_OVERRIDE=zink GALLIUM_DRIVER=zink LIBGL_KOPPER_DRI2=true [ -n "${DROIDDECK_GLTHREAD:-}" ] && export mesa_glthread=$DROIDDECK_GLTHREAD export APPIMAGE_EXTRACT_AND_RUN=1 -gamescope "${args[@]}" -- /usr/local/bin/droiddeck-gpu-window "$@" +if [ "$window" = 1 ]; then + export BL_GPU_CHILD_WSI=${MESA_VK_WSI_DEBUG:-} + SDL_VIDEODRIVER=wayland MESA_VK_WSI_DEBUG=sw gamescope "${args[@]}" -- /usr/local/bin/droiddeck-gpu-window "$@" +else + gamescope "${args[@]}" -- /usr/local/bin/droiddeck-gpu-window "$@" +fi rc=$? echo "== droiddeck-gpu $(date -u +%H:%M:%S): exited $rc" exit $rc diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index d3f3fd7707..cf3e6ae85d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -551,8 +551,17 @@ class Tidy: return False +def desktop_gpu(): + if os.environ.get("BL_DESKTOP") != "1" or os.environ.get("BL_DESKTOP_GPU_CHILD"): + return None + if os.environ.get("BL_DESKTOP_GPU", "on").strip().lower() in ("off", "0", "no", "false"): + return None + gpu = os.path.join(BIN, "droiddeck-gpu") + return gpu if os.access(gpu, os.X_OK) else None + + def proton_options(): - if os.environ.get("BL_DESKTOP") == "1": + if os.environ.get("BL_DESKTOP") == "1" and not os.environ.get("BL_DESKTOP_GPU_CHILD"): return ["--window"] width, height = os.environ.get("BL_WIDTH", ""), os.environ.get("BL_HEIGHT", "") options = ["--desktop", "%sx%s" % (width, height)] if width.isdigit() and height.isdigit() else [] @@ -943,6 +952,10 @@ def main(argv): if action == "status": print(json.dumps(status(root))) return 0 + gpu = desktop_gpu() + if gpu: + say("the desktop starts Battle.net on the GPU") + os.execv(gpu, [gpu, os.path.abspath(sys.argv[0])] + list(sys.argv[1:])) os.environ["BL_BATTLENET"] = "1" if launching: say("launch %s" % argv[1]) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window index f5cb4007cb..0c1c9818f6 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window @@ -45,6 +45,13 @@ def advertise_compositing(): if __name__ == '__main__': if len(sys.argv) < 2: raise SystemExit('usage: droiddeck-gpu-window <program> [args...]') + if 'BL_GPU_CHILD_WSI' in os.environ: + wsi = os.environ.pop('BL_GPU_CHILD_WSI') + if wsi: + os.environ['MESA_VK_WSI_DEBUG'] = wsi + else: + os.environ.pop('MESA_VK_WSI_DEBUG', None) + os.environ['SDL_VIDEODRIVER'] = 'x11' os.environ.setdefault('GTK_CSD', '1') try: connection = advertise_compositing() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open index 0809a228f7..2fc023e041 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open @@ -9,9 +9,9 @@ Add an app does) when that holds native programs or libraries. A Steam library's droiddeck-open --exec FILE [ARGS...] an exec the kernel refused (libblsession) droiddeck-open --install the Run entries and default handlers -The desktop composites in software, so a program started from it goes full screen on the GPU -(droiddeck-gpu), as the menu's games do: --window keeps it in a desktop window instead, --terminal -runs it in Konsole. A plain script stays on the desktop, and an exec whose output is read (a terminal, +The desktop composites in software, so a program started from it runs on the GPU in a window of its +own (droiddeck-gpu), as the menu's games do: --window keeps it on the desktop's software drawing +instead, --terminal runs it in Konsole. A plain script stays on the desktop, and an exec whose output is read (a terminal, a pipe, a file) stays where it was started. """ import fcntl @@ -337,7 +337,7 @@ def unattended(env): def placed(cmd, what, mode, env): - """[cmd] where it shows: full screen on the GPU from the desktop, else where it was started.""" + """[cmd] where it shows: on the GPU from the desktop, else where it was started.""" if mode == "terminal" and what not in ("windows", "steam") and shutil.which("konsole"): return ["konsole", "--hold", "-e"] + cmd if mode == "window" or what in ("script", "steam") or not on_desktop(env): diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 09dd3dd02b..b1864dfadf 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -90,6 +90,34 @@ bl_run() { } """ +BL_DESKTOP_GPU_SETUP = """ +bl_desktop_gpu() { + local name saved gpu=/usr/local/bin/droiddeck-gpu + local names=(LD_PRELOAD LD_LIBRARY_PATH ENABLE_VK_LAYER_VALVE_steam_overlay_1 ENABLE_VK_LAYER_VALVE_steam_fossilize_1) + if [ -n "${BL_DESKTOP_GPU_CHILD:-}" ]; then + for name in "${names[@]}"; do + saved=BL_GPU_SAVED_$name + [ -n "${!saved+x}" ] || continue + export "$name=${!saved}" + unset "$saved" + done + return 0 + fi + [ "${BL_DESKTOP:-}" = 1 ] && [ "${verb:-}" = waitforexitandrun ] && [ -x "$gpu" ] || return 0 + local choice=${BL_DESKTOP_GPU:-on} + case "${choice,,}" in off | 0 | no | false) return 0 ;; esac + case " $* " in *iscriptevaluator*) return 0 ;; esac + local clear=() + for name in "${names[@]}"; do + [ -n "${!name+x}" ] || continue + export "BL_GPU_SAVED_$name=${!name}" + clear+=(-u "$name") + done + echo "droiddeck-gpu: the desktop starts this game on the GPU" >&2 + exec env "${clear[@]}" "$gpu" "$0" "$verb" "$@" +} +bl_desktop_gpu "$@" +""" BL_COMPONENTS_SETUP = """ bl_components() { base=$1 @@ -380,7 +408,7 @@ LAUNCHER_TEMPLATE = LAUNCHER_SH def launcher_sh(sources=SOURCES): return (LAUNCHER_TEMPLATE % " ".join('"%s"' % n for n in sources)).replace( - "verb=$1; shift", "verb=$1; shift\n" + BL_DIRECTAUDIO_SETUP + BL_GAME_CPUS_SETUP + BL_IDTECH3_SETUP + "verb=$1; shift", "verb=$1; shift\n" + BL_DESKTOP_GPU_SETUP + BL_DIRECTAUDIO_SETUP + BL_GAME_CPUS_SETUP + BL_IDTECH3_SETUP + BL_VACDIAG_SETUP + BL_COMPONENTS_SETUP + BL_LIBPATH_SETUP + BL_STORE_SETUP, 1) @@ -469,7 +497,7 @@ verb=$1; shift case $verb in getcompatpath | getnativepath) printf '%s\\n' "$1"; exit 0 ;; esac -""" + BL_GAME_CPUS_SETUP + """ +""" + BL_DESKTOP_GPU_SETUP + BL_GAME_CPUS_SETUP + """ bl_game_cpus if [ -x /usr/local/bin/droiddeck-steamvr-flat ] && /usr/local/bin/droiddeck-steamvr-flat "$verb"; then exec /usr/local/bin/droiddeck-steamvr-game ${BL_TASKSET:-} /usr/local/bin/droiddeck-fex steam "$verb" "$@" @@ -652,7 +680,7 @@ def adopt_extras(tools): try: body = (EXTRA_WRAPPER_SH % entry_point).replace( 'here=$(dirname "$0")', - 'here=$(dirname "$0")\n' + BL_DIRECTAUDIO_SETUP + BL_GAME_CPUS_SETUP + BL_IDTECH3_SETUP + 'here=$(dirname "$0")\n' + BL_DESKTOP_GPU_SETUP + BL_DIRECTAUDIO_SETUP + BL_GAME_CPUS_SETUP + BL_IDTECH3_SETUP + BL_VACDIAG_SETUP + BL_COMPONENTS_SETUP + BL_LIBPATH_SETUP + BL_STORE_SETUP, 1) write_changed(wrapper, body, 0o755) write_changed(manifest, EXTRA_MANIFEST_VDF) diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index fe5aed7202..2a953dfe7f 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -947,6 +947,33 @@ class LaunchTest(Harness): os.environ["SteamGameId"] = "0" self.assertEqual(BNET["proton_options"](), []) + def test_on_the_desktop_battle_net_restarts_on_the_gpu_unless_turned_off(self): + with tempfile.TemporaryDirectory() as tmp: + gpu = os.path.join(tmp, "droiddeck-gpu") + with open(gpu, "w") as out: + out.write("#!/bin/sh\n") + os.chmod(gpu, 0o755) + with mock.patch.dict(BNET, {"BIN": tmp}), mock.patch.dict(os.environ, {"BL_DESKTOP": "1"}): + os.environ.pop("BL_DESKTOP_GPU", None) + os.environ.pop("BL_DESKTOP_GPU_CHILD", None) + self.assertEqual(BNET["desktop_gpu"](), gpu) + for choice in ("off", "0", "No", "false"): + os.environ["BL_DESKTOP_GPU"] = choice + self.assertIsNone(BNET["desktop_gpu"]()) + os.environ["BL_DESKTOP_GPU"] = "on" + os.environ["BL_DESKTOP_GPU_CHILD"] = "1" + self.assertIsNone(BNET["desktop_gpu"]()) + os.environ.pop("BL_DESKTOP_GPU_CHILD") + os.environ["BL_DESKTOP"] = "0" + self.assertIsNone(BNET["desktop_gpu"]()) + os.environ["BL_DESKTOP"] = "1" + os.chmod(gpu, 0o644) + self.assertIsNone(BNET["desktop_gpu"]()) + + def test_on_the_gpu_battle_net_fills_the_screen_instead_of_a_window(self): + with mock.patch.dict(os.environ, {"BL_DESKTOP": "1", "BL_DESKTOP_GPU_CHILD": "1", "BL_WIDTH": "1280", "BL_HEIGHT": "720", "SteamGameId": "0"}): + self.assertEqual(BNET["proton_options"](), ["--desktop", "1280x720"]) + def test_under_gamescope_battle_net_gets_a_desktop_of_the_screens_size(self): with mock.patch.dict(os.environ, {"BL_WIDTH": "1280", "BL_HEIGHT": "720", "SteamGameId": "0"}): os.environ.pop("BL_DESKTOP", None) diff --git a/tools/tests/test_desktop_gpu_window.py b/tools/tests/test_desktop_gpu_window.py new file mode 100644 index 0000000000..ba3bfc5492 --- /dev/null +++ b/tools/tests/test_desktop_gpu_window.py @@ -0,0 +1,74 @@ +import json +import os +from pathlib import Path +import shutil +import subprocess +import sys +import tempfile +import unittest + +TOOLS = Path(__file__).resolve().parents[1] +GPU = TOOLS / "linuxfs/desktop/droiddeck-gpu" +WINDOW = TOOLS / "linuxfs/overlay/usr/local/bin/droiddeck-gpu-window" +KEYS = ("MESA_VK_WSI_DEBUG", "SDL_VIDEODRIVER", "WAYLAND_DISPLAY", "BL_GPU_CHILD_WSI", "BL_DESKTOP_GPU_CHILD") + + +class DesktopGpuWindowTest(unittest.TestCase): + def setUp(self): + self.tmp = Path(tempfile.mkdtemp()) + self.addCleanup(shutil.rmtree, self.tmp, True) + self.out = self.tmp / "gamescope.json" + fake = self.tmp / "gamescope" + fake.write_text("#!%s\nimport json, os, sys\njson.dump({'args': sys.argv[1:], 'env': {k: os.environ.get(k) for k in %r}}, open(%r, 'w'))\n" + % (sys.executable, KEYS, str(self.out))) + fake.chmod(0o755) + + def run_gpu(self, **env): + base = {k: v for k, v in os.environ.items() if k not in KEYS + ("BL_DEBUG_DIR", "BL_DESKTOP_GPU_WINDOW")} + base.update(PATH="%s:%s" % (self.tmp, os.environ["PATH"]), BL_WIDTH="1280", BL_HEIGHT="720", **env) + subprocess.run(["bash", str(GPU), "game.exe"], env=base, check=True, capture_output=True) + return json.loads(self.out.read_text()) + + def test_on_the_desktop_the_game_gets_a_window_of_its_own(self): + run = self.run_gpu(WAYLAND_DISPLAY="wayland-1", MESA_VK_WSI_DEBUG="sw,linear") + self.assertEqual(run["args"][:2], ["--backend", "sdl"]) + self.assertNotIn("-f", run["args"]) + self.assertEqual(run["args"][-2:], ["/usr/local/bin/droiddeck-gpu-window", "game.exe"]) + self.assertEqual(run["env"]["WAYLAND_DISPLAY"], "wayland-1") + self.assertEqual(run["env"]["SDL_VIDEODRIVER"], "wayland") + self.assertEqual(run["env"]["MESA_VK_WSI_DEBUG"], "sw") + self.assertEqual(run["env"]["BL_GPU_CHILD_WSI"], "linear") + self.assertEqual(run["env"]["BL_DESKTOP_GPU_CHILD"], "1") + + def test_full_screen_stays_available(self): + for env in ({"WAYLAND_DISPLAY": "wayland-1", "BL_DESKTOP_GPU_WINDOW": "0"}, {"WAYLAND_DISPLAY": "wayland-0"}, {}): + run = self.run_gpu(**env) + self.assertEqual(run["args"][:2], ["--backend", "wayland"]) + self.assertIn("-f", run["args"]) + self.assertEqual(run["env"]["WAYLAND_DISPLAY"], "wayland-0") + self.assertIsNone(run["env"]["MESA_VK_WSI_DEBUG"]) + self.assertIsNone(run["env"]["BL_GPU_CHILD_WSI"]) + + def test_the_game_inside_the_window_gets_its_own_settings_back(self): + script = "import json, os; print(json.dumps({k: os.environ.get(k) for k in %r}))" % (KEYS,) + for saved, expected in (("linear", "linear"), ("", None)): + env = {k: v for k, v in os.environ.items() if k not in KEYS + ("DISPLAY",)} + env.update(BL_GPU_CHILD_WSI=saved, MESA_VK_WSI_DEBUG="sw", SDL_VIDEODRIVER="wayland") + out = subprocess.run([sys.executable, str(WINDOW), sys.executable, "-c", script], env=env, + check=True, capture_output=True, text=True).stdout + child = json.loads(out) + self.assertEqual(child["MESA_VK_WSI_DEBUG"], expected) + self.assertEqual(child["SDL_VIDEODRIVER"], "x11") + self.assertIsNone(child["BL_GPU_CHILD_WSI"]) + + def test_outside_a_window_the_game_keeps_its_settings(self): + script = "import os; print(os.environ.get('MESA_VK_WSI_DEBUG'), os.environ.get('SDL_VIDEODRIVER'))" + env = {k: v for k, v in os.environ.items() if k not in KEYS + ("DISPLAY",)} + env.update(MESA_VK_WSI_DEBUG="linear", SDL_VIDEODRIVER="x11") + out = subprocess.run([sys.executable, str(WINDOW), sys.executable, "-c", script], env=env, + check=True, capture_output=True, text=True).stdout.split() + self.assertEqual(out, ["linear", "x11"]) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 3895ebc695..ae7c2b95d7 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -77,6 +77,35 @@ class GameEnvironmentTest(unittest.TestCase): env=env, text=True, capture_output=True, check=True) self.assertEqual(result.stdout.strip(), expected) + def test_desktop_games_restart_on_the_gpu_with_steams_preloads_handed_back(self): + with tempfile.TemporaryDirectory() as tmp: + home = Path(tmp) + gpu = home / "gpu" + gpu.write_text("#!/bin/bash\necho \"gpu LD_PRELOAD=${LD_PRELOAD-unset}\"\nexport BL_DESKTOP_GPU_CHILD=1\nexec \"$@\"\n") + gpu.chmod(0o755) + launcher = home / "launcher" + setup = COMPAT["BL_DESKTOP_GPU_SETUP"].replace("/usr/local/bin/droiddeck-gpu", str(gpu)) + launcher.write_text("#!/bin/bash\nverb=$1; shift\n" + setup + "echo \"game $verb $* LD_PRELOAD=${LD_PRELOAD-unset} saved=${BL_GPU_SAVED_LD_PRELOAD-unset}\"\n") + launcher.chmod(0o755) + base = {key: value for key, value in os.environ.items() if not key.startswith("BL_")} + base["LD_PRELOAD"] = "overlay.so" + for extra, args, expected in ( + ({"BL_DESKTOP": "1"}, ["waitforexitandrun", "game.exe"], + ["gpu LD_PRELOAD=unset", "game waitforexitandrun game.exe LD_PRELOAD=overlay.so saved=unset"]), + ({"BL_DESKTOP": "1", "BL_DESKTOP_GPU": "Off"}, ["waitforexitandrun", "game.exe"], + ["game waitforexitandrun game.exe LD_PRELOAD=overlay.so saved=unset"]), + ({"BL_DESKTOP": "1"}, ["run", "setup.exe"], + ["game run setup.exe LD_PRELOAD=overlay.so saved=unset"]), + ({"BL_DESKTOP": "1"}, ["waitforexitandrun", "iscriptevaluator.exe"], + ["game waitforexitandrun iscriptevaluator.exe LD_PRELOAD=overlay.so saved=unset"]), + ({}, ["waitforexitandrun", "game.exe"], + ["game waitforexitandrun game.exe LD_PRELOAD=overlay.so saved=unset"]), + ): + with self.subTest(extra=extra, args=args): + result = subprocess.run([str(launcher)] + args, env=dict(base, **extra), + text=True, capture_output=True, check=True) + self.assertEqual(result.stdout.splitlines(), expected) + def test_the_install_script_evaluator_gets_its_scripts_marked_first(self): with tempfile.TemporaryDirectory() as tmp: root = Path(tmp) From 5978a13f092cd537574cf0abf523e1ec290d4b86 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 22:07:42 -0400 Subject: [PATCH 056/135] fix(stores): restore store capabilities in Library (#1586) --- .../droiddeck/launcher/ui/FrontEndScreen.kt | 1 + .../com/droiddeck/launcher/ui/GameDetail.kt | 31 ++-- .../com/droiddeck/launcher/ui/LibraryPage.kt | 31 +++- .../com/droiddeck/launcher/ui/StoresPage.kt | 29 ---- .../droiddeck/launcher/ui/XboxStoreDialogs.kt | 52 ++++++ .../launcher/ui/LibraryEntriesTest.kt | 36 +++++ .../launcher/ui/StoreRestorationTest.kt | 151 ++++++++++++++++++ 7 files changed, 284 insertions(+), 47 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/XboxStoreDialogs.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/StoreRestorationTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index a3c685b756..5982e1c47c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -569,6 +569,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com } FlightsLayer(screenAt) GamesDialogs(a, s.steamGames) + StoreTheme(com.droiddeck.launcher.stores.Store.XBOX) { XboxStoreDialogs() } com.droiddeck.launcher.stores.StoresState.pendingInstall?.let { item -> StoreTheme(item.store) { InstallWhere(item) } } com.droiddeck.launcher.stores.StoresState.itchPicking?.let { item -> StoreTheme(item.store) { ItchBuildPicker(item) { com.droiddeck.launcher.stores.StoresState.itchPicking = null } } } StepsLayer(screenAt) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index 7c9cdc74c2..53b5c953bb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -319,7 +319,7 @@ private fun GameTitle(title: String, logo: Any?, titleSize: TextUnit) { } @Composable -private fun GameActions( +internal fun GameActions( store: Store?, id: String?, game: Library.SteamGame?, item: CatalogItem?, installed: InstalledStoreGame?, s: FrontEndState, a: FrontEndActions, leadOn: Modifier, ) { @@ -328,22 +328,14 @@ private fun GameActions( val rawDownload = storeKey?.let { StoresState.download(it) } val download = rawDownload?.takeIf { it.isActive } val failed = rawDownload?.takeIf { it.state == DownloadState.FAILED } + val cloud = game?.library == Library.XBOX_CLOUD && installed == null Actions { when { s.shortcutPicker && game != null -> { PrimaryButton(stringResource(R.string.game_shortcut_choose), enabled = !s.busy, main = true, icon = Icons.Filled.PlayArrow, modifier = leadOn) { a.onSteamGame(game) } FileButtons(game, a) } - game?.library == Library.XBOX_CLOUD -> { - val cloudId = game.storeId.orEmpty() - XboxStreamButton(cloudId, game.name, main = true, modifier = leadOn) - if (download != null) ActionChip(downloadLabel(download), ok = false) - else if (item?.installable == true) SecondaryButton( - if (item.sizeBytes > 0) stringResource(R.string.stores_install_size, formatBytes(item.sizeBytes)) else stringResource(R.string.stores_install), - ) { StoresState.requestInstall(ctx, item) } - XboxLibraryButton(cloudId, item) - } - game != null || installed != null -> { + !cloud && (game != null || installed != null) -> { val gone = storeKey?.let { StoresState.uninstalling[it] } val xboxBusy = store == Store.XBOX && id != null && XboxContent.busy(id) PrimaryButton( @@ -381,6 +373,19 @@ private fun GameActions( } ConfirmButton(stringResource(R.string.stores_dl_clear), stringResource(R.string.stores_dl_cancel_confirm), compact = true) { DownloadQueue.clear(ctx, failed.key) } } + cloud -> { + val cloudId = game.storeId.orEmpty() + XboxStreamButton(cloudId, game.name, main = true, modifier = leadOn) + if (item?.installable == true && item.xboxPc) { + SecondaryButton( + if (StoresState.isUnfinished(item)) stringResource(R.string.stores_resume_install) + else if (item.sizeBytes > 0) stringResource(R.string.stores_install_size, formatBytes(item.sizeBytes)) + else stringResource(R.string.stores_install), + ) { StoresState.requestInstall(ctx, item) } + } + if (item != null && StoresState.isUnfinished(item)) ConfirmButton(stringResource(R.string.stores_dl_clear), stringResource(R.string.stores_dl_cancel_confirm), compact = true) { StoresState.clearUnfinished(ctx, item) } + XboxLibraryButton(cloudId, item) + } store == Store.BATTLENET && item != null -> InstallButton(stringResource(R.string.stores_install), leadOn) { StoresState.requestInstall(ctx, item) } store == Store.XBOX && item != null && !item.xboxPc && item.xboxCloud -> { XboxStreamButton(item.id, item.title, main = true, modifier = leadOn) @@ -408,6 +413,10 @@ private fun GameActions( item != null && item.isFree -> PrimaryButton(stringResource(R.string.stores_get_free), main = true, modifier = leadOn) { openStoreUrl(ctx, item) } item != null -> PrimaryButton(buyLabel(item), main = true, modifier = leadOn) { openStoreUrl(ctx, item) } } + if (cloud && (download != null || failed != null)) { + XboxStreamButton(game.storeId.orEmpty(), game.name) + XboxLibraryButton(game.storeId.orEmpty(), item) + } BusyChip(s) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 773f44ce7f..5d1ba95ab6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -108,12 +108,16 @@ internal fun libraryEntries( ): List<LibraryEntry> { val claimed = HashSet<String>() val out = ArrayList<LibraryEntry>() - for (g in games) { + for (g in games.sortedBy { it.library == Library.XBOX_CLOUD }) { if (g.library == Library.EPIC_LAUNCHER) continue val storeKey = g.storeId?.let { "${g.source}:$it" } val item = storeKey?.let { k -> Store.byId(g.source)?.let { st -> owned[st]?.firstOrNull { it.key == k } } } - if (storeKey != null) claimed += storeKey - out += LibraryEntry(GameRef.key(g), g.source, g.name, g, item, installed = true) + if (storeKey != null) { + if (g.library == Library.XBOX_CLOUD && storeKey in claimed) continue + claimed.add(storeKey) + } + out += LibraryEntry(GameRef.key(g), g.source, g.name, g, item, + installed = g.library != Library.XBOX_CLOUD || storeKey in installedStore) } for (store in Store.entries) for (item in owned[store].orEmpty()) { if (!claimed.add(item.key)) continue @@ -506,18 +510,31 @@ private fun LibraryTile(e: LibraryEntry, capsule: Boolean, first: Boolean, navig @Composable private fun RequestSize(e: LibraryEntry) { val ctx = LocalContext.current + if (e.installed) { + val inst = e.storeKey?.let { k -> StoresState.installed.firstOrNull { it.key == k } } + LaunchedEffect(e.key, inst) { + if (inst != null) StoreSizes.requestDisk(ctx, inst.key, inst) + else e.game?.gameFiles?.let { FolderSizes.request(it) } + } + return + } val item = e.item?.takeIf { !e.installed && it.accessible && it.sizeBytes <= 0 } ?: return LaunchedEffect(item.key) { StoreSizes.request(ctx, item) } } @Composable -private fun LibraryMarker(e: LibraryEntry, download: DownloadEntry?) { +internal fun LibraryMarker(e: LibraryEntry, download: DownloadEntry?) { val pal = LocalPalette.current + val size = if (e.installed) e.storeKey?.let { StoreSizes.onDisk[it] } + ?: e.game?.gameFiles?.let { FolderSizes.known[it.path] } + else e.item?.let { StoreSizes.size(it) }?.takeIf { it > 0 } when { download != null -> Text("${download.percent}%", fontSize = 10.sp, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) - e.installed -> Unit e.item != null && StoresState.isUnfinished(e.item) -> Text(stringResource(R.string.stores_resume), fontSize = 10.sp, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) - else -> Icon(Icons.Outlined.Download, stringResource(R.string.stores_section_not_installed), tint = Color.White, modifier = Modifier.size(12.dp)) + else -> Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(3.dp)) { + if (size != null && size > 0) Text(formatBytes(size), fontSize = 11.sp, fontWeight = FontWeight.Bold, color = Color.White, maxLines = 1) + if (!e.installed) Icon(Icons.Outlined.Download, stringResource(R.string.stores_section_not_installed), tint = Color.White, modifier = Modifier.size(12.dp)) + } } } @@ -599,7 +616,7 @@ private fun Modifier.paneEntry(): Modifier { internal fun keepsXbox(filter: String, e: LibraryEntry): Boolean = when { filter == XboxLibraryFilter.ALL || e.source != Store.XBOX.id -> true - e.game?.library == Library.XBOX_CLOUD -> filter == XboxLibraryFilter.CLOUD + e.game?.library == Library.XBOX_CLOUD && e.item == null -> filter == XboxLibraryFilter.CLOUD else -> e.item?.let { XboxLibraryFilter.keeps(filter, it) } == true } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 23a996fb9d..d19e0e4bc7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -150,35 +150,6 @@ private data class PaneKey(val chip: String, val signedIn: Boolean, val accounts internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier) { val ctx = LocalContext.current val focusManager = LocalFocusManager.current - com.droiddeck.launcher.stores.xbox.XboxContent.plan?.let { content -> - androidx.compose.material3.AlertDialog( - onDismissRequest = { com.droiddeck.launcher.stores.xbox.XboxContent.dismiss() }, - title = { Text(stringResource(R.string.stores_xbox_content_title)) }, - text = { Column { - if (content.error != null) Text(content.error) - else if (content.offers.isEmpty()) Text(stringResource(R.string.stores_xbox_content_none)) - content.offers.forEach { offer -> - androidx.compose.material3.TextButton(onClick = { com.droiddeck.launcher.stores.xbox.XboxContent.install(ctx, offer.item) }) { - Text(stringResource(if (offer.installed) R.string.stores_xbox_content_update else R.string.stores_xbox_content_install, offer.item.title)) - } - } - } }, - confirmButton = { androidx.compose.material3.TextButton(onClick = { com.droiddeck.launcher.stores.xbox.XboxContent.dismiss() }) { Text(stringResource(android.R.string.ok)) } }, - ) - } - com.droiddeck.launcher.stores.xbox.XboxBackend.packageChoice?.let { pending -> - androidx.compose.material3.AlertDialog( - onDismissRequest = { com.droiddeck.launcher.stores.xbox.XboxBackend.dismissPackages() }, - title = { Text(stringResource(R.string.stores_xbox_choose_content)) }, - text = { Column { pending.choices.forEach { choice -> - androidx.compose.material3.TextButton(onClick = { com.droiddeck.launcher.stores.xbox.XboxBackend.selectPackage(ctx, choice) }) { - Text(stringResource(R.string.stores_xbox_choice, choice.getString("title"), choice.getString("kind"))) - } - } } }, - confirmButton = {}, - dismissButton = { androidx.compose.material3.TextButton(onClick = { com.droiddeck.launcher.stores.xbox.XboxBackend.dismissPackages() }) { Text(stringResource(android.R.string.cancel)) } }, - ) - } val narrow = LocalNarrowPane.current val padH = if (narrow) 14.dp else 22.dp val tabs = remember { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/XboxStoreDialogs.kt b/app/src/main/java/com/droiddeck/launcher/ui/XboxStoreDialogs.kt new file mode 100644 index 0000000000..4a61e5b11b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/XboxStoreDialogs.kt @@ -0,0 +1,52 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.xbox.XboxBackend +import com.droiddeck.launcher.stores.xbox.XboxContent + +@Composable +internal fun XboxStoreDialogs( + content: XboxContent.Plan? = XboxContent.plan, + pending: XboxBackend.PackageChoice? = XboxBackend.packageChoice, +) { + val ctx = LocalContext.current + content?.let { + AlertDialog( + onDismissRequest = { XboxContent.dismiss() }, + title = { Text(stringResource(R.string.stores_xbox_content_title)) }, + text = { Column(Modifier.verticalScroll(rememberScrollState())) { + if (content.error != null) Text(content.error) + else if (content.offers.isEmpty()) Text(stringResource(R.string.stores_xbox_content_none)) + content.offers.forEach { offer -> + TextButton(onClick = { XboxContent.install(ctx, offer.item) }) { + Text(stringResource(if (offer.installed) R.string.stores_xbox_content_update else R.string.stores_xbox_content_install, offer.item.title)) + } + } + } }, + confirmButton = { TextButton(onClick = { XboxContent.dismiss() }) { Text(stringResource(android.R.string.ok)) } }, + ) + } + pending?.let { + AlertDialog( + onDismissRequest = { XboxBackend.dismissPackages() }, + title = { Text(stringResource(R.string.stores_xbox_choose_content)) }, + text = { Column(Modifier.verticalScroll(rememberScrollState())) { pending.choices.forEach { choice -> + TextButton(onClick = { XboxBackend.selectPackage(ctx, choice) }) { + Text(stringResource(R.string.stores_xbox_choice, choice.getString("title"), choice.getString("kind"))) + } + } } }, + confirmButton = {}, + dismissButton = { TextButton(onClick = { XboxBackend.dismissPackages() }) { Text(stringResource(android.R.string.cancel)) } }, + ) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt index 65a3a72b0a..be6b3abea4 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.ui import com.droiddeck.launcher.frontend.Library import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.xbox.XboxLibraryFilter import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull @@ -36,6 +37,41 @@ class LibraryEntriesTest { assertTrue(entries.single().installed) } + @Test fun aSavedCloudGameStaysNotInstalledAndKeepsItsLicenseFilters() { + val game = Library.SteamGame(-20, "Cloud game", null, Library.XBOX_CLOUD, source = "xbox", storeId = "cloud") + val product = owned(Store.XBOX, "cloud").copy(subscription = true, extra = mapOf("cloud" to "1")) + val entries = libraryEntries(listOf(game), mapOf(Store.XBOX to listOf(product)), emptySet()) + val entry = entries.single() + assertFalse(entry.installed) + for (filter in XboxLibraryFilter.ALL_FILTERS) assertTrue(filter, keepsXbox(filter, entry)) + assertEquals(listOf("local", entry.key), installedFirst(listOf(entry, LibraryEntry("local", "steam", "Local", null, null, true))).map { it.key }) + } + + @Test fun anInstalledPcCopyTakesPrecedenceOverTheSavedCloudRow() { + val local = Library.SteamGame(-5, "PC game", null, Library.ADDED, source = "xbox", storeId = "same") + val cloud = Library.SteamGame(-20, "PC game", null, Library.XBOX_CLOUD, source = "xbox", storeId = "same") + val entries = libraryEntries(listOf(cloud, local), mapOf(Store.XBOX to listOf(owned(Store.XBOX, "same"))), setOf("xbox:same")) + assertEquals(1, entries.size) + assertEquals(local, entries.single().game) + assertTrue(entries.single().installed) + } + + @Test fun aSavedCloudGameWithoutACatalogStillAppearsInTheCloudFilter() { + val cloud = Library.SteamGame(-20, "Cloud game", null, Library.XBOX_CLOUD, source = "xbox", storeId = "cloud") + val entry = libraryEntries(listOf(cloud), emptyMap(), emptySet()).single() + assertFalse(entry.installed) + assertTrue(keepsXbox(XboxLibraryFilter.CLOUD, entry)) + assertFalse(keepsXbox(XboxLibraryFilter.OWNED, entry)) + } + + @Test fun distinctLocalShortcutsForTheSameProductArePreserved() { + val first = Library.SteamGame(-5, "First install", null, Library.ADDED, source = "xbox", storeId = "same") + val second = Library.SteamGame(-6, "Second install", null, Library.ADDED, source = "xbox", storeId = "same") + val cloud = Library.SteamGame(-20, "Cloud game", null, Library.XBOX_CLOUD, source = "xbox", storeId = "same") + val entries = libraryEntries(listOf(cloud, first, second), mapOf(Store.XBOX to listOf(owned(Store.XBOX, "same"))), setOf("xbox:same")) + assertEquals(listOf(first, second), entries.map { it.game }) + } + @Test fun installedGamesComeFirstKeepingTheirSortedOrder() { val entries = listOf("a", "b", "c", "d").map { LibraryEntry(it, "steam", it, null, null, installed = it == "b" || it == "d") } assertEquals(listOf("b", "d", "a", "c"), installedFirst(entries).map { it.key }) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/StoreRestorationTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StoreRestorationTest.kt new file mode 100644 index 0000000000..4f914f0b55 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/StoreRestorationTest.kt @@ -0,0 +1,151 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Column +import androidx.compose.material3.Text +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.performClick +import androidx.compose.ui.test.performScrollTo +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreSizes +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.download.DownloadEntry +import com.droiddeck.launcher.stores.download.DownloadState +import com.droiddeck.launcher.stores.xbox.XboxBackend +import com.droiddeck.launcher.stores.xbox.XboxContent +import org.json.JSONObject +import org.junit.After +import org.junit.Assert.assertNull +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], qualifiers = "w1200dp-h752dp-land", application = android.app.Application::class) +class StoreRestorationTest { + @get:Rule val compose = createRobolectricComposeRule() + private val ctx get() = RuntimeEnvironment.getApplication() + private val product = CatalogItem(Store.XBOX, "9NBLGGH4R315", "Test game", null, owned = true, sizeBytes = 10_485_760L, extra = mapOf("cloud" to "1")) + private val cloud = Library.SteamGame(-20, product.title, null, Library.XBOX_CLOUD, source = "xbox", storeId = product.id) + + @After fun clear() { + StoresState.publishDownloads(emptyList()) + StoresState.unfinished = emptyList() + StoreSizes.onDisk.clear() + XboxContent.dismiss() + } + + @Test fun manageContentReportsItsResultWithoutComposingTheStoresPage() { + val base = InstalledStoreGame(StoreGameSidecar(Store.XBOX, product.id, product.title, "game.exe"), File(ctx.cacheDir, "missing-xbox-manifest")) + compose.mainClock.autoAdvance = false + compose.setContent { + DroidDeckTheme { FrontEndScreen(state(), actions(), page = { Text("Library game page") }) } + } + compose.mainClock.advanceTimeBy(2_000) + compose.runOnIdle { XboxContent.manage(ctx, base) } + compose.waitUntil(5_000) { + shadowOf(android.os.Looper.getMainLooper()).idle() + XboxContent.plan != null + } + compose.mainClock.advanceTimeBy(100) + compose.onNodeWithText(ctx.getString(R.string.stores_xbox_content_title)).assertExists() + compose.onNodeWithText("Missing or ambiguous MicrosoftGame.config.").assertExists() + compose.onNodeWithText(ctx.getString(android.R.string.ok)).performClick() + compose.runOnIdle { assertNull(XboxContent.plan) } + } + + @Test fun packageChoicesRenderOutsideTheStoresPage() { + val choices = (1..24).map { JSONObject().put("title", "Package $it").put("kind", "Game") } + val pending = XboxBackend.PackageChoice(product, ctx.cacheDir, choices) + compose.setContent { DroidDeckTheme { XboxStoreDialogs(content = null, pending = pending) } } + compose.onNodeWithText(ctx.getString(R.string.stores_xbox_choose_content)).assertExists() + choices.forEach { compose.onNodeWithText(ctx.getString(R.string.stores_xbox_choice, it.getString("title"), "Game")).performScrollTo().assertIsDisplayed() } + compose.onNodeWithText(ctx.getString(android.R.string.cancel)).assertExists() + } + + @Test fun everyContentOfferCanBeReachedInALandscapeDialog() { + val base = InstalledStoreGame(StoreGameSidecar(Store.XBOX, product.id, product.title, "game.exe"), ctx.cacheDir) + val offers = (1..24).map { XboxContent.Offer(product.copy(id = "dlc-$it", title = "Content $it"), installed = false) } + val plan = XboxContent.Plan(base, offers) + compose.setContent { DroidDeckTheme { XboxStoreDialogs(content = plan, pending = null) } } + offers.forEach { compose.onNodeWithText(ctx.getString(R.string.stores_xbox_content_install, it.item.title)).performScrollTo().assertIsDisplayed() } + } + + @Test fun libraryCardsShowDownloadAndInstalledSizes() { + val owned = LibraryEntry("owned", "xbox", product.title, null, product, false) + val installed = LibraryEntry("installed", "xbox", product.title, null, product.copy(id = "installed"), true) + StoreSizes.onDisk["xbox:installed"] = 20_971_520L + compose.setContent { DroidDeckTheme { Column { + LibraryMarker(owned, null) + LibraryMarker(installed, null) + } } } + compose.onNodeWithText("10.0 MB").assertExists() + compose.onNodeWithText("20.0 MB").assertExists() + } + + @Test fun aSavedCloudGamesDownloadKeepsPauseResumeCancelAndFailureRecovery() { + val entry = DownloadEntry(Store.XBOX, product.id, product.title, state = DownloadState.RUNNING) + StoresState.publishDownloads(listOf(entry)) + compose.setContent { DroidDeckTheme { GameActions(Store.XBOX, product.id, cloud, product, null, state(), actions(), Modifier) } } + compose.onNodeWithText(ctx.getString(R.string.stores_dl_pause)).assertExists() + compose.onNodeWithText(ctx.getString(R.string.stores_dl_cancel)).assertExists() + compose.onNodeWithText(ctx.getString(R.string.game_stream)).assertExists() + compose.runOnIdle { StoresState.publishDownloads(listOf(entry.copy(state = DownloadState.PAUSED))) } + compose.onNodeWithText(ctx.getString(R.string.stores_dl_resume)).assertExists() + compose.onNodeWithText(ctx.getString(R.string.stores_dl_cancel)).assertExists() + compose.runOnIdle { StoresState.publishDownloads(listOf(entry.copy(state = DownloadState.FAILED))) } + compose.onNodeWithText(ctx.getString(R.string.stores_dl_resume)).assertExists() + compose.onNodeWithText(ctx.getString(R.string.stores_dl_clear)).assertExists() + compose.onNodeWithText(ctx.getString(R.string.game_stream)).assertExists() + } + + @Test fun aConsoleOnlyCloudGameDoesNotOfferAPcInstall() { + compose.setContent { DroidDeckTheme { GameActions(Store.XBOX, product.id, cloud, product.copy(sizeBytes = 0, extra = mapOf("pc" to "0", "cloud" to "1")), null, state(), actions(), Modifier) } } + compose.onNodeWithText(ctx.getString(R.string.game_stream)).assertExists() + compose.onNodeWithText(ctx.getString(R.string.stores_install)).assertDoesNotExist() + } + + @Test fun anInterruptedCloudDownloadCanBeClearedAfterItsLicenseOrPcMetadataChanges() { + StoresState.unfinished = listOf(StoreInstallRoot.Unfinished(Store.XBOX, product.id, File(ctx.cacheDir, "partial"))) + var item by mutableStateOf(product) + compose.setContent { DroidDeckTheme { GameActions(Store.XBOX, product.id, cloud, item, null, state(), actions(), Modifier) } } + compose.onNodeWithText(ctx.getString(R.string.stores_resume_install)).assertExists() + for (changed in listOf(product.copy(owned = false), product.copy(extra = mapOf("pc" to "0", "cloud" to "1")))) { + compose.runOnIdle { item = changed } + compose.onNodeWithText(ctx.getString(R.string.stores_dl_clear)).assertExists() + compose.onNodeWithText(ctx.getString(R.string.stores_resume_install)).assertDoesNotExist() + } + } + + private fun state() = FrontEndState( + installed = "r9", ready = true, available = null, busy = false, stage = "", percent = -1, + desktopInstalled = true, offlineAccount = null, offline = false, frameGenLabel = "", + romsDir = null, logsEnabled = false, steamGames = emptyList(), emulators = emptyList(), running = null, + pageKey = "test-game", navigate = "games", + ) + + private fun actions() = FrontEndActions( + onPlay = {}, onPlayDesktopUi = {}, onSteamGame = {}, onDesktop = {}, onEmulator = {}, + onRom = {}, onResume = {}, onSteamSettings = {}, onDesktopSettings = {}, + onInstallPackage = {}, onRemovePackage = {}, onRuntime = {}, onFrameGenPick = {}, + onImportLossless = {}, onProtons = {}, onComponents = {}, onPerformance = {}, + onRoms = {}, onFiles = {}, onLogs = {}, onOffline = {}, + onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> }, + onSetPhantomProcessLimit = { _, _ -> }, + ) +} From 3fd6b1f00d5e47611fc219481a7259320c48ccd4 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 25 Oct 2026 23:20:57 -0400 Subject: [PATCH 057/135] fix(ui): restore consistent focus glide transitions (#1588) --- .../launcher/files/CollapsibleRail.kt | 15 +- .../launcher/files/FileManagerItems.kt | 28 ++-- .../launcher/files/FileManagerScreen.kt | 65 +++++--- .../launcher/files/FilePropertiesDialog.kt | 5 +- .../launcher/files/OutlinedAlertDialog.kt | 2 +- .../input/ControllerEditorActivity.kt | 2 + .../stores/xbox/XboxCloudSettingsActivity.kt | 4 +- .../stores/xbox/XboxCloudSettingsPanel.kt | 11 +- .../stores/xbox/XboxNativePlayerActivity.kt | 6 +- .../com/droiddeck/launcher/ui/AddAppDialog.kt | 2 +- .../droiddeck/launcher/ui/AddedGameEditor.kt | 4 +- .../droiddeck/launcher/ui/BootMovieSection.kt | 6 +- .../droiddeck/launcher/ui/ComponentsPage.kt | 2 +- .../com/droiddeck/launcher/ui/DriverPage.kt | 2 +- .../com/droiddeck/launcher/ui/FocusGlide.kt | 57 +++++-- .../droiddeck/launcher/ui/FrontEndWidgets.kt | 2 +- .../launcher/ui/GlassesCalibrationControls.kt | 12 +- .../com/droiddeck/launcher/ui/GlassesPanel.kt | 2 + .../com/droiddeck/launcher/ui/GlideWindows.kt | 78 +++++++++ .../droiddeck/launcher/ui/GpuDriversPanel.kt | 2 +- .../com/droiddeck/launcher/ui/HandCameraUi.kt | 11 +- .../droiddeck/launcher/ui/ItchKeyDialog.kt | 9 +- .../com/droiddeck/launcher/ui/MainScreen.kt | 23 +-- .../launcher/ui/ModeSettingsDialog.kt | 32 ++-- .../launcher/ui/PerformanceDialog.kt | 2 +- .../launcher/ui/PhantomProcessGatePage.kt | 9 +- .../com/droiddeck/launcher/ui/RomsDialog.kt | 9 +- .../droiddeck/launcher/ui/ScreenKeyEditor.kt | 20 +-- .../droiddeck/launcher/ui/ScreenKeyPicker.kt | 9 +- .../launcher/ui/ScreenLayoutPanel.kt | 19 +-- .../droiddeck/launcher/ui/SessionLoading.kt | 1 + .../droiddeck/launcher/ui/SessionOverlay.kt | 6 +- .../launcher/ui/SessionPausedOverlay.kt | 10 +- .../droiddeck/launcher/ui/SettingsWidgets.kt | 3 +- .../launcher/ui/SpatialTrackingActivity.kt | 5 +- .../com/droiddeck/launcher/ui/StoragePage.kt | 2 +- .../launcher/ui/StoreAchievementsUi.kt | 2 +- .../com/droiddeck/launcher/ui/StorePage.kt | 2 +- .../launcher/ui/StoresInstallDialog.kt | 2 +- .../java/com/droiddeck/launcher/ui/Theme.kt | 2 +- .../launcher/ui/TouchGestureDialog.kt | 35 ++-- .../com/droiddeck/launcher/ui/UpdatesPage.kt | 6 +- .../droiddeck/launcher/ui/XboxStoreDialogs.kt | 11 +- .../launcher/ui/FocusGlideRenderingTest.kt | 121 ++++++++++++++ .../launcher/ui/FocusGlideWindowsTest.kt | 152 ++++++++++++++++++ .../ui/PrimaryButtonFocusContrastTest.kt | 51 +++++- docs/development/focus-glide.md | 27 ++++ 47 files changed, 705 insertions(+), 183 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/GlideWindows.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/FocusGlideRenderingTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/FocusGlideWindowsTest.kt create mode 100644 docs/development/focus-glide.md diff --git a/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt b/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt index bcba0189bd..b1d93fdaba 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.files +import androidx.compose.foundation.shape.CircleShape +import com.droiddeck.launcher.ui.focusGlide import android.content.res.Configuration import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.background @@ -181,14 +183,14 @@ fun CollapsibleRail( modifier = Modifier.weight(1f), ) if (!state.portraitLocked) { - IconButton(onClick = state.onToggle, modifier = Modifier.size(28.dp)) { + IconButton(onClick = state.onToggle, modifier = Modifier.size(28.dp).focusGlide(CircleShape)) { Text("‹‹", color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 15.sp) } } } } if (collapsed && !state.portraitLocked) { - IconButton(onClick = state.onToggle, modifier = Modifier.fillMaxWidth().height(24.dp)) { + IconButton(onClick = state.onToggle, modifier = Modifier.fillMaxWidth().height(24.dp).focusGlide(CircleShape)) { Text("››", color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 15.sp) } } @@ -197,14 +199,14 @@ fun CollapsibleRail( if (collapsed) { Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp)) { links.forEach { link -> - IconButton(onClick = link.onClick, modifier = Modifier.size(32.dp)) { + IconButton(onClick = link.onClick, modifier = Modifier.size(32.dp).focusGlide(CircleShape)) { Icon(link.icon, link.label, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(18.dp)) } } } } else { links.forEach { link -> - TextButton(onClick = link.onClick, modifier = Modifier.padding(start = 4.dp)) { + TextButton(onClick = link.onClick, modifier = Modifier.padding(start = 4.dp).focusGlide(CircleShape)) { Icon(link.icon, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(15.dp)) Spacer(Modifier.width(6.dp)) Text(link.label, fontSize = 12.sp) @@ -250,11 +252,11 @@ fun CollapsibleRail( if (active) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outline.copy(alpha = 0.5f), shape, ) - .clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = item.onClick) + .focusGlide(shape).clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = item.onClick) .padding(horizontal = if (collapsed) 2.dp else 11.dp, vertical = if (collapsed) 6.dp else 9.dp) } else { base - .clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = item.onClick) + .focusGlide(shape).clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = item.onClick) .background(if (active) MaterialTheme.colorScheme.primary.copy(alpha = 0.14f) else Color.Transparent) .padding(horizontal = if (collapsed) 2.dp else 13.dp, vertical = if (collapsed) 7.dp else 11.dp) } @@ -361,6 +363,7 @@ private fun TopTabCell( modifier = modifier .clip(RoundedCornerShape(9.dp)) .background(if (selected) MaterialTheme.colorScheme.primary.copy(alpha = 0.14f) else Color.Transparent) + .focusGlide(RoundedCornerShape(9.dp)) .then( if (isTab) { Modifier.selectable(selected = selected, role = androidx.compose.ui.semantics.Role.Tab, onClick = onClick) diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt index e6289a3b98..3fb876ac23 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.files +import androidx.compose.foundation.shape.CircleShape +import com.droiddeck.launcher.ui.focusGlide import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -39,7 +41,7 @@ import androidx.compose.material.icons.filled.Storage import androidx.compose.material.icons.filled.Image import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults -import androidx.compose.material3.DropdownMenu +import com.droiddeck.launcher.ui.GlideDropdownMenu as DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -105,12 +107,14 @@ private fun FileContextMenuItems( text = { Text(stringResource(R.string.fm_select)) }, leadingIcon = { Icon(Icons.Filled.Checklist, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onSelect() }, + modifier = Modifier.focusGlide(), ) MenuItemDivider() DropdownMenuItem( text = { Text(stringResource(R.string.fm_properties)) }, leadingIcon = { Icon(Icons.Filled.Info, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onProperties() }, + modifier = Modifier.focusGlide(), ) MenuItemDivider() if (isDir) { @@ -124,6 +128,7 @@ private fun FileContextMenuItems( ) }, onClick = { onToggleFavorite() }, + modifier = Modifier.focusGlide(), ) MenuItemDivider() } @@ -131,24 +136,28 @@ private fun FileContextMenuItems( text = { Text(stringResource(R.string.fm_rename)) }, leadingIcon = { Icon(Icons.Filled.Edit, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onRename() }, + modifier = Modifier.focusGlide(), ) MenuItemDivider() DropdownMenuItem( text = { Text(stringResource(R.string.fm_copy)) }, leadingIcon = { Icon(Icons.Filled.FileCopy, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onCopy() }, + modifier = Modifier.focusGlide(), ) MenuItemDivider() DropdownMenuItem( text = { Text(stringResource(R.string.fm_cut)) }, leadingIcon = { Icon(Icons.Filled.ContentCut, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onCut() }, + modifier = Modifier.focusGlide(), ) MenuItemDivider() DropdownMenuItem( text = { Text(stringResource(R.string.common_delete)) }, leadingIcon = { Icon(Icons.Filled.Delete, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onDelete() }, + modifier = Modifier.focusGlide(), ) } @@ -193,7 +202,7 @@ internal fun FileItemRow( modifier = Modifier .fillMaxWidth() .padding(horizontal = 12.dp, vertical = 3.dp) - .combinedClickable(role = androidx.compose.ui.semantics.Role.Button, + .focusGlide(RoundedCornerShape(10.dp)).combinedClickable(role = androidx.compose.ui.semantics.Role.Button, onClick = { if (selectionMode) onToggleSelect() else onTap() }, onLongClick = onLongPress, ), @@ -212,7 +221,7 @@ internal fun FileItemRow( modifier = Modifier.padding(horizontal = 12.dp, vertical = if (compact) 3.dp else 8.dp), ) { if (selectionMode) { - androidx.compose.material3.Checkbox(checked = selected, onCheckedChange = { onToggleSelect() }) + androidx.compose.material3.Checkbox(checked = selected, onCheckedChange = { onToggleSelect() }, modifier = Modifier.focusGlide()) Spacer(Modifier.width(4.dp)) } when { @@ -270,7 +279,7 @@ internal fun FileItemRow( ) } if (showActions) Box { - IconButton(onClick = onMenu) { + IconButton(onClick = onMenu, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Filled.MoreVert, stringResource(R.string.fm_actions), tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(20.dp)) } DropdownMenu( @@ -302,7 +311,7 @@ internal fun ParentFolderRow(compact: Boolean = false, onTap: () -> Unit) { modifier = Modifier .fillMaxWidth() .padding(horizontal = 12.dp, vertical = 3.dp) - .clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = onTap), + .focusGlide(RoundedCornerShape(10.dp)).clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = onTap), shape = RoundedCornerShape(10.dp), colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer), border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline), @@ -370,6 +379,7 @@ internal fun FavoritesList( TextButton( onClick = onPinCurrent, enabled = !currentAlreadyPinned, + modifier = Modifier.focusGlide(CircleShape), ) { Icon(Icons.Filled.PushPin, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(16.dp)) Spacer(Modifier.width(6.dp)) @@ -422,7 +432,7 @@ private fun FavoriteCard( modifier = Modifier .fillMaxWidth() .padding(horizontal = 12.dp, vertical = 3.dp) - .clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = onJump), + .focusGlide(RoundedCornerShape(10.dp)).clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = onJump), shape = RoundedCornerShape(10.dp), colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer), border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline), @@ -480,7 +490,7 @@ private fun FavoriteCard( overflow = TextOverflow.Ellipsis, ) } - IconButton(onClick = onUnpin) { + IconButton(onClick = onUnpin, modifier = Modifier.focusGlide(CircleShape)) { Icon( Icons.Filled.Star, contentDescription = stringResource(R.string.fm_unpin_favorite), @@ -526,7 +536,7 @@ internal fun FileGridTile( Card( modifier = Modifier .padding(4.dp) - .combinedClickable(role = androidx.compose.ui.semantics.Role.Button, + .focusGlide(RoundedCornerShape(10.dp)).combinedClickable(role = androidx.compose.ui.semantics.Role.Button, onClick = { if (selectionMode) onToggleSelect() else onTap() }, onLongClick = onLongPress, ), @@ -570,7 +580,7 @@ internal fun FileGridTile( androidx.compose.material3.Checkbox( checked = selected, onCheckedChange = { onToggleSelect() }, - modifier = Modifier.align(Alignment.TopStart), + modifier = Modifier.align(Alignment.TopStart).focusGlide(), ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt index 8d60241c89..997a0e6da2 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.files +import androidx.compose.foundation.shape.CircleShape +import com.droiddeck.launcher.ui.focusGlide import android.widget.Toast import androidx.activity.compose.BackHandler import androidx.compose.foundation.BorderStroke @@ -50,7 +52,7 @@ import androidx.compose.material.icons.filled.Description import androidx.compose.material.icons.filled.Image import androidx.compose.material.icons.filled.SportsEsports import androidx.compose.material3.Button -import androidx.compose.material3.DropdownMenu +import com.droiddeck.launcher.ui.GlideDropdownMenu as DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.HorizontalDivider @@ -318,10 +320,10 @@ fun FileManagerScreen( navigate(action) } } - }) { Text(stringResource(R.string.fm_accept)) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_accept)) } }, dismissButton = { - TextButton(onClick = { pendingNavigation = null }) { + TextButton(onClick = { pendingNavigation = null }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_decline)) } }, @@ -509,15 +511,16 @@ fun FileManagerScreen( onValueChange = { folderName = it }, label = { Text(stringResource(R.string.fm_folder_name)) }, singleLine = true, + modifier = Modifier.focusGlide(), ) }, confirmButton = { TextButton(onClick = { showNewFolderDialog = false if (folderName.isNotBlank()) createFolder(currentDir, folderName) - }) { Text(stringResource(R.string.fm_create)) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_create)) } }, - dismissButton = { TextButton(onClick = { showNewFolderDialog = false }) { Text(stringResource(R.string.common_cancel)) } }, + dismissButton = { TextButton(onClick = { showNewFolderDialog = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -532,6 +535,7 @@ fun FileManagerScreen( onValueChange = { newName = it }, label = { Text(stringResource(R.string.fm_new_name)) }, singleLine = true, + modifier = Modifier.focusGlide(), ) }, confirmButton = { @@ -539,9 +543,9 @@ fun FileManagerScreen( val file = renameTarget renameTarget = null if (file != null && newName.isNotBlank()) performRename(file, newName) - }) { Text(stringResource(R.string.fm_rename)) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_rename)) } }, - dismissButton = { TextButton(onClick = { renameTarget = null }) { Text(stringResource(R.string.common_cancel)) } }, + dismissButton = { TextButton(onClick = { renameTarget = null }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -563,9 +567,9 @@ fun FileManagerScreen( TextButton(onClick = { selectedEntry = null performDelete(file) - }) { Text(stringResource(R.string.common_delete)) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_delete)) } }, - dismissButton = { TextButton(onClick = { selectedEntry = null }) { Text(stringResource(R.string.common_cancel)) } }, + dismissButton = { TextButton(onClick = { selectedEntry = null }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -611,9 +615,9 @@ fun FileManagerScreen( Toast.makeText(context, context.resources.getQuantityString(R.plurals.fm_delete_some_failed, failed, failed), Toast.LENGTH_SHORT).show() } } - }) { Text(stringResource(R.string.common_delete), color = MaterialTheme.colorScheme.error) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_delete), color = MaterialTheme.colorScheme.error) } }, - dismissButton = { TextButton(onClick = { pendingBulkDelete = emptyList() }) { Text(stringResource(R.string.common_cancel)) } }, + dismissButton = { TextButton(onClick = { pendingBulkDelete = emptyList() }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -636,6 +640,7 @@ fun FileManagerScreen( androidx.compose.material3.Checkbox( checked = conflictApplyToAll, onCheckedChange = { conflictApplyToAll = it }, + modifier = Modifier.focusGlide(), ) Text(stringResource(R.string.fm_conflict_apply_all), fontSize = 12.sp) } @@ -648,7 +653,7 @@ fun FileManagerScreen( ConflictChoice.SKIP to stringResource(R.string.fm_conflict_skip), ).forEach { (choice, label) -> TextButton( - modifier = Modifier.fillMaxWidth(), + modifier = Modifier.fillMaxWidth().focusGlide(CircleShape), onClick = { conflictChoice = choice; pendingConflict = null }, ) { Text(label, modifier = Modifier.fillMaxWidth()) } } @@ -656,7 +661,7 @@ fun FileManagerScreen( }, confirmButton = {}, dismissButton = { - TextButton(onClick = { conflictChoice = ConflictChoice.SKIP; pendingConflict = null }) { + TextButton(onClick = { conflictChoice = ConflictChoice.SKIP; pendingConflict = null }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, @@ -681,7 +686,7 @@ fun FileManagerScreen( onClick = { onPick?.invoke(currentDir) }, modifier = Modifier .fillMaxWidth() - .padding(horizontal = 16.dp, vertical = 8.dp), + .padding(horizontal = 16.dp, vertical = 8.dp).focusGlide(CircleShape), ) { Icon(Icons.Filled.Folder, null, modifier = Modifier.size(18.dp)) Spacer(Modifier.width(8.dp)) @@ -695,7 +700,7 @@ fun FileManagerScreen( .background(MaterialTheme.colorScheme.surfaceContainer) .padding(horizontal = 8.dp, vertical = 6.dp), ) { - IconButton(onClick = { requestNavigation(FileManagerNavigation.UP) }, enabled = canGoUp && !cancellingNavigation) { + IconButton(onClick = { requestNavigation(FileManagerNavigation.UP) }, enabled = canGoUp && !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Filled.ArrowBack, stringResource(R.string.fm_back), tint = MaterialTheme.colorScheme.primary) } @@ -744,6 +749,7 @@ fun FileManagerScreen( ).show() } }, + modifier = Modifier.focusGlide(), ) } linuxRoot?.let { root -> @@ -754,6 +760,7 @@ fun FileManagerScreen( Icon(Icons.Filled.Terminal, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(18.dp)) }, onClick = { showDriveMenu = false; openDrive(root) }, + modifier = Modifier.focusGlide(), ) } } @@ -786,7 +793,7 @@ fun FileManagerScreen( } if (launchDir != null) { - IconButton(onClick = { requestNavigation(FileManagerNavigation.RETURN_TO_START) }, enabled = !cancellingNavigation) { + IconButton(onClick = { requestNavigation(FileManagerNavigation.RETURN_TO_START) }, enabled = !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.AutoMirrored.Filled.KeyboardReturn, stringResource(R.string.fm_return_to_start), tint = MaterialTheme.colorScheme.primary) } if (LocalConfiguration.current.screenWidthDp >= 700) Spacer(Modifier.width(56.dp)) @@ -798,7 +805,7 @@ fun FileManagerScreen( onClick = { showNewFolderDialog = true }, border = BorderStroke(1.dp, MaterialTheme.colorScheme.primary.copy(alpha = 0.6f)), contentPadding = PaddingValues(horizontal = 10.dp, vertical = 2.dp), - modifier = Modifier.height(32.dp), + modifier = Modifier.height(32.dp).focusGlide(CircleShape), ) { Icon(Icons.Filled.CreateNewFolder, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(16.dp)) Spacer(Modifier.width(5.dp)) @@ -808,18 +815,18 @@ fun FileManagerScreen( IconButton(onClick = { gridView = !gridView browsePrefs.edit().putBoolean("fmGridView", gridView).apply() - }) { + }, modifier = Modifier.focusGlide(CircleShape)) { Icon( if (gridView) Icons.Filled.ViewList else Icons.Filled.GridView, if (gridView) stringResource(R.string.fm_list_view) else stringResource(R.string.fm_grid_view), tint = MaterialTheme.colorScheme.onSurfaceVariant, ) } - IconButton(onClick = { showSearch = !showSearch; if (!showSearch) searchQuery = "" }) { + IconButton(onClick = { showSearch = !showSearch; if (!showSearch) searchQuery = "" }, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Filled.Search, stringResource(R.string.fm_search), tint = MaterialTheme.colorScheme.onSurfaceVariant) } Box { - IconButton(onClick = { showSortMenu = true }) { + IconButton(onClick = { showSortMenu = true }, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Filled.Sort, stringResource(R.string.fm_sort), tint = MaterialTheme.colorScheme.onSurfaceVariant) } DropdownMenu(expanded = showSortMenu, onDismissRequest = { showSortMenu = false }) { @@ -836,6 +843,7 @@ fun FileManagerScreen( showSortMenu = false loadDirectory(currentDir, resetScroll = false) }, + modifier = Modifier.focusGlide(), ) } HorizontalDivider(color = MaterialTheme.colorScheme.outline) @@ -846,6 +854,7 @@ fun FileManagerScreen( browsePrefs.edit().putBoolean("fmCompactRows", compactRows).apply() showSortMenu = false }, + modifier = Modifier.focusGlide(), ) DropdownMenuItem( text = { Text(if (showHidden) stringResource(R.string.fm_hide_hidden) else stringResource(R.string.fm_show_hidden)) }, @@ -855,12 +864,13 @@ fun FileManagerScreen( showSortMenu = false loadDirectory(currentDir, resetScroll = false) }, + modifier = Modifier.focusGlide(), ) } } } - IconButton(onClick = { showFavorites = !showFavorites }) { + IconButton(onClick = { showFavorites = !showFavorites }, modifier = Modifier.focusGlide(CircleShape)) { if (showFavorites) { Icon(Icons.Filled.Star, stringResource(R.string.fm_hide_favorites), tint = MaterialTheme.colorScheme.primary) } else { @@ -868,7 +878,7 @@ fun FileManagerScreen( } } if (!pickMode && onExit != null) { - IconButton(onClick = { requestNavigation(FileManagerNavigation.EXIT) }, enabled = !cancellingNavigation) { + IconButton(onClick = { requestNavigation(FileManagerNavigation.EXIT) }, enabled = !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.AutoMirrored.Filled.ExitToApp, stringResource(R.string.fm_exit), tint = MaterialTheme.colorScheme.onSurfaceVariant) } } @@ -880,7 +890,7 @@ fun FileManagerScreen( onValueChange = { searchQuery = it }, singleLine = true, placeholder = { Text(stringResource(R.string.fm_filter_folder), fontSize = 13.sp) }, - modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 4.dp), + modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 4.dp).focusGlide(), ) } @@ -935,6 +945,7 @@ fun FileManagerScreen( selectedPaths = if (allVisibleSelected) selectedPaths - shown.toSet() else selectedPaths + shown }, contentPadding = selBarPadding, + modifier = Modifier.focusGlide(CircleShape), ) { Text(if (allVisibleSelected) stringResource(R.string.fm_select_none) else stringResource(R.string.fm_select_all), fontSize = 12.sp) } Spacer(Modifier.width(4.dp)) OutlinedButton( @@ -946,6 +957,7 @@ fun FileManagerScreen( selectedPaths = emptySet() }, contentPadding = selBarPadding, + modifier = Modifier.focusGlide(CircleShape), ) { Text(stringResource(R.string.fm_copy), fontSize = 12.sp) } Spacer(Modifier.width(4.dp)) OutlinedButton( @@ -957,6 +969,7 @@ fun FileManagerScreen( selectedPaths = emptySet() }, contentPadding = selBarPadding, + modifier = Modifier.focusGlide(CircleShape), ) { Text(stringResource(R.string.fm_cut), fontSize = 12.sp) } Spacer(Modifier.width(4.dp)) OutlinedButton( @@ -964,11 +977,13 @@ fun FileManagerScreen( onClick = { pendingBulkDelete = visibleEntries.filter { it.absolutePath in selectedPaths } }, contentPadding = selBarPadding, border = BorderStroke(1.dp, MaterialTheme.colorScheme.error), + modifier = Modifier.focusGlide(CircleShape), ) { Text(stringResource(R.string.common_delete), color = MaterialTheme.colorScheme.error, fontSize = 12.sp) } Spacer(Modifier.width(4.dp)) OutlinedButton( onClick = { selectionMode = false; selectedPaths = emptySet() }, contentPadding = selBarPadding, + modifier = Modifier.focusGlide(CircleShape), ) { Text(stringResource(R.string.fm_done), fontSize = 12.sp) } } } @@ -990,7 +1005,7 @@ fun FileManagerScreen( if (isCutOperation) stringResource(R.string.fm_paste_move_here, what) else stringResource(R.string.fm_paste_here, what), color = MaterialTheme.colorScheme.onBackground, fontSize = 13.sp, modifier = Modifier.weight(1f), ) - TextButton(onClick = { clipboardFiles = emptyList(); isCutOperation = false }) { + TextButton(onClick = { clipboardFiles = emptyList(); isCutOperation = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel), color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 12.sp) } } @@ -1021,7 +1036,7 @@ fun FileManagerScreen( isOperationRunning = false operationDeterminate = false loadDirectory(currentDir, resetScroll = false) - }) { Text(stringResource(R.string.common_cancel), fontSize = 12.sp) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel), fontSize = 12.sp) } } } Spacer(Modifier.height(4.dp)) diff --git a/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt b/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt index f4f8d80fb2..07fbb15606 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.files +import androidx.compose.foundation.shape.CircleShape +import com.droiddeck.launcher.ui.focusGlide import android.widget.Toast import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll @@ -128,7 +130,7 @@ internal fun FilePropertiesDialog( ) } }, - confirmButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.fm_done)) } }, + confirmButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_done)) } }, ) } @@ -182,6 +184,7 @@ private fun AttributeToggleRow( checked = checked, enabled = enabled, onCheckedChange = onToggle, + modifier = Modifier.focusGlide(), ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/files/OutlinedAlertDialog.kt b/app/src/main/java/com/droiddeck/launcher/files/OutlinedAlertDialog.kt index 3919e89b0d..2eda726c3b 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/OutlinedAlertDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/OutlinedAlertDialog.kt @@ -1,7 +1,7 @@ package com.droiddeck.launcher.files import androidx.compose.foundation.border -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.AlertDialogDefaults import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt b/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt index 4bd76a4e73..cb544d5a4d 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.input +import com.droiddeck.launcher.ui.focusGlide import android.os.Build import android.os.Bundle import android.view.Gravity @@ -104,6 +105,7 @@ class ControllerEditorActivity : ComponentActivity() { else -> Color.White.copy(alpha = 0.06f) }, ) + .focusGlide(RoundedCornerShape(50)) .then( if (selected == null) Modifier.clickable(onClick = onClick) else Modifier.toggleable(value = selected, role = Role.Switch, onValueChange = { onClick() }), diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt index bfe1e3908e..1d6c3df63e 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.stores.xbox +import androidx.compose.foundation.shape.CircleShape +import com.droiddeck.launcher.ui.focusGlide import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent @@ -45,7 +47,7 @@ class XboxCloudSettingsActivity : ComponentActivity() { } Column(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background).verticalScroll(rememberScrollState())) { Row(Modifier.padding(16.dp), verticalAlignment = Alignment.CenterVertically) { - OutlinedButton(onClick = { finish() }) { Text("Back") } + OutlinedButton(onClick = { finish() }, modifier = Modifier.focusGlide(CircleShape)) { Text("Back") } Text("Xbox Cloud Gaming", style = MaterialTheme.typography.headlineSmall, fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.padding(horizontal = 16.dp)) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt index 0a09fd7890..1131fb1245 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt @@ -1,5 +1,8 @@ package com.droiddeck.launcher.stores.xbox +import com.droiddeck.launcher.ui.glideBorder +import androidx.compose.foundation.shape.CircleShape +import com.droiddeck.launcher.ui.focusGlide import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope @@ -16,7 +19,6 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Switch import androidx.compose.material3.Text -import androidx.compose.foundation.border import androidx.compose.foundation.background import androidx.compose.foundation.focusable import androidx.compose.foundation.gestures.detectTapGestures @@ -148,7 +150,7 @@ private fun PanelContent( Toggle("Toon", "Cartoon outlines.", settings.toon) { onChange(settings.copy(toon = it)) } Choice("Frame-rate cap", listOf(0 to "Off", 30 to "30 fps", 45 to "45 fps", 60 to "60 fps"), settings.maxFps) { onChange(settings.copy(maxFps = it)) } Row(Modifier.fillMaxWidth().padding(top = 6.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { - OutlinedButton(onClick = { onChange(settings.withoutEffects()) }) { Text("Reset picture") } + OutlinedButton(onClick = { onChange(settings.withoutEffects()) }, modifier = Modifier.focusGlide(CircleShape)) { Text("Reset picture") } } Text("Effects cost a little GPU time; with none set the stream is shown directly.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(top = 4.dp)) @@ -220,7 +222,7 @@ private fun SettingRow( Row( Modifier.fillMaxWidth().padding(vertical = 1.dp).clip(shape) .background(if (focused) cs.primary.copy(alpha = 0.16f) else Color.Transparent) - .border(2.dp, if (focused) cs.primary else Color.Transparent, shape) + .glideBorder(focused, shape, cs.primary, hotFillAlpha = 0f) .let { if (panel != null && index >= 0) it.focusRequester(panel.requester(index)) else it } .onFocusChanged { state -> focused = state.isFocused; if (state.isFocused && index >= 0) panel?.onFocused?.invoke(index) } .onKeyEvent { event -> @@ -299,8 +301,9 @@ internal fun XboxMenuEntry(title: String, note: String?, focus: FocusRequester? val shape = RoundedCornerShape(10.dp) androidx.compose.material3.Surface( onClick = onClick, color = if (focused) cs.primary.copy(alpha = 0.2f) else cs.surfaceContainerHigh, shape = shape, - border = if (focused) androidx.compose.foundation.BorderStroke(2.dp, cs.primary) else null, + border = null, modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 3.dp) + .glideBorder(focused, shape, cs.primary, hotFillAlpha = 0f) .let { if (focus != null) it.focusRequester(focus) else it } .onFocusChanged { state -> focused = state.isFocused; if (state.isFocused) onFocused() } .onKeyEvent { event -> if (event.type == KeyEventType.KeyDown && event.key == Key.ButtonA) { onClick(); true } else false }, diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt index 97fd03a3da..1333be117c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.stores.xbox +import androidx.compose.foundation.shape.CircleShape +import com.droiddeck.launcher.ui.focusGlide import android.content.Context import android.content.Intent import android.graphics.Color @@ -181,10 +183,10 @@ class XboxNativePlayerActivity : ComponentActivity() { fun NoticeButton(label: String, focus: androidx.compose.ui.focus.FocusRequester?, onClick: () -> Unit) = androidx.compose.material3.TextButton(onClick = onClick, modifier = androidx.compose.ui.Modifier.let { if (focus != null) it.focusRequester(focus) else it } - .onKeyEvent { e -> if (e.type == KeyEventType.KeyDown && e.key == Key.ButtonA) { onClick(); true } else false }) { + .onKeyEvent { e -> if (e.type == KeyEventType.KeyDown && e.key == Key.ButtonA) { onClick(); true } else false }.focusGlide(CircleShape)) { androidx.compose.material3.Text(label) } - androidx.compose.material3.AlertDialog( + com.droiddeck.launcher.ui.GlideAlertDialog( onDismissRequest = { finish() }, properties = androidx.compose.ui.window.DialogProperties(dismissOnClickOutside = false), title = { androidx.compose.material3.Text(title) }, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt index b3b88f0aa4..660e0723c0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt @@ -88,7 +88,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.sp -import androidx.compose.ui.window.Dialog +import com.droiddeck.launcher.ui.GlideDialog as Dialog import androidx.compose.ui.window.DialogProperties import coil.compose.AsyncImage import coil.request.ImageRequest diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt index 3d86510f70..6e2ae810c0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt @@ -475,7 +475,7 @@ internal fun TextEntryDialog(title: String, initial: String, onDismiss: () -> Un AppDialog(shown, close, "textEntry", wide = false, maxWidth = 460.dp) { DialogTitleRow(title, onClose = close) androidx.compose.material3.OutlinedTextField( - value, { value = it }, singleLine = true, modifier = Modifier.fillMaxWidth().focusRequester(focus), + value, { value = it }, singleLine = true, modifier = Modifier.fillMaxWidth().focusRequester(focus).focusGlide(), keyboardActions = androidx.compose.foundation.text.KeyboardActions(onDone = { onSave(value.trim()); close() }), keyboardOptions = androidx.compose.foundation.text.KeyboardOptions(imeAction = androidx.compose.ui.text.input.ImeAction.Done), ) @@ -644,7 +644,7 @@ private fun SgdbSearchDialog( SmallIconButton(Icons.AutoMirrored.Filled.ArrowBack, stringResource(R.string.common_back), colors.onBackground, onClick = back) }) androidx.compose.material3.OutlinedTextField( - query, { query = it }, singleLine = true, modifier = Modifier.fillMaxWidth(), + query, { query = it }, singleLine = true, modifier = Modifier.fillMaxWidth().focusGlide(), label = { Text(stringResource(R.string.art_sgdb_search_label)) }, keyboardActions = androidx.compose.foundation.text.KeyboardActions(onSearch = { leaveField(); search() }), keyboardOptions = androidx.compose.foundation.text.KeyboardOptions(imeAction = androidx.compose.ui.text.input.ImeAction.Search), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt index c4d8053d98..2c090048d4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt @@ -308,12 +308,12 @@ private fun InstalledMoviesDialog(a: ModeSettingsActions, onDismiss: () -> Unit) @Composable private fun RemoveMovieDialog(entry: BootMovieLibrary.Entry, onConfirm: () -> Unit, onDismiss: () -> Unit) { - androidx.compose.material3.AlertDialog( + com.droiddeck.launcher.ui.GlideAlertDialog( onDismissRequest = onDismiss, title = { Text(stringResource(R.string.boot_movie_remove_confirm, entry.title)) }, text = { Text(stringResource(R.string.boot_movie_remove_confirm_body)) }, - confirmButton = { androidx.compose.material3.TextButton(onClick = onConfirm) { Text(stringResource(R.string.boot_movie_remove)) } }, - dismissButton = { androidx.compose.material3.TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } }, + confirmButton = { androidx.compose.material3.TextButton(onClick = onConfirm, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.boot_movie_remove)) } }, + dismissButton = { androidx.compose.material3.TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index 0e99b6e714..364650b90b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -38,7 +38,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Delete import androidx.compose.material.icons.outlined.Refresh import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.Icon import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DriverPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/DriverPage.kt index 2a22c0a155..067ff06ecc 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DriverPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DriverPage.kt @@ -31,7 +31,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Delete import androidx.compose.material.icons.outlined.Refresh -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon import androidx.compose.material3.LinearProgressIndicator diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FocusGlide.kt b/app/src/main/java/com/droiddeck/launcher/ui/FocusGlide.kt index 0bc1ccc472..452a6160cf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FocusGlide.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FocusGlide.kt @@ -11,6 +11,7 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf @@ -23,6 +24,7 @@ import androidx.compose.runtime.withFrameNanos import androidx.compose.ui.Modifier import androidx.compose.ui.draw.drawWithContent import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.geometry.CornerRadius import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Rect @@ -54,10 +56,21 @@ internal class GlideSource { var shape: Shape by mutableStateOf<Shape>(androidx.compose.ui.graphics.RectangleShape) var color by mutableStateOf(Color.Transparent) var width by mutableStateOf(2.dp) + var fillAlpha by mutableFloatStateOf(RING_FILL) val requester = androidx.compose.ui.focus.FocusRequester() } -internal class FocusGlide(val view: View) { +internal class FocusGlide(view: View?) { + private val deferredWindow = view == null + var view = view + private set + + fun accepts(view: View): Boolean { + // DropdownMenu recreates its popup view after closing. + if (this.view == null || deferredWindow && this.view !== view && host?.isAttached != true) this.view = view + return this.view === view + } + var host: LayoutCoordinates? = null val hot = mutableStateListOf<GlideSource>() var moves by mutableIntStateOf(0) @@ -107,15 +120,17 @@ internal fun Modifier.glideBorder( restColor: Color = Color.Transparent, hotWidth: Dp = 2.dp, restWidth: Dp = 1.dp, + hotFillAlpha: Float = RING_FILL, ): Modifier { val glide = LocalFocusGlide.current - if (glide == null || glide.view !== LocalView.current) { + if (glide == null || !glide.accepts(LocalView.current)) { return border(if (hot) hotWidth else restWidth, if (hot) hotColor else restColor, shape) } val src = remember { GlideSource() } src.shape = shape src.color = hotColor src.width = hotWidth + src.fillAlpha = hotFillAlpha DisposableEffect(glide, hot) { if (hot) glide.claim(src) onDispose { glide.release(src) } @@ -140,12 +155,36 @@ private const val REPEAT_MS = 180L private val FAR = 360.dp +@Composable +internal fun Modifier.focusGlide( + shape: Shape = Shape12, + color: Color = LocalPalette.current.signal, +): Modifier { + var focused by remember { mutableStateOf(false) } + return glideBorder(focused, shape, color, hotFillAlpha = 0f) + .onFocusChanged { focused = it.isFocused } +} + @Composable internal fun FocusGlideHost(modifier: Modifier = Modifier, content: @Composable () -> Unit) { val view = LocalView.current + val glide = remember(view) { FocusGlide(view) } + Box(modifier.focusGlideOverlay(glide)) { + CompositionLocalProvider(LocalFocusGlide provides glide) { content() } + } +} + +@Composable +internal fun FocusGlideWindow(content: @Composable (Modifier) -> Unit) { + val glide = remember { FocusGlide(null) } + val overlay = Modifier.focusGlideOverlay(glide) + CompositionLocalProvider(LocalFocusGlide provides glide) { content(overlay) } +} + +@Composable +private fun Modifier.focusGlideOverlay(glide: FocusGlide): Modifier { val density = LocalDensity.current val dir = LocalLayoutDirection.current - val glide = remember(view) { FocusGlide(view) } val edges = remember { List(4) { Animatable(0f) } } val corner = remember { Animatable(0f) } val solid = remember { Animatable(0f) } @@ -162,6 +201,8 @@ internal fun FocusGlideHost(modifier: Modifier = Modifier, content: @Composable val color by animateColorAsState(cur?.color ?: lastColor, Motion.tw(160), label = "glideColor") var width by remember { mutableStateOf(2.dp) } if (cur != null) width = cur.width + var fillAlpha by remember { mutableFloatStateOf(RING_FILL) } + if (cur != null) fillAlpha = cur.fillAlpha LaunchedEffect(glide, Motion.scale) { var shown: GlideSource? = null @@ -339,8 +380,7 @@ internal fun FocusGlideHost(modifier: Modifier = Modifier, content: @Composable } } - Box( - modifier + return this .onGloballyPositioned { glide.host = it } .drawWithContent { drawContent() @@ -359,15 +399,12 @@ internal fun FocusGlideHost(modifier: Modifier = Modifier, content: @Composable if (f < 0.99f) { drawRoundRect( color, topLeft = Offset(l + w / 2f, t + w / 2f), size = Size(sw, sh), - cornerRadius = CornerRadius(rad), alpha = a * (1f - f) * RING_FILL, + cornerRadius = CornerRadius(rad), alpha = a * (1f - f) * fillAlpha, ) drawRoundRect( color, topLeft = Offset(l + w / 2f, t + w / 2f), size = Size(sw, sh), cornerRadius = CornerRadius(rad), style = Stroke(w), alpha = a, ) } - }, - ) { - CompositionLocalProvider(LocalFocusGlide provides glide) { content() } - } + } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt index fb7d204852..0455366d26 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt @@ -186,7 +186,7 @@ internal fun PrimaryButton( .clip(Shape12) .background(if (enabled) Brush.linearGradient(listOf(colors.primary, pal.primary2)) else Brush.linearGradient(listOf(colors.surfaceVariant, colors.surfaceVariant))) .then(if (enabled) Modifier else Modifier.border(1.dp, pal.line2, Shape12)) - .then(if (hot) Modifier.border(2.dp, pal.signal, Shape12) else Modifier) + .glideBorder(hot, Shape12, pal.signal, hotFillAlpha = 0f) .hoverable(src).clickable(role = Role.Button, interactionSource = src, indication = null, enabled = enabled) { placed[0]?.takeIf { it.isAttached }?.let { LaunchOrigin.mark(it.boundsInRoot(), placed) } onClick() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GlassesCalibrationControls.kt b/app/src/main/java/com/droiddeck/launcher/ui/GlassesCalibrationControls.kt index 1f53c272dc..c2dde844e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GlassesCalibrationControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GlassesCalibrationControls.kt @@ -1,7 +1,9 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.ui.Modifier import androidx.compose.foundation.layout.Column -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -32,8 +34,8 @@ internal fun GlassesCalibrationControls( onDismissRequest = { reset = false }, title = { Text(stringResource(R.string.glasses_calibration_reset)) }, text = { Text(stringResource(R.string.glasses_calibration_reset_hint)) }, - confirmButton = { TextButton(onClick = { onReset(); reset = false }) { Text(stringResource(R.string.glasses_calibration_reset_button)) } }, - dismissButton = { TextButton(onClick = { reset = false }) { Text(stringResource(R.string.common_cancel)) } }, + confirmButton = { TextButton(onClick = { onReset(); reset = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.glasses_calibration_reset_button)) } }, + dismissButton = { TextButton(onClick = { reset = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) if (shown) AlertDialog( onDismissRequest = { onCancel(); shown = false }, @@ -57,8 +59,8 @@ internal fun GlassesCalibrationControls( if (!state.running) TextButton(onClick = { if (state.phase == CalibrationPhase.SAVED) { onDone(); onCancel(); shown = false } else onStart() - }) { Text(stringResource(if (state.phase == CalibrationPhase.SAVED) R.string.glasses_calibration_done else R.string.glasses_calibration_start)) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(if (state.phase == CalibrationPhase.SAVED) R.string.glasses_calibration_done else R.string.glasses_calibration_start)) } }, - dismissButton = { TextButton(onClick = { onCancel(); shown = false }) { Text(stringResource(R.string.common_cancel)) } }, + dismissButton = { TextButton(onClick = { onCancel(); shown = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GlassesPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/GlassesPanel.kt index 92e0aef3bc..877cad9240 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GlassesPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GlassesPanel.kt @@ -347,6 +347,7 @@ internal fun GlassesCornerButton(slot: Int, tint: Int, opacity: Int, onClick: () .clip(CircleShape) .background(fill) .border(1.5.dp, line, CircleShape) + .focusGlide(CircleShape) .clickable(interactionSource = source, indication = null, role = Role.Button, onClick = onClick) .testTag("glasses-button"), ) { @@ -382,6 +383,7 @@ private fun GlassesRecenterAction(label: String, tag: String, tint: Int, opacity .clip(shape) .background(fill) .border(1.5.dp, line, shape) + .focusGlide(shape) .clickable(interactionSource = source, indication = null, role = Role.Button, onClick = onClick) .padding(horizontal = 18.dp) .testTag(tag), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GlideWindows.kt b/app/src/main/java/com/droiddeck/launcher/ui/GlideWindows.kt new file mode 100644 index 0000000000..dd362fe528 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GlideWindows.kt @@ -0,0 +1,78 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.ScrollState +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.rememberScrollState +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.AlertDialogDefaults +import androidx.compose.material3.DropdownMenu +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Shape +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.DpOffset +import androidx.compose.ui.window.Dialog +import androidx.compose.ui.window.DialogProperties +import androidx.compose.ui.window.Popup +import androidx.compose.ui.window.PopupPositionProvider +import androidx.compose.ui.window.PopupProperties + +@Composable +internal fun GlideDialog( + onDismissRequest: () -> Unit, + properties: DialogProperties = DialogProperties(), + content: @Composable () -> Unit, +) { + Dialog(onDismissRequest, properties) { FocusGlideHost(content = content) } +} + +@Composable +internal fun GlidePopup( + popupPositionProvider: PopupPositionProvider, + onDismissRequest: (() -> Unit)? = null, + properties: PopupProperties = PopupProperties(), + content: @Composable () -> Unit, +) { + Popup(popupPositionProvider, onDismissRequest, properties) { FocusGlideHost(content = content) } +} + +@Composable +internal fun GlideAlertDialog( + onDismissRequest: () -> Unit, + confirmButton: @Composable () -> Unit, + modifier: Modifier = Modifier, + dismissButton: (@Composable () -> Unit)? = null, + icon: (@Composable () -> Unit)? = null, + title: (@Composable () -> Unit)? = null, + text: (@Composable () -> Unit)? = null, + shape: Shape = AlertDialogDefaults.shape, + containerColor: Color = AlertDialogDefaults.containerColor, + iconContentColor: Color = AlertDialogDefaults.iconContentColor, + titleContentColor: Color = AlertDialogDefaults.titleContentColor, + textContentColor: Color = AlertDialogDefaults.textContentColor, + tonalElevation: Dp = AlertDialogDefaults.TonalElevation, + properties: DialogProperties = DialogProperties(), +) { + FocusGlideWindow { overlay -> + AlertDialog( + onDismissRequest, confirmButton, modifier.then(overlay), dismissButton, icon, title, text, + shape, containerColor, iconContentColor, titleContentColor, textContentColor, tonalElevation, properties, + ) + } +} + +@Composable +internal fun GlideDropdownMenu( + expanded: Boolean, + onDismissRequest: () -> Unit, + modifier: Modifier = Modifier, + offset: DpOffset = DpOffset.Zero, + scrollState: ScrollState = rememberScrollState(), + properties: PopupProperties = PopupProperties(focusable = true), + content: @Composable ColumnScope.() -> Unit, +) { + FocusGlideWindow { overlay -> + DropdownMenu(expanded, onDismissRequest, modifier.then(overlay), offset, scrollState, properties, content) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt index 8474050c34..fddb98c60b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt @@ -48,7 +48,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.AutoAwesome import androidx.compose.material.icons.outlined.Memory import androidx.compose.material.icons.outlined.Tune -import androidx.compose.material3.DropdownMenu +import com.droiddeck.launcher.ui.GlideDropdownMenu as DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon diff --git a/app/src/main/java/com/droiddeck/launcher/ui/HandCameraUi.kt b/app/src/main/java/com/droiddeck/launcher/ui/HandCameraUi.kt index 3aae52a767..50f6a9d458 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/HandCameraUi.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/HandCameraUi.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import com.droiddeck.launcher.core.AddonPack import android.Manifest import android.content.Intent @@ -28,7 +29,7 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.RadioButton @@ -63,7 +64,7 @@ import androidx.compose.ui.semantics.Role import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.compose.ui.window.Dialog +import com.droiddeck.launcher.ui.GlideDialog as Dialog import androidx.compose.ui.window.DialogProperties import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver @@ -129,7 +130,7 @@ internal fun HandCameraPrompt(sides: Set<String>, onAllow: (String?) -> Unit, on Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().clip(RoundedCornerShape(8.dp)) - .selectable(side == id, role = Role.RadioButton) { side = id } + .focusGlide(RoundedCornerShape(8.dp)).selectable(side == id, role = Role.RadioButton) { side = id } .testTag("hand-camera-$id") .padding(vertical = 4.dp), ) { @@ -144,12 +145,12 @@ internal fun HandCameraPrompt(sides: Set<String>, onAllow: (String?) -> Unit, on } }, confirmButton = { - TextButton(onClick = { onAllow(if (choose) side else null) }, modifier = Modifier.testTag("hand-camera-allow")) { + TextButton(onClick = { onAllow(if (choose) side else null) }, modifier = Modifier.testTag("hand-camera-allow").focusGlide(CircleShape)) { Text(stringResource(R.string.hand_camera_allow)) } }, dismissButton = { - TextButton(onClick = onNotNow, modifier = Modifier.testTag("hand-camera-not-now")) { Text(stringResource(R.string.hand_camera_not_now)) } + TextButton(onClick = onNotNow, modifier = Modifier.testTag("hand-camera-not-now").focusGlide(CircleShape)) { Text(stringResource(R.string.hand_camera_not_now)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchKeyDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchKeyDialog.kt index cfeeeb8c41..0a0f0a813f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ItchKeyDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchKeyDialog.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import android.content.ClipboardManager import android.content.Context import android.content.Intent @@ -9,7 +10,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -91,7 +92,7 @@ internal fun ItchKeyDialog(onDismiss: () -> Unit) { Row(horizontalArrangement = Arrangement.Start) { TextButton(onClick = { ctx.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(ItchApi.KEYS_PAGE))) - }) { Text(stringResource(R.string.stores_itch_get_key)) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.stores_itch_get_key)) } } if (rejected) { Spacer(Modifier.height(8.dp)) @@ -104,12 +105,12 @@ internal fun ItchKeyDialog(onDismiss: () -> Unit) { } }, confirmButton = { - TextButton(enabled = key.isNotBlank() && !busy, onClick = { submit() }) { + TextButton(enabled = key.isNotBlank() && !busy, onClick = { submit() }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.game_env_save)) } }, dismissButton = { - TextButton(enabled = !busy, onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } + TextButton(enabled = !busy, onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/MainScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/MainScreen.kt index 0f4483c0a3..aa2b6da6c5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/MainScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/MainScreen.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import com.droiddeck.launcher.R import androidx.compose.ui.res.stringResource import androidx.compose.foundation.layout.Arrangement @@ -12,7 +13,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.selection.toggleable import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.Checkbox import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -46,9 +47,9 @@ fun ChooseAppDisplayDialog( ?: stringResource(R.string.main_secondary_gone), ) }, - confirmButton = { TextButton(onClick = onPrimary) { Text(stringResource(R.string.main_primary)) } }, + confirmButton = { TextButton(onClick = onPrimary, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.main_primary)) } }, dismissButton = { - TextButton(onClick = onSecondary, enabled = secondaryDisplay != null) { + TextButton(onClick = onSecondary, enabled = secondaryDisplay != null, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.main_secondary)) } }, @@ -61,8 +62,8 @@ fun ConfirmDialog(title: String, text: String, confirm: String, onConfirm: () -> onDismissRequest = onDismiss, title = { Text(title) }, text = { Text(text) }, - confirmButton = { TextButton(onClick = { onDismiss(); onConfirm() }) { Text(confirm) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } }, + confirmButton = { TextButton(onClick = { onDismiss(); onConfirm() }, modifier = Modifier.focusGlide(CircleShape)) { Text(confirm) } }, + dismissButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -72,11 +73,11 @@ fun RuntimeActionsDialog(onRepair: () -> Unit, onRemove: () -> Unit, onDismiss: onDismissRequest = onDismiss, title = { Text(stringResource(R.string.runtime_actions_title)) }, text = { Text(stringResource(R.string.runtime_actions_text)) }, - confirmButton = { TextButton(onClick = onRepair) { Text(stringResource(R.string.runtime_repair)) } }, + confirmButton = { TextButton(onClick = onRepair, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.runtime_repair)) } }, dismissButton = { Row { - TextButton(onClick = onRemove) { Text(stringResource(R.string.store_remove)) } - TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } + TextButton(onClick = onRemove, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.store_remove)) } + TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } } }, ) @@ -92,7 +93,7 @@ fun ResetSettingsDialog(onConfirm: (gameProfiles: Boolean) -> Unit, onDismiss: ( Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { Text(stringResource(R.string.setup_reset_settings_body)) Row( - Modifier.fillMaxWidth().toggleable(gameProfiles, role = Role.Checkbox) { gameProfiles = it }, + Modifier.fillMaxWidth().focusGlide().toggleable(gameProfiles, role = Role.Checkbox) { gameProfiles = it }, verticalAlignment = Alignment.CenterVertically, ) { Checkbox(checked = gameProfiles, onCheckedChange = null) @@ -102,10 +103,10 @@ fun ResetSettingsDialog(onConfirm: (gameProfiles: Boolean) -> Unit, onDismiss: ( } }, confirmButton = { - TextButton(onClick = { onDismiss(); onConfirm(gameProfiles) }) { + TextButton(onClick = { onDismiss(); onConfirm(gameProfiles) }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.setup_reset_settings_button), color = MaterialTheme.colorScheme.error) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } }, + dismissButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } 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 393971446e..fd9933e250 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.pluralStringResource import androidx.compose.foundation.clickable @@ -7,7 +8,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.size -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.LinearProgressIndicator @@ -530,12 +531,12 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: title = { Text(stringResource(R.string.mode_wifi_explain_title)) }, text = { Text(stringResource(R.string.mode_wifi_explain_text)) }, confirmButton = { - TextButton(onClick = { explainWifiDiscovery = false; a.onWifiDiscovery(true) }) { + TextButton(onClick = { explainWifiDiscovery = false; a.onWifiDiscovery(true) }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(if (s.wifiDiscoveryBlocked) R.string.mode_wifi_open_settings else R.string.mode_wifi_continue)) } }, dismissButton = { - TextButton(onClick = { explainWifiDiscovery = false }) { Text(stringResource(R.string.common_cancel)) } + TextButton(onClick = { explainWifiDiscovery = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -582,14 +583,14 @@ internal fun DeckyZipWarningDialog(onConfirm: () -> Unit, onCancel: () -> Unit) title = { Text(stringResource(R.string.decky_zip_warning_title)) }, text = { Text(stringResource(R.string.decky_zip_warning_text)) }, confirmButton = { - androidx.compose.material3.TextButton(onClick = onConfirm, enabled = left == 0) { + androidx.compose.material3.TextButton(onClick = onConfirm, enabled = left == 0, modifier = Modifier.focusGlide(CircleShape)) { Text( if (left > 0) androidx.compose.ui.res.pluralStringResource(R.plurals.decky_zip_warning_wait, left, left) else stringResource(R.string.decky_zip_warning_continue), ) } }, - dismissButton = { androidx.compose.material3.TextButton(onClick = onCancel) { Text(stringResource(R.string.common_cancel)) } }, + dismissButton = { androidx.compose.material3.TextButton(onClick = onCancel, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -624,7 +625,7 @@ private fun DeckyUninstall(enabled: Boolean, onUninstall: () -> Unit) { @Composable internal fun SgdbKeyDialog(hasKey: Boolean, onSave: (String) -> Unit, onDismiss: () -> Unit) { var key by remember { mutableStateOf("") } - androidx.compose.material3.AlertDialog( + com.droiddeck.launcher.ui.GlideAlertDialog( onDismissRequest = onDismiss, title = { Text(stringResource(R.string.mode_sgdb_key)) }, text = { @@ -632,14 +633,14 @@ internal fun SgdbKeyDialog(hasKey: Boolean, onSave: (String) -> Unit, onDismiss: key, { v -> key = v.trim() }, label = { Text(stringResource(R.string.mode_sgdb_key)) }, singleLine = true, visualTransformation = androidx.compose.ui.text.input.PasswordVisualTransformation(), keyboardOptions = androidx.compose.foundation.text.KeyboardOptions(keyboardType = androidx.compose.ui.text.input.KeyboardType.Password), - modifier = Modifier.fillMaxWidth(), + modifier = Modifier.fillMaxWidth().focusGlide(), ) }, - confirmButton = { androidx.compose.material3.TextButton(onClick = { onSave(key) }, enabled = key.isNotEmpty()) { Text(stringResource(R.string.common_ok)) } }, + confirmButton = { androidx.compose.material3.TextButton(onClick = { onSave(key) }, enabled = key.isNotEmpty(), modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_ok)) } }, dismissButton = { androidx.compose.foundation.layout.Row { - if (hasKey) androidx.compose.material3.TextButton(onClick = { onSave("") }) { Text(stringResource(R.string.common_delete)) } - androidx.compose.material3.TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } + if (hasKey) androidx.compose.material3.TextButton(onClick = { onSave("") }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_delete)) } + androidx.compose.material3.TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } } }, ) @@ -651,7 +652,7 @@ internal fun CustomResolutionDialog(initial: Pair<Int, Int>?, onSave: (Pair<Int, var w by remember { mutableStateOf(initial?.first?.toString() ?: "") } var h by remember { mutableStateOf(initial?.second?.toString() ?: "") } val parsed = SessionPrefs.parseResolution("${w}x$h") - androidx.compose.material3.AlertDialog( + com.droiddeck.launcher.ui.GlideAlertDialog( onDismissRequest = onDismiss, title = { Text(stringResource(R.string.mode_custom_res_title)) }, text = { @@ -667,12 +668,12 @@ internal fun CustomResolutionDialog(initial: Pair<Int, Int>?, onSave: (Pair<Int, val numbers = androidx.compose.foundation.text.KeyboardOptions(keyboardType = androidx.compose.ui.text.input.KeyboardType.Number) androidx.compose.material3.OutlinedTextField( w, { v -> w = v.filter(Char::isDigit).take(4) }, label = { Text(stringResource(R.string.mode_width)) }, - singleLine = true, keyboardOptions = numbers, modifier = Modifier.weight(1f), + singleLine = true, keyboardOptions = numbers, modifier = Modifier.weight(1f).focusGlide(), ) Text("×", fontSize = 18.sp, modifier = Modifier.padding(horizontal = 10.dp)) androidx.compose.material3.OutlinedTextField( h, { v -> h = v.filter(Char::isDigit).take(4) }, label = { Text(stringResource(R.string.mode_height)) }, - singleLine = true, keyboardOptions = numbers, modifier = Modifier.weight(1f), + singleLine = true, keyboardOptions = numbers, modifier = Modifier.weight(1f).focusGlide(), ) } androidx.compose.foundation.layout.FlowRow( @@ -683,6 +684,7 @@ internal fun CustomResolutionDialog(initial: Pair<Int, Int>?, onSave: (Pair<Int, androidx.compose.material3.AssistChip( onClick = { w = pw.toString(); h = ph.toString() }, label = { Text("$pw×$ph · $tag", fontSize = 12.sp) }, + modifier = Modifier.focusGlide(), ) } } @@ -692,7 +694,7 @@ internal fun CustomResolutionDialog(initial: Pair<Int, Int>?, onSave: (Pair<Int, ) } }, - confirmButton = { androidx.compose.material3.TextButton(enabled = parsed != null, onClick = { parsed?.let(onSave) }) { Text(stringResource(R.string.common_use)) } }, - dismissButton = { androidx.compose.material3.TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } }, + confirmButton = { androidx.compose.material3.TextButton(enabled = parsed != null, onClick = { parsed?.let(onSave) }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_use)) } }, + dismissButton = { androidx.compose.material3.TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt index 9c1424dd4f..2c0927bc88 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt @@ -212,7 +212,7 @@ fun PerformancePage( }, singleLine = true, isError = !valid && draft.isNotBlank(), placeholder = { Text(SessionPrefs.DEFAULT_GUEST_HOSTNAME) }, - modifier = Modifier.width(220.dp), + modifier = Modifier.width(220.dp).focusGlide(), ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt index 10b6c00c8e..517309ec03 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import com.droiddeck.launcher.R import androidx.compose.ui.res.stringResource import android.content.Context @@ -17,7 +18,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.widthIn -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -276,12 +277,12 @@ fun DeveloperDisplayChoiceDialog( text = { Column(verticalArrangement = Arrangement.spacedBy(4.dp), modifier = Modifier.fillMaxWidth()) { Text(stringResource(R.string.gate_choose_display)) - TextButton(modifier = Modifier.fillMaxWidth(), onClick = onMainScreen) { Text(stringResource(R.string.gate_main_screen)) } + TextButton(modifier = Modifier.fillMaxWidth().focusGlide(CircleShape), onClick = onMainScreen) { Text(stringResource(R.string.gate_main_screen)) } displays.forEach { (id, label) -> - TextButton(modifier = Modifier.fillMaxWidth(), onClick = { onSecondaryScreen(id) }) { Text(label) } + TextButton(modifier = Modifier.fillMaxWidth().focusGlide(CircleShape), onClick = { onSecondaryScreen(id) }) { Text(label) } } } }, - confirmButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } }, + confirmButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/RomsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/RomsDialog.kt index 0417c5e098..2504a2eee3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/RomsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/RomsDialog.kt @@ -1,12 +1,13 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import com.droiddeck.launcher.R import androidx.compose.ui.res.stringResource import androidx.compose.foundation.layout.Column import androidx.compose.ui.Modifier import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -38,10 +39,10 @@ fun RomsDialog(path: String?, onChoose: () -> Unit, onClear: () -> Unit, onDismi ) } }, - confirmButton = { TextButton(onClick = onChoose) { Text(if (path == null) stringResource(R.string.roms_choose) else stringResource(R.string.roms_change)) } }, + confirmButton = { TextButton(onClick = onChoose, modifier = Modifier.focusGlide(CircleShape)) { Text(if (path == null) stringResource(R.string.roms_choose) else stringResource(R.string.roms_change)) } }, dismissButton = { - if (path != null) TextButton(onClick = onClear) { Text(stringResource(R.string.common_forget)) } - else TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } + if (path != null) TextButton(onClick = onClear, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_forget)) } + else TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyEditor.kt index 3cb99d6051..94e1a5ff27 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyEditor.kt @@ -166,7 +166,7 @@ fun ScreenKeyEditor( keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), modifier = Modifier.fillMaxWidth().onFocusChanged { if (it.isFocused) onTextFocus() else onTextBlur() - }, + }.focusGlide(), ) if (text.isEmpty()) { Text( @@ -177,26 +177,26 @@ fun ScreenKeyEditor( } } if (button) { - IconButton(onClick = onBind, modifier = Modifier.width(38.dp)) { + IconButton(onClick = onBind, modifier = Modifier.width(38.dp).focusGlide(CircleShape)) { Icon( Icons.Default.Keyboard, stringResource(R.string.screen_key_bind), tint = p.onBackground.copy(alpha = 0.8f), ) } } - IconButton(onClick = { pickImage.launch("image/*") }, modifier = Modifier.width(38.dp)) { + IconButton(onClick = { pickImage.launch("image/*") }, modifier = Modifier.width(38.dp).focusGlide(CircleShape)) { Icon( Icons.Default.Image, stringResource(R.string.screen_key_image), tint = p.onBackground.copy(alpha = 0.8f), ) } - if (hasImage) IconButton(onClick = onClearImage, modifier = Modifier.width(34.dp)) { + if (hasImage) IconButton(onClick = onClearImage, modifier = Modifier.width(34.dp).focusGlide(CircleShape)) { Icon(Icons.Default.Close, stringResource(R.string.screen_key_image_clear), tint = p.error) } - IconButton(onClick = onRemove, modifier = Modifier.width(38.dp)) { + IconButton(onClick = onRemove, modifier = Modifier.width(38.dp).focusGlide(CircleShape)) { Icon(Icons.Default.Delete, stringResource(R.string.common_delete), tint = p.error) } - IconButton(onClick = onDismiss, modifier = Modifier.width(34.dp)) { + IconButton(onClick = onDismiss, modifier = Modifier.width(34.dp).focusGlide(CircleShape)) { Icon(Icons.Default.Close, null, tint = p.onBackground) } } @@ -232,7 +232,7 @@ fun ScreenKeyEditor( stringResource(R.string.screen_key_toggle), Modifier.padding(start = 6.dp, end = 2.dp), style = MaterialTheme.typography.bodySmall, maxLines = 1, ) - Switch(checked = toggle, onCheckedChange = onToggle, modifier = Modifier.height(30.dp)) + Switch(checked = toggle, onCheckedChange = onToggle, modifier = Modifier.height(30.dp).focusGlide()) } if (directions.isNotEmpty()) { Row( @@ -251,7 +251,7 @@ fun ScreenKeyEditor( stringResource(R.string.screen_key_text), Modifier.padding(start = 6.dp, end = 2.dp), style = MaterialTheme.typography.bodySmall, maxLines = 1, ) - Switch(checked = labels, onCheckedChange = onLabels, modifier = Modifier.height(30.dp)) + Switch(checked = labels, onCheckedChange = onLabels, modifier = Modifier.height(30.dp).focusGlide()) } } Row( @@ -294,7 +294,7 @@ private fun KeySlider( ) { Row(modifier, verticalAlignment = Alignment.CenterVertically) { Text(label, style = MaterialTheme.typography.bodySmall, maxLines = 1) - Slider(current, onChange, Modifier.weight(1f).height(28.dp), valueRange = min..max) + Slider(current, onChange, Modifier.weight(1f).height(28.dp).focusGlide(), valueRange = min..max) Text( value, Modifier.width(32.dp), style = MaterialTheme.typography.bodySmall, fontWeight = FontWeight.SemiBold, maxLines = 1, @@ -317,7 +317,7 @@ private fun Chip( if (selected) p.primary.copy(alpha = 0.18f) else p.line2.copy(alpha = 0.28f), CircleShape, ) - .clickable(enabled = enabled, onClick = onClick) + .focusGlide(RoundedCornerShape(8.dp)).clickable(enabled = enabled, onClick = onClick) .padding(vertical = 6.dp), contentAlignment = Alignment.Center, ) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyPicker.kt b/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyPicker.kt index 787854d080..e70249eef2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyPicker.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyPicker.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.clickable import androidx.compose.foundation.horizontalScroll @@ -41,7 +42,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.compose.ui.window.Dialog +import com.droiddeck.launcher.ui.GlideDialog as Dialog import androidx.compose.ui.window.DialogProperties import com.droiddeck.launcher.R import com.droiddeck.launcher.input.PC_KEYS @@ -86,7 +87,7 @@ fun ScreenKeyPicker( Column { Row(Modifier.fillMaxWidth().padding(start = 16.dp, end = 6.dp), verticalAlignment = Alignment.CenterVertically) { Text(stringResource(R.string.screen_keys_add), Modifier.weight(1f), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) - IconButton(onClick = onDismiss) { Icon(Icons.Default.Close, null) } + IconButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Default.Close, null) } } Row( Modifier.fillMaxWidth().heightIn(min = 26.dp).horizontalScroll(rememberScrollState()).padding(horizontal = 16.dp), @@ -136,7 +137,7 @@ fun ScreenKeyPicker( Button( onClick = { onAdd(picked) }, enabled = picked.isNotEmpty(), - modifier = Modifier.weight(1f), + modifier = Modifier.weight(1f).focusGlide(CircleShape), ) { Text(stringResource(R.string.screen_keys_add)) } @@ -155,7 +156,7 @@ private fun KeyCell(key: PcKey, selected: Boolean, modifier: Modifier, onClick: shape = RoundedCornerShape(8.dp), color = if (selected) p.primary.copy(alpha = 0.2f) else p.surface, border = BorderStroke(1.dp, if (selected) p.primary else p.line), - modifier = modifier.height(36.dp).clickable(onClick = onClick), + modifier = modifier.height(36.dp).focusGlide(RoundedCornerShape(8.dp)).clickable(onClick = onClick), ) { Box(Modifier.fillMaxSize().padding(horizontal = 2.dp), contentAlignment = Alignment.Center) { Text( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ScreenLayoutPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/ScreenLayoutPanel.kt index 7e195d5e8c..7bc78f7105 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ScreenLayoutPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ScreenLayoutPanel.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.foundation.BorderStroke @@ -40,7 +41,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.unit.dp -import androidx.compose.ui.window.Dialog +import com.droiddeck.launcher.ui.GlideDialog as Dialog import androidx.compose.ui.window.DialogProperties import com.droiddeck.launcher.R @@ -83,14 +84,14 @@ fun ScreenLayoutPanel( stringResource(R.string.screen_key_layout), Modifier.weight(1f), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold, ) - IconButton(onClick = onDismiss) { Icon(Icons.Default.Close, null) } + IconButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Default.Close, null) } } Row(Modifier.fillMaxWidth().padding(end = 12.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { - TextButton(onClick = { naming = true }) { Text(stringResource(R.string.screen_key_layout_save)) } - TextButton(onClick = { importer.launch(arrayOf("application/json", "text/plain", "*/*")) }) { + TextButton(onClick = { naming = true }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.screen_key_layout_save)) } + TextButton(onClick = { importer.launch(arrayOf("application/json", "text/plain", "*/*")) }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.boot_movie_import)) } - TextButton(onClick = { exporter.launch("droiddeck-layout.icp") }) { + TextButton(onClick = { exporter.launch("droiddeck-layout.icp") }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.screen_key_layout_export)) } } @@ -101,7 +102,7 @@ fun ScreenLayoutPanel( layout, Modifier.weight(1f).clickable { onLoad(layout) }.padding(vertical = 14.dp), style = MaterialTheme.typography.bodyLarge, ) - TextButton(onClick = { onDelete(layout) }) { + TextButton(onClick = { onDelete(layout) }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_delete), color = p.error) } } @@ -121,12 +122,12 @@ fun ScreenLayoutPanel( ) { Column(Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) { OutlinedTextField( - name, { name = it.take(24) }, Modifier.fillMaxWidth(), singleLine = true, + name, { name = it.take(24) }, Modifier.fillMaxWidth().focusGlide(), singleLine = true, keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), ) Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) { - TextButton(onClick = { naming = false }) { Text(stringResource(R.string.common_cancel)) } - Button(onClick = { onSave(name.trim()); naming = false }, enabled = name.isNotBlank()) { + TextButton(onClick = { naming = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } + Button(onClick = { onSave(name.trim()); naming = false }, enabled = name.isNotBlank(), modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.screen_key_layout_save)) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt index cdde71b587..65a552df3d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt @@ -331,6 +331,7 @@ private fun CancelHint(onCancel: () -> Unit, modifier: Modifier = Modifier) { verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = modifier.heightIn(min = 44.dp).clip(RoundedCornerShape(22.dp)) .background(if (hot) colors.onBackground.copy(alpha = 0.08f) else Color.Transparent) + .glideBorder(hot, RoundedCornerShape(22.dp), LocalPalette.current.signal) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onCancel) .padding(horizontal = 12.dp), ) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 9f8ceb2708..b36131edd9 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -807,10 +807,10 @@ private fun DrawerOutlineButton(text: String, modifier: Modifier = Modifier, pro OutlinedButton( onClick = onClick, interactionSource = source, - modifier = modifier.controllerConfirm(onClick = onClick), + modifier = modifier.controllerConfirm(onClick = onClick).focusGlide(RoundedCornerShape(12.dp)), shape = RoundedCornerShape(12.dp), contentPadding = PaddingValues(horizontal = 12.dp), - border = BorderStroke(if (hot) 2.dp else 1.dp, if (hot) pal.signal else colors.outline), + border = BorderStroke(1.dp, colors.outline), colors = ButtonDefaults.outlinedButtonColors(containerColor = if (hot) pal.signal.copy(alpha = 0.16f) else Color.Transparent), ) { ProgressLabel({ m -> Text(text, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, modifier = m) }, progress, fontSize = 13.sp) } } @@ -1387,6 +1387,7 @@ private fun ComponentsDrawerPage(host: MenuHost, a: DrawerActions, track: (Strin val pal = LocalPalette.current Column( modifier = Modifier.fillMaxWidth().then(track("cmp-running")) + .glideBorder(hot, Shape12, pal.signal) .focusable(interactionSource = src) .background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) .padding(horizontal = 14.dp, vertical = 11.dp), @@ -1662,6 +1663,7 @@ private fun StopConfirm( Box(Modifier.fillMaxSize()) { Box( Modifier.fillMaxSize().graphicsLayer { alpha = dim.value }.background(Color(0x59000000)) + .focusProperties { canFocus = false } .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, enabled = open, onClick = onCancel), ) val path = remember { Path() } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt index b7f5cbfebe..afe9f0ba4c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt @@ -17,6 +17,7 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsFocusedAsState import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.fillMaxSize @@ -168,6 +169,8 @@ fun SessionPausedOverlay( runCatching { focus.requestFocus() } } val resumeLabel = stringResource(R.string.resume_session) + val source = remember { MutableInteractionSource() } + val focused by source.collectIsFocusedAsState() Box( contentAlignment = Alignment.Center, modifier = Modifier @@ -176,7 +179,7 @@ fun SessionPausedOverlay( .focusRequester(focus) .controllerConfirm(enabled = idle, onClick = onResume) .clickable( - interactionSource = remember { MutableInteractionSource() }, + interactionSource = source, indication = null, role = Role.Button, onClickLabel = resumeLabel, @@ -187,7 +190,7 @@ fun SessionPausedOverlay( } else { Box(Modifier.fillMaxSize().graphicsLayer { alpha = presence }.background(Color.Black.copy(alpha = 0.55f))) } - ResumeOrb(orb.value, press.value, ring.value, shake.value, idle) + ResumeOrb(orb.value, press.value, ring.value, shake.value, idle, focused) } } @@ -221,7 +224,7 @@ private fun BoxScope.PausedCard(frame: PausedFrame, lift: Float, presence: Float } @Composable -private fun ResumeOrb(presence: Float, press: Float, ring: Float, shake: Float, idle: Boolean) { +private fun ResumeOrb(presence: Float, press: Float, ring: Float, shake: Float, idle: Boolean, focused: Boolean) { val glintAlpha by animateFloatAsState(if (idle) 1f else 0f, Motion.tw(160), label = "glintAlpha") val glint: State<Float>? = if (Motion.scale > 0f) { rememberInfiniteTransition(label = "glint").animateFloat( @@ -245,6 +248,7 @@ private fun ResumeOrb(presence: Float, press: Float, ring: Float, shake: Float, } .clip(CircleShape) .background(Color.White.copy(alpha = 0.08f)) + .glideBorder(focused, CircleShape, Color.White, hotFillAlpha = 0f) .drawWithContent { drawContent() val stroke = 2.5.dp.toPx() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt index 0d8909d825..df897161d7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -113,7 +113,7 @@ import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.compose.ui.window.Popup +import com.droiddeck.launcher.ui.GlidePopup as Popup import androidx.compose.ui.window.PopupPositionProvider import androidx.compose.ui.window.PopupProperties @@ -368,6 +368,7 @@ fun MenuItem( .then(focusRequester?.let { Modifier.focusRequester(it) } ?: Modifier) .clip(RoundedCornerShape(8.dp)) .background(if (hot && enabled) Color.White.copy(alpha = 0.07f) else Color.Transparent) + .glideBorder(hot && enabled, RoundedCornerShape(8.dp), pal.signal) .alpha(if (enabled) 1f else 0.4f) .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, enabled = enabled, onClick = onClick) .controllerConfirm(enabled = enabled, onClick = onClick) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SpatialTrackingActivity.kt b/app/src/main/java/com/droiddeck/launcher/ui/SpatialTrackingActivity.kt index 3b77e09f0f..a3dc1f4d65 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SpatialTrackingActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SpatialTrackingActivity.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import android.os.Bundle import android.os.CancellationSignal import android.os.ParcelFileDescriptor @@ -242,8 +243,8 @@ internal fun SpatialSetupScreen( if (confirmRestart) AlertDialog( onDismissRequest = { confirmRestart = false }, title = { Text(stringResource(R.string.spatial_restart_title)) }, text = { Text(stringResource(R.string.spatial_restart_confirm)) }, - confirmButton = { TextButton(onClick = { confirmRestart = false; actions.restart() }) { Text(stringResource(R.string.spatial_restart)) } }, - dismissButton = { TextButton(onClick = { confirmRestart = false }) { Text(stringResource(R.string.common_cancel)) } }, + confirmButton = { TextButton(onClick = { confirmRestart = false; actions.restart() }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.spatial_restart)) } }, + dismissButton = { TextButton(onClick = { confirmRestart = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt index e820ed8eed..badd3f1f4d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt @@ -47,7 +47,7 @@ import androidx.compose.material.icons.outlined.SaveAlt import androidx.compose.material.icons.outlined.ShoppingBag import androidx.compose.material.icons.outlined.Storage import androidx.compose.material.icons.outlined.VideogameAsset -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt index e2ab2a77f1..642160b158 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt @@ -11,7 +11,7 @@ import androidx.compose.runtime.mutableIntStateOf import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.withStyle -import androidx.compose.ui.window.Dialog +import com.droiddeck.launcher.ui.GlideDialog as Dialog import androidx.compose.ui.window.DialogProperties import androidx.compose.foundation.LocalIndication import androidx.compose.foundation.background diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StorePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StorePage.kt index 0facc0c070..cd3a905c78 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StorePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StorePage.kt @@ -240,7 +240,7 @@ private fun SetupButton(s: FrontEndState, busy: Boolean, full: Dp, ring: Int, on drawRect(Brush.horizontalGradient(listOf(Color.Transparent, FlathubTeal.copy(alpha = 0.55f), Color.Transparent), startX = size.width * sweep - w, endX = size.width * sweep + w)) } } - .focusable() + .focusGlide(shape, FlathubTeal).focusable() .semantics { contentDescription = label } .padding(horizontal = 20.dp, vertical = 16.dp), ) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt index 662e8236fd..c5dd008edb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt @@ -84,7 +84,7 @@ internal fun InstallWhereDialog(item: CatalogItem, onDismiss: () -> Unit) { ) Text( stringResource(R.string.common_cancel), fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurfaceVariant, - modifier = Modifier.clip(Shape12).clickable(role = Role.Button, onClick = close).controllerConfirm(onClick = close).padding(horizontal = 10.dp, vertical = 6.dp), + modifier = Modifier.clip(Shape12).focusGlide().clickable(role = Role.Button, onClick = close).controllerConfirm(onClick = close).padding(horizontal = 10.dp, vertical = 6.dp), ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt index a02eb8d365..352b29a544 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -170,7 +170,7 @@ fun DroidDeckTheme(theme: String? = null, appScale: Int = AppUiPrefs.DEFAULT_SCA LocalConfiguration provides configuration, ) { MaterialTheme(colorScheme = scheme, typography = ContentDirected) { - ProvideTextStyle(TextStyle(textDirection = TextDirection.Content), content) + FocusGlideHost { ProvideTextStyle(TextStyle(textDirection = TextDirection.Content), content) } } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/TouchGestureDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/TouchGestureDialog.kt index db975a1996..0fda34fc28 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/TouchGestureDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/TouchGestureDialog.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import androidx.annotation.StringRes import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background @@ -33,7 +34,7 @@ import androidx.compose.ui.semantics.Role import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.LayoutDirection -import androidx.compose.ui.window.Dialog +import com.droiddeck.launcher.ui.GlideDialog as Dialog import androidx.compose.ui.window.DialogProperties import com.droiddeck.launcher.R import com.droiddeck.launcher.input.GestureKeys @@ -72,7 +73,7 @@ fun TouchGestureDialog(game: String?, onDismiss: () -> Unit, onSaved: () -> Unit GestureDialogFrame(onDismiss, footer = { Row(Modifier.fillMaxWidth().padding(horizontal = 20.dp, vertical = 12.dp), horizontalArrangement = Arrangement.End, verticalAlignment = Alignment.CenterVertically) { - TextButton(onClick = onDismiss) { Text(stringResource(R.string.gesture_cancel)) } + TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.gesture_cancel)) } Spacer(Modifier.width(12.dp)) Button(onClick = { if (defaults != initialDefaults) GesturePrefs.save(context, null, defaults) @@ -80,13 +81,13 @@ fun TouchGestureDialog(game: String?, onDismiss: () -> Unit, onSaved: () -> Unit gameDraft?.let { GesturePrefs.save(context, targetGame, it) } ?: GesturePrefs.clear(context, targetGame) } onSaved() - }, modifier = Modifier.testTag("gesture-save")) { Text(stringResource(R.string.gesture_save_changes)) } + }, modifier = Modifier.testTag("gesture-save").focusGlide(CircleShape)) { Text(stringResource(R.string.gesture_save_changes)) } } }) { ScrollableTabRow(tab, edgePadding = 12.dp, containerColor = p.surface, divider = { HorizontalDivider(color = p.line) }) { tabs.forEachIndexed { index, title -> Tab(tab == index, onClick = { tab = index }, text = { Text(stringResource(title)) }, selectedContentColor = p.onBackground, - unselectedContentColor = p.onSurfaceVariant, modifier = Modifier.testTag("gesture-tab-$index")) + unselectedContentColor = p.onSurfaceVariant, modifier = Modifier.testTag("gesture-tab-$index").focusGlide()) } } key(tab) { @@ -96,7 +97,7 @@ fun TouchGestureDialog(game: String?, onDismiss: () -> Unit, onSaved: () -> Unit GestureFilterChip(!forGame, onClick = { forGame = false }, label = { Text(stringResource(R.string.gesture_defaults)) }, modifier = Modifier.testTag("gesture-scope-default")) if (targetGame != null) GestureFilterChip(forGame, onClick = { forGame = true }, label = { Text(stringResource(R.string.gesture_game)) }, modifier = Modifier.testTag("gesture-scope-game")) } - if (forGame && gameDraft != null) TextButton(onClick = { gameDraft = null }, modifier = Modifier.testTag("gesture-inherit")) { Text(stringResource(R.string.gesture_use_defaults)) } + if (forGame && gameDraft != null) TextButton(onClick = { gameDraft = null }, modifier = Modifier.testTag("gesture-inherit").focusGlide(CircleShape)) { Text(stringResource(R.string.gesture_use_defaults)) } } when (tab) { 0 -> { @@ -151,12 +152,12 @@ fun TouchGestureDialog(game: String?, onDismiss: () -> Unit, onSaved: () -> Unit } GestureSettingsCard(R.string.gesture_recognition) { Text(stringResource(R.string.gesture_threshold, config.gestureThreshold), style = MaterialTheme.typography.bodyMedium) - Slider(config.gestureThreshold.toFloat(), { change(config.copy(gestureThreshold = it.toInt())) }, valueRange = 10f..100f, steps = 17) + Slider(config.gestureThreshold.toFloat(), { change(config.copy(gestureThreshold = it.toInt())) }, valueRange = 10f..100f, steps = 17, modifier = Modifier.focusGlide()) } GestureSettingsCard(R.string.gesture_feedback) { GestureToggle(R.string.gesture_debug, config.showGestureDebugOverlay) { change(config.copy(showGestureDebugOverlay = it)) } } - OutlinedButton(onClick = { change(TouchGestureConfig()) }, modifier = Modifier.fillMaxWidth()) { Text(stringResource(R.string.gesture_reset)) } + OutlinedButton(onClick = { change(TouchGestureConfig()) }, modifier = Modifier.fillMaxWidth().focusGlide(CircleShape)) { Text(stringResource(R.string.gesture_reset)) } } } } @@ -177,7 +178,7 @@ private fun GestureDialogFrame(onDismiss: () -> Unit, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2)) { Column { Row(Modifier.fillMaxWidth().padding(end = 4.dp), horizontalArrangement = Arrangement.End) { - IconButton(onClick = onDismiss, modifier = Modifier.size(40.dp)) { Icon(Icons.Default.Close, stringResource(R.string.gesture_close)) } + IconButton(onClick = onDismiss, modifier = Modifier.size(40.dp).focusGlide(CircleShape)) { Icon(Icons.Default.Close, stringResource(R.string.gesture_close)) } } content() HorizontalDivider(color = p.line) @@ -201,7 +202,7 @@ private fun GestureCard(@StringRes title: Int, checked: Boolean, onToggle: (Bool Surface(Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp), color = p.surface, border = BorderStroke(1.dp, if (checked) p.line2 else p.line)) { Column { - Row(Modifier.fillMaxWidth().toggleable(checked, role = Role.Switch, onValueChange = onToggle) + Row(Modifier.fillMaxWidth().focusGlide().toggleable(checked, role = Role.Switch, onValueChange = onToggle) .padding(horizontal = 16.dp, vertical = 10.dp), verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f).padding(end = 12.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { Text(stringResource(title), style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.SemiBold) @@ -217,7 +218,7 @@ private fun GestureCard(@StringRes title: Int, checked: Boolean, onToggle: (Bool private fun GestureActionField(id: String, @StringRes gesture: Int, selected: String, choices: List<String>, onChoose: (String) -> Unit) { var open by remember { mutableStateOf(false) } val p = LocalPalette.current - Surface(onClick = { open = true }, modifier = Modifier.fillMaxWidth().testTag("gesture-choice-$id"), shape = RoundedCornerShape(10.dp), + Surface(onClick = { open = true }, modifier = Modifier.fillMaxWidth().testTag("gesture-choice-$id").focusGlide(RoundedCornerShape(10.dp)), shape = RoundedCornerShape(10.dp), color = p.surfaceVariant, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2)) { Row(Modifier.padding(horizontal = 14.dp, vertical = 12.dp), verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) { @@ -239,10 +240,10 @@ internal fun GestureActionPicker(choices: List<String>, selected: String, onDism val shown = filterGestureActions(catalog, query, category) val p = LocalPalette.current GestureDialogFrame(onDismiss) { - OutlinedTextField(query, onValueChange = { query = it }, modifier = Modifier.fillMaxWidth().padding(horizontal = 20.dp).testTag("gesture-action-search"), + OutlinedTextField(query, onValueChange = { query = it }, modifier = Modifier.fillMaxWidth().padding(horizontal = 20.dp).testTag("gesture-action-search").focusGlide(RoundedCornerShape(12.dp)), singleLine = true, shape = RoundedCornerShape(12.dp), placeholder = { Text(stringResource(R.string.gesture_search_actions)) }, leadingIcon = { Icon(Icons.Default.Search, null) }, trailingIcon = { - if (query.isNotEmpty()) IconButton(onClick = { query = "" }) { Icon(Icons.Default.Close, stringResource(R.string.gesture_clear_search)) } + if (query.isNotEmpty()) IconButton(onClick = { query = "" }, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Default.Close, stringResource(R.string.gesture_clear_search)) } }) Row(Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).padding(horizontal = 20.dp, vertical = 8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { GestureFilterChip(category == null, onClick = { category = null }, label = { Text(stringResource(R.string.gesture_all_actions)) }) @@ -262,7 +263,7 @@ internal fun GestureActionPicker(choices: List<String>, selected: String, onDism val isSelected = action.id == selected Surface(shape = RoundedCornerShape(12.dp), color = if (isSelected) p.primary.copy(alpha = 0.12f) else p.surface, border = BorderStroke(1.dp, if (isSelected) p.primary else p.line)) { - Row(Modifier.fillMaxWidth().selectable(isSelected, role = Role.RadioButton, onClick = { onChoose(action.id) }) + Row(Modifier.fillMaxWidth().focusGlide().selectable(isSelected, role = Role.RadioButton, onClick = { onChoose(action.id) }) .testTag("gesture-action-${action.id}").padding(horizontal = 14.dp, vertical = 9.dp), verticalAlignment = Alignment.CenterVertically) { Icon(when (group) { GestureActionGroup.MOUSE -> Icons.Default.Mouse; GestureActionGroup.APP -> Icons.Default.TouchApp; else -> Icons.Default.Keyboard }, null, tint = if (isSelected) p.primary else p.onSurfaceVariant, modifier = Modifier.size(22.dp)) @@ -289,7 +290,7 @@ private fun GestureHoldOptions(action: String, behavior: String, delay: Int, onB @Composable private fun GestureFilterChip(selected: Boolean, onClick: () -> Unit, label: @Composable () -> Unit, modifier: Modifier = Modifier) { val p = LocalPalette.current - FilterChip(selected, onClick, label, modifier = modifier, colors = FilterChipDefaults.filterChipColors( + FilterChip(selected, onClick, label, modifier = modifier.focusGlide(), colors = FilterChipDefaults.filterChipColors( containerColor = p.surface, labelColor = p.onSurfaceVariant, selectedContainerColor = p.primary.copy(alpha = 0.16f), selectedLabelColor = p.onBackground)) } @@ -314,9 +315,9 @@ private fun GestureSettingsCard(@StringRes title: Int, content: @Composable Colu @Composable private fun GestureToggle(@StringRes title: Int, checked: Boolean, change: (Boolean) -> Unit) { - Row(Modifier.fillMaxWidth().toggleable(checked, role = Role.Switch, onValueChange = change).padding(vertical = 6.dp), verticalAlignment = Alignment.CenterVertically) { + Row(Modifier.fillMaxWidth().focusGlide().toggleable(checked, role = Role.Switch, onValueChange = change).padding(vertical = 6.dp), verticalAlignment = Alignment.CenterVertically) { Text(stringResource(title), Modifier.weight(1f).padding(end = 12.dp), style = MaterialTheme.typography.bodyMedium) - Switch(checked, null) + Switch(checked, null, modifier = Modifier.focusGlide()) } } @@ -326,5 +327,5 @@ private fun GestureDelay(label: String, value: Int, change: (Int) -> Unit) { Text(label, Modifier.weight(1f), style = MaterialTheme.typography.bodyMedium) Text(stringResource(R.string.gesture_ms, value), Modifier.background(LocalPalette.current.surfaceVariant, RoundedCornerShape(6.dp)).padding(horizontal = 10.dp, vertical = 5.dp), style = MaterialTheme.typography.labelLarge) } - Slider(value.toFloat().coerceIn(100f, 1000f), { change((it / 50).toInt() * 50) }, valueRange = 100f..1000f, steps = 17) + Slider(value.toFloat().coerceIn(100f, 1000f), { change((it / 50).toInt() * 50) }, valueRange = 100f..1000f, steps = 17, modifier = Modifier.focusGlide()) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt index c11d5874dc..927a2c470d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt @@ -43,7 +43,7 @@ import androidx.compose.material.icons.outlined.Verified import androidx.compose.material3.Icon import androidx.compose.ui.draw.alpha import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -139,8 +139,8 @@ internal fun UpdatesPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie stringResource(R.string.upd_perm_text), ) }, - confirmButton = { TextButton(onClick = ua.onAllowInstalls) { Text(stringResource(R.string.upd_open_settings)) } }, - dismissButton = { TextButton(onClick = ua.onDismissPermission) { Text(stringResource(R.string.upd_not_now)) } }, + confirmButton = { TextButton(onClick = ua.onAllowInstalls, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.upd_open_settings)) } }, + dismissButton = { TextButton(onClick = ua.onDismissPermission, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.upd_not_now)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/XboxStoreDialogs.kt b/app/src/main/java/com/droiddeck/launcher/ui/XboxStoreDialogs.kt index 4a61e5b11b..c2e4f30250 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/XboxStoreDialogs.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/XboxStoreDialogs.kt @@ -1,9 +1,10 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.layout.Column import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -28,12 +29,12 @@ internal fun XboxStoreDialogs( if (content.error != null) Text(content.error) else if (content.offers.isEmpty()) Text(stringResource(R.string.stores_xbox_content_none)) content.offers.forEach { offer -> - TextButton(onClick = { XboxContent.install(ctx, offer.item) }) { + TextButton(onClick = { XboxContent.install(ctx, offer.item) }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(if (offer.installed) R.string.stores_xbox_content_update else R.string.stores_xbox_content_install, offer.item.title)) } } } }, - confirmButton = { TextButton(onClick = { XboxContent.dismiss() }) { Text(stringResource(android.R.string.ok)) } }, + confirmButton = { TextButton(onClick = { XboxContent.dismiss() }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(android.R.string.ok)) } }, ) } pending?.let { @@ -41,12 +42,12 @@ internal fun XboxStoreDialogs( onDismissRequest = { XboxBackend.dismissPackages() }, title = { Text(stringResource(R.string.stores_xbox_choose_content)) }, text = { Column(Modifier.verticalScroll(rememberScrollState())) { pending.choices.forEach { choice -> - TextButton(onClick = { XboxBackend.selectPackage(ctx, choice) }) { + TextButton(onClick = { XboxBackend.selectPackage(ctx, choice) }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.stores_xbox_choice, choice.getString("title"), choice.getString("kind"))) } } } }, confirmButton = {}, - dismissButton = { TextButton(onClick = { XboxBackend.dismissPackages() }) { Text(stringResource(android.R.string.cancel)) } }, + dismissButton = { TextButton(onClick = { XboxBackend.dismissPackages() }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(android.R.string.cancel)) } }, ) } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/FocusGlideRenderingTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/FocusGlideRenderingTest.kt new file mode 100644 index 0000000000..8938e90938 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/FocusGlideRenderingTest.kt @@ -0,0 +1,121 @@ +package com.droiddeck.launcher.ui + +import android.graphics.Bitmap +import android.graphics.Canvas +import android.view.View +import androidx.compose.foundation.background +import androidx.compose.foundation.focusable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.size +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.RectangleShape +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.session.SessionPrefs +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import org.robolectric.annotation.GraphicsMode + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], qualifiers = "w960dp-h540dp-land") +@GraphicsMode(GraphicsMode.Mode.NATIVE) +class FocusGlideRenderingTest { + @get:Rule val compose = createRobolectricComposeRule() + + @Test fun largeJumpCollapsesIntoABallAndExpandsAtTheDestination() { + val context = RuntimeEnvironment.getApplication() + SessionPrefs.setAnimationsEnabled(context, true) + Motion.refresh(context) + compose.mainClock.autoAdvance = false + lateinit var view: View + val from = FocusRequester() + val to = FocusRequester() + compose.setContent { + view = LocalView.current + FocusGlideHost(Modifier.fillMaxSize().background(Color.Black)) { + Box(Modifier.offset(10.dp, 10.dp).size(80.dp, 40.dp).focusRequester(from) + .focusGlide(RectangleShape, Color.White).focusable()) + Box(Modifier.offset(650.dp, 400.dp).size(80.dp, 40.dp).focusRequester(to) + .focusGlide(RectangleShape, Color.White).focusable()) + } + } + fun ringBounds(): Rect = compose.runOnIdle { + val bitmap = Bitmap.createBitmap(view.width, view.height, Bitmap.Config.ARGB_8888) + view.draw(Canvas(bitmap)) + var left = view.width + var top = view.height + var right = 0 + var bottom = 0 + for (y in 0 until bitmap.height) for (x in 0 until bitmap.width) { + if (android.graphics.Color.red(bitmap.getPixel(x, y)) > 200) { + left = minOf(left, x); top = minOf(top, y) + right = maxOf(right, x + 1); bottom = maxOf(bottom, y + 1) + } + } + bitmap.recycle() + Rect(left.toFloat(), top.toFloat(), right.toFloat(), bottom.toFloat()) + } + compose.runOnIdle { from.requestFocus() } + compose.mainClock.advanceTimeBy(1_000) + assertTrue(ringBounds().width > 60f) + compose.runOnIdle { to.requestFocus() } + compose.mainClock.advanceTimeBy(160) + val ball = ringBounds() + assertTrue("Ball bounds: $ball", ball.width in 8f..16f && ball.height in 8f..16f) + compose.mainClock.advanceTimeBy(1_500) + val landed = ringBounds() + assertTrue("Landed bounds: $landed", landed.width > 60f && landed.left > 600f) + } + + @Test fun hollowGlideKeepsItsOutlineWithoutTintingTheContent() { + val context = RuntimeEnvironment.getApplication() + SessionPrefs.setAnimationsEnabled(context, false) + Motion.refresh(context) + try { + lateinit var view: View + var bounds = Rect.Zero + var hollow by mutableStateOf(true) + compose.setContent { + view = LocalView.current + FocusGlideHost { + Box(Modifier.size(120.dp).background(Color.Black) + .glideBorder(true, RectangleShape, Color.White, hotFillAlpha = if (hollow) 0f else 0.14f) + .onGloballyPositioned { bounds = it.boundsInRoot() }) + } + } + fun sample(): Pair<Int, Int> = compose.runOnIdle { + val bitmap = Bitmap.createBitmap(view.width, view.height, Bitmap.Config.ARGB_8888) + view.draw(Canvas(bitmap)) + val center = bitmap.getPixel(bounds.center.x.toInt(), bounds.center.y.toInt()) + val edge = bitmap.getPixel(bounds.left.toInt(), bounds.center.y.toInt()) + bitmap.recycle() + center to edge + } + val (center, edge) = sample() + assertEquals(android.graphics.Color.BLACK, center) + assertEquals(android.graphics.Color.WHITE, edge) + compose.runOnIdle { hollow = false } + assertTrue(android.graphics.Color.red(sample().first) > 0) + } finally { + SessionPrefs.setAnimationsEnabled(context, true) + Motion.refresh(context) + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/FocusGlideWindowsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/FocusGlideWindowsTest.kt new file mode 100644 index 0000000000..66c741eb1e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/FocusGlideWindowsTest.kt @@ -0,0 +1,152 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Column +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.IconButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Slider +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.SideEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.platform.LocalView +import com.droiddeck.launcher.stores.xbox.XboxMenuEntry +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNotSame +import org.junit.Assert.assertSame +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], qualifiers = "w960dp-h540dp-land") +class FocusGlideWindowsTest { + @get:Rule val compose = createRobolectricComposeRule() + + @Test fun standaloneThemedControlsShareTheGlide() { + lateinit var glide: FocusGlide + val focus = List(6) { FocusRequester() } + compose.setContent { + DroidDeckTheme { + glide = LocalFocusGlide.current!! + Column { + TextButton(onClick = {}, modifier = Modifier.focusRequester(focus[0]).focusGlide()) { Text("Action") } + IconButton(onClick = {}, modifier = Modifier.focusRequester(focus[1]).focusGlide()) { Text("Icon") } + Switch(false, {}, modifier = Modifier.focusRequester(focus[2]).focusGlide()) + Slider(0.5f, {}, modifier = Modifier.focusRequester(focus[3]).focusGlide()) + OutlinedTextField("Value", {}, modifier = Modifier.focusRequester(focus[4]).focusGlide()) + XboxMenuEntry("Xbox action", null, focus = focus[5], onClick = {}) + } + } + } + var previous: GlideSource? = null + for (requester in focus) { + compose.runOnIdle { requester.requestFocus() } + compose.runOnIdle { + val source = glide.current + assertNotNull(source) + assertNotSame(previous, source) + assertEquals(1, glide.hot.size) + assertNotNull(glide.boundsOf(source!!)) + previous = source + } + } + } + + @Test fun alertDialogButtonsShareTheirOwnWindowGlide() { + lateinit var parent: FocusGlide + lateinit var dialog: FocusGlide + val focus = List(2) { FocusRequester() } + compose.setContent { + DroidDeckTheme { + parent = LocalFocusGlide.current!! + GlideAlertDialog( + onDismissRequest = {}, + title = { Text("Dialog") }, + confirmButton = { + dialog = LocalFocusGlide.current!! + val view = LocalView.current + SideEffect { assertSame(view, dialog.view) } + TextButton(onClick = {}, modifier = Modifier.focusRequester(focus[0]).focusGlide()) { Text("Confirm") } + }, + dismissButton = { + TextButton(onClick = {}, modifier = Modifier.focusRequester(focus[1]).focusGlide()) { Text("Cancel") } + }, + ) + } + } + assertNotSame(parent, dialog) + assertWindowHandoff(dialog, focus) + } + + @Test fun customDialogsHaveAHostInsideTheirWindow() { + lateinit var parent: FocusGlide + lateinit var dialog: FocusGlide + val focus = List(2) { FocusRequester() } + compose.setContent { + DroidDeckTheme { + parent = LocalFocusGlide.current!! + GlideDialog(onDismissRequest = {}) { + dialog = LocalFocusGlide.current!! + Column { + SecondaryButton("First", modifier = Modifier.focusRequester(focus[0])) {} + SecondaryButton("Second", modifier = Modifier.focusRequester(focus[1])) {} + } + } + } + } + assertNotSame(parent, dialog) + assertWindowHandoff(dialog, focus) + } + + @Test fun dropdownItemsShareTheirOwnWindowGlide() { + lateinit var parent: FocusGlide + lateinit var menu: FocusGlide + val focus = List(2) { FocusRequester() } + var expanded by mutableStateOf(true) + compose.setContent { + DroidDeckTheme { + parent = LocalFocusGlide.current!! + GlideDropdownMenu(expanded = expanded, onDismissRequest = {}) { + menu = LocalFocusGlide.current!! + for (i in focus.indices) DropdownMenuItem( + text = { Text("Item $i") }, onClick = {}, + modifier = Modifier.focusRequester(focus[i]).focusGlide(), + ) + } + } + } + assertNotSame(parent, menu) + assertWindowHandoff(menu, focus) + compose.runOnIdle { expanded = false } + compose.waitForIdle() + compose.runOnIdle { expanded = true } + compose.waitForIdle() + assertWindowHandoff(menu, focus) + } + + private fun assertWindowHandoff(glide: FocusGlide, focus: List<FocusRequester>) { + var previous: GlideSource? = null + for (requester in focus) { + compose.runOnIdle { requester.requestFocus() } + compose.runOnIdle { + assertNotNull(glide.host) + val current = glide.current + assertNotNull(current) + assertNotSame(previous, current) + assertTrue(glide.boundsOf(current!!)!!.width > 0f) + previous = current + } + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/PrimaryButtonFocusContrastTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/PrimaryButtonFocusContrastTest.kt index 51da840cb2..f5c47bdfa4 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/PrimaryButtonFocusContrastTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/PrimaryButtonFocusContrastTest.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.layout.Column import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalView @@ -9,7 +10,9 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performSemanticsAction import org.junit.Assert.assertEquals -import org.junit.Assert.assertNull +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNotSame +import org.junit.Assert.assertSame import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -21,7 +24,7 @@ import org.robolectric.annotation.Config class PrimaryButtonFocusContrastTest { @get:Rule val compose = createRobolectricComposeRule() - @Test fun focusedPrimaryButtonDoesNotClaimAColorOverlayAboveItsLabel() { + @Test fun focusedPrimaryButtonClaimsTheGlideWithoutAColorOverlayAboveItsLabel() { lateinit var glide: FocusGlide var clicks = 0 compose.setContent { @@ -36,11 +39,51 @@ class PrimaryButtonFocusContrastTest { val button = compose.onNodeWithText("Play") button.performSemanticsAction(SemanticsActions.RequestFocus) button.assertIsFocused() - compose.runOnIdle { assertNull(glide.current) } + compose.runOnIdle { + assertNotNull(glide.current) + assertEquals(0f, glide.current!!.fillAlpha) + } button.performClick() compose.runOnIdle { assertEquals(1, clicks) - assertNull(glide.current) + assertNotNull(glide.current) + assertEquals(0f, glide.current!!.fillAlpha) + } + } + + @Test fun focusCanGlideIntoAndBackOutOfPrimaryButtons() { + lateinit var glide: FocusGlide + val focus = FrontFocus() + compose.setContent { + val view = LocalView.current + glide = remember(view) { FocusGlide(view) } + DroidDeckTheme { + CompositionLocalProvider(LocalFocusGlide provides glide, LocalFrontFocus provides focus) { + Column { + SecondaryButton("Tab") {} + PrimaryButton("Play Steam", main = true, large = true) {} + } + } + } + } + val tab = compose.onNodeWithText("Tab") + val play = compose.onNodeWithText("Play Steam") + tab.performSemanticsAction(SemanticsActions.RequestFocus) + tab.assertIsFocused() + val tabSource = compose.runOnIdle { glide.current!! } + compose.runOnIdle { focus.primary.requestFocus() } + play.assertIsFocused() + compose.runOnIdle { + assertNotNull(glide.current) + assertNotSame(tabSource, glide.current) + assertEquals(0f, glide.current!!.fillAlpha) + assertEquals(1, glide.hot.size) + } + tab.performSemanticsAction(SemanticsActions.RequestFocus) + tab.assertIsFocused() + compose.runOnIdle { + assertSame(tabSource, glide.current) + assertEquals(1, glide.hot.size) } } } diff --git a/docs/development/focus-glide.md b/docs/development/focus-glide.md new file mode 100644 index 0000000000..e84027a8a0 --- /dev/null +++ b/docs/development/focus-glide.md @@ -0,0 +1,27 @@ +# Focus transitions + +Focusable app controls participate in the shared focus glide. Nearby moves stretch +the outline; jumps over 360 dp collapse it into a ball before expanding at the +destination. Rapid repeats keep the faster outline movement. Disabling animations +places the outline directly at the focused control. + +`DroidDeckTheme` supplies the host for standalone Compose interfaces. Custom +controls use `glideBorder` with their focus interaction state. Material controls +use `Modifier.focusGlide(shape)` before their focus target. Match the control's +shape, and keep existing selection borders separate from the focus outline. +Filled primary buttons use `hotFillAlpha = 0f` to preserve label contrast. + +Use `GlideDialog`, `GlideAlertDialog`, `GlidePopup`, and `GlideDropdownMenu` for app +windows. Android dialogs and popups have separate views and coordinate spaces; +they need their own host. The wrappers preserve the underlying Material layouts +and keep all controls in each window on the same animation. Dropdown hosts also +handle recreation of the popup view after closing. + +Touch dismiss backdrops and controller shortcut hints should have +`canFocus = false`. Controls with a larger touch target can register the visible +shape separately, as the toggle switch and pause/resume orb do. Web content, +Android system UI, and native game input surfaces retain their own focus behavior. + +`FocusGlideWindowsTest` checks Material controls, Xbox menu entries, dialog focus +handoffs, and dropdown reopening. `FocusGlideRenderingTest` checks the large-jump +ball animation and outline-only rendering with animations disabled. From fbb334263c388f30778bf60e441764e0b76f3f54 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 02:05:19 -0400 Subject: [PATCH 058/135] fix(ui): restore continuous ambient motion (#1592) --- .../droiddeck/launcher/FrontEndActivity.kt | 18 ----- .../droiddeck/launcher/ui/FrontEndScreen.kt | 6 -- .../com/droiddeck/launcher/ui/LiftSheet.kt | 16 ++--- .../droiddeck/launcher/ui/SessionLoading.kt | 2 +- .../com/droiddeck/launcher/ui/SteamHome.kt | 68 +++++++------------ 5 files changed, 29 insertions(+), 81 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 18244ae660..077e9e96de 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1301,23 +1301,6 @@ class FrontEndActivity : ComponentActivity() { } } - override fun onUserInteraction() { - super.onUserInteraction() - com.droiddeck.launcher.ui.Ambient.poke() - } - - override fun dispatchTouchEvent(event: android.view.MotionEvent): Boolean { - if (event.actionMasked == android.view.MotionEvent.ACTION_UP || event.actionMasked == android.view.MotionEvent.ACTION_CANCEL) { - com.droiddeck.launcher.ui.Ambient.poke() - } - return super.dispatchTouchEvent(event) - } - - override fun dispatchGenericMotionEvent(event: android.view.MotionEvent): Boolean { - com.droiddeck.launcher.ui.Ambient.poke() - return super.dispatchGenericMotionEvent(event) - } - override fun dispatchKeyEvent(event: KeyEvent): Boolean { if (event.keyCode == KeyEvent.KEYCODE_BUTTON_A) com.droiddeck.launcher.ui.HeldKeys.confirm = event.action == KeyEvent.ACTION_DOWN if (showComponents && (event.keyCode == KeyEvent.KEYCODE_BUTTON_L1 || event.keyCode == KeyEvent.KEYCODE_BUTTON_R1)) { @@ -1344,7 +1327,6 @@ class FrontEndActivity : ComponentActivity() { com.droiddeck.launcher.stores.StoresState.libraryListener = { refreshAddedGames(); refresh() } com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = { args -> openBattleNet(args) } com.droiddeck.launcher.ui.Motion.refresh(this) - com.droiddeck.launcher.ui.Ambient.poke() com.droiddeck.launcher.ui.QuitFlood.take()?.let { c -> returning = ReturningFlood(c, com.droiddeck.launcher.ui.LaunchOrigin.takeReturn()) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 5982e1c47c..66c2a8841e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -265,12 +265,6 @@ internal object Motion { if (scale == 0f) snap() else spring(damping, stiffness) } -internal object Ambient { - var poked by mutableStateOf(0L) - private set - fun poke() { poked = android.os.SystemClock.uptimeMillis() } -} - private val Shape10 = RoundedCornerShape(10.dp) internal val Shape12 = RoundedCornerShape(12.dp) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt b/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt index fae0f318d2..c428b8b97d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt @@ -641,7 +641,11 @@ internal fun LiftHero( } @Composable -private fun handleBob(): Float { +internal fun Handle(height: Dp, above: Boolean = false) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shape = if (above) RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp) else RoundedCornerShape(bottomStart = 12.dp, bottomEnd = 12.dp) + val still = Motion.scale == 0f val bob = androidx.compose.animation.core.rememberInfiniteTransition(label = "handle") val lift by bob.animateFloat( 0f, 0f, @@ -656,16 +660,6 @@ private fun handleBob(): Float { ), label = "handleBob", ) - return lift -} - -@Composable -internal fun Handle(height: Dp, above: Boolean = false) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val shape = if (above) RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp) else RoundedCornerShape(bottomStart = 12.dp, bottomEnd = 12.dp) - val still = Motion.scale == 0f || !ambientAwake() - val lift = if (still) 0f else handleBob() Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp), modifier = Modifier.height(height).clip(shape).background(colors.surface) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt index 65a552df3d..9e5266b67e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt @@ -222,7 +222,7 @@ fun LoadingOverlay( .background(colors.background) .blockTouches(), ) { - CapsuleWall(games, driftMs = 65_000, modifier = Modifier.alpha(0.3f), pauseWhenIdle = false) + CapsuleWall(games, driftMs = 65_000, modifier = Modifier.alpha(0.3f)) Box( Modifier.fillMaxSize().drawBehind { drawRect( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt index 888d87e232..dfb6d2525d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt @@ -5,6 +5,12 @@ import androidx.compose.foundation.layout.fillMaxWidth import com.droiddeck.launcher.R import androidx.compose.ui.res.stringResource import androidx.compose.animation.core.FastOutSlowInEasing +import androidx.compose.animation.core.RepeatMode +import androidx.compose.runtime.State +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -70,38 +76,6 @@ private const val WALL_MIN_GAMES = 4 private const val WALL_DISTINCT = 40 private const val DRIFT_STEP_NS = 15_000_000L -private const val AMBIENT_IDLE_NS = 20_000_000_000L - -@Composable -internal fun ambientAwake(): Boolean { - val poked = Ambient.poked - var awake by remember { mutableStateOf(true) } - LaunchedEffect(poked) { - awake = true - kotlinx.coroutines.delay(AMBIENT_IDLE_NS / 1_000_000) - awake = false - } - return awake -} - -@Composable -internal fun AmbientFrames(pauseWhenIdle: Boolean = true, step: (Long) -> Unit) { - val onStep = androidx.compose.runtime.rememberUpdatedState(step) - val poked = if (pauseWhenIdle) Ambient.poked else 0L - if (Motion.scale != 0f) LaunchedEffect(poked, pauseWhenIdle) { - var shown = 0L - var end = Long.MAX_VALUE - while (shown < end) withFrameNanos { now -> - if (shown == 0L) { - shown = now - if (pauseWhenIdle) end = now + AMBIENT_IDLE_NS - } else if (now - shown >= DRIFT_STEP_NS) { - onStep.value(now - shown) - shown = now - } - } - } -} @Composable internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) { @@ -205,7 +179,6 @@ internal fun CapsuleWall( modifier: Modifier = Modifier, owned: List<Pair<Int, java.io.File>> = emptyList(), featured: List<com.droiddeck.launcher.frontend.SteamFeatured.Game> = emptyList(), - pauseWhenIdle: Boolean = true, ) { val pal = LocalPalette.current val blank = remember(pal) { WallCapsule(Brush.linearGradient(listOf(pal.surface, pal.background)), edge = pal.line) } @@ -215,7 +188,7 @@ internal fun CapsuleWall( val store = if (owned.isEmpty()) featured.filter { shown.add(it.appId) }.map { it.name to it.art } else emptyList() (library + store).take((WALL_DISTINCT - games.size).coerceAtLeast(0)) } - TiltedWall(games.size + padding.size, driftMs, modifier, pauseWhenIdle = pauseWhenIdle) { i -> + TiltedWall(games.size + padding.size, driftMs, modifier) { i -> when { i < games.size -> WallCapsule(artBrush(hueOf(games[i].name)), games[i].art) i - games.size < padding.size -> padding[i - games.size].let { (seed, art) -> WallCapsule(artBrush(hueOf(seed)), art) } @@ -235,13 +208,20 @@ internal fun TiltedWall( capH: androidx.compose.ui.unit.Dp = 168.dp, gap: androidx.compose.ui.unit.Dp = 14.dp, corner: androidx.compose.ui.unit.Dp = 10.dp, - pauseWhenIdle: Boolean = true, capsule: (index: Int) -> WallCapsule, ) { val still = Motion.scale == 0f val drift = remember { mutableFloatStateOf(0f) } - AmbientFrames(pauseWhenIdle) { dt -> - drift.floatValue = ((drift.floatValue + dt / (driftMs * 1_000_000.0 * Motion.scale)) % 1.0).toFloat() + val period = androidx.compose.runtime.rememberUpdatedState(driftMs) + if (!still) LaunchedEffect(Unit) { + var shown = 0L + while (true) withFrameNanos { now -> + if (shown == 0L) shown = now + else if (now - shown >= DRIFT_STEP_NS) { + drift.floatValue = ((drift.floatValue + (now - shown) / (period.value * 1_000_000.0 * Motion.scale)) % 1.0).toFloat() + shown = now + } + } } val density = LocalDensity.current BoxWithConstraints(modifier.fillMaxSize()) { @@ -327,9 +307,10 @@ private fun DrawScope.drawCapsule(look: WallCapsule, art: Painter?, radius: Floa private fun CapsuleFan(games: List<Library.SteamGame>) { val pal = LocalPalette.current val density = LocalDensity.current - val clock = remember { androidx.compose.runtime.mutableLongStateOf(0L) } - AmbientFrames { clock.longValue += it } - val floatMs = listOf(9_000, 11_000, 13_000) + val transition = rememberInfiniteTransition(label = "fan") + val floats = listOf(9_000, 11_000, 13_000).map { ms -> + transition.animateFloat(0f, 1f, infiniteRepeatable(tween(ms, easing = FastOutSlowInEasing), RepeatMode.Reverse), label = "float") + } val still = Motion.scale == 0f val slots = listOf( FanSlot(0.54f, 0.14f, 0.62f, -9f), @@ -350,7 +331,7 @@ private fun CapsuleFan(games: List<Library.SteamGame>) { for (i in games.indices.reversed()) { val slot = slots[i] val h = maxHeight * slot.height - val ms = floatMs[i] + val v: State<Float> = floats[i] val look = WallCapsule(artBrush(hueOf(games[i].name)), games[i].art) val art = look.art?.let { rememberCapsuleArt(it, with(density) { Size((h * 2f / 3f).toPx(), h.toPx()) }, radius) } Spacer( @@ -358,10 +339,7 @@ private fun CapsuleFan(games: List<Library.SteamGame>) { .offset(x = maxWidth * slot.x, y = maxHeight * slot.y) .size(h * 2f / 3f, h) .graphicsLayer { - val t = if (still) 0f else { - val phase = (clock.longValue / (ms * 1_000_000.0 * Motion.scale)) % 2.0 - FastOutSlowInEasing.transform((if (phase < 1.0) phase else 2.0 - phase).toFloat()) - } + val t = if (still) 0f else v.value rotationZ = slot.lean + 2f * t translationY = -12.dp.toPx() * t shadowElevation = 24.dp.toPx() From 63d1e4d61d9be4dc5721622305ac58ebd7b33f34 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 07:44:07 -0400 Subject: [PATCH 059/135] feat(library): remember visibility and store order (#1591) --- .../launcher/session/SessionPrefs.kt | 6 + .../com/droiddeck/launcher/ui/LibraryPage.kt | 82 +++++-- .../com/droiddeck/launcher/ui/StoresPage.kt | 2 +- app/src/main/res/values/strings.xml | 5 + .../launcher/ui/LibraryEntriesTest.kt | 10 + .../launcher/ui/LibraryVisibilityTest.kt | 219 ++++++++++++++++++ 6 files changed, 303 insertions(+), 21 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt 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 ec502a279f..94093cb323 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -111,6 +111,12 @@ object SessionPrefs { prefs(context).edit().putString("storesView", if (view in STORES_VIEWS) view else STORES_VIEWS.first()).apply() } + fun libraryShowUninstalled(context: Context): Boolean = prefs(context).getBoolean("libraryShowUninstalled", false) + + fun setLibraryShowUninstalled(context: Context, show: Boolean) { + prefs(context).edit().putBoolean("libraryShowUninstalled", show).apply() + } + fun storesTabOrder(context: Context): List<String> = idList(prefs(context).getString("storesTabOrder", null)) fun setStoresTabOrder(context: Context, order: List<String>) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 5d1ba95ab6..431dc647b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -35,7 +35,7 @@ import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.FilterList +import androidx.compose.material.icons.filled.FilterAlt import androidx.compose.material.icons.filled.GridView import androidx.compose.material.icons.filled.PlayArrow import androidx.compose.material.icons.filled.Sort @@ -86,6 +86,7 @@ import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreSizes import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.arrangeStoreTabs import com.droiddeck.launcher.stores.download.DownloadEntry import com.droiddeck.launcher.stores.formatBytes import com.droiddeck.launcher.stores.retainOrder @@ -129,15 +130,21 @@ internal fun libraryEntries( internal fun installedFirst(entries: List<LibraryEntry>): List<LibraryEntry> = entries.partition { it.installed }.let { (on, off) -> on + off } internal const val LIBRARY_ALL = "all" -internal val LIBRARY_SOURCES = listOf(Library.SOURCE_STEAM) + Store.entries.map { it.id } + Library.ADDED +internal fun librarySources(entries: List<LibraryEntry>, order: List<String>): List<String> = + (listOf(Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED) + .filter { source -> entries.any { it.source == source } } /** Survives leaving the page, so Stores can open the Library on one store's owned games. */ internal object LibraryView { var source by mutableStateOf(LIBRARY_ALL) var query by mutableStateOf("") var focusFirst = false + var ownedRequest by mutableIntStateOf(0) + private set - fun showOwned(store: Store) { + fun showOwned(context: android.content.Context, store: Store) { + SessionPrefs.setLibraryShowUninstalled(context, true) + ownedRequest++ source = store.id query = "" focusFirst = true @@ -161,13 +168,20 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val cloudRows = rememberXboxCloudRows(s) val all = remember(s.steamGames, cloudRows, owned, installedStore) { libraryEntries(s.steamGames + cloudRows, owned, installedStore) } LaunchedEffect(Unit) { XboxLibraryFilter.load(ctx) } - val sources = LIBRARY_SOURCES.filter { src -> all.any { it.source == src } } + var showUninstalled by remember(LibraryView.ownedRequest) { mutableStateOf(SessionPrefs.libraryShowUninstalled(ctx)) } + val setShowUninstalled = { show: Boolean -> + showUninstalled = show + SessionPrefs.setLibraryShowUninstalled(ctx, show) + } + val sources = librarySources(all, SessionPrefs.storesTabOrder(ctx)) val source = LibraryView.source.takeIf { it == LIBRARY_ALL || it in sources } ?: LIBRARY_ALL val q = LibraryView.query.trim().lowercase() val xboxFilter = if (source == Store.XBOX.id) XboxLibraryFilter.current else XboxLibraryFilter.ALL - val candidates = all.filter { + val matching = all.filter { (source == LIBRARY_ALL || it.source == source) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) } + val candidates = if (showUninstalled) matching else matching.filter { it.installed } + val hiddenUninstalled = if (showUninstalled) 0 else matching.count { !it.installed } val sort = s.storesSort val sizeSort = sort == "sizeAsc" || sort == "sizeDesc" val installedAt = StoresState.installed.associate { it.key to it.sidecar.installedAt } @@ -258,7 +272,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val detailScroll = rememberScrollState() var cycled by remember { mutableIntStateOf(0) } var gridFocused by remember { mutableStateOf(false) } - LaunchedEffect(source, sort) { grid.scrollToItem(0) } + LaunchedEffect(source, sort, showUninstalled) { grid.scrollToItem(0) } LaunchedEffect(cycled) { if (cycled == 0 || ff == null || inputMode.inputMode != androidx.compose.ui.input.InputMode.Keyboard) return@LaunchedEffect focusWithinFrames({ gridFocused }) { @@ -273,7 +287,9 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, wrap = { key, content -> StoreTheme(GameRef.parse(key).let { r -> r.store ?: r.game(s.steamGames)?.source?.let { Store.byId(it) } }) { content() } }, grid = { LibraryGrid( - s, a, grid, visible, split, all.size, sources, source, sizesPending, syncing, + s, a, grid, visible, split, visible.size, sources, source, sizesPending, syncing, + showUninstalled = showUninstalled.takeIf { stores }, onShowUninstalled = setShowUninstalled, + hiddenUninstalled = hiddenUninstalled, onSource = { LibraryView.source = it }, onCycle = { step -> val ids = listOf(LIBRARY_ALL) + sources @@ -312,6 +328,7 @@ private fun LibraryEmpty(s: FrontEndState, a: FrontEndActions, modifier: Modifie private fun LibraryGrid( s: FrontEndState, a: FrontEndActions, grid: LazyGridState, visible: List<LibraryEntry>, split: Int, total: Int, sources: List<String>, source: String, sizesPending: Boolean, syncing: List<Pair<Store, String>>, + showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, hiddenUninstalled: Int, onSource: (String) -> Unit, onCycle: (Int) -> Unit, onOpen: (String) -> Unit, onFocus: (Boolean) -> Unit, searchCleared: Boolean, ) { val listMode = s.storesView == "list" @@ -365,7 +382,9 @@ private fun LibraryGrid( horizontalArrangement = Arrangement.spacedBy(10.dp), verticalArrangement = Arrangement.spacedBy(10.dp), contentPadding = PaddingValues(top = 4.dp, bottom = 16.dp), ) { - item(key = "header", span = { GridItemSpan(maxLineSpan) }) { Rise(0) { LibraryHeader(s, a, total, searchCleared, xbox = source == Store.XBOX.id) } } + item(key = "header", span = { GridItemSpan(maxLineSpan) }) { + Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled) } + } item(key = "filters", span = { GridItemSpan(maxLineSpan) }) { Rise(1) { LibraryFilters(sources, source, onSource) } } @@ -383,7 +402,13 @@ private fun LibraryGrid( } } val empty = R.string.stores_nothing_matches - if (split == 0) libraryGrid(visible, empty, tile) + if (visible.isEmpty() && hiddenUninstalled > 0) item(key = "browse-owned", span = { GridItemSpan(maxLineSpan) }) { + Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth().padding(vertical = 32.dp)) { + Text(stringResource(R.string.library_no_installed_matches), fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) + SecondaryButton(stringResource(R.string.library_browse_owned), modifier = Modifier.testTag("library-browse-owned")) { onShowUninstalled(true) } + } + } + else if (split == 0) libraryGrid(visible, empty, tile) else { item(key = "installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_installed)) } libraryGrid(visible.take(split), empty, tile) @@ -403,7 +428,10 @@ private fun LazyGridScope.libraryGrid(entries: List<LibraryEntry>, empty: Int, t } @Composable -private fun LibraryHeader(s: FrontEndState, a: FrontEndActions, total: Int, searchCleared: Boolean, xbox: Boolean) { +private fun LibraryHeader( + s: FrontEndState, a: FrontEndActions, total: Int, searchCleared: Boolean, xbox: Boolean, + showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, +) { val colors = MaterialTheme.colorScheme val narrow = LocalNarrowPane.current ModeHeader( @@ -418,7 +446,7 @@ private fun LibraryHeader(s: FrontEndState, a: FrontEndActions, total: Int, sear } }, ) { - if (xbox) XboxFilterButton() + if (showUninstalled != null || xbox) LibraryFilterButton(showUninstalled, onShowUninstalled, xbox) SortButton(s, a) ViewButton(s, a) GameFileFolderActions(s, a) @@ -432,7 +460,7 @@ private fun LibraryFilters(sources: List<String>, source: String, onSource: (Str if (sources.size < 2) return Row( horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).padding(top = 4.dp, bottom = 2.dp), + modifier = Modifier.fillMaxWidth().padding(top = 4.dp, bottom = 2.dp).horizontalScroll(rememberScrollState()), ) { SourceFilterChip(LIBRARY_ALL, stringResource(R.string.stores_tab_all), source == LIBRARY_ALL, dot = null) { onSource(LIBRARY_ALL) } for (src in sources) { @@ -629,24 +657,38 @@ private fun xboxFilterLabel(filter: String): String = when (filter) { } @Composable -private fun XboxFilterButton() { +private fun LibraryFilterButton(showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, xbox: Boolean) { val pal = LocalPalette.current val ctx = LocalContext.current - val title = stringResource(R.string.xbox_filter_show) + val title = stringResource(R.string.library_filter) + val visibility = stringResource(if (showUninstalled == true) R.string.library_filter_all_owned else R.string.library_filter_installed) + val description = title + " · " + if (showUninstalled == null) xboxFilterLabel(XboxLibraryFilter.current) else visibility + val offset = if (showUninstalled == null) 0 else 2 var at by remember { mutableStateOf<Rect?>(null) } Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { - HeaderIconButton(title + " · " + xboxFilterLabel(XboxLibraryFilter.current), Icons.Filled.FilterList, "xbox-filter") { + HeaderIconButton(description, Icons.Filled.FilterAlt, "library-filter") { val from = at ?: return@HeaderIconButton Steps.ask(StepAsk( - anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = XboxLibraryFilter.ALL_FILTERS.size, - handle = { Text(title, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1, overflow = TextOverflow.Ellipsis) }, + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = offset + if (xbox) XboxLibraryFilter.ALL_FILTERS.size else 0, + handle = { Icon(Icons.Filled.FilterAlt, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, ) { StepTitle(title) StepList { - XboxLibraryFilter.ALL_FILTERS.forEachIndexed { i, filter -> + if (showUninstalled != null) listOf(false, true).forEachIndexed { i, show -> + StepChoice( + stringResource(if (show) R.string.library_filter_all_owned else R.string.library_filter_installed), + selected = show == showUninstalled, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(i).then(if (show == showUninstalled) Modifier.focusRequester(first) else Modifier), + ) { + onShowUninstalled(show) + Steps.fold() + } + } + if (xbox && showUninstalled != null) Text(Store.XBOX.shortLabel, fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.stepItem(offset).padding(start = 4.dp, top = 10.dp, bottom = 4.dp)) + if (xbox) XboxLibraryFilter.ALL_FILTERS.forEachIndexed { i, filter -> StepChoice( xboxFilterLabel(filter), selected = filter == XboxLibraryFilter.current, enabled = open, - modifier = Modifier.fillMaxWidth().stepItem(i).then(if (filter == XboxLibraryFilter.current) Modifier.focusRequester(first) else Modifier), + modifier = Modifier.fillMaxWidth().stepItem(offset + i).then(if (showUninstalled == null && filter == XboxLibraryFilter.current) Modifier.focusRequester(first) else Modifier), ) { XboxLibraryFilter.set(ctx, filter) Steps.fold() @@ -668,7 +710,7 @@ private fun SortButton(s: FrontEndState, a: FrontEndActions) { val from = at ?: return@HeaderIconButton Steps.ask(StepAsk( anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = SessionPrefs.STORES_SORTS.size, - handle = { Text(title, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1, overflow = TextOverflow.Ellipsis) }, + handle = { Icon(Icons.Filled.Sort, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, ) { StepTitle(title) StepList { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index d19e0e4bc7..d3e3b8b0aa 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -947,7 +947,7 @@ private fun ProfileStrip(store: Store, owned: Int, loaded: Boolean, s: FrontEndS } Actions { SmallTextButton(stringResource(R.string.stores_owned_in_library), key = "owned-in-library") { - LibraryView.showOwned(store) + LibraryView.showOwned(ctx, store) show("games") } SmallTextButton(stringResource(R.string.stores_refresh)) { StoresState.open(ctx, store, force = true) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 416e25e4e2..fea5e1a29a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3181,6 +3181,11 @@ <string name="epic_client_open">Open</string> <string name="epic_client_install">Install</string> <string name="library_filter_added">Added</string> + <string name="library_filter">Filter</string> + <string name="library_filter_installed">Installed only</string> + <string name="library_filter_all_owned">All owned games</string> + <string name="library_no_installed_matches">No installed games match these filters.</string> + <string name="library_browse_owned">Browse owned games</string> <string name="game_tab_about">About</string> <string name="game_tab_achievements_count" translatable="false">%1$s %2$d/%3$d</string> <string name="game_tab_launch">Launch</string> diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt index be6b3abea4..3bc153e4d2 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt @@ -77,6 +77,16 @@ class LibraryEntriesTest { assertEquals(listOf("b", "d", "a", "c"), installedFirst(entries).map { it.key }) } + @Test fun librarySourcesFollowTheConfiguredStoreOrderWithSteamFirstAndAddedLast() { + val entries = listOf("added", "gog", "steam", "epic", "xbox").map { LibraryEntry(it, it, it, null, null, true) } + assertEquals(listOf("steam", "xbox", "epic", "gog", "added"), librarySources(entries, listOf("xbox", "epic", "gog"))) + } + + @Test fun librarySourcesIgnoreUnknownAndDuplicateOrderEntriesAndAppendNewStores() { + val entries = listOf("epic", "gog", "battlenet").map { LibraryEntry(it, it, it, null, null, false) } + assertEquals(listOf("epic", "gog", "battlenet"), librarySources(entries, listOf("missing", "epic", "epic", "amazon"))) + } + @Test fun gameKeysNameEitherAnAppOrAStoreProduct() { GameRef.parse("app:440").let { assertEquals(440, it.appId); assertNull(it.store) } GameRef.parse("app:-12").let { assertEquals(-12, it.appId) } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt new file mode 100644 index 0000000000..f6085e5126 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt @@ -0,0 +1,219 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.getValue +import androidx.compose.runtime.key +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshots.Snapshot +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.assertCountEquals +import androidx.compose.ui.test.onAllNodesWithText +import androidx.compose.ui.test.onNodeWithContentDescription +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.performClick +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.CredentialCipher +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.xbox.XboxLibraryFilter +import org.json.JSONObject +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import javax.crypto.spec.SecretKeySpec + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], qualifiers = "w1200dp-h752dp-land", application = android.app.Application::class) +class LibraryVisibilityTest { + @get:Rule val compose = createRobolectricComposeRule() + private val ctx get() = RuntimeEnvironment.getApplication() + private var generation by mutableIntStateOf(0) + + @Before fun prepare() { + StoreAccounts.keys = CredentialCipher.KeyProvider { SecretKeySpec(ByteArray(32) { 7 }, "AES") } + StoreAccounts.keystoreFailed = false + ctx.getSharedPreferences("session", 0).edit().clear().commit() + LibraryView.source = LIBRARY_ALL + LibraryView.query = "" + LibraryView.focusFirst = false + StoresState.library.clear() + StoresState.accounts.clear() + for (store in listOf(Store.GOG, Store.EPIC)) { + StoreAccounts.write(ctx, store, JSONObject().put("access_token", "test-only").put("display_name", "Library test")) + StoresState.accounts[store] = "Library test" + StoresState.library[store] = listOf(CatalogItem(store, "owned", "Uninstalled ${store.shortLabel}", null, owned = true, sizeBytes = 1024)) + } + } + + @After fun clear() { + Steps.drop() + XboxLibraryFilter.set(ctx, XboxLibraryFilter.ALL) + for (store in listOf(Store.GOG, Store.EPIC)) StoreAccounts.clear(ctx, store) + StoreAccounts.keys = CredentialCipher.Keystore + StoreAccounts.keystoreFailed = false + StoresState.library.clear() + StoresState.accounts.clear() + ctx.getSharedPreferences("session", 0).edit().clear().commit() + LibraryView.source = LIBRARY_ALL + LibraryView.query = "" + LibraryView.focusFirst = false + } + + @Test fun uninstalledGamesAreHiddenUntilSelectedInTheFilterAndTheChoiceSurvivesReopeningLibrary() { + show() + compose.onNodeWithText("Installed Steam game").assertExists() + compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() + chooseVisibility(true) + compose.onNodeWithText("Uninstalled GOG").assertExists() + assertTrue(SessionPrefs.libraryShowUninstalled(ctx)) + compose.runOnIdle { generation++; Snapshot.sendApplyNotifications() } + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithText("Uninstalled GOG").assertExists() + chooseVisibility(false) + compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() + assertFalse(SessionPrefs.libraryShowUninstalled(ctx)) + } + + @Test fun theFilterExpandsBesideSortWithoutChangingTheSelectionOnOpen() { + show() + val filter = compose.onNodeWithContentDescription("Filter · Installed only") + val sort = compose.onNodeWithContentDescription("Sort") + assertTrue(filter.fetchSemanticsNode().boundsInRoot.right <= sort.fetchSemanticsNode().boundsInRoot.left) + filter.performClick() + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithText("Installed only").assertIsDisplayed() + compose.onNodeWithText("All owned games").assertIsDisplayed() + compose.onAllNodesWithText("Filter").assertCountEquals(1) + compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() + assertFalse(SessionPrefs.libraryShowUninstalled(ctx)) + compose.runOnIdle { Steps.fold(); Snapshot.sendApplyNotifications() } + compose.mainClock.advanceTimeBy(1_000) + sort.performClick() + compose.mainClock.advanceTimeBy(2_000) + compose.onAllNodesWithText("Sort").assertCountEquals(1) + compose.onNodeWithText("Recently played").assertIsDisplayed() + } + + @Test fun theXboxAccessChoicesShareTheLibraryFilter() { + StoreAccounts.write(ctx, Store.XBOX, JSONObject().put("username", "Library test")) + StoresState.accounts[Store.XBOX] = "Library test" + StoresState.library[Store.XBOX] = listOf(CatalogItem(Store.XBOX, "owned", "Uninstalled Xbox", null, owned = true)) + LibraryView.source = Store.XBOX.id + try { + show() + compose.onNodeWithContentDescription("Filter · Installed only").performClick() + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithText("Installed only").assertIsDisplayed() + compose.onNodeWithText("All owned games").assertIsDisplayed() + compose.onNodeWithText("Game Pass").assertIsDisplayed().performClick() + compose.mainClock.advanceTimeBy(1_000) + assertEquals(XboxLibraryFilter.GAME_PASS, XboxLibraryFilter.current) + assertFalse(SessionPrefs.libraryShowUninstalled(ctx)) + } finally { + StoreAccounts.clear(ctx, Store.XBOX) + } + } + + @Test fun aSearchWithOnlyUninstalledMatchesOffersToRevealThem() { + LibraryView.query = "Uninstalled GOG" + show() + compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() + compose.onNodeWithTag("library-browse-owned").performClick() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Uninstalled GOG").assertExists() + assertEquals("Uninstalled GOG", LibraryView.query) + } + + @Test fun aHiddenStoreRemainsReachableInLibraryInItsConfiguredOrder() { + SessionPrefs.setStoresTabOrder(ctx, listOf("epic", "gog")) + SessionPrefs.setStoresTabHidden(ctx, setOf("gog")) + show() + val steam = compose.onNodeWithTag("library-source-steam").fetchSemanticsNode().boundsInRoot.left + val epic = compose.onNodeWithTag("library-source-epic").fetchSemanticsNode().boundsInRoot.left + val gog = compose.onNodeWithTag("library-source-gog").fetchSemanticsNode().boundsInRoot.left + assertTrue(steam < epic && epic < gog) + compose.onNodeWithTag("library-source-gog").performClick() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithTag("library-browse-owned").assertIsDisplayed().performClick() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Uninstalled GOG").assertExists() + } + + @Test fun theStoresOwnedGamesLinkRevealsOwnedGamesDespiteTheSavedInstalledOnlyView() { + assertFalse(SessionPrefs.libraryShowUninstalled(ctx)) + LibraryView.showOwned(ctx, Store.GOG) + show() + compose.onNodeWithText("Uninstalled GOG").assertExists() + compose.onNodeWithText("Installed Steam game").assertDoesNotExist() + } + + @Test fun theStoresOwnedGamesLinkUpdatesALibraryPageThatIsStillComposed() { + LibraryView.source = Store.GOG.id + show() + compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() + compose.runOnIdle { LibraryView.showOwned(ctx, Store.GOG); Snapshot.sendApplyNotifications() } + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Uninstalled GOG").assertExists() + } + + private fun show() { + compose.mainClock.autoAdvance = false + compose.setContent { key(generation) { + DroidDeckTheme { + CompositionLocalProvider(LocalFrontFocus provides FrontFocus()) { + FocusGlideHost { Box(Modifier.fillMaxSize()) { + LibraryPage(state(), actions(), "games", {}, Modifier.fillMaxSize()) + StepsLayer(Offset.Zero) + } } + } + } + } } + compose.mainClock.advanceTimeBy(2_000) + } + + private fun chooseVisibility(show: Boolean) { + compose.onNodeWithContentDescription("Filter · " + if (SessionPrefs.libraryShowUninstalled(ctx)) "All owned games" else "Installed only") + .performClick() + compose.mainClock.advanceTimeBy(2_000) + assertTrue(Steps.open) + compose.onNodeWithText(if (show) "All owned games" else "Installed only") + .performClick() + compose.mainClock.advanceTimeBy(1_000) + assertEquals(show, SessionPrefs.libraryShowUninstalled(ctx)) + } + + private fun state() = FrontEndState( + installed = "r9", ready = true, available = null, busy = false, stage = "", percent = -1, + desktopInstalled = true, offlineAccount = null, offline = false, frameGenLabel = "", + romsDir = null, logsEnabled = false, + steamGames = listOf(Library.SteamGame(440, "Installed Steam game", null, "internal")), + emulators = emptyList(), running = null, + ) + + private fun actions() = FrontEndActions( + onPlay = {}, onPlayDesktopUi = {}, onSteamGame = {}, onDesktop = {}, onEmulator = {}, + onRom = {}, onResume = {}, onSteamSettings = {}, onDesktopSettings = {}, + onInstallPackage = {}, onRemovePackage = {}, onRuntime = {}, onFrameGenPick = {}, + onImportLossless = {}, onProtons = {}, onComponents = {}, onPerformance = {}, + onRoms = {}, onFiles = {}, onLogs = {}, onOffline = {}, + onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> }, + onSetPhantomProcessLimit = { _, _ -> }, + ) +} From 9fc48515c13937578817645a08d9264a630d151d Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 08:12:47 -0400 Subject: [PATCH 060/135] feat(input): unify low latency mode (#1604) --- .../com/droiddeck/launcher/SessionActivity.kt | 24 +++++++------------ .../launcher/input/FakeInputWriter.java | 4 ++-- .../launcher/session/SessionPrefs.kt | 12 +++------- .../launcher/session/SessionService.kt | 2 +- .../droiddeck/launcher/ui/SessionOverlay.kt | 15 ++++-------- app/src/main/res/values/strings.xml | 2 ++ 6 files changed, 21 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 5d8ad8e393..2d6970c4f3 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -318,8 +318,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var drawerPage by mutableStateOf(SessionDrawerPage.CONTROLLER) private var drawerControllerActive by mutableStateOf(false) private var backActionsInverted by mutableStateOf(false) - private var lowLatencyController by mutableStateOf(false) - private var lowLatencyTouch by mutableStateOf(false) + private var lowLatency by mutableStateOf(true) private var padType by mutableStateOf(SessionPrefs.CONTROLLER_DECK) private var pcKeyboardOpen by mutableStateOf(false) private var achievementsInFront by mutableStateOf<AchievementsInFront?>(null) @@ -1019,16 +1018,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionPrefs.setBackActionsInverted(this@SessionActivity, inverted) backActionsInverted = inverted }, - lowLatencyController = lowLatencyController, - lowLatencyTouch = lowLatencyTouch, - onLowLatencyController = { on -> - SessionPrefs.setLowLatencyController(this@SessionActivity, on) - lowLatencyController = on - applyLowLatency() - }, - onLowLatencyTouch = { on -> - SessionPrefs.setLowLatencyTouch(this@SessionActivity, on) - lowLatencyTouch = on + lowLatency = lowLatency, + onLowLatency = { on -> + SessionPrefs.setLowLatency(this@SessionActivity, on) + lowLatency = on applyLowLatency() }, onOsc = { v -> @@ -1633,8 +1626,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { steamDownloadsInBackground = SessionPrefs.steamDownloadsInBackground(this) oscMode = SessionPrefs.oscMode(this) backActionsInverted = SessionPrefs.backActionsInverted(this) - lowLatencyController = SessionPrefs.lowLatencyController(this) - lowLatencyTouch = SessionPrefs.lowLatencyTouch(this) + lowLatency = SessionPrefs.lowLatency(this) padType = SessionPrefs.steamController(this) } @@ -3625,10 +3617,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun unbufferedSources() = - if (lowLatencyTouch) UNBUFFERED_SOURCES or InputDevice.SOURCE_CLASS_POINTER else UNBUFFERED_SOURCES + if (lowLatency) UNBUFFERED_SOURCES or InputDevice.SOURCE_CLASS_POINTER else UNBUFFERED_SOURCES private fun applyLowLatency() { - com.droiddeck.launcher.input.FakeInputWriter.setLowLatency(lowLatencyController, lowLatencyTouch) + com.droiddeck.launcher.input.FakeInputWriter.setLowLatency(lowLatency) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) window.decorView.requestUnbufferedDispatch(unbufferedSources()) } diff --git a/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java b/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java index 05469e6340..f140314dc0 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java +++ b/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java @@ -525,8 +525,8 @@ public class FakeInputWriter { } } - public static void setLowLatency(boolean controller, boolean touch) { - int flags = (controller ? LATENCY_CONTROLLER : 0) | (touch ? LATENCY_TOUCH : 0); + public static void setLowLatency(boolean enabled) { + int flags = enabled ? LATENCY_CONTROLLER | LATENCY_TOUCH : 0; latency = flags; RingSlot ringSlot; synchronized (RING_LOCK) { 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 94093cb323..48cad19186 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -229,16 +229,10 @@ object SessionPrefs { private fun mangoappSession(context: Context) = SessionState.mode == SessionService.MODE_STEAM && mangoapp(context) - fun lowLatencyController(context: Context): Boolean = prefs(context).getBoolean("lowLatencyController", false) + fun lowLatency(context: Context): Boolean = prefs(context).getBoolean("lowLatency", true) - fun setLowLatencyController(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("lowLatencyController", on).apply() - } - - fun lowLatencyTouch(context: Context): Boolean = prefs(context).getBoolean("lowLatencyTouch", false) - - fun setLowLatencyTouch(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("lowLatencyTouch", on).apply() + fun setLowLatency(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("lowLatency", on).apply() } fun backActionsInverted(context: Context): Boolean = prefs(context).getBoolean("backActionsInverted", false) 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 1df7ea31b7..b49e6392d8 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -852,7 +852,7 @@ class SessionService : Service() { SessionState.deckPad = deckBinds.isNotEmpty() if (wantsDeck && !SessionState.deckPad) Log.w(TAG, "deck pad: not available this session; the pad stays an Xbox 360 controller") logControllersAtStart() - com.droiddeck.launcher.input.FakeInputWriter.setLowLatency(SessionPrefs.lowLatencyController(this), SessionPrefs.lowLatencyTouch(this)) + com.droiddeck.launcher.input.FakeInputWriter.setLowLatency(SessionPrefs.lowLatency(this)) if (uinput) { guest.add("FAKE_EVDEV_UINPUT=1") if (SessionState.deckPad) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index b36131edd9..1adcfd860c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -256,10 +256,8 @@ class DrawerActions( val onSuspendPolicy: (String) -> Unit, val onSteamDownloadsInBackground: (Boolean) -> Unit = {}, val onBackActionsInverted: (Boolean) -> Unit, - val lowLatencyController: Boolean = false, - val lowLatencyTouch: Boolean = false, - val onLowLatencyController: (Boolean) -> Unit = {}, - val onLowLatencyTouch: (Boolean) -> Unit = {}, + val lowLatency: Boolean = true, + val onLowLatency: (Boolean) -> Unit = {}, val onTouch: (String) -> Unit, val onGestureSettings: () -> Unit = {}, val onScreenKeys: (() -> Unit)? = null, @@ -612,12 +610,9 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont onChange = a.onUnfoldedControlsWithController) } SettingsGroup(stringResource(R.string.drawer_latency)) { - ToggleRow(host, "low-latency-controller", stringResource(R.string.drawer_low_latency_controller), - stringResource(R.string.drawer_low_latency_controller_hint), a.lowLatencyController, - chipModifier = focus.track(page, "low-latency-controller"), onChange = a.onLowLatencyController) - ToggleRow(host, "low-latency-touch", stringResource(R.string.drawer_low_latency_touch), - stringResource(R.string.drawer_low_latency_touch_hint), a.lowLatencyTouch, - chipModifier = focus.track(page, "low-latency-touch"), onChange = a.onLowLatencyTouch) + ToggleRow(host, "low-latency", stringResource(R.string.drawer_low_latency), + stringResource(R.string.drawer_low_latency_hint), a.lowLatency, + chipModifier = focus.track(page, "low-latency"), onChange = a.onLowLatency) } SettingsGroup(stringResource(R.string.drawer_keyboard)) { Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(8.dp)) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fea5e1a29a..9fa3fe8caf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -702,6 +702,8 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Keyboard</string> <string name="drawer_latency">Latency</string> + <string name="drawer_low_latency">Low latency mode</string> + <string name="drawer_low_latency_hint">Increases CPU and battery usage</string> <string name="drawer_low_latency_controller">Low-latency controller</string> <string name="drawer_low_latency_controller_hint">Pad reports at 1000 Hz instead of 250 Hz. Slightly more CPU.</string> <string name="drawer_low_latency_touch">Low-latency touch</string> From b887e8653d891dcf8781f603b5cd722dcf2837de Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 06:46:45 -0400 Subject: [PATCH 061/135] feat: install Battle.net games from Stores with downloads, updates and uninstall Battle.net games now install like Epic, Xbox and itch games: Install, pick a location, and the download runs in the Downloads tab while the Stores page stays open. droiddeck-battlenet starts Blizzard's own Agent on its own under a headless gamescope and drives its local API, so no window opens and nothing waits on the Battle.net client. - Progress, speed and time left come from the Agent, with pause, resume (the Agent keeps what it downloaded) and cancel, which uninstalls the partial game and removes its folder. - A job only finishes once the Agent has really run it and the game is playable; the first status after a request can still describe the previous operation. - Installed games check Blizzard's version service and show Update when the build on disk is behind; the update repairs missing files too. - Battle.net games can be uninstalled from their page through the Agent. - Games land in the chosen location: internal storage, other storage or a Games folder. - The hero keeps its action row clear of the playtime column. --- README.md | 2 +- .../droiddeck/launcher/runtime/BattleNet.kt | 76 ++-- .../droiddeck/launcher/stores/StoresState.kt | 4 +- .../stores/battlenet/BattleNetInstall.kt | 283 +++++++++++++++ .../stores/battlenet/BattleNetStore.kt | 10 +- .../com/droiddeck/launcher/ui/GameDetail.kt | 24 +- .../com/droiddeck/launcher/ui/StoresPage.kt | 6 +- app/src/main/res/values-ar/strings.xml | 7 + app/src/main/res/values-b+es+419/strings.xml | 7 + app/src/main/res/values-bg/strings.xml | 7 + app/src/main/res/values-cs/strings.xml | 7 + app/src/main/res/values-da/strings.xml | 7 + app/src/main/res/values-de/strings.xml | 7 + app/src/main/res/values-el/strings.xml | 7 + app/src/main/res/values-es/strings.xml | 7 + app/src/main/res/values-fi/strings.xml | 7 + app/src/main/res/values-fr/strings.xml | 7 + app/src/main/res/values-hi/strings.xml | 7 + app/src/main/res/values-hu/strings.xml | 7 + app/src/main/res/values-in/strings.xml | 7 + app/src/main/res/values-it/strings.xml | 7 + app/src/main/res/values-ja/strings.xml | 7 + app/src/main/res/values-ko/strings.xml | 7 + app/src/main/res/values-ms/strings.xml | 7 + app/src/main/res/values-nb/strings.xml | 7 + app/src/main/res/values-nl/strings.xml | 7 + app/src/main/res/values-pl/strings.xml | 7 + app/src/main/res/values-pt-rPT/strings.xml | 7 + app/src/main/res/values-pt/strings.xml | 7 + app/src/main/res/values-ro/strings.xml | 7 + app/src/main/res/values-ru/strings.xml | 7 + app/src/main/res/values-sv/strings.xml | 7 + app/src/main/res/values-th/strings.xml | 7 + app/src/main/res/values-tr/strings.xml | 7 + app/src/main/res/values-uk/strings.xml | 7 + app/src/main/res/values-vi/strings.xml | 7 + app/src/main/res/values-zh-rCN/strings.xml | 7 + app/src/main/res/values-zh-rHK/strings.xml | 7 + app/src/main/res/values-zh-rTW/strings.xml | 7 + app/src/main/res/values/strings.xml | 7 + .../stores/battlenet/BattleNetInstallTest.kt | 75 ++++ .../overlay/usr/local/bin/droiddeck-battlenet | 335 +++++++++++++++++- tools/tests/test_battlenet.py | 179 ++++++++++ 43 files changed, 1176 insertions(+), 49 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt diff --git a/README.md b/README.md index 76a02242b7..794e272cc2 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Compatibility and performance vary by device; hardware validation is limited. De ## Credits and licence -GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. Battle.net support is [@kayakyakr](https://github.com/kayakyakr)'s: it runs Blizzard's own Battle.net client, downloaded from Blizzard and not included, in Proton, and shows the key art from each game's [Battle.net Shop](https://shop.battle.net) page; without the Steam client its games see DroidDeck's pad as an Xbox 360 controller through `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. The registry entries a GOG game's install script (`goggame-<id>.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc/<pid>/mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc/<pid>/status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). Xbox games load the Windows modules of [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) runtime (LGPL-2.1-or-later), including its `wintypes.dll`, whose `ApiInformation` answer Minecraft for Windows needs to start; how Minecraft installs GameInput under Wine was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. +GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. Battle.net support is [@kayakyakr](https://github.com/kayakyakr)'s: it runs Blizzard's own Battle.net client, downloaded from Blizzard and not included, in Proton, and shows the key art from each game's [Battle.net Shop](https://shop.battle.net) page; without the Steam client its games see DroidDeck's pad as an Xbox 360 controller through `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. Its games install from Stores through Blizzard's own Agent and the local HTTP API it serves, driven the way [@barncastle](https://github.com/barncastle)'s [Battle.Net-Installer](https://github.com/barncastle/Battle.Net-Installer) drives it, with the requests described on [wowdev.wiki](https://wowdev.wiki/Agent); how other launchers find, install and start Blizzard games was read in [@mubaraknumann](https://github.com/mubaraknumann)'s [unifideck](https://github.com/mubaraknumann/unifideck), [@djmittens](https://github.com/djmittens)'s [neo-mittens](https://github.com/djmittens/neo-mittens) `bnetswitch`, [@BCD1210](https://github.com/BCD1210)'s [soju](https://github.com/BCD1210/soju) and [Lutris](https://github.com/lutris/lutris)'s `product.db` reader, without taking their code. The registry entries a GOG game's install script (`goggame-<id>.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc/<pid>/mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc/<pid>/status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). Xbox games load the Windows modules of [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) runtime (LGPL-2.1-or-later), including its `wintypes.dll`, whose `ApiInformation` answer Minecraft for Windows needs to start; how Minecraft installs GameInput under Wine was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. XR glasses support builds on WinNative's VITURE glasses work. VITURE protocol details were checked against [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) by [@wheaney](https://github.com/wheaney), including the VITURE protocol header it ships, [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) by [@badicsalex](https://github.com/badicsalex) and the [go-macos/iokit VITURE package](https://pkg.go.dev/github.com/go-macos/iokit/viture); the optional VITURE SDK belongs to VITURE and is not included. RayNeo support adapts [@informalTechCode](https://github.com/informalTechCode)'s [RayNeo-Air-Series-3DoF-Scaffold](https://github.com/informalTechCode/RayNeo-Air-Series-3DoF-Scaffold) (Apache-2.0) and references [@verncat](https://github.com/verncat)'s [RayNeo-Air-3S-Pro-OpenVR](https://github.com/verncat/RayNeo-Air-3S-Pro-OpenVR) (MIT) and [Monado](https://gitlab.freedesktop.org/monado/monado) (BSL-1.0); see [docs/third-party/rayneo](docs/third-party/rayneo/README.md). XREAL 1S support references [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) and [xrealOneDeviceKit](https://github.com/wheaney/xrealOneDeviceKit) by @wheaney, [xreal_one_driver](https://github.com/rohitsangwan01/xreal_one_driver) by [@rohitsangwan01](https://github.com/rohitsangwan01) (MIT) and [xr-tools](https://github.com/0xcaff/xr-tools) by [@0xcaff](https://github.com/0xcaff). Rokid support follows the Rokid protocol notes in [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) and @badicsalex's [Void Computing write-ups](https://voidcomputing.hu/blog/worse-better-prettier/), and [Monado](https://gitlab.freedesktop.org/monado/monado)'s Rokid driver. The REDMAGIC glasses-display findings draw on [@mekhontsev](https://github.com/mekhontsev)'s [MagicDesk investigation](https://github.com/mekhontsev/magicdesk/blob/main/docs/xr-resolution-fix.md) and [@Coding-BR](https://github.com/Coding-BR)'s [decompiled Nubia kernel](https://github.com/Coding-BR/android_kernel_nubia_sm8850_qwjujube). VITURE, RayNeo, XREAL, Rokid and REDMAGIC are trademarks of their owners; this project is not affiliated with them. diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt index 5cd766a7b8..f753585b17 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -17,45 +17,45 @@ object BattleNet { const val PROGRAM = "/usr/local/bin/droiddeck-battlenet" - class Title(val uid: String, val name: String, val code: String, val steam: Int? = null, val shop: String? = null) + class Title(val uid: String, val name: String, val code: String, val steam: Int? = null, val shop: String? = null, val product: String? = null) internal val TITLES = listOf( - Title("wow", "World of Warcraft", "WoW", shop = "world-of-warcraft-midnight"), - Title("wow_classic", "World of Warcraft Classic", "WoWC", shop = "world-of-warcraft-burning-crusade-classic-anniversary-edition-upgrades"), - Title("wow_classic_era", "World of Warcraft Classic", "WoWC"), - Title("wow_classic_anniversary", "World of Warcraft Classic", "WoWC"), - Title("diablo3", "Diablo III", "D3", shop = "diablo-iii"), + Title("wow", "World of Warcraft", "WoW", shop = "world-of-warcraft-midnight", product = "wow"), + Title("wow_classic", "World of Warcraft Classic", "WoWC", shop = "world-of-warcraft-burning-crusade-classic-anniversary-edition-upgrades", product = "wow_classic"), + Title("wow_classic_era", "World of Warcraft Classic", "WoWC", product = "wow_classic_era"), + Title("wow_classic_anniversary", "World of Warcraft Classic", "WoWC", product = "wow_anniversary"), + Title("diablo3", "Diablo III", "D3", shop = "diablo-iii", product = "d3"), Title("d3cn", "Diablo III", "D3CN", shop = "diablo-iii"), - Title("s2", "StarCraft II", "S2", shop = "starcraft-ii"), - Title("s1", "StarCraft", "S1", shop = "starcraft-remastered"), - Title("hs_beta", "Hearthstone", "WTCG", shop = "hearthstone"), - Title("heroes", "Heroes of the Storm", "Hero", shop = "heroes-of-the-storm"), - Title("prometheus", "Overwatch 2", "Pro", 2357570, shop = "overwatch"), - Title("w3", "Warcraft III: Reforged", "W3", shop = "warcraft-3-reforged"), - Title("viper", "Call of Duty: Black Ops 4", "VIPR", shop = "call-of-duty-black-ops-4"), - Title("odin", "Call of Duty: Modern Warfare", "ODIN", 2000950, shop = "call-of-duty-modern-warfare"), - Title("lazarus", "Call of Duty: Modern Warfare 2 Campaign Remastered", "LAZR", shop = "call-of-duty-modern-warfare-2-campaign-remastered"), - Title("zeus", "Call of Duty: Black Ops Cold War", "ZEUS", shop = "call-of-duty-black-ops-cold-war"), - Title("fore", "Call of Duty: Vanguard", "FORE", shop = "call-of-duty-vanguard"), - Title("auks", "Call of Duty: Modern Warfare II", "AUKS", shop = "call-of-duty-modern-warfare-ii"), - Title("pinta", "Call of Duty: Modern Warfare III", "PNTA", 2519060, shop = "call-of-duty-modern-warfare-iii"), - Title("wlby", "Crash Bandicoot 4: It's About Time", "WLBY", 1378990, shop = "crash-bandicoot-4"), - Title("osi", "Diablo II: Resurrected", "OSI"), - Title("rtro", "Blizzard Arcade Collection", "RTRO", shop = "blizzard-arcade-collection"), - Title("anbs", "Diablo Immortal", "ANBS", shop = "diablo-immortal"), - Title("fenris", "Diablo IV", "Fen", 2344520, shop = "diablo-iv"), - Title("fen", "Diablo IV", "Fen", 2344520, shop = "diablo-iv"), - Title("d1", "Diablo", "D1", shop = "diablo"), - Title("w1", "Warcraft: Orcs & Humans", "W1", shop = "warcraft-orcs-and-humans"), - Title("w2", "Warcraft II: Battle.net Edition", "W2", shop = "warcraft-2-battle-net-edition"), - Title("w1r", "Warcraft: Remastered", "W1R", shop = "warcraft-1-remastered"), - Title("w2r", "Warcraft II: Remastered", "W2R", shop = "warcraft-2-remastered"), - Title("gryphon", "Warcraft Rumble", "GRY", shop = "warcraft-rumble"), - Title("aris", "Doom: The Dark Ages", "ARIS", 3017860, shop = "doom-the-dark-ages"), - Title("scorpio", "Sea of Thieves", "SCOR", 1172620, shop = "sea-of-thieves"), - Title("arkansas", "The Outer Worlds 2", "ARK", 1449110, shop = "the-outer-worlds-2"), - Title("libra", "Tony Hawk's Pro Skater 3 + 4", "LBRA", 2545710), - Title("aqua", "Avowed", "AQUA", 2457220, shop = "avowed"), + Title("s2", "StarCraft II", "S2", shop = "starcraft-ii", product = "s2"), + Title("s1", "StarCraft", "S1", shop = "starcraft-remastered", product = "s1"), + Title("hs_beta", "Hearthstone", "WTCG", shop = "hearthstone", product = "hsb"), + Title("heroes", "Heroes of the Storm", "Hero", shop = "heroes-of-the-storm", product = "hero"), + Title("prometheus", "Overwatch 2", "Pro", 2357570, shop = "overwatch", product = "pro"), + Title("w3", "Warcraft III: Reforged", "W3", shop = "warcraft-3-reforged", product = "w3"), + Title("viper", "Call of Duty: Black Ops 4", "VIPR", shop = "call-of-duty-black-ops-4", product = "viper"), + Title("odin", "Call of Duty: Modern Warfare", "ODIN", 2000950, shop = "call-of-duty-modern-warfare", product = "odin"), + Title("lazarus", "Call of Duty: Modern Warfare 2 Campaign Remastered", "LAZR", shop = "call-of-duty-modern-warfare-2-campaign-remastered", product = "lazr"), + Title("zeus", "Call of Duty: Black Ops Cold War", "ZEUS", shop = "call-of-duty-black-ops-cold-war", product = "zeus"), + Title("fore", "Call of Duty: Vanguard", "FORE", shop = "call-of-duty-vanguard", product = "fore"), + Title("auks", "Call of Duty: Modern Warfare II", "AUKS", shop = "call-of-duty-modern-warfare-ii", product = "auks"), + Title("pinta", "Call of Duty: Modern Warfare III", "PNTA", 2519060, shop = "call-of-duty-modern-warfare-iii", product = "pinta"), + Title("wlby", "Crash Bandicoot 4: It's About Time", "WLBY", 1378990, shop = "crash-bandicoot-4", product = "wlby"), + Title("osi", "Diablo II: Resurrected", "OSI", product = "osi"), + Title("rtro", "Blizzard Arcade Collection", "RTRO", shop = "blizzard-arcade-collection", product = "rtro"), + Title("anbs", "Diablo Immortal", "ANBS", shop = "diablo-immortal", product = "anbs"), + Title("fenris", "Diablo IV", "Fen", 2344520, shop = "diablo-iv", product = "fenris"), + Title("fen", "Diablo IV", "Fen", 2344520, shop = "diablo-iv", product = "fenris"), + Title("d1", "Diablo", "D1", shop = "diablo", product = "drtl"), + Title("w1", "Warcraft: Orcs & Humans", "W1", shop = "warcraft-orcs-and-humans", product = "war1"), + Title("w2", "Warcraft II: Battle.net Edition", "W2", shop = "warcraft-2-battle-net-edition", product = "w2bn"), + Title("w1r", "Warcraft: Remastered", "W1R", shop = "warcraft-1-remastered", product = "w1r"), + Title("w2r", "Warcraft II: Remastered", "W2R", shop = "warcraft-2-remastered", product = "w2r"), + Title("gryphon", "Warcraft Rumble", "GRY", shop = "warcraft-rumble", product = "gryphon"), + Title("aris", "Doom: The Dark Ages", "ARIS", 3017860, shop = "doom-the-dark-ages", product = "aris"), + Title("scorpio", "Sea of Thieves", "SCOR", 1172620, shop = "sea-of-thieves", product = "scor"), + Title("arkansas", "The Outer Worlds 2", "ARK", 1449110, shop = "the-outer-worlds-2", product = "ark"), + Title("libra", "Tony Hawk's Pro Skater 3 + 4", "LBRA", 2545710, product = "lbra"), + Title("aqua", "Avowed", "AQUA", 2457220, shop = "avowed", product = "aqua"), ) val STORE: List<Title> get() = TITLES.distinctBy { it.code }.filter { it.uid != "d3cn" && it.code != "WoWC" } @@ -104,7 +104,7 @@ object BattleNet { private val NOT_GAMES = setOf("agent", "bna", "battle.net") - class Game(val uid: String, val name: String, val code: String, val folder: File) { + class Game(val uid: String, val name: String, val code: String, val folder: File, val installUid: String = uid) { val title: Title get() = title(uid) ?: Title(uid, name, code) } @@ -172,7 +172,7 @@ object BattleNet { } if (title.code in found) continue val folder = hostFolder(context, path)?.takeIf { it.isDirectory } ?: continue - found[title.code] = Game(title.uid, title.name, title.code, folder) + found[title.code] = Game(title.uid, title.name, title.code, folder, uid) } return found.values.toList() } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index e15f19dd48..3488bf05a4 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -236,7 +236,7 @@ object StoresState { fun install(context: Context, item: CatalogItem, root: java.io.File? = null, language: String? = null) { val app = context.applicationContext val targetRoot = root ?: StoreInstallRoot.defaultTarget(app)?.root ?: StoreInstallRoot.installRoot(app) - if (item.store == Store.BATTLENET) { + if (item.store == Store.BATTLENET && !com.droiddeck.launcher.stores.battlenet.BattleNetInstall.headless(item)) { backends[item.store]?.install(app, item, targetRoot) return } @@ -273,7 +273,7 @@ object StoresState { uninstalling[key] = 0f background("stores-uninstall", onFailure = { main.post { uninstalling.remove(key); onDone() } }) { runCatching { backends[game.sidecar.store]?.uninstall(app, game) } - if (game.sidecar.store == Store.BATTLENET) { + if (game.sidecar.store == Store.BATTLENET && com.droiddeck.launcher.runtime.BattleNet.games(app).any { it.folder.absolutePath == game.folder.absolutePath }) { main.post { uninstalling.remove(key); onDone() } return@background } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt new file mode 100644 index 0000000000..925f113b14 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt @@ -0,0 +1,283 @@ +package com.droiddeck.launcher.stores.battlenet + +import android.content.Context +import android.util.Log +import androidx.compose.runtime.mutableStateMapOf +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.AddedGames +import com.droiddeck.launcher.runtime.BattleNet +import com.droiddeck.launcher.runtime.GuestCommand +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.GameStorage +import com.droiddeck.launcher.session.SecondaryLibrary +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreLanguage +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.download.DownloadEntry +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadStage +import org.json.JSONObject +import java.io.File +import java.net.HttpURLConnection +import java.net.URL +import java.util.Locale +import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicBoolean + +object BattleNetInstall { + private const val TAG = "BattleNetInstall" + internal const val PROGRESS = "BNET_PROGRESS " + internal const val STATE = "BNET_STATE " + internal const val DONE = "BNET_DONE " + internal const val ERROR = "BNET_ERROR " + private const val LIBRARY_GUEST = "/mnt/droiddeck-sd" + private const val VERSIONS = "https://%s.version.battle.net/v2/products/%s/versions" + private const val BUILD_INFO = ".build.info" + private const val CHECK_AGAIN_MS = 30 * 60_000L + + internal val LOCALES = listOf( + "enUS", "enGB", "esMX", "esES", "ptBR", "ptPT", "frFR", "deDE", "itIT", "ruRU", "jaJP", "koKR", "plPL", "trTR", + "zhTW", "zhCN", "thTH", "arSA", + ) + + private val checks = Executors.newSingleThreadExecutor { r -> Thread(r, "battlenet-updates") } + private val checkedAt = HashMap<String, Long>() + + val updates = mutableStateMapOf<String, Boolean>() + + fun product(id: String): String? = BattleNet.title(id)?.product + + fun headless(item: CatalogItem): Boolean = item.store == Store.BATTLENET && product(item.id) != null + + internal fun locale(locale: Locale): String { + val language = locale.language.lowercase(Locale.ROOT) + if (language == "zh") { + val traditional = locale.script.equals("Hant", true) || locale.country.uppercase(Locale.ROOT) in setOf("TW", "HK", "MO") + return if (traditional) "zhTW" else "zhCN" + } + val exact = language + locale.country.uppercase(Locale.ROOT) + return LOCALES.firstOrNull { it == exact } ?: LOCALES.firstOrNull { it.startsWith(language) } ?: "enUS" + } + + internal fun country(locale: Locale): Pair<String, String> { + val two = locale.country.uppercase(Locale.ROOT) + val three = runCatching { locale.isO3Country.uppercase(Locale.ROOT) }.getOrDefault("") + return if (two.matches(Regex("[A-Z]{2}")) && three.matches(Regex("[A-Z]{3}"))) three to two else "USA" to "US" + } + + internal fun binds(context: Context, guest: String): List<String> { + val out = ArrayList<String>() + if (guest.startsWith(StoreInstallRoot.GUEST_EXTERNAL + "/")) out += StoreInstallRoot.externalBindSpecs(context) + if (guest == LIBRARY_GUEST || guest.startsWith("$LIBRARY_GUEST/")) { + GameStorage.effective(context)?.let { library -> + File(LinuxRuntime.rootDir(context), LIBRARY_GUEST.removePrefix("/")).mkdirs() + out += SecondaryLibrary.contentPath(File(library.path)).path + ":" + LIBRARY_GUEST + } + } + return out + } + + internal fun run(context: Context, args: List<String>, guest: String?, cancelled: AtomicBoolean?, onLine: (String) -> Unit): Int = + GuestCommand.run( + context, listOf(BattleNet.PROGRAM) + args, logName = "battlenet-agent", + extraBinds = guest?.let { binds(context, it) }, fastPath = true, cancelled = cancelled, onLine = onLine, + ) + + fun enqueue(context: Context, item: CatalogItem, folder: File, update: Boolean = false) { + val app = context.applicationContext + val entry = DownloadEntry( + Store.BATTLENET, item.id, item.title, cover = item.tallImageUrl ?: item.imageUrl, + location = StoreInstallRoot.labelFor(app, folder), + ) + DownloadQueue.enqueue(app, entry) { BattleNetInstaller(app, item, folder, update) } + } + + fun update(context: Context, game: InstalledStoreGame) { + val app = context.applicationContext + Thread({ + val item = CatalogItem( + Store.BATTLENET, game.sidecar.id, game.sidecar.title, game.sidecar.hero, tallImageUrl = game.sidecar.cover, owned = true, + extra = mapOf(INSTALL_UID to installUid(app, game)), + ) + game.folder.parentFile?.parentFile?.let { com.droiddeck.launcher.stores.download.SavedQueue.remember(app, item, it) } + enqueue(app, item, game.folder, update = true) + }, "battlenet-update").start() + } + + internal const val INSTALL_UID = "installUid" + + internal fun installUid(context: Context, game: InstalledStoreGame): String = + runCatching { BattleNet.games(context).firstOrNull { it.uid == game.sidecar.id }?.installUid }.getOrNull() ?: game.sidecar.id + + fun uninstall(context: Context, game: InstalledStoreGame): Boolean { + if (product(game.sidecar.id) == null || !BattleNet.installed(context)) return false + val uid = installUid(context, game) + var done = false + val code = runCatching { + run(context, listOf("agent-uninstall", uid), AddedGames.guestPath(context, game.folder), null) { line -> + if (line.startsWith(DONE)) done = true + } + }.onFailure { Log.w(TAG, "uninstall $uid", it) }.getOrDefault(-1) + Log.i(TAG, "uninstall $uid: ${if (done) "done" else "exit $code"}") + if (done) StoresState.post { StoresState.notifyLibraryChanged(context.applicationContext) } + return done + } + + internal fun buildKey(text: String): Pair<String, String>? { + val rows = text.lines().filter { it.isNotBlank() } + if (rows.size < 2) return null + val head = rows[0].split('|').map { it.substringBefore('!') } + val branch = head.indexOf("Branch") + val active = head.indexOf("Active") + val key = head.indexOf("Build Key") + if (branch < 0 || key < 0) return null + val row = rows.drop(1).map { it.split('|') }.firstOrNull { active < 0 || it.getOrNull(active) == "1" } ?: return null + val region = row.getOrNull(branch)?.takeIf { it.matches(Regex("[a-z]{2}")) } ?: return null + val build = row.getOrNull(key)?.takeIf { it.matches(Regex("[0-9a-f]{32}")) } ?: return null + return region to build + } + + internal fun latestBuild(text: String, region: String): String? { + val rows = text.lines().filter { it.isNotBlank() && !it.startsWith("##") } + if (rows.isEmpty()) return null + val head = rows[0].split('|').map { it.substringBefore('!') } + val at = head.indexOf("Region") + val key = head.indexOf("BuildConfig") + if (at < 0 || key < 0) return null + return rows.drop(1).map { it.split('|') }.firstOrNull { it.getOrNull(at) == region }?.getOrNull(key) + ?.takeIf { it.matches(Regex("[0-9a-f]{32}")) } + } + + fun checkUpdate(context: Context, game: InstalledStoreGame, force: Boolean = false) = check(game.sidecar.id, game.folder, force) + + internal fun check(id: String, folder: File, force: Boolean) { + val product = product(id) ?: return + val now = System.currentTimeMillis() + synchronized(checkedAt) { + if (!force && now - (checkedAt[id] ?: 0L) < CHECK_AGAIN_MS) return + checkedAt[id] = now + } + checks.execute { + val local = runCatching { buildKey(File(folder, BUILD_INFO).readText()) }.getOrNull() ?: return@execute + val latest = runCatching { latestBuild(fetch(VERSIONS.format(Locale.ROOT, local.first, product)), local.first) } + .onFailure { Log.w(TAG, "versions of $product: ${it.javaClass.simpleName}") }.getOrNull() ?: return@execute + val behind = latest != local.second + Log.i(TAG, "$id: ${if (behind) "update available" else "up to date"}") + StoresState.post { if (behind) updates[id] = true else updates.remove(id) } + } + } + + private fun fetch(url: String): String { + val conn = (URL(url).openConnection() as HttpURLConnection).apply { + connectTimeout = 15_000 + readTimeout = 15_000 + setRequestProperty("User-Agent", "DroidDeck") + } + try { + if (conn.responseCode != 200) throw java.io.IOException("HTTP ${conn.responseCode}") + return conn.inputStream.bufferedReader().use { it.readText() } + } finally { + conn.disconnect() + } + } + + internal fun failure(context: Context, reason: String?, code: Int): String { + val detail = when { + reason == null -> "exit $code" + reason == "client" -> return context.getString(R.string.bnet_dl_client_first) + reason.startsWith("agent ") -> context.getString(R.string.bnet_dl_agent_error, reason.removePrefix("agent ")) + else -> reason.removePrefix("stopped ") + } + return context.getString(R.string.bnet_dl_failed, detail) + } + + internal fun localeTag(context: Context): String = locale(StoreLanguage.localeFor(null, context)) + + internal enum class Step { PREPARING, DOWNLOADING, APPLYING } + + internal fun step(state: Int, phase: Int, current: Long, total: Long): Step = when { + state == DONE_STATE || phase == APPLY_PHASE || total > 0L && current >= total -> Step.APPLYING + total > 0L -> Step.DOWNLOADING + else -> Step.PREPARING + } + + private const val DONE_STATE = 1004 + private const val APPLY_PHASE = 2000 +} + +internal class BattleNetInstaller( + private val app: Context, + private val item: CatalogItem, + private val folder: File, + private val update: Boolean, +) : DownloadQueue.DownloadJob { + private val cancelled = AtomicBoolean(false) + private var before = 0L + private var kept = -1L + + override fun run(handle: DownloadQueue.JobHandle): String? { + before = DownloadQueue.entry(handle.key)?.bytesTotal ?: 0L + handle.stage(DownloadStage.MANIFEST, app.getString(R.string.bnet_dl_starting)) + if (!BattleNet.installed(app)) throw IllegalStateException(app.getString(R.string.bnet_dl_client_first)) + val title = BattleNet.title(item.id) + val product = title?.product ?: throw IllegalStateException(app.getString(R.string.bnet_dl_failed, item.id)) + val uid = item.extra[BattleNetInstall.INSTALL_UID] ?: title.uid + if (!update) folder.mkdirs() + val guest = AddedGames.guestPath(app, folder) ?: throw IllegalStateException(app.getString(R.string.bnet_dl_failed, folder.path)) + val (country, region) = BattleNetInstall.country(Locale.getDefault()) + val args = if (update) listOf("agent-update", uid) + else listOf("agent-install", uid, product, guest, BattleNetInstall.localeTag(app), country, region) + var done: JSONObject? = null + var reason: String? = null + val code = BattleNetInstall.run(app, args, guest, cancelled) { line -> + when { + line.startsWith(BattleNetInstall.PROGRESS) -> + runCatching { JSONObject(line.removePrefix(BattleNetInstall.PROGRESS)) }.getOrNull()?.let { progress(handle, it) } + line == BattleNetInstall.STATE + "waiting" -> handle.stage(DownloadStage.MANIFEST, app.getString(R.string.bnet_dl_waiting)) + line == BattleNetInstall.STATE + "queued" -> handle.stage(DownloadStage.MANIFEST, app.getString(R.string.bnet_dl_queued)) + line == BattleNetInstall.STATE + "starting" -> handle.stage(DownloadStage.MANIFEST, app.getString(R.string.bnet_dl_starting)) + line.startsWith(BattleNetInstall.DONE) -> done = runCatching { JSONObject(line.removePrefix(BattleNetInstall.DONE)) }.getOrNull() + line.startsWith(BattleNetInstall.ERROR) -> reason = line.removePrefix(BattleNetInstall.ERROR) + } + } + if (cancelled.get()) return null + if (done == null) throw IllegalStateException(BattleNetInstall.failure(app, reason, code)) + handle.log("Battle.net: ${item.title} ${if (update) "updated" else "installed"} ${done?.optString("version").orEmpty()}".trimEnd()) + StoresState.post { + BattleNetInstall.updates.remove(item.id) + StoresState.notifyLibraryChanged(app) + } + BattleNetInstall.check(item.id, folder, force = true) + return folder.absolutePath + } + + private fun progress(handle: DownloadQueue.JobHandle, status: JSONObject) { + val current = status.optLong("download_current", 0L) + val total = status.optLong("download_total", 0L) + when (BattleNetInstall.step(status.optInt("state", 0), status.optInt("phase", 0), current, total)) { + BattleNetInstall.Step.PREPARING -> handle.stage(DownloadStage.MANIFEST, app.getString(R.string.stores_stage_checking)) + BattleNetInstall.Step.DOWNLOADING -> { + if (kept < 0L) kept = (before - total).coerceAtLeast(0L) + handle.progress(kept + current, kept + total) + } + BattleNetInstall.Step.APPLYING -> handle.stage(DownloadStage.INSTALL) + } + } + + override fun cancel(deleteFiles: Boolean) { + cancelled.set(true) + if (!deleteFiles || update) return + val uid = item.extra[BattleNetInstall.INSTALL_UID] ?: BattleNet.title(item.id)?.uid ?: return + Thread({ + Thread.sleep(2_000) + val gone = runCatching { + BattleNetInstall.run(app, listOf("agent-uninstall", uid), AddedGames.guestPath(app, folder), null) {} + }.getOrDefault(-1) + if (folder.isDirectory) com.droiddeck.launcher.core.FileUtils.delete(folder) + Log.i("BattleNetInstall", "cancelled install of $uid cleaned up (exit $gone)") + }, "battlenet-cancel").start() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt index 945c75c7a6..737ba3b4ff 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt @@ -189,9 +189,15 @@ object BattleNetBackend : StoreBackend { override fun search(context: Context, query: String): List<CatalogItem> = BattleNet.STORE.filter { it.name.contains(query, ignoreCase = true) }.map { item(context, it) } - override fun install(context: Context, item: CatalogItem, root: File) = BattleNetClient.installGame(context, item.id, root) + override fun install(context: Context, item: CatalogItem, root: File) { + if (!BattleNetInstall.headless(item)) return BattleNetClient.installGame(context, item.id, root) + val app = context.applicationContext + BattleNetInstall.enqueue(app, item, StoreInstallRoot.folderFor(app, store, item.id, item.title, root)) + } - override fun uninstall(context: Context, game: InstalledStoreGame) = BattleNetClient.open(emptyList()) + override fun uninstall(context: Context, game: InstalledStoreGame) { + if (!BattleNetInstall.uninstall(context, game)) BattleNetClient.open(emptyList()) + } fun installed(context: Context): List<BattleNet.Game> = if (BattleNet.installed(context)) BattleNet.games(context) else emptyList() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index 53b5c953bb..ac8ecffcce 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -56,6 +56,7 @@ import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.boundsInRoot import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.layout.positionInRoot import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalConfiguration @@ -86,6 +87,7 @@ import com.droiddeck.launcher.stores.StoreInstallRoot import com.droiddeck.launcher.stores.StoreLanguage import com.droiddeck.launcher.stores.StoreSizes import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.battlenet.BattleNetInstall import com.droiddeck.launcher.stores.download.DownloadQueue import com.droiddeck.launcher.stores.download.DownloadState import com.droiddeck.launcher.stores.formatBytes @@ -267,13 +269,15 @@ private fun GameHero( ) } Spacer(Modifier.matchParentSize().background(Brush.horizontalGradient(0f to colors.background.copy(alpha = 0.94f), 0.55f to colors.background.copy(alpha = 0.58f), 1f to Color.Transparent))) + var scoresWidth by remember { mutableStateOf(0) } if (scores != null) { Spacer(Modifier.matchParentSize().background(Brush.horizontalGradient(0.45f to Color.Transparent, 1f to colors.background.copy(alpha = 0.75f)))) - HeroScores(scores, Modifier.align(Alignment.BottomEnd).padding(end = 16.dp, bottom = 18.dp)) + HeroScores(scores, Modifier.align(Alignment.BottomEnd).padding(end = 16.dp, bottom = 18.dp).onSizeChanged { scoresWidth = it.width }) } + val scoresSpace = with(LocalDensity.current) { if (scores != null && scoresWidth > 0) scoresWidth.toDp() + 16.dp else 0.dp } Column( verticalArrangement = Arrangement.spacedBy(6.dp), - modifier = Modifier.align(Alignment.BottomStart).padding(horizontal = 22.dp, vertical = 18.dp), + modifier = Modifier.align(Alignment.BottomStart).padding(start = 22.dp, end = 22.dp + scoresSpace, top = 18.dp, bottom = 18.dp), content = content, ) Box(Modifier.align(Alignment.TopEnd).padding(12.dp), content = corner) @@ -358,7 +362,19 @@ internal fun GameActions( } SecondaryButton(stringResource(R.string.stores_xbox_manage), enabled = download == null) { XboxContent.manage(ctx, installed) } } - if (store == Store.BATTLENET) SecondaryButton(stringResource(R.string.bnet_open)) { a.onBattleNet() } + if (store == Store.BATTLENET) { + if (installed != null && id != null) { + LaunchedEffect(id) { BattleNetInstall.checkUpdate(ctx, installed) } + if (download != null) { + ActionChip(downloadLabel(download), ok = false) + if (download.state != DownloadState.PAUSED) SecondaryButton(stringResource(R.string.stores_dl_pause)) { DownloadQueue.pause(download.key) } + else SecondaryButton(stringResource(R.string.stores_dl_resume)) { DownloadQueue.resume(ctx, download.key) } + } else if (BattleNetInstall.updates[id] == true) { + SecondaryButton(stringResource(R.string.bnet_update)) { BattleNetInstall.update(ctx, installed) } + } + } + SecondaryButton(stringResource(R.string.bnet_open)) { a.onBattleNet() } + } } download != null -> { ActionChip(downloadLabel(download), ok = false) @@ -534,7 +550,7 @@ private fun IconAction(icon: androidx.compose.ui.graphics.vector.ImageVector, la private fun RemoveButton(title: String, game: Library.SteamGame?, installed: InstalledStoreGame?, a: FrontEndActions) { val ctx = LocalContext.current val colors = MaterialTheme.colorScheme - if ((installed?.sidecar?.store?.id ?: game?.source) == Store.BATTLENET.id) return + if ((installed?.sidecar?.store?.id ?: game?.source) == Store.BATTLENET.id && installed?.sidecar?.id?.let(BattleNetInstall::product) == null) return if (installed != null) { val key = installed.key val gone = StoresState.uninstalling[key] diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index d3e3b8b0aa..a4e8bdaf76 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -1392,7 +1392,11 @@ internal fun downloadLabel(d: com.droiddeck.launcher.stores.download.DownloadEnt @Composable internal fun activeStageLabel(d: com.droiddeck.launcher.stores.download.DownloadEntry): String = when (d.stage) { - DownloadStage.MANIFEST -> if (d.stageItemsTotal > 0) stringResource(R.string.stores_stage_checking) else stringResource(R.string.stores_stage_manifest) + DownloadStage.MANIFEST -> when { + d.store == Store.BATTLENET && d.detail.isNotBlank() -> d.detail + d.stageItemsTotal > 0 -> stringResource(R.string.stores_stage_checking) + else -> stringResource(R.string.stores_stage_manifest) + } DownloadStage.DOWNLOAD -> stringResource(R.string.stores_stage_downloading) DownloadStage.VERIFY -> stringResource(R.string.stores_stage_verifying) DownloadStage.INSTALL -> stringResource(R.string.stores_stage_installing) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index fa1c13e5e5..0d17340d69 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2081,6 +2081,13 @@ <string name="stores_play">تشغيل</string> <string name="stores_install">تثبيت</string> <string name="bnet_open">فتح Battle.net</string> + <string name="bnet_dl_starting">جارٍ تشغيل أداة التنزيل من Blizzard…</string> + <string name="bnet_dl_waiting">في انتظار إغلاق Battle.net…</string> + <string name="bnet_dl_queued">في انتظار تنزيل Battle.net الآخر…</string> + <string name="bnet_dl_client_first">افتح Battle.net وسجّل الدخول مرة واحدة، ثم ثبّت ألعابه من هنا.</string> + <string name="bnet_dl_failed">توقفت أداة التنزيل من Blizzard: %1$s</string> + <string name="bnet_dl_agent_error">خطأ Blizzard %1$s</string> + <string name="bnet_update">تحديث</string> <string name="bnet_store">ألعاب Blizzard</string> <string name="stores_resume_install">استئناف التثبيت</string> <string name="stores_dl_interrupted">منقطع</string> diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index acbf053f10..35abfeb415 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2049,6 +2049,13 @@ <string name="stores_play">Jugar</string> <string name="stores_install">Instalar</string> <string name="bnet_open">Abrir Battle.net</string> + <string name="bnet_dl_starting">Iniciando el descargador de Blizzard…</string> + <string name="bnet_dl_waiting">Esperando a que se cierre Battle.net…</string> + <string name="bnet_dl_queued">Esperando la otra descarga de Battle.net…</string> + <string name="bnet_dl_client_first">Abre Battle.net e inicia sesión una vez; luego instala sus juegos desde aquí.</string> + <string name="bnet_dl_failed">El descargador de Blizzard se detuvo: %1$s</string> + <string name="bnet_dl_agent_error">Error de Blizzard %1$s</string> + <string name="bnet_update">Actualizar</string> <string name="bnet_store">Juegos de Blizzard</string> <string name="stores_resume_install">Reanudar instalación</string> <string name="stores_dl_interrupted">Interrumpida</string> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 137b761f8b..e4eda5acf1 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1997,6 +1997,13 @@ <string name="stores_play">Играй</string> <string name="stores_install">Инсталирай</string> <string name="bnet_open">Отвори Battle.net</string> + <string name="bnet_dl_starting">Стартиране на програмата за изтегляне на Blizzard…</string> + <string name="bnet_dl_waiting">Изчакване Battle.net да се затвори…</string> + <string name="bnet_dl_queued">Изчакване на другото изтегляне от Battle.net…</string> + <string name="bnet_dl_client_first">Отворете Battle.net и влезте веднъж, след това инсталирайте игрите му оттук.</string> + <string name="bnet_dl_failed">Програмата за изтегляне на Blizzard спря: %1$s</string> + <string name="bnet_dl_agent_error">Грешка на Blizzard %1$s</string> + <string name="bnet_update">Актуализиране</string> <string name="bnet_store">Игри на Blizzard</string> <string name="stores_resume_install">Продължи инсталацията</string> <string name="stores_dl_interrupted">Прекъснато</string> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d12e8ff408..f3c5a4b8fb 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2039,6 +2039,13 @@ <string name="stores_play">Hrát</string> <string name="stores_install">Instalovat</string> <string name="bnet_open">Otevřít Battle.net</string> + <string name="bnet_dl_starting">Spouštění stahovače Blizzardu…</string> + <string name="bnet_dl_waiting">Čekání na zavření Battle.net…</string> + <string name="bnet_dl_queued">Čekání na druhé stahování z Battle.net…</string> + <string name="bnet_dl_client_first">Otevřete Battle.net a jednou se přihlaste, pak instalujte jeho hry odsud.</string> + <string name="bnet_dl_failed">Stahovač Blizzardu se zastavil: %1$s</string> + <string name="bnet_dl_agent_error">Chyba Blizzardu %1$s</string> + <string name="bnet_update">Aktualizovat</string> <string name="bnet_store">Hry od Blizzardu</string> <string name="stores_resume_install">Pokračovat v instalaci</string> <string name="stores_dl_interrupted">Přerušeno</string> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index caf758e572..f34cad2490 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1997,6 +1997,13 @@ <string name="stores_play">Spil</string> <string name="stores_install">Installer</string> <string name="bnet_open">Åbn Battle.net</string> + <string name="bnet_dl_starting">Starter Blizzards downloader…</string> + <string name="bnet_dl_waiting">Venter på, at Battle.net lukker…</string> + <string name="bnet_dl_queued">Venter på den anden Battle.net-download…</string> + <string name="bnet_dl_client_first">Åbn Battle.net, og log ind én gang, og installer derefter dets spil herfra.</string> + <string name="bnet_dl_failed">Blizzards downloader stoppede: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard-fejl %1$s</string> + <string name="bnet_update">Opdater</string> <string name="bnet_store">Blizzard-spil</string> <string name="stores_resume_install">Genoptag installation</string> <string name="stores_dl_interrupted">Afbrudt</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index fbdf383abb..db80fbc596 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1989,6 +1989,13 @@ <string name="stores_play">Spielen</string> <string name="stores_install">Installieren</string> <string name="bnet_open">Battle.net öffnen</string> + <string name="bnet_dl_starting">Blizzards Downloader wird gestartet…</string> + <string name="bnet_dl_waiting">Warten, bis Battle.net geschlossen ist…</string> + <string name="bnet_dl_queued">Warten auf den anderen Battle.net-Download…</string> + <string name="bnet_dl_client_first">Öffne Battle.net und melde dich einmal an, dann installiere seine Spiele hier.</string> + <string name="bnet_dl_failed">Blizzards Downloader wurde beendet: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard-Fehler %1$s</string> + <string name="bnet_update">Aktualisieren</string> <string name="bnet_store">Blizzard-Spiele</string> <string name="stores_resume_install">Installation fortsetzen</string> <string name="stores_dl_interrupted">Unterbrochen</string> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 7e21ae76cd..0fb72f3a33 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1997,6 +1997,13 @@ <string name="stores_play">Αναπαραγωγή</string> <string name="stores_install">Εγκατάσταση</string> <string name="bnet_open">Άνοιγμα του Battle.net</string> + <string name="bnet_dl_starting">Εκκίνηση του προγράμματος λήψης της Blizzard…</string> + <string name="bnet_dl_waiting">Αναμονή για κλείσιμο του Battle.net…</string> + <string name="bnet_dl_queued">Αναμονή για την άλλη λήψη από το Battle.net…</string> + <string name="bnet_dl_client_first">Ανοίξτε το Battle.net και συνδεθείτε μία φορά, έπειτα εγκαταστήστε τα παιχνίδια του από εδώ.</string> + <string name="bnet_dl_failed">Το πρόγραμμα λήψης της Blizzard σταμάτησε: %1$s</string> + <string name="bnet_dl_agent_error">Σφάλμα Blizzard %1$s</string> + <string name="bnet_update">Ενημέρωση</string> <string name="bnet_store">Παιχνίδια της Blizzard</string> <string name="stores_resume_install">Συνέχιση εγκατάστασης</string> <string name="stores_dl_interrupted">Διακόπηκε</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1e3859f582..e599874c81 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2020,6 +2020,13 @@ <string name="stores_play">Jugar</string> <string name="stores_install">Instalar</string> <string name="bnet_open">Abrir Battle.net</string> + <string name="bnet_dl_starting">Iniciando el descargador de Blizzard…</string> + <string name="bnet_dl_waiting">Esperando a que se cierre Battle.net…</string> + <string name="bnet_dl_queued">Esperando a la otra descarga de Battle.net…</string> + <string name="bnet_dl_client_first">Abre Battle.net e inicia sesión una vez; después instala sus juegos desde aquí.</string> + <string name="bnet_dl_failed">El descargador de Blizzard se ha detenido: %1$s</string> + <string name="bnet_dl_agent_error">Error de Blizzard %1$s</string> + <string name="bnet_update">Actualizar</string> <string name="bnet_store">Juegos de Blizzard</string> <string name="stores_resume_install">Reanudar instalación</string> <string name="stores_dl_interrupted">Interrumpida</string> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 30f3341610..0fc0768a86 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1997,6 +1997,13 @@ <string name="stores_play">Pelaa</string> <string name="stores_install">Asenna</string> <string name="bnet_open">Avaa Battle.net</string> + <string name="bnet_dl_starting">Käynnistetään Blizzardin latausohjelmaa…</string> + <string name="bnet_dl_waiting">Odotetaan Battle.netin sulkeutumista…</string> + <string name="bnet_dl_queued">Odotetaan toista Battle.net-latausta…</string> + <string name="bnet_dl_client_first">Avaa Battle.net ja kirjaudu sisään kerran, asenna sitten sen pelit täältä.</string> + <string name="bnet_dl_failed">Blizzardin latausohjelma pysähtyi: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard-virhe %1$s</string> + <string name="bnet_update">Päivitä</string> <string name="bnet_store">Blizzardin pelit</string> <string name="stores_resume_install">Jatka asennusta</string> <string name="stores_dl_interrupted">Keskeytynyt</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 76bf5abc2c..ceaad3f8ae 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2020,6 +2020,13 @@ <string name="stores_play">Jouer</string> <string name="stores_install">Installer</string> <string name="bnet_open">Ouvrir Battle.net</string> + <string name="bnet_dl_starting">Démarrage du téléchargeur de Blizzard…</string> + <string name="bnet_dl_waiting">En attente de la fermeture de Battle.net…</string> + <string name="bnet_dl_queued">En attente de l\'autre téléchargement Battle.net…</string> + <string name="bnet_dl_client_first">Ouvrez Battle.net et connectez-vous une fois, puis installez ses jeux ici.</string> + <string name="bnet_dl_failed">Le téléchargeur de Blizzard s\'est arrêté : %1$s</string> + <string name="bnet_dl_agent_error">Erreur Blizzard %1$s</string> + <string name="bnet_update">Mettre à jour</string> <string name="bnet_store">Jeux Blizzard</string> <string name="stores_resume_install">Reprendre l\'installation</string> <string name="stores_dl_interrupted">Interrompu</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 68cb4c185a..72455444e1 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1997,6 +1997,13 @@ <string name="stores_play">Play</string> <string name="stores_install">इंस्टॉल करें</string> <string name="bnet_open">Battle.net खोलें</string> + <string name="bnet_dl_starting">Blizzard का डाउनलोडर शुरू हो रहा है…</string> + <string name="bnet_dl_waiting">Battle.net के बंद होने का इंतज़ार…</string> + <string name="bnet_dl_queued">दूसरे Battle.net डाउनलोड का इंतज़ार…</string> + <string name="bnet_dl_client_first">Battle.net खोलें और एक बार साइन इन करें, फिर इसके गेम यहाँ से इंस्टॉल करें।</string> + <string name="bnet_dl_failed">Blizzard का डाउनलोडर रुक गया: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard त्रुटि %1$s</string> + <string name="bnet_update">अपडेट करें</string> <string name="bnet_store">Blizzard के गेम</string> <string name="stores_resume_install">इंस्टॉल फिर से शुरू करें</string> <string name="stores_dl_interrupted">बाधित</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index a7e0ca9754..fd309f9ad6 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1997,6 +1997,13 @@ <string name="stores_play">Játék</string> <string name="stores_install">Telepítés</string> <string name="bnet_open">Battle.net megnyitása</string> + <string name="bnet_dl_starting">A Blizzard letöltőjének indítása…</string> + <string name="bnet_dl_waiting">Várakozás a Battle.net bezárására…</string> + <string name="bnet_dl_queued">Várakozás a másik Battle.net-letöltésre…</string> + <string name="bnet_dl_client_first">Nyisd meg a Battle.netet, és jelentkezz be egyszer, majd innen telepítsd a játékait.</string> + <string name="bnet_dl_failed">A Blizzard letöltője leállt: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard-hiba: %1$s</string> + <string name="bnet_update">Frissítés</string> <string name="bnet_store">Blizzard-játékok</string> <string name="stores_resume_install">Telepítés folytatása</string> <string name="stores_dl_interrupted">Megszakítva</string> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index d5fc612c3f..6f8d35ffcd 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1976,6 +1976,13 @@ <string name="stores_play">Mainkan</string> <string name="stores_install">Instal</string> <string name="bnet_open">Buka Battle.net</string> + <string name="bnet_dl_starting">Memulai pengunduh Blizzard…</string> + <string name="bnet_dl_waiting">Menunggu Battle.net ditutup…</string> + <string name="bnet_dl_queued">Menunggu unduhan Battle.net lainnya…</string> + <string name="bnet_dl_client_first">Buka Battle.net dan masuk sekali, lalu instal gamenya dari sini.</string> + <string name="bnet_dl_failed">Pengunduh Blizzard berhenti: %1$s</string> + <string name="bnet_dl_agent_error">Kesalahan Blizzard %1$s</string> + <string name="bnet_update">Perbarui</string> <string name="bnet_store">Game Blizzard</string> <string name="stores_resume_install">Lanjutkan instalasi</string> <string name="stores_dl_interrupted">Terhenti</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d070b01e32..f410007078 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2010,6 +2010,13 @@ <string name="stores_play">Gioca</string> <string name="stores_install">Installa</string> <string name="bnet_open">Apri Battle.net</string> + <string name="bnet_dl_starting">Avvio del downloader di Blizzard…</string> + <string name="bnet_dl_waiting">In attesa della chiusura di Battle.net…</string> + <string name="bnet_dl_queued">In attesa dell\'altro download di Battle.net…</string> + <string name="bnet_dl_client_first">Apri Battle.net ed esegui l\'accesso una volta, poi installa qui i suoi giochi.</string> + <string name="bnet_dl_failed">Il downloader di Blizzard si è fermato: %1$s</string> + <string name="bnet_dl_agent_error">Errore Blizzard %1$s</string> + <string name="bnet_update">Aggiorna</string> <string name="bnet_store">Giochi Blizzard</string> <string name="stores_resume_install">Riprendi installazione</string> <string name="stores_dl_interrupted">Interrotto</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9bb40dcd11..5de521b824 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1978,6 +1978,13 @@ <string name="stores_play">プレイ</string> <string name="stores_install">インストール</string> <string name="bnet_open">Battle.net を開く</string> + <string name="bnet_dl_starting">Blizzard のダウンローダーを起動しています…</string> + <string name="bnet_dl_waiting">Battle.net が閉じるのを待っています…</string> + <string name="bnet_dl_queued">もう一つの Battle.net のダウンロードを待っています…</string> + <string name="bnet_dl_client_first">Battle.net を開いて一度サインインしてから、ここでゲームをインストールしてください。</string> + <string name="bnet_dl_failed">Blizzard のダウンローダーが停止しました: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard エラー %1$s</string> + <string name="bnet_update">アップデート</string> <string name="bnet_store">Blizzard のゲーム</string> <string name="stores_resume_install">インストールを再開</string> <string name="stores_dl_interrupted">中断</string> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index b76da8d131..5c87b95a3c 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1978,6 +1978,13 @@ <string name="stores_play">플레이</string> <string name="stores_install">설치</string> <string name="bnet_open">Battle.net 열기</string> + <string name="bnet_dl_starting">Blizzard 다운로더를 시작하는 중…</string> + <string name="bnet_dl_waiting">Battle.net이 닫히기를 기다리는 중…</string> + <string name="bnet_dl_queued">다른 Battle.net 다운로드를 기다리는 중…</string> + <string name="bnet_dl_client_first">Battle.net을 열고 한 번 로그인한 다음 여기에서 게임을 설치하세요.</string> + <string name="bnet_dl_failed">Blizzard 다운로더가 중지됨: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard 오류 %1$s</string> + <string name="bnet_update">업데이트</string> <string name="bnet_store">Blizzard 게임</string> <string name="stores_resume_install">설치 재개</string> <string name="stores_dl_interrupted">중단됨</string> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index e036753b5d..562683f18a 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1976,6 +1976,13 @@ <string name="stores_play">Main</string> <string name="stores_install">Pasang</string> <string name="bnet_open">Buka Battle.net</string> + <string name="bnet_dl_starting">Memulakan pemuat turun Blizzard…</string> + <string name="bnet_dl_waiting">Menunggu Battle.net ditutup…</string> + <string name="bnet_dl_queued">Menunggu muat turun Battle.net yang lain…</string> + <string name="bnet_dl_client_first">Buka Battle.net dan log masuk sekali, kemudian pasang permainannya dari sini.</string> + <string name="bnet_dl_failed">Pemuat turun Blizzard berhenti: %1$s</string> + <string name="bnet_dl_agent_error">Ralat Blizzard %1$s</string> + <string name="bnet_update">Kemas kini</string> <string name="bnet_store">Permainan Blizzard</string> <string name="stores_resume_install">Sambung pemasangan</string> <string name="stores_dl_interrupted">Terganggu</string> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index a9f9489c15..a979f2c44d 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1997,6 +1997,13 @@ <string name="stores_play">Spill</string> <string name="stores_install">Installer</string> <string name="bnet_open">Åpne Battle.net</string> + <string name="bnet_dl_starting">Starter Blizzards nedlaster…</string> + <string name="bnet_dl_waiting">Venter på at Battle.net lukkes…</string> + <string name="bnet_dl_queued">Venter på den andre Battle.net-nedlastingen…</string> + <string name="bnet_dl_client_first">Åpne Battle.net og logg på én gang, og installer deretter spillene herfra.</string> + <string name="bnet_dl_failed">Blizzards nedlaster stoppet: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard-feil %1$s</string> + <string name="bnet_update">Oppdater</string> <string name="bnet_store">Blizzard-spill</string> <string name="stores_resume_install">Gjenoppta installasjon</string> <string name="stores_dl_interrupted">Avbrutt</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d74633be94..ccef5c5df3 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1997,6 +1997,13 @@ <string name="stores_play">Spelen</string> <string name="stores_install">Installeren</string> <string name="bnet_open">Battle.net openen</string> + <string name="bnet_dl_starting">Blizzards downloader wordt gestart…</string> + <string name="bnet_dl_waiting">Wachten tot Battle.net is gesloten…</string> + <string name="bnet_dl_queued">Wachten op de andere Battle.net-download…</string> + <string name="bnet_dl_client_first">Open Battle.net en meld je één keer aan, installeer daarna de games hier.</string> + <string name="bnet_dl_failed">Blizzards downloader is gestopt: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard-fout %1$s</string> + <string name="bnet_update">Bijwerken</string> <string name="bnet_store">Blizzard-games</string> <string name="stores_resume_install">Installatie hervatten</string> <string name="stores_dl_interrupted">Onderbroken</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 121d781649..145d207a30 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2039,6 +2039,13 @@ <string name="stores_play">Graj</string> <string name="stores_install">Zainstaluj</string> <string name="bnet_open">Otwórz Battle.net</string> + <string name="bnet_dl_starting">Uruchamianie programu pobierającego Blizzarda…</string> + <string name="bnet_dl_waiting">Oczekiwanie na zamknięcie Battle.net…</string> + <string name="bnet_dl_queued">Oczekiwanie na drugie pobieranie z Battle.net…</string> + <string name="bnet_dl_client_first">Otwórz Battle.net i zaloguj się raz, a potem instaluj jego gry tutaj.</string> + <string name="bnet_dl_failed">Program pobierający Blizzarda zatrzymał się: %1$s</string> + <string name="bnet_dl_agent_error">Błąd Blizzarda %1$s</string> + <string name="bnet_update">Aktualizuj</string> <string name="bnet_store">Gry Blizzarda</string> <string name="stores_resume_install">Wznów instalację</string> <string name="stores_dl_interrupted">Przerwano</string> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 61fe3b5ff4..ab9b323b70 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2010,6 +2010,13 @@ <string name="stores_play">Jogar</string> <string name="stores_install">Instalar</string> <string name="bnet_open">Abrir o Battle.net</string> + <string name="bnet_dl_starting">A iniciar o transferidor da Blizzard…</string> + <string name="bnet_dl_waiting">A aguardar que o Battle.net feche…</string> + <string name="bnet_dl_queued">A aguardar a outra transferência do Battle.net…</string> + <string name="bnet_dl_client_first">Abra o Battle.net e inicie sessão uma vez; depois instale os jogos dele aqui.</string> + <string name="bnet_dl_failed">O transferidor da Blizzard parou: %1$s</string> + <string name="bnet_dl_agent_error">Erro da Blizzard %1$s</string> + <string name="bnet_update">Atualizar</string> <string name="bnet_store">Jogos da Blizzard</string> <string name="stores_resume_install">Retomar instalação</string> <string name="stores_dl_interrupted">Interrompida</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index c9e1e7b1b7..c5b7bd327d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2010,6 +2010,13 @@ <string name="stores_play">Jogar</string> <string name="stores_install">Instalar</string> <string name="bnet_open">Abrir o Battle.net</string> + <string name="bnet_dl_starting">Iniciando o downloader da Blizzard…</string> + <string name="bnet_dl_waiting">Aguardando o Battle.net fechar…</string> + <string name="bnet_dl_queued">Aguardando o outro download do Battle.net…</string> + <string name="bnet_dl_client_first">Abra o Battle.net e entre uma vez; depois instale os jogos dele aqui.</string> + <string name="bnet_dl_failed">O downloader da Blizzard parou: %1$s</string> + <string name="bnet_dl_agent_error">Erro da Blizzard %1$s</string> + <string name="bnet_update">Atualizar</string> <string name="bnet_store">Jogos da Blizzard</string> <string name="stores_resume_install">Retomar instalação</string> <string name="stores_dl_interrupted">Interrompido</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index b8e3b4954c..d4aa16f9d8 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2018,6 +2018,13 @@ <string name="stores_play">Joacă</string> <string name="stores_install">Instalează</string> <string name="bnet_open">Deschide Battle.net</string> + <string name="bnet_dl_starting">Se pornește programul de descărcare Blizzard…</string> + <string name="bnet_dl_waiting">Se așteaptă închiderea Battle.net…</string> + <string name="bnet_dl_queued">Se așteaptă cealaltă descărcare Battle.net…</string> + <string name="bnet_dl_client_first">Deschide Battle.net și conectează-te o dată, apoi instalează jocurile de aici.</string> + <string name="bnet_dl_failed">Programul de descărcare Blizzard s-a oprit: %1$s</string> + <string name="bnet_dl_agent_error">Eroare Blizzard %1$s</string> + <string name="bnet_update">Actualizează</string> <string name="bnet_store">Jocuri Blizzard</string> <string name="stores_resume_install">Reia instalarea</string> <string name="stores_dl_interrupted">Întreruptă</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 59e74118e7..0de18cd365 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2041,6 +2041,13 @@ <string name="stores_play">Играть</string> <string name="stores_install">Установить</string> <string name="bnet_open">Открыть Battle.net</string> + <string name="bnet_dl_starting">Запуск загрузчика Blizzard…</string> + <string name="bnet_dl_waiting">Ожидание закрытия Battle.net…</string> + <string name="bnet_dl_queued">Ожидание другой загрузки Battle.net…</string> + <string name="bnet_dl_client_first">Откройте Battle.net и войдите один раз, затем устанавливайте его игры здесь.</string> + <string name="bnet_dl_failed">Загрузчик Blizzard остановился: %1$s</string> + <string name="bnet_dl_agent_error">Ошибка Blizzard %1$s</string> + <string name="bnet_update">Обновить</string> <string name="bnet_store">Игры Blizzard</string> <string name="stores_resume_install">Продолжить установку</string> <string name="stores_dl_interrupted">Прервано</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 2c62e8b139..7e5ccf7d66 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1997,6 +1997,13 @@ <string name="stores_play">Spela</string> <string name="stores_install">Installera</string> <string name="bnet_open">Öppna Battle.net</string> + <string name="bnet_dl_starting">Startar Blizzards nedladdare…</string> + <string name="bnet_dl_waiting">Väntar på att Battle.net stängs…</string> + <string name="bnet_dl_queued">Väntar på den andra Battle.net-nedladdningen…</string> + <string name="bnet_dl_client_first">Öppna Battle.net och logga in en gång, installera sedan dess spel här.</string> + <string name="bnet_dl_failed">Blizzards nedladdare stoppades: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard-fel %1$s</string> + <string name="bnet_update">Uppdatera</string> <string name="bnet_store">Blizzard-spel</string> <string name="stores_resume_install">Återuppta installation</string> <string name="stores_dl_interrupted">Avbruten</string> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 38337b0fda..762cb944dd 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1976,6 +1976,13 @@ <string name="stores_play">เล่น</string> <string name="stores_install">ติดตั้ง</string> <string name="bnet_open">เปิด Battle.net</string> + <string name="bnet_dl_starting">กำลังเริ่มตัวดาวน์โหลดของ Blizzard…</string> + <string name="bnet_dl_waiting">กำลังรอให้ Battle.net ปิด…</string> + <string name="bnet_dl_queued">กำลังรอการดาวน์โหลด Battle.net อีกรายการ…</string> + <string name="bnet_dl_client_first">เปิด Battle.net และลงชื่อเข้าใช้หนึ่งครั้ง แล้วติดตั้งเกมจากที่นี่</string> + <string name="bnet_dl_failed">ตัวดาวน์โหลดของ Blizzard หยุดทำงาน: %1$s</string> + <string name="bnet_dl_agent_error">ข้อผิดพลาดของ Blizzard %1$s</string> + <string name="bnet_update">อัปเดต</string> <string name="bnet_store">เกมของ Blizzard</string> <string name="stores_resume_install">ดำเนินการติดตั้งต่อ</string> <string name="stores_dl_interrupted">ถูกขัดจังหวะ</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c1bbb9d33d..693747e851 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1991,6 +1991,13 @@ <string name="stores_play">Oyna</string> <string name="stores_install">Yükle</string> <string name="bnet_open">Battle.net\'i aç</string> + <string name="bnet_dl_starting">Blizzard indiricisi başlatılıyor…</string> + <string name="bnet_dl_waiting">Battle.net\'in kapanması bekleniyor…</string> + <string name="bnet_dl_queued">Diğer Battle.net indirmesi bekleniyor…</string> + <string name="bnet_dl_client_first">Battle.net\'i açıp bir kez oturum açın, ardından oyunlarını buradan yükleyin.</string> + <string name="bnet_dl_failed">Blizzard indiricisi durdu: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard hatası %1$s</string> + <string name="bnet_update">Güncelle</string> <string name="bnet_store">Blizzard oyunları</string> <string name="stores_resume_install">Yüklemeyi sürdür</string> <string name="stores_dl_interrupted">Kesintiye uğradı</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2cadb53c52..44e0418ddc 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2039,6 +2039,13 @@ <string name="stores_play">Грати</string> <string name="stores_install">Встановити</string> <string name="bnet_open">Відкрити Battle.net</string> + <string name="bnet_dl_starting">Запуск завантажувача Blizzard…</string> + <string name="bnet_dl_waiting">Очікування закриття Battle.net…</string> + <string name="bnet_dl_queued">Очікування іншого завантаження Battle.net…</string> + <string name="bnet_dl_client_first">Відкрийте Battle.net і увійдіть один раз, потім встановлюйте його ігри тут.</string> + <string name="bnet_dl_failed">Завантажувач Blizzard зупинився: %1$s</string> + <string name="bnet_dl_agent_error">Помилка Blizzard %1$s</string> + <string name="bnet_update">Оновити</string> <string name="bnet_store">Ігри Blizzard</string> <string name="stores_resume_install">Продовжити встановлення</string> <string name="stores_dl_interrupted">Перервано</string> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index b8a7da87a9..7a8194842c 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1976,6 +1976,13 @@ <string name="stores_play">Chơi</string> <string name="stores_install">Cài</string> <string name="bnet_open">Mở Battle.net</string> + <string name="bnet_dl_starting">Đang khởi động trình tải xuống của Blizzard…</string> + <string name="bnet_dl_waiting">Đang chờ Battle.net đóng…</string> + <string name="bnet_dl_queued">Đang chờ lượt tải Battle.net khác…</string> + <string name="bnet_dl_client_first">Mở Battle.net và đăng nhập một lần, sau đó cài trò chơi của nó tại đây.</string> + <string name="bnet_dl_failed">Trình tải xuống của Blizzard đã dừng: %1$s</string> + <string name="bnet_dl_agent_error">Lỗi Blizzard %1$s</string> + <string name="bnet_update">Cập nhật</string> <string name="bnet_store">Trò chơi Blizzard</string> <string name="stores_resume_install">Tiếp tục cài</string> <string name="stores_dl_interrupted">Bị gián đoạn</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2726014a0b..5e16b21607 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2056,6 +2056,13 @@ <string name="stores_play">游玩</string> <string name="stores_install">安装</string> <string name="bnet_open">打开 Battle.net</string> + <string name="bnet_dl_starting">正在启动暴雪下载器…</string> + <string name="bnet_dl_waiting">正在等待 Battle.net 关闭…</string> + <string name="bnet_dl_queued">正在等待另一个 Battle.net 下载…</string> + <string name="bnet_dl_client_first">请先打开 Battle.net 并登录一次,然后在这里安装其游戏。</string> + <string name="bnet_dl_failed">暴雪下载器已停止:%1$s</string> + <string name="bnet_dl_agent_error">暴雪错误 %1$s</string> + <string name="bnet_update">更新</string> <string name="bnet_store">暴雪游戏</string> <string name="stores_resume_install">继续安装</string> <string name="stores_dl_interrupted">已中断</string> diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index cdcc40b76a..6ca43c17f2 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1979,6 +1979,13 @@ <string name="stores_play">開啟遊戲</string> <string name="stores_install">安裝</string> <string name="bnet_open">開啟 Battle.net</string> + <string name="bnet_dl_starting">正在啟動暴雪下載器…</string> + <string name="bnet_dl_waiting">正在等待 Battle.net 關閉…</string> + <string name="bnet_dl_queued">正在等待另一個 Battle.net 下載…</string> + <string name="bnet_dl_client_first">請先開啟 Battle.net 並登入一次,然後在這裡安裝其遊戲。</string> + <string name="bnet_dl_failed">暴雪下載器已停止:%1$s</string> + <string name="bnet_dl_agent_error">暴雪錯誤 %1$s</string> + <string name="bnet_update">更新</string> <string name="bnet_store">Blizzard 遊戲</string> <string name="stores_resume_install">繼續安裝</string> <string name="stores_dl_interrupted">已中斷</string> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 43fb5e4434..77156849a5 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1979,6 +1979,13 @@ <string name="stores_play">執行</string> <string name="stores_install">安裝</string> <string name="bnet_open">開啟 Battle.net</string> + <string name="bnet_dl_starting">正在啟動暴雪下載器…</string> + <string name="bnet_dl_waiting">正在等待 Battle.net 關閉…</string> + <string name="bnet_dl_queued">正在等待另一個 Battle.net 下載…</string> + <string name="bnet_dl_client_first">請先開啟 Battle.net 並登入一次,然後在這裡安裝其遊戲。</string> + <string name="bnet_dl_failed">暴雪下載器已停止:%1$s</string> + <string name="bnet_dl_agent_error">暴雪錯誤 %1$s</string> + <string name="bnet_update">更新</string> <string name="bnet_store">Blizzard 遊戲</string> <string name="stores_resume_install">繼續安裝</string> <string name="stores_dl_interrupted">已中斷</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9fa3fe8caf..d260c3da88 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2094,6 +2094,13 @@ <string name="stores_play">Play</string> <string name="stores_install">Install</string> <string name="bnet_open">Open Battle.net</string> + <string name="bnet_dl_starting">Starting Blizzard\'s downloader…</string> + <string name="bnet_dl_waiting">Waiting for Battle.net to close…</string> + <string name="bnet_dl_queued">Waiting for the other Battle.net download…</string> + <string name="bnet_dl_client_first">Open Battle.net and sign in once, then install its games here.</string> + <string name="bnet_dl_failed">Blizzard\'s downloader stopped: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard error %1$s</string> + <string name="bnet_update">Update</string> <string name="bnet_store">Blizzard games</string> <string name="stores_resume_install">Resume install</string> <string name="stores_dl_interrupted">Interrupted</string> diff --git a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt new file mode 100644 index 0000000000..9a907b3720 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt @@ -0,0 +1,75 @@ +package com.droiddeck.launcher.stores.battlenet + +import com.droiddeck.launcher.runtime.BattleNet +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import java.util.Locale + +class BattleNetInstallTest { + private val buildInfo = """ + Branch!STRING:0|Active!DEC:1|Build Key!HEX:16|CDN Key!HEX:16|Install Key!HEX:16|IM Size!DEC:4|Version!STRING:0|Product!STRING:0 + eu|0|11111111111111111111111111111111|db0583272ed15286569b5f24ce516876|||16.1.1.1|gryphon + us|1|e474008a3535d8ea978949a90d9873e6|db0583272ed15286569b5f24ce516876|||16.1.2.119725|gryphon + """.trimIndent() + + private val versions = """ + Region!STRING:0|BuildConfig!HEX:16|CDNConfig!HEX:16|KeyRing!HEX:16|BuildId!DEC:4|VersionsName!String:0|ProductConfig!HEX:16 + ## seqn = 4048130 + us|f00d008a3535d8ea978949a90d9873e6|db0583272ed15286569b5f24ce516876||119800|16.1.3.119800|f6a454799d25791e5a37a7547d75ce49 + eu|e474008a3535d8ea978949a90d9873e6|db0583272ed15286569b5f24ce516876||119725|16.1.2.119725|f6a454799d25791e5a37a7547d75ce49 + """.trimIndent() + + @Test fun theActiveRowGivesTheRegionAndBuildOnDisk() { + assertEquals("us" to "e474008a3535d8ea978949a90d9873e6", BattleNetInstall.buildKey(buildInfo)) + assertNull(BattleNetInstall.buildKey("Branch!STRING:0|Active!DEC:1\n")) + assertNull(BattleNetInstall.buildKey("Branch!STRING:0|Active!DEC:1|Build Key!HEX:16\nus|1|not-a-key\n")) + } + + @Test fun theLiveBuildIsReadForTheSameRegion() { + assertEquals("f00d008a3535d8ea978949a90d9873e6", BattleNetInstall.latestBuild(versions, "us")) + assertEquals("e474008a3535d8ea978949a90d9873e6", BattleNetInstall.latestBuild(versions, "eu")) + assertNull(BattleNetInstall.latestBuild(versions, "kr")) + assertNull(BattleNetInstall.latestBuild("", "us")) + } + + @Test fun theDeviceLanguagePicksABlizzardLocale() { + assertEquals("enUS", BattleNetInstall.locale(Locale.US)) + assertEquals("enGB", BattleNetInstall.locale(Locale.UK)) + assertEquals("enUS", BattleNetInstall.locale(Locale("en", "AU"))) + assertEquals("deDE", BattleNetInstall.locale(Locale.GERMANY)) + assertEquals("ptBR", BattleNetInstall.locale(Locale("pt", "BR"))) + assertEquals("ptPT", BattleNetInstall.locale(Locale("pt", "PT"))) + assertEquals("zhTW", BattleNetInstall.locale(Locale.forLanguageTag("zh-Hant-HK"))) + assertEquals("zhCN", BattleNetInstall.locale(Locale.SIMPLIFIED_CHINESE)) + assertEquals("enUS", BattleNetInstall.locale(Locale("nl", "NL"))) + } + + @Test fun theCountryIsSentInBothForms() { + assertEquals("DEU" to "DE", BattleNetInstall.country(Locale.GERMANY)) + assertEquals("USA" to "US", BattleNetInstall.country(Locale("en"))) + } + + @Test fun everyStoreTitleWithAProductInstallsHeadless() { + val products = BattleNet.TITLES.mapNotNull { it.product } + assertTrue(products.all { Regex("[a-z0-9_]{1,32}").matches(it) }) + assertTrue(BattleNetInstall.headless(CatalogItem(Store.BATTLENET, "gryphon", "Warcraft Rumble", null))) + assertEquals("hsb", BattleNetInstall.product("hs_beta")) + assertEquals("d3", BattleNetInstall.product("diablo3_enus")) + assertFalse(BattleNetInstall.headless(CatalogItem(Store.BATTLENET, "d3cn", "Diablo III", null))) + assertFalse(BattleNetInstall.headless(CatalogItem(Store.EPIC, "gryphon", "Warcraft Rumble", null))) + } + + @Test fun theAgentStatusPicksTheDownloadStep() { + assertEquals(BattleNetInstall.Step.PREPARING, BattleNetInstall.step(1008, 0, 0, 0)) + assertEquals(BattleNetInstall.Step.PREPARING, BattleNetInstall.step(1003, 500, 0, 0)) + assertEquals(BattleNetInstall.Step.DOWNLOADING, BattleNetInstall.step(1003, 500, 31405777, 6746574227)) + assertEquals(BattleNetInstall.Step.APPLYING, BattleNetInstall.step(1003, 500, 6746574227, 6746574227)) + assertEquals(BattleNetInstall.Step.APPLYING, BattleNetInstall.step(1003, 2000, 1, 9)) + assertEquals(BattleNetInstall.Step.APPLYING, BattleNetInstall.step(1004, 1000, 0, 0)) + } +} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index cf3e6ae85d..0552642b8e 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -67,6 +67,110 @@ GX_API_SETTING = re.compile(r"(?im)^[ \t]*SET[ \t]+gxApi[ \t].*$") GX_API_MARK = ".droiddeck-d3d11" STEAM_CLIENT = {"steam", "steamwebhelper"} LOG = os.path.join(CACHE, "battlenet.log") +AGENT_DIR = ("ProgramData", "Battle.net", "Agent") +AGENT_BUILD = re.compile(r"Agent\.(\d+)") +AGENT_PORT = re.compile(r"\d{2,5}") +AGENT_START = 90 +AGENT_HELPER = "agent.js" +AGENT_RUNTIME = "agent-runtime" +AGENT_LOG = "agent.log" +AGENT_LOG_LIMIT = 4 << 20 +HEADLESS = ["--backend", "headless", "-w", "640", "-h", "480"] +PRODUCT = re.compile(r"[a-z0-9_]{1,32}") +LOCALE = re.compile(r"[a-z]{2}[A-Z]{2}") +COUNTRY = re.compile(r"[A-Z]{3}") +REGION = re.compile(r"[A-Z]{2}") +REPORT = "BNET" +ETA_LIMIT = 30 * 86400 +DONE_STATE = 1004 +REPORTED = ("progress", "playable_progress", "download_rate", "download_remaining", "estimated_time_in_sec", "state", + "playable", "paused", "download_complete", "installed", "error") +AGENT_SCRIPT = r"""var a = WScript.Arguments, port = a(0), action = a(1), uid = a(2), product = a(3), dir = a(4); +var lang = a(5), country = a(6), region = a(7), out = a(8), token = ""; +var fso = new ActiveXObject("Scripting.FileSystemObject"); + +function save(name, text) { + var f = fso.CreateTextFile(out + name + ".tmp", true, true); + f.Write(text); + f.Close(); + if (fso.FileExists(out + name)) fso.DeleteFile(out + name); + fso.MoveFile(out + name + ".tmp", out + name); +} + +function call(method, path, body) { + var r = new ActiveXObject("WinHttp.WinHttpRequest.5.1"); + r.SetTimeouts(10000, 10000, 30000, 30000); + r.Open(method, "http://127.0.0.1:" + port + path, false); + r.SetRequestHeader("User-Agent", "phoenix-agent/1.0"); + if (token) r.SetRequestHeader("Authorization", token); + r.Send(body || ""); + return r.ResponseText; +} + +function field(text, name) { + var m = new RegExp('"' + name + '"\\s*:\\s*"([^"]*)"').exec(text); + return m ? m[1] : ""; +} + +function install() { + var form = call("POST", "/install", '{"uid":"' + uid + '","instructions_patch_url":"http://' + zone + '.patch.battle.net:1119/' + + product + '","instructions_product":"NGDP","monitor_pid":12345,"priority":{"insert_at_head":true,"value":900}}'); + save(".form", form); + if (form.indexOf('"' + lang + '"') < 0) lang = "enUS"; + var locale = lang.toLowerCase(); + call("POST", "/install/" + uid, '{"account_country":"' + country + '","finalized":true,"game_dir":"' + dir + '","geo_ip_country":"' + + region + '","language":["' + locale + '"],"selected_asset_locale":"' + locale + '","selected_locale":"' + locale + + '","shortcut":"none","tome_torrent":""}'); + watch("/install/" + uid); +} + +function watch(path) { + var started = false; + for (var i = 0; ; i++) { + var s = call("GET", path); + save(".json", s); + if (/"error"\s*:\s*[1-9]/.test(s)) break; + var state = /"state"\s*:\s*(\d+)/.exec(s.replace(/"extended_status"\s*:\s*\{[^}]*\}/, "")), complete = /"download_complete"\s*:\s*true/.test(s); + state = state ? +state[1] : 0; + if (state == 1000 || state == 1003 || !complete) started = true; + if (started && (state == 1004 || complete && /"playable"\s*:\s*true/.test(s))) break; + if (!started && state == 1004 && i >= 20) break; + if (!started && i >= 180) { + if (/"playable"\s*:\s*true/.test(call("GET", "/game/" + uid))) break; + throw new Error("the agent did not start the " + action); + } + WScript.Sleep(1000); + } + save(".game", call("GET", "/game/" + uid)); +} + +function update() { + save(".form", call("POST", "/update", '{"uid":"' + uid + '","priority":{"insert_at_head":true,"value":900}}')); + watch("/update/" + uid); +} + +function uninstall() { + save(".json", call("POST", "/uninstall", '{"uid":"' + uid + '","run_compaction":true}')); + for (var i = 0; i < 900; i++) { + var s = call("GET", "/game/" + uid); + save(".game", s); + if (!/"installed"\s*:\s*true/.test(s)) break; + WScript.Sleep(1000); + } +} + +var zone = "us"; +try { + var agent = call("GET", "/agent"); + token = field(agent, "authorization"); + zone = field(agent, "region") || "us"; + if (!token) throw new Error("no authorization from the agent"); + if (action == "install") install(); else if (action == "update") update(); else uninstall(); +} catch (e) { + save(".error", e.message || "the agent stopped answering"); + WScript.Quit(1); +} +""" LOG_LIMIT = 512 << 10 @@ -933,6 +1037,227 @@ def install_game(root, uid): return open_client(root) +def agent_exe(root): + folder = os.path.join(drive_c(root), *AGENT_DIR) + try: + names = os.listdir(folder) + except OSError: + return None + builds = sorted(((int(m.group(1)), name) for name in names for m in [AGENT_BUILD.fullmatch(name)] if m), reverse=True) + for _, name in builds: + exe = os.path.join(folder, name, "Agent.exe") + if os.path.isfile(exe): + return exe + return None + + +def agent_port(root): + try: + with open(os.path.join(drive_c(root), *AGENT_DIR, "Agent.dat"), encoding="ascii", errors="replace") as f: + text = f.read().strip() + except OSError: + return None + return int(text) if AGENT_PORT.fullmatch(text) else None + + +def answers(port, timeout=2): + try: + conn = http.client.HTTPConnection("127.0.0.1", port, timeout=timeout) + try: + conn.request("GET", "/agent", headers={"User-Agent": "phoenix-agent/1.0"}) + conn.getresponse().read() + finally: + conn.close() + return True + except (OSError, http.client.HTTPException): + return False + + +def agent_env(): + env = proton_env() + env["PROTON_USE_XALIA"] = "0" + return env + + +def agent_failed(status, reason): + say(reason) + try: + with open(status.replace("\\", "/")[2:] + ".error", "w", encoding="utf-8") as f: + f.write(reason) + except OSError: + pass + + +def agent_serve(root, args, wait=None, poll=None): + exe = agent_exe(root) + if exe is None: + agent_failed(args[-1], "no Blizzard Agent in the Battle.net prefix") + return 3 + cmd = [PROTON_RUN, "--prefix", APP_ID, "--verb", "run"] + say("starting Blizzard's Agent on its own: %s" % exe) + try: + agent = subprocess.Popen(cmd + [exe, "--internalclienttools"], stdin=subprocess.DEVNULL, env=agent_env()) + except OSError as error: + say("%s: %s" % (PROTON_RUN, error)) + return 127 + deadline = time.monotonic() + (AGENT_START if wait is None else wait) + port = None + while time.monotonic() < deadline: + port = agent_port(root) + if port and answers(port): + break + if agent.poll() is not None and not any(program(argv) == AGENT for _, argv in wine_processes(os.path.join(prefix(root), "pfx"))): + agent_failed(args[-1], "the Agent exited before it answered") + return 4 + port = None + time.sleep(POLL if poll is None else poll) + if port is None: + agent_failed(args[-1], "the Agent did not answer in time") + return 4 + helper = os.path.join(CACHE, AGENT_HELPER) + with open(helper, "w", encoding="utf-8") as f: + f.write(AGENT_SCRIPT) + cscript = os.path.join(drive_c(root), "windows", "system32", "cscript.exe") + say("the Agent answers on port %d; %s %s" % (port, args[0], args[1])) + return subprocess.call(cmd + [cscript, "//nologo", "Z:" + helper.replace("/", "\\"), str(port)] + list(args), env=agent_env()) + + +def emit(kind, value=""): + print(("%s_%s %s" % (REPORT, kind, value)).rstrip(), flush=True) + + +def read_status(path): + try: + with open(path, "rb") as f: + data = f.read() + except OSError: + return None + for encoding in ("utf-16", "utf-8-sig"): + try: + return json.loads(data.decode(encoding)) + except (UnicodeDecodeError, ValueError): + continue + return None + + +def summary(status): + out = {key: status[key] for key in REPORTED if key in status} + for key in ("download_current", "download_total"): + value = status.get(key) + if isinstance(value, list) and value and isinstance(value[0], (int, float)): + out[key] = value[0] + phase = (status.get("extended_status") or {}).get("state") + if isinstance(phase, int): + out["phase"] = phase + eta = out.get("estimated_time_in_sec") + if not isinstance(eta, int) or not 0 <= eta <= ETA_LIMIT: + out.pop("estimated_time_in_sec", None) + return out + + +def agent_job(root, action, uid, product="", folder="", locale="enUS", country="USA", region="US", poll=None, wait=None): + pfx = os.path.join(prefix(root), "pfx") + if not installed(root) or agent_exe(root) is None: + emit("ERROR", "client") + return 3 + windows = "" + if action == "install": + if not folder.startswith("/") or any(c in folder for c in '"\\\n'): + emit("ERROR", "folder") + return 2 + try: + os.makedirs(folder, exist_ok=True) + except OSError as error: + say("%s not made: %s" % (folder, error)) + emit("ERROR", "folder") + return 2 + windows = "Z:" + folder + told = None + while True: + processes = wine_processes(pfx) + busy = bool(processes) and not idle(processes) + lock = None if busy else acquire() + if lock is not None: + break + state = "waiting" if busy else "queued" + if told != state: + say("%s; the %s of %s waits for it" % ("Battle.net or a game is open" if busy else "another Battle.net job holds the prefix", + action, uid)) + emit("STATE", state) + told = state + time.sleep(POLL if poll is None else poll) + with lock: + stop_leftovers(pfx) + emit("STATE", "starting") + base = os.path.join(CACHE, "agent-%s" % uid) + for suffix in (".json", ".game", ".form", ".error"): + try: + os.unlink(base + suffix) + except OSError: + pass + runtime = os.path.join(CACHE, AGENT_RUNTIME) + os.makedirs(runtime, mode=0o700, exist_ok=True) + env = agent_env() + for name in ("DISPLAY", "WAYLAND_DISPLAY"): + env.pop(name, None) + env["XDG_RUNTIME_DIR"] = runtime + cmd = ["gamescope"] + HEADLESS + ["--", os.path.abspath(sys.argv[0]), "agent-serve", action, uid, product or "-", + windows or "-", locale, country, region, "Z:" + base.replace("/", "\\")] + say("%s %s through the Agent: %s" % (action, uid, " ".join(cmd))) + output = os.path.join(CACHE, AGENT_LOG) + try: + if os.path.getsize(output) > AGENT_LOG_LIMIT: + os.replace(output, output + ".1") + except OSError: + pass + with open(output, "ab") as log: + child = subprocess.Popen(cmd, stdin=subprocess.DEVNULL, stdout=log, stderr=log, env=env) + seen = None + while True: + done = child.poll() is not None + status = read_status(base + ".json") + if status is not None and action != "uninstall": + brief = summary(status) + if brief != seen: + emit("PROGRESS", json.dumps(brief, sort_keys=True)) + seen = brief + if done: + break + time.sleep(POLL if poll is None else poll) + leftovers = wine_processes(pfx) + if leftovers and idle(leftovers): + stop(leftovers) + game = read_status(base + ".game") or {} + status = read_status(base + ".json") or {} + try: + with open(base + ".error", "rb") as f: + data = f.read() + reason = data.decode("utf-16" if data[:2] in (b"\xff\xfe", b"\xfe\xff") else "utf-8", "replace").strip() \ + or "the agent stopped answering" + except OSError: + reason = None + code = status.get("error") + if reason is None and isinstance(code, int) and code > 0: + emit("ERROR", "agent %d" % code) + say("the %s of %s stopped: Agent error %d" % (action, uid, code)) + return 5 + if reason is None and action != "uninstall" and game.get("installed") is True \ + and (game.get("playable") is True or status.get("state") == DONE_STATE): + binary = ((game.get("binaries") or {}).get("game") or {}).get("relative_path", "") + emit("DONE", json.dumps({"install_dir": game.get("install_dir", windows), "exe": binary, + "version": game.get("local_version", "")}, sort_keys=True)) + say("%s %s in %s" % (uid, "updated" if action == "update" else "installed", game.get("install_dir", windows))) + return 0 + if reason is None and action == "uninstall" and game.get("installed") is not True: + emit("DONE", json.dumps({"uninstalled": uid})) + say("%s uninstalled" % uid) + return 0 + reason = reason or "exit %d" % child.returncode + say("the %s of %s stopped: %s" % (action, uid, reason)) + emit("ERROR", "stopped %s" % reason.replace("\n", " ")) + return 1 + + def main(argv): global LIBRARY argv = list(argv) @@ -943,10 +1268,18 @@ def main(argv): LIBRARY = os.path.normpath(argv[1]) argv = argv[2:] action = argv[0] if argv else "open" + if action == "agent-serve" and len(argv) == 9: + return agent_serve(steam_root(), argv[1:]) + if action == "agent-install" and len(argv) == 7 and GAME_UID.fullmatch(argv[1]) and PRODUCT.fullmatch(argv[2]) and argv[3].startswith("/") \ + and LOCALE.fullmatch(argv[4]) and COUNTRY.fullmatch(argv[5]) and REGION.fullmatch(argv[6]): + return agent_job(steam_root(), "install", argv[1], argv[2], os.path.normpath(argv[3]), argv[4], argv[5], argv[6]) + if action in ("agent-update", "agent-uninstall") and len(argv) == 2 and GAME_UID.fullmatch(argv[1]): + return agent_job(steam_root(), action[len("agent-"):], argv[1]) launching = action == "launch" and len(argv) == 2 and CODE.fullmatch(argv[1]) getting = action == "install-game" and len(argv) == 2 and GAME_UID.fullmatch(argv[1]) if not (launching or getting) and (action not in ("open", "install", "status") or len(argv) > 1): - say("usage: droiddeck-battlenet [--library DIR] [open | install | status | launch CODE | install-game ID]") + say("usage: droiddeck-battlenet [--library DIR] [open | install | status | launch CODE | install-game ID | " + "agent-install ID PRODUCT DIR LOCALE COUNTRY REGION | agent-update ID | agent-uninstall ID]") return 2 root = steam_root() if action == "status": diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index 2a953dfe7f..b44d7b424a 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -1,3 +1,4 @@ +import contextlib import json import os from pathlib import Path @@ -1064,5 +1065,183 @@ class HandOverTest(Harness): self.assertEqual(self.calls, []) +class AgentTest(Temp): + def test_the_newest_agent_build_and_its_port_are_found(self): + root = str(self.tmp / "Steam") + agent = "Steam/steamapps/compatdata/%s/pfx/drive_c/ProgramData/Battle.net/Agent" % BNET["APP_ID"] + self.write(agent + "/Agent.9100/Agent.exe", b"MZ") + self.write(agent + "/Agent.9824/Agent.exe", b"MZ") + os.makedirs(self.tmp / agent / "Agent.9999") + self.write(agent + "/Agent.dat", "39211\n") + self.assertTrue(BNET["agent_exe"](root).endswith("Agent.9824/Agent.exe")) + self.assertEqual(BNET["agent_port"](root), 39211) + self.write(agent + "/Agent.dat", "not a port") + self.assertIsNone(BNET["agent_port"](root)) + + def test_progress_keeps_the_fields_the_app_reads(self): + status = {"progress": 0.35, "download_current": [2397, 0, 0], "download_total": [6746, 0, 0], "download_rate": 34076920, + "state": 1003, "build_config_kv_pairs": {"x": "y"}, "regional_version_info": {}, "estimated_time_in_sec": 120, + "extended_status": {"current": 1, "state": 500, "total": 2, "unit_type": "bytes"}} + self.assertEqual(BNET["summary"](status), {"progress": 0.35, "download_current": 2397, "download_total": 6746, + "download_rate": 34076920, "state": 1003, "estimated_time_in_sec": 120, "phase": 500}) + + def test_an_unknown_time_left_is_not_reported(self): + for eta in (18446744073709551615, -1, 1.5): + with self.subTest(eta): + self.assertNotIn("estimated_time_in_sec", BNET["summary"]({"estimated_time_in_sec": eta})) + + def test_the_driver_script_reads_its_arguments_in_the_order_they_are_passed(self): + script = BNET["AGENT_SCRIPT"] + self.assertIn("port = a(0), action = a(1), uid = a(2), product = a(3), dir = a(4)", script) + self.assertIn("lang = a(5), country = a(6), region = a(7), out = a(8)", script) + self.assertIn('"--internalclienttools"', (BIN / "droiddeck-battlenet").read_text()) + + +class AgentJobTest(Harness): + def setUp(self): + super().setUp() + self.lines = [] + self.files = {} + self.started = [] + self.envs = [] + test = self + + class Child: + def __init__(self, cmd, **kwargs): + test.started.append(cmd) + test.envs.append(kwargs.get("env") or {}) + base = cmd[-1][2:].replace("\\", "/") + for suffix, value in test.files.items(): + with open(base + suffix, "wb") as f: + f.write(value.encode("utf-16")) + self.returncode = 0 + + def poll(self): + return 0 + + patcher = mock.patch.dict(BNET, {"emit": lambda kind, value="": self.lines.append((kind, value)), + "stop_leftovers": lambda pfx: True, "CACHE": str(self.tmp / "cache")}) + patcher.start() + self.addCleanup(patcher.stop) + popen = mock.patch.object(BNET["subprocess"], "Popen", Child) + popen.start() + self.addCleanup(popen.stop) + + def install(self): + super().install() + self.write("Steam/steamapps/compatdata/%s/pfx/drive_c/ProgramData/Battle.net/Agent/Agent.9824/Agent.exe" % BNET["APP_ID"], b"MZ") + + def test_a_game_downloads_headless_and_reports_where_it_landed(self): + self.install() + folder = str(self.tmp / "Games/Battle.net/Warcraft Rumble") + self.files = { + ".json": json.dumps({"progress": 1.0, "download_complete": True, "state": 1004, "download_current": [6746, 0, 0], + "download_total": [6746, 0, 0]}), + ".game": json.dumps({"installed": True, "install_dir": "Z:" + folder, "local_version": "16.1.2.119725", + "binaries": {"game": {"relative_path": "WarcraftRumble.exe"}}}), + } + code = BNET["agent_job"](self.root, "install", "gryphon", "gryphon", folder, "enUS", "USA", "US", poll=0) + self.assertEqual(code, 0) + self.assertTrue(os.path.isdir(folder)) + cmd = self.started[0] + self.assertEqual(cmd[:6], ["gamescope", "--backend", "headless", "-w", "640", "-h"]) + self.assertEqual(cmd[cmd.index("--") + 2:-1], ["agent-serve", "install", "gryphon", "gryphon", "Z:" + folder, "enUS", "USA", "US"]) + self.assertEqual([kind for kind, _ in self.lines], ["STATE", "PROGRESS", "DONE"]) + self.assertEqual(json.loads(self.lines[-1][1]), {"install_dir": "Z:" + folder, "exe": "WarcraftRumble.exe", "version": "16.1.2.119725"}) + + def test_an_agent_error_is_reported_with_its_code(self): + self.install() + self.files = {".json": json.dumps({"error": 2421, "progress": 0.0})} + self.assertEqual(BNET["agent_job"](self.root, "install", "fenris", "fenris", str(self.tmp / "D4"), "enUS", "USA", "US", poll=0), 5) + self.assertEqual(self.lines[-1], ("ERROR", "agent 2421")) + + def test_a_driver_failure_is_reported_with_its_reason(self): + self.install() + self.files = {".error": "the agent stopped answering"} + self.assertEqual(BNET["agent_job"](self.root, "update", "wow", poll=0), 1) + self.assertEqual(self.lines[-1], ("ERROR", "stopped the agent stopped answering")) + + def test_an_update_reports_the_new_version(self): + self.install() + self.files = {".json": json.dumps({"progress": 1.0}), + ".game": json.dumps({"installed": True, "playable": True, "install_dir": "Z:/g", "local_version": "2"})} + self.assertEqual(BNET["agent_job"](self.root, "update", "gryphon", poll=0), 0) + self.assertIn("agent-serve", self.started[0]) + self.assertEqual(json.loads(self.lines[-1][1])["version"], "2") + + def test_a_game_left_unplayable_is_not_reported_as_done(self): + self.install() + self.files = {".json": json.dumps({"state": 1008, "download_complete": True, "progress": 0.0}), + ".game": json.dumps({"installed": True, "playable": False, "install_dir": "Z:/g", "local_version": "2"})} + self.assertEqual(BNET["agent_job"](self.root, "update", "gryphon", poll=0), 1) + self.assertEqual(self.lines[-1][0], "ERROR") + + def test_the_driver_only_stops_once_the_agent_has_really_run(self): + script = BNET["AGENT_SCRIPT"] + self.assertIn("if (started && (state == 1004 || complete && /\"playable\"\\s*:\\s*true/.test(s))) break;", script) + self.assertNotIn('"progress"', script) + + def test_an_uninstall_is_done_once_the_agent_no_longer_lists_it(self): + self.install() + self.files = {".json": json.dumps({}), ".game": json.dumps({"installed": False})} + self.assertEqual(BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0), 0) + self.assertEqual(self.lines[-1], ("DONE", json.dumps({"uninstalled": "gryphon"}))) + + def test_a_large_agent_log_is_rotated_before_a_job(self): + self.install() + os.makedirs(self.tmp / "cache") + log = self.tmp / "cache" / "agent.log" + log.write_bytes(b"x" * (BNET["AGENT_LOG_LIMIT"] + 1)) + self.files = {".game": json.dumps({"installed": False})} + BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0) + self.assertEqual((self.tmp / "cache" / "agent.log.1").stat().st_size, BNET["AGENT_LOG_LIMIT"] + 1) + self.assertEqual(log.stat().st_size, 0) + + def test_it_queues_behind_another_battle_net_job(self): + self.install() + self.files = {".game": json.dumps({"installed": False})} + locks = iter([None, contextlib.nullcontext()]) + with mock.patch.dict(BNET, {"acquire": lambda *a: next(locks)}): + self.assertEqual(BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0), 0) + self.assertEqual(self.lines[:2], [("STATE", "queued"), ("STATE", "starting")]) + + def test_without_battle_net_nothing_starts(self): + self.assertEqual(BNET["agent_job"](self.root, "install", "gryphon", "gryphon", str(self.tmp / "g"), "enUS", "USA", "US", poll=0), 3) + self.assertEqual(self.lines, [("ERROR", "client")]) + self.assertEqual(self.started, []) + + def test_it_waits_while_battle_net_or_a_game_is_open(self): + self.install() + self.states = [self.clients() + [(40, self.GAME)], [(40, self.GAME)], []] + self.files = {".game": json.dumps({"installed": False})} + self.assertEqual(BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0), 0) + self.assertEqual(self.lines[0], ("STATE", "waiting")) + self.assertEqual(self.lines[1], ("STATE", "starting")) + + def test_gamescope_gets_no_display_but_the_agent_keeps_the_one_gamescope_gives_it(self): + self.install() + os.environ.update(DISPLAY=":5", WAYLAND_DISPLAY="wayland-1") + self.files = {".game": json.dumps({"installed": False})} + BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0) + self.assertNotIn("DISPLAY", self.envs[0]) + self.assertNotIn("WAYLAND_DISPLAY", self.envs[0]) + self.assertEqual(self.envs[0]["PROTON_USE_XALIA"], "0") + os.environ["DISPLAY"] = ":0" + self.assertEqual(BNET["agent_env"]()["DISPLAY"], ":0") + + def test_only_valid_arguments_start_a_job(self): + calls = [] + with mock.patch.dict(BNET, {"agent_job": lambda *a, **k: calls.append(a[1:]) or 0}): + for argv in (["agent-install", "gryphon", "gryphon", "relative/dir", "enUS", "USA", "US"], + ["agent-install", "gryphon", "Gry phon", "/g", "enUS", "USA", "US"], + ["agent-install", "gryphon", "gryphon", "/g", "english", "USA", "US"], + ["agent-update"], ["agent-uninstall", "Gryphon"]): + with self.subTest(argv): + self.assertEqual(BNET["main"](argv), 2) + self.assertEqual(BNET["main"](["agent-install", "gryphon", "gryphon", "/g/../g/Rumble", "enUS", "USA", "US"]), 0) + self.assertEqual(BNET["main"](["agent-update", "wow_classic"]), 0) + self.assertEqual(calls, [("install", "gryphon", "gryphon", "/g/Rumble", "enUS", "USA", "US"), ("update", "wow_classic")]) + + if __name__ == "__main__": unittest.main() From c48297e0d123dca3196966fb3b0705cf02c60aa9 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 07:10:44 -0400 Subject: [PATCH 062/135] fix: wait for a cancelled Battle.net job before removing it, and bound uninstall waits A cancelled install now waits for its Agent job to end before the uninstall runs, and removes the folder only once the Agent no longer lists the game or the folder is empty. Uninstall gives up when Battle.net or a game keeps the prefix busy for a minute, so the page falls back to opening Battle.net. An uninstall only counts when the Agent reports the game as not installed. --- .../stores/battlenet/BattleNetInstall.kt | 56 ++++++++++++++----- app/src/main/res/values-pt-rPT/strings.xml | 4 +- .../overlay/usr/local/bin/droiddeck-battlenet | 2 +- tools/tests/test_battlenet.py | 6 ++ 4 files changed, 51 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt index 925f113b14..fa49fbd478 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt @@ -25,6 +25,7 @@ import java.net.HttpURLConnection import java.net.URL import java.util.Locale import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicBoolean object BattleNetInstall { @@ -37,6 +38,7 @@ object BattleNetInstall { private const val VERSIONS = "https://%s.version.battle.net/v2/products/%s/versions" private const val BUILD_INFO = ".build.info" private const val CHECK_AGAIN_MS = 30 * 60_000L + private const val START_WAIT_MS = 60_000L internal val LOCALES = listOf( "enUS", "enGB", "esMX", "esES", "ptBR", "ptPT", "frFR", "deDE", "itIT", "ruRU", "jaJP", "koKR", "plPL", "trTR", @@ -114,18 +116,33 @@ object BattleNetInstall { fun uninstall(context: Context, game: InstalledStoreGame): Boolean { if (product(game.sidecar.id) == null || !BattleNet.installed(context)) return false - val uid = installUid(context, game) - var done = false - val code = runCatching { - run(context, listOf("agent-uninstall", uid), AddedGames.guestPath(context, game.folder), null) { line -> - if (line.startsWith(DONE)) done = true - } - }.onFailure { Log.w(TAG, "uninstall $uid", it) }.getOrDefault(-1) - Log.i(TAG, "uninstall $uid: ${if (done) "done" else "exit $code"}") + val done = agentUninstall(context, installUid(context, game), game.folder) if (done) StoresState.post { StoresState.notifyLibraryChanged(context.applicationContext) } return done } + internal fun agentUninstall(context: Context, uid: String, folder: File): Boolean { + val stop = AtomicBoolean(false) + val started = AtomicBoolean(false) + val done = AtomicBoolean(false) + val guard = Thread({ + try { + Thread.sleep(START_WAIT_MS) + if (!started.get()) stop.set(true) + } catch (_: InterruptedException) { + } + }, "battlenet-uninstall-wait").apply { isDaemon = true; start() } + val code = runCatching { + run(context, listOf("agent-uninstall", uid), AddedGames.guestPath(context, folder), stop) { line -> + if (line == STATE + "starting") started.set(true) + if (line.startsWith(DONE)) done.set(true) + } + }.onFailure { Log.w(TAG, "uninstall $uid", it) }.getOrDefault(-1) + guard.interrupt() + Log.i(TAG, "uninstall $uid: ${if (done.get()) "done" else if (stop.get()) "Battle.net stayed busy" else "exit $code"}") + return done.get() + } + internal fun buildKey(text: String): Pair<String, String>? { val rows = text.lines().filter { it.isNotBlank() } if (rows.size < 2) return null @@ -215,10 +232,21 @@ internal class BattleNetInstaller( private val update: Boolean, ) : DownloadQueue.DownloadJob { private val cancelled = AtomicBoolean(false) + private val started = AtomicBoolean(false) + private val ended = java.util.concurrent.CountDownLatch(1) private var before = 0L private var kept = -1L override fun run(handle: DownloadQueue.JobHandle): String? { + started.set(true) + try { + return if (cancelled.get()) null else work(handle) + } finally { + ended.countDown() + } + } + + private fun work(handle: DownloadQueue.JobHandle): String? { before = DownloadQueue.entry(handle.key)?.bytesTotal ?: 0L handle.stage(DownloadStage.MANIFEST, app.getString(R.string.bnet_dl_starting)) if (!BattleNet.installed(app)) throw IllegalStateException(app.getString(R.string.bnet_dl_client_first)) @@ -272,12 +300,12 @@ internal class BattleNetInstaller( if (!deleteFiles || update) return val uid = item.extra[BattleNetInstall.INSTALL_UID] ?: BattleNet.title(item.id)?.uid ?: return Thread({ - Thread.sleep(2_000) - val gone = runCatching { - BattleNetInstall.run(app, listOf("agent-uninstall", uid), AddedGames.guestPath(app, folder), null) {} - }.getOrDefault(-1) - if (folder.isDirectory) com.droiddeck.launcher.core.FileUtils.delete(folder) - Log.i("BattleNetInstall", "cancelled install of $uid cleaned up (exit $gone)") + if (started.get() && !ended.await(END_WAIT_S, TimeUnit.SECONDS)) Log.w("BattleNetInstall", "the cancelled install of $uid is still stopping") + val gone = BattleNetInstall.agentUninstall(app, uid, folder) + if (folder.isDirectory && (gone || folder.list().isNullOrEmpty())) com.droiddeck.launcher.core.FileUtils.delete(folder) + Log.i("BattleNetInstall", "cancelled install of $uid: ${if (gone) "removed" else "left for Battle.net to remove"}") }, "battlenet-cancel").start() } } + +private const val END_WAIT_S = 120L diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index ab9b323b70..3a54ebd0df 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2010,11 +2010,11 @@ <string name="stores_play">Jogar</string> <string name="stores_install">Instalar</string> <string name="bnet_open">Abrir o Battle.net</string> - <string name="bnet_dl_starting">A iniciar o transferidor da Blizzard…</string> + <string name="bnet_dl_starting">A iniciar o programa de transferência da Blizzard…</string> <string name="bnet_dl_waiting">A aguardar que o Battle.net feche…</string> <string name="bnet_dl_queued">A aguardar a outra transferência do Battle.net…</string> <string name="bnet_dl_client_first">Abra o Battle.net e inicie sessão uma vez; depois instale os jogos dele aqui.</string> - <string name="bnet_dl_failed">O transferidor da Blizzard parou: %1$s</string> + <string name="bnet_dl_failed">O programa de transferência da Blizzard parou: %1$s</string> <string name="bnet_dl_agent_error">Erro da Blizzard %1$s</string> <string name="bnet_update">Atualizar</string> <string name="bnet_store">Jogos da Blizzard</string> diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index 0552642b8e..5b3444be03 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -1248,7 +1248,7 @@ def agent_job(root, action, uid, product="", folder="", locale="enUS", country=" "version": game.get("local_version", "")}, sort_keys=True)) say("%s %s in %s" % (uid, "updated" if action == "update" else "installed", game.get("install_dir", windows))) return 0 - if reason is None and action == "uninstall" and game.get("installed") is not True: + if reason is None and action == "uninstall" and game.get("installed") is False: emit("DONE", json.dumps({"uninstalled": uid})) say("%s uninstalled" % uid) return 0 diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index b44d7b424a..d0c01b9a08 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -1205,6 +1205,12 @@ class AgentJobTest(Harness): self.assertEqual(BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0), 0) self.assertEqual(self.lines[:2], [("STATE", "queued"), ("STATE", "starting")]) + def test_an_uninstall_needs_the_agent_to_say_the_game_is_gone(self): + self.install() + self.files = {".game": json.dumps({"error": 2})} + self.assertEqual(BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0), 1) + self.assertEqual(self.lines[-1][0], "ERROR") + def test_without_battle_net_nothing_starts(self): self.assertEqual(BNET["agent_job"](self.root, "install", "gryphon", "gryphon", str(self.tmp / "g"), "enUS", "USA", "US", poll=0), 3) self.assertEqual(self.lines, [("ERROR", "client")]) From 3b6b304f55122c7ac323b5dc60e454c0cfcd954d Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 07:42:55 -0400 Subject: [PATCH 063/135] fix: take the Agent's empty answer for an uninstalled game as gone Once Blizzard's Agent has removed a game it answers GET /game/<uid> with an empty object, not installed false, so a finished uninstall read as a failure and opened Battle.net. --- tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet | 5 +++-- tools/tests/test_battlenet.py | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index 5b3444be03..35518880ab 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -1227,7 +1227,8 @@ def agent_job(root, action, uid, product="", folder="", locale="enUS", country=" leftovers = wine_processes(pfx) if leftovers and idle(leftovers): stop(leftovers) - game = read_status(base + ".game") or {} + answer = read_status(base + ".game") + game = answer or {} status = read_status(base + ".json") or {} try: with open(base + ".error", "rb") as f: @@ -1248,7 +1249,7 @@ def agent_job(root, action, uid, product="", folder="", locale="enUS", country=" "version": game.get("local_version", "")}, sort_keys=True)) say("%s %s in %s" % (uid, "updated" if action == "update" else "installed", game.get("install_dir", windows))) return 0 - if reason is None and action == "uninstall" and game.get("installed") is False: + if reason is None and action == "uninstall" and (game.get("installed") is False or answer == {}): emit("DONE", json.dumps({"uninstalled": uid})) say("%s uninstalled" % uid) return 0 diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index d0c01b9a08..93680ef5cd 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -1210,6 +1210,9 @@ class AgentJobTest(Harness): self.files = {".game": json.dumps({"error": 2})} self.assertEqual(BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0), 1) self.assertEqual(self.lines[-1][0], "ERROR") + self.files = {".game": json.dumps({})} + self.assertEqual(BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0), 0) + self.assertEqual(self.lines[-1], ("DONE", json.dumps({"uninstalled": "gryphon"}))) def test_without_battle_net_nothing_starts(self): self.assertEqual(BNET["agent_job"](self.root, "install", "gryphon", "gryphon", str(self.tmp / "g"), "enUS", "USA", "US", poll=0), 3) From 24f0b97c08a1eaf44956955cc424c8fdfb003464 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 08:29:28 -0400 Subject: [PATCH 064/135] fix: report a gamescope that cannot start and ignore Agent answers that are not objects --- .../overlay/usr/local/bin/droiddeck-battlenet | 10 ++++++++-- tools/tests/test_battlenet.py | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index 35518880ab..3e70593909 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -1134,9 +1134,11 @@ def read_status(path): return None for encoding in ("utf-16", "utf-8-sig"): try: - return json.loads(data.decode(encoding)) + value = json.loads(data.decode(encoding)) except (UnicodeDecodeError, ValueError): continue + if isinstance(value, dict): + return value return None @@ -1211,7 +1213,11 @@ def agent_job(root, action, uid, product="", folder="", locale="enUS", country=" except OSError: pass with open(output, "ab") as log: - child = subprocess.Popen(cmd, stdin=subprocess.DEVNULL, stdout=log, stderr=log, env=env) + try: + child = subprocess.Popen(cmd, stdin=subprocess.DEVNULL, stdout=log, stderr=log, env=env) + except OSError as error: + emit("ERROR", "stopped gamescope: %s" % error) + return 1 seen = None while True: done = child.poll() is not None diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index 93680ef5cd..aed66699ed 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -1187,6 +1187,25 @@ class AgentJobTest(Harness): self.assertEqual(BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0), 0) self.assertEqual(self.lines[-1], ("DONE", json.dumps({"uninstalled": "gryphon"}))) + def test_a_gamescope_that_cannot_start_is_reported(self): + self.install() + + def missing(cmd, **kwargs): + raise FileNotFoundError("gamescope") + + with mock.patch.object(BNET["subprocess"], "Popen", missing): + self.assertEqual(BNET["agent_job"](self.root, "update", "gryphon", poll=0), 1) + self.assertEqual(self.lines[-1], ("ERROR", "stopped gamescope: gamescope")) + + def test_an_agent_answer_that_is_not_an_object_is_ignored(self): + path = self.tmp / "answer.json" + for value in ([1, 2], "text", 3, None): + with self.subTest(value): + path.write_bytes(json.dumps(value).encode("utf-16")) + self.assertIsNone(BNET["read_status"](str(path))) + path.write_bytes(json.dumps({"state": 1004}).encode("utf-8")) + self.assertEqual(BNET["read_status"](str(path)), {"state": 1004}) + def test_a_large_agent_log_is_rotated_before_a_job(self): self.install() os.makedirs(self.tmp / "cache") From db56cff880e84c777740d377049c8e0e3a844acf Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 08:45:52 -0400 Subject: [PATCH 065/135] fix: check a Battle.net game for updates again when the last check failed --- .../launcher/stores/battlenet/BattleNetInstall.kt | 11 +++++++---- .../stores/battlenet/BattleNetInstallTest.kt | 12 ++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt index fa49fbd478..d73e77d132 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt @@ -45,8 +45,8 @@ object BattleNetInstall { "zhTW", "zhCN", "thTH", "arSA", ) - private val checks = Executors.newSingleThreadExecutor { r -> Thread(r, "battlenet-updates") } - private val checkedAt = HashMap<String, Long>() + internal val checks = Executors.newSingleThreadExecutor { r -> Thread(r, "battlenet-updates") } + internal val checkedAt = HashMap<String, Long>() val updates = mutableStateMapOf<String, Boolean>() @@ -177,10 +177,13 @@ object BattleNetInstall { if (!force && now - (checkedAt[id] ?: 0L) < CHECK_AGAIN_MS) return checkedAt[id] = now } + fun retryLater() = synchronized(checkedAt) { if (checkedAt[id] == now) checkedAt.remove(id) } checks.execute { - val local = runCatching { buildKey(File(folder, BUILD_INFO).readText()) }.getOrNull() ?: return@execute + val local = runCatching { buildKey(File(folder, BUILD_INFO).readText()) }.getOrNull() + ?: return@execute retryLater() val latest = runCatching { latestBuild(fetch(VERSIONS.format(Locale.ROOT, local.first, product)), local.first) } - .onFailure { Log.w(TAG, "versions of $product: ${it.javaClass.simpleName}") }.getOrNull() ?: return@execute + .onFailure { Log.w(TAG, "versions of $product: ${it.javaClass.simpleName}") }.getOrNull() + ?: return@execute retryLater() val behind = latest != local.second Log.i(TAG, "$id: ${if (behind) "update available" else "up to date"}") StoresState.post { if (behind) updates[id] = true else updates.remove(id) } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt index 9a907b3720..027a1db73b 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt @@ -8,6 +8,7 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Test +import java.nio.file.Files import java.util.Locale class BattleNetInstallTest { @@ -64,6 +65,17 @@ class BattleNetInstallTest { assertFalse(BattleNetInstall.headless(CatalogItem(Store.EPIC, "gryphon", "Warcraft Rumble", null))) } + @Test fun aCheckThatCouldNotRunIsTriedAgainNextTime() { + val folder = Files.createTempDirectory("bnet").toFile() + try { + BattleNetInstall.check("gryphon", folder, false) + BattleNetInstall.checks.submit {}.get() + assertFalse(synchronized(BattleNetInstall.checkedAt) { "gryphon" in BattleNetInstall.checkedAt }) + } finally { + folder.deleteRecursively() + } + } + @Test fun theAgentStatusPicksTheDownloadStep() { assertEquals(BattleNetInstall.Step.PREPARING, BattleNetInstall.step(1008, 0, 0, 0)) assertEquals(BattleNetInstall.Step.PREPARING, BattleNetInstall.step(1003, 500, 0, 0)) From 78f95c5a0c1a4153aa0426fbc95ed0add0139471 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 09:14:35 -0400 Subject: [PATCH 066/135] feat(ui): support portrait launcher layouts (#1606) --- app/src/main/AndroidManifest.xml | 10 +- .../droiddeck/launcher/FrontEndActivity.kt | 12 +- .../com/droiddeck/launcher/HomeActivity.kt | 2 +- .../com/droiddeck/launcher/core/AppUiPrefs.kt | 21 +++ .../launcher/files/FileManagerActivity.kt | 2 +- .../launcher/files/FileManagerScreen.kt | 14 +- .../launcher/files/FilePickerActivity.kt | 2 +- .../launcher/stores/StoreLoginActivity.kt | 1 + .../launcher/stores/xbox/XboxLoginActivity.kt | 1 + .../com/droiddeck/launcher/ui/FrontEndRail.kt | 92 +++++++++--- .../droiddeck/launcher/ui/FrontEndScreen.kt | 41 ++++-- .../droiddeck/launcher/ui/FrontEndSetup.kt | 7 +- .../java/com/droiddeck/launcher/ui/Layout.kt | 41 ++++++ .../com/droiddeck/launcher/ui/SteamHome.kt | 14 +- .../com/droiddeck/launcher/ui/StoresPage.kt | 75 ++++++---- app/src/main/res/values/strings.xml | 5 + .../launcher/session/OrientationTest.kt | 23 +++ .../launcher/ui/PortraitLayoutTest.kt | 137 ++++++++++++++++++ 18 files changed, 427 insertions(+), 73 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a1c126962a..1ce7b0ac73 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -73,7 +73,7 @@ <activity android:name=".FrontEndActivity" android:exported="true" - android:screenOrientation="sensorLandscape" + android:screenOrientation="user" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|density|keyboard|keyboardHidden|navigation"> <intent-filter> <action android:name="android.intent.action.VIEW" /> @@ -125,7 +125,7 @@ android:excludeFromRecents="true" android:noHistory="true" android:taskAffinity="${applicationId}.home" - android:screenOrientation="sensorLandscape" + android:screenOrientation="user" android:theme="@android:style/Theme.Translucent.NoTitleBar"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -146,14 +146,14 @@ <activity android:name=".files.FileManagerActivity" android:exported="false" - android:screenOrientation="sensorLandscape" + android:screenOrientation="user" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|density" android:theme="@style/AppTheme" /> <activity android:name=".files.FilePickerActivity" android:exported="false" - android:screenOrientation="sensorLandscape" + android:screenOrientation="user" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|density" android:theme="@style/AppTheme" /> @@ -185,7 +185,7 @@ <activity android:name=".stores.StoreLoginActivity" android:exported="false" - android:screenOrientation="sensorLandscape" + android:screenOrientation="user" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|density" android:theme="@style/AppTheme" /> diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 077e9e96de..f7d514c49b 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -168,6 +168,7 @@ class FrontEndActivity : ComponentActivity() { private var picturePosition by mutableStateOf("center") private var stretch16x9 by mutableStateOf(false) private var orientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) + private var launcherOrientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER) private var launcherFullscreen by mutableStateOf(true) private var downloadSource by mutableStateOf(DownloadSource.MODE_AUTO) private var downloadMirror by mutableStateOf("") @@ -775,7 +776,8 @@ class FrontEndActivity : ComponentActivity() { steamGamesX64 = cachedX64 backActionsInverted = SessionPrefs.backActionsInverted(this) orientation = SessionPrefs.orientation(this) - requestedOrientation = orientation + launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) + requestedOrientation = launcherOrientation launcherFullscreen = SessionPrefs.launcherFullscreen(this) downloadSource = DownloadSource.mode(this) downloadMirror = DownloadSource.mirror(this) @@ -844,6 +846,7 @@ class FrontEndActivity : ComponentActivity() { phantomProcessStatus = phantomProcessStatus, showPhantomGate = showPhantomGate, orientation = orientation, + launcherOrientation = launcherOrientation, launcherFullscreen = launcherFullscreen, downloadSource = downloadSource, downloadMirror = downloadMirror, @@ -1026,6 +1029,10 @@ class FrontEndActivity : ComponentActivity() { onOrientation = { value -> SessionPrefs.setOrientation(this, value) orientation = value + }, + onLauncherOrientation = { value -> + com.droiddeck.launcher.core.AppUiPrefs.setOrientation(this, value) + launcherOrientation = value requestedOrientation = value }, onLauncherFullscreen = { on -> @@ -1321,7 +1328,8 @@ class FrontEndActivity : ComponentActivity() { override fun onResume() { super.onResume() orientation = SessionPrefs.orientation(this) - requestedOrientation = orientation + launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) + requestedOrientation = launcherOrientation refreshWifiDiscovery() com.droiddeck.launcher.stores.StoresState.refresh(this) com.droiddeck.launcher.stores.StoresState.libraryListener = { refreshAddedGames(); refresh() } diff --git a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt index 71304e8837..59e10c48e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt @@ -13,7 +13,7 @@ class HomeActivity : Activity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - requestedOrientation = com.droiddeck.launcher.session.SessionPrefs.orientation(this) + requestedOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) routeHome() } diff --git a/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt b/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt index 3021b7196d..7b8536202d 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt @@ -1,11 +1,32 @@ package com.droiddeck.launcher.core import android.content.Context +import android.content.pm.ActivityInfo +import com.droiddeck.launcher.R object AppUiPrefs { const val DEFAULT_SCALE = 100 val scales = listOf(75, 85, 100, 115, 125, 150) + val orientationOptions = listOf( + ActivityInfo.SCREEN_ORIENTATION_USER to R.string.setup_launcher_orientation_auto, + ActivityInfo.SCREEN_ORIENTATION_PORTRAIT to R.string.setup_orientation_portrait, + ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE to R.string.setup_orientation_auto, + ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE to R.string.setup_orientation_landscape, + ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE to R.string.setup_orientation_reverse, + ) + + fun orientation(context: Context): Int = + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE) + .getInt("orientation", ActivityInfo.SCREEN_ORIENTATION_USER) + .takeIf { value -> orientationOptions.any { it.first == value } } + ?: ActivityInfo.SCREEN_ORIENTATION_USER + + fun setOrientation(context: Context, value: Int) { + require(orientationOptions.any { it.first == value }) + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().putInt("orientation", value).apply() + } + internal fun normalizeScale(percent: Int): Int = percent.takeIf { it in scales } ?: DEFAULT_SCALE fun scale(context: Context): Int = normalizeScale( diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt index 1425a78e7e..873a413ad4 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt @@ -21,7 +21,7 @@ class FileManagerActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - requestedOrientation = com.droiddeck.launcher.session.SessionPrefs.orientation(this) + requestedOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 1) } diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt index 997a0e6da2..4ea75ab1ce 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -6,6 +6,8 @@ import android.widget.Toast import androidx.activity.compose.BackHandler import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.Image +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.rememberScrollState import android.content.res.Configuration import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -21,6 +23,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.grid.GridCells @@ -668,6 +671,7 @@ fun FileManagerScreen( ) } + val compactToolbar = LocalConfiguration.current.screenWidthDp < 600 Column(modifier = Modifier.fillMaxSize()) { if (pickMode && !pickerTitle.isNullOrEmpty()) { Text( @@ -698,6 +702,7 @@ fun FileManagerScreen( modifier = Modifier .fillMaxWidth() .background(MaterialTheme.colorScheme.surfaceContainer) + .then(if (compactToolbar) Modifier.horizontalScroll(rememberScrollState()) else Modifier) .padding(horizontal = 8.dp, vertical = 6.dp), ) { IconButton(onClick = { requestNavigation(FileManagerNavigation.UP) }, enabled = canGoUp && !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) { @@ -776,10 +781,10 @@ fun FileManagerScreen( fontWeight = FontWeight.SemiBold, maxLines = 1, overflow = TextOverflow.Ellipsis, - modifier = Modifier.weight(1f), + modifier = if (compactToolbar) Modifier.widthIn(max = 140.dp) else Modifier.weight(1f), ) } else if (LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT) { - Spacer(Modifier.weight(1f)) + if (!compactToolbar) Spacer(Modifier.weight(1f)) } else { Text( text = currentDir.name.ifBlank { currentDir.absolutePath }, @@ -788,7 +793,7 @@ fun FileManagerScreen( fontWeight = FontWeight.SemiBold, maxLines = 1, overflow = TextOverflow.Ellipsis, - modifier = Modifier.weight(1f), + modifier = if (compactToolbar) Modifier.widthIn(max = 140.dp) else Modifier.weight(1f), ) } @@ -928,13 +933,14 @@ fun FileManagerScreen( modifier = Modifier .fillMaxWidth() .background(MaterialTheme.colorScheme.primary.copy(alpha = 0.12f)) + .then(if (compactToolbar) Modifier.horizontalScroll(rememberScrollState()) else Modifier) .padding(horizontal = 12.dp, vertical = 6.dp), ) { Text( stringResource(R.string.fm_selected_count, selectedPaths.size), color = MaterialTheme.colorScheme.onBackground, fontSize = 13.sp, - modifier = Modifier.weight(1f), + modifier = if (compactToolbar) Modifier.padding(end = 12.dp) else Modifier.weight(1f), ) val allVisibleSelected = visibleEntries.isNotEmpty() && visibleEntries.all { it.absolutePath in selectedPaths } val anyVisibleSelected = visibleEntries.any { it.absolutePath in selectedPaths } diff --git a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt index 498ec504e8..39a83e40e1 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt @@ -25,7 +25,7 @@ class FilePickerActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - requestedOrientation = com.droiddeck.launcher.session.SessionPrefs.orientation(this) + requestedOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 1) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt index 9a4f97c877..37169cf96f 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt @@ -88,6 +88,7 @@ class StoreLoginActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + requestedOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) store = Store.byId(intent.getStringExtra(EXTRA_STORE)) clientUrl = intent.getStringExtra(EXTRA_CLIENT_URL)?.takeIf { store == Store.EPIC } oauthState = savedInstanceState?.getString(KEY_STATE) ?: generateState() diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt index 10fc5ea71a..39840b2608 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt @@ -36,6 +36,7 @@ class XboxLoginActivity : ComponentActivity() { @SuppressLint("SetJavaScriptEnabled") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + requestedOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) host = LinearLayout(this).apply { orientation = LinearLayout.VERTICAL; setBackgroundColor(Color.BLACK) } status = TextView(this).apply { setTextColor(Color.WHITE); text = "Preparing Microsoft sign-in…"; setPadding(24, 16, 24, 16) } host.addView(status) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index 7136ac7f07..78e6bd49bf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -41,6 +41,9 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.relocation.BringIntoViewRequester +import androidx.compose.foundation.relocation.bringIntoViewRequester import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Apps @@ -87,6 +90,40 @@ import com.droiddeck.launcher.core.PhantomProcessLimit internal val AttentionAmber = Color(0xFFFFB547) +@Composable +internal fun BottomBar( + s: FrontEndState, selected: String, + onSelect: (String) -> Unit, onFocusSelect: (String) -> Unit, a: FrontEndActions, modifier: Modifier, +) { + val shown = Hops.railPreview ?: selected + val keys = navigationKeys(s) + val bounds = remember { androidx.compose.runtime.mutableStateMapOf<String, androidx.compose.ui.geometry.Rect>() } + val tint = androidx.compose.runtime.rememberUpdatedState(LocalPalette.current.signal) + var barAt by remember { mutableStateOf(androidx.compose.ui.geometry.Offset.Zero) } + Row(modifier.fillMaxWidth().background(MaterialTheme.colorScheme.surface), verticalAlignment = Alignment.CenterVertically) { + BoxWithConstraints(Modifier.weight(1f)) { + val itemWidth = (maxWidth / keys.size).coerceIn(56.dp, 88.dp) + Box(Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).onGloballyPositioned { barAt = it.boundsInRoot().topLeft }) { + if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown]?.translate(-barAt), tint, GlideAxis.Horizontal, corner = 14.dp, fill = 0.14f, outline = 0f) + Row(Modifier.selectableGroup().padding(vertical = 4.dp), horizontalArrangement = Arrangement.Center) { + NavigationItems(s, shown, compact = true, iconOnly = false, height = 56.dp, width = itemWidth, + place = { key -> Modifier.onGloballyPositioned { bounds[key] = it.boundsInRoot(); Hops.railBounds[key] = it.boundsInRoot() } }, + onSelect = onSelect, onFocusSelect = onFocusSelect) + } + } + } + if (s.running != null) ResumeRailItem(s.running, compact = true, iconOnly = true, a.onResume) + } +} + +private fun navigationKeys(s: FrontEndState) = buildList { + add("steam"); add("games") + if (s.gameStoresEnabled) add("stores") + add("desktop"); add("components") + if (s.isHomeApp) add("android-apps") + add("setup"); add("updates") +} + @Composable internal fun SideRail( s: FrontEndState, selected: String, @@ -95,8 +132,6 @@ internal fun SideRail( val colors = MaterialTheme.colorScheme val compact = LocalConfiguration.current.screenHeightDp < 420 val iconOnly = isNarrowScreen() - val setupNeedsAttention = !s.ready || (s.available != null && s.available != s.installed) || - PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) Column( horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier.width(if (iconOnly) 64.dp else 92.dp).background(colors.surface).padding(vertical = if (compact) 8.dp else 12.dp), @@ -105,14 +140,7 @@ internal fun SideRail( BoxWithConstraints(Modifier.weight(1f).fillMaxWidth()) { val fit = (maxHeight / count - 4.dp).coerceIn(44.dp, if (iconOnly) 48.dp else if (compact) 52.dp else 60.dp) val shown = Hops.railPreview ?: selected - val keys = buildList { - add("steam"); add("games") - if (s.gameStoresEnabled) add("stores") - add("desktop") - add("components") - if (s.isHomeApp) add("android-apps") - add("setup"); add("updates") - } + val keys = navigationKeys(s) val bounds = remember { androidx.compose.runtime.mutableStateMapOf<String, androidx.compose.ui.geometry.Rect>() } val tint = androidx.compose.runtime.rememberUpdatedState(LocalPalette.current.signal) var railAt by remember { mutableStateOf(androidx.compose.ui.geometry.Offset.Zero) } @@ -129,14 +157,7 @@ internal fun SideRail( Hops.railBounds[key] = it.boundsInRoot() } } - RailItem(stringResource(R.string.rail_steam), Icons.Outlined.SportsEsports, "steam", shown == "steam", compact, iconOnly, fit, place = place, onFocus = { onFocusSelect("steam") }) { onSelect("steam") } - RailItem(stringResource(R.string.rail_games), Icons.Outlined.VideoLibrary, "games", shown == "games", compact, iconOnly, fit, place = place, onFocus = { onFocusSelect("games") }) { onSelect("games") } - if (s.gameStoresEnabled) RailItem(stringResource(R.string.rail_stores), Icons.Outlined.LocalMall, "stores", shown == "stores", compact, iconOnly, fit, count = s.storeDownloadsActive, place = place, onFocus = { onFocusSelect("stores") }) { onSelect("stores") } - RailItem(stringResource(R.string.rail_desktop), Icons.Outlined.DesktopWindows, "desktop", shown == "desktop", compact, iconOnly, fit, place = place, onFocus = { onFocusSelect("desktop") }) { onSelect("desktop") } - RailItem(stringResource(R.string.rail_components), Icons.Outlined.Layers, "components", shown == "components", compact, iconOnly, fit, place = place, onFocus = { onFocusSelect("components") }) { onSelect("components") } - if (s.isHomeApp) RailItem(stringResource(R.string.rail_apps), Icons.Outlined.Apps, "android-apps", shown == "android-apps", compact, iconOnly, fit, place = place, onFocus = { onFocusSelect("android-apps") }) { onSelect("android-apps") } - RailItem(stringResource(R.string.rail_setup), Icons.Outlined.Tune, "setup", shown == "setup", compact, iconOnly, fit, badge = setupNeedsAttention, place = place, onFocus = { onFocusSelect("setup") }) { onSelect("setup") } - RailItem(stringResource(R.string.rail_updates), Icons.Outlined.SystemUpdate, "updates", shown == "updates", compact, iconOnly, fit, badge = s.updates.hasUpdate, place = place, onFocus = { onFocusSelect("updates") }) { onSelect("updates") } + NavigationItems(s, shown, compact, iconOnly, fit, if (iconOnly) 52.dp else 80.dp, place, onSelect, onFocusSelect) } } } @@ -151,8 +172,36 @@ internal fun SideRail( } @Composable +private fun NavigationItems( + s: FrontEndState, shown: String, compact: Boolean, iconOnly: Boolean, height: Dp, width: Dp, + place: (String) -> Modifier, onSelect: (String) -> Unit, onFocusSelect: (String) -> Unit, +) { + val setupNeedsAttention = !s.ready || (s.available != null && s.available != s.installed) || + PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) + for (key in navigationKeys(s)) { + val (label, icon) = when (key) { + "steam" -> R.string.rail_steam to Icons.Outlined.SportsEsports + "games" -> R.string.rail_games to Icons.Outlined.VideoLibrary + "stores" -> R.string.rail_stores to Icons.Outlined.LocalMall + "desktop" -> R.string.rail_desktop to Icons.Outlined.DesktopWindows + "components" -> R.string.rail_components to Icons.Outlined.Layers + "android-apps" -> R.string.rail_apps to Icons.Outlined.Apps + "setup" -> R.string.rail_setup to Icons.Outlined.Tune + else -> R.string.rail_updates to Icons.Outlined.SystemUpdate + } + key(key) { + RailItem(stringResource(label), icon, key, shown == key, compact, iconOnly, height, width, + badge = (key == "setup" && setupNeedsAttention) || (key == "updates" && s.updates.hasUpdate), + count = if (key == "stores") s.storeDownloadsActive else 0, + place = place, onFocus = { onFocusSelect(key) }) { onSelect(key) } + } + } +} + +@Composable +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) private fun RailItem( - label: String, icon: ImageVector, key: String, current: Boolean, compact: Boolean, iconOnly: Boolean, height: Dp, + label: String, icon: ImageVector, key: String, current: Boolean, compact: Boolean, iconOnly: Boolean, height: Dp, width: Dp, badge: Boolean = false, count: Int = 0, place: (String) -> Modifier = { Modifier }, @@ -181,6 +230,8 @@ private fun RailItem( Motion.tw(220), label = "railFill", ) val scale by animateFloatAsState(if (pressed) 0.95f else 1f, Motion.sp(0.5f, Spring.StiffnessMedium), label = "railScale") + val bringIntoView = remember { BringIntoViewRequester() } + LaunchedEffect(current) { if (current) bringIntoView.bringIntoView() } Box( contentAlignment = Alignment.Center, modifier = Modifier @@ -189,7 +240,8 @@ private fun RailItem( .then(place(key)) .landingPop(Hops.railLanded[key] ?: 0) .graphicsLayer { scaleX = scale; scaleY = scale } - .size(width = if (iconOnly) 52.dp else 80.dp, height = height) + .size(width = width, height = height) + .bringIntoViewRequester(bringIntoView) .clip(Shape14) .background(fill) .glideBorder(focused, Shape14, pal.signal) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 66c2a8841e..4df261e8d2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.focusGroup import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.FocusDirection import androidx.compose.ui.focus.onFocusChanged import android.provider.Settings import android.view.Display @@ -138,6 +139,7 @@ class FrontEndState( val phantomProcessStatus: PhantomProcessStatus = PhantomProcessStatus.NOT_APPLICABLE, val showPhantomGate: Boolean = false, val orientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, + val launcherOrientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER, val launcherFullscreen: Boolean = true, val downloadSource: String = DownloadSource.MODE_AUTO, val downloadMirror: String = "", @@ -219,6 +221,7 @@ class FrontEndActions( val onAppScale: (Int) -> Unit = {}, val onLauncherIcon: (String) -> Unit = {}, val onOrientation: (Int) -> Unit = {}, + val onLauncherOrientation: (Int) -> Unit = {}, val onLauncherFullscreen: (Boolean) -> Unit = {}, val onAnimationsEnabled: (Boolean) -> Unit = {}, val onDownloadSource: (String) -> Unit = {}, @@ -386,7 +389,12 @@ internal suspend fun focusSoon(target: () -> FocusRequester) { @Composable fun FrontEndScreen(s: FrontEndState, a: FrontEndActions, page: (@Composable () -> Unit)? = null) { val frontFocus = remember { FrontFocus() } - CompositionLocalProvider(LocalFrontFocus provides frontFocus) { FrontEndScreenBody(s, a, page, frontFocus) } + androidx.compose.foundation.layout.BoxWithConstraints(Modifier.fillMaxSize()) { + CompositionLocalProvider( + LocalFrontFocus provides frontFocus, + LocalNarrowPane provides (maxWidth < NarrowPaneWidth), + ) { FrontEndScreenBody(s, a, page, frontFocus) } + } } @OptIn(ExperimentalComposeUiApi::class) @@ -486,11 +494,12 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com val window = LocalWindowInfo.current val androidContext = androidx.compose.ui.platform.LocalContext.current var anyFocused by remember { mutableStateOf(false) } - Box( + androidx.compose.foundation.layout.BoxWithConstraints( modifier = Modifier.fillMaxSize().background(colors.background) .windowInsetsPadding(if (s.launcherFullscreen) WindowInsets.displayCutout else WindowInsets.systemBars) .onFocusChanged { anyFocused = it.hasFocus }, ) { + val bottomNavigation = maxHeight > maxWidth LaunchedEffect(processSettingsPageVisible) { if (processSettingsPageVisible) return@LaunchedEffect snapshotFlow { window.isWindowFocused }.first { it } @@ -527,10 +536,19 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com focusWithinFrames({ frontFocus.focusedRail == null && anyFocused }) { frontFocus.paneEntry() } } val paneFocus = Modifier - .focusProperties { enter = { frontFocus.paneEntry() } } + .focusProperties { + enter = { frontFocus.paneEntry() } + exit = { direction -> + if (bottomNavigation && direction == FocusDirection.Down) frontFocus.railFor(railSelection) + else FocusRequester.Default + } + } .focusGroup() val railFocus = Modifier - .focusProperties { enter = { frontFocus.railFor(railSelection) } } + .focusProperties { + enter = { frontFocus.railFor(railSelection) } + if (bottomNavigation) up = frontFocus.paneEntry() + } .focusGroup() LaunchedEffect(Hops.restore) { val r = Hops.restore ?: return@LaunchedEffect @@ -544,12 +562,16 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com } var screenAt by remember { mutableStateOf(Offset.Zero) } CompositionLocalProvider(LocalShowSection provides { key -> selected = key }) { - Row(modifier = Modifier.fillMaxSize().onGloballyPositioned { screenAt = it.positionInRoot() }) { - SideRail(s, railSelection, onRailSelect, onRailFocus, a, railFocus.fillMaxHeight()) - Box(Modifier.width(1.dp).fillMaxHeight().background(pal.line)) - Column(modifier = Modifier.weight(1f).fillMaxHeight()) { + LauncherLayout( + bottomNavigation, pal.line, + Modifier.fillMaxSize().onGloballyPositioned { screenAt = it.positionInRoot() }, + navigation = { + if (bottomNavigation) BottomBar(s, railSelection, onRailSelect, onRailFocus, a, railFocus) + else SideRail(s, railSelection, onRailSelect, onRailFocus, a, railFocus.fillMaxHeight()) + }, + ) { Pane( - s, selected, a, page, Modifier.weight(1f).fillMaxWidth().then(paneFocus), { selected = it }, + s, selected, a, page, Modifier.fillMaxSize().then(paneFocus), { selected = it }, onAndroidAppClick = { app -> if (s.secondScreenDisplays.isEmpty()) a.onAndroidApp(app, null) else appToChooseDisplay = app @@ -557,7 +579,6 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com onOpenDeveloperOptions = requestDeveloperOptions, onRequestWirelessAdb = requestWirelessAdbFix, ) - } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 1bf99f0697..43926aa6b1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -398,7 +398,12 @@ internal fun SetupPanel( ActionRow(stringResource(R.string.setup_default_home), s.defaultHomeLabel ?: stringResource(R.string.setup_choose_home), stringResource(R.string.setup_choose), a.onHomeApp) } ChoiceRow( - host, "orientation", stringResource(R.string.setup_orientation), null, + host, "launcher-orientation", stringResource(R.string.setup_launcher_orientation), null, + com.droiddeck.launcher.core.AppUiPrefs.orientationOptions.map { (value, label) -> value to stringResource(label) }, + s.launcherOrientation, onPick = a.onLauncherOrientation, + ) + ChoiceRow( + host, "orientation", stringResource(R.string.setup_session_orientation), stringResource(R.string.setup_session_orientation_hint), SessionPrefs.orientationOptions.map { (value, label) -> value to stringResource(label) }, s.orientation, onPick = a.onOrientation, ) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Layout.kt b/app/src/main/java/com/droiddeck/launcher/ui/Layout.kt index 9777ee83b2..594492f840 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Layout.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Layout.kt @@ -2,6 +2,12 @@ package com.droiddeck.launcher.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.compositionLocalOf +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.Layout +import androidx.compose.ui.unit.Constraints import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.unit.dp @@ -13,3 +19,38 @@ val LocalNarrowPane = compositionLocalOf { false } @Composable internal fun isNarrowScreen(): Boolean = LocalConfiguration.current.screenWidthDp < 600 +@Composable +internal fun LauncherLayout( + bottomNavigation: Boolean, divider: Color, modifier: Modifier = Modifier, + navigation: @Composable () -> Unit, content: @Composable () -> Unit, +) { + Layout(modifier = modifier, content = { + Box { content() } + Box(Modifier.background(divider)) + Box { navigation() } + }) { children, constraints -> + val width = constraints.maxWidth + val height = constraints.maxHeight + val line = 1.dp.roundToPx() + val nav = children[2].measure(Constraints( + minWidth = if (bottomNavigation) width else 0, maxWidth = width, + minHeight = if (bottomNavigation) 0 else height, maxHeight = height, + )) + val contentWidth = if (bottomNavigation) width else (width - nav.width - line).coerceAtLeast(0) + val contentHeight = if (bottomNavigation) (height - nav.height - line).coerceAtLeast(0) else height + val pane = children[0].measure(Constraints.fixed(contentWidth, contentHeight)) + val edge = children[1].measure(Constraints.fixed(if (bottomNavigation) width else line, if (bottomNavigation) line else height)) + layout(width, height) { + if (bottomNavigation) { + pane.placeRelative(0, 0) + edge.placeRelative(0, contentHeight) + nav.placeRelative(0, contentHeight + line) + } else { + nav.placeRelative(0, 0) + edge.placeRelative(nav.width, 0) + pane.placeRelative(nav.width + line, 0) + } + } + } +} + diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt index dfb6d2525d..49cfd2da49 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt @@ -128,7 +128,7 @@ internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) }, onOpen = a.onSteamSettings, onPrimary = a.onPlay, modifier = modifier.clipToBounds(), - start = if (narrow) 20.dp else 44.dp, bottom = if (narrow) 20.dp else 44.dp, + start = if (narrow) 20.dp else 44.dp, bottom = 44.dp, background = { when { games.isEmpty() -> EmptyLibrary( @@ -141,12 +141,20 @@ internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) }, scrim = { if (games.size >= WALL_MIN_GAMES) WallFade() }, words = { - Row( + val runtimeStatus: @Composable () -> Unit = { + if (s.busy || !s.ready || (s.available != null && s.available != s.installed)) RuntimeChip(s) + } + if (narrow) Column( + verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.onPlaced { words = it.boundsInParent() }, + ) { + Wordmark(30.dp) + runtimeStatus() + } else Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.onPlaced { words = it.boundsInParent() }, ) { Wordmark(if (narrow) 30.dp else 40.dp) - if (s.busy || !s.ready || (s.available != null && s.available != s.installed)) RuntimeChip(s) + runtimeStatus() } }, button = { click -> diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index a4e8bdaf76..2d26dc708b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -1065,36 +1065,61 @@ internal fun ModeHeader( if (query.isNotEmpty()) onQuery("") } BackHandler(enabled = searching && !clearSearchFocus) { close() } - Column(Modifier.fillMaxWidth()) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth().heightIn(min = 52.dp).padding(vertical = 4.dp)) { - if (lead != null) lead() - else Text( - title, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, - modifier = Modifier.padding(start = 4.dp, end = 4.dp), - ) - BoxWithConstraints(Modifier.weight(1f), contentAlignment = Alignment.CenterStart) { - if (searching || open > 0.01f) { - val closable = maxWidth >= 80.dp - val w = androidx.compose.ui.unit.lerp(44.dp, (maxWidth - if (closable) 36.dp else 0.dp).coerceIn(44.dp, 520.dp), open) - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) { - Box(Modifier.width(w).graphicsLayer { alpha = (open * 1.6f).coerceAtMost(1f) }) { - AdbTextField( - value = query, onValueChange = onQuery, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, - placeholder = placeholder, compact = true, focusOnShow = focusOnOpen, - clearFocus = clearSearchFocus || !searching, - onFocusChange = { focused -> if (!focused && query.isEmpty()) { searching = false; focusOnOpen = false } }, - ) - } - if (searching && closable) SmallIconButton(Icons.Filled.Close, stringResource(R.string.common_close), tint = colors.onSurfaceVariant, onClick = close) - } - } else SearchIcon(stringResource(R.string.stores_search_open)) { searching = true; focusOnOpen = true } + val heading: @Composable () -> Unit = { + if (lead != null) lead() + else Text( + title, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, + modifier = Modifier.padding(start = 4.dp, end = 4.dp), + ) + } + val searchField: @Composable (Modifier) -> Unit = { modifier -> + BoxWithConstraints(modifier, contentAlignment = Alignment.CenterStart) { + val closable = maxWidth >= 80.dp + val w = androidx.compose.ui.unit.lerp(44.dp, (maxWidth - if (closable) 36.dp else 0.dp).coerceIn(44.dp, 520.dp), open) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) { + Box(Modifier.width(w).graphicsLayer { alpha = (open * 1.6f).coerceAtMost(1f) }) { + AdbTextField( + value = query, onValueChange = onQuery, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, + placeholder = placeholder, compact = true, focusOnShow = focusOnOpen, + clearFocus = clearSearchFocus || !searching, + onFocusChange = { focused -> if (!focused && query.isEmpty()) { searching = false; focusOnOpen = false } }, + ) + } + if (searching && closable) SmallIconButton(Icons.Filled.Close, stringResource(R.string.common_close), tint = colors.onSurfaceVariant, onClick = close) } - trailing() } - Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + } + val searchButton: @Composable () -> Unit = { + SearchIcon(stringResource(R.string.stores_search_open)) { searching = true; focusOnOpen = true } + } + BoxWithConstraints(Modifier.fillMaxWidth()) { + val stacked = maxWidth < NarrowPaneWidth + Column(Modifier.fillMaxWidth()) { + if (stacked) { + Box(Modifier.padding(vertical = 4.dp)) { heading() } + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).heightIn(min = 52.dp).padding(vertical = 4.dp), + ) { + searchButton() + trailing() + } + if (searching || open > 0.01f) searchField(Modifier.fillMaxWidth().padding(bottom = 6.dp)) + } else Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.fillMaxWidth().heightIn(min = 52.dp).padding(vertical = 4.dp), + ) { + heading() + if (searching || open > 0.01f) searchField(Modifier.weight(1f)) + else Box(Modifier.weight(1f)) { searchButton() } + trailing() + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + } } } + internal fun storePalette(base: Palette, store: Store?): Palette { val (accent, deep) = when (store) { Store.GOG -> Color(0xFFC25BC8) to Color(0xFF9A3FA1) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d260c3da88..03204a9ffa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -829,6 +829,11 @@ <string name="setup_home_on">DroidDeck can be the Home app</string> <string name="setup_home_off">DroidDeck is never offered as a Home app</string> <string name="setup_orientation">Orientation</string> + <string name="setup_launcher_orientation">Launcher orientation</string> + <string name="setup_launcher_orientation_auto">Follow device rotation</string> + <string name="setup_orientation_portrait">Portrait</string> + <string name="setup_session_orientation">Game and desktop orientation</string> + <string name="setup_session_orientation_hint">Applies to Steam, games, desktop, and the controller editor.</string> <string name="setup_orientation_auto">Automatic landscape</string> <string name="setup_orientation_landscape">Landscape</string> <string name="setup_orientation_reverse">Reverse landscape</string> diff --git a/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt b/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt index 5d67d041a2..e694b8b3c7 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.session import android.content.Context import android.content.pm.ActivityInfo +import com.droiddeck.launcher.core.AppUiPrefs import org.junit.Assert.* import org.junit.Before import org.junit.Test @@ -17,6 +18,7 @@ class OrientationTest { @Before fun clearOrientation() { context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().clear().commit() } @Test fun landscapeChoicesPersistGloballyAndCanRestoreAutomaticRotation() { @@ -41,4 +43,25 @@ class OrientationTest { } assertEquals(ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE, SessionPrefs.orientation(context)) } + + @Test fun launcherFollowsDeviceRotationAndPortraitDoesNotChangeSessions() { + assertEquals(ActivityInfo.SCREEN_ORIENTATION_USER, AppUiPrefs.orientation(context)) + for ((value, _) in AppUiPrefs.orientationOptions) { + AppUiPrefs.setOrientation(context, value) + assertEquals(value, AppUiPrefs.orientation(context)) + assertEquals(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, SessionPrefs.orientation(context)) + } + AppUiPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) + SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) + assertEquals(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, AppUiPrefs.orientation(context)) + } + + @Test fun invalidLauncherOrientationFallsBackAndInvalidChoicePreservesPreference() { + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().putInt("orientation", 999).commit() + assertEquals(ActivityInfo.SCREEN_ORIENTATION_USER, AppUiPrefs.orientation(context)) + AppUiPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) + assertThrows(IllegalArgumentException::class.java) { AppUiPrefs.setOrientation(context, 999) } + assertEquals(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, AppUiPrefs.orientation(context)) + } + } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt new file mode 100644 index 0000000000..e1210893f0 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt @@ -0,0 +1,137 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.size +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.test.* +import androidx.compose.ui.unit.dp +import org.junit.Assert.* +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], qualifiers = "w960dp-h900dp-mdpi") +class PortraitLayoutTest { + @get:Rule val compose = createRobolectricComposeRule() + + @Before fun freezeAnimations() { + compose.mainClock.autoAdvance = false + Hops.railPreview = null + } + + @Test fun navigationSitsAtBottomAndRotatingPreservesContentState() { + val portrait = mutableStateOf(true) + compose.setContent { + DroidDeckTheme { + LauncherLayout(portrait.value, Color.Gray, + Modifier.size(if (portrait.value) 480.dp else 800.dp, if (portrait.value) 800.dp else 480.dp).testTag("launcher"), + navigation = { + if (portrait.value) BottomBar(state, "steam", {}, {}, actions, Modifier) + else SideRail(state, "steam", {}, {}, actions, Modifier.fillMaxHeight()) + }, + ) { + var count by remember { mutableIntStateOf(0) } + Box(Modifier.fillMaxSize().testTag("pane")) { + TextButton(onClick = { count++ }) { Text("Count $count") } + } + } + } + } + compose.mainClock.advanceTimeBy(1_000) + val root = compose.onNodeWithTag("launcher").getUnclippedBoundsInRoot() + val pane = compose.onNodeWithTag("pane").getUnclippedBoundsInRoot() + val steam = compose.onNodeWithTag("rail-steam").getUnclippedBoundsInRoot() + assertEquals(root.left, pane.left) + assertEquals(root.right, pane.right) + assertTrue(steam.top >= pane.bottom) + assertEquals(root.bottom - 4.dp, steam.bottom) + compose.onNodeWithText("Count 0").performClick() + compose.runOnIdle { portrait.value = false } + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Count 1").assertExists() + val landscapePane = compose.onNodeWithTag("pane").getUnclippedBoundsInRoot() + val rail = compose.onNodeWithTag("rail-steam").getUnclippedBoundsInRoot() + assertTrue(landscapePane.left > rail.right) + assertEquals(0.dp, landscapePane.top) + compose.runOnIdle { portrait.value = true } + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Count 1").assertExists() + } + + @Test fun narrowBottomBarScrollsToEveryDestinationWithAppsAndResumeVisible() { + val selected = mutableStateOf("steam") + compose.setContent { + DroidDeckTheme { + BottomBar(stateWithAppsAndSession, selected.value, { selected.value = it }, {}, actions, Modifier.size(320.dp, 64.dp)) + } + } + compose.mainClock.advanceTimeBy(1_000) + for (key in listOf("games", "stores", "desktop", "components", "android-apps", "setup", "updates", "steam")) { + compose.onNodeWithTag("rail-$key").performScrollTo() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithTag("rail-$key").assertIsDisplayed().performClick() + compose.mainClock.advanceTimeBy(1_000) + compose.runOnIdle { assertEquals(key, selected.value); assertNull(Hops.railPreview) } + compose.onNodeWithTag("rail-$key").assertIsSelected().assertHeightIsAtLeast(48.dp).assertWidthIsAtLeast(48.dp) + } + compose.onNodeWithContentDescription("Resume Steam").assertIsDisplayed() + } + + @Test fun compactHeaderKeepsAllActionsReachable() { + compose.setContent { + DroidDeckTheme { + CompositionLocalProvider(LocalNarrowPane provides true) { + Box(Modifier.size(320.dp, 240.dp)) { + ModeHeader("Library", "", {}, "Search library") { + for (label in listOf("Filter", "Sort", "View", "Frontend files", "Add game")) { + SecondaryButton(label) {} + } + } + } + } + } + } + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Add game").performScrollTo() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Add game").assertIsDisplayed() + compose.onNodeWithText("Filter").performScrollTo() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Filter").assertIsDisplayed() + } + + private fun state(home: Boolean = false, running: String? = null) = FrontEndState( + installed = "r9", ready = true, available = null, busy = false, stage = "", percent = -1, + desktopInstalled = true, offlineAccount = null, offline = false, frameGenLabel = "", + romsDir = null, logsEnabled = false, steamGames = emptyList(), emulators = emptyList(), running = running, + isHomeApp = home, + ) + private val state get() = state() + private val stateWithAppsAndSession get() = state(home = true, running = "Steam") + + private val actions = FrontEndActions( + onPlay = {}, onPlayDesktopUi = {}, onSteamGame = {}, onDesktop = {}, onEmulator = {}, + onRom = {}, onResume = {}, onSteamSettings = {}, onDesktopSettings = {}, + onInstallPackage = {}, onRemovePackage = {}, onRuntime = {}, onFrameGenPick = {}, + onImportLossless = {}, onProtons = {}, onComponents = {}, onPerformance = {}, + onRoms = {}, onFiles = {}, onLogs = {}, onOffline = {}, + onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> }, + onSetPhantomProcessLimit = { _, _ -> }, + ) +} From 1b3814a5876788962141d1a53c4ffcd8cc367c9c Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Mon, 26 Oct 2026 09:16:05 -0400 Subject: [PATCH 067/135] Hold games to the frame limit in Performance mode (#1609) A frame limit only paced what reached the screen: a game without vsync kept drawing hundreds of frames a second that were thrown away (AIO at a 60 fps limit drew 155 to 2,446 fps), so the limit saved no power. With Performance mode on and a frame limit set, the session now sets gamescope's per-game limit over gamescope_control (gamescopectl debug_set_fps_limit). gamescope's limiter then has its WSI layer hold Vulkan games, DXVK and VKD3D included, to the limit. gamescope's own --framerate-limit option is reset on its first frame in 3.16.29, and Steam resets the per-game limit while it starts, so the session watches gamescope's limiter state file and sets the limit again whenever it is off (a once-a-second check with shell builtins, no process started). With Performance mode off, a limit paces the screen only, as before. The session also gives gamescope a fixed limiter state file path, so gamescope stops leaving a new one behind on every start, and removes the old ones. Device-proven on the AYANEO Pocket FIT (Turnip, AIO D3D11, 45 s runs on battery, three runs each): at a 60 fps limit the game held exactly 60.0 fps and the device drew 7.08 W instead of 9.45 W, with 1.3 instead of 2.6 busy cores and 5 instead of 11 % GPU load. No limit: unchanged. --- .../launcher/session/SessionService.kt | 2 + app/src/main/res/values/strings.xml | 2 +- .../overlay/usr/local/bin/droiddeck-session | 37 +++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) 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 b49e6392d8..c81c1831c0 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -483,6 +483,8 @@ class SessionService : Service() { val windowCheckMs = if (SessionState.performanceMode) 100 else 0 guest.add("DROIDDECK_WSI_BYPASS_CHECK_MS=$windowCheckMs") guest.add("WINE_OFFSCREEN_CHECK_MS=$windowCheckMs") + // With a frame limit, gamescope's limiter also holds the games to it instead of only pacing the screen. + guest.add("DROIDDECK_GAME_FRAME_LIMIT=" + (if (SessionState.performanceMode) 1 else 0)) if (SessionPrefs.compositorFpsLimit(SessionState.fpsLimit, SessionState.performanceMode) == SessionPrefs.FPS_UNPACED) { // gamescope turns buffers around slower than an unpaced game draws; more images keep it drawing. guest.add("GAMESCOPE_WSI_MIN_IMAGE_COUNT=8") diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 03204a9ffa..6de9cdb354 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -258,7 +258,7 @@ <string name="mode_ratio_auto">Auto uses at least 16:9.</string> <string name="mode_fps">Frame limit</string> <string name="mode_performance">Performance mode</string> - <string name="mode_performance_hint">With no frame limit, games run as fast as they can: frames go back to the game without waiting for the screen. With a frame limit, frames stay paced to it. Either way, gamescope and Wine skip repeated window checks. Uses more power and runs warmer without a limit. Applies next session.</string> + <string name="mode_performance_hint">With no frame limit, games run as fast as they can: frames go back to the game without waiting for the screen. With a frame limit, games are held to it instead of drawing frames the screen never shows. Either way, gamescope and Wine skip repeated window checks. Uses more power and runs warmer without a limit. Applies next session.</string> <string name="mode_fps_note">Caps the whole session. The display switches to a refresh rate the cap divides evenly.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 output</string> diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index bc3febb332..755a9fce89 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -70,6 +70,31 @@ steam_update_stuck() { [ "$steam_updates" -ge 3 ] } +# gamescope's --framerate-limit lasts only until its first frame, which recomputes the limit +# from the per-app value set over gamescope_control, and Steam resets that value to 0 while it +# starts. Watch gamescope's limiter state file (first byte 1 = limiter on) and set the value +# again whenever it is off; the limiter then makes the WSI layer hold Vulkan games (DXVK and +# VKD3D included) to it. Shell builtins only, so the once-a-second check starts no process. +hold_games_to_frame_limit() { + local fps=$1 file=$2 parent=$3 state sent=0 nap napfd= + command -v gamescopectl >/dev/null || { echo "== gamescope: no gamescopectl, the frame limit paces the screen only"; return 0; } + nap=$(mktemp -u "${XDG_RUNTIME_DIR:-/tmp}/droiddeck-nap.XXXXXX") && mkfifo "$nap" 2>/dev/null \ + && exec {napfd}<>"$nap"; rm -f "$nap" + while kill -0 "$parent" 2>/dev/null; do + if [ -f "$file" ]; then + state= + IFS= read -r -n1 -d '' state < "$file" + if [ "$state" != $'\x01' ] && gamescopectl debug_set_fps_limit "$fps" >/dev/null 2>&1; then + sent=$((sent + 1)) + if [ "$sent" = 1 ]; then echo "== gamescope: games held to $fps fps" + elif [ "$sent" -le 4 ]; then echo "== gamescope: the frame limit was reset, set it again" + fi + fi + fi + if [ -n "$napfd" ]; then read -r -t 1 -u "$napfd" _; else sleep 1; fi + done +} + run_gamescope() ( local status_file child_status compositor_status status_file=$(mktemp "${XDG_RUNTIME_DIR:-/tmp}/droiddeck-steam-exit.XXXXXX") || exit 73 @@ -238,6 +263,13 @@ if [ -z "${BL_INSIDE:-}" ]; then fi if [ "${BL_FPS:-0}" -gt 0 ]; then args+=(-r "$BL_FPS") + # -r alone only paces what reaches the screen: a game without vsync keeps drawing + # hundreds of frames that are thrown away. Performance mode also holds the games to it. + if [ "${DROIDDECK_GAME_FRAME_LIMIT:-0}" = 1 ]; then + game_frame_limit=$BL_FPS + else + echo "== gamescope: frame limit $BL_FPS paces the screen only" + fi elif [ "${BL_REFRESH:-0}" -gt 0 ]; then args+=(-r "$BL_REFRESH") fi @@ -258,6 +290,11 @@ if [ -z "${BL_INSIDE:-}" ]; then echo "== gamescope: mangoapp on ($(command -v mangoapp), config $MANGOHUD_CONFIGFILE)" fi export BL_INSIDE=1 + # A fixed path: left to itself gamescope creates a new limiter state file on every start. + rm -f "${XDG_RUNTIME_DIR:-/tmp}"/gamescope-limiter-* + export GAMESCOPE_LIMITER_FILE="${XDG_RUNTIME_DIR:-/tmp}/droiddeck-gamescope-limiter" + rm -f "$GAMESCOPE_LIMITER_FILE" + [ -n "${game_frame_limit:-}" ] && hold_games_to_frame_limit "$game_frame_limit" "$GAMESCOPE_LIMITER_FILE" $$ & if [ "$mode" = steam ]; then if /usr/local/bin/droiddeck-pipewire start; then eval "$(/usr/local/bin/droiddeck-pipewire env)" From fd9de4a21e7c5b49e36ecb05e475477ce85c8d7b Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 09:10:46 -0400 Subject: [PATCH 068/135] fix: list Battle.net's games in a grid that scrolls down --- .../java/com/droiddeck/launcher/ui/StoresPage.kt | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 2d26dc708b..916e44e43f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -832,8 +832,10 @@ private fun Storefront( LaunchedEffect(store, q) { StoresState.search(ctx, store, q) } val browsing = store == Store.ITCH && q.isEmpty() && ItchBrowseState.active val browseItems = if (browsing) ItchBrowseState.items else emptyList() - val visible = remember(found, library, shelves, q, s.storesShowMature, browsing, browseItems) { - if (browsing) { + val catalog = store == Store.BATTLENET && q.isEmpty() + val visible = remember(found, library, shelves, q, s.storesShowMature, browsing, browseItems, catalog) { + if (catalog) shelf(shelves?.trending) ?: emptyList() + else if (browsing) { val owned = library.associateBy { it.id } browseItems.map { owned[it.id] ?: it }.filter(::shown) } else if (q.isEmpty()) emptyList() @@ -843,6 +845,7 @@ private fun Storefront( val nothing = stringResource(when { browsing && ItchBrowseState.loading -> R.string.stores_shelves_loading browsing && ItchBrowseState.failed -> R.string.stores_itch_browse_failed + catalog && shelves == null -> R.string.stores_shelves_loading else -> R.string.stores_nothing_matches }) var firstPlaced = false @@ -850,12 +853,12 @@ private fun Storefront( val density = androidx.compose.ui.platform.LocalDensity.current val focus = LocalFrontFocus.current val scope = rememberCoroutineScope() - val searching = q.isNotEmpty() || browsing + val searching = q.isNotEmpty() || browsing || catalog // A bar only while there is nothing else to look at: no shelves yet and no search results. val bareTab = if (searching) visible.isEmpty() else shelves == null || shelves.isEmpty val barLine = StoresState.status[store]?.takeIf { bareTab && syncCount(it) != null } val itchBar = store == Store.ITCH && q.isEmpty() - val headerItems = 2 + (if (barLine != null) 1 else 0) + (if (StoresState.problems[store] != null) 1 else 0) + (if (itchBar) 1 else 0) + val headerItems = 2 + (if (barLine != null) 1 else 0) + (if (StoresState.problems[store] != null) 1 else 0) + (if (itchBar) 1 else 0) + (if (catalog) 1 else 0) val card: @Composable (CatalogItem) -> Unit = { item -> val first = if (searching) item.key == visible.firstOrNull()?.key else !firstPlaced firstPlaced = true @@ -904,6 +907,9 @@ private fun Storefront( barLine?.let { line -> item(key = "sync", span = { GridItemSpan(maxLineSpan) }) { Rise(3) { SyncBar(line) } } } StoresState.problems[store]?.let { line -> item(key = "problem", span = { GridItemSpan(maxLineSpan) }) { Rise(3) { Box(Modifier.padding(bottom = 8.dp)) { Note(line) } } } } if (itchBar) item(key = "itch-browse-bar", span = { GridItemSpan(maxLineSpan) }) { ItchBrowseBar() } + if (catalog) item(key = "catalog-label", span = { GridItemSpan(maxLineSpan) }) { + Box(Modifier.padding(top = 10.dp)) { SectionLabel(stringResource(R.string.bnet_store)) } + } if (searching) { storeGrid(visible, nothing, card) if (browsing) item(key = "itch-more", span = { GridItemSpan(maxLineSpan) }) { ItchLoadMore() } @@ -912,7 +918,7 @@ private fun Storefront( Shelf(stringResource(R.string.stores_shelf_new), shelf(shelves?.whatsNew), card) Shelf(stringResource(R.string.stores_shelf_deals), shelf(shelves?.deals), card) Shelf(stringResource(R.string.stores_shelf_free), shelf(shelves?.free), card) - Shelf(stringResource(if (store == Store.BATTLENET) R.string.bnet_store else R.string.stores_shelf_trending), shelf(shelves?.trending), card) + Shelf(stringResource(R.string.stores_shelf_trending), shelf(shelves?.trending), card) if (shelves == null) Rise(4) { Box(Modifier.padding(top = 8.dp)) { Note(stringResource(R.string.stores_shelves_loading)) } } else if (shelves.isEmpty && store == Store.AMAZON) Rise(4) { Box(Modifier.padding(top = 8.dp)) { Note(stringResource(R.string.stores_amazon_no_catalog)) } } } From be5bec2d44971bbd95a0b1830f9adcd624060f90 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 09:34:52 -0400 Subject: [PATCH 069/135] fix: keep every game library mounted for Battle.net's Agent and drop games it no longer tracks --- .../droiddeck/launcher/runtime/BattleNet.kt | 12 +++++-- .../stores/battlenet/BattleNetInstall.kt | 35 +++++++++++-------- .../launcher/runtime/BattleNetTest.kt | 15 ++++++-- 3 files changed, 42 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt index f753585b17..d1d54c0db8 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -161,8 +161,10 @@ object BattleNet { fun games(context: Context): List<Game> { val pfx = File(prefix(context), "pfx") - val entries = runCatching { File(pfx, "system.reg").useLines { uninstallEntries(it) } }.getOrDefault(emptyList()) + - runCatching { productDbEntries(File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").readBytes()) }.getOrDefault(emptyList()) + val entries = installs( + runCatching { File(pfx, "system.reg").useLines { uninstallEntries(it) } }.getOrDefault(emptyList()), + runCatching { productDbEntries(File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").readBytes()) }.getOrNull(), + ) val found = LinkedHashMap<String, Game>() for ((uid, path) in entries) { val title = title(uid) @@ -177,6 +179,12 @@ object BattleNet { return found.values.toList() } + internal fun installs(registry: List<Pair<String, String>>, agent: List<Pair<String, String>>?): List<Pair<String, String>> { + if (agent.isNullOrEmpty()) return registry + val tracked = agent.map { it.first.lowercase() }.toSet() + return registry.filter { it.first.lowercase() in tracked } + agent + } + internal fun hostFolder(context: Context, path: String): File? { val drive = Regex("""^([CcZz]):[\\/](.*)$""").matchEntire(path.trim()) ?: return null val relative = drive.groupValues[2].replace('\\', '/').trim('/') diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt index d73e77d132..735471cc83 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt @@ -34,7 +34,6 @@ object BattleNetInstall { internal const val STATE = "BNET_STATE " internal const val DONE = "BNET_DONE " internal const val ERROR = "BNET_ERROR " - private const val LIBRARY_GUEST = "/mnt/droiddeck-sd" private const val VERSIONS = "https://%s.version.battle.net/v2/products/%s/versions" private const val BUILD_INFO = ".build.info" private const val CHECK_AGAIN_MS = 30 * 60_000L @@ -70,22 +69,28 @@ object BattleNetInstall { return if (two.matches(Regex("[A-Z]{2}")) && three.matches(Regex("[A-Z]{3}"))) three to two else "USA" to "US" } - internal fun binds(context: Context, guest: String): List<String> { - val out = ArrayList<String>() - if (guest.startsWith(StoreInstallRoot.GUEST_EXTERNAL + "/")) out += StoreInstallRoot.externalBindSpecs(context) - if (guest == LIBRARY_GUEST || guest.startsWith("$LIBRARY_GUEST/")) { - GameStorage.effective(context)?.let { library -> - File(LinuxRuntime.rootDir(context), LIBRARY_GUEST.removePrefix("/")).mkdirs() - out += SecondaryLibrary.contentPath(File(library.path)).path + ":" + LIBRARY_GUEST + internal fun binds(context: Context): List<String> { + val out = ArrayList<String>(StoreInstallRoot.externalBindSpecs(context)) + val root = LinuxRuntime.rootDir(context) + GameStorage.effective(context)?.let { library -> + val content = SecondaryLibrary.contentPath(File(library.path)).path + for (guest in SecondaryLibrary.CARD_GUESTS) { + File(root, guest.removePrefix("/")).mkdirs() + out += "$content:$guest" } } + for (folder in AddedGames.roots(context)) { + if (!folder.host.isDirectory || !folder.host.canRead()) continue + File(root, folder.guest.removePrefix("/")).mkdirs() + out += folder.host.path + ":" + folder.guest + } return out } - internal fun run(context: Context, args: List<String>, guest: String?, cancelled: AtomicBoolean?, onLine: (String) -> Unit): Int = + internal fun run(context: Context, args: List<String>, cancelled: AtomicBoolean?, onLine: (String) -> Unit): Int = GuestCommand.run( context, listOf(BattleNet.PROGRAM) + args, logName = "battlenet-agent", - extraBinds = guest?.let { binds(context, it) }, fastPath = true, cancelled = cancelled, onLine = onLine, + extraBinds = binds(context), fastPath = true, cancelled = cancelled, onLine = onLine, ) fun enqueue(context: Context, item: CatalogItem, folder: File, update: Boolean = false) { @@ -116,12 +121,12 @@ object BattleNetInstall { fun uninstall(context: Context, game: InstalledStoreGame): Boolean { if (product(game.sidecar.id) == null || !BattleNet.installed(context)) return false - val done = agentUninstall(context, installUid(context, game), game.folder) + val done = agentUninstall(context, installUid(context, game)) if (done) StoresState.post { StoresState.notifyLibraryChanged(context.applicationContext) } return done } - internal fun agentUninstall(context: Context, uid: String, folder: File): Boolean { + internal fun agentUninstall(context: Context, uid: String): Boolean { val stop = AtomicBoolean(false) val started = AtomicBoolean(false) val done = AtomicBoolean(false) @@ -133,7 +138,7 @@ object BattleNetInstall { } }, "battlenet-uninstall-wait").apply { isDaemon = true; start() } val code = runCatching { - run(context, listOf("agent-uninstall", uid), AddedGames.guestPath(context, folder), stop) { line -> + run(context, listOf("agent-uninstall", uid), stop) { line -> if (line == STATE + "starting") started.set(true) if (line.startsWith(DONE)) done.set(true) } @@ -263,7 +268,7 @@ internal class BattleNetInstaller( else listOf("agent-install", uid, product, guest, BattleNetInstall.localeTag(app), country, region) var done: JSONObject? = null var reason: String? = null - val code = BattleNetInstall.run(app, args, guest, cancelled) { line -> + val code = BattleNetInstall.run(app, args, cancelled) { line -> when { line.startsWith(BattleNetInstall.PROGRESS) -> runCatching { JSONObject(line.removePrefix(BattleNetInstall.PROGRESS)) }.getOrNull()?.let { progress(handle, it) } @@ -304,7 +309,7 @@ internal class BattleNetInstaller( val uid = item.extra[BattleNetInstall.INSTALL_UID] ?: BattleNet.title(item.id)?.uid ?: return Thread({ if (started.get() && !ended.await(END_WAIT_S, TimeUnit.SECONDS)) Log.w("BattleNetInstall", "the cancelled install of $uid is still stopping") - val gone = BattleNetInstall.agentUninstall(app, uid, folder) + val gone = BattleNetInstall.agentUninstall(app, uid) if (folder.isDirectory && (gone || folder.list().isNullOrEmpty())) com.droiddeck.launcher.core.FileUtils.delete(folder) Log.i("BattleNetInstall", "cancelled install of $uid: ${if (gone) "removed" else "left for Battle.net to remove"}") }, "battlenet-cancel").start() diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt index d23a2eac23..6a4e84cb7e 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -216,6 +216,13 @@ class BattleNetTest { assertEquals(emptyList<Pair<String, String>>(), BattleNet.productDbEntries(byteArrayOf(0x0a, 0x7f, 0x01))) } + @Test fun aGameTheAgentNoLongerTracksIsNotInstalled() { + val registry = listOf("wow" to "Z:\\mnt\\droiddeck-sd\\Games\\Battle.net\\World of Warcraft", "hs_beta" to "C:\\Hearthstone") + assertEquals(listOf("hs_beta" to "C:\\Hearthstone", "HS_BETA" to "C:/Hearthstone"), BattleNet.installs(registry, listOf("HS_BETA" to "C:/Hearthstone"))) + assertEquals(registry, BattleNet.installs(registry, null)) + assertEquals(registry, BattleNet.installs(registry, emptyList())) + } + @Test fun theGamesAreTheTitlesInstalledInTheirFolders() { val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } File(pfx, "system.reg").writeText(REGISTRY) @@ -229,9 +236,11 @@ class BattleNetTest { File(pfx, "drive_c/$folder").mkdirs() } val games = BattleNet.games(context) - assertEquals(listOf("Fen", "OSI", "WTCG", "WoWC"), games.map { it.code }) - assertEquals(listOf("Diablo IV", "Diablo II: Resurrected", "Hearthstone", "World of Warcraft Classic"), games.map { it.name }) - assertEquals(File(pfx, "drive_c/Games/Diablo II Resurrected"), games[1].folder) + assertEquals(listOf("Fen", "WTCG", "WoWC"), games.map { it.code }) + assertEquals(listOf("Diablo IV", "Hearthstone", "World of Warcraft Classic"), games.map { it.name }) + assertEquals(File(pfx, "drive_c/Program Files (x86)/Hearthstone"), games[1].folder) + File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").delete() + assertEquals(listOf("Fen", "OSI"), BattleNet.games(context).map { it.code }) assertNull(BattleNet.hostFolder(context, "D:\\Games\\X")) assertNull(BattleNet.hostFolder(context, "C:\\..\\..\\etc")) assertNull(BattleNet.hostFolder(context, "Z:\\root\\..\\..\\etc")) From 538b5c527092ff91c1a597797027a2cfd62884b0 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 09:53:01 -0400 Subject: [PATCH 070/135] fix: hide registry-only games when product.db lists none, keep the Agent off without the game storage card --- .../com/droiddeck/launcher/runtime/BattleNet.kt | 6 +++--- .../stores/battlenet/BattleNetInstall.kt | 1 + .../droiddeck/launcher/runtime/BattleNetTest.kt | 16 +++++++++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt index d1d54c0db8..ba8605b7ce 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -180,7 +180,7 @@ object BattleNet { } internal fun installs(registry: List<Pair<String, String>>, agent: List<Pair<String, String>>?): List<Pair<String, String>> { - if (agent.isNullOrEmpty()) return registry + if (agent == null) return registry val tracked = agent.map { it.first.lowercase() }.toSet() return registry.filter { it.first.lowercase() in tracked } + agent } @@ -250,8 +250,8 @@ object BattleNet { return out.toString() } - internal fun productDbEntries(bytes: ByteArray): List<Pair<String, String>> { - val installs = runCatching { fields(bytes, 0, bytes.size) }.getOrDefault(emptyList()).filter { it.first == 1 } + internal fun productDbEntries(bytes: ByteArray): List<Pair<String, String>>? { + val installs = runCatching { fields(bytes, 0, bytes.size) }.getOrNull()?.filter { it.first == 1 }?.takeIf { it.isNotEmpty() } ?: return null return installs.mapNotNull { (_, start, end) -> runCatching { val install = fields(bytes, start, end) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt index 735471cc83..0fe38c49db 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt @@ -73,6 +73,7 @@ object BattleNetInstall { val out = ArrayList<String>(StoreInstallRoot.externalBindSpecs(context)) val root = LinuxRuntime.rootDir(context) GameStorage.effective(context)?.let { library -> + if (!File(library.path).isDirectory) throw IllegalStateException(context.getString(R.string.game_sync_err_game_storage)) val content = SecondaryLibrary.contentPath(File(library.path)).path for (guest in SecondaryLibrary.CARD_GUESTS) { File(root, guest.removePrefix("/")).mkdirs() diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt index 6a4e84cb7e..df68c86d09 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -212,15 +212,25 @@ class BattleNetTest { ) assertEquals(listOf("agent" to "C:/ProgramData/Battle.net/Agent", "hs_beta" to "C:/Program Files (x86)/Hearthstone", "wow_classic_anniversary" to "Z:/root/Games/World of Warcraft"), BattleNet.productDbEntries(db)) - assertEquals(emptyList<Pair<String, String>>(), BattleNet.productDbEntries(db.copyOf(db.size - 3))) - assertEquals(emptyList<Pair<String, String>>(), BattleNet.productDbEntries(byteArrayOf(0x0a, 0x7f, 0x01))) + assertNull(BattleNet.productDbEntries(db.copyOf(db.size - 3))) + assertNull(BattleNet.productDbEntries(byteArrayOf(0x0a, 0x7f, 0x01))) + assertNull(BattleNet.productDbEntries(ByteArray(0))) + assertEquals(emptyList<Pair<String, String>>(), BattleNet.productDbEntries(message(field(1, message(field(1, "s1"), field(3, message(field(1, "Z:/Games/StarCraft"))), field(4, message(field(1, message(varintField(1, 0)))))))))) + } + + @Test fun theAgentDoesNotStartWithoutTheGameStorageCard() { + val card = Files.createTempDirectory("card").toFile() + com.droiddeck.launcher.session.SessionPrefs.setGameStorage(context, card.path, "SD Card") + assertTrue(com.droiddeck.launcher.stores.battlenet.BattleNetInstall.binds(context).any { it.endsWith(":/mnt/droiddeck-sd") }) + card.deleteRecursively() + assertThrows(IllegalStateException::class.java) { com.droiddeck.launcher.stores.battlenet.BattleNetInstall.binds(context) } } @Test fun aGameTheAgentNoLongerTracksIsNotInstalled() { val registry = listOf("wow" to "Z:\\mnt\\droiddeck-sd\\Games\\Battle.net\\World of Warcraft", "hs_beta" to "C:\\Hearthstone") assertEquals(listOf("hs_beta" to "C:\\Hearthstone", "HS_BETA" to "C:/Hearthstone"), BattleNet.installs(registry, listOf("HS_BETA" to "C:/Hearthstone"))) assertEquals(registry, BattleNet.installs(registry, null)) - assertEquals(registry, BattleNet.installs(registry, emptyList())) + assertEquals(emptyList<Pair<String, String>>(), BattleNet.installs(registry, emptyList())) } @Test fun theGamesAreTheTitlesInstalledInTheirFolders() { From e492a78f55c60b717a1ec9858ae869871925564e Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 10:05:34 -0400 Subject: [PATCH 071/135] fix: treat a product.db with a damaged install record as unreadable --- .../main/java/com/droiddeck/launcher/runtime/BattleNet.kt | 6 +++--- .../java/com/droiddeck/launcher/runtime/BattleNetTest.kt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt index ba8605b7ce..b41fee3171 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -252,7 +252,7 @@ object BattleNet { internal fun productDbEntries(bytes: ByteArray): List<Pair<String, String>>? { val installs = runCatching { fields(bytes, 0, bytes.size) }.getOrNull()?.filter { it.first == 1 }?.takeIf { it.isNotEmpty() } ?: return null - return installs.mapNotNull { (_, start, end) -> + return installs.map { (_, start, end) -> runCatching { val install = fields(bytes, start, end) val uid = install.firstOrNull { it.first == 1 }?.let { String(bytes, it.second, it.third - it.second) } @@ -261,8 +261,8 @@ object BattleNet { val installed = install.firstOrNull { it.first == 4 }?.let { s -> fields(bytes, s.second, s.third).firstOrNull { it.first == 1 } } ?.let { s -> varints(bytes, s.second, s.third)[1] } if (uid.isNullOrEmpty() || path.isNullOrEmpty() || installed == 0L) null else uid to path - }.getOrNull() - } + }.getOrElse { return null } + }.filterNotNull() } private fun fields(bytes: ByteArray, from: Int, to: Int): List<Triple<Int, Int, Int>> = walk(bytes, from, to) { _, _ -> } diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt index df68c86d09..a2c5e483bb 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -215,6 +215,7 @@ class BattleNetTest { assertNull(BattleNet.productDbEntries(db.copyOf(db.size - 3))) assertNull(BattleNet.productDbEntries(byteArrayOf(0x0a, 0x7f, 0x01))) assertNull(BattleNet.productDbEntries(ByteArray(0))) + assertNull(BattleNet.productDbEntries(byteArrayOf(0x0a, 0x03, 0x0a, 0x7f, 0x01))) assertEquals(emptyList<Pair<String, String>>(), BattleNet.productDbEntries(message(field(1, message(field(1, "s1"), field(3, message(field(1, "Z:/Games/StarCraft"))), field(4, message(field(1, message(varintField(1, 0)))))))))) } From 30da4d2bcd6aba0271004e41ff5e47d92dd199ee Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 08:47:24 -0400 Subject: [PATCH 072/135] fix: count a desktop window game's frames for the performance HUD --- app/src/main/cpp/waylandcomp/src/compositor.c | 42 ++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 0718623cfa..2c3889d252 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -207,6 +207,7 @@ struct surface { int buf_w, buf_h, has_content; int buf_alpha; int opaque[4], pending_opaque[4], pending_opaque_set; + int64_t damage_max, pending_damage_max; int src_set, dst_set; float src[4]; int dst[2]; @@ -624,6 +625,15 @@ static void fire_frames(struct wl_list *frames) { } } +static void scene_size(int *w, int *h); +static struct surface *g_hud_surface; +static int64_t g_hud_last_ns, g_hud_alive_ns; +static int g_hud_fresh; +static uint64_t g_game_frames; +extern void droiddeck_on_game_surface(const char *window, const char *gpu); +extern void droiddeck_on_game_frame(void); +extern void droiddeck_on_game_program(int pid, const char *program); + static void take_shm(struct surface *s, struct wl_shm_buffer *shm, struct wl_resource *buffer) { int32_t w = wl_shm_buffer_get_width(shm), h = wl_shm_buffer_get_height(shm); int32_t stride = wl_shm_buffer_get_stride(shm); @@ -646,6 +656,14 @@ static void take_shm(struct surface *s, struct wl_shm_buffer *shm, struct wl_res g_stat_shm++; struct client_info *ci = client_info_of(wl_resource_get_client(s->resource)); if (ci && ci->asked_feedback) ci->shm_frames++; + const int64_t area = (int64_t)w * h, damaged = s->damage_max < area ? s->damage_max : area; + if (damaged * 16 >= area && (!g_hud_surface || now_ns() - g_hud_alive_ns > 1000000000LL)) { + const struct surface *top = s; + int scene_w, scene_h, depth = 0; + while (top->parent && depth++ < 8) top = top->parent; + scene_size(&scene_w, &scene_h); + if (top->role == ROLE_TOPLEVEL && area * 2 >= (int64_t)scene_w * scene_h) droiddeck_on_game_frame(); + } } static void take_pixel(struct surface *s, const uint8_t bgra[4], struct wl_resource *buffer) { @@ -662,14 +680,6 @@ static void take_pixel(struct surface *s, const uint8_t bgra[4], struct wl_resou s->has_content = s->shm_img != NULL; } -static struct surface *g_hud_surface; -static int64_t g_hud_last_ns, g_hud_alive_ns; -static int g_hud_fresh; -static uint64_t g_game_frames; -extern void droiddeck_on_game_surface(const char *window, const char *gpu); -extern void droiddeck_on_game_frame(void); -extern void droiddeck_on_game_program(int pid, const char *program); - static void take_dmabuf(struct surface *s, struct dmabuf_buffer *b, struct wl_resource *buffer) { const int repeat = s->dmabuf == buffer && s->dmabuf_buf == b; if (!repeat) { @@ -786,8 +796,16 @@ static void surface_attach(struct wl_client *c, struct wl_resource *r, wl_resource_add_destroy_listener(buffer, &s->pending_buffer_destroy); } } +static void note_damage(struct wl_resource *r, int32_t w, int32_t h) { + struct surface *s = wl_resource_get_user_data(r); + if (w <= 0 || h <= 0) return; + const int64_t area = (int64_t)(w < 65536 ? w : 65536) * (h < 65536 ? h : 65536); + if (area > s->pending_damage_max) s->pending_damage_max = area; +} static void surface_damage(struct wl_client *c, struct wl_resource *r, - int32_t x, int32_t y, int32_t w, int32_t h) {} + int32_t x, int32_t y, int32_t w, int32_t h) { + note_damage(r, w, h); +} static void frame_callback_destroy(struct wl_resource *r) { wl_list_remove(wl_resource_get_link(r)); } @@ -987,6 +1005,8 @@ static void surface_commit(struct wl_client *c, struct wl_resource *r) { s->pending_opaque_set = 0; } + s->damage_max = s->pending_damage_max; + s->pending_damage_max = 0; if (s->pending_attach) { struct wl_resource *buffer = s->pending_buffer; struct dmabuf_buffer *db = get_dmabuf(buffer); @@ -1051,7 +1071,9 @@ static void surface_commit(struct wl_client *c, struct wl_resource *r) { static void surface_set_buffer_transform(struct wl_client *c, struct wl_resource *r, int32_t t) {} static void surface_set_buffer_scale(struct wl_client *c, struct wl_resource *r, int32_t s) {} static void surface_damage_buffer(struct wl_client *c, struct wl_resource *r, - int32_t x, int32_t y, int32_t w, int32_t h) {} + int32_t x, int32_t y, int32_t w, int32_t h) { + note_damage(r, w, h); +} static void surface_offset(struct wl_client *c, struct wl_resource *r, int32_t x, int32_t y) {} static const struct wl_surface_interface surface_impl = { From 744a42d324e7adccc981fa684fae309f8a2a8807 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 09:06:13 -0400 Subject: [PATCH 073/135] fix: count one shm window, only after new GPU frames stop, with damage in buffer pixels --- app/src/main/cpp/waylandcomp/src/compositor.c | 39 +++++++++++++------ 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 2c3889d252..6f3b80bd4b 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -207,7 +207,7 @@ struct surface { int buf_w, buf_h, has_content; int buf_alpha; int opaque[4], pending_opaque[4], pending_opaque_set; - int64_t damage_max, pending_damage_max; + int64_t damage_max, pending_damage_max, damage_local_max, pending_damage_local_max; int src_set, dst_set; float src[4]; int dst[2]; @@ -626,7 +626,8 @@ static void fire_frames(struct wl_list *frames) { } static void scene_size(int *w, int *h); -static struct surface *g_hud_surface; +static struct surface *g_hud_surface, *g_hud_shm; +static int64_t g_hud_shm_ns; static int64_t g_hud_last_ns, g_hud_alive_ns; static int g_hud_fresh; static uint64_t g_game_frames; @@ -656,13 +657,26 @@ static void take_shm(struct surface *s, struct wl_shm_buffer *shm, struct wl_res g_stat_shm++; struct client_info *ci = client_info_of(wl_resource_get_client(s->resource)); if (ci && ci->asked_feedback) ci->shm_frames++; - const int64_t area = (int64_t)w * h, damaged = s->damage_max < area ? s->damage_max : area; - if (damaged * 16 >= area && (!g_hud_surface || now_ns() - g_hud_alive_ns > 1000000000LL)) { + int local_w, local_h; + surface_size(s, &local_w, &local_h); + const double region = s->src_set ? (double)s->src[2] * s->src[3] : (double)w * h; + const int64_t local = local_w > 0 && local_h > 0 + ? (int64_t)((double)s->damage_local_max * region / ((double)local_w * local_h)) : s->damage_local_max; + const int64_t area = (int64_t)w * h; + int64_t damaged = s->damage_max > local ? s->damage_max : local; + if (damaged > area) damaged = area; + const int64_t now = now_ns(); + if (damaged * 16 >= area && (!g_hud_surface || now - g_hud_last_ns > 1000000000LL) && + (s == g_hud_shm || !g_hud_shm || now - g_hud_shm_ns > 1000000000LL)) { const struct surface *top = s; int scene_w, scene_h, depth = 0; while (top->parent && depth++ < 8) top = top->parent; scene_size(&scene_w, &scene_h); - if (top->role == ROLE_TOPLEVEL && area * 2 >= (int64_t)scene_w * scene_h) droiddeck_on_game_frame(); + if (top->role == ROLE_TOPLEVEL && top->mapped && area * 2 >= (int64_t)scene_w * scene_h) { + g_hud_shm = s; + g_hud_shm_ns = now; + droiddeck_on_game_frame(); + } } } @@ -796,15 +810,15 @@ static void surface_attach(struct wl_client *c, struct wl_resource *r, wl_resource_add_destroy_listener(buffer, &s->pending_buffer_destroy); } } -static void note_damage(struct wl_resource *r, int32_t w, int32_t h) { - struct surface *s = wl_resource_get_user_data(r); +static void note_damage(int64_t *max, int32_t w, int32_t h) { if (w <= 0 || h <= 0) return; const int64_t area = (int64_t)(w < 65536 ? w : 65536) * (h < 65536 ? h : 65536); - if (area > s->pending_damage_max) s->pending_damage_max = area; + if (area > *max) *max = area; } static void surface_damage(struct wl_client *c, struct wl_resource *r, int32_t x, int32_t y, int32_t w, int32_t h) { - note_damage(r, w, h); + struct surface *s = wl_resource_get_user_data(r); + note_damage(&s->pending_damage_local_max, w, h); } static void frame_callback_destroy(struct wl_resource *r) { wl_list_remove(wl_resource_get_link(r)); @@ -1006,7 +1020,8 @@ static void surface_commit(struct wl_client *c, struct wl_resource *r) { } s->damage_max = s->pending_damage_max; - s->pending_damage_max = 0; + s->damage_local_max = s->pending_damage_local_max; + s->pending_damage_max = s->pending_damage_local_max = 0; if (s->pending_attach) { struct wl_resource *buffer = s->pending_buffer; struct dmabuf_buffer *db = get_dmabuf(buffer); @@ -1072,7 +1087,8 @@ static void surface_set_buffer_transform(struct wl_client *c, struct wl_resource static void surface_set_buffer_scale(struct wl_client *c, struct wl_resource *r, int32_t s) {} static void surface_damage_buffer(struct wl_client *c, struct wl_resource *r, int32_t x, int32_t y, int32_t w, int32_t h) { - note_damage(r, w, h); + struct surface *s = wl_resource_get_user_data(r); + note_damage(&s->pending_damage_max, w, h); } static void surface_offset(struct wl_client *c, struct wl_resource *r, int32_t x, int32_t y) {} @@ -1116,6 +1132,7 @@ static void surface_resource_destroy(struct wl_resource *r) { droiddeck_text_input_surface_gone(r); if (g_desktop == s) { g_desktop = NULL; droiddeck_log("desktop", "the desktop closed"); } if (g_hud_surface == s) { g_hud_surface = NULL; droiddeck_on_game_surface(NULL, NULL); } + if (g_hud_shm == s) g_hud_shm = NULL; constraints_surface_gone(s); unmap_toplevel(s); From f98c2723004e9136c12fccc68c66d055de186d20 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 09:21:17 -0400 Subject: [PATCH 074/135] fix: compare the window's shown size with the scene --- app/src/main/cpp/waylandcomp/src/compositor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 6f3b80bd4b..937cdb718b 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -672,7 +672,7 @@ static void take_shm(struct surface *s, struct wl_shm_buffer *shm, struct wl_res int scene_w, scene_h, depth = 0; while (top->parent && depth++ < 8) top = top->parent; scene_size(&scene_w, &scene_h); - if (top->role == ROLE_TOPLEVEL && top->mapped && area * 2 >= (int64_t)scene_w * scene_h) { + if (top->role == ROLE_TOPLEVEL && top->mapped && (int64_t)local_w * local_h * 2 >= (int64_t)scene_w * scene_h) { g_hud_shm = s; g_hud_shm_ns = now; droiddeck_on_game_frame(); From 9c02233b06096d4f07f44a5011b87c71e3d11196 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 10:12:54 -0400 Subject: [PATCH 075/135] fix: clip damage to the surface and let the toplevel's size count for coverage --- app/src/main/cpp/waylandcomp/src/compositor.c | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 937cdb718b..84e7022b18 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -669,10 +669,13 @@ static void take_shm(struct surface *s, struct wl_shm_buffer *shm, struct wl_res if (damaged * 16 >= area && (!g_hud_surface || now - g_hud_last_ns > 1000000000LL) && (s == g_hud_shm || !g_hud_shm || now - g_hud_shm_ns > 1000000000LL)) { const struct surface *top = s; - int scene_w, scene_h, depth = 0; + int scene_w, scene_h, top_w, top_h, depth = 0; while (top->parent && depth++ < 8) top = top->parent; scene_size(&scene_w, &scene_h); - if (top->role == ROLE_TOPLEVEL && top->mapped && (int64_t)local_w * local_h * 2 >= (int64_t)scene_w * scene_h) { + surface_size(top, &top_w, &top_h); + int64_t shown = (int64_t)local_w * local_h; + if ((int64_t)top_w * top_h > shown) shown = (int64_t)top_w * top_h; + if (top->role == ROLE_TOPLEVEL && top->mapped && shown * 2 >= (int64_t)scene_w * scene_h) { g_hud_shm = s; g_hud_shm_ns = now; droiddeck_on_game_frame(); @@ -810,15 +813,26 @@ static void surface_attach(struct wl_client *c, struct wl_resource *r, wl_resource_add_destroy_listener(buffer, &s->pending_buffer_destroy); } } -static void note_damage(int64_t *max, int32_t w, int32_t h) { +static void note_damage(int64_t *max, int32_t x, int32_t y, int32_t w, int32_t h, int bound_w, int bound_h) { if (w <= 0 || h <= 0) return; - const int64_t area = (int64_t)(w < 65536 ? w : 65536) * (h < 65536 ? h : 65536); + int64_t x0 = x, y0 = y, x1 = (int64_t)x + w, y1 = (int64_t)y + h; + if (bound_w > 0 && bound_h > 0) { + if (x0 < 0) x0 = 0; + if (y0 < 0) y0 = 0; + if (x1 > bound_w) x1 = bound_w; + if (y1 > bound_h) y1 = bound_h; + if (x1 <= x0 || y1 <= y0) return; + } + const int64_t cw = x1 - x0, ch = y1 - y0; + const int64_t area = (cw < 65536 ? cw : 65536) * (ch < 65536 ? ch : 65536); if (area > *max) *max = area; } static void surface_damage(struct wl_client *c, struct wl_resource *r, int32_t x, int32_t y, int32_t w, int32_t h) { struct surface *s = wl_resource_get_user_data(r); - note_damage(&s->pending_damage_local_max, w, h); + int sw, sh; + surface_size(s, &sw, &sh); + note_damage(&s->pending_damage_local_max, x, y, w, h, sw, sh); } static void frame_callback_destroy(struct wl_resource *r) { wl_list_remove(wl_resource_get_link(r)); @@ -1088,7 +1102,7 @@ static void surface_set_buffer_scale(struct wl_client *c, struct wl_resource *r, static void surface_damage_buffer(struct wl_client *c, struct wl_resource *r, int32_t x, int32_t y, int32_t w, int32_t h) { struct surface *s = wl_resource_get_user_data(r); - note_damage(&s->pending_damage_max, w, h); + note_damage(&s->pending_damage_max, x, y, w, h, s->buf_w, s->buf_h); } static void surface_offset(struct wl_client *c, struct wl_resource *r, int32_t x, int32_t y) {} From ee1b3b26e1f7b19216b17a1d49cb070d77980f65 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 10:32:47 -0400 Subject: [PATCH 076/135] fix: clip damage against the buffer committed with it --- app/src/main/cpp/waylandcomp/src/compositor.c | 58 +++++++++++++------ 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 84e7022b18..256d8f6593 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -186,6 +186,9 @@ static void on_client_created(struct wl_listener *l, void *data) { enum surface_role { ROLE_NONE, ROLE_TOPLEVEL, ROLE_SUBSURFACE, ROLE_DESKTOP, ROLE_CURSOR }; +#define DAMAGE_RECTS 8 +struct damage_list { int32_t r[DAMAGE_RECTS][4]; int n; }; + struct surface { struct wl_resource *resource; struct wl_list link; @@ -207,7 +210,7 @@ struct surface { int buf_w, buf_h, has_content; int buf_alpha; int opaque[4], pending_opaque[4], pending_opaque_set; - int64_t damage_max, pending_damage_max, damage_local_max, pending_damage_local_max; + struct damage_list damage_buf, pending_damage_buf, damage_local, pending_damage_local; int src_set, dst_set; float src[4]; int dst[2]; @@ -626,6 +629,7 @@ static void fire_frames(struct wl_list *frames) { } static void scene_size(int *w, int *h); +static int64_t damage_area(const struct damage_list *d, int bound_w, int bound_h); static struct surface *g_hud_surface, *g_hud_shm; static int64_t g_hud_shm_ns; static int64_t g_hud_last_ns, g_hud_alive_ns; @@ -660,10 +664,12 @@ static void take_shm(struct surface *s, struct wl_shm_buffer *shm, struct wl_res int local_w, local_h; surface_size(s, &local_w, &local_h); const double region = s->src_set ? (double)s->src[2] * s->src[3] : (double)w * h; + const int64_t local_max = damage_area(&s->damage_local, local_w, local_h); const int64_t local = local_w > 0 && local_h > 0 - ? (int64_t)((double)s->damage_local_max * region / ((double)local_w * local_h)) : s->damage_local_max; + ? (int64_t)((double)local_max * region / ((double)local_w * local_h)) : local_max; + const int64_t buffer_max = damage_area(&s->damage_buf, w, h); const int64_t area = (int64_t)w * h; - int64_t damaged = s->damage_max > local ? s->damage_max : local; + int64_t damaged = buffer_max > local ? buffer_max : local; if (damaged > area) damaged = area; const int64_t now = now_ns(); if (damaged * 16 >= area && (!g_hud_surface || now - g_hud_last_ns > 1000000000LL) && @@ -813,26 +819,44 @@ static void surface_attach(struct wl_client *c, struct wl_resource *r, wl_resource_add_destroy_listener(buffer, &s->pending_buffer_destroy); } } -static void note_damage(int64_t *max, int32_t x, int32_t y, int32_t w, int32_t h, int bound_w, int bound_h) { - if (w <= 0 || h <= 0) return; - int64_t x0 = x, y0 = y, x1 = (int64_t)x + w, y1 = (int64_t)y + h; +static int64_t rect_area(const int32_t *r, int bound_w, int bound_h) { + int64_t x0 = r[0], y0 = r[1], x1 = (int64_t)r[0] + r[2], y1 = (int64_t)r[1] + r[3]; if (bound_w > 0 && bound_h > 0) { if (x0 < 0) x0 = 0; if (y0 < 0) y0 = 0; if (x1 > bound_w) x1 = bound_w; if (y1 > bound_h) y1 = bound_h; - if (x1 <= x0 || y1 <= y0) return; } - const int64_t cw = x1 - x0, ch = y1 - y0; - const int64_t area = (cw < 65536 ? cw : 65536) * (ch < 65536 ? ch : 65536); - if (area > *max) *max = area; + if (x1 <= x0 || y1 <= y0) return 0; + const int64_t w = x1 - x0, h = y1 - y0; + return (w < 65536 ? w : 65536) * (h < 65536 ? h : 65536); +} +static void note_damage(struct damage_list *d, int32_t x, int32_t y, int32_t w, int32_t h) { + if (w <= 0 || h <= 0) return; + const int32_t rect[4] = { x, y, w, h }; + int slot = d->n; + if (slot == DAMAGE_RECTS) { + slot = 0; + for (int i = 1; i < DAMAGE_RECTS; i++) + if (rect_area(d->r[i], 0, 0) < rect_area(d->r[slot], 0, 0)) slot = i; + if (rect_area(rect, 0, 0) <= rect_area(d->r[slot], 0, 0)) return; + } else { + d->n++; + } + memcpy(d->r[slot], rect, sizeof(rect)); +} +static int64_t damage_area(const struct damage_list *d, int bound_w, int bound_h) { + int64_t max = 0; + for (int i = 0; i < d->n; i++) { + const int64_t area = rect_area(d->r[i], bound_w, bound_h); + if (area > max) max = area; + } + return max; } static void surface_damage(struct wl_client *c, struct wl_resource *r, int32_t x, int32_t y, int32_t w, int32_t h) { struct surface *s = wl_resource_get_user_data(r); - int sw, sh; - surface_size(s, &sw, &sh); - note_damage(&s->pending_damage_local_max, x, y, w, h, sw, sh); + note_damage(&s->pending_damage_local, x, y, w, h); } static void frame_callback_destroy(struct wl_resource *r) { wl_list_remove(wl_resource_get_link(r)); @@ -1033,9 +1057,9 @@ static void surface_commit(struct wl_client *c, struct wl_resource *r) { s->pending_opaque_set = 0; } - s->damage_max = s->pending_damage_max; - s->damage_local_max = s->pending_damage_local_max; - s->pending_damage_max = s->pending_damage_local_max = 0; + s->damage_buf = s->pending_damage_buf; + s->damage_local = s->pending_damage_local; + s->pending_damage_buf.n = s->pending_damage_local.n = 0; if (s->pending_attach) { struct wl_resource *buffer = s->pending_buffer; struct dmabuf_buffer *db = get_dmabuf(buffer); @@ -1102,7 +1126,7 @@ static void surface_set_buffer_scale(struct wl_client *c, struct wl_resource *r, static void surface_damage_buffer(struct wl_client *c, struct wl_resource *r, int32_t x, int32_t y, int32_t w, int32_t h) { struct surface *s = wl_resource_get_user_data(r); - note_damage(&s->pending_damage_max, x, y, w, h, s->buf_w, s->buf_h); + note_damage(&s->pending_damage_buf, x, y, w, h); } static void surface_offset(struct wl_client *c, struct wl_resource *r, int32_t x, int32_t y) {} From 5d945d7784248be6cd294c3ce830c56ef513bbd8 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 11:25:31 -0400 Subject: [PATCH 077/135] refactor: remove duplicate session frame limiter (#1616) --- .../droiddeck/launcher/FrontEndActivity.kt | 5 +- .../com/droiddeck/launcher/SessionActivity.kt | 3 +- .../launcher/glasses/GlassesRendering.kt | 6 -- .../launcher/session/SessionPrefs.kt | 18 ++---- .../launcher/session/SessionService.kt | 7 +-- .../launcher/session/SessionState.kt | 3 - .../launcher/ui/ModeSettingsDialog.kt | 4 -- app/src/main/res/values-ar/strings.xml | 2 - app/src/main/res/values-b+es+419/strings.xml | 2 - app/src/main/res/values-bg/strings.xml | 2 - app/src/main/res/values-cs/strings.xml | 2 - app/src/main/res/values-da/strings.xml | 2 - app/src/main/res/values-de/strings.xml | 2 - app/src/main/res/values-el/strings.xml | 2 - app/src/main/res/values-es/strings.xml | 2 - app/src/main/res/values-fi/strings.xml | 2 - app/src/main/res/values-fr/strings.xml | 2 - app/src/main/res/values-hi/strings.xml | 2 - app/src/main/res/values-hu/strings.xml | 2 - app/src/main/res/values-in/strings.xml | 2 - app/src/main/res/values-it/strings.xml | 2 - app/src/main/res/values-ja/strings.xml | 2 - app/src/main/res/values-ko/strings.xml | 2 - app/src/main/res/values-ms/strings.xml | 2 - app/src/main/res/values-nb/strings.xml | 2 - app/src/main/res/values-nl/strings.xml | 2 - app/src/main/res/values-pl/strings.xml | 2 - app/src/main/res/values-pt-rPT/strings.xml | 2 - app/src/main/res/values-pt/strings.xml | 2 - app/src/main/res/values-ro/strings.xml | 2 - app/src/main/res/values-ru/strings.xml | 2 - app/src/main/res/values-sv/strings.xml | 2 - app/src/main/res/values-th/strings.xml | 2 - app/src/main/res/values-tr/strings.xml | 2 - app/src/main/res/values-uk/strings.xml | 2 - app/src/main/res/values-vi/strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 2 - app/src/main/res/values-zh-rHK/strings.xml | 2 - app/src/main/res/values-zh-rTW/strings.xml | 2 - app/src/main/res/values/strings.xml | 6 +- .../glasses/GlassesMirrorPacingTest.kt | 31 ++++++++--- .../launcher/glasses/GlassesRenderingTest.kt | 7 --- .../launcher/session/PerformanceModeTest.kt | 10 +--- .../launcher/session/SettingsResetTest.kt | 4 +- docs/development/game-environment.md | 2 +- .../overlay/usr/local/bin/droiddeck-session | 39 +------------ tools/tests/test_session_pacing.py | 55 +++++++++++++++++++ 47 files changed, 94 insertions(+), 170 deletions(-) create mode 100644 tools/tests/test_session_pacing.py diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index f7d514c49b..1f754d0b78 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -392,7 +392,6 @@ class FrontEndActivity : ComponentActivity() { private var theme by mutableStateOf("graphite") private var appScale by mutableStateOf(com.droiddeck.launcher.core.AppUiPrefs.DEFAULT_SCALE) private var hdrOn by mutableStateOf(false) - private var fpsLimit by mutableStateOf(0) private var performanceMode by mutableStateOf(false) private var upscaler by mutableStateOf(0) private var upscaleSharpness by mutableStateOf(75) @@ -1703,7 +1702,7 @@ class FrontEndActivity : ComponentActivity() { ModeSettings( mode = mode, resolution = resolution, panelSize = com.droiddeck.launcher.session.SessionDisplay.panelSize(this), - hdr = hdrOn, hdrReason = hdrReason, fpsLimit = fpsLimit, performanceMode = performanceMode, + hdr = hdrOn, hdrReason = hdrReason, performanceMode = performanceMode, upscaler = upscaler, upscaleSharpness = upscaleSharpness, gpuDrivers = drivers.summary(), touchMode = touchMode, @@ -1769,7 +1768,6 @@ class FrontEndActivity : ComponentActivity() { onResolution = { value -> SessionPrefs.setResolutionChoice(this, mode, value); resolution = value }, onHdr = { on -> SessionPrefs.setHdr(this, mode, on); hdrOn = on }, onGpuDrivers = { openComponents(focusContent = true, tab = com.droiddeck.launcher.ui.GPU_TAB) }, - onFpsLimit = { fps -> SessionPrefs.setFpsLimit(this, mode, fps); fpsLimit = fps }, onPerformanceMode = { on -> SessionPrefs.setPerformanceMode(this, mode, on); performanceMode = on }, onUpscaler = { m -> SessionPrefs.setUpscaler(this, m); upscaler = m }, onUpscaleSharpness = { pct -> SessionPrefs.setUpscaleSharpness(this, pct); upscaleSharpness = pct }, @@ -2021,7 +2019,6 @@ class FrontEndActivity : ComponentActivity() { runSteamAtStartup = SessionPrefs.runSteamAtStartup(this) loadBootMovie() hdrOn = SessionPrefs.hdr(this, mode) - fpsLimit = SessionPrefs.fpsLimit(this, mode) performanceMode = SessionPrefs.performanceMode(this, mode) upscaler = SessionPrefs.upscaler(this) upscaleSharpness = SessionPrefs.upscaleSharpness(this) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 2d6970c4f3..2f9bcf190a 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -492,7 +492,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) if (!SessionState.running) { val prefMode = SessionPrefs.prefMode(intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM) - SessionState.fpsLimit = SessionPrefs.fpsLimit(this, prefMode) SessionState.performanceMode = SessionPrefs.performanceMode(this, prefMode) } applyOutputPacing() @@ -1976,7 +1975,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { GlassesRendering.mirrorRefreshLimit(glassesSettings, glasses, glassesScreen != null) private fun outputFpsLimit(): Int = SessionPrefs.compositorFpsLimit( - GlassesRendering.fpsLimit(SessionState.fpsLimit, mirrorRefreshLimit()), SessionState.performanceMode, + mirrorRefreshLimit(), SessionState.performanceMode, ) private fun applyOutputPacing() { diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesRendering.kt b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesRendering.kt index f8d6f4c5f1..b07221556d 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesRendering.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesRendering.kt @@ -32,12 +32,6 @@ internal object GlassesRendering { return if (hz == 30 && kotlin.math.abs(state.hz - 30f) >= 0.5f) 60 else hz } - fun fpsLimit(requested: Int, mirrorRefreshLimit: Int): Int = when { - mirrorRefreshLimit <= 0 -> requested - requested <= 0 -> mirrorRefreshLimit - else -> minOf(requested, mirrorRefreshLimit) - } - fun usesGlasses(state: GlassesState, outputActive: Boolean, steamVrRunning: Boolean): Boolean = outputActive || (steamVrRunning && state.usable) 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 48cad19186..95e867f8a1 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -903,19 +903,8 @@ object SessionPrefs { prefs(context).edit().putBoolean("hdr.$mode", on).apply() } - fun fpsLimit(context: Context, mode: String): Int = prefs(context).getInt("fpsLimit.$mode", 0).coerceAtLeast(0) - - fun setFpsLimit(context: Context, mode: String, fps: Int) { - prefs(context).edit().putInt("fpsLimit.$mode", fps.coerceAtLeast(0)).apply() - } - - val fpsLimitChoices = listOf(0 to "Off", 30 to "30", 40 to "40", 45 to "45", 60 to "60", 90 to "90", 120 to "120") - - fun fpsLimitChoices(context: Context): List<Pair<Int, String>> = - fpsLimitChoices.map { (fps, label) -> fps to if (fps == 0) context.getString(R.string.frame_gen_off) else label } - /** - * Performance mode: without a frame limit, buffers go back to the game as soon as they are replaced + * Performance mode: buffers go back to the game as soon as they are replaced * instead of once per refresh, and gamescope's WSI layer and winex11 reuse their per-present window checks. */ fun performanceMode(context: Context, mode: String): Boolean = prefs(context).getBoolean("performanceMode.$mode", false) @@ -927,8 +916,9 @@ object SessionPrefs { /** Compositor frame limit that releases buffers to the game unpaced. */ const val FPS_UNPACED = -1 - /** The limit handed to the compositor: Performance mode without a limit is unpaced, a chosen limit still paces. */ - fun compositorFpsLimit(limit: Int, performanceMode: Boolean): Int = if (performanceMode && limit <= 0) FPS_UNPACED else limit + /** Mirroring still follows the glasses' refresh rate when Performance mode is on. */ + fun compositorFpsLimit(mirrorRefreshLimit: Int, performanceMode: Boolean): Int = + if (performanceMode && mirrorRefreshLimit <= 0) FPS_UNPACED else mirrorRefreshLimit val upscalerChoices = listOf( 0 to "Linear", 2 to "Nearest", 4 to "AMD FSR 1", 3 to "Snapdragon GSR", 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 c81c1831c0..0b7f32db10 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -478,19 +478,16 @@ class SessionService : Service() { guest.add("DXVK_HDR=1") Log.i(TAG, "hdr: gamescope --hdr-enabled, DXVK_HDR=1") } - guest.add("BL_FPS=" + SessionState.fpsLimit) // gamescope's WSI layer and winex11 reuse their per-present window checks for this long; 0 checks on every present. val windowCheckMs = if (SessionState.performanceMode) 100 else 0 guest.add("DROIDDECK_WSI_BYPASS_CHECK_MS=$windowCheckMs") guest.add("WINE_OFFSCREEN_CHECK_MS=$windowCheckMs") - // With a frame limit, gamescope's limiter also holds the games to it instead of only pacing the screen. - guest.add("DROIDDECK_GAME_FRAME_LIMIT=" + (if (SessionState.performanceMode) 1 else 0)) - if (SessionPrefs.compositorFpsLimit(SessionState.fpsLimit, SessionState.performanceMode) == SessionPrefs.FPS_UNPACED) { + if (SessionState.performanceMode) { // gamescope turns buffers around slower than an unpaced game draws; more images keep it drawing. guest.add("GAMESCOPE_WSI_MIN_IMAGE_COUNT=8") guest.add("GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT=1") } - Log.i(TAG, "performance mode " + (if (SessionState.performanceMode) "on" else "off") + ", frame limit " + SessionState.fpsLimit) + Log.i(TAG, "performance mode " + (if (SessionState.performanceMode) "on" else "off")) guest.add("BL_REFRESH=" + Math.round(SessionState.refreshHz)) guest.add("BL_LOG=" + sessionLog.path) guest.add("BL_DEBUG_DIR=" + sessionDir.path) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt index 5db2211a13..bb1ea39238 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -103,9 +103,6 @@ object SessionState { @Volatile var upscaleRatio: Float = 0f - @Volatile - var fpsLimit: Int = 0 - @Volatile var performanceMode = false 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 fd9933e250..a2239bb725 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -60,7 +60,6 @@ class ModeSettings( val hdr: Boolean, val hdrReason: String?, val gpuDrivers: String? = null, - val fpsLimit: Int = 0, val performanceMode: Boolean = false, val upscaler: Int = 0, val upscaleSharpness: Int = 75, @@ -117,7 +116,6 @@ class ModeSettingsActions( val onResolution: (String) -> Unit, val onHdr: (Boolean) -> Unit, val onGpuDrivers: () -> Unit = {}, - val onFpsLimit: (Int) -> Unit = {}, val onPerformanceMode: (Boolean) -> Unit = {}, val onUpscaler: (Int) -> Unit = {}, val onUpscaleSharpness: (Int) -> Unit = {}, @@ -246,8 +244,6 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: SettingsGroup(stringResource(R.string.display_frame_rate)) { ToggleRow(host, "performance", stringResource(R.string.mode_performance), stringResource(R.string.mode_performance_hint), s.performanceMode, onChange = a.onPerformanceMode) - ChoiceRow(host, "fps", stringResource(R.string.mode_fps), stringResource(R.string.common_applies_next_session), - SessionPrefs.fpsLimitChoices(LocalContext.current), s.fpsLimit, note = stringResource(R.string.mode_fps_note), onPick = a.onFpsLimit) } SettingsGroup(stringResource(R.string.mode_hdr)) { ToggleRow( diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 0d17340d69..fe7c0e1389 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">نسبة أبعاد الشاشة</string> <string name="mode_ratio_custom">تحددها الدقة المخصّصة.</string> <string name="mode_ratio_auto">يستخدم الخيار «تلقائي» نسبة 16:9 على الأقل.</string> - <string name="mode_fps">حد الإطارات</string> - <string name="mode_fps_note">يحدّ الجلسة بأكملها. تنتقل الشاشة إلى معدل تحديث يكون من مضاعفات الحد.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">إخراج HDR10</string> <string name="mode_hdr_unavailable">غير متاح: %1$s.</string> diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 35abfeb415..1609361f2c 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Relación de aspecto</string> <string name="mode_ratio_custom">Definida por la resolución personalizada.</string> <string name="mode_ratio_auto">Auto usa al menos 16:9.</string> - <string name="mode_fps">Límite de fotogramas</string> - <string name="mode_fps_note">Limita toda la sesión. La pantalla cambia a una tasa de refresco que el límite divide exactamente.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Salida HDR10</string> <string name="mode_hdr_unavailable">No disponible: %1$s.</string> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index e4eda5acf1..a40f3e38d0 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Пропорции на екрана</string> <string name="mode_ratio_custom">Определени от персонализираната резолюция.</string> <string name="mode_ratio_auto">Автоматично използва поне 16:9.</string> - <string name="mode_fps">Ограничение на кадрите</string> - <string name="mode_fps_note">Ограничава цялата сесия. Екранът преминава към честота на опресняване, която се дели точно на ограничението.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 изход</string> <string name="mode_hdr_unavailable">Не е налично: %1$s.</string> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index f3c5a4b8fb..4d493645a6 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Poměr stran obrazovky</string> <string name="mode_ratio_custom">Určen vlastním rozlišením.</string> <string name="mode_ratio_auto">Automaticky použije alespoň 16:9.</string> - <string name="mode_fps">Omezení snímků</string> - <string name="mode_fps_note">Omezuje celou relaci. Displej přejde na obnovovací frekvenci, kterou lze tímto limitem dělit beze zbytku.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Výstup HDR10</string> <string name="mode_hdr_unavailable">Není k dispozici: %1$s.</string> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f34cad2490..f737e6bd7b 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Billedformat</string> <string name="mode_ratio_custom">Angivet af den brugerdefinerede opløsning.</string> <string name="mode_ratio_auto">Auto bruger mindst 16:9.</string> - <string name="mode_fps">Billedgrænse</string> - <string name="mode_fps_note">Begrænser hele sessionen. Skærmen skifter til en opdateringshastighed, grænsen går lige op med.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10-output</string> <string name="mode_hdr_unavailable">Ikke tilgængelig: %1$s.</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index db80fbc596..8e9b653323 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Seitenverhältnis</string> <string name="mode_ratio_custom">Durch die benutzerdefinierte Auflösung festgelegt.</string> <string name="mode_ratio_auto">Auto verwendet mindestens 16:9.</string> - <string name="mode_fps">Bildratenlimit</string> - <string name="mode_fps_note">Begrenzt die gesamte Sitzung. Das Display wechselt auf eine Bildwiederholrate, die ein ganzzahliges Vielfaches des Limits ist.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10-Ausgabe</string> <string name="mode_hdr_unavailable">Nicht verfügbar: %1$s.</string> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 0fb72f3a33..2da1c1b2a8 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Αναλογία οθόνης</string> <string name="mode_ratio_custom">Καθορίζεται από την προσαρμοσμένη ανάλυση.</string> <string name="mode_ratio_auto">Το Αυτόματο χρησιμοποιεί τουλάχιστον 16:9.</string> - <string name="mode_fps">Όριο καρέ</string> - <string name="mode_fps_note">Περιορίζει ολόκληρη τη συνεδρία. Η οθόνη μεταβαίνει σε ρυθμό ανανέωσης που διαιρείται ακριβώς με το όριο.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Έξοδος HDR10</string> <string name="mode_hdr_unavailable">Μη διαθέσιμο: %1$s.</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e599874c81..45f4cfc67e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Relación de aspecto</string> <string name="mode_ratio_custom">Definida por la resolución personalizada.</string> <string name="mode_ratio_auto">Auto usa al menos 16:9.</string> - <string name="mode_fps">Límite de fotogramas</string> - <string name="mode_fps_note">Limita toda la sesión. La pantalla cambia a una tasa de refresco que el límite divide exactamente.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Salida HDR10</string> <string name="mode_hdr_unavailable">No disponible: %1$s.</string> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 0fc0768a86..ddf4d46056 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Näytön kuvasuhde</string> <string name="mode_ratio_custom">Määräytyy mukautetun resoluution mukaan.</string> <string name="mode_ratio_auto">Automaattinen käyttää vähintään 16:9:ää.</string> - <string name="mode_fps">Kuvanopeusraja</string> - <string name="mode_fps_note">Rajoittaa koko istuntoa. Näyttö vaihtaa virkistystaajuuteen, jonka rajoitus jakaa tasan.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10-lähtö</string> <string name="mode_hdr_unavailable">Ei käytettävissä: %1$s.</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ceaad3f8ae..535cbf4877 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Format d\'écran</string> <string name="mode_ratio_custom">Défini par la résolution personnalisée.</string> <string name="mode_ratio_auto">Le mode automatique utilise au moins 16:9.</string> - <string name="mode_fps">Limite de taux de rafraîchissement</string> - <string name="mode_fps_note">Limite le taux de rafraîchissement de toute la session. Le moniteur basculera vers un taux de rafraîchissement divisible par cette limite.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Sortie HDR10</string> <string name="mode_hdr_unavailable">Non disponible : %1$s.</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 72455444e1..be2c1b8036 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">स्क्रीन रेशियो</string> <string name="mode_ratio_custom">कस्टम रिज़ॉल्यूशन से तय होता है।</string> <string name="mode_ratio_auto">ऑटो कम से कम 16:9 इस्तेमाल करता है।</string> - <string name="mode_fps">फ़्रेम सीमा</string> - <string name="mode_fps_note">पूरे सेशन को सीमित करता है। डिस्प्ले उस रिफ्रेश रेट पर चला जाता है जिसे यह सीमा बराबर बांटती है।</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 आउटपुट</string> <string name="mode_hdr_unavailable">उपलब्ध नहीं: %1$s।</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index fd309f9ad6..6902c2cc33 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Képernyőarány</string> <string name="mode_ratio_custom">Az egyéni felbontás határozza meg.</string> <string name="mode_ratio_auto">Az Automatikus legalább 16:9-et használ.</string> - <string name="mode_fps">Képkocka-korlát</string> - <string name="mode_fps_note">Korlátozza a teljes munkamenetet. A kijelző olyan frissítési frekvenciára vált, amelyet a korlát egyenlően oszt.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10-kimenet</string> <string name="mode_hdr_unavailable">Nem elérhető: %1$s.</string> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 6f8d35ffcd..24ce23f45e 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Rasio layar</string> <string name="mode_ratio_custom">Ditentukan oleh resolusi khusus.</string> <string name="mode_ratio_auto">Otomatis menggunakan setidaknya 16:9.</string> - <string name="mode_fps">Batas frame rate</string> - <string name="mode_fps_note">Membatasi seluruh sesi. Tampilan beralih ke refresh rate yang habis dibagi oleh batas ini.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Output HDR10</string> <string name="mode_hdr_unavailable">Tidak tersedia: %1$s.</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f410007078..524eba5449 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Proporzioni schermo</string> <string name="mode_ratio_custom">Definite dalla risoluzione personalizzata.</string> <string name="mode_ratio_auto">Auto usa almeno 16:9.</string> - <string name="mode_fps">Limite frame</string> - <string name="mode_fps_note">Limita l\'intera sessione. Lo schermo passa a una frequenza di aggiornamento multipla del limite.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Uscita HDR10</string> <string name="mode_hdr_unavailable">Non disponibile: %1$s.</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 5de521b824..4d605fa6b2 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">画面比率</string> <string name="mode_ratio_custom">カスタム解像度で設定されます。</string> <string name="mode_ratio_auto">自動モードでは少なくとも16:9を使用します。</string> - <string name="mode_fps">フレームレート制限</string> - <string name="mode_fps_note">セッション全体のフレームレートを制限します。モニターはこの上限で割り切れるリフレッシュレートに切り替わります。</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10出力</string> <string name="mode_hdr_unavailable">利用不可:%1$s。</string> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 5c87b95a3c..9420ce605c 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">화면 비율</string> <string name="mode_ratio_custom">사용자 정의 해상도로 설정됩니다.</string> <string name="mode_ratio_auto">자동 모드에서는 최소 16:9를 사용합니다.</string> - <string name="mode_fps">프레임 속도 제한</string> - <string name="mode_fps_note">세션 전체의 프레임 속도를 제한합니다. 모니터는 이 상한으로 나누어떨어지는 주사율로 전환됩니다.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 출력</string> <string name="mode_hdr_unavailable">사용 불가: %1$s.</string> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 562683f18a..218fc9a817 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Nisbah skrin</string> <string name="mode_ratio_custom">Ditetapkan oleh resolusi tersuai.</string> <string name="mode_ratio_auto">Auto menggunakan sekurang-kurangnya 16:9.</string> - <string name="mode_fps">Had bingkai</string> - <string name="mode_fps_note">Mengehadkan keseluruhan sesi. Paparan beralih kepada kadar penyegaran yang boleh dibahagi sama rata dengan had ini.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Output HDR10</string> <string name="mode_hdr_unavailable">Tidak tersedia: %1$s.</string> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index a979f2c44d..bbb6c8a249 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Skjermforhold</string> <string name="mode_ratio_custom">Angis av den egendefinerte oppløsningen.</string> <string name="mode_ratio_auto">Auto bruker minst 16:9.</string> - <string name="mode_fps">Bildefrekvensgrense</string> - <string name="mode_fps_note">Begrenser hele sesjonen. Skjermen bytter til en oppdateringsfrekvens som grensen går opp i.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10-utgang</string> <string name="mode_hdr_unavailable">Ikke tilgjengelig: %1$s.</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ccef5c5df3..e8c394cf1e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Beeldverhouding</string> <string name="mode_ratio_custom">Ingesteld door de aangepaste resolutie.</string> <string name="mode_ratio_auto">Automatisch gebruikt minimaal 16:9.</string> - <string name="mode_fps">Framelimiet</string> - <string name="mode_fps_note">Begrenst de hele sessie. Het scherm schakelt naar een verversingssnelheid die een veelvoud van de limiet is.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10-uitvoer</string> <string name="mode_hdr_unavailable">Niet beschikbaar: %1$s.</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 145d207a30..8d1736c64a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Proporcje ekranu</string> <string name="mode_ratio_custom">Ustalane przez własną rozdzielczość.</string> <string name="mode_ratio_auto">Auto używa co najmniej 16:9.</string> - <string name="mode_fps">Limit klatek</string> - <string name="mode_fps_note">Ogranicza całą sesję. Wyświetlacz przełącza się na częstotliwość odświeżania będącą wielokrotnością limitu.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Wyjście HDR10</string> <string name="mode_hdr_unavailable">Niedostępne: %1$s.</string> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 3a54ebd0df..f2c4bf67c5 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Proporção do ecrã</string> <string name="mode_ratio_custom">Definida pela resolução personalizada.</string> <string name="mode_ratio_auto">Automático utiliza pelo menos 16:9.</string> - <string name="mode_fps">Limite de fotogramas</string> - <string name="mode_fps_note">Limita toda a sessão. O ecrã muda para uma taxa de atualização que seja múltipla do limite.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Saída HDR10</string> <string name="mode_hdr_unavailable">Indisponível: %1$s.</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index c5b7bd327d..3ade72aee0 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Proporção da tela</string> <string name="mode_ratio_custom">Definida pela resolução personalizada.</string> <string name="mode_ratio_auto">O Automático usa no mínimo 16:9.</string> - <string name="mode_fps">Limite de quadros</string> - <string name="mode_fps_note">Limita a sessão inteira. A tela muda para uma taxa de atualização que seja múltipla do limite.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Saída HDR10</string> <string name="mode_hdr_unavailable">Indisponível: %1$s.</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index d4aa16f9d8..2305d87aba 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Raport de ecran</string> <string name="mode_ratio_custom">Stabilit de rezoluția personalizată.</string> <string name="mode_ratio_auto">Automat folosește cel puțin 16:9.</string> - <string name="mode_fps">Limită de cadre</string> - <string name="mode_fps_note">Limitează întreaga sesiune. Afișajul trece la o rată de reîmprospătare pe care limita o împarte exact.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Ieșire HDR10</string> <string name="mode_hdr_unavailable">Indisponibil: %1$s.</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0de18cd365..9a7447b3d8 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Соотношение сторон</string> <string name="mode_ratio_custom">Задается пользовательским разрешением.</string> <string name="mode_ratio_auto">Автоматический режим использует не менее 16:9.</string> - <string name="mode_fps">Ограничение частоты кадров</string> - <string name="mode_fps_note">Ограничивает частоту кадров всей сессии. Экран переключится на частоту обновления, кратную этому пределу.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Вывод HDR10</string> <string name="mode_hdr_unavailable">Недоступно: %1$s.</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 7e5ccf7d66..f50d90edff 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Bildförhållande</string> <string name="mode_ratio_custom">Bestäms av den anpassade upplösningen.</string> <string name="mode_ratio_auto">Auto använder minst 16:9.</string> - <string name="mode_fps">Bildgräns</string> - <string name="mode_fps_note">Begränsar hela sessionen. Skärmen byter till en uppdateringsfrekvens som är en jämn multipel av gränsen.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10-utgång</string> <string name="mode_hdr_unavailable">Inte tillgängligt: %1$s.</string> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 762cb944dd..ef164e4086 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">อัตราส่วนหน้าจอ</string> <string name="mode_ratio_custom">กำหนดโดยความละเอียดกำหนดเอง</string> <string name="mode_ratio_auto">อัตโนมัติใช้อย่างน้อย 16:9</string> - <string name="mode_fps">ขีดจำกัดเฟรม</string> - <string name="mode_fps_note">จำกัดทั้งเซสชัน หน้าจอจะเปลี่ยนไปใช้อัตรารีเฟรชที่หารขีดจำกัดได้พอดี</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">เอาต์พุต HDR10</string> <string name="mode_hdr_unavailable">ไม่พร้อมใช้งาน: %1$s</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 693747e851..3795112962 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Ekran oranı</string> <string name="mode_ratio_custom">Özel çözünürlüğe göre ayarlanır.</string> <string name="mode_ratio_auto">Otomatik en az 16:9 kullanır.</string> - <string name="mode_fps">Kare sınırı</string> - <string name="mode_fps_note">Tüm oturumu sınırlar. Ekran, sınırın tam katı olan bir yenileme hızına geçer.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 çıkışı</string> <string name="mode_hdr_unavailable">Kullanılamıyor: %1$s.</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 44e0418ddc..78eef7de8d 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Співвідношення сторін</string> <string name="mode_ratio_custom">Визначається власною роздільною здатністю.</string> <string name="mode_ratio_auto">«Авто» використовує щонайменше 16:9.</string> - <string name="mode_fps">Обмеження кадрів</string> - <string name="mode_fps_note">Обмежує весь сеанс. Екран перемикається на частоту оновлення, кратну цьому обмеженню.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Вивід HDR10</string> <string name="mode_hdr_unavailable">Недоступно: %1$s.</string> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 7a8194842c..475bef045d 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Tỷ lệ màn hình</string> <string name="mode_ratio_custom">Được đặt theo độ phân giải tùy chỉnh.</string> <string name="mode_ratio_auto">Tự động dùng tối thiểu 16:9.</string> - <string name="mode_fps">Giới hạn khung hình</string> - <string name="mode_fps_note">Giới hạn toàn bộ phiên. Màn hình chuyển sang tốc độ làm mới mà giới hạn chia hết.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Xuất HDR10</string> <string name="mode_hdr_unavailable">Không khả dụng: %1$s.</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 5e16b21607..2b5f4083a2 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">屏幕比例</string> <string name="mode_ratio_custom">由自定义分辨率决定。</string> <string name="mode_ratio_auto">自动模式至少使用 16:9。</string> - <string name="mode_fps">帧率上限</string> - <string name="mode_fps_note">限制整个会话。显示器会切换到能被该上限整除的刷新率。</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 输出</string> <string name="mode_hdr_unavailable">不可用:%1$s。</string> diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 6ca43c17f2..54058fe19b 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">螢幕比例</string> <string name="mode_ratio_custom">由自訂解像度決定。</string> <string name="mode_ratio_auto">自動模式至少使用 16:9。</string> - <string name="mode_fps">幀率限制</string> - <string name="mode_fps_note">限制整個會話的幀率。螢幕會切換至能被此上限整除的刷新率。</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 輸出</string> <string name="mode_hdr_unavailable">不可用:%1$s。</string> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 77156849a5..88adc508f4 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">螢幕比例</string> <string name="mode_ratio_custom">由自訂解析度設定。</string> <string name="mode_ratio_auto">自動模式至少使用 16:9。</string> - <string name="mode_fps">影格率限制</string> - <string name="mode_fps_note">限制整個工作階段的影格率。顯示器會切換到能夠被該上限整除的重新整理率。</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 輸出</string> <string name="mode_hdr_unavailable">無法使用:%1$s。</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6de9cdb354..f546a543a7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -94,7 +94,7 @@ <string name="game_env_xalia">Set to 0 to disable Proton’s gamepad-navigation helper for this game.</string> <string name="game_env_anticheat_offline">On by default. Starts an Easy Anti-Cheat game without its anti-cheat when the game supports offline play. Turn off to launch through Easy Anti-Cheat as usual. Online modes that require Easy Anti-Cheat remain unavailable.</string> <string name="game_env_hud">DXVK overlay for D3D9–11. fps displays frame rate; unset hides it.</string> - <string name="game_env_dxvk_config">DXVK settings separated by semicolons. Recent builds use dxvk.maxFrameRate for frame limiting; prefer the session frame limiter for ordinary play.</string> + <string name="game_env_dxvk_config">DXVK settings separated by semicolons. Recent builds use dxvk.maxFrameRate for frame limiting; prefer Steam\'s Quick Access menu frame limiter for ordinary play.</string> <string name="game_env_cores">CPU cores for this game, such as 0-4 or 0,2,4, in place of the session\'s game cores. Fewer cores run cooler.</string> <string name="game_env_vkd3d_limit">D3D12 frame-rate limit. 0 disables the limit.</string> <string name="game_env_glthread">Mesa OpenGL threading. true can help CPU-limited OpenGL games; test per game.</string> @@ -256,10 +256,8 @@ <string name="mode_ratio">Screen ratio</string> <string name="mode_ratio_custom">Set by the custom resolution.</string> <string name="mode_ratio_auto">Auto uses at least 16:9.</string> - <string name="mode_fps">Frame limit</string> <string name="mode_performance">Performance mode</string> - <string name="mode_performance_hint">With no frame limit, games run as fast as they can: frames go back to the game without waiting for the screen. With a frame limit, games are held to it instead of drawing frames the screen never shows. Either way, gamescope and Wine skip repeated window checks. Uses more power and runs warmer without a limit. Applies next session.</string> - <string name="mode_fps_note">Caps the whole session. The display switches to a refresh rate the cap divides evenly.</string> + <string name="mode_performance_hint">Lets games run without waiting for the screen and reduces repeated window checks in gamescope and Wine. Can use more power and run warmer. Use Steam\'s Quick Access menu to limit Steam games. Applies next session.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 output</string> <string name="mode_hdr_unavailable">Not available: %1$s.</string> diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMirrorPacingTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMirrorPacingTest.kt index b8306b936d..4b97723d39 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMirrorPacingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMirrorPacingTest.kt @@ -1,9 +1,11 @@ package com.droiddeck.launcher.glasses +import android.content.Context import android.hardware.display.DisplayManager import android.view.Display import androidx.compose.runtime.MutableState import com.droiddeck.launcher.SessionActivity +import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.session.SessionState import org.junit.After import org.junit.Assert.assertEquals @@ -36,10 +38,14 @@ class GlassesMirrorPacingTest { val panel = Shadow.extract<ModeDisplay>(activity.display) panel.supported = arrayOf(mode(1, 60f), mode(2, 90f), mode(3, 120f)) panel.current = panel.supported.last() - SessionState.fpsLimit = 0 + SessionState.performanceMode = false + activity.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() } - @After fun cleanup() { SessionState.fpsLimit = 0 } + @After fun cleanup() { + SessionState.performanceMode = false + activity.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + } @Test fun connectingChangingRateAndDisconnectingUpdatePhonePacingWithoutSavingPreferences() { apply(connected, settings) @@ -48,18 +54,25 @@ class GlassesMirrorPacingTest { expect(2, 90f, 90) apply(GlassesState(), settings) expect(3, 120f, 0) - assertEquals(0, SessionState.fpsLimit) } - @Test fun lowerSavedLimitSurvivesMirroringAndStalePhoneRefreshReports() { - SessionState.fpsLimit = 30 + @Test fun retiredSavedLimitsDoNotCapThePhoneOrMirroredOutput() { + activity.getSharedPreferences("session", Context.MODE_PRIVATE).edit() + .putInt("fpsLimit.steam", 30).putInt("fpsLimit.desktop", 40).commit() apply(connected, settings) - expect(1, 60f, 30) + expect(1, 60f, 60) apply(connected.copy(hz = 120f), settings) - expect(1, 60f, 30) + expect(1, 60f, 60) apply(GlassesState(), settings) - expect(3, 120f, 30) - assertEquals(30, SessionState.fpsLimit) + expect(3, 120f, 0) + } + + @Test fun performanceModeResumesUnpacedOutputAfterMirrorDisconnects() { + SessionState.performanceMode = true + apply(connected, settings) + expect(1, 60f, 60) + apply(GlassesState(), settings) + expect(3, 120f, SessionPrefs.FPS_UNPACED) } @Test fun pacingFollowsThePanelWhenTheSystemKeepsALowerRateThanRequested() { diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesRenderingTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesRenderingTest.kt index 51d9aa7b72..4b5972ede3 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesRenderingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesRenderingTest.kt @@ -58,13 +58,6 @@ class GlassesRenderingTest { assertEquals(0, GlassesRendering.mirrorRefreshLimit(settings, ultra, true)) } - @Test fun mirrorCapPreservesLowerLimitsAndRestoresTheRequestedLimitAfterDisconnect() { - for (requested in listOf(0, 30, 60, 90, 120)) { - assertEquals(if (requested == 30) 30 else 60, GlassesRendering.fpsLimit(requested, 60)) - assertEquals(requested, GlassesRendering.fpsLimit(requested, 0)) - } - } - private fun render(settings: GlassesSettings, state: GlassesState = ultra, steamVr: Boolean = false) = GlassesRendering.cardboard(base, settings, state, outputActive = true, steamVrRunning = steamVr) diff --git a/app/src/test/java/com/droiddeck/launcher/session/PerformanceModeTest.kt b/app/src/test/java/com/droiddeck/launcher/session/PerformanceModeTest.kt index f59157c3be..9805a66dec 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/PerformanceModeTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/PerformanceModeTest.kt @@ -24,19 +24,13 @@ class PerformanceModeTest { assertFalse(SessionPrefs.performanceMode(app, SessionService.MODE_DESKTOP)) } - @Test fun offKeepsTodaysPacing() { + @Test fun offKeepsDisplayAndMirrorPacing() { assertEquals(0, SessionPrefs.compositorFpsLimit(0, false)) assertEquals(60, SessionPrefs.compositorFpsLimit(60, false)) } - @Test fun onWithoutALimitIsUnpacedAndAChosenLimitStillPaces() { + @Test fun onIsUnpacedUnlessMirroring() { assertEquals(SessionPrefs.FPS_UNPACED, SessionPrefs.compositorFpsLimit(0, true)) assertEquals(60, SessionPrefs.compositorFpsLimit(60, true)) } - - @Test fun anOldUncappedFrameLimitReadsAsOff() { - session.edit().putInt("fpsLimit.steam", -1).commit() - assertEquals(0, SessionPrefs.fpsLimit(app, SessionService.MODE_STEAM)) - assertFalse(SessionPrefs.fpsLimitChoices.any { it.first < 0 }) - } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt index e73905cbe6..97b1102a3f 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt @@ -29,7 +29,7 @@ class SettingsResetTest { SessionPrefs.setTheme(app, "ocean") SessionPrefs.setUnfoldedControlsWithController(app, true) SessionPrefs.setNoXalia(app, false) - SessionPrefs.setFpsLimit(app, SessionService.MODE_STEAM, 30) + session.edit().putInt("fpsLimit.steam", 30).commit() SessionPrefs.setHdr(app, SessionService.MODE_DESKTOP, true) SessionPrefs.setResolutionChoice(app, SessionService.MODE_STEAM, "1280x800") SessionPrefs.setGuestHostname(app, "MyDeck") @@ -48,7 +48,7 @@ class SettingsResetTest { assertEquals("graphite", SessionPrefs.theme(app)) assertFalse(SessionPrefs.unfoldedControlsWithController(app)) assertTrue(SessionPrefs.noXalia(app)) - assertEquals(0, SessionPrefs.fpsLimit(app, SessionService.MODE_STEAM)) + assertFalse(session.contains("fpsLimit.steam")) assertFalse(SessionPrefs.hdr(app, SessionService.MODE_DESKTOP)) assertFalse(SessionPrefs.resolutionChosen(app, SessionService.MODE_STEAM)) assertEquals(SessionPrefs.DEFAULT_GUEST_HOSTNAME, SessionPrefs.guestHostname(app)) diff --git a/docs/development/game-environment.md b/docs/development/game-environment.md index 62530ca48d..bebd67ce66 100644 --- a/docs/development/game-environment.md +++ b/docs/development/game-environment.md @@ -98,7 +98,7 @@ custom components can support a different set of options. Android Wine wrapper, ALSA-server, Box64 and patched async-DXVK options are identified in the editor as requiring a different/custom component; custom entries remain allowed. The old `DXVK_FRAME_RATE` environment variable was removed from current DXVK, so it is -not offered as a suggestion. Prefer the session frame limiter for ordinary play. +not offered as a suggestion. Prefer Steam's Quick Access menu frame limiter for ordinary play. ## Launch path and references diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 755a9fce89..59d950af07 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -16,7 +16,7 @@ if [ -n "${BL_LOG:-}" ] && [ -z "${BL_INSIDE:-}" ]; then fi exec > >({ dd of="$BL_LOG" oflag=append conv=notrunc iflag=count_bytes count="${BL_LOG_CAP:-268435456}" bs=65536 status=none; cat >/dev/null; }) 2>&1 echo "== droiddeck-session $(date) mode=$mode $*" - echo "== uid=$(id -u) size=${BL_WIDTH:-?}x${BL_HEIGHT:-?} fps=${BL_FPS:-0} icd=${VK_ICD_FILENAMES:-none}" + echo "== uid=$(id -u) size=${BL_WIDTH:-?}x${BL_HEIGHT:-?} icd=${VK_ICD_FILENAMES:-none}" echo "== gamescope: $(gamescope --version 2>&1 | head -1) at $(command -v gamescope)" echo "== rootfs: $(cat /.version 2>/dev/null || echo unversioned)" fi @@ -70,31 +70,6 @@ steam_update_stuck() { [ "$steam_updates" -ge 3 ] } -# gamescope's --framerate-limit lasts only until its first frame, which recomputes the limit -# from the per-app value set over gamescope_control, and Steam resets that value to 0 while it -# starts. Watch gamescope's limiter state file (first byte 1 = limiter on) and set the value -# again whenever it is off; the limiter then makes the WSI layer hold Vulkan games (DXVK and -# VKD3D included) to it. Shell builtins only, so the once-a-second check starts no process. -hold_games_to_frame_limit() { - local fps=$1 file=$2 parent=$3 state sent=0 nap napfd= - command -v gamescopectl >/dev/null || { echo "== gamescope: no gamescopectl, the frame limit paces the screen only"; return 0; } - nap=$(mktemp -u "${XDG_RUNTIME_DIR:-/tmp}/droiddeck-nap.XXXXXX") && mkfifo "$nap" 2>/dev/null \ - && exec {napfd}<>"$nap"; rm -f "$nap" - while kill -0 "$parent" 2>/dev/null; do - if [ -f "$file" ]; then - state= - IFS= read -r -n1 -d '' state < "$file" - if [ "$state" != $'\x01' ] && gamescopectl debug_set_fps_limit "$fps" >/dev/null 2>&1; then - sent=$((sent + 1)) - if [ "$sent" = 1 ]; then echo "== gamescope: games held to $fps fps" - elif [ "$sent" -le 4 ]; then echo "== gamescope: the frame limit was reset, set it again" - fi - fi - fi - if [ -n "$napfd" ]; then read -r -t 1 -u "$napfd" _; else sleep 1; fi - done -} - run_gamescope() ( local status_file child_status compositor_status status_file=$(mktemp "${XDG_RUNTIME_DIR:-/tmp}/droiddeck-steam-exit.XXXXXX") || exit 73 @@ -261,16 +236,7 @@ if [ -z "${BL_INSIDE:-}" ]; then args+=(-S stretch) export BL_STRETCHED=1 fi - if [ "${BL_FPS:-0}" -gt 0 ]; then - args+=(-r "$BL_FPS") - # -r alone only paces what reaches the screen: a game without vsync keeps drawing - # hundreds of frames that are thrown away. Performance mode also holds the games to it. - if [ "${DROIDDECK_GAME_FRAME_LIMIT:-0}" = 1 ]; then - game_frame_limit=$BL_FPS - else - echo "== gamescope: frame limit $BL_FPS paces the screen only" - fi - elif [ "${BL_REFRESH:-0}" -gt 0 ]; then + if [ "${BL_REFRESH:-0}" -gt 0 ]; then args+=(-r "$BL_REFRESH") fi [ "$mode" = steam ] && [ "${BL_STEAM_UI:-}" != desktop ] && args+=(-e) @@ -294,7 +260,6 @@ if [ -z "${BL_INSIDE:-}" ]; then rm -f "${XDG_RUNTIME_DIR:-/tmp}"/gamescope-limiter-* export GAMESCOPE_LIMITER_FILE="${XDG_RUNTIME_DIR:-/tmp}/droiddeck-gamescope-limiter" rm -f "$GAMESCOPE_LIMITER_FILE" - [ -n "${game_frame_limit:-}" ] && hold_games_to_frame_limit "$game_frame_limit" "$GAMESCOPE_LIMITER_FILE" $$ & if [ "$mode" = steam ]; then if /usr/local/bin/droiddeck-pipewire start; then eval "$(/usr/local/bin/droiddeck-pipewire env)" diff --git a/tools/tests/test_session_pacing.py b/tools/tests/test_session_pacing.py new file mode 100644 index 0000000000..e7c0df938f --- /dev/null +++ b/tools/tests/test_session_pacing.py @@ -0,0 +1,55 @@ +"""Steam owns game caps; the nested compositor follows the output refresh rate.""" +import os +from pathlib import Path +import subprocess +import tempfile +import unittest + + +SESSION = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-session' + + +class SessionPacingTest(unittest.TestCase): + def launch(self, refresh, **overrides): + source = SESSION.read_text() + start = source.index(' width=${BL_WIDTH:-1280}') + end = source.index('\nfi\n\nbl_displays()', start) + block = source[start:end].replace('/usr/local/bin/droiddeck-pipewire', 'pipewire_stub') + with tempfile.TemporaryDirectory() as directory: + env = dict(os.environ, XDG_RUNTIME_DIR=directory, BL_REFRESH=str(refresh), + BL_MANGOAPP='0', BL_FPS='0', DROIDDECK_GAME_FRAME_LIMIT='0') + env.update(overrides) + script = ''' +set -u +mode=steam +pipewire_stub() { return 1; } +run_gamescope() { printf 'ARG:%s\\n' "$@"; } +''' + block + result = subprocess.run(['bash', '-c', script], env=env, capture_output=True, + text=True, timeout=5) + self.assertEqual(0, result.returncode, result.stderr) + return [line.removeprefix('ARG:') for line in result.stdout.splitlines() + if line.startswith('ARG:')] + + def test_display_refresh_sets_the_nested_compositor_rate(self): + for refresh in (60, 90, 120): + with self.subTest(refresh=refresh): + args = self.launch(refresh) + self.assertEqual(str(refresh), args[args.index('-r') + 1]) + self.assertIn('-e', args) + + def test_retired_cap_variables_do_not_override_the_display_rate(self): + for performance in ('0', '1'): + with self.subTest(performance=performance): + args = self.launch(120, BL_FPS='30', DROIDDECK_GAME_FRAME_LIMIT=performance) + self.assertEqual('120', args[args.index('-r') + 1]) + self.assertNotIn('--framerate-limit', args) + + def test_retired_cap_cannot_set_the_rate_when_the_display_rate_is_unknown(self): + args = self.launch(0, BL_FPS='30', DROIDDECK_GAME_FRAME_LIMIT='1') + self.assertNotIn('-r', args) + self.assertNotIn('--framerate-limit', args) + + +if __name__ == '__main__': + unittest.main() From d65912f0c52a642b2c76be28145a700cf5d183eb Mon Sep 17 00:00:00 2001 From: 0x1Nawaf <73679429+0x1Nawaf@users.noreply.github.com> Date: Mon, 26 Oct 2026 18:41:18 +0300 Subject: [PATCH 078/135] fix: stop starting a session on the slow proot (#1395) --- .github/workflows/build.yml | 10 +++++ app/build.gradle | 8 ++++ .../com/droiddeck/launcher/SessionActivity.kt | 8 +++- .../droiddeck/launcher/core/DeviceReport.kt | 2 + .../launcher/runtime/LinuxRuntime.java | 40 +++++++++++++++++-- .../runtime/LinuxRuntimeInstaller.java | 5 ++- .../launcher/runtime/ProotFastPath.kt | 22 ++++++++-- .../launcher/session/SessionPrefs.kt | 10 +++++ .../launcher/session/SessionService.kt | 38 +++++++++++++++--- app/src/main/res/values/strings.xml | 2 + .../launcher/runtime/ProotFastPathTest.kt | 10 +++++ tools/device-smoke.sh | 12 +++++- tools/packs/proot/release.env | 6 +++ tools/tests/test_device_smoke.py | 12 ++++++ 14 files changed, 169 insertions(+), 16 deletions(-) create mode 100644 tools/packs/proot/release.env diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 146e7fe3bf..1d39651c0b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -494,6 +494,16 @@ jobs: - name: Build the add-on packs run: bash tools/packs/build.sh app/build/packs + - name: Note when the proot pack pin is behind this build + run: | + set -euo pipefail + # shellcheck disable=SC1091 + source tools/packs/proot/release.env + sha=$(sha256sum app/build/packs/proot.tar.zst | cut -d' ' -f1) + if [ "$sha" != "$PROOT_PACK_SHA256" ]; then + echo "::warning::built proot pack $sha does not match tools/packs/proot/release.env ($PROOT_PACK_SHA256). This build publishes the pack it just built. Source builds keep downloading the pinned pack until release.env is updated." + fi + - name: Build id: build env: diff --git a/app/build.gradle b/app/build.gradle index 6fdfe9c4b9..1c9b9bad8d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -87,10 +87,18 @@ def desktopKde = rootProject.file('tools/desktop-kde/release.env').readLines() def trackingPack = rootProject.file('tools/packs/tracking/release.env').readLines() .findAll { it.contains('=') && !it.startsWith('#') } .collectEntries { def kv = it.split('=', 2); [(kv[0].trim()): kv[1].trim()] } +def prootPackPin = rootProject.file('tools/packs/proot/release.env').readLines() + .findAll { it.contains('=') && !it.startsWith('#') } + .collectEntries { def kv = it.split('=', 2); [(kv[0].trim()): kv[1].trim()] } def addonPacks = ['proot', 'directaudio', 'tracking', 'xbox', 'comet'].collectEntries { name -> def pack = file("build/packs/${name}.tar.zst") if (!pack.isFile()) { if (ciBuild) throw new GradleException("Add-on pack ${pack} is missing: run tools/packs/build.sh app/build/packs") + // A source build that did not compile proot still pins a published pack, so the app + // downloads the patched binary instead of falling back to the rootfs copy. + if (name == 'proot' && prootPackPin.PROOT_PACK_SHA256) { + return [(name): [sha256: prootPackPin.PROOT_PACK_SHA256, size: (prootPackPin.PROOT_PACK_SIZE ?: '0') as long]] + } return [(name): [sha256: '', size: 0L]] } def digest = java.security.MessageDigest.getInstance('SHA-256') diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 2f9bcf190a..9a762212d1 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2073,7 +2073,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return } Thread({ - val hint = runtimeDamageHint() ?: sessionEndHint(SessionState.logFile) + val hint = runtimeDamageHint() ?: sessionEndHint(SessionState.logFile) ?: prootFailureHint() runOnUiThread { if (isFinishing || isDestroyed) return@runOnUiThread showEnded(status, hint) @@ -2136,6 +2136,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return EndHint(resources.getQuantityString(R.plurals.session_end_runtime_damaged, broken.size, broken.size, broken.first()), repair = true) } + private fun prootFailureHint(): EndHint? { + if (SessionState.failureCode != "PROOT_MISSING") return null + val message = SessionState.failureMessage ?: return null + return EndHint(message) + } + private fun sessionEndHint(log: File?): EndHint? { if (log == null || !log.isFile) return null return try { 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 9d62261667..d587ecb7cc 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -261,6 +261,8 @@ object DeviceReport { k("VRAM cap", SessionPrefs.vramCapMb(context).let { if (it > 0) "$it MB" else "driver default" }) k("proot without seccomp", SessionPrefs.prootNoSeccomp(context)) k("proot fast path", SessionPrefs.prootFastPath(context)) + k("proot binary", LinuxRuntime.prootSource(context) + " " + LinuxRuntime.prootBinary(context).path) + k("proot fast path (eligible)", com.droiddeck.launcher.runtime.ProotFastPath.enabled(context)) k("Guest host name", SessionPrefs.guestHostname(context)) k("DirectAudio for games", SessionPrefs.directAudio(context)) k("Stretch 16:9 to panel", SessionPrefs.stretch16x9(context)) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java index 6d17f2d75a..6473197549 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -63,15 +63,48 @@ public final class LinuxRuntime { } private static final String HOST_DIR = "opt/android-host"; + /** The downloaded add-on pack. The APK does not ship this binary. */ + public static final String PROOT_PACK = "add-on pack"; + /** Termux's unpatched proot inside the rootfs. Developer switch only. */ + public static final String PROOT_ROOTFS = "rootfs fallback"; + public static final String PROOT_MISSING = "missing"; + + private static File rootfsProot(Context context) { + return new File(rootDir(context), HOST_DIR + "/proot"); + } + + private static File rootfsLoader(Context context) { + return new File(rootDir(context), HOST_DIR + "/loader"); + } + + private static boolean rootfsProotReady(Context context) { + return rootfsProot(context).isFile() && rootfsLoader(context).isFile(); + } + + /** Patched proot is the add-on pack. The rootfs copy is not that binary. */ + public static boolean patchedProot(Context context) { + return AddonPack.PROOT.installed(context); + } public static File prootBinary(Context context) { if (AddonPack.PROOT.installed(context)) return AddonPack.PROOT.file(context, "libproot.so"); - return new File(rootDir(context), HOST_DIR + "/proot"); + if (SessionPrefs.allowStockProot(context)) return rootfsProot(context); + return AddonPack.PROOT.file(context, "libproot.so"); } public static File prootLoader(Context context) { if (AddonPack.PROOT.installed(context)) return AddonPack.PROOT.file(context, "libproot-loader.so"); - return new File(rootDir(context), HOST_DIR + "/loader"); + if (SessionPrefs.allowStockProot(context)) return rootfsLoader(context); + return AddonPack.PROOT.file(context, "libproot-loader.so"); + } + + /** Where {@link #prootBinary} came from: {@link #PROOT_PACK}, {@link #PROOT_ROOTFS} or {@link #PROOT_MISSING}. */ + public static String prootSource(Context context) { + File bin = prootBinary(context); + if (!bin.isFile()) return PROOT_MISSING; + if (AddonPack.PROOT.installed(context) + && bin.getPath().equals(AddonPack.PROOT.file(context, "libproot.so").getPath())) return PROOT_PACK; + return PROOT_ROOTFS; } public static String prootLibraryPath(Context context) { @@ -85,8 +118,7 @@ public final class LinuxRuntime { return new File(root, "usr/bin/gamescope").isFile() && (new File(root, SESSION_SCRIPT.substring(1)).isFile() || new File(root, LegacyNames.SESSION_SCRIPT.substring(1)).isFile()) - && prootBinary(context).isFile() - && prootLoader(context).isFile(); + && (patchedProot(context) || rootfsProotReady(context)); } public static File vulkanIcd(Context context) { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java index cd8c6c44d4..5975f6501a 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java @@ -6,6 +6,7 @@ import android.util.Log; import com.droiddeck.launcher.R; +import com.droiddeck.launcher.session.SessionPrefs; import com.droiddeck.launcher.core.ArchivePaths; import com.droiddeck.launcher.core.Downloader; import com.droiddeck.launcher.core.Hashes; @@ -262,7 +263,9 @@ public final class LinuxRuntimeInstaller { emptyTrash(LinuxRuntime.rootDir(context).getParentFile()); String downloading = context.getString(R.string.rtinst_downloading); if (listener != null) listener.onProgress(Step.DOWNLOADING, downloading, 0); - if (!AddonPack.PROOT.await(context)) throw new IOException("Cannot download proot"); + if (!LinuxRuntime.patchedProot(context) && !AddonPack.PROOT.await(context) + && !SessionPrefs.allowStockProot(context)) + throw new IOException("Cannot download proot"); if (!AddonPack.DIRECTAUDIO.await(context)) throw new IOException("Cannot download DirectAudio"); boolean ok = Downloader.downloadFile(release.url, archive, true, release.sha256, (fraction) -> { if (listener != null) { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt b/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt index 94508e3729..485d7178a0 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt @@ -1,18 +1,32 @@ package com.droiddeck.launcher.runtime import android.content.Context -import com.droiddeck.launcher.core.AddonPack +import android.util.Log import com.droiddeck.launcher.session.SessionPrefs import java.io.File import java.security.MessageDigest object ProotFastPath { + private const val TAG = "ProotFastPath" const val LIBRARY = "/usr/local/lib/libblfastpath.so" const val MAX_BINDS = 256 - fun enabled(context: Context): Boolean = - SessionPrefs.prootFastPath(context) && !SessionPrefs.prootNoSeccomp(context) && - LinuxRuntime.prootBinary(context).parentFile == AddonPack.PROOT.dir(context) + /** + * The fast path's trampoline is let through only by the proot built with patches/0014. + * The rootfs copy (Termux's stock proot) is not that binary, so the library stays out. + */ + fun allows(preference: Boolean, noSeccomp: Boolean, source: String): Boolean = + preference && !noSeccomp && source == LinuxRuntime.PROOT_PACK + + fun enabled(context: Context): Boolean { + val preference = SessionPrefs.prootFastPath(context) + val noSeccomp = SessionPrefs.prootNoSeccomp(context) + val source = LinuxRuntime.prootSource(context) + val on = allows(preference, noSeccomp, source) + if (preference && !noSeccomp && !on) + Log.i(TAG, "proot: fast path off - binary is $source, not the patched proot") + return on + } fun key(root: File, binds: List<String>): String? { if (binds.size > MAX_BINDS || binds.any { it.contains('|') } || root.path.contains('|')) return null 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 95e867f8a1..75f6e54bef 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -9,6 +9,7 @@ import com.droiddeck.launcher.core.TextureFiltering import com.droiddeck.launcher.gpu.Cardboard import com.droiddeck.launcher.gpu.ScreenEffects import org.json.JSONObject +import java.io.File object SessionPrefs { data class GameTextureFiltering(val anisotropy: Int? = null, val lodBias: String? = null) @@ -527,6 +528,15 @@ object SessionPrefs { prefs(context).edit().putBoolean("cursorComposite", on).apply() } + /** + * The rootfs ships Termux's unpatched proot. A session uses it only when this file exists, + * so a missing add-on pack cannot silently fall back to it. + * Path: Android/data/<package>/files/droiddeck-stock-proot + */ + @JvmStatic + fun allowStockProot(context: Context): Boolean = + context.getExternalFilesDir(null)?.let { File(it, "droiddeck-stock-proot").isFile } == true + const val DEFAULT_GUEST_HOSTNAME = "DroidDeck" @JvmStatic 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 0b7f32db10..dd844b71c1 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -25,6 +25,7 @@ import android.os.PowerManager import android.hardware.display.DisplayManager import android.view.Display import android.util.Log +import android.widget.Toast import com.droiddeck.launcher.R import com.droiddeck.launcher.SessionActivity import com.droiddeck.launcher.audio.DirectAudioRelayComponent @@ -430,8 +431,30 @@ class SessionService : Service() { val sessionRoot = LinuxRuntime.sessionRoot(this).apply { mkdirs() } val runtimeDir = File(filesDir, ".wayland-rt").apply { mkdirs() } killStragglers() - for (pack in listOf(AddonPack.PROOT, AddonPack.DIRECTAUDIO)) - if (!pack.await(this, { gen == sessionGen && SessionState.running })) Log.w(TAG, "${pack.name} pack unavailable") + val stillStarting = { gen == sessionGen && SessionState.running } + val prootPack = LinuxRuntime.patchedProot(this) || AddonPack.PROOT.await(this, stillStarting) + val directAudioPack = AddonPack.DIRECTAUDIO.await(this, stillStarting) + if (!stillStarting()) { + Log.i(TAG, "session stopped while add-on packs were downloading") + return + } + if (!directAudioPack) { + Log.w(TAG, "directaudio pack unavailable; game audio drivers will not be staged") + mainHandler.post { + Toast.makeText(this, R.string.session_directaudio_missing, Toast.LENGTH_LONG).show() + } + } + if (!LinuxRuntime.patchedProot(this)) { + if (SessionPrefs.allowStockProot(this)) { + Log.w(TAG, "proot: patched proot missing; droiddeck-stock-proot allows the rootfs copy") + } else { + val message = getString(R.string.session_proot_missing) + Log.e(TAG, "$message (pack ready=$prootPack)") + SessionEvents.fail("PROOT_MISSING", message, -1) + stopSession(-1) + return + } + } val agentEnvironment = runCatching { com.droiddeck.launcher.agent.AgentEnv.beginSession(this) } .onFailure { Log.w(TAG, "agent environment skipped", it) } .getOrDefault(emptyList()) @@ -446,6 +469,10 @@ class SessionService : Service() { val sessionDir = openSessionFolder() val sessionLog = File(sessionDir, "session.log") + val prootLine = "== proot: ${LinuxRuntime.prootBinary(this).path} (${LinuxRuntime.prootSource(this)})" + Log.i(TAG, prootLine) + runCatching { sessionLog.appendText(prootLine + "\n") } + .onFailure { Log.w(TAG, "could not write the proot line to ${sessionLog.path}", it) } Log.i(TAG, GpuClockPin.start(this)) Log.i(TAG, GameThreadHints.start(this)) @@ -462,7 +489,7 @@ class SessionService : Service() { if (steamHere) guest.add("BL_EPIC_APP_ID=" + com.droiddeck.launcher.stores.epic.EpicClient.shortcutAppId) val fastPathAt = guest.size - val pulse = startAudio(guest, sessionDir) + val pulse = startAudio(guest, sessionDir, directAudioPack) if (steamHere) { val encoder = VideoEncodeBridge(File(filesDir, "venc/venc.sock")) encoder.attach(this) @@ -781,8 +808,9 @@ class SessionService : Service() { private fun noSteamGame(): Boolean = SessionState.mode == MODE_RUN && SessionState.program in setOf(NoSteamLaunch.PROTON_RUN, NoSteamLaunch.EPIC, NoSteamLaunch.BATTLENET) - private fun startAudio(guest: MutableList<String>, sessionDir: File): PulseAudioComponent { - val wantsDirectAudio = (SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP || noSteamGame()) && + private fun startAudio(guest: MutableList<String>, sessionDir: File, directAudioPack: Boolean): PulseAudioComponent { + val wantsDirectAudio = directAudioPack && + (SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP || noSteamGame()) && SessionPrefs.directAudio(this) val wantsMic = SessionPrefs.micEnabled(this) && checkSelfPermission(android.Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f546a543a7..81d0ad94d2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -184,6 +184,8 @@ <string name="app_fex_hint">FEX runs x86 Linux programs on this ARM64 device. Auto uses it when the program is built for x86.</string> <string name="app_fex_x86">%1$s through FEX</string> <string name="app_fex_not_ready">This program is built for %1$s PCs and runs through FEX, which is not set up yet. Open Steam once while signed in: DroidDeck has it download FEX and the Steam Linux Runtime it needs, then this opens.</string> + <string name="session_proot_missing">DroidDeck\'s proot could not be downloaded. Check the connection and try again. The session was not started, because the fallback proot is too slow to play on.</string> + <string name="session_directaudio_missing">DirectAudio could not be downloaded, so game audio uses the slower path this session.</string> <string name="session_end_program">This program</string> <string name="session_end_steam_download">Couldn\'t download the Steam client. Your network or VPN may be blocking Steam\'s servers; check the connection and try again.</string> <string name="session_end_steam_setup">Couldn\'t set up the Steam client. Check your connection and free storage, then try again.</string> diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/ProotFastPathTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/ProotFastPathTest.kt index 5d4eb1d8ee..9b97bd4181 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/ProotFastPathTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/ProotFastPathTest.kt @@ -1,7 +1,9 @@ package com.droiddeck.launcher.runtime +import org.junit.Assert.assertFalse import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue import org.junit.Test import java.io.File @@ -17,4 +19,12 @@ class ProotFastPathTest { val binds = (1..ProotFastPath.MAX_BINDS + 1).map { "/host/$it:/guest/$it" } assertNull(ProotFastPath.key(root, binds)) } + + @Test fun fastPathStaysOffForTheRootfsProot() { + assertTrue(ProotFastPath.allows(preference = true, noSeccomp = false, source = LinuxRuntime.PROOT_PACK)) + assertFalse(ProotFastPath.allows(preference = true, noSeccomp = false, source = LinuxRuntime.PROOT_ROOTFS)) + assertFalse(ProotFastPath.allows(preference = true, noSeccomp = false, source = LinuxRuntime.PROOT_MISSING)) + assertFalse(ProotFastPath.allows(preference = false, noSeccomp = false, source = LinuxRuntime.PROOT_PACK)) + assertFalse(ProotFastPath.allows(preference = true, noSeccomp = true, source = LinuxRuntime.PROOT_PACK)) + } } diff --git a/tools/device-smoke.sh b/tools/device-smoke.sh index bec8fed81b..80a8838050 100755 --- a/tools/device-smoke.sh +++ b/tools/device-smoke.sh @@ -10,7 +10,7 @@ # 5. on a foldable cycles the device state (half-opened, and with --closed also closed) through # `cmd device_state`, then puts the original state back; # 6. reads the newest session folder of a debug build: first frame, last frame rate, the -# memory page size and the last process exits. +# memory page size, the proot that session ran, and the last process exits. # # Usage: tools/device-smoke.sh [--serial SERIAL] [--apk FILE] [--pkg PACKAGE] # [--no-density] [--no-size] [--no-fold] [--closed] @@ -279,6 +279,16 @@ else ev=$(sh_ run-as "$pkg" cat "files/logs/$dir/events.jsonl" 2>/dev/null) echo "$ev" | grep -q '"frame.first"' && ok "first frame was drawn" || note "no frame.first in $dir" echo "$ev" | grep -q '"session.failed"' && bad "session.failed: $(echo "$ev" | grep '"session.failed"' | tail -1 | cut -c1-160)" + report=$(sh_ run-as "$pkg" cat "files/logs/$dir/device.txt" 2>/dev/null) + proot_line=$(echo "$report" | grep 'proot binary' | head -1) + case $proot_line in + *"rootfs fallback"*|*"missing"*) bad "session proot is not the patched binary ($proot_line)" ;; + *"apk"*|*"add-on pack"*) ok "patched proot ($proot_line)" ;; + *) note "device report has no proot binary line (build from before the check)" ;; + esac + app_log=$(sh_ run-as "$pkg" cat "files/logs/$dir/app.log" 2>/dev/null) + echo "$app_log" | grep -Fq 'proot: fast path on (' && ok "proot fast path was on" \ + || note "proot fast path activation was not recorded ($(echo "$report" | grep 'proot fast path' | tr '\n' '; '))" fps=$(sh_ run-as "$pkg" cat "files/logs/$dir/app.log" 2>/dev/null | grep 'last 10 s:' | tail -1 | sed 's/.*last 10 s: //' | cut -c1-70) [ -n "$fps" ] && echo " last stats $fps" sh_ run-as "$pkg" cat "files/logs/$dir/device.txt" 2>/dev/null | grep -E 'Memory page size|^Kernel' | sed 's/^/ report /' diff --git a/tools/packs/proot/release.env b/tools/packs/proot/release.env new file mode 100644 index 0000000000..7a23b27997 --- /dev/null +++ b/tools/packs/proot/release.env @@ -0,0 +1,6 @@ +# Published proot pack for a build that did not compile libproot.so into the APK. +# CI builds embed the binary and publish their own pack; this pin is what a source +# build downloads. Tag on DroidDeck-Components: pack-proot-<first 16 hex of the digest>. +# Update both lines when source builds should pick up a newer proot. +PROOT_PACK_SHA256=5a2b7284e6357f88a14a790abd54e61effbe5f202c63b6aaba9b974c559649c3 +PROOT_PACK_SIZE=96643 diff --git a/tools/tests/test_device_smoke.py b/tools/tests/test_device_smoke.py index 9afeb919f9..25478e0ab5 100644 --- a/tools/tests/test_device_smoke.py +++ b/tools/tests/test_device_smoke.py @@ -47,6 +47,8 @@ elif a[:1] == ["shell"]: s.setdefault("log_commands", []).append(a) p.write_text(json.dumps(s)) if "ls" in a: print(s["session"]) + elif a[-1].endswith("/device.txt"): print(s.get("report", "")) + elif a[-1].endswith("/app.log"): print(s.get("app_log", "")) else: print("package not debuggable") ''' @@ -112,6 +114,16 @@ class DeviceSmokeTest(unittest.TestCase): self.assertEqual(1, result.returncode, result.stdout) self.assertIn("could not launch", result.stdout) + def test_fast_path_requires_a_session_activation_log(self): + for active in (False, True): + with self.subTest(active=active): + result, _ = self.run_smoke( + session="session", report="proot fast path (eligible) true", + app_log="proot: fast path on (66 binds)" if active else "proot: fast path off - too many binds", + ) + self.assertEqual(0, result.returncode, result.stdout + result.stderr) + self.assertEqual(active, "PASS proot fast path was on" in result.stdout) + def test_session_name_remains_one_remote_argument(self): session = "x';id;#" result, state = self.run_smoke(session=session) From d08afbd878e19c62df08589280be22f0c2751266 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 11:55:01 -0400 Subject: [PATCH 079/135] fix: restart compression delay for new games --- .../overlay/usr/local/bin/droiddeck-session | 7 ++-- tools/tests/test_client_zram_focus.py | 32 +++++++++++++++++-- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index b44d74599b..0f99643ee3 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -552,6 +552,7 @@ case $mode in } # Proton starts its reaper before the game window; compressing during launch stalls it. # Desktop Steam has no focus.json, so it still uses the game process as its trigger. + # A configured RAM cap can still force compression while a game is launching. bl_game_focused() { if [ "${BL_DESKTOP:-}" = 1 ] || [ -z "${BL_LAUNCH_DIR:-}" ]; then return 0 @@ -575,7 +576,7 @@ case $mode in bl_cap_due() { [ "$_bl_ram_cap" -gt 0 ] && { [ "$_bl_measured" -lt 0 ] || [ $((SECONDS - _bl_measured)) -ge 30 ]; } } - _bl_since=-1 _bl_packed=-1 _bl_measured=-1 _bl_unpack=0 _bl_capped=-1 _bl_backoff=30 + _bl_since=-1 _bl_since_apps= _bl_packed=-1 _bl_measured=-1 _bl_unpack=0 _bl_capped=-1 _bl_backoff=30 while kill -0 $$ 2>/dev/null; do bl_zram_scan if bl_cap_due; then @@ -607,7 +608,9 @@ case $mode in fi fi if [ "$_bl_game" = 1 ] && bl_game_focused; then - [ "$_bl_since" -ge 0 ] || _bl_since=$SECONDS + if [ "$_bl_since" -lt 0 ] || [ "$_bl_since_apps" != "$_bl_apps" ]; then + _bl_since=$SECONDS _bl_since_apps=$_bl_apps + fi if [ "${BL_ZRAM_CLIENT:-1}" = 1 ] && [ $((SECONDS - _bl_since)) -ge 20 ] && [ "${#_bl_pids[@]}" -gt 0 ] && { [ "$_bl_packed" -lt 0 ] || [ $((SECONDS - _bl_packed)) -ge 300 ]; }; then bl_zram_send 1 "compressing the client" client diff --git a/tools/tests/test_client_zram_focus.py b/tools/tests/test_client_zram_focus.py index c542f21a2a..b35902e7ff 100644 --- a/tools/tests/test_client_zram_focus.py +++ b/tools/tests/test_client_zram_focus.py @@ -25,7 +25,7 @@ class ClientZramFocusTest(unittest.TestCase): stop = source.index(' nap 5', start) body = source[start:stop] harness = ''' -_bl_since=-1 _bl_packed=-1 +_bl_since=-1 _bl_since_apps= _bl_packed=-1 _bl_apps=" 413150" _bl_pids=(123) bl_game_focused() { [ "$focused" = 1 ]; } bl_over_cap() { return 1; } @@ -53,8 +53,10 @@ tick 60 0 0 start = source.index(' bl_zram_scan\n if bl_cap_due; then') stop = source.index(' nap 5', start) return ''' -_bl_since=-1 _bl_packed=-1 _bl_measured=-1 _bl_unpack=0 _bl_capped=-1 _bl_backoff=30 +_bl_since=-1 _bl_since_apps= _bl_packed=-1 _bl_measured=-1 _bl_unpack=0 _bl_capped=-1 _bl_backoff=30 +_bl_apps=" 413150" _bl_pids=(123) +step() { :; } bl_zram_scan() { :; } bl_game_focused() { [ "$focused" = 1 ]; } bl_cap_due() { [ "$cap_due" = 1 ]; } @@ -75,6 +77,32 @@ tick 30 0 0 0 0 self.assertEqual('', result.stderr) self.assertEqual('', result.stdout) + def test_a_new_game_restarts_the_compression_delay(self): + result = run_bash(self.monitor_harness() + ''' +tick 0 1 1 0 0 +_bl_apps=" 413150 1245620" +tick 15 1 1 0 0 +tick 20 1 1 0 0 +echo "starting:$_bl_packed" +tick 34 1 1 0 0 +tick 35 1 1 0 0 +''') + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual(['starting:-1', 'send:1:client'], result.stdout.splitlines()) + + def test_ram_cap_can_still_compress_an_unfocused_client(self): + result = run_bash(self.monitor_harness() + ''' +BL_ZRAM_CLIENT=0 BL_RAM_CAP_MB=1024 +bl_zram_usage() { _bl_rss=$((768 * 1024)); } +tick 0 1 0 1 1 +echo "cap:$_bl_packed:$_bl_since:$_bl_backoff" +tick 5 0 0 0 0 +''') + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual(['send:1:client', 'send:1:session', 'cap:0:-1:60', 'send:0:client'], result.stdout.splitlines()) + def test_game_exit_defers_restore_until_the_session_is_under_the_ram_cap(self): result = run_bash(self.monitor_harness() + ''' tick 0 1 1 0 0 From eaaecf066143a6fd5efda6d53344f368c4cb48a3 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 12:01:44 -0400 Subject: [PATCH 080/135] feat(session): add portrait sessions and controls below the game (#1612) --- .../droiddeck/launcher/FrontEndActivity.kt | 3 +- .../com/droiddeck/launcher/SessionActivity.kt | 63 ++++++++++--------- .../launcher/session/SessionDisplay.kt | 22 ++++--- .../launcher/session/SessionPrefs.kt | 29 ++++++++- .../launcher/session/SessionService.kt | 4 +- .../launcher/ui/DeckControlsPanel.kt | 26 ++++++-- .../droiddeck/launcher/ui/GamepadGeometry.kt | 43 ++++++++++++- .../launcher/ui/ModeSettingsDialog.kt | 11 +++- .../droiddeck/launcher/ui/ResolutionRow.kt | 7 ++- .../droiddeck/launcher/ui/SessionOverlay.kt | 36 ++++++++--- .../droiddeck/launcher/ui/SettingsWidgets.kt | 47 ++++++++++---- app/src/main/res/values/strings.xml | 10 +-- .../launcher/session/OrientationTest.kt | 40 +++++++++--- .../launcher/session/SessionDisplayTest.kt | 37 +++++++++++ .../session/SessionScalingPrefsTest.kt | 10 +++ .../launcher/ui/GamepadGeometryTest.kt | 62 +++++++++++++++++- 16 files changed, 359 insertions(+), 91 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 1f754d0b78..8bf9166f0c 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1710,8 +1710,7 @@ class FrontEndActivity : ComponentActivity() { steamDownloadsInBackground = steamDownloadsInBackground, pipSupported = com.droiddeck.launcher.session.SessionPipController.supported(this), pipAutoEnter = pipAutoEnter, - unfoldedControls = if (mode == SessionService.MODE_STEAM && - com.droiddeck.launcher.session.SessionDisplay.foldable(this)) unfoldedControls else null, + unfoldedControls = if (mode == SessionService.MODE_STEAM) unfoldedControls else null, unfoldedControlsWithController = unfoldedControlsWithController, oscMode = if (mode == SessionService.MODE_STEAM) oscMode else null, backActionsInverted = backActionsInverted, diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 9a762212d1..b9dce0e415 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1084,7 +1084,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { pipAutoEnter = on pip.refresh(true) }, - unfoldedControls = if (com.droiddeck.launcher.session.SessionDisplay.foldable(this@SessionActivity)) unfoldedControls else null, + unfoldedControls = unfoldedControls, onUnfoldedControls = ::chooseUnfoldedControls, unfoldedControlsWithController = unfoldedControlsWithController, onUnfoldedControlsWithController = ::chooseUnfoldedControlsWithController, @@ -1786,9 +1786,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val driverId = if (CompositorHost.isStarted) null else turnip.install() val previous = SessionState.outputSize - val live = if (SessionState.followScreen && !isInPictureInPictureMode) - com.droiddeck.launcher.session.SessionDisplay.followSize(holder.surfaceFrame.width(), holder.surfaceFrame.height()) - else null + val live = windowOutputSize(holder.surfaceFrame.width(), holder.surfaceFrame.height()) val size = live ?: if (SessionState.running) previous else glassesOutputSize() ?: outputSize() SessionState.outputSize = size if (!SessionState.running) SessionState.refreshHz = refreshHz() @@ -1845,7 +1843,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { ) onOutputAttached(holder) if (SessionState.running && size != previous) { - Log.i(TAG, "follow screen: ${previous.first}x${previous.second} -> ${size.first}x${size.second} on a new surface") + Log.i(TAG, "output resized: ${previous.first}x${previous.second} -> ${size.first}x${size.second} on a new surface") WaylandCompositor.nativeResizeOutput(size.first, size.second) } if (!SessionState.running) SessionEvents.record("compositor.started") @@ -1877,15 +1875,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { cancelTouchGestures() Log.i(TAG, "surface resized to ${width}x$height - rebinding the compositor") CompositorHost.resize(holder.surface) { applyFrameGen() } - followWindow(width, height) + resizeOutputForWindow(width, height) } } - private fun followWindow(width: Int, height: Int) { - if (!SessionState.followScreen || isInPictureInPictureMode || !CompositorHost.isStarted) return - val size = com.droiddeck.launcher.session.SessionDisplay.followSize(width, height) ?: return + private fun windowOutputSize(width: Int, height: Int): Pair<Int, Int>? { + if (isInPictureInPictureMode || width <= 0 || height <= 0) return null + return if (SessionState.followScreen) + com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, controlsBelowWanted()) + else if (glassesScreen == null) outputSize() else null + } + + private fun resizeOutputForWindow(width: Int, height: Int) { + if (!CompositorHost.isStarted) return + val size = windowOutputSize(width, height) ?: return if (size == SessionState.outputSize) return - Log.i(TAG, "follow screen: ${SessionState.outputSize.first}x${SessionState.outputSize.second} -> ${size.first}x${size.second}") + Log.i(TAG, "output resized: ${SessionState.outputSize.first}x${SessionState.outputSize.second} -> ${size.first}x${size.second}") SessionState.outputSize = size val panel = panelBounds() SessionState.upscaleRatio = maxOf(panel.width(), panel.height()).toFloat() / maxOf(size.first, size.second).coerceAtLeast(1) @@ -1899,11 +1904,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun applyFollowOrientation(config: android.content.res.Configuration) { - val wanted = if (SessionState.followScreen && config.smallestScreenWidthDp >= 600) { - android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER - } else { - SessionPrefs.orientation(this) - } + val wanted = SessionPrefs.windowOrientation(this, SessionState.followScreen, config.smallestScreenWidthDp) if (requestedOrientation != wanted) requestedOrientation = wanted } @@ -1915,6 +1916,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { cancelTouchGestures() applyFollowOrientation(newConfig) applyUnfoldedControls() + resizeOutputForWindow(surfaceW, surfaceH) } override fun surfaceDestroyed(holder: SurfaceHolder) { @@ -1956,7 +1958,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { Library.drawsAtPanel(program) && !SessionPrefs.resolutionChosen(this, mode)) com.droiddeck.launcher.session.SessionDisplay.MATCH_SCREEN else SessionPrefs.resolutionChoice(this, mode, panel) - return com.droiddeck.launcher.session.SessionDisplay.resolveChoice(panel, choice) + return com.droiddeck.launcher.session.SessionDisplay.resolveChoice(panel, choice, + SessionPrefs.portrait(this) && !controlsBelowWanted()) } private fun refreshHz(): Float { @@ -2682,21 +2685,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { screenKeys?.refreshAppearance() } + private fun controlsBelowWanted(): Boolean { + if (!::sessionRoot.isInitialized || glassesScreen != null || cardboard.enabled) return false + return SessionPrefs.controlsBelowWanted(this, SessionState.mode, sessionRoot.width, sessionRoot.height, + pipUi || isInPictureInPictureMode) + } + private fun applyUnfoldedControls() { if (!::sessionRoot.isInitialized) return val width = sessionRoot.width val height = sessionRoot.height - val wanted = com.droiddeck.launcher.session.SessionDisplay.unfoldedControlsWanted( - enabled = unfoldedControls, - foldable = com.droiddeck.launcher.session.SessionDisplay.foldable(this), - controllerConnected = PadBridge.anyControllerConnected() || SteamControllerBle.connected, - keepWithController = unfoldedControlsWithController, - steamDeckPad = SessionState.mode == SessionService.MODE_STEAM && SessionState.deckPad, - pip = pipUi || isInPictureInPictureMode, - width = width, - height = height, - smallestWidthDp = resources.configuration.smallestScreenWidthDp, - ) + val wanted = controlsBelowWanted() val gameHeight = if (wanted) com.droiddeck.launcher.session.SessionDisplay.unfoldedGameHeight(width, height) else FrameLayout.LayoutParams.MATCH_PARENT val params = surfaceView.layoutParams as FrameLayout.LayoutParams @@ -2706,13 +2705,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { else "unfolded controls: game full screen") } var panel = unfoldedPanel + if (panel != null && panel.deckControls != SessionState.deckPad) { + sessionRoot.removeView(panel) + unfoldedPanel = null + panel = null + } if (!wanted) { if (panel != null) { sessionRoot.removeView(panel); unfoldedPanel = null; updateOnScreenControls() } return } if (panel == null) { panel = com.droiddeck.launcher.ui.DeckControlsPanel(this, onClose = { chooseUnfoldedControls(false) }, - onSteamMenu = ::tapSteamButton, onQam = ::tapQam, pad = padBridge) + onSteamMenu = ::tapSteamButton, onQam = ::tapQam, pad = padBridge, + portraitDock = !com.droiddeck.launcher.session.SessionDisplay.foldable(this)) sessionRoot.addView(panel, sessionRoot.indexOfChild(surfaceView) + 1) unfoldedPanel = panel updateOnScreenControls() @@ -3148,7 +3153,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onPictureInPictureModeChanged(inPip: Boolean, newConfig: android.content.res.Configuration) { super.onPictureInPictureModeChanged(inPip, newConfig) if (::pip.isInitialized) pip.changed(inPip) - if (!inPip && surfaceW > 0) followWindow(surfaceW, surfaceH) + if (!inPip && surfaceW > 0) resizeOutputForWindow(surfaceW, surfaceH) applyUnfoldedControls() updateGlassesScreen() } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt index 39ed2c43e9..31b9b10988 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt @@ -17,12 +17,13 @@ object SessionDisplay { fun screenSize(panel: Pair<Int, Int>): Pair<Int, Int> = (maxOf(panel.first, panel.second) and 1.inv()) to (minOf(panel.first, panel.second) and 1.inv()) - fun resolveChoice(panel: Pair<Int, Int>, choice: String): Pair<Int, Int> { - if (choice == MATCH_SCREEN || choice == FOLLOW_SCREEN) return screenSize(panel) - presetHeight(choice)?.let { return resolve(panel, it, SessionPrefs.SHAPE_AUTO) } + fun resolveChoice(panel: Pair<Int, Int>, choice: String, portrait: Boolean = false): Pair<Int, Int> { + fun orient(size: Pair<Int, Int>) = if (portrait) size.second to size.first else size + if (choice == MATCH_SCREEN || choice == FOLLOW_SCREEN) return orient(screenSize(panel)) + presetHeight(choice)?.let { return orient(resolve(panel, it, SessionPrefs.SHAPE_AUTO)) } val parts = choice.split('x').map { it.toIntOrNull() } return if (parts.size == 2 && parts.all { it != null && it > 0 }) parts[0]!! to parts[1]!! - else resolve(panel, 720, SessionPrefs.SHAPE_AUTO) + else orient(resolve(panel, 720, SessionPrefs.SHAPE_AUTO)) } fun resolutionOptions(panel: Pair<Int, Int>): List<String> { @@ -31,8 +32,10 @@ object SessionDisplay { .filter { resolveChoice(panel, it) != screenSize(panel) } + MATCH_SCREEN + FOLLOW_SCREEN } - fun followSize(width: Int, height: Int): Pair<Int, Int>? = - if (minOf(width, height) < FOLLOW_MIN_SIDE) null else (width and 1.inv()) to (height and 1.inv()) + fun followSize(width: Int, height: Int, controlsBelow: Boolean = false): Pair<Int, Int>? = + if (width <= 0 || height <= 0 || + (if (controlsBelow) width else minOf(width, height)) < FOLLOW_MIN_SIDE) null + else (width and 1.inv()) to (height and 1.inv()) const val UNFOLDED_MAX_GAME_SHARE = 0.8f @@ -49,13 +52,14 @@ object SessionDisplay { foldable: Boolean, controllerConnected: Boolean, keepWithController: Boolean, - steamDeckPad: Boolean, + gamepadAvailable: Boolean, pip: Boolean, width: Int, height: Int, smallestWidthDp: Int, - ): Boolean = enabled && foldable && (keepWithController || !controllerConnected) && steamDeckPad && - !pip && width > 0 && height > 0 && smallestWidthDp >= UNFOLDED_MIN_DP + ): Boolean = enabled && (keepWithController || !controllerConnected) && gamepadAvailable && + !pip && width > 0 && height > 0 && + (height > width || (foldable && smallestWidthDp >= UNFOLDED_MIN_DP)) fun panelSize(context: Context): Pair<Int, Int> { 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 75f6e54bef..8ffaacd563 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -44,6 +44,8 @@ object SessionPrefs { private fun prefs(context: Context) = context.getSharedPreferences("session", Context.MODE_PRIVATE) val orientationOptions = listOf( + ActivityInfo.SCREEN_ORIENTATION_USER to R.string.setup_launcher_orientation_auto, + ActivityInfo.SCREEN_ORIENTATION_PORTRAIT to R.string.setup_orientation_portrait, ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE to R.string.setup_orientation_auto, ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE to R.string.setup_orientation_landscape, ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE to R.string.setup_orientation_reverse, @@ -59,6 +61,17 @@ object SessionPrefs { prefs(context).edit().putInt("orientation", orientation).apply() } + fun windowOrientation(context: Context, followScreen: Boolean, smallestWidthDp: Int): Int = + if (followScreen && smallestWidthDp >= SessionDisplay.UNFOLDED_MIN_DP && !prefs(context).contains("orientation")) + ActivityInfo.SCREEN_ORIENTATION_USER else orientation(context) + + fun portrait(context: Context): Boolean = when (orientation(context)) { + ActivityInfo.SCREEN_ORIENTATION_PORTRAIT -> true + ActivityInfo.SCREEN_ORIENTATION_USER -> + context.resources.configuration.orientation == android.content.res.Configuration.ORIENTATION_PORTRAIT + else -> false + } + fun launcherFullscreen(context: Context): Boolean = prefs(context).getBoolean("launcherFullscreen", true) fun setLauncherFullscreen(context: Context, on: Boolean) { @@ -664,8 +677,10 @@ object SessionPrefs { parseResolution(value)?.let { return "${it.first}x${it.second}" } } if (!resolutionChosen(context, mode) && !saved.contains("shape")) return SessionDisplay.DEFAULT_RESOLUTION - val legacy = SessionDisplay.resolve(panel, resolutionCap(context, mode), shapeMode(context), customResolution(context, mode)) + val custom = customResolution(context, mode) + val legacy = SessionDisplay.resolve(panel, resolutionCap(context, mode), shapeMode(context), custom) return if (legacy == SessionDisplay.screenSize(panel)) SessionDisplay.MATCH_SCREEN + else if (custom == null && legacy == SessionDisplay.resolve(panel, legacy.second, SHAPE_AUTO)) "${legacy.second}p" else "${legacy.first}x${legacy.second}" } @@ -1117,6 +1132,18 @@ object SessionPrefs { fun unfoldedControls(context: Context): Boolean = prefs(context).getBoolean("unfoldedControls", false) + fun controlsBelowWanted(context: Context, mode: String, width: Int, height: Int, pip: Boolean = false): Boolean = + SessionDisplay.unfoldedControlsWanted( + enabled = unfoldedControls(context), + foldable = SessionDisplay.foldable(context), + controllerConnected = com.droiddeck.launcher.input.PadBridge.anyControllerConnected() || + com.droiddeck.launcher.input.SteamControllerBle.connected, + keepWithController = unfoldedControlsWithController(context), + gamepadAvailable = mode == SessionService.MODE_STEAM && builtinPad(context), + pip = pip, width = width, height = height, + smallestWidthDp = context.resources.configuration.smallestScreenWidthDp, + ) + fun setUnfoldedControls(context: Context, enabled: Boolean) { prefs(context).edit().putBoolean("unfoldedControls", enabled).apply() } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index dd844b71c1..b6f35f96a1 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -499,7 +499,9 @@ class SessionService : Service() { guest.add("BL_WIDTH=" + size.first) guest.add("BL_HEIGHT=" + size.second) - if (SessionState.followScreen) guest.add("BL_FOLLOW_OUTPUT=1") + if (SessionState.followScreen || size.first < size.second || + SessionPrefs.orientation(this) == android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER) + guest.add("BL_FOLLOW_OUTPUT=1") if (SessionState.hdr) { guest.add("BL_HDR=1") guest.add("DXVK_HDR=1") diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt index 0a603d5a54..825b6980fb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt @@ -37,10 +37,12 @@ class DeckControlsPanel( private val onSteamMenu: () -> Unit, private val onQam: () -> Unit, private val pad: PadBridge? = null, + private val portraitDock: Boolean = false, ) : LinearLayout(context) { private enum class Tab(val label: Int) { GAMEPAD(R.string.deck_tab_gamepad), GRIPS(R.string.deck_tab_grips), LEFT(R.string.deck_tab_left), RIGHT(R.string.deck_tab_right), BOTH(R.string.deck_tab_both) } private val content = FrameLayout(context) + val deckControls = pad == null || SessionState.deckPad private val tabViews = HashMap<Tab, TextView>() private val topBar: View by lazy { topBar() } @@ -49,7 +51,7 @@ class DeckControlsPanel( setBackgroundColor(Color.BLACK) addView(topBar, LayoutParams(LayoutParams.MATCH_PARENT, dp(64))) addView(content, LayoutParams(LayoutParams.MATCH_PARENT, 0, 1f)) - select(if (pad != null) selectedWithPad else selected) + select(if (pad != null && !deckControls) Tab.GAMEPAD else if (pad != null) selectedWithPad else selected) } override fun onDetachedFromWindow() { @@ -67,6 +69,7 @@ class DeckControlsPanel( background = outline(CORNER_PILL, SURFACE) setPadding(dp(4), dp(4), dp(4), dp(4)) for (tab in Tab.values()) { + if (!deckControls && tab != Tab.GAMEPAD) continue if (tab == Tab.GAMEPAD && pad == null) continue val view = TextView(context).apply { text = context.getString(tab.label) @@ -170,7 +173,7 @@ class DeckControlsPanel( addView(grips, LayoutParams(LayoutParams.MATCH_PARENT, dp(84))) } - private fun gamepad(pad: PadBridge): View = GamepadLayout(context).apply { + private fun gamepad(pad: PadBridge): View = GamepadLayout(context, portraitDock).apply { fun pill(label: String, write: (PadState, Boolean) -> Unit) = PadButton(context, pad, label, write) place(surfaceSlot(pad, right = false), GamepadGeometry.Slot.LEFT_MAIN) place(DirectionPad(context, pad), GamepadGeometry.Slot.LEFT_SECOND) @@ -186,14 +189,22 @@ class DeckControlsPanel( place(centreTap("\u2022\u2022\u2022", context.getString(R.string.drawer_open_qam), onQam), GamepadGeometry.Slot.QAM) } place(pill("MENU") { st, d -> st.press(PadState.START, d) }, GamepadGeometry.Slot.MENU) - place(centreTap("\u25a6 " + context.getString(R.string.deck_panels), context.getString(R.string.deck_more_controls)) { select(Tab.BOTH) }, + if (deckControls) place(centreTap("\u25a6 " + context.getString(R.string.deck_panels), context.getString(R.string.deck_more_controls)) { select(Tab.BOTH) }, GamepadGeometry.Slot.PANELS) + if (portraitDock && deckControls) { + place(GripButton(context, "L4", null, DeckControls.L4), GamepadGeometry.Slot.L4) + place(GripButton(context, "L5", null, DeckControls.L5), GamepadGeometry.Slot.L5) + place(GripButton(context, "R5", null, DeckControls.R5), GamepadGeometry.Slot.R5) + place(GripButton(context, "R4", null, DeckControls.R4), GamepadGeometry.Slot.R4) + } } private fun centreTap(label: String, description: String, onClick: () -> Unit) = TextView(context).apply { text = label contentDescription = description textSize = 13f + maxLines = 1 + setAutoSizeTextTypeUniformWithConfiguration(9, 13, 1, android.util.TypedValue.COMPLEX_UNIT_SP) typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD) letterSpacing = 0.08f gravity = Gravity.CENTER @@ -206,6 +217,11 @@ class DeckControlsPanel( } private fun surfaceSlot(pad: PadBridge, right: Boolean): View = FrameLayout(context).apply { + if (!deckControls) { + addView(StickView(context, pad, right), + FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)) + return@apply + } val slot = this fun show() { slot.removeAllViews() @@ -617,7 +633,7 @@ class DeckControlsPanel( } } - private class GamepadLayout(context: Context) : ViewGroup(context) { + private class GamepadLayout(context: Context, private val portraitDock: Boolean) : ViewGroup(context) { private val slots = LinkedHashMap<View, GamepadGeometry.Slot>() fun place(view: View, slot: GamepadGeometry.Slot) { @@ -625,7 +641,7 @@ class DeckControlsPanel( addView(view) } - private fun boxes(w: Int, h: Int) = GamepadGeometry.layout(w.toFloat(), h.toFloat(), resources.displayMetrics.density) + private fun boxes(w: Int, h: Int) = GamepadGeometry.layout(w.toFloat(), h.toFloat(), resources.displayMetrics.density, portraitDock) override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { val w = MeasureSpec.getSize(widthMeasureSpec) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GamepadGeometry.kt b/app/src/main/java/com/droiddeck/launcher/ui/GamepadGeometry.kt index 466d57aecd..2b369c20aa 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GamepadGeometry.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GamepadGeometry.kt @@ -8,6 +8,7 @@ object GamepadGeometry { LEFT_OUTER_SHOULDER, LEFT_INNER_SHOULDER, RIGHT_INNER_SHOULDER, RIGHT_OUTER_SHOULDER, VIEW, STEAM, QAM, MENU, PANELS, + L4, L5, R5, R4, } data class Box(val cx: Float, val cy: Float, val width: Float, val height: Float) { @@ -25,8 +26,11 @@ object GamepadGeometry { fun tall(w: Float, h: Float): Boolean = h >= w * 0.45f - fun layout(w: Float, h: Float, density: Float): Map<Slot, Box> { + fun layout(w: Float, h: Float, density: Float, portraitDock: Boolean = false): Map<Slot, Box> { if (w <= 0f || h <= 0f) return emptyMap() + if (portraitDock && h >= w * 0.9f && w >= 300 * density && h >= 360 * density) { + return portraitLayout(w, h, density) + } val pad = 8 * density val buttonH = 40 * density val rowButton = 64 * density @@ -67,7 +71,7 @@ object GamepadGeometry { } middleGrid(columns, gap - 2 * gutter, shoulderY - buttonH / 2f) } else { - val side = min(w * 0.5f, h * 0.70f) + val side = min(min(w * 0.5f, h * 0.70f), (w - 2 * gridButton - 2 * gutter) / 1.42f) val main = side * 0.62f val second = side * 0.46f val secondCy = h - side * 0.97f @@ -87,4 +91,39 @@ object GamepadGeometry { } return boxes } + + private fun portraitLayout(w: Float, h: Float, density: Float): Map<Slot, Box> { + val pad = 8 * density + val gap = 8 * density + val buttonH = 44 * density + val scale = min(1f, (h - 2 * pad - 4 * gap - 3 * buttonH) / (w * 0.7f)) + val main = w * 0.4f * scale + val second = w * 0.3f * scale + val mainY = h - pad - main / 2f + val secondY = mainY - main / 2f - gap - second / 2f + val shoulderY = secondY - second / 2f - gap - buttonH / 2f + val boxes = linkedMapOf( + Slot.LEFT_MAIN to Box(w * 0.25f, mainY, main, main), + Slot.RIGHT_MAIN to Box(w * 0.75f, mainY, main, main), + Slot.LEFT_SECOND to Box(w * 0.25f, secondY, second, second), + Slot.RIGHT_SECOND to Box(w * 0.75f, secondY, second, second), + ) + val utilityW = (w - 2 * pad - 3 * gap) / 4f + for ((i, slot) in middle.withIndex()) { + boxes[slot] = Box(pad + utilityW / 2f + i * (utilityW + gap), pad + buttonH / 2f, utilityW, buttonH) + } + val gripTop = pad + buttonH + gap + val gripH = min(64 * density, shoulderY - buttonH / 2f - gap - gripTop) + for ((i, slot) in listOf(Slot.L4, Slot.L5, Slot.R5, Slot.R4).withIndex()) { + boxes[slot] = Box(pad + utilityW / 2f + i * (utilityW + gap), gripTop + gripH / 2f, utilityW, gripH) + } + val panelsW = min(112 * density, w * 0.22f) + val shoulderW = (w - 2 * pad - 4 * gap - panelsW) / 4f + boxes[Slot.PANELS] = Box(w / 2f, shoulderY, panelsW, buttonH) + boxes[Slot.LEFT_OUTER_SHOULDER] = Box(pad + shoulderW / 2f, shoulderY, shoulderW, buttonH) + boxes[Slot.LEFT_INNER_SHOULDER] = Box(pad + shoulderW * 1.5f + gap, shoulderY, shoulderW, buttonH) + boxes[Slot.RIGHT_INNER_SHOULDER] = Box(w - pad - shoulderW * 1.5f - gap, shoulderY, shoulderW, buttonH) + boxes[Slot.RIGHT_OUTER_SHOULDER] = Box(w - pad - shoulderW / 2f, shoulderY, shoulderW, buttonH) + return boxes + } } 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 a2239bb725..86c03309f8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -210,9 +210,16 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: val host = rememberMenuHost() var explainWifiDiscovery by remember { mutableStateOf(false) } if (tab == SheetTab.DISPLAY) { - val displaySize = com.droiddeck.launcher.session.SessionDisplay.resolveChoice(s.panelSize, s.resolution) + val context = LocalContext.current + val portraitWindow = SessionPrefs.portrait(context) + val longSide = maxOf(s.panelSize.first, s.panelSize.second) + val shortSide = minOf(s.panelSize.first, s.panelSize.second) + val controlsBelow = SessionPrefs.controlsBelowWanted(context, s.mode, + if (portraitWindow) shortSide else longSide, if (portraitWindow) longSide else shortSide) + val portrait = portraitWindow && !controlsBelow + val displaySize = com.droiddeck.launcher.session.SessionDisplay.resolveChoice(s.panelSize, s.resolution, portrait) SettingsGroup(stringResource(R.string.display_session)) { - ResolutionRow(host, s.resolution, s.panelSize, a.onResolution) + ResolutionRow(host, s.resolution, s.panelSize, a.onResolution, portrait = portrait) s.picturePosition?.let { position -> ChoiceRow(host, "picture-position", stringResource(R.string.display_picture_position), null, listOf("top" to stringResource(R.string.display_position_top), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt index 5a0b88daaf..8db8910a80 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt @@ -14,16 +14,17 @@ import com.droiddeck.launcher.session.SessionDisplay fun ResolutionRow( host: MenuHost, choice: String, panel: Pair<Int, Int>, onPick: (String) -> Unit, chipModifier: Modifier = Modifier, + portrait: Boolean = false, ) { val custom = "custom" - val size = SessionDisplay.resolveChoice(panel, choice) - val screen = SessionDisplay.screenSize(panel) + val size = SessionDisplay.resolveChoice(panel, choice, portrait) + val screen = SessionDisplay.resolveChoice(panel, SessionDisplay.MATCH_SCREEN, portrait) val choices = SessionDisplay.resolutionOptions(panel) val selected = if (choice == SessionDisplay.FOLLOW_SCREEN) choice else if (size == screen) SessionDisplay.MATCH_SCREEN else choice var editCustom by remember { mutableStateOf(false) } val options = choices.map { value -> - val dimensions = SessionDisplay.resolveChoice(panel, value) + val dimensions = SessionDisplay.resolveChoice(panel, value, portrait) value to if (value == SessionDisplay.MATCH_SCREEN) stringResource(R.string.display_match_screen, screen.first, screen.second) else if (value == SessionDisplay.FOLLOW_SCREEN) stringResource(R.string.display_follow_screen) else if (value == SessionDisplay.DEFAULT_RESOLUTION) stringResource(R.string.mode_res_default, "${dimensions.first}×${dimensions.second}") diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 1adcfd860c..b526bea285 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -72,6 +72,8 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.ScrollState +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme @@ -405,6 +407,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont androidx.compose.foundation.layout.BoxWithConstraints(modifier = Modifier.fillMaxSize().exposeTestTags(), contentAlignment = Alignment.CenterEnd) { val short = maxHeight < 440.dp val sheetWidth = minOf(360.dp, maxWidth * 0.92f) + val narrow = sheetWidth < 320.dp AnimatedVisibility( open, enter = slideInHorizontally(Motion.sp(0.8f, Spring.StiffnessLow)) { it } + fadeIn(Motion.tw(220)), @@ -420,14 +423,18 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont .controllerBack { if (host.open != null) host.open = null else a.onClose() } - .padding(if (short) 12.dp else 16.dp), + .padding(12.dp), ) { + val title = a.title ?: if (a.steam) stringResource(R.string.drawer_steam) else stringResource(R.string.drawer_desktop) + if (narrow) Text(title, fontSize = 18.sp, fontWeight = FontWeight.Bold, + color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, + modifier = Modifier.fillMaxWidth().padding(bottom = 6.dp)) Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().heightIn(min = 44.dp), ) { - Text(a.title ?: if (a.steam) stringResource(R.string.drawer_steam) else stringResource(R.string.drawer_desktop), fontSize = if (short) 18.sp else 20.sp, fontWeight = FontWeight.Bold, + if (narrow) Spacer(Modifier.weight(1f)) else Text(title, fontSize = 18.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) if (a.pipSupported) SteamActionPill( stringResource(R.string.pip_title), Icons.Outlined.PictureInPictureAlt, focus.track(page, "pip"), @@ -468,12 +475,12 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont Row( verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth().padding(top = if (short) 6.dp else 12.dp), + modifier = Modifier.fillMaxWidth().padding(top = 6.dp), ) { DrawerBumper("LB", stringResource(R.string.drawer_prev_page), modifier = focus.track(page, "prev")) { host.open = null; onPageChange(pages.step(page, -1)) } - DrawerPageTabs(page = page, pages = pages, compact = short, modifier = Modifier.weight(1f)) { index -> host.open = null; onPageChange(index) } + DrawerPageTabs(page = page, pages = pages, compact = true, modifier = Modifier.weight(1f)) { index -> host.open = null; onPageChange(index) } DrawerBumper("RB", stringResource(R.string.drawer_next_page), modifier = focus.track(page, "next")) { host.open = null; onPageChange(pages.step(page, 1)) } @@ -484,7 +491,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont ) { selectedGlassesTab = it } Column( modifier = Modifier.weight(1f).fillMaxWidth().verticalScroll(pageScroll.getValue(page)), - ) { CompositionLocalProvider(LocalChipMinWidth provides 120.dp) { + ) { CompositionLocalProvider(LocalChipMinWidth provides 96.dp, LocalCompactSettings provides true) { when (page) { SessionDrawerPage.DISPLAY -> { SettingsGroup(stringResource(R.string.drawer_page_display)) { @@ -559,7 +566,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont stringResource(R.string.ctrl_edit), a.onGestureSettings, modifier = focus.track(page, "gesture-settings")) if (a.onScreenKeys != null) { - SettingsRow(stringResource(R.string.screen_keys), null) { + SettingsRow(stringResource(R.string.screen_keys), null, stacked = narrow) { Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), @@ -896,16 +903,22 @@ private fun DrawerPageTabs(page: SessionDrawerPage, pages: List<SessionDrawerPag modifier = modifier.height(if (compact) 44.dp else 64.dp).clipToBounds().selectableGroup(), ) { val tab = if (compact) 36f else 44f + val scrolling = maxWidth < (tab + (count - 1) * 24f).dp + val scroll = rememberScrollState() + val density = LocalDensity.current.density + LaunchedEffect(scrolling, selectedIndex, maxWidth) { + if (scrolling) scroll.animateScrollTo(((selectedIndex * (tab + 4f) + tab / 2f - maxWidth.value / 2f) * density).roundToInt().coerceAtLeast(0)) + } val spacing = ((maxWidth.value - tab) / ((count - 1) * (1f + DRAWER_TAB_LEAN_DP / DRAWER_TAB_SPACING_DP))).coerceIn(24f, DRAWER_TAB_SPACING_DP) val leanStep = DRAWER_TAB_LEAN_DP * spacing / DRAWER_TAB_SPACING_DP val lean by animateFloatAsState(-(selectedIndex - middle) * leanStep, motion, label = "tabLean") - pages.forEachIndexed { index, item -> + @Composable fun tabs() { pages.forEachIndexed { index, item -> androidx.compose.runtime.key(item) { val selected = item == page val source = remember { MutableInteractionSource() } val focused = source.collectIsFocusedAsState().value - val scale by animateFloatAsState(if (selected) 1f else DRAWER_TAB_SIDE_SCALE, motion, label = "tabScale") - val alpha by animateFloatAsState(if (selected) 1f else DRAWER_TAB_SIDE_ALPHA, motion, label = "tabAlpha") + val scale by animateFloatAsState(if (selected || scrolling) 1f else DRAWER_TAB_SIDE_SCALE, motion, label = "tabScale") + val alpha by animateFloatAsState(if (selected || scrolling) 1f else DRAWER_TAB_SIDE_ALPHA, motion, label = "tabAlpha") val glow by animateFloatAsState(if (selected) 1f else 0f, motion, label = "tabGlow") val pageDescription = stringResource(R.string.drawer_page_desc, stringResource(item.title)) val tint by animateColorAsState(if (selected) colors.onBackground else colors.onSurfaceVariant, Motion.tw(340, easing = FastOutSlowInEasing), label = "tabTint") @@ -913,7 +926,7 @@ private fun DrawerPageTabs(page: SessionDrawerPage, pages: List<SessionDrawerPag Box( contentAlignment = Alignment.Center, modifier = Modifier - .offset(x = ((index - middle) * spacing + lean).dp) + .then(if (scrolling) Modifier else Modifier.offset(x = ((index - middle) * spacing + lean).dp)) .size(tab.dp) .graphicsLayer { scaleX = scale; scaleY = scale; this.alpha = alpha } .clip(RoundedCornerShape(16.dp)) @@ -933,6 +946,9 @@ private fun DrawerPageTabs(page: SessionDrawerPage, pages: List<SessionDrawerPag } } } + } + if (scrolling) Row(Modifier.fillMaxWidth().horizontalScroll(scroll), horizontalArrangement = Arrangement.spacedBy(4.dp)) { tabs() } + else tabs() } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt index df897161d7..f4c1837888 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -230,6 +230,7 @@ private fun BumperKey(label: String, description: String, onClick: () -> Unit) { } val LocalChipMinWidth = androidx.compose.runtime.compositionLocalOf { 150.dp } +internal val LocalCompactSettings = androidx.compose.runtime.compositionLocalOf { false } class MenuHost { var open by mutableStateOf<String?>(null) @@ -389,6 +390,7 @@ fun MenuItem( @Composable fun ValueChip(text: String, open: Boolean, enabled: Boolean = true, modifier: Modifier = Modifier, onClick: () -> Unit) { + val compact = LocalCompactSettings.current val colors = MaterialTheme.colorScheme val src = remember { MutableInteractionSource() } val hot = src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value @@ -405,13 +407,15 @@ fun ValueChip(text: String, open: Boolean, enabled: Boolean = true, modifier: Mo .alpha(if (enabled) 1f else 0.5f) .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, enabled = enabled, onClick = onClick) .controllerConfirm(enabled = enabled, onClick = onClick) - .padding(horizontal = 12.dp, vertical = 8.dp), + .padding(horizontal = if (compact) 10.dp else 12.dp, vertical = if (compact) 6.dp else 8.dp), ) { AnimatedContent( targetState = text, transitionSpec = { (fadeIn(Motion.tw(260)) + slideInVertically(Motion.tw(260)) { it / 2 }) togetherWith (fadeOut(Motion.tw(160)) + slideOutVertically(Motion.tw(160)) { -it / 2 }) }, label = "chipText", - ) { t -> Text(t, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) } + ) { t -> Text(t, fontSize = if (compact) 12.sp else 13.sp, + lineHeight = if (compact) 16.sp else androidx.compose.ui.unit.TextUnit.Unspecified, + fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) } Spacer(Modifier.width(8.dp)) Text("▾", fontSize = 10.sp, color = colors.onSurfaceVariant, modifier = Modifier.rotate(rot)) } @@ -419,15 +423,16 @@ fun ValueChip(text: String, open: Boolean, enabled: Boolean = true, modifier: Mo @Composable fun SettingsGroup(title: String, compact: Boolean = false, content: @Composable ColumnScope.() -> Unit) { + val tight = compact || LocalCompactSettings.current val colors = MaterialTheme.colorScheme val pal = LocalPalette.current Column(Modifier.fillMaxWidth().sheetPiece()) { Row( verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(if (compact) 6.dp else 10.dp), - modifier = Modifier.fillMaxWidth().padding(top = if (compact) 4.dp else 16.dp, bottom = if (compact) 3.dp else 6.dp), + horizontalArrangement = Arrangement.spacedBy(if (tight) 6.dp else 10.dp), + modifier = Modifier.fillMaxWidth().padding(top = if (tight) 4.dp else 16.dp, bottom = if (tight) 3.dp else 6.dp), ) { - Text(title.uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, color = colors.onSurfaceVariant) + Text(title.uppercase(), fontSize = if (tight) 11.sp else 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, color = colors.onSurfaceVariant) Box(modifier = Modifier.weight(1f).height(1.dp).background(pal.line)) } Column(modifier = Modifier.fillMaxWidth().clip(GroupShape).background(colors.surface).border(1.dp, pal.line, GroupShape)) { content() } @@ -436,19 +441,34 @@ fun SettingsGroup(title: String, compact: Boolean = false, content: @Composable @Composable fun SettingsRow(label: String, hint: String?, highlighted: Boolean = false, hintLines: Int? = null, stacked: Boolean = false, control: @Composable () -> Unit) { + val compact = LocalCompactSettings.current val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val bg by animateColorAsState(if (highlighted) pal.signal.copy(alpha = 0.10f) else Color.Transparent, Motion.tw(200), label = "rowBg") val hintText: @Composable (androidx.compose.ui.unit.TextUnit) -> Unit = { size -> Text(hint ?: "", fontSize = size, color = colors.onSurfaceVariant, modifier = Modifier.padding(top = 2.dp), + lineHeight = if (compact) 14.sp else androidx.compose.ui.unit.TextUnit.Unspecified, minLines = hintLines ?: 1, maxLines = hintLines ?: Int.MAX_VALUE, overflow = TextOverflow.Ellipsis) } - if (stacked || LocalNarrowPane.current) Column( - modifier = Modifier.fillMaxWidth().background(bg).padding(start = 14.dp, end = 14.dp, top = 11.dp, bottom = 12.dp), + if (compact && !stacked) Column( + modifier = Modifier.fillMaxWidth().background(bg).padding(horizontal = 10.dp, vertical = 6.dp), ) { - Text(label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) - if (hint != null || hintLines != null) hintText(13.sp) - Box(Modifier.padding(top = 8.dp)) { control() } + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Text(label, fontSize = 13.sp, lineHeight = 16.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + modifier = Modifier.weight(1f)) + control() + } + if (hint != null || hintLines != null) hintText(11.sp) + } else if (stacked || LocalNarrowPane.current) Column( + modifier = Modifier.fillMaxWidth().background(bg).padding( + horizontal = if (compact) 10.dp else 14.dp, + vertical = if (compact) 6.dp else 12.dp), + ) { + Text(label, fontSize = if (compact) 13.sp else 15.sp, + lineHeight = if (compact) 16.sp else androidx.compose.ui.unit.TextUnit.Unspecified, + fontWeight = FontWeight.SemiBold, color = colors.onBackground) + if (hint != null || hintLines != null) hintText(if (compact) 11.sp else 13.sp) + Box(Modifier.padding(top = if (compact) 6.dp else 8.dp)) { control() } } else Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().background(bg).padding(horizontal = 14.dp, vertical = 11.dp), @@ -561,6 +581,7 @@ fun ValueSlider( value: Int, range: IntRange, step: Int, enabled: Boolean, label: String?, format: (Int) -> String, modifier: Modifier = Modifier, onChange: (Int) -> Unit, ) { + val compact = LocalCompactSettings.current val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val source = remember { MutableInteractionSource() } @@ -581,7 +602,7 @@ fun ValueSlider( } } Column( - modifier = modifier.fillMaxWidth().heightIn(min = 72.dp) + modifier = modifier.fillMaxWidth().heightIn(min = if (compact) 64.dp else 72.dp) .clip(shape).background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) .glideBorder(hot, shape, pal.signal) .alpha(if (enabled) 1f else 0.5f) @@ -610,10 +631,10 @@ fun ValueSlider( .padding(horizontal = 8.dp, vertical = 6.dp), ) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { - if (label != null) Text(label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, + if (label != null) Text(label, fontSize = if (compact) 13.sp else 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, modifier = Modifier.weight(1f)) else Spacer(Modifier.weight(1f)) - Text(text, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1) + Text(text, fontSize = if (compact) 12.sp else 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1) } Canvas( Modifier.fillMaxWidth().height(40.dp).onSizeChanged { trackPx = it.width } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 81d0ad94d2..6b598b8c25 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -832,8 +832,8 @@ <string name="setup_launcher_orientation">Launcher orientation</string> <string name="setup_launcher_orientation_auto">Follow device rotation</string> <string name="setup_orientation_portrait">Portrait</string> - <string name="setup_session_orientation">Game and desktop orientation</string> - <string name="setup_session_orientation_hint">Applies to Steam, games, desktop, and the controller editor.</string> + <string name="setup_session_orientation">Session orientation</string> + <string name="setup_session_orientation_hint">Applies to Steam, games, desktop, and the controller editor. Resolution presets rotate with the session; custom width and height stay as entered.</string> <string name="setup_orientation_auto">Automatic landscape</string> <string name="setup_orientation_landscape">Landscape</string> <string name="setup_orientation_reverse">Reverse landscape</string> @@ -1251,10 +1251,10 @@ <string name="game_env_eyebrow">Proton games</string> <string name="pip_title">Picture in picture</string> <string name="pip_auto">Automatically enter PiP</string> - <string name="unfolded_controls">Controls on the unfolded screen</string> - <string name="unfolded_controls_hint">Unfolded, the game sits above the Steam Deck trackpads and back grips. Folded, the game is full screen.</string> + <string name="unfolded_controls">Controls below the game</string> + <string name="unfolded_controls_hint">In portrait or on an unfolded screen, place a landscape game above the touch controls.</string> <string name="unfolded_controls_with_controller">Keep them with a controller</string> - <string name="unfolded_controls_with_controller_hint">Also show the unfolded controls while a controller is connected, for controllers that hold the phone.</string> + <string name="unfolded_controls_with_controller_hint">Also show these touch controls while a controller is connected.</string> <string name="pip_suspended">Suspended</string> <string name="pip_not_ready">Picture in picture is available once the session is ready.</string> <string name="pip_permission">Allow picture in picture for DroidDeck in Android settings.</string> diff --git a/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt b/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt index e694b8b3c7..1801ce756c 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt @@ -21,13 +21,9 @@ class OrientationTest { context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().clear().commit() } - @Test fun landscapeChoicesPersistGloballyAndCanRestoreAutomaticRotation() { + @Test fun sessionChoicesPersistGloballyWithLandscapeAsTheDefault() { assertEquals(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, SessionPrefs.orientation(context)) - for (value in listOf( - ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, - ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE, - ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, - )) { + for ((value, _) in SessionPrefs.orientationOptions) { SessionPrefs.setOrientation(context, value) assertEquals(value, SessionPrefs.orientation(context.createConfigurationContext(context.resources.configuration))) } @@ -35,11 +31,11 @@ class OrientationTest { @Test fun invalidStoredOrientationFallsBackAndInvalidChoicePreservesTheSavedValue() { val prefs = context.getSharedPreferences("session", Context.MODE_PRIVATE) - prefs.edit().putInt("orientation", ActivityInfo.SCREEN_ORIENTATION_PORTRAIT).commit() + prefs.edit().putInt("orientation", 999).commit() assertEquals(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, SessionPrefs.orientation(context)) SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) assertThrows(IllegalArgumentException::class.java) { - SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) + SessionPrefs.setOrientation(context, 999) } assertEquals(ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE, SessionPrefs.orientation(context)) } @@ -54,6 +50,34 @@ class OrientationTest { AppUiPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) assertEquals(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, AppUiPrefs.orientation(context)) + AppUiPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) + SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) + assertEquals(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, AppUiPrefs.orientation(context)) + assertEquals(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, SessionPrefs.orientation(context)) + } + + @Test fun explicitOrientationTakesPriorityOverLargeFollowScreenWindows() { + assertEquals(ActivityInfo.SCREEN_ORIENTATION_USER, SessionPrefs.windowOrientation(context, true, 700)) + assertEquals(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, SessionPrefs.windowOrientation(context, true, 400)) + assertEquals(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, SessionPrefs.windowOrientation(context, false, 700)) + for ((value, _) in SessionPrefs.orientationOptions) { + SessionPrefs.setOrientation(context, value) + assertEquals(value, SessionPrefs.windowOrientation(context, true, 700)) + } + } + + @Test fun sessionPortraitUsesItsOwnLockOrTheCurrentRotation() { + val config = android.content.res.Configuration(context.resources.configuration) + config.orientation = android.content.res.Configuration.ORIENTATION_PORTRAIT + val portrait = context.createConfigurationContext(config) + config.orientation = android.content.res.Configuration.ORIENTATION_LANDSCAPE + val landscape = context.createConfigurationContext(config) + assertFalse(SessionPrefs.portrait(portrait)) + SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) + assertTrue(SessionPrefs.portrait(landscape)) + SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_USER) + assertTrue(SessionPrefs.portrait(portrait)) + assertFalse(SessionPrefs.portrait(landscape)) } @Test fun invalidLauncherOrientationFallsBackAndInvalidChoicePreservesPreference() { diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt index 7962ef6fc8..5d51028b05 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt @@ -4,6 +4,23 @@ import org.junit.Assert.* import org.junit.Test class SessionDisplayTest { + @Test fun portraitPresetsSwapTheOutputAndRetainTheResolutionCap() { + assertEquals(720 to 1280, SessionDisplay.resolveChoice(1920 to 1080, "720p", portrait = true)) + assertEquals(900 to 1600, SessionDisplay.resolveChoice(1080 to 1920, "900p", portrait = true)) + assertEquals(720 to 1280, SessionDisplay.resolveChoice(1440 to 1080, "720p", portrait = true)) + assertEquals(720 to 1600, SessionDisplay.resolveChoice(2400 to 1080, "720p", portrait = true)) + assertEquals(1080 to 1920, SessionDisplay.resolveChoice(1921 to 1081, SessionDisplay.MATCH_SCREEN, portrait = true)) + assertEquals(1080 to 2400, SessionDisplay.resolveChoice(2400 to 1080, SessionDisplay.FOLLOW_SCREEN, portrait = true)) + assertEquals(720 to 1280, SessionDisplay.resolveChoice(1920 to 1080, "invalid", portrait = true)) + } + + @Test fun customDimensionsStayExplicitInEitherOrientation() { + for (portrait in listOf(false, true)) { + assertEquals(1280 to 720, SessionDisplay.resolveChoice(1920 to 1080, "1280x720", portrait)) + assertEquals(720 to 1280, SessionDisplay.resolveChoice(1920 to 1080, "720x1280", portrait)) + } + } + @Test fun fixedSizesAndMatchScreenResolveWithoutAnyAspectSetting() { assertEquals(1280 to 720, SessionDisplay.resolveChoice(1440 to 1080, "1280x720")) assertEquals(1600 to 900, SessionDisplay.resolveChoice(1280 to 720, "1600x900")) @@ -35,6 +52,7 @@ class SessionDisplayTest { } @Test fun unfoldedControlsKeepTheGameSixteenByNineAcrossTheWidth() { + assertEquals(606, SessionDisplay.unfoldedGameHeight(1080, 1920)) assertEquals(1376, SessionDisplay.unfoldedGameHeight(2448, 1848)) assertEquals(1038, SessionDisplay.unfoldedGameHeight(1848, 2448)) assertEquals(864, SessionDisplay.unfoldedGameHeight(1920, 1080)) @@ -67,6 +85,18 @@ class SessionDisplayTest { assertFalse(SessionDisplay.unfoldedControlsWanted(true, true, true, true, true, false, 0, 1848, 700)) } + @Test fun portraitControlsWorkOnHandheldsAndPhonesWithoutAHinge() { + fun wanted(width: Int = 1080, height: Int = 1920, controller: Boolean = false, + keep: Boolean = false, pad: Boolean = true, pip: Boolean = false) = + SessionDisplay.unfoldedControlsWanted(true, false, controller, keep, pad, pip, width, height, 393) + assertTrue(wanted()) + assertFalse(wanted(width = 1920, height = 1080)) + assertFalse(wanted(controller = true)) + assertTrue(wanted(controller = true, keep = true)) + assertFalse(wanted(pad = false)) + assertFalse(wanted(pip = true)) + } + @Test fun followScreenKeepsTheWindowShapeAndSkipsTinyWindows() { assertEquals(2520 to 1080, SessionDisplay.resolveChoice(1080 to 2520, SessionDisplay.FOLLOW_SCREEN)) @@ -75,6 +105,13 @@ class SessionDisplayTest { assertNull(SessionDisplay.followSize(640, 360)) } + @Test fun aPhoneCanFollowTheShortGameAreaAboveItsControls() { + assertNull(SessionDisplay.followSize(720, 404)) + assertEquals(720 to 404, SessionDisplay.followSize(720, 404, controlsBelow = true)) + assertNull(SessionDisplay.followSize(320, 180, controlsBelow = true)) + assertNull(SessionDisplay.followSize(720, 0, controlsBelow = true)) + } + @Test fun resolutionCapsPreserveTheSelectedShapeWithoutExceedingPanelHeight() { assertEquals(1280 to 720, SessionDisplay.resolve(1920 to 1080, 720, SessionPrefs.SHAPE_AUTO)) assertEquals(960 to 720, SessionDisplay.resolve(1440 to 1080, 720, SessionPrefs.SHAPE_EXACT)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt index 03a3243910..de082c7fe9 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt @@ -13,6 +13,16 @@ import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @Config(sdk = [28], manifest = Config.NONE) class SessionScalingPrefsTest { + @Test fun legacyAutomaticResolutionsRemainRotatablePresets() { + val context = RuntimeEnvironment.getApplication() + val prefs = context.getSharedPreferences("session", Context.MODE_PRIVATE) + prefs.edit().putString("shape", SessionPrefs.SHAPE_AUTO).putInt("resolutionCap.steam", 900).commit() + assertEquals("900p", SessionPrefs.resolutionChoice(context, "steam", 1920 to 1080)) + val desktop = SessionPrefs.resolutionChoice(context, "lxqt", 1920 to 1080) + assertEquals("720p", desktop) + assertEquals(720 to 1280, SessionDisplay.resolveChoice(1920 to 1080, desktop, portrait = true)) + } + @Before fun clearSettings() { RuntimeEnvironment.getApplication().getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt index e60f12f444..06f4dedfd7 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt @@ -13,6 +13,9 @@ class GamepadGeometryTest { } private val panels = listOf( + Panel("Thor portrait", 1080, 1920, 369 / 160f), + Panel("720p phone portrait", 720, 1280, 2f), + Panel("Phone portrait", 1080, 2400, 2.75f), Panel("Fold 8 upright", 1848, 2448, 2.625f), Panel("Fold 8 as a tablet", 2448, 1848, 2.625f), Panel("Pixel Fold upright", 1840, 2208, 2.625f), @@ -26,10 +29,15 @@ class GamepadGeometryTest { private fun boxes(panel: Panel) = GamepadGeometry.layout(panel.width.toFloat(), panel.controlsHeight.toFloat(), panel.density) + private val grips = setOf(Slot.L4, Slot.L5, Slot.R5, Slot.R4) + private val portraitPanels get() = panels.take(3) + Panel("312dp phone portrait", 720, 1280, 369 / 160f) + private fun portraitBoxes(panel: Panel) = + GamepadGeometry.layout(panel.width.toFloat(), panel.controlsHeight.toFloat(), panel.density, portraitDock = true) + @Test fun everyControlIsPlacedAndPanelsOnlyWhenUpright() { for (panel in panels) { val upright = panel.height > panel.width - val expected = Slot.values().toSet() - if (upright) emptySet() else setOf(Slot.PANELS) + val expected = Slot.values().toSet() - grips - if (upright) emptySet() else setOf(Slot.PANELS) assertEquals(panel.name, expected, boxes(panel).keys) } } @@ -81,4 +89,56 @@ class GamepadGeometryTest { assertTrue(panel.name, before(Slot.STEAM, Slot.QAM)) } } + + @Test fun portraitDockPlacesAllControlsWithinThePanel() { + for (panel in portraitPanels) { + val b = portraitBoxes(panel) + assertEquals(panel.name, Slot.values().toSet(), b.keys) + for ((slot, box) in b) { + val where = "${panel.name}: $slot $box" + assertTrue(where, box.left >= 0f && box.top >= 0f) + assertTrue(where, box.right <= panel.width && box.bottom <= panel.controlsHeight) + assertTrue(where, box.width >= 44 * panel.density - 1 && box.height >= 44 * panel.density - 1) + } + } + } + + @Test fun portraitDockControlsDoNotOverlap() { + for (panel in portraitPanels) { + val placed = portraitBoxes(panel).entries.toList() + for (i in placed.indices) for (j in i + 1 until placed.size) { + assertFalse("${panel.name}: ${placed[i].key} overlaps ${placed[j].key}", + placed[i].value.overlaps(placed[j].value)) + } + } + } + + @Test fun portraitDockUsesMoreSpaceForTheThumbSurfaces() { + for (panel in portraitPanels) { + val old = boxes(panel) + val b = portraitBoxes(panel) + for (slot in listOf(Slot.LEFT_MAIN, Slot.RIGHT_MAIN, Slot.LEFT_SECOND, Slot.RIGHT_SECOND)) { + assertTrue("${panel.name}: $slot", b.getValue(slot).width >= old.getValue(slot).width * 1.2f) + } + assertEquals(panel.name, b.getValue(Slot.LEFT_MAIN).cx, b.getValue(Slot.LEFT_SECOND).cx, 0.5f) + assertEquals(panel.name, panel.width - b.getValue(Slot.LEFT_MAIN).cx, b.getValue(Slot.RIGHT_MAIN).cx, 0.5f) + } + } + + @Test fun portraitDockMovesUtilitiesAndGripsAboveTheGamepad() { + for (panel in portraitPanels) { + val b = portraitBoxes(panel) + assertEquals(panel.name, 8 * panel.density, b.getValue(Slot.VIEW).top, 0.5f) + assertTrue(panel.name, b.getValue(Slot.MENU).bottom < b.getValue(Slot.L4).top) + assertTrue(panel.name, b.getValue(Slot.L4).bottom < b.getValue(Slot.LEFT_OUTER_SHOULDER).top) + assertTrue(panel.name, b.getValue(Slot.LEFT_OUTER_SHOULDER).bottom < b.getValue(Slot.LEFT_SECOND).top) + } + } + + @Test fun shortPanelsKeepTheExistingLayoutEvenWhenPortraitDockIsRequested() { + for ((width, height, density) in listOf(Triple(1920f, 1080f, 2f), Triple(720f, 600f, 2.3f))) { + assertEquals(GamepadGeometry.layout(width, height, density), + GamepadGeometry.layout(width, height, density, portraitDock = true)) + } + } } From 1f60e57749e30baff0652a8643b55efcdbc5eb7b Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 11:26:16 -0400 Subject: [PATCH 081/135] fix: time the HUD graph from the game's frames as shown on screen --- app/src/main/cpp/waylandcomp/src/compositor.c | 55 ++++++++++++++++++- .../cpp/waylandcomp/src/waylandcomp_jni.c | 15 +++++ .../com/droiddeck/launcher/session/PerfHud.kt | 47 +++++++--------- .../droiddeck/launcher/ui/SessionLoading.kt | 3 +- .../launcher/wayland/WaylandCompositor.java | 2 + .../launcher/session/PerfHudGraphTest.kt | 18 ++++++ 6 files changed, 110 insertions(+), 30 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/PerfHudGraphTest.kt diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 256d8f6593..dd1dfa64fa 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -634,6 +634,49 @@ static struct surface *g_hud_surface, *g_hud_shm; static int64_t g_hud_shm_ns; static int64_t g_hud_last_ns, g_hud_alive_ns; static int g_hud_fresh; +static int g_hud_new; +#define HUD_TIMES 256 +static pthread_mutex_t g_hud_times_lock = PTHREAD_MUTEX_INITIALIZER; +static float g_hud_times[HUD_TIMES]; +static int64_t g_hud_times_total, g_hud_shown_ns; + +static void hud_frame_shown(int64_t t) { + const int64_t previous = g_hud_shown_ns; + g_hud_shown_ns = t; + if (!previous || t <= previous) return; + pthread_mutex_lock(&g_hud_times_lock); + g_hud_times[g_hud_times_total % HUD_TIMES] = (float)((t - previous) / 1e6); + g_hud_times_total++; + pthread_mutex_unlock(&g_hud_times_lock); +} + +static int inside_surface(const struct surface *s, const struct surface *ancestor) { + int depth = 0; + for (s = s->parent; s && depth++ < 8; s = s->parent) + if (s == ancestor) return 1; + return 0; +} + +static int below_surface(const struct surface *s, const struct surface *other) { + if (inside_surface(other, s)) return 1; + if (!s->parent || s->parent != other->parent) return 0; + const struct surface *child; + wl_list_for_each(child, &s->parent->children, child_link) { + if (child == s) return 1; + if (child == other) return 0; + } + return 0; +} + +int droiddeck_hud_frame_times(float *out, int len, int64_t *total) { + pthread_mutex_lock(&g_hud_times_lock); + *total = g_hud_times_total; + int64_t n = *total < len ? *total : len; + if (n > HUD_TIMES) n = HUD_TIMES; + for (int64_t i = 0; i < n; i++) out[i] = g_hud_times[(*total - n + i) % HUD_TIMES]; + pthread_mutex_unlock(&g_hud_times_lock); + return (int)n; +} static uint64_t g_game_frames; extern void droiddeck_on_game_surface(const char *window, const char *gpu); extern void droiddeck_on_game_frame(void); @@ -684,6 +727,7 @@ static void take_shm(struct surface *s, struct wl_shm_buffer *shm, struct wl_res if (top->role == ROLE_TOPLEVEL && top->mapped && shown * 2 >= (int64_t)scene_w * scene_h) { g_hud_shm = s; g_hud_shm_ns = now; + g_hud_new = 1; droiddeck_on_game_frame(); } } @@ -757,8 +801,9 @@ static void take_dmabuf(struct surface *s, struct dmabuf_buffer *b, struct wl_re name, b->width, b->height, (unsigned long long)b->modifier); } if (s != g_hud_surface && (b->img || ahb_swapchain_has_ahb(b)) && - (!g_hud_surface || now_ns() - g_hud_alive_ns > 1000000000LL || - (announced_now && (int64_t)b->width * b->height >= (int64_t)g_hud_surface->buf_w * g_hud_surface->buf_h))) { + (!g_hud_surface || now_ns() - g_hud_alive_ns > 1000000000LL || (!repeat && below_surface(s, g_hud_surface)) || + (announced_now && !below_surface(g_hud_surface, s) && + (int64_t)b->width * b->height >= (int64_t)g_hud_surface->buf_w * g_hud_surface->buf_h))) { char name[160]; describe(s, name, sizeof(name)); g_hud_surface = s; @@ -782,7 +827,7 @@ static void take_dmabuf(struct surface *s, struct dmabuf_buffer *b, struct wl_re } if (s == g_hud_surface) { g_hud_alive_ns = now_ns(); - if (!repeat) { g_hud_last_ns = g_hud_alive_ns; g_hud_fresh = 1; g_game_frames++; droiddeck_on_game_frame(); } + if (!repeat) { g_hud_last_ns = g_hud_alive_ns; g_hud_fresh = 1; g_hud_new = 1; g_game_frames++; droiddeck_on_game_frame(); } } } @@ -2180,6 +2225,10 @@ static void render_scene(void) { if (rendered) { int64_t t = presented_ns(t_scene); g_stat_frames++; + if (g_hud_new) { + g_hud_new = 0; + hud_frame_shown(t); + } wl_list_for_each(s, &g_surfaces, link) { if (s->drawn) feedback_present_all(&s->feedback, t); else feedback_discard_all(&s->feedback); diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c index e6bb03027c..675d4ac2ce 100644 --- a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c +++ b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c @@ -25,6 +25,7 @@ extern void droiddeck_wayland_send_pointer(int action, int x, int y); extern void droiddeck_wayland_send_touch(int action, int pointer_id, int x, int y); extern int droiddeck_cursor_snapshot(int *out, int cap); extern int droiddeck_cursor_serial(void); +extern int droiddeck_hud_frame_times(float *out, int len, int64_t *total); extern void droiddeck_wayland_send_key(int evdev, int state); extern void droiddeck_wayland_send_scene_input(int type, int a, int b); extern void droiddeck_wayland_vsync(int64_t frame_time_ns); @@ -268,6 +269,20 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeCursorSnapshot( return n; } +JNIEXPORT jlong JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeHudFrameTimes(JNIEnv *env, jclass clazz, jfloatArray out) { + (void)clazz; + if (!out) return 0; + jint cap = (*env)->GetArrayLength(env, out); + float *buf = cap > 0 ? malloc(sizeof(float) * (size_t)cap) : NULL; + if (!buf) return 0; + int64_t total = 0; + int n = droiddeck_hud_frame_times(buf, cap, &total); + if (n > 0) (*env)->SetFloatArrayRegion(env, out, 0, n, buf); + free(buf); + return (jlong)total; +} + JNIEXPORT jint JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeCursorSerial(JNIEnv *env, jclass clazz) { (void)env; (void)clazz; diff --git a/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt b/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt index 3829d9a258..6453f65f9c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt @@ -18,7 +18,6 @@ import com.droiddeck.launcher.wayland.WaylandCompositor import java.io.File import java.util.Locale import java.util.concurrent.atomic.AtomicInteger -import java.util.concurrent.atomic.AtomicLong class PerfHud(context: Context) { var text by mutableStateOf("") @@ -32,9 +31,9 @@ class PerfHud(context: Context) { private var lastFps = 0f private var running = false private val handler = Handler(Looper.getMainLooper()) - private val intervals = FloatArray(GRAPH) - private val graphWrite = AtomicInteger() - private val lastFrameNs = AtomicLong() + private val samples = FloatArray(GRAPH) + private var graphBase = 0L + private var graphSeen = 0L @Volatile private var showFps = true @Volatile private var showBattery = true @@ -59,14 +58,6 @@ class PerfHud(context: Context) { } override fun onGameFrame() { frames.incrementAndGet() - if (!showGraph) return - val now = System.nanoTime() - val previous = lastFrameNs.getAndSet(now) - if (previous == 0L) return - val ms = ((now - previous) / 1_000_000f).coerceIn(0f, 50f) - val slot = graphWrite.get() - intervals[slot and (GRAPH - 1)] = ms - graphWrite.compareAndSet(slot, slot + 1) } } @@ -100,9 +91,9 @@ class PerfHud(context: Context) { if (!enabled || !anyPart || running) return running = true lastTick = SystemClock.elapsedRealtime() - lastFrameNs.set(0L) frames.set(0) - graphWrite.set(0) + graphBase = shownTotal() + graphSeen = graphBase WaylandCompositor.setGameListener(listener) handler.postDelayed(tick, TICK_MS) } @@ -135,23 +126,19 @@ class PerfHud(context: Context) { return sticky.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0) } + private fun shownTotal(): Long = try { WaylandCompositor.nativeHudFrameTimes(samples) } catch (t: Throwable) { 0L } + private fun clearGraph() { - lastFrameNs.set(0L) - graphWrite.set(0) + graphBase = shownTotal() + graphSeen = graphBase if (graph.isNotEmpty()) graph = FloatArray(0) } private fun publishGraph() { - val count = graphWrite.get() - val shown = minOf(count, GRAPH) - if (shown < 2) { - graph = FloatArray(0) - return - } - val out = FloatArray(shown) - val start = count - shown - for (i in 0 until shown) out[i] = intervals[(start + i) and (GRAPH - 1)] - graph = out + val total = shownTotal() + if (total == graphSeen && graph.isNotEmpty()) return + graphSeen = total + graph = recent(samples, total, graphBase) } private fun line(base: Float): String { @@ -176,6 +163,14 @@ class PerfHud(context: Context) { companion object { private const val TICK_MS = 1_000L private const val GRAPH = 128 + internal const val GRAPH_MAX_MS = 50f + + internal fun recent(samples: FloatArray, total: Long, base: Long): FloatArray { + val filled = minOf(total, samples.size.toLong()).toInt() + val shown = minOf(filled.toLong(), (total - base).coerceAtLeast(0L)).toInt() + if (shown < 2) return FloatArray(0) + return FloatArray(shown) { samples[filled - shown + it].coerceIn(0f, GRAPH_MAX_MS) } + } internal fun batteryCelsius(deci: Int): String? = if (deci <= 0) null else String.format(Locale.US, "%.1f°C", deci / 10f) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt index 9e5266b67e..f3dfbcf82d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt @@ -18,6 +18,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.semantics.Role import com.droiddeck.launcher.frontend.Library import com.droiddeck.launcher.session.LoadingState +import com.droiddeck.launcher.session.PerfHud import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import androidx.compose.animation.core.FastOutSlowInEasing @@ -116,7 +117,7 @@ fun HudText(text: String, graph: FloatArray = FloatArray(0), color: String = "mi @Composable private fun HudGraph(samples: FloatArray, accent: Color, wash: Float) { Canvas(Modifier.width(148.dp).height(44.dp)) { - val maxMs = (samples.maxOrNull() ?: 16.7f).coerceAtLeast(16.7f) + val maxMs = PerfHud.GRAPH_MAX_MS val step = size.width / (samples.size - 1) fun yOf(ms: Float) = size.height * (1f - (ms / maxMs).coerceIn(0f, 1f)) val fillAlpha = wash * 0.5f 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 4111cea2ce..206b182805 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -307,6 +307,8 @@ public final class WaylandCompositor { public static native float[] nativeFrameGenStats(); + public static native long nativeHudFrameTimes(float[] out); + /** Stream mode: the scene is the Xbox Cloud Gaming native player's picture, handed over frame by frame. */ public static native void nativeStreamMode(boolean on); diff --git a/app/src/test/java/com/droiddeck/launcher/session/PerfHudGraphTest.kt b/app/src/test/java/com/droiddeck/launcher/session/PerfHudGraphTest.kt new file mode 100644 index 0000000000..bf607d3678 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/PerfHudGraphTest.kt @@ -0,0 +1,18 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertArrayEquals +import org.junit.Assert.assertEquals +import org.junit.Test + +class PerfHudGraphTest { + @Test fun theGraphShowsOnlyFramesFromThisHudRun() { + val samples = floatArrayOf(9f, 9f, 9f, 9f, 9f, 16.7f, 33.4f, 16.6f) + assertArrayEquals(floatArrayOf(16.7f, 33.4f, 16.6f), PerfHud.recent(samples, 105, 102), 0f) + assertEquals(0, PerfHud.recent(samples, 103, 102).size) + } + + @Test fun anEarlySessionShowsWhatWasShownSoFar() { + val samples = floatArrayOf(16.6f, 16.7f, 120f, 0f, 0f, 0f) + assertArrayEquals(floatArrayOf(16.6f, 16.7f, 50f), PerfHud.recent(samples, 3, 0), 0f) + } +} From 9b68b33e73228c08cee2802d51cb4fa55027ad34 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 11:45:34 -0400 Subject: [PATCH 082/135] fix: pick the HUD surface by the scene's draw order --- app/src/main/cpp/waylandcomp/src/compositor.c | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index dd1dfa64fa..02477724be 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -650,22 +650,30 @@ static void hud_frame_shown(int64_t t) { pthread_mutex_unlock(&g_hud_times_lock); } -static int inside_surface(const struct surface *s, const struct surface *ancestor) { - int depth = 0; - for (s = s->parent; s && depth++ < 8; s = s->parent) - if (s == ancestor) return 1; +static int tree_rank(const struct surface *s, const struct surface *want, int *rank, int depth) { + const struct surface *c; + if (depth > 8) return 0; + wl_list_for_each(c, &s->children, child_link) + if (c->below_parent && tree_rank(c, want, rank, depth + 1)) return 1; + if (s == want) return 1; + (*rank)++; + wl_list_for_each(c, &s->children, child_link) + if (!c->below_parent && tree_rank(c, want, rank, depth + 1)) return 1; return 0; } +static int render_rank(const struct surface *want) { + const struct surface *s; + int rank = 0; + if (g_desktop && tree_rank(g_desktop, want, &rank, 0)) return rank; + wl_list_for_each(s, &g_toplevels, toplevel_link) + if (tree_rank(s, want, &rank, 0)) return rank; + return -1; +} + static int below_surface(const struct surface *s, const struct surface *other) { - if (inside_surface(other, s)) return 1; - if (!s->parent || s->parent != other->parent) return 0; - const struct surface *child; - wl_list_for_each(child, &s->parent->children, child_link) { - if (child == s) return 1; - if (child == other) return 0; - } - return 0; + const int a = render_rank(s), b = render_rank(other); + return a >= 0 && b >= 0 && a < b; } int droiddeck_hud_frame_times(float *out, int len, int64_t *total) { From 6a5dfe14864c9d0658710d7e0899bfdfedfc1ae6 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 12:32:35 -0400 Subject: [PATCH 083/135] feat(steam): sync QAM brightness and volume with Android --- app/src/main/AndroidManifest.xml | 2 + .../launcher/audio/PulseAudioComponent.java | 7 +- .../runtime/DeviceControlsComponent.kt | 177 ++++++++++++++++++ .../launcher/runtime/LinuxRuntime.java | 1 + .../launcher/session/SessionService.kt | 4 + .../runtime/DeviceControlsComponentTest.kt | 120 ++++++++++++ tools/aaudio-sink/android-volume.h | 96 ++++++++++ tools/aaudio-sink/module-aaudio-sink.c | 10 + .../sink/module-directaudio-native-sink.c | 10 + .../usr/local/bin/droiddeck-steam-compat | 73 +++++++- tools/tests/test_device_controls.py | 82 ++++++++ 11 files changed, 575 insertions(+), 7 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt create mode 100644 tools/aaudio-sink/android-volume.h create mode 100644 tools/tests/test_device_controls.py diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1ce7b0ac73..6336fb1325 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,8 @@ <uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" /> <uses-permission android:name="android.permission.RECORD_AUDIO" /> + <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> + <uses-permission android:name="android.permission.WRITE_SETTINGS" /> <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.CAMERA" /> diff --git a/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java b/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java index 3b73b6a3c9..32d5f5189e 100644 --- a/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java +++ b/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java @@ -26,6 +26,7 @@ public class PulseAudioComponent extends SessionPart { private final File workingDir; + private final File deviceControls; private File logFile; private final String micFifoPath; private volatile int pid = -1; @@ -36,6 +37,8 @@ public class PulseAudioComponent extends SessionPart { public PulseAudioComponent(Context context, String micFifoPath) { this.workingDir = new File(context.getFilesDir(), "pulseaudio"); + this.deviceControls = com.droiddeck.launcher.runtime.DeviceControlsComponent.directory( + com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context)); this.micFifoPath = micFifoPath; } @@ -94,7 +97,7 @@ public class PulseAudioComponent extends SessionPart { config.add("load-module module-native-protocol-unix auth-anonymous=1 auth-cookie-enabled=0 socket=\"" + socket().getAbsolutePath() + "\""); config.add(".nofail"); - config.add("load-module module-directaudio-native-sink sink_name=DirectAudio performance_mode=1 adaptive=1 decay=0 limiter=1 watchdog=1 volume=1.0"); + config.add("load-module module-directaudio-native-sink sink_name=DirectAudio performance_mode=1 adaptive=1 decay=0 limiter=1 watchdog=1 volume=1.0 control_dir=" + deviceControls); config.add("set-default-sink DirectAudio"); config.add(".fail"); if (micFifoPath != null && !micFifoPath.isEmpty()) { @@ -139,7 +142,7 @@ public class PulseAudioComponent extends SessionPart { } else if (sinks.contains("\tDirectAudio\t") || sinks.startsWith("DirectAudio\t") || sinks.contains("\tDirectAudio\n") || sinks.matches("(?s).*\\bDirectAudio\\b.*")) { line = "== client sink: DirectAudio (module-directaudio-native-sink)"; } else { - boolean loaded = pactl("load-module", "module-aaudio-sink", "sink_name=AAudioSink", "performance_mode=1", "adaptive=1", "volume=1.0") != null + boolean loaded = pactl("load-module", "module-aaudio-sink", "sink_name=AAudioSink", "performance_mode=1", "adaptive=1", "volume=1.0", "control_dir=" + deviceControls) != null && pactl("set-default-sink", "AAudioSink") != null; line = loaded ? "== client sink: DirectAudio did not come up; FALLBACK to the plain AAudio sink (AAudioSink)" : "== client sink: DirectAudio did not come up and the AAudio fallback failed too - no client sound"; diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt new file mode 100644 index 0000000000..c88666dfb5 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt @@ -0,0 +1,177 @@ +package com.droiddeck.launcher.runtime + +import android.content.Context +import android.content.Intent +import android.database.ContentObserver +import android.media.AudioManager +import android.net.Uri +import android.os.FileObserver +import android.os.Handler +import android.os.Looper +import android.os.SystemClock +import android.provider.Settings +import android.util.Log +import com.droiddeck.launcher.core.SessionPart +import java.io.File +import java.nio.file.Files +import java.nio.file.StandardCopyOption +import org.json.JSONObject +import kotlin.math.roundToInt + +class DeviceControlsComponent(context: Context, root: File) : SessionPart() { + private val context = context.applicationContext + private val audio = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager + private val directory = directory(root) + private val handler = Handler(Looper.getMainLooper()) + private var running = false + private var pendingBrightness: Pair<Float, Long>? = null + private var permissionRequestAt = -5_000L + private var previous = "" + private var revision = 0L + init { prepareBacklight(context, root) } + private val observer = object : ContentObserver(handler) { + override fun onChange(selfChange: Boolean) { if (running) publish() } + } + private val requests = object : FileObserver(directory.path, CLOSE_WRITE or MOVED_TO) { + override fun onEvent(event: Int, path: String?) { + if (path in REQUESTS) handler.post { if (running) consume() } + } + } + private val refresh = object : Runnable { + override fun run() { + if (!running) return + consume() + pendingBrightness?.let { (value, time) -> + if (SystemClock.elapsedRealtime() - time > 120_000) pendingBrightness = null + else if (Settings.System.canWrite(context)) { + pendingBrightness = null + brightness(value) + } + } + publish() + handler.postDelayed(this, 250) + } + } + + fun publish(force: Boolean = false) { + try { + directory.mkdirs() + val level = audio.getStreamVolume(AudioManager.STREAM_MUSIC) + val maximum = audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC).coerceAtLeast(1) + val muted = audio.isStreamMute(AudioManager.STREAM_MUSIC) + write("volume.state", "$level $maximum ${if (muted) 1 else 0}\n") + val value = Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS, 128) + write("backlight/droiddeck/brightness", "$value\n") + write("backlight/droiddeck/actual_brightness", "$value\n") + val state = JSONObject().put("brightness", (value.coerceIn(1, 255) - 1) / 254.0) + .put("brightnessWritable", Settings.System.canWrite(context)).toString() + if (force || state != previous) { + write("state.json", JSONObject(state).put("revision", ++revision).toString()) + previous = state + } + } catch (e: Exception) { + Log.w(TAG, "Could not publish Android controls", e) + } + } + + override fun start() { + handler.post { + REQUESTS.forEach { + File(directory, it).delete() + File(directory, "$it.processing").delete() + } + running = true + context.contentResolver.registerContentObserver(Settings.System.CONTENT_URI, true, observer) + requests.startWatching() + refresh.run() + } + } + + override fun stop() { + handler.post { + running = false + handler.removeCallbacks(refresh) + requests.stopWatching() + context.contentResolver.unregisterContentObserver(observer) + pendingBrightness = null + } + } + + private fun consume() { + for (name in REQUESTS) { + val file = File(directory, name) + if (!file.isFile) continue + val claimed = File(directory, "$name.processing") + try { + Files.move(file.toPath(), claimed.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE) + if (claimed.length() > 64) continue + val text = claimed.readText().trim() + when (name) { + "brightness.request" -> text.toFloatOrNull()?.takeIf { it.isFinite() && it in 0f..1f }?.let(::brightness) + "volume.request" -> text.toIntOrNull()?.let { + audio.setStreamVolume(AudioManager.STREAM_MUSIC, + it.coerceIn(0, audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC)), 0) + } + "mute.request" -> if (text == "0" || text == "1") { + audio.adjustStreamVolume(AudioManager.STREAM_MUSIC, + if (text == "1") AudioManager.ADJUST_MUTE else AudioManager.ADJUST_UNMUTE, 0) + } + } + } catch (e: Exception) { + Log.w(TAG, "Could not apply $name", e) + } finally { + publish(force = true) + claimed.delete() + } + } + } + + private fun brightness(value: Float) { + if (!Settings.System.canWrite(context)) { + pendingBrightness = value to SystemClock.elapsedRealtime() + val now = SystemClock.elapsedRealtime() + if (now - permissionRequestAt >= 5_000) { + permissionRequestAt = now + try { + context.startActivity(Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS, + Uri.parse("package:${context.packageName}")).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + } catch (e: Exception) { + Log.w(TAG, "Could not open brightness permission", e) + } + } + return + } + val level = 1 + (value * 254).roundToInt() + try { + Settings.System.putInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS_MODE, + Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL) + Settings.System.putInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS, level) + } catch (e: SecurityException) { + Log.w(TAG, "Brightness permission was revoked", e) + } + } + + private fun write(name: String, text: String) { + val file = File(directory, name) + if (file.isFile && file.readText() == text) return + val staged = File(directory, "$name.tmp") + staged.writeText(text) + Files.move(staged.toPath(), file.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE) + } + + companion object { + private const val TAG = "DeviceControls" + private val REQUESTS = setOf("brightness.request", "volume.request", "mute.request") + @JvmStatic fun directory(root: File) = File(root, "etc/droiddeck-device-controls") + @JvmStatic fun prepareBacklight(context: Context, root: File): File { + val base = File(directory(root), "backlight") + val panel = File(base, "droiddeck").apply { mkdirs() } + val value = Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS, 128) + for ((name, text) in mapOf("type" to "raw", "max_brightness" to "255", "brightness" to "$value", + "actual_brightness" to "$value", "bl_power" to "0", "scale" to "linear")) { + File(panel, name).writeText("$text\n") + } + return base + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java index 6473197549..d02fdf0c2f 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -192,6 +192,7 @@ public final class LinuxRuntime { bind(cmd, "/dev"); bind(cmd, "/proc"); bind(cmd, "/sys"); + bind(cmd, DeviceControlsComponent.prepareBacklight(context, root).getPath() + ":/sys/class/backlight"); bind(cmd, "/dev/urandom:/dev/random"); bind(cmd, "/proc/self/fd:/dev/fd"); bind(cmd, "/proc/self/fd/0:/dev/stdin"); 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 b6f35f96a1..252f94103f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -630,6 +630,10 @@ class SessionService : Service() { networkLink.attach(this) networkLink.publish() components.add(networkLink) + val deviceControls = com.droiddeck.launcher.runtime.DeviceControlsComponent(this, root) + deviceControls.attach(this) + deviceControls.publish() + components.add(deviceControls) if (gen != sessionGen || !SessionState.running) { Log.i(TAG, "session stopped while it was starting; not launching it") if (gen == sessionGen) components.clear() diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt new file mode 100644 index 0000000000..9e0da30aa7 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt @@ -0,0 +1,120 @@ +package com.droiddeck.launcher.runtime + +import android.app.Application +import android.content.Context +import android.media.AudioManager +import android.os.Looper +import android.provider.Settings +import java.io.File +import java.time.Duration +import org.json.JSONObject +import org.junit.After +import org.junit.Assert.* +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.annotation.Implements +import org.robolectric.annotation.Implementation +import org.robolectric.shadows.ShadowSettings + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE, application = Application::class, shadows = [WriteSettingsShadow::class]) +class DeviceControlsComponentTest { + @get:Rule val tmp = TemporaryFolder() + private val context get() = RuntimeEnvironment.getApplication() + private val audio get() = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager + private lateinit var component: DeviceControlsComponent + private lateinit var directory: File + + @Before fun start() { + WriteSettingsShadow.writable = true + Settings.System.putInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS, 128) + val root = tmp.newFolder() + directory = DeviceControlsComponent.directory(root) + component = DeviceControlsComponent(context, root) + component.publish() + component.start() + shadowOf(Looper.getMainLooper()).idle() + } + + @After fun stop() { + component.stop() + shadowOf(Looper.getMainLooper()).idle() + } + + private fun tick() = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(300)) + private fun request(name: String, text: String) { + File(directory, "$name.request").writeText(text) + tick() + } + + @Test fun androidChangesArePublishedAndRequestsUseDeviceVolumeSteps() { + request("volume", "999") + assertEquals(audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC), audio.getStreamVolume(AudioManager.STREAM_MUSIC)) + audio.setStreamVolume(AudioManager.STREAM_MUSIC, 3, 0) + tick() + assertEquals("3", File(directory, "volume.state").readText().split(" ").first()) + request("volume", "invalid") + assertEquals(3, audio.getStreamVolume(AudioManager.STREAM_MUSIC)) + } + + @Test fun deniedBrightnessIsReadBackAndAppliedOnlyAfterPermission() { + WriteSettingsShadow.writable = false + request("brightness", "0.75") + assertEquals(128, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + assertEquals(Settings.ACTION_MANAGE_WRITE_SETTINGS, shadowOf(context).nextStartedActivity.action) + assertFalse(JSONObject(File(directory, "state.json").readText()).getBoolean("brightnessWritable")) + WriteSettingsShadow.writable = true + tick() + assertEquals(192, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + } + + @Test fun brightnessIsBoundedAndExternalChangesAreReadBack() { + for (invalid in listOf("NaN", "Infinity", "-0.1", "1.1")) request("brightness", invalid) + assertEquals(128, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + request("brightness", "0") + assertEquals(1, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + Settings.System.putInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS, 255) + tick() + assertEquals(1.0, JSONObject(File(directory, "state.json").readText()).getDouble("brightness"), 0.0001) + } + + @Test fun stoppedSessionsDoNotConsumeNewCommands() { + component.stop() + shadowOf(Looper.getMainLooper()).idle() + request("brightness", "0.2") + assertEquals(128, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + } + + @Test fun rejectedPermissionCanBeRequestedAgainWithoutOpeningRepeatedScreens() { + WriteSettingsShadow.writable = false + request("brightness", "0.75") + assertNotNull(shadowOf(context).nextStartedActivity) + request("brightness", "0.8") + assertNull(shadowOf(context).nextStartedActivity) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofSeconds(5)) + request("brightness", "0.8") + assertNotNull(shadowOf(context).nextStartedActivity) + } + + @Test fun oversizedRequestsAreDiscardedAndDoNotBlockLaterCommands() { + request("brightness", "0".repeat(1000)) + assertFalse(File(directory, "brightness.request.processing").exists()) + request("brightness", "0.75") + assertEquals(192, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + } +} + +@Implements(Settings.System::class) +class WriteSettingsShadow : ShadowSettings.ShadowSystem() { + companion object { + @JvmField var writable = true + @JvmStatic @Implementation fun canWrite(context: Context) = writable + } +} diff --git a/tools/aaudio-sink/android-volume.h b/tools/aaudio-sink/android-volume.h new file mode 100644 index 0000000000..b7f4ec9d18 --- /dev/null +++ b/tools/aaudio-sink/android-volume.h @@ -0,0 +1,96 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <stdio.h> +#include <pulsecore/core-rtclock.h> + +struct android_volume { + pa_sink *sink; + char *directory; + pa_time_event *timer; +}; + +static bool android_volume_read(const char *directory, unsigned *level, unsigned *maximum, unsigned *muted) { + char *path = pa_sprintf_malloc("%s/volume.state", directory); + FILE *file = fopen(path, "r"); + pa_xfree(path); + if (!file) return false; + int fields = fscanf(file, "%u %u %u", level, maximum, muted); + fclose(file); + return fields == 3 && *maximum > 0 && *level <= *maximum && *muted <= 1; +} + +static void android_volume_request(pa_sink *sink, const char *name, unsigned value) { + struct userdata *u = sink->userdata; + if (!u->android_volume || sink->state == PA_SINK_INIT) return; + char *path = pa_sprintf_malloc("%s/%s.request", u->android_volume->directory, name); + char *staged = pa_sprintf_malloc("%s.tmp", path); + FILE *file = fopen(staged, "w"); + if (file) { + fprintf(file, "%u\n", value); + if (fclose(file) == 0 && rename(staged, path) < 0) pa_log_warn("Could not publish Android %s", name); + } + pa_xfree(staged); + pa_xfree(path); +} + +static void android_volume_set(pa_sink *sink) { + struct userdata *u = sink->userdata; + unsigned level, maximum, muted; + if (!u->android_volume || !android_volume_read(u->android_volume->directory, &level, &maximum, &muted)) return; + unsigned requested = PA_MIN(pa_cvolume_max(&sink->real_volume), PA_VOLUME_NORM); + level = ((uint64_t)requested * maximum + PA_VOLUME_NORM / 2) / PA_VOLUME_NORM; + pa_cvolume_set(&sink->real_volume, sink->sample_spec.channels, (uint64_t)level * PA_VOLUME_NORM / maximum); + /* Android applies media gain to both PulseAudio and DirectAudio streams. */ + pa_cvolume_reset(&sink->soft_volume, sink->sample_spec.channels); + android_volume_request(sink, "volume", level); +} + +static void android_volume_mute(pa_sink *sink) { + android_volume_request(sink, "mute", sink->muted ? 1 : 0); +} + +static void android_volume_refresh(pa_mainloop_api *api, pa_time_event *event, const struct timeval *tv, void *userdata) { + struct android_volume *bridge = userdata; + unsigned level, maximum, muted; + char *request = pa_sprintf_malloc("%s/volume.request", bridge->directory); + char *mute_request = pa_sprintf_malloc("%s/mute.request", bridge->directory); + char *processing = pa_sprintf_malloc("%s.processing", request); + char *mute_processing = pa_sprintf_malloc("%s.processing", mute_request); + if (access(request, F_OK) != 0 && access(mute_request, F_OK) != 0 && + access(processing, F_OK) != 0 && access(mute_processing, F_OK) != 0 && + android_volume_read(bridge->directory, &level, &maximum, &muted)) { + pa_cvolume volume; + pa_cvolume_set(&volume, bridge->sink->sample_spec.channels, (uint64_t)level * PA_VOLUME_NORM / maximum); + if (!pa_cvolume_equal(&volume, &bridge->sink->real_volume)) pa_sink_volume_changed(bridge->sink, &volume); + if (bridge->sink->muted != !!muted) pa_sink_mute_changed(bridge->sink, !!muted); + } + pa_xfree(request); + pa_xfree(mute_request); + pa_xfree(processing); + pa_xfree(mute_processing); + pa_core_rttime_restart(bridge->sink->core, event, pa_rtclock_now() + 100 * PA_USEC_PER_MSEC); +} + +static struct android_volume *android_volume_new(pa_sink *sink, const char *directory) { + unsigned level, maximum, muted; + if (!directory || !android_volume_read(directory, &level, &maximum, &muted)) return NULL; + struct android_volume *bridge = pa_xnew0(struct android_volume, 1); + bridge->sink = sink; + bridge->directory = pa_xstrdup(directory); + pa_cvolume_set(&sink->real_volume, sink->sample_spec.channels, (uint64_t)level * PA_VOLUME_NORM / maximum); + sink->reference_volume = sink->real_volume; + sink->muted = !!muted; + sink->n_volume_steps = maximum + 1; + pa_cvolume_reset(&sink->soft_volume, sink->sample_spec.channels); + pa_sink_set_set_volume_callback(sink, android_volume_set); + pa_sink_set_set_mute_callback(sink, android_volume_mute); + bridge->timer = pa_core_rttime_new(sink->core, pa_rtclock_now() + 100 * PA_USEC_PER_MSEC, + android_volume_refresh, bridge); + return bridge; +} + +static void android_volume_free(struct android_volume *bridge) { + if (!bridge) return; + bridge->sink->core->mainloop->time_free(bridge->timer); + pa_xfree(bridge->directory); + pa_xfree(bridge); +} diff --git a/tools/aaudio-sink/module-aaudio-sink.c b/tools/aaudio-sink/module-aaudio-sink.c index 619bd26733..3c129ce4b6 100644 --- a/tools/aaudio-sink/module-aaudio-sink.c +++ b/tools/aaudio-sink/module-aaudio-sink.c @@ -42,6 +42,7 @@ PA_MODULE_USAGE( "channels=<number of channels> " "channel_map=<channel map> " "volume=<initial volume, linear, 1.0 = full> " + "control_dir=<Android media volume bridge directory> " "performance_mode=<0 none, 1 low latency, 2 power saving> " "adaptive=<grow the buffer after underruns: 0 or 1> " "buffer_frames=<initial buffer size in frames, 0 = two bursts> " @@ -56,6 +57,7 @@ PA_MODULE_USAGE( #define STATS_EVERY_USEC (30 * PA_USEC_PER_SEC) static const char* const valid_modargs[] = { + "control_dir", "sink_name", "sink_properties", "format", @@ -70,7 +72,10 @@ static const char* const valid_modargs[] = { NULL }; +struct android_volume; + struct userdata { + struct android_volume *android_volume; pa_core *core; pa_module *module; pa_sink *sink; @@ -100,6 +105,9 @@ struct userdata { int32_t xruns_reported; }; +#include "android-volume.h" + + static pa_usec_t frames_to_usec(const struct userdata *u, int64_t frames) { return (pa_usec_t) (frames * (int64_t) PA_USEC_PER_SEC / (int64_t) u->ss.rate); } @@ -472,6 +480,7 @@ int pa__init(pa_module *m) { goto fail; } + u->android_volume = android_volume_new(u->sink, pa_modargs_get_value(ma, "control_dir", NULL)); pa_sink_put(u->sink); pa_modargs_free(ma); return 0; @@ -498,6 +507,7 @@ void pa__done(pa_module *m) { if (!(u = m->userdata)) return; + android_volume_free(u->android_volume); if (u->sink) pa_sink_unlink(u->sink); if (u->thread) { diff --git a/tools/directaudio/sink/module-directaudio-native-sink.c b/tools/directaudio/sink/module-directaudio-native-sink.c index ca3eb01cc5..4d03e6bd4d 100644 --- a/tools/directaudio/sink/module-directaudio-native-sink.c +++ b/tools/directaudio/sink/module-directaudio-native-sink.c @@ -59,6 +59,7 @@ PA_MODULE_DESCRIPTION("Android audio output: DirectAudio's AAudio engine, in-pro PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(false); PA_MODULE_USAGE( + "control_dir=<Android media volume bridge directory> " "sink_name=<name for the sink> " "sink_properties=<properties for the sink> " "volume=<initial volume, linear, 1.0 = full> " @@ -91,11 +92,15 @@ PA_MODULE_USAGE( #define DA_FADE_FRAMES 64 static const char* const valid_modargs[] = { + "control_dir", "sink_name", "sink_properties", "volume", "performance_mode", "buffer_ms", "max_ms", "ring_ms", "adaptive", "decay", "limiter", "watchdog", NULL }; +struct android_volume; + struct userdata { + struct android_volume *android_volume; pa_core *core; pa_module *module; pa_sink *sink; @@ -136,6 +141,9 @@ struct userdata { unsigned int opens; }; +#include "../../aaudio-sink/android-volume.h" + + static uint64_t now_ns(void) { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); @@ -774,6 +782,7 @@ int pa__init(pa_module *m) { pa_log("Failed to create thread."); goto fail; } + u->android_volume = android_volume_new(u->sink, pa_modargs_get_value(ma, "control_dir", NULL)); pa_sink_put(u->sink); pa_modargs_free(ma); return 0; @@ -799,6 +808,7 @@ void pa__done(pa_module *m) { pa_assert(m); if (!(u = m->userdata)) return; + android_volume_free(u->android_volume); if (u->sink) pa_sink_unlink(u->sink); if (u->thread) { diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index ba739235b1..595563019b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -2,6 +2,7 @@ import base64 import ctypes import json +import math import os import runpy import select @@ -15,6 +16,48 @@ import time HERE = os.path.dirname(os.path.realpath(__file__)) COMPAT = runpy.run_path(os.path.join(HERE, "steam-compatibility")) BINDING = "droiddeckCompatChanged" +BRIGHTNESS_BINDING = "droiddeckBrightnessChanged" +CONTROLS_DIR = "/etc/droiddeck-device-controls" +BRIGHTNESS_JS = r""" +(() => { + if (window.__droiddeckBrightness) return "present"; + const display = SteamClient.System?.Display; + if (!display?.RegisterForBrightnessChanges || !display?.SetBrightness) return "unavailable"; + const self = { expected: null, updating: true }; + self.set = value => { + if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || value > 1) return; + if (!self.updating && self.expected !== null && Math.abs(value - self.expected) < 0.0001) return; + self.expected = value; + self.updating = true; + display.SetBrightness(value); + }; + self.subscription = display.RegisterForBrightnessChanges(state => { + const value = state?.flBrightness; + if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || value > 1 || self.expected === null) return; + if (Math.abs(value - self.expected) < 0.0001) { self.updating = false; return; } + if (self.updating) return; + self.expected = value; + if (typeof window.__BINDING__ === "function") window.__BINDING__(String(value)); + }); + window.__droiddeckBrightness = self; + return "installed"; +})() +""".replace("__BINDING__", BRIGHTNESS_BINDING) + + +def brightness_request(payload, directory=CONTROLS_DIR): + try: + value = float(payload) + if not math.isfinite(value) or not 0 <= value <= 1: + return + path = os.path.join(directory, "brightness.request") + with open(path + ".tmp", "w") as target: + target.write(str(value) + "\n") + os.replace(path + ".tmp", path) + except (ValueError, TypeError, OSError): + return + + INSTALL_JS = r""" (() => { if (window.__droiddeckCompat) return "present"; @@ -633,6 +676,20 @@ class Helper: self.tools_checked = None self.vr_launch = None self.chooser = None + self.controls_state = None + + def sync_controls(self): + try: + with open(os.path.join(CONTROLS_DIR, "state.json")) as source: + state = json.load(source) + value = state.get("brightness") + if isinstance(value, bool) or not isinstance(value, (int, float)) or not math.isfinite(value) or not 0 <= value <= 1: + return + if state != self.controls_state: + self.page.evaluate("window.__droiddeckBrightness?.set(%s)" % json.dumps(value)) + self.controls_state = state + except (OSError, ValueError, TypeError): + pass def open_chooser(self, payload): try: @@ -705,6 +762,10 @@ class Helper: try: if page.evaluate("typeof SteamClient === 'object' && typeof SteamClient.WebUITransport === 'object'") is not True: raise LookupError("SteamClient is not ready") + if os.path.isfile(os.path.join(CONTROLS_DIR, "state.json")): + page.call("Runtime.addBinding", {"name": BRIGHTNESS_BINDING}) + page.evaluate(BRIGHTNESS_JS) + self.controls_state = None if self.files_only: page.call("Runtime.addBinding", {"name": FILE_BINDING}) page.evaluate(FILE_JS) @@ -854,6 +915,8 @@ class Helper: say("preparing SteamVR for library app(s): " + ", ".join(sorted(vr_games))) self.vr_launch = launch_steamvr() for e in events: + if called(e, BRIGHTNESS_BINDING): + brightness_request(e.get("params", {}).get("payload")) if called(e, FILE_BINDING) and isinstance(e.get("params", {}).get("payload"), str): self.open_chooser(e["params"]["payload"]) return events @@ -861,15 +924,14 @@ class Helper: def serve_files(self): say("attached to the client on port %d for its file dialogs" % self.port) while True: + self.sync_controls() sources = [self.page.ws] + ([self.chooser[1].stdout] if self.chooser is not None else []) queued = self.page.ws.pending() or bool(self.page.events) - ready = [self.page.ws] if queued else select.select(sources, [], [], 30)[0] + ready = [self.page.ws] if queued else select.select(sources, [], [], 0.25)[0] if self.chooser is not None and self.chooser[1].stdout in ready: self.chooser_done() if self.page.ws in ready or self.page.events: - for e in self.page.drain(): - if called(e, FILE_BINDING) and isinstance(e.get("params", {}).get("payload"), str): - self.open_chooser(e["params"]["payload"]) + self.drain() def serve(self, watcher): if self.files_only: @@ -880,10 +942,11 @@ class Helper: self.reconcile() self.ensure_tools() while True: + self.sync_controls() sources = [self.page.ws] + ([watcher] if watcher.fileno() >= 0 else []) if self.chooser is not None: sources.append(self.chooser[1].stdout) - ready = [self.page.ws] if self.page.ws.pending() else select.select(sources, [], [], 30 if watcher.fileno() >= 0 else 2)[0] + ready = [self.page.ws] if self.page.ws.pending() else select.select(sources, [], [], 0.25)[0] if self.chooser is not None and self.chooser[1].stdout in ready: self.chooser_done() due = False diff --git a/tools/tests/test_device_controls.py b/tools/tests/test_device_controls.py new file mode 100644 index 0000000000..3a513a89fa --- /dev/null +++ b/tools/tests/test_device_controls.py @@ -0,0 +1,82 @@ +import json +from pathlib import Path +import runpy +import subprocess +import tempfile +import unittest + +BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" +LIVE = runpy.run_path(str(BIN / "droiddeck-steam-compat")) + + +class DeviceControlsTest(unittest.TestCase): + def test_native_brightness_notifications_do_not_echo_android_readback(self): + harness = r""" +const assert = require('assert'); +globalThis.window = globalThis; +const requests = [], callbacks = []; +let current = 1; +window.droiddeckBrightnessChanged = value => requests.push(Number(value)); +globalThis.SteamClient = { System: { Display: { + RegisterForBrightnessChanges(cb) { callbacks.push(cb); cb({ flBrightness: 1 }); return {}; }, + SetBrightness(value) { + if (current === value) return; + current = value; + callbacks.forEach(cb => cb({ flBrightness: value })); + } +} } }; +const script = require('fs').readFileSync(process.argv[2], 'utf8'); +assert.strictEqual(eval(script), 'installed'); +assert.strictEqual(eval(script), 'present'); +const bridge = window.__droiddeckBrightness; +bridge.set(0.5); +bridge.set(0.5); +assert.deepStrictEqual(requests, []); +callbacks.forEach(cb => cb({ flBrightness: 0.8 })); +assert.deepStrictEqual(requests, [0.8]); +bridge.set(0.7992126); +assert.deepStrictEqual(requests, [0.8]); +for (const value of [NaN, Infinity, -1, 2, '0.5']) callbacks.forEach(cb => cb({ flBrightness: value })); +assert.deepStrictEqual(requests, [0.8]); +assert.strictEqual(callbacks.length, 1); +""" + with tempfile.TemporaryDirectory() as directory: + script = Path(directory) / "bridge.js" + script.write_text(LIVE["BRIGHTNESS_JS"]) + test = Path(directory) / "test.js" + test.write_text(harness) + result = subprocess.run(["node", str(test), str(script)], capture_output=True, text=True, timeout=20) + self.assertEqual(result.returncode, 0, result.stderr) + + def test_requests_reject_nonfinite_and_out_of_range_values(self): + with tempfile.TemporaryDirectory() as directory: + path = Path(directory) / "brightness.request" + for value in ["NaN", "Infinity", "-0.1", "1.1", "invalid", None]: + LIVE["brightness_request"](value, directory) + self.assertFalse(path.exists()) + LIVE["brightness_request"]("0.4", directory) + self.assertEqual(float(path.read_text()), 0.4) + + def test_failed_request_revision_republishes_the_actual_brightness(self): + with tempfile.TemporaryDirectory() as directory: + globals_ = LIVE["Helper"].sync_controls.__globals__ + previous = globals_["CONTROLS_DIR"] + try: + globals_["CONTROLS_DIR"] = directory + helper = LIVE["Helper"]("/steam", 0) + calls = [] + helper.page = type("Page", (), {"evaluate": lambda self, expression: calls.append(expression)})() + path = Path(directory) / "state.json" + path.write_text(json.dumps({"brightness": 0.5, "revision": 1})) + helper.sync_controls() + helper.sync_controls() + self.assertEqual(len(calls), 1) + path.write_text(json.dumps({"brightness": 0.5, "revision": 2})) + helper.sync_controls() + self.assertEqual(len(calls), 2) + finally: + globals_["CONTROLS_DIR"] = previous + + +if __name__ == "__main__": + unittest.main() From 53d643dd005b5c4477087fd5cf22e95f9fb9288f Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 12:34:31 -0400 Subject: [PATCH 084/135] fix(audio): clear volume bridge during sink teardown --- tools/aaudio-sink/module-aaudio-sink.c | 1 + tools/directaudio/sink/module-directaudio-native-sink.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/aaudio-sink/module-aaudio-sink.c b/tools/aaudio-sink/module-aaudio-sink.c index 3c129ce4b6..e79a20a54a 100644 --- a/tools/aaudio-sink/module-aaudio-sink.c +++ b/tools/aaudio-sink/module-aaudio-sink.c @@ -508,6 +508,7 @@ void pa__done(pa_module *m) { return; android_volume_free(u->android_volume); + u->android_volume = NULL; if (u->sink) pa_sink_unlink(u->sink); if (u->thread) { diff --git a/tools/directaudio/sink/module-directaudio-native-sink.c b/tools/directaudio/sink/module-directaudio-native-sink.c index 4d03e6bd4d..3b6e5f6c9c 100644 --- a/tools/directaudio/sink/module-directaudio-native-sink.c +++ b/tools/directaudio/sink/module-directaudio-native-sink.c @@ -809,6 +809,7 @@ void pa__done(pa_module *m) { if (!(u = m->userdata)) return; android_volume_free(u->android_volume); + u->android_volume = NULL; if (u->sink) pa_sink_unlink(u->sink); if (u->thread) { From 2e2b950964447bf1e1702b4cb1dfcdb0ec7c1c8e Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 12:04:20 -0400 Subject: [PATCH 085/135] fix: Flatpak setup clears a package lock left by an interrupted run --- .../usr/local/bin/droiddeck-flatpak-setup | 3 ++ tools/tests/test_flatpak_setup.py | 28 ++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup index bd25b6089e..9717da5ba6 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup @@ -49,6 +49,9 @@ if [ ! -f /etc/pacman.d/gnupg/pubring.gpg ] && [ ! -f /etc/pacman.d/gnupg/pubrin fi step "Reading the package lists" +if [ -e "$WORK/db/db.lck" ] && ! grep -qx pacman /proc/[0-9]*/comm 2>/dev/null; then + rm -f "$WORK/db/db.lck" +fi sync_log=$(pacman --config "$CONF" --dbpath "$WORK/db" --noconfirm -Sy 2>&1) \ || sync_log=$(pacman --config "$CONF" --dbpath "$WORK/db" --noconfirm -Sy 2>&1) if [ ! -f "$WORK/db/sync/extra.db" ]; then diff --git a/tools/tests/test_flatpak_setup.py b/tools/tests/test_flatpak_setup.py index b5714b9a46..5ad712efe0 100644 --- a/tools/tests/test_flatpak_setup.py +++ b/tools/tests/test_flatpak_setup.py @@ -9,9 +9,12 @@ SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/dr class FlatpakSetupTest(unittest.TestCase): - def run_setup(self, uid, pacman): + def run_setup(self, uid, pacman, locked=False): with tempfile.TemporaryDirectory() as directory: root = Path(directory) + if locked: + (root / "work/db").mkdir(parents=True) + (root / "work/db/db.lck").write_text("") bin_dir = root / "bin" bin_dir.mkdir() stubs = {"id": "echo %d" % uid, "curl": "exit 7", "pacman": pacman, "pacman-key": "exit 0"} @@ -40,6 +43,29 @@ class FlatpakSetupTest(unittest.TestCase): self.assertIn("== FAIL could not reach the Arch Linux ARM mirrors (error: failed retrieving file 'core.db' : " "Could not resolve host)", out) + SYNC = ("db=; while [ $# -gt 0 ]; do [ \"$1\" = --dbpath ] && db=$2; shift; done\n" + "[ -e \"$db/db.lck\" ] && { echo 'error: failed to synchronize all databases (unable to lock database)' >&2; exit 1; }\n" + "mkdir -p \"$db/sync\" && touch \"$db/sync/extra.db\"") + + def test_a_lock_left_by_an_interrupted_run_is_cleared(self): + code, out = self.run_setup(0, self.SYNC, locked=True) + self.assertNotIn("unable to lock database", out) + self.assertIn("== STEP Downloading Flatpak", out) + + def test_a_lock_held_by_a_running_pacman_is_kept(self): + with tempfile.TemporaryDirectory() as directory: + holder = Path(directory) / "pacman" + holder.write_bytes(Path("/bin/sleep").read_bytes()) + holder.chmod(0o755) + running = subprocess.Popen([str(holder), "30"]) + try: + code, out = self.run_setup(0, self.SYNC, locked=True) + finally: + running.kill() + running.wait() + self.assertEqual(code, 1) + self.assertIn("unable to lock database", out) + if __name__ == "__main__": unittest.main() From c446566f42fd8083119598beda574b6197352767 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 12:21:09 -0400 Subject: [PATCH 086/135] fix: hold a setup lock instead of guessing from running processes --- .../usr/local/bin/droiddeck-flatpak-setup | 5 ++-- tools/tests/test_flatpak_setup.py | 26 ++++++++----------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup index 9717da5ba6..534a4f7d38 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup @@ -25,6 +25,7 @@ NEEDS WORK=/var/cache/droiddeck-flatpak CONF=$WORK/pacman.conf mkdir -p "$WORK/pkg" "$WORK/db" || fail "cannot create $WORK" +exec 9>"$WORK/setup.lock" && flock -n 9 || fail "another Flatpak setup is still running" OVERSEAS="https://ca.us.mirror.archlinuxarm.org https://fl.us.mirror.archlinuxarm.org https://de3.mirror.archlinuxarm.org https://nl.mirror.archlinuxarm.org" MAINLAND="" @@ -49,9 +50,7 @@ if [ ! -f /etc/pacman.d/gnupg/pubring.gpg ] && [ ! -f /etc/pacman.d/gnupg/pubrin fi step "Reading the package lists" -if [ -e "$WORK/db/db.lck" ] && ! grep -qx pacman /proc/[0-9]*/comm 2>/dev/null; then - rm -f "$WORK/db/db.lck" -fi +rm -f "$WORK/db/db.lck" sync_log=$(pacman --config "$CONF" --dbpath "$WORK/db" --noconfirm -Sy 2>&1) \ || sync_log=$(pacman --config "$CONF" --dbpath "$WORK/db" --noconfirm -Sy 2>&1) if [ ! -f "$WORK/db/sync/extra.db" ]; then diff --git a/tools/tests/test_flatpak_setup.py b/tools/tests/test_flatpak_setup.py index 5ad712efe0..7de2d0f7aa 100644 --- a/tools/tests/test_flatpak_setup.py +++ b/tools/tests/test_flatpak_setup.py @@ -1,3 +1,5 @@ +import contextlib +import fcntl import os from pathlib import Path import subprocess @@ -9,12 +11,15 @@ SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/dr class FlatpakSetupTest(unittest.TestCase): - def run_setup(self, uid, pacman, locked=False): - with tempfile.TemporaryDirectory() as directory: + def run_setup(self, uid, pacman, locked=False, busy=False): + with tempfile.TemporaryDirectory() as directory, contextlib.ExitStack() as held: root = Path(directory) if locked: (root / "work/db").mkdir(parents=True) (root / "work/db/db.lck").write_text("") + if busy: + holder = held.enter_context(open(root / "work/setup.lock", "w")) + fcntl.flock(holder, fcntl.LOCK_EX | fcntl.LOCK_NB) bin_dir = root / "bin" bin_dir.mkdir() stubs = {"id": "echo %d" % uid, "curl": "exit 7", "pacman": pacman, "pacman-key": "exit 0"} @@ -52,20 +57,11 @@ class FlatpakSetupTest(unittest.TestCase): self.assertNotIn("unable to lock database", out) self.assertIn("== STEP Downloading Flatpak", out) - def test_a_lock_held_by_a_running_pacman_is_kept(self): - with tempfile.TemporaryDirectory() as directory: - holder = Path(directory) / "pacman" - holder.write_bytes(Path("/bin/sleep").read_bytes()) - holder.chmod(0o755) - running = subprocess.Popen([str(holder), "30"]) - try: - code, out = self.run_setup(0, self.SYNC, locked=True) - finally: - running.kill() - running.wait() + def test_a_setup_that_is_still_running_keeps_its_lock(self): + code, out = self.run_setup(0, self.SYNC, locked=True, busy=True) self.assertEqual(code, 1) - self.assertIn("unable to lock database", out) - + self.assertIn("== FAIL another Flatpak setup is still running", out) + self.assertNotIn("Reading the package lists", out) if __name__ == "__main__": unittest.main() From dde1a55d00a6bb8964018efc1e0db42048740e05 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 12:49:51 -0400 Subject: [PATCH 087/135] feat(input): pass held Back through as Steam QAM --- .../com/droiddeck/launcher/SessionActivity.kt | 15 +++ .../droiddeck/launcher/input/BackQamInput.kt | 42 +++++++ .../droiddeck/launcher/input/PadBridge.java | 17 ++- .../launcher/ui/ModeSettingsDialog.kt | 4 +- .../droiddeck/launcher/ui/SessionOverlay.kt | 4 +- app/src/main/res/values/strings.xml | 1 + .../launcher/input/BackQamInputTest.kt | 90 ++++++++++++++ .../launcher/input/PadBridgeQamTest.kt | 115 ++++++++++++++++++ 8 files changed, 285 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index b9dce0e415..7599185ff3 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -257,6 +257,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private val cursorResync = Runnable { if (syncClientCursor() && clientHidesCursor) cursorVisible = false } private val uiHandler = Handler(Looper.getMainLooper()) private var pendingBackAction: Runnable? = null + private val backQamInput = com.droiddeck.launcher.input.BackQamInput { padBridge?.setBackQamPressed(it) } private var drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN private var drawerDirectionDownTime = 0L private var drawerDirectionDeviceId = -1 @@ -446,6 +447,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } override fun onInputDeviceRemoved(deviceId: Int) { Log.i(TAG, "input device $deviceId disconnected") + backQamInput.onDeviceRemoved(deviceId) joyConVr?.refresh() padBridge?.onDeviceRemoved(deviceId) if (::padMouse.isInitialized) padMouse.reset() @@ -773,6 +775,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, gestureSettingsOpen, pipUi, SessionState.suspended) { if (drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || pipUi || SessionState.suspended) { + backQamInput.cancel() cancelTouchGestures() screenKeys?.stopEditing() } @@ -2106,6 +2109,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun releasePads() { + backQamInput.cancel() padBridge?.releaseAll() joyConVr?.releaseButtons() } @@ -2184,6 +2188,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> return super.dispatchKeyEvent(event) } + val backToQam = !pipUi && !screenKeyTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && + SessionState.mode == SessionService.MODE_STEAM && SessionState.running && SessionState.firstFrameSeen && + !SessionState.suspended && padBridge?.canHoldQam() == true + if (backQamInput.onKeyEvent(event, backToQam)) { + pendingBackAction?.let(uiHandler::removeCallbacks) + pendingBackAction = null + return true + } if (pipUi) return true if (screenKeyTextFocus) return super.dispatchKeyEvent(event) val pad = com.droiddeck.launcher.input.JoyCon.normalize(event) @@ -3253,6 +3265,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onPause() { if (runtimeRemovalBlocked) { super.onPause(); return } + backQamInput.cancel() capturePausedFrame() sessionClipboard.stop() if (::touchscreenGestures.isInitialized) touchscreenGestures.cancel() @@ -3636,6 +3649,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onWindowFocusChanged(hasFocus: Boolean) { super.onWindowFocusChanged(hasFocus) + if (!hasFocus) backQamInput.cancel() if (!hasFocus && ::padMouse.isInitialized) padMouse.reset() if (runtimeRemovalBlocked) return if (!hasFocus) { @@ -3683,6 +3697,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } override fun onDestroy() { + backQamInput.cancel() steamVrRecovery.close() uiHandler.removeCallbacks(steamTouchRetry) if (runtimeRemovalBlocked) { super.onDestroy(); return } diff --git a/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt b/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt new file mode 100644 index 0000000000..4ba4e3391d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.input + +import android.view.KeyEvent + +class BackQamInput(private val setPressed: (Boolean) -> Unit) { + private val held = mutableSetOf<Int>() + private val cancelled = mutableSetOf<Int>() + + fun onKeyEvent(event: KeyEvent, enabled: Boolean): Boolean { + if (!enabled) cancel() + if (event.keyCode != KeyEvent.KEYCODE_BACK) return false + val device = event.deviceId + return when (event.action) { + KeyEvent.ACTION_DOWN -> { + if (event.repeatCount > 0) return enabled || device in held || device in cancelled + cancelled.remove(device) + if (!enabled || event.isCanceled) return false + if (held.add(device) && held.size == 1) setPressed(true) + true + } + KeyEvent.ACTION_UP -> { + val released = held.remove(device) + val wasCancelled = cancelled.remove(device) + if (released && held.isEmpty()) setPressed(false) + released || wasCancelled || enabled + } + else -> device in held || device in cancelled + } + } + + fun cancel() { + if (held.isEmpty()) return + cancelled.addAll(held) + held.clear() + setPressed(false) + } + + fun onDeviceRemoved(device: Int) { + cancelled.remove(device) + if (held.remove(device) && held.isEmpty()) setPressed(false) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index 0811cab05e..2ed8037afd 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -61,6 +61,7 @@ public final class PadBridge { private final PadState routedTouch = new PadState(); private boolean systemGuidePressed; private boolean systemQamPressed; + private boolean backQamPressed; private boolean qamChordActive; private int chordButton = -1; private boolean chordButtonPressed; @@ -132,6 +133,7 @@ public final class PadBridge { routedTouch.clear(); systemGuidePressed = false; systemQamPressed = false; + backQamPressed = false; qamTapPressed = false; qamChordActive = false; chordButtonPressed = false; @@ -165,6 +167,7 @@ public final class PadBridge { } systemGuidePressed = false; systemQamPressed = false; + backQamPressed = false; qamChordActive = false; chordButtonPressed = false; qamTapPressed = false; @@ -459,6 +462,7 @@ public final class PadBridge { public synchronized void releaseAll() { routedTouch.clear(); + backQamPressed = false; releaseBackPaddles(); state.clear(); publish(); @@ -479,6 +483,17 @@ public final class PadBridge { return SessionState.getDeckPad() && FakeInputWriter.padHasQam(); } + public boolean canHoldQam() { + return builtinPad && nativeQam(); + } + + public synchronized void setBackQamPressed(boolean pressed) { + if (pressed && !canHoldQam()) return; + if (backQamPressed == pressed) return; + backQamPressed = pressed; + publish(); + } + public synchronized void triggerQam() { if (!builtinPad) return; if (!nativeQam()) { @@ -684,7 +699,7 @@ public final class PadBridge { return; } boolean guide = systemGuidePressed || qamChordActive; - boolean qam = nativeQam() && (systemQamPressed || qamTapPressed); + boolean qam = nativeQam() && (systemQamPressed || qamTapPressed || backQamPressed); if (!guide && !qam) { writer.writePad(state); return; 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 86c03309f8..78fc3b00cb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -306,7 +306,9 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: stringResource(R.string.unfolded_controls_with_controller_hint), s.unfoldedControlsWithController, onChange = a.onUnfoldedControlsWithController, ) - if (steam) ChoiceRow( + if (steam && s.steamController in listOf(SessionPrefs.CONTROLLER_DECK, SessionPrefs.CONTROLLER_STEAM)) { + Note(stringResource(R.string.back_native_qam_hint)) + } else if (steam) ChoiceRow( host, "back-actions", stringResource(R.string.mode_back), stringResource(SessionPrefs.backActionsOrder(s.backActionsInverted)), listOf( false to stringResource(SessionPrefs.BACK_MENU_THEN_QAM), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index b526bea285..bed8cccbd6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -604,7 +604,9 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont chipModifier = focus.track(page, "keyboard-button"), onChange = a.onKeyboardButton) } } - if (a.steam) ChoiceRow(host, "back-actions", stringResource(R.string.mode_back), null, + if (a.steam && a.padType in listOf(SessionPrefs.CONTROLLER_DECK, SessionPrefs.CONTROLLER_STEAM)) { + Note(stringResource(R.string.back_native_qam_hint)) + } else if (a.steam) ChoiceRow(host, "back-actions", stringResource(R.string.mode_back), null, listOf(false to stringResource(SessionPrefs.BACK_MENU_THEN_QAM), true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU)), a.backActionsInverted, chipModifier = focus.track(page, "back-actions"), onPick = a.onBackActionsInverted) if (a.steam && a.unfoldedControls != null) ToggleRow(host, "unfolded-controls", stringResource(R.string.unfolded_controls), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6b598b8c25..6cf0674c2d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -306,6 +306,7 @@ <string name="mode_controller_x360">Xbox 360 controller</string> <string name="mode_controller_note">Deck: Quick Access button and gyro. Steam Controller: the same, with grip sense on the back buttons. DualShock 4 and DualSense: gyro, and the trackpads as their touchpad. Xbox 360: open Quick Access with Guide+A.</string> <string name="mode_back">Back</string> + <string name="back_native_qam_hint">Back acts as Quick Access. Hold it with another button for Steam shortcuts.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Session</string> diff --git a/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt b/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt new file mode 100644 index 0000000000..37a7abda0d --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt @@ -0,0 +1,90 @@ +package com.droiddeck.launcher.input + +import android.view.KeyEvent +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], manifest = Config.NONE) +class BackQamInputTest { + private val changes = mutableListOf<Boolean>() + private val input = BackQamInput(changes::add) + + @Test fun aHoldAndItsRepeatsProduceOnePressAndOneRelease() { + assertTrue(send(KeyEvent.ACTION_DOWN)) + for (repeat in 1..10) assertTrue(send(KeyEvent.ACTION_DOWN, repeat = repeat)) + assertEquals(listOf(true), changes) + assertTrue(send(KeyEvent.ACTION_UP)) + assertEquals(listOf(true, false), changes) + } + + @Test fun otherButtonsAndSelectPassThroughWhileBackIsHeld() { + send(KeyEvent.ACTION_DOWN) + for (code in listOf(KeyEvent.KEYCODE_BUTTON_X, KeyEvent.KEYCODE_BUTTON_SELECT)) { + for (action in listOf(KeyEvent.ACTION_DOWN, KeyEvent.ACTION_UP)) { + assertFalse(input.onKeyEvent(KeyEvent(action, code), true)) + } + } + assertEquals(listOf(true), changes) + send(KeyEvent.ACTION_UP) + assertEquals(listOf(true, false), changes) + } + + @Test fun disabledRoutingPreservesBackNavigation() { + assertFalse(send(KeyEvent.ACTION_DOWN, enabled = false)) + assertFalse(send(KeyEvent.ACTION_UP, enabled = false)) + assertTrue(changes.isEmpty()) + } + + @Test fun losingFocusReleasesQamAndConsumesTheLateRelease() { + send(KeyEvent.ACTION_DOWN) + input.cancel() + input.cancel() + assertTrue(send(KeyEvent.ACTION_DOWN, repeat = 1, enabled = false)) + assertTrue(send(KeyEvent.ACTION_UP, enabled = false)) + assertEquals(listOf(true, false), changes) + assertFalse(send(KeyEvent.ACTION_UP, enabled = false)) + } + + @Test fun openingAnOverlayReleasesQamBeforeRoutingItsNextKey() { + send(KeyEvent.ACTION_DOWN) + assertFalse(input.onKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BUTTON_B), false)) + assertTrue(send(KeyEvent.ACTION_UP, enabled = false)) + assertEquals(listOf(true, false), changes) + } + + @Test fun repeatsAfterCancellationCannotReassertQam() { + send(KeyEvent.ACTION_DOWN) + input.cancel() + assertTrue(send(KeyEvent.ACTION_DOWN, repeat = 1)) + assertEquals(listOf(true, false), changes) + assertTrue(send(KeyEvent.ACTION_DOWN)) + assertTrue(send(KeyEvent.ACTION_UP)) + assertEquals(listOf(true, false, true, false), changes) + } + + @Test fun cancelledReleaseStillReleasesQam() { + send(KeyEvent.ACTION_DOWN) + assertTrue(input.onKeyEvent(KeyEvent(0, 100, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK, + 0, 0, 4, 0, KeyEvent.FLAG_CANCELED), true)) + assertEquals(listOf(true, false), changes) + } + + @Test fun removingOneDeviceDoesNotReleaseAnotherDevicesHold() { + send(KeyEvent.ACTION_DOWN, device = 4) + send(KeyEvent.ACTION_DOWN, device = 5) + input.onDeviceRemoved(4) + assertTrue(changes.last()) + send(KeyEvent.ACTION_UP, device = 5) + assertFalse(changes.last()) + send(KeyEvent.ACTION_DOWN, device = 4) + input.onDeviceRemoved(4) + assertFalse(changes.last()) + } + + private fun send(action: Int, repeat: Int = 0, device: Int = 4, enabled: Boolean = true) = + input.onKeyEvent(KeyEvent(0, 100, action, KeyEvent.KEYCODE_BACK, repeat, 0, device, 0), enabled) +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt new file mode 100644 index 0000000000..3491076a24 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt @@ -0,0 +1,115 @@ +package com.droiddeck.launcher.input + +import android.os.Handler +import com.droiddeck.launcher.session.SessionState +import java.nio.file.Files +import java.time.Duration +import org.junit.After +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.util.ReflectionHelpers + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], manifest = Config.NONE, instrumentedPackages = ["com.droiddeck.launcher.input.FakeInputWriter"], + shadows = [JoyConPadTest.RecordingWriter::class]) +class PadBridgeQamTest { + private val directory = Files.createTempDirectory("qam-pad").toFile() + private lateinit var bridge: PadBridge + + @Before fun start() { + JoyConPadTest.RecordingWriter.pads.clear() + ReflectionHelpers.setStaticField(FakeInputWriter::class.java, "padType", FakeInputWriter.PAD_TYPE_DECK) + SessionState.deckPad = true + bridge = PadBridge(directory) + assertTrue(bridge.start()) + } + + @After fun stop() { + bridge.stop() + SessionState.deckPad = false + directory.deleteRecursively() + } + + @Test fun onlyNativeQamControllersAcceptAHeldBack() { + for (type in listOf(-1, FakeInputWriter.PAD_TYPE_DECK, FakeInputWriter.PAD_TYPE_STEAM, + FakeInputWriter.PAD_TYPE_XBOX, FakeInputWriter.PAD_TYPE_DS4, FakeInputWriter.PAD_TYPE_DUALSENSE)) { + ReflectionHelpers.setStaticField(FakeInputWriter::class.java, "padType", type) + val supported = type <= FakeInputWriter.PAD_TYPE_STEAM + assertEquals(supported, bridge.canHoldQam()) + bridge.setBackQamPressed(true) + bridge.applyExternal({}, false) + assertEquals(supported, pad().isDown(PadState.QAM)) + bridge.setBackQamPressed(false) + } + SessionState.deckPad = false + assertFalse(bridge.canHoldQam()) + } + + @Test fun qamAndOtherButtonsShareAReportUntilBackIsReleased() { + bridge.setBackQamPressed(true) + advanceTime() + bridge.applyExternal({ it.press(PadState.X, true); it.press(PadState.SELECT, true) }, true) + assertTrue(pad().isDown(PadState.QAM)) + assertTrue(pad().isDown(PadState.X)) + assertTrue(pad().isDown(PadState.SELECT)) + bridge.setBackQamPressed(false) + assertFalse(pad().isDown(PadState.QAM)) + assertTrue(pad().isDown(PadState.X)) + assertTrue(pad().isDown(PadState.SELECT)) + } + + @Test fun touchQamAndBackHaveIndependentReleases() { + bridge.setBackQamPressed(true) + bridge.setSystemButtons(false, true) + bridge.setBackQamPressed(false) + assertTrue(pad().isDown(PadState.QAM)) + bridge.setBackQamPressed(true) + bridge.setSystemButtons(false, false) + assertTrue(pad().isDown(PadState.QAM)) + bridge.setBackQamPressed(false) + assertFalse(pad().isDown(PadState.QAM)) + } + + @Test fun aTimedQamTapCannotReleaseAHeldBack() { + bridge.triggerQam() + bridge.setBackQamPressed(true) + advanceTime() + assertTrue(pad().isDown(PadState.QAM)) + bridge.setBackQamPressed(false) + assertFalse(pad().isDown(PadState.QAM)) + } + + @Test fun releasingAllOrStoppingClearsTheHold() { + bridge.setBackQamPressed(true) + bridge.releaseAll() + assertFalse(pad().isDown(PadState.QAM)) + bridge.setBackQamPressed(true) + bridge.stop() + bridge.start() + bridge.applyExternal({}, false) + assertFalse(pad().isDown(PadState.QAM)) + } + + @Test fun disablingTheBuiltinPadClearsAndRejectsTheHold() { + bridge.setBackQamPressed(true) + bridge.setBuiltinPad(false) + assertFalse(bridge.canHoldQam()) + assertFalse(pad().isDown(PadState.QAM)) + bridge.setBackQamPressed(true) + bridge.setBuiltinPad(true) + bridge.applyExternal({}, false) + assertFalse(pad().isDown(PadState.QAM)) + } + + private fun pad() = requireNotNull(JoyConPadTest.RecordingWriter.pads[0]) + + private fun advanceTime() { + val handler = ReflectionHelpers.getStaticField<Handler>(PadBridge::class.java, "chordHandler") + shadowOf(handler.looper).idleFor(Duration.ofSeconds(2)) + } +} From fa5506df35a7fa3ac00e7e82fc0cc7fcecbba9bd Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 13:13:08 -0400 Subject: [PATCH 088/135] fix(steam): preserve Back taps and recover QAM controls --- .../com/droiddeck/launcher/SessionActivity.kt | 5 +- .../droiddeck/launcher/input/BackQamInput.kt | 60 ++++++++--- .../runtime/DeviceControlsComponent.kt | 34 ++++-- .../launcher/session/SessionService.kt | 2 +- .../launcher/ui/ModeSettingsDialog.kt | 7 +- .../droiddeck/launcher/ui/SessionOverlay.kt | 7 +- app/src/main/res/values/strings.xml | 4 +- .../launcher/input/BackQamInputTest.kt | 96 +++++++++++++++-- .../runtime/DeviceControlsComponentTest.kt | 35 +++++- tools/aaudio-sink/android-volume.h | 17 ++- .../usr/local/bin/droiddeck-steam-compat | 29 +++-- tools/tests/test_android_volume.py | 101 ++++++++++++++++++ tools/tests/test_device_controls.py | 54 +++++++++- 13 files changed, 395 insertions(+), 56 deletions(-) create mode 100644 tools/tests/test_android_volume.py diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 7599185ff3..f4bb0b6e2f 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -257,7 +257,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private val cursorResync = Runnable { if (syncClientCursor() && clientHidesCursor) cursorVisible = false } private val uiHandler = Handler(Looper.getMainLooper()) private var pendingBackAction: Runnable? = null - private val backQamInput = com.droiddeck.launcher.input.BackQamInput { padBridge?.setBackQamPressed(it) } + private val backQamInput = com.droiddeck.launcher.input.BackQamInput( + setPressed = { padBridge?.setBackQamPressed(it) }, + onTap = { performBackAction(double = it) }, + ) private var drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN private var drawerDirectionDownTime = 0L private var drawerDirectionDeviceId = -1 diff --git a/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt b/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt index 4ba4e3391d..ef8042aa67 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt @@ -1,10 +1,21 @@ package com.droiddeck.launcher.input import android.view.KeyEvent +import android.os.Handler +import android.os.Looper -class BackQamInput(private val setPressed: (Boolean) -> Unit) { - private val held = mutableSetOf<Int>() +class BackQamInput(private val setPressed: (Boolean) -> Unit, private val onTap: (Boolean) -> Unit) { + private class Press(val hold: Runnable, var held: Boolean = false, var used: Boolean = false) + private val handler = Handler(Looper.getMainLooper()) + private val presses = mutableMapOf<Int, Press>() private val cancelled = mutableSetOf<Int>() + private var tapPending = false + private val singleTap = Runnable { tapPending = false; onTap(false) } + + private fun cancelTap() { + handler.removeCallbacks(singleTap) + tapPending = false + } fun onKeyEvent(event: KeyEvent, enabled: Boolean): Boolean { if (!enabled) cancel() @@ -12,31 +23,54 @@ class BackQamInput(private val setPressed: (Boolean) -> Unit) { val device = event.deviceId return when (event.action) { KeyEvent.ACTION_DOWN -> { - if (event.repeatCount > 0) return enabled || device in held || device in cancelled + if (event.repeatCount > 0) return enabled || device in presses || device in cancelled cancelled.remove(device) if (!enabled || event.isCanceled) return false - if (held.add(device) && held.size == 1) setPressed(true) + if (device in presses) return true + handler.removeCallbacks(singleTap) + val hold = Runnable { + val press = presses[device] ?: return@Runnable + val alreadyHeld = presses.values.any { it.held } + press.held = true + presses.values.forEach { it.used = true } + cancelTap() + if (!alreadyHeld) setPressed(true) + } + presses[device] = Press(hold, used = presses.values.any { it.held }) + handler.postDelayed(hold, 500) true } KeyEvent.ACTION_UP -> { - val released = held.remove(device) + val press = presses.remove(device) val wasCancelled = cancelled.remove(device) - if (released && held.isEmpty()) setPressed(false) - released || wasCancelled || enabled + if (press != null) { + handler.removeCallbacks(press.hold) + if (press.held && presses.values.none { it.held }) setPressed(false) + if (!press.used && !event.isCanceled) { + if (tapPending) { cancelTap(); onTap(true) } + else { tapPending = true; handler.postDelayed(singleTap, 500) } + } else if (event.isCanceled) cancelTap() + } + press != null || wasCancelled || enabled } - else -> device in held || device in cancelled + else -> device in presses || device in cancelled } } fun cancel() { - if (held.isEmpty()) return - cancelled.addAll(held) - held.clear() - setPressed(false) + cancelTap() + val wasHeld = presses.values.any { it.held } + presses.values.forEach { handler.removeCallbacks(it.hold) } + cancelled.addAll(presses.keys) + presses.clear() + if (wasHeld) setPressed(false) } fun onDeviceRemoved(device: Int) { cancelled.remove(device) - if (held.remove(device) && held.isEmpty()) setPressed(false) + val press = presses.remove(device) ?: return + handler.removeCallbacks(press.hold) + cancelTap() + if (press.held && presses.values.none { it.held }) setPressed(false) } } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt index c88666dfb5..3e0eaf8b21 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt @@ -2,6 +2,10 @@ package com.droiddeck.launcher.runtime import android.content.Context import android.content.Intent +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent import android.database.ContentObserver import android.media.AudioManager import android.net.Uri @@ -12,19 +16,20 @@ import android.os.SystemClock import android.provider.Settings import android.util.Log import com.droiddeck.launcher.core.SessionPart +import com.droiddeck.launcher.R import java.io.File import java.nio.file.Files import java.nio.file.StandardCopyOption import org.json.JSONObject import kotlin.math.roundToInt -class DeviceControlsComponent(context: Context, root: File) : SessionPart() { +class DeviceControlsComponent(context: Context, root: File, private val activityVisible: () -> Boolean = { false }) : SessionPart() { private val context = context.applicationContext private val audio = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager private val directory = directory(root) private val handler = Handler(Looper.getMainLooper()) private var running = false - private var pendingBrightness: Pair<Float, Long>? = null + private var pendingBrightness: Float? = null private var permissionRequestAt = -5_000L private var previous = "" private var revision = 0L @@ -41,10 +46,10 @@ class DeviceControlsComponent(context: Context, root: File) : SessionPart() { override fun run() { if (!running) return consume() - pendingBrightness?.let { (value, time) -> - if (SystemClock.elapsedRealtime() - time > 120_000) pendingBrightness = null - else if (Settings.System.canWrite(context)) { + pendingBrightness?.let { value -> + if (Settings.System.canWrite(context)) { pendingBrightness = null + context.getSystemService(NotificationManager::class.java).cancel(PERMISSION_NOTIFICATION) brightness(value) } } @@ -94,6 +99,7 @@ class DeviceControlsComponent(context: Context, root: File) : SessionPart() { requests.stopWatching() context.contentResolver.unregisterContentObserver(observer) pendingBrightness = null + context.getSystemService(NotificationManager::class.java).cancel(PERMISSION_NOTIFICATION) } } @@ -128,13 +134,23 @@ class DeviceControlsComponent(context: Context, root: File) : SessionPart() { private fun brightness(value: Float) { if (!Settings.System.canWrite(context)) { - pendingBrightness = value to SystemClock.elapsedRealtime() + pendingBrightness = value val now = SystemClock.elapsedRealtime() if (now - permissionRequestAt >= 5_000) { permissionRequestAt = now try { - context.startActivity(Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS, - Uri.parse("package:${context.packageName}")).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + val intent = Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS, + Uri.parse("package:${context.packageName}")).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + val manager = context.getSystemService(NotificationManager::class.java) + manager.createNotificationChannel(NotificationChannel(PERMISSION_CHANNEL, + context.getString(R.string.brightness_permission_title), NotificationManager.IMPORTANCE_DEFAULT)) + val action = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE) + manager.notify(PERMISSION_NOTIFICATION, Notification.Builder(context, PERMISSION_CHANNEL) + .setSmallIcon(R.drawable.ic_stat_session) + .setContentTitle(context.getString(R.string.brightness_permission_title)) + .setContentText(context.getString(R.string.brightness_permission_text)) + .setContentIntent(action).setOnlyAlertOnce(true).setAutoCancel(true).build()) + if (activityVisible()) context.startActivity(intent) } catch (e: Exception) { Log.w(TAG, "Could not open brightness permission", e) } @@ -161,6 +177,8 @@ class DeviceControlsComponent(context: Context, root: File) : SessionPart() { companion object { private const val TAG = "DeviceControls" + private const val PERMISSION_CHANNEL = "brightness_permission" + private const val PERMISSION_NOTIFICATION = 0x4442 private val REQUESTS = setOf("brightness.request", "volume.request", "mute.request") @JvmStatic fun directory(root: File) = File(root, "etc/droiddeck-device-controls") @JvmStatic fun prepareBacklight(context: Context, root: File): File { 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 252f94103f..c5b5f8415c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -630,7 +630,7 @@ class SessionService : Service() { networkLink.attach(this) networkLink.publish() components.add(networkLink) - val deviceControls = com.droiddeck.launcher.runtime.DeviceControlsComponent(this, root) + val deviceControls = com.droiddeck.launcher.runtime.DeviceControlsComponent(this, root) { activityVisible && screenOn } deviceControls.attach(this) deviceControls.publish() components.add(deviceControls) 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 78fc3b00cb..598995cd92 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -306,15 +306,16 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: stringResource(R.string.unfolded_controls_with_controller_hint), s.unfoldedControlsWithController, onChange = a.onUnfoldedControlsWithController, ) - if (steam && s.steamController in listOf(SessionPrefs.CONTROLLER_DECK, SessionPrefs.CONTROLLER_STEAM)) { - Note(stringResource(R.string.back_native_qam_hint)) - } else if (steam) ChoiceRow( + if (steam) ChoiceRow( host, "back-actions", stringResource(R.string.mode_back), stringResource(SessionPrefs.backActionsOrder(s.backActionsInverted)), listOf( false to stringResource(SessionPrefs.BACK_MENU_THEN_QAM), true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU), ), s.backActionsInverted, onPick = a.onBackActionsInverted, ) + if (steam && s.steamController in listOf(SessionPrefs.CONTROLLER_DECK, SessionPrefs.CONTROLLER_STEAM)) { + Note(stringResource(R.string.back_native_qam_hint)) + } } } if (tab == SheetTab.AUDIO && steam) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index bed8cccbd6..5ea179ea1c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -604,11 +604,12 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont chipModifier = focus.track(page, "keyboard-button"), onChange = a.onKeyboardButton) } } - if (a.steam && a.padType in listOf(SessionPrefs.CONTROLLER_DECK, SessionPrefs.CONTROLLER_STEAM)) { - Note(stringResource(R.string.back_native_qam_hint)) - } else if (a.steam) ChoiceRow(host, "back-actions", stringResource(R.string.mode_back), null, + if (a.steam) ChoiceRow(host, "back-actions", stringResource(R.string.mode_back), null, listOf(false to stringResource(SessionPrefs.BACK_MENU_THEN_QAM), true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU)), a.backActionsInverted, chipModifier = focus.track(page, "back-actions"), onPick = a.onBackActionsInverted) + if (a.steam && a.padType in listOf(SessionPrefs.CONTROLLER_DECK, SessionPrefs.CONTROLLER_STEAM)) { + Note(stringResource(R.string.back_native_qam_hint)) + } if (a.steam && a.unfoldedControls != null) ToggleRow(host, "unfolded-controls", stringResource(R.string.unfolded_controls), stringResource(R.string.unfolded_controls_hint), a.unfoldedControls, chipModifier = focus.track(page, "unfolded-controls"), onChange = a.onUnfoldedControls) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6cf0674c2d..0e600fceb0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -306,7 +306,9 @@ <string name="mode_controller_x360">Xbox 360 controller</string> <string name="mode_controller_note">Deck: Quick Access button and gyro. Steam Controller: the same, with grip sense on the back buttons. DualShock 4 and DualSense: gyro, and the trackpads as their touchpad. Xbox 360: open Quick Access with Guide+A.</string> <string name="mode_back">Back</string> - <string name="back_native_qam_hint">Back acts as Quick Access. Hold it with another button for Steam shortcuts.</string> + <string name="back_native_qam_hint">Hold Back for 500 ms, then press another button for Steam shortcuts. Single and double taps keep the selected actions.</string> + <string name="brightness_permission_title">Allow brightness control</string> + <string name="brightness_permission_text">Tap to allow Steam to change Android screen brightness.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Session</string> diff --git a/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt b/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt index 37a7abda0d..3b3c459925 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt @@ -1,28 +1,76 @@ package com.droiddeck.launcher.input +import android.os.Looper import android.view.KeyEvent +import java.time.Duration import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @Config(sdk = [34], manifest = Config.NONE) class BackQamInputTest { private val changes = mutableListOf<Boolean>() - private val input = BackQamInput(changes::add) + private val taps = mutableListOf<Boolean>() + private val input = BackQamInput(changes::add, taps::add) - @Test fun aHoldAndItsRepeatsProduceOnePressAndOneRelease() { + @Test fun singleTapWaitsForTheDoubleTapWindowWithoutPressingQam() { + send(KeyEvent.ACTION_DOWN) + advance(100) + send(KeyEvent.ACTION_UP) + advance(499) + assertTrue(taps.isEmpty()) + advance(1) + assertEquals(listOf(false), taps) + assertTrue(changes.isEmpty()) + } + + @Test fun doubleTapProducesOnlyTheDoubleAction() { + repeat(2) { + send(KeyEvent.ACTION_DOWN) + advance(100) + send(KeyEvent.ACTION_UP) + advance(100) + } + advance(1000) + assertEquals(listOf(true), taps) + assertTrue(changes.isEmpty()) + } + + @Test fun aHoldStartsAt500msAndNeverProducesATap() { assertTrue(send(KeyEvent.ACTION_DOWN)) + advance(499) + assertTrue(changes.isEmpty()) + advance(1) for (repeat in 1..10) assertTrue(send(KeyEvent.ACTION_DOWN, repeat = repeat)) + advance(4000) assertEquals(listOf(true), changes) assertTrue(send(KeyEvent.ACTION_UP)) + advance(1000) assertEquals(listOf(true, false), changes) + assertTrue(taps.isEmpty()) + } + + @Test fun holdingTheSecondPressCancelsTheFirstTap() { + send(KeyEvent.ACTION_DOWN) + send(KeyEvent.ACTION_UP) + advance(400) + send(KeyEvent.ACTION_DOWN) + advance(499) + assertTrue(taps.isEmpty()) + advance(1) + assertEquals(listOf(true), changes) + send(KeyEvent.ACTION_UP) + advance(1000) + assertTrue(taps.isEmpty()) } @Test fun otherButtonsAndSelectPassThroughWhileBackIsHeld() { send(KeyEvent.ACTION_DOWN) + advance(500) for (code in listOf(KeyEvent.KEYCODE_BUTTON_X, KeyEvent.KEYCODE_BUTTON_SELECT)) { for (action in listOf(KeyEvent.ACTION_DOWN, KeyEvent.ACTION_UP)) { assertFalse(input.onKeyEvent(KeyEvent(action, code), true)) @@ -37,20 +85,42 @@ class BackQamInputTest { assertFalse(send(KeyEvent.ACTION_DOWN, enabled = false)) assertFalse(send(KeyEvent.ACTION_UP, enabled = false)) assertTrue(changes.isEmpty()) + assertTrue(taps.isEmpty()) } @Test fun losingFocusReleasesQamAndConsumesTheLateRelease() { send(KeyEvent.ACTION_DOWN) + advance(500) input.cancel() input.cancel() assertTrue(send(KeyEvent.ACTION_DOWN, repeat = 1, enabled = false)) assertTrue(send(KeyEvent.ACTION_UP, enabled = false)) + advance(1000) assertEquals(listOf(true, false), changes) - assertFalse(send(KeyEvent.ACTION_UP, enabled = false)) + assertTrue(taps.isEmpty()) + } + + @Test fun cancellationBeforeTheThresholdPreventsBothHoldAndTap() { + send(KeyEvent.ACTION_DOWN) + advance(100) + input.cancel() + send(KeyEvent.ACTION_UP) + advance(1000) + assertTrue(changes.isEmpty()) + assertTrue(taps.isEmpty()) + } + + @Test fun cancellationAlsoDiscardsAPendingSingleTap() { + send(KeyEvent.ACTION_DOWN) + send(KeyEvent.ACTION_UP) + input.cancel() + advance(1000) + assertTrue(taps.isEmpty()) } @Test fun openingAnOverlayReleasesQamBeforeRoutingItsNextKey() { send(KeyEvent.ACTION_DOWN) + advance(500) assertFalse(input.onKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BUTTON_B), false)) assertTrue(send(KeyEvent.ACTION_UP, enabled = false)) assertEquals(listOf(true, false), changes) @@ -58,33 +128,39 @@ class BackQamInputTest { @Test fun repeatsAfterCancellationCannotReassertQam() { send(KeyEvent.ACTION_DOWN) + advance(500) input.cancel() assertTrue(send(KeyEvent.ACTION_DOWN, repeat = 1)) + advance(1000) assertEquals(listOf(true, false), changes) assertTrue(send(KeyEvent.ACTION_DOWN)) + advance(500) assertTrue(send(KeyEvent.ACTION_UP)) assertEquals(listOf(true, false, true, false), changes) } - @Test fun cancelledReleaseStillReleasesQam() { + @Test fun cancelledReleaseNeverProducesATap() { send(KeyEvent.ACTION_DOWN) assertTrue(input.onKeyEvent(KeyEvent(0, 100, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK, 0, 0, 4, 0, KeyEvent.FLAG_CANCELED), true)) - assertEquals(listOf(true, false), changes) + advance(1000) + assertTrue(changes.isEmpty()) + assertTrue(taps.isEmpty()) } @Test fun removingOneDeviceDoesNotReleaseAnotherDevicesHold() { send(KeyEvent.ACTION_DOWN, device = 4) send(KeyEvent.ACTION_DOWN, device = 5) + advance(500) input.onDeviceRemoved(4) - assertTrue(changes.last()) + assertEquals(listOf(true), changes) send(KeyEvent.ACTION_UP, device = 5) - assertFalse(changes.last()) - send(KeyEvent.ACTION_DOWN, device = 4) - input.onDeviceRemoved(4) - assertFalse(changes.last()) + assertEquals(listOf(true, false), changes) + assertTrue(taps.isEmpty()) } + private fun advance(millis: Long) = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(millis)) + private fun send(action: Int, repeat: Int = 0, device: Int = 4, enabled: Boolean = true) = input.onKeyEvent(KeyEvent(0, 100, action, KeyEvent.KEYCODE_BACK, repeat, 0, device, 0), enabled) } diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt index 9e0da30aa7..fa96dacc99 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.runtime import android.app.Application +import android.app.NotificationManager import android.content.Context import android.media.AudioManager import android.os.Looper @@ -24,20 +25,21 @@ import org.robolectric.annotation.Implementation import org.robolectric.shadows.ShadowSettings @RunWith(RobolectricTestRunner::class) -@Config(sdk = [28], manifest = Config.NONE, application = Application::class, shadows = [WriteSettingsShadow::class]) +@Config(sdk = [28, 33], manifest = Config.NONE, application = Application::class, shadows = [WriteSettingsShadow::class]) class DeviceControlsComponentTest { @get:Rule val tmp = TemporaryFolder() private val context get() = RuntimeEnvironment.getApplication() private val audio get() = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager private lateinit var component: DeviceControlsComponent private lateinit var directory: File + private var visible = true @Before fun start() { WriteSettingsShadow.writable = true Settings.System.putInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS, 128) val root = tmp.newFolder() directory = DeviceControlsComponent.directory(root) - component = DeviceControlsComponent(context, root) + component = DeviceControlsComponent(context, root) { visible } component.publish() component.start() shadowOf(Looper.getMainLooper()).idle() @@ -85,6 +87,35 @@ class DeviceControlsComponentTest { assertEquals(1.0, JSONObject(File(directory, "state.json").readText()).getDouble("brightness"), 0.0001) } + @Test fun hiddenPermissionRequestOffersANotificationAndRetainsTheLatestValue() { + visible = false + WriteSettingsShadow.writable = false + request("brightness", "0.25") + request("brightness", "0.75") + assertNull(shadowOf(context).nextStartedActivity) + val notifications = context.getSystemService(NotificationManager::class.java) + val notification = notifications.activeNotifications.single().notification + notification.contentIntent.send() + assertEquals(Settings.ACTION_MANAGE_WRITE_SETTINGS, shadowOf(context).nextStartedActivity.action) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofSeconds(121)) + WriteSettingsShadow.writable = true + tick() + assertEquals(192, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + assertTrue(notifications.activeNotifications.isEmpty()) + } + + @Test fun stoppingClearsThePermissionNotificationAndPendingRequest() { + visible = false + WriteSettingsShadow.writable = false + request("brightness", "0.75") + component.stop() + shadowOf(Looper.getMainLooper()).idle() + assertTrue(context.getSystemService(NotificationManager::class.java).activeNotifications.isEmpty()) + WriteSettingsShadow.writable = true + tick() + assertEquals(128, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + } + @Test fun stoppedSessionsDoNotConsumeNewCommands() { component.stop() shadowOf(Looper.getMainLooper()).idle() diff --git a/tools/aaudio-sink/android-volume.h b/tools/aaudio-sink/android-volume.h index b7f4ec9d18..6a31befeb1 100644 --- a/tools/aaudio-sink/android-volume.h +++ b/tools/aaudio-sink/android-volume.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> #include <pulsecore/core-rtclock.h> +#include <pulsecore/core-subscribe.h> struct android_volume { pa_sink *sink; @@ -59,6 +60,10 @@ static void android_volume_refresh(pa_mainloop_api *api, pa_time_event *event, c access(processing, F_OK) != 0 && access(mute_processing, F_OK) != 0 && android_volume_read(bridge->directory, &level, &maximum, &muted)) { pa_cvolume volume; + if (bridge->sink->n_volume_steps != maximum + 1) { + bridge->sink->n_volume_steps = maximum + 1; + pa_subscription_post(bridge->sink->core, PA_SUBSCRIPTION_EVENT_SINK | PA_SUBSCRIPTION_EVENT_CHANGE, bridge->sink->index); + } pa_cvolume_set(&volume, bridge->sink->sample_spec.channels, (uint64_t)level * PA_VOLUME_NORM / maximum); if (!pa_cvolume_equal(&volume, &bridge->sink->real_volume)) pa_sink_volume_changed(bridge->sink, &volume); if (bridge->sink->muted != !!muted) pa_sink_mute_changed(bridge->sink, !!muted); @@ -72,14 +77,16 @@ static void android_volume_refresh(pa_mainloop_api *api, pa_time_event *event, c static struct android_volume *android_volume_new(pa_sink *sink, const char *directory) { unsigned level, maximum, muted; - if (!directory || !android_volume_read(directory, &level, &maximum, &muted)) return NULL; + if (!directory) return NULL; struct android_volume *bridge = pa_xnew0(struct android_volume, 1); bridge->sink = sink; bridge->directory = pa_xstrdup(directory); - pa_cvolume_set(&sink->real_volume, sink->sample_spec.channels, (uint64_t)level * PA_VOLUME_NORM / maximum); - sink->reference_volume = sink->real_volume; - sink->muted = !!muted; - sink->n_volume_steps = maximum + 1; + if (android_volume_read(directory, &level, &maximum, &muted)) { + pa_cvolume_set(&sink->real_volume, sink->sample_spec.channels, (uint64_t)level * PA_VOLUME_NORM / maximum); + sink->reference_volume = sink->real_volume; + sink->muted = !!muted; + sink->n_volume_steps = maximum + 1; + } pa_cvolume_reset(&sink->soft_volume, sink->sample_spec.channels); pa_sink_set_set_volume_callback(sink, android_volume_set); pa_sink_set_set_mute_callback(sink, android_volume_mute); diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index 595563019b..4c46216c22 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -23,19 +23,21 @@ BRIGHTNESS_JS = r""" if (window.__droiddeckBrightness) return "present"; const display = SteamClient.System?.Display; if (!display?.RegisterForBrightnessChanges || !display?.SetBrightness) return "unavailable"; - const self = { expected: null, updating: true }; + const self = { expected: null, updating: true, revision: 0 }; self.set = value => { if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || value > 1) return; if (!self.updating && self.expected !== null && Math.abs(value - self.expected) < 0.0001) return; self.expected = value; self.updating = true; + const revision = ++self.revision; + setTimeout(() => { if (self.revision === revision) self.updating = false; }, 500); display.SetBrightness(value); }; self.subscription = display.RegisterForBrightnessChanges(state => { const value = state?.flBrightness; if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || value > 1 || self.expected === null) return; if (Math.abs(value - self.expected) < 0.0001) { self.updating = false; return; } - if (self.updating) return; + if (self.updating) { self.updating = false; return; } self.expected = value; if (typeof window.__BINDING__ === "function") window.__BINDING__(String(value)); }); @@ -677,6 +679,7 @@ class Helper: self.vr_launch = None self.chooser = None self.controls_state = None + self.controls_installed = False def sync_controls(self): try: @@ -685,9 +688,17 @@ class Helper: value = state.get("brightness") if isinstance(value, bool) or not isinstance(value, (int, float)) or not math.isfinite(value) or not 0 <= value <= 1: return + if not self.controls_installed: + self.page.call("Runtime.addBinding", {"name": BRIGHTNESS_BINDING}) + self.controls_installed = self.page.evaluate(BRIGHTNESS_JS) in ("installed", "present") + if not self.controls_installed: + return if state != self.controls_state: - self.page.evaluate("window.__droiddeckBrightness?.set(%s)" % json.dumps(value)) - self.controls_state = state + if self.page.evaluate("!!window.__droiddeckBrightness && (window.__droiddeckBrightness.set(%s), true)" % json.dumps(value)) is True: + self.controls_state = state + else: + self.controls_installed = False + self.controls_state = None except (OSError, ValueError, TypeError): pass @@ -762,14 +773,13 @@ class Helper: try: if page.evaluate("typeof SteamClient === 'object' && typeof SteamClient.WebUITransport === 'object'") is not True: raise LookupError("SteamClient is not ready") - if os.path.isfile(os.path.join(CONTROLS_DIR, "state.json")): - page.call("Runtime.addBinding", {"name": BRIGHTNESS_BINDING}) - page.evaluate(BRIGHTNESS_JS) - self.controls_state = None if self.files_only: page.call("Runtime.addBinding", {"name": FILE_BINDING}) page.evaluate(FILE_JS) self.page = page + self.controls_state = None + self.controls_installed = False + self.sync_controls() return True page.call("Runtime.addBinding", {"name": BINDING}) page.call("Runtime.addBinding", {"name": VR_BINDING}) @@ -789,6 +799,9 @@ class Helper: page.ws.close() raise self.page = page + self.controls_state = None + self.controls_installed = False + self.sync_controls() return True def reconcile(self): diff --git a/tools/tests/test_android_volume.py b/tools/tests/test_android_volume.py new file mode 100644 index 0000000000..8246f34fe1 --- /dev/null +++ b/tools/tests/test_android_volume.py @@ -0,0 +1,101 @@ +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + + +@unittest.skipUnless(shutil.which("cc"), "C compiler required") +class AndroidVolumeTest(unittest.TestCase): + def test_missing_or_invalid_initial_state_recovers_without_restarting_the_sink(self): + header = Path(__file__).resolve().parents[1] / "aaudio-sink/android-volume.h" + harness = r''' +#define _GNU_SOURCE +#include <assert.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> +#include <sys/time.h> +#include <unistd.h> +#define PA_VOLUME_NORM 65536U +#define PA_USEC_PER_MSEC 1000 +#define PA_SINK_INIT 0 +#define PA_SUBSCRIPTION_EVENT_SINK 1 +#define PA_SUBSCRIPTION_EVENT_CHANGE 2 +#define PA_MIN(a,b) ((a)<(b)?(a):(b)) +#define pa_xnew0(type,n) ((type*)calloc(n,sizeof(type))) +#define pa_xstrdup strdup +#define pa_xfree free +#define pa_log_warn(...) ((void)0) +typedef struct { unsigned value; } pa_cvolume; +typedef struct pa_time_event { int value; } pa_time_event; +typedef struct pa_mainloop_api { void (*time_free)(pa_time_event*); } pa_mainloop_api; +typedef struct { pa_mainloop_api *mainloop; } pa_core; +typedef struct pa_sink { + void *userdata; int state; bool muted; unsigned n_volume_steps, index; + struct { unsigned channels; } sample_spec; + pa_cvolume real_volume, reference_volume, soft_volume; + pa_core *core; + void (*set_volume)(struct pa_sink*), (*set_mute)(struct pa_sink*); +} pa_sink; +struct android_volume; +struct userdata { struct android_volume *android_volume; }; +static int restarts, frees; +static char *pa_sprintf_malloc(const char *format, ...) { + va_list ap; va_start(ap,format); char *result; assert(vasprintf(&result,format,ap)>=0); va_end(ap); return result; +} +static void pa_cvolume_set(pa_cvolume *volume, unsigned channels, unsigned value) { volume->value=value; } +static unsigned pa_cvolume_max(const pa_cvolume *volume) { return volume->value; } +static void pa_cvolume_reset(pa_cvolume *volume, unsigned channels) { volume->value=PA_VOLUME_NORM; } +static bool pa_cvolume_equal(const pa_cvolume *a, const pa_cvolume *b) { return a->value==b->value; } +static void pa_sink_volume_changed(pa_sink *sink, const pa_cvolume *volume) { sink->real_volume=*volume; } +static void pa_sink_mute_changed(pa_sink *sink, bool muted) { sink->muted=muted; } +static void pa_sink_set_set_volume_callback(pa_sink *sink, void (*callback)(pa_sink*)) { sink->set_volume=callback; } +static void pa_sink_set_set_mute_callback(pa_sink *sink, void (*callback)(pa_sink*)) { sink->set_mute=callback; } +static void pa_subscription_post(pa_core *core, int event, unsigned index) {} +static uint64_t pa_rtclock_now(void) { return 0; } +static void pa_core_rttime_restart(pa_core *core, pa_time_event *event, uint64_t time) { restarts++; } +static pa_time_event *pa_core_rttime_new(pa_core *core, uint64_t time, + void (*callback)(pa_mainloop_api*,pa_time_event*,const struct timeval*,void*), void *userdata) { + return calloc(1,sizeof(pa_time_event)); +} +static void free_timer(pa_time_event *event) { frees++; free(event); } +#include "android-volume.h" +static void state(const char *directory, const char *text) { + char *path=pa_sprintf_malloc("%s/volume.state",directory); + FILE *f=fopen(path,"w"); assert(f); fputs(text,f); fclose(f); free(path); +} +int main(int argc, char **argv) { + pa_mainloop_api api={.time_free=free_timer}; pa_core core={.mainloop=&api}; + struct userdata userdata={0}; + pa_sink sink={.userdata=&userdata,.core=&core,.state=1,.sample_spec={.channels=2},.real_volume={PA_VOLUME_NORM}}; + userdata.android_volume=android_volume_new(&sink,argv[1]); + assert(userdata.android_volume && userdata.android_volume->timer && sink.set_volume && sink.set_mute); + state(argv[1],"invalid\n"); + android_volume_refresh(&api,userdata.android_volume->timer,NULL,userdata.android_volume); + assert(sink.real_volume.value==PA_VOLUME_NORM && restarts==1); + state(argv[1],"3 15 1\n"); + android_volume_refresh(&api,userdata.android_volume->timer,NULL,userdata.android_volume); + assert(sink.real_volume.value==3*PA_VOLUME_NORM/15 && sink.muted && sink.n_volume_steps==16); + assert(sink.soft_volume.value==PA_VOLUME_NORM && restarts==2); + sink.real_volume.value=2*PA_VOLUME_NORM/3; sink.set_volume(&sink); + char *request=pa_sprintf_malloc("%s/volume.request",argv[1]); + FILE *f=fopen(request,"r"); unsigned level; assert(f && fscanf(f,"%u",&level)==1 && level==10); fclose(f); free(request); + android_volume_free(userdata.android_volume); assert(frees==1); + return 0; +} +''' + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + (root / "pulsecore").mkdir() + for name in ("core-rtclock.h", "core-subscribe.h"): + (root / "pulsecore" / name).touch() + source = root / "test.c" + source.write_text(harness) + binary = root / "test" + subprocess.run(["cc", "-std=c11", "-I", str(root), "-I", str(header.parent), + str(source), "-o", str(binary)], check=True, capture_output=True) + subprocess.run([str(binary), str(root)], check=True, capture_output=True) diff --git a/tools/tests/test_device_controls.py b/tools/tests/test_device_controls.py index 3a513a89fa..9f914c5d38 100644 --- a/tools/tests/test_device_controls.py +++ b/tools/tests/test_device_controls.py @@ -15,6 +15,8 @@ class DeviceControlsTest(unittest.TestCase): const assert = require('assert'); globalThis.window = globalThis; const requests = [], callbacks = []; +const timers = []; +globalThis.setTimeout = callback => timers.push(callback); let current = 1; window.droiddeckBrightnessChanged = value => requests.push(Number(value)); globalThis.SteamClient = { System: { Display: { @@ -39,6 +41,16 @@ assert.deepStrictEqual(requests, [0.8]); for (const value of [NaN, Infinity, -1, 2, '0.5']) callbacks.forEach(cb => cb({ flBrightness: value })); assert.deepStrictEqual(requests, [0.8]); assert.strictEqual(callbacks.length, 1); +SteamClient.System.Display.SetBrightness = value => callbacks.forEach(cb => cb({ flBrightness: value + 0.1 })); +bridge.set(0.3); +assert.deepStrictEqual(requests, [0.8]); +callbacks.forEach(cb => cb({ flBrightness: 0.6 })); +assert.deepStrictEqual(requests, [0.8, 0.6]); +SteamClient.System.Display.SetBrightness = () => {}; +bridge.set(0.65); +timers.forEach(callback => callback()); +callbacks.forEach(cb => cb({ flBrightness: 0.7 })); +assert.deepStrictEqual(requests, [0.8, 0.6, 0.7]); """ with tempfile.TemporaryDirectory() as directory: script = Path(directory) / "bridge.js" @@ -65,7 +77,8 @@ assert.strictEqual(callbacks.length, 1); globals_["CONTROLS_DIR"] = directory helper = LIVE["Helper"]("/steam", 0) calls = [] - helper.page = type("Page", (), {"evaluate": lambda self, expression: calls.append(expression)})() + helper.controls_installed = True + helper.page = type("Page", (), {"evaluate": lambda self, expression: calls.append(expression) or True})() path = Path(directory) / "state.json" path.write_text(json.dumps({"brightness": 0.5, "revision": 1})) helper.sync_controls() @@ -77,6 +90,45 @@ assert.strictEqual(callbacks.length, 1); finally: globals_["CONTROLS_DIR"] = previous + def test_display_bridge_retries_binding_and_install_before_caching_state(self): + with tempfile.TemporaryDirectory() as directory: + globals_ = LIVE["Helper"].sync_controls.__globals__ + previous = globals_["CONTROLS_DIR"] + try: + globals_["CONTROLS_DIR"] = directory + Path(directory, "state.json").write_text(json.dumps({"brightness": 0.5, "revision": 1})) + calls, installs, writes = [], ["unavailable", "installed", "present"], [] + class Page: + present = True + def call(self, method, params): + calls.append((method, params)) + def evaluate(self, expression): + if expression == LIVE["BRIGHTNESS_JS"]: + return installs.pop(0) + writes.append(expression) + return self.present + helper = LIVE["Helper"]("/steam", 0) + helper.page = Page() + helper.sync_controls() + self.assertIsNone(helper.controls_state) + self.assertFalse(writes) + helper.sync_controls() + helper.sync_controls() + self.assertEqual(len(calls), 2) + self.assertEqual(len(writes), 1) + self.assertEqual(calls[1], ("Runtime.addBinding", {"name": LIVE["BRIGHTNESS_BINDING"]})) + helper.page.present = False + Path(directory, "state.json").write_text(json.dumps({"brightness": 0.7, "revision": 2})) + helper.sync_controls() + self.assertIsNone(helper.controls_state) + self.assertFalse(helper.controls_installed) + helper.page.present = True + helper.sync_controls() + self.assertEqual(len(calls), 3) + self.assertEqual(helper.controls_state["brightness"], 0.7) + finally: + globals_["CONTROLS_DIR"] = previous + if __name__ == "__main__": unittest.main() From 749ade4a45018b47bf50d9e8ef932e5895aebb20 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 13:20:51 -0400 Subject: [PATCH 089/135] fix(input): delay held QAM to 700 ms --- .../droiddeck/launcher/input/BackQamInput.kt | 2 +- .../droiddeck/launcher/ui/SessionOverlay.kt | 3 --- app/src/main/res/values/strings.xml | 2 +- .../launcher/input/BackQamInputTest.kt | 27 ++++++++++++------- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt b/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt index ef8042aa67..83e1adafbf 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt @@ -37,7 +37,7 @@ class BackQamInput(private val setPressed: (Boolean) -> Unit, private val onTap: if (!alreadyHeld) setPressed(true) } presses[device] = Press(hold, used = presses.values.any { it.held }) - handler.postDelayed(hold, 500) + handler.postDelayed(hold, 700) true } KeyEvent.ACTION_UP -> { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 5ea179ea1c..b526bea285 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -607,9 +607,6 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont if (a.steam) ChoiceRow(host, "back-actions", stringResource(R.string.mode_back), null, listOf(false to stringResource(SessionPrefs.BACK_MENU_THEN_QAM), true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU)), a.backActionsInverted, chipModifier = focus.track(page, "back-actions"), onPick = a.onBackActionsInverted) - if (a.steam && a.padType in listOf(SessionPrefs.CONTROLLER_DECK, SessionPrefs.CONTROLLER_STEAM)) { - Note(stringResource(R.string.back_native_qam_hint)) - } if (a.steam && a.unfoldedControls != null) ToggleRow(host, "unfolded-controls", stringResource(R.string.unfolded_controls), stringResource(R.string.unfolded_controls_hint), a.unfoldedControls, chipModifier = focus.track(page, "unfolded-controls"), onChange = a.onUnfoldedControls) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0e600fceb0..840e26ebb6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -306,7 +306,7 @@ <string name="mode_controller_x360">Xbox 360 controller</string> <string name="mode_controller_note">Deck: Quick Access button and gyro. Steam Controller: the same, with grip sense on the back buttons. DualShock 4 and DualSense: gyro, and the trackpads as their touchpad. Xbox 360: open Quick Access with Guide+A.</string> <string name="mode_back">Back</string> - <string name="back_native_qam_hint">Hold Back for 500 ms, then press another button for Steam shortcuts. Single and double taps keep the selected actions.</string> + <string name="back_native_qam_hint">Hold Back for 700 ms, then press another button for Steam shortcuts. Single and double taps keep the selected actions.</string> <string name="brightness_permission_title">Allow brightness control</string> <string name="brightness_permission_text">Tap to allow Steam to change Android screen brightness.</string> <string name="back_menu_then_qam">Menu → QAM</string> diff --git a/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt b/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt index 3b3c459925..8006a495b2 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt @@ -40,9 +40,9 @@ class BackQamInputTest { assertTrue(changes.isEmpty()) } - @Test fun aHoldStartsAt500msAndNeverProducesATap() { + @Test fun aHoldStartsAt700msAndNeverProducesATap() { assertTrue(send(KeyEvent.ACTION_DOWN)) - advance(499) + advance(699) assertTrue(changes.isEmpty()) advance(1) for (repeat in 1..10) assertTrue(send(KeyEvent.ACTION_DOWN, repeat = repeat)) @@ -54,12 +54,21 @@ class BackQamInputTest { assertTrue(taps.isEmpty()) } + @Test fun releasingBetween500And700msStillProducesASingleTap() { + send(KeyEvent.ACTION_DOWN) + advance(600) + send(KeyEvent.ACTION_UP) + advance(500) + assertEquals(listOf(false), taps) + assertTrue(changes.isEmpty()) + } + @Test fun holdingTheSecondPressCancelsTheFirstTap() { send(KeyEvent.ACTION_DOWN) send(KeyEvent.ACTION_UP) advance(400) send(KeyEvent.ACTION_DOWN) - advance(499) + advance(699) assertTrue(taps.isEmpty()) advance(1) assertEquals(listOf(true), changes) @@ -70,7 +79,7 @@ class BackQamInputTest { @Test fun otherButtonsAndSelectPassThroughWhileBackIsHeld() { send(KeyEvent.ACTION_DOWN) - advance(500) + advance(700) for (code in listOf(KeyEvent.KEYCODE_BUTTON_X, KeyEvent.KEYCODE_BUTTON_SELECT)) { for (action in listOf(KeyEvent.ACTION_DOWN, KeyEvent.ACTION_UP)) { assertFalse(input.onKeyEvent(KeyEvent(action, code), true)) @@ -90,7 +99,7 @@ class BackQamInputTest { @Test fun losingFocusReleasesQamAndConsumesTheLateRelease() { send(KeyEvent.ACTION_DOWN) - advance(500) + advance(700) input.cancel() input.cancel() assertTrue(send(KeyEvent.ACTION_DOWN, repeat = 1, enabled = false)) @@ -120,7 +129,7 @@ class BackQamInputTest { @Test fun openingAnOverlayReleasesQamBeforeRoutingItsNextKey() { send(KeyEvent.ACTION_DOWN) - advance(500) + advance(700) assertFalse(input.onKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BUTTON_B), false)) assertTrue(send(KeyEvent.ACTION_UP, enabled = false)) assertEquals(listOf(true, false), changes) @@ -128,13 +137,13 @@ class BackQamInputTest { @Test fun repeatsAfterCancellationCannotReassertQam() { send(KeyEvent.ACTION_DOWN) - advance(500) + advance(700) input.cancel() assertTrue(send(KeyEvent.ACTION_DOWN, repeat = 1)) advance(1000) assertEquals(listOf(true, false), changes) assertTrue(send(KeyEvent.ACTION_DOWN)) - advance(500) + advance(700) assertTrue(send(KeyEvent.ACTION_UP)) assertEquals(listOf(true, false, true, false), changes) } @@ -151,7 +160,7 @@ class BackQamInputTest { @Test fun removingOneDeviceDoesNotReleaseAnotherDevicesHold() { send(KeyEvent.ACTION_DOWN, device = 4) send(KeyEvent.ACTION_DOWN, device = 5) - advance(500) + advance(700) input.onDeviceRemoved(4) assertEquals(listOf(true), changes) send(KeyEvent.ACTION_UP, device = 5) From a984d11742c28c73892dfc2cef3ca51fbd19606e Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 12:59:08 -0400 Subject: [PATCH 090/135] fix: run Xbox games from a short drive letter The launch view lives under the app's files folder, so games saw an install path like Z:\data\user\0\com.droiddeck.launcher\files\xbox-runtime \views\launch-<n>\droiddeck-xbox-<id>. Forza Horizon checks that length and quits with "Installation path is too long". The view is now mapped to a free drive letter in the prefix (X: first) for the length of the launch. --- .../overlay/usr/local/bin/droiddeck-xbox | 34 +++++++++++++++- tools/tests/test_xbox_launch.py | 40 +++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox index f8aaff7b1b..9382f2deba 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox @@ -27,6 +27,7 @@ CLASSES = { 'Windows.Storage.Streams.DataWriter'), } CLASS_KEY = 'Software\\Microsoft\\WindowsRuntime\\ActivatableClassId\\' +VIEW_DRIVES = 'xwvutsrqponmlkjihgfe' def bridge(upstream): @@ -137,6 +138,29 @@ def register_classes(proton, prefix, env): print('droiddeck-xbox: Windows Runtime class registration failed; launching without it', file=sys.stderr) +def view_drive(prefix, exe): + path = Path(exe) + view = next((parent for parent in path.parents if parent.name.startswith('droiddeck-xbox-')), None) + if not path.is_absolute() or view is None: + return exe, None + devices = prefix / 'dosdevices' + for letter in VIEW_DRIVES: + link = devices / (letter + ':') + staged = devices / ('.%s-%s' % (letter, secrets.token_hex(4))) + try: + if os.path.lexists(link) and (os.path.exists(link) or not os.readlink(link).startswith(str(view.parent.parent) + '/')): + continue + devices.mkdir(parents=True, exist_ok=True) + staged.symlink_to(view) + os.replace(staged, link) + except OSError: + if os.path.lexists(staged): + staged.unlink() + continue + return letter.upper() + ':\\' + str(path.relative_to(view)).replace('/', '\\'), link + return exe, None + + def wine(argv, source_env=None): source_env = os.environ if source_env is None else source_env with open(source_env['DROIDDECK_XBOX_COMMAND_FILE'], encoding='utf-8') as file: @@ -163,7 +187,15 @@ def wine(argv, source_env=None): register_classes(command[0], prefix, env) overrides = ';'.join(name[:-4] + '=n' for name in DLLS if name != 'libnghttp2.dll') env['WINEDLLOVERRIDES'] = overrides + ';' + env.get('WINEDLLOVERRIDES', '') - return subprocess.call([*command[:2], argv[0], *command[3:]], env=env) + exe, drive = view_drive(prefix, argv[0]) + try: + return subprocess.call([*command[:2], exe, *command[3:]], env=env) + finally: + if drive is not None: + try: + drive.unlink() + except OSError: + pass def renew_lease(ask, channel, product, lease, stopped): diff --git a/tools/tests/test_xbox_launch.py b/tools/tests/test_xbox_launch.py index 3ed2cf6c10..370c694dfd 100644 --- a/tools/tests/test_xbox_launch.py +++ b/tools/tests/test_xbox_launch.py @@ -136,6 +136,46 @@ class XboxLaunchTest(unittest.TestCase): self.assertNotIn('DROIDDECK_XBOX_COMMAND_FILE', child_env) self.assertEqual(child_env['XODUS_BRIDGE_KEY'], 'runtime-key') + def test_launch_view_runs_from_a_short_drive_letter(self): + with tempfile.TemporaryDirectory() as root: + root = Path(root) + prefix = root / 'compat/pfx' + prefix.mkdir(parents=True) + runtime = root / 'runtime/windows'; runtime.mkdir(parents=True) + for name in xbox['DLLS']: + (runtime / name).write_bytes(b'MZ-synthetic') + view = root / 'files/xbox-runtime/views/launch-4093691424/droiddeck-xbox-1ZpM3D' + (view / 'Bin').mkdir(parents=True) + command = root / 'command.json' + command.write_text(json.dumps(['/selected/proton', 'waitforexitandrun', '/encrypted/Game.exe'])) + env = {'STEAM_COMPAT_DATA_PATH': str(prefix.parent), 'DROIDDECK_XBOX_COMMAND_FILE': str(command)} + seen = [] + def call(argv, **kwargs): + seen.append((argv, os.readlink(prefix / 'dosdevices/x:'))) + return 0 + with patch.dict(os.environ, env), patch.dict(xbox['wine'].__globals__, RUNTIME=runtime.parent), patch('subprocess.run') as initialize, patch('subprocess.call', side_effect=call): + initialize.return_value.returncode = 0 + self.assertEqual(xbox['wine']([str(view / 'Bin/Game.exe')]), 0) + self.assertEqual(seen, [(['/selected/proton', 'waitforexitandrun', 'X:\\Bin\\Game.exe'], str(view))]) + self.assertFalse(os.path.lexists(prefix / 'dosdevices/x:')) + + def test_view_drive_keeps_drives_in_use_and_reuses_a_stale_view(self): + with tempfile.TemporaryDirectory() as root: + root = Path(root) + devices = root / 'pfx/dosdevices'; devices.mkdir(parents=True) + views = root / 'views' + live = views / 'launch-1/droiddeck-xbox-live'; live.mkdir(parents=True) + view = views / 'launch-2/droiddeck-xbox-new'; view.mkdir(parents=True) + (devices / 'x:').symlink_to(live) + (devices / 'w:').symlink_to(root / 'games') + (devices / 'v:').symlink_to(views / 'launch-0/droiddeck-xbox-gone') + exe, link = xbox['view_drive'](root / 'pfx', str(view / 'Game.exe')) + self.assertEqual((exe, link), ('V:\\Game.exe', devices / 'v:')) + self.assertEqual(os.readlink(devices / 'v:'), str(view)) + self.assertEqual(os.readlink(devices / 'x:'), str(live)) + self.assertEqual(sorted(p.name for p in devices.iterdir()), ['v:', 'w:', 'x:']) + self.assertEqual(xbox['view_drive'](root / 'pfx', '/games/Game.exe'), ('/games/Game.exe', None)) + def test_missing_runtime_classes_are_registered_once(self): with tempfile.TemporaryDirectory() as root: prefix = Path(root) From 4d7ceb2325a0fec6e72458bba60398e94bbd1d9a Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 13:27:03 -0400 Subject: [PATCH 091/135] fix(steam): drain queued control notifications --- .../usr/local/bin/droiddeck-steam-compat | 3 +- tools/tests/test_device_controls.py | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index 4c46216c22..126afe0505 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -959,7 +959,8 @@ class Helper: sources = [self.page.ws] + ([watcher] if watcher.fileno() >= 0 else []) if self.chooser is not None: sources.append(self.chooser[1].stdout) - ready = [self.page.ws] if self.page.ws.pending() else select.select(sources, [], [], 0.25)[0] + queued = self.page.ws.pending() or bool(self.page.events) + ready = [self.page.ws] if queued else select.select(sources, [], [], 0.25)[0] if self.chooser is not None and self.chooser[1].stdout in ready: self.chooser_done() due = False diff --git a/tools/tests/test_device_controls.py b/tools/tests/test_device_controls.py index 9f914c5d38..091d29a5a5 100644 --- a/tools/tests/test_device_controls.py +++ b/tools/tests/test_device_controls.py @@ -4,12 +4,49 @@ import runpy import subprocess import tempfile import unittest +from unittest import mock BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" LIVE = runpy.run_path(str(BIN / "droiddeck-steam-compat")) class DeviceControlsTest(unittest.TestCase): + def test_sync_controls_queued_notifications_are_processed_without_another_frame(self): + with tempfile.TemporaryDirectory() as directory: + Path(directory, "state.json").write_text(json.dumps({"brightness": 0.5, "revision": 1})) + helper = LIVE["Helper"]("/steam", 0) + helper.controls_installed = True + page = mock.Mock(events=[]) + page.ws.pending.return_value = False + helper.page = page + payload = json.dumps({"id": 1, "options": {"strTitle": "Pick a file"}}) + def evaluate(expression): + for name, value in [(LIVE["BRIGHTNESS_BINDING"], "0.4"), (LIVE["FILE_BINDING"], payload)]: + page.events.append({"method": "Runtime.bindingCalled", "params": {"name": name, "payload": value}}) + return True + def drain(): + events, page.events = page.events, [] + return events + page.evaluate.side_effect = evaluate + page.drain.side_effect = drain + helper.reconcile = mock.Mock() + helper.ensure_tools = mock.Mock(side_effect=[None, StopIteration]) + helper.open_chooser = mock.Mock() + watcher = mock.Mock() + watcher.fileno.return_value = -1 + watcher.changed.return_value = False + globals_ = LIVE["Helper"].serve.__globals__ + with mock.patch.dict(globals_, {"CONTROLS_DIR": directory, + "brightness_request": lambda value: LIVE["brightness_request"](value, directory)}), \ + mock.patch.dict(globals_["COMPAT"], {"state_path": lambda name: str(Path(directory, name))}), \ + mock.patch.object(globals_["select"], "select", return_value=([], [], [])) as select_: + with self.assertRaises(StopIteration): + helper.serve(watcher) + self.assertEqual(float(Path(directory, "brightness.request").read_text()), 0.4) + helper.open_chooser.assert_called_once_with(payload) + self.assertEqual(page.events, []) + select_.assert_not_called() + def test_native_brightness_notifications_do_not_echo_android_readback(self): harness = r""" const assert = require('assert'); From 13493d44c38306ea3dd165210a5a61175fb8a179 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 13:10:16 -0400 Subject: [PATCH 092/135] fix: keep Sentry for Godot games that are not .NET The Sentry GDExtension was turned off for every Godot game that ships it, because its crash handler takes the .NET runtime down under FEX. GDScript games such as Pathogenic call SentrySDK from their scripts, so without the extension their autoloads fail to parse and the game quits. Only Godot .NET builds have it turned off now. --- tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env | 2 +- tools/tests/test_game_environment.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index f8b4acaebb..a854bb1d7b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -103,7 +103,7 @@ def godot_vulkan(game): @fix def godot_sentry(game): sentry = sorted(n[:-4] for n in game.files if n.startswith("libsentry.windows.") and n.endswith(".dll")) - if is_godot(game) and sentry: + if is_godot(game) and sentry and ("coreclr.dll" in game.files or "godotsharp.dll" in game.files): return {"WINEDLLOVERRIDES": ";".join(n + "=d" for n in sentry)}, [], "Godot: Sentry crash handler off" diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index ae7c2b95d7..b4bc05aada 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -302,6 +302,13 @@ class GameEnvironmentTest(unittest.TestCase): self.assertEqual(env["WINEDLLOVERRIDES"], "libsentry.windows.release.x86_64=d") self.assertEqual(extra, ["--rendering-driver", "vulkan"]) self.assertEqual(MODULE["engine_fixes"](str(game / "Game.exe"), ["--rendering-driver", "opengl3"])[1], []) + script = Path(tmp) / "GDScript Game" + script.mkdir() + for name in ("Game.exe", "Game.pck", "libsentry.windows.release.x86_64.dll"): + (script / name).touch() + env, extra, notes = MODULE["engine_fixes"](str(script / "Game.exe"), []) + self.assertNotIn("WINEDLLOVERRIDES", env) + self.assertEqual(extra, ["--rendering-driver", "vulkan"]) other = Path(tmp) / "Other" other.mkdir() (other / "Other.exe").touch() From 5bdf0d6b04b21f237bda32910d7eec79e949f7cf Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 12:24:07 -0400 Subject: [PATCH 093/135] fix(fex): report the x86 platform under AT_PLATFORM --- tools/fex/patches/0004-auxv-at-platform.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 tools/fex/patches/0004-auxv-at-platform.patch diff --git a/tools/fex/patches/0004-auxv-at-platform.patch b/tools/fex/patches/0004-auxv-at-platform.patch new file mode 100644 index 0000000000..f8b2de587b --- /dev/null +++ b/tools/fex/patches/0004-auxv-at-platform.patch @@ -0,0 +1,12 @@ +diff --git a/Source/Tools/FEXInterpreter/ELFCodeLoader.h b/Source/Tools/FEXInterpreter/ELFCodeLoader.h +--- a/Source/Tools/FEXInterpreter/ELFCodeLoader.h ++++ b/Source/Tools/FEXInterpreter/ELFCodeLoader.h +@@ -640,7 +640,7 @@ + AuxVariables.emplace_back(auxv_t {16, HWCap}); // AT_HWCAP + AuxVariables.emplace_back(auxv_t {26, HWCap2}); // AT_HWCAP2 + AuxVariables.emplace_back(auxv_t {51, CalculateSignalStackSize()}); // AT_MINSIGSTKSZ +- AuxPlatform = &AuxVariables.emplace_back(auxv_t {24, ~0ULL}); // AT_PLATFORM ++ AuxPlatform = &AuxVariables.emplace_back(auxv_t {15, ~0ULL}); // AT_PLATFORM + AuxExecFN = &AuxVariables.emplace_back(auxv_t {AT_EXECFN, ~0ULL}); // AT_EXECFN + + if (Is64BitMode()) { From 7e2d13b64183fac248a61293431a9f9721852f48 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 12:45:00 -0400 Subject: [PATCH 094/135] fix(fex): x86 programs use DroidDeck's own FEX build, kept to the catalog's version --- .../droiddeck/launcher/FrontEndActivity.kt | 2 +- .../droiddeck/launcher/session/FexCatalog.kt | 4 +- .../launcher/session/SessionFiles.kt | 1 + .../launcher/session/SessionService.kt | 2 +- .../overlay/usr/local/bin/droiddeck-fex | 17 ++++ .../usr/local/bin/droiddeck-fex-update | 81 +++++++++++++++++++ .../overlay/usr/local/bin/droiddeck-steam-x64 | 76 +---------------- tools/tests/test_droiddeck_fex.py | 33 ++++++++ tools/tests/test_fex_install.py | 2 +- tools/tests/test_fex_select.py | 6 +- 10 files changed, 142 insertions(+), 82 deletions(-) create mode 100755 tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 8bf9166f0c..a80e3c5d61 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -2124,7 +2124,7 @@ class FrontEndActivity : ComponentActivity() { val scanGeneration = ++libraryScanGeneration val artRefreshesAtStart = HashMap(steamArtRefreshes) if (shortcutPicker) shortcutLibraryScanning = true - if (SessionPrefs.steamClientArch(this) == "x86_64" && !OfflineMode.enabled(this)) { + if (!OfflineMode.enabled(this)) { Thread({ com.droiddeck.launcher.session.FexCatalog.refresh(this) }, "fex-catalog").start() } Thread({ diff --git a/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt b/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt index 73f42cb141..92cd7652da 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt @@ -8,7 +8,7 @@ import org.json.JSONObject import java.io.File /** - * The FEX build DroidDeck-Components' fex.json names for the x86-64 client. A session uses the last copy read. + * The FEX build DroidDeck-Components' fex.json names for x86 programs. A session uses the last copy read. * Components' build-fex.yml replaces the archive on its single `fex` release and records the build's version; * a release per build (fex-2610-r5) is still read. */ @@ -62,7 +62,7 @@ object FexCatalog { return build } - /** For droiddeck-steam-x64: the build and every source its archive may come from (it checks the sha256). */ + /** For droiddeck-fex-update: the build and every source its archive may come from (it checks the sha256). */ fun environment(build: Build, sources: List<String> = DownloadSource.candidates(build.url)): List<String> = listOf( "BL_FEX_TAG=${build.tag}", "BL_FEX_SHA256=${build.sha256}", diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 0e10fca293..d9c59b1b88 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -81,6 +81,7 @@ object SessionFiles { "usr/local/bin/droiddeck-steam-games" to "usr/local/bin/droiddeck-steam-games", "usr/local/bin/droiddeck-pad-defaults" to "usr/local/bin/droiddeck-pad-defaults", "usr/local/bin/droiddeck-steam-x64" to "usr/local/bin/droiddeck-steam-x64", + "usr/local/bin/droiddeck-fex-update" to "usr/local/bin/droiddeck-fex-update", "usr/local/bin/droiddeck-steamrt-shim" to "usr/local/bin/droiddeck-steamrt-shim", "usr/local/bin/droiddeck-x64-arm-proton" to "usr/local/bin/droiddeck-x64-arm-proton", "usr/local/bin/droiddeck-x64-arm-webhelper" to "usr/local/bin/droiddeck-x64-arm-webhelper", 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 b6f35f96a1..c85f11bbaf 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -777,8 +777,8 @@ class SessionService : Service() { SessionArtifacts.recordClient(it, arch) SessionArtifacts.markSteamLogs(it, File(SessionPrefs.steamRoot(this, arch), "logs")) } - if (arch == "x86_64") FexCatalog.cached(this)?.let { guest.addAll(FexCatalog.environment(it)) } } + FexCatalog.cached(this)?.let { guest.addAll(FexCatalog.environment(it)) } if (SessionState.mode == MODE_STEAM) { guest.add("BL_GAMESCOPE_STRETCH_16X9=" + (if (SessionPrefs.stretch16x9(this)) "1" else "0")) } diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex index 6ca792143d..ad4232a350 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex @@ -27,6 +27,8 @@ PRELOADS = "/usr/local/lib/droiddeck-fex" URUNTIME = "/usr/local/lib/droiddeck/uruntime" HOST_PRELOAD = "/etc/ld.so.preload" FEX_APPID = "3127680" +OWN_FEX = "/usr/local" +OWN_FEX_TAG = os.path.join(OWN_FEX, "share", "fex-emu", ".droiddeck-tag") SNIPER_APPID = "1628350" SLR4_APPID = "4183110" INSTALL_DIRS = {FEX_APPID: "FEX-Emu", SNIPER_APPID: "SteamLinuxRuntime_sniper", SLR4_APPID: "SteamLinuxRuntime_4"} @@ -152,8 +154,21 @@ def first_dir(prefix, candidates): return None +def update_own_fex(): + wanted = os.environ.get("BL_FEX_TAG") + if not wanted: + return + if (read_text(OWN_FEX_TAG) or "").strip() == wanted and os.access(os.path.join(OWN_FEX, "bin", "FEX"), os.X_OK): + return + say("installing DroidDeck's FEX build %s" % wanted) + if subprocess.call([os.path.join(BIN_DIR, "droiddeck-fex-update")], stdout=sys.stderr) != 0: + say("DroidDeck's FEX build %s did not install; using the FEX already here" % wanted) + + def fex_install(): prefixes = [] + if os.path.isfile(OWN_FEX_TAG): + prefixes.append((OWN_FEX, False)) tool = app_dir(FEX_APPID) if tool: prefixes += [(os.path.join(tool, sub), True) for sub in ("usr", "", "files/usr", "files")] @@ -445,6 +460,7 @@ def describe(fex, platform, graphics=None): def prepare(app=SNIPER_APPID): with locked(): + update_own_fex() fex = fex_install() platform = runtime_platform(app) status = describe(fex, platform) @@ -730,6 +746,7 @@ def extracted(): def want_fex(): with locked(): + update_own_fex() status = describe(fex_install(), runtime_platform(), graphics_platform()) if not status["ready"]: request_install() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update new file mode 100755 index 0000000000..33346cfbb6 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update @@ -0,0 +1,81 @@ +#!/bin/bash +FEX_TAG=fex-2610-r5 +FEX_SHA256=0fc1ca2ba13817ad70d1ea157119a75c9c02446b57d166e6d676cce0807c19c4 +FEX_URL=https://github.com/Droid-Deck/DroidDeck-Components/releases/download/$FEX_TAG/fex.tzst + +# Whether every program in the FEX tree at $1 finds its libraries (r4 did not without libxxhash). +fex_loads() { + local b out + for b in FEX FEXServer unsquashfs; do + out=$(/usr/lib/ld-linux-aarch64.so.1 --list "$1/usr/local/bin/$b" 2>&1) && ! grep -q "not found" <<<"$out" && continue + echo "== FEX check: $b: $(grep -E "not found|error" <<<"$out" | tr -s '\t ' ' ' | tr '\n' ';')" >&2 + return 1 + done +} + +# Installs one FEX build only once its archive matches the sha256 and it loads. The files it replaces are kept +# until the installed copy loads too, and put back otherwise; the tag is written last. +fex_install() { + local tag=$1 sha=$2 urls=$3 dst=/ tmp u f + tmp=$(mktemp -d) + for u in $urls; do + curl -fsSL --retry 2 "$u" -o "$tmp/fex.tzst" && echo "$sha $tmp/fex.tzst" | sha256sum -c --quiet >/dev/null 2>&1 && break + rm -f "$tmp/fex.tzst" + done + if [ ! -s "$tmp/fex.tzst" ]; then + echo "== FEX $tag: no source gave the archive with sha256 ${sha:0:12}" >&2 + rm -rf "$tmp" + return 1 + fi + if ! { mkdir "$tmp/root" && zstd -dc "$tmp/fex.tzst" | tar -C "$tmp/root" -x && fex_loads "$tmp/root"; }; then + rm -rf "$tmp" + return 1 + fi + (cd "$tmp/root" && find . ! -type d) > "$tmp/files" + mkdir "$tmp/old" + while IFS= read -r f; do + f=${f#./} + if [ -e "$dst$f" ] || [ -L "$dst$f" ]; then + cp -a --parents "$dst$f" "$tmp/old" || { echo "== FEX $tag: could not keep $dst$f aside" >&2; rm -rf "$tmp"; return 1; } + fi + done < "$tmp/files" + if tar -C "$tmp/root" -c . | tar -C "$dst" -x && fex_loads "$dst" && + mkdir -p "${dst}usr/local/share/fex-emu" && echo "$tag" > "${dst}usr/local/share/fex-emu/.droiddeck-tag"; then + rm -rf "$tmp" + return 0 + fi + echo "== FEX $tag: the installed copy did not load or its tag was not written; putting the previous files back" >&2 + while IFS= read -r f; do + f=${f#./} + [ -e "$tmp/old/$dst$f" ] || [ -L "$tmp/old/$dst$f" ] || rm -f "$dst$f" + done < "$tmp/files" + tar -C "$tmp/old$dst" -c . | tar -C "$dst" -x || echo "== FEX $tag: could not put the previous files back" >&2 + rm -rf "$tmp" + return 1 +} + +# The build DroidDeck-Components' fex.json names (the app passes it as BL_FEX_*) comes first, then a working +# installed one, then FEX_TAG above. Sets FEX_NOW and FEX_FROM. +fex_ready() { + local have ok= + have=$(cat /usr/local/share/fex-emu/.droiddeck-tag 2>/dev/null || true) + [ -x /usr/local/bin/FEX ] && fex_loads / && ok=1 + if [ -n "${BL_FEX_TAG:-}" ]; then + if [ -n "$ok" ] && [ "$have" = "$BL_FEX_TAG" ]; then FEX_NOW=$have FEX_FROM=catalog; return 0; fi + step "downloading FEX ($BL_FEX_TAG)" + if fex_install "$BL_FEX_TAG" "${BL_FEX_SHA256:-}" "${BL_FEX_URLS:-}"; then FEX_NOW=$BL_FEX_TAG FEX_FROM=catalog; return 0; fi + if [ -n "$ok" ]; then FEX_NOW=$have FEX_FROM="kept; $BL_FEX_TAG did not install"; return 0; fi + fi + if [ -n "$ok" ] && [ "$have" = "$FEX_TAG" ]; then FEX_NOW=$have FEX_FROM=built-in; return 0; fi + step "downloading FEX ($FEX_TAG)" + if fex_install "$FEX_TAG" "$FEX_SHA256" "$FEX_URL"; then FEX_NOW=$FEX_TAG FEX_FROM=built-in; return 0; fi + if [ -n "$ok" ]; then FEX_NOW=$have FEX_FROM="kept; $FEX_TAG did not install"; return 0; fi + return 1 +} + +if [ "${BASH_SOURCE[0]}" = "$0" ]; then + set -eu + step() { echo "== STEP $*" >&2; } + fex_ready || exit 1 + echo "$FEX_NOW ($FEX_FROM)" +fi diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 index 8461fdf8a6..17d4490f17 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 @@ -1,8 +1,5 @@ #!/bin/bash set -eu -FEX_TAG=fex-2610-r5 -FEX_SHA256=0fc1ca2ba13817ad70d1ea157119a75c9c02446b57d166e6d676cce0807c19c4 -FEX_URL=https://github.com/Droid-Deck/DroidDeck-Components/releases/download/$FEX_TAG/fex.tzst ROOTFS_URL=https://github.com/Droid-Deck/DroidDeck-Components/releases/download/fex-rootfs-ubuntu-24.04-2026-08-11/Ubuntu_24_04.sqsh ROOTFS_SHA256=2854b06d3ff1b8f6e526135bfb6dd5b7b30ab3ab73e79ae933a3d9fed959a178 CDN=https://client-update.fastly.steamstatic.com @@ -18,6 +15,7 @@ ARM_STEAM=${XDG_DATA_HOME:-$REAL_HOME/.local/share}/Steam LOG=$X64_HOME/steam-x64.log mkdir -p "$X64_HOME" step() { echo "== STEP $(date -u +%H:%M:%S) $*" | tee -a "$LOG"; } +. "${BASH_SOURCE[0]%/*}/droiddeck-fex-update" x64_default_dir() { local d @@ -319,76 +317,6 @@ print("droiddeck-steam-x64: %d Linux title(s) on DroidDeck direct (%d on the new PY } -# Whether every program in the FEX tree at $1 finds its libraries (r4 did not without libxxhash). -fex_loads() { - local b out - for b in FEX FEXServer unsquashfs; do - out=$(/usr/lib/ld-linux-aarch64.so.1 --list "$1/usr/local/bin/$b" 2>&1) && ! grep -q "not found" <<<"$out" && continue - echo "== FEX check: $b: $(grep -E "not found|error" <<<"$out" | tr -s '\t ' ' ' | tr '\n' ';')" >&2 - return 1 - done -} - -# Installs one FEX build only once its archive matches the sha256 and it loads. The files it replaces are kept -# until the installed copy loads too, and put back otherwise; the tag is written last. -fex_install() { - local tag=$1 sha=$2 urls=$3 dst=/ tmp u f - tmp=$(mktemp -d) - for u in $urls; do - curl -fsSL --retry 2 "$u" -o "$tmp/fex.tzst" && echo "$sha $tmp/fex.tzst" | sha256sum -c --quiet >/dev/null 2>&1 && break - rm -f "$tmp/fex.tzst" - done - if [ ! -s "$tmp/fex.tzst" ]; then - echo "== FEX $tag: no source gave the archive with sha256 ${sha:0:12}" >&2 - rm -rf "$tmp" - return 1 - fi - if ! { mkdir "$tmp/root" && zstd -dc "$tmp/fex.tzst" | tar -C "$tmp/root" -x && fex_loads "$tmp/root"; }; then - rm -rf "$tmp" - return 1 - fi - (cd "$tmp/root" && find . ! -type d) > "$tmp/files" - mkdir "$tmp/old" - while IFS= read -r f; do - f=${f#./} - if [ -e "$dst$f" ] || [ -L "$dst$f" ]; then - cp -a --parents "$dst$f" "$tmp/old" || { echo "== FEX $tag: could not keep $dst$f aside" >&2; rm -rf "$tmp"; return 1; } - fi - done < "$tmp/files" - if tar -C "$tmp/root" -c . | tar -C "$dst" -x && fex_loads "$dst" && - mkdir -p "${dst}usr/local/share/fex-emu" && echo "$tag" > "${dst}usr/local/share/fex-emu/.droiddeck-tag"; then - rm -rf "$tmp" - return 0 - fi - echo "== FEX $tag: the installed copy did not load or its tag was not written; putting the previous files back" >&2 - while IFS= read -r f; do - f=${f#./} - [ -e "$tmp/old/$dst$f" ] || [ -L "$tmp/old/$dst$f" ] || rm -f "$dst$f" - done < "$tmp/files" - tar -C "$tmp/old$dst" -c . | tar -C "$dst" -x || echo "== FEX $tag: could not put the previous files back" >&2 - rm -rf "$tmp" - return 1 -} - -# The build DroidDeck-Components' fex.json names (the app passes it as BL_FEX_*) comes first, then a working -# installed one, then FEX_TAG above. Sets FEX_NOW and FEX_FROM. -x64_fex() { - local have ok= - have=$(cat /usr/local/share/fex-emu/.droiddeck-tag 2>/dev/null || true) - [ -x /usr/local/bin/FEX ] && fex_loads / && ok=1 - if [ -n "${BL_FEX_TAG:-}" ]; then - if [ -n "$ok" ] && [ "$have" = "$BL_FEX_TAG" ]; then FEX_NOW=$have FEX_FROM=catalog; return 0; fi - step "downloading FEX ($BL_FEX_TAG)" - if fex_install "$BL_FEX_TAG" "${BL_FEX_SHA256:-}" "${BL_FEX_URLS:-}"; then FEX_NOW=$BL_FEX_TAG FEX_FROM=catalog; return 0; fi - if [ -n "$ok" ]; then FEX_NOW=$have FEX_FROM="kept; $BL_FEX_TAG did not install"; return 0; fi - fi - if [ -n "$ok" ] && [ "$have" = "$FEX_TAG" ]; then FEX_NOW=$have FEX_FROM=built-in; return 0; fi - step "downloading FEX ($FEX_TAG)" - if fex_install "$FEX_TAG" "$FEX_SHA256" "$FEX_URL"; then FEX_NOW=$FEX_TAG FEX_FROM=built-in; return 0; fi - if [ -n "$ok" ]; then FEX_NOW=$have FEX_FROM="kept; $FEX_TAG did not install"; return 0; fi - return 1 -} - # A resumable download that reports every tenth of its size as a step. x64_fetch() { local url=$1 out=$2 label=$3 total pid rc=0 last=-1 pct @@ -406,7 +334,7 @@ x64_fetch() { } x64_prepare() { -x64_fex || { step "FEX could not be installed; see $LOG"; exit 1; } +fex_ready || { step "FEX could not be installed; see $LOG"; exit 1; } step "FEX ready ($FEX_NOW, $FEX_FROM)" # The client's opt-in to its SteamRT3 build; without it, it re-executes through steam.sh, whose checks fail under proot. mkdir -p "$STEAM_X64" && : > "$STEAM_X64/.steam-enable-steamrt64-client" diff --git a/tools/tests/test_droiddeck_fex.py b/tools/tests/test_droiddeck_fex.py index e65b21277e..fda93362e0 100644 --- a/tools/tests/test_droiddeck_fex.py +++ b/tools/tests/test_droiddeck_fex.py @@ -48,6 +48,8 @@ class FexTestCase(unittest.TestCase): "HOST_PRELOAD": str(self.tmp / "ld.so.preload"), "DEVICE_FONTS": str(self.tmp / "android-fonts"), "FONT_RULES": str(self.tmp / "66-droiddeck-device-fonts.conf"), + "OWN_FEX": str(self.tmp / "own"), + "OWN_FEX_TAG": str(self.tmp / "own/share/fex-emu/.droiddeck-tag"), } patcher = mock.patch.dict(G, patches) patcher.start() @@ -202,6 +204,37 @@ class LocateTest(FexTestCase): self.assertEqual((fex["bin"], fex["server"], fex["portable"]), (str(tool / "usr/bin/FEX"), str(tool / "usr/bin/FEXServer"), True)) self.assertTrue(fex["host_thunks"].endswith("HostThunks") and fex["guest_thunks"].endswith("GuestThunks") and fex["thunks_db"]) + def own_fex(self, tag): + own = self.tmp / "own" + self.write(own / "bin/FEX", mode=0o755) + self.write(own / "bin/FEXServer", mode=0o755) + self.write(own / "share/fex-emu/.droiddeck-tag", tag + "\n") + return own + + def test_droiddeck_s_own_build_comes_before_the_steam_tool(self): + self.fex_tool(self.steam) + own = self.own_fex("fex-2610-r7") + fex = FEX["fex_install"]() + self.assertEqual((fex["bin"], fex["server"], fex["portable"]), (str(own / "bin/FEX"), str(own / "bin/FEXServer"), False)) + + def test_the_build_the_session_names_is_installed_once(self): + self.own_fex("fex-2610-r6") + calls = [] + with mock.patch.dict(os.environ, {"BL_FEX_TAG": "fex-2610-r7"}), \ + mock.patch.object(G["subprocess"], "call", lambda args, **kw: calls.append(args) or 0): + FEX["update_own_fex"]() + self.write(self.tmp / "own/share/fex-emu/.droiddeck-tag", "fex-2610-r7\n") + FEX["update_own_fex"]() + self.assertEqual([[str(BIN / "droiddeck-fex-update")]], calls) + + def test_no_build_is_installed_without_one_from_the_session(self): + calls = [] + with mock.patch.dict(os.environ, {}, clear=False), \ + mock.patch.object(G["subprocess"], "call", lambda args, **kw: calls.append(args) or 0): + os.environ.pop("BL_FEX_TAG", None) + FEX["update_own_fex"]() + self.assertEqual([], calls) + def test_library_folders_are_read(self): other = self.tmp / "other" (other / "steamapps/common").mkdir(parents=True) diff --git a/tools/tests/test_fex_install.py b/tools/tests/test_fex_install.py index 355b540381..51d5279e89 100644 --- a/tools/tests/test_fex_install.py +++ b/tools/tests/test_fex_install.py @@ -6,7 +6,7 @@ import tempfile import textwrap import unittest -SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-steam-x64" +SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-fex-update" SOURCE = SCRIPT.read_text() START = SOURCE.index("fex_install() {") END = SOURCE.index("\n}\n", START) + 3 diff --git a/tools/tests/test_fex_select.py b/tools/tests/test_fex_select.py index 94008a1c70..3b351520e7 100644 --- a/tools/tests/test_fex_select.py +++ b/tools/tests/test_fex_select.py @@ -5,9 +5,9 @@ import tempfile import textwrap import unittest -SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-steam-x64" +SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-fex-update" SOURCE = SCRIPT.read_text() -START = SOURCE.index("x64_fex() {") +START = SOURCE.index("fex_ready() {") END = SOURCE.index("\n}\n", START) + 3 X64_FEX = SOURCE[START:END] @@ -35,7 +35,7 @@ class FexSelectTest(unittest.TestCase): fex.chmod(0o755) body = (X64_FEX.replace("/usr/local/share/fex-emu/.droiddeck-tag", "$ROOT/tag") .replace("/usr/local/bin/FEX", "$ROOT/FEX")) - script = HARNESS + body + 'if x64_fex; then echo "NOW $FEX_NOW|$FEX_FROM"; else echo FAILED; fi\n' + script = HARNESS + body + 'if fex_ready; then echo "NOW $FEX_NOW|$FEX_FROM"; else echo FAILED; fi\n' env = dict(os.environ, ROOT=root, LOADS="1" if loads else "0", INSTALLABLE=" ".join(installable)) env.pop("BL_FEX_TAG", None) if catalog: From bb1cbf95c0484f0178a673ca0e4b4a188b091390 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 12:45:52 -0400 Subject: [PATCH 095/135] docs: credit sharun and userland-execve --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 794e272cc2..80958dcdab 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Compatibility and performance vary by device; hardware validation is limited. De ## Credits and licence -GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. Battle.net support is [@kayakyakr](https://github.com/kayakyakr)'s: it runs Blizzard's own Battle.net client, downloaded from Blizzard and not included, in Proton, and shows the key art from each game's [Battle.net Shop](https://shop.battle.net) page; without the Steam client its games see DroidDeck's pad as an Xbox 360 controller through `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. Its games install from Stores through Blizzard's own Agent and the local HTTP API it serves, driven the way [@barncastle](https://github.com/barncastle)'s [Battle.Net-Installer](https://github.com/barncastle/Battle.Net-Installer) drives it, with the requests described on [wowdev.wiki](https://wowdev.wiki/Agent); how other launchers find, install and start Blizzard games was read in [@mubaraknumann](https://github.com/mubaraknumann)'s [unifideck](https://github.com/mubaraknumann/unifideck), [@djmittens](https://github.com/djmittens)'s [neo-mittens](https://github.com/djmittens/neo-mittens) `bnetswitch`, [@BCD1210](https://github.com/BCD1210)'s [soju](https://github.com/BCD1210/soju) and [Lutris](https://github.com/lutris/lutris)'s `product.db` reader, without taking their code. The registry entries a GOG game's install script (`goggame-<id>.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc/<pid>/mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc/<pid>/status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). Xbox games load the Windows modules of [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) runtime (LGPL-2.1-or-later), including its `wintypes.dll`, whose `ApiInformation` answer Minecraft for Windows needs to start; how Minecraft installs GameInput under Wine was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. +GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. Battle.net support is [@kayakyakr](https://github.com/kayakyakr)'s: it runs Blizzard's own Battle.net client, downloaded from Blizzard and not included, in Proton, and shows the key art from each game's [Battle.net Shop](https://shop.battle.net) page; without the Steam client its games see DroidDeck's pad as an Xbox 360 controller through `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. Its games install from Stores through Blizzard's own Agent and the local HTTP API it serves, driven the way [@barncastle](https://github.com/barncastle)'s [Battle.Net-Installer](https://github.com/barncastle/Battle.Net-Installer) drives it, with the requests described on [wowdev.wiki](https://wowdev.wiki/Agent); how other launchers find, install and start Blizzard games was read in [@mubaraknumann](https://github.com/mubaraknumann)'s [unifideck](https://github.com/mubaraknumann/unifideck), [@djmittens](https://github.com/djmittens)'s [neo-mittens](https://github.com/djmittens/neo-mittens) `bnetswitch`, [@BCD1210](https://github.com/BCD1210)'s [soju](https://github.com/BCD1210/soju) and [Lutris](https://github.com/lutris/lutris)'s `product.db` reader, without taking their code. The registry entries a GOG game's install script (`goggame-<id>.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. x86 AppImages packed with [sharun](https://github.com/VHSgunzo/sharun) by VHSgunzo (MIT) start because DroidDeck's own [FEX](https://github.com/FEX-Emu/FEX) build (MIT) puts the platform name under `AT_PLATFORM`, which sharun's [userland-execve](https://crates.io/crates/userland-execve) loader (MIT) requires; FEX filed it under `AT_BASE_PLATFORM`. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc/<pid>/mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc/<pid>/status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). Xbox games load the Windows modules of [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) runtime (LGPL-2.1-or-later), including its `wintypes.dll`, whose `ApiInformation` answer Minecraft for Windows needs to start; how Minecraft installs GameInput under Wine was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. XR glasses support builds on WinNative's VITURE glasses work. VITURE protocol details were checked against [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) by [@wheaney](https://github.com/wheaney), including the VITURE protocol header it ships, [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) by [@badicsalex](https://github.com/badicsalex) and the [go-macos/iokit VITURE package](https://pkg.go.dev/github.com/go-macos/iokit/viture); the optional VITURE SDK belongs to VITURE and is not included. RayNeo support adapts [@informalTechCode](https://github.com/informalTechCode)'s [RayNeo-Air-Series-3DoF-Scaffold](https://github.com/informalTechCode/RayNeo-Air-Series-3DoF-Scaffold) (Apache-2.0) and references [@verncat](https://github.com/verncat)'s [RayNeo-Air-3S-Pro-OpenVR](https://github.com/verncat/RayNeo-Air-3S-Pro-OpenVR) (MIT) and [Monado](https://gitlab.freedesktop.org/monado/monado) (BSL-1.0); see [docs/third-party/rayneo](docs/third-party/rayneo/README.md). XREAL 1S support references [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) and [xrealOneDeviceKit](https://github.com/wheaney/xrealOneDeviceKit) by @wheaney, [xreal_one_driver](https://github.com/rohitsangwan01/xreal_one_driver) by [@rohitsangwan01](https://github.com/rohitsangwan01) (MIT) and [xr-tools](https://github.com/0xcaff/xr-tools) by [@0xcaff](https://github.com/0xcaff). Rokid support follows the Rokid protocol notes in [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) and @badicsalex's [Void Computing write-ups](https://voidcomputing.hu/blog/worse-better-prettier/), and [Monado](https://gitlab.freedesktop.org/monado/monado)'s Rokid driver. The REDMAGIC glasses-display findings draw on [@mekhontsev](https://github.com/mekhontsev)'s [MagicDesk investigation](https://github.com/mekhontsev/magicdesk/blob/main/docs/xr-resolution-fix.md) and [@Coding-BR](https://github.com/Coding-BR)'s [decompiled Nubia kernel](https://github.com/Coding-BR/android_kernel_nubia_sm8850_qwjujube). VITURE, RayNeo, XREAL, Rokid and REDMAGIC are trademarks of their owners; this project is not affiliated with them. From 4de4c65c2ad6021e8dbc9a0956c28c02d4e0b8ab Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 13:01:15 -0400 Subject: [PATCH 096/135] fix: wait before retrying a FEX build that did not install A failed catalog install is retried after an hour or when the session names another build, a missing updater falls back to the FEX already here, and the archive download gives up on a stalled connection. --- .../overlay/usr/local/bin/droiddeck-fex | 21 ++++++++++++++-- .../usr/local/bin/droiddeck-fex-update | 2 +- tools/tests/test_droiddeck_fex.py | 24 +++++++++++++++++++ 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex index ad4232a350..93964cfcd5 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex @@ -11,6 +11,7 @@ import shutil import struct import subprocess import sys +import time HOME = os.environ.get("HOME") or "/root" STEAM_ROOT = os.path.join(HOME, ".local", "share", "Steam") @@ -160,9 +161,25 @@ def update_own_fex(): return if (read_text(OWN_FEX_TAG) or "").strip() == wanted and os.access(os.path.join(OWN_FEX, "bin", "FEX"), os.X_OK): return + failed = os.path.join(STATE, "update-failed") + try: + if (read_text(failed) or "").strip() == wanted and time.time() - os.path.getmtime(failed) < 3600: + return + except OSError: + pass say("installing DroidDeck's FEX build %s" % wanted) - if subprocess.call([os.path.join(BIN_DIR, "droiddeck-fex-update")], stdout=sys.stderr) != 0: - say("DroidDeck's FEX build %s did not install; using the FEX already here" % wanted) + try: + code = subprocess.call([os.path.join(BIN_DIR, "droiddeck-fex-update")], stdout=sys.stderr) + except OSError: + code = 1 + if code == 0: + with contextlib.suppress(OSError): + os.remove(failed) + return + with contextlib.suppress(OSError): + with open(failed, "w", encoding="utf-8") as handle: + handle.write(wanted + "\n") + say("DroidDeck's FEX build %s did not install; using the FEX already here" % wanted) def fex_install(): diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update index 33346cfbb6..3611978f54 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update @@ -19,7 +19,7 @@ fex_install() { local tag=$1 sha=$2 urls=$3 dst=/ tmp u f tmp=$(mktemp -d) for u in $urls; do - curl -fsSL --retry 2 "$u" -o "$tmp/fex.tzst" && echo "$sha $tmp/fex.tzst" | sha256sum -c --quiet >/dev/null 2>&1 && break + curl -fsSL --retry 2 --connect-timeout 20 --speed-limit 1024 --speed-time 60 "$u" -o "$tmp/fex.tzst" && echo "$sha $tmp/fex.tzst" | sha256sum -c --quiet >/dev/null 2>&1 && break rm -f "$tmp/fex.tzst" done if [ ! -s "$tmp/fex.tzst" ]; then diff --git a/tools/tests/test_droiddeck_fex.py b/tools/tests/test_droiddeck_fex.py index fda93362e0..9be22f6845 100644 --- a/tools/tests/test_droiddeck_fex.py +++ b/tools/tests/test_droiddeck_fex.py @@ -227,6 +227,30 @@ class LocateTest(FexTestCase): FEX["update_own_fex"]() self.assertEqual([[str(BIN / "droiddeck-fex-update")]], calls) + def test_a_failed_build_waits_an_hour_unless_the_session_names_another(self): + self.own_fex("fex-2610-r6") + Path(G["STATE"]).mkdir(parents=True, exist_ok=True) + calls = [] + tag = {"BL_FEX_TAG": "fex-2610-r7"} + with mock.patch.dict(os.environ, tag), \ + mock.patch.object(G["subprocess"], "call", lambda args, **kw: calls.append(os.environ["BL_FEX_TAG"]) or 1): + FEX["update_own_fex"]() + FEX["update_own_fex"]() + failed = Path(G["STATE"]) / "update-failed" + os.utime(failed, (failed.stat().st_atime, failed.stat().st_mtime - 3601)) + FEX["update_own_fex"]() + os.environ["BL_FEX_TAG"] = "fex-2610-r8" + FEX["update_own_fex"]() + self.assertEqual(["fex-2610-r7", "fex-2610-r7", "fex-2610-r8"], calls) + + def test_a_missing_updater_falls_back_to_the_fex_already_here(self): + self.fex_tool(self.steam) + Path(G["STATE"]).mkdir(parents=True, exist_ok=True) + with mock.patch.dict(os.environ, {"BL_FEX_TAG": "fex-2610-r7"}), \ + mock.patch.object(G["subprocess"], "call", mock.Mock(side_effect=FileNotFoundError)): + FEX["update_own_fex"]() + self.assertEqual(FEX["fex_install"]()["bin"], str(self.steam / "steamapps/common/FEX-Emu/usr/bin/FEX")) + def test_no_build_is_installed_without_one_from_the_session(self): calls = [] with mock.patch.dict(os.environ, {}, clear=False), \ From 8df90c30dda57dedc76015d397ef3b7e182b32ac Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 13:02:45 -0400 Subject: [PATCH 097/135] fix(fex): read the fallback FEX version from droiddeck-fex-update The pin moved there from droiddeck-steam-x64, so the client settings sheet and its test read it from the new script. The x86-64 client notes now name the updater and Components' FEX watcher. --- .../com/droiddeck/launcher/ui/ModeSettingsDialog.kt | 4 ++-- .../java/com/droiddeck/launcher/ui/FexVersionTest.kt | 4 ++-- docs/development/x86-64-steam-client.md | 11 ++++++----- 3 files changed, 10 insertions(+), 9 deletions(-) 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 86c03309f8..431858bf05 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -159,7 +159,7 @@ class ModeSettingsActions( val onDismiss: () -> Unit, ) -/** "2610 r3" from droiddeck-steam-x64's FEX_TAG line (fex-2610-r3), the build the x86-64 client downloads. */ +/** "2610 r3" from droiddeck-fex-update's FEX_TAG line (fex-2610-r3), the build x86 programs fall back to. */ internal fun fexVersionOf(script: String): String? = Regex("""(?m)^FEX_TAG=(fex-\d+-r\d+)\s*$""").find(script)?.let { fexVersionOfTag(it.groupValues[1]) } @@ -174,7 +174,7 @@ private fun x64FexVersion(context: android.content.Context): String? = remember runCatching { java.io.File(root, "usr/local/share/fex-emu/.droiddeck-tag").readText() }.getOrNull()?.let(::fexVersionOfTag) ?: com.droiddeck.launcher.session.FexCatalog.cached(context)?.tag?.let(::fexVersionOfTag) ?: runCatching { - context.assets.open("linuxfs/usr/local/bin/droiddeck-steam-x64").bufferedReader().use { fexVersionOf(it.readText()) } + context.assets.open("linuxfs/usr/local/bin/droiddeck-fex-update").bufferedReader().use { fexVersionOf(it.readText()) } }.getOrNull() } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/FexVersionTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/FexVersionTest.kt index 3d4600f8c1..0ee00d3ad4 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/FexVersionTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/FexVersionTest.kt @@ -20,8 +20,8 @@ class FexVersionTest { } @Test fun theShippedLauncherHasOne() { - val script = java.io.File("../tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64").takeIf { it.isFile } - ?: java.io.File("tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64") + val script = java.io.File("../tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update").takeIf { it.isFile } + ?: java.io.File("tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update") assertEquals(true, fexVersionOf(script.readText()) != null) } } diff --git a/docs/development/x86-64-steam-client.md b/docs/development/x86-64-steam-client.md index b3e2c5caf9..cf25613687 100644 --- a/docs/development/x86-64-steam-client.md +++ b/docs/development/x86-64-steam-client.md @@ -210,16 +210,17 @@ alone would then read as an installed client. build fails when a program in the package needs a library that is neither bundled nor listed in `tools/fex/runtime-libs.txt`). They were built and published in The412Banner/DroidDeck; up to r3 their tags point at that repository's `main`, from r4 at the commit each was built from. Later builds are versions on the single - `fex` release; `fex-2610-r5` stays published as the build `droiddeck-steam-x64` pins. + `fex` release; `fex-2610-r5` stays published as the build `droiddeck-fex-update` pins. - **Where the app gets it.** The app downloads FEX from Droid-Deck/DroidDeck-Components, where nothing is - uploaded by hand. The app follows its `fex.json`: while the x86-64 client is selected it reads it from - Components' `main` (directly, at most every ten minutes) and keeps the last copy, and a session passes - that build to `droiddeck-steam-x64` (`BL_FEX_TAG`, `BL_FEX_SHA256`, `BL_FEX_URLS` with the download + uploaded by hand. The app follows its `fex.json`: it reads it from + Components' `main` (directly, at most every ten minutes) and keeps the last copy, and every session passes + that build to `droiddeck-fex-update` (`BL_FEX_TAG`, `BL_FEX_SHA256`, `BL_FEX_URLS` with the download source's mirrors). The script installs a build only after its archive matches the sha256 and every program in it loads (`ld-linux --list`); the files it replaces are kept aside until the installed copy loads too and put back otherwise, and the tag is written last. Otherwise it keeps the installed one while that still loads, then falls back to `FEX_TAG`/`FEX_SHA256` built in, which stay the first-start default when no copy - of `fex.json` has been read. Publishing a FEX build therefore takes a Components run only; a + of `fex.json` has been read. Components' `watch-fex.yml` starts that run by itself every six hours once FEX-Emu + tags a release or `tools/fex` changes on `main`. Publishing a FEX build therefore takes a Components run only; a replaced archive cannot be pointed back to, so undoing a build means building an earlier ref. The rootfs is FEX-Emu's own image, unmodified: `fex-rootfs.json` there names its rootfs.fex-emu.gg link, sha256 and size, and `mirror-upstream.yml` fetches it into the catalog's release only when both match. A newer From 455bf0fba90b4f88948772291bf0c9695e1ef33e Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 13:22:26 -0400 Subject: [PATCH 098/135] fix(fex): install DroidDeck's FEX build again when it no longer loads A tag that matches no longer vouches for the build: FEX and FEXServer must also load (ld.so --list), otherwise the session reinstalls it and x86 programs use the Steam or system FEX meanwhile. --- .../overlay/usr/local/bin/droiddeck-fex | 19 +++++++++++++++++-- tools/tests/test_droiddeck_fex.py | 16 +++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex index 93964cfcd5..7db59b048c 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex @@ -155,11 +155,26 @@ def first_dir(prefix, candidates): return None +def own_fex_loads(): + for name in ("FEX", "FEXServer"): + binary = os.path.join(OWN_FEX, "bin", name) + if not os.access(binary, os.X_OK): + return False + try: + listed = subprocess.run(["/usr/lib/ld-linux-aarch64.so.1", "--list", binary], + stdout=subprocess.PIPE, stderr=subprocess.STDOUT, timeout=20) + except (OSError, subprocess.TimeoutExpired): + return False + if listed.returncode != 0 or b"not found" in listed.stdout: + return False + return True + + def update_own_fex(): wanted = os.environ.get("BL_FEX_TAG") if not wanted: return - if (read_text(OWN_FEX_TAG) or "").strip() == wanted and os.access(os.path.join(OWN_FEX, "bin", "FEX"), os.X_OK): + if (read_text(OWN_FEX_TAG) or "").strip() == wanted and own_fex_loads(): return failed = os.path.join(STATE, "update-failed") try: @@ -184,7 +199,7 @@ def update_own_fex(): def fex_install(): prefixes = [] - if os.path.isfile(OWN_FEX_TAG): + if os.path.isfile(OWN_FEX_TAG) and own_fex_loads(): prefixes.append((OWN_FEX, False)) tool = app_dir(FEX_APPID) if tool: diff --git a/tools/tests/test_droiddeck_fex.py b/tools/tests/test_droiddeck_fex.py index 9be22f6845..456eec407d 100644 --- a/tools/tests/test_droiddeck_fex.py +++ b/tools/tests/test_droiddeck_fex.py @@ -204,13 +204,27 @@ class LocateTest(FexTestCase): self.assertEqual((fex["bin"], fex["server"], fex["portable"]), (str(tool / "usr/bin/FEX"), str(tool / "usr/bin/FEXServer"), True)) self.assertTrue(fex["host_thunks"].endswith("HostThunks") and fex["guest_thunks"].endswith("GuestThunks") and fex["thunks_db"]) - def own_fex(self, tag): + def own_fex(self, tag, loads=True): own = self.tmp / "own" self.write(own / "bin/FEX", mode=0o755) self.write(own / "bin/FEXServer", mode=0o755) self.write(own / "share/fex-emu/.droiddeck-tag", tag + "\n") + listing = b"libc.so.6 => /usr/lib/libc.so.6\n" if loads else b"libxxhash.so.0 => not found\n" + patcher = mock.patch.object(G["subprocess"], "run", lambda args, **kw: subprocess.CompletedProcess(args, 0, listing)) + patcher.start() + self.addCleanup(patcher.stop) return own + def test_an_own_build_that_no_longer_loads_is_installed_again_and_skipped(self): + tool = self.fex_tool(self.steam) + self.own_fex("fex-2610-r7", loads=False) + calls = [] + with mock.patch.dict(os.environ, {"BL_FEX_TAG": "fex-2610-r7"}), \ + mock.patch.object(G["subprocess"], "call", lambda args, **kw: calls.append(args) or 1): + FEX["update_own_fex"]() + self.assertEqual([[str(BIN / "droiddeck-fex-update")]], calls) + self.assertEqual(FEX["fex_install"]()["bin"], str(tool / "usr/bin/FEX")) + def test_droiddeck_s_own_build_comes_before_the_steam_tool(self): self.fex_tool(self.steam) own = self.own_fex("fex-2610-r7") From 830c75331269a64f1fafdd11f79e86c0c366f0d6 Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Mon, 26 Oct 2026 14:07:15 -0400 Subject: [PATCH 099/135] fix: turn off D3DGear's capture hook when it sits beside a game (#1627) The Crew 2 loads D3DGear64.dll from its folder. Its DXGI Present hook faults over a thousand times within seconds under Wine and the game never presents again: black screen while the sound keeps playing. droiddeck-game-env now disables the DLL when it finds it beside the game, and DLL overrides from several engine fixes are kept together instead of the last one replacing the others. --- .../overlay/usr/local/bin/droiddeck-game-env | 14 ++++++++++++- tools/tests/test_game_environment.py | 21 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index a854bb1d7b..c9f37a3612 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -107,6 +107,15 @@ def godot_sentry(game): return {"WINEDLLOVERRIDES": ";".join(n + "=d" for n in sentry)}, [], "Godot: Sentry crash handler off" +@fix +def d3dgear_hook(game): + """D3DGear's capture DLL left beside a game (The Crew 2) is loaded by it and hooks the DXGI swapchain; + under Wine the hook faults over a thousand times within seconds and the game never presents again: + black screen while the sound keeps playing.""" + if "d3dgear64.dll" in game.files: + return {"WINEDLLOVERRIDES": "d3dgear64=d"}, [], "D3DGear capture hook off (it stops the game drawing)" + + @fix def deep_rock_gdk_raytracing(game): if game.stem == "fsd-wingdk-shipping" and not any(game.has_arg(arg) for arg in ("-raytracing", "-noraytracing")): @@ -254,7 +263,10 @@ def engine_fixes(exe, args): for check in FIXES: found = check(game) if found: - env.update(found[0]) + for name, value in found[0].items(): + if name == "WINEDLLOVERRIDES" and env.get(name): + value = env[name] + ";" + value + env[name] = value extra += found[1] notes.append(found[2]) return env, extra, notes diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index b4bc05aada..0bb794517c 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -402,6 +402,27 @@ class GameEnvironmentTest(unittest.TestCase): (asylum / name).touch() self.assertEqual(MODULE["engine_fixes"](str(asylum / "BmLauncher.exe"), []), ({}, [], [])) + def test_d3dgear_capture_hook_beside_the_game_is_turned_off(self): + with tempfile.TemporaryDirectory() as tmp: + game = Path(tmp) / "The Crew 2" + game.mkdir() + for name in ("TheCrew2.exe", "TheCrew2_BE.exe", "d3dgear64.dll"): + (game / name).touch() + env, extra, notes = MODULE["engine_fixes"](str(game / "TheCrew2.exe"), []) + self.assertEqual((env, extra), ({"WINEDLLOVERRIDES": "d3dgear64=d"}, [])) + self.assertTrue(notes) + (game / "d3dgear64.dll").rename(game / "D3DGear64.DLL") + self.assertEqual(MODULE["engine_fixes"](str(game / "TheCrew2.exe"), [])[0], {"WINEDLLOVERRIDES": "d3dgear64=d"}) + (game / "D3DGear64.DLL").unlink() + self.assertEqual(MODULE["engine_fixes"](str(game / "TheCrew2.exe"), []), ({}, [], [])) + + def test_dll_overrides_from_several_fixes_are_all_kept(self): + with tempfile.TemporaryDirectory() as tmp: + for name in ("Game.exe", "Game.pck", "GodotSharp.dll", "libsentry.windows.release.x86_64.dll", "d3dgear64.dll"): + (Path(tmp) / name).touch() + env = MODULE["engine_fixes"](str(Path(tmp) / "Game.exe"), [])[0] + self.assertEqual(env["WINEDLLOVERRIDES"], "libsentry.windows.release.x86_64=d;d3dgear64=d") + def test_black_ops_iii_and_dark_souls_remastered_skip_protonfixes(self): for exe in ("/game/Call of Duty Black Ops III/BlackOps3.exe", "/game/DARK SOULS REMASTERED/DarkSoulsRemastered.exe"): env, extra, notes = MODULE["engine_fixes"](exe, []) From c8f650e1676fcbf85d4a3d7d9d4040fdebb4c0d2 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 14:53:21 -0400 Subject: [PATCH 100/135] feat(ui): add game resource links (#1630) --- .../com/droiddeck/launcher/ui/GameDetail.kt | 3 + .../droiddeck/launcher/ui/GameResources.kt | 90 +++++++++++++++++++ app/src/main/res/values/strings.xml | 8 ++ .../launcher/ui/GameResourcesRowTest.kt | 63 +++++++++++++ .../launcher/ui/GameResourcesTest.kt | 43 +++++++++ 5 files changed, 207 insertions(+) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/GameResources.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/GameResourcesRowTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/GameResourcesTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index ac8ecffcce..5350d2afa5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -219,6 +219,9 @@ internal fun GameDetail( } } if (StoresMotion.heroLands) hero() else Rise(1) { hero() } + if (!s.shortcutPicker) Rise(2) { + GameResourcesRow(title.takeUnless { it == id }.orEmpty(), game, Modifier.padding(top = 6.dp)) + } if (tab != null) Rise(2) { Column(Modifier.fillMaxWidth().padding(top = 14.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) { val labels = tabs.map { t -> diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameResources.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameResources.kt new file mode 100644 index 0000000000..78384480a4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameResources.kt @@ -0,0 +1,90 @@ +package com.droiddeck.launcher.ui + +import androidx.annotation.StringRes +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.OpenInNew +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import java.net.URLEncoder + +internal data class GameResource(@StringRes val label: Int, val url: String, @StringRes val detail: Int? = null) + +internal fun gameResources(title: String, game: Library.SteamGame?): List<GameResource> { + if (title.isBlank()) return emptyList() + val query = URLEncoder.encode(title.trim(), "UTF-8").replace("+", "%20") + val steamId = game?.takeIf { Library.fromSteamClient(it) && it.appId > 0 }?.appId + return buildList { + add(GameResource(R.string.game_resource_pcgw, "https://www.pcgamingwiki.com/w/index.php?search=$query")) + add(GameResource(R.string.game_resource_guides, "https://gamefaqs.gamespot.com/search?game=$query")) + if (steamId != null) { + add(GameResource(R.string.game_resource_protondb, "https://www.protondb.com/app/$steamId", R.string.game_resource_protondb_detail)) + add(GameResource(R.string.game_resource_steam_cloud, "https://store.steampowered.com/account/remotestorageapp/?appid=$steamId", R.string.game_resource_steam_cloud_detail)) + } + add(GameResource(R.string.game_resource_search, "https://www.google.com/search?q=$query")) + } +} + +@Composable +@OptIn(ExperimentalLayoutApi::class) +internal fun GameResourcesRow(title: String, game: Library.SteamGame?, modifier: Modifier = Modifier) { + val links = remember(title, game) { gameResources(title, game) } + if (links.isEmpty()) return + FlowRow(modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(10.dp)) { + links.forEach { ResourceLink(it) } + } +} + +@Composable +private fun ResourceLink(link: GameResource) { + val ctx = LocalContext.current + val pal = LocalPalette.current + val source = remember { MutableInteractionSource() } + val hot = rememberHot(source) + val shape = RoundedCornerShape(8.dp) + val label = stringResource(link.label) + val description = listOfNotNull(label, link.detail?.let { stringResource(it) }, stringResource(R.string.game_resources_browser)).joinToString(". ") + val open = { openUrl(ctx, link.url) } + val tint = if (hot) pal.signal else pal.onSurfaceVariant + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(5.dp), + modifier = Modifier.paneItem("resource:${link.label}").heightIn(min = 44.dp).clip(shape) + .background(if (hot) pal.signal.copy(alpha = 0.08f) else Color.Transparent) + .glideBorder(hot, shape, pal.signal, restColor = Color.Transparent) + .semantics { contentDescription = description } + .hoverable(source).clickable(interactionSource = source, indication = LocalIndication.current, role = Role.Button, onClick = open) + .controllerConfirm(onClick = open).padding(horizontal = 8.dp), + ) { + Text(label, fontSize = 12.sp, fontWeight = FontWeight.Medium, color = tint, maxLines = 1) + Icon(Icons.AutoMirrored.Filled.OpenInNew, contentDescription = null, tint = tint.copy(alpha = 0.65f), modifier = Modifier.size(11.dp)) + } +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 840e26ebb6..1399db1b68 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3204,6 +3204,14 @@ <string name="library_no_installed_matches">No installed games match these filters.</string> <string name="library_browse_owned">Browse owned games</string> <string name="game_tab_about">About</string> + <string name="game_resources_browser">Opens in your browser</string> + <string name="game_resource_pcgw" translatable="false">PCGamingWiki</string> + <string name="game_resource_guides">Guides</string> + <string name="game_resource_protondb" translatable="false">ProtonDB</string> + <string name="game_resource_protondb_detail">Linux / Proton compatibility reports</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">For games with saves on your Steam account</string> + <string name="game_resource_search">Web search</string> <string name="game_tab_achievements_count" translatable="false">%1$s %2$d/%3$d</string> <string name="game_tab_launch">Launch</string> <string name="game_tab_saves_cloud">Saves & cloud</string> diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GameResourcesRowTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GameResourcesRowTest.kt new file mode 100644 index 0000000000..5793b394fa --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/GameResourcesRowTest.kt @@ -0,0 +1,63 @@ +package com.droiddeck.launcher.ui + +import android.content.Intent +import androidx.compose.ui.input.InputMode +import androidx.compose.ui.input.InputModeManager +import androidx.compose.ui.input.key.Key +import androidx.compose.ui.platform.LocalInputModeManager +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.assertIsFocused +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.performClick +import androidx.compose.ui.test.performKeyInput +import androidx.compose.ui.test.pressKey +import androidx.compose.ui.test.requestFocus +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import org.junit.Assert.assertEquals +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +@OptIn(androidx.compose.ui.test.ExperimentalTestApi::class, androidx.compose.ui.ExperimentalComposeUiApi::class) +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], qualifiers = "w360dp-h640dp-port", application = android.app.Application::class) +class GameResourcesRowTest { + @get:Rule val compose = createRobolectricComposeRule() + private val ctx get() = RuntimeEnvironment.getApplication() + private val game = Library.SteamGame(292030, "The Witcher 3", null, "/steam") + + @Test fun everyResourceIsReachableOnANarrowPageAndOpensTheExpectedBrowserUrl() { + compose.setContent { DroidDeckTheme { GameResourcesRow(game.name, game) } } + for (link in gameResources(game.name, game)) { + compose.onNodeWithText(ctx.getString(link.label)).assertIsDisplayed().performClick() + val intent = shadowOf(ctx).nextStartedActivity + assertEquals(Intent.ACTION_VIEW, intent.action) + assertEquals(link.url, intent.dataString) + } + } + + @Test fun controllerCanMoveBetweenLinksAndOpenAResource() { + lateinit var inputMode: InputModeManager + compose.setContent { DroidDeckTheme { + inputMode = LocalInputModeManager.current + GameResourcesRow(game.name, game) + } } + compose.runOnIdle { inputMode.requestInputMode(InputMode.Keyboard) } + compose.onNodeWithText(ctx.getString(R.string.game_resource_pcgw)).requestFocus().assertIsFocused().performKeyInput { pressKey(Key.DirectionRight) } + compose.onNodeWithText(ctx.getString(R.string.game_resource_guides)).assertIsFocused().performKeyInput { pressKey(Key.ButtonA) } + assertEquals(gameResources(game.name, game)[1].url, shadowOf(ctx).nextStartedActivity.dataString) + } + + @Test @Config(qualifiers = "w640dp-h360dp-land") + fun shortLandscapeWindowsKeepEveryResourceVisible() { + compose.setContent { DroidDeckTheme { GameResourcesRow(game.name, game) } } + for (link in gameResources(game.name, game)) { + compose.onNodeWithText(ctx.getString(link.label)).assertIsDisplayed() + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GameResourcesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GameResourcesTest.kt new file mode 100644 index 0000000000..3fd423e595 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/GameResourcesTest.kt @@ -0,0 +1,43 @@ +package com.droiddeck.launcher.ui + +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test +import java.net.URI +import java.net.URLDecoder + +class GameResourcesTest { + @Test fun searchesPreserveUnicodeAndEscapeQueryDelimiters() { + val title = "Ōkami HD & friends + 100% #1?" + val links = gameResources(" $title ", null) + assertEquals(3, links.size) + links.forEach { link -> + val uri = URI(link.url) + assertEquals("https", uri.scheme) + assertEquals(null, uri.fragment) + assertEquals(title, URLDecoder.decode(uri.rawQuery.substringAfter('='), "UTF-8")) + } + } + + @Test fun onlySteamClientGamesGetAppSpecificSteamResources() { + val steam = Library.SteamGame(292030, "The Witcher 3", null, "/steam") + val links = gameResources(steam.name, steam) + assertEquals("https://www.protondb.com/app/292030", links.single { it.label == R.string.game_resource_protondb }.url) + assertEquals("https://store.steampowered.com/account/remotestorageapp/?appid=292030", links.single { it.label == R.string.game_resource_steam_cloud }.url) + val others = listOf( + Library.SteamGame(292030, steam.name, null, Library.ADDED), + Library.SteamGame(292030, steam.name, null, Library.ADDED, source = "gog", storeId = "292030"), + Library.SteamGame(292030, steam.name, null, Library.XBOX_CLOUD, source = "xbox"), + Library.SteamGame(-1, steam.name, null, "/steam"), + ) + others.forEach { game -> + assertEquals(3, gameResources(game.name, game).size) + } + } + + @Test fun loadingPagesHaveNoResourcesUntilTheyHaveATitle() { + assertTrue(gameResources(" ", null).isEmpty()) + } +} From 13eb291ba83f7496a06138ce109f795fbff2ec2a Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 15:04:55 -0400 Subject: [PATCH 101/135] fix(input): handle immediate Back chords and tap timing (#1628) * feat(input): support instant Back chords and tap timing * fix(input): send QAM before shortcut inputs * fix(input): stop delayed stick input on Back release --- .../com/droiddeck/launcher/SessionActivity.kt | 12 +- .../droiddeck/launcher/input/BackQamInput.kt | 23 ++- .../droiddeck/launcher/input/PadBridge.java | 124 +++++++++++- .../launcher/session/SessionPrefs.kt | 10 + .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/ui/SessionOverlay.kt | 5 + app/src/main/res/values/strings.xml | 4 +- .../launcher/input/BackQamInputTest.kt | 72 +++++++ .../launcher/input/PadBridgeQamTest.kt | 181 +++++++++++++++++- .../launcher/session/SettingsResetTest.kt | 2 + 10 files changed, 425 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index f4bb0b6e2f..1873b15ec5 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -260,6 +260,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private val backQamInput = com.droiddeck.launcher.input.BackQamInput( setPressed = { padBridge?.setBackQamPressed(it) }, onTap = { performBackAction(double = it) }, + doubleTapMs = { backDoubleTapMs.toLong() }, + onCancel = { padBridge?.cancelBackQam() }, ) private var drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN private var drawerDirectionDownTime = 0L @@ -322,6 +324,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var drawerPage by mutableStateOf(SessionDrawerPage.CONTROLLER) private var drawerControllerActive by mutableStateOf(false) private var backActionsInverted by mutableStateOf(false) + private var backDoubleTapMs by mutableStateOf(500) private var lowLatency by mutableStateOf(true) private var padType by mutableStateOf(SessionPrefs.CONTROLLER_DECK) private var pcKeyboardOpen by mutableStateOf(false) @@ -529,6 +532,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { bridge.setSelectSteam(ControllerPrefs.read(this).selectSteam) bridge.setBuiltinPad(SessionState.mode != SessionService.MODE_STEAM || SessionPrefs.builtinPad(this)) padBridge = bridge + bridge.setOnChordInput(backQamInput::onChordInput) SessionState.padBridge = bridge if (Build.VERSION.SDK_INT >= 31) { val vr = com.droiddeck.launcher.input.JoyConVr(this, File(filesDir, ".wayland-rt/${com.droiddeck.launcher.input.JoyConVr.FILE}")) { taken, released -> @@ -1019,6 +1023,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { padType = id }, backActionsInverted = backActionsInverted, + backDoubleTapMs = backDoubleTapMs, + onBackDoubleTapMs = { ms -> + SessionPrefs.setBackDoubleTapMs(this@SessionActivity, ms) + backDoubleTapMs = ms + }, onBackActionsInverted = { inverted -> SessionPrefs.setBackActionsInverted(this@SessionActivity, inverted) backActionsInverted = inverted @@ -1297,7 +1306,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { performBackAction(double = false) } pendingBackAction = pending - uiHandler.postDelayed(pending, 500L) + uiHandler.postDelayed(pending, backDoubleTapMs.toLong()) } private fun performBackAction(double: Boolean) { @@ -1631,6 +1640,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { steamDownloadsInBackground = SessionPrefs.steamDownloadsInBackground(this) oscMode = SessionPrefs.oscMode(this) backActionsInverted = SessionPrefs.backActionsInverted(this) + backDoubleTapMs = SessionPrefs.backDoubleTapMs(this) lowLatency = SessionPrefs.lowLatency(this) padType = SessionPrefs.steamController(this) } diff --git a/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt b/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt index 83e1adafbf..65f9e5b83e 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt @@ -4,7 +4,8 @@ import android.view.KeyEvent import android.os.Handler import android.os.Looper -class BackQamInput(private val setPressed: (Boolean) -> Unit, private val onTap: (Boolean) -> Unit) { +class BackQamInput(private val setPressed: (Boolean) -> Unit, private val onTap: (Boolean) -> Unit, + private val doubleTapMs: () -> Long = { 500 }, private val onCancel: () -> Unit = {}) { private class Press(val hold: Runnable, var held: Boolean = false, var used: Boolean = false) private val handler = Handler(Looper.getMainLooper()) private val presses = mutableMapOf<Int, Press>() @@ -17,6 +18,18 @@ class BackQamInput(private val setPressed: (Boolean) -> Unit, private val onTap: tapPending = false } + fun onChordInput() { + if (presses.isEmpty()) return + val alreadyHeld = presses.values.any { it.held } + presses.values.forEach { + handler.removeCallbacks(it.hold) + it.held = true + it.used = true + } + cancelTap() + if (!alreadyHeld) setPressed(true) + } + fun onKeyEvent(event: KeyEvent, enabled: Boolean): Boolean { if (!enabled) cancel() if (event.keyCode != KeyEvent.KEYCODE_BACK) return false @@ -48,7 +61,7 @@ class BackQamInput(private val setPressed: (Boolean) -> Unit, private val onTap: if (press.held && presses.values.none { it.held }) setPressed(false) if (!press.used && !event.isCanceled) { if (tapPending) { cancelTap(); onTap(true) } - else { tapPending = true; handler.postDelayed(singleTap, 500) } + else { tapPending = true; handler.postDelayed(singleTap, doubleTapMs()) } } else if (event.isCanceled) cancelTap() } press != null || wasCancelled || enabled @@ -63,6 +76,7 @@ class BackQamInput(private val setPressed: (Boolean) -> Unit, private val onTap: presses.values.forEach { handler.removeCallbacks(it.hold) } cancelled.addAll(presses.keys) presses.clear() + onCancel() if (wasHeld) setPressed(false) } @@ -71,6 +85,9 @@ class BackQamInput(private val setPressed: (Boolean) -> Unit, private val onTap: val press = presses.remove(device) ?: return handler.removeCallbacks(press.hold) cancelTap() - if (press.held && presses.values.none { it.held }) setPressed(false) + if (press.held && presses.values.none { it.held }) { + onCancel() + setPressed(false) + } } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index 2ed8037afd..daecd4844c 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -62,12 +62,18 @@ public final class PadBridge { private boolean systemGuidePressed; private boolean systemQamPressed; private boolean backQamPressed; + private final PadState lastBackQamReport = new PadState(); + private final PadState lastWrittenReport = new PadState(); + private boolean backQamAxesBlocked; + private final java.util.Set<Runnable> backQamWrites = new java.util.HashSet<>(); + private long backQamDelayMs, backQamWriteAt; private boolean qamChordActive; private int chordButton = -1; private boolean chordButtonPressed; private boolean qamTapPressed; private int qamChordGeneration; private volatile Runnable onPlayerInput; + private Runnable onChordInput; private final java.util.concurrent.atomic.AtomicBoolean playerInputPosted = new java.util.concurrent.atomic.AtomicBoolean(); private static final long STATS_WINDOW_MS = 10_000; @@ -130,6 +136,7 @@ public final class PadBridge { } private void resetBuiltin() { + clearBackQamWrites(); routedTouch.clear(); systemGuidePressed = false; systemQamPressed = false; @@ -152,6 +159,7 @@ public final class PadBridge { } public synchronized void stop() { + clearBackQamWrites(); releaseBackPaddles(); activeControllerId = NO_CONTROLLER; for (int slot = 0; slot < SLOTS; slot++) { @@ -276,6 +284,14 @@ public final class PadBridge { onPlayerInput = listener; } + public synchronized void setOnChordInput(Runnable listener) { + onChordInput = listener; + } + + private void noteChordInput(int slot) { + if (slot == 0 && onChordInput != null) onChordInput.run(); + } + private void notePlayerInput() { Runnable listener = onPlayerInput; if (listener == null || !playerInputPosted.compareAndSet(false, true)) return; @@ -326,6 +342,7 @@ public final class PadBridge { default: return false; } noteDevice(event.getDevice(), slot); + if (pressed && event.getRepeatCount() == 0 && !event.isCanceled()) noteChordInput(slot); if (pressed) notePlayerInput(); statButtons++; scheduleStats(); @@ -355,6 +372,7 @@ public final class PadBridge { pad.rightX = x; pad.rightY = y; } + if (x != 0f || y != 0f) noteChordInput(slot); if (Math.max(Math.abs(x), Math.abs(y)) > 0.5f) notePlayerInput(); publish(slot); return true; @@ -385,6 +403,8 @@ public final class PadBridge { pad.up = hatY < -0.5f; pad.down = hatY > 0.5f; } + if (pad.leftX != 0f || pad.leftY != 0f || pad.rightX != 0f || pad.rightY != 0f + || lt > 0f || rt > 0f || pad.up || pad.right || pad.down || pad.left) noteChordInput(slot); if (Math.max(Math.max(Math.abs(pad.leftX), Math.abs(pad.leftY)), Math.max(Math.abs(pad.rightX), Math.abs(pad.rightY))) > 0.5f || lt > 0.5f || rt > 0.5f || pad.up || pad.right || pad.down || pad.left) { notePlayerInput(); @@ -461,6 +481,7 @@ public final class PadBridge { } public synchronized void releaseAll() { + clearBackQamWrites(); routedTouch.clear(); backQamPressed = false; releaseBackPaddles(); @@ -491,9 +512,108 @@ public final class PadBridge { if (pressed && !canHoldQam()) return; if (backQamPressed == pressed) return; backQamPressed = pressed; + if (pressed && (open || start())) { + backQamAxesBlocked = false; + long now = android.os.SystemClock.uptimeMillis(); + long modifierAt = Math.max(now, backQamWriteAt); + backQamDelayMs = modifierAt - now + QAM_GUIDE_LEAD_MIN_MS; + PadState modifier = new PadState(); + modifier.copyFrom(lastBackQamReport); + modifier.press(PadState.QAM, true); + writeBackQamReport(modifier, modifierAt); + } + if (!pressed) { + backQamAxesBlocked = hasAxes(state); + if (!backQamWrites.isEmpty()) { + PadState neutral = new PadState(); + neutral.copyFrom(lastWrittenReport); + clearAxes(neutral); + writer.writePad(neutral); + lastWrittenReport.copyFrom(neutral); + } + } publish(); } + public synchronized void cancelBackQam() { + if (!backQamPressed && backQamWrites.isEmpty()) return; + clearBackQamWrites(); + backQamPressed = false; + state.clear(); + publish(); + } + + private void clearBackQamWrites() { + for (Runnable pending : backQamWrites) mainHandler.removeCallbacks(pending); + backQamWrites.clear(); + backQamDelayMs = backQamWriteAt = 0; + lastBackQamReport.clear(); + lastWrittenReport.clear(); + backQamAxesBlocked = false; + } + + private void writeBackQamReport(PadState report, long at) { + lastBackQamReport.copyFrom(report); + if (backQamWrites.isEmpty() && at <= android.os.SystemClock.uptimeMillis()) { + writeReport(report, false); + return; + } + PadState queued = new PadState(); + queued.copyFrom(report); + Runnable pending = new Runnable() { + @Override public void run() { + synchronized (PadBridge.this) { + if (!backQamWrites.remove(this)) return; + writeReport(queued, true); + if (backQamWrites.isEmpty() && !hasButtons(lastBackQamReport)) backQamDelayMs = 0; + } + } + }; + backQamWrites.add(pending); + backQamWriteAt = at; + mainHandler.postAtTime(pending, at); + } + + private void writePad(PadState report) { + if (backQamAxesBlocked && !hasAxes(state)) backQamAxesBlocked = false; + long at = android.os.SystemClock.uptimeMillis(); + // Steam must see the modifier before a partner; preserve quick press/release pairs in order. + if (backQamPressed || !backQamWrites.isEmpty()) at += backQamDelayMs; + writeBackQamReport(report, at); + } + + private static boolean hasAxes(PadState pad) { + return pad.leftX != 0f || pad.leftY != 0f || pad.rightX != 0f || pad.rightY != 0f + || pad.leftTrigger != 0f || pad.rightTrigger != 0f; + } + + private static void clearAxes(PadState pad) { + pad.leftX = pad.leftY = pad.rightX = pad.rightY = pad.leftTrigger = pad.rightTrigger = 0f; + } + + private static boolean hasButtons(PadState pad) { + for (int i = 0; i < 10; i++) if (pad.isDown(i)) return true; + return pad.isDown(PadState.GUIDE) || pad.up || pad.right || pad.down || pad.left; + } + + private void writeReport(PadState report, boolean queued) { + if (!queued && !backQamAxesBlocked) { + lastWrittenReport.copyFrom(report); + writer.writePad(report); + return; + } + PadState live = new PadState(); + live.copyFrom(report); + if (queued) { + live.leftX = state.leftX; live.leftY = state.leftY; + live.rightX = state.rightX; live.rightY = state.rightY; + live.leftTrigger = state.leftTrigger; live.rightTrigger = state.rightTrigger; + } + if ((queued && (!backQamPressed || !report.isDown(PadState.QAM))) || backQamAxesBlocked) clearAxes(live); + lastWrittenReport.copyFrom(live); + writer.writePad(live); + } + public synchronized void triggerQam() { if (!builtinPad) return; if (!nativeQam()) { @@ -701,14 +821,14 @@ public final class PadBridge { boolean guide = systemGuidePressed || qamChordActive; boolean qam = nativeQam() && (systemQamPressed || qamTapPressed || backQamPressed); if (!guide && !qam) { - writer.writePad(state); + writePad(state); return; } effectiveState.copyFrom(state); if (guide) effectiveState.press(PadState.GUIDE, true); if (qam) effectiveState.press(PadState.QAM, true); if (chordButtonPressed) effectiveState.press(chordButton, true); - writer.writePad(effectiveState); + writePad(effectiveState); } public static boolean wiredXboxLayout(MotionEvent event) { 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 8ffaacd563..92163226f8 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -255,6 +255,16 @@ object SessionPrefs { prefs(context).edit().putBoolean("backActionsInverted", inverted).apply() } + val BACK_DOUBLE_TAP_MS_OPTIONS = (100..800 step 100).toList() + + fun backDoubleTapMs(context: Context): Int = + prefs(context).getInt("backDoubleTapMs", 500).takeIf { it in BACK_DOUBLE_TAP_MS_OPTIONS } ?: 500 + + fun setBackDoubleTapMs(context: Context, ms: Int) { + require(ms in BACK_DOUBLE_TAP_MS_OPTIONS) + prefs(context).edit().putInt("backDoubleTapMs", ms).apply() + } + const val TOUCH_AUTO = "auto" const val TOUCH_PAD = "touchpad" const val TOUCH_DIRECT = "direct" diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index c933229a88..27c97b2ba0 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -14,7 +14,7 @@ object SettingsReset { "orientation", "launcherFullscreen", "animations", "theme", "runSteamAtStartup", "addedGamesArt", "gameStoresEnabled", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", "storesInstallLanguage", - "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "backActionsInverted", "touch", "osc", "shape", "steamController", + "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", "stretch16x9", "picturePosition", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index b526bea285..4e59b74448 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -215,6 +215,8 @@ class DrawerActions( val micEnabled: Boolean = false, val onMicEnabled: (Boolean) -> Unit = {}, val backActionsInverted: Boolean, + val backDoubleTapMs: Int = 500, + val onBackDoubleTapMs: (Int) -> Unit = {}, val padType: String? = null, val onPadType: (String) -> Unit = {}, val touchMode: String, @@ -607,6 +609,9 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont if (a.steam) ChoiceRow(host, "back-actions", stringResource(R.string.mode_back), null, listOf(false to stringResource(SessionPrefs.BACK_MENU_THEN_QAM), true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU)), a.backActionsInverted, chipModifier = focus.track(page, "back-actions"), onPick = a.onBackActionsInverted) + if (a.steam) ChoiceRow(host, "back-double-tap", stringResource(R.string.back_double_tap_window), null, + SessionPrefs.BACK_DOUBLE_TAP_MS_OPTIONS.map { it to stringResource(R.string.back_tap_ms, it) }, + a.backDoubleTapMs, chipModifier = focus.track(page, "back-double-tap"), onPick = a.onBackDoubleTapMs) if (a.steam && a.unfoldedControls != null) ToggleRow(host, "unfolded-controls", stringResource(R.string.unfolded_controls), stringResource(R.string.unfolded_controls_hint), a.unfoldedControls, chipModifier = focus.track(page, "unfolded-controls"), onChange = a.onUnfoldedControls) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1399db1b68..1b75df827e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -306,7 +306,9 @@ <string name="mode_controller_x360">Xbox 360 controller</string> <string name="mode_controller_note">Deck: Quick Access button and gyro. Steam Controller: the same, with grip sense on the back buttons. DualShock 4 and DualSense: gyro, and the trackpads as their touchpad. Xbox 360: open Quick Access with Guide+A.</string> <string name="mode_back">Back</string> - <string name="back_native_qam_hint">Hold Back for 700 ms, then press another button for Steam shortcuts. Single and double taps keep the selected actions.</string> + <string name="back_native_qam_hint">Hold Back for 700 ms, or hold Back and press another button for Steam shortcuts.</string> + <string name="back_double_tap_window">Double-tap window</string> + <string name="back_tap_ms">%1$d ms</string> <string name="brightness_permission_title">Allow brightness control</string> <string name="brightness_permission_text">Tap to allow Steam to change Android screen brightness.</string> <string name="back_menu_then_qam">Menu → QAM</string> diff --git a/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt b/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt index 8006a495b2..5759556aea 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt @@ -40,6 +40,29 @@ class BackQamInputTest { assertTrue(changes.isEmpty()) } + @Test fun theConfiguredWindowControlsSingleAndDoubleTaps() { + for (window in listOf(100L, 800L)) { + taps.clear() + val configured = BackQamInput(changes::add, taps::add, doubleTapMs = { window }) + fun press(action: Int) = configured.onKeyEvent(KeyEvent(action, KeyEvent.KEYCODE_BACK), true) + press(KeyEvent.ACTION_DOWN) + press(KeyEvent.ACTION_UP) + advance(window - 1) + assertTrue(taps.isEmpty()) + press(KeyEvent.ACTION_DOWN) + press(KeyEvent.ACTION_UP) + assertEquals(listOf(true), taps) + taps.clear() + press(KeyEvent.ACTION_DOWN) + press(KeyEvent.ACTION_UP) + advance(window - 1) + assertTrue(taps.isEmpty()) + advance(1) + assertEquals(listOf(false), taps) + assertTrue(changes.isEmpty()) + } + } + @Test fun aHoldStartsAt700msAndNeverProducesATap() { assertTrue(send(KeyEvent.ACTION_DOWN)) advance(699) @@ -90,6 +113,55 @@ class BackQamInputTest { assertEquals(listOf(true, false), changes) } + @Test fun aChordImmediatelyStartsAHoldAndSuppressesTheTap() { + send(KeyEvent.ACTION_DOWN) + advance(25) + input.onChordInput() + assertEquals(listOf(true), changes) + input.onChordInput() + send(KeyEvent.ACTION_UP) + advance(1000) + assertEquals(listOf(true, false), changes) + assertTrue(taps.isEmpty()) + } + + @Test fun aChordOnTheSecondPressCancelsBothTapActions() { + send(KeyEvent.ACTION_DOWN) + send(KeyEvent.ACTION_UP) + advance(100) + send(KeyEvent.ACTION_DOWN) + input.onChordInput() + send(KeyEvent.ACTION_UP) + advance(1000) + assertEquals(listOf(true, false), changes) + assertTrue(taps.isEmpty()) + } + + @Test fun controllerInputAfterBackIsReleasedOrCancelledCannotStartAHold() { + send(KeyEvent.ACTION_DOWN) + send(KeyEvent.ACTION_UP) + input.onChordInput() + advance(500) + assertEquals(listOf(false), taps) + send(KeyEvent.ACTION_DOWN) + input.cancel() + input.onChordInput() + advance(1000) + assertTrue(changes.isEmpty()) + } + + @Test fun anImmediateChordKeepsAllBackOwnersUntilTheLastRelease() { + send(KeyEvent.ACTION_DOWN, device = 4) + send(KeyEvent.ACTION_DOWN, device = 5) + input.onChordInput() + input.onDeviceRemoved(4) + assertEquals(listOf(true), changes) + send(KeyEvent.ACTION_UP, device = 5) + advance(1000) + assertEquals(listOf(true, false), changes) + assertTrue(taps.isEmpty()) + } + @Test fun disabledRoutingPreservesBackNavigation() { assertFalse(send(KeyEvent.ACTION_DOWN, enabled = false)) assertFalse(send(KeyEvent.ACTION_UP, enabled = false)) diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt index 3491076a24..ed8f42dd59 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt @@ -1,6 +1,11 @@ package com.droiddeck.launcher.input import android.os.Handler +import android.os.Looper +import android.hardware.input.InputManager +import android.view.InputDevice +import android.view.KeyEvent +import android.view.MotionEvent import com.droiddeck.launcher.session.SessionState import java.nio.file.Files import java.time.Duration @@ -10,13 +15,16 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import org.robolectric.util.ReflectionHelpers +import org.robolectric.shadows.InputDeviceBuilder @RunWith(RobolectricTestRunner::class) -@Config(sdk = [34], manifest = Config.NONE, instrumentedPackages = ["com.droiddeck.launcher.input.FakeInputWriter"], - shadows = [JoyConPadTest.RecordingWriter::class]) +@Config(sdk = [34], manifest = Config.NONE, instrumentedPackages = ["com.droiddeck.launcher.input.FakeInputWriter", "com.droiddeck.launcher.wayland.WaylandCompositor"], + shadows = [JoyConPadTest.RecordingWriter::class, PadBridgeRoutingTest.RegisteredKeyEvent::class, + PadBridgeRoutingTest.RegisteredMotionEvent::class, SessionGestureRoutingTest.CompositorShadow::class]) class PadBridgeQamTest { private val directory = Files.createTempDirectory("qam-pad").toFile() private lateinit var bridge: PadBridge @@ -45,6 +53,7 @@ class PadBridgeQamTest { bridge.applyExternal({}, false) assertEquals(supported, pad().isDown(PadState.QAM)) bridge.setBackQamPressed(false) + advanceTime() } SessionState.deckPad = false assertFalse(bridge.canHoldQam()) @@ -54,10 +63,12 @@ class PadBridgeQamTest { bridge.setBackQamPressed(true) advanceTime() bridge.applyExternal({ it.press(PadState.X, true); it.press(PadState.SELECT, true) }, true) + advanceTime() assertTrue(pad().isDown(PadState.QAM)) assertTrue(pad().isDown(PadState.X)) assertTrue(pad().isDown(PadState.SELECT)) bridge.setBackQamPressed(false) + advanceTime() assertFalse(pad().isDown(PadState.QAM)) assertTrue(pad().isDown(PadState.X)) assertTrue(pad().isDown(PadState.SELECT)) @@ -72,6 +83,7 @@ class PadBridgeQamTest { bridge.setSystemButtons(false, false) assertTrue(pad().isDown(PadState.QAM)) bridge.setBackQamPressed(false) + advanceTime() assertFalse(pad().isDown(PadState.QAM)) } @@ -106,10 +118,175 @@ class PadBridgeQamTest { assertFalse(pad().isDown(PadState.QAM)) } + @Test fun aQuickPartnerPressReachesSteamWithQamAndReleasesIndependently() { + val device = controller() + val taps = mutableListOf<Boolean>() + val input = BackQamInput(bridge::setBackQamPressed, taps::add) + bridge.setOnChordInput { + assertFalse(pad().isDown(PadState.X)) + input.onChordInput() + } + input.onKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK), true) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(25)) + assertTrue(bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_X))) + assertTrue(pad().isDown(PadState.QAM)) + assertFalse(pad().isDown(PadState.X)) + advance(79) + assertFalse(pad().isDown(PadState.X)) + advance(1) + assertTrue(pad().isDown(PadState.X)) + input.onKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK), true) + assertFalse(pad().isDown(PadState.QAM)) + assertTrue(pad().isDown(PadState.X)) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_X, KeyEvent.ACTION_UP)) + advance(80) + assertFalse(pad().isDown(PadState.X)) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofSeconds(1)) + assertTrue(taps.isEmpty()) + } + + @Test fun onlyFreshAcceptedPrimaryControllerPressesPromoteAChord() { + val device = controller() + val second = controller(11) + val promoted = mutableListOf<Boolean>() + bridge.setOnChordInput { promoted.add(true) } + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_X, KeyEvent.ACTION_UP)) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_X, repeat = 1)) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_A)) + bridge.onKeyEvent(key(second, KeyEvent.KEYCODE_BUTTON_X)) + bridge.setExcluded { it == device.id } + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_X)) + assertTrue(promoted.isEmpty()) + bridge.setExcluded { false } + for (code in listOf(KeyEvent.KEYCODE_BUTTON_X, KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_BUTTON_L2)) { + bridge.onKeyEvent(key(device, code)) + } + assertEquals(3, promoted.size) + } + + @Test fun aQuickChordKeepsItsPressAndReleaseAfterTheModifierLead() { + bridge.setBackQamPressed(true) + bridge.applyExternal({ it.press(PadState.X, true) }, true) + advance(20) + bridge.applyExternal({ it.press(PadState.X, false) }, true) + bridge.setBackQamPressed(false) + assertTrue(pad().isDown(PadState.QAM)) + assertFalse(pad().isDown(PadState.X)) + advance(60) + assertTrue(pad().isDown(PadState.QAM)) + assertTrue(pad().isDown(PadState.X)) + advance(19) + assertTrue(pad().isDown(PadState.X)) + advance(1) + assertFalse(pad().isDown(PadState.X)) + assertFalse(pad().isDown(PadState.QAM)) + } + + @Test fun cancellationDiscardsQueuedPartnersAndTheirReleases() { + val input = BackQamInput(bridge::setBackQamPressed, {}, onCancel = bridge::cancelBackQam) + input.onKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK), true) + input.onChordInput() + bridge.applyExternal({ it.press(PadState.LB, true) }, true) + input.onKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK), true) + input.cancel() + advance(1000) + assertFalse(pad().isDown(PadState.LB)) + assertFalse(pad().isDown(PadState.QAM)) + bridge.applyExternal({ it.press(PadState.X, true) }, true) + input.cancel() + assertTrue(pad().isDown(PadState.X)) + } + + @Test fun aSettledHoldDoesNotDelayLaterPartnerInput() { + bridge.setBackQamPressed(true) + advance(80) + bridge.applyExternal({ it.press(PadState.LB, true) }, true) + assertTrue(pad().isDown(PadState.LB)) + bridge.setBackQamPressed(false) + assertFalse(pad().isDown(PadState.QAM)) + } + + @Test fun queuedReportsUseTheLiveStickAndStopItImmediatelyOnBackRelease() { + bridge.setBackQamPressed(true) + bridge.applyExternal({ it.press(PadState.X, true); it.leftY = -1f }, true) + advance(20) + bridge.applyExternal({ it.leftY = -0.25f }, true) + advance(60) + assertEquals(-0.25f, pad().leftY) + bridge.setBackQamPressed(false) + assertEquals(0f, pad().leftY) + advance(1000) + assertEquals(0f, pad().leftY) + bridge.applyExternal({ it.leftY = 0f }, true) + bridge.applyExternal({ it.leftY = 0.75f }, true) + assertEquals(0.75f, pad().leftY) + } + + @Test fun releasingBackDuringTheLeadNeverReplaysAnOldStickMovement() { + bridge.setBackQamPressed(true) + bridge.applyExternal({ it.leftY = -1f }, true) + advance(20) + bridge.setBackQamPressed(false) + advance(1000) + assertEquals(0f, pad().leftY) + assertFalse(pad().isDown(PadState.QAM)) + } + + @Test fun theInitialPartnerKeepsItsDurationWhenReleasedAfterTheLead() { + bridge.setBackQamPressed(true) + bridge.applyExternal({ it.press(PadState.X, true) }, true) + advance(100) + bridge.applyExternal({ it.press(PadState.X, false) }, true) + assertTrue(pad().isDown(PadState.X)) + advance(79) + assertTrue(pad().isDown(PadState.X)) + advance(1) + assertFalse(pad().isDown(PadState.X)) + } + + @Test fun deliberateStickTriggerAndHatMotionPromoteChordsButNeutralAndDriftDoNot() { + val device = controller() + val promoted = mutableListOf<Boolean>() + bridge.setOnChordInput { promoted.add(true) } + for ((axis, value) in listOf(MotionEvent.AXIS_X to 0f, MotionEvent.AXIS_X to 0.1f, + MotionEvent.AXIS_LTRIGGER to 0f, MotionEvent.AXIS_HAT_Y to 0f)) motion(device, axis, value) + assertTrue(promoted.isEmpty()) + for ((axis, value) in listOf(MotionEvent.AXIS_X to -0.15f, MotionEvent.AXIS_LTRIGGER to 0.75f, + MotionEvent.AXIS_HAT_Y to -1f)) motion(device, axis, value) + assertEquals(3, promoted.size) + } + + private fun controller(id: Int = 10): InputDevice { + val builder = InputDeviceBuilder.newBuilder().setId(id).setName("QAM pad $id") + .setDescriptor("qam-pad-$id").setExternal(true).setKeyboardType(InputDevice.KEYBOARD_TYPE_NON_ALPHABETIC) + .setSources(InputDevice.SOURCE_GAMEPAD or InputDevice.SOURCE_JOYSTICK) + for (axis in listOf(MotionEvent.AXIS_X, MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_HAT_Y)) { + builder.addMotionRange(axis, InputDevice.SOURCE_JOYSTICK, 0f, 1f, 0f, 0f, 0f) + } + return builder.build().also { + shadowOf(RuntimeEnvironment.getApplication().getSystemService(InputManager::class.java)).addInputDevice(it) + bridge.applyExternal({}, false) + } + } + + private fun key(device: InputDevice, code: Int, action: Int = KeyEvent.ACTION_DOWN, repeat: Int = 0) = + KeyEvent(0L, 0L, action, code, repeat, 0, device.id, 0, 0, InputDevice.SOURCE_GAMEPAD) + + private fun motion(device: InputDevice, axis: Int, value: Float) { + val event = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_MOVE, 1, + arrayOf(MotionEvent.PointerProperties().apply { id = 0 }), + arrayOf(MotionEvent.PointerCoords().apply { setAxisValue(axis, value) }), + 0, 0, 1f, 1f, device.id, 0, InputDevice.SOURCE_JOYSTICK, 0) + try { assertTrue(bridge.onMotionEvent(event)) } finally { event.recycle() } + } + private fun pad() = requireNotNull(JoyConPadTest.RecordingWriter.pads[0]) private fun advanceTime() { val handler = ReflectionHelpers.getStaticField<Handler>(PadBridge::class.java, "chordHandler") shadowOf(handler.looper).idleFor(Duration.ofSeconds(2)) + advance(2000) } + + private fun advance(ms: Long) = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(ms)) } diff --git a/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt index 97b1102a3f..c37f59c9ce 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt @@ -27,6 +27,7 @@ class SettingsResetTest { @Test fun settingsGoBackToTheirDefaults() { SessionPrefs.setTheme(app, "ocean") + SessionPrefs.setBackDoubleTapMs(app, 100) SessionPrefs.setUnfoldedControlsWithController(app, true) SessionPrefs.setNoXalia(app, false) session.edit().putInt("fpsLimit.steam", 30).commit() @@ -46,6 +47,7 @@ class SettingsResetTest { assertTrue(SettingsReset.resetAll(app, gameProfiles = false)) assertEquals("graphite", SessionPrefs.theme(app)) + assertEquals(500, SessionPrefs.backDoubleTapMs(app)) assertFalse(SessionPrefs.unfoldedControlsWithController(app)) assertTrue(SessionPrefs.noXalia(app)) assertFalse(session.contains("fpsLimit.steam")) From b3561bf6580e3973208f9852561659c33562d4cc Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 15:31:51 -0400 Subject: [PATCH 102/135] fix(input): discard queued chords on disconnect (#1632) --- .../droiddeck/launcher/input/PadBridge.java | 3 + .../launcher/input/PadBridgeQamTest.kt | 65 ++++++++++++++++++- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index daecd4844c..3d27da5547 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -692,7 +692,9 @@ public final class PadBridge { slotJoyCons.set(slot * 2 + side, id); slotJoyCons.set(slot * 2 + 1 - side, owner.getId()); if (slot == firstPlayerSlot()) releaseBackPaddles(); + if (slot == 0) clearBackQamWrites(); stateFor(slot).clear(); + if (slot == 0) publish(); Log.i(TAG, "\"" + device.getName() + "\" (id " + id + ") joins \"" + owner.getName() + "\" as player " + (slot + 1)); return slot; } @@ -727,6 +729,7 @@ public final class PadBridge { } private void leave(int slot, int id) { + if (slot == 0) clearBackQamWrites(); if (partners[slot] == NO_CONTROLLER) { free(slot); return; diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt index ed8f42dd59..78a790892f 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt @@ -206,6 +206,64 @@ class PadBridgeQamTest { assertFalse(pad().isDown(PadState.QAM)) } + @Test fun disconnectingThePartnerControllerDiscardsItsQueuedPress() { + val device = controller() + bridge.setBackQamPressed(true) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_L1)) + advance(20) + bridge.onDeviceRemoved(device.id) + assertTrue(pad().isDown(PadState.QAM)) + assertFalse(pad().isDown(PadState.LB)) + advance(60) + assertFalse(pad().isDown(PadState.LB)) + advance(1000) + assertFalse(pad().isDown(PadState.LB)) + assertTrue(pad().isDown(PadState.QAM)) + } + + @Test fun disconnectingThePartnerControllerImmediatelyReleasesADeliveredPress() { + val device = controller() + bridge.setBackQamPressed(true) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_L1)) + advance(80) + assertTrue(pad().isDown(PadState.LB)) + bridge.onDeviceRemoved(device.id) + assertFalse(pad().isDown(PadState.LB)) + assertTrue(pad().isDown(PadState.QAM)) + advance(1000) + assertFalse(pad().isDown(PadState.LB)) + } + + @Test fun removingAnotherPlayerDoesNotDiscardThePrimaryPlayersQueuedChord() { + val device = controller() + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.ACTION_UP)) + val other = controller(11) + bridge.onKeyEvent(key(other, KeyEvent.KEYCODE_BUTTON_X, KeyEvent.ACTION_UP)) + bridge.setBackQamPressed(true) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_L1)) + bridge.onDeviceRemoved(other.id) + advance(80) + assertTrue(pad().isDown(PadState.LB)) + assertTrue(pad().isDown(PadState.QAM)) + } + + @Test fun pairingOnAnIgnoredRailKeyImmediatelyReleasesDeliveredButtonsAndDropsQueuedOnes() { + val left = controller(product = 0x2006) + bridge.setBackQamPressed(true) + bridge.onKeyEvent(key(left, KeyEvent.KEYCODE_BUTTON_L1)) + advance(80) + assertTrue(pad().isDown(PadState.LB)) + bridge.onKeyEvent(key(left, KeyEvent.KEYCODE_BUTTON_X)) + val right = controller(11, product = 0x2007) + assertTrue(bridge.onKeyEvent(key(right, KeyEvent.KEYCODE_BUTTON_L1, scan = 0x136))) + assertFalse(pad().isDown(PadState.LB)) + assertFalse(pad().isDown(PadState.X)) + assertTrue(pad().isDown(PadState.QAM)) + advance(1000) + assertFalse(pad().isDown(PadState.LB)) + assertFalse(pad().isDown(PadState.X)) + } + @Test fun queuedReportsUseTheLiveStickAndStopItImmediatelyOnBackRelease() { bridge.setBackQamPressed(true) bridge.applyExternal({ it.press(PadState.X, true); it.leftY = -1f }, true) @@ -256,8 +314,9 @@ class PadBridgeQamTest { assertEquals(3, promoted.size) } - private fun controller(id: Int = 10): InputDevice { + private fun controller(id: Int = 10, product: Int = 0): InputDevice { val builder = InputDeviceBuilder.newBuilder().setId(id).setName("QAM pad $id") + .setVendorId(if (product == 0) 0 else 0x057e).setProductId(product) .setDescriptor("qam-pad-$id").setExternal(true).setKeyboardType(InputDevice.KEYBOARD_TYPE_NON_ALPHABETIC) .setSources(InputDevice.SOURCE_GAMEPAD or InputDevice.SOURCE_JOYSTICK) for (axis in listOf(MotionEvent.AXIS_X, MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_HAT_Y)) { @@ -269,8 +328,8 @@ class PadBridgeQamTest { } } - private fun key(device: InputDevice, code: Int, action: Int = KeyEvent.ACTION_DOWN, repeat: Int = 0) = - KeyEvent(0L, 0L, action, code, repeat, 0, device.id, 0, 0, InputDevice.SOURCE_GAMEPAD) + private fun key(device: InputDevice, code: Int, action: Int = KeyEvent.ACTION_DOWN, repeat: Int = 0, scan: Int = 0) = + KeyEvent(0L, 0L, action, code, repeat, 0, device.id, scan, 0, InputDevice.SOURCE_GAMEPAD) private fun motion(device: InputDevice, axis: Int, value: Float) { val event = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_MOVE, 1, From 2d8957a401f202351d2f1b8a975e034645ad73dc Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 15:41:46 -0400 Subject: [PATCH 103/135] feat(launch): show compatibility install progress (#1629) --- .../droiddeck/launcher/FrontEndActivity.kt | 127 ++++++++- .../java/com/droiddeck/launcher/ProtonMenu.kt | 21 +- app/src/main/res/values/strings.xml | 4 + .../droiddeck/launcher/CompatLaunchTest.kt | 268 ++++++++++++++++++ .../droiddeck/launcher/ProtonMenuAutoTest.kt | 8 + 5 files changed, 416 insertions(+), 12 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index a80e3c5d61..c6daf0da36 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -91,12 +91,16 @@ class FrontEndActivity : ComponentActivity() { private val components = ComponentsMenu(this, ui) private val decky = DeckyMenu(this, ui) private val updates = UpdatesMenu(this, ui) - private val protons = ProtonMenu(this, ui) { !busy && flood == null && pkgStage == null && components.compBusy == null } + private val protons = ProtonMenu(this, ui) { !busy && flood == null && compatLaunch == null && pkgStage == null && components.compBusy == null } private var installed by mutableStateOf<String?>(null) private var flood by mutableStateOf<PendingFlood?>(null) private var floodProgress by androidx.compose.runtime.mutableFloatStateOf(0f) private class PendingFlood(val from: androidx.compose.ui.geometry.Rect, val intent: Intent) + private class CompatLaunch(val intent: Intent, val loading: com.droiddeck.launcher.session.LoadingState, var menuInstall: Boolean) + private var compatLaunch by mutableStateOf<CompatLaunch?>(null) + private var compatLaunchPoll: Runnable? = null + private var compatLaunchVisible = false private var returning by mutableStateOf<ReturningFlood?>(null) private class ReturningFlood(val color: Int, val to: androidx.compose.ui.geometry.Rect?) private var ready by mutableStateOf(false) @@ -134,9 +138,14 @@ class FrontEndActivity : ComponentActivity() { private var catalog by mutableStateOf<List<DesktopCatalog.Entry>?>(null) private var catalogLoading by mutableStateOf(false) private var packageRows by mutableStateOf<List<PackageRow>?>(null) - private var pkgId by mutableStateOf<String?>(null) - private var pkgStage by mutableStateOf<String?>(null) - private var pkgPercent by mutableIntStateOf(-1) + private object PackageOperation { + val id = mutableStateOf<String?>(null) + val stage = mutableStateOf<String?>(null) + val percent = mutableIntStateOf(-1) + } + private var pkgId by PackageOperation.id + private var pkgStage by PackageOperation.stage + private var pkgPercent by PackageOperation.percent private var desktopInstalled by mutableStateOf(false) private var desktopPresent by mutableStateOf(false) private var battleNetInstalled by mutableStateOf(false) @@ -440,13 +449,14 @@ class FrontEndActivity : ComponentActivity() { override fun startActivity(intent: Intent?) { if (intent?.component?.className == SessionActivity::class.java.name) { + if (compatLaunch != null) return when { busy || LinuxRuntimeInstaller.isBusy() -> { android.widget.Toast.makeText(this, R.string.main_wait_runtime, android.widget.Toast.LENGTH_SHORT).show() return } protons.protonBusyId != null || ProtonExtras.installInProgress -> { - android.widget.Toast.makeText(this, R.string.main_wait_proton_install, android.widget.Toast.LENGTH_SHORT).show() + waitForCompat(intent) return } pkgStage != null -> { @@ -474,6 +484,8 @@ class FrontEndActivity : ComponentActivity() { flood = null floodProgress = 0f com.droiddeck.launcher.ui.LaunchOrigin.flooding = null + if (!busy && !LinuxRuntimeInstaller.isBusy() && pkgStage == null && + (protons.protonBusyId != null || ProtonExtras.installInProgress)) waitForCompat(f.intent) return } val signal = com.droiddeck.launcher.ui.Themes.byId(theme).signal @@ -481,6 +493,71 @@ class FrontEndActivity : ComponentActivity() { overridePendingTransition(0, 0) } + private fun waitForCompat(next: Intent, menuInstall: Boolean = protons.protonBusyId != null) { + if (compatLaunch != null) return + com.droiddeck.launcher.ui.LaunchOrigin.take() + com.droiddeck.launcher.ui.LaunchOrigin.flooding = null + val waiting = CompatLaunch(Intent(next), com.droiddeck.launcher.session.LoadingState(this), menuInstall) + compatLaunch = waiting + val poll = object : Runnable { + override fun run() { + if (isDestroyed || isFinishing || compatLaunch !== waiting) return + if (protons.protonBusyId != null || ProtonExtras.installInProgress) { + waiting.menuInstall = waiting.menuInstall || protons.protonBusyId != null + val percent = if (protons.protonBusyId != null) protons.protonPercent else -1 + val stage = protons.protonStage ?: getString(R.string.load_compat_wait) + waiting.loading.say(if (percent >= 0) getString(R.string.load_compat_progress, stage, percent) else stage, + com.droiddeck.launcher.session.LoadingState.Topic.RUNTIME, readable = true) + waiting.loading.percent = percent + waiting.loading.tick() + ui.postDelayed(this, 250) + return + } + if (!compatLaunchVisible) { ui.postDelayed(this, 250); return } + val problem = protons.protonProblem.takeIf { waiting.menuInstall } + if (problem == null && (busy || LinuxRuntimeInstaller.isBusy() || pkgStage != null)) { + waiting.loading.say(pkgStage ?: stage.takeIf { it.isNotBlank() } ?: getString(R.string.main_wait_runtime), + com.droiddeck.launcher.session.LoadingState.Topic.RUNTIME, readable = true) + waiting.loading.percent = if (pkgStage != null) pkgPercent else percent + waiting.loading.tick() + ui.postDelayed(this, 250) + return + } + compatLaunchPoll = null + if (problem != null) waiting.loading.showEnded(problem) + else { + compatLaunch = null + startActivity(waiting.intent) + } + } + } + compatLaunchPoll = poll + poll.run() + } + + private fun cancelCompatLaunch() { + compatLaunchPoll?.let(ui::removeCallbacks) + compatLaunchPoll = null + compatLaunch = null + } + + private fun restoreCompatLaunch(state: Bundle) { + savedIntent(state, KEY_COMPAT_LAUNCH)?.let { next -> + val problem = state.getString(KEY_COMPAT_PROBLEM) + if (problem == null) waitForCompat(next, state.getBoolean(KEY_COMPAT_MENU_INSTALL)) + else compatLaunch = CompatLaunch(next, + com.droiddeck.launcher.session.LoadingState(this).apply { showEnded(problem) }, false) + } + } + + private fun saveCompatLaunch(state: Bundle) { + compatLaunch?.let { + state.putParcelable(KEY_COMPAT_LAUNCH, it.intent) + state.putBoolean(KEY_COMPAT_MENU_INSTALL, it.menuInstall) + if (it.loading.ended) state.putString(KEY_COMPAT_PROBLEM, it.loading.step) + } + } + private var shortcutPicker by mutableStateOf(false) private var shortcutLibraryScanning by mutableStateOf(false) @Volatile private var libraryScanGeneration = 0 @@ -542,7 +619,7 @@ class FrontEndActivity : ComponentActivity() { } private fun launchGame(game: Library.SteamGame, returnHome: Boolean = false): Boolean { - if (protons.protonBusyId != null || ProtonExtras.installInProgress || pkgStage != null) { + if (pkgStage != null) { android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show() return false } @@ -654,7 +731,7 @@ class FrontEndActivity : ComponentActivity() { android.widget.Toast.makeText(this, R.string.epic_client_uninstalling, android.widget.Toast.LENGTH_SHORT).show() return false } - if (protons.protonBusyId != null || ProtonExtras.installInProgress || pkgStage != null) { + if (pkgStage != null) { android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show() return false } @@ -1216,12 +1293,21 @@ class FrontEndActivity : ComponentActivity() { com.droiddeck.launcher.ui.LaunchOrigin.flooding = null } } + androidx.activity.compose.BackHandler(compatLaunch != null) { cancelCompatLaunch() } + compatLaunch?.loading?.let { loading -> + com.droiddeck.launcher.ui.LoadingOverlay( + loading.step, loading.percent, loading.elapsed, getString(R.string.load_compat_hint), loading.ended, + loading.topic, loading.readable, title = getString(R.string.load_compat_title), + onCancel = ::cancelCompatLaunch, onClose = ::cancelCompatLaunch, + ) + } } } } if (savedInstanceState == null) ui.post { startSteamAtStartupIfEnabled() } else { + restoreCompatLaunch(savedInstanceState) pendingSwitch = savedIntent(savedInstanceState, KEY_PENDING_SWITCH) savedIntent(savedInstanceState, KEY_SWITCHING_TO)?.let { awaitSessionEnd(it, savedInstanceState.getLong(KEY_SWITCH_DEADLINE)) } } @@ -1308,6 +1394,14 @@ class FrontEndActivity : ComponentActivity() { } override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (compatLaunch != null) { + if (event.keyCode == KeyEvent.KEYCODE_BACK || event.keyCode == KeyEvent.KEYCODE_BUTTON_B) { + if (event.action == KeyEvent.ACTION_UP) cancelCompatLaunch() + return true + } + if (!compatLaunch!!.loading.ended && event.keyCode !in listOf( + KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE)) return true + } if (event.keyCode == KeyEvent.KEYCODE_BUTTON_A) com.droiddeck.launcher.ui.HeldKeys.confirm = event.action == KeyEvent.ACTION_DOWN if (showComponents && (event.keyCode == KeyEvent.KEYCODE_BUTTON_L1 || event.keyCode == KeyEvent.KEYCODE_BUTTON_R1)) { if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) { @@ -1324,8 +1418,20 @@ class FrontEndActivity : ComponentActivity() { } } + override fun dispatchGenericMotionEvent(event: android.view.MotionEvent): Boolean { + if (compatLaunch != null && !compatLaunch!!.loading.ended && + com.droiddeck.launcher.input.PadBridge.isControllerMotionEvent(event)) return true + return super.dispatchGenericMotionEvent(event) + } + + override fun onPause() { + compatLaunchVisible = false + super.onPause() + } + override fun onResume() { super.onResume() + compatLaunchVisible = true orientation = SessionPrefs.orientation(this) launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) requestedOrientation = launcherOrientation @@ -1378,6 +1484,7 @@ class FrontEndActivity : ComponentActivity() { override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) + saveCompatLaunch(outState) pendingSwitch?.let { outState.putParcelable(KEY_PENDING_SWITCH, it) } switchingTo?.let { outState.putParcelable(KEY_SWITCHING_TO, it) @@ -1390,6 +1497,7 @@ class FrontEndActivity : ComponentActivity() { else @Suppress("DEPRECATION") state.getParcelable(key) override fun onDestroy() { + cancelCompatLaunch() updates.unregister() super.onDestroy() } @@ -1594,7 +1702,7 @@ class FrontEndActivity : ComponentActivity() { } private fun openBattleNet(args: List<String> = emptyList()) { - if (protons.protonBusyId != null || ProtonExtras.installInProgress || pkgStage != null) { + if (pkgStage != null) { android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show() return } @@ -2316,6 +2424,9 @@ class FrontEndActivity : ComponentActivity() { private const val SESSION_SWITCH_WAIT_MS = 30_000L private const val SESSION_SWITCH_POLL_MS = 250L private const val KEY_PENDING_SWITCH = "pending_switch" + private const val KEY_COMPAT_LAUNCH = "compat_launch" + private const val KEY_COMPAT_MENU_INSTALL = "compat_menu_install" + private const val KEY_COMPAT_PROBLEM = "compat_problem" private const val KEY_SWITCHING_TO = "switching_to" private const val KEY_SWITCH_DEADLINE = "switch_deadline" private val SESSION_ENDED = setOf(SessionPhase.IDLE, SessionPhase.FAILED) diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index 1d870a6bcb..8e8efc80c2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -20,10 +20,19 @@ internal class ProtonMenu( private val ui: Handler, private val idle: () -> Boolean = { true }, ) { - var protonRows by mutableStateOf<List<ProtonRow>>(emptyList()) - var protonBusyId by mutableStateOf<String?>(null) - var protonStage by mutableStateOf<String?>(null) - var protonPercent by mutableIntStateOf(-1) + // Install workers and their results outlive the activity that starts them. + private object Operation { + val rows = mutableStateOf<List<ProtonRow>>(emptyList()) + val busyId = mutableStateOf<String?>(null) + val stage = mutableStateOf<String?>(null) + val percent = mutableIntStateOf(-1) + val problem = mutableStateOf<String?>(null) + } + var protonRows by Operation.rows + var protonBusyId by Operation.busyId + var protonStage by Operation.stage + var protonPercent by Operation.percent + var protonProblem by Operation.problem private val checking = java.util.concurrent.atomic.AtomicBoolean(false) @VisibleForTesting internal var installer: (ProtonExtras.Tool, (String, Int) -> Unit) -> String? = { tool, progress -> ProtonExtras.install(activity, tool, progress) } @@ -33,6 +42,7 @@ internal class ProtonMenu( if (protonBusyId != null || ProtonExtras.installInProgress || SessionState.running) return ProtonExtras.unqueue(activity, tool) protonBusyId = id + protonProblem = null protonStage = activity.getString(R.string.store_starting) protonPercent = -1 Thread({ @@ -43,6 +53,7 @@ internal class ProtonMenu( }.getOrElse { it.message ?: it.javaClass.simpleName } if (problem == null && !automatic && tool.id == ProtonExtras.OWN) ProtonExtras.setDeclined(activity, false) ui.post { + protonProblem = problem protonBusyId = null protonStage = null protonPercent = -1 @@ -60,6 +71,7 @@ internal class ProtonMenu( val tool = ProtonExtras.tools.firstOrNull { it.id == id } ?: return if (protonBusyId != null || SessionState.running) return protonBusyId = id + protonProblem = null protonStage = activity.getString(R.string.main_removing_named, dir ?: tool.name) protonPercent = -1 Thread({ @@ -98,6 +110,7 @@ internal class ProtonMenu( !LinuxRuntime.isInstalled(activity) || !AutoComponents.online(activity) || AutoComponents.unfavourable(activity)) return if (ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == ProtonExtras.OWN }).size > 1) { protonBusyId = ProtonExtras.OWN + protonProblem = null Thread({ ProtonExtras.tidy(activity) val tidied = ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == ProtonExtras.OWN }).size <= 1 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1b75df827e..89991465b5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1287,6 +1287,10 @@ <string name="main_wait_runtime">Wait for the runtime operation to finish</string> <string name="main_wait_proton_install">Wait for the compatibility tool install to finish</string> + <string name="load_compat_title">Preparing compatibility tools</string> + <string name="load_compat_wait">Waiting for compatibility setup to finish</string> + <string name="load_compat_hint">Your session will start when setup finishes.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Wait for the desktop app install to finish</string> <string name="main_wait_install_game">Wait for the install to finish before launching a game</string> <string name="main_saves_close_session">Close the Steam session first, so the game can\'t save over the import</string> diff --git a/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt new file mode 100644 index 0000000000..e19b1d6347 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt @@ -0,0 +1,268 @@ +package com.droiddeck.launcher + +import android.content.Intent +import android.os.Bundle +import android.os.Looper +import com.droiddeck.launcher.session.LoadingState +import com.droiddeck.launcher.session.ProtonExtras +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.ui.LaunchOrigin +import java.time.Duration +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit +import org.junit.After +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.util.ReflectionHelpers + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class CompatLaunchTest { + private lateinit var activity: FrontEndActivity + private lateinit var protons: ProtonMenu + + @Before fun setUp() { + installing(false) + LaunchOrigin.take() + activity = Robolectric.buildActivity(FrontEndActivity::class.java).get() + protons = ReflectionHelpers.getField(activity, "protons") + ReflectionHelpers.setField(activity, "compatLaunchVisible", true) + protons.protonBusyId = "droiddeck" + protons.protonProblem = null + protons.protonStage = "Downloading DroidDeck Proton" + protons.protonPercent = 37 + setString("setPkgStage", null) + } + + @After fun cleanUp() { + cancel() + protons.protonBusyId = null + protons.protonProblem = null + protons.protonStage = null + protons.protonPercent = -1 + setString("setPkgStage", null) + installing(false) + LaunchOrigin.take() + } + + @Test fun waitingShowsRealProgressThenStartsTheOriginalRequestOnce() { + activity.startActivity(request("steam://rungameid/42")) + assertNull(shadowOf(activity).nextStartedActivity) + assertEquals(37, loading().percent) + assertTrue(loading().step.contains("37%")) + protons.protonStage = "Verifying download" + protons.protonPercent = -1 + advance() + assertEquals("Verifying download", loading().step) + assertEquals(-1, loading().percent) + protons.protonBusyId = null + advance() + assertEquals("steam://rungameid/42", shadowOf(activity).nextStartedActivity.getStringExtra(SessionService.EXTRA_STEAM_URL)) + assertNull(waiting()) + advance() + assertNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun cancellingTheLaunchLeavesTheInstallRunningAndPreventsALateStart() { + activity.startActivity(request("first")) + cancel() + assertEquals("droiddeck", protons.protonBusyId) + protons.protonBusyId = null + advance() + assertNull(waiting()) + assertNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun installationFailureStaysOnTheLoadingErrorWithoutStarting() { + activity.startActivity(request("first")) + protons.protonProblem = "Checksum verification failed" + protons.protonBusyId = null + advance() + assertTrue(loading().ended) + assertEquals("Checksum verification failed", loading().step) + assertNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun repeatedLaunchesDoNotReplaceThePendingGame() { + activity.startActivity(request("first")) + activity.startActivity(request("second")) + protons.protonBusyId = null + advance() + assertEquals("first", shadowOf(activity).nextStartedActivity.getStringExtra(SessionService.EXTRA_STEAM_URL)) + assertNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun anInstallOutsideTheLauncherUsesIndeterminateProgress() { + protons.protonBusyId = null + installing(true) + activity.startActivity(request("first")) + assertEquals(-1, loading().percent) + assertNull(shadowOf(activity).nextStartedActivity) + installing(false) + advance() + assertNotNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun finishingInTheBackgroundWaitsUntilTheLauncherIsVisible() { + activity.startActivity(request("first")) + ReflectionHelpers.setField(activity, "compatLaunchVisible", false) + protons.protonBusyId = null + advance() + assertNull(shadowOf(activity).nextStartedActivity) + ReflectionHelpers.setField(activity, "compatLaunchVisible", true) + advance() + assertNotNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun aRestoredCompletedRequestWaitsForResume() { + activity.startActivity(request("first")) + val saved = save() + cancel() + protons.protonBusyId = null + recreate(saved) + advance() + assertNull(shadowOf(activity).nextStartedActivity) + ReflectionHelpers.setField(activity, "compatLaunchVisible", true) + advance() + assertEquals("first", shadowOf(activity).nextStartedActivity.getStringExtra(SessionService.EXTRA_STEAM_URL)) + } + + @Test fun overlappingPackageWorkKeepsTheOriginalLaunchUntilItFinishes() { + activity.startActivity(request("first")) + setString("setPkgStage", "Installing desktop") + ReflectionHelpers.callInstanceMethod<Void>(activity, "setPkgPercent", ReflectionHelpers.ClassParameter.from(Int::class.javaPrimitiveType, 64)) + protons.protonBusyId = null + advance() + assertNotNull(waiting()) + assertNull(shadowOf(activity).nextStartedActivity) + assertEquals("Installing desktop", loading().step) + assertEquals(64, loading().percent) + setString("setPkgStage", null) + advance() + assertEquals("first", shadowOf(activity).nextStartedActivity.getStringExtra(SessionService.EXTRA_STEAM_URL)) + advance() + assertNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun overlappingRuntimeWorkDoesNotDropThePendingLaunch() { + activity.startActivity(request("first")) + setString("setStage", "Updating runtime") + ReflectionHelpers.callInstanceMethod<Void>(activity, "setBusy", ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, true)) + protons.protonBusyId = null + advance() + assertNotNull(waiting()) + assertNull(shadowOf(activity).nextStartedActivity) + assertEquals("Updating runtime", loading().step) + ReflectionHelpers.callInstanceMethod<Void>(activity, "setBusy", ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, false)) + advance() + assertEquals("first", shadowOf(activity).nextStartedActivity.getStringExtra(SessionService.EXTRA_STEAM_URL)) + } + + @Test fun aPackageDownloadStillBlocksTheLaunchAfterRecreationAndReportsOldWorkerProgress() { + activity.startActivity(request("first")) + setString("setPkgStage", "Downloading AppImage") + ReflectionHelpers.callInstanceMethod<Void>(activity, "setPkgPercent", ReflectionHelpers.ClassParameter.from(Int::class.javaPrimitiveType, 23)) + val workerActivity = activity + val saved = save() + cancel() + recreate(saved) + ReflectionHelpers.setField(activity, "compatLaunchVisible", true) + protons.protonBusyId = null + advance() + assertNotNull(waiting()) + assertNull(shadowOf(activity).nextStartedActivity) + assertEquals("Downloading AppImage", loading().step) + assertEquals(23, loading().percent) + android.os.Handler(Looper.getMainLooper()).post { + setString("setPkgStage", "Placing AppImage", workerActivity) + ReflectionHelpers.callInstanceMethod<Void>(workerActivity, "setPkgPercent", ReflectionHelpers.ClassParameter.from(Int::class.javaPrimitiveType, 90)) + } + advance() + assertEquals("Placing AppImage", loading().step) + assertEquals(90, loading().percent) + assertNull(shadowOf(activity).nextStartedActivity) + android.os.Handler(Looper.getMainLooper()).post { setString("setPkgStage", null, workerActivity) } + advance() + assertEquals("first", shadowOf(activity).nextStartedActivity.getStringExtra(SessionService.EXTRA_STEAM_URL)) + advance() + assertNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun aFailedInstallAfterRecreationKeepsItsProgressAndError() = recreationFailure(false) + + @Test fun aFailedInstallBeforeRestorationStillShowsItsError() = recreationFailure(true) + + private fun recreationFailure(finishBeforeRestore: Boolean) { + val entered = CountDownLatch(1) + val finish = CountDownLatch(1) + protons.protonBusyId = null + protons.installer = { _, progress -> + progress("Verifying download", 64) + entered.countDown() + check(finish.await(5, TimeUnit.SECONDS)) + "Checksum verification failed" + } + try { + protons.installProton("droiddeck") + assertTrue(entered.await(5, TimeUnit.SECONDS)) + activity.startActivity(request("first")) + val saved = save() + cancel() + if (finishBeforeRestore) { + finish.countDown() + waitForInstall() + } + recreate(saved) + if (!finishBeforeRestore) { + advance() + assertEquals(64, loading().percent) + finish.countDown() + waitForInstall() + } + ReflectionHelpers.setField(activity, "compatLaunchVisible", true) + advance() + assertEquals("Checksum verification failed", loading().step) + assertTrue(loading().ended) + assertNull(shadowOf(activity).nextStartedActivity) + } finally { + finish.countDown() + waitForInstall() + } + } + + private fun waitForInstall() { + val deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(5) + while (protons.protonBusyId != null && System.nanoTime() < deadline) { + shadowOf(Looper.getMainLooper()).idle() + Thread.sleep(10) + } + assertNull(protons.protonBusyId) + } + + private fun save() = Bundle().also { + ReflectionHelpers.callInstanceMethod<Void>(activity, "saveCompatLaunch", ReflectionHelpers.ClassParameter.from(Bundle::class.java, it)) + } + + private fun recreate(saved: Bundle) { + activity = Robolectric.buildActivity(FrontEndActivity::class.java).get() + protons = ReflectionHelpers.getField(activity, "protons") + ReflectionHelpers.callInstanceMethod<Void>(activity, "restoreCompatLaunch", ReflectionHelpers.ClassParameter.from(Bundle::class.java, saved)) + } + + private fun setString(method: String, value: String?, target: FrontEndActivity = activity) { + ReflectionHelpers.callInstanceMethod<Void>(target, method, ReflectionHelpers.ClassParameter.from(String::class.java, value)) + } + + private fun request(url: String) = Intent(activity, SessionActivity::class.java).putExtra(SessionService.EXTRA_STEAM_URL, url) + private fun installing(on: Boolean) = ReflectionHelpers.setStaticField(ProtonExtras::class.java, "installInProgress", on) + private fun waiting(): Any? = ReflectionHelpers.callInstanceMethod(activity, "getCompatLaunch") + private fun loading(): LoadingState = ReflectionHelpers.getField(requireNotNull(waiting()), "loading") + private fun cancel() { ReflectionHelpers.callInstanceMethod<Void>(activity, "cancelCompatLaunch") } + private fun advance() = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(250)) +} diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt index 5f3dddf96c..9f79a6efad 100644 --- a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -56,6 +56,10 @@ class ProtonMenuAutoTest { .put("tag", "${tool.prefix}-11-12").put("at", System.currentTimeMillis())) File(activity.filesDir, "proton-latest.json").writeText(latest.toString()) menu = ProtonMenu(activity, Handler(Looper.getMainLooper())) { idle } + menu.protonBusyId = null + menu.protonProblem = null + menu.protonStage = null + menu.protonPercent = -1 menu.installer = { tool, progress -> progress("Installing ${tool.name}", 50) install("${tool.prefix}-11-12") @@ -64,6 +68,10 @@ class ProtonMenuAutoTest { } @After fun reset() { + menu.protonBusyId = null + menu.protonProblem = null + menu.protonStage = null + menu.protonPercent = -1 AutoComponents.online = online AutoComponents.unfavourable = constrained SessionState.running = false From 46076e165b13cf8cff50724b17ec6c116a047b89 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 15:15:17 -0400 Subject: [PATCH 104/135] fix(input): let on-screen controls work while the touchpad finger is down The game surface only took touches in gestures mode, so in touchpad and direct mode a finger on the game left the window with no touch target and Android sent every later finger to the touchpad, even over a stick or button. The surface now owns those fingers in every mode, and the on-screen and Steam touch controls hand fingers that miss a control back to the touchpad instead of dropping them. --- .../com/droiddeck/launcher/SessionActivity.kt | 21 +++++++-- .../launcher/input/GestureTouchStreamGate.kt | 2 +- .../launcher/input/OnScreenControls.kt | 30 ++++++++++++ .../droiddeck/launcher/input/PointerSubset.kt | 35 ++++++++++++++ .../droiddeck/launcher/input/ScreenKeys.kt | 30 +----------- .../launcher/input/SteamTouchControls.kt | 26 +++++++++- .../launcher/input/OnScreenControlsTest.kt | 47 +++++++++++++++++++ 7 files changed, 155 insertions(+), 36 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/input/PointerSubset.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 1873b15ec5..8172ccc59b 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -557,12 +557,18 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { uiHandler.removeCallbacks(cursorHide) cursorVisible = false } - onScreenControls = OnScreenControls(this, bridge, onKeyboard = ::togglePcKeyboard).also { root.addView(it) } + onScreenControls = OnScreenControls(this, bridge, onKeyboard = ::togglePcKeyboard).also { controls -> + controls.onTouchMiss = miss@{ event -> + if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.ON_SCREEN_CONTROLS, event)) return@miss + event.offsetLocation(controls.left - surfaceView.left.toFloat(), controls.top - surfaceView.top.toFloat()) + onTouchEvent(event) + } + root.addView(controls) + } screenKeysShown = com.droiddeck.launcher.input.ControllerPrefs.screenKeysShown(this) screenKeys = ScreenKeys(this) { code, down -> if (CompositorHost.isStarted) sendGuestKey(code, down) }.also { keys -> keys.onTouchMiss = miss@{ event -> - if (routedTouchMode == SessionPrefs.TOUCH_GESTURES && - !gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, event)) return@miss + if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, event)) return@miss event.offsetLocation(keys.left - surfaceView.left.toFloat(), keys.top - surfaceView.top.toFloat()) onTouchEvent(event) } @@ -587,8 +593,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { // game surface and on-screen buttons, in either finger-down order. root.isMotionEventSplittingEnabled = true surfaceView.setOnTouchListener { _, event -> - if (routedTouchMode != SessionPrefs.TOUCH_GESTURES) { - gestureTouchStreamGate.reset() + if (!event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) { false } else if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SURFACE, event)) { false @@ -2337,6 +2342,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (pipUi) return true if (event.actionMasked == MotionEvent.ACTION_DOWN && event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) { drawerControllerActive = false + gestureTouchStreamGate.reset() } return super.dispatchTouchEvent(event) } @@ -2987,6 +2993,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { uiHandler.postDelayed({ updateOnScreenControls() }, 700) } view.onStyle = { screenKeys?.refreshAppearance() } + view.onTouchMiss = miss@{ event -> + if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.ON_SCREEN_CONTROLS, event)) return@miss + event.offsetLocation(view.left - surfaceView.left.toFloat(), view.top - surfaceView.top.toFloat()) + onTouchEvent(event) + } root.addView(view, root.indexOfChild(onScreenControls) + 1) steamTouchControls = view steamTouchAvailable = true diff --git a/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt b/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt index e4ad4f655d..68d5722d0a 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt @@ -4,7 +4,7 @@ import android.view.MotionEvent /** Keeps split Android touch targets from restarting one shared gesture recognizer. */ internal class GestureTouchStreamGate { - enum class Source { SURFACE, SCREEN_KEYS } + enum class Source { SURFACE, SCREEN_KEYS, ON_SCREEN_CONTROLS } private var owner: Source? = null diff --git a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt index 50ffb17a81..e0a0b14b9b 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt @@ -96,6 +96,8 @@ class OnScreenControls( private var quickHidden = false private var quickPressedBy = -1 private var keyboardPressedBy = -1 + private var forwardedPointerBits = 0 + var onTouchMiss: ((MotionEvent) -> Unit)? = null private var settings = ControllerPrefs.read(context) private var snap = settings.snap private var safe = Rect() @@ -515,6 +517,9 @@ class OnScreenControls( val index = event.actionIndex val x = event.getX(index) val y = event.getY(index) + if (event.actionMasked == MotionEvent.ACTION_DOWN) forwardedPointerBits = 0 + if (event.actionMasked == MotionEvent.ACTION_POINTER_DOWN && forwardMiss(event, x, y)) return true + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) if (event.actionMasked == MotionEvent.ACTION_DOWN && keyboardContains(x, y)) { keyboardPressedBy = event.getPointerId(index) invalidate() @@ -542,11 +547,13 @@ class OnScreenControls( return true } MotionEvent.ACTION_MOVE -> { + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) if (keyboardPressedBy != -1) return true if (quickPressedBy != -1) return true var changed = false for (index in 0 until event.pointerCount) { val pointer = event.getPointerId(index) + if (forwardedPointerBits and (1 shl pointer) != 0) continue val x = event.getX(index) val y = event.getY(index) val stick = controls.firstOrNull { it.stick >= 0 && it.pressedBy == pointer } @@ -568,10 +575,16 @@ class OnScreenControls( } MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_CANCEL -> { val pointer = event.getPointerId(event.actionIndex) + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) if (event.actionMasked == MotionEvent.ACTION_CANCEL) { + forwardedPointerBits = 0 releaseAll() return true } + if (forwardedPointerBits and (1 shl pointer) != 0) { + forwardedPointerBits = forwardedPointerBits and (1 shl pointer).inv() + return true + } if (keyboardPressedBy == pointer) { val tapped = event.actionMasked == MotionEvent.ACTION_UP && keyboardContains(event.x, event.y) keyboardPressedBy = -1 @@ -604,6 +617,23 @@ class OnScreenControls( return false } + private fun forwardMiss(event: MotionEvent, x: Float, y: Float): Boolean { + if (onTouchMiss == null || keyboardPressedBy != -1 || quickPressedBy != -1) return false + if (!quickHidden && (controlAt(x, y) ?: adaptiveStickAt(x, y)) != null) return false + forwardedPointerBits = forwardedPointerBits or (1 shl event.getPointerId(event.actionIndex)) + forwardPointers(event, forwardedPointerBits) + return true + } + + private fun forwardPointers(event: MotionEvent, pointerIdBits: Int) { + val split = event.pointerSubset(pointerIdBits) ?: return + try { + onTouchMiss?.invoke(split) + } finally { + split.recycle() + } + } + private fun onEditTouch(event: MotionEvent): Boolean { when (event.actionMasked) { MotionEvent.ACTION_DOWN -> { diff --git a/app/src/main/java/com/droiddeck/launcher/input/PointerSubset.kt b/app/src/main/java/com/droiddeck/launcher/input/PointerSubset.kt new file mode 100644 index 0000000000..d6d990ea8f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/PointerSubset.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.input + +import android.view.MotionEvent + +internal fun MotionEvent.pointerSubset(pointerIdBits: Int): MotionEvent? { + val indices = (0 until pointerCount).filter { index -> + pointerIdBits and (1 shl getPointerId(index)) != 0 + } + if (indices.isEmpty()) return null + val splitIndex = indices.indexOf(actionIndex) + val splitAction = when (actionMasked) { + MotionEvent.ACTION_DOWN -> if (splitIndex >= 0) MotionEvent.ACTION_DOWN else MotionEvent.ACTION_MOVE + MotionEvent.ACTION_POINTER_DOWN -> if (splitIndex >= 0) { + if (indices.size == 1) MotionEvent.ACTION_DOWN + else MotionEvent.ACTION_POINTER_DOWN or (splitIndex shl MotionEvent.ACTION_POINTER_INDEX_SHIFT) + } else MotionEvent.ACTION_MOVE + MotionEvent.ACTION_UP -> if (splitIndex >= 0) MotionEvent.ACTION_UP else MotionEvent.ACTION_MOVE + MotionEvent.ACTION_POINTER_UP -> if (splitIndex >= 0) { + if (indices.size == 1) MotionEvent.ACTION_UP + else MotionEvent.ACTION_POINTER_UP or (splitIndex shl MotionEvent.ACTION_POINTER_INDEX_SHIFT) + } else MotionEvent.ACTION_MOVE + else -> action + } + val properties = Array(indices.size) { MotionEvent.PointerProperties() } + val coordinates = Array(indices.size) { MotionEvent.PointerCoords() } + indices.forEachIndexed { target, index -> + getPointerProperties(index, properties[target]) + getPointerCoords(index, coordinates[target]) + } + return MotionEvent.obtain( + downTime, eventTime, splitAction, indices.size, properties, coordinates, + metaState, buttonState, xPrecision, yPrecision, + deviceId, edgeFlags, source, flags, + ) +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt index 4cc87ef0b8..c7a9291e9e 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt @@ -926,35 +926,7 @@ class ScreenKeys(context: Context, private val sendKey: (Int, Boolean) -> Unit) } private fun forwardPointers(event: MotionEvent, pointerIdBits: Int) { - val indices = (0 until event.pointerCount).filter { index -> - pointerIdBits and (1 shl event.getPointerId(index)) != 0 - } - if (indices.isEmpty()) return - val actionIndex = indices.indexOf(event.actionIndex) - val action = when (event.actionMasked) { - MotionEvent.ACTION_DOWN -> if (actionIndex >= 0) MotionEvent.ACTION_DOWN else MotionEvent.ACTION_MOVE - MotionEvent.ACTION_POINTER_DOWN -> if (actionIndex >= 0) { - if (indices.size == 1) MotionEvent.ACTION_DOWN - else MotionEvent.ACTION_POINTER_DOWN or (actionIndex shl MotionEvent.ACTION_POINTER_INDEX_SHIFT) - } else MotionEvent.ACTION_MOVE - MotionEvent.ACTION_UP -> if (actionIndex >= 0) MotionEvent.ACTION_UP else MotionEvent.ACTION_MOVE - MotionEvent.ACTION_POINTER_UP -> if (actionIndex >= 0) { - if (indices.size == 1) MotionEvent.ACTION_UP - else MotionEvent.ACTION_POINTER_UP or (actionIndex shl MotionEvent.ACTION_POINTER_INDEX_SHIFT) - } else MotionEvent.ACTION_MOVE - else -> event.action - } - val properties = Array(indices.size) { MotionEvent.PointerProperties() } - val coordinates = Array(indices.size) { MotionEvent.PointerCoords() } - indices.forEachIndexed { target, source -> - event.getPointerProperties(source, properties[target]) - event.getPointerCoords(source, coordinates[target]) - } - val split = MotionEvent.obtain( - event.downTime, event.eventTime, action, indices.size, properties, coordinates, - event.metaState, event.buttonState, event.xPrecision, event.yPrecision, - event.deviceId, event.edgeFlags, event.source, event.flags, - ) + val split = event.pointerSubset(pointerIdBits) ?: return try { onTouchMiss?.invoke(split) } finally { diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt index ca5157372a..c64e759d17 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt @@ -103,6 +103,8 @@ class SteamTouchControls( private class Finger(val element: Element?, var x: Float, var y: Float, val toolbar: Int = -1) private val fingers = HashMap<Int, Finger>() + private var forwardedPointerBits = 0 + var onTouchMiss: ((MotionEvent) -> Unit)? = null private var editing = false private var editElements: MutableList<Element> = mutableListOf() @@ -629,7 +631,17 @@ class SteamTouchControls( MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> { val x = event.getX(index) val y = event.getY(index) - val e = hit(live(), x, y) ?: return event.actionMasked == MotionEvent.ACTION_POINTER_DOWN + if (event.actionMasked == MotionEvent.ACTION_DOWN) forwardedPointerBits = 0 + val e = hit(live(), x, y) + if (e == null) { + if (event.actionMasked == MotionEvent.ACTION_DOWN) return false + if (onTouchMiss != null) { + forwardedPointerBits = forwardedPointerBits or (1 shl event.getPointerId(index)) + forwardPointers(event, forwardedPointerBits) + } + return true + } + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) fingers[event.getPointerId(index)] = Finger(e, x, y) if (feedback) performHapticFeedback(android.view.HapticFeedbackConstants.VIRTUAL_KEY) requestUnbufferedDispatch(event) @@ -637,6 +649,7 @@ class SteamTouchControls( return true } MotionEvent.ACTION_MOVE -> { + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) for (i in 0 until event.pointerCount) { val f = fingers[event.getPointerId(i)] ?: continue f.x = event.getX(i) @@ -655,6 +668,8 @@ class SteamTouchControls( } MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_CANCEL -> { val id = event.getPointerId(index) + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) + forwardedPointerBits = if (event.actionMasked == MotionEvent.ACTION_CANCEL) 0 else forwardedPointerBits and (1 shl id).inv() val f = fingers.remove(id) if (event.actionMasked == MotionEvent.ACTION_CANCEL) fingers.clear() val e = f?.element @@ -673,6 +688,15 @@ class SteamTouchControls( } + private fun forwardPointers(event: MotionEvent, pointerIdBits: Int) { + val split = event.pointerSubset(pointerIdBits) ?: return + try { + onTouchMiss?.invoke(split) + } finally { + split.recycle() + } + } + val isEditing get() = editing fun startEditing() { diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt index a1bb94bf1a..a857316e53 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt @@ -236,6 +236,53 @@ class OnScreenControlsTest { assertEquals(-1, field(control("ls"), "pressedBy")) } + @Test fun trackpadFingerKeepsItsOwnStreamWhileAStickIsHeld() { + val forwarded = mutableListOf<Triple<Int, Int, Float>>() + view.onTouchMiss = { forwarded += Triple(it.actionMasked, it.getPointerId(0), it.getX(0)) } + touch(MotionEvent.ACTION_DOWN, 7 to (540f to 400f)) + assertTrue(touch(MotionEvent.ACTION_POINTER_DOWN or (1 shl 8), 7 to (540f to 400f), 9 to (600f to 200f))) + touch(MotionEvent.ACTION_MOVE, 7 to (500f to 400f), 9 to (650f to 200f)) + touch(MotionEvent.ACTION_POINTER_UP or (1 shl 8), 7 to (500f to 400f), 9 to (650f to 200f)) + assertEquals(listOf( + Triple(MotionEvent.ACTION_DOWN, 9, 600f), + Triple(MotionEvent.ACTION_MOVE, 9, 650f), + Triple(MotionEvent.ACTION_UP, 9, 650f), + ), forwarded) + assertEquals(7, field(control("ls"), "pressedBy")) + assertTrue(value(control("ls"), "kx") < 0f) + } + + @Test fun stickPressedAfterTrackpadFingerReachesTheControls() { + val received = mutableListOf<Triple<Int, Int, Int>>() + val trackpad = View(context).apply { + setOnTouchListener { _, event -> received += Triple(event.actionMasked, event.pointerCount, event.getPointerId(0)); true } + } + val root = FrameLayout(context).apply { + isMotionEventSplittingEnabled = true + addView(trackpad, FrameLayout.LayoutParams(1200, 800)) + addView(view, FrameLayout.LayoutParams(1200, 800)) + measure(View.MeasureSpec.makeMeasureSpec(1200, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(800, View.MeasureSpec.EXACTLY)) + layout(0, 0, 1200, 800) + } + fun dispatch(action: Int, vararg pointers: Pair<Int, Pair<Float, Float>>) { + val properties = pointers.map { (id, _) -> MotionEvent.PointerProperties().apply { this.id = id; toolType = MotionEvent.TOOL_TYPE_FINGER } }.toTypedArray() + val coords = pointers.map { (_, position) -> MotionEvent.PointerCoords().apply { x = position.first; y = position.second; pressure = 1f; size = 1f } }.toTypedArray() + val event = MotionEvent.obtain(1000L, time++, action, pointers.size, properties, coords, 0, 0, 1f, 1f, 0, 0, 0, 0) + try { assertTrue(root.dispatchTouchEvent(event)) } finally { event.recycle() } + } + dispatch(MotionEvent.ACTION_DOWN, 0 to (600f to 200f)) + dispatch(MotionEvent.ACTION_POINTER_DOWN or (1 shl 8), 0 to (600f to 200f), 1 to (540f to 400f)) + dispatch(MotionEvent.ACTION_MOVE, 0 to (640f to 220f), 1 to (500f to 400f)) + assertEquals(1, field(control("ls"), "pressedBy")) + assertTrue(value(control("ls"), "kx") < 0f) + dispatch(MotionEvent.ACTION_POINTER_UP or (1 shl 8), 0 to (640f to 220f), 1 to (500f to 400f)) + dispatch(MotionEvent.ACTION_UP, 0 to (640f to 220f)) + assertEquals(-1, field(control("ls"), "pressedBy")) + assertEquals(Triple(MotionEvent.ACTION_DOWN, 1, 0), received.first()) + assertEquals(Triple(MotionEvent.ACTION_UP, 1, 0), received.last()) + assertTrue(received.all { it.second == 1 && it.third == 0 }) + } + @Test fun adaptiveActivationLeavesFivePixelsAroundButtonHitTargets() { for (id in listOf("a", "rb")) { val button = control(id) From aa17b0553d9e56c67b4f54cacbb8ea679bface0a Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 15:36:23 -0400 Subject: [PATCH 105/135] fix(input): end the forwarded touchpad finger when the Steam menu opens --- .../droiddeck/launcher/input/SteamTouchControls.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt index c64e759d17..2138f9c92b 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt @@ -675,7 +675,7 @@ class SteamTouchControls( val e = f?.element if (event.actionMasked != MotionEvent.ACTION_CANCEL && e != null && reach(e, event.getX(index), event.getY(index)) <= 1.3f) { when (e.type) { - SteamTouchConfig.THUMB -> openMenu() + SteamTouchConfig.THUMB -> { cancelForwarded(event); openMenu() } SteamTouchConfig.KEYBOARD -> onKeyboard() SteamTouchConfig.PASTE -> onPaste() } @@ -688,6 +688,16 @@ class SteamTouchControls( } + private fun cancelForwarded(event: MotionEvent) { + val split = event.pointerSubset(forwardedPointerBits).also { forwardedPointerBits = 0 } ?: return + split.action = MotionEvent.ACTION_CANCEL + try { + onTouchMiss?.invoke(split) + } finally { + split.recycle() + } + } + private fun forwardPointers(event: MotionEvent, pointerIdBits: Int) { val split = event.pointerSubset(pointerIdBits) ?: return try { From 73daaf7adc5b3cc9c8723aa67c19cc461651017a Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 16:06:40 -0400 Subject: [PATCH 106/135] fix(gamescope): keep Fill scaling and magnification visible (#1634) * fix(gamescope): preserve signed plane positions * fix(gamescope): pin validated scaling component --- tools/gamescope/PATCHES.md | 22 ++++ tools/gamescope/build-in-arch.sh | 2 +- .../0118-wayland-signed-plane-positions.patch | 106 ++++++++++++++++++ tools/gamescope/release.env | 4 +- 4 files changed, 131 insertions(+), 3 deletions(-) create mode 100644 tools/gamescope/patches/0118-wayland-signed-plane-positions.patch diff --git a/tools/gamescope/PATCHES.md b/tools/gamescope/PATCHES.md index ab53e5ad99..5ff8197a2d 100644 --- a/tools/gamescope/PATCHES.md +++ b/tools/gamescope/PATCHES.md @@ -99,3 +99,25 @@ The patch can keep the result for `DROIDDECK_WSI_BYPASS_CHECK_MS` milliseconds. or 0 keeps the per-present check; the app sets 100 only in Performance mode and 0 otherwise. With 100, a window resize or a flip/obscure change is seen up to 100 ms later than before; surface creation and capability queries still check every time. + +## 0118 Wayland: preserve signed plane positions + +Fill scaling and Steam magnification can place the image at negative x/y coordinates. +The Wayland backend converted these signed positions through an unsigned size helper: +at host scale 120, -120 became 35791275 and the image moved off-screen while overlays +could remain visible. A separate signed conversion uses a 64-bit intermediate and +retains the existing ceiling convention; viewport sizes keep their original helper. + +The component build runs `wayland_scaling` for negative crop offsets, positive/zero +positions, fractional host scales and wide intermediates. This patch may be worth +upstreaming: the same unsigned position calls were present in ValveSoftware/gamescope +3.16.29 and master `d175688ad4ec490dc7b0695c5c62f8807684a1f1` when checked on +2026-10-26. Carry it here until an upstream release containing the fix is adopted. + +Device validation on AYN Thor (1280x720 session, 1920x1080 Android output): +800x600 and 1600x600 source windows retained their image through Auto, Fit, +Stretch, Fill, Integer and 2x Steam magnification, including returning to Fit. +The old component lost the image in Fill and magnification. The tested executable +matches the pinned p14 archive and the locally assembled APK. Hardware checks used +native Gamescope properties; the physical Back+LB shortcut was not independently +confirmed. The original APK and runtime were restored after validation. diff --git a/tools/gamescope/build-in-arch.sh b/tools/gamescope/build-in-arch.sh index 79d4fd8692..ba3b1605db 100755 --- a/tools/gamescope/build-in-arch.sh +++ b/tools/gamescope/build-in-arch.sh @@ -39,7 +39,7 @@ else fi PREP makepkg -A -s --noconfirm --skipchecksums --skippgpcheck -meson test -C src/build --no-rebuild --print-errorlogs cursor_routing +meson test -C src/build --no-rebuild --print-errorlogs cursor_routing wayland_scaling ls -l *.pkg.tar.* " cd "$WORK" diff --git a/tools/gamescope/patches/0118-wayland-signed-plane-positions.patch b/tools/gamescope/patches/0118-wayland-signed-plane-positions.patch new file mode 100644 index 0000000000..d66ca56e04 --- /dev/null +++ b/tools/gamescope/patches/0118-wayland-signed-plane-positions.patch @@ -0,0 +1,106 @@ +diff --git a/src/Backends/WaylandBackend.cpp b/src/Backends/WaylandBackend.cpp +index d00644f..40164ba 100644 +--- a/src/Backends/WaylandBackend.cpp ++++ b/src/Backends/WaylandBackend.cpp +@@ -11,6 +11,7 @@ + #include "waitable.h" + #include "Utils/TempFiles.h" + #include "Utils/CursorRouting.h" ++#include "Utils/WaylandScaling.h" + + #include <cstring> + #include <unordered_map> +@@ -1618,8 +1619,8 @@ namespace gamescope + { + wl_subsurface_set_position( + m_pSubsurface, +- WaylandScaleToLogical( oState->nDestX, uScale ), +- WaylandScaleToLogical( oState->nDestY, uScale ) ); ++ gamescope::WaylandPositionToLogical( oState->nDestX, uScale ), ++ gamescope::WaylandPositionToLogical( oState->nDestY, uScale ) ); + } + // The x/y here does nothing? Why? What is it for... + // Use the subsurface set_position thing instead. +diff --git a/src/Utils/WaylandScaling.h b/src/Utils/WaylandScaling.h +new file mode 100644 +index 0000000..d488e39 +--- /dev/null ++++ b/src/Utils/WaylandScaling.h +@@ -0,0 +1,12 @@ ++#pragma once ++ ++#include <cstdint> ++ ++namespace gamescope ++{ ++ constexpr int32_t WaylandPositionToLogical( int32_t nValue, uint32_t uFactor ) ++ { ++ const int64_t nScaled = int64_t( nValue ) * 120; ++ return int32_t( nScaled / uFactor + ( nScaled % uFactor > 0 ) ); ++ } ++} +diff --git a/tests/meson.build b/tests/meson.build +index 1ccdf7d..d86bf9e 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -8,7 +8,7 @@ endforeach + + gamescope_tests = executable( + 'gamescope_tests', +- unittest_src + ['test_convar.cpp', 'test_cursor_routing.cpp', 'test_focus_placement.cpp', 'test_mangoapp_config.cpp', 'test_mangoapp_control.cpp', 'test_process.cpp', 'test_upscale.cpp', 'test_utils_parsers.cpp', 'test_utils_string.cpp', 'test_vrclient_detect.cpp'], ++ unittest_src + ['test_convar.cpp', 'test_cursor_routing.cpp', 'test_focus_placement.cpp', 'test_mangoapp_config.cpp', 'test_mangoapp_control.cpp', 'test_process.cpp', 'test_upscale.cpp', 'test_utils_parsers.cpp', 'test_utils_string.cpp', 'test_vrclient_detect.cpp', 'test_wayland_scaling.cpp'], + include_directories: [srcdir, sol2_include], + dependencies: [catch2_dep, luajit_dep, cap_dep, drm_dep, glm_dep, wlroots_dep], + cpp_args: gamescope_cpp_args, +@@ -18,6 +18,7 @@ reaper_test_helper = executable('reaper_test_helper', 'reaper_test_helper.cpp') + + test('convar', gamescope_tests, args: ['[convar]']) + test('cursor_routing', gamescope_tests, args: ['[cursor_routing]']) ++test('wayland_scaling', gamescope_tests, args: ['[wayland_scaling]']) + test('focus_placement', gamescope_tests, args: ['[focus_placement]']) + test('mangoapp_config', gamescope_tests, args: ['[mangoapp_config]']) + test('mangoapp_control', gamescope_tests, args: ['[mangoapp_control]']) +diff --git a/tests/test_wayland_scaling.cpp b/tests/test_wayland_scaling.cpp +new file mode 100644 +index 0000000..498f55b +--- /dev/null ++++ b/tests/test_wayland_scaling.cpp +@@ -0,0 +1,38 @@ ++#include <catch2/catch_test_macros.hpp> ++ ++#include "Utils/WaylandScaling.h" ++ ++#include <cmath> ++#include <limits> ++ ++using namespace gamescope; ++ ++TEST_CASE("cropped Wayland planes retain negative positions", "[wayland_scaling]") ++{ ++ REQUIRE( WaylandPositionToLogical( -120, 120 ) == -120 ); ++ REQUIRE( WaylandPositionToLogical( -640, 120 ) == -640 ); ++ REQUIRE( WaylandPositionToLogical( -360, 120 ) == -360 ); ++ REQUIRE( WaylandPositionToLogical( 0, 120 ) == 0 ); ++ REQUIRE( WaylandPositionToLogical( 160, 120 ) == 160 ); ++} ++ ++TEST_CASE("Wayland positions round up at fractional host scales", "[wayland_scaling]") ++{ ++ const int32_t positions[] = { -100000000, -1000000, -640, -120, -1, 0, 1, 120, 640, 1000000, 100000000 }; ++ const uint32_t scales[] = { 120, 150, 180, 240, 360, 480 }; ++ for ( uint32_t uScale : scales ) ++ { ++ for ( int32_t nPosition : positions ) ++ { ++ CAPTURE( nPosition, uScale ); ++ const int32_t nExpected = int32_t( std::ceil( (long double)( nPosition ) * 120 / uScale ) ); ++ REQUIRE( WaylandPositionToLogical( nPosition, uScale ) == nExpected ); ++ } ++ } ++} ++ ++TEST_CASE("Wayland position conversion widens before multiplying", "[wayland_scaling]") ++{ ++ REQUIRE( WaylandPositionToLogical( std::numeric_limits<int32_t>::min(), 120 ) == std::numeric_limits<int32_t>::min() ); ++ REQUIRE( WaylandPositionToLogical( std::numeric_limits<int32_t>::max(), 120 ) == std::numeric_limits<int32_t>::max() ); ++} diff --git a/tools/gamescope/release.env b/tools/gamescope/release.env index a505f40a87..9bb47de0b3 100644 --- a/tools/gamescope/release.env +++ b/tools/gamescope/release.env @@ -1,3 +1,3 @@ GAMESCOPE_REPO=Droid-Deck/DroidDeck-Components -GAMESCOPE_TAG=gamescope-3.16.29-p13 -GAMESCOPE_SHA256=93c789dc9e08828496f1caa2849d56acdf205838de723a24b296547a29c0b6af +GAMESCOPE_TAG=gamescope-3.16.29-p14 +GAMESCOPE_SHA256=f0f2f33767c883bcfe66f28c303fddc1564f91a915fb7cedd31eb823570b254c From f13916ee25e6828659f768748f9f8e3d820354ac Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 17:51:44 -0400 Subject: [PATCH 107/135] feat(steam): optional Steam integration setup (#1637) * feat(steam): add optional device integration setup * feat(steam): show integration setup as inline settings rows * fix(steam): offer App info when shortcuts stay blocked --- app/src/main/AndroidManifest.xml | 9 + .../droiddeck/launcher/FrontEndActivity.kt | 100 ++++++-- .../com/droiddeck/launcher/SessionActivity.kt | 14 ++ .../launcher/core/SteamIntegration.kt | 72 ++++++ .../launcher/input/HomeButtonService.kt | 70 ++++++ .../launcher/input/HomeGuideInput.kt | 42 ++++ .../droiddeck/launcher/input/PadBridge.java | 38 +++- .../runtime/DeviceControlsComponent.kt | 31 +-- .../droiddeck/launcher/ui/FrontEndScreen.kt | 8 + .../droiddeck/launcher/ui/FrontEndSetup.kt | 3 + .../launcher/ui/ModeSettingsDialog.kt | 46 +--- .../droiddeck/launcher/ui/SettingsWidgets.kt | 3 +- .../com/droiddeck/launcher/ui/SteamHome.kt | 2 + .../launcher/ui/SteamIntegrationGroup.kt | 215 ++++++++++++++++++ app/src/main/res/values/strings.xml | 25 +- app/src/main/res/xml/home_button_service.xml | 7 + .../launcher/input/HomeGuideInputTest.kt | 62 +++++ .../launcher/input/PadBridgeQamTest.kt | 47 ++++ .../runtime/DeviceControlsComponentTest.kt | 20 +- .../launcher/ui/SteamIntegrationGroupTest.kt | 93 ++++++++ 20 files changed, 813 insertions(+), 94 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/SteamIntegrationGroup.kt create mode 100644 app/src/main/res/xml/home_button_service.xml create mode 100644 app/src/test/java/com/droiddeck/launcher/input/HomeGuideInputTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/SteamIntegrationGroupTest.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6336fb1325..8612604928 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,15 @@ <meta-data android:name="android.game_mode_config" android:resource="@xml/game_mode_config" /> <service android:name=".glasses.LumaRgbCaptureService" android:exported="false" android:process=":rgb_diagnostic" /> + <service android:name=".input.HomeButtonService" + android:label="@string/integration_shortcuts_service" + android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE" + android:exported="true"> + <intent-filter> + <action android:name="android.accessibilityservice.AccessibilityService" /> + </intent-filter> + <meta-data android:name="android.accessibilityservice" android:resource="@xml/home_button_service" /> + </service> <meta-data android:name="com.oculus.supportedDevices" android:value="quest2|quest3|quest3s" /> <activity android:name=".QuestXrActivity" android:exported="true" android:launchMode="singleTask" android:permission="android.permission.DUMP" diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index c6daf0da36..a41457d92c 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -52,6 +52,7 @@ import com.droiddeck.launcher.core.PhantomProcessLimit import com.droiddeck.launcher.core.PhantomProcessStatus import com.droiddeck.launcher.core.WirelessAdbFix import com.droiddeck.launcher.core.WifiDiscovery +import com.droiddeck.launcher.core.SteamIntegration import com.droiddeck.launcher.core.WirelessAdbPairingService import com.droiddeck.launcher.ui.CoreRow import com.droiddeck.launcher.ui.PerformancePage @@ -197,6 +198,8 @@ class FrontEndActivity : ComponentActivity() { private var wifiDiscoveryLocation by mutableStateOf(false) private var wifiDiscoveryAsked by mutableStateOf(false) private var wifiDiscoveryBlocked by mutableStateOf(false) + private var integrationState by mutableStateOf(SteamIntegration.State()) + private var integrationFocus by mutableStateOf<SteamIntegration.Feature?>(null) private val wifiLocationReceiver = object : android.content.BroadcastReceiver() { override fun onReceive(context: android.content.Context?, intent: Intent?) { refreshWifiDiscovery() @@ -265,8 +268,65 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setWifiDiscoveryEnabled(this, false) } wifiDiscovery = SessionPrefs.wifiDiscoveryEnabled(this) + integrationState = readIntegration() } + private var shortcutsTried = false + + private fun readIntegration() = SteamIntegration.read(this) + .copy(locationBlocked = wifiDiscoveryBlocked, shortcutsTried = shortcutsTried) + + private fun openIntegration(feature: SteamIntegration.Feature? = null) { + SteamIntegration.dismissSuggestion(this) + refreshWifiDiscovery() + integrationState = readIntegration() + integrationFocus = feature + navRequest = "setup:integration" + } + + private fun readIntegrationIntent(incoming: Intent) { + if (incoming.action != SteamIntegration.ACTION_SETUP) return + openIntegration(incoming.getStringExtra(SteamIntegration.EXTRA_FEATURE)?.let { + runCatching { SteamIntegration.Feature.valueOf(it) }.getOrNull() + }) + } + + private fun integrationSettings(intent: Intent, fallback: String = android.provider.Settings.ACTION_SETTINGS) { + try { startActivity(intent) } + catch (_: android.content.ActivityNotFoundException) { startActivity(Intent(fallback)) } + catch (_: SecurityException) { startActivity(Intent(fallback)) } + } + + private fun configureIntegration(feature: SteamIntegration.Feature) { + when (feature) { + SteamIntegration.Feature.WIFI -> { + if (wifiDiscovery && wifiDiscoveryPermission) { + SessionPrefs.setWifiDiscoveryEnabled(this, false) + } else if (wifiDiscoveryPermission) { + SessionPrefs.setWifiDiscoveryEnabled(this, true) + } else { + SessionPrefs.setWifiDiscoveryAsked(this) + wifiLocationPermission.launch(WifiDiscovery.permissions) + } + refreshWifiDiscovery() + } + SteamIntegration.Feature.BRIGHTNESS -> integrationSettings(SteamIntegration.brightnessSettings(this)) + SteamIntegration.Feature.HOME -> if (HomeApp.isDefault(this)) HomeApp.openSystemHomeSettings(this) else { + HomeApp.setHomeScreenEnabled(this, true) + refreshHomeAppState() + manageHomeApp() + } + SteamIntegration.Feature.SHORTCUTS -> { + if (!integrationState.shortcuts) shortcutsTried = true + if (!HomeApp.isDefault(this)) configureIntegration(SteamIntegration.Feature.HOME) + else integrationSettings(SteamIntegration.shortcutSettings(this), android.provider.Settings.ACTION_ACCESSIBILITY_SETTINGS) + } + } + } + + private fun openAppInfo() = + integrationSettings(Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.parse("package:$packageName"))) + private fun openWifiDiscoverySettings() { if (!WifiDiscovery.permissionGranted(this)) { wifiPermissionSettings.launch(Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS, @@ -839,6 +899,7 @@ class FrontEndActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + if (savedInstanceState == null) readIntegrationIntent(intent) readGameIntent(intent) gameSyncFolder = GameFileSync.folder(this) displayManager = getSystemService(DISPLAY_SERVICE) as DisplayManager @@ -905,6 +966,8 @@ class FrontEndActivity : ComponentActivity() { isHomeApp = homeAppSelected, homeScreenEnabled = homeScreenEnabled, defaultHomeLabel = defaultHomeLabel, + integration = integrationState, + integrationFocus = integrationFocus, androidApps = androidApps, secondScreenDisplays = secondScreenDisplays, packages = packageRows, @@ -1144,6 +1207,14 @@ class FrontEndActivity : ComponentActivity() { downloadProxy = DownloadSource.proxyHostPort(this) }, onHomeApp = { manageHomeApp() }, + onSteamIntegration = ::openIntegration, + onIntegration = { integrationFocus = null; configureIntegration(it) }, + onIntegrationAppInfo = ::openAppInfo, + onIntegrationLocation = ::openWifiDiscoverySettings, + onDismissIntegration = { + SteamIntegration.dismissSuggestion(this) + integrationState = readIntegration() + }, onHomeScreen = { on -> HomeApp.setHomeScreenEnabled(this, on) refreshHomeAppState() @@ -1336,6 +1407,10 @@ class FrontEndActivity : ComponentActivity() { override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) setIntent(intent) + if (intent.action == SteamIntegration.ACTION_SETUP) { + readIntegrationIntent(intent) + return + } readGameIntent(intent) refresh() startSteamAtStartupIfEnabled() @@ -1521,6 +1596,7 @@ class FrontEndActivity : ComponentActivity() { homeAppSelected = homeScreenEnabled && HomeApp.isDefault(this) defaultHomeLabel = HomeApp.defaultLabel(this) androidApps = if (homeAppSelected) HomeApp.launchableApps(this) else emptyList() + integrationState = readIntegration() } private fun refreshSecondScreenDisplays() { @@ -1844,11 +1920,7 @@ class FrontEndActivity : ComponentActivity() { bootMovieCustomName = bootMovieCustomName, bootMovieImporting = bootMovieImporting, bootMovieProgress = bootMovieProgress, - wifiDiscovery = if (mode == SessionService.MODE_STEAM) wifiDiscovery else null, - wifiDiscoveryPermission = wifiDiscoveryPermission, - wifiDiscoveryLocation = wifiDiscoveryLocation, - wifiDiscoveryAsked = wifiDiscoveryAsked, - wifiDiscoveryBlocked = wifiDiscoveryBlocked, + integration = if (mode == SessionService.MODE_STEAM) integrationState else null, deckyInstalled = if (mode == SessionService.MODE_STEAM) decky.deckyInstalled else null, deckyLatestRelease = if (mode == SessionService.MODE_STEAM) decky.deckyLatest else null, deckyBranch = decky.deckyBranch, @@ -1857,21 +1929,9 @@ class FrontEndActivity : ComponentActivity() { deckyEnabled = decky.deckySupervisor, deckySessionRunning = SessionState.running, ), ModeSettingsActions( - onWifiDiscovery = { on -> - if (!on) { - SessionPrefs.setWifiDiscoveryEnabled(this, false) - refreshWifiDiscovery() - } else if (WifiDiscovery.permissionGranted(this)) { - SessionPrefs.setWifiDiscoveryEnabled(this, true) - refreshWifiDiscovery() - } else if (wifiDiscoveryBlocked) { - openWifiDiscoverySettings() - } else { - SessionPrefs.setWifiDiscoveryAsked(this) - wifiLocationPermission.launch(WifiDiscovery.permissions) - } - }, - onWifiDiscoverySettings = { openWifiDiscoverySettings() }, + onIntegration = ::configureIntegration, + onIntegrationAppInfo = ::openAppInfo, + onIntegrationLocation = ::openWifiDiscoverySettings, onResolution = { value -> SessionPrefs.setResolutionChoice(this, mode, value); resolution = value }, onHdr = { on -> SessionPrefs.setHdr(this, mode, on); hdrOn = on }, onGpuDrivers = { openComponents(focusContent = true, tab = com.droiddeck.launcher.ui.GPU_TAB) }, diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 8172ccc59b..501024b968 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -788,6 +788,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, gestureSettingsOpen, pipUi, SessionState.suspended) { if (drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || pipUi || SessionState.suspended) { backQamInput.cancel() + com.droiddeck.launcher.input.HomeButtonShortcuts.cancel(this@SessionActivity) cancelTouchGestures() screenKeys?.stopEditing() } @@ -2127,6 +2128,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun releasePads() { + com.droiddeck.launcher.input.HomeButtonShortcuts.cancel(this) backQamInput.cancel() padBridge?.releaseAll() joyConVr?.releaseButtons() @@ -3277,6 +3279,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onScreenControls?.reload() controllerSettings = ControllerPrefs.read(this) resumed = true + com.droiddeck.launcher.input.HomeButtonShortcuts.attach(this, + enabled = { + resumed && window.decorView.hasWindowFocus() && !ended && !drawerOpen && !pcKeyboardOpen && + !achievementsOpen && !gestureSettingsOpen && !pipUi && SessionState.running && !SessionState.suspended && + SessionState.mode == SessionService.MODE_STEAM && padBridge?.canHoldGuide() == true + }, + setPressed = { padBridge?.setHomeGuidePressed(it) }, + onCancel = { padBridge?.cancelHomeGuide() }, + ) updatePointerCapture() if (!pipUi) sessionClipboard.start() updatePadMotion() @@ -3288,6 +3299,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } override fun onPause() { + com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this) if (runtimeRemovalBlocked) { super.onPause(); return } backQamInput.cancel() capturePausedFrame() @@ -3673,6 +3685,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onWindowFocusChanged(hasFocus: Boolean) { super.onWindowFocusChanged(hasFocus) + if (!hasFocus) com.droiddeck.launcher.input.HomeButtonShortcuts.cancel(this) if (!hasFocus) backQamInput.cancel() if (!hasFocus && ::padMouse.isInitialized) padMouse.reset() if (runtimeRemovalBlocked) return @@ -3721,6 +3734,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } override fun onDestroy() { + com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this) backQamInput.cancel() steamVrRecovery.close() uiHandler.removeCallbacks(steamTouchRetry) diff --git a/app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt b/app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt new file mode 100644 index 0000000000..982b609474 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt @@ -0,0 +1,72 @@ +package com.droiddeck.launcher.core + +import android.accessibilityservice.AccessibilityServiceInfo +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.provider.Settings +import android.view.accessibility.AccessibilityManager +import com.droiddeck.launcher.HomeApp +import com.droiddeck.launcher.input.HomeButtonService +import com.droiddeck.launcher.session.SessionPrefs + +object SteamIntegration { + const val ACTION_SETUP = "com.droiddeck.launcher.STEAM_INTEGRATION" + const val EXTRA_FEATURE = "integration_feature" + enum class Feature { WIFI, BRIGHTNESS, HOME, SHORTCUTS } + + data class State( + val wifi: Boolean = false, + val locationPermission: Boolean = false, + val locationOn: Boolean = false, + val locationBlocked: Boolean = false, + val brightness: Boolean = false, + val home: Boolean = false, + val shortcuts: Boolean = false, + val shortcutsRestricted: Boolean = false, + val shortcutsTried: Boolean = false, + val suggested: Boolean = true, + ) + + fun read(context: Context) = State( + wifi = SessionPrefs.wifiDiscoveryEnabled(context), + locationPermission = WifiDiscovery.permissionGranted(context), + locationOn = WifiDiscovery.locationEnabled(context), + brightness = Settings.System.canWrite(context), + home = HomeApp.isDefault(context), + shortcuts = context.getSystemService(AccessibilityManager::class.java) + .getEnabledAccessibilityServiceList(AccessibilityServiceInfo.FEEDBACK_ALL_MASK).any { + val service = it.resolveInfo.serviceInfo + ComponentName(service.packageName, service.name) == ComponentName(context, HomeButtonService::class.java) + }, + shortcutsRestricted = restrictedSettings(context), + suggested = !SessionPrefs.sessionPrefs(context).getBoolean("steam_integration_seen", false), + ) + + // Android 13+ blocks accessibility services for sideloaded APKs until the user allows restricted settings in App info. + // MODE_DEFAULT is inconclusive on Android 15, so only an explicit denial counts here. + private fun restrictedSettings(context: Context): Boolean { + if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.TIRAMISU) return false + val mode = runCatching { + context.getSystemService(android.app.AppOpsManager::class.java) + .unsafeCheckOpNoThrow("android:access_restricted_settings", android.os.Process.myUid(), context.packageName) + }.getOrDefault(android.app.AppOpsManager.MODE_ALLOWED) + return mode == android.app.AppOpsManager.MODE_ERRORED || mode == android.app.AppOpsManager.MODE_IGNORED + } + + fun dismissSuggestion(context: Context) { + SessionPrefs.sessionPrefs(context).edit().putBoolean("steam_integration_seen", true).apply() + } + + fun brightnessSettings(context: Context) = Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS, + Uri.parse("package:${context.packageName}")) + + // ACCESSIBILITY_DETAILS_SETTINGS is restricted to system apps; the fragment args key highlights our entry in the list. + fun shortcutSettings(context: Context): Intent { + val service = ComponentName(context, HomeButtonService::class.java).flattenToString() + return Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS) + .putExtra(":settings:fragment_args_key", service) + .putExtra(":settings:show_fragment_args", android.os.Bundle().apply { putString(":settings:fragment_args_key", service) }) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt new file mode 100644 index 0000000000..f7d918bdf5 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt @@ -0,0 +1,70 @@ +package com.droiddeck.launcher.input + +import android.accessibilityservice.AccessibilityService +import android.content.Context +import android.content.Intent +import android.hardware.input.InputManager +import android.os.Handler +import android.os.Looper +import android.view.KeyEvent +import android.view.accessibility.AccessibilityEvent +import com.droiddeck.launcher.HomeApp + +object HomeButtonShortcuts { + private var owner: Any? = null + private var enabled: () -> Boolean = { false } + private var setPressed: (Boolean) -> Unit = {} + private var onCancel: () -> Unit = {} + private val input = HomeGuideInput({ setPressed(it) }, { onCancel() }) + + fun attach(owner: Any, enabled: () -> Boolean, setPressed: (Boolean) -> Unit, onCancel: () -> Unit) { + input.cancel() + this.owner = owner + this.enabled = enabled + this.setPressed = setPressed + this.onCancel = onCancel + } + + fun cancel(owner: Any) { if (this.owner === owner) input.cancel() } + + fun detach(owner: Any) { + if (this.owner !== owner) return + input.cancel() + this.owner = null + enabled = { false } + setPressed = {} + onCancel = {} + } + + fun onKeyEvent(context: Context, event: KeyEvent): Boolean { + if (event.keyCode != KeyEvent.KEYCODE_HOME) return false + return input.onKeyEvent(event, enabled() && HomeApp.isDefault(context)) + } + + fun release() = input.cancel() + fun onDeviceRemoved(device: Int) = input.onDeviceRemoved(device) +} + +class HomeButtonService : AccessibilityService(), InputManager.InputDeviceListener { + override fun onServiceConnected() { + getSystemService(InputManager::class.java).registerInputDeviceListener(this, Handler(Looper.getMainLooper())) + } + + override fun onKeyEvent(event: KeyEvent) = HomeButtonShortcuts.onKeyEvent(this, event) + override fun onAccessibilityEvent(event: AccessibilityEvent?) {} + override fun onInterrupt() { HomeButtonShortcuts.release() } + override fun onInputDeviceAdded(deviceId: Int) {} + override fun onInputDeviceChanged(deviceId: Int) {} + override fun onInputDeviceRemoved(deviceId: Int) { HomeButtonShortcuts.onDeviceRemoved(deviceId) } + + override fun onUnbind(intent: Intent?): Boolean { + HomeButtonShortcuts.release() + return super.onUnbind(intent) + } + + override fun onDestroy() { + HomeButtonShortcuts.release() + getSystemService(InputManager::class.java).unregisterInputDeviceListener(this) + super.onDestroy() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt b/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt new file mode 100644 index 0000000000..dfb7dbb0a1 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.input + +import android.view.KeyEvent + +class HomeGuideInput(private val setPressed: (Boolean) -> Unit, private val onCancel: () -> Unit = {}) { + private val presses = mutableSetOf<Int>() + private val cancelled = mutableSetOf<Int>() + + fun onKeyEvent(event: KeyEvent, enabled: Boolean): Boolean { + if (event.keyCode != KeyEvent.KEYCODE_HOME) return false + if (!enabled) cancel() + val device = event.deviceId + return when (event.action) { + KeyEvent.ACTION_DOWN -> { + if (event.repeatCount > 0) return device in presses || device in cancelled + cancelled.remove(device) + if (!enabled || event.isCanceled) return false + if (presses.add(device) && presses.size == 1) setPressed(true) + true + } + KeyEvent.ACTION_UP -> { + val owned = presses.remove(device) + val wasCancelled = cancelled.remove(device) + if (owned && presses.isEmpty()) setPressed(false) + owned || wasCancelled + } + else -> device in presses || device in cancelled + } + } + + fun cancel() { + val held = presses.isNotEmpty() + cancelled.addAll(presses) + presses.clear() + if (held) { onCancel(); setPressed(false) } + } + + fun onDeviceRemoved(device: Int) { + cancelled.remove(device) + if (presses.remove(device) && presses.isEmpty()) { onCancel(); setPressed(false) } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index 3d27da5547..28ee6403f0 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -62,6 +62,7 @@ public final class PadBridge { private boolean systemGuidePressed; private boolean systemQamPressed; private boolean backQamPressed; + private boolean homeGuidePressed; private final PadState lastBackQamReport = new PadState(); private final PadState lastWrittenReport = new PadState(); private boolean backQamAxesBlocked; @@ -136,6 +137,7 @@ public final class PadBridge { } private void resetBuiltin() { + homeGuidePressed = false; clearBackQamWrites(); routedTouch.clear(); systemGuidePressed = false; @@ -159,6 +161,7 @@ public final class PadBridge { } public synchronized void stop() { + homeGuidePressed = false; clearBackQamWrites(); releaseBackPaddles(); activeControllerId = NO_CONTROLLER; @@ -481,6 +484,7 @@ public final class PadBridge { } public synchronized void releaseAll() { + homeGuidePressed = false; clearBackQamWrites(); routedTouch.clear(); backQamPressed = false; @@ -508,10 +512,33 @@ public final class PadBridge { return builtinPad && nativeQam(); } + public boolean canHoldGuide() { + return builtinPad; + } + + public synchronized void setHomeGuidePressed(boolean pressed) { + if (pressed && !canHoldGuide()) return; + if (homeGuidePressed == pressed) return; + homeGuidePressed = pressed; + updateHeldModifier(PadState.GUIDE, pressed); + } + + public synchronized void cancelHomeGuide() { + if (!homeGuidePressed) return; + clearBackQamWrites(); + homeGuidePressed = false; + state.clear(); + publish(); + } + public synchronized void setBackQamPressed(boolean pressed) { if (pressed && !canHoldQam()) return; if (backQamPressed == pressed) return; backQamPressed = pressed; + updateHeldModifier(PadState.QAM, pressed); + } + + private void updateHeldModifier(int button, boolean pressed) { if (pressed && (open || start())) { backQamAxesBlocked = false; long now = android.os.SystemClock.uptimeMillis(); @@ -519,10 +546,10 @@ public final class PadBridge { backQamDelayMs = modifierAt - now + QAM_GUIDE_LEAD_MIN_MS; PadState modifier = new PadState(); modifier.copyFrom(lastBackQamReport); - modifier.press(PadState.QAM, true); + modifier.press(button, true); writeBackQamReport(modifier, modifierAt); } - if (!pressed) { + if (!pressed && !backQamPressed && !homeGuidePressed) { backQamAxesBlocked = hasAxes(state); if (!backQamWrites.isEmpty()) { PadState neutral = new PadState(); @@ -578,7 +605,7 @@ public final class PadBridge { if (backQamAxesBlocked && !hasAxes(state)) backQamAxesBlocked = false; long at = android.os.SystemClock.uptimeMillis(); // Steam must see the modifier before a partner; preserve quick press/release pairs in order. - if (backQamPressed || !backQamWrites.isEmpty()) at += backQamDelayMs; + if (backQamPressed || homeGuidePressed || !backQamWrites.isEmpty()) at += backQamDelayMs; writeBackQamReport(report, at); } @@ -609,7 +636,8 @@ public final class PadBridge { live.rightX = state.rightX; live.rightY = state.rightY; live.leftTrigger = state.leftTrigger; live.rightTrigger = state.rightTrigger; } - if ((queued && (!backQamPressed || !report.isDown(PadState.QAM))) || backQamAxesBlocked) clearAxes(live); + boolean held = (backQamPressed && report.isDown(PadState.QAM)) || (homeGuidePressed && report.isDown(PadState.GUIDE)); + if ((queued && !held) || backQamAxesBlocked) clearAxes(live); lastWrittenReport.copyFrom(live); writer.writePad(live); } @@ -821,7 +849,7 @@ public final class PadBridge { statDropped++; return; } - boolean guide = systemGuidePressed || qamChordActive; + boolean guide = systemGuidePressed || qamChordActive || homeGuidePressed; boolean qam = nativeQam() && (systemQamPressed || qamTapPressed || backQamPressed); if (!guide && !qam) { writePad(state); diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt index 3e0eaf8b21..f5780da94f 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt @@ -8,11 +8,9 @@ import android.app.NotificationManager import android.app.PendingIntent import android.database.ContentObserver import android.media.AudioManager -import android.net.Uri import android.os.FileObserver import android.os.Handler import android.os.Looper -import android.os.SystemClock import android.provider.Settings import android.util.Log import com.droiddeck.launcher.core.SessionPart @@ -29,8 +27,7 @@ class DeviceControlsComponent(context: Context, root: File, private val activity private val directory = directory(root) private val handler = Handler(Looper.getMainLooper()) private var running = false - private var pendingBrightness: Float? = null - private var permissionRequestAt = -5_000L + private var permissionNotified = false private var previous = "" private var revision = 0L init { prepareBacklight(context, root) } @@ -46,13 +43,8 @@ class DeviceControlsComponent(context: Context, root: File, private val activity override fun run() { if (!running) return consume() - pendingBrightness?.let { value -> - if (Settings.System.canWrite(context)) { - pendingBrightness = null - context.getSystemService(NotificationManager::class.java).cancel(PERMISSION_NOTIFICATION) - brightness(value) - } - } + if (permissionNotified && Settings.System.canWrite(context)) + context.getSystemService(NotificationManager::class.java).cancel(PERMISSION_NOTIFICATION) publish() handler.postDelayed(this, 250) } @@ -86,6 +78,7 @@ class DeviceControlsComponent(context: Context, root: File, private val activity File(directory, "$it.processing").delete() } running = true + permissionNotified = false context.contentResolver.registerContentObserver(Settings.System.CONTENT_URI, true, observer) requests.startWatching() refresh.run() @@ -98,7 +91,6 @@ class DeviceControlsComponent(context: Context, root: File, private val activity handler.removeCallbacks(refresh) requests.stopWatching() context.contentResolver.unregisterContentObserver(observer) - pendingBrightness = null context.getSystemService(NotificationManager::class.java).cancel(PERMISSION_NOTIFICATION) } } @@ -134,13 +126,13 @@ class DeviceControlsComponent(context: Context, root: File, private val activity private fun brightness(value: Float) { if (!Settings.System.canWrite(context)) { - pendingBrightness = value - val now = SystemClock.elapsedRealtime() - if (now - permissionRequestAt >= 5_000) { - permissionRequestAt = now + if (!permissionNotified) { + permissionNotified = true try { - val intent = Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS, - Uri.parse("package:${context.packageName}")).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + val intent = Intent(context, com.droiddeck.launcher.FrontEndActivity::class.java) + .setAction(com.droiddeck.launcher.core.SteamIntegration.ACTION_SETUP) + .putExtra(com.droiddeck.launcher.core.SteamIntegration.EXTRA_FEATURE, "BRIGHTNESS") + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) val manager = context.getSystemService(NotificationManager::class.java) manager.createNotificationChannel(NotificationChannel(PERMISSION_CHANNEL, context.getString(R.string.brightness_permission_title), NotificationManager.IMPORTANCE_DEFAULT)) @@ -150,7 +142,8 @@ class DeviceControlsComponent(context: Context, root: File, private val activity .setContentTitle(context.getString(R.string.brightness_permission_title)) .setContentText(context.getString(R.string.brightness_permission_text)) .setContentIntent(action).setOnlyAlertOnce(true).setAutoCancel(true).build()) - if (activityVisible()) context.startActivity(intent) + if (activityVisible()) android.widget.Toast.makeText(context, R.string.integration_brightness_needed, + android.widget.Toast.LENGTH_LONG).show() } catch (e: Exception) { Log.w(TAG, "Could not open brightness permission", e) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 4df261e8d2..e75994776a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -121,6 +121,8 @@ class FrontEndState( val isHomeApp: Boolean = false, val homeScreenEnabled: Boolean = false, val defaultHomeLabel: String? = null, + val integration: com.droiddeck.launcher.core.SteamIntegration.State = com.droiddeck.launcher.core.SteamIntegration.State(suggested = false), + val integrationFocus: com.droiddeck.launcher.core.SteamIntegration.Feature? = null, val androidApps: List<HomeApp.LaunchableApp> = emptyList(), val secondScreenDisplays: List<SecondScreenDisplay> = emptyList(), val packages: List<PackageRow>? = null, @@ -237,6 +239,11 @@ class FrontEndActions( val onLibraryChanged: () -> Unit = {}, val onHomeApp: () -> Unit = {}, val onHomeScreen: (Boolean) -> Unit = {}, + val onSteamIntegration: (com.droiddeck.launcher.core.SteamIntegration.Feature?) -> Unit = {}, + val onDismissIntegration: () -> Unit = {}, + val onIntegration: (com.droiddeck.launcher.core.SteamIntegration.Feature) -> Unit = {}, + val onIntegrationAppInfo: () -> Unit = {}, + val onIntegrationLocation: () -> Unit = {}, val onAndroidApp: (HomeApp.LaunchableApp, Int?) -> Unit = { _, _ -> }, val onBackActionsInverted: (Boolean) -> Unit = {}, val onRefreshPhantomStatus: () -> Unit = {}, @@ -408,6 +415,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com "stores:downloads" -> { com.droiddeck.launcher.stores.StoresState.openDownloads = true; selected = "stores" } "components" -> a.onComponents(true) "setup:launcher" -> { SetupTabs.openLauncher = true; selected = "setup" } + "setup:integration" -> { SetupTabs.openOverview = true; selected = "setup" } else -> selected = target } a.onNavigated() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 43926aa6b1..d5932762f7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -91,6 +91,7 @@ private const val LAUNCHER_TAB = 2 internal object SetupTabs { var openLauncher = false + var openOverview = false } private const val GLASSES_TAB = 5 @@ -191,6 +192,7 @@ internal fun SetupPanel( val tabs = listOf(stringResource(R.string.setup_tab_overview), stringResource(R.string.setup_tab_controller), stringResource(R.string.setup_tab_launcher), stringResource(R.string.setup_tab_storage), stringResource(R.string.setup_tab_diagnostics), stringResource(R.string.setup_tab_glasses)) var tab by rememberSaveable { mutableStateOf(if (SetupTabs.openLauncher) LAUNCHER_TAB else 0) } SetupTabs.openLauncher = false + if (SetupTabs.openOverview) { tab = 0; SetupTabs.openOverview = false } val chipFocus = remember { List(tabs.size) { FocusRequester() } } var tabTurned by remember { mutableStateOf(false) } val pick: (Int) -> Unit = { i -> tab = i; tabTurned = true } @@ -341,6 +343,7 @@ internal fun SetupPanel( } } SettingsGroup(stringResource(R.string.setup_runtime)) { runtimeCheck(false) } + SteamIntegrationGroup(s.integration, s.integrationFocus, a.onIntegration, a.onIntegrationAppInfo, a.onIntegrationLocation) } 1 -> { val controller = s.controller 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 f8f8857645..1e07f6c47f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -96,11 +96,7 @@ class ModeSettings( val bootMovieCustomName: String? = null, val bootMovieImporting: Boolean = false, val bootMovieProgress: Int = -1, - val wifiDiscovery: Boolean? = null, - val wifiDiscoveryPermission: Boolean = false, - val wifiDiscoveryLocation: Boolean = false, - val wifiDiscoveryAsked: Boolean = false, - val wifiDiscoveryBlocked: Boolean = false, + val integration: com.droiddeck.launcher.core.SteamIntegration.State? = null, val deckyInstalled: String? = null, val deckyLatestRelease: DeckyManager.Release? = null, val deckyBranch: Int = DeckyManager.BRANCH_STABLE, @@ -148,8 +144,9 @@ class ModeSettingsActions( val onBootMovieSound: (Boolean) -> Unit = {}, val onImportBootMovie: () -> Unit = {}, val onBootMovieChanged: () -> Unit = {}, - val onWifiDiscovery: (Boolean) -> Unit = {}, - val onWifiDiscoverySettings: () -> Unit = {}, + val onIntegration: (com.droiddeck.launcher.core.SteamIntegration.Feature) -> Unit = {}, + val onIntegrationAppInfo: () -> Unit = {}, + val onIntegrationLocation: () -> Unit = {}, val onDeckyInstall: (DeckyManager.Release) -> Unit = {}, val onDeckyCheck: () -> Unit = {}, val onDeckyBranch: (Int) -> Unit = {}, @@ -208,7 +205,6 @@ class SheetExtras( fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: SheetExtras = SheetExtras()) { val steam = s.mode == SessionService.MODE_STEAM val host = rememberMenuHost() - var explainWifiDiscovery by remember { mutableStateOf(false) } if (tab == SheetTab.DISPLAY) { val context = LocalContext.current val portraitWindow = SessionPrefs.portrait(context) @@ -512,39 +508,9 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: ) } if (s.bootMovie != null) BootMovieGroup(s, a, host) - if (s.wifiDiscovery != null) SettingsGroup(stringResource(R.string.mode_network)) { - val hint = when { - s.wifiDiscovery && !s.wifiDiscoveryLocation -> stringResource(R.string.mode_wifi_location_off) - !s.wifiDiscoveryPermission && s.wifiDiscoveryAsked -> stringResource(R.string.mode_wifi_permission_denied) - else -> stringResource(R.string.mode_wifi_discovery_hint) - } - SettingsRow(stringResource(R.string.mode_wifi_discovery), hint) { - Row(verticalAlignment = androidx.compose.ui.Alignment.CenterVertically, - horizontalArrangement = androidx.compose.foundation.layout.Arrangement.spacedBy(8.dp)) { - if (s.wifiDiscoveryBlocked || (s.wifiDiscovery && !s.wifiDiscoveryLocation)) { - SecondaryButton(stringResource(R.string.mode_wifi_open_settings), onClick = a.onWifiDiscoverySettings) - } - ToggleSwitch(s.wifiDiscovery, label = stringResource(R.string.mode_wifi_discovery)) { on -> - host.open = null - if (on) explainWifiDiscovery = true else a.onWifiDiscovery(false) - } - } - } - } + if (s.integration != null) SteamIntegrationGroup(s.integration, + onFeature = a.onIntegration, onAppInfo = a.onIntegrationAppInfo, onLocation = a.onIntegrationLocation) } - if (explainWifiDiscovery) AlertDialog( - onDismissRequest = { explainWifiDiscovery = false }, - title = { Text(stringResource(R.string.mode_wifi_explain_title)) }, - text = { Text(stringResource(R.string.mode_wifi_explain_text)) }, - confirmButton = { - TextButton(onClick = { explainWifiDiscovery = false; a.onWifiDiscovery(true) }, modifier = Modifier.focusGlide(CircleShape)) { - Text(stringResource(if (s.wifiDiscoveryBlocked) R.string.mode_wifi_open_settings else R.string.mode_wifi_continue)) - } - }, - dismissButton = { - TextButton(onClick = { explainWifiDiscovery = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } - }, - ) } @Composable diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt index f4c1837888..6725ac3193 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -422,7 +422,7 @@ fun ValueChip(text: String, open: Boolean, enabled: Boolean = true, modifier: Mo } @Composable -fun SettingsGroup(title: String, compact: Boolean = false, content: @Composable ColumnScope.() -> Unit) { +fun SettingsGroup(title: String, compact: Boolean = false, detail: String? = null, content: @Composable ColumnScope.() -> Unit) { val tight = compact || LocalCompactSettings.current val colors = MaterialTheme.colorScheme val pal = LocalPalette.current @@ -434,6 +434,7 @@ fun SettingsGroup(title: String, compact: Boolean = false, content: @Composable ) { Text(title.uppercase(), fontSize = if (tight) 11.sp else 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, color = colors.onSurfaceVariant) Box(modifier = Modifier.weight(1f).height(1.dp).background(pal.line)) + if (detail != null) Text(detail, fontSize = if (tight) 11.sp else 12.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurfaceVariant) } Column(modifier = Modifier.fillMaxWidth().clip(GroupShape).background(colors.surface).border(1.dp, pal.line, GroupShape)) { content() } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt index 49cfd2da49..4a93056dda 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt @@ -143,6 +143,8 @@ internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) words = { val runtimeStatus: @Composable () -> Unit = { if (s.busy || !s.ready || (s.available != null && s.available != s.installed)) RuntimeChip(s) + else if (s.integration.suggested && signedIn && !com.droiddeck.launcher.core.PhantomProcessLimit.blocksSteam(s.phantomProcessStatus)) + IntegrationSuggestion(s.integration, { a.onSteamIntegration(null) }, a.onDismissIntegration) } if (narrow) Column( verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.onPlaced { words = it.boundsInParent() }, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamIntegrationGroup.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamIntegrationGroup.kt new file mode 100644 index 0000000000..d7f030695d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamIntegrationGroup.kt @@ -0,0 +1,215 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.animation.animateColorAsState +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.relocation.BringIntoViewRequester +import androidx.compose.foundation.relocation.bringIntoViewRequester +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.AutoAwesome +import androidx.compose.material.icons.outlined.Close +import androidx.compose.material.icons.outlined.Home +import androidx.compose.material.icons.outlined.KeyboardCommandKey +import androidx.compose.material.icons.outlined.LightMode +import androidx.compose.material.icons.outlined.Wifi +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.core.SteamIntegration +import com.droiddeck.launcher.core.SteamIntegration.Feature + +private val BadgeShape = RoundedCornerShape(10.dp) + +internal fun SteamIntegration.State.enabled(feature: Feature) = when (feature) { + Feature.WIFI -> wifi && locationPermission && locationOn + Feature.BRIGHTNESS -> brightness + Feature.HOME -> home + Feature.SHORTCUTS -> home && shortcuts +} + +internal fun SteamIntegration.State.enabledCount() = Feature.entries.count { enabled(it) } + +@Composable +internal fun SteamIntegrationGroup( + state: SteamIntegration.State, + focus: Feature? = null, + onFeature: (Feature) -> Unit, + onAppInfo: () -> Unit, + onLocation: () -> Unit = {}, +) { + SettingsGroup( + stringResource(R.string.integration_title), + detail = stringResource(R.string.integration_count, state.enabledCount(), Feature.entries.size), + ) { + Feature.entries.forEachIndexed { i, feature -> + IntegrationRow(state, feature, focus == feature, i < Feature.entries.lastIndex, onFeature, onAppInfo, onLocation) + } + } +} + +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) +@Composable +private fun IntegrationRow( + state: SteamIntegration.State, + feature: Feature, + focused: Boolean, + divider: Boolean, + onFeature: (Feature) -> Unit, + onAppInfo: () -> Unit, + onLocation: () -> Unit, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val on = state.enabled(feature) + var flash by remember { mutableStateOf(false) } + val reveal = remember { BringIntoViewRequester() } + LaunchedEffect(focused) { + if (focused) try { flash = true; reveal.bringIntoView(); kotlinx.coroutines.delay(1600) } finally { flash = false } + } + val bg by animateColorAsState(if (flash) pal.signal.copy(alpha = 0.12f) else Color.Transparent, Motion.tw(400), label = "integrationFlash") + val wifiLocationOff = feature == Feature.WIFI && state.wifi && state.locationPermission && !state.locationOn + val wifiDenied = feature == Feature.WIFI && !state.locationPermission && state.locationBlocked + val needsHome = feature == Feature.SHORTCUTS && !state.home + val restricted = feature == Feature.SHORTCUTS && !needsHome && !state.shortcuts && state.shortcutsRestricted + val maybeRestricted = feature == Feature.SHORTCUTS && !needsHome && !state.shortcuts && !restricted && state.shortcutsTried && + android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU + val hint = stringResource(when { + wifiLocationOff -> R.string.integration_wifi_location_off + wifiDenied -> R.string.integration_wifi_denied + needsHome -> R.string.integration_shortcuts_needs_home + restricted -> R.string.integration_shortcuts_restricted + maybeRestricted -> R.string.integration_shortcuts_maybe_restricted + feature == Feature.WIFI -> if (on) R.string.integration_wifi_on else R.string.integration_wifi_hint + feature == Feature.BRIGHTNESS -> R.string.integration_brightness_hint + feature == Feature.HOME -> R.string.integration_home_hint + else -> R.string.integration_shortcuts_hint + }) + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(14.dp), + modifier = Modifier.fillMaxWidth().bringIntoViewRequester(reveal).background(bg).heightIn(min = 64.dp) + .padding(horizontal = 14.dp, vertical = 10.dp) + .testTag("integration-${feature.name.lowercase()}"), + ) { + FeatureBadge(featureIcon(feature), on) + Column(Modifier.weight(1f)) { + Text(stringResource(featureTitle(feature)), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(hint, fontSize = 13.sp, color = if (wifiLocationOff || wifiDenied || restricted) AttentionAmber else colors.onSurfaceVariant, + maxLines = 1, overflow = TextOverflow.Ellipsis) + } + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + when { + wifiLocationOff -> SecondaryButton(stringResource(R.string.integration_location), compact = true, onClick = onLocation) + wifiDenied -> SecondaryButton(stringResource(R.string.integration_app_info), compact = true, onClick = onLocation) + restricted || maybeRestricted -> SecondaryButton(stringResource(R.string.integration_app_info), compact = true, onClick = onAppInfo) + } + val checked = if (feature == Feature.WIFI) state.wifi && state.locationPermission else on + ToggleSwitch(checked, enabled = !needsHome && !restricted, label = stringResource(featureTitle(feature)), + modifier = Modifier.testTag("integration-action-${feature.name.lowercase()}")) { onFeature(feature) } + } + } + if (divider) Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) +} + +@Composable +private fun FeatureBadge(icon: ImageVector, on: Boolean) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val tint by animateColorAsState(if (on) pal.good else colors.onSurfaceVariant, Motion.tw(250), label = "badgeTint") + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.size(36.dp).clip(BadgeShape) + .background(if (on) pal.good.copy(alpha = 0.14f) else colors.surfaceVariant) + .border(1.dp, if (on) pal.good.copy(alpha = 0.3f) else pal.line2, BadgeShape), + ) { Icon(icon, contentDescription = null, tint = tint, modifier = Modifier.size(19.dp)) } +} + +private fun featureIcon(feature: Feature) = when (feature) { + Feature.WIFI -> Icons.Outlined.Wifi + Feature.BRIGHTNESS -> Icons.Outlined.LightMode + Feature.HOME -> Icons.Outlined.Home + Feature.SHORTCUTS -> Icons.Outlined.KeyboardCommandKey +} + +private fun featureTitle(feature: Feature) = when (feature) { + Feature.WIFI -> R.string.integration_wifi + Feature.BRIGHTNESS -> R.string.integration_brightness + Feature.HOME -> R.string.integration_home + Feature.SHORTCUTS -> R.string.integration_shortcuts +} + +@Composable +internal fun IntegrationSuggestion(state: SteamIntegration.State, onOpen: () -> Unit, onLater: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val pill = RoundedCornerShape(99.dp) + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.clip(pill).background(colors.surfaceVariant.copy(alpha = 0.85f)) + .border(1.dp, pal.signal.copy(alpha = 0.3f), pill).testTag("integration-suggestion"), + ) { + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.heightIn(min = 40.dp).clip(pill).glideBorder(hot, pill, pal.signal, Color.Transparent) + .hoverable(src).clickable(role = Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = onOpen) + .controllerConfirm(onClick = onOpen) + .padding(start = 12.dp, end = 10.dp, top = 6.dp, bottom = 6.dp), + ) { + Icon(Icons.Outlined.AutoAwesome, contentDescription = null, tint = pal.signal, modifier = Modifier.size(16.dp)) + Text(stringResource(R.string.integration_title), fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1) + Text(stringResource(R.string.integration_count, state.enabledCount(), Feature.entries.size), fontSize = 12.sp, + color = colors.onSurfaceVariant, maxLines = 1) + } + val closeSrc = remember { MutableInteractionSource() } + val closeHot = rememberHot(closeSrc) + val later = stringResource(R.string.integration_later) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.padding(end = 4.dp).size(32.dp).clip(CircleShape) + .background(if (closeHot) pal.signal.copy(alpha = 0.16f) else Color.Transparent) + .glideBorder(closeHot, CircleShape, pal.signal, Color.Transparent) + .hoverable(closeSrc).clickable(role = Role.Button, interactionSource = closeSrc, indication = LocalIndication.current, onClick = onLater) + .controllerConfirm(onClick = onLater) + .semantics { contentDescription = later }, + ) { Icon(Icons.Outlined.Close, contentDescription = null, tint = colors.onSurfaceVariant, modifier = Modifier.size(16.dp)) } + } +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 89991465b5..d826e83df7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -310,7 +310,7 @@ <string name="back_double_tap_window">Double-tap window</string> <string name="back_tap_ms">%1$d ms</string> <string name="brightness_permission_title">Allow brightness control</string> - <string name="brightness_permission_text">Tap to allow Steam to change Android screen brightness.</string> + <string name="brightness_permission_text">Set up brightness control in DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Session</string> @@ -3240,4 +3240,27 @@ <string name="stores_xbox_cloud_settings">Cloud settings</string> <string name="xbox_cloud_gaming" translatable="false">Xbox Cloud Gaming</string> <string name="xbox_filter_game_pass" translatable="false">Game Pass</string> + <string name="integration_title">Steam integration</string> + <string name="integration_count">%1$d of %2$d on</string> + <string name="integration_set_up">Set up</string> + <string name="integration_later">Not now</string> + <string name="integration_location">Location</string> + <string name="integration_app_info">App info</string> + <string name="integration_wifi">Wi-Fi names</string> + <string name="integration_brightness">Brightness</string> + <string name="integration_home">DroidDeck as Home</string> + <string name="integration_shortcuts">Home button shortcuts</string> + <string name="integration_wifi_hint">Show networks in Steam · needs Location access, never tracked</string> + <string name="integration_wifi_on">Networks show in Steam</string> + <string name="integration_wifi_location_off">Location is off</string> + <string name="integration_wifi_denied">Location denied · allow it in App info</string> + <string name="integration_brightness_hint">Steam’s slider sets screen brightness</string> + <string name="integration_home_hint">Home opens the Steam menu in a session</string> + <string name="integration_shortcuts_hint">Hold Home for Steam Guide chords</string> + <string name="integration_shortcuts_needs_home">Needs DroidDeck as Home</string> + <string name="integration_shortcuts_maybe_restricted">Greyed out in Android? App info → ⋮ → Allow restricted settings</string> + <string name="integration_shortcuts_restricted">Blocked by Android · App info → ⋮ → Allow restricted settings</string> + <string name="integration_shortcuts_service">DroidDeck Home button</string> + <string name="integration_shortcuts_service_description">Pass Home button presses to Steam Guide while a Steam session is focused and DroidDeck is the default Home app. Does not read screen content.</string> + <string name="integration_brightness_needed">Turn on Brightness in Setup → Steam integration</string> </resources> diff --git a/app/src/main/res/xml/home_button_service.xml b/app/src/main/res/xml/home_button_service.xml new file mode 100644 index 0000000000..3b094dcd54 --- /dev/null +++ b/app/src/main/res/xml/home_button_service.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android" + android:accessibilityFeedbackType="feedbackGeneric" + android:accessibilityFlags="flagRequestFilterKeyEvents" + android:canRequestFilterKeyEvents="true" + android:canRetrieveWindowContent="false" + android:description="@string/integration_shortcuts_service_description" /> diff --git a/app/src/test/java/com/droiddeck/launcher/input/HomeGuideInputTest.kt b/app/src/test/java/com/droiddeck/launcher/input/HomeGuideInputTest.kt new file mode 100644 index 0000000000..ccef31215d --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/HomeGuideInputTest.kt @@ -0,0 +1,62 @@ +package com.droiddeck.launcher.input + +import android.app.Application +import android.view.KeyEvent +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28, 33], manifest = Config.NONE, application = Application::class) +class HomeGuideInputTest { + private val states = mutableListOf<Boolean>() + private var cancellations = 0 + private val input = HomeGuideInput({ states.add(it) }, { cancellations++ }) + + private fun home(action: Int, device: Int = 10, repeat: Int = 0, down: Long = 10) = + KeyEvent(down, down + 100, action, KeyEvent.KEYCODE_HOME, repeat, 0, device, 102) + + @Test fun guideIsHeldImmediatelyAndReleaseDoesNotDependOnAndroidDownTime() { + assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_DOWN), true)) + assertEquals(listOf(true), states) + assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_DOWN, repeat = 1), true)) + assertFalse(input.onKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BUTTON_X), true)) + assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_UP, down = 77), true)) + assertEquals(listOf(true, false), states) + } + + @Test fun anUnownedHomePressKeepsAndroidBehaviorEvenIfSessionBecomesEligibleBeforeRelease() { + assertFalse(input.onKeyEvent(home(KeyEvent.ACTION_DOWN), false)) + assertFalse(input.onKeyEvent(home(KeyEvent.ACTION_UP), true)) + assertTrue(states.isEmpty()) + } + + @Test fun focusLossReleasesGuideAndConsumesTheOwnedReleaseWithoutAnotherTap() { + input.onKeyEvent(home(KeyEvent.ACTION_DOWN), true) + input.cancel() + assertEquals(1, cancellations) + assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_DOWN, repeat = 2), false)) + assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_UP), false)) + assertEquals(listOf(true, false), states) + assertFalse(input.onKeyEvent(home(KeyEvent.ACTION_UP), false)) + } + + @Test fun disablingDuringAHoldReleasesItAndDoesNotStealTheNextAndroidHomePress() { + input.onKeyEvent(home(KeyEvent.ACTION_DOWN), true) + assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_UP), false)) + assertEquals(listOf(true, false), states) + assertFalse(input.onKeyEvent(home(KeyEvent.ACTION_DOWN), false)) + } + + @Test fun guideStaysHeldUntilAllOwnersReleaseAndDisconnectCancelsTheLastOwner() { + input.onKeyEvent(home(KeyEvent.ACTION_DOWN), true) + input.onKeyEvent(home(KeyEvent.ACTION_DOWN, device = 11), true) + input.onKeyEvent(home(KeyEvent.ACTION_UP), true) + assertEquals(listOf(true), states) + input.onDeviceRemoved(11) + assertEquals(listOf(true, false), states) + assertEquals(1, cancellations) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt index 78a790892f..9ac6ecfccd 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt @@ -328,6 +328,53 @@ class PadBridgeQamTest { } } + @Test fun homeGuidePrecedesEarlyPartnerInputAndDoesNotGenerateABareButton() { + bridge.setHomeGuidePressed(true) + assertTrue(pad().isDown(PadState.GUIDE)) + bridge.applyExternal({ it.press(PadState.X, true) }, true) + assertFalse(pad().isDown(PadState.X)) + advance(80) + assertTrue(pad().isDown(PadState.GUIDE)) + assertTrue(pad().isDown(PadState.X)) + bridge.applyExternal({ it.press(PadState.X, false) }, true) + bridge.setHomeGuidePressed(false) + advance(1000) + assertFalse(pad().isDown(PadState.GUIDE)) + assertFalse(pad().isDown(PadState.X)) + } + + @Test fun cancellingHomeDiscardsQueuedPartnersAndReleasesGuideImmediately() { + bridge.setHomeGuidePressed(true) + bridge.applyExternal({ it.press(PadState.LB, true); it.leftY = -1f }, true) + bridge.cancelHomeGuide() + advance(1000) + assertFalse(pad().isDown(PadState.GUIDE)) + assertFalse(pad().isDown(PadState.LB)) + assertEquals(0f, pad().leftY) + } + + @Test fun homeAndTouchGuideHaveIndependentReleases() { + bridge.setHomeGuidePressed(true) + bridge.setSystemButtons(true, false) + bridge.setHomeGuidePressed(false) + advance(1000) + assertTrue(pad().isDown(PadState.GUIDE)) + bridge.setSystemButtons(false, false) + advance(1000) + assertFalse(pad().isDown(PadState.GUIDE)) + } + + @Test fun releasingHomeStopsHeldAxesFromBecomingNavigation() { + bridge.setHomeGuidePressed(true) + bridge.applyExternal({ it.leftY = -1f }, true) + advance(80) + assertEquals(-1f, pad().leftY) + bridge.setHomeGuidePressed(false) + advance(1000) + assertEquals(0f, pad().leftY) + assertFalse(pad().isDown(PadState.GUIDE)) + } + private fun key(device: InputDevice, code: Int, action: Int = KeyEvent.ACTION_DOWN, repeat: Int = 0, scan: Int = 0) = KeyEvent(0L, 0L, action, code, repeat, 0, device.id, scan, 0, InputDevice.SOURCE_GAMEPAD) diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt index fa96dacc99..db035a656a 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt @@ -66,14 +66,16 @@ class DeviceControlsComponentTest { assertEquals(3, audio.getStreamVolume(AudioManager.STREAM_MUSIC)) } - @Test fun deniedBrightnessIsReadBackAndAppliedOnlyAfterPermission() { + @Test fun deniedBrightnessDoesNotOpenSettingsOrReplayAnOldSliderValueAfterPermission() { WriteSettingsShadow.writable = false request("brightness", "0.75") assertEquals(128, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) - assertEquals(Settings.ACTION_MANAGE_WRITE_SETTINGS, shadowOf(context).nextStartedActivity.action) + assertNull(shadowOf(context).nextStartedActivity) assertFalse(JSONObject(File(directory, "state.json").readText()).getBoolean("brightnessWritable")) WriteSettingsShadow.writable = true tick() + assertEquals(128, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + request("brightness", "0.75") assertEquals(192, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) } @@ -87,7 +89,7 @@ class DeviceControlsComponentTest { assertEquals(1.0, JSONObject(File(directory, "state.json").readText()).getDouble("brightness"), 0.0001) } - @Test fun hiddenPermissionRequestOffersANotificationAndRetainsTheLatestValue() { + @Test fun permissionNotificationOpensOptionalLauncherSetupOnlyWhenSelected() { visible = false WriteSettingsShadow.writable = false request("brightness", "0.25") @@ -96,11 +98,13 @@ class DeviceControlsComponentTest { val notifications = context.getSystemService(NotificationManager::class.java) val notification = notifications.activeNotifications.single().notification notification.contentIntent.send() - assertEquals(Settings.ACTION_MANAGE_WRITE_SETTINGS, shadowOf(context).nextStartedActivity.action) + val intent = shadowOf(context).nextStartedActivity + assertEquals(com.droiddeck.launcher.core.SteamIntegration.ACTION_SETUP, intent.action) + assertEquals("BRIGHTNESS", intent.getStringExtra(com.droiddeck.launcher.core.SteamIntegration.EXTRA_FEATURE)) shadowOf(Looper.getMainLooper()).idleFor(Duration.ofSeconds(121)) WriteSettingsShadow.writable = true tick() - assertEquals(192, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + assertEquals(128, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) assertTrue(notifications.activeNotifications.isEmpty()) } @@ -123,15 +127,15 @@ class DeviceControlsComponentTest { assertEquals(128, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) } - @Test fun rejectedPermissionCanBeRequestedAgainWithoutOpeningRepeatedScreens() { + @Test fun repeatedSliderChangesDoNotInterruptTheSession() { WriteSettingsShadow.writable = false request("brightness", "0.75") - assertNotNull(shadowOf(context).nextStartedActivity) + assertNull(shadowOf(context).nextStartedActivity) request("brightness", "0.8") assertNull(shadowOf(context).nextStartedActivity) shadowOf(Looper.getMainLooper()).idleFor(Duration.ofSeconds(5)) request("brightness", "0.8") - assertNotNull(shadowOf(context).nextStartedActivity) + assertNull(shadowOf(context).nextStartedActivity) } @Test fun oversizedRequestsAreDiscardedAndDoNotBlockLaterCommands() { diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SteamIntegrationGroupTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SteamIntegrationGroupTest.kt new file mode 100644 index 0000000000..b11fbd2fe1 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/SteamIntegrationGroupTest.kt @@ -0,0 +1,93 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.runtime.mutableStateOf +import androidx.compose.ui.test.assertIsEnabled +import androidx.compose.ui.test.assertIsNotEnabled +import androidx.compose.ui.semantics.SemanticsProperties +import androidx.compose.ui.test.SemanticsMatcher +import androidx.compose.ui.test.assert +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.performClick +import com.droiddeck.launcher.core.SteamIntegration +import com.droiddeck.launcher.core.SteamIntegration.Feature +import org.junit.Assert.* +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], qualifiers = "w960dp-h540dp-land") +class SteamIntegrationGroupTest { + @get:Rule val compose = createRobolectricComposeRule() + private val state = mutableStateOf(SteamIntegration.State()) + private val requests = mutableListOf<Feature>() + private var appInfo = 0 + private var location = 0 + + private fun stateIs(value: String) = SemanticsMatcher.expectValue(SemanticsProperties.StateDescription, value) + + private fun show() = compose.setContent { + DroidDeckTheme { + SteamIntegrationGroup(state.value, onFeature = { requests.add(it) }, onAppInfo = { appInfo++ }, onLocation = { location++ }) + } + } + + @Test fun everySwitchRequestsOnlyItsOwnFeature() { + state.value = SteamIntegration.State(home = true) + show() + compose.onNodeWithTag("integration-action-brightness").performClick() + compose.onNodeWithTag("integration-action-home").performClick() + compose.onNodeWithTag("integration-action-shortcuts").performClick() + assertEquals(listOf(Feature.BRIGHTNESS, Feature.HOME, Feature.SHORTCUTS), requests) + } + + @Test fun switchesReflectAndroidGrants() { + state.value = SteamIntegration.State(brightness = true, home = true, shortcuts = true) + show() + compose.onNodeWithTag("integration-action-brightness").assert(stateIs("On")) + compose.onNodeWithTag("integration-action-shortcuts").assert(stateIs("On")) + compose.onNodeWithTag("integration-action-wifi").assert(stateIs("Off")) + compose.onNodeWithText("3 of 4 on").assertExists() + } + + @Test fun shortcutsWaitForHome() { + show() + compose.onNodeWithTag("integration-action-shortcuts").assertIsNotEnabled() + compose.onNodeWithText("Needs DroidDeck as Home").assertExists() + compose.runOnIdle { state.value = state.value.copy(home = true) } + compose.onNodeWithTag("integration-action-shortcuts").assertIsEnabled() + } + + @Test fun restrictedShortcutsPointToAppInfo() { + state.value = SteamIntegration.State(home = true, shortcutsRestricted = true) + show() + compose.onNodeWithTag("integration-action-shortcuts").assertIsNotEnabled() + compose.onNodeWithText("App info").performClick() + assertEquals(1, appInfo) + compose.runOnIdle { state.value = state.value.copy(shortcutsRestricted = false) } + compose.onNodeWithText("App info").assertDoesNotExist() + compose.onNodeWithTag("integration-action-shortcuts").assertIsEnabled() + } + + @Test fun unconfirmedRestrictionOffersAppInfoAfterAnAttempt() { + state.value = SteamIntegration.State(home = true) + show() + compose.onNodeWithText("App info").assertDoesNotExist() + compose.runOnIdle { state.value = state.value.copy(shortcutsTried = true) } + compose.onNodeWithTag("integration-action-shortcuts").assertIsEnabled() + compose.onNodeWithText("App info").performClick() + assertEquals(1, appInfo) + } + + @Test fun deniedLocationPointsToAppInfoWithoutTogglingWifi() { + state.value = SteamIntegration.State(locationBlocked = true) + show() + compose.onNodeWithText("Location denied · allow it in App info").assertExists() + compose.onNodeWithText("App info").performClick() + assertEquals(1, location) + assertTrue(requests.isEmpty()) + } +} From d905f03bf725090e62340492b192591cbb035652 Mon Sep 17 00:00:00 2001 From: FX1922 <120828496+FX192@users.noreply.github.com> Date: Tue, 27 Oct 2026 01:15:24 +0300 Subject: [PATCH 108/135] feat(itch): collections filter in the Library (#1597) * Add itch.io collections to the Library A Collections button on the Library's itch tab filters the library to one collection of the signed-in account. Its games that are not installed show in the Not installed section. * Keep itch collections complete across failures, sign-out and empty libraries A failed later page no longer publishes a partial collection, selecting a collection refreshes it, pagination runs until an empty page, signing out clears collection state, and the itch chip shows for a signed-in account with no owned games. * Tie itch collection requests to the account that started them Requests capture the account generation before reading the key and dedupe per generation, sign-out clears collections after the token is removed, and the collections load follows the itch sign-in state. * Keep paging itch collections past a page of already seen games * Run the itch collections tests under Robolectric like the other itch tests * Let the Installed filter apply inside a collection and keep the grid for an empty itch account * fix(itch): stop paging a collection when a page adds no new games * Keep the collections icon on the itch collections tab when it opens --------- Co-authored-by: maxjivi05 <maxjividen@gmail.com> --- .../droiddeck/launcher/stores/StoresState.kt | 3 +- .../droiddeck/launcher/stores/itch/ItchApi.kt | 5 + .../launcher/stores/itch/ItchCollections.kt | 116 ++++++++++++++++++ .../droiddeck/launcher/ui/CollectionsIcon.kt | 15 +++ .../com/droiddeck/launcher/ui/LibraryPage.kt | 77 ++++++++++-- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-b+es+419/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../stores/itch/ItchCollectionsTest.kt | 31 +++++ .../launcher/ui/LibraryEntriesTest.kt | 19 +++ docs/development/itch-collections.md | 26 ++++ 41 files changed, 313 insertions(+), 12 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/itch/ItchCollections.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/CollectionsIcon.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/itch/ItchCollectionsTest.kt create mode 100644 docs/development/itch-collections.md diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index 3488bf05a4..3edac79a4b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -130,7 +130,7 @@ object StoresState { fun detailItem(store: Store, id: String): CatalogItem? = detailCatalogItem( store, id, library[store].orEmpty(), - found[store].orEmpty() + if (store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchBrowseState.items else emptyList(), + found[store].orEmpty() + if (store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchBrowseState.items + com.droiddeck.launcher.stores.itch.ItchCollections.items() else emptyList(), shelves[store], ) @@ -191,6 +191,7 @@ object StoresState { backend?.signOut(app) if (store == Store.GOG) com.droiddeck.launcher.stores.gog.GogComet.replaceAccount { StoreAccounts.clear(app, store) } else if (store != Store.XBOX || backend == null) StoreAccounts.clear(app, store) + if (store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchCollections.clear() main.post { if (store == Store.XBOX && StoreAccounts.signedInAs(app, store) != null) return@post accounts.remove(store); library.remove(store); status.remove(store); problems.remove(store); libraryAsked.remove(store) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchApi.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchApi.kt index 496691feec..293a59c46d 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchApi.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchApi.kt @@ -19,6 +19,11 @@ internal object ItchApi { fun ownedKeys(key: String, page: Int): JSONObject? = get("/profile/owned-keys?page=$page&per_page=500", key) + fun collections(key: String): JSONArray? = get("/profile/collections", key)?.optJSONArray("collections") + + fun collectionGames(key: String, collectionId: String, page: Int): JSONObject? = + get("/collections/$collectionId/collection-games?page=$page", key) + fun uploads(key: String, gameId: String, downloadKeyId: String): JSONArray? = get("/games/$gameId/uploads" + keyQuery(downloadKeyId), key)?.optJSONArray("uploads") diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchCollections.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchCollections.kt new file mode 100644 index 0000000000..30e216f103 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchCollections.kt @@ -0,0 +1,116 @@ +package com.droiddeck.launcher.stores.itch + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONArray +import org.json.JSONObject +import java.util.concurrent.ConcurrentHashMap + +internal class ItchCollection(val id: String, val title: String, val count: Int) + +internal object ItchCollections { + var list by mutableStateOf<List<ItchCollection>>(emptyList()) + private set + var selected by mutableStateOf<String?>(null) + private set + private val games = mutableStateMapOf<String, List<CatalogItem>>() + private val loading = ConcurrentHashMap.newKeySet<String>() + @Volatile private var generation = 0 + + fun items(): List<CatalogItem> = games.values.flatten() + + fun gamesOf(id: String): List<CatalogItem>? = games[id] + + fun chosen(): ItchCollection? = list.firstOrNull { it.id == selected } + + fun clear() { + generation++ + StoresState.post { + list = emptyList() + selected = null + games.clear() + } + } + + fun load(context: Context) { + val app = context.applicationContext + val started = generation + val guard = "$started:" + if (!loading.add(guard)) return + Thread({ + try { + val key = ItchAuth.key(app) + if (key.isBlank()) return@Thread + val parsed = parseCollections(ItchApi.collections(key) ?: return@Thread) + if (started != generation) return@Thread + StoresState.post { + if (started != generation) return@post + list = parsed + if (selected != null && parsed.none { it.id == selected }) selected = null + } + StoresState.logLine("itch.io: ${parsed.size} collections") + selected?.let { fetchGames(key, it, started) } + } finally { + loading.remove(guard) + } + }, "itch-collections").start() + } + + fun select(context: Context, id: String?) { + selected = id + if (id == null) return + val app = context.applicationContext + val started = generation + Thread({ + val key = ItchAuth.key(app) + if (key.isNotBlank()) fetchGames(key, id, started) + }, "itch-collection-games").start() + } + + private fun fetchGames(key: String, id: String, started: Int) { + val guard = "$started:$id" + if (!loading.add(guard)) return + try { + val out = ArrayList<CatalogItem>() + val seen = HashSet<String>() + var page = 1 + while (true) { + val body = ItchApi.collectionGames(key, id, page) + if (body == null) { + StoresState.logLine("itch.io: collection $id page $page failed") + return + } + val batch = parseGames(body) + if (batch.isEmpty()) break + val before = out.size + out.addAll(batch.filter { seen.add(it.id) }) + if (out.size == before) break + page++ + } + val distinct = out.toList() + StoresState.post { if (started == generation) games[id] = distinct } + StoresState.logLine("itch.io: collection $id has ${distinct.size} games") + } finally { + loading.remove(guard) + } + } + + internal fun parseCollections(array: JSONArray): List<ItchCollection> = (0 until array.length()).mapNotNull { i -> + val c = array.optJSONObject(i) ?: return@mapNotNull null + val id = c.opt("id")?.toString().orEmpty().takeIf { it.isNotBlank() && it != "null" } ?: return@mapNotNull null + val title = c.optString("title").ifBlank { return@mapNotNull null } + ItchCollection(id, title, c.optInt("games_count", c.optInt("gamesCount"))) + } + + internal fun parseGames(body: JSONObject): List<CatalogItem> { + val rows = body.optJSONArray("collection_games") ?: body.optJSONArray("collectionGames") ?: return emptyList() + return (0 until rows.length()).mapNotNull { i -> + rows.optJSONObject(i)?.optJSONObject("game")?.let { ItchLibrary.item(it, "") } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/CollectionsIcon.kt b/app/src/main/java/com/droiddeck/launcher/ui/CollectionsIcon.kt new file mode 100644 index 0000000000..ade8c967f8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/CollectionsIcon.kt @@ -0,0 +1,15 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.unit.dp + +internal val CollectionsIcon: ImageVector = ImageVector.Builder("Collections", 24.dp, 24.dp, 24f, 24f).apply { + for (d in listOf( + "M2.65,4.6H7.33V22H2.65Z", + "M8.32,2H13V22H8.32Z", + "M13.9,5.4H18.5L21.4,22H16.8Z", + )) addPath(addPathNodes(d), fill = SolidColor(Color.Black)) +}.build() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 431dc647b6..4a3b24ce67 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -89,6 +89,8 @@ import com.droiddeck.launcher.stores.StoresState import com.droiddeck.launcher.stores.arrangeStoreTabs import com.droiddeck.launcher.stores.download.DownloadEntry import com.droiddeck.launcher.stores.formatBytes +import com.droiddeck.launcher.stores.itch.ItchCollection +import com.droiddeck.launcher.stores.itch.ItchCollections import com.droiddeck.launcher.stores.retainOrder import com.droiddeck.launcher.stores.xbox.XboxLibraryFilter import com.droiddeck.launcher.stores.sortGames @@ -127,6 +129,14 @@ internal fun libraryEntries( return out.distinctBy { it.key } } +internal fun collectionEntries(all: List<LibraryEntry>, items: List<CatalogItem>): List<LibraryEntry> { + val keys = items.map { it.key }.toSet() + val itch = all.filter { it.source == Store.ITCH.id } + val have = itch.mapNotNull { it.storeKey }.toSet() + return itch.filter { it.storeKey in keys } + + items.filter { it.key !in have }.map { LibraryEntry(GameRef.key(it), Store.ITCH.id, it.title, null, it, false) } +} + internal fun installedFirst(entries: List<LibraryEntry>): List<LibraryEntry> = entries.partition { it.installed }.let { (on, off) -> on + off } internal const val LIBRARY_ALL = "all" @@ -169,19 +179,30 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val all = remember(s.steamGames, cloudRows, owned, installedStore) { libraryEntries(s.steamGames + cloudRows, owned, installedStore) } LaunchedEffect(Unit) { XboxLibraryFilter.load(ctx) } var showUninstalled by remember(LibraryView.ownedRequest) { mutableStateOf(SessionPrefs.libraryShowUninstalled(ctx)) } + var collectionShows by remember { mutableStateOf<Pair<String, Boolean>?>(null) } val setShowUninstalled = { show: Boolean -> - showUninstalled = show - SessionPrefs.setLibraryShowUninstalled(ctx, show) + val picked = ItchCollections.selected.takeIf { LibraryView.source == Store.ITCH.id } + if (picked != null) collectionShows = picked to show + else { + showUninstalled = show + SessionPrefs.setLibraryShowUninstalled(ctx, show) + } } - val sources = librarySources(all, SessionPrefs.storesTabOrder(ctx)) + val itchSignedIn = owned.containsKey(Store.ITCH) + val listed = librarySources(all, SessionPrefs.storesTabOrder(ctx)) + val sources = if (itchSignedIn && Store.ITCH.id !in listed) listed + Store.ITCH.id else listed val source = LibraryView.source.takeIf { it == LIBRARY_ALL || it in sources } ?: LIBRARY_ALL val q = LibraryView.query.trim().lowercase() val xboxFilter = if (source == Store.XBOX.id) XboxLibraryFilter.current else XboxLibraryFilter.ALL - val matching = all.filter { + LaunchedEffect(source, itchSignedIn) { if (source == Store.ITCH.id && itchSignedIn) ItchCollections.load(ctx) } + val collection = if (source == Store.ITCH.id) ItchCollections.chosen() else null + val pool = if (collection == null) all else collectionEntries(all, ItchCollections.gamesOf(collection.id).orEmpty()) + val matching = pool.filter { (source == LIBRARY_ALL || it.source == source) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) } - val candidates = if (showUninstalled) matching else matching.filter { it.installed } - val hiddenUninstalled = if (showUninstalled) 0 else matching.count { !it.installed } + val listUninstalled = if (collection == null) showUninstalled else collectionShows?.takeIf { it.first == collection.id }?.second ?: true + val candidates = if (listUninstalled) matching else matching.filter { it.installed } + val hiddenUninstalled = if (listUninstalled) 0 else matching.count { !it.installed } val sort = s.storesSort val sizeSort = sort == "sizeAsc" || sort == "sizeDesc" val installedAt = StoresState.installed.associate { it.key to it.sidecar.installedAt } @@ -264,7 +285,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, kotlinx.coroutines.delay(Motion.ms(240).toLong()) focusWithinFrames({ ff.last?.startsWith("card:") == true }) { if (ff.firstTileAttached > 0) ff.firstTile else FocusRequester.Default } } - if (all.isEmpty() && open == null) { + if (all.isEmpty() && open == null && !itchSignedIn) { LibraryEmpty(s, a, modifier) return } @@ -272,7 +293,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val detailScroll = rememberScrollState() var cycled by remember { mutableIntStateOf(0) } var gridFocused by remember { mutableStateOf(false) } - LaunchedEffect(source, sort, showUninstalled) { grid.scrollToItem(0) } + LaunchedEffect(source, sort, listUninstalled) { grid.scrollToItem(0) } LaunchedEffect(cycled) { if (cycled == 0 || ff == null || inputMode.inputMode != androidx.compose.ui.input.InputMode.Keyboard) return@LaunchedEffect focusWithinFrames({ gridFocused }) { @@ -288,7 +309,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, grid = { LibraryGrid( s, a, grid, visible, split, visible.size, sources, source, sizesPending, syncing, - showUninstalled = showUninstalled.takeIf { stores }, onShowUninstalled = setShowUninstalled, + showUninstalled = listUninstalled.takeIf { stores }, onShowUninstalled = setShowUninstalled, hiddenUninstalled = hiddenUninstalled, onSource = { LibraryView.source = it }, onCycle = { step -> @@ -383,7 +404,7 @@ private fun LibraryGrid( contentPadding = PaddingValues(top = 4.dp, bottom = 16.dp), ) { item(key = "header", span = { GridItemSpan(maxLineSpan) }) { - Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled) } + Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = source == Store.ITCH.id) } } item(key = "filters", span = { GridItemSpan(maxLineSpan) }) { Rise(1) { LibraryFilters(sources, source, onSource) } @@ -430,7 +451,7 @@ private fun LazyGridScope.libraryGrid(entries: List<LibraryEntry>, empty: Int, t @Composable private fun LibraryHeader( s: FrontEndState, a: FrontEndActions, total: Int, searchCleared: Boolean, xbox: Boolean, - showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, + showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, collections: Boolean, ) { val colors = MaterialTheme.colorScheme val narrow = LocalNarrowPane.current @@ -447,6 +468,7 @@ private fun LibraryHeader( }, ) { if (showUninstalled != null || xbox) LibraryFilterButton(showUninstalled, onShowUninstalled, xbox) + if (collections) CollectionsButton() SortButton(s, a) ViewButton(s, a) GameFileFolderActions(s, a) @@ -700,6 +722,39 @@ private fun LibraryFilterButton(showUninstalled: Boolean?, onShowUninstalled: (B } } +@Composable +private fun CollectionsButton() { + val pal = LocalPalette.current + val ctx = LocalContext.current + val title = stringResource(R.string.itch_collections) + val all = stringResource(R.string.stores_tab_all) + var at by remember { mutableStateOf<Rect?>(null) } + Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { + HeaderIconButton(title + " · " + (ItchCollections.chosen()?.title ?: all), CollectionsIcon, "itch-collections") { + val from = at ?: return@HeaderIconButton + val choices = listOf<ItchCollection?>(null) + ItchCollections.list + Steps.ask(StepAsk( + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = choices.size, + handle = { Icon(CollectionsIcon, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, + ) { + StepTitle(title) + StepList { + choices.forEachIndexed { i, c -> + val picked = c?.id == ItchCollections.selected + StepChoice( + c?.let { it.title + " (" + it.count + ")" } ?: all, selected = picked, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(i).then(if (picked) Modifier.focusRequester(first) else Modifier), + ) { + ItchCollections.select(ctx, c?.id) + Steps.fold() + } + } + } + }) + } + } +} + @Composable private fun SortButton(s: FrontEndState, a: FrontEndActions) { val pal = LocalPalette.current diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index fe7c0e1389..68dcfe1806 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3219,6 +3219,7 @@ <string name="library_remove">إزالة من المكتبة</string> <string name="library_in">في المكتبة</string> <string name="xbox_filter_show">عرض</string> + <string name="itch_collections">المجموعات</string> <string name="xbox_filter_cloud">سحابية</string> <string name="stores_xbox_cloud_settings">إعدادات السحابة</string> </resources> diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 1609361f2c..413588da65 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -3069,6 +3069,7 @@ <string name="library_remove">Quitar de Biblioteca</string> <string name="library_in">En Biblioteca</string> <string name="xbox_filter_show">Mostrar</string> + <string name="itch_collections">Colecciones</string> <string name="xbox_filter_cloud">Nube</string> <string name="stores_xbox_cloud_settings">Configuración de nube</string> </resources> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index a40f3e38d0..3429ff0ecf 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3083,6 +3083,7 @@ <string name="library_remove">Премахни от Библиотека</string> <string name="library_in">В Библиотека</string> <string name="xbox_filter_show">Показване</string> + <string name="itch_collections">Колекции</string> <string name="xbox_filter_cloud">Облак</string> <string name="stores_xbox_cloud_settings">Настройки на облака</string> </resources> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 4d493645a6..3c41609da3 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3151,6 +3151,7 @@ <string name="library_remove">Odebrat z knihovny</string> <string name="library_in">V knihovně</string> <string name="xbox_filter_show">Zobrazit</string> + <string name="itch_collections">Kolekce</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Nastavení cloudu</string> </resources> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f737e6bd7b..166786e068 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3083,6 +3083,7 @@ <string name="library_remove">Fjern fra Bibliotek</string> <string name="library_in">I Bibliotek</string> <string name="xbox_filter_show">Vis</string> + <string name="itch_collections">Samlinger</string> <string name="xbox_filter_cloud">Sky</string> <string name="stores_xbox_cloud_settings">Skyindstillinger</string> </resources> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8e9b653323..76d7e59bc3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3083,6 +3083,7 @@ <string name="library_remove">Aus der Bibliothek entfernen</string> <string name="library_in">In der Bibliothek</string> <string name="xbox_filter_show">Anzeigen</string> + <string name="itch_collections">Sammlungen</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Cloud-Einstellungen</string> </resources> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 2da1c1b2a8..266eeb6fd1 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3083,6 +3083,7 @@ <string name="library_remove">Αφαίρεση από τη Βιβλιοθήκη</string> <string name="library_in">Στη Βιβλιοθήκη</string> <string name="xbox_filter_show">Εμφάνιση</string> + <string name="itch_collections">Συλλογές</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Ρυθμίσεις cloud</string> </resources> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 45f4cfc67e..196207fb1b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3119,6 +3119,7 @@ <string name="library_remove">Quitar de la Biblioteca</string> <string name="library_in">En la Biblioteca</string> <string name="xbox_filter_show">Mostrar</string> + <string name="itch_collections">Colecciones</string> <string name="xbox_filter_cloud">Nube</string> <string name="stores_xbox_cloud_settings">Ajustes de nube</string> </resources> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index ddf4d46056..ffe2199025 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3083,6 +3083,7 @@ <string name="library_remove">Poista kirjastosta</string> <string name="library_in">Kirjastossa</string> <string name="xbox_filter_show">Näytä</string> + <string name="itch_collections">Kokoelmat</string> <string name="xbox_filter_cloud">Pilvi</string> <string name="stores_xbox_cloud_settings">Pilviasetukset</string> </resources> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 535cbf4877..79f4a85cd9 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3119,6 +3119,7 @@ <string name="library_remove">Retirer de la Bibliothèque</string> <string name="library_in">Dans la Bibliothèque</string> <string name="xbox_filter_show">Afficher</string> + <string name="itch_collections">Collections</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Paramètres cloud</string> </resources> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index be2c1b8036..858b138591 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3083,6 +3083,7 @@ <string name="library_remove">लाइब्रेरी से हटाएँ</string> <string name="library_in">लाइब्रेरी में</string> <string name="xbox_filter_show">दिखाएँ</string> + <string name="itch_collections">संग्रह</string> <string name="xbox_filter_cloud">क्लाउड</string> <string name="stores_xbox_cloud_settings">क्लाउड सेटिंग्स</string> </resources> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 6902c2cc33..b68fb6a5fd 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3083,6 +3083,7 @@ <string name="library_remove">Eltávolítás a könyvtárból</string> <string name="library_in">A könyvtárban</string> <string name="xbox_filter_show">Megjelenítés</string> + <string name="itch_collections">Gyűjtemények</string> <string name="xbox_filter_cloud">Felhő</string> <string name="stores_xbox_cloud_settings">Felhőbeállítások</string> </resources> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 24ce23f45e..8f2661e2ac 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3073,6 +3073,7 @@ <string name="library_remove">Hapus dari Pustaka</string> <string name="library_in">Di Pustaka</string> <string name="xbox_filter_show">Tampilkan</string> + <string name="itch_collections">Koleksi</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Pengaturan cloud</string> </resources> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 524eba5449..9c3628c8e6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3117,6 +3117,7 @@ <string name="library_remove">Rimuovi dalla Libreria</string> <string name="library_in">Nella Libreria</string> <string name="xbox_filter_show">Mostra</string> + <string name="itch_collections">Raccolte</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Impostazioni cloud</string> </resources> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 4d605fa6b2..b75b63bc7f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3060,6 +3060,7 @@ <string name="library_remove">ライブラリから削除</string> <string name="library_in">ライブラリにあります</string> <string name="xbox_filter_show">表示</string> + <string name="itch_collections">コレクション</string> <string name="xbox_filter_cloud">クラウド</string> <string name="stores_xbox_cloud_settings">クラウド設定</string> </resources> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 9420ce605c..cb0648a4ff 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3060,6 +3060,7 @@ <string name="library_remove">라이브러리에서 제거</string> <string name="library_in">라이브러리에 있음</string> <string name="xbox_filter_show">표시</string> + <string name="itch_collections">컬렉션</string> <string name="xbox_filter_cloud">클라우드</string> <string name="stores_xbox_cloud_settings">클라우드 설정</string> </resources> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 218fc9a817..88b80ac4b7 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3058,6 +3058,7 @@ <string name="library_remove">Alih keluar dari Pustaka</string> <string name="library_in">Dalam Pustaka</string> <string name="xbox_filter_show">Tunjukkan</string> + <string name="itch_collections">Koleksi</string> <string name="xbox_filter_cloud">Awan</string> <string name="stores_xbox_cloud_settings">Tetapan awan</string> </resources> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index bbb6c8a249..89be0988d8 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3083,6 +3083,7 @@ <string name="library_remove">Fjern fra Bibliotek</string> <string name="library_in">I Bibliotek</string> <string name="xbox_filter_show">Vis</string> + <string name="itch_collections">Samlinger</string> <string name="xbox_filter_cloud">Sky</string> <string name="stores_xbox_cloud_settings">Skyinnstillinger</string> </resources> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e8c394cf1e..8d0891046a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3083,6 +3083,7 @@ <string name="library_remove">Verwijderen uit Bibliotheek</string> <string name="library_in">In Bibliotheek</string> <string name="xbox_filter_show">Weergeven</string> + <string name="itch_collections">Collecties</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Cloudinstellingen</string> </resources> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 8d1736c64a..3065d3644c 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3154,6 +3154,7 @@ <string name="library_remove">Usuń z biblioteki</string> <string name="library_in">W bibliotece</string> <string name="xbox_filter_show">Pokaż</string> + <string name="itch_collections">Kolekcje</string> <string name="xbox_filter_cloud">Chmura</string> <string name="stores_xbox_cloud_settings">Ustawienia chmury</string> </resources> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index f2c4bf67c5..4043426b48 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3117,6 +3117,7 @@ <string name="library_remove">Remover da Biblioteca</string> <string name="library_in">Na Biblioteca</string> <string name="xbox_filter_show">Mostrar</string> + <string name="itch_collections">Coleções</string> <string name="xbox_filter_cloud">Nuvem</string> <string name="stores_xbox_cloud_settings">Definições da nuvem</string> </resources> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 3ade72aee0..9f37ed2c7e 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3117,6 +3117,7 @@ <string name="library_remove">Remover da Biblioteca</string> <string name="library_in">Na Biblioteca</string> <string name="xbox_filter_show">Mostrar</string> + <string name="itch_collections">Coleções</string> <string name="xbox_filter_cloud">Nuvem</string> <string name="stores_xbox_cloud_settings">Configurações da nuvem</string> </resources> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 2305d87aba..ddfca2fbcd 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3117,6 +3117,7 @@ <string name="library_remove">Elimină din Bibliotecă</string> <string name="library_in">În Bibliotecă</string> <string name="xbox_filter_show">Afișează</string> + <string name="itch_collections">Colecții</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Setări cloud</string> </resources> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 9a7447b3d8..040315b9aa 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3153,6 +3153,7 @@ <string name="library_remove">Убрать из библиотеки</string> <string name="library_in">В библиотеке</string> <string name="xbox_filter_show">Показать</string> + <string name="itch_collections">Коллекции</string> <string name="xbox_filter_cloud">Облако</string> <string name="stores_xbox_cloud_settings">Настройки облака</string> </resources> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f50d90edff..8a379c5763 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3083,6 +3083,7 @@ <string name="library_remove">Ta bort från Bibliotek</string> <string name="library_in">I Bibliotek</string> <string name="xbox_filter_show">Visa</string> + <string name="itch_collections">Samlingar</string> <string name="xbox_filter_cloud">Moln</string> <string name="stores_xbox_cloud_settings">Molninställningar</string> </resources> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index ef164e4086..d572994fb8 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3058,6 +3058,7 @@ <string name="library_remove">นำออกจากไลบรารี</string> <string name="library_in">อยู่ในไลบรารี</string> <string name="xbox_filter_show">แสดง</string> + <string name="itch_collections">คอลเลกชัน</string> <string name="xbox_filter_cloud">คลาวด์</string> <string name="stores_xbox_cloud_settings">การตั้งค่าคลาวด์</string> </resources> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 3795112962..48a1113594 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3085,6 +3085,7 @@ <string name="library_remove">Kütüphane içinden kaldır</string> <string name="library_in">Kütüphane içinde</string> <string name="xbox_filter_show">Göster</string> + <string name="itch_collections">Koleksiyonlar</string> <string name="xbox_filter_cloud">Bulut</string> <string name="stores_xbox_cloud_settings">Bulut ayarları</string> </resources> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 78eef7de8d..fdc4aca60d 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3151,6 +3151,7 @@ <string name="library_remove">Прибрати з бібліотеки</string> <string name="library_in">У бібліотеці</string> <string name="xbox_filter_show">Показати</string> + <string name="itch_collections">Колекції</string> <string name="xbox_filter_cloud">Хмара</string> <string name="stores_xbox_cloud_settings">Налаштування хмари</string> </resources> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 475bef045d..cf89b0ba75 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3058,6 +3058,7 @@ <string name="library_remove">Xóa khỏi Thư viện</string> <string name="library_in">Trong Thư viện</string> <string name="xbox_filter_show">Hiển thị</string> + <string name="itch_collections">Bộ sưu tập</string> <string name="xbox_filter_cloud">Đám mây</string> <string name="stores_xbox_cloud_settings">Cài đặt đám mây</string> </resources> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2b5f4083a2..d946abc578 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3062,6 +3062,7 @@ <string name="library_remove">从游戏库移除</string> <string name="library_in">已在游戏库</string> <string name="xbox_filter_show">显示</string> + <string name="itch_collections">收藏集</string> <string name="xbox_filter_cloud">云</string> <string name="stores_xbox_cloud_settings">云设置</string> </resources> diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 54058fe19b..cfd0eea3c2 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3061,6 +3061,7 @@ <string name="library_remove">從收藏庫移除</string> <string name="library_in">已在收藏庫</string> <string name="xbox_filter_show">顯示</string> + <string name="itch_collections">收藏集</string> <string name="xbox_filter_cloud">雲端</string> <string name="stores_xbox_cloud_settings">雲端設定</string> </resources> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 88adc508f4..d5e9d93f74 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3061,6 +3061,7 @@ <string name="library_remove">從收藏庫移除</string> <string name="library_in">已在收藏庫</string> <string name="xbox_filter_show">顯示</string> + <string name="itch_collections">收藏集</string> <string name="xbox_filter_cloud">雲端</string> <string name="stores_xbox_cloud_settings">雲端設定</string> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d826e83df7..661b321f64 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3236,6 +3236,7 @@ <string name="library_remove">Remove from Library</string> <string name="library_in">In Library</string> <string name="xbox_filter_show">Show</string> + <string name="itch_collections">Collections</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Cloud settings</string> <string name="xbox_cloud_gaming" translatable="false">Xbox Cloud Gaming</string> diff --git a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchCollectionsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchCollectionsTest.kt new file mode 100644 index 0000000000..77fe2b2d71 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchCollectionsTest.kt @@ -0,0 +1,31 @@ +package com.droiddeck.launcher.stores.itch + +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class ItchCollectionsTest { + @Test fun collectionsKeepTheirIdTitleAndCount() { + val body = JSONArray() + .put(JSONObject().put("id", 8356509).put("title", "library").put("games_count", 12)) + .put(JSONObject().put("id", 7).put("title", "").put("games_count", 3)) + .put(JSONObject().put("title", "no id")) + val list = ItchCollections.parseCollections(body) + assertEquals(listOf("8356509"), list.map { it.id }) + assertEquals("library", list.single().title) + assertEquals(12, list.single().count) + } + + @Test fun collectionGamesReadBothKeyStylesAndSkipRowsWithoutAGame() { + val game = JSONObject().put("id", 99).put("title", "Celeste 64").put("url", "https://noel.itch.io/celeste64") + val snake = JSONObject().put("collection_games", JSONArray().put(JSONObject().put("game", game)).put(JSONObject().put("position", 1))) + val camel = JSONObject().put("collectionGames", JSONArray().put(JSONObject().put("game", game))) + assertEquals(listOf("noel.itch.io/celeste64"), ItchCollections.parseGames(snake).map { it.id }) + assertEquals(1, ItchCollections.parseGames(camel).size) + assertEquals(false, ItchCollections.parseGames(snake).single().owned) + assertEquals(0, ItchCollections.parseGames(JSONObject()).size) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt index 3bc153e4d2..d703d09bec 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt @@ -94,4 +94,23 @@ class LibraryEntriesTest { GameRef.parse("xbox:9NBLGGH4R315").let { assertEquals(Store.XBOX, it.store); assertEquals("9NBLGGH4R315", it.storeId) } GameRef.parse("app:nope:1").let { assertNull(it.store); assertNull(it.appId) } } + + @Test fun aCollectionKeepsItsInstalledGamesAndListsTheRestAsNotInstalled() { + val games = listOf( + Library.SteamGame(440, "Team Fortress 2", null, "Steam library"), + Library.SteamGame(-5, "Celeste", null, Library.ADDED, source = "itch", storeId = "a/celeste"), + Library.SteamGame(-6, "Other", null, Library.ADDED, source = "itch", storeId = "a/other"), + ) + val library = mapOf(Store.ITCH to listOf(owned(Store.ITCH, "a/celeste"), owned(Store.ITCH, "a/other"), owned(Store.ITCH, "b/owned"))) + val all = libraryEntries(games, library, setOf("itch:a/celeste", "itch:a/other")) + val collection = listOf(owned(Store.ITCH, "a/celeste"), owned(Store.ITCH, "b/owned"), owned(Store.ITCH, "c/new")) + val out = collectionEntries(all, collection) + assertEquals(listOf("app:-5", "app:itch:b/owned", "app:itch:c/new"), out.map { it.key }) + assertEquals(listOf(true, false, false), out.map { it.installed }) + } + + @Test fun anEmptyCollectionHidesEveryGame() { + val all = libraryEntries(listOf(Library.SteamGame(440, "Team Fortress 2", null, "Steam library")), emptyMap(), emptySet()) + assertEquals(emptyList<String>(), collectionEntries(all, emptyList()).map { it.key }) + } } diff --git a/docs/development/itch-collections.md b/docs/development/itch-collections.md new file mode 100644 index 0000000000..9a2f1419aa --- /dev/null +++ b/docs/development/itch-collections.md @@ -0,0 +1,26 @@ +# itch.io collections + +On the Library's itch tab a Collections button in the header lists the collections of the signed-in +itch account. Picking one hides every game that is not in it; the games of the collection that are not +installed show in the existing "Not installed" section, and All brings the full library back. The button +exists only while the itch chip is selected. + +## Data + +`ItchCollections` (`stores/itch/ItchCollections.kt`) asks itch with the account's API key: + +``` +GET /profile/collections -> collections[{id, title, games_count}] +GET /collections/<id>/collection-games?page=N -> collection_games[{game{...}}] +``` + +Pages are read until one comes back empty. Each game goes through `ItchLibrary.item`, the reader the +library and shelves share, so it looks the same everywhere. The selection and the loaded games live in +memory; the list is asked again whenever the itch tab opens. Counts are logged +(`itch.io: <n> collections`, `itch.io: collection <id> has <n> games`). + +## Filtering + +`collectionEntries` keeps the itch entries whose store key is in the collection, then adds the +collection games the library has no entry for as not installed ones. Their game page resolves through +`StoresState.detailItem`, which also looks at the collection games. From 9d85af75589529cc632cce2bcefca55a6c39b07a Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 15:57:57 -0400 Subject: [PATCH 109/135] fix(proton): Windows games see only the cores they are pinned to Game cores pinned the game with taskset, but Wine counts the online CPUs, so a game held to two cores still saw eight processors and sized its thread pools for them. Prototype freezes at its splash screen that way. When the session or a game profile limits the game cores, Wine now gets WINE_CPU_TOPOLOGY for exactly those cores unless the profile sets its own. --- .../overlay/usr/local/bin/droiddeck-game-env | 15 +++++++++++++++ tools/tests/test_game_environment.py | 17 +++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index c9f37a3612..49e1c4453f 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -351,6 +351,20 @@ def game_cores(env): print("droiddeck-game-env: could not use game cores %r (%s)" % (text, error), file=sys.stderr) +def cpu_topology(env): + if env.get("WINE_CPU_TOPOLOGY") or not (env.get("DROIDDECK_GAME_CORES", "").strip() or env.get("BL_GAME_CPUS", "").strip()): + return + try: + cores = sorted(os.sched_getaffinity(0)) + except OSError: + return + online = online_cores() + if not cores or set(cores) >= online or cores[-1] >= len(online): + return + env["WINE_CPU_TOPOLOGY"] = "%d:%s" % (len(cores), ",".join(map(str, cores))) + print("droiddeck-game-env: Windows sees %d cores (%s)" % (len(cores), env["WINE_CPU_TOPOLOGY"]), file=sys.stderr) + + def apply_config(env, config, app_id, fixes=None): if config.get("version") != 1: raise ValueError("unsupported environment configuration") @@ -627,6 +641,7 @@ def main(): env = vram_cap(env) env = force_ssbs(command, env) game_cores(env) + cpu_topology(env) try: xbox = runpy.run_path(str(Path(__file__).with_name("droiddeck-xbox"))) except Exception as error: diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 0bb794517c..0765644475 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -449,6 +449,23 @@ class GameEnvironmentTest(unittest.TestCase): self.assertEqual(calls, [{0, 1, 2}]) self.assertEqual(MODULE["parse_cores"]("0,2-7"), {0, 2, 3, 4, 5, 6, 7}) + def test_windows_games_see_only_the_cores_they_are_pinned_to(self): + os_mod = MODULE["os"] + online = {"online_cores": lambda: {0, 1, 2, 3, 4, 5, 6, 7}} + cases = [ + ({"BL_GAME_CPUS": "6,7"}, {6, 7}, "2:6,7"), + ({"DROIDDECK_GAME_CORES": "0-2"}, {0, 1, 2}, "3:0,1,2"), + ({"BL_GAME_CPUS": "0-7"}, set(range(8)), None), + ({}, {6, 7}, None), + ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": "4:0,1,2,3"}, {6, 7}, "4:0,1,2,3"), + ({"BL_GAME_CPUS": "9"}, {9}, None), + ] + for env, affinity, expected in cases: + with mock.patch.dict(MODULE["cpu_topology"].__globals__, online), \ + mock.patch.object(os_mod, "sched_getaffinity", return_value=affinity, create=True): + MODULE["cpu_topology"](env) + self.assertEqual(env.get("WINE_CPU_TOPOLOGY"), expected, env) + def test_caravan_sandwitch_robocop_and_cyberpunk_run_at_feature_level_12_1(self): with tempfile.TemporaryDirectory() as tmp: caravan = Path(tmp) / "Caravan SandWitch" From 43266b2923484e510e5344cabf1ea5ddec8fdd3c Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 17:36:32 -0400 Subject: [PATCH 110/135] Keep an empty WINE_CPU_TOPOLOGY from a game profile --- tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env | 2 +- tools/tests/test_game_environment.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 49e1c4453f..2ff7287859 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -352,7 +352,7 @@ def game_cores(env): def cpu_topology(env): - if env.get("WINE_CPU_TOPOLOGY") or not (env.get("DROIDDECK_GAME_CORES", "").strip() or env.get("BL_GAME_CPUS", "").strip()): + if "WINE_CPU_TOPOLOGY" in env or not (env.get("DROIDDECK_GAME_CORES", "").strip() or env.get("BL_GAME_CPUS", "").strip()): return try: cores = sorted(os.sched_getaffinity(0)) diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 0765644475..6c90be2d6d 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -458,6 +458,7 @@ class GameEnvironmentTest(unittest.TestCase): ({"BL_GAME_CPUS": "0-7"}, set(range(8)), None), ({}, {6, 7}, None), ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": "4:0,1,2,3"}, {6, 7}, "4:0,1,2,3"), + ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": ""}, {6, 7}, ""), ({"BL_GAME_CPUS": "9"}, {9}, None), ] for env, affinity, expected in cases: From 70c512693aa86f699f884d01402f7165d89e98f9 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 17:53:44 -0400 Subject: [PATCH 111/135] Set PROTON_CPU_TOPOLOGY too so Proton's per-game CPU list doesn't replace it Proton sets WINE_CPU_TOPOLOGY from its own default_cpu_limit for games like Prototype (8 cores) unless PROTON_CPU_TOPOLOGY is set, so the pinned topology never reached the game the issue was about. --- .../overlay/usr/local/bin/droiddeck-game-env | 4 ++-- tools/tests/test_game_environment.py | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 2ff7287859..80be5c7d49 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -352,7 +352,7 @@ def game_cores(env): def cpu_topology(env): - if "WINE_CPU_TOPOLOGY" in env or not (env.get("DROIDDECK_GAME_CORES", "").strip() or env.get("BL_GAME_CPUS", "").strip()): + if "WINE_CPU_TOPOLOGY" in env or "PROTON_CPU_TOPOLOGY" in env or not (env.get("DROIDDECK_GAME_CORES", "").strip() or env.get("BL_GAME_CPUS", "").strip()): return try: cores = sorted(os.sched_getaffinity(0)) @@ -361,7 +361,7 @@ def cpu_topology(env): online = online_cores() if not cores or set(cores) >= online or cores[-1] >= len(online): return - env["WINE_CPU_TOPOLOGY"] = "%d:%s" % (len(cores), ",".join(map(str, cores))) + env["WINE_CPU_TOPOLOGY"] = env["PROTON_CPU_TOPOLOGY"] = "%d:%s" % (len(cores), ",".join(map(str, cores))) print("droiddeck-game-env: Windows sees %d cores (%s)" % (len(cores), env["WINE_CPU_TOPOLOGY"]), file=sys.stderr) diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 6c90be2d6d..147ce73837 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -453,19 +453,21 @@ class GameEnvironmentTest(unittest.TestCase): os_mod = MODULE["os"] online = {"online_cores": lambda: {0, 1, 2, 3, 4, 5, 6, 7}} cases = [ - ({"BL_GAME_CPUS": "6,7"}, {6, 7}, "2:6,7"), - ({"DROIDDECK_GAME_CORES": "0-2"}, {0, 1, 2}, "3:0,1,2"), - ({"BL_GAME_CPUS": "0-7"}, set(range(8)), None), - ({}, {6, 7}, None), - ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": "4:0,1,2,3"}, {6, 7}, "4:0,1,2,3"), - ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": ""}, {6, 7}, ""), - ({"BL_GAME_CPUS": "9"}, {9}, None), + ({"BL_GAME_CPUS": "6,7"}, {6, 7}, "2:6,7", "2:6,7"), + ({"DROIDDECK_GAME_CORES": "0-2"}, {0, 1, 2}, "3:0,1,2", "3:0,1,2"), + ({"BL_GAME_CPUS": "0-7"}, set(range(8)), None, None), + ({}, {6, 7}, None, None), + ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": "4:0,1,2,3"}, {6, 7}, "4:0,1,2,3", None), + ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": ""}, {6, 7}, "", None), + ({"BL_GAME_CPUS": "6,7", "PROTON_CPU_TOPOLOGY": "1:7"}, {6, 7}, None, "1:7"), + ({"BL_GAME_CPUS": "9"}, {9}, None, None), ] - for env, affinity, expected in cases: + for env, affinity, expected, proton in cases: with mock.patch.dict(MODULE["cpu_topology"].__globals__, online), \ mock.patch.object(os_mod, "sched_getaffinity", return_value=affinity, create=True): MODULE["cpu_topology"](env) self.assertEqual(env.get("WINE_CPU_TOPOLOGY"), expected, env) + self.assertEqual(env.get("PROTON_CPU_TOPOLOGY"), proton, env) def test_caravan_sandwitch_robocop_and_cyberpunk_run_at_feature_level_12_1(self): with tempfile.TemporaryDirectory() as tmp: From 70d8fc6559c41910c8d48056987e7c52516259a5 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 18:15:46 -0400 Subject: [PATCH 112/135] Hand a profile's WINE_CPU_TOPOLOGY to Proton as well --- tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env | 8 +++++++- tools/tests/test_game_environment.py | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 80be5c7d49..8a4e26f1d3 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -352,7 +352,13 @@ def game_cores(env): def cpu_topology(env): - if "WINE_CPU_TOPOLOGY" in env or "PROTON_CPU_TOPOLOGY" in env or not (env.get("DROIDDECK_GAME_CORES", "").strip() or env.get("BL_GAME_CPUS", "").strip()): + if "PROTON_CPU_TOPOLOGY" in env: + return + if "WINE_CPU_TOPOLOGY" in env: + if env["WINE_CPU_TOPOLOGY"]: + env["PROTON_CPU_TOPOLOGY"] = env["WINE_CPU_TOPOLOGY"] + return + if not (env.get("DROIDDECK_GAME_CORES", "").strip() or env.get("BL_GAME_CPUS", "").strip()): return try: cores = sorted(os.sched_getaffinity(0)) diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 147ce73837..52c9188dd5 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -457,7 +457,8 @@ class GameEnvironmentTest(unittest.TestCase): ({"DROIDDECK_GAME_CORES": "0-2"}, {0, 1, 2}, "3:0,1,2", "3:0,1,2"), ({"BL_GAME_CPUS": "0-7"}, set(range(8)), None, None), ({}, {6, 7}, None, None), - ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": "4:0,1,2,3"}, {6, 7}, "4:0,1,2,3", None), + ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": "4:0,1,2,3"}, {6, 7}, "4:0,1,2,3", "4:0,1,2,3"), + ({"WINE_CPU_TOPOLOGY": "2:0,1"}, set(range(8)), "2:0,1", "2:0,1"), ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": ""}, {6, 7}, "", None), ({"BL_GAME_CPUS": "6,7", "PROTON_CPU_TOPOLOGY": "1:7"}, {6, 7}, None, "1:7"), ({"BL_GAME_CPUS": "9"}, {9}, None, None), From 9555cb9f650dabd79a542cebfe6239831648937f Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 19:34:22 -0400 Subject: [PATCH 113/135] fix(skate.): run ReSkate at D3D12 feature level 12_1 skate. under ReSkate crashed with an access violation in Skate.exe 12 to 60 seconds after it started at the default feature level 12_2; at 12_1 it loads San Vansterdam and plays. The rule matches Skate.exe with ReSkate.dll beside it, so it covers ReSkate started from skate.'s own Steam entry and as a non-Steam game, and a game profile can still set another level. --- README.md | 2 +- .../overlay/usr/local/bin/droiddeck-game-env | 6 ++++++ tools/tests/test_game_environment.py | 20 +++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 80958dcdab..690d76fbc4 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Compatibility and performance vary by device; hardware validation is limited. De ## Credits and licence -GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. Battle.net support is [@kayakyakr](https://github.com/kayakyakr)'s: it runs Blizzard's own Battle.net client, downloaded from Blizzard and not included, in Proton, and shows the key art from each game's [Battle.net Shop](https://shop.battle.net) page; without the Steam client its games see DroidDeck's pad as an Xbox 360 controller through `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. Its games install from Stores through Blizzard's own Agent and the local HTTP API it serves, driven the way [@barncastle](https://github.com/barncastle)'s [Battle.Net-Installer](https://github.com/barncastle/Battle.Net-Installer) drives it, with the requests described on [wowdev.wiki](https://wowdev.wiki/Agent); how other launchers find, install and start Blizzard games was read in [@mubaraknumann](https://github.com/mubaraknumann)'s [unifideck](https://github.com/mubaraknumann/unifideck), [@djmittens](https://github.com/djmittens)'s [neo-mittens](https://github.com/djmittens/neo-mittens) `bnetswitch`, [@BCD1210](https://github.com/BCD1210)'s [soju](https://github.com/BCD1210/soju) and [Lutris](https://github.com/lutris/lutris)'s `product.db` reader, without taking their code. The registry entries a GOG game's install script (`goggame-<id>.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. x86 AppImages packed with [sharun](https://github.com/VHSgunzo/sharun) by VHSgunzo (MIT) start because DroidDeck's own [FEX](https://github.com/FEX-Emu/FEX) build (MIT) puts the platform name under `AT_PLATFORM`, which sharun's [userland-execve](https://crates.io/crates/userland-execve) loader (MIT) requires; FEX filed it under `AT_BASE_PLATFORM`. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc/<pid>/mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc/<pid>/status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). Xbox games load the Windows modules of [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) runtime (LGPL-2.1-or-later), including its `wintypes.dll`, whose `ApiInformation` answer Minecraft for Windows needs to start; how Minecraft installs GameInput under Wine was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. +GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. Battle.net support is [@kayakyakr](https://github.com/kayakyakr)'s: it runs Blizzard's own Battle.net client, downloaded from Blizzard and not included, in Proton, and shows the key art from each game's [Battle.net Shop](https://shop.battle.net) page; without the Steam client its games see DroidDeck's pad as an Xbox 360 controller through `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. Its games install from Stores through Blizzard's own Agent and the local HTTP API it serves, driven the way [@barncastle](https://github.com/barncastle)'s [Battle.Net-Installer](https://github.com/barncastle/Battle.Net-Installer) drives it, with the requests described on [wowdev.wiki](https://wowdev.wiki/Agent); how other launchers find, install and start Blizzard games was read in [@mubaraknumann](https://github.com/mubaraknumann)'s [unifideck](https://github.com/mubaraknumann/unifideck), [@djmittens](https://github.com/djmittens)'s [neo-mittens](https://github.com/djmittens/neo-mittens) `bnetswitch`, [@BCD1210](https://github.com/BCD1210)'s [soju](https://github.com/BCD1210/soju) and [Lutris](https://github.com/lutris/lutris)'s `product.db` reader, without taking their code. The registry entries a GOG game's install script (`goggame-<id>.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. x86 AppImages packed with [sharun](https://github.com/VHSgunzo/sharun) by VHSgunzo (MIT) start because DroidDeck's own [FEX](https://github.com/FEX-Emu/FEX) build (MIT) puts the platform name under `AT_PLATFORM`, which sharun's [userland-execve](https://crates.io/crates/userland-execve) loader (MIT) requires; FEX filed it under `AT_BASE_PLATFORM`. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc/<pid>/mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc/<pid>/status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). Xbox games load the Windows modules of [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) runtime (LGPL-2.1-or-later), including its `wintypes.dll`, whose `ApiInformation` answer Minecraft for Windows needs to start; how Minecraft installs GameInput under Wine was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). [ReSkate](https://github.com/Dingo-Shenanigans/ReSkate) (GPL-3.0) by Dingo Shenanigans is set up with the Steam launch option from its README and starts at D3D12 feature level 12_1, as its game crashes at 12_2 here. See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. XR glasses support builds on WinNative's VITURE glasses work. VITURE protocol details were checked against [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) by [@wheaney](https://github.com/wheaney), including the VITURE protocol header it ships, [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) by [@badicsalex](https://github.com/badicsalex) and the [go-macos/iokit VITURE package](https://pkg.go.dev/github.com/go-macos/iokit/viture); the optional VITURE SDK belongs to VITURE and is not included. RayNeo support adapts [@informalTechCode](https://github.com/informalTechCode)'s [RayNeo-Air-Series-3DoF-Scaffold](https://github.com/informalTechCode/RayNeo-Air-Series-3DoF-Scaffold) (Apache-2.0) and references [@verncat](https://github.com/verncat)'s [RayNeo-Air-3S-Pro-OpenVR](https://github.com/verncat/RayNeo-Air-3S-Pro-OpenVR) (MIT) and [Monado](https://gitlab.freedesktop.org/monado/monado) (BSL-1.0); see [docs/third-party/rayneo](docs/third-party/rayneo/README.md). XREAL 1S support references [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) and [xrealOneDeviceKit](https://github.com/wheaney/xrealOneDeviceKit) by @wheaney, [xreal_one_driver](https://github.com/rohitsangwan01/xreal_one_driver) by [@rohitsangwan01](https://github.com/rohitsangwan01) (MIT) and [xr-tools](https://github.com/0xcaff/xr-tools) by [@0xcaff](https://github.com/0xcaff). Rokid support follows the Rokid protocol notes in [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) and @badicsalex's [Void Computing write-ups](https://voidcomputing.hu/blog/worse-better-prettier/), and [Monado](https://gitlab.freedesktop.org/monado/monado)'s Rokid driver. The REDMAGIC glasses-display findings draw on [@mekhontsev](https://github.com/mekhontsev)'s [MagicDesk investigation](https://github.com/mekhontsev/magicdesk/blob/main/docs/xr-resolution-fix.md) and [@Coding-BR](https://github.com/Coding-BR)'s [decompiled Nubia kernel](https://github.com/Coding-BR/android_kernel_nubia_sm8850_qwjujube). VITURE, RayNeo, XREAL, Rokid and REDMAGIC are trademarks of their owners; this project is not affiliated with them. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 8a4e26f1d3..288c8d57c2 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -151,6 +151,12 @@ def robocop_rogue_city_feature_level(game): return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "RoboCop: Rogue City: D3D12 feature level 12_1" +@fix +def reskate_feature_level(game): + if "skate.exe" in game.files and "reskate.dll" in game.files: + return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "ReSkate (skate.): D3D12 feature level 12_1" + + @fix def cyberpunk_feature_level(game): if game.stem == "cyberpunk2077" or ( diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 52c9188dd5..0b1bee1753 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -470,6 +470,26 @@ class GameEnvironmentTest(unittest.TestCase): self.assertEqual(env.get("WINE_CPU_TOPOLOGY"), expected, env) self.assertEqual(env.get("PROTON_CPU_TOPOLOGY"), proton, env) + def test_reskate_runs_at_feature_level_12_1(self): + with tempfile.TemporaryDirectory() as tmp: + reskate = Path(tmp) / "ReSkate" + reskate.mkdir() + for name in ("Skate.exe", "ReSkate.dll", "ReSkateLauncher.exe", "EAAntiCheat.GameServiceLauncher.exe"): + (reskate / name).touch() + for exe in ("ReSkateLauncher.exe", "Skate.exe"): + env, extra, notes = MODULE["engine_fixes"](str(reskate / exe), []) + self.assertEqual((env, extra), ({"VKD3D_FEATURE_LEVEL": "12_1"}, []), exe) + self.assertTrue(notes) + config = {"version": 1, "shared": {"VKD3D_FEATURE_LEVEL": "12_2"}} + self.assertEqual(MODULE["apply_config"]({}, config, "3354750", env)["VKD3D_FEATURE_LEVEL"], "12_1") + config["games"] = {"3354750": {"VKD3D_FEATURE_LEVEL": "12_2"}} + self.assertEqual(MODULE["apply_config"]({}, config, "3354750", env)["VKD3D_FEATURE_LEVEL"], "12_2") + skate = Path(tmp) / "Skate" + skate.mkdir() + for name in ("Skate.exe", "EAAntiCheat.GameServiceLauncher.exe"): + (skate / name).touch() + self.assertEqual(MODULE["engine_fixes"](str(skate / "EAAntiCheat.GameServiceLauncher.exe"), [])[:2], ({}, [])) + def test_caravan_sandwitch_robocop_and_cyberpunk_run_at_feature_level_12_1(self): with tempfile.TemporaryDirectory() as tmp: caravan = Path(tmp) / "Caravan SandWitch" From 916a39585f75c61282e7f1a84eed58593b14c66d Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 17:35:47 -0400 Subject: [PATCH 114/135] Decode Remote Play streams on the arm64 Steam client Steam's arm64 streaming_client only decodes through a V4L2 stateful decoder and libdrm dumb buffers, neither of which exist on Android, so streams from a PC never showed a picture. The preload now offers it a /dev/video-dec0 and a libdrm stand-in backed by dma-heap buffers, and each frame is decoded by the app's MediaCodec (Qualcomm low-latency mode) over the encoder socket, falling back to the FFmpeg in Steam's runtime. --- README.md | 2 + app/src/main/cpp/venc/venc_proto.h | 28 +- app/src/main/cpp/venc/venc_server.cpp | 239 +++++++ tools/linuxfs/preload/netif.c | 2 + tools/linuxfs/preload/ntsync.c | 2 + tools/linuxfs/preload/opens.c | 3 + tools/linuxfs/preload/vdec.c | 973 ++++++++++++++++++++++++++ tools/linuxfs/preload/venc.c | 5 + tools/tests/test_vdec_emulator.py | 258 +++++++ 9 files changed, 1511 insertions(+), 1 deletion(-) create mode 100644 tools/linuxfs/preload/vdec.c create mode 100644 tools/tests/test_vdec_emulator.py diff --git a/README.md b/README.md index 690d76fbc4..8290b3ef6a 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,8 @@ Camera hand tracking runs Google's [MediaPipe](https://github.com/google-ai-edge The Store installs and runs apps with [Flatpak](https://github.com/flatpak/flatpak) (LGPL-2.1). Its sandbox goes through DroidDeck's own bubblewrap shim, which follows how Flatpak hands bwrap its environment. Chromium and Electron apps from Flathub start their browser processes through [zypak](https://github.com/refi64/zypak) by [@refi64](https://github.com/refi64) (BSD-3-Clause); its source was read to see that it always spawns them through Flatpak's spawn portal, which is why DroidDeck starts them directly without Chromium's sandbox instead. +Remote Play from a PC to the arm64 Steam client goes through a stand-in for the V4L2 decoder and the libdrm dumb buffers that Steam's `streaming_client` expects: each frame is decoded by Android's MediaCodec through the app, or by the [FFmpeg](https://ffmpeg.org) (LGPL-2.1-or-later) that ships in Steam's own runtime, into dma-heap buffers that its Vulkan renderer imports. The Qualcomm low-latency decoder settings follow [Moonlight](https://github.com/moonlight-stream/moonlight-android) (GPL-3.0). + Steam's Browse buttons open a GTK 3 file chooser through PyGObject (LGPL-2.1-or-later). It runs under Steam's own `reaper` with Steam's app ID, which [gamescope](https://github.com/ValveSoftware/gamescope) (BSD-2-Clause) reads from the process tree (`GetAppIdFromReaper` in `src/Utils/Process.cpp`) to show it over Steam. Black Ops III and Dark Souls Remastered start without [umu-protonfixes](https://github.com/Open-Wine-Components/umu-protonfixes) (BSD-2-Clause), whose fixes for them (`311210.py` sets ALSA audio, `570940.py` installs VC++ 2017) fail under ARM64 Proton. diff --git a/app/src/main/cpp/venc/venc_proto.h b/app/src/main/cpp/venc/venc_proto.h index 9622577119..47fb6ef241 100644 --- a/app/src/main/cpp/venc/venc_proto.h +++ b/app/src/main/cpp/venc/venc_proto.h @@ -9,7 +9,7 @@ #define VENC_MAX_BUFFERS 16 -enum venc_msg { VENC_CONFIG = 1, VENC_FRAME = 2, VENC_DONE = 3, VENC_BITRATE = 4, VENC_TOUCH = 5 }; +enum venc_msg { VENC_CONFIG = 1, VENC_FRAME = 2, VENC_DONE = 3, VENC_BITRATE = 4, VENC_TOUCH = 5, VDEC_CONFIG = 6, VDEC_CAPTURE = 7, VDEC_PACKET = 8, VDEC_RESULT = 9 }; enum venc_touch_action { VENC_TOUCH_DOWN = 0, VENC_TOUCH_MOVE = 1, VENC_TOUCH_UP = 2 }; enum venc_codec { VENC_H264 = 0, VENC_HEVC = 1 }; @@ -52,4 +52,30 @@ struct venc_touch { uint32_t x, y; }; +struct vdec_config { + uint32_t type; + uint32_t codec; + uint32_t width, height; + uint32_t stride, rows; + uint32_t bitstreams, bitstream_size; +}; + +struct vdec_capture { + uint32_t type; + uint32_t index; + uint32_t size; +}; + +struct vdec_packet { + uint32_t type; + uint32_t input, bytes, capture; + int64_t pts_us; +}; + +struct vdec_result { + uint32_t type; + int32_t status; + uint32_t frame; +}; + #endif diff --git a/app/src/main/cpp/venc/venc_server.cpp b/app/src/main/cpp/venc/venc_server.cpp index be484c898d..17a5d7eed1 100644 --- a/app/src/main/cpp/venc/venc_server.cpp +++ b/app/src/main/cpp/venc/venc_server.cpp @@ -3,6 +3,7 @@ #include <jni.h> #include <media/NdkMediaCodec.h> #include <media/NdkMediaFormat.h> +#include <sys/ioctl.h> #include <sys/mman.h> #include <sys/socket.h> #include <sys/stat.h> @@ -11,6 +12,7 @@ #include <algorithm> #include <atomic> +#include <chrono> #include <cerrno> #include <cstring> #include <string> @@ -45,6 +47,218 @@ int32_t avc_profile(int32_t v4l2) { } } +struct DmaBufSync { + uint64_t flags; +}; +constexpr unsigned long kDmaBufIoctlSync = _IOW('b', 0, DmaBufSync); +constexpr uint64_t kDmaBufSyncWrite = 2, kDmaBufSyncStart = 0, kDmaBufSyncEnd = 4; +constexpr int32_t kColorFormatYuv420Planar = 19; + +class Decoder { +public: + ~Decoder() { release(); } + + void release() { + if (codec_) { + AMediaCodec_stop(codec_); + AMediaCodec_delete(codec_); + codec_ = nullptr; + } + if (bitstream_) munmap((void *)bitstream_, bitstream_size_); + bitstream_ = nullptr; + for (auto &c : captures_) drop(c); + } + + bool configure(const vdec_config &c, int fd) { + release(); + if (c.width < 16 || c.height < 16 || c.stride < c.width || c.rows < c.height || c.bitstreams == 0 || + c.bitstreams > VENC_MAX_BUFFERS || c.bitstream_size == 0) { + LOG("bad decoder config: %ux%u stride %u rows %u, %u bitstreams", c.width, c.height, c.stride, c.rows, + c.bitstreams); + return false; + } + bitstream_size_ = (size_t)c.bitstreams * c.bitstream_size; + void *p = mmap(nullptr, bitstream_size_, PROT_READ, MAP_SHARED, fd, 0); + if (p == MAP_FAILED) { + LOG("could not map the bitstream buffers: %s", strerror(errno)); + return false; + } + bitstream_ = (const uint8_t *)p; + config_ = c; + codec_ = create(c, true); + if (!codec_) codec_ = create(c, false); + if (!codec_) { + LOG("no %s decoder for %ux%u", c.codec == VENC_HEVC ? "HEVC" : "H.264", c.width, c.height); + release(); + return false; + } + src_stride_ = (int32_t)c.width; + src_rows_ = (int32_t)c.height; + src_width_ = (int32_t)c.width; + src_height_ = (int32_t)c.height; + src_planar_ = false; + shown_ = false; + using GetName = media_status_t (*)(AMediaCodec *, char **); + using ReleaseName = void (*)(AMediaCodec *, char *); + static auto get_name = (GetName)dlsym(RTLD_DEFAULT, "AMediaCodec_getName"); + static auto release_name = (ReleaseName)dlsym(RTLD_DEFAULT, "AMediaCodec_releaseName"); + char *name = nullptr; + if (get_name && get_name(codec_, &name) != AMEDIA_OK) name = nullptr; + LOG("decoding %s %ux%u with %s", c.codec == VENC_HEVC ? "HEVC" : "H.264", c.width, c.height, + name ? name : "MediaCodec"); + if (name && release_name) release_name(codec_, name); + return true; + } + + void capture(const vdec_capture &c, int fd) { + if (c.index >= VENC_MAX_BUFFERS) { + close(fd); + return; + } + Capture &cap = captures_[c.index]; + drop(cap); + void *p = mmap(nullptr, c.size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (p == MAP_FAILED) { + LOG("could not map capture buffer %u: %s", c.index, strerror(errno)); + close(fd); + return; + } + cap = {fd, (uint8_t *)p, c.size}; + } + + bool decode(const vdec_packet &p, bool *frame) { + *frame = false; + if (!codec_ || p.capture >= VENC_MAX_BUFFERS || !captures_[p.capture].data || p.input >= config_.bitstreams || + p.bytes == 0 || p.bytes > config_.bitstream_size) + return false; + auto start = std::chrono::steady_clock::now(); + ssize_t in = AMediaCodec_dequeueInputBuffer(codec_, 20000); + if (in < 0) return false; + size_t capacity = 0; + uint8_t *dst = AMediaCodec_getInputBuffer(codec_, (size_t)in, &capacity); + if (!dst || capacity < p.bytes) { + AMediaCodec_queueInputBuffer(codec_, (size_t)in, 0, 0, 0, 0); + return false; + } + memcpy(dst, bitstream_ + (size_t)p.input * config_.bitstream_size, p.bytes); + if (AMediaCodec_queueInputBuffer(codec_, (size_t)in, 0, p.bytes, (uint64_t)std::max<int64_t>(p.pts_us, 0), 0) != + AMEDIA_OK) + return false; + auto wait = std::chrono::milliseconds(shown_ ? 25 : 250); + while (std::chrono::steady_clock::now() - start < wait) { + AMediaCodecBufferInfo info; + ssize_t o = AMediaCodec_dequeueOutputBuffer(codec_, &info, 2000); + if (o == AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED) { + read_format(); + continue; + } + if (o < 0) continue; + size_t size = 0; + uint8_t *data = AMediaCodec_getOutputBuffer(codec_, (size_t)o, &size); + if (data && info.size > 0 && (size_t)info.offset + (size_t)info.size <= size) + *frame = copy(data + info.offset, (size_t)info.size, captures_[p.capture]) || *frame; + AMediaCodec_releaseOutputBuffer(codec_, (size_t)o, false); + if (info.presentationTimeUs >= p.pts_us) break; + } + shown_ = shown_ || *frame; + return true; + } + +private: + struct Capture { + int fd = -1; + uint8_t *data = nullptr; + size_t size = 0; + }; + + static void drop(Capture &c) { + if (c.data) munmap(c.data, c.size); + if (c.fd >= 0) close(c.fd); + c = Capture(); + } + + AMediaCodec *create(const vdec_config &c, bool low_latency) { + const char *mime = c.codec == VENC_HEVC ? "video/hevc" : "video/avc"; + AMediaCodec *codec = AMediaCodec_createDecoderByType(mime); + if (!codec) return nullptr; + AMediaFormat *f = AMediaFormat_new(); + AMediaFormat_setString(f, AMEDIAFORMAT_KEY_MIME, mime); + AMediaFormat_setInt32(f, AMEDIAFORMAT_KEY_WIDTH, (int32_t)c.width); + AMediaFormat_setInt32(f, AMEDIAFORMAT_KEY_HEIGHT, (int32_t)c.height); + AMediaFormat_setInt32(f, AMEDIAFORMAT_KEY_COLOR_FORMAT, kColorFormatYuv420SemiPlanar); + AMediaFormat_setInt32(f, AMEDIAFORMAT_KEY_MAX_INPUT_SIZE, (int32_t)c.bitstream_size); + if (low_latency) { + AMediaFormat_setInt32(f, "low-latency", 1); + AMediaFormat_setInt32(f, "vendor.qti-ext-dec-low-latency.enable", 1); + AMediaFormat_setInt32(f, "vendor.qti-ext-dec-picture-order.enable", 1); + AMediaFormat_setInt32(f, "priority", 0); + AMediaFormat_setFloat(f, "operating-rate", 120.0f); + } + media_status_t s = AMediaCodec_configure(codec, f, nullptr, nullptr, 0); + AMediaFormat_delete(f); + if (s == AMEDIA_OK) s = AMediaCodec_start(codec); + if (s != AMEDIA_OK) { + AMediaCodec_delete(codec); + return nullptr; + } + return codec; + } + + void read_format() { + AMediaFormat *f = AMediaCodec_getOutputFormat(codec_); + if (!f) return; + int32_t v; + if (AMediaFormat_getInt32(f, AMEDIAFORMAT_KEY_WIDTH, &v) && v > 0) src_width_ = v; + if (AMediaFormat_getInt32(f, AMEDIAFORMAT_KEY_HEIGHT, &v) && v > 0) src_height_ = v; + src_stride_ = AMediaFormat_getInt32(f, "stride", &v) && v >= src_width_ ? v : src_width_; + src_rows_ = AMediaFormat_getInt32(f, "slice-height", &v) && v >= src_height_ ? v : src_height_; + src_planar_ = AMediaFormat_getInt32(f, AMEDIAFORMAT_KEY_COLOR_FORMAT, &v) && v == kColorFormatYuv420Planar; + LOG("decoder output %dx%d stride %d rows %d %s", src_width_, src_height_, src_stride_, src_rows_, + src_planar_ ? "planar" : "semi-planar"); + AMediaFormat_delete(f); + } + + bool copy(const uint8_t *src, size_t size, const Capture &cap) { + size_t luma = (size_t)src_stride_ * src_rows_; + size_t chroma = src_planar_ ? 2 * (size_t)(src_stride_ / 2) * (src_rows_ / 2) : (size_t)src_stride_ * (src_rows_ / 2); + if (size < luma + chroma) return false; + uint32_t w = std::min<uint32_t>((uint32_t)src_width_, config_.stride); + uint32_t h = std::min<uint32_t>((uint32_t)src_height_, config_.rows); + if ((size_t)config_.stride * config_.rows * 3 / 2 > cap.size) return false; + DmaBufSync sync = {kDmaBufSyncStart | kDmaBufSyncWrite}; + ioctl(cap.fd, kDmaBufIoctlSync, &sync); + uint8_t *y = cap.data, *uv = cap.data + (size_t)config_.stride * config_.rows; + for (uint32_t row = 0; row < h; row++) + memcpy(y + (size_t)row * config_.stride, src + (size_t)row * src_stride_, w); + const uint8_t *su = src + luma; + for (uint32_t row = 0; row < h / 2; row++) { + uint8_t *d = uv + (size_t)row * config_.stride; + if (!src_planar_) { + memcpy(d, su + (size_t)row * src_stride_, w & ~1u); + continue; + } + const uint8_t *u = su + (size_t)row * (src_stride_ / 2); + const uint8_t *vv = su + (size_t)(src_stride_ / 2) * (src_rows_ / 2) + (size_t)row * (src_stride_ / 2); + for (uint32_t x = 0; x < w / 2; x++) { + d[2 * x] = u[x]; + d[2 * x + 1] = vv[x]; + } + } + sync.flags = kDmaBufSyncEnd | kDmaBufSyncWrite; + ioctl(cap.fd, kDmaBufIoctlSync, &sync); + return true; + } + + AMediaCodec *codec_ = nullptr; + vdec_config config_ = {}; + const uint8_t *bitstream_ = nullptr; + size_t bitstream_size_ = 0; + Capture captures_[VENC_MAX_BUFFERS]; + int32_t src_width_ = 0, src_height_ = 0, src_stride_ = 0, src_rows_ = 0; + bool src_planar_ = false; + bool shown_ = false; +}; + class Session { public: explicit Session(int fd) : fd_(fd) {} @@ -85,6 +299,24 @@ public: memcpy(&b, buf, sizeof b); set_bitrate(b.bitrate); for (int i = 0; i < nfds; i++) close(fds[i]); + } else if (type == VDEC_CONFIG && n == (ssize_t)sizeof(vdec_config)) { + vdec_config c; + memcpy(&c, buf, sizeof c); + bool ok = nfds == 1 && decoder_.configure(c, fds[0]); + for (int i = 0; i < nfds; i++) close(fds[i]); + decoded(ok ? 0 : -1, false); + } else if (type == VDEC_CAPTURE && n == (ssize_t)sizeof(vdec_capture)) { + vdec_capture c; + memcpy(&c, buf, sizeof c); + if (nfds == 1) decoder_.capture(c, fds[0]); + else for (int i = 0; i < nfds; i++) close(fds[i]); + } else if (type == VDEC_PACKET && n == (ssize_t)sizeof(vdec_packet)) { + vdec_packet p; + memcpy(&p, buf, sizeof p); + bool frame = false; + bool ok = decoder_.decode(p, &frame); + for (int i = 0; i < nfds; i++) close(fds[i]); + decoded(ok ? 0 : -1, frame); } else { LOG("unexpected message %u of %zd bytes; closing", type, n); for (int i = 0; i < nfds; i++) close(fds[i]); @@ -117,7 +349,13 @@ private: send(fd_, &d, sizeof d, MSG_NOSIGNAL); } + void decoded(int32_t status, bool frame) { + vdec_result r = {VDEC_RESULT, status, frame ? 1u : 0u}; + send(fd_, &r, sizeof r, MSG_NOSIGNAL); + } + void release() { + decoder_.release(); if (codec_) { AMediaCodec_stop(codec_); AMediaCodec_delete(codec_); @@ -292,6 +530,7 @@ private: int32_t dst_stride_ = 0, dst_rows_ = 0; std::vector<Mapping> inputs_, outputs_; std::vector<uint8_t> header_; + Decoder decoder_; }; std::atomic<int> g_listener{-1}; diff --git a/tools/linuxfs/preload/netif.c b/tools/linuxfs/preload/netif.c index 1782d0f0d1..872a877e11 100644 --- a/tools/linuxfs/preload/netif.c +++ b/tools/linuxfs/preload/netif.c @@ -407,6 +407,7 @@ int bl_kgsl_poll(int (*real)(int, unsigned long, void *), int fd, unsigned long int bl_ntsync_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); int bl_drm_gem_close(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); int bl_venc_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); +int bl_vdec_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); int bl_winebus_rumble_ioctl(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, void *caller, int *rc) __attribute__((visibility("hidden"))); int bl_writewatch_ioctl(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, @@ -423,6 +424,7 @@ int ioctl(int fd, unsigned long request, ...) { int rc; if (bl_ntsync_ioctl(fd, request, arg, &rc)) return rc; if (bl_venc_ioctl(fd, request, arg, &rc)) return rc; + if (bl_vdec_ioctl(fd, request, arg, &rc)) return rc; if (bl_drm_gem_close(fd, request, arg, &rc)) return rc; if (real == NULL) real = (ioctl_fn) dlsym(RTLD_NEXT, "ioctl"); if (bl_winebus_rumble_ioctl(real, fd, request, arg, __builtin_return_address(0), &rc)) return rc; diff --git a/tools/linuxfs/preload/ntsync.c b/tools/linuxfs/preload/ntsync.c index d49bb42b74..4fa0d6c2c5 100644 --- a/tools/linuxfs/preload/ntsync.c +++ b/tools/linuxfs/preload/ntsync.c @@ -1459,10 +1459,12 @@ ssize_t recvmsg(int fd, struct msghdr *msg, int flags) { void bl_fsync_fds_closed(unsigned int first, unsigned int last) __attribute__((visibility("hidden"))); void bl_venc_closed(int fd) __attribute__((visibility("hidden"))); +void bl_vdec_closed(int fd) __attribute__((visibility("hidden"))); int close(int fd) { if (fd >= 0) bl_fsync_fds_closed((unsigned int)fd, (unsigned int)fd); bl_venc_closed(fd); + bl_vdec_closed(fd); uint64_t *t = __atomic_load_n(&ns_fdt, __ATOMIC_ACQUIRE); if (t && fd >= 0 && fd < NS_FDS && __atomic_load_n(&t[fd], __ATOMIC_ACQUIRE)) ns_forget(fd); return ns_close_fd(fd); diff --git a/tools/linuxfs/preload/opens.c b/tools/linuxfs/preload/opens.c index 269f013913..332f9d89a5 100644 --- a/tools/linuxfs/preload/opens.c +++ b/tools/linuxfs/preload/opens.c @@ -15,6 +15,7 @@ int bl_status_without_tracer(const char *path, int flags, const void *caller) __ int bl_writable_retry(int dirfd, const char *path, int flags) __attribute__((visibility("hidden"))); int bl_ntsync_open(const char *path, int flags) __attribute__((visibility("hidden"))); int bl_venc_open(const char *path, int flags) __attribute__((visibility("hidden"))); +int bl_vdec_open(const char *path, int flags) __attribute__((visibility("hidden"))); int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, int (*real)(int, const char *, int, mode_t)) __attribute__((visibility("hidden"))); @@ -55,6 +56,7 @@ int open(const char *path, int flags, ...) { if ((fd = bl_status_without_tracer(path, flags, __builtin_return_address(0))) >= 0) return fd; if ((fd = bl_ntsync_open(path, flags)) != -2) return fd; if ((fd = bl_venc_open(path, flags)) != -2) return fd; + if ((fd = bl_vdec_open(path, flags)) != -2) return fd; if (real_open == NULL) real_open = dlsym(RTLD_NEXT, "open"); if (real_open == NULL) { errno = ENOSYS; @@ -81,6 +83,7 @@ int openat(int dirfd, const char *path, int flags, ...) { if ((fd = bl_status_without_tracer(path, flags, __builtin_return_address(0))) >= 0) return fd; if ((fd = bl_ntsync_open(path, flags)) != -2) return fd; if ((fd = bl_venc_open(path, flags)) != -2) return fd; + if ((fd = bl_vdec_open(path, flags)) != -2) return fd; if (real_openat == NULL) real_openat = dlsym(RTLD_NEXT, "openat"); if (real_openat == NULL) { errno = ENOSYS; diff --git a/tools/linuxfs/preload/vdec.c b/tools/linuxfs/preload/vdec.c new file mode 100644 index 0000000000..4606563611 --- /dev/null +++ b/tools/linuxfs/preload/vdec.c @@ -0,0 +1,973 @@ +#define _GNU_SOURCE +#include <dlfcn.h> +#include <errno.h> +#include <poll.h> +#include <stddef.h> + +#if defined(__aarch64__) || defined(BL_VDEC_ANY_ARCH) + +#include <fcntl.h> +#include <linux/videodev2.h> +#include <pthread.h> +#include <stdarg.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/ioctl.h> +#include <sys/mman.h> +#include <sys/socket.h> +#include <sys/stat.h> +#include <time.h> +#include <unistd.h> + +#include "../../../app/src/main/cpp/venc/venc_proto.h" + +#define VDEC_DEVICE "/dev/video-dec0" +#define VDEC_INSTANCES 4 +#define VDEC_BUFFERS 16 +#define VDEC_BITSTREAM_SIZE (4u << 20) +#define VDEC_PADDING 64 +#define VDEC_DUMB 64 + +struct vd_dma_heap_alloc { + uint64_t len; + uint32_t fd; + uint32_t fd_flags; + uint64_t heap_flags; +}; +#define VD_DMA_HEAP_IOCTL_ALLOC _IOWR('H', 0x0, struct vd_dma_heap_alloc) + +struct vd_dma_buf_sync { + uint64_t flags; +}; +#define VD_DMA_BUF_SYNC_WRITE 2u +#define VD_DMA_BUF_SYNC_START 0u +#define VD_DMA_BUF_SYNC_END 4u +#define VD_DMA_BUF_IOCTL_SYNC _IOW('b', 0, struct vd_dma_buf_sync) + +struct vd_create_dumb { + uint32_t height, width, bpp, flags, handle, pitch; + uint64_t size; +}; +struct vd_destroy_dumb { + uint32_t handle; +}; +struct vd_prime_handle { + uint32_t handle, flags; + int32_t fd; +}; +#define VD_IOCTL_MODE_CREATE_DUMB _IOWR('d', 0xB2, struct vd_create_dumb) +#define VD_IOCTL_MODE_DESTROY_DUMB _IOWR('d', 0xB4, struct vd_destroy_dumb) +#define VD_IOCTL_PRIME_HANDLE_TO_FD _IOWR('d', 0x2d, struct vd_prime_handle) + +struct vd_mode_info { + uint32_t clock; + uint16_t hdisplay, hsync_start, hsync_end, htotal, hskew; + uint16_t vdisplay, vsync_start, vsync_end, vtotal, vscan; + uint32_t vrefresh, flags, type; + char name[32]; +}; +struct vd_res { + int count_fbs; + uint32_t *fbs; + int count_crtcs; + uint32_t *crtcs; + int count_connectors; + uint32_t *connectors; + int count_encoders; + uint32_t *encoders; + uint32_t min_width, max_width, min_height, max_height; +}; +struct vd_connector { + uint32_t connector_id, encoder_id, connector_type, connector_type_id; + int connection; + uint32_t mm_width, mm_height; + int subpixel; + int count_modes; + struct vd_mode_info *modes; + int count_props; + uint32_t *props; + uint64_t *prop_values; + int count_encoders; + uint32_t *encoders; +}; +struct vd_encoder { + uint32_t encoder_id, encoder_type, crtc_id, possible_crtcs, possible_clones; +}; +struct vd_crtc { + uint32_t crtc_id, buffer_id, x, y, width, height; + int mode_valid; + struct vd_mode_info mode; + int gamma_size; +}; +struct vd_device { + char **nodes; + int available_nodes; + int bustype; + void *businfo; + void *deviceinfo; +}; + +struct vd_capture { + int fd; + ino_t ino; + uint8_t *map; + size_t len; +}; + +struct vd_done { + uint32_t index; + struct timeval timestamp; +}; + +struct vdec { + int used, fd; + uint32_t fourcc, width, height; + uint32_t cap_width, cap_height, bpl, cap_size; + uint8_t *bitstream; + uint32_t out_count; + uint32_t out_done[VDEC_BUFFERS], n_out_done; + struct vd_capture cap[VDEC_BUFFERS]; + uint32_t cap_count; + uint32_t cap_queue[VDEC_BUFFERS], n_cap_queue; + struct vd_done cap_done[VDEC_BUFFERS]; + uint32_t n_cap_done; + int out_on, cap_on; + int sock, hw, hw_failed; + int64_t pts; + void *ctx, *packet, *frame; + uint8_t *packet_data; + size_t packet_capacity; + int last; + uint32_t frames, slow; + double decode_ms; +}; + +static struct { + void *(*find_decoder_by_name)(const char *); + void *(*alloc_context3)(const void *); + int (*open2)(void *, const void *, void **); + void (*free_context)(void **); + int (*send_packet)(void *, const void *); + int (*receive_frame)(void *, void *); + void (*flush_buffers)(void *); + void *(*packet_alloc)(void); + void (*packet_free)(void **); + void *(*frame_alloc)(void); + void (*frame_free)(void **); + void (*frame_unref)(void *); + int (*dict_set)(void **, const char *, const char *, int); + void (*dict_free)(void **); + const char *(*pix_fmt_name)(int); +} av; + +static pthread_mutex_t vd_lock = PTHREAD_MUTEX_INITIALIZER; +static struct vdec vd_all[VDEC_INSTANCES]; +static int vd_open_count; +static int vd_state; +static int vd_ffmpeg; +static int vd_heap = -1; +static int vd_dumb_fd[VDEC_DUMB]; +static char vd_drm_handle; + +static void vd_log(const char *fmt, ...) __attribute__((format(printf, 1, 2))); +static void vd_log(const char *fmt, ...) { + va_list ap; + char line[256]; + va_start(ap, fmt); + int n = vsnprintf(line, sizeof line - 1, fmt, ap); + va_end(ap); + if (n < 0) return; + if (n > (int)sizeof line - 2) n = sizeof line - 2; + line[n++] = '\n'; + if (write(2, "droiddeck-vdec: ", 16) < 0 || write(2, line, n) < 0) return; +} + +static int vd_load_ffmpeg(void) { + void *codec = dlopen("libavcodec.so.62", RTLD_LAZY | RTLD_LOCAL); + void *util = codec ? dlopen("libavutil.so.60", RTLD_LAZY | RTLD_LOCAL) : NULL; + if (codec == NULL || util == NULL) { + vd_log("FFmpeg 8 is not available (%s), Remote Play decoding stays off", dlerror()); + return 0; + } +#define VD_SYM(lib, field, name) \ + if ((*(void **)&av.field = dlsym(lib, name)) == NULL) { \ + vd_log("FFmpeg has no %s, Remote Play decoding stays off", name); \ + return 0; \ + } + VD_SYM(codec, find_decoder_by_name, "avcodec_find_decoder_by_name") + VD_SYM(codec, alloc_context3, "avcodec_alloc_context3") + VD_SYM(codec, open2, "avcodec_open2") + VD_SYM(codec, free_context, "avcodec_free_context") + VD_SYM(codec, send_packet, "avcodec_send_packet") + VD_SYM(codec, receive_frame, "avcodec_receive_frame") + VD_SYM(codec, flush_buffers, "avcodec_flush_buffers") + VD_SYM(codec, packet_alloc, "av_packet_alloc") + VD_SYM(codec, packet_free, "av_packet_free") + VD_SYM(util, frame_alloc, "av_frame_alloc") + VD_SYM(util, frame_free, "av_frame_free") + VD_SYM(util, frame_unref, "av_frame_unref") + VD_SYM(util, dict_set, "av_dict_set") + VD_SYM(util, dict_free, "av_dict_free") + VD_SYM(util, pix_fmt_name, "av_get_pix_fmt_name") +#undef VD_SYM + return 1; +} + +static int vd_have_ffmpeg(void) { + if (vd_ffmpeg == 0) vd_ffmpeg = vd_load_ffmpeg() ? 1 : -1; + return vd_ffmpeg > 0; +} + +__attribute__((visibility("hidden"))) int bl_venc_connect(void); + +static int vd_enabled(void) { + pthread_mutex_lock(&vd_lock); + if (vd_state == 0) { + const char *flag = getenv("BL_REMOTE_PLAY_DECODE"), *socket = getenv("BL_VENC_SOCKET"); + vd_state = -1; + if (strcmp(program_invocation_short_name, "streaming_client") == 0 && (flag == NULL || strcmp(flag, "0") != 0)) { + vd_heap = open("/dev/dma_heap/system", O_RDONLY | O_CLOEXEC); + if (vd_heap < 0) vd_log("no /dev/dma_heap/system (%s), Remote Play decoding stays off", strerror(errno)); + else if ((socket && *socket) || vd_have_ffmpeg()) vd_state = 1; + for (int i = 0; i < VDEC_DUMB; i++) vd_dumb_fd[i] = -1; + } + } + int on = vd_state > 0; + pthread_mutex_unlock(&vd_lock); + return on; +} + +static struct vdec *vd_find(int fd) { + if (fd < 0 || __atomic_load_n(&vd_open_count, __ATOMIC_ACQUIRE) == 0) return NULL; + for (int i = 0; i < VDEC_INSTANCES; i++) if (vd_all[i].used && vd_all[i].fd == fd) return &vd_all[i]; + return NULL; +} + +__attribute__((visibility("hidden"))) int bl_vdec_open(const char *path, int flags) { + (void)flags; + if (path == NULL || strcmp(path, VDEC_DEVICE) != 0 || !vd_enabled()) return -2; + int fd = memfd_create("droiddeck-vdec", 0); + if (fd < 0) return -1; + pthread_mutex_lock(&vd_lock); + struct vdec *v = NULL; + for (int i = 0; i < VDEC_INSTANCES && v == NULL; i++) if (!vd_all[i].used) v = &vd_all[i]; + if (v == NULL) { + pthread_mutex_unlock(&vd_lock); + close(fd); + errno = EBUSY; + return -1; + } + memset(v, 0, sizeof *v); + v->used = 1; + v->fd = fd; + v->fourcc = V4L2_PIX_FMT_H264; + v->last = -1; + v->sock = -1; + for (int i = 0; i < VDEC_BUFFERS; i++) v->cap[i].fd = -1; + __atomic_add_fetch(&vd_open_count, 1, __ATOMIC_RELEASE); + pthread_mutex_unlock(&vd_lock); + return fd; +} + +static void vd_close_decoder(struct vdec *v) { + if (v->frames) { + vd_log("%u frames, %.1f ms each on average, %u over 25 ms", v->frames, v->decode_ms / v->frames, v->slow); + } + if (v->sock >= 0) close(v->sock); + v->sock = -1; + v->hw = 0; + if (v->ctx) av.free_context(&v->ctx); + if (v->packet) av.packet_free(&v->packet); + if (v->frame) av.frame_free(&v->frame); + free(v->packet_data); + v->packet_data = NULL; + v->packet_capacity = 0; + v->frames = v->slow = 0; + v->decode_ms = 0; + v->last = -1; +} + +static int vd_send(int sock, const void *msg, size_t len, int fd) { + struct iovec iov = { .iov_base = (void *)msg, .iov_len = len }; + char control[CMSG_SPACE(sizeof(int))]; + struct msghdr m = { .msg_iov = &iov, .msg_iovlen = 1 }; + if (fd >= 0) { + memset(control, 0, sizeof control); + m.msg_control = control; + m.msg_controllen = sizeof control; + struct cmsghdr *c = CMSG_FIRSTHDR(&m); + c->cmsg_level = SOL_SOCKET; + c->cmsg_type = SCM_RIGHTS; + c->cmsg_len = CMSG_LEN(sizeof(int)); + memcpy(CMSG_DATA(c), &fd, sizeof fd); + } + return sendmsg(sock, &m, MSG_NOSIGNAL) == (ssize_t)len ? 0 : -1; +} + +static void vd_send_capture(struct vdec *v, uint32_t index) { + struct vdec_capture c = { .type = VDEC_CAPTURE, .index = index, .size = (uint32_t)v->cap[index].len }; + if (v->sock >= 0 && v->cap[index].map && vd_send(v->sock, &c, sizeof c, v->cap[index].fd) != 0) + vd_log("could not hand capture buffer %u to the app: %s", index, strerror(errno)); +} + +static int vd_open_hardware(struct vdec *v) { + if (v->hw_failed) return -1; + int sock = bl_venc_connect(); + if (sock < 0) return -1; + struct vdec_config c = { + .type = VDEC_CONFIG, .codec = v->fourcc == V4L2_PIX_FMT_HEVC ? VENC_HEVC : VENC_H264, + .width = v->width ? v->width : v->cap_width, .height = v->height ? v->height : v->cap_height, + .stride = v->bpl, .rows = v->cap_height, .bitstreams = v->out_count, .bitstream_size = VDEC_BITSTREAM_SIZE, + }; + struct vdec_result r; + if (vd_send(sock, &c, sizeof c, v->fd) != 0 || recv(sock, &r, sizeof r, 0) != (ssize_t)sizeof r || + r.type != VDEC_RESULT || r.status != 0) { + vd_log("the app has no %s decoder for %ux%u", c.codec == VENC_HEVC ? "HEVC" : "H.264", c.width, c.height); + close(sock); + v->hw_failed = 1; + return -1; + } + v->sock = sock; + v->hw = 1; + for (uint32_t i = 0; i < v->cap_count; i++) vd_send_capture(v, i); + vd_log("decoding %s %ux%u with the app's MediaCodec into %ux%u NV12 dma-bufs", + c.codec == VENC_HEVC ? "HEVC" : "H.264", c.width, c.height, v->cap_width, v->cap_height); + return 0; +} + +static int vd_open_decoder(struct vdec *v) { + if (vd_open_hardware(v) == 0) return 0; + if (!vd_have_ffmpeg()) return -1; + const char *name = v->fourcc == V4L2_PIX_FMT_HEVC ? "hevc" : "h264"; + const void *codec = av.find_decoder_by_name(name); + if (codec == NULL) { + vd_log("FFmpeg has no %s decoder", name); + return -1; + } + v->ctx = av.alloc_context3(codec); + v->packet = av.packet_alloc(); + v->frame = av.frame_alloc(); + void *options = NULL; + long cores = sysconf(_SC_NPROCESSORS_ONLN); + char threads[8]; + snprintf(threads, sizeof threads, "%ld", cores > 4 ? 4L : cores < 1 ? 1L : cores); + av.dict_set(&options, "threads", threads, 0); + av.dict_set(&options, "thread_type", "slice", 0); + av.dict_set(&options, "flags", "+low_delay", 0); + av.dict_set(&options, "flags2", "+fast", 0); + int r = v->ctx && v->packet && v->frame ? av.open2(v->ctx, codec, &options) : -1; + av.dict_free(&options); + if (r < 0) { + vd_log("could not open the %s decoder (%d)", name, r); + vd_close_decoder(v); + return -1; + } + vd_log("decoding %s %ux%u in software into %ux%u NV12 dma-bufs", v->fourcc == V4L2_PIX_FMT_HEVC ? "HEVC" : "H.264", + v->width, v->height, v->cap_width, v->cap_height); + return 0; +} + +static void vd_unmap_capture(struct vdec *v) { + for (uint32_t i = 0; i < VDEC_BUFFERS; i++) { + if (v->cap[i].map) munmap(v->cap[i].map, v->cap[i].len); + v->cap[i] = (struct vd_capture){ .fd = -1 }; + } + v->cap_count = v->n_cap_queue = v->n_cap_done = 0; + v->last = -1; +} + +static void vd_sync(int fd, uint64_t flags) { + struct vd_dma_buf_sync s = { .flags = flags | VD_DMA_BUF_SYNC_WRITE }; + ioctl(fd, VD_DMA_BUF_IOCTL_SYNC, &s); +} + +static void vd_blank(struct vdec *v, struct vd_capture *c) { + size_t luma = (size_t)v->bpl * v->cap_height; + if (luma + luma / 2 > c->len) return; + vd_sync(c->fd, VD_DMA_BUF_SYNC_START); + memset(c->map, 16, luma); + memset(c->map + luma, 128, luma / 2); + vd_sync(c->fd, VD_DMA_BUF_SYNC_END); +} + +static int vd_map_capture(struct vdec *v, uint32_t index, int fd) { + struct stat st; + if (fd < 0 || fstat(fd, &st) != 0) return -EINVAL; + struct vd_capture *c = &v->cap[index]; + if (c->map && c->ino == st.st_ino) { + c->fd = fd; + return 0; + } + if (c->map) munmap(c->map, c->len); + off_t len = lseek(fd, 0, SEEK_END); + if (len < (off_t)v->cap_size) return -EINVAL; + void *p = mmap(NULL, (size_t)len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (p == MAP_FAILED) { + vd_log("could not map capture buffer %u: %s", index, strerror(errno)); + *c = (struct vd_capture){ .fd = -1 }; + return -EINVAL; + } + *c = (struct vd_capture){ .fd = fd, .ino = st.st_ino, .map = p, .len = (size_t)len }; + vd_blank(v, c); + if (v->hw) vd_send_capture(v, index); + return 0; +} + +static int vd_write_frame(struct vdec *v, struct vd_capture *c) { + uint8_t **data = (uint8_t **)v->frame; + int *linesize = (int *)((uint8_t *)v->frame + 64); + int width = *(int *)((uint8_t *)v->frame + 104), height = *(int *)((uint8_t *)v->frame + 108); + const char *format = av.pix_fmt_name(*(int *)((uint8_t *)v->frame + 116)); + if (format == NULL || width <= 0 || height <= 0) return -1; + int nv12 = strcmp(format, "nv12") == 0; + if (!nv12 && strcmp(format, "yuv420p") != 0 && strcmp(format, "yuvj420p") != 0) { + static int warned; + if (!warned++) vd_log("cannot show %s frames", format); + return -1; + } + uint32_t w = (uint32_t)width < v->bpl ? (uint32_t)width : v->bpl; + uint32_t h = (uint32_t)height < v->cap_height ? (uint32_t)height : v->cap_height; + uint8_t *y = c->map, *uv = c->map + (size_t)v->bpl * v->cap_height; + vd_sync(c->fd, VD_DMA_BUF_SYNC_START); + for (uint32_t row = 0; row < h; row++) memcpy(y + (size_t)row * v->bpl, data[0] + (size_t)row * linesize[0], w); + for (uint32_t row = 0; row < (h + 1) / 2; row++) { + uint8_t *dst = uv + (size_t)row * v->bpl; + if (nv12) { + memcpy(dst, data[1] + (size_t)row * linesize[1], w & ~1u); + continue; + } + const uint8_t *u = data[1] + (size_t)row * linesize[1], *vv = data[2] + (size_t)row * linesize[2]; + for (uint32_t x = 0; x < w / 2; x++) { + dst[2 * x] = u[x]; + dst[2 * x + 1] = vv[x]; + } + } + vd_sync(c->fd, VD_DMA_BUF_SYNC_END); + return 0; +} + +static void vd_copy_last(struct vdec *v, struct vd_capture *c) { + if (v->last < 0 || v->cap[v->last].map == NULL || &v->cap[v->last] == c) return; + size_t size = v->cap_size < c->len ? v->cap_size : c->len; + vd_sync(c->fd, VD_DMA_BUF_SYNC_START); + memcpy(c->map, v->cap[v->last].map, size); + vd_sync(c->fd, VD_DMA_BUF_SYNC_END); +} + +static double vd_now_ms(void) { + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + return ts.tv_sec * 1000.0 + ts.tv_nsec / 1e6; +} + +static void vd_deliver(struct vdec *v, int written, double start, struct timeval timestamp) { + uint32_t target = v->cap_queue[0]; + if (!written) { + if (v->last < 0) return; + vd_copy_last(v, &v->cap[target]); + } + double ms = vd_now_ms() - start; + v->frames++; + v->decode_ms += ms; + if (ms > 25.0) v->slow++; + memmove(v->cap_queue, v->cap_queue + 1, --v->n_cap_queue * sizeof v->cap_queue[0]); + v->cap_done[v->n_cap_done++] = (struct vd_done){ .index = target, .timestamp = timestamp }; + v->last = (int)target; +} + +static void vd_decode_hardware(struct vdec *v, uint32_t index, uint32_t bytes, struct timeval timestamp) { + double start = vd_now_ms(); + v->pts += 16667; + struct vdec_packet p = { .type = VDEC_PACKET, .input = index, .bytes = bytes, .capture = v->cap_queue[0], .pts_us = v->pts }; + struct vdec_result r; + if (vd_send(v->sock, &p, sizeof p, -1) != 0 || recv(v->sock, &r, sizeof r, 0) != (ssize_t)sizeof r || + r.type != VDEC_RESULT) { + vd_log("lost the app's decoder (%s), switching to software", strerror(errno)); + vd_close_decoder(v); + v->hw_failed = 1; + return; + } + vd_deliver(v, r.status == 0 && r.frame, start, timestamp); +} + +static void vd_decode(struct vdec *v, uint32_t index, uint32_t bytes, struct timeval timestamp) { + if (!v->cap_on || v->n_cap_queue == 0) return; + if (v->ctx == NULL && !v->hw && vd_open_decoder(v) != 0) return; + if (v->hw) { + vd_decode_hardware(v, index, bytes, timestamp); + return; + } + if (v->packet_capacity < bytes + VDEC_PADDING) { + free(v->packet_data); + v->packet_capacity = bytes + VDEC_PADDING + (64u << 10); + v->packet_data = malloc(v->packet_capacity); + if (v->packet_data == NULL) { + v->packet_capacity = 0; + return; + } + } + memcpy(v->packet_data, v->bitstream + (size_t)index * VDEC_BITSTREAM_SIZE, bytes); + memset(v->packet_data + bytes, 0, VDEC_PADDING); + *(uint8_t **)((uint8_t *)v->packet + 24) = v->packet_data; + *(int *)((uint8_t *)v->packet + 32) = (int)bytes; + double start = vd_now_ms(); + uint32_t target = v->cap_queue[0]; + struct vd_capture *c = &v->cap[target]; + int written = 0; + if (av.send_packet(v->ctx, v->packet) >= 0) { + while (av.receive_frame(v->ctx, v->frame) >= 0) { + if (vd_write_frame(v, c) == 0) written = 1; + av.frame_unref(v->frame); + } + } + *(uint8_t **)((uint8_t *)v->packet + 24) = NULL; + *(int *)((uint8_t *)v->packet + 32) = 0; + vd_deliver(v, written, start, timestamp); +} + +static int is_output(uint32_t type) { return type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE || type == V4L2_BUF_TYPE_VIDEO_OUTPUT; } +static int is_capture(uint32_t type) { return type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE || type == V4L2_BUF_TYPE_VIDEO_CAPTURE; } + +static void vd_fill_format(struct vdec *v, struct v4l2_format *f) { + struct v4l2_pix_format_mplane *p = &f->fmt.pix_mp; + memset(p, 0, sizeof *p); + p->field = V4L2_FIELD_NONE; + p->num_planes = 1; + p->colorspace = V4L2_COLORSPACE_REC709; + if (is_output(f->type)) { + p->width = v->width; + p->height = v->height; + p->pixelformat = v->fourcc; + p->plane_fmt[0].sizeimage = VDEC_BITSTREAM_SIZE; + } else { + p->width = v->cap_width; + p->height = v->cap_height; + p->pixelformat = V4L2_PIX_FMT_NV12; + p->plane_fmt[0].bytesperline = v->bpl; + p->plane_fmt[0].sizeimage = v->cap_size; + } +} + +static int vd_set_format(struct vdec *v, struct v4l2_format *f, int apply) { + struct v4l2_pix_format_mplane *p = &f->fmt.pix_mp; + if (f->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE && f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) return -EINVAL; + struct vdec t = *v; + if (is_output(f->type)) { + if (p->pixelformat != V4L2_PIX_FMT_H264 && p->pixelformat != V4L2_PIX_FMT_HEVC) return -EINVAL; + t.fourcc = p->pixelformat; + t.width = p->width; + t.height = p->height; + } else { + uint32_t w = p->width > t.width ? p->width : t.width, h = p->height > t.height ? p->height : t.height; + if (w < 16 || h < 16 || w > 8192 || h > 8192) return -EINVAL; + t.cap_width = (w + 15) & ~15u; + t.cap_height = (h + 15) & ~15u; + t.bpl = t.cap_width; + t.cap_size = t.bpl * t.cap_height * 3 / 2; + } + if (apply) { + if (t.fourcc != v->fourcc) vd_close_decoder(&t); + *v = t; + } + vd_fill_format(&t, f); + return 0; +} + +static int vd_reqbufs(struct vdec *v, struct v4l2_requestbuffers *r) { + uint32_t n = r->count > VDEC_BUFFERS ? VDEC_BUFFERS : r->count; + if (r->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE && r->memory == V4L2_MEMORY_MMAP) { + if (v->bitstream) munmap(v->bitstream, (size_t)v->out_count * VDEC_BITSTREAM_SIZE); + v->bitstream = NULL; + v->out_count = v->n_out_done = 0; + if (n && ftruncate(v->fd, (off_t)n * VDEC_BITSTREAM_SIZE) != 0) return -ENOMEM; + if (n) { + void *p = mmap(NULL, (size_t)n * VDEC_BITSTREAM_SIZE, PROT_READ, MAP_SHARED, v->fd, 0); + if (p == MAP_FAILED) return -ENOMEM; + v->bitstream = p; + } + v->out_count = n; + } else if (r->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && r->memory == V4L2_MEMORY_DMABUF) { + vd_unmap_capture(v); + v->cap_count = n; + } else { + return -EINVAL; + } + r->count = n; + r->capabilities = r->memory == V4L2_MEMORY_MMAP ? V4L2_BUF_CAP_SUPPORTS_MMAP : V4L2_BUF_CAP_SUPPORTS_DMABUF; + return 0; +} + +static int vd_querybuf(struct vdec *v, struct v4l2_buffer *b) { + if (b->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE || b->index >= v->out_count || b->m.planes == NULL || b->length < 1) + return -EINVAL; + b->memory = V4L2_MEMORY_MMAP; + b->flags = V4L2_BUF_FLAG_MAPPED; + b->length = 1; + b->m.planes[0].length = VDEC_BITSTREAM_SIZE; + b->m.planes[0].m.mem_offset = b->index * VDEC_BITSTREAM_SIZE; + return 0; +} + +static int vd_qbuf(struct vdec *v, struct v4l2_buffer *b) { + if (b->m.planes == NULL || b->length < 1) return -EINVAL; + if (b->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { + if (b->index >= v->out_count || v->n_out_done >= VDEC_BUFFERS) return -EINVAL; + uint32_t bytes = b->m.planes[0].bytesused; + if (bytes > VDEC_BITSTREAM_SIZE) bytes = VDEC_BITSTREAM_SIZE; + if (v->out_on && bytes) vd_decode(v, b->index, bytes, b->timestamp); + v->out_done[v->n_out_done++] = b->index; + } else if (b->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { + if (b->index >= v->cap_count || v->cap_size == 0) return -EINVAL; + int r = vd_map_capture(v, b->index, b->m.planes[0].m.fd); + if (r < 0) return r; + for (uint32_t i = 0; i < v->n_cap_queue; i++) if (v->cap_queue[i] == b->index) return 0; + if (v->n_cap_queue >= VDEC_BUFFERS) return -EINVAL; + v->cap_queue[v->n_cap_queue++] = b->index; + } else { + return -EINVAL; + } + b->flags |= V4L2_BUF_FLAG_QUEUED; + return 0; +} + +static int vd_dqbuf(struct vdec *v, struct v4l2_buffer *b) { + if (b->m.planes == NULL || b->length < 1) return -EINVAL; + if (b->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { + if (v->n_out_done == 0) return -EAGAIN; + b->index = v->out_done[0]; + memmove(v->out_done, v->out_done + 1, --v->n_out_done * sizeof v->out_done[0]); + b->memory = V4L2_MEMORY_MMAP; + b->flags = V4L2_BUF_FLAG_DONE | V4L2_BUF_FLAG_MAPPED; + b->length = 1; + b->m.planes[0].bytesused = 0; + b->m.planes[0].length = VDEC_BITSTREAM_SIZE; + b->m.planes[0].m.mem_offset = b->index * VDEC_BITSTREAM_SIZE; + return 0; + } + if (b->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) return -EINVAL; + if (v->n_cap_done == 0) return -EAGAIN; + struct vd_done d = v->cap_done[0]; + memmove(v->cap_done, v->cap_done + 1, --v->n_cap_done * sizeof d); + b->index = d.index; + b->memory = V4L2_MEMORY_DMABUF; + b->flags = V4L2_BUF_FLAG_DONE | V4L2_BUF_FLAG_TIMESTAMP_COPY; + b->field = V4L2_FIELD_NONE; + b->timestamp = d.timestamp; + b->length = 1; + b->m.planes[0].bytesused = v->cap_size; + b->m.planes[0].length = v->cap_size; + b->m.planes[0].m.fd = v->cap[d.index].fd; + return 0; +} + +static int vd_ioctl(struct vdec *v, unsigned long req, void *arg) { + switch (req) { + case VIDIOC_QUERYCAP: { + struct v4l2_capability *c = arg; + memset(c, 0, sizeof *c); + strcpy((char *)c->driver, "droiddeck_vdec"); + strcpy((char *)c->card, "DroidDeck video decoder"); + strcpy((char *)c->bus_info, "platform:droiddeck-vdec"); + c->version = 0x00060000; + c->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING; + c->capabilities = c->device_caps | V4L2_CAP_DEVICE_CAPS; + return 0; + } + case VIDIOC_ENUM_FMT: { + struct v4l2_fmtdesc *d = arg; + static const uint32_t coded[] = { V4L2_PIX_FMT_H264, V4L2_PIX_FMT_HEVC }; + if (is_capture(d->type) && d->index == 0) { + d->pixelformat = V4L2_PIX_FMT_NV12; + strcpy((char *)d->description, "Y/CbCr 4:2:0"); + d->flags = 0; + } else if (is_output(d->type) && d->index < 2) { + d->pixelformat = coded[d->index]; + strcpy((char *)d->description, d->index ? "HEVC" : "H.264"); + d->flags = V4L2_FMT_FLAG_COMPRESSED; + } else { + return -EINVAL; + } + return 0; + } + case VIDIOC_G_FMT: { + struct v4l2_format *f = arg; + if (!is_output(f->type) && !is_capture(f->type)) return -EINVAL; + vd_fill_format(v, f); + return 0; + } + case VIDIOC_S_FMT: return vd_set_format(v, arg, 1); + case VIDIOC_TRY_FMT: return vd_set_format(v, arg, 0); + case VIDIOC_REQBUFS: return vd_reqbufs(v, arg); + case VIDIOC_QUERYBUF: return vd_querybuf(v, arg); + case VIDIOC_QBUF: return vd_qbuf(v, arg); + case VIDIOC_DQBUF: return vd_dqbuf(v, arg); + case VIDIOC_STREAMON: + case VIDIOC_STREAMOFF: { + uint32_t type = *(uint32_t *)arg; + int on = req == VIDIOC_STREAMON; + if (is_output(type)) { + v->out_on = on; + if (!on) { + v->n_out_done = 0; + if (v->ctx) av.flush_buffers(v->ctx); + } + } else if (is_capture(type)) { + v->cap_on = on; + if (!on) v->n_cap_queue = v->n_cap_done = 0; + } else { + return -EINVAL; + } + if (v->out_on && v->cap_on && v->ctx == NULL && !v->hw && v->out_count && v->cap_size) vd_open_decoder(v); + return 0; + } + case VIDIOC_SUBSCRIBE_EVENT: + case VIDIOC_UNSUBSCRIBE_EVENT: + case VIDIOC_DECODER_CMD: + case VIDIOC_TRY_DECODER_CMD: + return 0; + case VIDIOC_DQEVENT: + return -ENOENT; + default: + vd_log("unhandled ioctl 0x%lx", req); + return -ENOTTY; + } +} + +__attribute__((visibility("hidden"))) int bl_vdec_ioctl(int fd, unsigned long req, void *arg, int *rc) { + struct vdec *v = vd_find(fd); + if (v == NULL) return 0; + pthread_mutex_lock(&vd_lock); + int r = arg ? vd_ioctl(v, req, arg) : -EFAULT; + pthread_mutex_unlock(&vd_lock); + if (r < 0) { + errno = -r; + *rc = -1; + } else { + *rc = 0; + } + return 1; +} + +__attribute__((visibility("hidden"))) void bl_vdec_closed(int fd) { + struct vdec *v = vd_find(fd); + if (v == NULL) return; + pthread_mutex_lock(&vd_lock); + vd_close_decoder(v); + vd_unmap_capture(v); + if (v->bitstream) munmap(v->bitstream, (size_t)v->out_count * VDEC_BITSTREAM_SIZE); + v->bitstream = NULL; + v->used = 0; + __atomic_sub_fetch(&vd_open_count, 1, __ATOMIC_RELEASE); + pthread_mutex_unlock(&vd_lock); +} + +__attribute__((visibility("hidden"))) int bl_vdec_poll(struct pollfd *fds, nfds_t n, int timeout_ms, + int (*real)(struct pollfd *, nfds_t, int), int *ret) { + if (n != 1 || vd_find(fds[0].fd) == NULL) return 0; + struct vdec *v = vd_find(fds[0].fd); + pthread_mutex_lock(&vd_lock); + short ready = (v->n_cap_done ? POLLIN | POLLRDNORM : 0) | (v->n_out_done ? POLLOUT | POLLWRNORM : 0); + pthread_mutex_unlock(&vd_lock); + fds[0].revents = ready & fds[0].events; + if (fds[0].revents == 0 && timeout_ms != 0) real(NULL, 0, timeout_ms < 0 || timeout_ms > 1000 ? 1000 : timeout_ms); + *ret = fds[0].revents ? 1 : 0; + return 1; +} + +static int drm_get_devices2(uint32_t flags, struct vd_device **devices, int max) { + (void)flags; + static char *nodes[3] = { "/dev/null", NULL, NULL }; + static struct vd_device device = { .nodes = nodes, .available_nodes = 1 }; + if (devices == NULL || max < 1) return 1; + devices[0] = &device; + return 1; +} + +static void drm_free_devices(struct vd_device **devices, int count) { (void)devices; (void)count; } + +static struct vd_mode_info drm_mode = { + .clock = 148500, .hdisplay = 1920, .hsync_start = 2008, .hsync_end = 2052, .htotal = 2200, + .vdisplay = 1080, .vsync_start = 1084, .vsync_end = 1089, .vtotal = 1125, .vrefresh = 60, .name = "1920x1080", +}; +static uint32_t drm_crtc_ids[1] = { 1 }, drm_connector_ids[1] = { 2 }, drm_encoder_ids[1] = { 3 }; + +static struct vd_res *drm_get_resources(int fd) { + (void)fd; + static struct vd_res res = { + .count_crtcs = 1, .crtcs = drm_crtc_ids, .count_connectors = 1, .connectors = drm_connector_ids, + .count_encoders = 1, .encoders = drm_encoder_ids, .max_width = 8192, .max_height = 8192, + }; + return &res; +} + +static struct vd_connector *drm_get_connector(int fd, uint32_t id) { + (void)fd; + static struct vd_connector connector = { + .connector_id = 2, .encoder_id = 3, .connector_type = 14, .connection = 1, .count_modes = 1, + .modes = &drm_mode, .count_encoders = 1, .encoders = drm_encoder_ids, + }; + return id == 2 ? &connector : NULL; +} + +static struct vd_encoder *drm_get_encoder(int fd, uint32_t id) { + (void)fd; + static struct vd_encoder encoder = { .encoder_id = 3, .encoder_type = 8, .crtc_id = 1, .possible_crtcs = 1 }; + return id == 3 ? &encoder : NULL; +} + +static struct vd_crtc *drm_get_crtc(int fd, uint32_t id) { + (void)fd; + static struct vd_crtc crtc; + if (id != 1) return NULL; + crtc = (struct vd_crtc){ .crtc_id = 1, .width = 1920, .height = 1080, .mode_valid = 1, .mode = drm_mode }; + return &crtc; +} + +static void drm_free(void *p) { (void)p; } +static void *drm_null(void) { return NULL; } +static int drm_fail(void) { return -EINVAL; } + +static int drm_dumb_slot(uint32_t handle) { return handle >= 1 && handle <= VDEC_DUMB ? (int)handle - 1 : -1; } + +static int drm_ioctl(int fd, unsigned long request, void *arg) { + (void)fd; + int r = -EINVAL; + pthread_mutex_lock(&vd_lock); + if (request == VD_IOCTL_MODE_CREATE_DUMB && arg) { + struct vd_create_dumb *c = arg; + uint64_t pitch = ((uint64_t)c->width * c->bpp + 7) / 8; + uint64_t size = (pitch * c->height + 4095) & ~4095ull; + int slot = -1; + for (int i = 0; i < VDEC_DUMB && slot < 0; i++) if (vd_dumb_fd[i] < 0) slot = i; + struct vd_dma_heap_alloc a = { .len = size, .fd_flags = O_RDWR | O_CLOEXEC }; + if (slot < 0 || size == 0 || size > (512ull << 20)) { + r = -ENOMEM; + } else if (ioctl(vd_heap, VD_DMA_HEAP_IOCTL_ALLOC, &a) != 0) { + r = -errno; + vd_log("dma-heap allocation of %llu bytes failed: %s", (unsigned long long)size, strerror(errno)); + } else { + vd_dumb_fd[slot] = (int)a.fd; + c->handle = (uint32_t)slot + 1; + c->pitch = (uint32_t)pitch; + c->size = size; + r = 0; + } + } else if (request == VD_IOCTL_PRIME_HANDLE_TO_FD && arg) { + struct vd_prime_handle *h = arg; + int slot = drm_dumb_slot(h->handle); + int dup_fd = slot >= 0 && vd_dumb_fd[slot] >= 0 ? fcntl(vd_dumb_fd[slot], F_DUPFD_CLOEXEC, 0) : -1; + if (dup_fd >= 0) { + h->fd = dup_fd; + r = 0; + } else { + r = slot >= 0 ? -errno : -ENOENT; + } + } else if (request == VD_IOCTL_MODE_DESTROY_DUMB && arg) { + int slot = drm_dumb_slot(((struct vd_destroy_dumb *)arg)->handle); + if (slot >= 0 && vd_dumb_fd[slot] >= 0) { + close(vd_dumb_fd[slot]); + vd_dumb_fd[slot] = -1; + r = 0; + } else { + r = -ENOENT; + } + } + pthread_mutex_unlock(&vd_lock); + if (r < 0) { + errno = -r; + return -1; + } + return 0; +} + +static const struct { + const char *name; + void *fn; +} drm_table[] = { + { "drmGetDevices2", (void *)drm_get_devices2 }, + { "drmFreeDevices", (void *)drm_free_devices }, + { "drmSetMaster", (void *)drm_fail }, + { "drmSetClientCap", (void *)drm_fail }, + { "drmModeGetResources", (void *)drm_get_resources }, + { "drmModeFreeResources", (void *)drm_free }, + { "drmModeGetConnector", (void *)drm_get_connector }, + { "drmModeFreeConnector", (void *)drm_free }, + { "drmModeGetEncoder", (void *)drm_get_encoder }, + { "drmModeFreeEncoder", (void *)drm_free }, + { "drmModeGetCrtc", (void *)drm_get_crtc }, + { "drmModeSetCrtc", (void *)drm_fail }, + { "drmModeFreeCrtc", (void *)drm_free }, + { "drmModeGetPlaneResources", (void *)drm_null }, + { "drmModeFreePlaneResources", (void *)drm_free }, + { "drmModeGetPlane", (void *)drm_null }, + { "drmModeFreePlane", (void *)drm_free }, + { "drmModeObjectGetProperties", (void *)drm_null }, + { "drmModeFreeObjectProperties", (void *)drm_free }, + { "drmModeGetProperty", (void *)drm_null }, + { "drmModeFreeProperty", (void *)drm_free }, + { "drmModeAddFB2", (void *)drm_fail }, + { "drmModeAddFB2WithModifiers", (void *)drm_fail }, + { "drmModeRmFB", (void *)drm_fail }, + { "drmModeAtomicAlloc", (void *)drm_null }, + { "drmModeAtomicFree", (void *)drm_free }, + { "drmModeAtomicAddProperty", (void *)drm_fail }, + { "drmModeAtomicCommit", (void *)drm_fail }, + { "drmIoctl", (void *)drm_ioctl }, +}; + +void *SDL_LoadObject(const char *name) { + static void *(*real)(const char *); + if (name && strcmp(name, "libdrm.so.2") == 0 && vd_enabled()) return &vd_drm_handle; + if (!real) real = (void *(*)(const char *))dlsym(RTLD_NEXT, "SDL_LoadObject"); + return real ? real(name) : NULL; +} + +void *SDL_LoadFunction(void *handle, const char *name) { + static void *(*real)(void *, const char *); + if (handle == &vd_drm_handle) { + for (size_t i = 0; name && i < sizeof drm_table / sizeof drm_table[0]; i++) + if (strcmp(drm_table[i].name, name) == 0) return drm_table[i].fn; + return NULL; + } + if (!real) real = (void *(*)(void *, const char *))dlsym(RTLD_NEXT, "SDL_LoadFunction"); + return real ? real(handle, name) : NULL; +} + +void SDL_UnloadObject(void *handle) { + static void (*real)(void *); + if (handle == &vd_drm_handle) return; + if (!real) real = (void (*)(void *))dlsym(RTLD_NEXT, "SDL_UnloadObject"); + if (real) real(handle); +} + +#else + +__attribute__((visibility("hidden"))) int bl_vdec_open(const char *path, int flags) { + (void)path; + (void)flags; + return -2; +} + +__attribute__((visibility("hidden"))) int bl_vdec_ioctl(int fd, unsigned long req, void *arg, int *rc) { + (void)fd; + (void)req; + (void)arg; + (void)rc; + return 0; +} + +__attribute__((visibility("hidden"))) void bl_vdec_closed(int fd) { (void)fd; } + +__attribute__((visibility("hidden"))) int bl_vdec_poll(struct pollfd *fds, nfds_t n, int timeout_ms, + int (*real)(struct pollfd *, nfds_t, int), int *ret) { + (void)fds; + (void)n; + (void)timeout_ms; + (void)real; + (void)ret; + return 0; +} + +#endif diff --git a/tools/linuxfs/preload/venc.c b/tools/linuxfs/preload/venc.c index ca610e85c3..9480e88126 100644 --- a/tools/linuxfs/preload/venc.c +++ b/tools/linuxfs/preload/venc.c @@ -625,9 +625,14 @@ static int vn_poll(struct pollfd *fds, nfds_t n, int timeout_ms, int (*real)(str return r + ready; } +__attribute__((weak, visibility("hidden"))) int bl_vdec_poll(struct pollfd *fds, nfds_t n, int timeout_ms, + int (*real)(struct pollfd *, nfds_t, int), int *ret); + int poll(struct pollfd *fds, nfds_t n, int timeout_ms) { static int (*real)(struct pollfd *, nfds_t, int); if (!real) real = (int (*)(struct pollfd *, nfds_t, int))dlsym(RTLD_NEXT, "poll"); + int ret; + if (bl_vdec_poll && bl_vdec_poll(fds, n, timeout_ms, real, &ret)) return ret; if (__atomic_load_n(&vn_open_count, __ATOMIC_ACQUIRE) == 0) return real(fds, n, timeout_ms); return vn_poll(fds, n, timeout_ms, real); } diff --git a/tools/tests/test_vdec_emulator.py b/tools/tests/test_vdec_emulator.py new file mode 100644 index 0000000000..a4c4d4e3dc --- /dev/null +++ b/tools/tests/test_vdec_emulator.py @@ -0,0 +1,258 @@ +import array +import mmap +import os +import socket +import struct +import subprocess +import tempfile +import threading +import unittest +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[2] +VDEC = ROOT / 'tools/linuxfs/preload/vdec.c' +VENC = ROOT / 'tools/linuxfs/preload/venc.c' + +DRIVER = r''' +#define _GNU_SOURCE +#include <dlfcn.h> +#include <errno.h> +#include <fcntl.h> +#include <linux/videodev2.h> +#include <poll.h> +#include <stdarg.h> +#include <stdint.h> +#include <stdio.h> +#include <string.h> +#include <sys/ioctl.h> +#include <sys/mman.h> +#include <unistd.h> + +int bl_vdec_open(const char *path, int flags); +int bl_vdec_ioctl(int fd, unsigned long req, void *arg, int *rc); +void bl_vdec_closed(int fd); +void *SDL_LoadObject(const char *name); +void *SDL_LoadFunction(void *handle, const char *name); + +struct heap_alloc { uint64_t len; uint32_t fd, fd_flags; uint64_t heap_flags; }; +struct create_dumb { uint32_t height, width, bpp, flags, handle, pitch; uint64_t size; }; +struct prime_handle { uint32_t handle, flags; int32_t fd; }; +struct destroy_dumb { uint32_t handle; }; +struct drm_device { char **nodes; int available_nodes; }; + +static int heap = -1; + +int open(const char *path, int flags, ...) { + static int (*real)(const char *, int, ...); + va_list ap; + va_start(ap, flags); + int mode = va_arg(ap, int); + va_end(ap); + if (!real) real = dlsym(RTLD_NEXT, "open"); + if (strcmp(path, "/dev/dma_heap/system") == 0) return heap = memfd_create("heap", 0); + return real(path, flags, mode); +} + +int ioctl(int fd, unsigned long req, ...) { + static int (*real)(int, unsigned long, ...); + va_list ap; + va_start(ap, req); + void *arg = va_arg(ap, void *); + va_end(ap); + if (!real) real = dlsym(RTLD_NEXT, "ioctl"); + if (fd == heap && req == _IOWR('H', 0, struct heap_alloc)) { + struct heap_alloc *a = arg; + int buf = memfd_create("dmabuf", 0); + if (ftruncate(buf, (off_t)a->len) != 0) return -1; + a->fd = (uint32_t)buf; + return 0; + } + if (req == _IOW('b', 0, uint64_t)) return 0; + return real(fd, req, arg); +} + +static int vfd; +static int call(unsigned long req, void *arg) { + int rc; + if (!bl_vdec_ioctl(vfd, req, arg, &rc)) return -100; + return rc < 0 ? -errno : 0; +} + +int main(void) { + if (bl_vdec_open("/dev/video0", O_RDWR) != -2) return 2; + void *drm = SDL_LoadObject("libdrm.so.2"); + if (!drm) return 3; + int (*devices)(uint32_t, struct drm_device **, int) = SDL_LoadFunction(drm, "drmGetDevices2"); + int (*drm_ioctl)(int, unsigned long, void *) = SDL_LoadFunction(drm, "drmIoctl"); + if (!devices || !drm_ioctl || !SDL_LoadFunction(drm, "drmModeAtomicCommit")) return 4; + struct drm_device *dev[1]; + if (devices(0, NULL, 0) != 1 || devices(0, dev, 1) != 1 || !(dev[0]->available_nodes & 1)) return 5; + int card = open(dev[0]->nodes[0], O_RDWR | O_CLOEXEC); + if (card < 0) return 6; + + vfd = bl_vdec_open("/dev/video-dec0", O_RDWR); + if (vfd < 0) return 7; + struct v4l2_capability cap; + if (call(VIDIOC_QUERYCAP, &cap) || (cap.capabilities & 0x04004000) != 0x04004000) return 8; + struct v4l2_fmtdesc d = { .index = 1, .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE }; + if (call(VIDIOC_ENUM_FMT, &d) || d.pixelformat != V4L2_PIX_FMT_HEVC) return 9; + struct v4l2_format f = { .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE }; + f.fmt.pix_mp.width = 1280; f.fmt.pix_mp.height = 720; f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_HEVC; + if (call(VIDIOC_S_FMT, &f)) return 10; + struct v4l2_requestbuffers r = { .count = 4, .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, .memory = V4L2_MEMORY_MMAP }; + if (call(VIDIOC_REQBUFS, &r) || r.count != 4) return 11; + unsigned char *in[4]; + for (int i = 0; i < 4; i++) { + struct v4l2_plane p = { 0 }; + struct v4l2_buffer b = { .index = i, .type = r.type, .memory = V4L2_MEMORY_MMAP, .length = 1, .m.planes = &p }; + if (call(VIDIOC_QUERYBUF, &b)) return 12; + in[i] = mmap(NULL, p.length, PROT_READ | PROT_WRITE, MAP_SHARED, vfd, p.m.mem_offset); + if (in[i] == MAP_FAILED) return 13; + } + f = (struct v4l2_format){ .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE }; + f.fmt.pix_mp.width = 1280; f.fmt.pix_mp.height = 736; f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12; + if (call(VIDIOC_S_FMT, &f) || f.fmt.pix_mp.num_planes != 1) return 14; + uint32_t bpl = f.fmt.pix_mp.plane_fmt[0].bytesperline, size = f.fmt.pix_mp.plane_fmt[0].sizeimage; + if (bpl != 1280 || size != 1280 * 736 * 3 / 2) return 15; + r = (struct v4l2_requestbuffers){ .count = 3, .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, .memory = V4L2_MEMORY_DMABUF }; + if (call(VIDIOC_REQBUFS, &r) || r.count != 3) return 16; + int out[3]; + for (int i = 0; i < 3; i++) { + struct create_dumb c = { .height = 736, .width = 1280, .bpp = 16 }; + if (drm_ioctl(card, 0xc02064b2, &c) || !c.handle || c.size < size) return 17; + struct prime_handle h = { .handle = c.handle, .flags = O_CLOEXEC }; + if (drm_ioctl(card, 0xc00c642d, &h)) return 18; + struct destroy_dumb x = { .handle = c.handle }; + if (drm_ioctl(card, 0xc00464b4, &x)) return 19; + out[i] = h.fd; + } + unsigned types[2] = { V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE }; + if (call(VIDIOC_STREAMON, &types[0]) || call(VIDIOC_STREAMON, &types[1])) return 20; + for (int i = 0; i < 3; i++) { + struct v4l2_plane p = { .m.fd = out[i] }; + struct v4l2_buffer b = { .index = i, .type = types[1], .memory = V4L2_MEMORY_DMABUF, .length = 1, .m.planes = &p }; + if (call(VIDIOC_QBUF, &b)) return 21; + } + struct pollfd pf = { .fd = vfd, .events = 0xc9 }; + if (poll(&pf, 1, 0) != 0) return 22; + for (int frame = 1; frame <= 5; frame++) { + int slot = frame % 4; + memset(in[slot], 'a' + frame, 100 + frame); + struct v4l2_plane p = { .bytesused = 100 + frame }; + struct v4l2_buffer b = { .index = slot, .type = types[0], .memory = V4L2_MEMORY_MMAP, .flags = 0x4008, .length = 1, .m.planes = &p }; + b.timestamp.tv_usec = frame; + if (call(VIDIOC_QBUF, &b)) return 23; + pf = (struct pollfd){ .fd = vfd, .events = 0xc9 }; + if (poll(&pf, 1, 30) != 1 || !(pf.revents & POLLIN)) return 24; + struct v4l2_plane cp = { 0 }; + struct v4l2_buffer cb = { .type = types[1], .memory = V4L2_MEMORY_DMABUF, .length = 1, .m.planes = &cp }; + if (call(VIDIOC_DQBUF, &cb)) return 25; + unsigned char *m = mmap(NULL, size, PROT_READ, MAP_SHARED, out[cb.index], 0); + printf("%ld %u %c%c %u\n", (long)cb.timestamp.tv_usec, cb.index, m[0], m[(size_t)bpl * 736], cp.bytesused == size); + munmap(m, size); + pf = (struct pollfd){ .fd = vfd, .events = 0x306 }; + if (poll(&pf, 1, 0) != 1) return 26; + struct v4l2_plane op = { 0 }; + struct v4l2_buffer ob = { .type = types[0], .memory = V4L2_MEMORY_MMAP, .length = 1, .m.planes = &op }; + if (call(VIDIOC_DQBUF, &ob) || ob.index != (unsigned)slot) return 27; + struct v4l2_plane rp = { .m.fd = out[cb.index] }; + struct v4l2_buffer rb = { .index = cb.index, .type = types[1], .memory = V4L2_MEMORY_DMABUF, .length = 1, .m.planes = &rp }; + if (call(VIDIOC_QBUF, &rb)) return 28; + } + bl_vdec_closed(vfd); + return 0; +} +''' + +CONFIG = struct.Struct('<IIIIIIII') +CAPTURE = struct.Struct('<III') +PACKET = struct.Struct('<IIII q') +RESULT = struct.Struct('<IiI') + + +class FakeDecoder(threading.Thread): + def __init__(self, path): + super().__init__(daemon=True) + self.listener = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET) + self.listener.bind(path) + self.listener.listen(1) + self.configs, self.packets = [], [] + + def run(self): + while True: + try: + conn, _ = self.listener.accept() + except OSError: + return + threading.Thread(target=self.serve, args=(conn,), daemon=True).start() + + def serve(self, conn): + bitstream, captures, config = None, {}, None + while True: + fds = array.array('i') + msg, ancdata, _, _ = conn.recvmsg(256, socket.CMSG_LEN(4 * fds.itemsize)) + if not msg: + return + for level, kind, data in ancdata: + if level == socket.SOL_SOCKET and kind == socket.SCM_RIGHTS: + fds.frombytes(data[:len(data) - len(data) % fds.itemsize]) + kind = struct.unpack_from('<I', msg)[0] + if kind == 6: + config = CONFIG.unpack(msg) + self.configs.append(config) + bitstream = mmap.mmap(fds[0], config[6] * config[7], prot=mmap.PROT_READ) + os.close(fds[0]) + conn.send(RESULT.pack(9, 0, 0)) + elif kind == 7: + _, index, size = CAPTURE.unpack(msg) + captures[index] = mmap.mmap(fds[0], size) + os.close(fds[0]) + elif kind == 8: + _, source, nbytes, target, pts = PACKET.unpack(msg) + self.packets.append((source, nbytes, target, pts)) + first = bitstream[source * config[7]] + frame = captures[target] + frame[0] = first + frame[config[4] * config[5]] = ord('u') + conn.send(RESULT.pack(9, 0, 1)) + + +class VdecEmulatorTest(unittest.TestCase): + def test_remote_play_client_decodes_through_the_app_socket(self): + with tempfile.TemporaryDirectory() as tmp: + tmp = Path(tmp) + driver = tmp / 'driver.c' + driver.write_text(DRIVER) + binary = tmp / 'streaming_client' + subprocess.run(['cc', '-O1', '-pthread', '-DBL_VDEC_ANY_ARCH', '-o', str(binary), str(driver), str(VDEC), + str(VENC), '-ldl'], check=True) + sock = tmp / 'venc.sock' + server = FakeDecoder(str(sock)) + self.addCleanup(server.listener.close) + server.start() + done = subprocess.run([str(binary)], env=dict(os.environ, BL_VENC_SOCKET=str(sock)), + capture_output=True, text=True, timeout=20) + self.assertEqual(done.returncode, 0, done.stdout + done.stderr) + self.assertEqual(done.stdout.split('\n')[:5], + ['1 0 bu 1', '2 1 cu 1', '3 2 du 1', '4 0 eu 1', '5 1 fu 1']) + self.assertEqual(len(server.configs), 1) + self.assertEqual(server.configs[0][1:6], (1, 1280, 720, 1280, 736)) + self.assertEqual([p[:3] for p in server.packets], + [(1, 101, 0), (2, 102, 1), (3, 103, 2), (0, 104, 0), (1, 105, 1)]) + self.assertEqual(len({p[3] for p in server.packets}), 5) + + def test_other_programs_keep_the_real_libdrm(self): + with tempfile.TemporaryDirectory() as tmp: + tmp = Path(tmp) + (tmp / 'main.c').write_text( + 'void *SDL_LoadObject(const char *);\n' + 'int main(void) { return SDL_LoadObject("libdrm.so.2") != 0; }\n') + binary = tmp / 'steam' + subprocess.run(['cc', '-O1', '-pthread', '-DBL_VDEC_ANY_ARCH', '-o', str(binary), str(tmp / 'main.c'), + str(VDEC), str(VENC), '-ldl'], check=True) + done = subprocess.run([str(binary)], capture_output=True, text=True, timeout=20) + self.assertEqual(done.returncode, 0, done.stderr) + + +if __name__ == '__main__': + unittest.main() From bb9a64fa5fc08ddfa0f5fad6e8a38bf78e88d757 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 18:27:21 -0400 Subject: [PATCH 115/135] Reconfigure the app decoder when the capture layout changes A capture format or buffer change now closes the app's decoder so the next packet reopens it with the new stride and height, and a capture slot whose remap fails no longer keeps its old mapping. --- tools/linuxfs/preload/vdec.c | 9 ++++++-- tools/tests/test_vdec_emulator.py | 36 +++++++++++++++++++++++++------ 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/tools/linuxfs/preload/vdec.c b/tools/linuxfs/preload/vdec.c index 4606563611..9a0abbe504 100644 --- a/tools/linuxfs/preload/vdec.c +++ b/tools/linuxfs/preload/vdec.c @@ -400,7 +400,11 @@ static int vd_map_capture(struct vdec *v, uint32_t index, int fd) { c->fd = fd; return 0; } - if (c->map) munmap(c->map, c->len); + if (c->map) { + munmap(c->map, c->len); + *c = (struct vd_capture){ .fd = -1 }; + if (v->last == (int)index) v->last = -1; + } off_t len = lseek(fd, 0, SEEK_END); if (len < (off_t)v->cap_size) return -EINVAL; void *p = mmap(NULL, (size_t)len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); @@ -568,7 +572,7 @@ static int vd_set_format(struct vdec *v, struct v4l2_format *f, int apply) { t.cap_size = t.bpl * t.cap_height * 3 / 2; } if (apply) { - if (t.fourcc != v->fourcc) vd_close_decoder(&t); + if (t.fourcc != v->fourcc || (t.hw && (t.bpl != v->bpl || t.cap_height != v->cap_height))) vd_close_decoder(&t); *v = t; } vd_fill_format(&t, f); @@ -589,6 +593,7 @@ static int vd_reqbufs(struct vdec *v, struct v4l2_requestbuffers *r) { } v->out_count = n; } else if (r->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && r->memory == V4L2_MEMORY_DMABUF) { + if (v->hw) vd_close_decoder(v); vd_unmap_capture(v); v->cap_count = n; } else { diff --git a/tools/tests/test_vdec_emulator.py b/tools/tests/test_vdec_emulator.py index a4c4d4e3dc..8f9fbd6445 100644 --- a/tools/tests/test_vdec_emulator.py +++ b/tools/tests/test_vdec_emulator.py @@ -159,6 +159,31 @@ int main(void) { struct v4l2_buffer rb = { .index = cb.index, .type = types[1], .memory = V4L2_MEMORY_DMABUF, .length = 1, .m.planes = &rp }; if (call(VIDIOC_QBUF, &rb)) return 28; } + if (call(VIDIOC_STREAMOFF, &types[1])) return 29; + f = (struct v4l2_format){ .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE }; + f.fmt.pix_mp.width = 1920; f.fmt.pix_mp.height = 1088; f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12; + if (call(VIDIOC_S_FMT, &f)) return 30; + size = f.fmt.pix_mp.plane_fmt[0].sizeimage; + r = (struct v4l2_requestbuffers){ .count = 1, .type = types[1], .memory = V4L2_MEMORY_DMABUF }; + if (call(VIDIOC_REQBUFS, &r)) return 31; + struct create_dumb big = { .height = 1088, .width = 1920, .bpp = 16 }; + if (drm_ioctl(card, 0xc02064b2, &big)) return 32; + struct prime_handle bh = { .handle = big.handle, .flags = O_CLOEXEC }; + if (drm_ioctl(card, 0xc00c642d, &bh)) return 33; + if (call(VIDIOC_STREAMON, &types[1])) return 34; + struct v4l2_plane bp = { .m.fd = bh.fd }; + struct v4l2_buffer bb = { .index = 0, .type = types[1], .memory = V4L2_MEMORY_DMABUF, .length = 1, .m.planes = &bp }; + if (call(VIDIOC_QBUF, &bb)) return 35; + memset(in[2], 'z', 50); + struct v4l2_plane zp = { .bytesused = 50 }; + struct v4l2_buffer zb = { .index = 2, .type = types[0], .memory = V4L2_MEMORY_MMAP, .length = 1, .m.planes = &zp }; + zb.timestamp.tv_usec = 6; + if (call(VIDIOC_QBUF, &zb)) return 36; + struct v4l2_plane dp = { 0 }; + struct v4l2_buffer db = { .type = types[1], .memory = V4L2_MEMORY_DMABUF, .length = 1, .m.planes = &dp }; + if (call(VIDIOC_DQBUF, &db)) return 37; + unsigned char *m = mmap(NULL, size, PROT_READ, MAP_SHARED, bh.fd, 0); + printf("%ld %u %c%c\n", (long)db.timestamp.tv_usec, db.index, m[0], m[(size_t)1920 * 1088]); bl_vdec_closed(vfd); return 0; } @@ -233,13 +258,12 @@ class VdecEmulatorTest(unittest.TestCase): done = subprocess.run([str(binary)], env=dict(os.environ, BL_VENC_SOCKET=str(sock)), capture_output=True, text=True, timeout=20) self.assertEqual(done.returncode, 0, done.stdout + done.stderr) - self.assertEqual(done.stdout.split('\n')[:5], - ['1 0 bu 1', '2 1 cu 1', '3 2 du 1', '4 0 eu 1', '5 1 fu 1']) - self.assertEqual(len(server.configs), 1) - self.assertEqual(server.configs[0][1:6], (1, 1280, 720, 1280, 736)) + self.assertEqual(done.stdout.split('\n')[:6], + ['1 0 bu 1', '2 1 cu 1', '3 2 du 1', '4 0 eu 1', '5 1 fu 1', '6 0 zu']) + self.assertEqual([c[1:6] for c in server.configs], + [(1, 1280, 720, 1280, 736), (1, 1280, 720, 1920, 1088)]) self.assertEqual([p[:3] for p in server.packets], - [(1, 101, 0), (2, 102, 1), (3, 103, 2), (0, 104, 0), (1, 105, 1)]) - self.assertEqual(len({p[3] for p in server.packets}), 5) + [(1, 101, 0), (2, 102, 1), (3, 103, 2), (0, 104, 0), (1, 105, 1), (2, 50, 0)]) def test_other_programs_keep_the_real_libdrm(self): with tempfile.TemporaryDirectory() as tmp: From 8749154cbf3974d6f9de7966ce2a106657b49ad7 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 21:11:46 -0400 Subject: [PATCH 116/135] fix(input): keep AYN system key out of Home shortcuts (#1643) --- .../droiddeck/launcher/input/HomeButtonService.kt | 3 ++- .../launcher/input/PadBridgeRoutingTest.kt | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt index f7d918bdf5..874d8fe583 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt @@ -37,7 +37,8 @@ object HomeButtonShortcuts { } fun onKeyEvent(context: Context, event: KeyEvent): Boolean { - if (event.keyCode != KeyEvent.KEYCODE_HOME) return false + // AYN maps its system-assistant key (gpio-keys KEY_F24) to HOME too; only the pad's Home is Guide. + if (event.keyCode != KeyEvent.KEYCODE_HOME || !PadBridge.isControllerKeyEvent(event)) return false return input.onKeyEvent(event, enabled() && HomeApp.isDefault(context)) } diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt index 1d2e1a10e8..a76da590a3 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt @@ -84,6 +84,20 @@ class PadBridgeRoutingTest { assertFalse(PadBridge.anyControllerConnected()) } + @Test fun homeShortcutsIgnoreHomeFromSystemKeys() { + val gpio = device(InputDevice.SOURCE_KEYBOARD, InputDevice.KEYBOARD_TYPE_NON_ALPHABETIC, name = "gpio-keys") + val pad = device(InputDevice.SOURCE_GAMEPAD or InputDevice.SOURCE_KEYBOARD, InputDevice.KEYBOARD_TYPE_NON_ALPHABETIC) + assertFalse(PadBridge.isControllerKeyEvent(key(gpio, KeyEvent.KEYCODE_HOME, KeyEvent.ACTION_DOWN))) + assertTrue(PadBridge.isControllerKeyEvent(key(pad, KeyEvent.KEYCODE_HOME, KeyEvent.ACTION_DOWN))) + val owner = Any() + HomeButtonShortcuts.attach(owner, { true }, { fail("system Home must not press Guide") }, {}) + try { + for (action in listOf(KeyEvent.ACTION_DOWN, KeyEvent.ACTION_UP)) { + assertFalse(HomeButtonShortcuts.onKeyEvent(RuntimeEnvironment.getApplication(), key(gpio, KeyEvent.KEYCODE_HOME, action))) + } + } finally { HomeButtonShortcuts.detach(owner) } + } + @Test fun keyAndMotionOwnershipDoesNotFollowEverySourceOnTheDevice() { val keyboard = device(InputDevice.SOURCE_KEYBOARD, InputDevice.KEYBOARD_TYPE_ALPHABETIC) val composite = device(COMPOSITE, InputDevice.KEYBOARD_TYPE_ALPHABETIC) From 0e9a31ccfe4fcce2828d067c7fa0e6db79badea5 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 22:54:57 -0400 Subject: [PATCH 117/135] feat: trust contributors for test builds (#1646) * feat: trust contributors for test builds * fix: restrict trusted list changes * fix: retain same-repository test signing * fix: publish completed fork builds * feat: trust K11MCH1 test builds * fix: recognize maintain collaborator role --- .github/trusted-test-builds.txt | 5 + .github/workflows/build.yml | 1 - .github/workflows/pr-release-publish.yml | 134 +++++++++++++++++------ tools/release/report-build.sh | 7 +- tools/release/validate_apk.py | 17 +++ tools/tests/test_validate_apk.py | 18 ++- 6 files changed, 144 insertions(+), 38 deletions(-) create mode 100644 .github/trusted-test-builds.txt diff --git a/.github/trusted-test-builds.txt b/.github/trusted-test-builds.txt new file mode 100644 index 0000000000..9b09f6132b --- /dev/null +++ b/.github/trusted-test-builds.txt @@ -0,0 +1,5 @@ +# GitHub PR openers trusted for automatic release-signed test builds. +FX192 +K11MCH1 +kingokksa +ovurrsl diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d39651c0b..0dd6d06d16 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -620,7 +620,6 @@ jobs: UNIT_TEST_OUTCOME: ${{ steps.unit-tests.outcome }} TEST_DIAGNOSTICS_URL: ${{ steps.unit-test-diagnostics.outputs.artifact-url }} APK_OUTCOME: ${{ steps.apk-upload.outcome }} - SAME_REPO: ${{ github.event.pull_request.head.repo.full_name == github.repository }} run: bash tools/release/report-build.sh python-tests: diff --git a/.github/workflows/pr-release-publish.yml b/.github/workflows/pr-release-publish.yml index dab96e0154..85f972a1b4 100644 --- a/.github/workflows/pr-release-publish.yml +++ b/.github/workflows/pr-release-publish.yml @@ -8,6 +8,10 @@ on: description: Open pull request number required: true type: string + automatic_build_run_id: + description: Completed build run for automatic publishing + required: false + type: string pull_request_target: types: [labeled] branches: [main] @@ -27,16 +31,47 @@ concurrency: queue: max jobs: + dispatch-fork-builds: + if: >- + github.event_name == 'workflow_run' && github.event.workflow_run.event == 'pull_request' && + github.event.workflow_run.conclusion == 'success' && + github.event.workflow_run.head_repository.full_name != github.repository + runs-on: ubuntu-24.04 + timeout-minutes: 5 + permissions: + actions: write + pull-requests: read + steps: + - name: Find fork PRs for the completed build + env: + GH_TOKEN: ${{ github.token }} + RUN_ID: ${{ github.event.workflow_run.id }} + RUN_SHA: ${{ github.event.workflow_run.head_sha }} + RUN_REPO: ${{ github.event.workflow_run.head_repository.full_name }} + RUN_BRANCH: ${{ github.event.workflow_run.head_branch }} + run: | + set -euo pipefail + owner=${RUN_REPO%%/*} + gh api --paginate --slurp -X GET "repos/$GITHUB_REPOSITORY/pulls" \ + -f state=open -f base=main -f "head=$owner:$RUN_BRANCH" -f per_page=100 | + jq -r --arg sha "$RUN_SHA" --arg repo "$RUN_REPO" --arg branch "$RUN_BRANCH" ' + .[][] | select(.head.sha == $sha and .head.repo.full_name == $repo and .head.ref == $branch) | .number' | + while IFS= read -r number; do + gh workflow run pr-release-publish.yml -R "$GITHUB_REPOSITORY" --ref main \ + -f "pr_number=$number" -f "automatic_build_run_id=$RUN_ID" + done + authorize: if: >- (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || - (github.event_name == 'pull_request_target' && github.event.label.name == 'publish-test') || + (github.event_name == 'pull_request_target' && + (github.event.action != 'labeled' || github.event.label.name == 'publish-test')) || (github.event_name == 'workflow_run' && github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_repository.full_name == github.repository && github.event.workflow_run.pull_requests[0] != null) runs-on: ubuntu-24.04 - timeout-minutes: 45 + timeout-minutes: 150 outputs: pr_number: ${{ steps.gate.outputs.pr_number }} run_id: ${{ steps.gate.outputs.run_id }} @@ -50,6 +85,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + fetch-depth: 0 persist-credentials: false - name: The packages a signed build ships as id: variants @@ -61,22 +97,14 @@ jobs: EVENT_NAME: ${{ github.event_name }} REQUESTER: ${{ github.actor }} PR_NUMBER: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.number || github.event_name == 'workflow_run' && github.event.workflow_run.pull_requests[0].number || inputs.pr_number }} + ACTION: ${{ github.event.action }} BUILT_SHA: ${{ github.event.workflow_run.head_sha }} + AUTO_RUN: ${{ inputs.automatic_build_run_id }} run: | set -euo pipefail [[ "$PR_NUMBER" =~ ^[1-9][0-9]*$ ]] || { echo "::error::Invalid PR number '$PR_NUMBER'"; exit 1; } skip() { echo "::notice::Not publishing PR #$PR_NUMBER: $1"; echo "skip=true" >> "$GITHUB_OUTPUT"; exit 0; } - if [ "$EVENT_NAME" = workflow_run ]; then - echo "automatic=true" >> "$GITHUB_OUTPUT" - pr=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER") - [ "$(jq -r .state <<<"$pr")" = open ] || skip "it is not open" - [ "$(jq -r .draft <<<"$pr")" = false ] || skip "it is a draft" - [ "$(jq -r .base.ref <<<"$pr")" = main ] || skip "it does not target main" - [ "$(jq -r .head.repo.full_name <<<"$pr")" = "$GITHUB_REPOSITORY" ] || skip "it comes from a fork" - jq -e 'any(.labels[]; .name == "no-test-build")' <<<"$pr" >/dev/null && skip "it is labelled no-test-build" - [ "$(jq -r .head.sha <<<"$pr")" = "$BUILT_SHA" ] || skip "a newer push is building" - fi - if [ "$EVENT_NAME" = pull_request_target ]; then + if [ "$EVENT_NAME" = pull_request_target ] && [ "$ACTION" = labeled ]; then permission=$(gh api "repos/$GITHUB_REPOSITORY/collaborators/$REQUESTER/permission" --jq .permission) case "$permission" in admin|maintain|write) ;; @@ -85,29 +113,59 @@ jobs: fi pr=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER") jq -e '.state == "open" and .draft == false and .base.ref == "main"' <<<"$pr" >/dev/null || - { echo "::error::PR #$PR_NUMBER must be open, ready for review, and target main"; exit 1; } + skip "it must be open, ready for review, and target main" + if [ "$EVENT_NAME" = workflow_run ]; then + [ "$(jq -r .head.repo.full_name <<<"$pr")" = "$GITHUB_REPOSITORY" ] || skip "it comes from a fork" + [ "$(jq -r .head.sha <<<"$pr")" = "$BUILT_SHA" ] || skip "a newer push is building" + jq -e 'any(.labels[]; .name == "no-test-build")' <<<"$pr" >/dev/null && skip "it is labelled no-test-build" + echo "automatic=true" >> "$GITHUB_OUTPUT" + elif [ "$EVENT_NAME" = workflow_dispatch ] && [ -n "$AUTO_RUN" ]; then + [[ "$AUTO_RUN" =~ ^[1-9][0-9]*$ ]] || { echo '::error::Invalid automatic build run ID'; exit 1; } + jq -e 'any(.labels[]; .name == "no-test-build")' <<<"$pr" >/dev/null && skip "it is labelled no-test-build" + git fetch --no-tags origin main + opener=$(jq -r .user.login <<<"$pr") + git show origin/main:.github/trusted-test-builds.txt | grep -Fixq -- "$opener" || skip "PR opener @$opener is not trusted for automatic signing" + echo "automatic=true" >> "$GITHUB_OUTPUT" + fi head=$(jq -r '.head.sha' <<<"$pr") base=$(jq -r '.base.sha' <<<"$pr") run_id= - for attempt in $(seq 1 60); do - latest=$(gh run list -R "$GITHUB_REPOSITORY" --workflow build.yml \ - --event pull_request --commit "$head" \ - --json databaseId,headSha,status,conclusion,createdAt,attempt -L 100 | - jq -c --arg head "$head" '[.[] | select(.headSha == $head)] | - sort_by([.createdAt, .attempt]) | last // empty') + for attempt in $(seq 1 240); do + latest=$(gh api "repos/$GITHUB_REPOSITORY/actions/workflows/build.yml/runs?event=pull_request&head_sha=$head&per_page=100" | + jq -c --arg head "$head" --arg repo "$(jq -r .head.repo.full_name <<<"$pr")" --arg ref "$(jq -r .head.ref <<<"$pr")" ' + [.workflow_runs[] | select(.head_sha == $head and .head_repository.full_name == $repo and .head_branch == $ref)] | + sort_by([.created_at, .run_attempt]) | last // empty') + if [[ -z "$latest" && "$attempt" == 1 ]]; then + git fetch --no-tags origin main + git fetch --no-tags origin "refs/pull/$PR_NUMBER/head" + git diff --no-renames --name-only -z "$base...FETCH_HEAD" > "$RUNNER_TEMP/pr-changed-paths" + excluded=true + while IFS= read -r -d '' path; do + case "$path" in + *.md|LICENSE|.gitignore) ;; + *) excluded=false; break ;; + esac + done < "$RUNNER_TEMP/pr-changed-paths" + [ "$excluded" = false ] || skip "its changes do not trigger the APK build" + fi if [[ -n "$latest" && $(jq -r .status <<<"$latest") == completed ]]; then conclusion=$(jq -r .conclusion <<<"$latest") - [[ "$conclusion" == success ]] || { echo "::error::The latest PR build is not green ($conclusion)"; exit 1; } - run_id=$(jq -r .databaseId <<<"$latest") - break + if [[ "$conclusion" == success ]]; then + run_id=$(jq -r .id <<<"$latest") + if [ -n "$AUTO_RUN" ] && [ "$run_id" != "$AUTO_RUN" ]; then + skip "a newer build exists" + fi + break + fi + [[ "$conclusion" == action_required ]] || { echo "::error::The latest PR build is not green ($conclusion)"; exit 1; } fi status=not-started [[ -z "$latest" ]] || status=$(jq -r .status <<<"$latest") echo "Waiting for the PR build of ${head:0:7} to finish ($status)" sleep 30 done - [[ -n "$run_id" ]] || { echo '::error::The PR build did not finish within 30 minutes'; exit 1; } + [[ -n "$run_id" ]] || { echo '::error::The PR build did not finish within 120 minutes'; exit 1; } run=$(gh api "repos/$GITHUB_REPOSITORY/actions/runs/$run_id") jq -e --arg head "$head" --arg repo "$(jq -r .head.repo.full_name <<<"$pr")" --arg ref "$(jq -r .head.ref <<<"$pr")" ' .event == "pull_request" and .head_sha == $head and .conclusion == "success" and @@ -137,6 +195,13 @@ jobs: .head.sha == $head and .base.sha == $base ' <<<"$current" >/dev/null || { echo "::error::PR #$PR_NUMBER moved on while its build was checked; publish again"; exit 1; } + if [ "$EVENT_NAME" = workflow_run ] || { [ "$EVENT_NAME" = workflow_dispatch ] && [ -n "$AUTO_RUN" ]; }; then + jq -e 'any(.labels[]; .name == "no-test-build")' <<<"$current" >/dev/null && skip "it is labelled no-test-build" + if [ "$EVENT_NAME" = workflow_dispatch ]; then + git fetch --no-tags origin main + git show origin/main:.github/trusted-test-builds.txt | grep -Fixq -- "$(jq -r .user.login <<<"$current")" || skip "the PR opener is no longer trusted" + fi + fi { echo "pr_number=$PR_NUMBER" echo "run_id=$run_id" @@ -271,17 +336,24 @@ jobs: echo "release=$release" >> "$GITHUB_OUTPUT" echo "apk=$GITHUB_SERVER_URL/$repo/releases/download/$tag/$apk" >> "$GITHUB_OUTPUT" - - name: Whether the PR's branch is in this repo - id: same-repo + - name: Whether the PR opener is trusted + id: trusted-opener env: GH_TOKEN: ${{ github.token }} PR_NUMBER: ${{ needs.authorize.outputs.pr_number }} run: | - head_repo=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER" --jq .head.repo.full_name) - echo "same=$([ "$head_repo" = "$GITHUB_REPOSITORY" ] && echo true || echo false)" >> "$GITHUB_OUTPUT" + pr=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER") + opener=$(jq -r .user.login <<<"$pr") + git fetch --no-tags origin main + if [ "$(jq -r .head.repo.full_name <<<"$pr")" = "$GITHUB_REPOSITORY" ] || + git show origin/main:.github/trusted-test-builds.txt | grep -Fixq -- "$opener"; then + echo "trusted=true" >> "$GITHUB_OUTPUT" + else + echo "trusted=false" >> "$GITHUB_OUTPUT" + fi - name: Clear the publish request label - if: ${{ github.event_name == 'pull_request_target' && steps.publish.outcome == 'success' }} + if: ${{ github.event_name == 'pull_request_target' && github.event.action == 'labeled' && steps.publish.outcome == 'success' }} env: GH_TOKEN: ${{ github.token }} PR_NUMBER: ${{ needs.authorize.outputs.pr_number }} @@ -295,12 +367,12 @@ jobs: HEAD_SHA: ${{ needs.authorize.outputs.head_sha }} RELEASE: ${{ steps.publish.outputs.release }} APK: ${{ steps.publish.outputs.apk }} - SAME_REPO: ${{ steps.same-repo.outputs.same }} + TRUSTED_OPENER: ${{ steps.trusted-opener.outputs.trusted }} run: | set -euo pipefail short=${HEAD_SHA:0:7} mark='<!-- droiddeck-pr-release -->' - if [ "$SAME_REPO" = true ]; then + if [ "$TRUSTED_OPENER" = true ]; then NEXT='Each green build of a new push is signed and published here on its own. Label the PR `no-test-build` to stop that.' else NEXT='Pushes to this PR do not re-sign automatically. After a new green build, a maintainer can add the `publish-test` label again.' diff --git a/tools/release/report-build.sh b/tools/release/report-build.sh index 75b16f666f..835bb6c65e 100644 --- a/tools/release/report-build.sh +++ b/tools/release/report-build.sh @@ -13,11 +13,8 @@ MARK="<!-- droiddeck-pr-build -->" echo echo "The \`droiddeck-apk\` artifact is [on this run]($RUN_URL), signed with the public test key." echo - if [ "$SAME_REPO" = true ]; then - echo "After the parallel regression tests pass, a release-signed tester build that installs over Stable or Preview will be published and will appear in DroidDeck's **Test builds** list. Label the PR \`no-test-build\` to skip that." - else - echo "**Maintainer:** add the \`publish-test\` label to publish a release-signed tester build that installs over Stable or Preview and appears in DroidDeck's **Test builds** list. The label is removed automatically after publishing." - fi + echo "Same-repository PRs and PRs opened by contributors listed in \`.github/trusted-test-builds.txt\` are eligible for automatic release-signed test builds after the full build passes. Label the PR \`no-test-build\` to skip that." + echo "For other PRs, a maintainer can add the \`publish-test\` label to request a signed build." echo echo "Fallback: [open **PR Release Publish**]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/workflows/pr-release-publish.yml) on \`main\` and enter PR \`$PR\`." ;; diff --git a/tools/release/validate_apk.py b/tools/release/validate_apk.py index 8ed51ebf19..5969b1ae8e 100644 --- a/tools/release/validate_apk.py +++ b/tools/release/validate_apk.py @@ -34,6 +34,22 @@ def documentation_only(sha): return all(path.endswith(b".md") or path in (b"LICENSE", b".gitignore") for path in paths if path) +def trusted_list_violation(repo, pr, sha): + changed = subprocess.run( + ["git", "diff", "--no-renames", "--quiet", f"origin/main...{sha}", "--", ".github/trusted-test-builds.txt"], + check=False, + ) + if changed.returncode not in (0, 1): + raise RuntimeError("Could not check trusted contributor changes") + if changed.returncode == 0: + return [] + opener = pr["user"]["login"] + permission = api(f"repos/{repo}/collaborators/{opener}/permission") + if permission["permission"] != "admin" and permission.get("role_name") != "maintain": + return [f"Only a maintainer may open a PR changing .github/trusted-test-builds.txt (opened by @{opener})"] + return [] + + def main(): with open(os.environ["GITHUB_EVENT_PATH"], encoding="utf-8") as source: event = json.load(source) @@ -76,6 +92,7 @@ def main(): commits, errors = check_revision(sha) if pr: errors.extend(event_violations({"pull_request": pr})) + errors.extend(trusted_list_violation(repo, pr, sha)) if errors: raise RuntimeError("\n".join(errors)) print(f"Source and metadata validated for {len(commits)} commits") diff --git a/tools/tests/test_validate_apk.py b/tools/tests/test_validate_apk.py index d197d74cff..448d969a91 100644 --- a/tools/tests/test_validate_apk.py +++ b/tools/tests/test_validate_apk.py @@ -28,7 +28,8 @@ class ValidateApkTest(unittest.TestCase): def git(self, *args): return subprocess.check_output(["git", "-C", self.root, *args], text=True).strip() - def validate(self, message="Source change", body="", result="success", stale=False, completed=False, filename="source.kt"): + def validate(self, message="Source change", body="", result="success", stale=False, completed=False, filename="source.kt", permission="write", role_name="write"): + (self.root / filename).parent.mkdir(parents=True, exist_ok=True) (self.root / filename).write_text(message) self.git("add", filename) self.git("commit", "--allow-empty", "-qm", message) @@ -42,6 +43,8 @@ class ValidateApkTest(unittest.TestCase): path.write_text(json.dumps(event)) def api(path, *args): + if path.endswith("/collaborators/human/permission"): + return {"permission": permission, "role_name": role_name} if "/statuses/" in path: self.statuses.append(dict(value.split("=", 1) for value in args if "=" in value)) return {} @@ -96,6 +99,19 @@ class ValidateApkTest(unittest.TestCase): self.validate(filename="README.md", result="pending") self.assertEqual(self.statuses[-1]["state"], "success") + def test_trusted_list_requires_maintainer_pr_opener(self): + with self.assertRaisesRegex(RuntimeError, "Only a maintainer"): + self.validate(filename=".github/trusted-test-builds.txt") + self.assertEqual(self.statuses[-1]["state"], "failure") + + def test_maintainer_can_change_trusted_list(self): + self.validate(filename=".github/trusted-test-builds.txt", permission="write", role_name="maintain") + self.assertEqual(self.statuses[-1]["state"], "success") + + def test_admin_can_change_trusted_list(self): + self.validate(filename=".github/trusted-test-builds.txt", permission="admin", role_name="admin") + self.assertEqual(self.statuses[-1]["state"], "success") + def test_renaming_code_to_documentation_still_requires_compilation(self): (self.root / "source.kt").write_text("source") self.git("add", "source.kt") From 4c7e59ed8b58c570e6b8220c356dad39e9a34ad3 Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Mon, 26 Oct 2026 23:17:35 -0400 Subject: [PATCH 118/135] feat: Steam's Frame Limit decides; gamescope and the limit follow the refresh rate (#1650) Remove the Performance mode switch. The session always runs the way Performance mode did: replaced buffers go back to the game at once (except while mirroring to glasses), gamescope's WSI layer and winex11 reuse their per-present window checks, and games get eight swapchain images while uncapped. Steam's Frame Limit in the Quick Access menu is the only limit. gamescope 3.16.29-p15 (p14 plus two patches): - 0119: with the Frame Limit on, gamescope forces FIFO while the WSI layer hands the driver MAILBOX, so a game with eight images could queue up to seven frames ahead of the screen. While the limiter forces FIFO the layer uses its default of 3 images; DXVK and VKD3D-Proton recreate their swapchain when the limiter changes, other apps are asked to with VK_SUBOPTIMAL_KHR. - 0120: -r fixed gamescope's pacing and limiter rate for the whole session. With GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST=1 a rate the host has reported for 300 ms replaces it (a switch from 144 to 120 Hz passes through 72 Hz for a few frames), and Steam gets the display information again. The session sets it whenever it passes -r. Steam keeps its Frame Limit as the client setting gamescope_app_target_framerate and offers the values gamescope's display state lists. After a refresh change, a limit the new rate does not offer (72 at 120 Hz) left the slider on its first value while the game kept the old limit. The Steam helper watches the offered values and, once they settle, keeps the limit when it is still offered and moves it to the highest value otherwise, through Steam's own setting so the slider shows it. Steam's webpack does not expose its module cache, so the gamescope service is found by the calls its module makes, and the helper retries the install every 10 s until Steam is ready. The session window asks for the fastest mode the peak refresh setting allows and chose again only when the display changed, so after it had asked for 60 Hz, raising Android's refresh setting left the display, gamescope and the limit at 60. It now also chooses again when peak_refresh_rate or min_refresh_rate changes. --- app/src/main/cpp/waylandcomp/src/compositor.c | 2 +- .../droiddeck/launcher/FrontEndActivity.kt | 5 +- .../com/droiddeck/launcher/SessionActivity.kt | 21 ++-- .../launcher/session/SessionPrefs.kt | 19 +-- .../launcher/session/SessionService.kt | 17 ++- .../launcher/session/SessionState.kt | 3 - .../launcher/ui/ModeSettingsDialog.kt | 6 - app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-b+es+419/strings.xml | 1 - app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-in/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-ms/strings.xml | 1 - app/src/main/res/values-nb/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rHK/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 3 - .../glasses/GlassesMirrorPacingTest.kt | 26 ++-- .../launcher/session/OutputPacingTest.kt | 14 +++ .../launcher/session/PerformanceModeTest.kt | 36 ------ tools/gamescope/PATCHES.md | 39 +++++- ...119-wsi-default-images-under-limiter.patch | 59 +++++++++ .../0120-nested-refresh-follows-host.patch | 95 ++++++++++++++ tools/gamescope/release.env | 4 +- .../overlay/usr/local/bin/droiddeck-session | 2 + .../usr/local/bin/droiddeck-steam-compat | 86 +++++++++++++ tools/tests/test_device_controls.py | 1 + tools/tests/test_frame_limit_sync.py | 118 ++++++++++++++++++ tools/tests/test_session_pacing.py | 11 +- 52 files changed, 466 insertions(+), 133 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/OutputPacingTest.kt delete mode 100644 app/src/test/java/com/droiddeck/launcher/session/PerformanceModeTest.kt create mode 100644 tools/gamescope/patches/0119-wsi-default-images-under-limiter.patch create mode 100644 tools/gamescope/patches/0120-nested-refresh-follows-host.patch create mode 100644 tools/tests/test_frame_limit_sync.py diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 02477724be..d84e73de52 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -268,7 +268,7 @@ static struct wl_event_source *g_fallback_timer; static int g_fallback_armed; volatile int g_fps_limit; -/* fps limit -1 (Performance mode without a limit): replaced buffers go back to the client at once instead of once per refresh. */ +/* fps limit -1 (phone output, not mirrored): replaced buffers go back to the client at once instead of once per refresh. */ volatile int g_release_unpaced; volatile int g_hide_shell; diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index a41457d92c..a8998197bf 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -461,7 +461,6 @@ class FrontEndActivity : ComponentActivity() { private var theme by mutableStateOf("graphite") private var appScale by mutableStateOf(com.droiddeck.launcher.core.AppUiPrefs.DEFAULT_SCALE) private var hdrOn by mutableStateOf(false) - private var performanceMode by mutableStateOf(false) private var upscaler by mutableStateOf(0) private var upscaleSharpness by mutableStateOf(75) private var hdrReason by mutableStateOf<String?>(null) @@ -1886,7 +1885,7 @@ class FrontEndActivity : ComponentActivity() { ModeSettings( mode = mode, resolution = resolution, panelSize = com.droiddeck.launcher.session.SessionDisplay.panelSize(this), - hdr = hdrOn, hdrReason = hdrReason, performanceMode = performanceMode, + hdr = hdrOn, hdrReason = hdrReason, upscaler = upscaler, upscaleSharpness = upscaleSharpness, gpuDrivers = drivers.summary(), touchMode = touchMode, @@ -1935,7 +1934,6 @@ class FrontEndActivity : ComponentActivity() { onResolution = { value -> SessionPrefs.setResolutionChoice(this, mode, value); resolution = value }, onHdr = { on -> SessionPrefs.setHdr(this, mode, on); hdrOn = on }, onGpuDrivers = { openComponents(focusContent = true, tab = com.droiddeck.launcher.ui.GPU_TAB) }, - onPerformanceMode = { on -> SessionPrefs.setPerformanceMode(this, mode, on); performanceMode = on }, onUpscaler = { m -> SessionPrefs.setUpscaler(this, m); upscaler = m }, onUpscaleSharpness = { pct -> SessionPrefs.setUpscaleSharpness(this, pct); upscaleSharpness = pct }, onTouch = { t -> SessionPrefs.setTouchMode(this, t); touchMode = t }, @@ -2186,7 +2184,6 @@ class FrontEndActivity : ComponentActivity() { runSteamAtStartup = SessionPrefs.runSteamAtStartup(this) loadBootMovie() hdrOn = SessionPrefs.hdr(this, mode) - performanceMode = SessionPrefs.performanceMode(this, mode) upscaler = SessionPrefs.upscaler(this) upscaleSharpness = SessionPrefs.upscaleSharpness(this) hdrReason = com.droiddeck.launcher.wayland.HdrSupport.probe(this).reason diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 501024b968..6ee14aacfc 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -9,6 +9,7 @@ import android.content.Intent import android.os.Build import android.os.Bundle import android.os.Environment +import android.database.ContentObserver import android.os.Handler import android.os.Looper import android.os.SystemClock @@ -432,6 +433,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } + // A higher refresh rate allowed in Android's settings does not change the display while this window + // still asks for a lower mode, so the mode is chosen again when the setting changes. + private val refreshSettingObserver = object : ContentObserver(Handler(Looper.getMainLooper())) { + override fun onChange(selfChange: Boolean) { + applyOutputPacing() + } + } + private fun followPanelRefresh(displayId: Int) { if (!CompositorHost.isStarted) return val output = glassesScreen?.display @@ -498,10 +507,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } com.droiddeck.launcher.gpu.SteamVrHealth.begin(this, SessionState.sessionId) window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) - if (!SessionState.running) { - val prefMode = SessionPrefs.prefMode(intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM) - SessionState.performanceMode = SessionPrefs.performanceMode(this, prefMode) - } applyOutputPacing() if (!SessionState.running) SessionState.followScreen = followChoice() applyFollowOrientation(resources.configuration) @@ -1999,9 +2004,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun mirrorRefreshLimit(): Int = GlassesRendering.mirrorRefreshLimit(glassesSettings, glasses, glassesScreen != null) - private fun outputFpsLimit(): Int = SessionPrefs.compositorFpsLimit( - mirrorRefreshLimit(), SessionState.performanceMode, - ) + private fun outputFpsLimit(): Int = SessionPrefs.compositorFpsLimit(mirrorRefreshLimit()) private fun applyOutputPacing() { Log.i(TAG, "perf: " + PerfMode.apply(this, outputFpsLimit(), mirrorRefreshLimit())) @@ -3210,6 +3213,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { started = true refreshActivityDisplayId() displayManager.registerDisplayListener(displayListener, Handler(Looper.getMainLooper())) + for (name in arrayOf("peak_refresh_rate", "min_refresh_rate")) { + contentResolver.registerContentObserver(android.provider.Settings.System.getUriFor(name), false, refreshSettingObserver) + } refreshSecondScreenDisplays() if (secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode) startedScreens++ @@ -3224,6 +3230,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { started = false updateHandCamera() displayManager.unregisterDisplayListener(displayListener) + contentResolver.unregisterContentObserver(refreshSettingObserver) closeSecondScreen(reset = false) startedScreens = (startedScreens - 1).coerceAtLeast(0) updateGlassesScreen() 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 92163226f8..592bf42cf9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -938,22 +938,15 @@ object SessionPrefs { prefs(context).edit().putBoolean("hdr.$mode", on).apply() } - /** - * Performance mode: buffers go back to the game as soon as they are replaced - * instead of once per refresh, and gamescope's WSI layer and winex11 reuse their per-present window checks. - */ - fun performanceMode(context: Context, mode: String): Boolean = prefs(context).getBoolean("performanceMode.$mode", false) - - fun setPerformanceMode(context: Context, mode: String, on: Boolean) { - prefs(context).edit().putBoolean("performanceMode.$mode", on).apply() - } - /** Compositor frame limit that releases buffers to the game unpaced. */ const val FPS_UNPACED = -1 - /** Mirroring still follows the glasses' refresh rate when Performance mode is on. */ - fun compositorFpsLimit(mirrorRefreshLimit: Int, performanceMode: Boolean): Int = - if (performanceMode && mirrorRefreshLimit <= 0) FPS_UNPACED else mirrorRefreshLimit + /** + * Buffers go back to the game as soon as they are replaced instead of once per refresh; + * Steam's Frame Limit in the Quick Access menu caps games. Mirroring still follows the glasses' refresh rate. + */ + fun compositorFpsLimit(mirrorRefreshLimit: Int): Int = + if (mirrorRefreshLimit <= 0) FPS_UNPACED else mirrorRefreshLimit val upscalerChoices = listOf( 0 to "Linear", 2 to "Nearest", 4 to "AMD FSR 1", 3 to "Snapdragon GSR", 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 be9795042a..445b2da05d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -507,16 +507,13 @@ class SessionService : Service() { guest.add("DXVK_HDR=1") Log.i(TAG, "hdr: gamescope --hdr-enabled, DXVK_HDR=1") } - // gamescope's WSI layer and winex11 reuse their per-present window checks for this long; 0 checks on every present. - val windowCheckMs = if (SessionState.performanceMode) 100 else 0 - guest.add("DROIDDECK_WSI_BYPASS_CHECK_MS=$windowCheckMs") - guest.add("WINE_OFFSCREEN_CHECK_MS=$windowCheckMs") - if (SessionState.performanceMode) { - // gamescope turns buffers around slower than an unpaced game draws; more images keep it drawing. - guest.add("GAMESCOPE_WSI_MIN_IMAGE_COUNT=8") - guest.add("GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT=1") - } - Log.i(TAG, "performance mode " + (if (SessionState.performanceMode) "on" else "off")) + // gamescope's WSI layer and winex11 reuse their per-present window checks for this long. + guest.add("DROIDDECK_WSI_BYPASS_CHECK_MS=100") + guest.add("WINE_OFFSCREEN_CHECK_MS=100") + // gamescope turns buffers around slower than an uncapped game draws; more images keep it drawing. + // The WSI layer goes back to its default count while Steam's Frame Limit holds the game. + guest.add("GAMESCOPE_WSI_MIN_IMAGE_COUNT=8") + guest.add("GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT=1") guest.add("BL_REFRESH=" + Math.round(SessionState.refreshHz)) guest.add("BL_LOG=" + sessionLog.path) guest.add("BL_DEBUG_DIR=" + sessionDir.path) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt index bb1ea39238..52544f2fc0 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -103,9 +103,6 @@ object SessionState { @Volatile var upscaleRatio: Float = 0f - @Volatile - var performanceMode = false - @Volatile var firstFrameSeen = false 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 1e07f6c47f..9c24f551cb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -60,7 +60,6 @@ class ModeSettings( val hdr: Boolean, val hdrReason: String?, val gpuDrivers: String? = null, - val performanceMode: Boolean = false, val upscaler: Int = 0, val upscaleSharpness: Int = 75, val touchMode: String, @@ -112,7 +111,6 @@ class ModeSettingsActions( val onResolution: (String) -> Unit, val onHdr: (Boolean) -> Unit, val onGpuDrivers: () -> Unit = {}, - val onPerformanceMode: (Boolean) -> Unit = {}, val onUpscaler: (Int) -> Unit = {}, val onUpscaleSharpness: (Int) -> Unit = {}, val onTouch: (String) -> Unit, @@ -244,10 +242,6 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: format = { "$it%" }, onChange = a.onUpscaleSharpness, ) } - SettingsGroup(stringResource(R.string.display_frame_rate)) { - ToggleRow(host, "performance", stringResource(R.string.mode_performance), stringResource(R.string.mode_performance_hint), - s.performanceMode, onChange = a.onPerformanceMode) - } SettingsGroup(stringResource(R.string.mode_hdr)) { ToggleRow( host, "hdr", stringResource(R.string.mode_hdr10), diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 68dcfe1806..f78cf3014d 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2025,7 +2025,6 @@ <string name="display_filter_live">يُطبَّق فوريًا. مشترك بين Steam وسطح المكتب.</string> <string name="display_filter_note">تُطبَّق FSR و GSR و NIS عند تكبير صورة الجلسة. ويعمل خيار «زيادة الحدة فقط» أيضًا دون تكبير.</string> <string name="display_sharpness">حدّة المرشِّح</string> - <string name="display_frame_rate">معدّل الإطارات</string> <string name="display_look_filter">%1$s يضبط أسلوب التكبير على %2$s.</string> <string name="display_match_screen">مطابقة الشاشة (%1$d×%2$d)</string> <string name="display_follow_screen">اتباع الشاشة (يُغيَّر الحجم عند الطي أو الفتح)</string> diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 413588da65..09e76582e9 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1994,7 +1994,6 @@ <string name="display_filter_live">Se aplica al instante. Compartido por Steam y Escritorio.</string> <string name="display_filter_note">FSR, GSR y NIS se aplican al ampliar la imagen de la sesión. Solo nitidez también funciona sin ampliar.</string> <string name="display_sharpness">Nitidez del filtro</string> - <string name="display_frame_rate">Velocidad de fotogramas</string> <string name="display_look_filter">%1$s Cambia el escalado a %2$s.</string> <string name="display_match_screen">Igual a la pantalla (%1$d×%2$d)</string> <string name="display_follow_screen">Seguir la pantalla (cambia de tamaño al plegar o desplegar)</string> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 3429ff0ecf..314b01f305 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1941,7 +1941,6 @@ <string name="display_filter_live">Прилага се веднага. Общ за Steam и Desktop.</string> <string name="display_filter_note">FSR, GSR и NIS се прилагат при уголемяване на изображението на сесията. „Само изостряне“ работи и без уголемяване.</string> <string name="display_sharpness">Острота на филтъра</string> - <string name="display_frame_rate">Честота на кадрите</string> <string name="display_look_filter">%1$s Задава мащабиране на %2$s.</string> <string name="display_match_screen">Напасване на екрана (%1$d×%2$d)</string> <string name="display_follow_screen">Следване на екрана (преоразмерява при сгъване или разгъване)</string> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 3c41609da3..e0278767d6 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1983,7 +1983,6 @@ <string name="display_filter_live">Použije se okamžitě. Sdíleno Steamem a Plochou.</string> <string name="display_filter_note">FSR, GSR a NIS se použijí při zvětšování obrazu relace. Jen zaostření funguje i bez zvětšení.</string> <string name="display_sharpness">Ostrost filtru</string> - <string name="display_frame_rate">Snímková frekvence</string> <string name="display_look_filter">%1$s Nastaví škálování na %2$s.</string> <string name="display_match_screen">Podle obrazovky (%1$d×%2$d)</string> <string name="display_follow_screen">Sledovat obrazovku (změní velikost při složení nebo rozložení)</string> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 166786e068..789cbc762d 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1941,7 +1941,6 @@ <string name="display_filter_live">Træder i kraft øjeblikkeligt. Deles af Steam og Desktop.</string> <string name="display_filter_note">FSR, GSR og NIS anvendes ved forstørrelse af sessionsbilledet. Kun skærpning virker også uden forstørrelse.</string> <string name="display_sharpness">Filterskarphed</string> - <string name="display_frame_rate">Billedfrekvens</string> <string name="display_look_filter">%1$s Indstiller skalering til %2$s.</string> <string name="display_match_screen">Match skærm (%1$d×%2$d)</string> <string name="display_follow_screen">Følg skærm (ændrer størrelse ved fold/udfold)</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 76d7e59bc3..1ddc2655d3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1933,7 +1933,6 @@ <string name="display_filter_live">Wirkt sofort. Gemeinsam für Steam und Desktop.</string> <string name="display_filter_note">FSR, GSR und NIS wirken beim Vergrößern des Sitzungsbilds. „Nur schärfen“ funktioniert auch ohne Vergrößerung.</string> <string name="display_sharpness">Filterschärfe</string> - <string name="display_frame_rate">Bildrate</string> <string name="display_look_filter">%1$s Stellt die Skalierung auf %2$s.</string> <string name="display_match_screen">An Bildschirm anpassen (%1$d×%2$d)</string> <string name="display_follow_screen">Bildschirm folgen (passt sich beim Auf- und Zuklappen an)</string> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 266eeb6fd1..85e3befcd8 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1941,7 +1941,6 @@ <string name="display_filter_live">Εφαρμόζεται σε πραγματικό χρόνο. Κοινό για το Steam και την Επιφάνεια εργασίας.</string> <string name="display_filter_note">Τα FSR, GSR και NIS εφαρμόζονται κατά τη μεγέθυνση της εικόνας συνεδρίας. Το Μόνο όξυνση λειτουργεί και χωρίς μεγέθυνση.</string> <string name="display_sharpness">Οξύτητα φίλτρου</string> - <string name="display_frame_rate">Καρέ ανά δευτερόλεπτο</string> <string name="display_look_filter">%1$s Ορίζει την κλιμάκωση σε %2$s.</string> <string name="display_match_screen">Αντιστοίχιση οθόνης (%1$d×%2$d)</string> <string name="display_follow_screen">Ακολούθηση οθόνης (αλλάζει μέγεθος όταν διπλώνει ή ξεδιπλώνει)</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 196207fb1b..f6d49f6f92 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1964,7 +1964,6 @@ <string name="display_filter_live">Se aplica al instante. Compartido por Steam y Escritorio.</string> <string name="display_filter_note">FSR, GSR y NIS se aplican al ampliar la imagen de la sesión. Solo nitidez también funciona sin ampliar.</string> <string name="display_sharpness">Nitidez del filtro</string> - <string name="display_frame_rate">Velocidad de fotogramas</string> <string name="display_look_filter">%1$s Cambia el escalado a %2$s.</string> <string name="display_match_screen">Igual a la pantalla (%1$d×%2$d)</string> <string name="display_follow_screen">Seguir la pantalla (cambia de tamaño al plegar o desplegar)</string> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index ffe2199025..79737e2e0f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1941,7 +1941,6 @@ <string name="display_filter_live">Vaikuttaa välittömästi. Yhteinen Steamille ja Työpöydälle.</string> <string name="display_filter_note">FSR, GSR ja NIS vaikuttavat, kun istunnon kuvaa suurennetaan. Vain terävöinti toimii myös suurentamatta.</string> <string name="display_sharpness">Suodattimen terävyys</string> - <string name="display_frame_rate">Kuvanopeus</string> <string name="display_look_filter">%1$s Asettaa skaalauksen tilaan %2$s.</string> <string name="display_match_screen">Sovita näyttöön (%1$d×%2$d)</string> <string name="display_follow_screen">Seuraa näyttöä (koko muuttuu taitettuna tai avattuna)</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 79f4a85cd9..97cb78aa59 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1964,7 +1964,6 @@ <string name="display_filter_live">S\'applique en direct. Partagé entre Steam et le bureau.</string> <string name="display_filter_note">FSR, GSR et NIS s\'appliquent lors de l\'agrandissement de l\'image de la session. « Netteté seule » fonctionne aussi sans agrandissement.</string> <string name="display_sharpness">Netteté du filtre</string> - <string name="display_frame_rate">Fréquence d\'images</string> <string name="display_look_filter">%1$s Règle la mise à l\'échelle sur %2$s.</string> <string name="display_match_screen">Adapter à l\'écran (%1$d×%2$d)</string> <string name="display_follow_screen">Suivre l\'écran (s\'adapte au pliage et au dépliage)</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 858b138591..a1edf261e0 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1941,7 +1941,6 @@ <string name="display_filter_live">लाइव लागू होता है। Steam और डेस्कटॉप में साझा।</string> <string name="display_filter_note">FSR, GSR और NIS सेशन इमेज को बड़ा करने पर लागू होते हैं। सिर्फ़ शार्पन बिना बड़ा किए भी काम करता है।</string> <string name="display_sharpness">फ़िल्टर शार्पनेस</string> - <string name="display_frame_rate">फ़्रेम रेट</string> <string name="display_look_filter">%1$s स्केलिंग को %2$s पर सेट करता है।</string> <string name="display_match_screen">स्क्रीन से मिलाएँ (%1$d×%2$d)</string> <string name="display_follow_screen">Follow screen (खुलने या बंद होने पर आकार बदलता है)</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index b68fb6a5fd..747b7ed5c1 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1941,7 +1941,6 @@ <string name="display_filter_live">Élőben érvénybe lép. A Steam és az Asztal közösen használja.</string> <string name="display_filter_note">Az FSR, a GSR és a NIS a munkamenet képének felnagyításakor lép érvénybe. A Csak élesítés nagyítás nélkül is működik.</string> <string name="display_sharpness">Szűrőélesség</string> - <string name="display_frame_rate">Képkockasebesség</string> <string name="display_look_filter">%1$s A méretezést erre állítja: %2$s.</string> <string name="display_match_screen">Képernyőhöz illesztés (%1$d×%2$d)</string> <string name="display_follow_screen">Képernyő követése (átméreteződik össze- vagy kinyitáskor)</string> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 8f2661e2ac..79291d8e70 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1920,7 +1920,6 @@ <string name="display_filter_live">Berlaku langsung. Digunakan bersama oleh Steam dan Desktop.</string> <string name="display_filter_note">FSR, GSR, dan NIS berlaku saat memperbesar gambar sesi. Hanya penajaman juga berfungsi tanpa pembesaran.</string> <string name="display_sharpness">Ketajaman filter</string> - <string name="display_frame_rate">Frame rate</string> <string name="display_look_filter">%1$s Mengatur skala ke %2$s.</string> <string name="display_match_screen">Sesuaikan layar (%1$d×%2$d)</string> <string name="display_follow_screen">Ikuti layar (ukuran berubah saat dilipat atau dibuka)</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9c3628c8e6..bbe5351461 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1954,7 +1954,6 @@ <string name="display_filter_live">Si applica subito. Condiviso da Steam e Desktop.</string> <string name="display_filter_note">FSR, GSR e NIS si applicano quando l\'immagine della sessione viene ingrandita. Solo nitidezza funziona anche senza ingrandimento.</string> <string name="display_sharpness">Nitidezza del filtro</string> - <string name="display_frame_rate">Frequenza fotogrammi</string> <string name="display_look_filter">%1$s Imposta il ridimensionamento su %2$s.</string> <string name="display_match_screen">Adatta allo schermo (%1$d×%2$d)</string> <string name="display_follow_screen">Segui lo schermo (si ridimensiona quando lo pieghi o lo apri)</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b75b63bc7f..19f6dbfaee 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1922,7 +1922,6 @@ <string name="display_filter_live">すぐに反映されます。Steamとデスクトップで共有されます。</string> <string name="display_filter_note">FSR、GSR、NISはセッションの映像を拡大するときに機能します。「シャープのみ」は拡大しなくても機能します。</string> <string name="display_sharpness">フィルターのシャープネス</string> - <string name="display_frame_rate">フレームレート</string> <string name="display_look_filter">%1$s スケーリングを%2$sに設定します。</string> <string name="display_match_screen">画面に合わせる(%1$d×%2$d)</string> <string name="display_follow_screen">画面に追従(開閉時にサイズを変更)</string> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index cb0648a4ff..9163a3a7d7 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1922,7 +1922,6 @@ <string name="display_filter_live">즉시 적용됩니다. Steam과 데스크톱에서 공유됩니다.</string> <string name="display_filter_note">FSR, GSR, NIS는 세션 이미지를 확대할 때 적용됩니다. 샤프닝 전용은 확대하지 않아도 작동합니다.</string> <string name="display_sharpness">필터 선명도</string> - <string name="display_frame_rate">프레임 속도</string> <string name="display_look_filter">%1$s 스케일링을 %2$s(으)로 설정합니다.</string> <string name="display_match_screen">화면에 맞춤(%1$d×%2$d)</string> <string name="display_follow_screen">화면 따라가기(접거나 펼치면 크기 변경)</string> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 88b80ac4b7..eb41beb9b0 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1920,7 +1920,6 @@ <string name="display_filter_live">Berkuat kuasa secara langsung. Dikongsi oleh Steam dan Desktop.</string> <string name="display_filter_note">FSR, GSR dan NIS berkuat kuasa semasa membesarkan imej sesi. Ketajaman sahaja juga berfungsi tanpa pembesaran.</string> <string name="display_sharpness">Ketajaman penapis</string> - <string name="display_frame_rate">Kadar bingkai</string> <string name="display_look_filter">%1$s Menetapkan penskalaan ke %2$s.</string> <string name="display_match_screen">Sepadan skrin (%1$d×%2$d)</string> <string name="display_follow_screen">Ikut skrin (mengubah saiz apabila dilipat atau dibuka)</string> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 89be0988d8..75653c225f 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1941,7 +1941,6 @@ <string name="display_filter_live">Gjelder live. Delt av Steam og Skrivebord.</string> <string name="display_filter_note">FSR, GSR og NIS gjelder ved forstørring av sesjonsbildet. Bare skarphet fungerer også uten forstørring.</string> <string name="display_sharpness">Filterskarphet</string> - <string name="display_frame_rate">Bildefrekvens</string> <string name="display_look_filter">%1$s Setter skalering til %2$s.</string> <string name="display_match_screen">Tilpass skjerm (%1$d×%2$d)</string> <string name="display_follow_screen">Følg skjermen (endrer størrelse ved sammenslåing eller utbretting)</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 8d0891046a..53748c36ab 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1941,7 +1941,6 @@ <string name="display_filter_live">Wordt direct toegepast. Gedeeld door Steam en Desktop.</string> <string name="display_filter_note">FSR, GSR en NIS worden toegepast bij het vergroten van het sessiebeeld. Alleen verscherpen werkt ook zonder vergroting.</string> <string name="display_sharpness">Filterscherpte</string> - <string name="display_frame_rate">Framerate</string> <string name="display_look_filter">%1$s Zet schaling op %2$s.</string> <string name="display_match_screen">Schermformaat (%1$d×%2$d)</string> <string name="display_follow_screen">Scherm volgen (past formaat aan bij vouwen of uitvouwen)</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 3065d3644c..37619c513a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1983,7 +1983,6 @@ <string name="display_filter_live">Działa od razu. Wspólny dla Steam i Pulpitu.</string> <string name="display_filter_note">FSR, GSR i NIS działają przy powiększaniu obrazu sesji. „Tylko wyostrzanie” działa też bez powiększania.</string> <string name="display_sharpness">Ostrość filtra</string> - <string name="display_frame_rate">Liczba klatek</string> <string name="display_look_filter">%1$s Ustawia skalowanie na %2$s.</string> <string name="display_match_screen">Dopasuj do ekranu (%1$d×%2$d)</string> <string name="display_follow_screen">Dopasuj do ekranu (zmienia rozmiar po złożeniu lub rozłożeniu)</string> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 4043426b48..177799c1a2 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1954,7 +1954,6 @@ <string name="display_filter_live">Aplica-se em tempo real. Partilhado pelo Steam e pelo Ambiente de trabalho.</string> <string name="display_filter_note">FSR, GSR e NIS aplicam-se ao ampliar a imagem da sessão. «Só nitidez» também funciona sem ampliação.</string> <string name="display_sharpness">Nitidez do filtro</string> - <string name="display_frame_rate">Taxa de fotogramas</string> <string name="display_look_filter">%1$s Define a escala como %2$s.</string> <string name="display_match_screen">Igual ao ecrã (%1$d×%2$d)</string> <string name="display_follow_screen">Seguir o ecrã (redimensiona ao dobrar ou desdobrar)</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 9f37ed2c7e..2bdda9aacd 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1954,7 +1954,6 @@ <string name="display_filter_live">Aplicado na hora. Compartilhado entre Steam e Área de trabalho.</string> <string name="display_filter_note">FSR, GSR e NIS são aplicados ao ampliar a imagem da sessão. Só nitidez também funciona sem ampliação.</string> <string name="display_sharpness">Nitidez do filtro</string> - <string name="display_frame_rate">Taxa de quadros</string> <string name="display_look_filter">%1$s Define a escala como %2$s.</string> <string name="display_match_screen">Igual à tela (%1$d×%2$d)</string> <string name="display_follow_screen">Seguir a tela (redimensiona ao dobrar ou desdobrar)</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index ddfca2fbcd..49a0503c69 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1962,7 +1962,6 @@ <string name="display_filter_live">Se aplică live. Partajat de Steam și Desktop.</string> <string name="display_filter_note">FSR, GSR și NIS se aplică la mărirea imaginii sesiunii. Doar claritate funcționează și fără mărire.</string> <string name="display_sharpness">Claritatea filtrului</string> - <string name="display_frame_rate">Rata de cadre</string> <string name="display_look_filter">%1$s Setează scalarea la %2$s.</string> <string name="display_match_screen">Potrivire ecran (%1$d×%2$d)</string> <string name="display_follow_screen">Urmărește ecranul (se redimensionează la împăturire sau desfacere)</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 040315b9aa..b4d440f2c9 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1985,7 +1985,6 @@ <string name="display_filter_live">Применяется сразу. Общий для Steam и рабочего стола.</string> <string name="display_filter_note">FSR, GSR и NIS работают при увеличении изображения сессии. «Sharpen only» работает и без увеличения.</string> <string name="display_sharpness">Резкость фильтра</string> - <string name="display_frame_rate">Частота кадров</string> <string name="display_look_filter">%1$s Устанавливает масштабирование: %2$s.</string> <string name="display_match_screen">По размеру экрана (%1$d×%2$d)</string> <string name="display_follow_screen">По экрану (меняется при складывании и раскладывании)</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 8a379c5763..35c26e8f21 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1941,7 +1941,6 @@ <string name="display_filter_live">Tillämpas direkt. Delas av Steam och skrivbordet.</string> <string name="display_filter_note">FSR, GSR och NIS tillämpas när sessionens bild förstoras. Endast skärpa fungerar även utan förstoring.</string> <string name="display_sharpness">Filterskärpa</string> - <string name="display_frame_rate">Bildfrekvens</string> <string name="display_look_filter">%1$s Ställer in skalning till %2$s.</string> <string name="display_match_screen">Matcha skärmen (%1$d×%2$d)</string> <string name="display_follow_screen">Följ skärmen (ändrar storlek vid vikning)</string> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index d572994fb8..348740686b 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1920,7 +1920,6 @@ <string name="display_filter_live">มีผลทันที ใช้ร่วมกันระหว่าง Steam และเดสก์ท็อป</string> <string name="display_filter_note">FSR, GSR และ NIS จะมีผลเมื่อขยายภาพของเซสชัน เพิ่มความคมชัดเท่านั้นทำงานได้โดยไม่ต้องขยายภาพด้วย</string> <string name="display_sharpness">ความคมชัดของตัวกรอง</string> - <string name="display_frame_rate">อัตราเฟรม</string> <string name="display_look_filter">%1$s ตั้งการปรับขนาดเป็น %2$s</string> <string name="display_match_screen">พอดีหน้าจอ (%1$d×%2$d)</string> <string name="display_follow_screen">ตามหน้าจอ (ปรับขนาดเมื่อพับหรือกาง)</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 48a1113594..78cdc1f700 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1935,7 +1935,6 @@ <string name="display_filter_live">Anında uygulanır. Steam ve Masaüstü tarafından paylaşılır.</string> <string name="display_filter_note">FSR, GSR ve NIS, oturum görüntüsü büyütülürken uygulanır. Yalnızca keskinleştirme büyütme olmadan da çalışır.</string> <string name="display_sharpness">Filtre keskinliği</string> - <string name="display_frame_rate">Kare hızı</string> <string name="display_look_filter">%1$s Ölçeklemeyi %2$s olarak ayarlar.</string> <string name="display_match_screen">Ekrana Uydur (%1$d×%2$d)</string> <string name="display_follow_screen">Ekranı takip et (katlanıp açıldığında yeniden boyutlanır)</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index fdc4aca60d..050fd0fdcf 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1983,7 +1983,6 @@ <string name="display_filter_live">Застосовується відразу. Спільний для Steam і Робочого столу.</string> <string name="display_filter_note">FSR, GSR і NIS застосовуються під час збільшення зображення сеансу. «Лише різкість» працює і без збільшення.</string> <string name="display_sharpness">Різкість фільтра</string> - <string name="display_frame_rate">Частота кадрів</string> <string name="display_look_filter">%1$s Встановлює масштабування на %2$s.</string> <string name="display_match_screen">Під екран (%1$d×%2$d)</string> <string name="display_follow_screen">Слідувати за екраном (змінює розмір при згортанні чи розгортанні)</string> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index cf89b0ba75..9c75292d7f 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1920,7 +1920,6 @@ <string name="display_filter_live">Áp dụng ngay. Dùng chung cho Steam và Desktop.</string> <string name="display_filter_note">FSR, GSR và NIS áp dụng khi phóng to hình ảnh phiên. Chỉ làm nét cũng hoạt động mà không cần phóng to.</string> <string name="display_sharpness">Độ sắc nét bộ lọc</string> - <string name="display_frame_rate">Tốc độ khung hình</string> <string name="display_look_filter">%1$s Đặt chia tỷ lệ thành %2$s.</string> <string name="display_match_screen">Khớp màn hình (%1$d×%2$d)</string> <string name="display_follow_screen">Theo màn hình (đổi kích thước khi gập hoặc mở)</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d946abc578..ade2de5de3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2000,7 +2000,6 @@ <string name="display_filter_live">即时生效。由 Steam 和桌面共享。</string> <string name="display_filter_note">FSR、GSR 和 NIS 在放大会话画面时生效。“仅锐化”在不放大时也可用。</string> <string name="display_sharpness">滤镜锐度</string> - <string name="display_frame_rate">帧率</string> <string name="display_look_filter">%1$s 将缩放设为 %2$s。</string> <string name="display_match_screen">匹配屏幕(%1$d×%2$d)</string> <string name="display_follow_screen">跟随屏幕(折叠或展开时调整大小)</string> diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index cfd0eea3c2..94ed816a9f 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1923,7 +1923,6 @@ <string name="display_filter_live">即時生效。Steam 和桌面共用。</string> <string name="display_filter_note">FSR、GSR 和 NIS 會在放大會話畫面時套用。「只銳化」不放大也能使用。</string> <string name="display_sharpness">濾鏡銳利度</string> - <string name="display_frame_rate">幀率</string> <string name="display_look_filter">%1$s 將縮放設為 %2$s。</string> <string name="display_match_screen">配合螢幕(%1$d×%2$d)</string> <string name="display_follow_screen">跟隨螢幕(摺疊或展開時調整大小)</string> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d5e9d93f74..0c3257ead8 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1923,7 +1923,6 @@ <string name="display_filter_live">立即生效。Steam 和桌面共用。</string> <string name="display_filter_note">FSR、GSR 和 NIS 會在放大工作階段畫面時套用。「僅銳化」不放大也能使用。</string> <string name="display_sharpness">濾鏡銳利度</string> - <string name="display_frame_rate">影格率</string> <string name="display_look_filter">%1$s 將縮放設為 %2$s。</string> <string name="display_match_screen">符合螢幕(%1$d×%2$d)</string> <string name="display_follow_screen">跟隨螢幕(摺疊或展開時調整大小)</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 661b321f64..fc6649cc86 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -258,8 +258,6 @@ <string name="mode_ratio">Screen ratio</string> <string name="mode_ratio_custom">Set by the custom resolution.</string> <string name="mode_ratio_auto">Auto uses at least 16:9.</string> - <string name="mode_performance">Performance mode</string> - <string name="mode_performance_hint">Lets games run without waiting for the screen and reduces repeated window checks in gamescope and Wine. Can use more power and run warmer. Use Steam\'s Quick Access menu to limit Steam games. Applies next session.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 output</string> <string name="mode_hdr_unavailable">Not available: %1$s.</string> @@ -2054,7 +2052,6 @@ <string name="display_filter_live">Applies live. Shared by Steam and Desktop.</string> <string name="display_filter_note">FSR, GSR and NIS apply when enlarging the session image. Sharpen only also works without enlargement.</string> <string name="display_sharpness">Filter sharpness</string> - <string name="display_frame_rate">Frame rate</string> <string name="display_look_filter">%1$s Sets scaling to %2$s.</string> <string name="display_match_screen">Match screen (%1$d×%2$d)</string> <string name="display_follow_screen">Follow screen (resizes when folded or unfolded)</string> diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMirrorPacingTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMirrorPacingTest.kt index 4b97723d39..a8dff5a443 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMirrorPacingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMirrorPacingTest.kt @@ -1,12 +1,13 @@ package com.droiddeck.launcher.glasses import android.content.Context +import android.database.ContentObserver +import android.provider.Settings import android.hardware.display.DisplayManager import android.view.Display import androidx.compose.runtime.MutableState import com.droiddeck.launcher.SessionActivity import com.droiddeck.launcher.session.SessionPrefs -import com.droiddeck.launcher.session.SessionState import org.junit.After import org.junit.Assert.assertEquals import org.junit.Before @@ -38,12 +39,10 @@ class GlassesMirrorPacingTest { val panel = Shadow.extract<ModeDisplay>(activity.display) panel.supported = arrayOf(mode(1, 60f), mode(2, 90f), mode(3, 120f)) panel.current = panel.supported.last() - SessionState.performanceMode = false activity.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() } @After fun cleanup() { - SessionState.performanceMode = false activity.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() } @@ -53,7 +52,7 @@ class GlassesMirrorPacingTest { apply(connected, settings.copy(refreshHz = 90)) expect(2, 90f, 90) apply(GlassesState(), settings) - expect(3, 120f, 0) + expect(3, 120f, SessionPrefs.FPS_UNPACED) } @Test fun retiredSavedLimitsDoNotCapThePhoneOrMirroredOutput() { @@ -64,21 +63,22 @@ class GlassesMirrorPacingTest { apply(connected.copy(hz = 120f), settings) expect(1, 60f, 60) apply(GlassesState(), settings) - expect(3, 120f, 0) - } - - @Test fun performanceModeResumesUnpacedOutputAfterMirrorDisconnects() { - SessionState.performanceMode = true - apply(connected, settings) - expect(1, 60f, 60) - apply(GlassesState(), settings) expect(3, 120f, SessionPrefs.FPS_UNPACED) } @Test fun pacingFollowsThePanelWhenTheSystemKeepsALowerRateThanRequested() { Shadow.extract<ModeDisplay>(activity.display).current = mode(2, 90f) apply(GlassesState(), settings) - expect(3, 90f, 0) + expect(3, 90f, SessionPrefs.FPS_UNPACED) + } + + @Test fun aHigherRefreshSettingChoosesTheFasterModeAgain() { + Settings.System.putFloat(activity.contentResolver, "peak_refresh_rate", 60f) + apply(GlassesState(), settings) + assertEquals(1, activity.window.attributes.preferredDisplayModeId) + Settings.System.putFloat(activity.contentResolver, "peak_refresh_rate", 120f) + ReflectionHelpers.getField<ContentObserver>(activity, "refreshSettingObserver").onChange(false) + assertEquals(3, activity.window.attributes.preferredDisplayModeId) } private fun apply(state: GlassesState, config: GlassesSettings) { diff --git a/app/src/test/java/com/droiddeck/launcher/session/OutputPacingTest.kt b/app/src/test/java/com/droiddeck/launcher/session/OutputPacingTest.kt new file mode 100644 index 0000000000..bd7dc380f5 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/OutputPacingTest.kt @@ -0,0 +1,14 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Test + +class OutputPacingTest { + @Test fun phoneOutputIsUnpaced() { + assertEquals(SessionPrefs.FPS_UNPACED, SessionPrefs.compositorFpsLimit(0)) + } + + @Test fun mirroringKeepsTheGlassesRate() { + assertEquals(60, SessionPrefs.compositorFpsLimit(60)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/PerformanceModeTest.kt b/app/src/test/java/com/droiddeck/launcher/session/PerformanceModeTest.kt deleted file mode 100644 index 9805a66dec..0000000000 --- a/app/src/test/java/com/droiddeck/launcher/session/PerformanceModeTest.kt +++ /dev/null @@ -1,36 +0,0 @@ -package com.droiddeck.launcher.session - -import android.content.Context -import org.junit.Assert.* -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment -import org.robolectric.annotation.Config - -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [33]) -class PerformanceModeTest { - private val app get() = RuntimeEnvironment.getApplication() - private val session get() = app.getSharedPreferences("session", Context.MODE_PRIVATE) - - @Before fun clear() { session.edit().clear().commit() } - - @Test fun offByDefaultAndPerMode() { - assertFalse(SessionPrefs.performanceMode(app, SessionService.MODE_STEAM)) - SessionPrefs.setPerformanceMode(app, SessionService.MODE_STEAM, true) - assertTrue(SessionPrefs.performanceMode(app, SessionService.MODE_STEAM)) - assertFalse(SessionPrefs.performanceMode(app, SessionService.MODE_DESKTOP)) - } - - @Test fun offKeepsDisplayAndMirrorPacing() { - assertEquals(0, SessionPrefs.compositorFpsLimit(0, false)) - assertEquals(60, SessionPrefs.compositorFpsLimit(60, false)) - } - - @Test fun onIsUnpacedUnlessMirroring() { - assertEquals(SessionPrefs.FPS_UNPACED, SessionPrefs.compositorFpsLimit(0, true)) - assertEquals(60, SessionPrefs.compositorFpsLimit(60, true)) - } -} diff --git a/tools/gamescope/PATCHES.md b/tools/gamescope/PATCHES.md index 5ff8197a2d..a72ab6be13 100644 --- a/tools/gamescope/PATCHES.md +++ b/tools/gamescope/PATCHES.md @@ -96,8 +96,7 @@ running AIO Graphics Test uncapped, Xwayland used 24-32% of a core and the game' present thread sat about half idle. The patch can keep the result for `DROIDDECK_WSI_BYPASS_CHECK_MS` milliseconds. Unset -or 0 keeps the per-present check; the app sets 100 only in Performance mode and 0 -otherwise. With 100, a window resize or a flip/obscure change is seen up to 100 ms +or 0 keeps the per-present check; the app sets 100. With 100, a window resize or a flip/obscure change is seen up to 100 ms later than before; surface creation and capability queries still check every time. ## 0118 Wayland: preserve signed plane positions @@ -121,3 +120,39 @@ The old component lost the image in Fill and magnification. The tested executabl matches the pinned p14 archive and the locally assembled APK. Hardware checks used native Gamescope properties; the physical Back+LB shortcut was not independently confirmed. The original APK and runtime were restored after validation. + +## 0119 WSI: default image count while the frame limiter runs + +The app sets `GAMESCOPE_WSI_MIN_IMAGE_COUNT=8` so an uncapped game keeps drawing while +gamescope turns its buffers around. With Steam's Frame Limit on, gamescope forces FIFO, +and the layer always hands the driver MAILBOX, so a game with eight images could queue +up to seven frames inside gamescope before it blocked: each one adds a frame of input +latency at the limited rate. + +While the limiter forces FIFO, the layer now reports and enforces its default minimum +of 3 images instead of the raised count; with the limiter off it uses the raised count +as before. DXVK and VKD3D-Proton already recreate their swapchain when the limiter +changes (the layer returns `VK_ERROR_OUT_OF_DATE_KHR`), so their image count follows +the Quick Access menu. Other apps keep their swapchain on a limiter change; they now +get `VK_SUBOPTIMAL_KHR` while their image count no longer matches, unless the layer +marks them as not taking it (`NoSuboptimal`). + +## 0120 Wayland: nested refresh follows the host + +`-r` fixes the refresh gamescope paces at, and the frame limiter and Steam's Frame Limit +slider use the same value. The app passes the panel refresh at session start, so a +panel switched to another mode during the session (for example in the device's own +quick settings) left gamescope pacing at the old rate until the next session; only the +reported output refresh changed. + +With `GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST=1`, a refresh the host compositor reports +through presentation feedback replaces the `-r` value, so pacing and the limiter switch +with the panel. `-r` still sets the starting rate, which avoids gamescope assuming +60 Hz until the first frame is shown. When the refresh changes, gamescope also sends +its `gamescope_control` display information to Steam again; Steam otherwise reads it +only when it binds. + +A host mode switch can report a passing rate for a few frames (72 Hz between 144 and +120 Hz on the AYANEO Pocket FIT), so with following on a new rate is taken once it has +been reported for 300 ms. Without the variable the reported rate is taken at once, as +upstream does. diff --git a/tools/gamescope/patches/0119-wsi-default-images-under-limiter.patch b/tools/gamescope/patches/0119-wsi-default-images-under-limiter.patch new file mode 100644 index 0000000000..78f2837ca6 --- /dev/null +++ b/tools/gamescope/patches/0119-wsi-default-images-under-limiter.patch @@ -0,0 +1,59 @@ +diff --git a/layer/VkLayer_FROG_gamescope_wsi.cpp b/layer/VkLayer_FROG_gamescope_wsi.cpp +index ea4ba84..46d086c 100644 +--- a/layer/VkLayer_FROG_gamescope_wsi.cpp ++++ b/layer/VkLayer_FROG_gamescope_wsi.cpp +@@ -201,6 +201,13 @@ namespace GamescopeWSILayer { + return s_minImageCount; + } + ++ // The raised count keeps an uncapped game drawing while gamescope turns its buffers around. ++ // Under the frame limiter's FIFO the extra images only queue frames ahead of the screen, ++ // so a limited swapchain gets the default count. ++ static uint32_t getMinImageCount(bool forcingFifo) { ++ return forcingFifo ? std::min(getMinImageCount(), 3u) : getMinImageCount(); ++ } ++ + static bool getEnsureMinImageCount() { + static bool s_ensureMinImageCount = []() -> bool { + if (auto ensure = parseEnv<bool>("GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT")) { +@@ -984,7 +991,7 @@ namespace GamescopeWSILayer { + + pSurfaceCapabilities->currentExtent = rect->extent; + } +- pSurfaceCapabilities->minImageCount = getMinImageCount(); ++ pSurfaceCapabilities->minImageCount = getMinImageCount(gamescopeIsForcingFifo(gamescopeSurface->waylandObjects)); + + return VK_SUCCESS; + } +@@ -1027,7 +1034,7 @@ namespace GamescopeWSILayer { + + pSurfaceCapabilities->surfaceCapabilities.currentExtent = rect->extent; + } +- pSurfaceCapabilities->surfaceCapabilities.minImageCount = getMinImageCount(); ++ pSurfaceCapabilities->surfaceCapabilities.minImageCount = getMinImageCount(gamescopeIsForcingFifo(gamescopeSurface->waylandObjects)); + + return VK_SUCCESS; + } +@@ -1305,7 +1312,7 @@ namespace GamescopeWSILayer { + + uint32_t minImageCount = swapchainInfo.minImageCount; + if (getEnsureMinImageCount()) +- minImageCount = std::max(getMinImageCount(), minImageCount); ++ minImageCount = std::max(getMinImageCount(gamescopeIsForcingFifo(gamescopeSurface->waylandObjects)), minImageCount); + swapchainInfo.minImageCount = minImageCount; + + fprintf(stderr, "[Gamescope WSI] Creating swapchain for xid: 0x%0x - oldSwapchain: %p - provided minImageCount: %u - minImageCount: %u - format: %s - colorspace: %s - flip: %s\n", +@@ -1627,6 +1634,13 @@ namespace GamescopeWSILayer { + continue; + } + ++ // Other apps keep their swapchain when the limiter changes; ask them to recreate it so ++ // the image count follows the limiter as well. ++ if (!frameLimiterAware && gamescopeSwapchain->forceFifo != forceFifo && ++ getMinImageCount(true) != getMinImageCount(false) && ++ !(gamescopeSurface->flags & GamescopeLayerClient::Flag::NoSuboptimal)) ++ UpdateSwapchainResult(VK_SUBOPTIMAL_KHR); ++ + const bool canBypass = gamescopeSurface->canBypassXWaylandAtPresent(gamescopeSwapchain->isHdrColorspace); + if (canBypass != gamescopeSwapchain->isBypassingXWayland) { + if (canBypass) { diff --git a/tools/gamescope/patches/0120-nested-refresh-follows-host.patch b/tools/gamescope/patches/0120-nested-refresh-follows-host.patch new file mode 100644 index 0000000000..5505ff3f6b --- /dev/null +++ b/tools/gamescope/patches/0120-nested-refresh-follows-host.patch @@ -0,0 +1,95 @@ +diff --git a/src/Backends/WaylandBackend.cpp b/src/Backends/WaylandBackend.cpp +index 40164ba..cc04fa7 100644 +--- a/src/Backends/WaylandBackend.cpp ++++ b/src/Backends/WaylandBackend.cpp +@@ -1698,6 +1698,49 @@ namespace gamescope + } + } + ++ // -r sets the refresh gamescope starts with. With GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST=1 a refresh ++ // the host compositor reports later replaces it, so pacing and the frame limiter follow a panel ++ // switched to another mode during the session. ++ static bool NestedRefreshFollowsHost() ++ { ++ static const bool s_bFollow = [] ++ { ++ const char *pszFollow = getenv( "GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST" ); ++ return pszFollow && atoi( pszFollow ) != 0; ++ }(); ++ return s_bFollow; ++ } ++ ++ // A mode switch on the host can report a passing rate for a few frames (72 Hz between 144 and ++ // 120 on an AYANEO Pocket FIT); a new rate is taken once it has been reported for 300 ms. ++ static bool HostRefreshChanged( int32_t nRefreshmHz, uint64_t ulPresentedNs ) ++ { ++ static int32_t s_nPendingmHz = 0; ++ static uint64_t s_ulPendingSinceNs = 0; ++ if ( !nRefreshmHz || nRefreshmHz == g_nOutputRefresh ) ++ { ++ s_nPendingmHz = 0; ++ return false; ++ } ++ if ( !NestedRefreshFollowsHost() ) ++ return true; ++ if ( nRefreshmHz != s_nPendingmHz ) ++ { ++ s_nPendingmHz = nRefreshmHz; ++ s_ulPendingSinceNs = ulPresentedNs; ++ return false; ++ } ++ return ulPresentedNs - s_ulPendingSinceNs >= 300'000'000ul; ++ } ++ ++ static void FollowHostRefresh( int32_t nRefreshmHz ) ++ { ++ if ( !NestedRefreshFollowsHost() || !g_nNestedRefresh || g_nNestedRefresh == nRefreshmHz ) ++ return; ++ xdg_log.infof( "Nested refresh follows the host: %.3fhz", ConvertmHzToHz( (float) nRefreshmHz ) ); ++ g_nNestedRefresh = nRefreshmHz; ++ } ++ + void CWaylandPlane::UpdateVRRRefreshRate() + { + if ( m_pParent ) +@@ -1724,6 +1767,7 @@ namespace gamescope + // TODO(strategy): We should pick the largest refresh rate. + xdg_log.infof( "Changed refresh to: %.3fhz", ConvertmHzToHz( (float) nLargestRefreshRateMhz ) ); + g_nOutputRefresh = nLargestRefreshRateMhz; ++ FollowHostRefresh( nLargestRefreshRateMhz ); + } + } + +@@ -1794,10 +1838,11 @@ namespace gamescope + if ( uRefreshCycle ) + { + int32_t nRefresh = RefreshCycleTomHz( uRefreshCycle ); +- if ( nRefresh && nRefresh != g_nOutputRefresh ) ++ if ( HostRefreshChanged( nRefresh, ulTime ) ) + { + xdg_log.infof( "Changed refresh to: %.3fhz", ConvertmHzToHz( (float) nRefresh ) ); + g_nOutputRefresh = nRefresh; ++ FollowHostRefresh( nRefresh ); + } + + m_pConnector->SetHostCompositorIsCurrentlyVRR( false ); +diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp +index 6c9299d..5fb9086 100644 +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -9254,6 +9254,15 @@ void update_vrr_atoms(xwayland_ctx_t *root_ctx, bool force, bool* needs_flush = + g_nCurrentRefreshRate_CachedValue = g_nOutputRefresh; + if (needs_flush) + *needs_flush = true; ++ ++ // Steam reads the display's refresh rates from gamescope_control when it binds; send them again. ++ if ( !force ) ++ { ++ wlserver_lock(); ++ for ( const auto &control : wlserver.gamescope_controls ) ++ wlserver_send_gamescope_control( control ); ++ wlserver_unlock(); ++ } + } + + // Don't update this in-sync with DRM vrr usage. diff --git a/tools/gamescope/release.env b/tools/gamescope/release.env index 9bb47de0b3..611dd0c860 100644 --- a/tools/gamescope/release.env +++ b/tools/gamescope/release.env @@ -1,3 +1,3 @@ GAMESCOPE_REPO=Droid-Deck/DroidDeck-Components -GAMESCOPE_TAG=gamescope-3.16.29-p14 -GAMESCOPE_SHA256=f0f2f33767c883bcfe66f28c303fddc1564f91a915fb7cedd31eb823570b254c +GAMESCOPE_TAG=gamescope-3.16.29-p15 +GAMESCOPE_SHA256=ee592bc7d000db86b12adaecb1aee5d25f8d6565c3584e55975ef1078d7a8e52 diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 0f99643ee3..ada9cba2ec 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -238,6 +238,8 @@ if [ -z "${BL_INSIDE:-}" ]; then fi if [ "${BL_REFRESH:-0}" -gt 0 ]; then args+=(-r "$BL_REFRESH") + # -r is the starting rate; gamescope follows the panel when it switches modes later. + export GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST=1 fi [ "$mode" = steam ] && [ "${BL_STEAM_UI:-}" != desktop ] && args+=(-e) if [ "$mode" = steam ] && [ "${BL_XWAYLAND_COUNT:-2}" -gt 1 ]; then diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index 126afe0505..1d8e3992f8 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -241,6 +241,74 @@ TOUR_JS = r""" return "off"; })() """ +# Steam keeps the Quick Access Frame Limit as the client setting gamescope_app_target_framerate +# (CMsgClientSettings field 21002) and offers the values gamescope's display state lists in +# active_display_info.supported_frame_rates. When the panel's refresh rate changes, a remembered +# limit that is not one of the new values leaves the slider on its first value while the game runs +# at the old limit. The limit is kept when it is still offered and moved to the highest value +# otherwise. Choices are read once they have been unchanged for a moment, since a mode switch can +# report a passing rate first. +FRAME_LIMIT_JS = r""" +(() => { + if (window.__droiddeckFrameLimit) return "present"; + const settings = window.settingsStore; + let service = null; + try { + // Steam's webpack does not expose its module cache; the gamescope service client is found by + // the calls its module makes and loaded by id. + let require; + window.webpackChunksteamui.push([[Symbol("droiddeck-frame-limit")], {}, r => { require = r; }]); + for (const id of Object.keys(require.m || {})) { + const source = String(require.m[id]); + if (!source.includes("SetBlurParams") || !source.includes("RegisterForNotifyStateChanged")) continue; + let exports; + try { exports = require(id); } catch (e) { continue; } + if (!exports || typeof exports !== "object") continue; + service = Object.values(exports).find(value => value && typeof value.GetState === "function" && + typeof value.RegisterForNotifyStateChanged === "function" && typeof value.SetBlurParams === "function"); + if (service) break; + } + } catch (e) { + service = null; + } + if (!service || !settings?.clientSettings || typeof SteamClient.Settings?.SetSetting !== "function") return "unavailable"; + const self = { choices: null, timer: null }; + const write = value => { + const bytes = []; + for (let n of [21002 * 8, value]) { + while (n > 127) { bytes.push((n & 127) | 128); n = Math.floor(n / 128); } + bytes.push(n); + } + SteamClient.Settings.SetSetting(btoa(String.fromCharCode(...bytes))); + }; + self.check = async () => { + let rates; + try { + const reply = await service.GetState({}); + if (!reply.BSuccess()) return; + rates = reply.Body().toObject().state?.active_display_info?.supported_frame_rates; + } catch (e) { + return; + } + if (!Array.isArray(rates) || rates.length === 0) return; + const choices = rates.join(","); + if (choices === self.choices) return; + self.choices = choices; + const current = settings.clientSettings; + if (!current.gamescope_enable_app_target_framerate || rates.includes(current.gamescope_app_target_framerate)) return; + write(Math.max(...rates)); + }; + self.schedule = () => { + clearTimeout(self.timer); + self.timer = setTimeout(self.check, 1500); + }; + self.subscription = service.RegisterForNotifyStateChanged(self.schedule); + self.interval = setInterval(self.schedule, 5000); + self.schedule(); + window.__droiddeckFrameLimit = self; + return "installed"; +})() +""" FILE_BINDING = "droiddeckOpenFileDialog" FILE_JS = r""" (() => { @@ -680,6 +748,8 @@ class Helper: self.chooser = None self.controls_state = None self.controls_installed = False + self.frame_limit_state = None + self.frame_limit_retry = 0 def sync_controls(self): try: @@ -702,6 +772,19 @@ class Helper: except (OSError, ValueError, TypeError): pass + def sync_frame_limit(self): + # Steam can still be loading its settings and gamescope state when the helper attaches. + if self.frame_limit_state in ("installed", "present") or time.monotonic() < self.frame_limit_retry: + return + try: + state = self.page.evaluate(FRAME_LIMIT_JS) + except RuntimeError as e: + state = "failed (%s)" % e + if state != self.frame_limit_state: + say("frame limit sync: %s" % state) + self.frame_limit_state = state + self.frame_limit_retry = time.monotonic() + 10 + def open_chooser(self, payload): try: request = json.loads(payload) @@ -801,6 +884,8 @@ class Helper: self.page = page self.controls_state = None self.controls_installed = False + self.frame_limit_state = None + self.frame_limit_retry = 0 self.sync_controls() return True @@ -956,6 +1041,7 @@ class Helper: self.ensure_tools() while True: self.sync_controls() + self.sync_frame_limit() sources = [self.page.ws] + ([watcher] if watcher.fileno() >= 0 else []) if self.chooser is not None: sources.append(self.chooser[1].stdout) diff --git a/tools/tests/test_device_controls.py b/tools/tests/test_device_controls.py index 091d29a5a5..736d62acba 100644 --- a/tools/tests/test_device_controls.py +++ b/tools/tests/test_device_controls.py @@ -30,6 +30,7 @@ class DeviceControlsTest(unittest.TestCase): page.evaluate.side_effect = evaluate page.drain.side_effect = drain helper.reconcile = mock.Mock() + helper.sync_frame_limit = mock.Mock() helper.ensure_tools = mock.Mock(side_effect=[None, StopIteration]) helper.open_chooser = mock.Mock() watcher = mock.Mock() diff --git a/tools/tests/test_frame_limit_sync.py b/tools/tests/test_frame_limit_sync.py new file mode 100644 index 0000000000..ca89c203aa --- /dev/null +++ b/tools/tests/test_frame_limit_sync.py @@ -0,0 +1,118 @@ +"""The Quick Access Frame Limit follows the panel when its refresh rate changes.""" +from pathlib import Path +import runpy +import subprocess +import tempfile +import unittest +from unittest import mock + +BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" +LIVE = runpy.run_path(str(BIN / "droiddeck-steam-compat")) + +HARNESS = r""" +const assert = require('assert'); +globalThis.window = globalThis; +globalThis.btoa = text => Buffer.from(text, 'binary').toString('base64'); +let timers = new Map(), nextTimer = 0; +globalThis.setTimeout = (callback, ms) => { timers.set(++nextTimer, callback); return nextTimer; }; +globalThis.clearTimeout = id => timers.delete(id); +globalThis.setInterval = () => 0; +const fire = async () => { + const pending = [...timers.values()]; timers = new Map(); + for (const callback of pending) await callback(); +}; +let rates = [36, 48, 72, 144]; +const notify = []; +const service = { + GetState: async () => ({ BSuccess: () => true, + Body: () => ({ toObject: () => ({ state: { active_display_info: { supported_frame_rates: rates } } }) }) }), + RegisterForNotifyStateChanged(callback) { notify.push(callback); return {}; }, + SetBlurParams() {}, +}; +const writes = []; +globalThis.settingsStore = { clientSettings: { + gamescope_enable_app_target_framerate: true, gamescope_app_target_framerate: 120, gamescope_disable_framelimit: false } }; +const varints = bytes => { const out = []; let value = 0, shift = 0; + for (const b of bytes) { value += (b & 127) * 2 ** shift; shift += 7; if (b < 128) { out.push(value); value = 0; shift = 0; } } + return out; }; +globalThis.SteamClient = { Settings: { SetSetting(encoded) { + const [key, value] = varints([...Buffer.from(encoded, 'base64')]); + assert.strictEqual(key, 21002 * 8); + writes.push(value); + settingsStore.clientSettings.gamescope_app_target_framerate = value; +} } }; +const modules = { + 1: { source: () => 'RegisterForNotifyStateChanged only', exports: { other: { GetState() {} } } }, + 2: { source: () => 'n.MX.SetBlurParams(); n.MX.RegisterForNotifyStateChanged()', exports: { hooks: () => {} } }, + 3: { source: () => 'SetBlurParams RegisterForNotifyStateChanged GetState', exports: { MX: service } }, +}; +const webpack = modules => { const require = id => modules[id].exports; + require.m = Object.fromEntries(Object.entries(modules).map(([id, m]) => [id, { toString: m.source }])); + return require; }; +globalThis.webpackChunksteamui = { push([, , callback]) { callback(webpack(modules)); } }; +const script = require('fs').readFileSync(process.argv[2], 'utf8'); +const change = async next => { rates = next; notify.forEach(callback => callback()); }; +(async () => { + assert.strictEqual(eval(script), 'installed'); + assert.strictEqual(eval(script), 'present'); + await fire(); + assert.deepStrictEqual(writes, [144], 'a remembered limit the panel does not offer moves to the highest value'); + await fire(); + assert.deepStrictEqual(writes, [144], 'unchanged choices are not written again'); + settingsStore.clientSettings.gamescope_app_target_framerate = 72; + await change([24, 30, 40, 60, 120]); + await fire(); + assert.deepStrictEqual(writes, [144, 120], '72 is not offered at 120 Hz'); + settingsStore.clientSettings.gamescope_app_target_framerate = 60; + await change([12, 15, 20, 30, 60]); + await fire(); + assert.deepStrictEqual(writes, [144, 120], '60 is still offered at 60 Hz and is kept'); + await change([18, 24, 36, 72]); + await change([24, 30, 40, 60, 120]); + await fire(); + assert.deepStrictEqual(writes, [144, 120], 'a passing rate during a mode switch is not acted on'); + settingsStore.clientSettings.gamescope_enable_app_target_framerate = false; + settingsStore.clientSettings.gamescope_app_target_framerate = 72; + await change([36, 48, 144]); + await fire(); + assert.deepStrictEqual(writes, [144, 120], 'nothing changes while Steam has the frame limit turned off'); + delete window.__droiddeckFrameLimit; + webpackChunksteamui.push = ([, , callback]) => callback(webpack({ 1: modules[1], 2: modules[2] })); + assert.strictEqual(eval(script), 'unavailable'); +})().catch(error => { console.error(error); process.exit(1); }); +""" + + +class FrameLimitSyncTest(unittest.TestCase): + def test_limit_is_kept_when_offered_and_moved_to_the_highest_value_otherwise(self): + with tempfile.TemporaryDirectory() as directory: + script = Path(directory) / "frame_limit.js" + script.write_text(LIVE["FRAME_LIMIT_JS"]) + test = Path(directory) / "test.js" + test.write_text(HARNESS) + result = subprocess.run(["node", str(test), str(script)], capture_output=True, text=True, timeout=20) + self.assertEqual(result.returncode, 0, result.stderr) + + def test_install_is_retried_until_steam_is_ready_and_reported_once_per_state(self): + helper = LIVE["Helper"]("/steam", 0) + page = mock.Mock() + page.evaluate.side_effect = ["unavailable", "unavailable", "installed"] + helper.page = page + said = [] + clock = [100.0] + globals_ = LIVE["Helper"].sync_frame_limit.__globals__ + with mock.patch.dict(globals_, {"say": said.append}), mock.patch.object(globals_["time"], "monotonic", lambda: clock[0]): + helper.sync_frame_limit() + helper.sync_frame_limit() + clock[0] += 10 + helper.sync_frame_limit() + clock[0] += 10 + helper.sync_frame_limit() + clock[0] += 10 + helper.sync_frame_limit() + self.assertEqual(page.evaluate.call_count, 3) + self.assertEqual(said, ["frame limit sync: unavailable", "frame limit sync: installed"]) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_session_pacing.py b/tools/tests/test_session_pacing.py index e7c0df938f..84962fe9e6 100644 --- a/tools/tests/test_session_pacing.py +++ b/tools/tests/test_session_pacing.py @@ -18,16 +18,19 @@ class SessionPacingTest(unittest.TestCase): with tempfile.TemporaryDirectory() as directory: env = dict(os.environ, XDG_RUNTIME_DIR=directory, BL_REFRESH=str(refresh), BL_MANGOAPP='0', BL_FPS='0', DROIDDECK_GAME_FRAME_LIMIT='0') + env.pop('GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST', None) env.update(overrides) script = ''' set -u mode=steam pipewire_stub() { return 1; } -run_gamescope() { printf 'ARG:%s\\n' "$@"; } +run_gamescope() { printf 'ARG:%s\\n' "$@"; printf 'FOLLOW:%s\\n' "${GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST:-}"; } ''' + block result = subprocess.run(['bash', '-c', script], env=env, capture_output=True, text=True, timeout=5) self.assertEqual(0, result.returncode, result.stderr) + self.follow = [line.removeprefix('FOLLOW:') for line in result.stdout.splitlines() + if line.startswith('FOLLOW:')] return [line.removeprefix('ARG:') for line in result.stdout.splitlines() if line.startswith('ARG:')] @@ -38,6 +41,12 @@ run_gamescope() { printf 'ARG:%s\\n' "$@"; } self.assertEqual(str(refresh), args[args.index('-r') + 1]) self.assertIn('-e', args) + def test_gamescope_follows_the_panel_after_the_starting_rate(self): + self.launch(144) + self.assertEqual(['1'], self.follow) + self.launch(0) + self.assertEqual([''], self.follow) + def test_retired_cap_variables_do_not_override_the_display_rate(self): for performance in ('0', '1'): with self.subTest(performance=performance): From c781cfd5252f183d6cb106d7d4ca71c18454aee2 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 23:36:11 -0400 Subject: [PATCH 119/135] fix: publish component choices again when a new Proton build appears Game and global component choices were written to desired.tsv only when a selection changed, so a Proton build installed later (DroidDeck-Proton 11-11.8) had no rows and kept its bundled FEX. Battle.net's d2rfix FEX never reached it and StarCraft died in ClientSdk.dll's DllMain. The choices are now republished at session start and on Battle.net's FEX request whenever the installed tools no longer match what was published. --- .../droiddeck/launcher/runtime/BattleNet.kt | 2 + .../launcher/session/ComponentsManager.kt | 11 ++- .../launcher/session/SessionService.kt | 3 + .../session/ComponentsRepublishTest.kt | 97 +++++++++++++++++++ 4 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/ComponentsRepublishTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt index b41fee3171..e3a64e9628 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -360,6 +360,8 @@ object BattleNet { if (ComponentsManager.gameComponents(context, scope)["fex"] != file) { ComponentsManager.setGameComponent(context, scope, "fex", file) Log.i(TAG, "FEX for the Battle.net prefix: $file") + } else if (ComponentsManager.republish(context)) { + Log.i(TAG, "FEX for the Battle.net prefix: $file, now in every installed Proton") } return file } diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index f10ab12448..ed271021d9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -155,8 +155,7 @@ object ComponentsManager { if (staged.exists()) check(staged.delete()) { "Could not remove unpublished component selections" } } - private fun saveState(context: Context, state: JSONObject) { - val prepared = prepareLaunchState(context, state) + private fun saveState(context: Context, state: JSONObject, prepared: PreparedLaunchState = prepareLaunchState(context, state)) { val dir = launchDir(context) val tmp = File(dir, "desired.tsv.tmp") try { @@ -175,6 +174,14 @@ object ComponentsManager { ?.forEach { it.deleteRecursively() } } + fun republish(context: Context): Boolean = synchronized(lock) { + val state = loadState(context) + val prepared = prepareLaunchState(context, state) + if ((FileUtils.readString(File(launchDir(context), "desired.tsv")) ?: "") == prepared.text) return false + saveState(context, state, prepared) + true + } + private fun JSONObject.sub(key: String): JSONObject = optJSONObject(key) ?: JSONObject().also { put(key, it) } private fun rememberProfiledComponent(state: JSONObject, comp: String) { 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 445b2da05d..025332da3b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -480,6 +480,9 @@ class SessionService : Service() { val size = SessionState.outputSize val guest = ArrayList<String>() val steamHere = SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP + runCatching { ComponentsManager.republish(this) } + .onSuccess { if (it) Log.i(TAG, "component selections published for the installed Proton builds") } + .onFailure { Log.w(TAG, "component selections", it) } if (steamHere) { runCatching { ComponentsManager.ensureForcedPackages(this) } .onSuccess { if (it != null) Log.i(TAG, it) } diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentsRepublishTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentsRepublishTest.kt new file mode 100644 index 0000000000..5d0ba33c6b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentsRepublishTest.kt @@ -0,0 +1,97 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.github.luben.zstd.ZstdOutputStream +import org.apache.commons.compress.archivers.tar.TarArchiveEntry +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class ComponentsRepublishTest { + private val fex = "FEXCore-2610-d2rfix28-linux.wcp" + private val scope = "2596113170" + private val dll = "files/lib/wine/aarch64-windows/libwow64fex.dll" + private lateinit var context: Context + + @Before fun setUp() { + context = RuntimeEnvironment.getApplication() + File(context.filesDir, "components").deleteRecursively() + LinuxRuntime.rootDir(context).deleteRecursively() + } + + @Test fun aGameFexChoiceReachesAProtonInstalledAfterIt() { + proton("DroidDeck-Proton 11-11.7", "DroidDeck-Proton-11-11.7") + packageFile() + ComponentsManager.setGameComponent(context, scope, "fex", fex) + assertEquals(setOf("DroidDeck-Proton 11-11.7"), scopedTools()) + + proton("DroidDeck-Proton 11-11.8", "DroidDeck-Proton-11-11.8") + assertEquals(setOf("DroidDeck-Proton 11-11.7"), scopedTools()) + + assertTrue(ComponentsManager.republish(context)) + assertEquals(setOf("DroidDeck-Proton 11-11.7", "DroidDeck-Proton 11-11.8"), scopedTools()) + val row = rows().single { it[0] == scope && it[1] == "DroidDeck-Proton 11-11.8" && it[4] == dll } + assertEquals("DroidDeck-Proton-11-11.8", row[2]) + assertEquals("d2rfix28 wow64", File(LinuxRuntime.rootDir(context), row[6].removePrefix("/")).readText()) + assertEquals(fex, ComponentsManager.gameComponents(context, scope)["fex"]) + } + + @Test fun nothingIsRewrittenWhileTheToolsAreUnchanged() { + proton("DroidDeck-Proton 11-11.8", "DroidDeck-Proton-11-11.8") + packageFile() + ComponentsManager.setGameComponent(context, scope, "fex", fex) + val published = launchState().readText() + val modified = launchState().lastModified() + + assertFalse(ComponentsManager.republish(context)) + assertEquals(published, launchState().readText()) + assertEquals(modified, launchState().lastModified()) + } + + @Test fun withNoSelectionsNothingIsPublished() { + proton("DroidDeck-Proton 11-11.8", "DroidDeck-Proton-11-11.8") + + assertFalse(ComponentsManager.republish(context)) + assertFalse(launchState().exists()) + } + + private fun scopedTools() = rows().filter { it[0] == scope }.map { it[1] }.toSet() + + private fun rows() = launchState().readLines().filter { it.isNotEmpty() }.map { it.split('\t') } + + private fun launchState() = File(LinuxRuntime.rootDir(context), "root/.local/share/droiddeck-components/desired.tsv") + + private fun proton(name: String, version: String) { + val dir = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/steamapps/common/$name") + File(dir, "files/lib/wine").mkdirs() + File(dir, "proton").writeText("#!/bin/sh\n") + File(dir, "version").writeText("1 $version\n") + File(dir, dll).apply { parentFile!!.mkdirs(); writeText("bundled FEX $version") } + } + + private fun packageFile() { + val out = File(context.filesDir, "components/packages/$fex").apply { parentFile!!.mkdirs() } + val profile = JSONObject().put("type", "FEXCore-Linux").put("versionName", "2610-d2rfix28").toString().toByteArray() + val body = "d2rfix28 wow64".toByteArray() + TarArchiveOutputStream(ZstdOutputStream(out.outputStream())).use { tar -> + tar.putArchiveEntry(TarArchiveEntry("profile.json").apply { size = profile.size.toLong() }) + tar.write(profile) + tar.closeArchiveEntry() + tar.putArchiveEntry(TarArchiveEntry(dll).apply { size = body.size.toLong() }) + tar.write(body) + tar.closeArchiveEntry() + } + } +} From c25d54acedcd0db899ce569751a9adfc76156e6a Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Mon, 26 Oct 2026 23:51:58 -0400 Subject: [PATCH 120/135] fix: leave published component choices alone when state.json cannot be read --- .../droiddeck/launcher/session/ComponentsManager.kt | 3 +++ .../launcher/session/ComponentsRepublishTest.kt | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index ed271021d9..8b7ad50f0c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -175,6 +175,9 @@ object ComponentsManager { } fun republish(context: Context): Boolean = synchronized(lock) { + recoverState(context) + val saved = stateFile(context) + if (saved.exists() && runCatching { JSONObject(saved.readText()) }.isFailure) return false val state = loadState(context) val prepared = prepareLaunchState(context, state) if ((FileUtils.readString(File(launchDir(context), "desired.tsv")) ?: "") == prepared.text) return false diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentsRepublishTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentsRepublishTest.kt index 5d0ba33c6b..74978ee30c 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ComponentsRepublishTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentsRepublishTest.kt @@ -60,6 +60,19 @@ class ComponentsRepublishTest { assertEquals(modified, launchState().lastModified()) } + @Test fun anUnreadableStateLeavesThePublishedSelectionsAlone() { + proton("DroidDeck-Proton 11-11.7", "DroidDeck-Proton-11-11.7") + packageFile() + ComponentsManager.setGameComponent(context, scope, "fex", fex) + val published = launchState().readText() + val state = File(context.filesDir, "components/state.json").apply { writeText("{\"active\": ") } + proton("DroidDeck-Proton 11-11.8", "DroidDeck-Proton-11-11.8") + + assertFalse(ComponentsManager.republish(context)) + assertEquals(published, launchState().readText()) + assertEquals("{\"active\": ", state.readText()) + } + @Test fun withNoSelectionsNothingIsPublished() { proton("DroidDeck-Proton 11-11.8", "DroidDeck-Proton-11-11.8") From 07a0a7e34433882f6fba2cd722783e63e03b4f40 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 27 Oct 2026 00:23:44 -0400 Subject: [PATCH 121/135] fix: show gesture settings only in gesture mode (#1654) --- .../main/java/com/droiddeck/launcher/ui/SessionOverlay.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 4e59b74448..d9a50a20d3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -564,9 +564,11 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont ChoiceRow(host, "touch", stringResource(R.string.mode_touch), null, listOf(SessionPrefs.TOUCH_AUTO to stringResource(R.string.drawer_touch_auto, a.touchAuto), SessionPrefs.TOUCH_PAD to stringResource(R.string.mode_touch_touchpad), SessionPrefs.TOUCH_DIRECT to stringResource(R.string.mode_touch_direct), SessionPrefs.TOUCH_GESTURES to stringResource(R.string.mode_touch_gestures), SessionPrefs.TOUCH_OFF to stringResource(R.string.widgets_off)), a.touchMode, chipModifier = focus.track(page, "touch"), onPick = a.onTouch) - ActionRow(stringResource(R.string.gesture_settings), stringResource(R.string.gesture_settings_hint), - stringResource(R.string.ctrl_edit), a.onGestureSettings, - modifier = focus.track(page, "gesture-settings")) + if (a.touchMode == SessionPrefs.TOUCH_GESTURES) { + ActionRow(stringResource(R.string.gesture_settings), null, + stringResource(R.string.ctrl_edit), a.onGestureSettings, + modifier = focus.track(page, "gesture-settings")) + } if (a.onScreenKeys != null) { SettingsRow(stringResource(R.string.screen_keys), null, stacked = narrow) { Row( From 43a0ce93f9fec1ea14e7017fe0d95a7d65ba33a6 Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Tue, 27 Oct 2026 05:08:21 -0400 Subject: [PATCH 122/135] fix: Frame Limit sync and refresh follow on a still screen (review follow-ups) (#1663) The Steam helper checked the Frame Limit only when the offered frame rates changed. With the limit off during a refresh change, turning it back on left a value the new rate does not offer, and a failed write was not tried again. It now checks on every state change and every 5 s, and waits for Steam's settings write so a rejected write is caught and tried again on the next check. gamescope 3.16.29-p16 (0120 changed): gamescope took a new host refresh only from the presentation feedback of a frame it drew, so with nothing moving on screen it kept the old rate. It now presents once when the host's wl_output mode changes and keeps presenting while a new rate is pending, so the 300 ms check runs on a still screen too. Found by CodeRabbit in the reviews of #1650 and #1663. --- .../0120-nested-refresh-follows-host.patch | 25 ++++++++++++++----- tools/gamescope/release.env | 4 +-- .../usr/local/bin/droiddeck-steam-compat | 12 ++++----- tools/tests/test_frame_limit_sync.py | 21 ++++++++++++++++ 4 files changed, 48 insertions(+), 14 deletions(-) diff --git a/tools/gamescope/patches/0120-nested-refresh-follows-host.patch b/tools/gamescope/patches/0120-nested-refresh-follows-host.patch index 5505ff3f6b..83ed73b74b 100644 --- a/tools/gamescope/patches/0120-nested-refresh-follows-host.patch +++ b/tools/gamescope/patches/0120-nested-refresh-follows-host.patch @@ -1,8 +1,8 @@ diff --git a/src/Backends/WaylandBackend.cpp b/src/Backends/WaylandBackend.cpp -index 40164ba..cc04fa7 100644 +index 40164ba..1b85e63 100644 --- a/src/Backends/WaylandBackend.cpp +++ b/src/Backends/WaylandBackend.cpp -@@ -1698,6 +1698,49 @@ namespace gamescope +@@ -1698,6 +1698,52 @@ namespace gamescope } } @@ -21,6 +21,7 @@ index 40164ba..cc04fa7 100644 + + // A mode switch on the host can report a passing rate for a few frames (72 Hz between 144 and + // 120 on an AYANEO Pocket FIT); a new rate is taken once it has been reported for 300 ms. ++ // Until then gamescope keeps presenting, so a still screen also gets the feedback that takes it. + static bool HostRefreshChanged( int32_t nRefreshmHz, uint64_t ulPresentedNs ) + { + static int32_t s_nPendingmHz = 0; @@ -36,9 +37,11 @@ index 40164ba..cc04fa7 100644 + { + s_nPendingmHz = nRefreshmHz; + s_ulPendingSinceNs = ulPresentedNs; -+ return false; + } -+ return ulPresentedNs - s_ulPendingSinceNs >= 300'000'000ul; ++ if ( ulPresentedNs - s_ulPendingSinceNs >= 300'000'000ul ) ++ return true; ++ force_repaint(); ++ return false; + } + + static void FollowHostRefresh( int32_t nRefreshmHz ) @@ -52,7 +55,7 @@ index 40164ba..cc04fa7 100644 void CWaylandPlane::UpdateVRRRefreshRate() { if ( m_pParent ) -@@ -1724,6 +1767,7 @@ namespace gamescope +@@ -1724,6 +1770,7 @@ namespace gamescope // TODO(strategy): We should pick the largest refresh rate. xdg_log.infof( "Changed refresh to: %.3fhz", ConvertmHzToHz( (float) nLargestRefreshRateMhz ) ); g_nOutputRefresh = nLargestRefreshRateMhz; @@ -60,7 +63,7 @@ index 40164ba..cc04fa7 100644 } } -@@ -1794,10 +1838,11 @@ namespace gamescope +@@ -1794,10 +1841,11 @@ namespace gamescope if ( uRefreshCycle ) { int32_t nRefresh = RefreshCycleTomHz( uRefreshCycle ); @@ -73,6 +76,16 @@ index 40164ba..cc04fa7 100644 } m_pConnector->SetHostCompositorIsCurrentlyVRR( false ); +@@ -2636,6 +2684,9 @@ namespace gamescope + } + void CWaylandBackend::Wayland_Output_Mode( wl_output *pOutput, uint32_t uFlags, int32_t nWidth, int32_t nHeight, int32_t nRefresh ) + { ++ // The followed rate comes from presentation feedback, so a still screen presents once for it. ++ if ( NestedRefreshFollowsHost() && m_pOutputs[ pOutput ].nRefresh != nRefresh ) ++ force_repaint(); + m_pOutputs[ pOutput ].nRefresh = nRefresh; + } + void CWaylandBackend::Wayland_Output_Done( wl_output *pOutput ) diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp index 6c9299d..5fb9086 100644 --- a/src/steamcompmgr.cpp diff --git a/tools/gamescope/release.env b/tools/gamescope/release.env index 611dd0c860..676a020370 100644 --- a/tools/gamescope/release.env +++ b/tools/gamescope/release.env @@ -1,3 +1,3 @@ GAMESCOPE_REPO=Droid-Deck/DroidDeck-Components -GAMESCOPE_TAG=gamescope-3.16.29-p15 -GAMESCOPE_SHA256=ee592bc7d000db86b12adaecb1aee5d25f8d6565c3584e55975ef1078d7a8e52 +GAMESCOPE_TAG=gamescope-3.16.29-p16 +GAMESCOPE_SHA256=8ae783d730d910de9a44ddb98dd567643e9cf7987f16ef261fe08cd2c4a7ba5c diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index 1d8e3992f8..ee24ff5829 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -272,14 +272,14 @@ FRAME_LIMIT_JS = r""" service = null; } if (!service || !settings?.clientSettings || typeof SteamClient.Settings?.SetSetting !== "function") return "unavailable"; - const self = { choices: null, timer: null }; + const self = { timer: null }; const write = value => { const bytes = []; for (let n of [21002 * 8, value]) { while (n > 127) { bytes.push((n & 127) | 128); n = Math.floor(n / 128); } bytes.push(n); } - SteamClient.Settings.SetSetting(btoa(String.fromCharCode(...bytes))); + return SteamClient.Settings.SetSetting(btoa(String.fromCharCode(...bytes))); }; self.check = async () => { let rates; @@ -291,12 +291,12 @@ FRAME_LIMIT_JS = r""" return; } if (!Array.isArray(rates) || rates.length === 0) return; - const choices = rates.join(","); - if (choices === self.choices) return; - self.choices = choices; const current = settings.clientSettings; if (!current.gamescope_enable_app_target_framerate || rates.includes(current.gamescope_app_target_framerate)) return; - write(Math.max(...rates)); + try { + await write(Math.max(...rates)); + } catch (e) { + } }; self.schedule = () => { clearTimeout(self.timer); diff --git a/tools/tests/test_frame_limit_sync.py b/tools/tests/test_frame_limit_sync.py index ca89c203aa..0cbdc18fb9 100644 --- a/tools/tests/test_frame_limit_sync.py +++ b/tools/tests/test_frame_limit_sync.py @@ -76,6 +76,27 @@ const change = async next => { rates = next; notify.forEach(callback => callback await change([36, 48, 144]); await fire(); assert.deepStrictEqual(writes, [144, 120], 'nothing changes while Steam has the frame limit turned off'); + settingsStore.clientSettings.gamescope_enable_app_target_framerate = true; + window.__droiddeckFrameLimit.schedule(); + await fire(); + assert.deepStrictEqual(writes, [144, 120, 144], 'turning the limit on after a rate change moves an unoffered value'); + settingsStore.clientSettings.gamescope_app_target_framerate = 72; + const setSetting = SteamClient.Settings.SetSetting; + SteamClient.Settings.SetSetting = () => { throw new Error('busy'); }; + window.__droiddeckFrameLimit.schedule(); + await fire(); + SteamClient.Settings.SetSetting = setSetting; + window.__droiddeckFrameLimit.schedule(); + await fire(); + assert.deepStrictEqual(writes, [144, 120, 144, 144], 'a failed write is tried again on the next check'); + settingsStore.clientSettings.gamescope_app_target_framerate = 72; + SteamClient.Settings.SetSetting = () => Promise.reject(new Error('busy')); + window.__droiddeckFrameLimit.schedule(); + await fire(); + SteamClient.Settings.SetSetting = setSetting; + window.__droiddeckFrameLimit.schedule(); + await fire(); + assert.deepStrictEqual(writes, [144, 120, 144, 144, 144], 'a rejected write is caught and tried again'); delete window.__droiddeckFrameLimit; webpackChunksteamui.push = ([, , callback]) => callback(webpack({ 1: modules[1], 2: modules[2] })); assert.strictEqual(eval(script), 'unavailable'); From 0f839bef5d5cf109af614d0ff15844c95a8e16d0 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 27 Oct 2026 07:23:47 -0400 Subject: [PATCH 123/135] fix(ui): bloom into the compatibility tools loading screen (#1666) --- .../droiddeck/launcher/FrontEndActivity.kt | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index a8998197bf..d6c7c94b90 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -100,6 +100,7 @@ class FrontEndActivity : ComponentActivity() { private class PendingFlood(val from: androidx.compose.ui.geometry.Rect, val intent: Intent) private class CompatLaunch(val intent: Intent, val loading: com.droiddeck.launcher.session.LoadingState, var menuInstall: Boolean) private var compatLaunch by mutableStateOf<CompatLaunch?>(null) + private var compatFlood by mutableStateOf<androidx.compose.ui.graphics.Color?>(null) private var compatLaunchPoll: Runnable? = null private var compatLaunchVisible = false private var returning by mutableStateOf<ReturningFlood?>(null) @@ -507,6 +508,7 @@ class FrontEndActivity : ComponentActivity() { } override fun startActivity(intent: Intent?) { + val compat = protons.protonBusyId != null || ProtonExtras.installInProgress if (intent?.component?.className == SessionActivity::class.java.name) { if (compatLaunch != null) return when { @@ -514,10 +516,7 @@ class FrontEndActivity : ComponentActivity() { android.widget.Toast.makeText(this, R.string.main_wait_runtime, android.widget.Toast.LENGTH_SHORT).show() return } - protons.protonBusyId != null || ProtonExtras.installInProgress -> { - waitForCompat(intent) - return - } + compat -> Unit pkgStage != null -> { android.widget.Toast.makeText(this, R.string.main_wait_desktop_install, android.widget.Toast.LENGTH_SHORT).show() return @@ -532,6 +531,10 @@ class FrontEndActivity : ComponentActivity() { return } com.droiddeck.launcher.ui.LaunchOrigin.flooding = null + if (compat) { + waitForCompat(intent) + return + } } super.startActivity(intent) if (intent?.component?.className == SessionActivity::class.java.name) overridePendingTransition(R.anim.session_rise, R.anim.session_hold) @@ -543,8 +546,11 @@ class FrontEndActivity : ComponentActivity() { flood = null floodProgress = 0f com.droiddeck.launcher.ui.LaunchOrigin.flooding = null - if (!busy && !LinuxRuntimeInstaller.isBusy() && pkgStage == null && - (protons.protonBusyId != null || ProtonExtras.installInProgress)) waitForCompat(f.intent) + if (!busy && !LinuxRuntimeInstaller.isBusy() && + (protons.protonBusyId != null || ProtonExtras.installInProgress)) { + compatFlood = com.droiddeck.launcher.ui.Themes.byId(theme).signal + waitForCompat(f.intent) + } return } val signal = com.droiddeck.launcher.ui.Themes.byId(theme).signal @@ -598,6 +604,7 @@ class FrontEndActivity : ComponentActivity() { compatLaunchPoll?.let(ui::removeCallbacks) compatLaunchPoll = null compatLaunch = null + compatFlood = null } private fun restoreCompatLaunch(state: Bundle) { @@ -1365,10 +1372,12 @@ class FrontEndActivity : ComponentActivity() { } androidx.activity.compose.BackHandler(compatLaunch != null) { cancelCompatLaunch() } compatLaunch?.loading?.let { loading -> + if (!loading.ended) com.droiddeck.launcher.ui.VeilRing() com.droiddeck.launcher.ui.LoadingOverlay( loading.step, loading.percent, loading.elapsed, getString(R.string.load_compat_hint), loading.ended, loading.topic, loading.readable, title = getString(R.string.load_compat_title), onCancel = ::cancelCompatLaunch, onClose = ::cancelCompatLaunch, + flood = compatFlood, onFlooded = { compatFlood = null }, ) } } From b5cc6dd1850b05a3806cd729b3a4000d4ebbd016 Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Tue, 27 Oct 2026 09:10:53 -0400 Subject: [PATCH 124/135] perf(gamescope): skip the repeated window lookup and wake on host events (#1672) The WSI layer sends override_window_content on every present, and gamescope walked the X tree to the top-level window (a blocking XQueryTree round trip per level, under the wlserver lock) before noticing the same swapchain already overrides it. A swapchain repeating the same window now skips the walk for 100 ms (0121). Backport of upstream gamescope 2962992 by Matthew Schwartz: the nested Wayland backend's input thread reads the host display, but steamcompmgr does not watch that fd, so buffer releases and presentation feedback could wait up to one refresh for its next poll; the input thread now wakes it after each read (0122). Pins gamescope-3.16.29-p17, the archive that was A/B-tested on the device. PATCHES.md also describes the p16 change to 0120. --- tools/gamescope/PATCHES.md | 25 +++++++++ ...-override-content-skip-toplevel-walk.patch | 55 +++++++++++++++++++ .../0122-wayland-wake-after-host-events.patch | 14 +++++ tools/gamescope/release.env | 4 +- 4 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 tools/gamescope/patches/0121-override-content-skip-toplevel-walk.patch create mode 100644 tools/gamescope/patches/0122-wayland-wake-after-host-events.patch diff --git a/tools/gamescope/PATCHES.md b/tools/gamescope/PATCHES.md index a72ab6be13..0d79564569 100644 --- a/tools/gamescope/PATCHES.md +++ b/tools/gamescope/PATCHES.md @@ -156,3 +156,28 @@ A host mode switch can report a passing rate for a few frames (72 Hz between 144 120 Hz on the AYANEO Pocket FIT), so with following on a new rate is taken once it has been reported for 300 ms. Without the variable the reported rate is taken at once, as upstream does. + +The rate comes from the feedback of a frame gamescope presents, so with nothing moving +on screen no feedback arrived and the old rate stayed. With following on, gamescope +presents once when the host's `wl_output` mode changes (DroidDeck's compositor sends +the new mode) and keeps presenting while a new rate is pending (since p16). + +## 0121 Xwayland: skip the X tree walk for a repeated window override + +The WSI layer sends `override_window_content` on every present of an X11 swapchain. +gamescope first walked from that window to its top-level window with `XQueryTree`, one +blocking X round trip per level under the wlserver lock, and only then noticed that the +same swapchain already overrides that window. At thousands of frames per second that is +thousands of round trips to Xwayland every second. + +The override now remembers the window it was asked for. When the same swapchain and +surface ask for the same window again within 100 ms, the request returns at once; after +100 ms the walk runs again, so a window that moved to another top level is still found. + +## 0122 Wayland: wake steamcompmgr after reading host events + +Backport of upstream commit 2962992 by Matthew Schwartz (ValveSoftware/gamescope). +The nested Wayland backend's input thread reads the host display, but steamcompmgr +does not watch that file descriptor, so buffer releases and presentation feedback +queued by that read could wait up to one refresh for steamcompmgr's next poll. The +input thread now wakes steamcompmgr after each read. diff --git a/tools/gamescope/patches/0121-override-content-skip-toplevel-walk.patch b/tools/gamescope/patches/0121-override-content-skip-toplevel-walk.patch new file mode 100644 index 0000000000..016ae5af37 --- /dev/null +++ b/tools/gamescope/patches/0121-override-content-skip-toplevel-walk.patch @@ -0,0 +1,55 @@ +diff --git a/src/wlserver.cpp b/src/wlserver.cpp +index 9a027a2..e6d8e31 100644 +--- a/src/wlserver.cpp ++++ b/src/wlserver.cpp +@@ -98,6 +98,8 @@ struct wlserver_content_override { + uint32_t x11_window; + struct wl_listener surface_destroy_listener; + struct wl_resource *gamescope_swapchain; ++ uint32_t requested_window; ++ uint64_t ulCheckedNs; + }; + + std::mutex g_wlserver_xdg_shell_windows_lock; +@@ -800,6 +802,20 @@ static void gamescope_swapchain_destroy_co( struct wl_resource *resource ); + + void gamescope_xwayland_server_t::handle_override_window_content( struct wl_client *client, struct wl_resource *gamescope_swapchain_resource, struct wlr_surface *surface, uint32_t x11_window ) + { ++ // The WSI layer sends this on every present. Finding the top level walks the X tree with a ++ // round trip per level, so a swapchain repeating the same window skips it for 100 ms. ++ const uint64_t ulNow = get_time_in_nanos(); ++ if ( gamescope_swapchain_resource ) ++ { ++ for ( const auto &[ window, existing ] : content_overrides ) ++ { ++ if ( existing->gamescope_swapchain == gamescope_swapchain_resource && existing->surface == surface && ++ existing->requested_window == x11_window && ulNow - existing->ulCheckedNs < 100'000'000ul ) ++ return; ++ } ++ } ++ ++ const uint32_t requested_window = x11_window; + x11_window = x11_find_toplevel_for_xid( this->ctx->dpy, x11_window ); + + wlserver_x11_surface_info *x11_surface = lookup_x11_surface_info_from_xid( this, x11_window ); +@@ -813,7 +829,11 @@ void gamescope_xwayland_server_t::handle_override_window_content( struct wl_clie + + if ( content_overrides.count( x11_window ) ) { + if ( content_overrides[x11_window]->gamescope_swapchain == gamescope_swapchain_resource ) ++ { ++ content_overrides[x11_window]->requested_window = requested_window; ++ content_overrides[x11_window]->ulCheckedNs = ulNow; + return; ++ } + #ifdef GAMESCOPE_SWAPCHAIN_DEBUG + wl_log.infof( "handle_override_window_content: (2) DESTROYING x11_window: 0x%x old_swapchain: %p new_swapchain: %p", x11_window, content_overrides[x11_window]->gamescope_swapchain, gamescope_swapchain_resource ); + #endif +@@ -830,6 +850,8 @@ void gamescope_xwayland_server_t::handle_override_window_content( struct wl_clie + co->surface = surface; + co->x11_window = x11_window; + co->gamescope_swapchain = gamescope_swapchain_resource; ++ co->requested_window = requested_window; ++ co->ulCheckedNs = ulNow; + co->surface_destroy_listener.notify = content_override_handle_surface_destroy; + wl_signal_add( &surface->events.destroy, &co->surface_destroy_listener ); + content_overrides[ x11_window ] = co; diff --git a/tools/gamescope/patches/0122-wayland-wake-after-host-events.patch b/tools/gamescope/patches/0122-wayland-wake-after-host-events.patch new file mode 100644 index 0000000000..0be39bf16c --- /dev/null +++ b/tools/gamescope/patches/0122-wayland-wake-after-host-events.patch @@ -0,0 +1,14 @@ +diff --git a/src/Backends/WaylandBackend.cpp b/src/Backends/WaylandBackend.cpp +index 1b85e63..370661d 100644 +--- a/src/Backends/WaylandBackend.cpp ++++ b/src/Backends/WaylandBackend.cpp +@@ -2977,6 +2977,9 @@ namespace gamescope + LogDisplayError( "Failed to read events on input thread", m_pBackend->GetDisplay() ); + abort(); + } ++ ++ // Reading also queues releases and presentation feedback for steamcompmgr. ++ nudge_steamcompmgr(); + } + } + diff --git a/tools/gamescope/release.env b/tools/gamescope/release.env index 676a020370..b8aaf70cba 100644 --- a/tools/gamescope/release.env +++ b/tools/gamescope/release.env @@ -1,3 +1,3 @@ GAMESCOPE_REPO=Droid-Deck/DroidDeck-Components -GAMESCOPE_TAG=gamescope-3.16.29-p16 -GAMESCOPE_SHA256=8ae783d730d910de9a44ddb98dd567643e9cf7987f16ef261fe08cd2c4a7ba5c +GAMESCOPE_TAG=gamescope-3.16.29-p17 +GAMESCOPE_SHA256=18e2b65407c5775301abdbc9f0db7df6b0e653923afcebdaa0f1ea3b9d5d5bb4 From e8bfe0c4e4d0796bc8e80d92ad53038b0bde4841 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 27 Oct 2026 10:14:43 -0400 Subject: [PATCH 125/135] fix: hold Home as Steam on Retroid Nova pads (#1674) * fix: hold Home as Steam on Retroid Nova pads * fix(input): track Home Guide apart from controller Guide * fix(input): keep held controls on Home cancel and resume on Home --- .../com/droiddeck/launcher/SessionActivity.kt | 8 ++- .../launcher/input/HomeButtonService.kt | 2 +- .../launcher/input/HomeGuideInput.kt | 7 +- .../droiddeck/launcher/input/PadBridge.java | 33 ++++++++-- .../launcher/input/HomeGuideInputTest.kt | 8 +++ .../launcher/input/PadBridgeQamTest.kt | 65 +++++++++++++++++++ 6 files changed, 111 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 6ee14aacfc..49216ee5e4 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -68,6 +68,7 @@ import com.droiddeck.launcher.gpu.ScreenEffects import com.droiddeck.launcher.gpu.Lossless import com.droiddeck.launcher.gpu.TurnipDriver import com.droiddeck.launcher.input.EvdevKeys +import com.droiddeck.launcher.input.HomeGuideInput import com.droiddeck.launcher.input.InputSpace import com.droiddeck.launcher.input.KeyboardHost import com.droiddeck.launcher.input.ControllerPrefs @@ -1330,7 +1331,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (incoming?.action != SessionService.ACTION_HOME_GUIDE) return incoming.action = null setIntent(incoming) - if (SessionState.running && SessionState.mode == SessionService.MODE_STEAM) sendSteamGuide() + if (SessionState.suspended) SessionService.resume(this) + else if (SessionState.running && SessionState.mode == SessionService.MODE_STEAM) sendSteamGuide() } @@ -2276,7 +2278,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return true } val resumeKey = event.keyCode == KeyEvent.KEYCODE_BUTTON_A || event.keyCode == KeyEvent.KEYCODE_BUTTON_START || - event.keyCode == KeyEvent.KEYCODE_BUTTON_MODE || event.keyCode == KeyEvent.KEYCODE_HOME + event.keyCode == KeyEvent.KEYCODE_BUTTON_MODE || HomeGuideInput.isHome(event.keyCode) val resumeKeyId = event.deviceId to event.keyCode if (fromController && resumeKey && (SessionState.suspended || resumeKeyId in resumeKeysDown)) { if (event.action == KeyEvent.ACTION_DOWN) { @@ -3290,7 +3292,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { enabled = { resumed && window.decorView.hasWindowFocus() && !ended && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !gestureSettingsOpen && !pipUi && SessionState.running && !SessionState.suspended && - SessionState.mode == SessionService.MODE_STEAM && padBridge?.canHoldGuide() == true + SessionState.mode == SessionService.MODE_STEAM && padBridge != null }, setPressed = { padBridge?.setHomeGuidePressed(it) }, onCancel = { padBridge?.cancelHomeGuide() }, diff --git a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt index 874d8fe583..b85fecb120 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt @@ -38,7 +38,7 @@ object HomeButtonShortcuts { fun onKeyEvent(context: Context, event: KeyEvent): Boolean { // AYN maps its system-assistant key (gpio-keys KEY_F24) to HOME too; only the pad's Home is Guide. - if (event.keyCode != KeyEvent.KEYCODE_HOME || !PadBridge.isControllerKeyEvent(event)) return false + if (!HomeGuideInput.isHome(event.keyCode) || !PadBridge.isControllerKeyEvent(event)) return false return input.onKeyEvent(event, enabled() && HomeApp.isDefault(context)) } diff --git a/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt b/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt index dfb7dbb0a1..785f7c1a13 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt @@ -7,7 +7,7 @@ class HomeGuideInput(private val setPressed: (Boolean) -> Unit, private val onCa private val cancelled = mutableSetOf<Int>() fun onKeyEvent(event: KeyEvent, enabled: Boolean): Boolean { - if (event.keyCode != KeyEvent.KEYCODE_HOME) return false + if (!isHome(event.keyCode)) return false if (!enabled) cancel() val device = event.deviceId return when (event.action) { @@ -39,4 +39,9 @@ class HomeGuideInput(private val setPressed: (Boolean) -> Unit, private val onCa cancelled.remove(device) if (presses.remove(device) && presses.isEmpty()) { onCancel(); setPressed(false) } } + + companion object { + // The Retroid Nova pad falls back to Generic.kl, which maps its Home scan code to MOVE_HOME. + fun isHome(keyCode: Int) = keyCode == KeyEvent.KEYCODE_HOME || keyCode == KeyEvent.KEYCODE_MOVE_HOME + } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index 28ee6403f0..7dd234daf1 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -53,6 +53,7 @@ public final class PadBridge { private final FakeInputWriter[] playerWriters = new FakeInputWriter[SLOTS]; private final PadState[] playerStates = new PadState[SLOTS]; private final PadState effectiveState = new PadState(); + private final PadState homeGuideReport = new PadState(); private final Handler mainHandler = new Handler(Looper.getMainLooper()); private boolean open; private volatile boolean selectSteam; @@ -63,6 +64,7 @@ public final class PadBridge { private boolean systemQamPressed; private boolean backQamPressed; private boolean homeGuidePressed; + private int homeGuideSlot = -1; private final PadState lastBackQamReport = new PadState(); private final PadState lastWrittenReport = new PadState(); private boolean backQamAxesBlocked; @@ -162,6 +164,7 @@ public final class PadBridge { public synchronized void stop() { homeGuidePressed = false; + homeGuideSlot = -1; clearBackQamWrites(); releaseBackPaddles(); activeControllerId = NO_CONTROLLER; @@ -229,6 +232,7 @@ public final class PadBridge { case KeyEvent.KEYCODE_BACK: case KeyEvent.KEYCODE_MENU: case KeyEvent.KEYCODE_HOME: + case KeyEvent.KEYCODE_MOVE_HOME: if (!isFromController(device)) return false; return device.supportsSource(InputDevice.SOURCE_GAMEPAD) || device.getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC @@ -329,7 +333,8 @@ public final class PadBridge { case KeyEvent.KEYCODE_BUTTON_THUMBL: pad.press(8, pressed); break; case KeyEvent.KEYCODE_BUTTON_THUMBR: pad.press(9, pressed); break; case KeyEvent.KEYCODE_BUTTON_MODE: - case KeyEvent.KEYCODE_HOME: pad.press(PadState.GUIDE, pressed); break; + case KeyEvent.KEYCODE_HOME: + case KeyEvent.KEYCODE_MOVE_HOME: pad.press(PadState.GUIDE, pressed); break; case KeyEvent.KEYCODE_BUTTON_Z: if (isPrimary(event)) DeckControls.INSTANCE.setGrip(isNovaController(event.getDevice()) ? DeckControls.R4 : DeckControls.L4, pressed); break; @@ -485,6 +490,7 @@ public final class PadBridge { public synchronized void releaseAll() { homeGuidePressed = false; + homeGuideSlot = -1; clearBackQamWrites(); routedTouch.clear(); backQamPressed = false; @@ -512,18 +518,24 @@ public final class PadBridge { return builtinPad && nativeQam(); } - public boolean canHoldGuide() { - return builtinPad; - } - public synchronized void setHomeGuidePressed(boolean pressed) { - if (pressed && !canHoldGuide()) return; + int slot = pressed ? firstPlayerSlot() : homeGuideSlot; + if (slot > 0) { + homeGuideSlot = pressed ? slot : -1; + publish(slot); + return; + } if (homeGuidePressed == pressed) return; homeGuidePressed = pressed; updateHeldModifier(PadState.GUIDE, pressed); } public synchronized void cancelHomeGuide() { + int slot = homeGuideSlot; + if (slot > 0) { + homeGuideSlot = -1; + publish(slot); + } if (!homeGuidePressed) return; clearBackQamWrites(); homeGuidePressed = false; @@ -784,6 +796,7 @@ public final class PadBridge { partners[slot] = NO_CONTROLLER; clearJoyCons(slot); slotControllers.set(slot, NO_CONTROLLER); + if (slot == homeGuideSlot) homeGuideSlot = -1; if (slot == firstPlayerSlot()) releaseBackPaddles(); if (slot == 0) { state.clear(); @@ -840,7 +853,13 @@ public final class PadBridge { } playerWriters[slot] = player; } - player.writePad(playerStates[slot]); + PadState report = playerStates[slot]; + if (slot == homeGuideSlot) { + homeGuideReport.copyFrom(report); + homeGuideReport.press(PadState.GUIDE, true); + report = homeGuideReport; + } + player.writePad(report); } private void publish() { diff --git a/app/src/test/java/com/droiddeck/launcher/input/HomeGuideInputTest.kt b/app/src/test/java/com/droiddeck/launcher/input/HomeGuideInputTest.kt index ccef31215d..3d2a2863ee 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/HomeGuideInputTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/HomeGuideInputTest.kt @@ -27,6 +27,14 @@ class HomeGuideInputTest { assertEquals(listOf(true, false), states) } + @Test fun genericLayoutMoveHomeHoldsGuideLikeHome() { + val down = KeyEvent(10, 110, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MOVE_HOME, 0, 0, 10, 102) + val up = KeyEvent(10, 200, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MOVE_HOME, 0, 0, 10, 102) + assertTrue(input.onKeyEvent(down, true)) + assertTrue(input.onKeyEvent(up, true)) + assertEquals(listOf(true, false), states) + } + @Test fun anUnownedHomePressKeepsAndroidBehaviorEvenIfSessionBecomesEligibleBeforeRelease() { assertFalse(input.onKeyEvent(home(KeyEvent.ACTION_DOWN), false)) assertFalse(input.onKeyEvent(home(KeyEvent.ACTION_UP), true)) diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt index 9ac6ecfccd..47bf0719c0 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt @@ -343,6 +343,71 @@ class PadBridgeQamTest { assertFalse(pad().isDown(PadState.X)) } + @Test fun homeGuideHoldsOnThePrimaryPlayerWithoutABuiltinPad() { + PadBridge.setFirstSlot(1) + try { + bridge.setBuiltinPad(false) + bridge.setHomeGuidePressed(true) + assertTrue(requireNotNull(JoyConPadTest.RecordingWriter.pads[1]).isDown(PadState.GUIDE)) + bridge.setHomeGuidePressed(false) + assertFalse(requireNotNull(JoyConPadTest.RecordingWriter.pads[1]).isDown(PadState.GUIDE)) + } finally { + PadBridge.setFirstSlot(0) + } + } + + @Test fun homeGuideAndControllerGuideReleaseIndependentlyOnThePrimaryPlayer() { + PadBridge.setFirstSlot(1) + try { + bridge.setBuiltinPad(false) + val device = controller() + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_MODE)) + bridge.setHomeGuidePressed(true) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_MODE, KeyEvent.ACTION_UP)) + assertTrue(requireNotNull(JoyConPadTest.RecordingWriter.pads[1]).isDown(PadState.GUIDE)) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_MODE)) + bridge.setHomeGuidePressed(false) + assertTrue(requireNotNull(JoyConPadTest.RecordingWriter.pads[1]).isDown(PadState.GUIDE)) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_MODE, KeyEvent.ACTION_UP)) + assertFalse(requireNotNull(JoyConPadTest.RecordingWriter.pads[1]).isDown(PadState.GUIDE)) + } finally { + PadBridge.setFirstSlot(0) + } + } + + @Test fun removingThePrimaryPlayerForgetsItsHomeGuide() { + PadBridge.setFirstSlot(1) + try { + bridge.setBuiltinPad(false) + val device = controller() + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_A, KeyEvent.ACTION_UP)) + bridge.setHomeGuidePressed(true) + bridge.onDeviceRemoved(device.id) + JoyConPadTest.RecordingWriter.pads.remove(1) + bridge.cancelHomeGuide() + bridge.setHomeGuidePressed(false) + assertNull(JoyConPadTest.RecordingWriter.pads[1]) + } finally { + PadBridge.setFirstSlot(0) + } + } + + @Test fun cancellingHomeGuideOnAPlayerSlotKeepsItsHeldControls() { + PadBridge.setFirstSlot(1) + try { + bridge.setBuiltinPad(false) + val device = controller() + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_A)) + bridge.setHomeGuidePressed(true) + bridge.cancelHomeGuide() + val pad = requireNotNull(JoyConPadTest.RecordingWriter.pads[1]) + assertFalse(pad.isDown(PadState.GUIDE)) + assertTrue(pad.isDown(PadState.A)) + } finally { + PadBridge.setFirstSlot(0) + } + } + @Test fun cancellingHomeDiscardsQueuedPartnersAndReleasesGuideImmediately() { bridge.setHomeGuidePressed(true) bridge.applyExternal({ it.press(PadState.LB, true); it.leftY = -1f }, true) From 378beacfacd4fc499b2728441a959370f0902709 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 27 Oct 2026 10:15:05 -0400 Subject: [PATCH 126/135] fix(ui): portrait nav highlight drift and blurry Android app icons (#1677) * fix(ui): keep nav highlight on its tab while the bar scrolls * fix(ui): render Android app icons at display density --- .../java/com/droiddeck/launcher/HomeApp.kt | 6 ++++- .../com/droiddeck/launcher/ui/FrontEndRail.kt | 22 ++++++++++--------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 74b49821c5..819a6525d6 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -12,8 +12,11 @@ import android.provider.Settings import androidx.core.graphics.drawable.toBitmap import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState +import kotlin.math.roundToInt object HomeApp { + private const val ICON_DP = 72 + data class LaunchableApp( val label: String, val packageName: String, @@ -71,13 +74,14 @@ object HomeApp { fun launchableApps(context: Context): List<LaunchableApp> { val pm = context.packageManager val launch = Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER) + val iconPx = (ICON_DP * context.resources.displayMetrics.density).roundToInt() val apps = pm.queryIntentActivities(launch, 0) .asSequence() .mapNotNull { result -> val activity = result.activityInfo ?: return@mapNotNull null if (!activity.exported || activity.packageName == context.packageName) return@mapNotNull null val label = result.loadLabel(pm)?.toString()?.trim().orEmpty().ifEmpty { activity.packageName } - val icon = runCatching { result.loadIcon(pm).toBitmap(48, 48) }.getOrNull() + val icon = runCatching { result.loadIcon(pm).toBitmap(iconPx, iconPx) }.getOrNull() LaunchableApp(label, activity.packageName, activity.name, icon) } .distinctBy { it.packageName } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index 78e6bd49bf..1087240002 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -84,7 +84,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.layout.boundsInParent import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.LayoutCoordinates import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.layout.onPlaced import com.droiddeck.launcher.core.PhantomProcessLimit @@ -99,15 +101,15 @@ internal fun BottomBar( val keys = navigationKeys(s) val bounds = remember { androidx.compose.runtime.mutableStateMapOf<String, androidx.compose.ui.geometry.Rect>() } val tint = androidx.compose.runtime.rememberUpdatedState(LocalPalette.current.signal) - var barAt by remember { mutableStateOf(androidx.compose.ui.geometry.Offset.Zero) } + val content = remember { arrayOfNulls<LayoutCoordinates>(1) } Row(modifier.fillMaxWidth().background(MaterialTheme.colorScheme.surface), verticalAlignment = Alignment.CenterVertically) { BoxWithConstraints(Modifier.weight(1f)) { val itemWidth = (maxWidth / keys.size).coerceIn(56.dp, 88.dp) - Box(Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).onGloballyPositioned { barAt = it.boundsInRoot().topLeft }) { - if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown]?.translate(-barAt), tint, GlideAxis.Horizontal, corner = 14.dp, fill = 0.14f, outline = 0f) + Box(Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).onPlaced { content[0] = it }) { + if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown], tint, GlideAxis.Horizontal, corner = 14.dp, fill = 0.14f, outline = 0f) Row(Modifier.selectableGroup().padding(vertical = 4.dp), horizontalArrangement = Arrangement.Center) { NavigationItems(s, shown, compact = true, iconOnly = false, height = 56.dp, width = itemWidth, - place = { key -> Modifier.onGloballyPositioned { bounds[key] = it.boundsInRoot(); Hops.railBounds[key] = it.boundsInRoot() } }, + place = { key -> Modifier.onGloballyPositioned { item -> content[0]?.let { bounds[key] = it.localBoundingBoxOf(item) }; Hops.railBounds[key] = item.boundsInRoot() } }, onSelect = onSelect, onFocusSelect = onFocusSelect) } } @@ -143,18 +145,18 @@ internal fun SideRail( val keys = navigationKeys(s) val bounds = remember { androidx.compose.runtime.mutableStateMapOf<String, androidx.compose.ui.geometry.Rect>() } val tint = androidx.compose.runtime.rememberUpdatedState(LocalPalette.current.signal) - var railAt by remember { mutableStateOf(androidx.compose.ui.geometry.Offset.Zero) } - Box(Modifier.fillMaxSize().verticalScroll(rememberScrollState()).onGloballyPositioned { railAt = it.boundsInRoot().topLeft }) { - if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown]?.translate(-railAt), tint, GlideAxis.Vertical, corner = 14.dp, fill = 0.14f, outline = 0f) + val content = remember { arrayOfNulls<LayoutCoordinates>(1) } + Box(Modifier.fillMaxSize().verticalScroll(rememberScrollState()).onPlaced { content[0] = it }) { + if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown], tint, GlideAxis.Vertical, corner = 14.dp, fill = 0.14f, outline = 0f) Column( horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(4.dp), modifier = Modifier.fillMaxWidth().selectableGroup(), ) { val place: (String) -> Modifier = { key -> - Modifier.onGloballyPositioned { - bounds[key] = it.boundsInRoot() - Hops.railBounds[key] = it.boundsInRoot() + Modifier.onGloballyPositioned { item -> + content[0]?.let { bounds[key] = it.localBoundingBoxOf(item) } + Hops.railBounds[key] = item.boundsInRoot() } } NavigationItems(s, shown, compact, iconOnly, fit, if (iconOnly) 52.dp else 80.dp, place, onSelect, onFocusSelect) From 067dabe81c4710706af33ab053e65eb3bc7032ab Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Tue, 27 Oct 2026 12:32:15 -0400 Subject: [PATCH 127/135] perf(compositor): screen tick on its own thread, pacing counters (#1678) The Choreographer frame callback that drives the compositor ran on the app's main thread, so main-thread work delayed the tick before it reached the compositor thread. It now runs on a display-priority HandlerThread with its own Choreographer; the session pref vsyncThread (default true) switches back to the main thread. Each resume posts a new callback with its own generation, so one left queued from an earlier resume, on either thread, stops itself instead of ticking twice. A new 10 s "pacing" log line reports how late the tick reaches the compositor, how long a new frame waits to be drawn, game frames against buffers re-attached after an empty attach, empty attaches and distinct buffers, and presentation feedback shown, replaced before drawing and not drawn. --- app/src/main/cpp/waylandcomp/src/compositor.c | 66 +++++++++++++++++-- .../launcher/session/SessionPrefs.kt | 1 + .../launcher/wayland/CompositorHost.kt | 29 +++++++- 3 files changed, 90 insertions(+), 6 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index d84e73de52..ff1a33ed2d 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -207,6 +207,7 @@ struct surface { struct wl_resource *dmabuf; struct dmabuf_buffer *dmabuf_buf; struct wl_listener dmabuf_destroy; + const void *last_dmabuf; int buf_w, buf_h, has_content; int buf_alpha; int opaque[4], pending_opaque[4], pending_opaque_set; @@ -261,6 +262,21 @@ static struct wl_event_source *g_render_idle, *g_frame_timer; static int g_dirty; +static int64_t g_dirty_since_ns; +#define PACE_BUFFERS 32 +static struct { + unsigned ticks, ticks_late_2ms, renders, null_attaches, reattaches, presented, replaced, undrawn, distinct; + int64_t tick_late_ns, tick_late_max_ns, wait_ns, wait_max_ns; + const void *buffers[PACE_BUFFERS]; + uint64_t game_frames_seen; +} g_pace; + +static void pace_note_buffer(const void *buffer) { + for (unsigned i = 0; i < g_pace.distinct && i < PACE_BUFFERS; i++) + if (g_pace.buffers[i] == buffer) return; + if (g_pace.distinct < PACE_BUFFERS) g_pace.buffers[g_pace.distinct] = buffer; + g_pace.distinct++; +} static int64_t g_last_vsync_ns; static int64_t g_tick_vsync_ns; static int64_t g_refresh_ns = 16666667; @@ -758,6 +774,9 @@ static void take_pixel(struct surface *s, const uint8_t bgra[4], struct wl_resou static void take_dmabuf(struct surface *s, struct dmabuf_buffer *b, struct wl_resource *buffer) { const int repeat = s->dmabuf == buffer && s->dmabuf_buf == b; if (!repeat) { + if (!s->dmabuf && s->last_dmabuf == buffer) g_pace.reattaches++; + s->last_dmabuf = buffer; + pace_note_buffer(buffer); drop_dmabuf(s, 1); s->dmabuf = buffer; s->dmabuf_buf = b; @@ -919,12 +938,15 @@ static void feedback_resource_destroy(struct wl_resource *r) { wl_list_remove(wl_resource_get_link(r)); } -static void feedback_discard_all(struct wl_list *list) { +static unsigned feedback_discard_all(struct wl_list *list) { struct wl_resource *fb, *tmp; + unsigned n = 0; wl_resource_for_each_safe(fb, tmp, list) { wp_presentation_feedback_send_discarded(fb); wl_resource_destroy(fb); + n++; } + return n; } static uint32_t nominal_refresh_ns(void) { @@ -953,6 +975,7 @@ static void feedback_present_all(struct wl_list *list, int64_t t) { nominal_refresh_ns(), 0, 0, WP_PRESENTATION_FEEDBACK_KIND_VSYNC); wl_resource_destroy(fb); + g_pace.presented++; } } @@ -1119,7 +1142,9 @@ static void surface_commit(struct wl_client *c, struct wl_resource *r) { struct wl_shm_buffer *shm = buffer && !db ? wl_shm_buffer_get(buffer) : NULL; uint8_t pixel[4]; - feedback_discard_all(&s->feedback); + g_pace.replaced += feedback_discard_all(&s->feedback); + if (!buffer) g_pace.null_attaches++; + else if (!db) s->last_dmabuf = NULL; if (buffer) { wl_list_remove(&s->pending_buffer_destroy.link); @@ -2092,13 +2117,20 @@ void droiddeck_stream_frame(AHardwareBuffer *ahb) { unsigned droiddeck_stream_frames(void) { return atomic_load(&g_stream_frames); } static void render_scene(void) { - if (atomic_load(&g_stream_on)) { render_stream(); return; } + if (atomic_load(&g_stream_on)) { g_dirty_since_ns = 0; render_stream(); return; } struct draw_list dl = {0}; struct surface *s; int w, h; const int64_t t_scene = now_ns(); int copy = 0; + if (g_dirty_since_ns) { + const int64_t wait = t_scene - g_dirty_since_ns; + g_pace.wait_ns += wait; + if (wait > g_pace.wait_max_ns) g_pace.wait_max_ns = wait; + g_pace.renders++; + g_dirty_since_ns = 0; + } g_dirty = 0; g_hud_fresh = 0; g_hdr_unimported = NULL; @@ -2239,7 +2271,7 @@ static void render_scene(void) { } wl_list_for_each(s, &g_surfaces, link) { if (s->drawn) feedback_present_all(&s->feedback, t); - else feedback_discard_all(&s->feedback); + else g_pace.undrawn += feedback_discard_all(&s->feedback); } fire_all_frames(); } else { @@ -2265,6 +2297,7 @@ static int on_fallback_timer(void *data) { } static void schedule_render(void) { + if (!g_dirty && !g_dirty_since_ns) g_dirty_since_ns = now_ns(); g_dirty = 1; if (!g_display) return; if (g_last_vsync_ns && now_ns() - g_last_vsync_ns < 100000000LL) return; @@ -2284,6 +2317,13 @@ static int scene_waits_for_game(int64_t now) { static void on_vsync(int64_t frame_time_ns) { int64_t now = now_ns(); g_perf.ticks++; + if (frame_time_ns > 0 && now >= frame_time_ns) { + const int64_t late = now - frame_time_ns; + g_pace.ticks++; + g_pace.tick_late_ns += late; + if (late > g_pace.tick_late_max_ns) g_pace.tick_late_max_ns = late; + if (late > 2000000LL) g_pace.ticks_late_2ms++; + } if (g_last_vsync_ns) { int64_t d = now - g_last_vsync_ns; if (d > 3000000LL && d < 40000000LL) g_refresh_ns = (g_refresh_ns * 7 + d) / 8; @@ -3396,6 +3436,24 @@ static int on_stats_timer(void *data) { #undef PERF_MS memset(&g_perf, 0, sizeof(g_perf)); } + const uint64_t game = g_game_frames - g_pace.game_frames_seen; + if (g_pace.ticks || g_pace.renders || game || g_pace.reattaches || g_pace.null_attaches || g_pace.distinct || + g_pace.presented || g_pace.replaced || g_pace.undrawn) { + droiddeck_log("pacing", "last 10 s: tick reaches compositor %.2f/%.2f ms late (%u ticks, %u over 2 ms) | " + "new frame waits %.2f/%.2f ms to be drawn (%u scenes) | %llu game frames, %u re-attached after an " + "empty attach, %u empty attaches, %u distinct buffers | feedback %u shown, %u replaced before drawing, " + "%u not drawn", + g_pace.ticks ? (double)g_pace.tick_late_ns / 1e6 / g_pace.ticks : 0.0, (double)g_pace.tick_late_max_ns / 1e6, + g_pace.ticks, g_pace.ticks_late_2ms, + g_pace.renders ? (double)g_pace.wait_ns / 1e6 / g_pace.renders : 0.0, (double)g_pace.wait_max_ns / 1e6, + g_pace.renders, (unsigned long long)game, g_pace.reattaches, g_pace.null_attaches, g_pace.distinct, + g_pace.presented, g_pace.replaced, g_pace.undrawn); + } + { + const uint64_t seen = g_game_frames; + memset(&g_pace, 0, sizeof(g_pace)); + g_pace.game_frames_seen = seen; + } g_stat_frames = g_stat_dmabuf = g_stat_shm = 0; droiddeck_color_stats_tick(); 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 592bf42cf9..77601e3a3a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -602,6 +602,7 @@ object SessionPrefs { } fun mangoapp(context: Context): Boolean = prefs(context).getBoolean("mangoapp", true) + fun vsyncThread(context: Context): Boolean = prefs(context).getBoolean("vsyncThread", true) fun setMangoapp(context: Context, on: Boolean) { prefs(context).edit().putBoolean("mangoapp", on).apply() } fun zinkLazy(context: Context): Boolean = prefs(context).getBoolean("zinkLazy", true) diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt index 348e8ff1fb..fcf57b9515 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt @@ -1,7 +1,11 @@ package com.droiddeck.launcher.wayland +import android.os.Handler +import android.os.HandlerThread +import android.os.Process import android.view.Choreographer import android.view.Surface +import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.session.SessionState object CompositorHost { @@ -14,8 +18,22 @@ object CompositorHost { @Volatile private var vsyncRunning = false - private val vsync = object : Choreographer.FrameCallback { + @Volatile + private var ownVsyncThread = true + + // The screen tick gets its own thread so a busy main thread cannot delay the compositor's frames. + private val vsyncThread: HandlerThread by lazy { + HandlerThread("droiddeck-vsync", Process.THREAD_PRIORITY_DISPLAY).apply { start() } + } + private val vsyncHandler: Handler by lazy { Handler(vsyncThread.looper) } + + @Volatile + private var vsyncGeneration = 0 + + // Each resume gets a new callback; one left queued from an earlier resume, on either thread, stops itself. + private fun vsyncCallback(generation: Int) = object : Choreographer.FrameCallback { override fun doFrame(frameTimeNanos: Long) { + if (generation != vsyncGeneration) return WaylandCompositor.nativeVsync(frameTimeNanos) if (vsyncRunning) Choreographer.getInstance().postFrameCallback(this) } @@ -34,6 +52,7 @@ object CompositorHost { refreshHz: Float, fpsLimit: Int, ): Boolean { + ownVsyncThread = SessionPrefs.vsyncThread(context) pace(refreshHz, fpsLimit) if (!SessionState.running) WaylandCompositor.nativeSetOutputSize(outputWidth, outputHeight) if (started) { @@ -103,8 +122,14 @@ object CompositorHost { private fun resumeVsync() { if (vsyncRunning) return + val callback = vsyncCallback(++vsyncGeneration) vsyncRunning = true - Choreographer.getInstance().postFrameCallback(vsync) + WaylandCompositor.nativeLog("screen", if (ownVsyncThread) "screen tick runs on its own display-priority thread" else "screen tick runs on the main thread") + if (!ownVsyncThread) { + Choreographer.getInstance().postFrameCallback(callback) + return + } + vsyncHandler.post { Choreographer.getInstance().postFrameCallback(callback) } } private fun pauseVsync() { From f07dd5eb979470ad2a0572a0143decda7dc975c3 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 27 Oct 2026 12:33:10 -0400 Subject: [PATCH 128/135] feat(setup): guided Wireless debugging onboarding for the child-process limit (#1682) * feat(setup): guide wireless pairing from a picture-in-picture window * feat(setup): share one child-process fix flow between Setup and Play Steam * fix(setup): read the child-process limit from the settings provider * fix(setup): re-check the child-process limit while Setup is open * fix(setup): skip a dead saved pairing and quiet the pairing guide * fix(setup): handle repeat guide launches and start pairing after the display choice --- app/src/main/AndroidManifest.xml | 11 + .../droiddeck/launcher/FrontEndActivity.kt | 5 + .../launcher/PairingGuideActivity.kt | 328 ++++++++++++++++++ .../droiddeck/launcher/core/GlobalSettings.kt | 24 ++ .../launcher/core/PhantomProcessLimit.kt | 4 +- .../core/WirelessAdbPairingService.kt | 6 +- .../droiddeck/launcher/ui/FrontEndContent.kt | 8 +- .../droiddeck/launcher/ui/FrontEndScreen.kt | 46 ++- .../droiddeck/launcher/ui/FrontEndSetup.kt | 17 +- .../launcher/ui/PhantomProcessGatePage.kt | 8 +- app/src/main/res/values/strings.xml | 7 + .../launcher/ui/GlobalGlassesSettingsTest.kt | 2 +- 12 files changed, 443 insertions(+), 23 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/PairingGuideActivity.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/core/GlobalSettings.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8612604928..0f9a8e9c13 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -81,6 +81,17 @@ </intent-filter> </activity> + <activity + android:name=".PairingGuideActivity" + android:exported="false" + android:launchMode="singleTask" + android:taskAffinity="com.droiddeck.launcher.pairingguide" + android:excludeFromRecents="true" + android:supportsPictureInPicture="true" + android:resizeableActivity="true" + android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|density|keyboard|keyboardHidden|navigation" + android:theme="@style/AppTheme" /> + <activity android:name=".FrontEndActivity" android:exported="true" diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index d6c7c94b90..7d81085b11 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1274,7 +1274,12 @@ class FrontEndActivity : ComponentActivity() { android.widget.Toast.makeText(this, R.string.main_adb_copied, android.widget.Toast.LENGTH_SHORT).show() }, onDismissPhantomGate = { showPhantomGate = false }, + onShowPhantomGate = { + refreshPhantomStatus() + showPhantomGate = true + }, onStartWirelessAdbPairing = { WirelessAdbPairingService.start(this) }, + onStartPairingGuide = { displayId -> PairingGuideActivity.start(this, displayId) }, onOpenNotificationSettings = { startActivity(Intent(android.provider.Settings.ACTION_APP_NOTIFICATION_SETTINGS) .putExtra(android.provider.Settings.EXTRA_APP_PACKAGE, packageName) diff --git a/app/src/main/java/com/droiddeck/launcher/PairingGuideActivity.kt b/app/src/main/java/com/droiddeck/launcher/PairingGuideActivity.kt new file mode 100644 index 0000000000..44fce026a9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/PairingGuideActivity.kt @@ -0,0 +1,328 @@ +package com.droiddeck.launcher + +import android.app.ActivityOptions +import android.app.AppOpsManager +import android.app.PictureInPictureParams +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.content.res.Configuration +import android.os.Build +import android.os.Bundle +import android.os.Process +import android.provider.Settings +import android.util.Rational +import androidx.activity.ComponentActivity +import androidx.activity.compose.BackHandler +import androidx.activity.compose.setContent +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.RepeatMode +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.draw.scale +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.core.AppLanguage +import com.droiddeck.launcher.core.GlobalSettings +import com.droiddeck.launcher.core.WirelessAdbPairingService +import com.droiddeck.launcher.core.WirelessAdbPairingService.Stage +import com.droiddeck.launcher.ui.DroidDeckTheme +import com.droiddeck.launcher.ui.LocalPalette +import com.droiddeck.launcher.ui.PrimaryButton +import com.droiddeck.launcher.ui.SecondaryButton +import kotlinx.coroutines.delay + +class PairingGuideActivity : ComponentActivity() { + enum class Step { BUILD_NUMBER, WIRELESS_DEBUGGING, PAIR, CODE, WORKING, DONE, FAILED } + + private var settingsDisplay: Int? = null + private var inPip by mutableStateOf(false) + private var launchPending = false + + override fun attachBaseContext(newBase: Context) = super.attachBaseContext(AppLanguage.wrap(newBase)) + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + settingsDisplay = intent.getIntExtra(EXTRA_DISPLAY, -1).takeIf { it >= 0 } + setContent { DroidDeckTheme { Guide() } } + launchPending = savedInstanceState == null + } + + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + setIntent(intent) + settingsDisplay = intent.getIntExtra(EXTRA_DISPLAY, -1).takeIf { it >= 0 } + launchPending = true + } + + override fun onResume() { + super.onResume() + if (!launchPending) return + if (inPip || settingsDisplay != null) { + launchSettings() + return + } + enterPip() + if (!inPip) launchSettings() + } + + override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) { + super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig) + inPip = isInPictureInPictureMode + if (isInPictureInPictureMode && launchPending) launchSettings() + } + + private fun launchSettings() { + launchPending = false + openSettings(stepFor(this, WirelessAdbPairingService.stage.value)) + } + + private fun enterPip() { + inPip = runCatching { + enterPictureInPictureMode(PictureInPictureParams.Builder().setAspectRatio(Rational(4, 3)).build()) + }.getOrDefault(false) + } + + private fun openSettings(step: Step) { + val intent = if (step == Step.BUILD_NUMBER) { + Intent(Settings.ACTION_DEVICE_INFO_SETTINGS).putExtra(HIGHLIGHT_KEY, "build_number") + } else { + Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS).putExtra(HIGHLIGHT_KEY, "toggle_adb_wireless") + }.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + val display = settingsDisplay + runCatching { + if (display == null) startActivity(intent) + else startActivity(intent, ActivityOptions.makeBasic().setLaunchDisplayId(display).toBundle()) + }.onFailure { + runCatching { startActivity(Intent(Settings.ACTION_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) } + } + } + + private fun returnToApp() { + startActivity(Intent(this, FrontEndActivity::class.java) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)) + finish() + } + + @Composable + private fun Guide() { + val stage by WirelessAdbPairingService.stage.collectAsState() + val settingsState by produceState(SettingsState.read(this)) { + while (true) { + value = SettingsState.read(this@PairingGuideActivity) + delay(500) + } + } + val step = stepFor(settingsState, stage) + var previous by remember { mutableStateOf(step) } + LaunchedEffect(step) { + if (previous == Step.BUILD_NUMBER && step == Step.WIRELESS_DEBUGGING) openSettings(step) + previous = step + when (step) { + Step.DONE -> { delay(1_500); returnToApp() } + Step.FAILED -> { delay(3_000); returnToApp() } + else -> Unit + } + } + LaunchedEffect(stage) { if (stage == Stage.Idle) finish() } + BackHandler(enabled = !inPip && settingsDisplay == null) { enterPip() } + + Box(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background), contentAlignment = Alignment.Center) { + if (inPip) CompactStep(step, stage) + else FullGuide(step, stage) + } + } + + @Composable + private fun CompactStep(step: Step, stage: Stage) { + Column(Modifier.fillMaxSize().padding(10.dp), verticalArrangement = Arrangement.SpaceBetween) { + Text( + instruction(step, stage), style = MaterialTheme.typography.labelLarge, fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.onBackground, maxLines = 3, overflow = TextOverflow.Ellipsis, + ) + StepVisual(step, compact = true) + StepDots(step) + } + } + + @Composable + private fun FullGuide(step: Step, stage: Stage) { + Column( + Modifier.widthIn(max = 520.dp).fillMaxWidth().padding(24.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Text(stringResource(R.string.gate_title), style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.onBackground) + Text(instruction(step, stage), style = MaterialTheme.typography.titleMedium, color = MaterialTheme.colorScheme.onBackground) + StepVisual(step, compact = false) + StepDots(step) + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + if (step == Step.DONE || step == Step.FAILED) { + PrimaryButton(stringResource(R.string.common_back), onClick = ::returnToApp) + } else { + PrimaryButton(stringResource(R.string.gate_open_dev), onClick = { + if (settingsDisplay == null) enterPip() + openSettings(step) + }) + SecondaryButton(stringResource(R.string.common_cancel), onClick = { + WirelessAdbPairingService.cancel(this@PairingGuideActivity) + returnToApp() + }) + } + } + } + } + + @Composable + private fun instruction(step: Step, stage: Stage): String = when (step) { + Step.BUILD_NUMBER -> stringResource(R.string.pairguide_build_number) + Step.WIRELESS_DEBUGGING -> stringResource(R.string.pairguide_wireless) + Step.PAIR -> stringResource(R.string.pairguide_pair) + Step.CODE -> (stage as? Stage.CodeNeeded)?.error ?: stringResource(R.string.gate_step3) + Step.WORKING -> (stage as? Stage.Working)?.step ?: stringResource(R.string.adbpair_title_working) + Step.DONE -> stringResource(R.string.adbpair_title_done) + Step.FAILED -> (stage as? Stage.Failed)?.error ?: stringResource(R.string.adbpair_title_failed) + } + + @Composable + private fun StepVisual(step: Step, compact: Boolean) { + val colors = MaterialTheme.colorScheme + val accent = LocalPalette.current.signal + val pulse = rememberInfiniteTransition(label = "guidePulse") + val beat by pulse.animateFloat(0f, 1f, infiniteRepeatable(tween(900, easing = LinearEasing), RepeatMode.Restart), label = "beat") + val label = when (step) { + Step.BUILD_NUMBER -> stringResource(R.string.pairguide_row_build_number) + Step.WIRELESS_DEBUGGING -> stringResource(R.string.pairguide_row_wireless) + Step.PAIR -> stringResource(R.string.pairguide_row_pair) + Step.CODE -> stringResource(R.string.adbpair_enter_code) + Step.WORKING, Step.DONE, Step.FAILED -> return + } + val rowHeight = if (compact) 34.dp else 56.dp + Row( + Modifier.fillMaxWidth().height(rowHeight).background(colors.surfaceVariant, RoundedCornerShape(10.dp)) + .border(1.dp, accent.copy(alpha = 0.35f), RoundedCornerShape(10.dp)).padding(horizontal = 10.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text(label, style = if (compact) MaterialTheme.typography.labelMedium else MaterialTheme.typography.bodyLarge, + color = colors.onSurface, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + when (step) { + Step.WIRELESS_DEBUGGING -> Toggle(on = beat > 0.5f, accent = accent, compact = compact) + else -> Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + if (step == Step.BUILD_NUMBER) Text("×7", style = MaterialTheme.typography.labelLarge, color = accent) + Box(contentAlignment = Alignment.Center) { + Box(Modifier.size(if (compact) 18.dp else 26.dp).scale(0.6f + beat * 0.8f).alpha(1f - beat) + .background(accent, CircleShape)) + Box(Modifier.size(if (compact) 8.dp else 12.dp).background(accent, CircleShape)) + } + } + } + } + } + + @Composable + private fun Toggle(on: Boolean, accent: Color, compact: Boolean) { + val width = if (compact) 26.dp else 40.dp + val knob = if (compact) 12.dp else 18.dp + Box( + Modifier.width(width).height(knob + 4.dp) + .background(if (on) accent.copy(alpha = 0.6f) else MaterialTheme.colorScheme.outline, CircleShape).padding(2.dp), + contentAlignment = if (on) Alignment.CenterEnd else Alignment.CenterStart, + ) { Box(Modifier.size(knob).background(Color.White, CircleShape)) } + } + + @Composable + private fun StepDots(step: Step) { + val accent = LocalPalette.current.signal + val shown = listOf(Step.BUILD_NUMBER, Step.WIRELESS_DEBUGGING, Step.PAIR, Step.CODE) + val at = shown.indexOf(step).takeIf { it >= 0 } ?: shown.size + Row(horizontalArrangement = Arrangement.spacedBy(5.dp), verticalAlignment = Alignment.CenterVertically) { + shown.forEachIndexed { index, _ -> + Box(Modifier.size(if (index == at) 8.dp else 6.dp) + .background(if (index <= at) accent else MaterialTheme.colorScheme.outline, CircleShape)) + } + Spacer(Modifier.width(2.dp)) + } + } + + private data class SettingsState(val developerOptions: Boolean, val wirelessDebugging: Boolean) { + companion object { + fun read(context: Context) = SettingsState( + GlobalSettings.developerOptionsOn(context), + GlobalSettings.wirelessDebuggingOn(context), + ) + } + } + + companion object { + private const val EXTRA_DISPLAY = "settingsDisplay" + private const val HIGHLIGHT_KEY = ":settings:fragment_args_key" + + private fun stepFor(context: Context, stage: Stage) = stepFor(SettingsState.read(context), stage) + + private fun stepFor(settings: SettingsState, stage: Stage): Step = when (stage) { + is Stage.Working -> Step.WORKING + Stage.Done -> Step.DONE + is Stage.Failed -> Step.FAILED + is Stage.CodeNeeded -> Step.CODE + else -> when { + !settings.developerOptions -> Step.BUILD_NUMBER + !settings.wirelessDebugging -> Step.WIRELESS_DEBUGGING + else -> Step.PAIR + } + } + + fun canFloat(context: Context): Boolean { + if (!context.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) return false + val ops = context.getSystemService(AppOpsManager::class.java) ?: return true + val mode = if (Build.VERSION.SDK_INT >= 29) { + ops.unsafeCheckOpNoThrow(AppOpsManager.OPSTR_PICTURE_IN_PICTURE, Process.myUid(), context.packageName) + } else { + @Suppress("DEPRECATION") + ops.checkOpNoThrow(AppOpsManager.OPSTR_PICTURE_IN_PICTURE, Process.myUid(), context.packageName) + } + return mode == AppOpsManager.MODE_ALLOWED + } + + fun start(context: Context, settingsDisplay: Int?): Boolean { + if (settingsDisplay == null && !canFloat(context)) return false + context.startActivity(Intent(context, PairingGuideActivity::class.java) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + .apply { if (settingsDisplay != null) putExtra(EXTRA_DISPLAY, settingsDisplay) }) + return true + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/core/GlobalSettings.kt b/app/src/main/java/com/droiddeck/launcher/core/GlobalSettings.kt new file mode 100644 index 0000000000..8cbf9bf39d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/core/GlobalSettings.kt @@ -0,0 +1,24 @@ +package com.droiddeck.launcher.core + +import android.content.Context +import android.net.Uri +import android.provider.Settings + +object GlobalSettings { + // Settings.Global caches values in-process and misses deletions made over adb; ask the provider directly. + fun read(context: Context, name: String): String? { + val uri = Uri.withAppendedPath(Settings.Global.CONTENT_URI, name) + context.contentResolver.query(uri, arrayOf(Settings.NameValueTable.VALUE), null, null, null)?.use { cursor -> + return if (cursor.moveToFirst()) cursor.getString(0) else null + } + return Settings.Global.getString(context.contentResolver, name) + } + + fun isOn(context: Context, name: String): Boolean = + runCatching { read(context, name)?.trim() == "1" }.getOrDefault(false) + + fun developerOptionsOn(context: Context): Boolean = isOn(context, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED) + + // Settings.Global.ADB_WIFI_ENABLED is hidden; the key is stable since Android 11. + fun wirelessDebuggingOn(context: Context): Boolean = isOn(context, "adb_wifi_enabled") +} diff --git a/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt b/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt index 6ad5f89b64..6e67ff495d 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt @@ -60,14 +60,14 @@ object PhantomProcessLimit { if (usesDeviceConfig(sdk)) { val off = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getBoolean(PREF_ANDROID_12_OFF, false) val global = try { - Settings.Global.getString(context.contentResolver, SETTING) + GlobalSettings.read(context, SETTING) } catch (_: Exception) { null } return android12Status(off, global, systemProperty(OVERRIDE_PROPERTY)) } val global = try { - Settings.Global.getString(context.contentResolver, SETTING) + GlobalSettings.read(context, SETTING) } catch (_: Exception) { return PhantomProcessStatus.UNREADABLE } diff --git a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt index c924f85329..2d6adb902b 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt @@ -184,12 +184,15 @@ class WirelessAdbPairingService : Service() { setSound(null, null) enableVibration(false) }) + manager?.createNotificationChannel(NotificationChannel(PROGRESS_CHANNEL_ID, getString(R.string.adbpair_progress_channel_name), + NotificationManager.IMPORTANCE_LOW).apply { setShowBadge(false) }) val open = PendingIntent.getActivity(this, 0, Intent(this, FrontEndActivity::class.java).setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), PendingIntent.FLAG_IMMUTABLE) val cancel = PendingIntent.getService(this, 1, Intent(this, WirelessAdbPairingService::class.java).setAction(ACTION_CANCEL), PendingIntent.FLAG_IMMUTABLE) - val builder = Notification.Builder(this, CHANNEL_ID) + val quiet = stage == Stage.Waiting || stage == Stage.Idle || stage is Stage.Working + val builder = Notification.Builder(this, if (quiet) PROGRESS_CHANNEL_ID else CHANNEL_ID) .setSmallIcon(R.drawable.ic_stat_session) .setContentIntent(open) .setShowWhen(false) @@ -239,6 +242,7 @@ class WirelessAdbPairingService : Service() { companion object { private const val CHANNEL_ID = "wireless-adb-pairing" + private const val PROGRESS_CHANNEL_ID = "wireless-adb-pairing-progress" private const val NOTIFICATION_ID = 3 private const val PAIRING_TYPE = "_adb-tls-pairing._tcp" private const val ACTION_CODE = "com.droiddeck.launcher.action.WIRELESS_ADB_CODE" diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt index b70f9bb5e3..4193290163 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -105,7 +105,7 @@ import java.io.File internal fun Pane( s: FrontEndState, selected: String, a: FrontEndActions, page: (@Composable () -> Unit)?, modifier: Modifier, onSelect: (String) -> Unit, onAndroidAppClick: (HomeApp.LaunchableApp) -> Unit, - onOpenDeveloperOptions: () -> Unit, onRequestWirelessAdb: (Boolean) -> Unit, + onOpenDeveloperOptions: () -> Unit, onRequestWirelessAdb: (Boolean) -> Unit, onPairWirelessDebugging: () -> Unit, ) { BoxWithConstraints(modifier = modifier) { CompositionLocalProvider(LocalNarrowPane provides (maxWidth < NarrowPaneWidth)) { @@ -162,7 +162,7 @@ internal fun Pane( label = "pane", ) { key -> val drawn = (if (page != null && key == s.pageKey) page else pages[key]) - ?: { Content(s, if (key == "games") gameShown[0] else key, a, Modifier.fillMaxSize(), onSelect, onAndroidAppClick, onOpenDeveloperOptions, onRequestWirelessAdb) } + ?: { Content(s, if (key == "games") gameShown[0] else key, a, Modifier.fillMaxSize(), onSelect, onAndroidAppClick, onOpenDeveloperOptions, onRequestWirelessAdb, onPairWirelessDebugging) } val hopSink by androidx.compose.animation.core.animateFloatAsState( if (Hops.sinking == key) 1f else 0f, Motion.tw(260), label = "hopSink", ) @@ -223,7 +223,7 @@ private fun romFor(s: FrontEndState, selected: String): Pair<Library.Emulator, L private fun Content( s: FrontEndState, selected: String, a: FrontEndActions, modifier: Modifier, onSelect: (String) -> Unit, onAndroidAppClick: (HomeApp.LaunchableApp) -> Unit, - onOpenDeveloperOptions: () -> Unit, onRequestWirelessAdb: (Boolean) -> Unit, + onOpenDeveloperOptions: () -> Unit, onRequestWirelessAdb: (Boolean) -> Unit, onPairWirelessDebugging: () -> Unit, ) { val colors = MaterialTheme.colorScheme val detailPosterWidth = if (LocalConfiguration.current.screenHeightDp < 600) 72.dp else 120.dp @@ -233,7 +233,7 @@ private fun Content( val padV = if (narrow) 12.dp else 18.dp if (selected == "setup") { Column(modifier = modifier.padding(horizontal = padH, vertical = padV)) { - SetupPanel(s, a, onOpenDeveloperOptions, onRequestWirelessAdb) + SetupPanel(s, a, onOpenDeveloperOptions, onRequestWirelessAdb, onPairWirelessDebugging) } return } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index e75994776a..3223826f37 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -255,6 +255,8 @@ class FrontEndActions( val onCopyPhantomCommand: (Boolean) -> Unit = {}, val onDismissPhantomGate: () -> Unit = {}, val onStartWirelessAdbPairing: () -> Unit = {}, + val onStartPairingGuide: (Int?) -> Boolean = { false }, + val onShowPhantomGate: () -> Unit = {}, val onOpenNotificationSettings: () -> Unit = {}, val controller: ControllerActions? = null, val updates: UpdatesActions = UpdatesActions(), @@ -425,6 +427,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com } var showWirelessAdbFix by rememberSaveable { mutableStateOf(false) } var showDeveloperDisplayChoice by rememberSaveable { mutableStateOf(false) } + var developerChoiceGuided by rememberSaveable { mutableStateOf(false) } var wirelessAdbDesiredEnabled by rememberSaveable { mutableStateOf(false) } var appToChooseDisplay by remember { mutableStateOf<HomeApp.LaunchableApp?>(null) } val colors = MaterialTheme.colorScheme @@ -433,9 +436,36 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com val phantomGateVisible = s.showPhantomGate && PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) val processSettingsPageVisible = phantomGateVisible || showWirelessAdbFix || showDeveloperDisplayChoice val requestDeveloperOptions = { + developerChoiceGuided = false if (s.secondScreenDisplays.isEmpty()) a.onOpenDeveloperOptions(null) else showDeveloperDisplayChoice = true } + val openDeveloperOptionsOn: (Int?) -> Unit = { displayId -> + if (developerChoiceGuided) a.onStartWirelessAdbPairing() + if (!developerChoiceGuided || !a.onStartPairingGuide(displayId)) a.onOpenDeveloperOptions(displayId) + developerChoiceGuided = false + } + val startGuidedPairing = { + if (!com.droiddeck.launcher.core.WirelessAdbPairingService.notificationsEnabled(ctx)) { + wirelessAdbDesiredEnabled = false + showWirelessAdbFix = true + } else { + developerChoiceGuided = true + if (s.secondScreenDisplays.isEmpty()) openDeveloperOptionsOn(null) + else showDeveloperDisplayChoice = true + } + } + var applyingSavedPairing by remember { mutableStateOf(false) } + val fixPhantomLimit = { + if (!s.adbPaired || !com.droiddeck.launcher.core.GlobalSettings.wirelessDebuggingOn(ctx)) startGuidedPairing() + else if (!applyingSavedPairing) { + applyingSavedPairing = true + a.onSetPhantomProcessLimit(false) { error -> + applyingSavedPairing = false + if (error != null) startGuidedPairing() + } + } + } val requestWirelessAdbFix: (Boolean) -> Unit = { enabled -> wirelessAdbDesiredEnabled = enabled showWirelessAdbFix = true @@ -586,6 +616,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com }, onOpenDeveloperOptions = requestDeveloperOptions, onRequestWirelessAdb = requestWirelessAdbFix, + onPairWirelessDebugging = startGuidedPairing, ) } @@ -619,10 +650,8 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com status = s.phantomProcessStatus, onDismiss = a.onDismissPhantomGate, onOpenDeveloperOptions = requestDeveloperOptions, - onFixWithWirelessDebugging = { - a.onStartWirelessAdbPairing() - requestDeveloperOptions() - }, + applyingSavedPairing = applyingSavedPairing, + onFixWithWirelessDebugging = fixPhantomLimit, onEnterAddressManually = { requestWirelessAdbFix(false) }, onCopyCommand = { a.onCopyPhantomCommand(false) }, onOpenNotificationSettings = a.onOpenNotificationSettings, @@ -648,13 +677,16 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com }, onMainScreen = { showDeveloperDisplayChoice = false - a.onOpenDeveloperOptions(null) + openDeveloperOptionsOn(null) }, onSecondaryScreen = { displayId -> showDeveloperDisplayChoice = false - a.onOpenDeveloperOptions(displayId) + openDeveloperOptionsOn(displayId) + }, + onDismiss = { + showDeveloperDisplayChoice = false + developerChoiceGuided = false }, - onDismiss = { showDeveloperDisplayChoice = false }, ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index d5932762f7..7540949132 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -141,6 +141,7 @@ internal fun SetupPanel( a: FrontEndActions, onOpenDeveloperOptions: () -> Unit, onRequestWirelessAdb: (Boolean) -> Unit, + onPairWirelessDebugging: () -> Unit, ) { val host = rememberMenuHost() val ctx = LocalContext.current @@ -203,6 +204,12 @@ internal fun SetupPanel( tab = STORAGE_TAB } } + LaunchedEffect(Unit) { + while (true) { + kotlinx.coroutines.delay(2_000) + a.onRefreshPhantomStatus() + } + } LaunchedEffect(tab) { if (tabTurned && inputModeManager.inputMode == InputMode.Keyboard) { androidx.compose.runtime.withFrameNanos { } @@ -279,7 +286,7 @@ internal fun SetupPanel( }, divider = divider && !showLimitDetails, ) { - if (limitBlocks) PrimaryButton(if (showLimitDetails) stringResource(R.string.common_hide) else stringResource(R.string.setup_fix_it), compact = true) { showLimitDetails = !showLimitDetails } + if (limitBlocks) PrimaryButton(stringResource(R.string.setup_fix_it), compact = true, onClick = a.onShowPhantomGate) else if (s.phantomProcessStatus != PhantomProcessStatus.NOT_APPLICABLE) { SecondaryButton(if (showLimitDetails) stringResource(R.string.common_hide) else stringResource(R.string.setup_details), compact = true) { showLimitDetails = !showLimitDetails } } @@ -292,11 +299,7 @@ internal fun SetupPanel( fontSize = 14.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(vertical = 4.dp), ) Actions { - if (limitBlocks) { - PrimaryButton(stringResource(R.string.setup_dev_options), compact = true, onClick = onOpenDeveloperOptions) - SecondaryButton(stringResource(R.string.setup_use_wireless), compact = true, enabled = !processLimitBusy) { setProcessLimit(false) } - SecondaryButton(stringResource(R.string.setup_check_again), compact = true, onClick = a.onRefreshPhantomStatus) - } else if (s.phantomProcessStatus == PhantomProcessStatus.DISABLED) { + if (s.phantomProcessStatus == PhantomProcessStatus.DISABLED) { SecondaryButton(stringResource(R.string.setup_limit_turn_on), compact = true, enabled = !processLimitBusy) { setProcessLimit(true) } } } @@ -509,7 +512,7 @@ internal fun SetupPanel( ) if (!s.adbPaired) ActionRow( stringResource(R.string.setup_adb_pair), stringResource(R.string.setup_adb_pair_hint), - stringResource(R.string.setup_adb_pair_button), { onRequestWirelessAdb(false) }, + stringResource(R.string.setup_adb_pair_button), onPairWirelessDebugging, ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt index 517309ec03..60b4223f0a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt @@ -45,6 +45,7 @@ import com.droiddeck.launcher.core.WirelessAdbPairingService.Stage @Composable fun PhantomProcessGatePage( status: PhantomProcessStatus, + applyingSavedPairing: Boolean, onDismiss: () -> Unit, onOpenDeveloperOptions: () -> Unit, onFixWithWirelessDebugging: () -> Unit, @@ -77,7 +78,7 @@ fun PhantomProcessGatePage( BoxWithConstraints(Modifier.fillMaxWidth()) { val wide = maxWidth >= 620.dp val fix: @Composable ColumnScope.() -> Unit = { - FixGroup(hasToggle, stage, environment, compact, onOpenDeveloperOptions, onFixWithWirelessDebugging, + FixGroup(hasToggle, stage, environment, compact, applyingSavedPairing, onOpenDeveloperOptions, onFixWithWirelessDebugging, onOpenNotificationSettings, onCancel = { WirelessAdbPairingService.cancel(context) }) } val side: @Composable ColumnScope.() -> Unit = { @@ -119,6 +120,7 @@ private fun FixGroup( stage: Stage, environment: GateEnvironment, compact: Boolean, + applyingSavedPairing: Boolean, onOpenDeveloperOptions: () -> Unit, onFixWithWirelessDebugging: () -> Unit, onOpenNotificationSettings: () -> Unit, @@ -131,6 +133,10 @@ private fun FixGroup( verticalArrangement = Arrangement.spacedBy(8.dp), ) { when { + applyingSavedPairing -> Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + CircularProgressIndicator(Modifier.size(18.dp), strokeWidth = 2.dp) + Body(stringResource(R.string.adbpair_applying)) + } pairing -> PairingProgress(stage, onCancel) hasToggle -> { Body(stringResource(R.string.gate_toggle_steps)) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fc6649cc86..955caad10c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -990,6 +990,12 @@ <string name="gate_step1">Open Settings → Developer options → Wireless debugging and turn it on</string> <string name="gate_step2">Tap “Pair device with pairing code”</string> <string name="gate_step3">Type the code into the DroidDeck notification</string> + <string name="pairguide_build_number">In About phone, tap Build number 7 times</string> + <string name="pairguide_wireless">Turn on Wireless debugging</string> + <string name="pairguide_pair">Open Wireless debugging, then tap “Pair device with pairing code”</string> + <string name="pairguide_row_build_number">Build number</string> + <string name="pairguide_row_wireless">Wireless debugging</string> + <string name="pairguide_row_pair">Pair device with pairing code</string> <string name="gate_waiting">Waiting for the pairing pop-up…</string> <string name="gate_code_needed">Pop-up found. Enter its code in the notification.</string> <string name="gate_status">Status</string> @@ -1849,6 +1855,7 @@ <string name="adbpair_applying">Applying the setting…</string> <string name="adbpair_command_failed">Wireless debugging command failed</string> <string name="adbpair_channel_name">Wireless debugging setup</string> + <string name="adbpair_progress_channel_name">Wireless debugging setup progress</string> <string name="adbpair_channel_description">Asks for the Wireless debugging pairing code while Settings is open</string> <string name="adbpair_title_pair">Pair Wireless debugging</string> <string name="adbpair_waiting_text">Turn on Wireless debugging, then tap “Pair device with pairing code”.</string> diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GlobalGlassesSettingsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GlobalGlassesSettingsTest.kt index b64986a1e4..62c90ce94a 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GlobalGlassesSettingsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GlobalGlassesSettingsTest.kt @@ -144,7 +144,7 @@ class GlobalGlassesSettingsTest { onRoms = {}, onFiles = {}, onLogs = {}, onOffline = {}, onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> }, onSetPhantomProcessLimit = { _, _ -> }, - ), onOpenDeveloperOptions = {}, onRequestWirelessAdb = {}) + ), onOpenDeveloperOptions = {}, onRequestWirelessAdb = {}, onPairWirelessDebugging = {}) } } } From ef9866e42319b27945be5ef52b9034ad237d7b25 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 27 Oct 2026 13:14:23 -0400 Subject: [PATCH 129/135] fix(input): stop controller rumble when the device sleeps (#1668) --- .../launcher/session/RumbleComponent.kt | 8 +++++++- .../droiddeck/launcher/session/SessionService.kt | 3 +++ .../launcher/session/RumbleComponentTest.kt | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/RumbleComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/RumbleComponent.kt index f2b1c0a1e6..5826db97ab 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/RumbleComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/RumbleComponent.kt @@ -30,6 +30,7 @@ class RumbleComponent : SessionPart() { private val joyConPairs = HashMap<Long, Motors>() private var preferences: SharedPreferences? = null private var enabled = false + private var quiet = false private var motorThread: HandlerThread? = null private var handler: Handler? = null private val preferenceListener = SharedPreferences.OnSharedPreferenceChangeListener { _, key -> @@ -44,6 +45,11 @@ class RumbleComponent : SessionPart() { if (!enabled) cancelAll() } + @Synchronized fun quiet(on: Boolean) { + quiet = on + if (on) cancelAll() + } + override fun start() { val ctx = app() ?: return val s = try { LocalServerSocket(NAME) } catch (e: Exception) { Log.w(TAG, "rumble: no listener ($e)"); return } @@ -89,7 +95,7 @@ class RumbleComponent : SessionPart() { private fun u16(b: ByteArray, at: Int): Int = (b[at].toInt() and 0xFF) or ((b[at + 1].toInt() and 0xFF) shl 8) @Synchronized private fun buzz(strong: Int, weak: Int, ms: Int, slot: Int) { - if (!enabled) return + if (!enabled || quiet) return val target = target(slot) val previous = playing[slot] if (target !== previous) { 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 025332da3b..24e9ef553b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -1558,6 +1558,9 @@ class SessionService : Service() { SessionPrefs.SUSPEND_MANUAL -> manualPauseRequested && prepared && !downloadsBlockingSuspend else -> false } + // A frozen game never sends the stop for a held rumble, so the keepalive would run on. + val quietRumble = !screenOn || shouldSuspend || SessionState.suspended + components.forEach { (it as? RumbleComponent)?.quiet(quietRumble) } if (freezePending && !shouldSuspend && !freezeCancelled) { freezeCancelled = true controller.cancelFreeze() diff --git a/app/src/test/java/com/droiddeck/launcher/session/RumbleComponentTest.kt b/app/src/test/java/com/droiddeck/launcher/session/RumbleComponentTest.kt index 8c5361aec1..78741888d3 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/RumbleComponentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/RumbleComponentTest.kt @@ -115,6 +115,22 @@ class RumbleComponentTest { assertFalse(pad.vibrating) } + @Test fun quietingStopsAHeldEffectAndDropsEffectsUntilLifted() { + val pad = FakeMotors() + rumble.controllerMotors = { pad } + activeController(PAD_ID) + effect(strong = 40000, weak = 20000, ms = RumbleComponent.HOLD_MS) + rumble.quiet(true) + assertFalse(pad.vibrating) + idle(RumbleComponent.KEEPALIVE_MS * 4 + 100) + assertEquals("the keepalive restarted the motors while quiet", 1, pad.played.size) + effect(strong = 40000, weak = 20000) + assertFalse("an effect played while quiet", pad.vibrating) + rumble.quiet(false) + effect(strong = 40000, weak = 20000) + assertTrue(pad.vibrating) + } + @Test fun aHeldEffectFollowsTheGamesNewStrength() { val pad = FakeMotors() rumble.controllerMotors = { pad } From e906d2f07704b94ab97e308f62ef9f672d269bfb Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 27 Oct 2026 14:50:11 -0400 Subject: [PATCH 130/135] feat(launcher): full launcher Apps page (#1686) * feat(launcher): apps page with search, sort, filter, folders, widgets and page swipes * feat(launcher): app shortcuts, pinned shortcuts, hidden apps and LauncherApps listing * fix(ui): let page content scroll to the bottom edge * feat(launcher): accept widgets other apps ask to pin * i18n(launcher): translate apps page strings * fix(launcher): keep disabled pins, serialize widget adds, add many plurals * fix(launcher): drop in-flight pin refreshes after unpinning * fix(launcher): skip unpin when pinned shortcuts can't be read * fix(launcher): drop in-flight app lists when home role is lost * fix(launcher): only migrate folder entries with one launcher activity --- app/src/main/AndroidManifest.xml | 13 + .../droiddeck/launcher/FrontEndActivity.kt | 42 +- .../java/com/droiddeck/launcher/HomeApp.kt | 111 +- .../com/droiddeck/launcher/HomeFolders.kt | 65 ++ .../java/com/droiddeck/launcher/HomeHidden.kt | 26 + .../java/com/droiddeck/launcher/HomePins.kt | 75 ++ .../com/droiddeck/launcher/HomeWidgets.kt | 317 ++++++ .../droiddeck/launcher/PinRequestActivity.kt | 82 ++ .../droiddeck/launcher/ui/AndroidAppsPage.kt | 959 ++++++++++++++++++ .../droiddeck/launcher/ui/ComponentsPage.kt | 4 +- .../droiddeck/launcher/ui/FrontEndContent.kt | 35 +- .../com/droiddeck/launcher/ui/FrontEndRail.kt | 2 +- .../droiddeck/launcher/ui/FrontEndScreen.kt | 12 +- .../com/droiddeck/launcher/ui/LibraryPage.kt | 6 +- .../com/droiddeck/launcher/ui/PageSwipe.kt | 60 ++ .../com/droiddeck/launcher/ui/StorePage.kt | 4 +- .../com/droiddeck/launcher/ui/StoresPage.kt | 2 +- .../com/droiddeck/launcher/ui/UpdatesPage.kt | 2 +- .../launcher/ui/WirelessAdbFixPage.kt | 3 +- app/src/main/res/values-ar/strings.xml | 46 + app/src/main/res/values-b+es+419/strings.xml | 43 + app/src/main/res/values-bg/strings.xml | 42 + app/src/main/res/values-cs/strings.xml | 44 + app/src/main/res/values-da/strings.xml | 42 + app/src/main/res/values-de/strings.xml | 42 + app/src/main/res/values-el/strings.xml | 42 + app/src/main/res/values-es/strings.xml | 43 + app/src/main/res/values-fi/strings.xml | 42 + app/src/main/res/values-fr/strings.xml | 43 + app/src/main/res/values-hi/strings.xml | 42 + app/src/main/res/values-hu/strings.xml | 42 + app/src/main/res/values-in/strings.xml | 41 + app/src/main/res/values-it/strings.xml | 43 + app/src/main/res/values-ja/strings.xml | 41 + app/src/main/res/values-ko/strings.xml | 41 + app/src/main/res/values-ms/strings.xml | 41 + app/src/main/res/values-nb/strings.xml | 42 + app/src/main/res/values-nl/strings.xml | 42 + app/src/main/res/values-pl/strings.xml | 44 + app/src/main/res/values-pt-rPT/strings.xml | 43 + app/src/main/res/values-pt/strings.xml | 43 + app/src/main/res/values-ro/strings.xml | 43 + app/src/main/res/values-ru/strings.xml | 44 + app/src/main/res/values-sv/strings.xml | 42 + app/src/main/res/values-th/strings.xml | 41 + app/src/main/res/values-tr/strings.xml | 42 + app/src/main/res/values-uk/strings.xml | 44 + app/src/main/res/values-vi/strings.xml | 41 + app/src/main/res/values-zh-rCN/strings.xml | 41 + app/src/main/res/values-zh-rHK/strings.xml | 41 + app/src/main/res/values-zh-rTW/strings.xml | 41 + app/src/main/res/values/strings.xml | 42 + 52 files changed, 3160 insertions(+), 56 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/HomeFolders.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/HomeHidden.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/HomePins.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/HomeWidgets.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/PinRequestActivity.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/PageSwipe.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0f9a8e9c13..806edc12dc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -30,6 +30,7 @@ <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <uses-permission android:name="android.permission.WRITE_SETTINGS" /> <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> + <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" /> <uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.CAMERA" /> @@ -157,6 +158,18 @@ </activity> + <activity + android:name=".PinRequestActivity" + android:exported="true" + android:excludeFromRecents="true" + android:taskAffinity="${applicationId}.pin" + android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"> + <intent-filter> + <action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT" /> + <action android:name="android.content.pm.action.CONFIRM_PIN_APPWIDGET" /> + </intent-filter> + </activity> + <activity android:name=".input.ControllerEditorActivity" android:exported="false" diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 7d81085b11..157a8eb35d 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -495,6 +495,21 @@ class FrontEndActivity : ComponentActivity() { private var homeScreenEnabled by mutableStateOf(false) private var defaultHomeLabel by mutableStateOf<String?>(null) private var androidApps by mutableStateOf<List<HomeApp.LaunchableApp>>(emptyList()) + private var androidAppsListing = 0 + private val packageCallback = object : android.content.pm.LauncherApps.Callback() { + private fun changed() { + refreshAndroidApps() + if (HomeWidgets.providers != null) HomeWidgets.refreshProviders(this@FrontEndActivity) + } + override fun onPackageRemoved(packageName: String, user: android.os.UserHandle) = changed() + override fun onPackageAdded(packageName: String, user: android.os.UserHandle) = changed() + override fun onPackageChanged(packageName: String, user: android.os.UserHandle) = changed() + override fun onPackagesAvailable(packageNames: Array<out String>, user: android.os.UserHandle, replacing: Boolean) = changed() + override fun onPackagesUnavailable(packageNames: Array<out String>, user: android.os.UserHandle, replacing: Boolean) = changed() + override fun onShortcutsChanged(packageName: String, shortcuts: MutableList<android.content.pm.ShortcutInfo>, user: android.os.UserHandle) { + if (homeAppSelected) HomePins.refresh(this@FrontEndActivity) + } + } private var secondScreenDisplays by mutableStateOf<List<SecondScreenDisplay>>(emptyList()) private lateinit var displayManager: DisplayManager private val secondScreenDisplayListener = object : DisplayManager.DisplayListener { @@ -1568,6 +1583,15 @@ class FrontEndActivity : ComponentActivity() { }) displayManager.registerDisplayListener(secondScreenDisplayListener, ui) refreshSecondScreenDisplays() + getSystemService(android.content.pm.LauncherApps::class.java).registerCallback(packageCallback, ui) + HomeWidgets.startListening(this) + } + + @Suppress("OVERRIDE_DEPRECATION") + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + if (HomeWidgets.onActivityResult(this, requestCode, resultCode)) return + @Suppress("DEPRECATION") + super.onActivityResult(requestCode, resultCode, data) } override fun onSaveInstanceState(outState: Bundle) { @@ -1593,6 +1617,8 @@ class FrontEndActivity : ComponentActivity() { override fun onStop() { unregisterReceiver(wifiLocationReceiver) unregisterReceiver(mediaReceiver) + getSystemService(android.content.pm.LauncherApps::class.java).unregisterCallback(packageCallback) + HomeWidgets.stopListening(this) ui.removeCallbacks(mediaRefresh) com.droiddeck.launcher.stores.StoresState.libraryListener = null com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = null @@ -1608,10 +1634,24 @@ class FrontEndActivity : ComponentActivity() { homeScreenEnabled = HomeApp.isHomeScreenEnabled(this) homeAppSelected = homeScreenEnabled && HomeApp.isDefault(this) defaultHomeLabel = HomeApp.defaultLabel(this) - androidApps = if (homeAppSelected) HomeApp.launchableApps(this) else emptyList() + refreshAndroidApps() integrationState = readIntegration() } + private fun refreshAndroidApps() { + if (!homeAppSelected) { + ++androidAppsListing + androidApps = emptyList() + return + } + val seq = ++androidAppsListing + HomePins.refresh(this) + Thread({ + val apps = runCatching { HomeApp.launchableApps(this) }.getOrDefault(emptyList()) + ui.post { if (seq == androidAppsListing) androidApps = apps } + }, "home-apps").start() + } + private fun refreshSecondScreenDisplays() { if (!::displayManager.isInitialized) return // The launcher can itself be shown on a non-default display (DeX, an external monitor); that one is not a "second screen". diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 819a6525d6..9d0ae53c1c 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -6,7 +6,15 @@ import android.graphics.Bitmap import android.content.ComponentName import android.content.Context import android.content.Intent +import android.content.pm.ApplicationInfo +import android.content.pm.LauncherApps +import android.content.pm.ShortcutInfo +import android.graphics.Rect +import android.os.Process +import android.os.UserHandle +import android.os.UserManager import android.content.pm.PackageManager +import android.net.Uri import android.os.Build import android.provider.Settings import androidx.core.graphics.drawable.toBitmap @@ -22,7 +30,17 @@ object HomeApp { val packageName: String, val className: String, val icon: Bitmap?, - ) + val system: Boolean = false, + val game: Boolean = false, + val installedAt: Long = 0L, + val updatedAt: Long = 0L, + val user: UserHandle? = null, + val userSerial: Long = 0L, + ) { + val component get() = ComponentName(packageName, className) + val key get() = "$packageName/$className" + if (userSerial != 0L) "#$userSerial" else "" + val work get() = userSerial != 0L + } fun isHomeScreenEnabled(context: Context): Boolean = context.packageManager.getComponentEnabledSetting(ComponentName(context, HomeActivity::class.java)) == @@ -72,34 +90,79 @@ object HomeApp { fun settingsIntent(): Intent = Intent(Settings.ACTION_HOME_SETTINGS) fun launchableApps(context: Context): List<LaunchableApp> { + val launcher = context.getSystemService(LauncherApps::class.java) + val users = context.getSystemService(UserManager::class.java) val pm = context.packageManager - val launch = Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER) + val own = Process.myUserHandle() val iconPx = (ICON_DP * context.resources.displayMetrics.density).roundToInt() - val apps = pm.queryIntentActivities(launch, 0) - .asSequence() - .mapNotNull { result -> - val activity = result.activityInfo ?: return@mapNotNull null - if (!activity.exported || activity.packageName == context.packageName) return@mapNotNull null - val label = result.loadLabel(pm)?.toString()?.trim().orEmpty().ifEmpty { activity.packageName } - val icon = runCatching { result.loadIcon(pm).toBitmap(iconPx, iconPx) }.getOrNull() - LaunchableApp(label, activity.packageName, activity.name, icon) + val apps = users.userProfiles.flatMap { user -> + val serial = if (user == own) 0L else users.getSerialNumberForUser(user) + runCatching { launcher.getActivityList(null, user) }.getOrDefault(emptyList()).mapNotNull { info -> + val component = info.componentName + if (component.packageName == context.packageName && user == own) return@mapNotNull null + val label = info.label?.toString()?.trim().orEmpty().ifEmpty { component.packageName } + val icon = runCatching { info.getBadgedIcon(0).toBitmap(iconPx, iconPx) }.getOrNull() + val app = info.applicationInfo + val updated = if (user == own) runCatching { pm.getPackageInfo(component.packageName, 0).lastUpdateTime }.getOrNull() else null + @Suppress("DEPRECATION") + val game = app.category == ApplicationInfo.CATEGORY_GAME || app.flags and ApplicationInfo.FLAG_IS_GAME != 0 + LaunchableApp( + label, component.packageName, component.className, icon, + system = app.flags and (ApplicationInfo.FLAG_SYSTEM or ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0, + game = game, + installedAt = info.firstInstallTime, + updatedAt = updated ?: info.firstInstallTime, + user = user, + userSerial = serial, + ) } - .distinctBy { it.packageName } - .toList() - return apps.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }) + } + return apps.distinctBy { it.key }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }) } - fun launch(context: Context, app: LaunchableApp, displayId: Int? = null) { - val intent = Intent(Intent.ACTION_MAIN) - .addCategory(Intent.CATEGORY_LAUNCHER) - .setComponent(ComponentName(app.packageName, app.className)) - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - if (displayId == null) { - context.startActivity(intent) - return - } - val options = ActivityOptions.makeBasic().setLaunchDisplayId(displayId) - context.startActivity(intent, options.toBundle()) + fun launch(context: Context, app: LaunchableApp, displayId: Int? = null, bounds: Rect? = null) { + val options = displayId?.let { ActivityOptions.makeBasic().setLaunchDisplayId(it).toBundle() } + val launcher = context.getSystemService(LauncherApps::class.java) + launcher.startMainActivity(app.component, app.user ?: Process.myUserHandle(), bounds, options) + } + + fun canUseShortcuts(context: Context): Boolean = + runCatching { context.getSystemService(LauncherApps::class.java).hasShortcutHostPermission() }.getOrDefault(false) + + fun shortcuts(context: Context, app: LaunchableApp): List<ShortcutInfo> { + if (!canUseShortcuts(context)) return emptyList() + val query = LauncherApps.ShortcutQuery() + .setPackage(app.packageName) + .setActivity(app.component) + .setQueryFlags(LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC or LauncherApps.ShortcutQuery.FLAG_MATCH_MANIFEST) + return runCatching { context.getSystemService(LauncherApps::class.java).getShortcuts(query, app.user ?: Process.myUserHandle()) } + .getOrNull().orEmpty() + .filter { it.isEnabled } + .sortedWith(compareBy<ShortcutInfo> { if (it.isDeclaredInManifest) 0 else 1 }.thenBy { it.rank }) + .take(5) + } + + fun shortcutIcon(context: Context, info: ShortcutInfo, px: Int = (ICON_DP * context.resources.displayMetrics.density).roundToInt()): Bitmap? = runCatching { + context.getSystemService(LauncherApps::class.java) + .getShortcutIconDrawable(info, context.resources.displayMetrics.densityDpi)?.toBitmap(px, px) + }.getOrNull() + + fun startShortcut(context: Context, info: ShortcutInfo) { + context.getSystemService(LauncherApps::class.java).startShortcut(info, null, null) + } + + fun openAppInfo(context: Context, app: LaunchableApp) { + context.getSystemService(LauncherApps::class.java) + .startAppDetailsActivity(app.component, app.user ?: Process.myUserHandle(), null, null) + } + + fun canUninstall(app: LaunchableApp): Boolean = !app.system && !app.work + + fun uninstall(context: Context, app: LaunchableApp) { + context.startActivity( + Intent(Intent.ACTION_DELETE, Uri.fromParts("package", app.packageName, null)) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), + ) } fun isActiveSteamSession(): Boolean = diff --git a/app/src/main/java/com/droiddeck/launcher/HomeFolders.kt b/app/src/main/java/com/droiddeck/launcher/HomeFolders.kt new file mode 100644 index 0000000000..dc1f0bca47 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/HomeFolders.kt @@ -0,0 +1,65 @@ +package com.droiddeck.launcher + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import org.json.JSONArray +import org.json.JSONObject +import java.util.UUID + +object HomeFolders { + data class Folder(val id: String, val name: String, val apps: List<String>) + + private const val PREFS = "home_launcher" + private const val KEY = "folders" + + var folders by mutableStateOf<List<Folder>>(emptyList()) + private set + private var loaded = false + + fun load(context: Context) { + if (loaded) return + loaded = true + val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString(KEY, null) ?: return + folders = runCatching { + val array = JSONArray(raw) + (0 until array.length()).map { i -> + val o = array.getJSONObject(i) + val apps = o.getJSONArray("apps") + Folder(o.getString("id"), o.getString("name"), (0 until apps.length()).map { apps.getString(it) }) + } + }.getOrDefault(emptyList()) + } + + fun create(context: Context, name: String, appKey: String): Folder { + val folder = Folder(UUID.randomUUID().toString(), name, listOf(appKey)) + update(context, without(appKey) + folder) + return folder + } + + fun add(context: Context, folderId: String, appKey: String) = + update(context, without(appKey).map { if (it.id == folderId) it.copy(apps = it.apps + appKey) else it }) + + fun remove(context: Context, appKey: String) = update(context, without(appKey)) + + fun rename(context: Context, folderId: String, name: String) = + update(context, folders.map { if (it.id == folderId) it.copy(name = name) else it }) + + fun delete(context: Context, folderId: String) = update(context, folders.filterNot { it.id == folderId }) + + fun migrateMembers(context: Context, keyFor: (String) -> String?) { + if (folders.none { f -> f.apps.any { '/' !in it } }) return + update(context, folders.map { f -> f.copy(apps = f.apps.map { if ('/' in it) it else keyFor(it) ?: it }.distinct()) }) + } + + private fun without(appKey: String): List<Folder> = + folders.map { it.copy(apps = it.apps - appKey) }.filter { it.apps.isNotEmpty() } + + private fun update(context: Context, next: List<Folder>) { + folders = next + val array = JSONArray() + for (f in next) array.put(JSONObject().put("id", f.id).put("name", f.name).put("apps", JSONArray(f.apps))) + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putString(KEY, array.toString()).apply() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/HomeHidden.kt b/app/src/main/java/com/droiddeck/launcher/HomeHidden.kt new file mode 100644 index 0000000000..70f98f4843 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/HomeHidden.kt @@ -0,0 +1,26 @@ +package com.droiddeck.launcher + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue + +object HomeHidden { + private const val PREFS = "home_launcher" + private const val KEY = "hidden" + + var keys by mutableStateOf<Set<String>>(emptySet()) + private set + private var loaded = false + + fun load(context: Context) { + if (loaded) return + loaded = true + keys = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getStringSet(KEY, emptySet()).orEmpty().toSet() + } + + fun set(context: Context, key: String, hidden: Boolean) { + keys = if (hidden) keys + key else keys - key + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putStringSet(KEY, keys).apply() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/HomePins.kt b/app/src/main/java/com/droiddeck/launcher/HomePins.kt new file mode 100644 index 0000000000..1040995e87 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/HomePins.kt @@ -0,0 +1,75 @@ +package com.droiddeck.launcher + +import android.content.Context +import android.content.pm.LauncherApps +import android.content.pm.ShortcutInfo +import android.graphics.Bitmap +import android.os.Handler +import android.os.Looper +import android.os.Process +import android.os.UserManager +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue + +/** Shortcuts other apps asked to put on the home screen. The system keeps the pinned set per launcher. */ +object HomePins { + class Pinned(val info: ShortcutInfo, val icon: Bitmap?, val appLabel: String, val userSerial: Long) { + val key get() = "pin:${info.`package`}/${info.id}" + if (userSerial != 0L) "#$userSerial" else "" + val label get() = info.shortLabel?.toString()?.trim().orEmpty().ifEmpty { appLabel } + val work get() = userSerial != 0L + } + + var pinned by mutableStateOf<List<Pinned>>(emptyList()) + private set + private val main = Handler(Looper.getMainLooper()) + private var listing = 0 + + fun refresh(context: Context) { + val app = context.applicationContext + val seq = ++listing + Thread({ + val list = runCatching { load(app) }.getOrDefault(emptyList()) + main.post { if (seq == listing) pinned = list } + }, "home-pins").start() + } + + private fun load(context: Context): List<Pinned> { + if (!HomeApp.canUseShortcuts(context)) return emptyList() + val launcher = context.getSystemService(LauncherApps::class.java) + val users = context.getSystemService(UserManager::class.java) + val pm = context.packageManager + val own = Process.myUserHandle() + val query = LauncherApps.ShortcutQuery().setQueryFlags(LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED) + return users.userProfiles.flatMap { user -> + val serial = if (user == own) 0L else users.getSerialNumberForUser(user) + runCatching { launcher.getShortcuts(query, user) }.getOrNull().orEmpty() + .filter { it.isEnabled && it.isPinned } + .map { info -> + val appLabel = runCatching { pm.getApplicationLabel(pm.getApplicationInfo(info.`package`, 0)).toString() } + .getOrDefault(info.`package`) + Pinned(info, HomeApp.shortcutIcon(context, info), appLabel, serial) + } + } + } + + fun accept(context: Context, request: LauncherApps.PinItemRequest): Boolean { + val ok = runCatching { request.isValid && request.accept() }.getOrDefault(false) + if (ok) refresh(context) + return ok + } + + fun unpin(context: Context, pinned: Pinned) { + val info = pinned.info + val launcher = context.getSystemService(LauncherApps::class.java) + val query = LauncherApps.ShortcutQuery().setPackage(info.`package`).setQueryFlags(LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED) + val unpinned = runCatching { + val current = checkNotNull(launcher.getShortcuts(query, info.userHandle)) + val keep = current.map { it.id } - info.id + launcher.pinShortcuts(info.`package`, keep, info.userHandle) + }.isSuccess + if (!unpinned) return + listing++ + this.pinned = this.pinned.filterNot { it.key == pinned.key } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/HomeWidgets.kt b/app/src/main/java/com/droiddeck/launcher/HomeWidgets.kt new file mode 100644 index 0000000000..8f79f4354b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/HomeWidgets.kt @@ -0,0 +1,317 @@ +package com.droiddeck.launcher + +import android.app.Activity +import android.appwidget.AppWidgetHost +import android.appwidget.AppWidgetHostView +import android.appwidget.AppWidgetManager +import android.appwidget.AppWidgetProviderInfo +import android.content.Context +import android.content.Intent +import android.content.pm.LauncherApps +import android.graphics.Bitmap +import android.os.Build +import android.os.Bundle +import android.os.Handler +import android.os.Looper +import android.util.SizeF +import android.view.HapticFeedbackConstants +import android.view.MotionEvent +import android.view.ViewConfiguration +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.core.graphics.drawable.toBitmap +import org.json.JSONArray +import org.json.JSONObject +import kotlin.math.hypot +import kotlin.math.roundToInt + +object HomeWidgets { + data class Placed(val id: Int, val widthDp: Int, val heightDp: Int) + + data class Provider( + val info: AppWidgetProviderInfo, + val label: String, + val appLabel: String, + val preview: Bitmap?, + val widthDp: Int, + val heightDp: Int, + ) + + private const val HOST_ID = 0x0DDE + private const val PREFS = "home_launcher" + private const val KEY = "widgets" + private const val REQUEST_BIND = 0x0DD1 + private const val REQUEST_CONFIGURE = 0x0DD2 + private const val REQUEST_RECONFIGURE = 0x0DD3 + const val MIN_WIDTH_DP = 96 + const val MIN_HEIGHT_DP = 56 + + var widgets by mutableStateOf<List<Placed>>(emptyList()) + private set + var providers by mutableStateOf<List<Provider>?>(null) + private set + private var loaded = false + private var host: Host? = null + private var pending: AppWidgetProviderInfo? = null + private var pendingId = AppWidgetManager.INVALID_APPWIDGET_ID + private var pinRequest: LauncherApps.PinItemRequest? = null + private val main = Handler(Looper.getMainLooper()) + + private class Host(context: Context) : AppWidgetHost(context, HOST_ID) { + override fun onCreateView(context: Context, appWidgetId: Int, appWidget: AppWidgetProviderInfo?): AppWidgetHostView = + HomeWidgetView(context) + } + + class HomeWidgetView(context: Context) : AppWidgetHostView(context) { + var onLongPress: (() -> Unit)? = null + private var fired = false + private var downX = 0f + private var downY = 0f + private val slop = ViewConfiguration.get(context).scaledTouchSlop + private val longPress = Runnable { + fired = true + performHapticFeedback(HapticFeedbackConstants.LONG_PRESS) + onLongPress?.invoke() + } + + override fun onInterceptTouchEvent(ev: MotionEvent): Boolean { + when (ev.actionMasked) { + MotionEvent.ACTION_DOWN -> { + fired = false + downX = ev.x + downY = ev.y + postDelayed(longPress, ViewConfiguration.getLongPressTimeout().toLong()) + } + MotionEvent.ACTION_MOVE -> if (hypot(ev.x - downX, ev.y - downY) > slop) removeCallbacks(longPress) + MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_POINTER_DOWN -> removeCallbacks(longPress) + } + return fired + } + + override fun onTouchEvent(event: MotionEvent): Boolean { + if (fired) { + if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) fired = false + return true + } + return super.onTouchEvent(event) + } + } + + private fun host(context: Context): Host = host ?: Host(context.applicationContext).also { host = it } + + fun load(context: Context) { + if (loaded) return + loaded = true + val raw = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString(KEY, null) ?: return + val manager = AppWidgetManager.getInstance(context) + val parsed = runCatching { + val array = JSONArray(raw) + (0 until array.length()).map { i -> + val o = array.getJSONObject(i) + Placed(o.getInt("id"), o.getInt("w"), o.getInt("h")) + } + }.getOrDefault(emptyList()) + val live = parsed.filter { manager.getAppWidgetInfo(it.id) != null } + parsed.filterNot { it in live }.forEach { host(context).deleteAppWidgetId(it.id) } + widgets = live + if (live.size != parsed.size) save(context) + } + + fun startListening(context: Context) { + load(context) + runCatching { host(context).startListening() } + } + + fun stopListening(context: Context) { + runCatching { host(context).stopListening() } + } + + fun info(context: Context, id: Int): AppWidgetProviderInfo? = AppWidgetManager.getInstance(context).getAppWidgetInfo(id) + + fun createView(context: Context, id: Int): HomeWidgetView? { + val info = info(context, id) ?: return null + return host(context).createView(context, id, info) as? HomeWidgetView + } + + fun applySize(view: AppWidgetHostView, widthDp: Int, heightDp: Int) { + if (Build.VERSION.SDK_INT >= 31) { + view.updateAppWidgetSize(Bundle(), listOf(SizeF(widthDp.toFloat(), heightDp.toFloat()))) + } else { + @Suppress("DEPRECATION") + view.updateAppWidgetSize(null, widthDp, heightDp, widthDp, heightDp) + } + } + + fun loadProviders(context: Context) { + if (providers != null) return + val app = context.applicationContext + Thread({ + val pm = app.packageManager + val manager = AppWidgetManager.getInstance(app) + val dpi = app.resources.displayMetrics.densityDpi + val list = manager.installedProviders.mapNotNull { info -> + runCatching { + val appLabel = runCatching { pm.getApplicationLabel(pm.getApplicationInfo(info.provider.packageName, 0)).toString() } + .getOrDefault(info.provider.packageName) + val drawable = info.loadPreviewImage(app, dpi) ?: info.loadIcon(app, dpi) + val preview = drawable?.let { d -> + val w = d.intrinsicWidth.takeIf { it > 0 } ?: 192 + val h = d.intrinsicHeight.takeIf { it > 0 } ?: 192 + val scale = minOf(1f, 360f / maxOf(w, h)) + d.toBitmap((w * scale).roundToInt().coerceAtLeast(1), (h * scale).roundToInt().coerceAtLeast(1)) + } + val (w, h) = defaultSize(app, info) + Provider(info, info.loadLabel(pm)?.toString()?.trim().orEmpty().ifEmpty { appLabel }, appLabel, preview, w, h) + }.getOrNull() + }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, Provider::appLabel).thenBy(String.CASE_INSENSITIVE_ORDER, Provider::label)) + main.post { providers = list } + }, "widget-providers").start() + } + + fun refreshProviders(context: Context) { + providers = null + loadProviders(context) + } + + private fun defaultSize(context: Context, info: AppWidgetProviderInfo): Pair<Int, Int> { + val density = context.resources.displayMetrics.density + var w = (info.minWidth / density).roundToInt() + var h = (info.minHeight / density).roundToInt() + if (Build.VERSION.SDK_INT >= 31) { + if (info.targetCellWidth > 0) w = maxOf(w, info.targetCellWidth * 80) + if (info.targetCellHeight > 0) h = maxOf(h, info.targetCellHeight * 80) + } + return w.coerceIn(160, 560) to h.coerceIn(MIN_HEIGHT_DP, 360) + } + + fun minSize(context: Context, id: Int): Pair<Int, Int> { + val info = info(context, id) ?: return MIN_WIDTH_DP to MIN_HEIGHT_DP + val density = context.resources.displayMetrics.density + val w = (if (info.minResizeWidth > 0) info.minResizeWidth else info.minWidth) / density + val h = (if (info.minResizeHeight > 0) info.minResizeHeight else info.minHeight) / density + return w.roundToInt().coerceAtLeast(MIN_WIDTH_DP) to h.roundToInt().coerceAtLeast(MIN_HEIGHT_DP) + } + + fun add(activity: Activity, provider: Provider) { + if (pendingId == AppWidgetManager.INVALID_APPWIDGET_ID) add(activity, provider.info, null) + } + + /** Places a widget another app asked for; its own app has already configured it. */ + fun addPinned(activity: Activity, request: LauncherApps.PinItemRequest): Boolean { + if (pendingId != AppWidgetManager.INVALID_APPWIDGET_ID) return false + val info = request.getAppWidgetProviderInfo(activity) ?: return false + load(activity) + add(activity, info, request) + return pending != null + } + + private fun add(activity: Activity, info: AppWidgetProviderInfo, request: LauncherApps.PinItemRequest?) { + val h = host(activity) + val id = h.allocateAppWidgetId() + pending = info + pendingId = id + pinRequest = request + val manager = AppWidgetManager.getInstance(activity) + val bound = runCatching { manager.bindAppWidgetIdIfAllowed(id, info.profile, info.provider, null) }.getOrDefault(false) + if (bound) { + bound(activity, id, info) + return + } + val bind = Intent(AppWidgetManager.ACTION_APPWIDGET_BIND) + .putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, id) + .putExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER, info.provider) + .putExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER_PROFILE, info.profile) + @Suppress("DEPRECATION") + runCatching { activity.startActivityForResult(bind, REQUEST_BIND) }.onFailure { abandon(activity) } + } + + private fun bound(activity: Activity, id: Int, info: AppWidgetProviderInfo) { + val request = pinRequest + if (request == null) { + configure(activity, id, info) + return + } + val accepted = runCatching { request.isValid && request.accept(Bundle().apply { putInt(AppWidgetManager.EXTRA_APPWIDGET_ID, id) }) } + .getOrDefault(false) + if (accepted) place(activity, id, info) else abandon(activity) + } + + private fun configure(activity: Activity, id: Int, info: AppWidgetProviderInfo) { + val optional = Build.VERSION.SDK_INT >= 31 && + info.widgetFeatures and AppWidgetProviderInfo.WIDGET_FEATURE_CONFIGURATION_OPTIONAL != 0 + if (info.configure == null || optional) { + place(activity, id, info) + return + } + runCatching { host(activity).startAppWidgetConfigureActivityForResult(activity, id, 0, REQUEST_CONFIGURE, null) } + .onFailure { place(activity, id, info) } + } + + fun canReconfigure(context: Context, id: Int): Boolean { + val info = info(context, id) ?: return false + if (info.configure == null) return false + return Build.VERSION.SDK_INT < 28 || info.widgetFeatures and AppWidgetProviderInfo.WIDGET_FEATURE_RECONFIGURABLE != 0 + } + + fun reconfigure(activity: Activity, id: Int) { + runCatching { host(activity).startAppWidgetConfigureActivityForResult(activity, id, 0, REQUEST_RECONFIGURE, null) } + } + + fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int): Boolean { + when (requestCode) { + REQUEST_BIND -> { + val info = pending + if (resultCode == Activity.RESULT_OK && info != null) bound(activity, pendingId, info) else abandon(activity) + } + REQUEST_CONFIGURE -> { + val info = pending + if (resultCode == Activity.RESULT_OK && info != null) place(activity, pendingId, info) else abandon(activity) + } + REQUEST_RECONFIGURE -> Unit + else -> return false + } + return true + } + + private fun abandon(context: Context) { + if (pendingId != AppWidgetManager.INVALID_APPWIDGET_ID) host(context).deleteAppWidgetId(pendingId) + pending = null + pinRequest = null + pendingId = AppWidgetManager.INVALID_APPWIDGET_ID + } + + private fun place(context: Context, id: Int, info: AppWidgetProviderInfo) { + val (w, h) = defaultSize(context, info) + pending = null + pinRequest = null + pendingId = AppWidgetManager.INVALID_APPWIDGET_ID + widgets = widgets + Placed(id, w, h) + save(context) + } + + fun resize(context: Context, id: Int, widthDp: Int, heightDp: Int) { + widgets = widgets.map { if (it.id == id) it.copy(widthDp = widthDp, heightDp = heightDp) else it } + save(context) + } + + fun move(context: Context, id: Int, by: Int) { + val i = widgets.indexOfFirst { it.id == id } + val j = i + by + if (i < 0 || j !in widgets.indices) return + widgets = widgets.toMutableList().apply { add(j, removeAt(i)) } + save(context) + } + + fun remove(context: Context, id: Int) { + host(context).deleteAppWidgetId(id) + widgets = widgets.filterNot { it.id == id } + save(context) + } + + private fun save(context: Context) { + val array = JSONArray() + for (w in widgets) array.put(JSONObject().put("id", w.id).put("w", w.widthDp).put("h", w.heightDp)) + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putString(KEY, array.toString()).apply() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/PinRequestActivity.kt b/app/src/main/java/com/droiddeck/launcher/PinRequestActivity.kt new file mode 100644 index 0000000000..ca8d382fee --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/PinRequestActivity.kt @@ -0,0 +1,82 @@ +package com.droiddeck.launcher + +import android.content.Intent +import android.content.pm.LauncherApps +import android.graphics.Bitmap +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.core.graphics.drawable.toBitmap +import com.droiddeck.launcher.core.AppUiPrefs +import com.droiddeck.launcher.ui.DroidDeckTheme +import com.droiddeck.launcher.ui.PinRequestPrompt + +class PinRequestActivity : ComponentActivity() { + override fun attachBaseContext(newBase: android.content.Context) { + super.attachBaseContext(newBase) + com.droiddeck.launcher.core.AppLanguage.applyTo(this, newBase) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + val request = runCatching { getSystemService(LauncherApps::class.java).getPinItemRequest(intent) }.getOrNull() + if (request == null || !request.isValid) { + finish() + return + } + val prompt = when (request.requestType) { + LauncherApps.PinItemRequest.REQUEST_TYPE_SHORTCUT -> request.shortcutInfo?.let { info -> + val appLabel = appLabel(info.`package`) + Triple(info.shortLabel?.toString().orEmpty().ifEmpty { appLabel }, appLabel, HomeApp.shortcutIcon(this, info)) + } + LauncherApps.PinItemRequest.REQUEST_TYPE_APPWIDGET -> request.getAppWidgetProviderInfo(this)?.let { info -> + val appLabel = appLabel(info.provider.packageName) + val dpi = resources.displayMetrics.densityDpi + val icon = runCatching { (info.loadPreviewImage(this, dpi) ?: info.loadIcon(this, dpi))?.let(::scaled) }.getOrNull() + Triple(info.loadLabel(packageManager)?.toString().orEmpty().ifEmpty { appLabel }, appLabel, icon) + } + else -> null + } + if (prompt == null) { + finish() + return + } + val (label, appLabel, icon) = prompt + val widget = request.requestType == LauncherApps.PinItemRequest.REQUEST_TYPE_APPWIDGET + setContent { + DroidDeckTheme(appScale = AppUiPrefs.scale(this)) { + PinRequestPrompt( + label = label, appLabel = appLabel, icon = icon, wide = widget, + onAdd = { + if (!widget) { + HomePins.accept(this, request) + finish() + } else if (!HomeWidgets.addPinned(this, request)) finish() + }, + onCancel = { finish() }, + ) + } + } + } + + @Suppress("OVERRIDE_DEPRECATION") + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + if (HomeWidgets.onActivityResult(this, requestCode, resultCode)) { + finish() + return + } + @Suppress("DEPRECATION") + super.onActivityResult(requestCode, resultCode, data) + } + + private fun appLabel(packageName: String): String = + runCatching { packageManager.getApplicationLabel(packageManager.getApplicationInfo(packageName, 0)).toString() } + .getOrDefault(packageName) + + private fun scaled(d: android.graphics.drawable.Drawable): Bitmap { + val w = d.intrinsicWidth.takeIf { it > 0 } ?: 192 + val h = d.intrinsicHeight.takeIf { it > 0 } ?: 192 + val k = minOf(1f, 480f / maxOf(w, h)) + return d.toBitmap((w * k).toInt().coerceAtLeast(1), (h * k).toInt().coerceAtLeast(1)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt new file mode 100644 index 0000000000..fdd0fdd8cb --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt @@ -0,0 +1,959 @@ +package com.droiddeck.launcher.ui + +import android.app.Activity +import android.content.Context +import android.content.ContextWrapper +import android.view.KeyEvent +import androidx.activity.compose.BackHandler +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.scaleIn +import androidx.compose.animation.scaleOut +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.Image +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.focusable +import androidx.compose.foundation.gestures.awaitEachGesture +import androidx.compose.foundation.gestures.awaitFirstDown +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsPressedAsState +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.imePadding +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.GridItemSpan +import androidx.compose.foundation.lazy.grid.LazyGridState +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.foundation.lazy.grid.rememberLazyGridState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Edit +import androidx.compose.material.icons.filled.FilterAlt +import androidx.compose.material.icons.filled.Sort +import androidx.compose.material.icons.filled.Widgets +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.getValue +import androidx.compose.runtime.key +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.layout.onSizeChanged +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.IntOffset +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.viewinterop.AndroidView +import androidx.compose.ui.zIndex +import com.droiddeck.launcher.HomeApp +import com.droiddeck.launcher.HomeFolders +import com.droiddeck.launcher.HomeHidden +import com.droiddeck.launcher.HomePins +import android.content.pm.ShortcutInfo +import android.graphics.Bitmap +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import com.droiddeck.launcher.HomeWidgets +import com.droiddeck.launcher.R +import kotlinx.coroutines.launch +import kotlin.math.roundToInt + +private sealed interface AppEntry : AppEntryKey { + val key: String + + class App(val app: HomeApp.LaunchableApp) : AppEntry { + override val label get() = app.label + override val key get() = "app:" + app.key + override val installedAt get() = app.installedAt + override val updatedAt get() = app.updatedAt + } + + class Folder(val folder: HomeFolders.Folder, val apps: List<HomeApp.LaunchableApp>) : AppEntry { + override val label get() = folder.name + override val key get() = "folder:" + folder.id + override val installedAt get() = apps.maxOf { it.installedAt } + override val updatedAt get() = apps.maxOf { it.updatedAt } + } + + class Shortcut(val pinned: HomePins.Pinned) : AppEntry { + override val label get() = pinned.label + override val key get() = pinned.key + override val installedAt get() = 0L + override val updatedAt get() = 0L + } +} + +private fun indexLetter(label: String): String { + val c = label.trim().firstOrNull()?.uppercaseChar() ?: return "#" + return if (c in 'A'..'Z') c.toString() else if (c.isLetter()) c.toString() else "#" +} + +private fun searchRank(label: String, q: String): Int? { + if (label.startsWith(q, ignoreCase = true)) return 0 + if (label.split(' ', '-', '_', '.').any { it.startsWith(q, ignoreCase = true) }) return 1 + if (label.contains(q, ignoreCase = true)) return 2 + return null +} + +internal fun Context.findActivity(): Activity? { + var c: Context? = this + while (c is ContextWrapper) { + if (c is Activity) return c + c = c.baseContext + } + return null +} + +private fun Modifier.menuKey(onMenu: () -> Unit): Modifier = onPreviewKeyEvent { event -> + val k = event.nativeKeyEvent + if (k.keyCode != KeyEvent.KEYCODE_BUTTON_Y && k.keyCode != KeyEvent.KEYCODE_MENU) false + else { + if (k.action == KeyEvent.ACTION_DOWN && k.repeatCount == 0) onMenu() + true + } +} + +internal object AppsView { + const val ALL = "all" + const val GAMES = "games" + const val DOWNLOADED = "downloaded" + const val SYSTEM = "system" + const val HIDDEN = "hidden" + val FILTERS = listOf(ALL, GAMES, DOWNLOADED, SYSTEM, HIDDEN) + const val NAME_ASC = "nameAsc" + const val NAME_DESC = "nameDesc" + const val INSTALLED = "installed" + const val UPDATED = "updated" + val SORTS = listOf(NAME_ASC, NAME_DESC, INSTALLED, UPDATED) + + var filter by mutableStateOf(ALL) + var sort by mutableStateOf(NAME_ASC) + private var loaded = false + + private fun prefs(context: Context) = context.getSharedPreferences("home_launcher", Context.MODE_PRIVATE) + + fun load(context: Context) { + if (loaded) return + loaded = true + val p = prefs(context) + filter = p.getString("filter", ALL)?.takeIf { it in FILTERS } ?: ALL + sort = p.getString("sort", NAME_ASC)?.takeIf { it in SORTS } ?: NAME_ASC + } + + fun setFilter(context: Context, value: String) { + filter = value + prefs(context).edit().putString("filter", value).apply() + } + + fun setSort(context: Context, value: String) { + sort = value + prefs(context).edit().putString("sort", value).apply() + } + + fun keeps(app: HomeApp.LaunchableApp): Boolean { + val hidden = app.key in HomeHidden.keys + return when (filter) { + HIDDEN -> hidden + GAMES -> !hidden && app.game + DOWNLOADED -> !hidden && !app.system + SYSTEM -> !hidden && app.system + else -> !hidden + } + } + + fun comparator(): Comparator<AppEntryKey> = when (sort) { + NAME_DESC -> compareBy<AppEntryKey, String>(String.CASE_INSENSITIVE_ORDER) { it.label }.reversed() + INSTALLED -> compareByDescending<AppEntryKey> { it.installedAt }.thenBy(String.CASE_INSENSITIVE_ORDER) { it.label } + UPDATED -> compareByDescending<AppEntryKey> { it.updatedAt }.thenBy(String.CASE_INSENSITIVE_ORDER) { it.label } + else -> compareBy(String.CASE_INSENSITIVE_ORDER) { it.label } + } +} + +internal interface AppEntryKey { + val label: String + val installedAt: Long + val updatedAt: Long +} + +@OptIn(ExperimentalLayoutApi::class) +@Composable +internal fun AndroidAppsPage(s: FrontEndState, modifier: Modifier, onLaunch: (HomeApp.LaunchableApp) -> Unit) { + val ctx = LocalContext.current + remember { HomeFolders.load(ctx); HomeWidgets.load(ctx); HomeHidden.load(ctx); AppsView.load(ctx); true } + val colors = MaterialTheme.colorScheme + val narrow = LocalNarrowPane.current + val padH = if (narrow) 16.dp else 22.dp + var query by rememberSaveable { mutableStateOf("") } + var openFolder by rememberSaveable { mutableStateOf<String?>(null) } + var renameOnOpen by rememberSaveable { mutableStateOf(false) } + var picking by rememberSaveable { mutableStateOf(false) } + val folders = HomeFolders.folders + val byKey = remember(s.androidApps) { s.androidApps.associateBy { it.key } } + val byPkg = remember(s.androidApps) { s.androidApps.filterNot { it.work }.groupBy { it.packageName }.mapNotNull { (pkg, apps) -> apps.singleOrNull()?.let { pkg to it } }.toMap() } + LaunchedEffect(byPkg) { if (byPkg.isNotEmpty()) HomeFolders.migrateMembers(ctx) { byPkg[it]?.key } } + val member: (String) -> HomeApp.LaunchableApp? = { byKey[it] ?: byPkg[it] } + val pins = HomePins.pinned + val hidden = HomeHidden.keys + val q = query.trim() + val filter = AppsView.filter + val sort = AppsView.sort + val entries: List<AppEntry> = remember(s.androidApps, folders, q, filter, sort, pins, hidden) { + val kept = s.androidApps.filter { AppsView.keeps(it) } + val shortcuts = if (filter == AppsView.ALL) pins.map { AppEntry.Shortcut(it) } else emptyList() + if (q.isNotEmpty()) { + (kept.map { AppEntry.App(it) } + shortcuts).mapNotNull { e -> searchRank(e.label, q)?.let { it to e } } + .sortedWith(compareBy<Pair<Int, AppEntry>> { it.first }.thenBy(String.CASE_INSENSITIVE_ORDER) { it.second.label }) + .map { it.second } + } else if (filter != AppsView.ALL) { + kept.map { AppEntry.App(it) }.sortedWith(AppsView.comparator()) + } else { + val folderEntries = folders.mapNotNull { f -> + val apps = f.apps.mapNotNull(member).filter { it.key !in hidden }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }) + if (apps.isEmpty()) null else AppEntry.Folder(f, apps) + } + val grouped = folderEntries.flatMap { f -> f.apps.map { it.key } }.toSet() + (folderEntries + kept.filter { it.key !in grouped }.map { AppEntry.App(it) } + shortcuts).sortedWith(AppsView.comparator()) + } + } + val grid = rememberLazyGridState() + LaunchedEffect(q, filter, sort) { grid.scrollToItem(0) } + val widgetsShown = q.isEmpty() && filter == AppsView.ALL && HomeWidgets.widgets.isNotEmpty() + val leadItems = if (widgetsShown) 1 else 0 + val byName = sort == AppsView.NAME_ASC || sort == AppsView.NAME_DESC + val newFolder: (HomeApp.LaunchableApp) -> Unit = { app -> + val f = HomeFolders.create(ctx, ctx.getString(R.string.apps_folder_default), app.key) + renameOnOpen = true + openFolder = f.id + } + + Box(modifier) { + Column(Modifier.fillMaxSize().imePadding()) { + Box(Modifier.fillMaxWidth().padding(start = padH, end = padH, top = if (narrow) 8.dp else 12.dp)) { + ModeHeader( + stringResource(R.string.content_android_apps), query, { query = it }, + placeholder = stringResource(R.string.apps_search_hint), + clearSearchFocus = openFolder != null || picking, + lead = { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(start = 2.dp, end = 4.dp)) { + Text(stringResource(R.string.content_android_apps), fontSize = if (narrow) 20.sp else 24.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1) + val shownCount = s.androidApps.count { AppsView.keeps(it) } + if (filter == AppsView.ALL) pins.size else 0 + Text(androidx.compose.ui.res.pluralStringResource(R.plurals.apps_count, shownCount, shownCount), fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1) + } + }, + ) { + AppsFilterButton() + AppsSortButton() + HeaderIconButton(stringResource(R.string.apps_add_widget), Icons.Filled.Widgets, "add-widget") { + HomeWidgets.loadProviders(ctx) + picking = true + } + } + } + Box(Modifier.weight(1f).fillMaxWidth()) { + val scroller = q.isEmpty() && byName && entries.size > 16 + LazyVerticalGrid( + columns = GridCells.Adaptive(if (narrow) 84.dp else 96.dp), + state = grid, + horizontalArrangement = Arrangement.spacedBy(10.dp), + verticalArrangement = Arrangement.spacedBy(10.dp), + contentPadding = PaddingValues(start = padH, end = if (scroller) padH + 22.dp else padH, top = 12.dp, bottom = 16.dp), + modifier = Modifier.fillMaxSize(), + ) { + if (widgetsShown) item(key = "widgets", span = { GridItemSpan(maxLineSpan) }) { + BoxWithConstraints(Modifier.fillMaxWidth()) { + val maxW = maxWidth + FlowRow( + horizontalArrangement = Arrangement.spacedBy(10.dp), + verticalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxWidth().padding(bottom = 6.dp), + ) { + for (w in HomeWidgets.widgets) key(w.id) { WidgetCard(w, maxW.value.toInt()) } + } + } + } + if (entries.isEmpty()) item(key = "empty", span = { GridItemSpan(maxLineSpan) }) { + Note( + when { + q.isNotEmpty() -> stringResource(R.string.apps_no_match, q) + filter == AppsView.HIDDEN -> stringResource(R.string.apps_hidden_none) + else -> stringResource(R.string.content_no_android_apps) + }, + ) + } + items(entries, key = { it.key }) { entry -> + when (entry) { + is AppEntry.App -> AppTile( + entry.app, folderId = null, onLaunch = onLaunch, onNewFolder = newFolder, + first = entry === entries.first(), + ) + is AppEntry.Shortcut -> PinnedTile(entry.pinned, first = entry === entries.first()) + is AppEntry.Folder -> FolderTile(entry, first = entry === entries.first(), onOpen = { renameOnOpen = false; openFolder = entry.folder.id }) { + renameOnOpen = true + openFolder = entry.folder.id + } + } + } + } + if (scroller) AlphabetScroller(entries, grid, leadItems, Modifier.align(Alignment.CenterEnd).fillMaxHeight().padding(end = 4.dp, top = 8.dp, bottom = 8.dp)) + } + } + + val folder = folders.firstOrNull { it.id == openFolder } + LaunchedEffect(folder == null, openFolder) { if (folder == null && openFolder != null) openFolder = null } + AnimatedVisibility( + folder != null, enter = fadeIn(Motion.tw(180)), exit = fadeOut(Motion.tw(160)), + modifier = Modifier.fillMaxSize().zIndex(2f), + ) { + var last by remember { mutableStateOf(folder) } + if (folder != null) last = folder + last?.let { f -> + FolderSheet(f, f.apps.mapNotNull(member).filter { it.key !in hidden }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }), renameOnOpen, onLaunch, newFolder) { + openFolder = null + renameOnOpen = false + } + } + } + AnimatedVisibility( + picking, enter = fadeIn(Motion.tw(180)), exit = fadeOut(Motion.tw(160)), + modifier = Modifier.fillMaxSize().zIndex(3f), + ) { WidgetPicker(padH) { picking = false } } + } +} + +@Composable +private fun SwipeLock() { + DisposableEffect(Unit) { + PageSwipe.locks++ + onDispose { PageSwipe.locks-- } + } +} + +@Composable +private fun appsFilterLabel(filter: String): String = stringResource( + when (filter) { + AppsView.GAMES -> R.string.apps_filter_games + AppsView.DOWNLOADED -> R.string.apps_filter_downloaded + AppsView.SYSTEM -> R.string.apps_filter_system + AppsView.HIDDEN -> R.string.apps_filter_hidden + else -> R.string.apps_filter_all + }, +) + +@Composable +private fun appsSortLabel(sort: String): String = stringResource( + when (sort) { + AppsView.NAME_DESC -> R.string.apps_sort_name_desc + AppsView.INSTALLED -> R.string.apps_sort_installed + AppsView.UPDATED -> R.string.apps_sort_updated + else -> R.string.apps_sort_name_asc + }, +) + +@Composable +private fun AppsFilterButton() = HeaderChoiceButton( + stringResource(R.string.apps_filter), Icons.Filled.FilterAlt, "apps-filter", + AppsView.FILTERS, AppsView.filter, { appsFilterLabel(it) }, AppsView::setFilter, +) + +@Composable +private fun AppsSortButton() = HeaderChoiceButton( + stringResource(R.string.stores_sort), Icons.Filled.Sort, "apps-sort", + AppsView.SORTS, AppsView.sort, { appsSortLabel(it) }, AppsView::setSort, +) + +@Composable +private fun HeaderChoiceButton( + title: String, icon: androidx.compose.ui.graphics.vector.ImageVector, key: String, + options: List<String>, current: String, label: @Composable (String) -> String, onPick: (Context, String) -> Unit, +) { + val pal = LocalPalette.current + val ctx = LocalContext.current + var at by remember { mutableStateOf<androidx.compose.ui.geometry.Rect?>(null) } + Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { + HeaderIconButton("$title · ${label(current)}", icon, key) { + val from = at ?: return@HeaderIconButton + Steps.ask(StepAsk( + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = options.size, + handle = { Icon(icon, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, + ) { + StepTitle(title) + StepList { + options.forEachIndexed { i, option -> + StepChoice( + label(option), selected = option == current, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(i).then(if (option == current) Modifier.focusRequester(first) else Modifier), + ) { + onPick(ctx, option) + Steps.fold() + } + } + } + }) + } + } +} + +@Composable +private fun AlphabetScroller(entries: List<AppEntry>, grid: LazyGridState, leadItems: Int, modifier: Modifier) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val scope = rememberCoroutineScope() + val firstAt = remember(entries) { + val map = LinkedHashMap<String, Int>() + entries.forEachIndexed { i, e -> map.putIfAbsent(indexLetter(e.label), i) } + map + } + val letters = remember(firstAt) { firstAt.keys.toList() } + var dragging by remember { mutableStateOf<String?>(null) } + val current by remember(entries, leadItems) { + derivedStateOf { + val i = (grid.firstVisibleItemIndex - leadItems).coerceIn(0, (entries.size - 1).coerceAtLeast(0)) + entries.getOrNull(i)?.let { indexLetter(it.label) } + } + } + var height by remember { mutableIntStateOf(1) } + val jump: (Float) -> Unit = { y -> + val i = ((y / height) * letters.size).toInt().coerceIn(0, letters.size - 1) + val letter = letters[i] + if (letter != dragging) { + dragging = letter + val at = firstAt[letter] ?: 0 + scope.launch { grid.scrollToItem(if (at == 0) 0 else leadItems + at) } + } + } + Box(modifier.width(22.dp)) { + Column( + verticalArrangement = Arrangement.SpaceEvenly, horizontalAlignment = Alignment.CenterHorizontally, + modifier = Modifier.fillMaxSize() + .clip(RoundedCornerShape(11.dp)) + .background(if (dragging != null) colors.surface.copy(alpha = 0.85f) else Color.Transparent) + .onSizeChanged { height = it.height.coerceAtLeast(1) } + .pointerInput(letters) { + awaitEachGesture { + val down = awaitFirstDown() + down.consume() + jump(down.position.y) + while (true) { + val event = awaitPointerEvent() + val c = event.changes.firstOrNull { it.id == down.id } ?: break + if (!c.pressed) break + c.consume() + jump(c.position.y) + } + dragging = null + } + }, + ) { + for (l in letters) { + val on = l == (dragging ?: current) + Text( + l, fontSize = 10.sp, lineHeight = 11.sp, fontWeight = if (on) FontWeight.Bold else FontWeight.Medium, + color = if (on) pal.signal else colors.onSurfaceVariant, textAlign = TextAlign.Center, + ) + } + } + dragging?.let { l -> + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.align(Alignment.Center).offset { IntOffset(-64.dp.roundToPx(), 0) }.size(56.dp) + .clip(CircleShape).background(pal.signal), + ) { Text(l, fontSize = 26.sp, fontWeight = FontWeight.Bold, color = pal.onPrimary) } + } + } +} + +@OptIn(ExperimentalFoundationApi::class) +@Composable +private fun TileFrame( + id: String, first: Boolean, onClick: () -> Unit, onMenu: () -> Unit, + content: @Composable (hot: Boolean) -> Unit, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val pressed by src.collectIsPressedAsState() + val scale by animateFloatAsState(if (pressed) 0.95f else if (hot) 1.04f else 1f, Motion.sp(0.55f, Spring.StiffnessMedium), label = "appScale") + Column( + horizontalAlignment = Alignment.CenterHorizontally, + modifier = Modifier.fillMaxWidth() + .paneItem("tile:$id").then(if (first) Modifier.firstTile().paneEntry() else Modifier) + .graphicsLayer { scaleX = scale; scaleY = scale } + .clip(Shape12) + .background(if (hot) colors.surface else colors.surface.copy(alpha = 0.55f)) + .glideBorder(hot, Shape12, pal.signal, hotWidth = 2.5.dp) + .hoverable(src) + .combinedClickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onLongClick = onMenu, onClick = onClick) + .controllerConfirm(onClick = onClick) + .menuKey(onMenu) + .padding(horizontal = 6.dp, vertical = 10.dp), + ) { content(hot) } +} + +@Composable +private fun TileLabel(text: String) = Text( + text, fontSize = 12.sp, lineHeight = 15.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis, textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth().padding(top = 8.dp), +) + +@Composable +private fun AppIcon(app: HomeApp.LaunchableApp, size: androidx.compose.ui.unit.Dp) { + val icon = app.icon + if (icon != null) Image(icon.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.size(size)) + else Box(Modifier.size(size).clip(CircleShape).background(artBrush(hueOf(app.label)))) +} + +@Composable +private fun AppTile( + app: HomeApp.LaunchableApp, folderId: String?, first: Boolean, + onLaunch: (HomeApp.LaunchableApp) -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, +) { + var menu by remember { mutableStateOf(false) } + Box { + TileFrame(app.key, first, onClick = { onLaunch(app) }, onMenu = { menu = true }) { + AppIcon(app, 52.dp) + TileLabel(app.label) + } + AppMenu(app, folderId, menu, onDismiss = { menu = false }, onNewFolder = onNewFolder) + } +} + +@Composable +private fun AppMenu( + app: HomeApp.LaunchableApp, folderId: String?, open: Boolean, + onDismiss: () -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, +) { + val ctx = LocalContext.current + var choosing by remember { mutableStateOf(false) } + var shortcuts by remember { mutableStateOf<List<Pair<ShortcutInfo, Bitmap?>>>(emptyList()) } + LaunchedEffect(open) { + if (!open) { + choosing = false + return@LaunchedEffect + } + shortcuts = withContext(Dispatchers.IO) { + HomeApp.shortcuts(ctx, app).map { it to HomeApp.shortcutIcon(ctx, it, 64) } + } + } + val isHidden = app.key in HomeHidden.keys + AnchoredMenu(open, onDismiss = onDismiss, title = app.label, compact = true, minWidth = 200.dp) { first -> + if (choosing) { + val others = HomeFolders.folders.filter { it.id != folderId } + var firstUsed = false + for (f in others) key(f.id) { + MenuItem(f.name, checked = false, focusRequester = if (!firstUsed) first.also { firstUsed = true } else null) { + HomeFolders.add(ctx, f.id, app.key) + onDismiss() + } + } + MenuItem(stringResource(R.string.apps_new_folder), checked = false, focusRequester = if (others.isEmpty()) first else null) { + onDismiss() + onNewFolder(app) + } + } else { + shortcuts.forEachIndexed { i, (info, icon) -> + key(info.id) { + MenuItem( + info.shortLabel?.toString().orEmpty(), checked = false, + focusRequester = if (i == 0) first else null, + leading = { MenuIcon(icon) }, + ) { + onDismiss() + runCatching { HomeApp.startShortcut(ctx, info) } + } + } + } + if (shortcuts.isNotEmpty()) Box(Modifier.fillMaxWidth().padding(vertical = 4.dp).height(1.dp).background(LocalPalette.current.line)) + if (!isHidden) MenuItem(stringResource(R.string.apps_add_to_folder), checked = false, focusRequester = if (shortcuts.isEmpty()) first else null) { choosing = true } + if (folderId != null) MenuItem(stringResource(R.string.apps_remove_from_folder), checked = false) { + HomeFolders.remove(ctx, app.key) + onDismiss() + } + MenuItem(stringResource(if (isHidden) R.string.apps_unhide else R.string.apps_hide), checked = false, + focusRequester = if (isHidden && shortcuts.isEmpty()) first else null) { + onDismiss() + HomeHidden.set(ctx, app.key, !isHidden) + } + MenuItem(stringResource(R.string.apps_app_info), checked = false) { + onDismiss() + runCatching { HomeApp.openAppInfo(ctx, app) } + } + if (HomeApp.canUninstall(app)) MenuItem(stringResource(R.string.apps_uninstall), checked = false) { + onDismiss() + runCatching { HomeApp.uninstall(ctx, app) } + } + } + } +} + +@Composable +private fun MenuIcon(icon: Bitmap?) { + if (icon != null) Image(icon.asImageBitmap(), null, modifier = Modifier.size(20.dp)) + else Spacer(Modifier.size(20.dp)) +} + +@Composable +private fun PinnedTile(pinned: HomePins.Pinned, first: Boolean) { + val ctx = LocalContext.current + var menu by remember { mutableStateOf(false) } + Box { + TileFrame(pinned.key, first, onClick = { runCatching { HomeApp.startShortcut(ctx, pinned.info) } }, onMenu = { menu = true }) { + Box { + val icon = pinned.icon + if (icon != null) Image(icon.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.size(52.dp)) + else Box(Modifier.size(52.dp).clip(CircleShape).background(artBrush(hueOf(pinned.label)))) + } + TileLabel(pinned.label) + } + AnchoredMenu(menu, onDismiss = { menu = false }, title = pinned.label, compact = true, minWidth = 180.dp) { firstItem -> + MenuItem(stringResource(R.string.apps_shortcut_remove), checked = false, detail = pinned.appLabel, focusRequester = firstItem) { + menu = false + HomePins.unpin(ctx, pinned) + } + } + } +} + +@Composable +private fun FolderIcon(apps: List<HomeApp.LaunchableApp>, size: androidx.compose.ui.unit.Dp) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val cell = (size - 14.dp) / 2 + Box( + Modifier.size(size).clip(RoundedCornerShape(size / 3.5f)).background(colors.surfaceVariant) + .glideBorder(false, RoundedCornerShape(size / 3.5f), pal.signal, pal.line2) + .padding(5.dp), + ) { + Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + for (row in apps.take(4).chunked(2)) Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) { + for (a in row) AppIcon(a, cell) + } + } + } +} + +@Composable +private fun FolderTile(entry: AppEntry.Folder, first: Boolean, onOpen: () -> Unit, onRename: () -> Unit) { + val ctx = LocalContext.current + var menu by remember { mutableStateOf(false) } + Box { + TileFrame(entry.key, first, onClick = onOpen, onMenu = { menu = true }) { + FolderIcon(entry.apps, 52.dp) + TileLabel(entry.folder.name) + } + AnchoredMenu(menu, onDismiss = { menu = false }, title = entry.folder.name, compact = true, minWidth = 160.dp) { firstItem -> + MenuItem(stringResource(R.string.apps_folder_rename), checked = false, focusRequester = firstItem) { + menu = false + onRename() + } + MenuItem(stringResource(R.string.apps_folder_ungroup), checked = false) { + menu = false + HomeFolders.delete(ctx, entry.folder.id) + } + } + } +} + +@Composable +private fun FolderSheet( + folder: HomeFolders.Folder, apps: List<HomeApp.LaunchableApp>, renameFirst: Boolean, + onLaunch: (HomeApp.LaunchableApp) -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, onClose: () -> Unit, +) { + SwipeLock() + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var renaming by remember(folder.id) { mutableStateOf(renameFirst) } + var name by remember(folder.id) { mutableStateOf(if (renameFirst) "" else folder.name) } + val commit = { + val n = name.trim() + if (n.isNotEmpty() && n != folder.name) HomeFolders.rename(ctx, folder.id, n) + renaming = false + } + val close = { if (renaming) commit(); onClose() } + BackHandler { close() } + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.55f)) + .pointerInput(Unit) { awaitEachGesture { val d = awaitFirstDown(); d.consume(); close() } }, + ) { + val shown = remember { androidx.compose.animation.core.MutableTransitionState(false) }.apply { targetState = true } + AnimatedVisibility(shown, enter = scaleIn(Motion.sp(0.75f), initialScale = 0.92f) + fadeIn(Motion.tw(160)), exit = scaleOut(Motion.tw(140)) + fadeOut(Motion.tw(140))) { + Column( + modifier = Modifier.widthIn(max = 620.dp).fillMaxWidth(0.9f).heightIn(max = 520.dp) + .clip(Shape16).background(pal.surfaceVariant.copy(alpha = 0.97f)) + .glideBorder(false, Shape16, pal.signal, pal.signal.copy(alpha = 0.22f)) + .pointerInput(Unit) { awaitEachGesture { awaitFirstDown(requireUnconsumed = false).consume() } } + .controllerBack(close) + .padding(16.dp), + ) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp)) { + if (renaming) Box(Modifier.weight(1f)) { + AdbTextField( + value = name, onValueChange = { name = it.take(40) }, label = stringResource(R.string.apps_folder_name), + keyboardType = KeyboardType.Text, imeAction = ImeAction.Done, compact = true, showLabel = false, + placeholder = folder.name, focusOnShow = true, onDone = { commit() }, + ) + } else { + Text(folder.name, fontSize = 20.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) + SmallIconButton(Icons.Filled.Edit, stringResource(R.string.apps_folder_rename), tint = colors.onSurfaceVariant) { renaming = true } + Spacer(Modifier.weight(1f)) + } + SmallIconButton(Icons.Filled.Close, stringResource(R.string.common_close), tint = colors.onSurfaceVariant) { close() } + } + LazyVerticalGrid( + columns = GridCells.Adaptive(92.dp), + horizontalArrangement = Arrangement.spacedBy(10.dp), + verticalArrangement = Arrangement.spacedBy(10.dp), + ) { + items(apps, key = { it.key }) { app -> + AppTile(app, folderId = folder.id, first = false, onLaunch = { onClose(); onLaunch(it) }, onNewFolder = onNewFolder) + } + } + } + } + } +} + +@Composable +private fun WidgetCard(w: HomeWidgets.Placed, maxWidthDp: Int) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var menu by remember { mutableStateOf(false) } + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val width = w.widthDp.coerceAtMost(maxWidthDp) + val activity = remember(ctx) { ctx.findActivity() } + Box { + Box( + Modifier.size(width.dp, w.heightDp.dp) + .clip(Shape16) + .background(colors.surface.copy(alpha = 0.35f)) + .glideBorder(hot || menu, Shape16, pal.signal) + .hoverable(src).focusable(interactionSource = src) + .controllerConfirm { menu = true } + .menuKey { menu = true }, + ) { + AndroidView( + factory = { c -> + (HomeWidgets.createView(c, w.id) ?: android.view.View(c)).apply { + val radius = 16 * c.resources.displayMetrics.density + outlineProvider = object : android.view.ViewOutlineProvider() { + override fun getOutline(view: android.view.View, outline: android.graphics.Outline) = + outline.setRoundRect(0, 0, view.width, view.height, radius) + } + clipToOutline = true + } + }, + update = { v -> + if (v is HomeWidgets.HomeWidgetView) { + v.onLongPress = { menu = true } + HomeWidgets.applySize(v, width, w.heightDp) + } + }, + modifier = Modifier.fillMaxSize(), + ) + } + val (minW, minH) = remember(w.id) { HomeWidgets.minSize(ctx, w.id) } + val index = HomeWidgets.widgets.indexOfFirst { it.id == w.id } + val label = remember(w.id) { HomeWidgets.info(ctx, w.id)?.loadLabel(ctx.packageManager) ?: "" } + AnchoredMenu(menu, onDismiss = { menu = false }, title = label, compact = true, minWidth = 180.dp) { first -> + val step = 48 + MenuItem(stringResource(R.string.apps_widget_wider), checked = false, enabled = width < maxWidthDp, focusRequester = first) { + HomeWidgets.resize(ctx, w.id, (width + step).coerceAtMost(maxWidthDp), w.heightDp) + } + MenuItem(stringResource(R.string.apps_widget_narrower), checked = false, enabled = width > minW) { + HomeWidgets.resize(ctx, w.id, (width - step).coerceAtLeast(minW), w.heightDp) + } + MenuItem(stringResource(R.string.apps_widget_taller), checked = false, enabled = w.heightDp < 480) { + HomeWidgets.resize(ctx, w.id, width, (w.heightDp + step).coerceAtMost(480)) + } + MenuItem(stringResource(R.string.apps_widget_shorter), checked = false, enabled = w.heightDp > minH) { + HomeWidgets.resize(ctx, w.id, width, (w.heightDp - step).coerceAtLeast(minH)) + } + if (index > 0) MenuItem(stringResource(R.string.apps_widget_move_earlier), checked = false) { HomeWidgets.move(ctx, w.id, -1) } + if (index in 0 until HomeWidgets.widgets.size - 1) MenuItem(stringResource(R.string.apps_widget_move_later), checked = false) { HomeWidgets.move(ctx, w.id, 1) } + if (activity != null && HomeWidgets.canReconfigure(ctx, w.id)) MenuItem(stringResource(R.string.apps_widget_configure), checked = false) { + menu = false + HomeWidgets.reconfigure(activity, w.id) + } + MenuItem(stringResource(R.string.apps_widget_remove), checked = false) { + menu = false + HomeWidgets.remove(ctx, w.id) + } + } + } +} + +@Composable +private fun WidgetPicker(padH: androidx.compose.ui.unit.Dp, onClose: () -> Unit) { + SwipeLock() + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val activity = remember(ctx) { ctx.findActivity() } + BackHandler { onClose() } + val providers = HomeWidgets.providers + Column(Modifier.fillMaxSize().background(colors.background).pointerInput(Unit) { awaitEachGesture { awaitFirstDown(requireUnconsumed = false) } }) { + LazyVerticalGrid( + columns = GridCells.Adaptive(150.dp), + horizontalArrangement = Arrangement.spacedBy(10.dp), + verticalArrangement = Arrangement.spacedBy(10.dp), + contentPadding = PaddingValues(horizontal = padH, vertical = 14.dp), + modifier = Modifier.fillMaxSize(), + ) { + item(key = "back", span = { GridItemSpan(maxLineSpan) }) { + Column { + Box(Modifier.padding(bottom = 10.dp)) { BackLink(stringResource(R.string.rail_apps), compact = true, onClick = onClose) } + PageHeader(stringResource(R.string.apps_add_widget)) { + if (providers != null) Chip(providers.size.toString(), ok = false) + } + } + } + when { + providers == null -> item(key = "loading", span = { GridItemSpan(maxLineSpan) }) { Note(stringResource(R.string.apps_widgets_loading)) } + providers.isEmpty() -> item(key = "none", span = { GridItemSpan(maxLineSpan) }) { Note(stringResource(R.string.apps_widgets_none)) } + else -> items(providers, key = { it.info.provider.flattenToString() }) { p -> + ProviderCard(p, first = p === providers.first()) { + onClose() + if (activity != null) HomeWidgets.add(activity, p) + } + } + } + } + } +} + +@Composable +private fun ProviderCard(p: HomeWidgets.Provider, first: Boolean, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Column( + modifier = Modifier.fillMaxWidth().paneItem("widget:" + p.info.provider.flattenToString()).then(if (first) Modifier.firstTile() else Modifier) + .clip(Shape12).background(colors.surface) + .glideBorder(hot, Shape12, pal.signal, hotWidth = 2.5.dp) + .hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) + .controllerConfirm(onClick = onClick), + ) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.fillMaxWidth().aspectRatio(1.6f).background(colors.surfaceVariant).padding(10.dp), + ) { + val preview = p.preview + if (preview != null) Image(preview.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.fillMaxSize()) + } + Column(Modifier.padding(horizontal = 10.dp, vertical = 8.dp)) { + Text(p.label, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + val cells = "${(p.widthDp / 80f).roundToInt().coerceAtLeast(1)} × ${(p.heightDp / 80f).roundToInt().coerceAtLeast(1)}" + Text(if (p.appLabel == p.label) cells else "${p.appLabel} · $cells", fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + } +} + +@Composable +fun PinRequestPrompt(label: String, appLabel: String, icon: Bitmap?, wide: Boolean, onAdd: () -> Unit, onCancel: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + BackHandler { onCancel() } + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.55f)) + .pointerInput(Unit) { awaitEachGesture { awaitFirstDown().consume(); onCancel() } }, + ) { + val shown = remember { androidx.compose.animation.core.MutableTransitionState(false) }.apply { targetState = true } + AnimatedVisibility(shown, enter = scaleIn(Motion.sp(0.75f), initialScale = 0.92f) + fadeIn(Motion.tw(160))) { + Column( + verticalArrangement = Arrangement.spacedBy(14.dp), + modifier = Modifier.widthIn(min = 280.dp, max = 420.dp) + .clip(Shape16).background(pal.surfaceVariant.copy(alpha = 0.97f)) + .glideBorder(false, Shape16, pal.signal, pal.signal.copy(alpha = 0.22f)) + .pointerInput(Unit) { awaitEachGesture { awaitFirstDown(requireUnconsumed = false).consume() } } + .controllerBack(onCancel) + .padding(18.dp), + ) { + Text( + stringResource(R.string.apps_pin_title).uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, + letterSpacing = 1.5.sp, color = colors.onSurfaceVariant, + ) + if (wide && icon != null) Box( + contentAlignment = Alignment.Center, + modifier = Modifier.fillMaxWidth().heightIn(max = 180.dp).clip(Shape12).background(MaterialTheme.colorScheme.surface).padding(10.dp), + ) { Image(icon.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.fillMaxWidth()) } + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp)) { + if (!wide) { + if (icon != null) Image(icon.asImageBitmap(), null, contentScale = ContentScale.Fit, modifier = Modifier.size(52.dp)) + else Box(Modifier.size(52.dp).clip(CircleShape).background(artBrush(hueOf(label)))) + } + Column(Modifier.weight(1f)) { + Text(label, fontSize = 17.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 2, overflow = TextOverflow.Ellipsis) + Text(appLabel, fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End), modifier = Modifier.fillMaxWidth()) { + SecondaryButton(stringResource(R.string.common_cancel), onClick = onCancel) + PrimaryButton(stringResource(R.string.apps_pin_add), onClick = onAdd) + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index 364650b90b..a934d39cfa 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -699,7 +699,7 @@ fun ComponentsPage( Box(Modifier.fillMaxSize().onGloballyPositioned { pageAt = it.positionInRoot() }.onFocusChanged { pageFocused = it.hasFocus }) { Column( - Modifier.fillMaxSize().padding(horizontal = if (narrow) 16.dp else 22.dp, vertical = if (narrow) 12.dp else 18.dp) + Modifier.fillMaxSize().padding(horizontal = if (narrow) 16.dp else 22.dp).padding(top = if (narrow) 12.dp else 18.dp) .then(if (selectedGame == null) Modifier.bumpers( onPrevious = { pick(layerStep(layer, -1)) }, onNext = { pick(layerStep(layer, 1)) }, @@ -972,7 +972,7 @@ private fun Stack( onFocus = { onFocus(l) }, onClick = { onOpen(l) }, ) } - Column(Modifier.fillMaxWidth().verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(3.dp)) { + Column(Modifier.fillMaxWidth().verticalScroll(rememberScrollState()).padding(bottom = 16.dp), verticalArrangement = Arrangement.spacedBy(3.dp)) { StackHeading(stringResource(R.string.comp_this_device)) card(GPU_TAB) Spacer(Modifier.height(6.dp)) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt index 4193290163..62c6a862e5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -10,6 +10,8 @@ import androidx.compose.animation.core.animateFloat import androidx.compose.animation.core.snap import androidx.compose.animation.core.tween import androidx.compose.animation.scaleIn +import androidx.compose.animation.slideInHorizontally +import androidx.compose.animation.slideOutHorizontally import androidx.compose.animation.scaleOut import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.rememberUpdatedState @@ -138,12 +140,19 @@ internal fun Pane( before[0] = target val targetNow by rememberUpdatedState(target) val leave = if (Hops.linking) PageLeave.Link else PageLeave.Ordinary - LaunchedEffect(target) { Hops.linking = false } + LaunchedEffect(target) { + Hops.linking = false + PageSwipe.direction = 0 + } AnimatedContent( targetState = target, modifier = Modifier.onGloballyPositioned { paneAt[0] = it.positionInRoot() }, transitionSpec = { + val swipe = PageSwipe.direction when { + swipe != 0 -> (fadeIn(Motion.tw(260, 40)) + slideInHorizontally(Motion.tw(360)) { it * swipe / 8 }) + .togetherWith(fadeOut(Motion.tw(160)) + slideOutHorizontally(Motion.tw(220)) { -it * swipe / 8 }) + .apply { targetContentZIndex = 1f } targetState in origins -> (fadeIn(Motion.tw(120))) .togetherWith(fadeOut(Motion.tw(320, 80)) + scaleOut(Motion.tw(480), targetScale = 0.95f)) .apply { targetContentZIndex = 1f } @@ -232,13 +241,13 @@ private fun Content( val padH = if (narrow) 16.dp else 22.dp val padV = if (narrow) 12.dp else 18.dp if (selected == "setup") { - Column(modifier = modifier.padding(horizontal = padH, vertical = padV)) { + Column(modifier = modifier.padding(horizontal = padH).padding(top = padV)) { SetupPanel(s, a, onOpenDeveloperOptions, onRequestWirelessAdb, onPairWirelessDebugging) } return } if (selected == "updates") { - UpdatesPage(s, a, modifier.padding(horizontal = padH, vertical = padV)) + UpdatesPage(s, a, modifier.padding(horizontal = padH).padding(top = padV)) return } if (selected == "steam") { @@ -261,24 +270,12 @@ private fun Content( DesktopPage(s, a, modifier, onSelect) return } + if (selected == "android-apps" && s.isHomeApp) { + AndroidAppsPage(s, modifier, onAndroidAppClick) + return + } Column(modifier = modifier.verticalScroll(rememberScrollState()).padding(horizontal = padH, vertical = padV)) { when { - selected == "android-apps" && s.isHomeApp -> { - Rise(0) { PageHeader(stringResource(R.string.content_android_apps)) { Chip(stringResource(R.string.content_apps_count, s.androidApps.size), ok = false) } } - if (s.androidApps.isEmpty()) Rise(3) { Note(stringResource(R.string.content_no_android_apps)) } - else Rise(3, Modifier.fillMaxWidth()) { - ArtGrid(s.androidApps.map { app -> - Tile( - app.label, - null, - null, - "android:${app.packageName}", - onClick = { onAndroidAppClick(app) }, - iconBitmap = app.icon, - ) - }) - } - } selected.startsWith("user:") -> { val app = UserAppsState.items.firstOrNull { "user:${it.key}" == selected } if (app == null) Note(stringResource(R.string.user_apps_gone)) else UserAppPage(app, s, a, onSelect) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index 1087240002..b7ac8ee43a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -118,7 +118,7 @@ internal fun BottomBar( } } -private fun navigationKeys(s: FrontEndState) = buildList { +internal fun navigationKeys(s: FrontEndState) = buildList { add("steam"); add("games") if (s.gameStoresEnabled) add("stores") add("desktop"); add("components") diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 3223826f37..69abceb386 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -507,6 +507,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com selected.startsWith("emu:") || selected.startsWith("rom:") || selected.startsWith("user:") || selected == "store" -> "desktop" else -> s.pageKey ?: selected } + val railSelectionNow = androidx.compose.runtime.rememberUpdatedState(railSelection) var railPicks by remember { mutableStateOf(0) } val showRailPage: (String, Boolean) -> Unit = { key, focusContent -> if (key == "components") a.onComponents(focusContent) @@ -609,7 +610,16 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com }, ) { Pane( - s, selected, a, page, Modifier.fillMaxSize().then(paneFocus), { selected = it }, + s, selected, a, page, + Modifier.fillMaxSize().then(paneFocus).pageSwipe({ !processSettingsPageVisible && appToChooseDisplay == null }) { dir -> + val keys = navigationKeys(s) + val at = keys.indexOf(railSelectionNow.value) + if (at >= 0) keys.getOrNull(at + dir)?.let { key -> + PageSwipe.direction = dir + showRailPage(key, false) + } + }, + { selected = it }, onAndroidAppClick = { app -> if (s.secondScreenDisplays.isEmpty()) a.onAndroidApp(app, null) else appToChooseDisplay = app diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 4a3b24ce67..0f1b579c92 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -304,7 +304,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, open, detailScroll, gridScrolled = { grid.firstVisibleItemIndex > 0 || grid.firstVisibleItemScrollOffset > 0 }, onDetailFocus = { detailFocused = it }, - modifier = modifier.padding(horizontal = if (narrow) 14.dp else 22.dp, vertical = if (narrow) 10.dp else 14.dp), + modifier = modifier.padding(horizontal = if (narrow) 14.dp else 22.dp).padding(top = if (narrow) 10.dp else 14.dp), wrap = { key, content -> StoreTheme(GameRef.parse(key).let { r -> r.store ?: r.game(s.steamGames)?.source?.let { Store.byId(it) } }) { content() } }, grid = { LibraryGrid( @@ -638,7 +638,7 @@ private fun LibraryRow(e: LibraryEntry, first: Boolean, navigation: Modifier, ch } @Composable -private fun HeaderIconButton(description: String, icon: androidx.compose.ui.graphics.vector.ImageVector, key: String, onClick: () -> Unit) { +internal fun HeaderIconButton(description: String, icon: androidx.compose.ui.graphics.vector.ImageVector, key: String, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val src = remember { MutableInteractionSource() } @@ -655,7 +655,7 @@ private fun HeaderIconButton(description: String, icon: androidx.compose.ui.grap /** Choosing Library in the rail lands on the first game, as Play Steam does on the Steam page. */ @Composable -private fun Modifier.paneEntry(): Modifier { +internal fun Modifier.paneEntry(): Modifier { val ff = LocalFrontFocus.current ?: return this androidx.compose.runtime.DisposableEffect(ff) { ff.primaryAttached++ diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PageSwipe.kt b/app/src/main/java/com/droiddeck/launcher/ui/PageSwipe.kt new file mode 100644 index 0000000000..94c7a8cf3c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/PageSwipe.kt @@ -0,0 +1,60 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.gestures.awaitEachGesture +import androidx.compose.foundation.gestures.awaitFirstDown +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.input.pointer.PointerEventPass +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.input.pointer.util.VelocityTracker +import androidx.compose.ui.input.pointer.util.addPointerInputChange +import androidx.compose.ui.unit.dp +import kotlin.math.abs + +internal object PageSwipe { + var locks by mutableIntStateOf(0) + var direction by mutableIntStateOf(0) +} + +// Runs on the Final pass so carousels, sliders, scrollers and widgets that consumed the drag keep it. +@Composable +internal fun Modifier.pageSwipe(enabled: () -> Boolean, onSwipe: (Int) -> Unit): Modifier { + val enabledNow by rememberUpdatedState(enabled) + val onSwipeNow by rememberUpdatedState(onSwipe) + return pointerInput(Unit) { + val distance = 72.dp.toPx() + val flingDistance = 32.dp.toPx() + val flingVelocity = 900.dp.toPx() + val slop = viewConfiguration.touchSlop + awaitEachGesture { + val down = awaitFirstDown(requireUnconsumed = false, pass = PointerEventPass.Final) + if (!enabledNow() || PageSwipe.locks > 0) return@awaitEachGesture + val tracker = VelocityTracker() + tracker.addPointerInputChange(down) + var total = Offset.Zero + var mine = false + while (true) { + val event = awaitPointerEvent(PointerEventPass.Final) + if (event.changes.size > 1) return@awaitEachGesture + val change = event.changes.firstOrNull { it.id == down.id } ?: return@awaitEachGesture + if (!change.pressed) break + if (!mine && change.isConsumed) return@awaitEachGesture + total += change.position - change.previousPosition + tracker.addPointerInputChange(change) + if (!mine && abs(total.x) > slop && abs(total.x) > abs(total.y) * 2f) mine = true + if (mine) change.consume() + } + if (!mine || PageSwipe.locks > 0) return@awaitEachGesture + val vx = tracker.calculateVelocity().x + val horizontal = abs(total.x) > abs(total.y) * 1.5f + val far = abs(total.x) > distance + val flung = abs(total.x) > flingDistance && abs(vx) > flingVelocity && (vx > 0) == (total.x > 0) + if (horizontal && (far || flung)) onSwipeNow(if (total.x < 0) 1 else -1) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StorePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StorePage.kt index cd3a905c78..e3724dd83d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StorePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StorePage.kt @@ -157,7 +157,7 @@ private fun FlathubHero(s: FrontEndState, ring: Int) { StoreState.sections.values.flatten().mapNotNull { it.icon }.distinct().take(48).takeIf { it.size >= 8 }.orEmpty() } val busy = StoreState.busy == "setup" - BoxWithConstraints(Modifier.fillMaxSize().padding(horizontal = if (narrow) 14.dp else 22.dp, vertical = if (narrow) 10.dp else 14.dp)) { + BoxWithConstraints(Modifier.fillMaxSize().padding(horizontal = if (narrow) 14.dp else 22.dp).padding(top = if (narrow) 10.dp else 14.dp)) { val shape = RoundedCornerShape(20.dp) Box(Modifier.fillMaxWidth().height(maxHeight.coerceAtLeast(320.dp)).clip(shape).background(colors.background).border(1.dp, pal.line, shape)) { androidx.compose.animation.Crossfade(icons, animationSpec = Motion.tw(600), label = "flathubWall") { tiles -> @@ -316,7 +316,7 @@ internal fun Storefront(s: FrontEndState, a: FrontEndActions) { } Column( - Modifier.fillMaxSize().padding(horizontal = padH, vertical = if (narrow) 10.dp else 14.dp) + Modifier.fillMaxSize().padding(horizontal = padH).padding(top = if (narrow) 10.dp else 14.dp) .bumpers( onPrevious = { if (openApp == null) mode = modes[(modes.indexOf(mode) + modes.size - 1) % modes.size] }, onNext = { if (openApp == null) mode = modes[(modes.indexOf(mode) + 1) % modes.size] }, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 916e44e43f..92b118d54b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -311,7 +311,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier val backLabel = stringResource(R.string.common_back) Box(modifier.onGloballyPositioned { hostAt = it.positionInRoot() }) { Column( - modifier = Modifier.fillMaxSize().padding(horizontal = padH, vertical = if (narrow) 10.dp else 14.dp) + modifier = Modifier.fillMaxSize().padding(horizontal = padH).padding(top = if (narrow) 10.dp else 14.dp) .then(if (openGame != null && !arranging) Modifier else Modifier.bumpers( onPrevious = { val picked = Store.byId(focusedChip) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt index 927a2c470d..dd73939a7d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt @@ -115,7 +115,7 @@ internal fun UpdatesPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie } BoxWithConstraints(Modifier.weight(1f).fillMaxWidth()) { val stacked = LocalNarrowPane.current || maxWidth < 600.dp - Column(modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(bottom = 8.dp)) { + Column(modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(bottom = 16.dp)) { if (stacked) { StatusPanel(s, u, ua, me) Box(Modifier.height(18.dp)) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt index 5c719ca90d..7e67b352bf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt @@ -360,6 +360,7 @@ internal fun AdbTextField( onNext: (() -> Unit)? = null, onDone: (() -> Unit)? = null, focusOnShow: Boolean = false, + showLabel: Boolean = true, ) { val context = LocalContext.current val focusAsked = remember { booleanArrayOf(false) } @@ -374,7 +375,7 @@ internal fun AdbTextField( val colors = MaterialTheme.colorScheme Column(modifier = modifier.fillMaxWidth()) { - Text( + if (showLabel) Text( label, style = MaterialTheme.typography.labelSmall, fontWeight = FontWeight.Medium, diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index f78cf3014d..e07f0faded 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3221,4 +3221,50 @@ <string name="itch_collections">المجموعات</string> <string name="xbox_filter_cloud">سحابية</string> <string name="stores_xbox_cloud_settings">إعدادات السحابة</string> + <string name="apps_search_hint">البحث في التطبيقات</string> + <string name="apps_no_match">لا توجد تطبيقات تطابق ”%1$s“.</string> + <string name="apps_add_widget">إضافة أداة</string> + <string name="apps_widgets_loading">جارٍ تحميل الأدوات…</string> + <string name="apps_widgets_none">لا توجد تطبيقات على هذا الجهاز توفّر أدوات.</string> + <string name="apps_widget_wider">أعرض</string> + <string name="apps_widget_narrower">أضيق</string> + <string name="apps_widget_taller">أطول</string> + <string name="apps_widget_shorter">أقصر</string> + <string name="apps_widget_move_earlier">نقل إلى الأمام</string> + <string name="apps_widget_move_later">نقل إلى الخلف</string> + <string name="apps_widget_configure">إعدادات الأداة</string> + <string name="apps_widget_remove">إزالة الأداة</string> + <string name="apps_add_to_folder">إضافة إلى مجلد</string> + <string name="apps_new_folder">مجلد جديد</string> + <string name="apps_remove_from_folder">إزالة من المجلد</string> + <string name="apps_app_info">معلومات التطبيق</string> + <string name="apps_uninstall">إلغاء التثبيت</string> + <string name="apps_folder_rename">إعادة التسمية</string> + <string name="apps_folder_ungroup">فك التجميع</string> + <string name="apps_folder_default">مجلد</string> + <string name="apps_folder_name">اسم المجلد</string> + <string name="apps_filter">عرض</string> + <string name="apps_filter_all">كل التطبيقات</string> + <string name="apps_filter_games">الألعاب</string> + <string name="apps_filter_downloaded">المنزّلة</string> + <string name="apps_filter_system">النظام</string> + <string name="apps_filter_hidden">المخفية</string> + <string name="apps_hide">إخفاء</string> + <string name="apps_unhide">إظهار في التطبيقات</string> + <string name="apps_shortcut_remove">إزالة الاختصار</string> + <string name="apps_pin_title">إضافة إلى التطبيقات</string> + <string name="apps_pin_add">إضافة</string> + <string name="apps_hidden_none">لا توجد تطبيقات مخفية.</string> + <string name="apps_sort_name_asc">الاسم أ–ي</string> + <string name="apps_sort_name_desc">الاسم ي–أ</string> + <string name="apps_sort_installed">المثبّتة مؤخرًا</string> + <string name="apps_sort_updated">المحدّثة مؤخرًا</string> + <plurals name="apps_count"> + <item quantity="zero">%d تطبيق</item> + <item quantity="one">تطبيق واحد</item> + <item quantity="two">تطبيقان</item> + <item quantity="few">%d تطبيقات</item> + <item quantity="many">%d تطبيقًا</item> + <item quantity="other">%d تطبيق</item> + </plurals> </resources> diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 09e76582e9..0861e3525f 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -3071,4 +3071,47 @@ <string name="itch_collections">Colecciones</string> <string name="xbox_filter_cloud">Nube</string> <string name="stores_xbox_cloud_settings">Configuración de nube</string> + <string name="apps_search_hint">Buscar apps</string> + <string name="apps_no_match">Ninguna app coincide con «%1$s».</string> + <string name="apps_add_widget">Agregar widget</string> + <string name="apps_widgets_loading">Cargando widgets…</string> + <string name="apps_widgets_none">Ninguna app de este dispositivo ofrece widgets.</string> + <string name="apps_widget_wider">Más ancho</string> + <string name="apps_widget_narrower">Más angosto</string> + <string name="apps_widget_taller">Más alto</string> + <string name="apps_widget_shorter">Más bajo</string> + <string name="apps_widget_move_earlier">Mover antes</string> + <string name="apps_widget_move_later">Mover después</string> + <string name="apps_widget_configure">Configuración del widget</string> + <string name="apps_widget_remove">Quitar widget</string> + <string name="apps_add_to_folder">Agregar a carpeta</string> + <string name="apps_new_folder">Carpeta nueva</string> + <string name="apps_remove_from_folder">Quitar de la carpeta</string> + <string name="apps_app_info">Información de la app</string> + <string name="apps_uninstall">Desinstalar</string> + <string name="apps_folder_rename">Cambiar nombre</string> + <string name="apps_folder_ungroup">Desagrupar</string> + <string name="apps_folder_default">Carpeta</string> + <string name="apps_folder_name">Nombre de la carpeta</string> + <string name="apps_filter">Mostrar</string> + <string name="apps_filter_all">Todas las apps</string> + <string name="apps_filter_games">Juegos</string> + <string name="apps_filter_downloaded">Descargadas</string> + <string name="apps_filter_system">Sistema</string> + <string name="apps_filter_hidden">Ocultas</string> + <string name="apps_hide">Ocultar</string> + <string name="apps_unhide">Mostrar en apps</string> + <string name="apps_shortcut_remove">Quitar acceso directo</string> + <string name="apps_pin_title">Agregar a Apps</string> + <string name="apps_pin_add">Agregar</string> + <string name="apps_hidden_none">No hay apps ocultas.</string> + <string name="apps_sort_name_asc">Nombre A–Z</string> + <string name="apps_sort_name_desc">Nombre Z–A</string> + <string name="apps_sort_installed">Instaladas recientemente</string> + <string name="apps_sort_updated">Actualizadas recientemente</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="many">%d apps</item> + <item quantity="other">%d apps</item> + </plurals> </resources> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 314b01f305..fecfd3a044 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3085,4 +3085,46 @@ <string name="itch_collections">Колекции</string> <string name="xbox_filter_cloud">Облак</string> <string name="stores_xbox_cloud_settings">Настройки на облака</string> + <string name="apps_search_hint">Търсене на приложения</string> + <string name="apps_no_match">Няма приложения, отговарящи на „%1$s“.</string> + <string name="apps_add_widget">Добавяне на приспособление</string> + <string name="apps_widgets_loading">Приспособленията се зареждат…</string> + <string name="apps_widgets_none">Няма приложения с приспособления на това устройство.</string> + <string name="apps_widget_wider">По-широко</string> + <string name="apps_widget_narrower">По-тясно</string> + <string name="apps_widget_taller">По-високо</string> + <string name="apps_widget_shorter">По-ниско</string> + <string name="apps_widget_move_earlier">Преместване по-рано</string> + <string name="apps_widget_move_later">Преместване по-късно</string> + <string name="apps_widget_configure">Настройки на приспособлението</string> + <string name="apps_widget_remove">Премахване на приспособлението</string> + <string name="apps_add_to_folder">Добавяне в папка</string> + <string name="apps_new_folder">Нова папка</string> + <string name="apps_remove_from_folder">Премахване от папката</string> + <string name="apps_app_info">Информация за приложението</string> + <string name="apps_uninstall">Деинсталиране</string> + <string name="apps_folder_rename">Преименуване</string> + <string name="apps_folder_ungroup">Разгрупиране</string> + <string name="apps_folder_default">Папка</string> + <string name="apps_folder_name">Име на папката</string> + <string name="apps_filter">Показване</string> + <string name="apps_filter_all">Всички приложения</string> + <string name="apps_filter_games">Игри</string> + <string name="apps_filter_downloaded">Изтеглени</string> + <string name="apps_filter_system">Системни</string> + <string name="apps_filter_hidden">Скрити</string> + <string name="apps_hide">Скриване</string> + <string name="apps_unhide">Показване в приложенията</string> + <string name="apps_shortcut_remove">Премахване на прекия път</string> + <string name="apps_pin_title">Добавяне към приложенията</string> + <string name="apps_pin_add">Добавяне</string> + <string name="apps_hidden_none">Няма скрити приложения.</string> + <string name="apps_sort_name_asc">Име А–Я</string> + <string name="apps_sort_name_desc">Име Я–А</string> + <string name="apps_sort_installed">Наскоро инсталирани</string> + <string name="apps_sort_updated">Наскоро актуализирани</string> + <plurals name="apps_count"> + <item quantity="one">%d приложение</item> + <item quantity="other">%d приложения</item> + </plurals> </resources> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e0278767d6..b9694894ef 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3153,4 +3153,48 @@ <string name="itch_collections">Kolekce</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Nastavení cloudu</string> + <string name="apps_search_hint">Hledat aplikace</string> + <string name="apps_no_match">Výrazu „%1$s“ neodpovídá žádná aplikace.</string> + <string name="apps_add_widget">Přidat widget</string> + <string name="apps_widgets_loading">Načítání widgetů…</string> + <string name="apps_widgets_none">Žádná aplikace v zařízení nenabízí widgety.</string> + <string name="apps_widget_wider">Širší</string> + <string name="apps_widget_narrower">Užší</string> + <string name="apps_widget_taller">Vyšší</string> + <string name="apps_widget_shorter">Nižší</string> + <string name="apps_widget_move_earlier">Posunout dříve</string> + <string name="apps_widget_move_later">Posunout později</string> + <string name="apps_widget_configure">Nastavení widgetu</string> + <string name="apps_widget_remove">Odebrat widget</string> + <string name="apps_add_to_folder">Přidat do složky</string> + <string name="apps_new_folder">Nová složka</string> + <string name="apps_remove_from_folder">Odebrat ze složky</string> + <string name="apps_app_info">Informace o aplikaci</string> + <string name="apps_uninstall">Odinstalovat</string> + <string name="apps_folder_rename">Přejmenovat</string> + <string name="apps_folder_ungroup">Zrušit složku</string> + <string name="apps_folder_default">Složka</string> + <string name="apps_folder_name">Název složky</string> + <string name="apps_filter">Zobrazit</string> + <string name="apps_filter_all">Všechny aplikace</string> + <string name="apps_filter_games">Hry</string> + <string name="apps_filter_downloaded">Stažené</string> + <string name="apps_filter_system">Systémové</string> + <string name="apps_filter_hidden">Skryté</string> + <string name="apps_hide">Skrýt</string> + <string name="apps_unhide">Zobrazit v aplikacích</string> + <string name="apps_shortcut_remove">Odebrat zkratku</string> + <string name="apps_pin_title">Přidat do aplikací</string> + <string name="apps_pin_add">Přidat</string> + <string name="apps_hidden_none">Žádné skryté aplikace.</string> + <string name="apps_sort_name_asc">Název A–Z</string> + <string name="apps_sort_name_desc">Název Z–A</string> + <string name="apps_sort_installed">Nedávno nainstalované</string> + <string name="apps_sort_updated">Nedávno aktualizované</string> + <plurals name="apps_count"> + <item quantity="one">%d aplikace</item> + <item quantity="few">%d aplikace</item> + <item quantity="many">%d aplikace</item> + <item quantity="other">%d aplikací</item> + </plurals> </resources> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 789cbc762d..af13b452d1 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3085,4 +3085,46 @@ <string name="itch_collections">Samlinger</string> <string name="xbox_filter_cloud">Sky</string> <string name="stores_xbox_cloud_settings">Skyindstillinger</string> + <string name="apps_search_hint">Søg i apps</string> + <string name="apps_no_match">Ingen apps matcher “%1$s”.</string> + <string name="apps_add_widget">Tilføj widget</string> + <string name="apps_widgets_loading">Indlæser widgets…</string> + <string name="apps_widgets_none">Ingen apps på enheden tilbyder widgets.</string> + <string name="apps_widget_wider">Bredere</string> + <string name="apps_widget_narrower">Smallere</string> + <string name="apps_widget_taller">Højere</string> + <string name="apps_widget_shorter">Lavere</string> + <string name="apps_widget_move_earlier">Flyt tidligere</string> + <string name="apps_widget_move_later">Flyt senere</string> + <string name="apps_widget_configure">Widgetindstillinger</string> + <string name="apps_widget_remove">Fjern widget</string> + <string name="apps_add_to_folder">Føj til mappe</string> + <string name="apps_new_folder">Ny mappe</string> + <string name="apps_remove_from_folder">Fjern fra mappe</string> + <string name="apps_app_info">Appinfo</string> + <string name="apps_uninstall">Afinstaller</string> + <string name="apps_folder_rename">Omdøb</string> + <string name="apps_folder_ungroup">Opløs</string> + <string name="apps_folder_default">Mappe</string> + <string name="apps_folder_name">Mappenavn</string> + <string name="apps_filter">Vis</string> + <string name="apps_filter_all">Alle apps</string> + <string name="apps_filter_games">Spil</string> + <string name="apps_filter_downloaded">Downloadet</string> + <string name="apps_filter_system">System</string> + <string name="apps_filter_hidden">Skjulte</string> + <string name="apps_hide">Skjul</string> + <string name="apps_unhide">Vis i apps</string> + <string name="apps_shortcut_remove">Fjern genvej</string> + <string name="apps_pin_title">Føj til Apps</string> + <string name="apps_pin_add">Tilføj</string> + <string name="apps_hidden_none">Ingen skjulte apps.</string> + <string name="apps_sort_name_asc">Navn A–Å</string> + <string name="apps_sort_name_desc">Navn Å–A</string> + <string name="apps_sort_installed">Senest installeret</string> + <string name="apps_sort_updated">Senest opdateret</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="other">%d apps</item> + </plurals> </resources> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1ddc2655d3..9ffcfe1fd0 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3085,4 +3085,46 @@ <string name="itch_collections">Sammlungen</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Cloud-Einstellungen</string> + <string name="apps_search_hint">Apps durchsuchen</string> + <string name="apps_no_match">Keine Apps passen zu „%1$s“.</string> + <string name="apps_add_widget">Widget hinzufügen</string> + <string name="apps_widgets_loading">Widgets werden geladen…</string> + <string name="apps_widgets_none">Keine App auf diesem Gerät bietet Widgets an.</string> + <string name="apps_widget_wider">Breiter</string> + <string name="apps_widget_narrower">Schmaler</string> + <string name="apps_widget_taller">Höher</string> + <string name="apps_widget_shorter">Niedriger</string> + <string name="apps_widget_move_earlier">Nach vorne</string> + <string name="apps_widget_move_later">Nach hinten</string> + <string name="apps_widget_configure">Widget-Einstellungen</string> + <string name="apps_widget_remove">Widget entfernen</string> + <string name="apps_add_to_folder">Zu Ordner hinzufügen</string> + <string name="apps_new_folder">Neuer Ordner</string> + <string name="apps_remove_from_folder">Aus Ordner entfernen</string> + <string name="apps_app_info">App-Info</string> + <string name="apps_uninstall">Deinstallieren</string> + <string name="apps_folder_rename">Umbenennen</string> + <string name="apps_folder_ungroup">Auflösen</string> + <string name="apps_folder_default">Ordner</string> + <string name="apps_folder_name">Ordnername</string> + <string name="apps_filter">Anzeigen</string> + <string name="apps_filter_all">Alle Apps</string> + <string name="apps_filter_games">Spiele</string> + <string name="apps_filter_downloaded">Heruntergeladen</string> + <string name="apps_filter_system">System</string> + <string name="apps_filter_hidden">Ausgeblendet</string> + <string name="apps_hide">Ausblenden</string> + <string name="apps_unhide">In Apps anzeigen</string> + <string name="apps_shortcut_remove">Verknüpfung entfernen</string> + <string name="apps_pin_title">Zu Apps hinzufügen</string> + <string name="apps_pin_add">Hinzufügen</string> + <string name="apps_hidden_none">Keine ausgeblendeten Apps.</string> + <string name="apps_sort_name_asc">Name A–Z</string> + <string name="apps_sort_name_desc">Name Z–A</string> + <string name="apps_sort_installed">Zuletzt installiert</string> + <string name="apps_sort_updated">Zuletzt aktualisiert</string> + <plurals name="apps_count"> + <item quantity="one">%d App</item> + <item quantity="other">%d Apps</item> + </plurals> </resources> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 85e3befcd8..c8588ac9c2 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3085,4 +3085,46 @@ <string name="itch_collections">Συλλογές</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Ρυθμίσεις cloud</string> + <string name="apps_search_hint">Αναζήτηση εφαρμογών</string> + <string name="apps_no_match">Καμία εφαρμογή δεν ταιριάζει με «%1$s».</string> + <string name="apps_add_widget">Προσθήκη γραφικού στοιχείου</string> + <string name="apps_widgets_loading">Φόρτωση γραφικών στοιχείων…</string> + <string name="apps_widgets_none">Καμία εφαρμογή στη συσκευή δεν προσφέρει γραφικά στοιχεία.</string> + <string name="apps_widget_wider">Πλατύτερο</string> + <string name="apps_widget_narrower">Στενότερο</string> + <string name="apps_widget_taller">Ψηλότερο</string> + <string name="apps_widget_shorter">Χαμηλότερο</string> + <string name="apps_widget_move_earlier">Μετακίνηση νωρίτερα</string> + <string name="apps_widget_move_later">Μετακίνηση αργότερα</string> + <string name="apps_widget_configure">Ρυθμίσεις γραφικού στοιχείου</string> + <string name="apps_widget_remove">Αφαίρεση γραφικού στοιχείου</string> + <string name="apps_add_to_folder">Προσθήκη σε φάκελο</string> + <string name="apps_new_folder">Νέος φάκελος</string> + <string name="apps_remove_from_folder">Αφαίρεση από φάκελο</string> + <string name="apps_app_info">Πληροφορίες εφαρμογής</string> + <string name="apps_uninstall">Απεγκατάσταση</string> + <string name="apps_folder_rename">Μετονομασία</string> + <string name="apps_folder_ungroup">Κατάργηση ομάδας</string> + <string name="apps_folder_default">Φάκελος</string> + <string name="apps_folder_name">Όνομα φακέλου</string> + <string name="apps_filter">Εμφάνιση</string> + <string name="apps_filter_all">Όλες οι εφαρμογές</string> + <string name="apps_filter_games">Παιχνίδια</string> + <string name="apps_filter_downloaded">Ληφθείσες</string> + <string name="apps_filter_system">Συστήματος</string> + <string name="apps_filter_hidden">Κρυφές</string> + <string name="apps_hide">Απόκρυψη</string> + <string name="apps_unhide">Εμφάνιση στις εφαρμογές</string> + <string name="apps_shortcut_remove">Αφαίρεση συντόμευσης</string> + <string name="apps_pin_title">Προσθήκη στις Εφαρμογές</string> + <string name="apps_pin_add">Προσθήκη</string> + <string name="apps_hidden_none">Δεν υπάρχουν κρυφές εφαρμογές.</string> + <string name="apps_sort_name_asc">Όνομα Α–Ω</string> + <string name="apps_sort_name_desc">Όνομα Ω–Α</string> + <string name="apps_sort_installed">Πρόσφατα εγκατεστημένες</string> + <string name="apps_sort_updated">Πρόσφατα ενημερωμένες</string> + <plurals name="apps_count"> + <item quantity="one">%d εφαρμογή</item> + <item quantity="other">%d εφαρμογές</item> + </plurals> </resources> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f6d49f6f92..82af913320 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3121,4 +3121,47 @@ <string name="itch_collections">Colecciones</string> <string name="xbox_filter_cloud">Nube</string> <string name="stores_xbox_cloud_settings">Ajustes de nube</string> + <string name="apps_search_hint">Buscar aplicaciones</string> + <string name="apps_no_match">Ninguna aplicación coincide con «%1$s».</string> + <string name="apps_add_widget">Añadir widget</string> + <string name="apps_widgets_loading">Cargando widgets…</string> + <string name="apps_widgets_none">Ninguna aplicación de este dispositivo ofrece widgets.</string> + <string name="apps_widget_wider">Más ancho</string> + <string name="apps_widget_narrower">Más estrecho</string> + <string name="apps_widget_taller">Más alto</string> + <string name="apps_widget_shorter">Más bajo</string> + <string name="apps_widget_move_earlier">Mover antes</string> + <string name="apps_widget_move_later">Mover después</string> + <string name="apps_widget_configure">Ajustes del widget</string> + <string name="apps_widget_remove">Quitar widget</string> + <string name="apps_add_to_folder">Añadir a carpeta</string> + <string name="apps_new_folder">Carpeta nueva</string> + <string name="apps_remove_from_folder">Quitar de la carpeta</string> + <string name="apps_app_info">Información de la aplicación</string> + <string name="apps_uninstall">Desinstalar</string> + <string name="apps_folder_rename">Cambiar nombre</string> + <string name="apps_folder_ungroup">Desagrupar</string> + <string name="apps_folder_default">Carpeta</string> + <string name="apps_folder_name">Nombre de la carpeta</string> + <string name="apps_filter">Mostrar</string> + <string name="apps_filter_all">Todas las aplicaciones</string> + <string name="apps_filter_games">Juegos</string> + <string name="apps_filter_downloaded">Descargadas</string> + <string name="apps_filter_system">Sistema</string> + <string name="apps_filter_hidden">Ocultas</string> + <string name="apps_hide">Ocultar</string> + <string name="apps_unhide">Mostrar en aplicaciones</string> + <string name="apps_shortcut_remove">Quitar acceso directo</string> + <string name="apps_pin_title">Añadir a Aplicaciones</string> + <string name="apps_pin_add">Añadir</string> + <string name="apps_hidden_none">No hay aplicaciones ocultas.</string> + <string name="apps_sort_name_asc">Nombre A–Z</string> + <string name="apps_sort_name_desc">Nombre Z–A</string> + <string name="apps_sort_installed">Instaladas recientemente</string> + <string name="apps_sort_updated">Actualizadas recientemente</string> + <plurals name="apps_count"> + <item quantity="one">%d aplicación</item> + <item quantity="many">%d aplicaciones</item> + <item quantity="other">%d aplicaciones</item> + </plurals> </resources> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 79737e2e0f..3ad1e92476 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3085,4 +3085,46 @@ <string name="itch_collections">Kokoelmat</string> <string name="xbox_filter_cloud">Pilvi</string> <string name="stores_xbox_cloud_settings">Pilviasetukset</string> + <string name="apps_search_hint">Hae sovelluksia</string> + <string name="apps_no_match">Mikään sovellus ei vastaa hakua ”%1$s”.</string> + <string name="apps_add_widget">Lisää widget</string> + <string name="apps_widgets_loading">Ladataan widgettejä…</string> + <string name="apps_widgets_none">Mikään tämän laitteen sovellus ei tarjoa widgettejä.</string> + <string name="apps_widget_wider">Leveämpi</string> + <string name="apps_widget_narrower">Kapeampi</string> + <string name="apps_widget_taller">Korkeampi</string> + <string name="apps_widget_shorter">Matalampi</string> + <string name="apps_widget_move_earlier">Siirrä aiemmaksi</string> + <string name="apps_widget_move_later">Siirrä myöhemmäksi</string> + <string name="apps_widget_configure">Widgetin asetukset</string> + <string name="apps_widget_remove">Poista widget</string> + <string name="apps_add_to_folder">Lisää kansioon</string> + <string name="apps_new_folder">Uusi kansio</string> + <string name="apps_remove_from_folder">Poista kansiosta</string> + <string name="apps_app_info">Sovelluksen tiedot</string> + <string name="apps_uninstall">Poista asennus</string> + <string name="apps_folder_rename">Nimeä uudelleen</string> + <string name="apps_folder_ungroup">Pura kansio</string> + <string name="apps_folder_default">Kansio</string> + <string name="apps_folder_name">Kansion nimi</string> + <string name="apps_filter">Näytä</string> + <string name="apps_filter_all">Kaikki sovellukset</string> + <string name="apps_filter_games">Pelit</string> + <string name="apps_filter_downloaded">Ladatut</string> + <string name="apps_filter_system">Järjestelmä</string> + <string name="apps_filter_hidden">Piilotetut</string> + <string name="apps_hide">Piilota</string> + <string name="apps_unhide">Näytä sovelluksissa</string> + <string name="apps_shortcut_remove">Poista pikakuvake</string> + <string name="apps_pin_title">Lisää sovelluksiin</string> + <string name="apps_pin_add">Lisää</string> + <string name="apps_hidden_none">Ei piilotettuja sovelluksia.</string> + <string name="apps_sort_name_asc">Nimi A–Ö</string> + <string name="apps_sort_name_desc">Nimi Ö–A</string> + <string name="apps_sort_installed">Äskettäin asennetut</string> + <string name="apps_sort_updated">Äskettäin päivitetyt</string> + <plurals name="apps_count"> + <item quantity="one">%d sovellus</item> + <item quantity="other">%d sovellusta</item> + </plurals> </resources> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 97cb78aa59..ef4fdb8f56 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3121,4 +3121,47 @@ <string name="itch_collections">Collections</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Paramètres cloud</string> + <string name="apps_search_hint">Rechercher des applications</string> + <string name="apps_no_match">Aucune application ne correspond à « %1$s ».</string> + <string name="apps_add_widget">Ajouter un widget</string> + <string name="apps_widgets_loading">Chargement des widgets…</string> + <string name="apps_widgets_none">Aucune application de cet appareil ne propose de widgets.</string> + <string name="apps_widget_wider">Plus large</string> + <string name="apps_widget_narrower">Plus étroit</string> + <string name="apps_widget_taller">Plus haut</string> + <string name="apps_widget_shorter">Moins haut</string> + <string name="apps_widget_move_earlier">Avancer</string> + <string name="apps_widget_move_later">Reculer</string> + <string name="apps_widget_configure">Paramètres du widget</string> + <string name="apps_widget_remove">Retirer le widget</string> + <string name="apps_add_to_folder">Ajouter à un dossier</string> + <string name="apps_new_folder">Nouveau dossier</string> + <string name="apps_remove_from_folder">Retirer du dossier</string> + <string name="apps_app_info">Infos sur l’application</string> + <string name="apps_uninstall">Désinstaller</string> + <string name="apps_folder_rename">Renommer</string> + <string name="apps_folder_ungroup">Dégrouper</string> + <string name="apps_folder_default">Dossier</string> + <string name="apps_folder_name">Nom du dossier</string> + <string name="apps_filter">Afficher</string> + <string name="apps_filter_all">Toutes les applications</string> + <string name="apps_filter_games">Jeux</string> + <string name="apps_filter_downloaded">Téléchargées</string> + <string name="apps_filter_system">Système</string> + <string name="apps_filter_hidden">Masquées</string> + <string name="apps_hide">Masquer</string> + <string name="apps_unhide">Afficher dans les applications</string> + <string name="apps_shortcut_remove">Retirer le raccourci</string> + <string name="apps_pin_title">Ajouter aux applications</string> + <string name="apps_pin_add">Ajouter</string> + <string name="apps_hidden_none">Aucune application masquée.</string> + <string name="apps_sort_name_asc">Nom A–Z</string> + <string name="apps_sort_name_desc">Nom Z–A</string> + <string name="apps_sort_installed">Installées récemment</string> + <string name="apps_sort_updated">Mises à jour récemment</string> + <plurals name="apps_count"> + <item quantity="one">%d application</item> + <item quantity="many">%d applications</item> + <item quantity="other">%d applications</item> + </plurals> </resources> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index a1edf261e0..ea458fa238 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3085,4 +3085,46 @@ <string name="itch_collections">संग्रह</string> <string name="xbox_filter_cloud">क्लाउड</string> <string name="stores_xbox_cloud_settings">क्लाउड सेटिंग्स</string> + <string name="apps_search_hint">ऐप खोजें</string> + <string name="apps_no_match">“%1$s” से कोई ऐप मेल नहीं खाता।</string> + <string name="apps_add_widget">विजेट जोड़ें</string> + <string name="apps_widgets_loading">विजेट लोड हो रहे हैं…</string> + <string name="apps_widgets_none">इस डिवाइस पर कोई ऐप विजेट नहीं देता।</string> + <string name="apps_widget_wider">चौड़ा</string> + <string name="apps_widget_narrower">पतला</string> + <string name="apps_widget_taller">लंबा</string> + <string name="apps_widget_shorter">छोटा</string> + <string name="apps_widget_move_earlier">पहले ले जाएँ</string> + <string name="apps_widget_move_later">बाद में ले जाएँ</string> + <string name="apps_widget_configure">विजेट सेटिंग</string> + <string name="apps_widget_remove">विजेट हटाएँ</string> + <string name="apps_add_to_folder">फ़ोल्डर में जोड़ें</string> + <string name="apps_new_folder">नया फ़ोल्डर</string> + <string name="apps_remove_from_folder">फ़ोल्डर से हटाएँ</string> + <string name="apps_app_info">ऐप की जानकारी</string> + <string name="apps_uninstall">अनइंस्टॉल करें</string> + <string name="apps_folder_rename">नाम बदलें</string> + <string name="apps_folder_ungroup">समूह तोड़ें</string> + <string name="apps_folder_default">फ़ोल्डर</string> + <string name="apps_folder_name">फ़ोल्डर का नाम</string> + <string name="apps_filter">दिखाएँ</string> + <string name="apps_filter_all">सभी ऐप</string> + <string name="apps_filter_games">गेम</string> + <string name="apps_filter_downloaded">डाउनलोड किए गए</string> + <string name="apps_filter_system">सिस्टम</string> + <string name="apps_filter_hidden">छिपे हुए</string> + <string name="apps_hide">छिपाएँ</string> + <string name="apps_unhide">ऐप में दिखाएँ</string> + <string name="apps_shortcut_remove">शॉर्टकट हटाएँ</string> + <string name="apps_pin_title">ऐप में जोड़ें</string> + <string name="apps_pin_add">जोड़ें</string> + <string name="apps_hidden_none">कोई छिपा हुआ ऐप नहीं।</string> + <string name="apps_sort_name_asc">नाम A–Z</string> + <string name="apps_sort_name_desc">नाम Z–A</string> + <string name="apps_sort_installed">हाल ही में इंस्टॉल किए गए</string> + <string name="apps_sort_updated">हाल ही में अपडेट किए गए</string> + <plurals name="apps_count"> + <item quantity="one">%d ऐप</item> + <item quantity="other">%d ऐप</item> + </plurals> </resources> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 747b7ed5c1..8d8f2774de 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3085,4 +3085,46 @@ <string name="itch_collections">Gyűjtemények</string> <string name="xbox_filter_cloud">Felhő</string> <string name="stores_xbox_cloud_settings">Felhőbeállítások</string> + <string name="apps_search_hint">Alkalmazások keresése</string> + <string name="apps_no_match">Egy alkalmazás sem felel meg ennek: „%1$s”.</string> + <string name="apps_add_widget">Modul hozzáadása</string> + <string name="apps_widgets_loading">Modulok betöltése…</string> + <string name="apps_widgets_none">Az eszközön egyik alkalmazás sem kínál modult.</string> + <string name="apps_widget_wider">Szélesebb</string> + <string name="apps_widget_narrower">Keskenyebb</string> + <string name="apps_widget_taller">Magasabb</string> + <string name="apps_widget_shorter">Alacsonyabb</string> + <string name="apps_widget_move_earlier">Előrébb</string> + <string name="apps_widget_move_later">Hátrébb</string> + <string name="apps_widget_configure">Modulbeállítások</string> + <string name="apps_widget_remove">Modul eltávolítása</string> + <string name="apps_add_to_folder">Hozzáadás mappához</string> + <string name="apps_new_folder">Új mappa</string> + <string name="apps_remove_from_folder">Eltávolítás a mappából</string> + <string name="apps_app_info">Alkalmazásinformáció</string> + <string name="apps_uninstall">Eltávolítás</string> + <string name="apps_folder_rename">Átnevezés</string> + <string name="apps_folder_ungroup">Szétbontás</string> + <string name="apps_folder_default">Mappa</string> + <string name="apps_folder_name">Mappa neve</string> + <string name="apps_filter">Megjelenítés</string> + <string name="apps_filter_all">Összes alkalmazás</string> + <string name="apps_filter_games">Játékok</string> + <string name="apps_filter_downloaded">Letöltött</string> + <string name="apps_filter_system">Rendszer</string> + <string name="apps_filter_hidden">Rejtett</string> + <string name="apps_hide">Elrejtés</string> + <string name="apps_unhide">Megjelenítés az alkalmazások között</string> + <string name="apps_shortcut_remove">Parancsikon eltávolítása</string> + <string name="apps_pin_title">Hozzáadás az alkalmazásokhoz</string> + <string name="apps_pin_add">Hozzáadás</string> + <string name="apps_hidden_none">Nincsenek rejtett alkalmazások.</string> + <string name="apps_sort_name_asc">Név A–Z</string> + <string name="apps_sort_name_desc">Név Z–A</string> + <string name="apps_sort_installed">Nemrég telepített</string> + <string name="apps_sort_updated">Nemrég frissített</string> + <plurals name="apps_count"> + <item quantity="one">%d alkalmazás</item> + <item quantity="other">%d alkalmazás</item> + </plurals> </resources> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 79291d8e70..c0c4fa21fe 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3075,4 +3075,45 @@ <string name="itch_collections">Koleksi</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Pengaturan cloud</string> + <string name="apps_search_hint">Cari aplikasi</string> + <string name="apps_no_match">Tidak ada aplikasi yang cocok dengan “%1$s”.</string> + <string name="apps_add_widget">Tambahkan widget</string> + <string name="apps_widgets_loading">Memuat widget…</string> + <string name="apps_widgets_none">Tidak ada aplikasi di perangkat ini yang menyediakan widget.</string> + <string name="apps_widget_wider">Lebih lebar</string> + <string name="apps_widget_narrower">Lebih sempit</string> + <string name="apps_widget_taller">Lebih tinggi</string> + <string name="apps_widget_shorter">Lebih pendek</string> + <string name="apps_widget_move_earlier">Pindahkan ke depan</string> + <string name="apps_widget_move_later">Pindahkan ke belakang</string> + <string name="apps_widget_configure">Setelan widget</string> + <string name="apps_widget_remove">Hapus widget</string> + <string name="apps_add_to_folder">Tambahkan ke folder</string> + <string name="apps_new_folder">Folder baru</string> + <string name="apps_remove_from_folder">Keluarkan dari folder</string> + <string name="apps_app_info">Info aplikasi</string> + <string name="apps_uninstall">Uninstal</string> + <string name="apps_folder_rename">Ganti nama</string> + <string name="apps_folder_ungroup">Pisahkan</string> + <string name="apps_folder_default">Folder</string> + <string name="apps_folder_name">Nama folder</string> + <string name="apps_filter">Tampilkan</string> + <string name="apps_filter_all">Semua aplikasi</string> + <string name="apps_filter_games">Game</string> + <string name="apps_filter_downloaded">Didownload</string> + <string name="apps_filter_system">Sistem</string> + <string name="apps_filter_hidden">Tersembunyi</string> + <string name="apps_hide">Sembunyikan</string> + <string name="apps_unhide">Tampilkan di aplikasi</string> + <string name="apps_shortcut_remove">Hapus pintasan</string> + <string name="apps_pin_title">Tambahkan ke Aplikasi</string> + <string name="apps_pin_add">Tambahkan</string> + <string name="apps_hidden_none">Tidak ada aplikasi tersembunyi.</string> + <string name="apps_sort_name_asc">Nama A–Z</string> + <string name="apps_sort_name_desc">Nama Z–A</string> + <string name="apps_sort_installed">Baru diinstal</string> + <string name="apps_sort_updated">Baru diperbarui</string> + <plurals name="apps_count"> + <item quantity="other">%d aplikasi</item> + </plurals> </resources> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index bbe5351461..c20bdc1513 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3119,4 +3119,47 @@ <string name="itch_collections">Raccolte</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Impostazioni cloud</string> + <string name="apps_search_hint">Cerca app</string> + <string name="apps_no_match">Nessuna app corrisponde a «%1$s».</string> + <string name="apps_add_widget">Aggiungi widget</string> + <string name="apps_widgets_loading">Caricamento widget…</string> + <string name="apps_widgets_none">Nessuna app su questo dispositivo offre widget.</string> + <string name="apps_widget_wider">Più largo</string> + <string name="apps_widget_narrower">Più stretto</string> + <string name="apps_widget_taller">Più alto</string> + <string name="apps_widget_shorter">Più basso</string> + <string name="apps_widget_move_earlier">Sposta prima</string> + <string name="apps_widget_move_later">Sposta dopo</string> + <string name="apps_widget_configure">Impostazioni widget</string> + <string name="apps_widget_remove">Rimuovi widget</string> + <string name="apps_add_to_folder">Aggiungi a cartella</string> + <string name="apps_new_folder">Nuova cartella</string> + <string name="apps_remove_from_folder">Rimuovi dalla cartella</string> + <string name="apps_app_info">Info app</string> + <string name="apps_uninstall">Disinstalla</string> + <string name="apps_folder_rename">Rinomina</string> + <string name="apps_folder_ungroup">Separa</string> + <string name="apps_folder_default">Cartella</string> + <string name="apps_folder_name">Nome cartella</string> + <string name="apps_filter">Mostra</string> + <string name="apps_filter_all">Tutte le app</string> + <string name="apps_filter_games">Giochi</string> + <string name="apps_filter_downloaded">Scaricate</string> + <string name="apps_filter_system">Sistema</string> + <string name="apps_filter_hidden">Nascoste</string> + <string name="apps_hide">Nascondi</string> + <string name="apps_unhide">Mostra nelle app</string> + <string name="apps_shortcut_remove">Rimuovi scorciatoia</string> + <string name="apps_pin_title">Aggiungi ad App</string> + <string name="apps_pin_add">Aggiungi</string> + <string name="apps_hidden_none">Nessuna app nascosta.</string> + <string name="apps_sort_name_asc">Nome A–Z</string> + <string name="apps_sort_name_desc">Nome Z–A</string> + <string name="apps_sort_installed">Installate di recente</string> + <string name="apps_sort_updated">Aggiornate di recente</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="many">%d app</item> + <item quantity="other">%d app</item> + </plurals> </resources> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 19f6dbfaee..87a910caef 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3062,4 +3062,45 @@ <string name="itch_collections">コレクション</string> <string name="xbox_filter_cloud">クラウド</string> <string name="stores_xbox_cloud_settings">クラウド設定</string> + <string name="apps_search_hint">アプリを検索</string> + <string name="apps_no_match">「%1$s」に一致するアプリはありません。</string> + <string name="apps_add_widget">ウィジェットを追加</string> + <string name="apps_widgets_loading">ウィジェットを読み込み中…</string> + <string name="apps_widgets_none">このデバイスにはウィジェットを提供するアプリがありません。</string> + <string name="apps_widget_wider">幅を広く</string> + <string name="apps_widget_narrower">幅を狭く</string> + <string name="apps_widget_taller">高く</string> + <string name="apps_widget_shorter">低く</string> + <string name="apps_widget_move_earlier">前へ移動</string> + <string name="apps_widget_move_later">後ろへ移動</string> + <string name="apps_widget_configure">ウィジェットの設定</string> + <string name="apps_widget_remove">ウィジェットを削除</string> + <string name="apps_add_to_folder">フォルダに追加</string> + <string name="apps_new_folder">新しいフォルダ</string> + <string name="apps_remove_from_folder">フォルダから削除</string> + <string name="apps_app_info">アプリ情報</string> + <string name="apps_uninstall">アンインストール</string> + <string name="apps_folder_rename">名前を変更</string> + <string name="apps_folder_ungroup">グループを解除</string> + <string name="apps_folder_default">フォルダ</string> + <string name="apps_folder_name">フォルダ名</string> + <string name="apps_filter">表示</string> + <string name="apps_filter_all">すべてのアプリ</string> + <string name="apps_filter_games">ゲーム</string> + <string name="apps_filter_downloaded">ダウンロード済み</string> + <string name="apps_filter_system">システム</string> + <string name="apps_filter_hidden">非表示</string> + <string name="apps_hide">非表示にする</string> + <string name="apps_unhide">アプリに表示</string> + <string name="apps_shortcut_remove">ショートカットを削除</string> + <string name="apps_pin_title">アプリに追加</string> + <string name="apps_pin_add">追加</string> + <string name="apps_hidden_none">非表示のアプリはありません。</string> + <string name="apps_sort_name_asc">名前 A–Z</string> + <string name="apps_sort_name_desc">名前 Z–A</string> + <string name="apps_sort_installed">最近インストール</string> + <string name="apps_sort_updated">最近更新</string> + <plurals name="apps_count"> + <item quantity="other">%d 個のアプリ</item> + </plurals> </resources> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 9163a3a7d7..10d6fd46dc 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3062,4 +3062,45 @@ <string name="itch_collections">컬렉션</string> <string name="xbox_filter_cloud">클라우드</string> <string name="stores_xbox_cloud_settings">클라우드 설정</string> + <string name="apps_search_hint">앱 검색</string> + <string name="apps_no_match">‘%1$s’와(과) 일치하는 앱이 없습니다.</string> + <string name="apps_add_widget">위젯 추가</string> + <string name="apps_widgets_loading">위젯 불러오는 중…</string> + <string name="apps_widgets_none">이 기기에 위젯을 제공하는 앱이 없습니다.</string> + <string name="apps_widget_wider">더 넓게</string> + <string name="apps_widget_narrower">더 좁게</string> + <string name="apps_widget_taller">더 높게</string> + <string name="apps_widget_shorter">더 낮게</string> + <string name="apps_widget_move_earlier">앞으로 이동</string> + <string name="apps_widget_move_later">뒤로 이동</string> + <string name="apps_widget_configure">위젯 설정</string> + <string name="apps_widget_remove">위젯 삭제</string> + <string name="apps_add_to_folder">폴더에 추가</string> + <string name="apps_new_folder">새 폴더</string> + <string name="apps_remove_from_folder">폴더에서 제거</string> + <string name="apps_app_info">앱 정보</string> + <string name="apps_uninstall">제거</string> + <string name="apps_folder_rename">이름 변경</string> + <string name="apps_folder_ungroup">그룹 해제</string> + <string name="apps_folder_default">폴더</string> + <string name="apps_folder_name">폴더 이름</string> + <string name="apps_filter">표시</string> + <string name="apps_filter_all">모든 앱</string> + <string name="apps_filter_games">게임</string> + <string name="apps_filter_downloaded">다운로드됨</string> + <string name="apps_filter_system">시스템</string> + <string name="apps_filter_hidden">숨김</string> + <string name="apps_hide">숨기기</string> + <string name="apps_unhide">앱에 표시</string> + <string name="apps_shortcut_remove">바로가기 삭제</string> + <string name="apps_pin_title">앱에 추가</string> + <string name="apps_pin_add">추가</string> + <string name="apps_hidden_none">숨긴 앱이 없습니다.</string> + <string name="apps_sort_name_asc">이름 A–Z</string> + <string name="apps_sort_name_desc">이름 Z–A</string> + <string name="apps_sort_installed">최근 설치</string> + <string name="apps_sort_updated">최근 업데이트</string> + <plurals name="apps_count"> + <item quantity="other">앱 %d개</item> + </plurals> </resources> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index eb41beb9b0..098f2429a2 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3060,4 +3060,45 @@ <string name="itch_collections">Koleksi</string> <string name="xbox_filter_cloud">Awan</string> <string name="stores_xbox_cloud_settings">Tetapan awan</string> + <string name="apps_search_hint">Cari apl</string> + <string name="apps_no_match">Tiada apl sepadan dengan “%1$s”.</string> + <string name="apps_add_widget">Tambah widget</string> + <string name="apps_widgets_loading">Memuatkan widget…</string> + <string name="apps_widgets_none">Tiada apl pada peranti ini yang menawarkan widget.</string> + <string name="apps_widget_wider">Lebih lebar</string> + <string name="apps_widget_narrower">Lebih sempit</string> + <string name="apps_widget_taller">Lebih tinggi</string> + <string name="apps_widget_shorter">Lebih rendah</string> + <string name="apps_widget_move_earlier">Alih ke depan</string> + <string name="apps_widget_move_later">Alih ke belakang</string> + <string name="apps_widget_configure">Tetapan widget</string> + <string name="apps_widget_remove">Alih keluar widget</string> + <string name="apps_add_to_folder">Tambah pada folder</string> + <string name="apps_new_folder">Folder baharu</string> + <string name="apps_remove_from_folder">Alih keluar daripada folder</string> + <string name="apps_app_info">Maklumat apl</string> + <string name="apps_uninstall">Nyahpasang</string> + <string name="apps_folder_rename">Namakan semula</string> + <string name="apps_folder_ungroup">Leraikan</string> + <string name="apps_folder_default">Folder</string> + <string name="apps_folder_name">Nama folder</string> + <string name="apps_filter">Tunjukkan</string> + <string name="apps_filter_all">Semua apl</string> + <string name="apps_filter_games">Permainan</string> + <string name="apps_filter_downloaded">Dimuat turun</string> + <string name="apps_filter_system">Sistem</string> + <string name="apps_filter_hidden">Tersembunyi</string> + <string name="apps_hide">Sembunyikan</string> + <string name="apps_unhide">Tunjukkan dalam apl</string> + <string name="apps_shortcut_remove">Alih keluar pintasan</string> + <string name="apps_pin_title">Tambah pada Apl</string> + <string name="apps_pin_add">Tambah</string> + <string name="apps_hidden_none">Tiada apl tersembunyi.</string> + <string name="apps_sort_name_asc">Nama A–Z</string> + <string name="apps_sort_name_desc">Nama Z–A</string> + <string name="apps_sort_installed">Dipasang baru-baru ini</string> + <string name="apps_sort_updated">Dikemas kini baru-baru ini</string> + <plurals name="apps_count"> + <item quantity="other">%d apl</item> + </plurals> </resources> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 75653c225f..e95a57c22b 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3085,4 +3085,46 @@ <string name="itch_collections">Samlinger</string> <string name="xbox_filter_cloud">Sky</string> <string name="stores_xbox_cloud_settings">Skyinnstillinger</string> + <string name="apps_search_hint">Søk i apper</string> + <string name="apps_no_match">Ingen apper samsvarer med «%1$s».</string> + <string name="apps_add_widget">Legg til modul</string> + <string name="apps_widgets_loading">Laster inn moduler…</string> + <string name="apps_widgets_none">Ingen apper på enheten tilbyr moduler.</string> + <string name="apps_widget_wider">Bredere</string> + <string name="apps_widget_narrower">Smalere</string> + <string name="apps_widget_taller">Høyere</string> + <string name="apps_widget_shorter">Lavere</string> + <string name="apps_widget_move_earlier">Flytt tidligere</string> + <string name="apps_widget_move_later">Flytt senere</string> + <string name="apps_widget_configure">Modulinnstillinger</string> + <string name="apps_widget_remove">Fjern modul</string> + <string name="apps_add_to_folder">Legg til i mappe</string> + <string name="apps_new_folder">Ny mappe</string> + <string name="apps_remove_from_folder">Fjern fra mappe</string> + <string name="apps_app_info">Appinfo</string> + <string name="apps_uninstall">Avinstaller</string> + <string name="apps_folder_rename">Gi nytt navn</string> + <string name="apps_folder_ungroup">Løs opp</string> + <string name="apps_folder_default">Mappe</string> + <string name="apps_folder_name">Mappenavn</string> + <string name="apps_filter">Vis</string> + <string name="apps_filter_all">Alle apper</string> + <string name="apps_filter_games">Spill</string> + <string name="apps_filter_downloaded">Nedlastet</string> + <string name="apps_filter_system">System</string> + <string name="apps_filter_hidden">Skjult</string> + <string name="apps_hide">Skjul</string> + <string name="apps_unhide">Vis i apper</string> + <string name="apps_shortcut_remove">Fjern snarvei</string> + <string name="apps_pin_title">Legg til i Apper</string> + <string name="apps_pin_add">Legg til</string> + <string name="apps_hidden_none">Ingen skjulte apper.</string> + <string name="apps_sort_name_asc">Navn A–Å</string> + <string name="apps_sort_name_desc">Navn Å–A</string> + <string name="apps_sort_installed">Nylig installert</string> + <string name="apps_sort_updated">Nylig oppdatert</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="other">%d apper</item> + </plurals> </resources> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 53748c36ab..5cd7fdf36d 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3085,4 +3085,46 @@ <string name="itch_collections">Collecties</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Cloudinstellingen</string> + <string name="apps_search_hint">Apps zoeken</string> + <string name="apps_no_match">Geen apps gevonden voor ‘%1$s’.</string> + <string name="apps_add_widget">Widget toevoegen</string> + <string name="apps_widgets_loading">Widgets laden…</string> + <string name="apps_widgets_none">Geen enkele app op dit apparaat biedt widgets.</string> + <string name="apps_widget_wider">Breder</string> + <string name="apps_widget_narrower">Smaller</string> + <string name="apps_widget_taller">Hoger</string> + <string name="apps_widget_shorter">Lager</string> + <string name="apps_widget_move_earlier">Naar voren</string> + <string name="apps_widget_move_later">Naar achteren</string> + <string name="apps_widget_configure">Widgetinstellingen</string> + <string name="apps_widget_remove">Widget verwijderen</string> + <string name="apps_add_to_folder">Toevoegen aan map</string> + <string name="apps_new_folder">Nieuwe map</string> + <string name="apps_remove_from_folder">Uit map verwijderen</string> + <string name="apps_app_info">App-info</string> + <string name="apps_uninstall">Verwijderen</string> + <string name="apps_folder_rename">Naam wijzigen</string> + <string name="apps_folder_ungroup">Opheffen</string> + <string name="apps_folder_default">Map</string> + <string name="apps_folder_name">Mapnaam</string> + <string name="apps_filter">Tonen</string> + <string name="apps_filter_all">Alle apps</string> + <string name="apps_filter_games">Games</string> + <string name="apps_filter_downloaded">Gedownload</string> + <string name="apps_filter_system">Systeem</string> + <string name="apps_filter_hidden">Verborgen</string> + <string name="apps_hide">Verbergen</string> + <string name="apps_unhide">Tonen in apps</string> + <string name="apps_shortcut_remove">Snelkoppeling verwijderen</string> + <string name="apps_pin_title">Toevoegen aan Apps</string> + <string name="apps_pin_add">Toevoegen</string> + <string name="apps_hidden_none">Geen verborgen apps.</string> + <string name="apps_sort_name_asc">Naam A–Z</string> + <string name="apps_sort_name_desc">Naam Z–A</string> + <string name="apps_sort_installed">Recent geïnstalleerd</string> + <string name="apps_sort_updated">Recent bijgewerkt</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="other">%d apps</item> + </plurals> </resources> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 37619c513a..4e87191fe1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3156,4 +3156,48 @@ <string name="itch_collections">Kolekcje</string> <string name="xbox_filter_cloud">Chmura</string> <string name="stores_xbox_cloud_settings">Ustawienia chmury</string> + <string name="apps_search_hint">Szukaj aplikacji</string> + <string name="apps_no_match">Żadna aplikacja nie pasuje do „%1$s”.</string> + <string name="apps_add_widget">Dodaj widżet</string> + <string name="apps_widgets_loading">Wczytywanie widżetów…</string> + <string name="apps_widgets_none">Żadna aplikacja na tym urządzeniu nie oferuje widżetów.</string> + <string name="apps_widget_wider">Szerszy</string> + <string name="apps_widget_narrower">Węższy</string> + <string name="apps_widget_taller">Wyższy</string> + <string name="apps_widget_shorter">Niższy</string> + <string name="apps_widget_move_earlier">Przesuń wcześniej</string> + <string name="apps_widget_move_later">Przesuń później</string> + <string name="apps_widget_configure">Ustawienia widżetu</string> + <string name="apps_widget_remove">Usuń widżet</string> + <string name="apps_add_to_folder">Dodaj do folderu</string> + <string name="apps_new_folder">Nowy folder</string> + <string name="apps_remove_from_folder">Usuń z folderu</string> + <string name="apps_app_info">Informacje o aplikacji</string> + <string name="apps_uninstall">Odinstaluj</string> + <string name="apps_folder_rename">Zmień nazwę</string> + <string name="apps_folder_ungroup">Rozgrupuj</string> + <string name="apps_folder_default">Folder</string> + <string name="apps_folder_name">Nazwa folderu</string> + <string name="apps_filter">Pokaż</string> + <string name="apps_filter_all">Wszystkie aplikacje</string> + <string name="apps_filter_games">Gry</string> + <string name="apps_filter_downloaded">Pobrane</string> + <string name="apps_filter_system">Systemowe</string> + <string name="apps_filter_hidden">Ukryte</string> + <string name="apps_hide">Ukryj</string> + <string name="apps_unhide">Pokaż w aplikacjach</string> + <string name="apps_shortcut_remove">Usuń skrót</string> + <string name="apps_pin_title">Dodaj do aplikacji</string> + <string name="apps_pin_add">Dodaj</string> + <string name="apps_hidden_none">Brak ukrytych aplikacji.</string> + <string name="apps_sort_name_asc">Nazwa A–Z</string> + <string name="apps_sort_name_desc">Nazwa Z–A</string> + <string name="apps_sort_installed">Ostatnio zainstalowane</string> + <string name="apps_sort_updated">Ostatnio zaktualizowane</string> + <plurals name="apps_count"> + <item quantity="one">%d aplikacja</item> + <item quantity="few">%d aplikacje</item> + <item quantity="many">%d aplikacji</item> + <item quantity="other">%d aplikacji</item> + </plurals> </resources> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 177799c1a2..ceac1c5343 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3119,4 +3119,47 @@ <string name="itch_collections">Coleções</string> <string name="xbox_filter_cloud">Nuvem</string> <string name="stores_xbox_cloud_settings">Definições da nuvem</string> + <string name="apps_search_hint">Pesquisar aplicações</string> + <string name="apps_no_match">Nenhuma aplicação corresponde a “%1$s”.</string> + <string name="apps_add_widget">Adicionar widget</string> + <string name="apps_widgets_loading">A carregar widgets…</string> + <string name="apps_widgets_none">Nenhuma aplicação neste dispositivo oferece widgets.</string> + <string name="apps_widget_wider">Mais largo</string> + <string name="apps_widget_narrower">Mais estreito</string> + <string name="apps_widget_taller">Mais alto</string> + <string name="apps_widget_shorter">Mais baixo</string> + <string name="apps_widget_move_earlier">Mover para antes</string> + <string name="apps_widget_move_later">Mover para depois</string> + <string name="apps_widget_configure">Definições do widget</string> + <string name="apps_widget_remove">Remover widget</string> + <string name="apps_add_to_folder">Adicionar a pasta</string> + <string name="apps_new_folder">Nova pasta</string> + <string name="apps_remove_from_folder">Remover da pasta</string> + <string name="apps_app_info">Informações da aplicação</string> + <string name="apps_uninstall">Desinstalar</string> + <string name="apps_folder_rename">Mudar o nome</string> + <string name="apps_folder_ungroup">Desagrupar</string> + <string name="apps_folder_default">Pasta</string> + <string name="apps_folder_name">Nome da pasta</string> + <string name="apps_filter">Mostrar</string> + <string name="apps_filter_all">Todas as aplicações</string> + <string name="apps_filter_games">Jogos</string> + <string name="apps_filter_downloaded">Transferidas</string> + <string name="apps_filter_system">Sistema</string> + <string name="apps_filter_hidden">Ocultas</string> + <string name="apps_hide">Ocultar</string> + <string name="apps_unhide">Mostrar nas aplicações</string> + <string name="apps_shortcut_remove">Remover atalho</string> + <string name="apps_pin_title">Adicionar às Aplicações</string> + <string name="apps_pin_add">Adicionar</string> + <string name="apps_hidden_none">Nenhuma aplicação oculta.</string> + <string name="apps_sort_name_asc">Nome A–Z</string> + <string name="apps_sort_name_desc">Nome Z–A</string> + <string name="apps_sort_installed">Instaladas recentemente</string> + <string name="apps_sort_updated">Atualizadas recentemente</string> + <plurals name="apps_count"> + <item quantity="one">%d aplicação</item> + <item quantity="many">%d aplicações</item> + <item quantity="other">%d aplicações</item> + </plurals> </resources> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2bdda9aacd..825ef7b95d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3119,4 +3119,47 @@ <string name="itch_collections">Coleções</string> <string name="xbox_filter_cloud">Nuvem</string> <string name="stores_xbox_cloud_settings">Configurações da nuvem</string> + <string name="apps_search_hint">Pesquisar apps</string> + <string name="apps_no_match">Nenhum app corresponde a “%1$s”.</string> + <string name="apps_add_widget">Adicionar widget</string> + <string name="apps_widgets_loading">Carregando widgets…</string> + <string name="apps_widgets_none">Nenhum app neste dispositivo oferece widgets.</string> + <string name="apps_widget_wider">Mais largo</string> + <string name="apps_widget_narrower">Mais estreito</string> + <string name="apps_widget_taller">Mais alto</string> + <string name="apps_widget_shorter">Mais baixo</string> + <string name="apps_widget_move_earlier">Mover para antes</string> + <string name="apps_widget_move_later">Mover para depois</string> + <string name="apps_widget_configure">Configurações do widget</string> + <string name="apps_widget_remove">Remover widget</string> + <string name="apps_add_to_folder">Adicionar à pasta</string> + <string name="apps_new_folder">Nova pasta</string> + <string name="apps_remove_from_folder">Remover da pasta</string> + <string name="apps_app_info">Informações do app</string> + <string name="apps_uninstall">Desinstalar</string> + <string name="apps_folder_rename">Renomear</string> + <string name="apps_folder_ungroup">Desagrupar</string> + <string name="apps_folder_default">Pasta</string> + <string name="apps_folder_name">Nome da pasta</string> + <string name="apps_filter">Mostrar</string> + <string name="apps_filter_all">Todos os apps</string> + <string name="apps_filter_games">Jogos</string> + <string name="apps_filter_downloaded">Baixados</string> + <string name="apps_filter_system">Sistema</string> + <string name="apps_filter_hidden">Ocultos</string> + <string name="apps_hide">Ocultar</string> + <string name="apps_unhide">Mostrar nos apps</string> + <string name="apps_shortcut_remove">Remover atalho</string> + <string name="apps_pin_title">Adicionar aos Apps</string> + <string name="apps_pin_add">Adicionar</string> + <string name="apps_hidden_none">Nenhum app oculto.</string> + <string name="apps_sort_name_asc">Nome A–Z</string> + <string name="apps_sort_name_desc">Nome Z–A</string> + <string name="apps_sort_installed">Instalados recentemente</string> + <string name="apps_sort_updated">Atualizados recentemente</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="many">%d apps</item> + <item quantity="other">%d apps</item> + </plurals> </resources> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 49a0503c69..b95ef48573 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3119,4 +3119,47 @@ <string name="itch_collections">Colecții</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Setări cloud</string> + <string name="apps_search_hint">Caută aplicații</string> + <string name="apps_no_match">Nicio aplicație nu se potrivește cu „%1$s”.</string> + <string name="apps_add_widget">Adaugă widget</string> + <string name="apps_widgets_loading">Se încarcă widgeturile…</string> + <string name="apps_widgets_none">Nicio aplicație de pe acest dispozitiv nu oferă widgeturi.</string> + <string name="apps_widget_wider">Mai lat</string> + <string name="apps_widget_narrower">Mai îngust</string> + <string name="apps_widget_taller">Mai înalt</string> + <string name="apps_widget_shorter">Mai scund</string> + <string name="apps_widget_move_earlier">Mută mai devreme</string> + <string name="apps_widget_move_later">Mută mai târziu</string> + <string name="apps_widget_configure">Setări widget</string> + <string name="apps_widget_remove">Elimină widgetul</string> + <string name="apps_add_to_folder">Adaugă în dosar</string> + <string name="apps_new_folder">Dosar nou</string> + <string name="apps_remove_from_folder">Elimină din dosar</string> + <string name="apps_app_info">Informații despre aplicație</string> + <string name="apps_uninstall">Dezinstalează</string> + <string name="apps_folder_rename">Redenumește</string> + <string name="apps_folder_ungroup">Degrupează</string> + <string name="apps_folder_default">Dosar</string> + <string name="apps_folder_name">Numele dosarului</string> + <string name="apps_filter">Afișează</string> + <string name="apps_filter_all">Toate aplicațiile</string> + <string name="apps_filter_games">Jocuri</string> + <string name="apps_filter_downloaded">Descărcate</string> + <string name="apps_filter_system">Sistem</string> + <string name="apps_filter_hidden">Ascunse</string> + <string name="apps_hide">Ascunde</string> + <string name="apps_unhide">Afișează în aplicații</string> + <string name="apps_shortcut_remove">Elimină comanda rapidă</string> + <string name="apps_pin_title">Adaugă în Aplicații</string> + <string name="apps_pin_add">Adaugă</string> + <string name="apps_hidden_none">Nicio aplicație ascunsă.</string> + <string name="apps_sort_name_asc">Nume A–Z</string> + <string name="apps_sort_name_desc">Nume Z–A</string> + <string name="apps_sort_installed">Instalate recent</string> + <string name="apps_sort_updated">Actualizate recent</string> + <plurals name="apps_count"> + <item quantity="one">%d aplicație</item> + <item quantity="few">%d aplicații</item> + <item quantity="other">%d de aplicații</item> + </plurals> </resources> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b4d440f2c9..483d86ab5a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3155,4 +3155,48 @@ <string name="itch_collections">Коллекции</string> <string name="xbox_filter_cloud">Облако</string> <string name="stores_xbox_cloud_settings">Настройки облака</string> + <string name="apps_search_hint">Поиск приложений</string> + <string name="apps_no_match">Нет приложений по запросу «%1$s».</string> + <string name="apps_add_widget">Добавить виджет</string> + <string name="apps_widgets_loading">Загрузка виджетов…</string> + <string name="apps_widgets_none">На этом устройстве нет приложений с виджетами.</string> + <string name="apps_widget_wider">Шире</string> + <string name="apps_widget_narrower">Уже</string> + <string name="apps_widget_taller">Выше</string> + <string name="apps_widget_shorter">Ниже</string> + <string name="apps_widget_move_earlier">Переместить раньше</string> + <string name="apps_widget_move_later">Переместить позже</string> + <string name="apps_widget_configure">Настройки виджета</string> + <string name="apps_widget_remove">Удалить виджет</string> + <string name="apps_add_to_folder">Добавить в папку</string> + <string name="apps_new_folder">Новая папка</string> + <string name="apps_remove_from_folder">Убрать из папки</string> + <string name="apps_app_info">О приложении</string> + <string name="apps_uninstall">Удалить</string> + <string name="apps_folder_rename">Переименовать</string> + <string name="apps_folder_ungroup">Разгруппировать</string> + <string name="apps_folder_default">Папка</string> + <string name="apps_folder_name">Название папки</string> + <string name="apps_filter">Показать</string> + <string name="apps_filter_all">Все приложения</string> + <string name="apps_filter_games">Игры</string> + <string name="apps_filter_downloaded">Загруженные</string> + <string name="apps_filter_system">Системные</string> + <string name="apps_filter_hidden">Скрытые</string> + <string name="apps_hide">Скрыть</string> + <string name="apps_unhide">Показывать в приложениях</string> + <string name="apps_shortcut_remove">Удалить ярлык</string> + <string name="apps_pin_title">Добавить в приложения</string> + <string name="apps_pin_add">Добавить</string> + <string name="apps_hidden_none">Скрытых приложений нет.</string> + <string name="apps_sort_name_asc">Название А–Я</string> + <string name="apps_sort_name_desc">Название Я–А</string> + <string name="apps_sort_installed">Недавно установленные</string> + <string name="apps_sort_updated">Недавно обновлённые</string> + <plurals name="apps_count"> + <item quantity="one">%d приложение</item> + <item quantity="few">%d приложения</item> + <item quantity="many">%d приложений</item> + <item quantity="other">%d приложения</item> + </plurals> </resources> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 35c26e8f21..72c27705b9 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3085,4 +3085,46 @@ <string name="itch_collections">Samlingar</string> <string name="xbox_filter_cloud">Moln</string> <string name="stores_xbox_cloud_settings">Molninställningar</string> + <string name="apps_search_hint">Sök appar</string> + <string name="apps_no_match">Inga appar matchar ”%1$s”.</string> + <string name="apps_add_widget">Lägg till widget</string> + <string name="apps_widgets_loading">Läser in widgetar…</string> + <string name="apps_widgets_none">Inga appar på enheten erbjuder widgetar.</string> + <string name="apps_widget_wider">Bredare</string> + <string name="apps_widget_narrower">Smalare</string> + <string name="apps_widget_taller">Högre</string> + <string name="apps_widget_shorter">Lägre</string> + <string name="apps_widget_move_earlier">Flytta tidigare</string> + <string name="apps_widget_move_later">Flytta senare</string> + <string name="apps_widget_configure">Widgetinställningar</string> + <string name="apps_widget_remove">Ta bort widget</string> + <string name="apps_add_to_folder">Lägg till i mapp</string> + <string name="apps_new_folder">Ny mapp</string> + <string name="apps_remove_from_folder">Ta bort från mapp</string> + <string name="apps_app_info">Appinfo</string> + <string name="apps_uninstall">Avinstallera</string> + <string name="apps_folder_rename">Byt namn</string> + <string name="apps_folder_ungroup">Dela upp</string> + <string name="apps_folder_default">Mapp</string> + <string name="apps_folder_name">Mappnamn</string> + <string name="apps_filter">Visa</string> + <string name="apps_filter_all">Alla appar</string> + <string name="apps_filter_games">Spel</string> + <string name="apps_filter_downloaded">Nedladdade</string> + <string name="apps_filter_system">System</string> + <string name="apps_filter_hidden">Dolda</string> + <string name="apps_hide">Dölj</string> + <string name="apps_unhide">Visa i appar</string> + <string name="apps_shortcut_remove">Ta bort genväg</string> + <string name="apps_pin_title">Lägg till i Appar</string> + <string name="apps_pin_add">Lägg till</string> + <string name="apps_hidden_none">Inga dolda appar.</string> + <string name="apps_sort_name_asc">Namn A–Ö</string> + <string name="apps_sort_name_desc">Namn Ö–A</string> + <string name="apps_sort_installed">Senast installerade</string> + <string name="apps_sort_updated">Senast uppdaterade</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="other">%d appar</item> + </plurals> </resources> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 348740686b..9cdb0a55b3 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3060,4 +3060,45 @@ <string name="itch_collections">คอลเลกชัน</string> <string name="xbox_filter_cloud">คลาวด์</string> <string name="stores_xbox_cloud_settings">การตั้งค่าคลาวด์</string> + <string name="apps_search_hint">ค้นหาแอป</string> + <string name="apps_no_match">ไม่มีแอปที่ตรงกับ “%1$s”</string> + <string name="apps_add_widget">เพิ่มวิดเจ็ต</string> + <string name="apps_widgets_loading">กำลังโหลดวิดเจ็ต…</string> + <string name="apps_widgets_none">ไม่มีแอปในอุปกรณ์นี้ที่มีวิดเจ็ต</string> + <string name="apps_widget_wider">กว้างขึ้น</string> + <string name="apps_widget_narrower">แคบลง</string> + <string name="apps_widget_taller">สูงขึ้น</string> + <string name="apps_widget_shorter">เตี้ยลง</string> + <string name="apps_widget_move_earlier">ย้ายไปก่อน</string> + <string name="apps_widget_move_later">ย้ายไปหลัง</string> + <string name="apps_widget_configure">การตั้งค่าวิดเจ็ต</string> + <string name="apps_widget_remove">นำวิดเจ็ตออก</string> + <string name="apps_add_to_folder">เพิ่มลงในโฟลเดอร์</string> + <string name="apps_new_folder">โฟลเดอร์ใหม่</string> + <string name="apps_remove_from_folder">นำออกจากโฟลเดอร์</string> + <string name="apps_app_info">ข้อมูลแอป</string> + <string name="apps_uninstall">ถอนการติดตั้ง</string> + <string name="apps_folder_rename">เปลี่ยนชื่อ</string> + <string name="apps_folder_ungroup">ยกเลิกกลุ่ม</string> + <string name="apps_folder_default">โฟลเดอร์</string> + <string name="apps_folder_name">ชื่อโฟลเดอร์</string> + <string name="apps_filter">แสดง</string> + <string name="apps_filter_all">แอปทั้งหมด</string> + <string name="apps_filter_games">เกม</string> + <string name="apps_filter_downloaded">ที่ดาวน์โหลด</string> + <string name="apps_filter_system">ระบบ</string> + <string name="apps_filter_hidden">ที่ซ่อนไว้</string> + <string name="apps_hide">ซ่อน</string> + <string name="apps_unhide">แสดงในแอป</string> + <string name="apps_shortcut_remove">นำทางลัดออก</string> + <string name="apps_pin_title">เพิ่มลงในแอป</string> + <string name="apps_pin_add">เพิ่ม</string> + <string name="apps_hidden_none">ไม่มีแอปที่ซ่อนไว้</string> + <string name="apps_sort_name_asc">ชื่อ A–Z</string> + <string name="apps_sort_name_desc">ชื่อ Z–A</string> + <string name="apps_sort_installed">ติดตั้งล่าสุด</string> + <string name="apps_sort_updated">อัปเดตล่าสุด</string> + <plurals name="apps_count"> + <item quantity="other">%d แอป</item> + </plurals> </resources> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 78cdc1f700..3dea1e5bc6 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3087,4 +3087,46 @@ <string name="itch_collections">Koleksiyonlar</string> <string name="xbox_filter_cloud">Bulut</string> <string name="stores_xbox_cloud_settings">Bulut ayarları</string> + <string name="apps_search_hint">Uygulama ara</string> + <string name="apps_no_match">“%1$s” ile eşleşen uygulama yok.</string> + <string name="apps_add_widget">Widget ekle</string> + <string name="apps_widgets_loading">Widget’lar yükleniyor…</string> + <string name="apps_widgets_none">Bu cihazdaki hiçbir uygulama widget sunmuyor.</string> + <string name="apps_widget_wider">Daha geniş</string> + <string name="apps_widget_narrower">Daha dar</string> + <string name="apps_widget_taller">Daha uzun</string> + <string name="apps_widget_shorter">Daha kısa</string> + <string name="apps_widget_move_earlier">Öne taşı</string> + <string name="apps_widget_move_later">Arkaya taşı</string> + <string name="apps_widget_configure">Widget ayarları</string> + <string name="apps_widget_remove">Widget’ı kaldır</string> + <string name="apps_add_to_folder">Klasöre ekle</string> + <string name="apps_new_folder">Yeni klasör</string> + <string name="apps_remove_from_folder">Klasörden çıkar</string> + <string name="apps_app_info">Uygulama bilgileri</string> + <string name="apps_uninstall">Kaldır</string> + <string name="apps_folder_rename">Yeniden adlandır</string> + <string name="apps_folder_ungroup">Grubu çöz</string> + <string name="apps_folder_default">Klasör</string> + <string name="apps_folder_name">Klasör adı</string> + <string name="apps_filter">Göster</string> + <string name="apps_filter_all">Tüm uygulamalar</string> + <string name="apps_filter_games">Oyunlar</string> + <string name="apps_filter_downloaded">İndirilenler</string> + <string name="apps_filter_system">Sistem</string> + <string name="apps_filter_hidden">Gizli</string> + <string name="apps_hide">Gizle</string> + <string name="apps_unhide">Uygulamalarda göster</string> + <string name="apps_shortcut_remove">Kısayolu kaldır</string> + <string name="apps_pin_title">Uygulamalara ekle</string> + <string name="apps_pin_add">Ekle</string> + <string name="apps_hidden_none">Gizli uygulama yok.</string> + <string name="apps_sort_name_asc">Ad A–Z</string> + <string name="apps_sort_name_desc">Ad Z–A</string> + <string name="apps_sort_installed">Son yüklenenler</string> + <string name="apps_sort_updated">Son güncellenenler</string> + <plurals name="apps_count"> + <item quantity="one">%d uygulama</item> + <item quantity="other">%d uygulama</item> + </plurals> </resources> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 050fd0fdcf..3084c36ba8 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3153,4 +3153,48 @@ <string name="itch_collections">Колекції</string> <string name="xbox_filter_cloud">Хмара</string> <string name="stores_xbox_cloud_settings">Налаштування хмари</string> + <string name="apps_search_hint">Пошук застосунків</string> + <string name="apps_no_match">Немає застосунків за запитом «%1$s».</string> + <string name="apps_add_widget">Додати віджет</string> + <string name="apps_widgets_loading">Завантаження віджетів…</string> + <string name="apps_widgets_none">На цьому пристрої немає застосунків із віджетами.</string> + <string name="apps_widget_wider">Ширше</string> + <string name="apps_widget_narrower">Вужче</string> + <string name="apps_widget_taller">Вище</string> + <string name="apps_widget_shorter">Нижче</string> + <string name="apps_widget_move_earlier">Перемістити раніше</string> + <string name="apps_widget_move_later">Перемістити пізніше</string> + <string name="apps_widget_configure">Налаштування віджета</string> + <string name="apps_widget_remove">Вилучити віджет</string> + <string name="apps_add_to_folder">Додати до папки</string> + <string name="apps_new_folder">Нова папка</string> + <string name="apps_remove_from_folder">Вилучити з папки</string> + <string name="apps_app_info">Про застосунок</string> + <string name="apps_uninstall">Видалити</string> + <string name="apps_folder_rename">Перейменувати</string> + <string name="apps_folder_ungroup">Розгрупувати</string> + <string name="apps_folder_default">Папка</string> + <string name="apps_folder_name">Назва папки</string> + <string name="apps_filter">Показати</string> + <string name="apps_filter_all">Усі застосунки</string> + <string name="apps_filter_games">Ігри</string> + <string name="apps_filter_downloaded">Завантажені</string> + <string name="apps_filter_system">Системні</string> + <string name="apps_filter_hidden">Приховані</string> + <string name="apps_hide">Приховати</string> + <string name="apps_unhide">Показувати в застосунках</string> + <string name="apps_shortcut_remove">Вилучити ярлик</string> + <string name="apps_pin_title">Додати до застосунків</string> + <string name="apps_pin_add">Додати</string> + <string name="apps_hidden_none">Прихованих застосунків немає.</string> + <string name="apps_sort_name_asc">Назва А–Я</string> + <string name="apps_sort_name_desc">Назва Я–А</string> + <string name="apps_sort_installed">Нещодавно встановлені</string> + <string name="apps_sort_updated">Нещодавно оновлені</string> + <plurals name="apps_count"> + <item quantity="one">%d застосунок</item> + <item quantity="few">%d застосунки</item> + <item quantity="many">%d застосунків</item> + <item quantity="other">%d застосунку</item> + </plurals> </resources> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 9c75292d7f..0cfe20866d 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3060,4 +3060,45 @@ <string name="itch_collections">Bộ sưu tập</string> <string name="xbox_filter_cloud">Đám mây</string> <string name="stores_xbox_cloud_settings">Cài đặt đám mây</string> + <string name="apps_search_hint">Tìm ứng dụng</string> + <string name="apps_no_match">Không có ứng dụng nào khớp với “%1$s”.</string> + <string name="apps_add_widget">Thêm tiện ích</string> + <string name="apps_widgets_loading">Đang tải tiện ích…</string> + <string name="apps_widgets_none">Không có ứng dụng nào trên thiết bị này cung cấp tiện ích.</string> + <string name="apps_widget_wider">Rộng hơn</string> + <string name="apps_widget_narrower">Hẹp hơn</string> + <string name="apps_widget_taller">Cao hơn</string> + <string name="apps_widget_shorter">Thấp hơn</string> + <string name="apps_widget_move_earlier">Chuyển lên trước</string> + <string name="apps_widget_move_later">Chuyển ra sau</string> + <string name="apps_widget_configure">Cài đặt tiện ích</string> + <string name="apps_widget_remove">Xóa tiện ích</string> + <string name="apps_add_to_folder">Thêm vào thư mục</string> + <string name="apps_new_folder">Thư mục mới</string> + <string name="apps_remove_from_folder">Xóa khỏi thư mục</string> + <string name="apps_app_info">Thông tin ứng dụng</string> + <string name="apps_uninstall">Gỡ cài đặt</string> + <string name="apps_folder_rename">Đổi tên</string> + <string name="apps_folder_ungroup">Bỏ nhóm</string> + <string name="apps_folder_default">Thư mục</string> + <string name="apps_folder_name">Tên thư mục</string> + <string name="apps_filter">Hiển thị</string> + <string name="apps_filter_all">Tất cả ứng dụng</string> + <string name="apps_filter_games">Trò chơi</string> + <string name="apps_filter_downloaded">Đã tải xuống</string> + <string name="apps_filter_system">Hệ thống</string> + <string name="apps_filter_hidden">Đã ẩn</string> + <string name="apps_hide">Ẩn</string> + <string name="apps_unhide">Hiện trong ứng dụng</string> + <string name="apps_shortcut_remove">Xóa lối tắt</string> + <string name="apps_pin_title">Thêm vào Ứng dụng</string> + <string name="apps_pin_add">Thêm</string> + <string name="apps_hidden_none">Không có ứng dụng nào bị ẩn.</string> + <string name="apps_sort_name_asc">Tên A–Z</string> + <string name="apps_sort_name_desc">Tên Z–A</string> + <string name="apps_sort_installed">Mới cài đặt</string> + <string name="apps_sort_updated">Mới cập nhật</string> + <plurals name="apps_count"> + <item quantity="other">%d ứng dụng</item> + </plurals> </resources> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ade2de5de3..416839104e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3064,4 +3064,45 @@ <string name="itch_collections">收藏集</string> <string name="xbox_filter_cloud">云</string> <string name="stores_xbox_cloud_settings">云设置</string> + <string name="apps_search_hint">搜索应用</string> + <string name="apps_no_match">没有与“%1$s”匹配的应用。</string> + <string name="apps_add_widget">添加微件</string> + <string name="apps_widgets_loading">正在加载微件…</string> + <string name="apps_widgets_none">此设备上没有提供微件的应用。</string> + <string name="apps_widget_wider">加宽</string> + <string name="apps_widget_narrower">缩窄</string> + <string name="apps_widget_taller">加高</string> + <string name="apps_widget_shorter">降低</string> + <string name="apps_widget_move_earlier">前移</string> + <string name="apps_widget_move_later">后移</string> + <string name="apps_widget_configure">微件设置</string> + <string name="apps_widget_remove">移除微件</string> + <string name="apps_add_to_folder">添加到文件夹</string> + <string name="apps_new_folder">新建文件夹</string> + <string name="apps_remove_from_folder">从文件夹中移除</string> + <string name="apps_app_info">应用信息</string> + <string name="apps_uninstall">卸载</string> + <string name="apps_folder_rename">重命名</string> + <string name="apps_folder_ungroup">取消分组</string> + <string name="apps_folder_default">文件夹</string> + <string name="apps_folder_name">文件夹名称</string> + <string name="apps_filter">显示</string> + <string name="apps_filter_all">所有应用</string> + <string name="apps_filter_games">游戏</string> + <string name="apps_filter_downloaded">已下载</string> + <string name="apps_filter_system">系统</string> + <string name="apps_filter_hidden">已隐藏</string> + <string name="apps_hide">隐藏</string> + <string name="apps_unhide">在应用中显示</string> + <string name="apps_shortcut_remove">移除快捷方式</string> + <string name="apps_pin_title">添加到应用</string> + <string name="apps_pin_add">添加</string> + <string name="apps_hidden_none">没有隐藏的应用。</string> + <string name="apps_sort_name_asc">名称 A–Z</string> + <string name="apps_sort_name_desc">名称 Z–A</string> + <string name="apps_sort_installed">最近安装</string> + <string name="apps_sort_updated">最近更新</string> + <plurals name="apps_count"> + <item quantity="other">%d 个应用</item> + </plurals> </resources> diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 94ed816a9f..ee0daff391 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3063,4 +3063,45 @@ <string name="itch_collections">收藏集</string> <string name="xbox_filter_cloud">雲端</string> <string name="stores_xbox_cloud_settings">雲端設定</string> + <string name="apps_search_hint">搜尋應用程式</string> + <string name="apps_no_match">沒有符合「%1$s」的應用程式。</string> + <string name="apps_add_widget">新增小工具</string> + <string name="apps_widgets_loading">正在載入小工具…</string> + <string name="apps_widgets_none">此裝置上沒有提供小工具的應用程式。</string> + <string name="apps_widget_wider">加闊</string> + <string name="apps_widget_narrower">收窄</string> + <string name="apps_widget_taller">加高</string> + <string name="apps_widget_shorter">降低</string> + <string name="apps_widget_move_earlier">向前移</string> + <string name="apps_widget_move_later">向後移</string> + <string name="apps_widget_configure">小工具設定</string> + <string name="apps_widget_remove">移除小工具</string> + <string name="apps_add_to_folder">加入資料夾</string> + <string name="apps_new_folder">新資料夾</string> + <string name="apps_remove_from_folder">從資料夾移除</string> + <string name="apps_app_info">應用程式資料</string> + <string name="apps_uninstall">解除安裝</string> + <string name="apps_folder_rename">重新命名</string> + <string name="apps_folder_ungroup">取消組合</string> + <string name="apps_folder_default">資料夾</string> + <string name="apps_folder_name">資料夾名稱</string> + <string name="apps_filter">顯示</string> + <string name="apps_filter_all">所有應用程式</string> + <string name="apps_filter_games">遊戲</string> + <string name="apps_filter_downloaded">已下載</string> + <string name="apps_filter_system">系統</string> + <string name="apps_filter_hidden">已隱藏</string> + <string name="apps_hide">隱藏</string> + <string name="apps_unhide">在應用程式中顯示</string> + <string name="apps_shortcut_remove">移除捷徑</string> + <string name="apps_pin_title">加入應用程式</string> + <string name="apps_pin_add">新增</string> + <string name="apps_hidden_none">沒有隱藏的應用程式。</string> + <string name="apps_sort_name_asc">名稱 A–Z</string> + <string name="apps_sort_name_desc">名稱 Z–A</string> + <string name="apps_sort_installed">最近安裝</string> + <string name="apps_sort_updated">最近更新</string> + <plurals name="apps_count"> + <item quantity="other">%d 個應用程式</item> + </plurals> </resources> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 0c3257ead8..27effeacb7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3063,4 +3063,45 @@ <string name="itch_collections">收藏集</string> <string name="xbox_filter_cloud">雲端</string> <string name="stores_xbox_cloud_settings">雲端設定</string> + <string name="apps_search_hint">搜尋應用程式</string> + <string name="apps_no_match">沒有符合「%1$s」的應用程式。</string> + <string name="apps_add_widget">新增小工具</string> + <string name="apps_widgets_loading">正在載入小工具…</string> + <string name="apps_widgets_none">這部裝置上沒有提供小工具的應用程式。</string> + <string name="apps_widget_wider">加寬</string> + <string name="apps_widget_narrower">縮窄</string> + <string name="apps_widget_taller">加高</string> + <string name="apps_widget_shorter">降低</string> + <string name="apps_widget_move_earlier">往前移</string> + <string name="apps_widget_move_later">往後移</string> + <string name="apps_widget_configure">小工具設定</string> + <string name="apps_widget_remove">移除小工具</string> + <string name="apps_add_to_folder">新增至資料夾</string> + <string name="apps_new_folder">新資料夾</string> + <string name="apps_remove_from_folder">從資料夾移除</string> + <string name="apps_app_info">應用程式資訊</string> + <string name="apps_uninstall">解除安裝</string> + <string name="apps_folder_rename">重新命名</string> + <string name="apps_folder_ungroup">取消群組</string> + <string name="apps_folder_default">資料夾</string> + <string name="apps_folder_name">資料夾名稱</string> + <string name="apps_filter">顯示</string> + <string name="apps_filter_all">所有應用程式</string> + <string name="apps_filter_games">遊戲</string> + <string name="apps_filter_downloaded">已下載</string> + <string name="apps_filter_system">系統</string> + <string name="apps_filter_hidden">已隱藏</string> + <string name="apps_hide">隱藏</string> + <string name="apps_unhide">在應用程式中顯示</string> + <string name="apps_shortcut_remove">移除捷徑</string> + <string name="apps_pin_title">新增至應用程式</string> + <string name="apps_pin_add">新增</string> + <string name="apps_hidden_none">沒有隱藏的應用程式。</string> + <string name="apps_sort_name_asc">名稱 A–Z</string> + <string name="apps_sort_name_desc">名稱 Z–A</string> + <string name="apps_sort_installed">最近安裝</string> + <string name="apps_sort_updated">最近更新</string> + <plurals name="apps_count"> + <item quantity="other">%d 個應用程式</item> + </plurals> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 955caad10c..8979e00b69 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1081,6 +1081,48 @@ <string name="content_android_apps">Android apps</string> <string name="content_apps_count">%1$d apps</string> <string name="content_no_android_apps">No launchable Android apps found.</string> + <string name="apps_search_hint">Search apps</string> + <string name="apps_no_match">No apps match “%1$s”.</string> + <string name="apps_add_widget">Add widget</string> + <string name="apps_widgets_loading">Loading widgets…</string> + <string name="apps_widgets_none">No apps on this device offer widgets.</string> + <string name="apps_widget_wider">Wider</string> + <string name="apps_widget_narrower">Narrower</string> + <string name="apps_widget_taller">Taller</string> + <string name="apps_widget_shorter">Shorter</string> + <string name="apps_widget_move_earlier">Move earlier</string> + <string name="apps_widget_move_later">Move later</string> + <string name="apps_widget_configure">Widget settings</string> + <string name="apps_widget_remove">Remove widget</string> + <string name="apps_add_to_folder">Add to folder</string> + <string name="apps_new_folder">New folder</string> + <string name="apps_remove_from_folder">Remove from folder</string> + <string name="apps_app_info">App info</string> + <string name="apps_uninstall">Uninstall</string> + <string name="apps_folder_rename">Rename</string> + <string name="apps_folder_ungroup">Ungroup</string> + <string name="apps_folder_default">Folder</string> + <string name="apps_folder_name">Folder name</string> + <string name="apps_filter">Show</string> + <string name="apps_filter_all">All apps</string> + <string name="apps_filter_games">Games</string> + <string name="apps_filter_downloaded">Downloaded</string> + <string name="apps_filter_system">System</string> + <string name="apps_filter_hidden">Hidden</string> + <string name="apps_hide">Hide</string> + <string name="apps_unhide">Show in apps</string> + <string name="apps_shortcut_remove">Remove shortcut</string> + <string name="apps_pin_title">Add to Apps</string> + <string name="apps_pin_add">Add</string> + <string name="apps_hidden_none">No hidden apps.</string> + <plurals name="apps_count"> + <item quantity="one">%d app</item> + <item quantity="other">%d apps</item> + </plurals> + <string name="apps_sort_name_asc">Name A–Z</string> + <string name="apps_sort_name_desc">Name Z–A</string> + <string name="apps_sort_installed">Recently installed</string> + <string name="apps_sort_updated">Recently updated</string> <string name="content_desktop_installed">● Desktop installed</string> <string name="content_desktop_first_open">Installs on first open</string> <string name="content_available">Available to install</string> From da3b8017cb2bdaff6ff38a0ae147668f9a99a379 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 27 Oct 2026 15:00:13 -0400 Subject: [PATCH 131/135] fix(steam): hide duplicate Android volume indicator in Steam sessions (#1689) --- .../com/droiddeck/launcher/SessionActivity.kt | 14 +++++- .../launcher/input/SteamVolumeKeys.kt | 22 +++++++++ .../launcher/input/SteamVolumeKeysTest.kt | 46 +++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/input/SteamVolumeKeys.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/SteamVolumeKeysTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 49216ee5e4..b9597649ed 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2210,8 +2210,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun dispatchKeyEvent(event: KeyEvent): Boolean { when (event.keyCode) { - KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> + KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> { + val steamVolume = + SessionState.mode == SessionService.MODE_STEAM && SessionState.running && + SessionState.firstFrameSeen && !SessionState.suspended && !ended && + !pipUi && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && + !gestureSettingsOpen && !screenKeyTextFocus && window.decorView.hasWindowFocus() + if (steamVolume) { + val audio = getSystemService(android.media.AudioManager::class.java) + if (com.droiddeck.launcher.input.SteamVolumeKeys.dispatch(event, !audio.isVolumeFixed) { direction -> + audio.adjustStreamVolume(android.media.AudioManager.STREAM_MUSIC, direction, 0) + }) return true + } return super.dispatchKeyEvent(event) + } } val backToQam = !pipUi && !screenKeyTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && SessionState.mode == SessionService.MODE_STEAM && SessionState.running && SessionState.firstFrameSeen && diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamVolumeKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamVolumeKeys.kt new file mode 100644 index 0000000000..3e0ca925aa --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamVolumeKeys.kt @@ -0,0 +1,22 @@ +package com.droiddeck.launcher.input + +import android.media.AudioManager +import android.view.KeyEvent + +/** Use Steam's PulseAudio bridge for feedback instead of requesting Android's volume UI. */ +internal object SteamVolumeKeys { + fun dispatch(event: KeyEvent, enabled: Boolean, adjust: (Int) -> Unit): Boolean { + val direction = when (event.keyCode) { + KeyEvent.KEYCODE_VOLUME_UP -> AudioManager.ADJUST_RAISE + KeyEvent.KEYCODE_VOLUME_DOWN -> AudioManager.ADJUST_LOWER + KeyEvent.KEYCODE_VOLUME_MUTE -> AudioManager.ADJUST_TOGGLE_MUTE + else -> return false + } + if (!enabled) return false + if (event.action == KeyEvent.ACTION_DOWN && + (event.keyCode != KeyEvent.KEYCODE_VOLUME_MUTE || event.repeatCount == 0)) { + adjust(direction) + } + return event.action == KeyEvent.ACTION_DOWN || event.action == KeyEvent.ACTION_UP + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/SteamVolumeKeysTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SteamVolumeKeysTest.kt new file mode 100644 index 0000000000..cce0daa3cc --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/SteamVolumeKeysTest.kt @@ -0,0 +1,46 @@ +package com.droiddeck.launcher.input + +import android.media.AudioManager +import android.view.KeyEvent +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28, 33]) +class SteamVolumeKeysTest { + private val adjustments = mutableListOf<Int>() + + private fun key(code: Int, action: Int = KeyEvent.ACTION_DOWN, repeat: Int = 0) = + KeyEvent(0L, 0L, action, code, repeat) + + private fun dispatch(code: Int, enabled: Boolean = true, action: Int = KeyEvent.ACTION_DOWN, repeat: Int = 0) = + SteamVolumeKeys.dispatch(key(code, action, repeat), enabled, adjustments::add) + + @Test fun enabledKeysAdjustOncePerDownAndConsumeRelease() { + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_UP)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_UP, repeat = 1)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_UP, action = KeyEvent.ACTION_UP)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_DOWN)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_DOWN, action = KeyEvent.ACTION_UP)) + assertEquals(listOf(AudioManager.ADJUST_RAISE, AudioManager.ADJUST_RAISE, AudioManager.ADJUST_LOWER), adjustments) + } + + @Test fun muteTogglesOnlyOnInitialPress() { + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_MUTE)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_MUTE, repeat = 1)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_MUTE, action = KeyEvent.ACTION_UP)) + assertEquals(listOf(AudioManager.ADJUST_TOGGLE_MUTE), adjustments) + } + + @Test fun disabledAndNonVolumeKeysFallThrough() { + for (code in listOf(KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE)) { + assertFalse(dispatch(code, enabled = false)) + assertFalse(dispatch(code, enabled = false, action = KeyEvent.ACTION_UP)) + } + assertFalse(dispatch(KeyEvent.KEYCODE_BUTTON_A)) + assertTrue(adjustments.isEmpty()) + } +} From 10174c1bd560927f8dfcb5303cda38387a8df004 Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Tue, 27 Oct 2026 14:46:43 -0400 Subject: [PATCH 132/135] fix(manifest): name the pairing guide's task from the application id --- app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 806edc12dc..091811b040 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,7 +86,7 @@ android:name=".PairingGuideActivity" android:exported="false" android:launchMode="singleTask" - android:taskAffinity="com.droiddeck.launcher.pairingguide" + android:taskAffinity="${applicationId}.pairingguide" android:excludeFromRecents="true" android:supportsPictureInPicture="true" android:resizeableActivity="true" From c9044a27e32fac51ca1c6bec371fed654538a678 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 27 Oct 2026 15:03:33 -0400 Subject: [PATCH 133/135] fix(release): rename pairing guide affinity for variant APKs --- tools/release/sign-apk.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/release/sign-apk.sh b/tools/release/sign-apk.sh index 2cf46c551e..b84480acd0 100755 --- a/tools/release/sign-apk.sh +++ b/tools/release/sign-apk.sh @@ -27,6 +27,7 @@ if [ "$pkg" = "$P" ]; then else python3 "$here/axml_rename.py" "$in" "$work/renamed.apk" \ "$P=$pkg" "$P.androidx-startup=$pkg.androidx-startup" "$P.logs=$pkg.logs" \ + "$P.pairingguide=$pkg.pairingguide" \ "$P.documents=$pkg.documents" "$P.home=$pkg.home" "$P.agent=$pkg.agent" \ "$P.vr_recovery=$pkg.vr_recovery" \ "$P.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION=$pkg.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" From 2d19c31872dcc55934209c90bcf08eab0f36010f Mon Sep 17 00:00:00 2001 From: maxjivi05 <maxjividen@gmail.com> Date: Tue, 27 Oct 2026 15:33:36 -0400 Subject: [PATCH 134/135] fix(release): rename the pin task affinity for variant APKs --- tools/release/sign-apk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/release/sign-apk.sh b/tools/release/sign-apk.sh index b84480acd0..c0fd0ace68 100755 --- a/tools/release/sign-apk.sh +++ b/tools/release/sign-apk.sh @@ -27,7 +27,7 @@ if [ "$pkg" = "$P" ]; then else python3 "$here/axml_rename.py" "$in" "$work/renamed.apk" \ "$P=$pkg" "$P.androidx-startup=$pkg.androidx-startup" "$P.logs=$pkg.logs" \ - "$P.pairingguide=$pkg.pairingguide" \ + "$P.pairingguide=$pkg.pairingguide" "$P.pin=$pkg.pin" \ "$P.documents=$pkg.documents" "$P.home=$pkg.home" "$P.agent=$pkg.agent" \ "$P.vr_recovery=$pkg.vr_recovery" \ "$P.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION=$pkg.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" From 4f58230a20ed0988b8996dbb9a61c43af7e828de Mon Sep 17 00:00:00 2001 From: kingokksa <47888451+kingokksa@users.noreply.github.com> Date: Wed, 28 Oct 2026 03:53:31 +0800 Subject: [PATCH 135/135] fix(session): look up the launched game without rescanning the library (#1595) --- .../main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt b/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt index b8dab5de11..8d8070f875 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt @@ -51,7 +51,8 @@ object NoSteamLaunch { fun addedGame(context: Context, game: Library.SteamGame): AddedGames.Game? { val id = game.appId.toLong() and 0xFFFFFFFFL - return AddedGames.scan(context).firstOrNull { settingsId(it) == id } + val one = game.gameFiles?.let { AddedGames.single(context, it.path) } + return one?.takeIf { settingsId(it) == id } ?: AddedGames.scan(context).firstOrNull { settingsId(it) == id } } fun nameFor(program: String?, args: List<String>): String? = when (program) {

    5F{&CUU1wC_j$9Q5>as=FVJ5`JaNnbzn02@lE8% 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 literal 0 HcmV?d00001 diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.boost b/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.boost new file mode 100644 index 0000000000..36b7cd93cd --- /dev/null +++ b/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.boost @@ -0,0 +1,23 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +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, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract b/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract new file mode 100644 index 0000000000..446f0c7829 --- /dev/null +++ b/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract @@ -0,0 +1,18 @@ + +Copyright (C) 2011-2020 Daniel Scharrer + +This software is provided 'as-is', without any express or implied +warranty. In no event will the author(s) be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. From 1f1873a18e36e575b7d366c1db26112ab5ae7939 Mon Sep 17 00:00:00 2001 From: 0x1Nawaf Date: Fri, 23 Oct 2026 15:46:00 +0000 Subject: [PATCH 002/135] fix: compress the client only after the game window is focused --- .../overlay/usr/local/bin/droiddeck-session | 19 +++++++-- tools/tests/test_client_zram_focus.py | 39 +++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 tools/tests/test_client_zram_focus.py diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 688d0c19bb..df89589e53 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -227,7 +227,9 @@ if [ -z "${BL_INSIDE:-}" ]; then echo "== gamescope: games at ${nested}x${height} stretched to the ${width}x${height} output" fi fi - if [ "$mode" = steam ]; then + # Off unless Performance asks for it. Compositing the cursor here adds a second + # plane on the phone's compositor; a controller-driven cursor is the reason to turn it on. + if [ "$mode" = steam ] && [ "${BL_CURSOR_COMPOSITE:-0}" = 1 ]; then export gamescope_cursor_composite=2 fi args=(--backend wayland --expose-wayland -f -W "$width" -H "$height" -w "$nested" -h "$height") @@ -475,19 +477,30 @@ case $mode in bl_zram_scan step "zRAM: done ($(bl_zram_usage))" } + # The game process exists for the whole Proton launch. Compressing then stalls the + # launch, so the clock starts only once the game window has focus, and waits 20 s more. + bl_game_focused() { + [ -n "${BL_LAUNCH_DIR:-}" ] || return 1 + local id + id=$(sed -n 's/.*"focusedApp"[[:space:]]*:[[:space:]]*\([0-9][0-9]*\).*/\1/p' \ + "$BL_LAUNCH_DIR/agent/focus.json" 2>/dev/null | head -1) + [ -n "$id" ] && [ "$id" != 769 ] + } _bl_since=-1 _bl_packed=-1 while kill -0 $$ 2>/dev/null; do bl_zram_scan - if [ "$_bl_game" = 1 ]; then + if [ "$_bl_game" = 1 ] && bl_game_focused; then [ "$_bl_since" -ge 0 ] || _bl_since=$SECONDS if [ $((SECONDS - _bl_since)) -ge 20 ] && [ "${#_bl_pids[@]}" -gt 0 ] && { [ "$_bl_packed" -lt 0 ] || [ $((SECONDS - _bl_packed)) -ge 300 ]; }; then bl_zram_send 1 "compressing the client" _bl_packed=$SECONDS fi - elif [ "$_bl_since" -ge 0 ]; then + elif [ "$_bl_game" != 1 ]; then [ "$_bl_packed" -lt 0 ] || bl_zram_send 0 "game closed, reading the client back" _bl_since=-1 _bl_packed=-1 + else + _bl_since=-1 fi nap 5 done diff --git a/tools/tests/test_client_zram_focus.py b/tools/tests/test_client_zram_focus.py new file mode 100644 index 0000000000..52c48b8bec --- /dev/null +++ b/tools/tests/test_client_zram_focus.py @@ -0,0 +1,39 @@ +from pathlib import Path +import subprocess +import unittest + + +SCRIPT = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-session' + + +class ClientZramFocusTest(unittest.TestCase): + def test_refocus_restarts_the_delay_and_game_exit_restores_a_packed_client(self): + source = SCRIPT.read_text() + start = source.index(' if [ "$_bl_game" = 1 ] && bl_game_focused; then') + stop = source.index(' nap 5', start) + body = source[start:stop] + harness = ''' +_bl_since=-1 _bl_packed=-1 +_bl_pids=(123) +bl_game_focused() { [ "$focused" = 1 ]; } +bl_zram_send() { echo "send:$1"; } +tick() { + SECONDS=$1 _bl_game=$2 focused=$3 +''' + body + ''' +} +tick 0 1 1 +tick 5 1 0 +tick 30 1 1 +echo "refocus:$_bl_packed" +tick 49 1 1 +tick 50 1 1 +tick 55 1 0 +tick 60 0 0 +''' + result = subprocess.run(['bash', '-c', harness], capture_output=True, text=True, timeout=10) + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual(['refocus:-1', 'send:1', 'send:0'], result.stdout.splitlines()) + + +if __name__ == '__main__': + unittest.main() From 0a8358d11fe691b2fde2f4671cb84544de8accec Mon Sep 17 00:00:00 2001 From: 0x1Nawaf Date: Fri, 23 Oct 2026 15:52:35 +0000 Subject: [PATCH 003/135] fix: keep the gamescope cursor out of the zram change The session script had also picked up the cursor switch from the other branch. --- tools/linuxfs/overlay/usr/local/bin/droiddeck-session | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index df89589e53..02635d8a68 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -227,9 +227,7 @@ if [ -z "${BL_INSIDE:-}" ]; then echo "== gamescope: games at ${nested}x${height} stretched to the ${width}x${height} output" fi fi - # Off unless Performance asks for it. Compositing the cursor here adds a second - # plane on the phone's compositor; a controller-driven cursor is the reason to turn it on. - if [ "$mode" = steam ] && [ "${BL_CURSOR_COMPOSITE:-0}" = 1 ]; then + if [ "$mode" = steam ]; then export gamescope_cursor_composite=2 fi args=(--backend wayland --expose-wayland -f -W "$width" -H "$height" -w "$nested" -h "$height") From 73e158ab3b0ce4de94734150d2cddb3084708f8d Mon Sep 17 00:00:00 2001 From: 0x1Nawaf Date: Sun, 25 Oct 2026 10:38:37 +0000 Subject: [PATCH 004/135] fix: compress only while the running game is focused --- .../overlay/usr/local/bin/droiddeck-session | 46 +++++++++++---- tools/tests/test_client_zram_focus.py | 59 ++++++++++++++++++- 2 files changed, 93 insertions(+), 12 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 02635d8a68..f50dc9fab5 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -447,14 +447,30 @@ case $mode in step "zRAM compression: on" ( bl_zram_scan() { - _bl_game=0 _bl_pids=() + _bl_game=0 _bl_pids=() _bl_apps= + local _d _c _args _name _a _id for _d in /proc/[0-9]*; do - # Under FEX the program is FEX's first argument. - { IFS= read -r -d '' _c && case ${_c##*/} in FEX|FEXInterpreter) IFS= read -r -d '' _c ;; esac; } \ - 2>/dev/null < "$_d/cmdline" || continue - case ${_c##*/} in - reaper) _bl_game=1 ;; - steam|steamwebhelper) _bl_pids+=("${_d#/proc/}") ;; + _args=() + # Under FEX the program is FEX's first argument. AppId= is its own argument. + while IFS= read -r -d '' _c; do _args+=("$_c"); done 2>/dev/null < "$_d/cmdline" || true + [ "${#_args[@]}" -gt 0 ] || continue + _name=${_args[0]} + if [ "${#_args[@]}" -gt 1 ]; then + case ${_name##*/} in FEX|FEXInterpreter) _name=${_args[1]} ;; esac + fi + case ${_name##*/} in + reaper) + for _a in "${_args[@]}"; do + case $_a in + AppId=769) ;; + AppId=[0-9]*) + _id=${_a#AppId=} + case $_id in *[!0-9]*) ;; *) _bl_game=1; _bl_apps="$_bl_apps $_id" ;; esac + ;; + esac + done + ;; + steam|steamwebhelper) _bl_pids+=("${_d##*/}") ;; esac done } @@ -475,14 +491,22 @@ case $mode in bl_zram_scan step "zRAM: done ($(bl_zram_usage))" } - # The game process exists for the whole Proton launch. Compressing then stalls the - # launch, so the clock starts only once the game window has focus, and waits 20 s more. + # Proton's reaper exists before the game window does, and compressing then stalls the + # launch. focusedApp uses the same 32-bit id as that reaper's AppId= (769 is Steam; a + # shortcut's CGameID keeps this id in its high half). The clock starts on a match, then + # waits 20 s more. Desktop Steam never writes focus.json, so the game process is enough. bl_game_focused() { - [ -n "${BL_LAUNCH_DIR:-}" ] || return 1 + if [ "${BL_DESKTOP:-}" = 1 ] || [ -z "${BL_LAUNCH_DIR:-}" ]; then + return 0 + fi local id id=$(sed -n 's/.*"focusedApp"[[:space:]]*:[[:space:]]*\([0-9][0-9]*\).*/\1/p' \ "$BL_LAUNCH_DIR/agent/focus.json" 2>/dev/null | head -1) - [ -n "$id" ] && [ "$id" != 769 ] + [ -n "$id" ] || return 1 + case " ${_bl_apps-} " in + *" $id "*) return 0 ;; + esac + return 1 } _bl_since=-1 _bl_packed=-1 while kill -0 $$ 2>/dev/null; do diff --git a/tools/tests/test_client_zram_focus.py b/tools/tests/test_client_zram_focus.py index 52c48b8bec..cd3d7b5ab8 100644 --- a/tools/tests/test_client_zram_focus.py +++ b/tools/tests/test_client_zram_focus.py @@ -1,11 +1,23 @@ from pathlib import Path import subprocess +import tempfile import unittest SCRIPT = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-session' +def function_source(name): + source = SCRIPT.read_text() + start = source.index('%s() {' % name) + end = source.index('\n }', start) + return source[start:end + len('\n }')] + + +def run_bash(script, env=None): + return subprocess.run(['bash', '-c', script], capture_output=True, text=True, timeout=10, env=env) + + class ClientZramFocusTest(unittest.TestCase): def test_refocus_restarts_the_delay_and_game_exit_restores_a_packed_client(self): source = SCRIPT.read_text() @@ -30,10 +42,55 @@ tick 50 1 1 tick 55 1 0 tick 60 0 0 ''' - result = subprocess.run(['bash', '-c', harness], capture_output=True, text=True, timeout=10) + result = run_bash(harness) self.assertEqual(0, result.returncode, result.stderr) self.assertEqual(['refocus:-1', 'send:1', 'send:0'], result.stdout.splitlines()) + def test_scan_keeps_the_running_game_and_ignores_steams_own_reaper(self): + temp = tempfile.TemporaryDirectory() + self.addCleanup(temp.cleanup) + root = Path(temp.name) + self.write_cmd(root, 10, ['/usr/lib/steam/reaper', 'SteamLaunch', 'AppId=769', '--']) + self.write_cmd(root, 20, ['/usr/bin/FEX', '/usr/lib/steam/reaper', 'SteamLaunch', 'AppId=1245620', '--']) + self.write_cmd(root, 30, ['/home/deck/.local/share/Steam/steamrtarm64/steam']) + scan = function_source('bl_zram_scan').replace('for _d in /proc/[0-9]*', 'for _d in "$FAKE"/[0-9]*') + result = run_bash('FAKE=%s\n%s\nbl_zram_scan\necho "game=$_bl_game"\necho "apps=${_bl_apps# }"\necho "pids=${_bl_pids[*]}"' % (root, scan)) + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual(['game=1', 'apps=1245620', 'pids=30'], result.stdout.splitlines()) + + def test_focus_must_be_the_running_game(self): + focus = function_source('bl_game_focused') + script = ''' +%s +check() { + BL_DESKTOP=$1 BL_LAUNCH_DIR=$2 _bl_apps=$3 + if bl_game_focused; then echo yes; else echo no; fi +} +check "" "$dir" " 413150" +check "" "$dir" " 1245620" +printf '%%s\\n' '{"focusedApp": 999}' > "$dir/agent/focus.json" +check "" "$dir" " 413150" +printf '%%s\\n' '{"focusedApp": 769}' > "$dir/agent/focus.json" +check "" "$dir" " 413150" +rm -f "$dir/agent/focus.json" +check 1 "$dir" " 413150" +check "" "" " 413150" +''' % focus + temp = tempfile.TemporaryDirectory() + self.addCleanup(temp.cleanup) + launch = Path(temp.name) + (launch / 'agent').mkdir() + (launch / 'agent' / 'focus.json').write_text('{"t": 1, "focusedApp": 413150}\n') + result = run_bash('dir=%s\n%s' % (launch, script)) + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual(['yes', 'no', 'no', 'no', 'yes', 'yes'], result.stdout.splitlines()) + + @staticmethod + def write_cmd(root, pid, args): + proc = root / str(pid) + proc.mkdir() + (proc / 'cmdline').write_bytes(b'\0'.join(arg.encode() for arg in args) + b'\0') + if __name__ == '__main__': unittest.main() From 3fdc74051c6b1e0b1ec8a92926fd82144f981a37 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sun, 25 Oct 2026 10:09:22 -0400 Subject: [PATCH 005/135] feat: DroidDeck-Proton is downloaded, kept up to date and used by default (#1540) --- .../java/com/droiddeck/launcher/ProtonMenu.kt | 17 +++- .../launcher/session/ComponentsManager.kt | 37 ++++++++ .../launcher/session/ProtonDefault.kt | 24 ++++- .../launcher/session/ProtonExtras.kt | 57 ++++++++++- .../launcher/session/SessionService.kt | 1 + .../launcher/stores/SteamLiveShortcuts.kt | 11 ++- .../droiddeck/launcher/ProtonMenuAutoTest.kt | 37 ++++++-- .../session/ComponentsCarryOverTest.kt | 30 ++++++ .../launcher/session/ProtonDefaultTest.kt | 24 +++++ .../launcher/session/ProtonExtrasTest.kt | 31 ++++++ .../overlay/usr/local/bin/steam-compatibility | 41 ++++++++ tools/tests/test_droiddeck_proton_default.py | 95 +++++++++++++++++++ 12 files changed, 389 insertions(+), 16 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/ComponentsCarryOverTest.kt create mode 100644 tools/tests/test_droiddeck_proton_default.py diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index 5e49b5cf5d..1d870a6bcb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -41,6 +41,7 @@ internal class ProtonMenu( ui.post { protonStage = label; protonPercent = value } } }.getOrElse { it.message ?: it.javaClass.simpleName } + if (problem == null && !automatic && tool.id == ProtonExtras.OWN) ProtonExtras.setDeclined(activity, false) ui.post { protonBusyId = null protonStage = null @@ -63,6 +64,7 @@ internal class ProtonMenu( protonPercent = -1 Thread({ if (older) ProtonExtras.removeOlder(activity, tool) else ProtonExtras.remove(activity, tool, dir) + if (tool.id == ProtonExtras.OWN && ProtonExtras.installedAll(activity, tool).isEmpty()) ProtonExtras.setDeclined(activity, true) ui.post { protonBusyId = null protonStage = null @@ -94,9 +96,22 @@ internal class ProtonMenu( ProtonExtras.installInProgress || SessionState.running || LinuxRuntimeInstaller.isBusy() || SessionState.phase !in setOf(SessionPhase.IDLE, SessionPhase.FAILED) || !LinuxRuntime.isInstalled(activity) || !AutoComponents.online(activity) || AutoComponents.unfavourable(activity)) return + if (ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == ProtonExtras.OWN }).size > 1) { + protonBusyId = ProtonExtras.OWN + Thread({ + ProtonExtras.tidy(activity) + val tidied = ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == ProtonExtras.OWN }).size <= 1 + ui.post { + protonBusyId = null + refreshProtons() + if (tidied) ensureAutoUpdates() + } + }, "proton-tidy").start() + return + } val attempts = activity.getSharedPreferences("proton-auto-updates", android.content.Context.MODE_PRIVATE) val (tool, update) = ProtonExtras.tools.firstNotNullOfOrNull { tool -> - val update = ProtonExtras.update(activity, tool) ?: return@firstNotNullOfOrNull null + val update = ProtonExtras.update(activity, tool) ?: ProtonExtras.missing(activity, tool) ?: return@firstNotNullOfOrNull null val previous = attempts.getLong("${tool.id}.at", 0L) if (attempts.getString("${tool.id}.tag", null) != update || now - previous !in 0 until 15L * 60 * 1000) tool to update else null } ?: return diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index ae405a80ae..058785cc7d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -780,6 +780,43 @@ object ComponentsManager { true } + fun carryOver(context: Context, fromDir: String, toDir: String) { + synchronized(lock) { + val target = protons(context).firstOrNull { it.id == safeName(toDir) } ?: return + val state = loadState(context) + val wanted = carried(state, safeName(fromDir)) { File(packagesDir(context), it).isFile } + val active = state.sub("active").optJSONObject(target.id) + val queued = state.sub("queued").sub(target.id) + var changed = false + wanted.forEach { (comp, entry) -> + if (active?.has(comp) != true && !queued.has(comp)) { + queued.put(comp, entry) + changed = true + } + } + if (queued.length() == 0) state.sub("queued").remove(target.id) + if (changed) saveState(context, state) + } + } + + internal fun carried(state: JSONObject, from: String, present: (String) -> Boolean): Map = buildMap { + state.optJSONObject("active")?.optJSONObject(from)?.let { active -> + active.keys().forEach { comp -> + val entry = active.optJSONObject(comp) ?: return@forEach + val file = entry.optString("file") + if (comp in COMPONENTS && file.endsWith(".wcp") && present(file)) { + put(comp, JSONObject().put("kind", "package").put("file", file).put("label", entry.optString("label"))) + } + } + } + state.optJSONObject("queued")?.optJSONObject(from)?.let { queued -> + queued.keys().forEach { comp -> + val entry = queued.optJSONObject(comp) ?: return@forEach + if (comp in COMPONENTS && entry.optString("kind") == "package" && present(entry.optString("file"))) put(comp, entry) + } + } + } + fun forgetProton(context: Context, dirName: String) { synchronized(lock) { val id = safeName(dirName) diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonDefault.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonDefault.kt index ff3214cf79..2c7110a855 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonDefault.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonDefault.kt @@ -114,12 +114,19 @@ object ProtonDefault { return if (SessionState.running && state.live && (tool == null || state.pending != tool.name)) Outcome.LIVE else Outcome.NEXT_START } + internal fun movedGames(choices: Map, from: Set, to: String): Map? { + if (choices.values.none { it != null && !it.valve && it.dir in from }) return null + return choices.mapValues { (_, choice) -> if (choice != null && !choice.valve && choice.dir in from) GameChoice(false, to) else choice } + } + @Synchronized - fun requestGame(context: Context, scope: String, proton: ComponentsManager.Proton?): Outcome { - require(GameEnvironment.validScope(scope)) + fun moveGames(context: Context, from: Set, to: String) { val d = dir(context) - val choices = parseGames(read(File(d, GAMES))).toMutableMap() - choices[scope] = proton?.let { GameChoice(it.valve, it.dir.name) } + val moved = movedGames(parseGames(read(File(d, GAMES))), from, to) ?: return + writeGames(d, moved) + } + + private fun writeGames(d: File, choices: Map) { val games = JSONObject() choices.forEach { (id, choice) -> games.put(id, choice?.let { JSONObject().put("valve", it.valve).put("dir", it.dir) } ?: JSONObject.NULL) @@ -134,6 +141,15 @@ object ProtonDefault { Log.w(TAG, "could not write the per-game Proton request", e) throw e } + } + + @Synchronized + fun requestGame(context: Context, scope: String, proton: ComponentsManager.Proton?): Outcome { + require(GameEnvironment.validScope(scope)) + val d = dir(context) + val choices = parseGames(read(File(d, GAMES))).toMutableMap() + choices[scope] = proton?.let { GameChoice(it.valve, it.dir.name) } + writeGames(d, choices) val state = state(context) val tool = proton?.let { selected -> state.tools.firstOrNull { it.valve == selected.valve && it.dir == selected.dir.name } } return if (SessionState.running && state.live && (proton == null || tool != null && state.pending != tool.name)) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt index 20714ba95a..962291d2c7 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -16,16 +16,20 @@ object ProtonExtras { private const val TAG = "ProtonExtras" private const val NEED_BYTES = 4L * 1024 * 1024 * 1024 private const val RELEASES = "https://api.github.com/repos/%s/releases?per_page=15" - const val CHECK_EVERY_MS = 6L * 60 * 60 * 1000 + const val CHECK_EVERY_MS = 60L * 60 * 1000 @Volatile var installInProgress = false private set + @Volatile + private var replacing = false class Tool(val id: String, val name: String, val prefix: String, val repo: String, val assetPattern: Regex) internal data class Asset(val tag: String, val name: String, val url: String, val sha512: String?, val size: Long, val sha256: String? = null) + const val OWN = "droiddeck" + val tools = listOf( Tool("ge", "GE-Proton", "GE-Proton", "GloriousEggroll/proton-ge-custom", Regex("aarch64\\.tar\\.(gz|xz)$")), Tool("cachyos", "proton-cachyos", "proton-cachyos", "CachyOS/proton-cachyos", Regex("arm64\\.tar\\.(gz|xz)$")), @@ -78,11 +82,23 @@ object ProtonExtras { fun update(context: Context, tool: Tool): String? = updateFor(installedTags(context, tool), cachedLatest(context, tool)) + fun missing(context: Context, tool: Tool): String? = + if (tool.id == OWN && !declined(context) && installedAll(context, tool).isEmpty()) cachedLatest(context, tool) else null + + private fun choices(context: Context) = context.getSharedPreferences("proton-auto-updates", Context.MODE_PRIVATE) + + fun declined(context: Context): Boolean = choices(context).getBoolean("$OWN.declined", false) + + fun setDeclined(context: Context, declined: Boolean) { + choices(context).edit().putBoolean("$OWN.declined", declined).apply() + } + fun cachedLatest(context: Context, tool: Tool): String? = readJson(latestFile(context)).optJSONObject(tool.id)?.optString("tag")?.ifEmpty { null } private val checkLock = Any() private const val RETRY_MS = 15L * 60 * 1000 + private const val USER_SETTINGS = "user_settings.py" private var lastAttempt = 0L fun checkLatest(context: Context, force: Boolean = false, now: Long = System.currentTimeMillis()): Boolean { @@ -145,6 +161,44 @@ object ProtonExtras { } } + private fun replaceOlder(context: Context, tool: Tool) { + val all = installedAll(context, tool) + val newest = all.lastOrNull() ?: return + val older = all.dropLast(1) + if (older.isEmpty()) return + replacing = true + try { + for (old in older.asReversed()) { + if (SessionState.running) break + if (runCatching { ComponentsManager.carryOver(context, old, newest) }.onFailure { Log.w(TAG, "components of $old", it) }.isFailure) continue + if (runCatching { keepUserSettings(context, old, newest) }.onFailure { Log.w(TAG, "user settings of $old", it) }.isFailure) continue + if (runCatching { ProtonDefault.moveGames(context, setOf(old), newest) }.onFailure { Log.w(TAG, "per-game picks of $old", it) }.isFailure) continue + if (File(toolsDir(context), old).deleteRecursively()) ComponentsManager.forgetProton(context, old) + else Log.w(TAG, "could not remove $old") + } + } finally { + replacing = false + } + } + + private fun keepUserSettings(context: Context, old: String, newest: String) { + val from = File(File(toolsDir(context), old), USER_SETTINGS) + val to = File(File(toolsDir(context), newest), USER_SETTINGS) + if (from.isFile && !to.exists()) from.copyTo(to) + } + + fun tidy(context: Context) { + val tool = tools.firstOrNull { it.id == OWN } ?: return + if (installedAll(context, tool).size > 1) replaceOlder(context, tool) + } + + fun awaitReplacement(timeoutMs: Long) { + val until = System.currentTimeMillis() + timeoutMs + while (replacing && System.currentTimeMillis() < until) { + try { Thread.sleep(50) } catch (_: InterruptedException) { Thread.currentThread().interrupt(); return } + } + } + @Synchronized fun install(context: Context, tool: Tool, onProgress: (String, Int) -> Unit): String? { if (installInProgress) return context.getString(R.string.pextra_busy) @@ -246,6 +300,7 @@ object ProtonExtras { archive.delete() unqueue(context, tool) record(context, tool, placed, asset.tag) + if (tool.id == OWN) replaceOlder(context, tool) if (EsyncPacks.enabled(context)) { onProgress(context.getString(R.string.esync_fetching), -1) try { 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 fd8d8d3730..c49e3f7acb 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -372,6 +372,7 @@ class SessionService : Service() { acquireLocks() Thread({ OrphanReaper.reap("session starting") + ProtonExtras.awaitReplacement(120_000) runSession(gen) }, "session-start").start() return START_NOT_STICKY diff --git a/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt b/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt index 345f4da32b..a0faaa8c01 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt @@ -30,7 +30,7 @@ object SteamLiveShortcuts { let added = 0; for (const w of want) { if (await ${KNOWN}(w.appid, w.name, w.exe)) continue; - if (await ${ADD}(w.name, w.exe, w.dir, true)) added++; + if (await ${ADD}(w.name, w.exe, w.dir, true, ${JSONObject.quote(compatTool(context))})) added++; } return added; })() @@ -46,7 +46,7 @@ object SteamLiveShortcuts { (async () => { const known = await ${KNOWN}(${appId?.and(0xFFFFFFFFL) ?: 0}, ${JSONObject.quote(name)}, ${JSONObject.quote(exe)}); if (known) return known; - return await ${ADD}(${JSONObject.quote(name)}, ${JSONObject.quote(exe)}, ${JSONObject.quote(dir)}, $compat); + return await ${ADD}(${JSONObject.quote(name)}, ${JSONObject.quote(exe)}, ${JSONObject.quote(dir)}, $compat, ${JSONObject.quote(compatTool(context))}); })() """.trimIndent() val id = evaluate(context, js)?.toLongOrNull()?.and(0xFFFFFFFFL)?.takeIf { it != 0L } ?: return null @@ -161,12 +161,15 @@ object SteamLiveShortcuts { return 0; })""" - private val ADD = """(async (name, exe, dir, compat) => { + private fun compatTool(context: Context): String = + com.droiddeck.launcher.session.ProtonDefault.state(context).default ?: COMPAT_TOOL + + private val ADD = """(async (name, exe, dir, compat, tool) => { const id = await SteamClient.Apps.AddShortcut(name, exe, dir, ""); if (!id) return 0; try { SteamClient.Apps.SetShortcutName(id, name); } catch (e) {} try { SteamClient.Apps.AddUserTagToApps([id], ${JSONObject.quote(TAG_NAME)}); } catch (e) {} - if (compat) { try { SteamClient.Apps.SpecifyCompatTool(id, ${JSONObject.quote(COMPAT_TOOL)}); } catch (e) {} } + if (compat) { try { SteamClient.Apps.SpecifyCompatTool(id, tool); } catch (e) {} } for (let i = 0; i < 40; i++) { try { if (globalThis.appStore.GetAppOverviewByAppID(id)) break; } catch (e) {} await new Promise(r => setTimeout(r, 250)); diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt index f0424bdaa0..5f3dddf96c 100644 --- a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -88,7 +88,7 @@ class ProtonMenuAutoTest { fail("Proton work did not finish") } - @Test fun aCachedCheckUpdatesOnlyInstalledFamiliesAndKeepsOlderBuildsAndSelections() { + @Test fun aCachedCheckUpdatesOnlyInstalledFamiliesAndReplacesOlderDroidDeckProton() { val older = install("DroidDeck-Proton-11-11.1") val request = File(root, "root/.local/share/droiddeck-compat/request.json").apply { parentFile!!.mkdirs() @@ -97,8 +97,8 @@ class ProtonMenuAutoTest { val before = request.readText() assertFalse(ProtonExtras.checkLatest(activity)) menu.checkUpdates() - waitUntil { menu.protonRows.singleOrNull { it.id == "droiddeck" }?.installed == "DroidDeck-Proton-11-12" && menu.protonBusyId == null } - assertTrue(older.isDirectory) + waitUntil { menu.protonRows.singleOrNull { it.id == "droiddeck" }?.installed == "DroidDeck-Proton-11-12" && menu.protonBusyId == null && !older.exists() } + assertEquals(listOf("DroidDeck-Proton-11-12"), ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == "droiddeck" })) assertEquals(before, request.readText()) assertTrue(ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == "ge" }).isEmpty()) assertTrue(ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == "cachyos" }).isEmpty()) @@ -128,7 +128,7 @@ class ProtonMenuAutoTest { @Test fun aFailedUpdateDoesNotLoopOrBlockOtherInstalledFamilies() { val ge = install("GE-Proton11-11") - val dd = install("DroidDeck-Proton-11-11.1") + install("DroidDeck-Proton-11-11.1") menu.installer = { tool, _ -> attempts.add(tool.id) if (tool.id == "ge") throw IllegalStateException("download failed") @@ -138,10 +138,10 @@ class ProtonMenuAutoTest { menu.ensureAutoUpdates() waitUntil { menu.protonBusyId == null } menu.ensureAutoUpdates() - shadowOf(Looper.getMainLooper()).idle() + waitUntil { menu.protonBusyId == null } assertEquals(listOf("ge", "droiddeck"), attempts) assertTrue(ge.isDirectory) - assertTrue(dd.isDirectory) + assertEquals(listOf("DroidDeck-Proton-11-12"), ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == "droiddeck" })) assertNull(menu.protonStage) assertEquals(-1, menu.protonPercent) } @@ -184,6 +184,31 @@ class ProtonMenuAutoTest { assertEquals("DroidDeck-Proton-11-12", ProtonExtras.installed(activity, ProtonExtras.tools.first { it.id == "droiddeck" })) } + @Test fun droidDeckProtonIsInstalledWhenMissingUnlessTheUserRemovedIt() { + menu.installer = { tool, _ -> attempts.add(tool.id); install("${tool.prefix}-11-12"); null } + ProtonExtras.setDeclined(activity, true) + menu.ensureAutoUpdates() + assertNull(menu.protonBusyId) + assertTrue(attempts.isEmpty()) + ProtonExtras.setDeclined(activity, false) + menu.ensureAutoUpdates() + waitUntil { menu.protonBusyId == null } + assertEquals(listOf("droiddeck"), attempts) + assertEquals("DroidDeck-Proton-11-12", ProtonExtras.installed(activity, ProtonExtras.tools.first { it.id == "droiddeck" })) + assertTrue(ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == "ge" }).isEmpty()) + menu.removeProton("droiddeck") + waitUntil { menu.protonBusyId == null } + assertTrue(ProtonExtras.declined(activity)) + menu.installer = { _, _ -> "failed" } + menu.installProton("droiddeck") + waitUntil { menu.protonBusyId == null } + assertTrue(ProtonExtras.declined(activity)) + menu.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } + menu.installProton("droiddeck") + waitUntil { menu.protonBusyId == null } + assertFalse(ProtonExtras.declined(activity)) + } + @Test fun aPendingAnimatedLaunchPreventsAnAutomaticInstall() { install("DroidDeck-Proton-11-11.1") val launcher = Robolectric.buildActivity(FrontEndActivity::class.java).get() diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentsCarryOverTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentsCarryOverTest.kt new file mode 100644 index 0000000000..60c1104516 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentsCarryOverTest.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.session + +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner + +@RunWith(RobolectricTestRunner::class) +class ComponentsCarryOverTest { + @Test + fun swappedPackagesFollowTheBuildThatReplacesTheirProton() { + val state = JSONObject(""" + {"active": {"DroidDeck-Proton_11-11.2": { + "dxvk": {"file": "dxvk-2.7.wcp", "label": "2.7", "protonVersion": "11-11.2"}, + "vkd3d": {"file": "original 11-11.1", "label": "Original from 11-11.1"}, + "fex": {"file": "gone.wcp", "label": "old"}}}, + "queued": {"DroidDeck-Proton_11-11.2": { + "vkd3d": {"kind": "package", "file": "vkd3d-3.0.wcp", "label": "3.0"}, + "fex": {"kind": "original", "protonVersion": "11-11.1", "label": "Original 11-11.1"}}}} + """.trimIndent()) + val carried = ComponentsManager.carried(state, "DroidDeck-Proton_11-11.2") { it != "gone.wcp" } + assertEquals(setOf("dxvk", "vkd3d"), carried.keys) + assertEquals("package", carried.getValue("dxvk").getString("kind")) + assertEquals("dxvk-2.7.wcp", carried.getValue("dxvk").getString("file")) + assertEquals("2.7", carried.getValue("dxvk").getString("label")) + assertEquals("vkd3d-3.0.wcp", carried.getValue("vkd3d").getString("file")) + assertEquals(emptyMap(), ComponentsManager.carried(state, "GE-Proton11-7") { true }) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/ProtonDefaultTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ProtonDefaultTest.kt index fcf85ddb99..5f0651bf25 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonDefaultTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonDefaultTest.kt @@ -103,4 +103,28 @@ class ProtonDefaultTest { assertNull(ProtonDefault.gameSelectedId(context, "42", listOf(proton("GE-Proton11-7", false)))) assertEquals(ProtonDefault.GameChoice(false, "GE-Proton9-1"), ProtonDefault.parseGames(file.readText())["42"]) } + + @Test + fun aReplacedBuildsPerGamePicksMoveToTheNewest() { + val old = ProtonDefault.GameChoice(false, "DroidDeck-Proton 11-11.2") + val ge = ProtonDefault.GameChoice(false, "GE-Proton11-7") + val valve = ProtonDefault.GameChoice(true, "DroidDeck-Proton 11-11.2") + val moved = ProtonDefault.movedGames(mapOf("42" to old, "43" to ge, "44" to null, "45" to valve), setOf("DroidDeck-Proton 11-11.2"), "DroidDeck-Proton 11-11.4") + assertEquals(mapOf("42" to ProtonDefault.GameChoice(false, "DroidDeck-Proton 11-11.4"), "43" to ge, "44" to null, "45" to valve), moved) + assertNull(ProtonDefault.movedGames(mapOf("43" to ge, "44" to null), setOf("DroidDeck-Proton 11-11.2"), "DroidDeck-Proton 11-11.4")) + } + + @Test + fun movingPicksRewritesTheGamesFile() { + val context = RuntimeEnvironment.getApplication() + val file = File(LinuxRuntime.rootDir(context), "root/.local/share/droiddeck-compat/games.json") + file.parentFile?.deleteRecursively() + ProtonDefault.requestGame(context, "42", proton("DroidDeck-Proton 11-11.2", false)) + ProtonDefault.requestGame(context, "43", null) + ProtonDefault.moveGames(context, setOf("DroidDeck-Proton 11-11.2"), "DroidDeck-Proton 11-11.4") + val games = ProtonDefault.parseGames(file.readText()) + assertEquals(ProtonDefault.GameChoice(false, "DroidDeck-Proton 11-11.4"), games["42"]) + assertTrue(games.containsKey("43")) + assertNull(games["43"]) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt index 63dc1efd61..411268ef69 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt @@ -198,4 +198,35 @@ class ProtonExtrasTest { ComponentsManager.forgetProton(context, kept.name) assertTrue(File(originals, "GE-Proton11-8/GE-Proton11-8/dxvk.wcp").isFile) } + + @Test + fun anUpdateKeepsTheUsersProtonSettingsFile() { + val context = RuntimeEnvironment.getApplication() + val tools = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/compatibilitytools.d") + tools.deleteRecursively() + File(installTool(tools, "DroidDeck-Proton 11-11.1"), "user_settings.py").writeText("old") + File(installTool(tools, "DroidDeck-Proton 11-11.4"), "user_settings.py").writeText("mine") + installTool(tools, "DroidDeck-Proton 11-11.5") + ProtonExtras.tidy(context) + assertEquals(listOf("DroidDeck-Proton 11-11.5"), ProtonExtras.installedAll(context, tool("droiddeck"))) + assertEquals("mine", File(tools, "DroidDeck-Proton 11-11.5/user_settings.py").readText()) + } + + @Test + fun droidDeckProtonIsFetchedWhenMissingUnlessTheUserRemovedIt() { + val context = RuntimeEnvironment.getApplication() + val tools = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/compatibilitytools.d") + tools.deleteRecursively() + File(context.filesDir, "proton-latest.json").writeText( + """{"droiddeck":{"tag":"DroidDeck-Proton-11-11.4","at":1},"ge":{"tag":"GE-Proton11-7","at":1}}""") + ProtonExtras.setDeclined(context, false) + assertEquals("DroidDeck-Proton-11-11.4", ProtonExtras.missing(context, tool("droiddeck"))) + assertNull(ProtonExtras.missing(context, tool("ge"))) + ProtonExtras.setDeclined(context, true) + assertNull(ProtonExtras.missing(context, tool("droiddeck"))) + ProtonExtras.setDeclined(context, false) + installTool(tools, "DroidDeck-Proton 11-11.2") + assertNull(ProtonExtras.missing(context, tool("droiddeck"))) + assertEquals("DroidDeck-Proton-11-11.4", ProtonExtras.update(context, tool("droiddeck"))) + } } diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 29fe4f8e43..601fea186c 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -1219,6 +1219,32 @@ def requested_games(requests, catalog, runnable=None): return resolved +OWN_PROTON = "DroidDeck-Proton" +ARCH_WORDS = re.compile(r"(?i)aarch64|arm64|x86_64|x86-64|amd64") + + +def own_builds(tools): + return [t for t in tools if isinstance(t, dict) and not t.get("valve") and + isinstance(t.get("dir"), str) and t["dir"].startswith(OWN_PROTON) and t.get("name")] + + +def build_key(name): + return [int(n) for n in re.findall(r"\d+", ARCH_WORDS.sub(" ", name))] + + +def own_proton_moves(state, catalog): + names = {t["name"] for t in catalog} + before = state.get("tools") if isinstance(state.get("tools"), list) else () + seen = state.get("own_builds") if isinstance(state.get("own_builds"), list) else [] + known = {n for n in seen if isinstance(n, str)} | {t["name"] for t in own_builds(before)} | {t["name"] for t in own_builds(catalog)} + state["own_builds"] = sorted(known) + builds = own_builds(catalog) + if not builds: + return None, set() + newest = max(builds, key=lambda t: (build_key(t["dir"]), t["dir"]))["name"] + return newest, known - names + + def now_ms(): import time return int(time.time() * 1000) @@ -1379,11 +1405,26 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non catalog = tool_catalog(os.path.dirname(os.path.dirname(os.path.abspath(config_path))), dict(protect) if isinstance(protect, dict) else {name: name for name in protect}) names = [t["name"] for t in catalog] + newest, gone = own_proton_moves(state, catalog) + previous, applied, chosen = state.get("default"), state.get("applied"), state.get("seq") if default is None: if settle: default, state = choose_default(current.get("0", ""), state, read_json(state_path("request.json", directory)), catalog) else: default = state.get("default") if state.get("default") in names else TOOL + if settle and newest and default == TOOL and state.get("applied") == applied and state.get("seq") == chosen and ( + previous in gone or not state.get("own_proton")): + default = newest + state.update(default=newest, seq=now_ms(), source="update") + if settle and newest: + state["own_proton"] = True + if newest: + for app, name in list(current.items()): + if app != "0" and name in gone: + set_mapping(tokens, mapping, app, newest) + current[app] = newest + if isinstance(state.get("auto"), dict): + state["auto"] = {app: newest if name in gone else name for app, name in state["auto"].items()} steam_root = os.path.dirname(os.path.dirname(os.path.abspath(config_path))) requests = settled_game_requests(state, current, catalog, not steam_running(), directory) overrides = requested_games(requests or {}, catalog) diff --git a/tools/tests/test_droiddeck_proton_default.py b/tools/tests/test_droiddeck_proton_default.py new file mode 100644 index 0000000000..6c0665d571 --- /dev/null +++ b/tools/tests/test_droiddeck_proton_default.py @@ -0,0 +1,95 @@ +import json +import runpy +import tempfile +import unittest +from pathlib import Path + +BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" +COMPAT = runpy.run_path(str(BIN / "steam-compatibility")) +TOOL = COMPAT["TOOL"] +OLD = {"name": "DroidDeck-Proton-11-11.2", "display": "DroidDeck-Proton 11-11.2", "dir": "DroidDeck-Proton 11-11.2", "valve": False} +NEW = {"name": "DroidDeck-Proton-11-11.4", "display": "DroidDeck-Proton 11-11.4", "dir": "DroidDeck-Proton 11-11.4", "valve": False} +VALVE = {"name": TOOL, "display": "Proton Experimental ARM64", "dir": "Proton - Experimental (ARM64)", "valve": True} +GE = {"name": "GE-Proton11-7", "display": "GE-Proton11-7", "dir": "GE-Proton11-7", "valve": False} + + +def config_text(entries): + mapping = "".join('"%s" { "name" "%s" "config" "" "priority" "%s" }' % (app, name, "75" if app == "0" else "250") for app, name in entries) + return '"InstallConfigStore" { "Software" { "Valve" { "Steam" { "CompatToolMapping" { %s } } } } }' % mapping + + +class DroidDeckProtonDefaultTest(unittest.TestCase): + def run_default(self, state, mapping, catalog, apps=(), request=None, settle=True): + with tempfile.TemporaryDirectory() as tmp: + directory = Path(tmp) + (directory / "state.json").write_text(json.dumps(state)) + if request is not None: + (directory / "request.json").write_text(json.dumps(request)) + config = directory / "config.vdf" + config.write_text(config_text(mapping)) + default = COMPAT["register_default"](str(config), list(apps), catalog=catalog, directory=str(directory), settle=settle) + return default, COMPAT["read_config_mapping"](str(config)), json.loads((directory / "state.json").read_text()) + + def test_a_replacement_seen_while_steam_runs_still_moves_the_default_later(self): + _, mapping, state = self.run_default( + {"default": OLD["name"], "own_proton": True, "tools": [VALVE, OLD]}, [("0", OLD["name"])], [VALVE, NEW], settle=False) + self.assertEqual(state["tools"], [VALVE, NEW]) + self.assertIn(OLD["name"], state["own_builds"]) + default, mapping, state = self.run_default(state, [("0", OLD["name"])], [VALVE, NEW]) + self.assertEqual(default, NEW["name"]) + self.assertEqual(mapping, {"0": NEW["name"]}) + + def test_a_valve_default_picked_in_steam_after_a_replacement_is_kept(self): + default, mapping, _ = self.run_default( + {"default": OLD["name"], "own_proton": True, "tools": [VALVE, OLD]}, [("0", TOOL)], [VALVE, NEW]) + self.assertEqual(default, TOOL) + self.assertEqual(mapping, {"0": TOOL}) + + def test_the_first_start_with_droiddeck_proton_makes_it_the_default_for_following_titles(self): + default, mapping, state = self.run_default( + {"default": TOOL, "auto": {"42": TOOL}}, [("0", TOOL), ("42", TOOL), ("43", TOOL)], [VALVE, NEW], ["42", "43"]) + self.assertEqual(default, NEW["name"]) + self.assertEqual(mapping, {"0": NEW["name"], "42": NEW["name"], "43": TOOL}) + self.assertEqual(state["default"], NEW["name"]) + self.assertTrue(state["own_proton"]) + + def test_a_default_picked_after_the_switch_is_kept(self): + default, mapping, state = self.run_default( + {"default": NEW["name"], "own_proton": True, "applied": 1, "tools": [VALVE, NEW]}, + [("0", NEW["name"])], [VALVE, NEW], request={"seq": 2, "valve": True, "dir": VALVE["dir"]}) + self.assertEqual(default, TOOL) + self.assertEqual(mapping, {"0": TOOL}) + default, mapping, state = self.run_default( + {"default": TOOL, "own_proton": True, "tools": [VALVE, NEW]}, [("0", TOOL)], [VALVE, NEW]) + self.assertEqual(default, TOOL) + self.assertEqual(mapping, {"0": TOOL}) + + def test_a_replaced_build_moves_its_default_and_titles_to_the_newest(self): + default, mapping, state = self.run_default( + {"default": OLD["name"], "own_proton": True, "auto": {"42": OLD["name"]}, "tools": [VALVE, OLD, GE]}, + [("0", OLD["name"]), ("42", OLD["name"]), ("43", OLD["name"]), ("44", GE["name"]), ("45", TOOL)], + [VALVE, NEW, GE], ["42", "43", "44", "45"]) + self.assertEqual(default, NEW["name"]) + self.assertEqual(mapping, {"0": NEW["name"], "42": NEW["name"], "43": NEW["name"], "44": GE["name"], "45": TOOL}) + self.assertEqual(state["auto"], {"42": NEW["name"]}) + + def test_a_replaced_build_does_not_override_a_valve_default(self): + default, mapping, _ = self.run_default( + {"default": TOOL, "own_proton": True, "tools": [VALVE, OLD]}, [("0", TOOL), ("43", OLD["name"])], [VALVE, NEW], ["43"]) + self.assertEqual(default, TOOL) + self.assertEqual(mapping, {"0": TOOL, "43": NEW["name"]}) + + def test_nothing_changes_without_droiddeck_proton(self): + default, mapping, state = self.run_default({"default": TOOL}, [("0", TOOL)], [VALVE, GE]) + self.assertEqual(default, TOOL) + self.assertEqual(mapping, {"0": TOOL}) + self.assertNotIn("own_proton", state) + + def test_the_newest_build_is_found_by_version(self): + newest, gone = COMPAT["own_proton_moves"]({"tools": [OLD]}, [dict(NEW, name="a", dir="DroidDeck-Proton 11-9.10"), dict(NEW, name="b", dir="DroidDeck-Proton 11-11.1")]) + self.assertEqual(newest, "b") + self.assertEqual(gone, {OLD["name"]}) + + +if __name__ == "__main__": + unittest.main() From 6ef2bcc9c5608603d1529ca872aeca509593a828 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sun, 25 Oct 2026 10:09:42 -0400 Subject: [PATCH 006/135] docs: Star History rank badge above the awards --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 653df9f720..9cfb7a1653 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ DroidDeck brings the SteamOS experience to Android: Valve's Steam client in Big