diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index eaec48d8f1..9aa715fcfe 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -124,6 +124,7 @@ class MainActivity : ComponentActivity() { private var zinkLazy by mutableStateOf(false) private var noXalia by mutableStateOf(false) private var prootNoSeccomp by mutableStateOf(false) + private var guestHostname by mutableStateOf(SessionPrefs.DEFAULT_GUEST_HOSTNAME) private var phantomWarning by mutableStateOf(null) private var phantomProcessStatus by mutableStateOf(PhantomProcessStatus.NOT_APPLICABLE) private var showPhantomGate by mutableStateOf(false) @@ -864,7 +865,7 @@ class MainActivity : ComponentActivity() { cores = CpuCores.all.map { c -> CoreRow(c, "cpu$c" + (CpuCores.maxGhz(c)?.let { String.format(java.util.Locale.US, " ยท %.1f GHz", it) } ?: "")) }, clientOverride = clientOverride, clientCores = clientCores, gameCores = gameCores, tuSysmem = tuSysmem, zinkLazy = zinkLazy, glThread = glThread, noGlError = noGlError, steamDeckMode = steamDeckMode, noXalia = noXalia, - prootNoSeccomp = prootNoSeccomp, phantomWarning = phantomWarning, + prootNoSeccomp = prootNoSeccomp, guestHostname = guestHostname, phantomWarning = phantomWarning, onClientOverride = { on -> SessionPrefs.setClientCpusOverride(this, on); clientOverride = on }, onTuSysmem = { on -> SessionPrefs.setTuSysmem(this, on); tuSysmem = on }, onZinkLazy = { on -> SessionPrefs.setZinkLazy(this, on); zinkLazy = on }, @@ -873,6 +874,7 @@ class MainActivity : ComponentActivity() { onSteamDeckMode = { on -> SessionPrefs.setSteamDeckMode(this, on); steamDeckMode = on }, onNoXalia = { on -> SessionPrefs.setNoXalia(this, on); noXalia = on }, onProotNoSeccomp = { on -> SessionPrefs.setProotNoSeccomp(this, on); prootNoSeccomp = on }, + onGuestHostname = { name -> SessionPrefs.setGuestHostname(this, name) }, onClientCore = { core, on -> clientCores = if (on) clientCores + core else clientCores - core SessionPrefs.setClientCpus(this, CpuCores.format(clientCores)) @@ -965,6 +967,7 @@ class MainActivity : ComponentActivity() { zinkLazy = SessionPrefs.zinkLazy(this) noXalia = SessionPrefs.noXalia(this) prootNoSeccomp = SessionPrefs.prootNoSeccomp(this) + guestHostname = SessionPrefs.guestHostname(this) refreshPhantomStatus() } 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 9ff0c002a6..4505f5cd4c 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -147,6 +147,7 @@ object DeviceReport { k("FEX preset", SessionPrefs.fexPreset(context).ifEmpty { "FEX defaults" }) k("Skip xalia", SessionPrefs.noXalia(context)) k("proot without seccomp", SessionPrefs.prootNoSeccomp(context)) + k("Guest host name", SessionPrefs.guestHostname(context)) k("DirectAudio for games", SessionPrefs.directAudio(context)) k("Stretch games to fill", SessionPrefs.forceFullscreen(context)) k("Client audio", if (SessionPrefs.clientDirectAudio(context)) "DirectAudio" else "classic") 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 816d7c3ad2..c8875dadef 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -6,6 +6,7 @@ import android.system.ErrnoException; import android.system.Os; import android.system.StructStat; import android.system.StructUtsname; +import com.droiddeck.launcher.session.SessionPrefs; import java.io.File; @@ -33,7 +34,6 @@ public final class LinuxRuntime { /** Shortcut extra naming which of the modes above a Linux entry launches. */ public static final String EXTRA_LINUX_MODE = "linux_mode"; private static final String KGSL_DEVICE = "/dev/kgsl-3d0"; - private static final String GUEST_HOSTNAME = "DroidDeck"; /** Where every Linux session's debug log lands: public, so a user can just hand the folder over. */ public static final String DEBUG_LOG_DIR = "DroidDeck"; @@ -119,7 +119,7 @@ public final class LinuxRuntime { cmd.add(prootBinary(context).getPath()); cmd.add("--kill-on-exit"); // Preserve the host kernel identity while giving the guest the app's branded host name. - cmd.add("--kernel-release=" + guestUtsname()); + cmd.add("--kernel-release=" + guestUtsname(SessionPrefs.guestHostname(context))); // Android's app seccomp policy traps the whole set*id family. Xwayland's Popen() calls // setgid()/setuid() before it execs xkbcomp and _exit(127)s when they fail, so without // this the keymap never compiles and Xwayland dies. -i makes proot answer those calls @@ -250,9 +250,9 @@ public final class LinuxRuntime { } /** PRoot's complex -k format: sysname, nodename, release, version, machine, domain, HWCAP. */ - private static String guestUtsname() { + private static String guestUtsname(String hostname) { StructUtsname host = Os.uname(); - return "\\" + host.sysname + "\\" + GUEST_HOSTNAME + "\\" + host.release + return "\\" + host.sysname + "\\" + hostname + "\\" + host.release + "\\" + host.version + "\\" + host.machine + "\\localdomain\\-1\\"; } 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 0f3aefe6e4..18e1db90d0 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -211,6 +211,22 @@ object SessionPrefs { prefs(context).edit().putBoolean("prootNoSeccomp", on).apply() } + const val DEFAULT_GUEST_HOSTNAME = "DroidDeck" + + @JvmStatic + fun guestHostname(context: Context): String = + validGuestHostname(prefs(context).getString("guestHostname", null)) ?: DEFAULT_GUEST_HOSTNAME + + fun setGuestHostname(context: Context, name: String) { + val valid = validGuestHostname(name) + prefs(context).edit().apply { if (valid == null) remove("guestHostname") else putString("guestHostname", valid) }.apply() + } + + fun validGuestHostname(name: String?): String? { + val trimmed = name?.trim() ?: return null + return trimmed.takeIf { Regex("[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?").matches(it) } + } + /** Turnip's sysmem rendering (TU_DEBUG=sysmem) for the runtime's driver: bypasses GMEM tiling. */ fun tuSysmem(context: Context): Boolean = prefs(context).getBoolean("tuSysmem", false) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt index 7fac4329ba..41b425092a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt @@ -7,15 +7,22 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField 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.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.session.SessionPrefs class CoreRow(val core: Int, val label: String) @@ -32,6 +39,7 @@ fun PerformancePage( steamDeckMode: Boolean, noXalia: Boolean, prootNoSeccomp: Boolean, + guestHostname: String, phantomWarning: String?, onClientOverride: (Boolean) -> Unit, onTuSysmem: (Boolean) -> Unit, @@ -41,6 +49,7 @@ fun PerformancePage( onSteamDeckMode: (Boolean) -> Unit, onNoXalia: (Boolean) -> Unit, onProotNoSeccomp: (Boolean) -> Unit, + onGuestHostname: (String) -> Unit, onClientCore: (Int, Boolean) -> Unit, onGameCore: (Int, Boolean) -> Unit, onDismiss: () -> Unit, @@ -50,7 +59,7 @@ fun PerformancePage( val coreItems = cores.map { it.core to it.label } SettingsPage( host, title = "Performance", - lede = "CPU cores and session fixes. Applies next session.", + lede = "CPU cores, session fixes and the host name. Applies next session.", onBack = onDismiss, ) { SettingsGroup("Steam client cores") { @@ -110,6 +119,25 @@ fun PerformancePage( prootNoSeccomp, onChange = onProotNoSeccomp, ) } + SettingsGroup("Session identity") { + var draft by remember(guestHostname) { mutableStateOf(guestHostname) } + val valid = SessionPrefs.validGuestHostname(draft) != null + SettingsRow( + "Host name", + if (valid || draft.isBlank()) "What the session and Steam report as this machine's name. Blank restores ${SessionPrefs.DEFAULT_GUEST_HOSTNAME}." + else "Letters, digits and inner hyphens only, up to 63 characters. Not saved until it is valid.", + ) { + OutlinedTextField( + draft, { v -> + draft = v.take(63) + if (draft.isBlank() || SessionPrefs.validGuestHostname(draft) != null) onGuestHostname(draft) + }, + singleLine = true, isError = !valid && draft.isNotBlank(), + placeholder = { Text(SessionPrefs.DEFAULT_GUEST_HOSTNAME) }, + modifier = Modifier.width(220.dp), + ) + } + } if (phantomWarning != null) { Spacer(Modifier.height(16.dp)) Column( diff --git a/app/src/test/java/com/droiddeck/launcher/session/GuestHostnameTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GuestHostnameTest.kt new file mode 100644 index 0000000000..23329a6af2 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/GuestHostnameTest.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class GuestHostnameTest { + @Test fun validLabelsAreKept() { + assertEquals("localhost", SessionPrefs.validGuestHostname("localhost")) + assertEquals("Fold8-Steam", SessionPrefs.validGuestHostname("Fold8-Steam")) + assertEquals("a", SessionPrefs.validGuestHostname("a")) + assertEquals("x".repeat(63), SessionPrefs.validGuestHostname("x".repeat(63))) + } + + @Test fun surroundingSpaceIsTrimmed() { + assertEquals("localhost", SessionPrefs.validGuestHostname(" localhost \n")) + } + + @Test fun anythingElseIsRejected() { + assertNull(SessionPrefs.validGuestHostname(null)) + assertNull(SessionPrefs.validGuestHostname("")) + assertNull(SessionPrefs.validGuestHostname(" ")) + assertNull(SessionPrefs.validGuestHostname("-leading")) + assertNull(SessionPrefs.validGuestHostname("trailing-")) + assertNull(SessionPrefs.validGuestHostname("two words")) + assertNull(SessionPrefs.validGuestHostname("dotted.name")) + assertNull(SessionPrefs.validGuestHostname("back\\slash")) + assertNull(SessionPrefs.validGuestHostname("x".repeat(64))) + } +}