From 3fa05f6c180fe5b1b11721de5c9afc85d8eee8f6 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Wed, 23 Sep 2026 17:16:02 -0400 Subject: [PATCH 01/65] Add Back shortcuts for session menu and Steam QAM --- .../com/steamdeck/launcher/MainActivity.kt | 7 +++ .../com/steamdeck/launcher/SessionActivity.kt | 48 +++++++++++++++---- .../launcher/session/SessionPrefs.kt | 7 +++ .../launcher/ui/ModeSettingsDialog.kt | 9 ++++ .../steamdeck/launcher/ui/SessionOverlay.kt | 8 ++++ docs/progress-log.md | 4 +- 6 files changed, 74 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/steamdeck/launcher/MainActivity.kt b/app/src/main/java/com/steamdeck/launcher/MainActivity.kt index 1fc000a148..01db50bd76 100644 --- a/app/src/main/java/com/steamdeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/steamdeck/launcher/MainActivity.kt @@ -169,6 +169,7 @@ class MainActivity : ComponentActivity() { private var touchMode by mutableStateOf(SessionPrefs.TOUCH_AUTO) private var suspendPolicy by mutableStateOf(SessionPrefs.SUSPEND_MANUAL) private var oscMode by mutableStateOf(SessionPrefs.OSC_AUTO) + private var backActionsInverted by mutableStateOf(false) private var renderer by mutableStateOf("pixman") private var gameStorage by mutableStateOf("") private var storageOptions by mutableStateOf>>(emptyList()) @@ -515,6 +516,7 @@ class MainActivity : ComponentActivity() { touchMode = touchMode, suspendPolicy = suspendPolicy, oscMode = if (mode == SessionService.MODE_STEAM) oscMode else null, + backActionsInverted = backActionsInverted, directAudio = if (mode == SessionService.MODE_STEAM) directAudio else null, clientDirectAudio = clientDirectAudio, mic = if (mode == SessionService.MODE_STEAM) mic else null, @@ -546,6 +548,10 @@ class MainActivity : ComponentActivity() { onTouch = { t -> SessionPrefs.setTouchMode(this, t); touchMode = t }, onSuspendPolicy = { policy -> SessionPrefs.setSuspendPolicy(this, mode, policy); suspendPolicy = policy }, onOsc = { o -> SessionPrefs.setOscMode(this, o); oscMode = o }, + onBackActionsInverted = { inverted -> + SessionPrefs.setBackActionsInverted(this, inverted) + backActionsInverted = inverted + }, onDirectAudio = { on -> SessionPrefs.setDirectAudio(this, on); directAudio = on }, onClientDirectAudio = { on -> SessionPrefs.setClientDirectAudio(this, on); clientDirectAudio = on }, onMic = { on -> @@ -641,6 +647,7 @@ class MainActivity : ComponentActivity() { touchMode = SessionPrefs.touchMode(this) suspendPolicy = SessionPrefs.suspendPolicy(this, mode) oscMode = SessionPrefs.oscMode(this) + backActionsInverted = SessionPrefs.backActionsInverted(this) directAudio = SessionPrefs.directAudio(this) clientDirectAudio = SessionPrefs.clientDirectAudio(this) mic = SessionPrefs.micEnabled(this) diff --git a/app/src/main/java/com/steamdeck/launcher/SessionActivity.kt b/app/src/main/java/com/steamdeck/launcher/SessionActivity.kt index 72cc3e36fc..608f3652f3 100644 --- a/app/src/main/java/com/steamdeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/steamdeck/launcher/SessionActivity.kt @@ -85,9 +85,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var cursorVisible by mutableStateOf(false) private val cursorHide = Runnable { cursorVisible = false } private val uiHandler = Handler(Looper.getMainLooper()) + private var pendingBackAction: Runnable? = null // Compose reads these; the activity writes them. private var drawerOpen by mutableStateOf(false) + private var backActionsInverted by mutableStateOf(false) private var hudOn by mutableStateOf(true) private var frameGenLabel by mutableStateOf("Off") private var frameGenEngine by mutableStateOf(FrameGen.ENGINE_OFF) @@ -200,10 +202,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }, onKeyboard = { drawerOpen = false; keyboard?.toggle() }, onSteamMenu = if (SessionState.mode == SessionService.MODE_STEAM) ({ sendSteamGuide() }) else null, - onQam = if (SessionState.mode == SessionService.MODE_STEAM) ({ - drawerOpen = false - padBridge?.triggerQam() - }) else null, + onQam = if (SessionState.mode == SessionService.MODE_STEAM) ({ triggerSteamQam() }) else null, + backActionsInverted = backActionsInverted, + onBackActionsInverted = { inverted -> + SessionPrefs.setBackActionsInverted(this@SessionActivity, inverted) + backActionsInverted = inverted + }, onOsc = { v -> SessionPrefs.setOscMode(this@SessionActivity, v); readPrefs(); updateOnScreenControls() }, onTouch = { v -> SessionPrefs.setTouchMode(this@SessionActivity, v); readPrefs() }, onShape = { v -> SessionPrefs.setShapeMode(this@SessionActivity, v); readPrefs() }, @@ -240,12 +244,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } SessionState.endListener = endListener - // Back opens the drawer (and closes it again). Leaving the session running in the - // background and ending it are both actions in there, so neither can happen by accident - // from a button a game might also be reading. + // A single Back opens the session menu; two quick presses/swipes send the Steam QAM chord. + // The single action waits out the double-press window so the two actions stay distinct. onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) { override fun handleOnBackPressed() { - drawerOpen = !drawerOpen + routeBackAction() } }) watchSession() @@ -264,6 +267,32 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }, 90) } + private fun triggerSteamQam() { + drawerOpen = false + padBridge?.triggerQam() + } + + private fun routeBackAction() { + pendingBackAction?.let { pending -> + uiHandler.removeCallbacks(pending) + pendingBackAction = null + performBackAction(double = true) + return + } + val pending = Runnable { + pendingBackAction = null + performBackAction(double = false) + } + pendingBackAction = pending + uiHandler.postDelayed(pending, android.view.ViewConfiguration.getDoubleTapTimeout().toLong()) + } + + private fun performBackAction(double: Boolean) { + val isSteam = SessionState.mode == SessionService.MODE_STEAM + val opensQam = isSteam && (double xor backActionsInverted) + if (opensQam) triggerSteamQam() else drawerOpen = !drawerOpen + } + private fun handleHomeGuideIntent(incoming: Intent?) { if (incoming?.action != SessionService.ACTION_HOME_GUIDE) return incoming.action = null @@ -280,6 +309,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { fexPreset = SessionPrefs.fexPreset(this) oscMode = SessionPrefs.oscMode(this) shapeMode = SessionPrefs.shapeMode(this) + backActionsInverted = SessionPrefs.backActionsInverted(this) } // ── Compositor ────────────────────────────────────────────────────────────────────────── @@ -957,6 +987,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { // Deliberately does NOT end the session: this activity can be destroyed while the user is // in another app, and the whole point of the service is that Steam survives that. watching = false + pendingBackAction?.let(uiHandler::removeCallbacks) + pendingBackAction = null closeSecondScreen(reset = true) if (::hud.isInitialized) hud.stop() padBridge?.stop() diff --git a/app/src/main/java/com/steamdeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/steamdeck/launcher/session/SessionPrefs.kt index 17a399e93d..4b4637c847 100644 --- a/app/src/main/java/com/steamdeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/steamdeck/launcher/session/SessionPrefs.kt @@ -21,6 +21,13 @@ object SessionPrefs { prefs(context).edit().putBoolean("hud", on).apply() } + /** When enabled, a single Back opens Steam QAM and a double Back opens the session menu. */ + fun backActionsInverted(context: Context): Boolean = prefs(context).getBoolean("backActionsInverted", false) + + fun setBackActionsInverted(context: Context, inverted: Boolean) { + prefs(context).edit().putBoolean("backActionsInverted", inverted).apply() + } + const val TOUCH_AUTO = "auto" const val TOUCH_PAD = "touchpad" const val TOUCH_DIRECT = "direct" diff --git a/app/src/main/java/com/steamdeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/steamdeck/launcher/ui/ModeSettingsDialog.kt index c2f2bccbb9..0956068777 100644 --- a/app/src/main/java/com/steamdeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/steamdeck/launcher/ui/ModeSettingsDialog.kt @@ -46,6 +46,8 @@ class ModeSettings( val suspendPolicy: String, /** Steam only. */ val oscMode: String?, + /** Steam only: whether single and double Back actions are swapped. */ + val backActionsInverted: Boolean = false, val directAudio: Boolean?, val clientDirectAudio: Boolean = false, val mic: Boolean?, @@ -91,6 +93,7 @@ class ModeSettingsActions( val onTouch: (String) -> Unit, val onSuspendPolicy: (String) -> Unit, val onOsc: (String) -> Unit, + val onBackActionsInverted: (Boolean) -> Unit = {}, val onDirectAudio: (Boolean) -> Unit, val onClientDirectAudio: (Boolean) -> Unit = {}, val onMic: (Boolean) -> Unit, @@ -226,6 +229,12 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { ), s.oscMode, note = "Auto shows all controls without a controller. Steam + QAM shows only those buttons.", onPick = a.onOsc, ) + if (steam) ToggleRow( + host, "back-actions", "Invert Back actions", + if (s.backActionsInverted) "Back once opens Steam QAM; twice opens the session menu." + else "Back once opens the session menu; twice opens Steam QAM.", + s.backActionsInverted, onChange = a.onBackActionsInverted, + ) } SettingsGroup("Session") { ChoiceRow( diff --git a/app/src/main/java/com/steamdeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/steamdeck/launcher/ui/SessionOverlay.kt index cad64176b5..da52109c7e 100644 --- a/app/src/main/java/com/steamdeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/steamdeck/launcher/ui/SessionOverlay.kt @@ -146,6 +146,7 @@ class DrawerActions( val frameGenMultiplier: Int, val lsfgReady: Boolean, val oscMode: String, + val backActionsInverted: Boolean, val touchMode: String, val touchAuto: String, val shapeMode: String, @@ -159,6 +160,7 @@ class DrawerActions( val onSteamMenu: (() -> Unit)?, val onQam: (() -> Unit)?, val onOsc: (String) -> Unit, + val onBackActionsInverted: (Boolean) -> Unit, val onTouch: (String) -> Unit, val onShape: (String) -> Unit, val onFexPreset: (String) -> Unit, @@ -296,6 +298,12 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { listOf(SessionPrefs.OSC_AUTO to "Auto", SessionPrefs.OSC_ALWAYS to "Always", SessionPrefs.OSC_STEAM_QAM to "Steam + QAM", SessionPrefs.OSC_NEVER to "Never"), a.oscMode, onPick = a.onOsc, ) + if (a.steam) ToggleRow( + host, "back-actions", "Invert Back actions", + if (a.backActionsInverted) "Back once opens Steam QAM; twice opens the session menu." + else "Back once opens the session menu; twice opens Steam QAM.", + a.backActionsInverted, onChange = a.onBackActionsInverted, + ) ActionRow("Keyboard", null, "Show") { host.open = null; a.onKeyboard() } } diff --git a/docs/progress-log.md b/docs/progress-log.md index ac6c752667..254fe6f62c 100644 --- a/docs/progress-log.md +++ b/docs/progress-log.md @@ -188,7 +188,9 @@ State: **main = `90c7574`** (PR #14 merge), main build run 35895701784. No tag, - Thor Pro: trackpad tap; the 1–2 min in-game crash once a `crash.log` arrives. - Xfce as a second desktop shell (Max's branch runs XFCE 4.20 on labwc) - a catalog package + a shell choice in the Desktop cog; comfort, not performance. -- Quick Access Menu for non-Deck pads - no confirmed chord; needs research, not a guess. +- Quick Access Menu for non-Deck pads - Back double-press now routes to the existing Guide+A chord; + the in-session and Steam settings can swap the single- and double-Back actions. Device confirmation + is still needed. - FlatOut shrink: try `vk_wsi_force_swapchain_to_current_extent=false` via `steamdeck-env`. - Max's stricter `winnative-directaudio` guards; `winnative-epic-launch` (a feature). - Rename before anything truly public: "SteamDeck" is Valve's mark. From e40b5ced7d349cbf24d5226c217593fb048a6c53 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Wed, 23 Sep 2026 17:26:27 -0400 Subject: [PATCH 02/65] Expose Back actions in app settings --- app/src/main/java/com/steamdeck/launcher/MainActivity.kt | 6 ++++++ .../main/java/com/steamdeck/launcher/SessionActivity.kt | 3 ++- .../main/java/com/steamdeck/launcher/ui/FrontEndScreen.kt | 8 ++++++++ docs/progress-log.md | 6 +++--- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/steamdeck/launcher/MainActivity.kt b/app/src/main/java/com/steamdeck/launcher/MainActivity.kt index 01db50bd76..021019d3ea 100644 --- a/app/src/main/java/com/steamdeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/steamdeck/launcher/MainActivity.kt @@ -211,6 +211,7 @@ class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) theme = SessionPrefs.theme(this) + backActionsInverted = SessionPrefs.backActionsInverted(this) setContent { SteamDeckTheme(theme) { val sm = settingsMode @@ -241,6 +242,7 @@ class MainActivity : ComponentActivity() { packageStage = pkgStage, packagePercent = pkgPercent, sessionRunning = SessionState.running, + backActionsInverted = backActionsInverted, ), FrontEndActions( onPlay = { startSession(Intent(this, SessionActivity::class.java)) }, @@ -301,6 +303,10 @@ class MainActivity : ComponentActivity() { onTheme = { id -> SessionPrefs.setTheme(this, id); theme = id }, onHomeApp = { manageHomeApp() }, onAndroidApp = { app -> launchAndroidApp(app) }, + onBackActionsInverted = { inverted -> + SessionPrefs.setBackActionsInverted(this, inverted) + backActionsInverted = inverted + }, ), page = page, ) diff --git a/app/src/main/java/com/steamdeck/launcher/SessionActivity.kt b/app/src/main/java/com/steamdeck/launcher/SessionActivity.kt index 608f3652f3..181684e2b5 100644 --- a/app/src/main/java/com/steamdeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/steamdeck/launcher/SessionActivity.kt @@ -284,7 +284,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { performBackAction(double = false) } pendingBackAction = pending - uiHandler.postDelayed(pending, android.view.ViewConfiguration.getDoubleTapTimeout().toLong()) + uiHandler.postDelayed(pending, BACK_DOUBLE_PRESS_TIMEOUT_MS) } private fun performBackAction(double: Boolean) { @@ -1005,6 +1005,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { companion object { private const val TAG = "SessionActivity" + private const val BACK_DOUBLE_PRESS_TIMEOUT_MS = 500L /** Compositor scale modes (Container.FULLSCREEN_* values): 1 = fit with bars, centred. */ private const val SCALE_FIT = 1 private const val ALIGN_CENTER = 0 diff --git a/app/src/main/java/com/steamdeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/steamdeck/launcher/ui/FrontEndScreen.kt index fb374b5a51..cff70d69cc 100644 --- a/app/src/main/java/com/steamdeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/steamdeck/launcher/ui/FrontEndScreen.kt @@ -141,6 +141,7 @@ class FrontEndState( val packageStage: String? = null, val packagePercent: Int = -1, val sessionRunning: Boolean = false, + val backActionsInverted: Boolean = false, ) class FrontEndActions( @@ -169,6 +170,7 @@ class FrontEndActions( val onTheme: (String) -> Unit = {}, val onHomeApp: () -> Unit = {}, val onAndroidApp: (com.steamdeck.launcher.HomeApp.LaunchableApp) -> Unit = {}, + val onBackActionsInverted: (Boolean) -> Unit = {}, ) @@ -692,6 +694,12 @@ private fun SetupPanel(s: FrontEndState, a: FrontEndActions) { ActionRow("ROMs folder", s.romsDir ?: "Choose where emulator games are stored", "Choose", a.onRoms) } SettingsGroup("Session") { + ToggleRow( + host, "back-actions", "Invert Back actions", + if (s.backActionsInverted) "Back once opens Steam QAM; twice opens the in-session menu." + else "Back once opens the in-session menu; twice opens Steam QAM.", + s.backActionsInverted, onChange = a.onBackActionsInverted, + ) SettingsRow("Frame generation", "Select the frame generation mode") { Box { ValueChip(s.frameGenLabel, host.open == "fg") { host.open = if (host.open == "fg") null else "fg" } diff --git a/docs/progress-log.md b/docs/progress-log.md index 254fe6f62c..6d3c9282df 100644 --- a/docs/progress-log.md +++ b/docs/progress-log.md @@ -188,9 +188,9 @@ State: **main = `90c7574`** (PR #14 merge), main build run 35895701784. No tag, - Thor Pro: trackpad tap; the 1–2 min in-game crash once a `crash.log` arrives. - Xfce as a second desktop shell (Max's branch runs XFCE 4.20 on labwc) - a catalog package + a shell choice in the Desktop cog; comfort, not performance. -- Quick Access Menu for non-Deck pads - Back double-press now routes to the existing Guide+A chord; - the in-session and Steam settings can swap the single- and double-Back actions. Device confirmation - is still needed. +- Quick Access Menu for non-Deck pads - Back double-press (500 ms) now routes to the existing Guide+A + chord; the in-session menu, Steam settings, and Setup › Session can swap the single- and double-Back + actions. Device confirmation is still needed. - FlatOut shrink: try `vk_wsi_force_swapchain_to_current_extent=false` via `steamdeck-env`. - Max's stricter `winnative-directaudio` guards; `winnative-epic-launch` (a feature). - Rename before anything truly public: "SteamDeck" is Valve's mark. From 06d9b7b1ccc32db3191544b568d49727a363965c Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Wed, 23 Sep 2026 23:05:12 -0400 Subject: [PATCH 03/65] Replace Back inversion toggle with order menu --- .../com/steamdeck/launcher/session/SessionPrefs.kt | 6 ++++++ .../java/com/steamdeck/launcher/ui/FrontEndScreen.kt | 12 +++++++----- .../com/steamdeck/launcher/ui/ModeSettingsDialog.kt | 11 ++++++----- .../java/com/steamdeck/launcher/ui/SessionOverlay.kt | 11 ++++++----- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/steamdeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/steamdeck/launcher/session/SessionPrefs.kt index 4b4637c847..b8cd68dde9 100644 --- a/app/src/main/java/com/steamdeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/steamdeck/launcher/session/SessionPrefs.kt @@ -13,6 +13,12 @@ object SessionPrefs { const val OSC_STEAM_QAM = "steam-qam" const val OSC_NEVER = "never" + const val BACK_MENU_THEN_QAM = "1: menu 2: QAM" + const val BACK_QAM_THEN_MENU = "1: QAM 2: menu" + + fun backActionsOrder(inverted: Boolean): String = + if (inverted) BACK_QAM_THEN_MENU else BACK_MENU_THEN_QAM + private fun prefs(context: Context) = context.getSharedPreferences("session", Context.MODE_PRIVATE) fun hudEnabled(context: Context): Boolean = prefs(context).getBoolean("hud", true) diff --git a/app/src/main/java/com/steamdeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/steamdeck/launcher/ui/FrontEndScreen.kt index cff70d69cc..f01a9dac04 100644 --- a/app/src/main/java/com/steamdeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/steamdeck/launcher/ui/FrontEndScreen.kt @@ -108,6 +108,7 @@ import coil.compose.AsyncImage import com.steamdeck.launcher.R import com.steamdeck.launcher.frontend.Library import com.steamdeck.launcher.gpu.FrameGen +import com.steamdeck.launcher.session.SessionPrefs import java.io.File import kotlin.math.roundToInt @@ -694,11 +695,12 @@ private fun SetupPanel(s: FrontEndState, a: FrontEndActions) { ActionRow("ROMs folder", s.romsDir ?: "Choose where emulator games are stored", "Choose", a.onRoms) } SettingsGroup("Session") { - ToggleRow( - host, "back-actions", "Invert Back actions", - if (s.backActionsInverted) "Back once opens Steam QAM; twice opens the in-session menu." - else "Back once opens the in-session menu; twice opens Steam QAM.", - s.backActionsInverted, onChange = a.onBackActionsInverted, + ChoiceRow( + host, "back-actions", "Back", SessionPrefs.backActionsOrder(s.backActionsInverted), + listOf( + false to SessionPrefs.BACK_MENU_THEN_QAM, + true to SessionPrefs.BACK_QAM_THEN_MENU, + ), s.backActionsInverted, onPick = a.onBackActionsInverted, ) SettingsRow("Frame generation", "Select the frame generation mode") { Box { diff --git a/app/src/main/java/com/steamdeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/steamdeck/launcher/ui/ModeSettingsDialog.kt index 0956068777..9dcf583720 100644 --- a/app/src/main/java/com/steamdeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/steamdeck/launcher/ui/ModeSettingsDialog.kt @@ -229,11 +229,12 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { ), s.oscMode, note = "Auto shows all controls without a controller. Steam + QAM shows only those buttons.", onPick = a.onOsc, ) - if (steam) ToggleRow( - host, "back-actions", "Invert Back actions", - if (s.backActionsInverted) "Back once opens Steam QAM; twice opens the session menu." - else "Back once opens the session menu; twice opens Steam QAM.", - s.backActionsInverted, onChange = a.onBackActionsInverted, + if (steam) ChoiceRow( + host, "back-actions", "Back", SessionPrefs.backActionsOrder(s.backActionsInverted), + listOf( + false to SessionPrefs.BACK_MENU_THEN_QAM, + true to SessionPrefs.BACK_QAM_THEN_MENU, + ), s.backActionsInverted, onPick = a.onBackActionsInverted, ) } SettingsGroup("Session") { diff --git a/app/src/main/java/com/steamdeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/steamdeck/launcher/ui/SessionOverlay.kt index da52109c7e..8556e546fc 100644 --- a/app/src/main/java/com/steamdeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/steamdeck/launcher/ui/SessionOverlay.kt @@ -298,11 +298,12 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { listOf(SessionPrefs.OSC_AUTO to "Auto", SessionPrefs.OSC_ALWAYS to "Always", SessionPrefs.OSC_STEAM_QAM to "Steam + QAM", SessionPrefs.OSC_NEVER to "Never"), a.oscMode, onPick = a.onOsc, ) - if (a.steam) ToggleRow( - host, "back-actions", "Invert Back actions", - if (a.backActionsInverted) "Back once opens Steam QAM; twice opens the session menu." - else "Back once opens the session menu; twice opens Steam QAM.", - a.backActionsInverted, onChange = a.onBackActionsInverted, + if (a.steam) ChoiceRow( + host, "back-actions", "Back", SessionPrefs.backActionsOrder(a.backActionsInverted), + listOf( + false to SessionPrefs.BACK_MENU_THEN_QAM, + true to SessionPrefs.BACK_QAM_THEN_MENU, + ), a.backActionsInverted, onPick = a.onBackActionsInverted, ) ActionRow("Keyboard", null, "Show") { host.open = null; a.onKeyboard() } } From 9222f2e8e993f0953ec84d5919c4a85355aafc1e Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Thu, 24 Sep 2026 01:04:29 -0400 Subject: [PATCH 04/65] Improve accelerated drawer stick navigation --- .../com/droiddeck/launcher/SessionActivity.kt | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 11dd8b8f8f..805bc075f1 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -93,6 +93,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN private var drawerDirectionDownTime = 0L private var drawerDirectionLastRepeat = 0L + private var drawerDirectionRepeatCount = 0 private var drawerDirectionDeviceId = -1 // Compose reads these; the activity writes them. @@ -742,8 +743,18 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val hatY = event.getAxisValue(MotionEvent.AXIS_HAT_Y) val x = if (abs(hatX) > 0.4f) hatX else event.getAxisValue(MotionEvent.AXIS_X) val y = if (abs(hatY) > 0.4f) hatY else event.getAxisValue(MotionEvent.AXIS_Y) + val heldDirection = drawerDirectionKey.takeIf { + when (it) { + KeyEvent.KEYCODE_DPAD_LEFT -> -x >= DRAWER_DIRECTION_RELEASE_THRESHOLD + KeyEvent.KEYCODE_DPAD_RIGHT -> x >= DRAWER_DIRECTION_RELEASE_THRESHOLD + KeyEvent.KEYCODE_DPAD_UP -> -y >= DRAWER_DIRECTION_RELEASE_THRESHOLD + KeyEvent.KEYCODE_DPAD_DOWN -> y >= DRAWER_DIRECTION_RELEASE_THRESHOLD + else -> false + } + } val keyCode = when { - maxOf(abs(x), abs(y)) < 0.45f -> KeyEvent.KEYCODE_UNKNOWN + heldDirection != null -> heldDirection + maxOf(abs(x), abs(y)) < DRAWER_DIRECTION_ENGAGE_THRESHOLD -> KeyEvent.KEYCODE_UNKNOWN abs(x) > abs(y) && x < 0f -> KeyEvent.KEYCODE_DPAD_LEFT abs(x) > abs(y) -> KeyEvent.KEYCODE_DPAD_RIGHT y < 0f -> KeyEvent.KEYCODE_DPAD_UP @@ -757,17 +768,29 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { drawerDirectionDeviceId = event.deviceId drawerDirectionDownTime = now drawerDirectionLastRepeat = now + drawerDirectionRepeatCount = 0 dispatchDrawerKey(KeyEvent.ACTION_DOWN, 0, now) - } else if (keyCode != KeyEvent.KEYCODE_UNKNOWN && now - drawerDirectionLastRepeat >= 240L) { + } else if (keyCode != KeyEvent.KEYCODE_UNKNOWN && + now - drawerDirectionLastRepeat >= drawerDirectionRepeatIntervalMs()) { drawerDirectionLastRepeat = now - dispatchDrawerKey(KeyEvent.ACTION_DOWN, 1, now) + drawerDirectionRepeatCount++ + dispatchDrawerKey(KeyEvent.ACTION_DOWN, drawerDirectionRepeatCount, now) } } + private fun drawerDirectionRepeatIntervalMs(): Long = when (drawerDirectionRepeatCount) { + 0 -> DRAWER_DIRECTION_INITIAL_REPEAT_MS + 1 -> 250L + 2 -> 180L + 3 -> 135L + else -> 105L + } + private fun releaseDrawerDirection() { if (drawerDirectionKey == KeyEvent.KEYCODE_UNKNOWN) return dispatchDrawerKey(KeyEvent.ACTION_UP, 0, SystemClock.uptimeMillis()) drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN + drawerDirectionRepeatCount = 0 drawerDirectionDeviceId = -1 } @@ -1102,6 +1125,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { companion object { private const val TAG = "SessionActivity" private const val BACK_DOUBLE_PRESS_TIMEOUT_MS = 500L + private const val DRAWER_DIRECTION_ENGAGE_THRESHOLD = 0.55f + private const val DRAWER_DIRECTION_RELEASE_THRESHOLD = 0.30f + private const val DRAWER_DIRECTION_INITIAL_REPEAT_MS = 420L /** Compositor scale modes (Container.FULLSCREEN_* values): 1 = fit with bars, centred. */ private const val SCALE_FIT = 1 private const val ALIGN_CENTER = 0 From 582e4675835c2bb855f6b9da56823fa12569cbfb Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Thu, 24 Sep 2026 01:07:34 -0400 Subject: [PATCH 05/65] Revert "Improve accelerated drawer stick navigation" This reverts commit 10f55068296834b0e5b1963abad03c3aa825a2fe. --- .../com/droiddeck/launcher/SessionActivity.kt | 32 ++----------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 805bc075f1..11dd8b8f8f 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -93,7 +93,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN private var drawerDirectionDownTime = 0L private var drawerDirectionLastRepeat = 0L - private var drawerDirectionRepeatCount = 0 private var drawerDirectionDeviceId = -1 // Compose reads these; the activity writes them. @@ -743,18 +742,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val hatY = event.getAxisValue(MotionEvent.AXIS_HAT_Y) val x = if (abs(hatX) > 0.4f) hatX else event.getAxisValue(MotionEvent.AXIS_X) val y = if (abs(hatY) > 0.4f) hatY else event.getAxisValue(MotionEvent.AXIS_Y) - val heldDirection = drawerDirectionKey.takeIf { - when (it) { - KeyEvent.KEYCODE_DPAD_LEFT -> -x >= DRAWER_DIRECTION_RELEASE_THRESHOLD - KeyEvent.KEYCODE_DPAD_RIGHT -> x >= DRAWER_DIRECTION_RELEASE_THRESHOLD - KeyEvent.KEYCODE_DPAD_UP -> -y >= DRAWER_DIRECTION_RELEASE_THRESHOLD - KeyEvent.KEYCODE_DPAD_DOWN -> y >= DRAWER_DIRECTION_RELEASE_THRESHOLD - else -> false - } - } val keyCode = when { - heldDirection != null -> heldDirection - maxOf(abs(x), abs(y)) < DRAWER_DIRECTION_ENGAGE_THRESHOLD -> KeyEvent.KEYCODE_UNKNOWN + maxOf(abs(x), abs(y)) < 0.45f -> KeyEvent.KEYCODE_UNKNOWN abs(x) > abs(y) && x < 0f -> KeyEvent.KEYCODE_DPAD_LEFT abs(x) > abs(y) -> KeyEvent.KEYCODE_DPAD_RIGHT y < 0f -> KeyEvent.KEYCODE_DPAD_UP @@ -768,29 +757,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { drawerDirectionDeviceId = event.deviceId drawerDirectionDownTime = now drawerDirectionLastRepeat = now - drawerDirectionRepeatCount = 0 dispatchDrawerKey(KeyEvent.ACTION_DOWN, 0, now) - } else if (keyCode != KeyEvent.KEYCODE_UNKNOWN && - now - drawerDirectionLastRepeat >= drawerDirectionRepeatIntervalMs()) { + } else if (keyCode != KeyEvent.KEYCODE_UNKNOWN && now - drawerDirectionLastRepeat >= 240L) { drawerDirectionLastRepeat = now - drawerDirectionRepeatCount++ - dispatchDrawerKey(KeyEvent.ACTION_DOWN, drawerDirectionRepeatCount, now) + dispatchDrawerKey(KeyEvent.ACTION_DOWN, 1, now) } } - private fun drawerDirectionRepeatIntervalMs(): Long = when (drawerDirectionRepeatCount) { - 0 -> DRAWER_DIRECTION_INITIAL_REPEAT_MS - 1 -> 250L - 2 -> 180L - 3 -> 135L - else -> 105L - } - private fun releaseDrawerDirection() { if (drawerDirectionKey == KeyEvent.KEYCODE_UNKNOWN) return dispatchDrawerKey(KeyEvent.ACTION_UP, 0, SystemClock.uptimeMillis()) drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN - drawerDirectionRepeatCount = 0 drawerDirectionDeviceId = -1 } @@ -1125,9 +1102,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { companion object { private const val TAG = "SessionActivity" private const val BACK_DOUBLE_PRESS_TIMEOUT_MS = 500L - private const val DRAWER_DIRECTION_ENGAGE_THRESHOLD = 0.55f - private const val DRAWER_DIRECTION_RELEASE_THRESHOLD = 0.30f - private const val DRAWER_DIRECTION_INITIAL_REPEAT_MS = 420L /** Compositor scale modes (Container.FULLSCREEN_* values): 1 = fit with bars, centred. */ private const val SCALE_FIT = 1 private const val ALIGN_CENTER = 0 From 4ef3bc92de3594def04e901d584ea15483cb9e95 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 04:29:57 -0400 Subject: [PATCH 06/65] ARMSX2 like RPCS3: front-end launches, first-time setup, PCSX2 settings, 16K pages; on-screen controls everywhere - From the rail ARMSX2 starts the game in its full-screen, controller-driven UI and exits with it (-batch -bigpicture -fullscreen). - bannerlator-pad-defaults: a PCSX2 player's settings and memory cards are copied into ARMSX2 once; a new player starts on ARMSX2's first-time setup with the BIOS folder in the ROMs folder (ps2/bios, created, or ps2/firmware), the ps2 folder as the game list and the controller on Player 1; the guide button opens the pause menu (how a rail game is left) instead of toggling analog. Users bring their own BIOS and games. - The catalog can name a file per memory page size ("pages"); the device's own size picks it (ARMSX2 has 4K and 16K builds). - On-screen controls: Auto keeps them off the desktop (the screen is a touchpad there) and shows them for rail games and Steam when no controller is connected; the drawer offers the setting in every session. --- .../com/droiddeck/launcher/SessionActivity.kt | 5 +- .../droiddeck/launcher/frontend/Library.kt | 3 + .../launcher/runtime/DesktopCatalog.kt | 10 ++- .../droiddeck/launcher/ui/SessionOverlay.kt | 6 +- .../usr/local/bin/bannerlator-pad-defaults | 84 +++++++++++++++++-- 5 files changed, 96 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 6c83cddba0..e66c43f492 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -885,7 +885,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionPrefs.OSC_ALWAYS -> true SessionPrefs.OSC_STEAM_QAM -> true SessionPrefs.OSC_NEVER -> false - else -> !PadBridge.anyControllerConnected() + // Auto: the touch pad when there is no controller - except on the desktop, where the + // screen is a touchpad for the pointer and a pad over it would be in the way. A game + // started from the rail, or Steam, gets it; the drawer turns it on anywhere. + else -> !PadBridge.anyControllerConnected() && SessionState.mode != SessionService.MODE_DESKTOP } if (show == (controls.visibility == View.VISIBLE)) return if (!show) controls.releaseAll() 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 c56971aae3..76f8c29ddb 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -170,6 +170,9 @@ object Library { /** How the emulator is told which game to boot, on its command line. */ fun launchArgs(emulatorId: String, guestPath: String): List = when (emulatorId) { "rpcs3" -> listOf("--no-gui", guestPath) + // Straight into the game in its controller-driven full-screen UI (first-time setup there + // too), and gone when the game is quit from its pause menu (guide button): -batch. + "armsx2" -> listOf("-batch", "-bigpicture", "-fullscreen", "--", guestPath) "dolphin" -> listOf("-e", guestPath) "cemu" -> listOf("-g", guestPath) else -> listOf(guestPath) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt index 7654917e98..2de78f99c6 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt @@ -31,12 +31,18 @@ object DesktopCatalog { return try { val json = JSONObject(body) val arr = json.getJSONArray("packages") + // A package built per memory page size (ARMSX2: 4K and 16K kernels) names the others + // under "pages"; the device's own size picks one, and the top-level file is the 4K one. + val pageSize = try { + android.system.Os.sysconf(android.system.OsConstants._SC_PAGESIZE).toString() + } catch (e: Exception) { "4096" } (0 until arr.length()).map { i -> val o = arr.getJSONObject(i) + val file = o.optJSONObject("pages")?.optJSONObject(pageSize) ?: o Entry( o.getString("id"), o.getString("name"), o.optInt("tier", 1), o.optString("version", ""), - o.optString("kind", "tar"), o.getString("url"), o.optString("sha256", ""), - o.optLong("size", 0L), o.optString("notes", ""), + o.optString("kind", "tar"), file.getString("url"), file.optString("sha256", ""), + file.optLong("size", 0L), o.optString("notes", ""), o.optString("icon", "applications-games"), o.optString("category", "Game"), ) } 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 0aaf1fc7d6..e5685f0314 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -318,9 +318,11 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { listOf(SessionPrefs.TOUCH_AUTO to "Auto (${a.touchAuto})", SessionPrefs.TOUCH_PAD to "Touchpad", SessionPrefs.TOUCH_DIRECT to "Direct"), a.touchMode, onPick = a.onTouch, ) - if (a.steam) ChoiceRow( + ChoiceRow( host, "osc", "On-screen controls", null, - listOf(SessionPrefs.OSC_AUTO to "Auto", SessionPrefs.OSC_ALWAYS to "Always", SessionPrefs.OSC_STEAM_QAM to "Steam + QAM", SessionPrefs.OSC_NEVER to "Never"), a.oscMode, + if (a.steam) listOf(SessionPrefs.OSC_AUTO to "Auto", SessionPrefs.OSC_ALWAYS to "Always", SessionPrefs.OSC_STEAM_QAM to "Steam + QAM", SessionPrefs.OSC_NEVER to "Never") + else listOf(SessionPrefs.OSC_AUTO to "Auto", SessionPrefs.OSC_ALWAYS to "Always", SessionPrefs.OSC_NEVER to "Never"), + a.oscMode, onPick = a.onOsc, ) SettingsRow("Keyboard", null) { diff --git a/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults b/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults index 01b9f593f4..f402ac4dd0 100755 --- a/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults +++ b/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults @@ -116,7 +116,7 @@ def ini_section(lines, name): return (start, len(lines)) if start is not None else None -def patch_ini_section(path, section, body, what, needle="SDL-", require=None): +def patch_ini_section(path, section, body, what, needle="SDL-", require=None, done="Player 1 on the controller"): """Add body's lines to [section] of an ini the emulator wrote itself, unless the section already binds a controller (needle). Missing file: nothing - the emulator writes its own defaults on first run and this runs again.""" @@ -144,7 +144,7 @@ def patch_ini_section(path, section, body, what, needle="SDL-", require=None): with open(path + ".tmp", "w", encoding="utf-8") as f: f.write("\n".join(lines) + "\n") os.replace(path + ".tmp", path) - print(f"bannerlator-pad-defaults: {what}: Player 1 on the controller ({path})") + print(f"bannerlator-pad-defaults: {what}: {done} ({path})") # DuckStation: SDL-/, axes signed (src/util/sdl_input_source.cpp); Pad1 keys from @@ -221,10 +221,7 @@ SmallMotor = SDL-0/SmallMotor def pcsx2(): patch_ini_section(os.path.join(CONFIG, "PCSX2/inis/PCSX2.ini"), "Pad1", PCSX2_PAD1, "PCSX2", require="SettingsVersion") - # ARMSX2 (PCSX2 with ARM64 recompilers): the same ini and binding names under its own folder - # (pcsx2/Pcsx2Config.cpp: $XDG_CONFIG_HOME/ARMSX2/inis/PCSX2.ini). - patch_ini_section(os.path.join(CONFIG, "ARMSX2/inis/PCSX2.ini"), "Pad1", PCSX2_PAD1, "ARMSX2", - require="SettingsVersion") + # Dolphin: SDL//; control names from InputCommon/.../SDL/SDLGamepad.h (Left Y+ @@ -287,6 +284,79 @@ Nunchuk/Stick/Right = `Left X+` """ +# ARMSX2 - the PS2 emulator (PCSX2 with ARM64 recompilers; upstream PCSX2 interprets on ARM64). Its +# files are PCSX2's under $XDG_CONFIG_HOME/ARMSX2 (pcsx2/Pcsx2Config.cpp). The user supplies the BIOS +# and the games; they live in the ROMs folder (/root/ROMs). The guide button opens the pause menu +# (Hotkeys OpenPauseMenu) - the way out of a game started from the front end, which runs ARMSX2 +# without its window (-batch -bigpicture) - so it is not also the analog toggle here. +ARMSX2_PAD1 = "\n".join(l for l in PCSX2_PAD1.splitlines() if not l.startswith("Analog ")) + "\n" +ROMS = "/root/ROMs" + + +def ps2_folder(): + for name in ("ps2", "PS2"): + d = os.path.join(ROMS, name) + if os.path.isdir(d): + return d + return os.path.join(ROMS, "ps2") + + +def ps2_bios_folder(): + base = ps2_folder() + for name in ("bios", "BIOS", "firmware"): + d = os.path.join(base, name) + if os.path.isdir(d): + return d + d = os.path.join(base, "bios") + if os.path.isdir(ROMS): + try: + os.makedirs(d, exist_ok=True) # where the user is told to put their BIOS + except OSError: + pass + return d + + +def armsx2(): + root = os.path.join(CONFIG, "ARMSX2") + ini = os.path.join(root, "inis/PCSX2.ini") + old = os.path.join(CONFIG, "PCSX2") + if not os.path.isfile(ini) and os.path.isfile(os.path.join(old, "inis/PCSX2.ini")): + # Someone who played on PCSX2 here: the same settings, BIOS choice and memory cards (the + # saves), copied once. PCSX2's own folder is left as it was. + import shutil + for sub in ("inis", "memcards", "bios", "gamesettings", "cheats", "patches", "covers", + "inputprofiles", "textures"): + src = os.path.join(old, sub) + if os.path.isdir(src): + shutil.copytree(src, os.path.join(root, sub), dirs_exist_ok=True) + print(f"bannerlator-pad-defaults: ARMSX2: settings and memory cards copied from PCSX2 ({root})") + elif not os.path.isfile(ini): + # A new player: ARMSX2's own first-time setup still runs (SetupWizardIncomplete) to pick the + # BIOS, but looking in the ROMs folder, with the ps2 folder as its game list and the + # controller already on Player 1. + bios, games = ps2_bios_folder(), ps2_folder() + seed(ini, "[UI]\nSettingsVersion = 1\nSetupWizardIncomplete = true\n\n" + f"[Folders]\nBios = {bios}\n\n" + f"[GameList]\nRecursivePaths = {games}\n\n" + "[Hotkeys]\nOpenPauseMenu = Keyboard/Escape\nOpenPauseMenu = SDL-0/Guide\n\n" + "[Pad1]\n" + ARMSX2_PAD1, "ARMSX2", "first-time setup, BIOS from " + bios) + return + patch_ini_section(ini, "Pad1", ARMSX2_PAD1, "ARMSX2", require="SettingsVersion") + # The guide button is the pause menu here; PCSX2's profile (ours, copied over) had it as the + # analog toggle as well. + with open(ini, encoding="utf-8", errors="replace") as f: + lines = f.read().splitlines() + kept = [l for l in lines if l.replace(" ", "") != "Analog=SDL-0/Guide"] + if len(kept) != len(lines): + with open(ini + ".tmp", "w", encoding="utf-8") as f: + f.write("\n".join(kept) + "\n") + os.replace(ini + ".tmp", ini) + patch_ini_section(ini, "Hotkeys", "OpenPauseMenu = SDL-0/Guide\n", "ARMSX2", needle="SDL-0/Guide", + require="SettingsVersion", done="the guide button opens the pause menu") + patch_ini_section(ini, "GameList", f"RecursivePaths = {ps2_folder()}\n", "ARMSX2", needle=ROMS, + require="SettingsVersion", done="games listed from the ROMs folder") + + def dolphin(): d = os.path.join(CONFIG, "dolphin-emu") seed(os.path.join(d, "GCPadNew.ini"), DOLPHIN_GC, "Dolphin (GameCube)") @@ -454,7 +524,7 @@ def retroarch(): print(f"bannerlator-pad-defaults: RetroArch: joypad driver udev -> sdl2 ({cfg})") -for step in (rpcs3, duckstation, pcsx2, dolphin, cemu, melonds, ppsspp, retroarch): +for step in (rpcs3, duckstation, pcsx2, armsx2, dolphin, cemu, melonds, ppsspp, retroarch): try: step() except Exception as e: From 9f2c98d28d7f6cd8f91c6483de991b9dea7428f2 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 04:32:58 -0400 Subject: [PATCH 07/65] ARMSX2: a new player starts on the Vulkan renderer (GSRendererType::VK = 14), not Auto's pick --- tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults b/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults index f402ac4dd0..45459a0e26 100755 --- a/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults +++ b/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults @@ -338,6 +338,8 @@ def armsx2(): seed(ini, "[UI]\nSettingsVersion = 1\nSetupWizardIncomplete = true\n\n" f"[Folders]\nBios = {bios}\n\n" f"[GameList]\nRecursivePaths = {games}\n\n" + # Vulkan outright rather than Auto's pick: the renderer every other path here uses. + "[EmuCore/GS]\nRenderer = 14\n\n" "[Hotkeys]\nOpenPauseMenu = Keyboard/Escape\nOpenPauseMenu = SDL-0/Guide\n\n" "[Pad1]\n" + ARMSX2_PAD1, "ARMSX2", "first-time setup, BIOS from " + bios) return From 1c7130545fc96ea69b113f82d03c2c91ead7ae3c Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 04:43:24 -0400 Subject: [PATCH 08/65] Drawer: a game from the rail is headed by its emulator (ARMSX2, RPCS3), not "Desktop" --- app/src/main/java/com/droiddeck/launcher/SessionActivity.kt | 2 ++ app/src/main/java/com/droiddeck/launcher/frontend/Library.kt | 3 +++ app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index e66c43f492..a2d31962e2 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -192,6 +192,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { ) SessionDrawer(drawerOpen, DrawerActions( steam = SessionState.mode == SessionService.MODE_STEAM, + title = if (SessionState.mode == SessionService.MODE_RUN) + com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) ?: "Game" else null, isHomeApp = isHomeApp, androidApps = androidApps, hudOn = hudOn, 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 76f8c29ddb..4bf6b414d3 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -76,6 +76,9 @@ object Library { "melonds" to "melonds", "cemu" to "cemu", "ppsspp" to "emulators", "retroarch" to "emulators", ) + /** The emulator's name for a program path from the rail ("ARMSX2"), or null. */ + fun nameForProgram(program: String?): String? = specs.firstOrNull { it.program == program }?.name + /** Desktop catalog package that supplies this emulator. */ fun packageId(emulatorId: String): String? = installedIds[emulatorId] 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 e5685f0314..400caaeb82 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -142,6 +142,8 @@ fun SessionPausedOverlay(onResume: () -> Unit) { /** Everything the drawer shows and does. */ class DrawerActions( val steam: Boolean, + /** The drawer's heading: the emulator for a program from the rail, else Steam or Desktop. */ + val title: String? = null, val isHomeApp: Boolean, val androidApps: List, val hudOn: Boolean, @@ -215,7 +217,7 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(start = 4.dp, bottom = 6.dp)) { Box(modifier = Modifier.size(10.dp).clip(CircleShape).background(Brush.linearGradient(listOf(colors.primary, pal.primary2)))) Spacer(Modifier.width(10.dp)) - Text(if (a.steam) "Steam" else "Desktop", fontSize = 17.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) + Text(a.title ?: if (a.steam) "Steam" else "Desktop", fontSize = 17.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) } if (a.onSteamMenu != null && a.onQam != null) { val qamInteraction = remember { MutableInteractionSource() } From e4e93c5f4a9ae60805420e794a5530740a9f26ce Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 04:55:01 -0400 Subject: [PATCH 09/65] Front end: Back steps out of a game or emulator page; PS2 and other games found deeper in their folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Back / B on an emulator page went back to Android (the app closed); it now returns to Desktop, a game page to its emulator, a Steam game to Steam - the same as each page's '‹' link. - Games are looked for up to three folders inside the system folder (ROMs/ps2/games//.iso showed ARMSX2 with 0 games), and the loose-file pass over the ROMs root no longer walks into other systems' folders. --- .../com/droiddeck/launcher/frontend/Library.kt | 17 ++++++++++------- .../com/droiddeck/launcher/ui/FrontEndScreen.kt | 12 ++++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) 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 4bf6b414d3..56334a3f4c 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -71,6 +71,8 @@ object Library { Spec("ppsspp", "PPSSPP", "PSP", "/usr/bin/PPSSPPSDL", listOf("psp"), setOf("iso", "cso", "pbp", "chd")), Spec("retroarch", "RetroArch", "many systems", "/usr/bin/retroarch", emptyList(), emptySet()), ) + /** Every system folder name the specs claim, so a loose-file scan of the root skips them. */ + private val systemFolders: Set by lazy { specs.flatMap { it.folders }.toSet() } private val installedIds = mapOf( "rpcs3" to "rpcs3", "armsx2" to "armsx2", "dolphin" to "dolphin", "duckstation" to "duckstation", "melonds" to "melonds", "cemu" to "cemu", "ppsspp" to "emulators", "retroarch" to "emulators", @@ -88,15 +90,16 @@ object Library { return specs.map { spec -> val games = ArrayList() if (romsRoot != null && spec.exts.isNotEmpty()) { - // The system's folder(s), matched without regard to case, then the root itself for - // a file left loose there - and one folder deeper, since a dump usually comes as a - // folder named for the game with the image inside it. + // The system's folder(s), matched without regard to case, and up to three folders + // inside them - a dump usually comes as a folder named for the game with the image + // inside it, and people sort those into folders of their own (ps2/games//). + // The root itself only one deep, for a file left loose there. val systemDirs = romsRoot.listFiles { f -> f.isDirectory && f.name.lowercase() in spec.folders }.orEmpty().toList() val dirs = LinkedHashSet() - for (top in systemDirs + romsRoot) { - dirs.add(top) - top.listFiles { f -> f.isDirectory }?.forEach { dirs.add(it) } - } + for (top in systemDirs) top.walkTopDown().maxDepth(3).filter { it.isDirectory }.forEach { dirs.add(it) } + dirs.add(romsRoot) + // ...and not into another system's folder: a PS3 .iso in ps3/ is not a PS2 game. + romsRoot.listFiles { f -> f.isDirectory && f.name.lowercase() !in systemFolders }?.forEach { dirs.add(it) } for (dir in dirs) { // A PS3 disc dump is a folder with PS3_GAME in it; RPCS3 boots the folder. if (spec.id == "rpcs3" && File(dir, "PS3_GAME").isDirectory) { 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 052630cc78..bc5c9ca45d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -233,6 +233,18 @@ fun FrontEndScreen(s: FrontEndState, a: FrontEndActions, page: (@Composable () - val colors = MaterialTheme.colorScheme val ctx = LocalContext.current BackHandler(enabled = s.pageKey != null && page != null) { a.onPageBack() } + // Back (and B) from a game or an emulator steps out one level, as its "‹" link does, instead + // of leaving the app: a game -> its emulator (or Steam), an emulator -> Desktop. + BackHandler( + enabled = (s.pageKey == null || page == null) && + (selected.startsWith("app:") || selected.startsWith("emu:") || selected.startsWith("rom:")), + ) { + selected = when { + selected.startsWith("app:") -> "steam" + selected.startsWith("emu:") -> "desktop" + else -> "emu:" + selected.removePrefix("rom:").substringBefore(':') + } + } LaunchedEffect(s.isHomeApp) { if (!s.isHomeApp && selected == "android-apps") selected = "steam" } remember { Motion.scale = Settings.Global.getFloat(ctx.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f); true } From 550d8711f28d632f249effb0b35f59d74d49114d Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 05:11:38 -0400 Subject: [PATCH 10/65] Front end: box art for emulator games, found automatically and kept CoverArt looks a game up by its file name in RetroArch's libretro-thumbnails collection for the system (exactly, then loosely: tags dropped, same region preferred, against the collection's cached list of names), then by the disc's own ID - PS2 serials from SYSTEM.CNF against xlenore/ps2-covers, GameCube/Wii IDs against GameTDB. Covers are downloaded once into files/covers after the list is shown, and the list is refreshed when some arrive; a game with none is retried after three days; nothing is fetched offline. PS3 disc dumps use their own PS3_GAME/ICON0.PNG. --- .../com/droiddeck/launcher/MainActivity.kt | 7 + .../droiddeck/launcher/frontend/CoverArt.kt | 229 ++++++++++++++++++ .../droiddeck/launcher/frontend/Library.kt | 8 +- 3 files changed, 242 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/CoverArt.kt diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 092682004f..e587aac8c1 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -47,6 +47,7 @@ import com.droiddeck.launcher.ui.CreditsDialog import com.droiddeck.launcher.ui.FrontEndScreen import com.droiddeck.launcher.ui.FrontEndState import com.droiddeck.launcher.ui.FrontEndActions +import com.droiddeck.launcher.frontend.CoverArt import com.droiddeck.launcher.frontend.Library import com.droiddeck.launcher.ui.DroidDeckTheme import com.droiddeck.launcher.ui.RomsDialog @@ -885,6 +886,12 @@ class MainActivity : ComponentActivity() { } else emptyList() val emus = Library.emulators(this) { id -> DesktopCatalog.installed(this, id) != null } ui.post { steamGames = games; emulatorList = emus } + // Box art for the games that have none, fetched after the list is up; the list is + // rebuilt once if any was found. + if (!OfflineMode.enabled(this) && CoverArt.fetchMissing(this, emus.flatMap { it.games })) { + val refreshed = Library.emulators(this) { id -> DesktopCatalog.installed(this, id) != null } + ui.post { emulatorList = refreshed } + } }, "library").start() } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/CoverArt.kt b/app/src/main/java/com/droiddeck/launcher/frontend/CoverArt.kt new file mode 100644 index 0000000000..6e437c10a7 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/CoverArt.kt @@ -0,0 +1,229 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context +import android.graphics.BitmapFactory +import android.util.Log +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.io.RandomAccessFile +import java.net.HttpURLConnection +import java.net.URL +import java.net.URLEncoder + +/** + * Box art for the emulators' games, found and kept on the device: the front end shows a disc image + * with nothing but its emulator's logo otherwise. + * + * In order: the name of the file against RetroArch's thumbnail collection for the system + * (libretro-thumbnails, named after the standard disc-dump names - "Need for Speed - Underground 2 + * (USA)"), first exactly and then loosely (tags dropped, the same region preferred) against the + * collection's list of names; then the disc's own ID, read from the image - PS2 serials against + * xlenore/ps2-covers (what PCSX2 and ARMSX2 download from), GameCube/Wii IDs against GameTDB (what + * Dolphin uses). A cover is downloaded once into files/covers; a game none of them has is not + * asked about again for a few days. + */ +object CoverArt { + private const val TAG = "CoverArt" + private const val MISS_RETRY_MS = 3L * 24 * 3600 * 1000 + private const val INDEX_TTL_MS = 14L * 24 * 3600 * 1000 + /** Downloads in one pass, so a first visit to a big library does not hold the network for long. */ + private const val MAX_PER_PASS = 40 + + /** The emulator's systems in libretro-thumbnails, in the order they are tried. */ + private val collections = mapOf( + "rpcs3" to listOf("Sony_-_PlayStation_3"), + "armsx2" to listOf("Sony_-_PlayStation_2"), + "duckstation" to listOf("Sony_-_PlayStation"), + "ppsspp" to listOf("Sony_-_PlayStation_Portable"), + "dolphin" to listOf("Nintendo_-_GameCube", "Nintendo_-_Wii"), + "melonds" to listOf("Nintendo_-_Nintendo_DS"), + "cemu" to listOf("Nintendo_-_Wii_U"), + ) + + private fun root(context: Context) = File(context.filesDir, "covers") + + /** The file name, as the cover is kept under: a game keeps its art when its folder moves. */ + private fun keyOf(rom: Library.Rom): String = + rom.hostPath.name.replace(Regex("[^A-Za-z0-9._() -]"), "_").take(150) + + private fun coverFile(context: Context, rom: Library.Rom) = File(root(context), "${rom.emulatorId}/${keyOf(rom)}.img") + private fun missFile(context: Context, rom: Library.Rom) = File(root(context), "${rom.emulatorId}/${keyOf(rom)}.miss") + + /** A cover already on the device for this game, or null. */ + fun cached(context: Context, rom: Library.Rom): File? = coverFile(context, rom).takeIf { it.isFile && it.length() > 0 } + + private fun wanted(context: Context, rom: Library.Rom): Boolean { + if (rom.art != null || cached(context, rom) != null || rom.emulatorId !in collections) return false + val miss = missFile(context, rom) + return !(miss.isFile && System.currentTimeMillis() - miss.lastModified() < MISS_RETRY_MS) + } + + /** + * Looks for covers for the games that have none, on the calling (background) thread. True when + * at least one was found, so the caller rebuilds the list to show it. + */ + fun fetchMissing(context: Context, roms: List): Boolean { + var found = false + var tries = 0 + for (rom in roms) { + if (!wanted(context, rom)) continue + if (++tries > MAX_PER_PASS) break + val url = try { findUrl(context, rom) } catch (e: Exception) { Log.w(TAG, "${rom.name}: $e"); null } + val target = coverFile(context, rom) + if (url != null && download(url, target)) { + Log.i(TAG, "${rom.name}: $url") + missFile(context, rom).delete() + found = true + } else { + missFile(context, rom).apply { parentFile?.mkdirs(); writeText(url ?: "") } + } + } + return found + } + + private fun findUrl(context: Context, rom: Library.Rom): String? { + val name = rom.hostPath.nameWithoutExtension.removeSuffix(".dec") + for (collection in collections.getValue(rom.emulatorId)) { + // Exactly the dump name first: no listing needed. + val exact = thumbnailUrl(collection, name) + if (exists(exact)) return exact + // Then loosely, against the collection's names. + nearest(name, names(context, collection))?.let { return thumbnailUrl(collection, it) } + } + // The disc's own ID. + return when (rom.emulatorId) { + "armsx2" -> ps2Serial(rom.hostPath)?.let { "https://raw.githubusercontent.com/xlenore/ps2-covers/main/covers/default/$it.jpg" } + "dolphin" -> nintendoDiscId(rom.hostPath)?.let { id -> + val region = when (id.getOrNull(3)) { 'P' -> "EN"; 'J' -> "JA"; 'K' -> "KO"; else -> "US" } + "https://art.gametdb.com/wii/cover/$region/$id.png" + } + else -> null + }?.takeIf { exists(it) } + } + + /** libretro-thumbnails replaces these in a title's file name. */ + private fun thumbName(title: String) = title.replace(Regex("[&*/:`<>?\\\\|\"]"), "_") + + private fun thumbnailUrl(collection: String, title: String) = + "https://raw.githubusercontent.com/libretro-thumbnails/$collection/master/Named_Boxarts/" + + URLEncoder.encode("${thumbName(title)}.png", "UTF-8").replace("+", "%20") + + // ---- loose matching ------------------------------------------------------------------------ + + private fun tags(name: String): List = Regex("[(\\[]([^)\\]]*)[)\\]]").findAll(name).map { it.groupValues[1].lowercase() }.toList() + + /** A title without its tags, articles and punctuation: "Legend of Zelda, The (USA)" = "legend of zelda". */ + private fun base(name: String): String = name + .replace(Regex("\\s*[(\\[][^)\\]]*[)\\]]"), " ") + .lowercase() + .replace(Regex("[^a-z0-9]+"), " ") + .split(' ').filter { it.isNotEmpty() && it != "the" && it != "a" } + .joinToString(" ") + + private fun nearest(name: String, candidates: List): String? { + if (candidates.isEmpty()) return null + val want = base(name) + if (want.isEmpty()) return null + val same = candidates.filter { base(it) == want } + if (same.isEmpty()) return null + val region = tags(name).firstOrNull { it in setOf("usa", "europe", "japan", "world", "korea") } ?: "usa" + return same.firstOrNull { region in tags(it) } ?: same.firstOrNull { "usa" in tags(it) } ?: same.first() + } + + /** The titles in a collection's Named_Boxarts (no extension), kept for a fortnight. */ + private fun names(context: Context, collection: String): List { + val cache = File(root(context), "index-$collection.txt") + if (cache.isFile && System.currentTimeMillis() - cache.lastModified() < INDEX_TTL_MS) return cache.readLines() + val list = try { + val top = JSONArray(get("https://api.github.com/repos/libretro-thumbnails/$collection/contents/") ?: return cachedOr(cache)) + val sha = (0 until top.length()).map { top.getJSONObject(it) }.firstOrNull { it.optString("name") == "Named_Boxarts" } + ?.optString("sha") ?: return cachedOr(cache) + val tree = JSONObject(get("https://api.github.com/repos/libretro-thumbnails/$collection/git/trees/$sha") ?: return cachedOr(cache)) + .getJSONArray("tree") + (0 until tree.length()).map { tree.getJSONObject(it).optString("path") } + .filter { it.endsWith(".png") }.map { it.removeSuffix(".png") } + } catch (e: Exception) { + Log.w(TAG, "index $collection: $e"); return cachedOr(cache) + } + cache.parentFile?.mkdirs() + cache.writeText(list.joinToString("\n")) + return list + } + + private fun cachedOr(cache: File): List = if (cache.isFile) cache.readLines() else emptyList() + + // ---- disc IDs ------------------------------------------------------------------------------ + + /** "SLUS-21065" from a PS2 .iso's SYSTEM.CNF (BOOT2 = cdrom0:\SLUS_210.65;1), or null. */ + private fun ps2Serial(file: File): String? { + if (!file.name.endsWith(".iso", ignoreCase = true)) return null + RandomAccessFile(file, "r").use { f -> + fun sector(lba: Long, length: Int): ByteArray = ByteArray(length).also { f.seek(lba * 2048); f.readFully(it) } + val pvd = sector(16, 2048) + if (String(pvd, 1, 5, Charsets.US_ASCII) != "CD001") return null + fun le32(b: ByteArray, at: Int) = (b[at].toLong() and 0xff) or ((b[at + 1].toLong() and 0xff) shl 8) or + ((b[at + 2].toLong() and 0xff) shl 16) or ((b[at + 3].toLong() and 0xff) shl 24) + val rootLba = le32(pvd, 156 + 2) + val rootSize = le32(pvd, 156 + 10).toInt().coerceAtMost(64 * 1024) + val dir = sector(rootLba, rootSize) + var at = 0 + while (at < dir.size) { + val len = dir[at].toInt() and 0xff + if (len == 0) { at = (at / 2048 + 1) * 2048; continue } + val nameLen = dir[at + 32].toInt() and 0xff + val name = String(dir, at + 33, nameLen, Charsets.US_ASCII) + if (name.startsWith("SYSTEM.CNF", ignoreCase = true)) { + val cnf = String(sector(le32(dir, at + 2), le32(dir, at + 10).toInt().coerceAtMost(4096)), Charsets.US_ASCII) + val m = Regex("BOOT2\\s*=\\s*cdrom0:\\\\?([A-Z]{4})_(\\d{3})\\.(\\d{2})").find(cnf) ?: return null + return "${m.groupValues[1]}-${m.groupValues[2]}${m.groupValues[3]}" + } + at += len + } + } + return null + } + + /** The six-character ID of a GameCube/Wii disc image (.iso/.gcm, or .wbfs), or null. */ + private fun nintendoDiscId(file: File): String? { + val offset = when (file.extension.lowercase()) { "iso", "gcm" -> 0L; "wbfs" -> 0x200L; else -> return null } + RandomAccessFile(file, "r").use { f -> + val b = ByteArray(6); f.seek(offset); f.readFully(b) + val id = String(b, Charsets.US_ASCII) + return id.takeIf { it.all { c -> c.isLetterOrDigit() } } + } + } + + // ---- network ------------------------------------------------------------------------------- + + private fun open(url: String, method: String = "GET"): HttpURLConnection = + (URL(url).openConnection() as HttpURLConnection).apply { + requestMethod = method + connectTimeout = 10_000 + readTimeout = 20_000 + instanceFollowRedirects = true + setRequestProperty("User-Agent", "DroidDeck") + } + + private fun exists(url: String): Boolean = try { + val c = open(url, "HEAD"); val ok = c.responseCode == 200; c.disconnect(); ok + } catch (e: Exception) { false } + + private fun get(url: String): String? = try { + val c = open(url) + if (c.responseCode != 200) { c.disconnect(); null } else c.inputStream.bufferedReader().use { it.readText() } + } catch (e: Exception) { Log.w(TAG, "$url: $e"); null } + + /** Saves the image at [url] to [target] if it really is an image. */ + private fun download(url: String, target: File): Boolean = try { + val c = open(url) + if (c.responseCode != 200) { c.disconnect(); false } else { + target.parentFile?.mkdirs() + val tmp = File(target.path + ".part") + c.inputStream.use { input -> tmp.outputStream().use { input.copyTo(it) } } + val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true } + BitmapFactory.decodeFile(tmp.path, bounds) + if (bounds.outWidth > 0 && tmp.renameTo(target)) true else { tmp.delete(); false } + } + } catch (e: Exception) { Log.w(TAG, "$url: $e"); false } +} 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 56334a3f4c..d4062dc3a4 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -104,7 +104,9 @@ object Library { // A PS3 disc dump is a folder with PS3_GAME in it; RPCS3 boots the folder. if (spec.id == "rpcs3" && File(dir, "PS3_GAME").isDirectory) { val rel = dir.relativeTo(romsRoot).path - games.add(Rom(dir.name, dir, "/root/ROMs/$rel", spec.id)) + games.add(Rom(dir.name, dir, "/root/ROMs/$rel", spec.id, + // The dump carries its own art, as an installed package does. + art = File(dir, "PS3_GAME/ICON0.PNG").takeIf { it.isFile })) continue } dir.listFiles()?.sortedBy { it.name.lowercase() }?.forEach { f -> @@ -118,7 +120,9 @@ object Library { } } if (spec.id == "rpcs3") games.addAll(rpcs3Installed(context)) - Emulator(spec.id, spec.name, spec.system, spec.program, installedPackage(installedIds.getValue(spec.id)), games) + // A cover found for the game before (CoverArt) where it has no art of its own. + val withArt = games.map { g -> if (g.art != null) g else CoverArt.cached(context, g)?.let { Rom(g.name, g.hostPath, g.guestPath, g.emulatorId, it) } ?: g } + Emulator(spec.id, spec.name, spec.system, spec.program, installedPackage(installedIds.getValue(spec.id)), withArt) } } From f161e061f66fad08c26b586137aee7e07919f5e5 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 05:17:20 -0400 Subject: [PATCH 11/65] Cover art: a PS3 disc image gives its own ICON0.PNG The libretro PS3 collection holds 67 covers (Tomb Raider found none). A PS3 disc image carries PS3_GAME/ICON0.PNG, unencrypted even on protected discs; it is read out of the ISO 9660 image, the way an installed game's icon already is. The PS2 serial lookup uses the same reader. --- .../droiddeck/launcher/frontend/CoverArt.kt | 73 +++++++++++++------ 1 file changed, 52 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/CoverArt.kt b/app/src/main/java/com/droiddeck/launcher/frontend/CoverArt.kt index 6e437c10a7..cf7f151aa3 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/CoverArt.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/CoverArt.kt @@ -20,7 +20,8 @@ import java.net.URLEncoder * (USA)"), first exactly and then loosely (tags dropped, the same region preferred) against the * collection's list of names; then the disc's own ID, read from the image - PS2 serials against * xlenore/ps2-covers (what PCSX2 and ARMSX2 download from), GameCube/Wii IDs against GameTDB (what - * Dolphin uses). A cover is downloaded once into files/covers; a game none of them has is not + * Dolphin uses). A PS3 disc image gives its own PS3_GAME/ICON0.PNG first: the libretro PS3 + * collection is small. A cover is downloaded once into files/covers; a game none of them has is not * asked about again for a few days. */ object CoverArt { @@ -69,8 +70,15 @@ object CoverArt { for (rom in roms) { if (!wanted(context, rom)) continue if (++tries > MAX_PER_PASS) break - val url = try { findUrl(context, rom) } catch (e: Exception) { Log.w(TAG, "${rom.name}: $e"); null } val target = coverFile(context, rom) + // A PS3 disc carries its own cover (PS3_GAME/ICON0.PNG, not encrypted): no download. + if (rom.emulatorId == "rpcs3" && try { copyPs3Icon(rom.hostPath, target) } catch (e: Exception) { false }) { + Log.i(TAG, "${rom.name}: ICON0.PNG from the disc") + missFile(context, rom).delete() + found = true + continue + } + val url = try { findUrl(context, rom) } catch (e: Exception) { Log.w(TAG, "${rom.name}: $e"); null } if (url != null && download(url, target)) { Log.i(TAG, "${rom.name}: $url") missFile(context, rom).delete() @@ -155,35 +163,58 @@ object CoverArt { // ---- disc IDs ------------------------------------------------------------------------------ - /** "SLUS-21065" from a PS2 .iso's SYSTEM.CNF (BOOT2 = cdrom0:\SLUS_210.65;1), or null. */ - private fun ps2Serial(file: File): String? { + /** + * A file's bytes from an ISO 9660 image by path ("PS3_GAME/ICON0.PNG"), or null. Primary volume + * names only (upper case, ";1" suffix), which is what PS2 and PS3 discs use. + */ + private fun isoFile(file: File, path: String, maxSize: Int): ByteArray? { if (!file.name.endsWith(".iso", ignoreCase = true)) return null RandomAccessFile(file, "r").use { f -> - fun sector(lba: Long, length: Int): ByteArray = ByteArray(length).also { f.seek(lba * 2048); f.readFully(it) } - val pvd = sector(16, 2048) - if (String(pvd, 1, 5, Charsets.US_ASCII) != "CD001") return null + fun read(lba: Long, length: Int): ByteArray = ByteArray(length).also { f.seek(lba * 2048); f.readFully(it) } fun le32(b: ByteArray, at: Int) = (b[at].toLong() and 0xff) or ((b[at + 1].toLong() and 0xff) shl 8) or ((b[at + 2].toLong() and 0xff) shl 16) or ((b[at + 3].toLong() and 0xff) shl 24) - val rootLba = le32(pvd, 156 + 2) - val rootSize = le32(pvd, 156 + 10).toInt().coerceAtMost(64 * 1024) - val dir = sector(rootLba, rootSize) - var at = 0 - while (at < dir.size) { - val len = dir[at].toInt() and 0xff - if (len == 0) { at = (at / 2048 + 1) * 2048; continue } - val nameLen = dir[at + 32].toInt() and 0xff - val name = String(dir, at + 33, nameLen, Charsets.US_ASCII) - if (name.startsWith("SYSTEM.CNF", ignoreCase = true)) { - val cnf = String(sector(le32(dir, at + 2), le32(dir, at + 10).toInt().coerceAtMost(4096)), Charsets.US_ASCII) - val m = Regex("BOOT2\\s*=\\s*cdrom0:\\\\?([A-Z]{4})_(\\d{3})\\.(\\d{2})").find(cnf) ?: return null - return "${m.groupValues[1]}-${m.groupValues[2]}${m.groupValues[3]}" + val pvd = read(16, 2048) + if (String(pvd, 1, 5, Charsets.US_ASCII) != "CD001") return null + var lba = le32(pvd, 156 + 2) + var size = le32(pvd, 156 + 10) + val parts = path.split('/') + for ((i, part) in parts.withIndex()) { + val dir = read(lba, size.toInt().coerceAtMost(256 * 1024)) + var at = 0 + var hit = false + while (at < dir.size) { + val len = dir[at].toInt() and 0xff + if (len == 0) { at = (at / 2048 + 1) * 2048; continue } + val name = String(dir, at + 33, dir[at + 32].toInt() and 0xff, Charsets.US_ASCII).substringBefore(';') + if (name.equals(part, ignoreCase = true)) { + lba = le32(dir, at + 2); size = le32(dir, at + 10); hit = true; break + } + at += len } - at += len + if (!hit) return null + if (i == parts.lastIndex) return if (size in 1..maxSize) read(lba, size.toInt()) else null } } return null } + private fun copyPs3Icon(file: File, target: File): Boolean { + val png = isoFile(file, "PS3_GAME/ICON0.PNG", 4 * 1024 * 1024) ?: return false + target.parentFile?.mkdirs() + val tmp = File(target.path + ".part") + tmp.writeBytes(png) + val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true } + BitmapFactory.decodeFile(tmp.path, bounds) + return if (bounds.outWidth > 0 && tmp.renameTo(target)) true else { tmp.delete(); false } + } + + /** "SLUS-21065" from a PS2 .iso's SYSTEM.CNF (BOOT2 = cdrom0:\SLUS_210.65;1), or null. */ + private fun ps2Serial(file: File): String? { + val cnf = String(isoFile(file, "SYSTEM.CNF", 4096) ?: return null, Charsets.US_ASCII) + val m = Regex("BOOT2\\s*=\\s*cdrom0:\\\\?([A-Z]{4})_(\\d{3})\\.(\\d{2})").find(cnf) ?: return null + return "${m.groupValues[1]}-${m.groupValues[2]}${m.groupValues[3]}" + } + /** The six-character ID of a GameCube/Wii disc image (.iso/.gcm, or .wbfs), or null. */ private fun nintendoDiscId(file: File): String? { val offset = when (file.extension.lowercase()) { "iso", "gcm" -> 0L; "wbfs" -> 0x200L; else -> return null } From 9b173da1423e11a3454e1fa0072e34575b86f78e Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 05:31:00 -0400 Subject: [PATCH 12/65] Front end: wide cover art shown whole, titles without dump tags - A portrait tile or poster with wide art (a PS3 disc's ICON0, 320x176) shows it whole over a blurred, darkened copy of itself instead of cropping its sides ('Tomb Raider' read 'B RAI'); box art still fills the tile. - A game's title drops the dump's tags - (USA), (En,Fr,Es,Pt), (v1.01), [!] - which stay in the file name and in the cover lookup. --- .../droiddeck/launcher/frontend/Library.kt | 12 +++++-- .../droiddeck/launcher/ui/FrontEndScreen.kt | 32 +++++++++++++++++-- 2 files changed, 40 insertions(+), 4 deletions(-) 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 d4062dc3a4..0337e9d940 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -71,6 +71,14 @@ object Library { Spec("ppsspp", "PPSSPP", "PSP", "/usr/bin/PPSSPPSDL", listOf("psp"), setOf("iso", "cso", "pbp", "chd")), Spec("retroarch", "RetroArch", "many systems", "/usr/bin/retroarch", emptyList(), emptySet()), ) + /** + * A dump's file name as a title: its tags - (USA), (En,Fr,Es,Pt), [!], (v1.01) - identify the + * file and are dropped for reading ("Tomb Raider (USA) (En,Fr,Es,Pt)" -> "Tomb Raider"). The + * file keeps them, and the cover lookup still uses them. + */ + private fun displayTitle(name: String): String = + name.replace(Regex("\\s*[(\\[][^)\\]]*[)\\]]"), "").trim().ifEmpty { name } + /** Every system folder name the specs claim, so a loose-file scan of the root skips them. */ private val systemFolders: Set by lazy { specs.flatMap { it.folders }.toSet() } private val installedIds = mapOf( @@ -104,7 +112,7 @@ object Library { // A PS3 disc dump is a folder with PS3_GAME in it; RPCS3 boots the folder. if (spec.id == "rpcs3" && File(dir, "PS3_GAME").isDirectory) { val rel = dir.relativeTo(romsRoot).path - games.add(Rom(dir.name, dir, "/root/ROMs/$rel", spec.id, + games.add(Rom(displayTitle(dir.name), dir, "/root/ROMs/$rel", spec.id, // The dump carries its own art, as an installed package does. art = File(dir, "PS3_GAME/ICON0.PNG").takeIf { it.isFile })) continue @@ -114,7 +122,7 @@ object Library { // A .bin beside a .cue is a track, not a game. if (f.isFile && ext in spec.exts && !(ext == "bin" && File(dir, f.nameWithoutExtension + ".cue").isFile)) { val rel = f.relativeTo(romsRoot).path - games.add(Rom(f.nameWithoutExtension.removeSuffix(".dec"), f, "/root/ROMs/$rel", spec.id)) + games.add(Rom(displayTitle(f.nameWithoutExtension.removeSuffix(".dec")), f, "/root/ROMs/$rel", spec.id)) } } } 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 bc5c9ca45d..d37e689638 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -861,7 +861,7 @@ private fun Poster(art: File?, name: String, modifier: Modifier) { .graphicsLayer { alpha = t.value; translationY = (1f - t.value) * 16.dp.toPx(); rotationZ = (1f - t.value) * 2f; scaleX = 0.94f + 0.06f * t.value; scaleY = scaleX; shadowElevation = 22.dp.toPx(); shape = Shape12; clip = false } .clip(Shape12).background(artBrush(hueOf(name))), ) { - if (art != null) AsyncImage(model = art, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.fillMaxSize()) + if (art != null) CoverImage(art, Modifier.fillMaxSize()) else Text(name, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, modifier = Modifier.align(Alignment.BottomStart).padding(8.dp), maxLines = 3, overflow = TextOverflow.Ellipsis) } } @@ -933,13 +933,41 @@ private fun GameTile(t: Tile, wide: Boolean, square: Boolean, src: MutableIntera } } +/** + * Art for a portrait (2:3) tile. Box art fills it; wide art - a PS3 disc's ICON0, a game's header - + * is shown whole over a blurred, darkened copy of itself instead of losing its sides to the crop. + */ +@Composable +private fun CoverImage(art: File, modifier: Modifier) { + var wideArt by remember(art) { mutableStateOf(false) } + Box(modifier) { + if (wideArt) { + AsyncImage( + model = art, contentDescription = null, contentScale = ContentScale.Crop, + modifier = Modifier.fillMaxSize().graphicsLayer { scaleX = 1.2f; scaleY = 1.2f }.blur(14.dp), + ) + Spacer(Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.45f))) + } + AsyncImage( + model = art, contentDescription = null, + contentScale = if (wideArt) ContentScale.Fit else ContentScale.Crop, + onSuccess = { state -> + val size = state.painter.intrinsicSize + if (size.width > size.height * 1.1f) wideArt = true + }, + modifier = Modifier.fillMaxSize(), + ) + } +} + @Composable private fun Art(art: File?, iconRes: Int?, label: String, modifier: Modifier, wide: Boolean = false, iconBitmap: Bitmap? = null) { val colors = MaterialTheme.colorScheme val ratio = if (art == null && (iconRes != null || iconBitmap != null)) 1f else if (wide) 16f / 9f else 2f / 3f Box(modifier = modifier.aspectRatio(ratio).background(if (art == null && iconRes == null && iconBitmap == null) artBrush(hueOf(label)) else Brush.linearGradient(listOf(colors.surfaceVariant, colors.surface)))) { when { - art != null -> AsyncImage(model = art, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.fillMaxSize()) + art != null -> if (wide) AsyncImage(model = art, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.fillMaxSize()) + else CoverImage(art, Modifier.fillMaxSize()) iconRes != null -> Image(painterResource(iconRes), null, contentScale = ContentScale.Fit, modifier = Modifier.fillMaxSize().padding(if (wide) 10.dp else 8.dp)) iconBitmap != null -> Image(bitmap = iconBitmap.asImageBitmap(), contentDescription = null, contentScale = ContentScale.Fit, modifier = Modifier.fillMaxSize().padding(8.dp)) else -> { From 6b109046cd1f9c3071c54093b5cb05ae6b481aa1 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 06:26:12 -0400 Subject: [PATCH 13/65] Steam cog: stretch games to fill the screen, as a switch 0.1.6 forced every game window to the screen's size (--force-windows-fullscreen), which keeps FlatOut filling the screen but leaves Quake 3 drawing small in the bottom-left: it sets its own resolution and never looks at its window again, and OpenGL draws from that corner. The switch sits in the Steam page's Games group, on by default as before, and reaches the session as BL_GAMESCOPE_FORCE_FULLSCREEN, which the session script already reads. Listed in the device report. --- .../main/java/com/droiddeck/launcher/MainActivity.kt | 4 ++++ .../java/com/droiddeck/launcher/core/DeviceReport.kt | 1 + .../com/droiddeck/launcher/session/SessionPrefs.kt | 12 ++++++++++++ .../com/droiddeck/launcher/session/SessionService.kt | 1 + .../com/droiddeck/launcher/ui/ModeSettingsDialog.kt | 8 ++++++++ 5 files changed, 26 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index e587aac8c1..a55657c03b 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -105,6 +105,7 @@ class MainActivity : ComponentActivity() { private var phantomWarning by mutableStateOf(null) private var directAudio by mutableStateOf(false) private var clientDirectAudio by mutableStateOf(false) + private var forceFullscreen by mutableStateOf(true) private var mic by mutableStateOf(false) private var linuxRows by mutableStateOf>(emptyList()) /** The latest Banners-Turnip release as each driver menu offers it (see [refreshReleaseRows]). */ @@ -518,6 +519,7 @@ class MainActivity : ComponentActivity() { oscMode = if (mode == SessionService.MODE_STEAM) oscMode else null, directAudio = if (mode == SessionService.MODE_STEAM) directAudio else null, clientDirectAudio = clientDirectAudio, + forceFullscreen = if (mode == SessionService.MODE_STEAM) forceFullscreen else null, mic = if (mode == SessionService.MODE_STEAM) mic else null, renderer = if (mode == SessionService.MODE_DESKTOP) renderer else null, gameStorage = if (mode == SessionService.MODE_STEAM) gameStorage else null, @@ -549,6 +551,7 @@ class MainActivity : ComponentActivity() { onOsc = { o -> SessionPrefs.setOscMode(this, o); oscMode = o }, onDirectAudio = { on -> SessionPrefs.setDirectAudio(this, on); directAudio = on }, onClientDirectAudio = { on -> SessionPrefs.setClientDirectAudio(this, on); clientDirectAudio = on }, + onForceFullscreen = { on -> SessionPrefs.setForceFullscreen(this, on); forceFullscreen = on }, onMic = { on -> SessionPrefs.setMicEnabled(this, on) mic = on @@ -644,6 +647,7 @@ class MainActivity : ComponentActivity() { oscMode = SessionPrefs.oscMode(this) directAudio = SessionPrefs.directAudio(this) clientDirectAudio = SessionPrefs.clientDirectAudio(this) + forceFullscreen = SessionPrefs.forceFullscreen(this) mic = SessionPrefs.micEnabled(this) renderer = SessionPrefs.desktopRenderer(this) gameStorage = SessionPrefs.gameStorage(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 060efb5b93..498eb1fd24 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -149,6 +149,7 @@ object DeviceReport { k("Skip xalia", SessionPrefs.noXalia(context)) k("proot without seccomp", SessionPrefs.prootNoSeccomp(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") k("Microphone", SessionPrefs.micEnabled(context)) k("On-screen controls", SessionPrefs.oscMode(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 a2c1dbe772..bf2ac5d04a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -87,6 +87,18 @@ object SessionPrefs { prefs(context).edit().putBoolean("clientDirectAudio", on).apply() } + /** + * Steam only: gamescope makes every game window the size of the screen. A game that resizes + * its own window when it loses focus (FlatOut) otherwise comes back smaller, drawn in a + * corner; a game that sets its own resolution and never looks at its window again (Quake 3) + * instead draws small in the bottom-left of the stretched one. On unless turned off. + */ + fun forceFullscreen(context: Context): Boolean = prefs(context).getBoolean("forceFullscreen", true) + + fun setForceFullscreen(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("forceFullscreen", on).apply() + } + /** * DirectAudio for games: their Wine audio driver talks to the relay helper on this side. On * unless the user turned it off. 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 830cbe71be..c49c5586d4 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -304,6 +304,7 @@ class SessionService : Service() { if (SessionPrefs.noGlError(this)) guest.add("MESA_NO_ERROR=1") if (SessionState.mode == MODE_STEAM) guest.add("BL_STEAMDECK=" + (if (SessionPrefs.steamDeckMode(this)) "1" else "0")) if (SessionState.mode == MODE_STEAM) guest.add("BL_STEAM_CHANNEL=" + SessionPrefs.steamChannel(this)) + if (SessionState.mode == MODE_STEAM) guest.add("BL_GAMESCOPE_FORCE_FULLSCREEN=" + (if (SessionPrefs.forceFullscreen(this)) "1" else "0")) // Proton's own gate for its xalia helper (its `proton` script reads this, and sets // XALIA_SUPPORTED_ONLY itself otherwise). Off by default: xalia is Valve's, and on a device // whose seccomp answers its syscalls normally there is no reason to take it away. 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 7460914bcc..e7d26a4e99 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -53,6 +53,8 @@ class ModeSettings( val gameStorage: String? = null, val storageOptions: List> = emptyList(), val fexPreset: String? = null, + /** Steam only: games are stretched to fill the screen (null = not a Steam page). */ + val forceFullscreen: Boolean? = null, /** Steam only: the client branch forced on the command line. */ val steamChannel: String? = null, /** Steam only: the user's own games folder and what was found in it. */ @@ -98,6 +100,7 @@ class ModeSettingsActions( val onGameStorage: (path: String, label: String) -> Unit = { _, _ -> }, val onPickGameStorageFolder: () -> Unit = {}, val onFexPreset: (String) -> Unit = {}, + val onForceFullscreen: (Boolean) -> Unit = {}, val onSteamChannel: (String) -> Unit = {}, val onPickAddedGamesDir: () -> Unit = {}, val onForgetAddedGamesDir: (path: String) -> Unit = {}, @@ -280,6 +283,11 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { FexPreset.all.map { it.id to it.label }, s.fexPreset, note = FexPreset.byId(s.fexPreset).detail, onPick = a.onFexPreset, ) + if (s.forceFullscreen != null) ToggleRow( + host, "fill", "Stretch games to fill the screen", + "Keeps games that resize their own window (FlatOut) full screen. Turn it off if a game shows up small in a corner (Quake 3). Applies next session.", + s.forceFullscreen, onChange = a.onForceFullscreen, + ) } if (steam && s.directAudio != null && s.mic != null) SettingsGroup("Audio") { ToggleRow(host, "da", "DirectAudio for games", "Bypasses PulseAudio for lower latency in games.", s.directAudio, onChange = a.onDirectAudio) From ee941da5b4f296d52143dca0a9073f11c6adad11 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 06:29:33 -0400 Subject: [PATCH 14/65] Session drawer: stretch games to fill the screen, live The same choice as the Steam cog's, in the drawer's Now group, changed while the client runs: the app writes it to ~/.droiddeck-fill (and again at every session start, so a file an earlier session left never disagrees), and a watcher in the Steam session hands each change to gamescope as GAMESCOPE_FORCE_WINDOWS_FULLSCREEN on the root window, which gamescope reads whenever it changes. The session log says so when it does. --- .../com/droiddeck/launcher/SessionActivity.kt | 4 ++++ .../droiddeck/launcher/session/SessionPrefs.kt | 14 ++++++++++++++ .../droiddeck/launcher/session/SessionService.kt | 5 ++++- .../com/droiddeck/launcher/ui/SessionOverlay.kt | 7 +++++++ .../overlay/usr/local/bin/bannerlator-session | 16 ++++++++++++++++ 5 files changed, 45 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index a2d31962e2..862286a8c0 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -91,6 +91,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { /** The on-screen PC keyboard (ui/PcKeyboard): real key presses, Esc and F1 included. */ private var pcKeyboardOpen by mutableStateOf(false) private var hudOn by mutableStateOf(true) + private var fillScreen by mutableStateOf(true) private var frameGenLabel by mutableStateOf("Off") private var frameGenEngine by mutableStateOf(FrameGen.ENGINE_OFF) private var frameGenMultiplier by mutableStateOf(2) @@ -197,6 +198,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { isHomeApp = isHomeApp, androidApps = androidApps, hudOn = hudOn, + fillScreen = if (SessionState.mode == SessionService.MODE_STEAM) fillScreen else null, frameGenEngine = frameGenEngine, frameGenMultiplier = frameGenMultiplier, lsfgReady = LsfgNative.isInstalled(this@SessionActivity), oscMode = oscMode, touchMode = touchMode, @@ -206,6 +208,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { secondScreenDisplays = secondScreenDisplays, selectedSecondScreenDisplay = selectedSecondScreenDisplay, onHud = { on -> SessionPrefs.setHudEnabled(this@SessionActivity, on); hudOn = on; hud.refresh() }, + onFillScreen = { on -> SessionPrefs.setForceFullscreen(this@SessionActivity, on); fillScreen = on }, onFrameGenPick = { engine, multiplier -> FrameGen.set(this@SessionActivity, engine, multiplier) readPrefs() @@ -288,6 +291,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun readPrefs() { hudOn = SessionPrefs.hudEnabled(this) + fillScreen = SessionPrefs.forceFullscreen(this) touchMode = SessionPrefs.touchMode(this) frameGenLabel = FrameGen.label(this) frameGenEngine = FrameGen.engine(this) 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 bf2ac5d04a..c7afe842d3 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -97,6 +97,20 @@ object SessionPrefs { fun setForceFullscreen(context: Context, on: Boolean) { prefs(context).edit().putBoolean("forceFullscreen", on).apply() + writeForceFullscreenFlag(context) + } + + /** + * The same choice as a file the running session watches, so the drawer can change it live: + * the session hands every change to gamescope, which reads GAMESCOPE_FORCE_WINDOWS_FULLSCREEN + * off its root window whenever it changes. Written again at every session start so a file left + * by an earlier session never disagrees with the setting. + */ + fun writeForceFullscreenFlag(context: Context) { + runCatching { + java.io.File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context), "root/.droiddeck-fill") + .writeText(if (forceFullscreen(context)) "1\n" else "0\n") + } } /** 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 c49c5586d4..ec15c5c2c6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -304,7 +304,10 @@ class SessionService : Service() { if (SessionPrefs.noGlError(this)) guest.add("MESA_NO_ERROR=1") if (SessionState.mode == MODE_STEAM) guest.add("BL_STEAMDECK=" + (if (SessionPrefs.steamDeckMode(this)) "1" else "0")) if (SessionState.mode == MODE_STEAM) guest.add("BL_STEAM_CHANNEL=" + SessionPrefs.steamChannel(this)) - if (SessionState.mode == MODE_STEAM) guest.add("BL_GAMESCOPE_FORCE_FULLSCREEN=" + (if (SessionPrefs.forceFullscreen(this)) "1" else "0")) + if (SessionState.mode == MODE_STEAM) { + guest.add("BL_GAMESCOPE_FORCE_FULLSCREEN=" + (if (SessionPrefs.forceFullscreen(this)) "1" else "0")) + SessionPrefs.writeForceFullscreenFlag(this) + } // Proton's own gate for its xalia helper (its `proton` script reads this, and sets // XALIA_SUPPORTED_ONLY itself otherwise). Off by default: xalia is Valve's, and on a device // whose seccomp answers its syscalls normally there is no reason to take it away. 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 400caaeb82..1566a7d38f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -155,6 +155,8 @@ class DrawerActions( val touchAuto: String, val shapeMode: String, val fexPreset: String, + /** Steam only: games stretched to the screen's size, changed live (null = not Steam). */ + val fillScreen: Boolean? = null, val secondScreenMode: SecondScreenMode, val secondScreenDisplays: List, val selectedSecondScreenDisplay: Int, @@ -170,6 +172,7 @@ class DrawerActions( val onTouch: (String) -> Unit, val onShape: (String) -> Unit, val onFexPreset: (String) -> Unit, + val onFillScreen: (Boolean) -> Unit = {}, val onSecondScreenMode: (SecondScreenMode) -> Unit, val onSecondScreenDisplay: (Int) -> Unit, val onLaunchAndroidApp: (HomeApp.LaunchableApp) -> Unit, @@ -298,6 +301,10 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { host, "hud", "Performance HUD", null, a.hudOn, chipModifier = if (steamButtons) Modifier else Modifier.focusRequester(firstFocus), onChange = a.onHud, ) + if (a.fillScreen != null) ToggleRow( + host, "fill", "Stretch games to fill the screen", + "Off for a game that shows up small in a corner (Quake 3).", a.fillScreen, onChange = a.onFillScreen, + ) val fgOpen = host.open == "fg" val fgLabel = when (a.frameGenEngine) { FrameGen.ENGINE_WINFG -> "Win-FG ${a.frameGenMultiplier}×" diff --git a/tools/linuxfs/overlay/usr/local/bin/bannerlator-session b/tools/linuxfs/overlay/usr/local/bin/bannerlator-session index 0bc8477cd4..bdcc653c9e 100755 --- a/tools/linuxfs/overlay/usr/local/bin/bannerlator-session +++ b/tools/linuxfs/overlay/usr/local/bin/bannerlator-session @@ -347,6 +347,22 @@ case $mode in # moments later, so the seeder has only that gap to mark the redistributables as already run. # It stamps each prefix it has covered and skips it thereafter, so the extra passes cost # almost nothing. + # The drawer's "Stretch games to fill the screen" works live: the app writes its choice to + # ~/.droiddeck-fill, and each change goes to gamescope as GAMESCOPE_FORCE_WINDOWS_FULLSCREEN on + # the root window, which it watches. What gamescope was started with is where this begins. + ( + last=${BL_GAMESCOPE_FORCE_FULLSCREEN:-1} + while :; do + sleep 1 + want=$(cat "$HOME/.droiddeck-fill" 2>/dev/null) || continue + case $want in 0|1) ;; *) continue ;; esac + [ "$want" = "$last" ] && continue + if xprop -root -f GAMESCOPE_FORCE_WINDOWS_FULLSCREEN 32c -set GAMESCOPE_FORCE_WINDOWS_FULLSCREEN "$want" 2>/dev/null; then + echo "== stretch games to fill the screen: $want (live)" + last=$want + fi + done + ) & ( beat=0 for _ in $(seq 1 720); do From 1f67850680a27974b9c15bad70e23252d071d6c9 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 06:30:39 -0400 Subject: [PATCH 15/65] Progress log: GPU desktop, emulators like PS3, ARMSX2, game art (2026-09-24) --- docs/progress-log.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/docs/progress-log.md b/docs/progress-log.md index 751ecfb86d..74f418d665 100644 --- a/docs/progress-log.md +++ b/docs/progress-log.md @@ -7,6 +7,26 @@ the timeline, then lessons and backlog. Companion to the README (what the app *d --- +## 2026-09-24 - main `08a6769`: GPU desktop, emulators like PS3, ARMSX2, game art + +State: **main = `08a6769`** (PR #29 merge), main build run 35983098806, staged as `Download/DroidDeck-main-08a6769(-Genshin).apk`. No tag, no release since 0.1.6. **Device-tested on the AYANEO Pocket FIT** (Adreno 750) unless marked. + +- **PR #25 → `f6f7470`** (`feat/desktop-gpu`) - the desktop on the GPU: + - **Patched wlroots** (`tools/wlroots`, release `wlroots-0.20.2-p1`, staged at `/usr/local/lib/droiddeck-wlroots`): a Vulkan DMA-BUF allocator for the KGSL stand-in node, which is not a DRM device - stock wlroots failed at `drmModeCreateLease` → "unable to create allocator"; linux-dmabuf skips its GEM import check on such a node. labwc's **vulkan** and **gles2** renderers start; **vulkan is the default**. + - Compositor: a toplevel's **initial commit is answered with a configure** (labwc on vulkan waited for ever - wlroots moves its toplevel to a private queue after that commit); **`xdg_positioner` / `xdg_popup` / `wl_output` requests no longer abort** the app (NULL implementations; a gamescope beside labwc took the app down); without a Wine desktop a new window takes the keys. + - Fallback: labwc that exits or does not answer its socket within 20 s → pixman, remembered per renderer + wlroots md5 + driver (`~/.droiddeck-renderer-failed`, cleared by choosing a renderer). On pixman, Game/Emulator menu entries run through `droiddeck-gpu` (their own gamescope on wayland-0). + - Emulators: the pad is a plain Xbox 360 controller outside Steam (SDL ignores Steam's virtual gamepad outside Steam); `bannerlator-pad-defaults` seeds Player 1 per emulator (source-verified formats) and never overwrites a user's profile; big-core pinning (`program_cores`, game cores when chosen); rail programs use the desktop's Linux driver (one shader cache); RPCS3 moved once to `Async Recompiler (multi-threaded)` (no 6650-variant interpreter precompile each boot). + - **PC keyboard** (drawer: Keyboard [Hardware] [Android]): Esc, F1-F12, editing block, modifiers (sticky), arrows; real evdev key presses; 47% of the screen. + - Proven: Vulkan and gles2 desktops, Firefox on Vulkan, RPCS3 God of War II HD in a window and from the rail (pad bound, no precompile, cores 2-7), pixman fallback path, Steam session. +- **PR #26 → `6980428`** (`feat/armsx2`) - **PS2 is ARMSX2** (PCSX2 fork with ARM64 recompilers, GPL-3.0). Upstream PCSX2 only has `pcsx2/arm64/RecStubs.cpp`: NFS Underground 2 ran at 17 fps with one core at 100%; ARMSX2 runs it at **59.9 fps / 100%**, all recompilers + fastmem on under proot. PCSX2 left the front end and the catalog. +- **PR #29 → `08a6769`** (`feat/armsx2-polish`): + - ARMSX2 from the rail: `-batch -bigpicture -fullscreen`; guide → pause menu → Close Game returns to the app. First run: PCSX2 settings + memory cards copied once; a new player gets ARMSX2's setup with the BIOS folder in `ROMs/ps2/bios` (or `ps2/firmware`), `ps2` as game list, Vulkan, controller on Player 1. Users bring their own BIOS and games. + - Catalog `pages` - a file per memory page size; ARMSX2 4K + 16K. + - On-screen controls: Auto for rail games and Steam when no controller, off on the desktop; setting in the drawer everywhere; drawer headed by the emulator for rail games. + - Front end: Back/B steps back a level (emulator → Desktop, game → emulator) instead of leaving the app; games found up to 3 folders deep (`ps2/games//`); **box art** (libretro-thumbnails by name exact/loose, xlenore/ps2-covers by PS2 serial, GameTDB by GC/Wii ID, PS3 discs' own `ICON0.PNG`), kept in `files/covers`; wide art shown whole over a blurred copy; titles without dump tags. +- **winlator-contents** (the catalog): ARMSX2 `nightly-20260923-92aa2174da` mirrored (`armsx2.AppImage` 4K, `armsx2-16k.AppImage`), PCSX2 dropped from `desktop.json` (PRs #12, #13); the mirror workflow lists only the file being added (a re-run re-fetches and clobbers every listed file, and DuckStation's upstream link moves). +- **Not yet device-played**: DuckStation, Dolphin, Cemu, melonDS, PPSSPP, RetroArch (profiles + covers written from their sources). Known gap: a keyboard's Esc does not open ARMSX2's pause menu in a rail game (guide does). + ## 2026-09-23 (evening) - renamed SteamDeck → DroidDeck - **App name, app ID and code package**: DroidDeck, `com.droiddeck.launcher` (was `com.steamdeck.launcher`), sources under `app/src/main/java/com/droiddeck/launcher`, the 68 JNI functions renamed with them. A new app ID means DroidDeck installs **beside** SteamDeck, not over it: the runtime, the Steam sign-in and the settings start fresh. @@ -191,8 +211,21 @@ State: **main = `90c7574`** (PR #14 merge), main build run 35895701784. No tag, - Bannerlator's File Manager ports mechanically (`port_fm.py` anchors) once the container hooks are cut; do not hand-edit 2,500 lines. - Deleting a release asset on GitHub can drop a sibling asset - re-list and restore. +- A resource without an implementation makes libwayland abort on its first request - every + interface the compositor hands out needs one, even as no-ops (positioner, popup, output). +- The KGSL stand-in answers no DRM ioctl: `drmIsMaster()` reads that as "master"; check + `drmGetVersion()` before treating a GPU fd as DRM. +- Verify an emulator's config values from its source: RPCS3's GUI says "Async Shader Recompiler", + the config value is "Async Recompiler (multi-threaded)". +- Upstream PCSX2 has no ARM64 recompiler; a correct ARM64 build of it is still interpreter-slow. ## Backlog / next +- Play-test the other emulators one by one on the FIT: DuckStation, Dolphin, Cemu, melonDS, + PPSSPP, RetroArch (pad profiles and covers exist; nothing played yet). +- Keyboard Esc in a rail game does not reach ARMSX2's pause menu (guide does). +- Kurt's PR #20 (Back shortcuts) conflicts with main since the keyboard/drawer work - rebase. +- 0.1.7 pre-release when ready (everything above is on main only). +- Pin a newer ARMSX2 nightly only after testing it (it changes daily). - Device-prove 0.1.4 on the FIT (list above). - Thor Pro: trackpad tap; the 1–2 min in-game crash once a `crash.log` arrives. - Xfce as a second desktop shell (Max's branch runs XFCE 4.20 on labwc) - a catalog package + a From c951c71f82511489455a9c5fbc85a0c3a941852f Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Wed, 23 Sep 2026 21:38:46 -0400 Subject: [PATCH 16/65] Show build identity on launcher --- .github/workflows/build.yml | 19 ++++++++ app/build.gradle | 41 +++++++++++++++++ .../com/droiddeck/launcher/MainActivity.kt | 4 ++ .../droiddeck/launcher/ui/FrontEndScreen.kt | 44 +++++++++++++++++++ 4 files changed, 108 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5965ffe22..8511575544 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,5 @@ name: Build APK +run-name: ${{ github.event_name == 'pull_request_target' && format('building pr {0} on {1}', github.event.pull_request.number, github.event.pull_request.head.sha) || format('building {0} on {1}', github.ref_name, github.sha) }} # One job: the two glibc preload libraries the session needs, then the app around them. # Nothing is built on a developer machine - this workflow is the only thing that produces an apk. @@ -140,6 +141,22 @@ jobs: echo "NDK $VERSION at $NDK" echo "NDK_VERSION=$VERSION" >> "$GITHUB_ENV" + - name: Set the APK build label + id: build-label + env: + PR_NUMBER: ${{ github.event.pull_request.number }} + PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} + BUILD_REF: ${{ github.ref_name }} + BUILD_SHA: ${{ github.sha }} + run: | + if [[ -n "$PR_NUMBER" ]]; then + label="pr${PR_NUMBER} at ${PR_HEAD_SHA:0:7}" + else + label="${BUILD_REF} at ${BUILD_SHA:0:7}" + fi + echo "label=$label" >> "$GITHUB_OUTPUT" + echo "Build: \`$label\`" >> "$GITHUB_STEP_SUMMARY" + # ── The session's preloads ─────────────────────────────────────────────────────────── # Both are glibc aarch64 libraries that live inside the rootfs, so they are cross-compiled # here rather than by the NDK. They ship in assets (not in the runtime tarball) so a fix in @@ -306,6 +323,8 @@ jobs: # The whole log is kept so a failed build's errors can be quoted back on a pull request. - name: Build id: build + env: + DROIDDECK_BUILD_LABEL: ${{ steps.build-label.outputs.label }} run: | set -o pipefail ./gradlew assembleRelease --console=plain -PndkVersion="$NDK_VERSION" 2>&1 | tee /tmp/build.log diff --git a/app/build.gradle b/app/build.gradle index 413b4e2238..821f2afb2e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,6 +4,45 @@ plugins { apply plugin: 'kotlin-android' apply plugin: 'org.jetbrains.kotlin.plugin.compose' +def gitValue = { List arguments -> + try { + def output = providers.exec { + commandLine(['git'] + arguments) + workingDir rootProject.projectDir + ignoreExitValue = true + } + output.result.get().exitValue == 0 ? output.standardOutput.asText.get().trim() : '' + } catch (Exception ignored) { + '' + } +} + +def buildLabel = providers.environmentVariable('DROIDDECK_BUILD_LABEL').getOrNull() +if (buildLabel == null || buildLabel.trim().isEmpty()) { + def eventName = providers.environmentVariable('GITHUB_EVENT_NAME').getOrNull() + def eventPath = providers.environmentVariable('GITHUB_EVENT_PATH').getOrNull() + if (eventName == 'pull_request_target' && eventPath) { + try { + def eventFile = layout.file(providers.provider { new File(eventPath) }) + def eventText = providers.fileContents(eventFile).asText.get() + def pullRequest = new groovy.json.JsonSlurper().parseText(eventText).pull_request + if (pullRequest?.number && pullRequest?.head?.sha) { + buildLabel = "pr${pullRequest.number} at ${pullRequest.head.sha.take(7)}" + } + } catch (Exception ignored) { + // Local builds and unusual CI events can omit the pull-request payload. + } + } + if (buildLabel == null || buildLabel.trim().isEmpty()) { + def branch = providers.environmentVariable('GITHUB_REF_NAME').getOrNull() + ?: gitValue(['branch', '--show-current']) ?: 'local' + def commit = providers.environmentVariable('GITHUB_SHA').getOrNull() + ?.take(7) ?: gitValue(['rev-parse', '--short=7', 'HEAD']) ?: 'unknown' + buildLabel = "${branch} at ${commit}" + } +} +def escapedBuildLabel = buildLabel.replace('\\', '\\\\').replace('"', '\\"') + android { namespace 'com.droiddeck.launcher' compileSdk 34 @@ -20,6 +59,7 @@ android { targetSdkVersion 28 versionCode 7 versionName "0.1.6" + buildConfigField "String", "BUILD_LABEL", "\"${escapedBuildLabel}\"" ndk { abiFilters 'arm64-v8a' @@ -87,6 +127,7 @@ android { buildFeatures { compose true + buildConfig true } compileOptions { diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index ca68e8e057..7e78b691ad 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -244,6 +244,7 @@ class MainActivity : ComponentActivity() { packagePercent = pkgPercent, sessionRunning = SessionState.running, backActionsInverted = backActionsInverted, + buildLabel = BuildConfig.BUILD_LABEL, ), FrontEndActions( onPlay = { startSession(Intent(this, SessionActivity::class.java)) }, @@ -308,6 +309,9 @@ class MainActivity : ComponentActivity() { SessionPrefs.setBackActionsInverted(this, inverted) backActionsInverted = inverted }, + onCheckLatestBuild = { + startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/The412Banner/DroidDeck/actions/workflows/build.yml"))) + }, ), page = page, ) 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 92774857a6..93bc551852 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -59,11 +59,13 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Refresh import androidx.compose.material.icons.filled.Settings import androidx.compose.material3.Icon import androidx.compose.material3.LinearProgressIndicator @@ -98,6 +100,7 @@ import androidx.compose.ui.layout.positionInRoot import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.painterResource +import androidx.compose.ui.semantics.Role import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.IntOffset @@ -143,6 +146,7 @@ class FrontEndState( val packagePercent: Int = -1, val sessionRunning: Boolean = false, val backActionsInverted: Boolean = false, + val buildLabel: String = "local", ) class FrontEndActions( @@ -172,6 +176,7 @@ class FrontEndActions( val onHomeApp: () -> Unit = {}, val onAndroidApp: (com.droiddeck.launcher.HomeApp.LaunchableApp) -> Unit = {}, val onBackActionsInverted: (Boolean) -> Unit = {}, + val onCheckLatestBuild: () -> Unit = {}, ) @@ -466,6 +471,45 @@ private fun Pane(s: FrontEndState, selected: String, a: FrontEndActions, page: ( }, label = "pane", ) { key -> if (page != null && key == s.pageKey) page() else Content(s, key, a, Modifier.fillMaxSize(), onSelect) } + if (page == null && s.pageKey == null && selected == "steam") { + BuildStatus( + label = s.buildLabel, + onCheckLatest = a.onCheckLatestBuild, + modifier = Modifier.align(Alignment.TopEnd).padding(12.dp), + ) + } + } +} + +@Composable +private fun BuildStatus(label: String, onCheckLatest: () -> Unit, modifier: Modifier = Modifier) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val interaction = remember { MutableInteractionSource() } + val hot = rememberHot(interaction) + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(9.dp), + modifier = modifier + .widthIn(max = 360.dp) + .clip(Shape12) + .background(colors.surface.copy(alpha = 0.96f)) + .border(1.5.dp, if (hot) pal.signal else pal.line2, Shape12) + .hoverable(interaction) + .clickable( + interactionSource = interaction, + indication = LocalIndication.current, + role = Role.Button, + onClick = onCheckLatest, + ) + .padding(horizontal = 11.dp, vertical = 7.dp), + ) { + Column(modifier = Modifier.weight(1f)) { + Text("BUILD", fontSize = 9.sp, letterSpacing = 1.sp, color = colors.onSurfaceVariant) + Text(label, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + Icon(Icons.Filled.Refresh, contentDescription = null, tint = if (hot) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(15.dp)) + Text("Check latest", fontSize = 11.sp, fontWeight = FontWeight.SemiBold, color = if (hot) pal.signal else colors.onBackground, maxLines = 1) } } From 8e3083507a5c45410bfef4e150cd5cc86eda40c4 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Wed, 23 Sep 2026 23:07:59 -0400 Subject: [PATCH 17/65] Remove build badge caption --- .../main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 93bc551852..35732091e3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -504,10 +504,7 @@ private fun BuildStatus(label: String, onCheckLatest: () -> Unit, modifier: Modi ) .padding(horizontal = 11.dp, vertical = 7.dp), ) { - Column(modifier = Modifier.weight(1f)) { - Text("BUILD", fontSize = 9.sp, letterSpacing = 1.sp, color = colors.onSurfaceVariant) - Text(label, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - } + Text(label, modifier = Modifier.weight(1f), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) Icon(Icons.Filled.Refresh, contentDescription = null, tint = if (hot) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(15.dp)) Text("Check latest", fontSize = 11.sp, fontWeight = FontWeight.SemiBold, color = if (hot) pal.signal else colors.onBackground, maxLines = 1) } From 39141d5c23c35c89ff0e0ad875b3b3be2f53f649 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Wed, 23 Sep 2026 23:21:09 -0400 Subject: [PATCH 18/65] Make session menu controller driven --- app/build.gradle | 1 - .../com/droiddeck/launcher/SessionActivity.kt | 15 +++++++-- .../droiddeck/launcher/ui/FrontEndScreen.kt | 1 + .../droiddeck/launcher/ui/SessionOverlay.kt | 31 +++++++++++++++++-- .../droiddeck/launcher/ui/SettingsWidgets.kt | 25 +++++++++++++++ 5 files changed, 67 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 821f2afb2e..bf8efebbe9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,7 +30,6 @@ if (buildLabel == null || buildLabel.trim().isEmpty()) { buildLabel = "pr${pullRequest.number} at ${pullRequest.head.sha.take(7)}" } } catch (Exception ignored) { - // Local builds and unusual CI events can omit the pull-request payload. } } if (buildLabel == null || buildLabel.trim().isEmpty()) { diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index f2a088b7a1..8889ad34c1 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -94,6 +94,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var drawerDirectionDownTime = 0L private var drawerDirectionLastRepeat = 0L private var drawerDirectionDeviceId = -1 + private val resumeKeysDown = mutableSetOf>() // Compose reads these; the activity writes them. private var drawerOpen by mutableStateOf(false) @@ -675,8 +676,18 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> return super.dispatchKeyEvent(event) } - // Keep keys in the Android/Compose focus tree while the drawer is open. Its Back key and - // controller B always dismiss the drawer; directional and confirm keys stay with the UI. + val fromController = PadBridge.isFromController(event.device) + val resumeKey = event.keyCode == KeyEvent.KEYCODE_BUTTON_A || event.keyCode == KeyEvent.KEYCODE_BUTTON_START + val resumeKeyId = event.deviceId to event.keyCode + if (fromController && resumeKey && (SessionState.suspended || resumeKeyId in resumeKeysDown)) { + if (event.action == KeyEvent.ACTION_DOWN) { + resumeKeysDown.add(resumeKeyId) + if (event.repeatCount == 0 && SessionState.suspended) SessionService.resume(this) + } else if (event.action == KeyEvent.ACTION_UP) { + resumeKeysDown.remove(resumeKeyId) + } + return true + } if (drawerOpen) { if (event.keyCode == KeyEvent.KEYCODE_BACK || event.keyCode == KeyEvent.KEYCODE_BUTTON_B) { if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) drawerOpen = false 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 35732091e3..6ed54f34b3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -883,6 +883,7 @@ internal fun SecondaryButton(text: String, enabled: Boolean = true, onClick: () modifier = Modifier.graphicsLayer { scaleX = scale; scaleY = scale }.clip(Shape12).background(fill).border(1.dp, edge, Shape12) .alpha(if (enabled) 1f else 0.5f) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, enabled = enabled, onClick = onClick) + .controllerConfirm(enabled = enabled, onClick = onClick) .padding(horizontal = 16.dp, vertical = 11.dp), ) { Text(text, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 0.5.sp, color = colors.onBackground, maxLines = 1) } } 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 c0bbd47b50..febe2825bb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.activity.compose.BackHandler import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -54,6 +55,7 @@ import androidx.compose.animation.slideOutHorizontally import androidx.compose.foundation.LocalIndication import androidx.compose.foundation.border import androidx.compose.foundation.hoverable +import androidx.compose.foundation.focusGroup import androidx.compose.foundation.interaction.collectIsFocusedAsState import androidx.compose.foundation.interaction.collectIsHoveredAsState import androidx.compose.foundation.layout.Arrangement @@ -65,6 +67,8 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.input.InputMode @@ -126,6 +130,11 @@ fun LoadingOverlay(step: String, percent: Int, elapsed: String, hint: String, en @Composable fun SessionPausedOverlay(onResume: () -> Unit) { val interactionSource = remember { MutableInteractionSource() } + val resumeFocus = remember { FocusRequester() } + LaunchedEffect(Unit) { + androidx.compose.runtime.withFrameNanos { } + runCatching { resumeFocus.requestFocus() } + } Box( modifier = Modifier .fillMaxSize() @@ -137,7 +146,10 @@ fun SessionPausedOverlay(onResume: () -> Unit) { horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.padding(32.dp), ) { - OutlinedButton(onClick = onResume) { + OutlinedButton( + onClick = onResume, + modifier = Modifier.focusRequester(resumeFocus).controllerConfirm(onClick = onResume), + ) { Text("Resume session") } } @@ -199,6 +211,9 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { var firstControlFocused by remember { mutableStateOf(false) } val inputModeManager = LocalInputModeManager.current val steamButtons = a.onSteamMenu != null && a.onQam != null + BackHandler(enabled = open) { + if (host.open != null) host.open = null else a.onClose() + } LaunchedEffect(open) { if (open) { inputModeManager.requestInputMode(InputMode.Keyboard) @@ -228,6 +243,9 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { .background(pal.background.copy(alpha = 0.97f)) .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) {} .focusGroup() + .controllerBack { + if (host.open != null) host.open = null else a.onClose() + } .verticalScroll(rememberScrollState()) .padding(horizontal = 14.dp, vertical = 16.dp), ) { @@ -259,7 +277,10 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { onClick = { host.open = null; a.onSteamMenu.invoke() }, interactionSource = steamSrc, modifier = Modifier.weight(1f).height(48.dp).focusRequester(firstFocus) - .onFocusChanged { firstControlFocused = it.isFocused }, + .onFocusChanged { firstControlFocused = it.isFocused }.controllerConfirm { + host.open = null + a.onSteamMenu.invoke() + }, shape = RoundedCornerShape(12.dp), border = BorderStroke(if (steamHot) 2.dp else 1.dp, if (steamHot) pal.signal else colors.outline), colors = ButtonDefaults.outlinedButtonColors(containerColor = if (steamHot) pal.signal.copy(alpha = 0.16f) else Color.Transparent), @@ -273,7 +294,10 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { qamStartedOnPress = false }, interactionSource = qamInteraction, - modifier = Modifier.weight(1f).height(48.dp).semantics { contentDescription = "Open Quick Access Menu" }, + modifier = Modifier.weight(1f).height(48.dp).semantics { contentDescription = "Open Quick Access Menu" }.controllerConfirm { + host.open = null + a.onQam.invoke() + }, shape = RoundedCornerShape(12.dp), border = BorderStroke(if (qamHot) 2.dp else 1.dp, if (qamHot) pal.signal else colors.outline), colors = ButtonDefaults.outlinedButtonColors(containerColor = if (qamHot) pal.signal.copy(alpha = 0.16f) else Color.Transparent), @@ -410,6 +434,7 @@ private fun DangerButton(text: String, onClick: () -> Unit) { Box( modifier = Modifier.clip(RoundedCornerShape(12.dp)).background(fill).border(1.dp, colors.error.copy(alpha = if (hot) 0.9f else 0.5f), RoundedCornerShape(12.dp)) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, onClick = onClick) + .controllerConfirm(onClick = onClick) .padding(horizontal = 16.dp, vertical = 11.dp), ) { Text(text, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 0.5.sp, color = colors.error, maxLines = 1) } } 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 da7fd678db..7577264693 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import android.view.KeyEvent import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateColorAsState @@ -52,6 +53,7 @@ import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.TransformOrigin import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow @@ -69,6 +71,26 @@ import androidx.compose.ui.window.PopupProperties private val RowShape = RoundedCornerShape(12.dp) private val GroupShape = RoundedCornerShape(14.dp) +internal fun Modifier.controllerConfirm(enabled: Boolean = true, onClick: () -> Unit): Modifier = onPreviewKeyEvent { event -> + val keyEvent = event.nativeKeyEvent + if (keyEvent.keyCode != KeyEvent.KEYCODE_BUTTON_A) { + false + } else { + if (enabled && keyEvent.action == KeyEvent.ACTION_DOWN && keyEvent.repeatCount == 0) onClick() + true + } +} + +internal fun Modifier.controllerBack(onBack: () -> Unit): Modifier = onPreviewKeyEvent { event -> + val keyEvent = event.nativeKeyEvent + if (keyEvent.keyCode != KeyEvent.KEYCODE_BUTTON_B && keyEvent.keyCode != KeyEvent.KEYCODE_BACK) { + false + } else { + if (keyEvent.action == KeyEvent.ACTION_DOWN && keyEvent.repeatCount == 0) onBack() + true + } +} + class MenuHost { var open by mutableStateOf(null) } @@ -114,6 +136,7 @@ fun AnchoredMenu(open: Boolean, onDismiss: () -> Unit, title: String? = null, no .clip(RowShape) .background(pal.surfaceVariant.copy(alpha = 0.95f)) .border(1.dp, pal.signal.copy(alpha = 0.22f), RowShape) + .controllerBack(onDismiss) .padding(6.dp), ) { if (title != null) Text( @@ -149,6 +172,7 @@ fun MenuItem( .background(if (hot && enabled) Color.White.copy(alpha = 0.07f) else Color.Transparent) .alpha(if (enabled) 1f else 0.4f) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, enabled = enabled, onClick = onClick) + .controllerConfirm(enabled = enabled, onClick = onClick) .padding(horizontal = 10.dp, vertical = 9.dp), ) { Text("✓", fontSize = 12.sp, color = pal.signal, modifier = Modifier.width(18.dp).alpha(if (checked) 1f else 0f)) @@ -181,6 +205,7 @@ fun ValueChip(text: String, open: Boolean, enabled: Boolean = true, modifier: Mo .border(1.dp, edge, RoundedCornerShape(10.dp)) .alpha(if (enabled) 1f else 0.5f) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, enabled = enabled, onClick = onClick) + .controllerConfirm(enabled = enabled, onClick = onClick) .padding(horizontal = 12.dp, vertical = 8.dp), ) { AnimatedContent( From 7c1a603ddbb18112822609e82c7abfed882ea272 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Wed, 23 Sep 2026 23:26:29 -0400 Subject: [PATCH 19/65] Add second-screen controls close button --- .../java/com/droiddeck/launcher/SessionActivity.kt | 1 + .../launcher/ui/SecondScreenPresentation.kt | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 8889ad34c1..62a672054c 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -905,6 +905,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onQam = { if (SessionState.mode == SessionService.MODE_STEAM) padBridge?.triggerQam() }, + onClose = { selectSecondScreenMode(SecondScreenMode.NONE) }, ) secondScreenPresentation = presentation } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt index 818d72624d..3a4bdb2ef6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -44,6 +44,7 @@ class SecondScreenPresentation( private val sendWheel: (steps: Int) -> Unit, private val onSteamMenu: () -> Unit, private val onQam: () -> Unit, + private val onClose: () -> Unit, ) : Presentation(sessionActivity, display) { private val root = LinearLayout(context).apply { orientation = LinearLayout.VERTICAL @@ -124,6 +125,12 @@ class SecondScreenPresentation( setPadding(dp(12), dp(8), dp(12), dp(8)) setBackgroundColor(0xE6191E24.toInt()) } + controls.addView(Button(context).apply { + text = "×" + contentDescription = "Close second-screen controls" + minWidth = dp(48) + setOnClickListener { onClose() } + }) controls.addView(TextView(context).apply { text = "Trackpad" textSize = 14f @@ -169,6 +176,12 @@ class SecondScreenPresentation( setPadding(dp(8), dp(4), dp(8), dp(4)) setBackgroundColor(Color.rgb(27, 32, 38)) } + bar.addView(Button(context).apply { + text = "×" + contentDescription = "Close second-screen controls" + minWidth = dp(48) + setOnClickListener { onClose() } + }) bar.addView(TextView(context).apply { text = "Linux terminal" textSize = 14f From e1ae162c79d2ef6e8e75b25f41c5706195bac56b Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Wed, 23 Sep 2026 23:38:53 -0400 Subject: [PATCH 20/65] Add direct touchscreen input for Steam sessions --- app/src/main/cpp/waylandcomp/src/compositor.c | 217 +++++++++++++++++- .../cpp/waylandcomp/src/waylandcomp_jni.c | 7 + .../com/droiddeck/launcher/SessionActivity.kt | 24 +- .../launcher/wayland/WaylandCompositor.java | 2 + 4 files changed, 232 insertions(+), 18 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 55fb521586..5b7642bb7d 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -465,17 +465,23 @@ static void release_buffer(struct surface *s, struct wl_resource *buffer, int64_ /* Each Wine process is a separate client with its own wl_pointer / wl_keyboard. */ struct seat_pointer { struct wl_resource *ptr; struct wl_resource *focus; }; struct seat_keyboard { struct wl_resource *kb; struct wl_resource *focus; }; +struct seat_touch { struct wl_resource *touch; struct wl_resource *focus; }; #define MAX_PTRS 32 +#define MAX_TOUCH_POINTS 32 static struct seat_pointer g_ptrs[MAX_PTRS]; static int g_nptrs; static struct seat_keyboard g_kbs[MAX_PTRS]; static int g_nkbs; +static struct seat_touch g_touches[MAX_PTRS]; +static int g_ntouches; +struct active_touch { struct surface *surface; int pointer_fallback; }; +static struct active_touch g_touch_points[MAX_TOUCH_POINTS]; +static void touch_cancel_surface(struct surface *surface); static struct surface *g_grab; /* no-desktop fallback: surface holding the button */ static struct surface *g_key_target; /* no-desktop fallback: last clicked surface */ static struct surface *g_ime_click; /* last clicked program window: where text input goes */ static int g_input_pipe[2] = {-1, -1}; -/* type 0 = pointer (p1=action 0down/1move/2up, p2=x, p3=y); type 1 = key (p1=evdev, p2=state 1down/0up) */ -struct input_msg { int type; int p1; int p2; int p3; }; +struct input_msg { int type; int p1; int p2; int p3; int p4; }; /* Pointer constraints (zwp_pointer_constraints_v1) and relative pointers * (zwp_relative_pointer_manager_v1); see the "pointer constraints" section. */ @@ -1002,6 +1008,7 @@ static void surface_resource_destroy(struct wl_resource *r) { if (!s) return; for (int i = 0; i < g_nptrs; i++) if (g_ptrs[i].focus == r) g_ptrs[i].focus = NULL; for (int i = 0; i < g_nkbs; i++) if (g_kbs[i].focus == r) g_kbs[i].focus = NULL; + touch_cancel_surface(s); if (g_grab == s) g_grab = NULL; if (g_key_target == s) g_key_target = NULL; if (g_ime_click == s) g_ime_click = NULL; @@ -2401,6 +2408,10 @@ static void keyboard_res_destroy(struct wl_resource *r) { } static void touch_release(struct wl_client *c, struct wl_resource *r) { wl_resource_destroy(r); } static const struct wl_touch_interface touch_impl = { .release = touch_release }; +static void touch_res_destroy(struct wl_resource *r) { + for (int i = 0; i < g_ntouches; i++) + if (g_touches[i].touch == r) { g_touches[i] = g_touches[--g_ntouches]; break; } +} static void seat_get_pointer(struct wl_client *c, struct wl_resource *r, uint32_t id) { struct wl_resource *p = wl_resource_create(c, &wl_pointer_interface, wl_resource_get_version(r), id); @@ -2432,7 +2443,13 @@ static void seat_get_keyboard(struct wl_client *c, struct wl_resource *r, uint32 } static void seat_get_touch(struct wl_client *c, struct wl_resource *r, uint32_t id) { struct wl_resource *t = wl_resource_create(c, &wl_touch_interface, wl_resource_get_version(r), id); - if (t) wl_resource_set_implementation(t, &touch_impl, NULL, NULL); + if (!t) { wl_client_post_no_memory(c); return; } + wl_resource_set_implementation(t, &touch_impl, NULL, touch_res_destroy); + if (g_ntouches < MAX_PTRS) { + g_touches[g_ntouches].touch = t; + g_touches[g_ntouches].focus = NULL; + g_ntouches++; + } } static void seat_release(struct wl_client *c, struct wl_resource *r) { wl_resource_destroy(r); } static const struct wl_seat_interface seat_impl = { @@ -2442,7 +2459,7 @@ static const struct wl_seat_interface seat_impl = { static void bind_seat(struct wl_client *c, void *data, uint32_t ver, uint32_t id) { struct wl_resource *r = wl_resource_create(c, &wl_seat_interface, ver, id); wl_resource_set_implementation(r, &seat_impl, NULL, NULL); - wl_seat_send_capabilities(r, WL_SEAT_CAPABILITY_POINTER | WL_SEAT_CAPABILITY_KEYBOARD); + wl_seat_send_capabilities(r, WL_SEAT_CAPABILITY_POINTER | WL_SEAT_CAPABILITY_KEYBOARD | WL_SEAT_CAPABILITY_TOUCH); if (ver >= 2) wl_seat_send_name(r, "bannerlator-seat"); } @@ -2466,6 +2483,9 @@ static struct seat_keyboard *keyboard_for(struct wl_client *client) { #define for_each_keyboard_of(client, sk) \ for (int _i = 0; _i < g_nkbs; _i++) \ if (((sk) = &g_kbs[_i]), wl_resource_get_client((sk)->kb) == (client)) +#define for_each_touch_of(client, st) \ + for (int _i = 0; _i < g_ntouches; _i++) \ + if (((st) = &g_touches[_i]), wl_resource_get_client((st)->touch) == (client)) /* Topmost window whose scene rectangle contains the point (no-desktop fallback). */ static struct surface *toplevel_at(double x, double y) { @@ -3000,6 +3020,179 @@ static void deliver_pointer(const struct input_msg *m) { pointer_event(x, y, m->p1 == 1 ? 0 : BTN_LEFT, m->p1 == 0); } +static void input_output_to_scene(int px, int py, double *x, double *y) { + int w, h, ow, oh; + scene_size(&w, &h); + vkp_output_size(&ow, &oh); + if (ow <= 0 || oh <= 0 || + !vkp_output_to_scene((double)px * ow / INPUT_SPACE_W, (double)py * oh / INPUT_SPACE_H, x, y)) { + *x = (double)px * w / INPUT_SPACE_W; + *y = (double)py * h / INPUT_SPACE_H; + } + if (*x < 0) *x = 0; + if (*y < 0) *y = 0; + if (*x > w - 1) *x = w - 1; + if (*y > h - 1) *y = h - 1; +} + +static int touch_points_for_client(struct wl_client *client) { + for (int i = 0; i < MAX_TOUCH_POINTS; i++) { + struct surface *surface = g_touch_points[i].surface; + if (surface && wl_resource_get_client(surface->resource) == client) return 1; + } + return 0; +} + +static void touch_frame(struct wl_client *client) { + struct seat_touch *st; + for_each_touch_of(client, st) + if (wl_resource_get_version(st->touch) >= WL_TOUCH_FRAME_SINCE_VERSION) + wl_touch_send_frame(st->touch); +} + +static void touch_cancel_client(struct wl_client *client) { + struct seat_touch *st; + int release_pointer = 0; + for_each_touch_of(client, st) { + if (st->focus) wl_touch_send_cancel(st->touch); + st->focus = NULL; + } + for (int i = 0; i < MAX_TOUCH_POINTS; i++) { + struct surface *surface = g_touch_points[i].surface; + if (surface && wl_resource_get_client(surface->resource) == client) { + release_pointer |= g_touch_points[i].pointer_fallback; + memset(&g_touch_points[i], 0, sizeof(g_touch_points[i])); + } + } + if (release_pointer) pointer_button(BTN_LEFT, 0); + wl_display_flush_clients(g_display); +} + +static void touch_cancel_all(void) { + int release_pointer = 0; + for (int i = 0; i < g_ntouches; i++) { + if (g_touches[i].focus) wl_touch_send_cancel(g_touches[i].touch); + g_touches[i].focus = NULL; + } + for (int i = 0; i < MAX_TOUCH_POINTS; i++) + release_pointer |= g_touch_points[i].pointer_fallback; + memset(g_touch_points, 0, sizeof(g_touch_points)); + if (release_pointer) pointer_button(BTN_LEFT, 0); + wl_display_flush_clients(g_display); +} + +static void touch_cancel_surface(struct surface *surface) { + struct wl_client *client = wl_resource_get_client(surface->resource); + for (int i = 0; i < MAX_TOUCH_POINTS; i++) + if (g_touch_points[i].surface == surface) { + touch_cancel_client(client); + return; + } +} + +static struct surface *touch_target_at(double x, double y) { + struct surface *target = toplevel_at(x, y); + if (target) return target; + if (g_desktop) return g_desktop; + return g_grab ? g_grab : g_key_target; +} + +static void touch_down(int id, double x, double y) { + if (id < 0 || id >= MAX_TOUCH_POINTS) return; + struct surface *target = touch_target_at(x, y); + if (!target) return; + struct wl_client *client = wl_resource_get_client(target->resource); + int any_active = 0; + for (int i = 0; i < MAX_TOUCH_POINTS; i++) { + struct surface *active = g_touch_points[i].surface; + if (!active) continue; + any_active = 1; + if (active != target) { + touch_cancel_all(); + any_active = 0; + break; + } + } + if (g_touch_points[id].surface) touch_cancel_client(client); + struct seat_touch *st; + int has_touch = 0; + for_each_touch_of(client, st) has_touch = 1; + if (!has_touch) { + if (any_active) return; + g_touch_points[id].surface = target; + g_touch_points[id].pointer_fallback = 1; + pointer_event(x, y, BTN_LEFT, 1); + wl_display_flush_clients(g_display); + return; + } + int tx = 0, ty = 0; + if (target != g_desktop && target->placed) { tx = target->x; ty = target->y; } + wl_fixed_t fx = wl_fixed_from_double(x - tx), fy = wl_fixed_from_double(y - ty); + int sent = 0; + for_each_touch_of(client, st) { + st->focus = target->resource; + wl_touch_send_down(st->touch, wl_display_next_serial(g_display), now_ms(), + target->resource, id, fx, fy); + sent = 1; + } + if (!sent) return; + g_touch_points[id].surface = target; + touch_frame(client); + wl_display_flush_clients(g_display); +} + +static void touch_motion(int id, double x, double y) { + if (id < 0 || id >= MAX_TOUCH_POINTS) return; + struct surface *target = g_touch_points[id].surface; + if (!target) return; + if (g_touch_points[id].pointer_fallback) { + pointer_event(x, y, 0, 0); + wl_display_flush_clients(g_display); + return; + } + struct wl_client *client = wl_resource_get_client(target->resource); + int tx = 0, ty = 0; + if (target != g_desktop && target->placed) { tx = target->x; ty = target->y; } + wl_fixed_t fx = wl_fixed_from_double(x - tx), fy = wl_fixed_from_double(y - ty); + struct seat_touch *st; + for_each_touch_of(client, st) + if (st->focus == target->resource) + wl_touch_send_motion(st->touch, now_ms(), id, fx, fy); + touch_frame(client); + wl_display_flush_clients(g_display); +} + +static void touch_up(int id, double x, double y) { + if (id < 0 || id >= MAX_TOUCH_POINTS) return; + struct surface *target = g_touch_points[id].surface; + if (!target) return; + if (g_touch_points[id].pointer_fallback) { + memset(&g_touch_points[id], 0, sizeof(g_touch_points[id])); + pointer_event(x, y, BTN_LEFT, 0); + wl_display_flush_clients(g_display); + return; + } + struct wl_client *client = wl_resource_get_client(target->resource); + struct seat_touch *st; + for_each_touch_of(client, st) + if (st->focus == target->resource) + wl_touch_send_up(st->touch, wl_display_next_serial(g_display), now_ms(), id); + memset(&g_touch_points[id], 0, sizeof(g_touch_points[id])); + touch_frame(client); + if (!touch_points_for_client(client)) + for_each_touch_of(client, st) st->focus = NULL; + wl_display_flush_clients(g_display); +} + +static void deliver_touch(const struct input_msg *m) { + double x, y; + input_output_to_scene(m->p3, m->p4, &x, &y); + if (m->p1 == 0) touch_down(m->p2, x, y); + else if (m->p1 == 1) touch_motion(m->p2, x, y); + else if (m->p1 == 2) touch_up(m->p2, x, y); + else if (m->p1 == 3) touch_cancel_all(); +} + static void key_event(uint32_t evdev, int pressed); struct wl_resource *banner_ime_target(void); static void deliver_key(const struct input_msg *m) { @@ -3068,6 +3261,7 @@ static int on_input_readable(int fd, uint32_t mask, void *data) { case 4: scroll_event(m.p1); break; case 5: on_vsync(((int64_t)m.p1 << 32) | (uint32_t)m.p2); break; case 6: pointer_delta(m.p1 / 256.0, m.p2 / 256.0); break; /* relative motion, 1/256 px */ + case 7: deliver_touch(&m); break; default: deliver_pointer(&m); break; } } @@ -3078,7 +3272,14 @@ static int on_input_readable(int fd, uint32_t mask, void *data) { * dispatches it. x/y are in INPUT_SPACE (0..1919, 0..1079) over the whole output. */ void banner_wayland_send_pointer(int action, int x, int y) { if (g_input_pipe[1] < 0) return; - struct input_msg m = { 0, action, x, y }; + struct input_msg m = { 0, action, x, y, 0 }; + ssize_t n = write(g_input_pipe[1], &m, sizeof(m)); + (void)n; +} + +void banner_wayland_send_touch(int action, int pointer_id, int x, int y) { + if (g_input_pipe[1] < 0) return; + struct input_msg m = { 7, action, pointer_id, x, y }; ssize_t n = write(g_input_pipe[1], &m, sizeof(m)); (void)n; } @@ -3086,7 +3287,7 @@ void banner_wayland_send_pointer(int action, int x, int y) { /* Called from JNI. Queues a key event. evdev = Linux input keycode (e.g. KEY_A=30); state 1=down 0=up. */ void banner_wayland_send_key(int evdev, int state) { if (g_input_pipe[1] < 0) return; - struct input_msg m = { 1, evdev, state, 0 }; + struct input_msg m = { 1, evdev, state, 0, 0 }; ssize_t n = write(g_input_pipe[1], &m, sizeof(m)); (void)n; } @@ -3094,7 +3295,7 @@ void banner_wayland_send_key(int evdev, int state) { /* Called from JNI on every screen refresh (Choreographer). */ void banner_wayland_vsync(int64_t frame_time_ns) { if (g_input_pipe[1] < 0) return; - struct input_msg m = { 5, (int)(frame_time_ns >> 32), (int)(uint32_t)frame_time_ns, 0 }; + struct input_msg m = { 5, (int)(frame_time_ns >> 32), (int)(uint32_t)frame_time_ns, 0, 0 }; ssize_t n = write(g_input_pipe[1], &m, sizeof(m)); (void)n; } @@ -3104,7 +3305,7 @@ void banner_wayland_vsync(int64_t frame_time_ns) { * 6 = relative motion by a,b in 1/256 pixel (the app's Relative Mouse / captured-mouse path). */ void banner_wayland_send_scene_input(int type, int a, int b) { if (g_input_pipe[1] < 0) return; - struct input_msg m = { type, a, b, 0 }; + struct input_msg m = { type, a, b, 0, 0 }; ssize_t n = write(g_input_pipe[1], &m, sizeof(m)); (void)n; } diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c index 9698e1cfd2..2125a5c088 100644 --- a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c +++ b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c @@ -23,6 +23,7 @@ extern int banner_wayland_run(void); extern void banner_wayland_send_pointer(int action, int x, int y); +extern void banner_wayland_send_touch(int action, int pointer_id, int x, int y); extern void banner_wayland_send_key(int evdev, int state); extern void banner_wayland_send_scene_input(int type, int a, int b); extern void banner_wayland_vsync(int64_t frame_time_ns); @@ -271,6 +272,12 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSendPointer( banner_wayland_send_pointer(action, x, y); } +JNIEXPORT void JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSendTouch( + JNIEnv *env, jclass clazz, jint action, jint pointer_id, jint x, jint y) { + banner_wayland_send_touch(action, pointer_id, x, y); +} + /* Inject a key event. evdev = Linux input keycode (KEY_A=30…); state 1=down 0=up. */ JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSendKey( diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 62a672054c..f936f26b7d 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -82,7 +82,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var onScreenControls: OnScreenControls? = null private var keyboard: KeyboardHost? = null private var watching = true - private lateinit var gestures: PointerGestures private lateinit var touchpad: TouchpadGestures private var touchMode by mutableStateOf(SessionPrefs.TOUCH_AUTO) private var cursorPos by mutableStateOf(androidx.compose.ui.geometry.Offset(-100f, -100f)) @@ -158,7 +157,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { padBridge = bridge onScreenControls = OnScreenControls(this, bridge).also { root.addView(it) } keyboard = KeyboardHost(this).also { root.addView(it) } - gestures = PointerGestures(PointerGestures.slop(this), pointerListener) touchpad = TouchpadGestures(PointerGestures.slop(this), pointerListener) // One arrow, ours: Android draws a system pointer for a mouse over any window, and the // session already draws the pointer it is sent. @@ -749,7 +747,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return super.dispatchGenericMotionEvent(event) } - /** Convert a held left-stick or d-pad-hat direction into focus navigation. */ private fun dispatchDrawerDirection(event: MotionEvent) { val hatX = event.getAxisValue(MotionEvent.AXIS_HAT_X) val hatY = event.getAxisValue(MotionEvent.AXIS_HAT_Y) @@ -792,12 +789,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { super.dispatchKeyEvent(event) } - /** - * The pointer. Touch goes through [PointerGestures] (tap, hold, drag, two-finger scroll); a - * mouse arrives with real buttons and a wheel and is forwarded as it is. Every position is - * mapped through the letterboxed rectangle into the compositor's fixed 1920x1080 pointer - * space, and the arrow is drawn where the app last sent the pointer. - */ private val pointerListener = object : PointerGestures.Listener { override fun onMove(x: Float, y: Float) = movePointer(x, y) override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { @@ -966,7 +957,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } return touchpad.onTouch(event) } - return gestures.onTouch(event) + val rect = drawnRect() ?: return false + fun sendTouch(action: Int, index: Int) { + val x = ((event.getX(index) - rect.left) / rect.width()).coerceIn(0f, 1f) + val y = ((event.getY(index) - rect.top) / rect.height()).coerceIn(0f, 1f) + WaylandCompositor.nativeSendTouch(action, event.getPointerId(index), (x * 1919f).toInt(), (y * 1079f).toInt()) + } + when (event.actionMasked) { + MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> sendTouch(0, event.actionIndex) + MotionEvent.ACTION_MOVE -> for (index in 0 until event.pointerCount) sendTouch(1, index) + MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> sendTouch(2, event.actionIndex) + MotionEvent.ACTION_CANCEL -> WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + else -> return false + } + return true } /** A mouse: hover moves, buttons press, the wheel scrolls. Android sends buttons as touch 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 52afd790f0..b9b2eb5d15 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -169,6 +169,8 @@ public final class WaylandCompositor { * action: 0=down, 1=move, 2=up. x/y in compositor output space (0..1919, 0..1079). */ public static native void nativeSendPointer(int action, int x, int y); + public static native void nativeSendTouch(int action, int pointerId, int x, int y); + /** Inject a key event. evdev = Linux input keycode (KEY_A=30…); state: 1=down, 0=up. */ public static native void nativeSendKey(int evdev, int state); From b7270186e00baabe7271073de463a177f1264583 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Thu, 24 Sep 2026 00:09:37 -0400 Subject: [PATCH 21/65] Fix controller focus in session drawer --- .../com/droiddeck/launcher/SessionActivity.kt | 8 +++++ .../droiddeck/launcher/ui/FrontEndScreen.kt | 13 +++++--- .../launcher/ui/ModeSettingsDialog.kt | 10 +++--- .../droiddeck/launcher/ui/SessionOverlay.kt | 4 +-- .../droiddeck/launcher/ui/SettingsWidgets.kt | 33 ++++++++++++++----- 5 files changed, 50 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index f936f26b7d..5330ee9cdd 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -674,6 +674,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> return super.dispatchKeyEvent(event) } + if (drawerOpen) { + val handled = super.dispatchKeyEvent(event) + if (event.keyCode == KeyEvent.KEYCODE_BUTTON_B || event.keyCode == KeyEvent.KEYCODE_BACK) { + if (!handled && event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) drawerOpen = false + releaseDrawerDirection() + } + return true + } val fromController = PadBridge.isFromController(event.device) val resumeKey = event.keyCode == KeyEvent.KEYCODE_BUTTON_A || event.keyCode == KeyEvent.KEYCODE_BUTTON_START val resumeKeyId = event.deviceId to event.keyCode 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 6ed54f34b3..a1e7a2a197 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -765,9 +765,9 @@ private fun SetupPanel(s: FrontEndState, a: FrontEndActions) { SettingsRow("Frame generation", "Select the frame generation mode") { Box { ValueChip(s.frameGenLabel, host.open == "fg") { host.open = if (host.open == "fg") null else "fg" } - AnchoredMenu(host.open == "fg", onDismiss = { if (host.open == "fg") host.open = null }, title = "Frame generation") { + AnchoredMenu(host.open == "fg", onDismiss = { if (host.open == "fg") host.open = null }, title = "Frame generation") { firstItemFocus -> val need = if (s.lsfgReady) null else "Install Lossless Scaling in Steam" - MenuItem("Off", checked = s.frameGenEngine == FrameGen.ENGINE_OFF) { a.onFrameGenPick(FrameGen.ENGINE_OFF, 2); host.open = null } + MenuItem("Off", checked = s.frameGenEngine == FrameGen.ENGINE_OFF, focusRequester = firstItemFocus) { a.onFrameGenPick(FrameGen.ENGINE_OFF, 2); host.open = null } for (m in 2..4) MenuItem("Win-FG ${m}×", checked = s.frameGenEngine == FrameGen.ENGINE_WINFG && s.frameGenMultiplier == m) { a.onFrameGenPick(FrameGen.ENGINE_WINFG, m); host.open = null } for (m in 2..4) MenuItem("LSFG ${m}×", checked = s.frameGenEngine == FrameGen.ENGINE_LSFG && s.frameGenMultiplier == m, enabled = s.lsfgReady, detail = need) { a.onFrameGenPick(FrameGen.ENGINE_LSFG, m); host.open = null } } @@ -788,8 +788,13 @@ private fun SetupPanel(s: FrontEndState, a: FrontEndActions) { SettingsRow("Theme", "Choose the launcher appearance") { Box { ValueChip(Themes.byId(s.theme).label, host.open == "theme") { host.open = if (host.open == "theme") null else "theme" } - AnchoredMenu(host.open == "theme", onDismiss = { if (host.open == "theme") host.open = null }, title = "Theme") { - for (t in Themes.all) MenuItem(t.label, checked = s.theme == t.id) { a.onTheme(t.id); host.open = null } + AnchoredMenu(host.open == "theme", onDismiss = { if (host.open == "theme") host.open = null }, title = "Theme") { firstItemFocus -> + Themes.all.forEachIndexed { index, theme -> + MenuItem(theme.label, checked = s.theme == theme.id, focusRequester = if (index == 0) firstItemFocus else null) { + a.onTheme(theme.id) + host.open = null + } + } } } } 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 f18bd20d65..099b360548 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -319,10 +319,12 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { AnchoredMenu( open, onDismiss = { if (host.open == "storage") host.open = null }, title = "Second library", note = "Games that stream assets from SD or shared storage may stutter. Keep them internal.", - ) { - for ((path, label) in options) MenuItem(label, checked = path == s.gameStorage) { - a.onGameStorage(path, if (path.isEmpty() || path == "off") "" else label.substringBefore(" ·")) - host.open = null + ) { firstItemFocus -> + options.forEachIndexed { index, (path, label) -> + MenuItem(label, checked = path == s.gameStorage, focusRequester = if (index == 0) firstItemFocus else null) { + a.onGameStorage(path, if (path.isEmpty() || path == "off") "" else label.substringBefore(" ·")) + host.open = null + } } MenuItem("Choose a folder…", checked = false) { host.open = null; a.onPickGameStorageFolder() } } 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 febe2825bb..0f443fbdce 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -350,9 +350,9 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { SettingsRow("Frame generation", null, highlighted = fgOpen) { Box { ValueChip(fgLabel, fgOpen) { host.open = if (fgOpen) null else "fg" } - AnchoredMenu(fgOpen, onDismiss = { if (host.open == "fg") host.open = null }, title = "Frame generation") { + AnchoredMenu(fgOpen, onDismiss = { if (host.open == "fg") host.open = null }, title = "Frame generation") { firstItemFocus -> val need = if (a.lsfgReady) null else "install Lossless Scaling in Steam" - MenuItem("Off", checked = a.frameGenEngine == FrameGen.ENGINE_OFF) { a.onFrameGenPick(FrameGen.ENGINE_OFF, 2); host.open = null } + MenuItem("Off", checked = a.frameGenEngine == FrameGen.ENGINE_OFF, focusRequester = firstItemFocus) { a.onFrameGenPick(FrameGen.ENGINE_OFF, 2); host.open = null } for (m in 2..4) MenuItem("Win-FG ${m}×", checked = a.frameGenEngine == FrameGen.ENGINE_WINFG && a.frameGenMultiplier == m) { a.onFrameGenPick(FrameGen.ENGINE_WINFG, m); host.open = null } for (m in 2..4) MenuItem("LSFG ${m}×", checked = a.frameGenEngine == FrameGen.ENGINE_LSFG && a.frameGenMultiplier == m, enabled = a.lsfgReady, detail = need) { a.onFrameGenPick(FrameGen.ENGINE_LSFG, m); host.open = null } } 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 7577264693..5139689b8e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -40,6 +40,7 @@ import androidx.compose.foundation.verticalScroll 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 @@ -50,6 +51,8 @@ import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.rotate import androidx.compose.ui.draw.shadow +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.TransformOrigin import androidx.compose.ui.graphics.graphicsLayer @@ -110,10 +113,17 @@ private class BelowEndProvider(private val gap: Int) : PopupPositionProvider { } @Composable -fun AnchoredMenu(open: Boolean, onDismiss: () -> Unit, title: String? = null, note: String? = null, content: @Composable ColumnScope.() -> Unit) { +fun AnchoredMenu(open: Boolean, onDismiss: () -> Unit, title: String? = null, note: String? = null, content: @Composable ColumnScope.(FocusRequester) -> Unit) { val state = remember { MutableTransitionState(false) } state.targetState = open if (!state.currentState && !state.targetState && state.isIdle) return + val firstItemFocus = remember { FocusRequester() } + LaunchedEffect(open) { + if (open) { + repeat(2) { androidx.compose.runtime.withFrameNanos { } } + runCatching { firstItemFocus.requestFocus() } + } + } val gap = with(LocalDensity.current) { 6.dp.roundToPx() } val provider = remember(gap) { BelowEndProvider(gap) } val colors = MaterialTheme.colorScheme @@ -143,7 +153,7 @@ fun AnchoredMenu(open: Boolean, onDismiss: () -> Unit, title: String? = null, no title.uppercase(), fontSize = 10.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 2.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 10.dp, top = 6.dp, bottom = 6.dp), ) - Column(Modifier.weight(1f, fill = false).verticalScroll(rememberScrollState())) { content() } + Column(Modifier.weight(1f, fill = false).verticalScroll(rememberScrollState())) { content(firstItemFocus) } if (note != null) { Spacer(Modifier.height(4.dp)) Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) @@ -157,7 +167,8 @@ fun AnchoredMenu(open: Boolean, onDismiss: () -> Unit, title: String? = null, no @Composable fun MenuItem( label: String, checked: Boolean, enabled: Boolean = true, detail: String? = null, - trailing: (@Composable () -> Unit)? = null, leading: (@Composable () -> Unit)? = null, onClick: () -> Unit, + trailing: (@Composable () -> Unit)? = null, leading: (@Composable () -> Unit)? = null, + focusRequester: FocusRequester? = null, onClick: () -> Unit, ) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current @@ -168,6 +179,7 @@ fun MenuItem( verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth() .graphicsLayer { translationX = shift.dp.toPx() } + .then(focusRequester?.let { Modifier.focusRequester(it) } ?: Modifier) .clip(RoundedCornerShape(8.dp)) .background(if (hot && enabled) Color.White.copy(alpha = 0.07f) else Color.Transparent) .alpha(if (enabled) 1f else 0.4f) @@ -259,8 +271,13 @@ fun ChoiceRow( SettingsRow(label, hint, highlighted = open) { Box { ValueChip(options.firstOrNull { it.first == selected }?.second ?: "-", open, enabled, modifier = chipModifier) { host.open = if (open) null else key } - AnchoredMenu(open, onDismiss = { if (host.open == key) host.open = null }, title = label, note = note) { - for ((value, text) in options) MenuItem(text, checked = value == selected) { onPick(value); host.open = null } + AnchoredMenu(open, onDismiss = { if (host.open == key) host.open = null }, title = label, note = note) { firstItemFocus -> + options.forEachIndexed { index, (value, text) -> + MenuItem(text, checked = value == selected, focusRequester = if (index == 0) firstItemFocus else null) { + onPick(value) + host.open = null + } + } } } } @@ -285,10 +302,10 @@ fun MultiRow( SettingsRow(label, hint, highlighted = open) { Box { ValueChip(summary, open, enabled) { host.open = if (open) null else key } - AnchoredMenu(open, onDismiss = { if (host.open == key) host.open = null }, title = label, note = note) { - for ((value, text) in items) { + AnchoredMenu(open, onDismiss = { if (host.open == key) host.open = null }, title = label, note = note) { firstItemFocus -> + items.forEachIndexed { index, (value, text) -> val on = value in selected - MenuItem(text, checked = on) { onToggle(value, !on) } + MenuItem(text, checked = on, focusRequester = if (index == 0) firstItemFocus else null) { onToggle(value, !on) } } } } From 2853962c1067ce16191f4b409576ab59795888ef Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Thu, 24 Sep 2026 07:45:55 -0400 Subject: [PATCH 22/65] Move build status to launcher rail footer --- .../droiddeck/launcher/ui/FrontEndScreen.kt | 173 +++++++++--------- 1 file changed, 87 insertions(+), 86 deletions(-) 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 a1e7a2a197..07c70f0b48 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -54,12 +54,12 @@ 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.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.layout.width -import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape @@ -101,6 +101,9 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.painterResource import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.IntOffset @@ -291,82 +294,89 @@ private fun Rail( ) { val colors = MaterialTheme.colorScheme Column( - modifier = modifier.background(colors.surface).verticalScroll(rememberScrollState()).padding(horizontal = 10.dp, vertical = 12.dp), - verticalArrangement = Arrangement.spacedBy(2.dp), + modifier = modifier.background(colors.surface).padding(horizontal = 10.dp, vertical = 12.dp), ) { - Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(start = 8.dp, bottom = 10.dp)) { - Image(painterResource(R.drawable.logo), null, modifier = Modifier.size(30.dp)) - Spacer(Modifier.width(10.dp)) - Column { - Text("DroidDeck", fontSize = 18.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) - val status = when { - s.busy -> if (s.percent >= 0) "${s.stage} ${s.percent}%" else s.stage - !s.ready -> "runtime not installed" - s.available != null && s.available != s.installed -> "runtime update available" - else -> null + Column( + modifier = Modifier.weight(1f).fillMaxWidth().verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(2.dp), + ) { + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(start = 8.dp, bottom = 10.dp)) { + Image(painterResource(R.drawable.logo), null, modifier = Modifier.size(30.dp)) + Spacer(Modifier.width(10.dp)) + Column { + Text("DroidDeck", fontSize = 18.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) + val status = when { + s.busy -> if (s.percent >= 0) "${s.stage} ${s.percent}%" else s.stage + !s.ready -> "runtime not installed" + s.available != null && s.available != s.installed -> "runtime update available" + else -> null + } + if (status != null) Text(status, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) } - if (status != null) Text(status, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) } - } - AnimatedVisibility(s.busy, enter = expandVertically() + fadeIn(), exit = shrinkVertically() + fadeOut()) { - LinearProgressIndicator(modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp)) - } + AnimatedVisibility(s.busy, enter = expandVertically() + fadeIn(), exit = shrinkVertically() + fadeOut()) { + LinearProgressIndicator(modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp)) + } - var lastRunning by remember { mutableStateOf("") } - if (s.running != null) lastRunning = s.running - AnimatedVisibility( - s.running != null, - enter = expandVertically(Motion.sp(0.75f)) + fadeIn(Motion.tw(300)) + slideInVertically(Motion.sp(0.6f)) { -it / 2 }, - exit = shrinkVertically(Motion.tw(220)) + fadeOut(Motion.tw(180)), - ) { RunningTile(lastRunning, a.onResume) } + var lastRunning by remember { mutableStateOf("") } + if (s.running != null) lastRunning = s.running + AnimatedVisibility( + s.running != null, + enter = expandVertically(Motion.sp(0.75f)) + fadeIn(Motion.tw(300)) + slideInVertically(Motion.sp(0.6f)) { -it / 2 }, + exit = shrinkVertically(Motion.tw(220)) + fadeOut(Motion.tw(180)), + ) { RunningTile(lastRunning, a.onResume) } - val pal = LocalPalette.current - var navOrigin by remember { mutableStateOf(Offset.Zero) } - val positions = remember { mutableStateMapOf() } - Box(modifier = Modifier.fillMaxWidth().onGloballyPositioned { val o = it.positionInRoot(); if (o != navOrigin) navOrigin = o }) { - val target = positions[selected]?.translate(-navOrigin) - val y by animateFloatAsState(target?.top ?: 0f, Motion.sp(0.72f, Spring.StiffnessLow), label = "indY") - val x by animateFloatAsState(target?.left ?: 0f, Motion.sp(0.9f), label = "indX") - val h by animateFloatAsState(target?.height ?: 0f, Motion.sp(1f, Spring.StiffnessMediumLow), label = "indH") - val w by animateFloatAsState(target?.width ?: 0f, Motion.sp(1f, Spring.StiffnessMediumLow), label = "indW") - val alpha by animateFloatAsState(if (target != null) 1f else 0f, Motion.tw(250), label = "indA") - val density = LocalDensity.current - Box( - modifier = Modifier - .offset { IntOffset(x.roundToInt(), y.roundToInt()) } - .width(with(density) { w.toDp() }).height(with(density) { h.toDp() }) - .alpha(alpha) - .graphicsLayer { shadowElevation = 6.dp.toPx(); shape = Shape10; clip = false; ambientShadowColor = pal.signal; spotShadowColor = pal.signal } - .clip(Shape10) - .background(Brush.linearGradient(listOf(colors.primary, pal.primary2))), + val pal = LocalPalette.current + var navOrigin by remember { mutableStateOf(Offset.Zero) } + val positions = remember { mutableStateMapOf() } + Box(modifier = Modifier.fillMaxWidth().onGloballyPositioned { val o = it.positionInRoot(); if (o != navOrigin) navOrigin = o }) { + val target = positions[selected]?.translate(-navOrigin) + val y by animateFloatAsState(target?.top ?: 0f, Motion.sp(0.72f, Spring.StiffnessLow), label = "indY") + val x by animateFloatAsState(target?.left ?: 0f, Motion.sp(0.9f), label = "indX") + val h by animateFloatAsState(target?.height ?: 0f, Motion.sp(1f, Spring.StiffnessMediumLow), label = "indH") + val w by animateFloatAsState(target?.width ?: 0f, Motion.sp(1f, Spring.StiffnessMediumLow), label = "indW") + val alpha by animateFloatAsState(if (target != null) 1f else 0f, Motion.tw(250), label = "indA") + val density = LocalDensity.current + Box( + modifier = Modifier + .offset { IntOffset(x.roundToInt(), y.roundToInt()) } + .width(with(density) { w.toDp() }).height(with(density) { h.toDp() }) + .alpha(alpha) + .graphicsLayer { shadowElevation = 6.dp.toPx(); shape = Shape10; clip = false; ambientShadowColor = pal.signal; spotShadowColor = pal.signal } + .clip(Shape10) + .background(Brush.linearGradient(listOf(colors.primary, pal.primary2))), + ) + val register: (String, LayoutCoordinates) -> Unit = { key, c -> + val o = c.positionInRoot(); val r = Rect(o.x, o.y, o.x + c.size.width, o.y + c.size.height) + if (positions[key] != r) positions[key] = r + } + val unregister: (String) -> Unit = { positions.remove(it) } + Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(2.dp)) { + if (s.isHomeApp) { + NavItem("Android apps", "android-apps", selected == "android-apps", count = s.androidApps.size, + register = register, unregister = unregister) { onSelect("android-apps") } + } + NavItem("Steam", "steam", selected == "steam", count = s.steamGames.size, register = register, unregister = unregister) { onSelect("steam") } + NavItem("Desktop", "desktop", selected == "desktop", count = s.emulators.count { it.installed }, register = register, unregister = unregister) { onSelect("desktop") } + NavItem("Setup", "setup", selected == "setup", register = register, unregister = unregister) { onSelect("setup") } + Spacer(Modifier.height(6.dp)) + } + } + + val creditsSrc = remember { MutableInteractionSource() } + val creditsHot = rememberHot(creditsSrc) + Text( + "credits", fontSize = 11.sp, color = if (creditsHot) LocalPalette.current.signal else colors.onSurfaceVariant, + modifier = Modifier.clip(Shape10) + .border(2.dp, if (creditsHot) LocalPalette.current.signal else Color.Transparent, Shape10) + .hoverable(creditsSrc).clickable(interactionSource = creditsSrc, indication = null, onClick = a.onCredits) + .padding(horizontal = 10.dp, vertical = 8.dp), ) - val register: (String, LayoutCoordinates) -> Unit = { key, c -> - val o = c.positionInRoot(); val r = Rect(o.x, o.y, o.x + c.size.width, o.y + c.size.height) - if (positions[key] != r) positions[key] = r - } - val unregister: (String) -> Unit = { positions.remove(it) } - Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(2.dp)) { - if (s.isHomeApp) { - NavItem("Android apps", "android-apps", selected == "android-apps", count = s.androidApps.size, - register = register, unregister = unregister) { onSelect("android-apps") } - } - NavItem("Steam", "steam", selected == "steam", count = s.steamGames.size, register = register, unregister = unregister) { onSelect("steam") } - NavItem("Desktop", "desktop", selected == "desktop", count = s.emulators.count { it.installed }, register = register, unregister = unregister) { onSelect("desktop") } - NavItem("Setup", "setup", selected == "setup", register = register, unregister = unregister) { onSelect("setup") } - Spacer(Modifier.height(6.dp)) - } } - - // Outlined when a controller is on it, like every other control; the ripple alone was - // a faint box on the dark rail. - val creditsSrc = remember { MutableInteractionSource() } - val creditsHot = rememberHot(creditsSrc) - Text( - "credits", fontSize = 11.sp, color = if (creditsHot) LocalPalette.current.signal else colors.onSurfaceVariant, - modifier = Modifier.clip(Shape10) - .border(2.dp, if (creditsHot) LocalPalette.current.signal else Color.Transparent, Shape10) - .hoverable(creditsSrc).clickable(interactionSource = creditsSrc, indication = null, onClick = a.onCredits) - .padding(horizontal = 10.dp, vertical = 8.dp), + BuildStatus( + label = s.buildLabel, + onCheckLatest = a.onCheckLatestBuild, + modifier = Modifier.align(Alignment.Start).padding(start = 8.dp, top = 4.dp, bottom = 2.dp), ) } } @@ -471,13 +481,6 @@ private fun Pane(s: FrontEndState, selected: String, a: FrontEndActions, page: ( }, label = "pane", ) { key -> if (page != null && key == s.pageKey) page() else Content(s, key, a, Modifier.fillMaxSize(), onSelect) } - if (page == null && s.pageKey == null && selected == "steam") { - BuildStatus( - label = s.buildLabel, - onCheckLatest = a.onCheckLatestBuild, - modifier = Modifier.align(Alignment.TopEnd).padding(12.dp), - ) - } } } @@ -489,12 +492,10 @@ private fun BuildStatus(label: String, onCheckLatest: () -> Unit, modifier: Modi val hot = rememberHot(interaction) Row( verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(9.dp), + horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = modifier - .widthIn(max = 360.dp) - .clip(Shape12) - .background(colors.surface.copy(alpha = 0.96f)) - .border(1.5.dp, if (hot) pal.signal else pal.line2, Shape12) + .clip(RoundedCornerShape(6.dp)) + .semantics { contentDescription = "Build $label. Check for newest build." } .hoverable(interaction) .clickable( interactionSource = interaction, @@ -502,11 +503,11 @@ private fun BuildStatus(label: String, onCheckLatest: () -> Unit, modifier: Modi role = Role.Button, onClick = onCheckLatest, ) - .padding(horizontal = 11.dp, vertical = 7.dp), + .heightIn(min = 40.dp) + .padding(horizontal = 8.dp), ) { - Text(label, modifier = Modifier.weight(1f), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - Icon(Icons.Filled.Refresh, contentDescription = null, tint = if (hot) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(15.dp)) - Text("Check latest", fontSize = 11.sp, fontWeight = FontWeight.SemiBold, color = if (hot) pal.signal else colors.onBackground, maxLines = 1) + Text(label, fontSize = 10.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = if (hot) colors.onSurfaceVariant else colors.onSurfaceVariant.copy(alpha = 0.72f), maxLines = 1, overflow = TextOverflow.Ellipsis) + Icon(Icons.Filled.Refresh, contentDescription = null, tint = if (hot) pal.signal else colors.onSurfaceVariant.copy(alpha = 0.72f), modifier = Modifier.size(12.dp)) } } From 2b25e9bedd1b88ac3a1bd36d1cd89c668d71cbc2 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Thu, 24 Sep 2026 07:46:20 -0400 Subject: [PATCH 23/65] Log session drawer controller routing --- .../java/com/droiddeck/launcher/SessionActivity.kt | 10 +++++++++- .../java/com/droiddeck/launcher/ui/SessionOverlay.kt | 6 +++++- .../java/com/droiddeck/launcher/ui/SettingsWidgets.kt | 1 + 3 files changed, 15 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 5330ee9cdd..f250d5e9f0 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -197,7 +197,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (drawerOpen) { padBridge?.releaseAll() androidx.compose.runtime.withFrameNanos { } - sessionOverlay.requestFocus() + val requested = sessionOverlay.requestFocus() + Log.i(TAG, "drawer root focus requested=$requested focused=${sessionOverlay.hasFocus()}") } else { releaseDrawerDirection() } @@ -676,6 +677,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } if (drawerOpen) { val handled = super.dispatchKeyEvent(event) + if (event.action == KeyEvent.ACTION_DOWN) { + Log.i(TAG, "drawer key=${KeyEvent.keyCodeToString(event.keyCode)} handled=$handled viewFocused=${sessionOverlay.hasFocus()}") + } if (event.keyCode == KeyEvent.KEYCODE_BUTTON_B || event.keyCode == KeyEvent.KEYCODE_BACK) { if (!handled && event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) drawerOpen = false releaseDrawerDirection() @@ -769,6 +773,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } val now = SystemClock.uptimeMillis() if (keyCode != drawerDirectionKey) { + Log.i(TAG, "drawer axis source=${event.source} x=$x y=$y direction=$keyCode") releaseDrawerDirection() if (keyCode == KeyEvent.KEYCODE_UNKNOWN) return drawerDirectionKey = keyCode @@ -794,6 +799,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { drawerDirectionDownTime, eventTime, action, drawerDirectionKey, repeatCount, 0, drawerDirectionDeviceId, 0, 0, InputDevice.SOURCE_DPAD, ) + if (action == KeyEvent.ACTION_DOWN) { + Log.i(TAG, "drawer synthetic key=${KeyEvent.keyCodeToString(drawerDirectionKey)} viewFocused=${sessionOverlay.hasFocus()}") + } super.dispatchKeyEvent(event) } 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 0f443fbdce..b82c129468 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -69,6 +69,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.draw.clip import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.input.InputMode @@ -277,7 +278,10 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { onClick = { host.open = null; a.onSteamMenu.invoke() }, interactionSource = steamSrc, modifier = Modifier.weight(1f).height(48.dp).focusRequester(firstFocus) - .onFocusChanged { firstControlFocused = it.isFocused }.controllerConfirm { + .onFocusChanged { + firstControlFocused = it.isFocused + android.util.Log.i("SessionDrawer", "first control focused=${it.isFocused}") + }.controllerConfirm { host.open = null a.onSteamMenu.invoke() }, 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 5139689b8e..a7322987b0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -122,6 +122,7 @@ fun AnchoredMenu(open: Boolean, onDismiss: () -> Unit, title: String? = null, no if (open) { repeat(2) { androidx.compose.runtime.withFrameNanos { } } runCatching { firstItemFocus.requestFocus() } + android.util.Log.i("AnchoredMenu", "requested first option focus") } } val gap = with(LocalDensity.current) { 6.dp.roundToPx() } From c11bca2dc255677d61ae78f15e1a83067a1d1ac2 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Thu, 24 Sep 2026 07:50:22 -0400 Subject: [PATCH 24/65] Keep the build hash visible in rail watermark --- .../java/com/droiddeck/launcher/ui/FrontEndScreen.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 07c70f0b48..38a65ac75c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -490,10 +490,14 @@ private fun BuildStatus(label: String, onCheckLatest: () -> Unit, modifier: Modi val pal = LocalPalette.current val interaction = remember { MutableInteractionSource() } val hot = rememberHot(interaction) + val divider = label.lastIndexOf(" at ") + val branch = if (divider >= 0) label.substring(0, divider).substringAfterLast('/') else label + val displayLabel = if (divider >= 0) "$branch${label.substring(divider)}" else branch Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = modifier + .fillMaxWidth() .clip(RoundedCornerShape(6.dp)) .semantics { contentDescription = "Build $label. Check for newest build." } .hoverable(interaction) @@ -504,10 +508,10 @@ private fun BuildStatus(label: String, onCheckLatest: () -> Unit, modifier: Modi onClick = onCheckLatest, ) .heightIn(min = 40.dp) - .padding(horizontal = 8.dp), + .padding(horizontal = 4.dp), ) { - Text(label, fontSize = 10.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = if (hot) colors.onSurfaceVariant else colors.onSurfaceVariant.copy(alpha = 0.72f), maxLines = 1, overflow = TextOverflow.Ellipsis) - Icon(Icons.Filled.Refresh, contentDescription = null, tint = if (hot) pal.signal else colors.onSurfaceVariant.copy(alpha = 0.72f), modifier = Modifier.size(12.dp)) + Text(displayLabel, modifier = Modifier.weight(1f), fontSize = 9.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = if (hot) colors.onSurfaceVariant else colors.onSurfaceVariant.copy(alpha = 0.82f), maxLines = 1, overflow = TextOverflow.Ellipsis) + Icon(Icons.Filled.Refresh, contentDescription = null, tint = if (hot) pal.signal else colors.onSurfaceVariant.copy(alpha = 0.82f), modifier = Modifier.size(12.dp)) } } From afdcf0591503995c12d3fab4a5933aa5cbc8e547 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 08:26:51 -0400 Subject: [PATCH 25/65] Proton launch: Quake-engine titles stay windowed at the session's size Quake III Arena, Team Arena, Return to Castle Wolfenstein and Jedi Academy set their own resolution and switch the display to it. Under gamescope with the ARM64 Proton that switch is refused ("calling CDS: failed, bad mode") and the game never gets OpenGL - device-seen on a Retroid Pocket 5 on Proton Experimental build 25406135 - and a window left at the game's own size draws small in a corner. Both wrappers (Valve's depot and an adopted GE or CachyOS) now add +set r_fullscreen 0 +set r_mode -1 +set r_customwidth/height at BL_WIDTH x BL_HEIGHT for those app ids, unless the user's launch options already set the video mode; the choice is logged. --- .../usr/local/bin/bannerlator-steam-compat | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-compat b/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-compat index b7c0659ad1..4156846a5b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-compat @@ -87,6 +87,31 @@ bl_game_cpus() { } """ +# Quake III engine games (id Tech 3) set their own resolution and switch the display to it. Under +# gamescope with the ARM64 Proton that switch is refused ("calling CDS: failed, bad mode") and the +# game never gets OpenGL; left at its own size in a window, it draws small in a corner. So these +# titles are told to stay windowed at the session's own size - unless the user's launch options +# already say something about the video mode, which are left as they are. +BL_IDTECH3_SETUP = """ +bl_idtech3() { + BL_EXTRA_ARGS=() + case "${SteamAppId:-${STEAM_COMPAT_APP_ID:-}}" in + # Quake III Arena, Quake III: Team Arena, Return to Castle Wolfenstein, Jedi Academy. + 2200|2350|9010|6020) ;; + *) return 0 ;; + esac + case " $* " in + *r_fullscreen*|*r_mode*|*r_customwidth*|*r_customheight*) + echo "bannerlator-proton: Quake-engine title; its launch options set the video mode, left as they are" >&2 + return 0 ;; + esac + w=${BL_WIDTH:-1280} + h=${BL_HEIGHT:-720} + BL_EXTRA_ARGS=(+set r_fullscreen 0 +set r_mode -1 +set r_customwidth "$w" +set r_customheight "$h") + echo "bannerlator-proton: Quake-engine title: windowed at ${w}x${h}" >&2 +} +""" + BL_DIRECTAUDIO_SETUP = """ bl_directaudio() { base=$1 @@ -152,7 +177,8 @@ for name in %s; do if [ -d "$depot/files/bin-arm64" ] && [ -x "$depot/proton" ]; then bl_directaudio "$depot" bl_game_cpus - exec ${BL_TASKSET:-} "$depot/proton" "$verb" "$@" + bl_idtech3 "$@" + exec ${BL_TASKSET:-} "$depot/proton" "$verb" "$@" "${BL_EXTRA_ARGS[@]}" fi done echo "bannerlator-proton: no ARM64 Proton depot yet - the client downloads one as this tool's dependency; retry the launch once it has" >&2 @@ -162,7 +188,7 @@ exit 1 # and a % format would eat that into a single %, leaving a shell expansion that silently does # something else. LAUNCHER_SH = LAUNCHER_SH.replace( - "verb=$1; shift", "verb=$1; shift\n" + BL_DIRECTAUDIO_SETUP + BL_GAME_CPUS_SETUP, 1) + "verb=$1; shift", "verb=$1; shift\n" + BL_DIRECTAUDIO_SETUP + BL_GAME_CPUS_SETUP + BL_IDTECH3_SETUP, 1) # A third-party Proton dropped into compatibilitytools.d - GE-Proton, proton-cachyos, anything of # that shape - is adopted rather than used as shipped, for the same two reasons Valve's ARM64 depot @@ -196,9 +222,10 @@ if [ -f "$fake" ]; then fi bl_directaudio "$here" bl_game_cpus +bl_idtech3 "$@" # Proton takes its base directory from dirname(sys.argv[0]) without resolving it, so it has to be # started from its own tree. -exec ${BL_TASKSET:-} "$here/%s" "$verb" "$@" +exec ${BL_TASKSET:-} "$here/%s" "$verb" "$@" "${BL_EXTRA_ARGS[@]}" """ EXTRA_COMPAT_TOOL_VDF = """"compatibilitytools" { @@ -357,7 +384,7 @@ def adopt_extras(tools): # ${major%%.*} of its own, and putting it through the format would eat both. body = (EXTRA_WRAPPER_SH % entry_point).replace( 'here=$(dirname "$0")', - 'here=$(dirname "$0")\n' + BL_DIRECTAUDIO_SETUP + BL_GAME_CPUS_SETUP, 1) + 'here=$(dirname "$0")\n' + BL_DIRECTAUDIO_SETUP + BL_GAME_CPUS_SETUP + BL_IDTECH3_SETUP, 1) with open(wrapper, "w", encoding="utf-8") as f: f.write(body) os.chmod(wrapper, 0o755) From 88803f1276295989e6b09b389b92e981b5df6f77 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 08:59:45 -0400 Subject: [PATCH 26/65] Front end: controller focus starts on the rail and moves between rail and page predictably - The app opens with the selected rail item focused (its outline shows). - Right from the rail enters the page on its main button (Play, Open desktop, Open , Launch, Launch in ); Down from there reaches the tiles as before. - Left from anything at the page's left edge - the main button, the first tile of any row - returns to the selected rail item, not whichever one is nearest. (Up, where the rail sits above the page.) --- .../droiddeck/launcher/ui/FrontEndScreen.kt | 64 +++++++++++++++++-- 1 file changed, 57 insertions(+), 7 deletions(-) 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 92774857a6..0fbba69a88 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -1,5 +1,13 @@ package com.droiddeck.launcher.ui +import androidx.compose.runtime.staticCompositionLocalOf +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.ExperimentalComposeUiApi +import androidx.compose.foundation.focusGroup +import androidx.compose.ui.focus.FocusDirection +import androidx.compose.ui.focus.focusProperties +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.FocusRequester import android.graphics.Bitmap import android.os.Build import android.provider.Settings @@ -230,8 +238,29 @@ private fun Modifier.shine(trigger: Boolean, strength: Float = 0.22f): Modifier } +/** + * Controller focus on the front end: each rail item's requester and the page's main button (Play, + * Open desktop, Open , Launch...). The pane enters on the main button and leaves, to the + * left, for the selected rail item - whatever tile or button it leaves from. + */ +private class FrontFocus { + val rail = HashMap() + val primary = FocusRequester() + var primaryAttached by mutableStateOf(0) + fun railFor(key: String): FocusRequester = rail.getOrPut(key) { FocusRequester() } +} + +private val LocalFrontFocus = staticCompositionLocalOf { null } + @Composable fun FrontEndScreen(s: FrontEndState, a: FrontEndActions, page: (@Composable () -> Unit)? = null) { + val frontFocus = remember { FrontFocus() } + CompositionLocalProvider(LocalFrontFocus provides frontFocus) { FrontEndScreenBody(s, a, page, frontFocus) } +} + +@OptIn(ExperimentalComposeUiApi::class) +@Composable +private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Composable () -> Unit)?, frontFocus: FrontFocus) { var selected by rememberSaveable { mutableStateOf("steam") } val colors = MaterialTheme.colorScheme val ctx = LocalContext.current @@ -272,7 +301,19 @@ fun FrontEndScreen(s: FrontEndState, a: FrontEndActions, page: (@Composable () - modifier = if (wide) Modifier.width(236.dp).fillMaxHeight() else Modifier.fillMaxWidth().height(maxHeight * 0.42f), ) } - val content: @Composable (Modifier) -> Unit = { m -> Pane(s, selected, a, page, m) { selected = it } } + // The app opens with the selected rail item focused, so a controller sees where it is. + LaunchedEffect(Unit) { + kotlinx.coroutines.delay(150) + runCatching { frontFocus.railFor(railSelection).requestFocus() } + } + val back = if (wide) FocusDirection.Left else FocusDirection.Up + val paneFocus = Modifier + .focusProperties { + enter = { if (frontFocus.primaryAttached > 0) frontFocus.primary else FocusRequester.Default } + exit = { dir -> if (dir == back) frontFocus.rail[railSelection] ?: FocusRequester.Default else FocusRequester.Default } + } + .focusGroup() + val content: @Composable (Modifier) -> Unit = { m -> Pane(s, selected, a, page, m.then(paneFocus)) { selected = it } } if (wide) Row(modifier = Modifier.fillMaxSize()) { rail(); content(Modifier.weight(1f).fillMaxHeight()) } else Column(modifier = Modifier.fillMaxSize()) { rail(); content(Modifier.weight(1f).fillMaxWidth()) } } @@ -406,6 +447,7 @@ private fun NavItem( val colors = MaterialTheme.colorScheme val src = remember { MutableInteractionSource() } val focused by src.collectIsFocusedAsState() + val railRequester = if (register != null && key != "x") LocalFrontFocus.current?.railFor(key) else null val hovered by src.collectIsHoveredAsState() val pressed by src.collectIsPressedAsState() val fg by animateColorAsState(if (current) colors.onPrimary else if (muted) colors.onSurfaceVariant else colors.onBackground, Motion.tw(280), label = "navFg") @@ -418,6 +460,7 @@ private fun NavItem( verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth() .then(if (register != null && key != "x") Modifier.onGloballyPositioned { register(key, it) } else Modifier) + .then(if (railRequester != null) Modifier.focusRequester(railRequester) else Modifier) .then(if (small && i >= 0 && register != null) Modifier.staggerIn(i) else Modifier) .graphicsLayer { scaleX = scale; scaleY = scale } .clip(Shape10) @@ -521,7 +564,7 @@ private fun Content(s: FrontEndState, selected: String, a: FrontEndActions, modi Rise(3) { Actions { // Enabled without a runtime: the session's loading screen installs it first. - PrimaryButton("Play", enabled = !s.busy, onClick = a.onPlay) + PrimaryButton("Play", enabled = !s.busy, main = true, onClick = a.onPlay) SecondaryButton("Steam Desktop UI", enabled = !s.busy, onClick = a.onPlayDesktopUi) Cog(a.onSteamSettings) } @@ -547,7 +590,7 @@ private fun Content(s: FrontEndState, selected: String, a: FrontEndActions, modi Row { Column(modifier = Modifier.weight(1f)) { Actions { - PrimaryButton("Launch", enabled = s.ready && !s.busy) { a.onSteamGame(g) } + PrimaryButton("Launch", enabled = s.ready && !s.busy, main = true) { a.onSteamGame(g) } Cog(a.onSteamSettings) Chip(if (s.ready) "● ready" else "runtime missing", ok = s.ready) } @@ -567,7 +610,7 @@ private fun Content(s: FrontEndState, selected: String, a: FrontEndActions, modi Rise(3) { Actions { // Enabled without a runtime or the desktop: the session's loading screen installs them first. - PrimaryButton(if (s.desktopInstalled) "Open desktop" else "Install & open desktop", enabled = !s.busy, onClick = a.onDesktop) + PrimaryButton(if (s.desktopInstalled) "Open desktop" else "Install & open desktop", enabled = !s.busy, main = true, onClick = a.onDesktop) Cog(a.onDesktopSettings) } } @@ -593,7 +636,7 @@ private fun Content(s: FrontEndState, selected: String, a: FrontEndActions, modi Rise(3) { Actions { Image(painterResource(e.iconRes), null, modifier = Modifier.size(40.dp)) - PrimaryButton("Open ${e.name}", enabled = s.ready && !s.busy) { a.onEmulator(e) } + PrimaryButton("Open ${e.name}", enabled = s.ready && !s.busy, main = true) { a.onEmulator(e) } SecondaryButton("ROMs folder", onClick = a.onRoms) if (pkg != null) SecondaryButton( if (pkg.kind == "appimage") "Remove" else "Forget", @@ -670,7 +713,7 @@ private fun Content(s: FrontEndState, selected: String, a: FrontEndActions, modi Spacer(Modifier.height(14.dp)) Actions { Image(painterResource(e.iconRes), null, modifier = Modifier.size(40.dp)) - PrimaryButton("Launch in ${e.name}", enabled = s.ready && !s.busy) { a.onRom(g) } + PrimaryButton("Launch in ${e.name}", enabled = s.ready && !s.busy, main = true) { a.onRom(g) } Chip(g.hostPath.extension.uppercase().ifEmpty { "folder" }, ok = false) } } @@ -803,9 +846,15 @@ private fun Chip(t: String, ok: Boolean) { private fun rememberHot(src: MutableInteractionSource): Boolean = src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value @Composable -private fun PrimaryButton(text: String, enabled: Boolean = true, onClick: () -> Unit) { +private fun PrimaryButton(text: String, enabled: Boolean = true, main: Boolean = false, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current + // The page's main button is where the pane is entered from the rail. + val frontFocus = if (main) LocalFrontFocus.current else null + if (frontFocus != null) DisposableEffect(Unit) { + frontFocus.primaryAttached++ + onDispose { frontFocus.primaryAttached-- } + } val src = remember { MutableInteractionSource() } val hot = rememberHot(src) && enabled val pressed by src.collectIsPressedAsState() @@ -814,6 +863,7 @@ private fun PrimaryButton(text: String, enabled: Boolean = true, onClick: () -> Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier + .then(if (frontFocus != null) Modifier.focusRequester(frontFocus.primary) else Modifier) .graphicsLayer { scaleX = scale; scaleY = scale; shadowElevation = if (enabled) lift.dp.toPx() else 0f; shape = Shape12; clip = false; ambientShadowColor = pal.signal; spotShadowColor = pal.signal } .clip(Shape12) .background(if (enabled) Brush.linearGradient(listOf(colors.primary, pal.primary2)) else Brush.linearGradient(listOf(colors.surfaceVariant, colors.surfaceVariant))) From 181b320ee1d6415bd5c7494d1aa312babdc864d5 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 09:03:34 -0400 Subject: [PATCH 27/65] DuckStation (PS1) set up like ARMSX2 - From the rail: -batch -bigpicture -fullscreen (the same flags as PCSX2's, src/duckstation-qt/qthost.cpp) - straight into the game, gone when it is quit. - bannerlator-pad-defaults: a new player starts on DuckStation's first-time setup with the BIOS folder in the ROMs folder (psx/bios, created, or an existing one), psx as the game list, Vulkan, the controller on Player 1 and the guide button on the pause menu (not the analog toggle). An existing install gets the guide and game-list changes, and once, its own empty BIOS folder moved to the ROMs folder and Automatic made Vulkan; later choices are kept. Users bring their own BIOS and games. --- .../droiddeck/launcher/frontend/Library.kt | 2 + .../usr/local/bin/bannerlator-pad-defaults | 116 +++++++++++++++++- 2 files changed, 116 insertions(+), 2 deletions(-) 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 0337e9d940..f437de9a36 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -191,6 +191,8 @@ object Library { // Straight into the game in its controller-driven full-screen UI (first-time setup there // too), and gone when the game is quit from its pause menu (guide button): -batch. "armsx2" -> listOf("-batch", "-bigpicture", "-fullscreen", "--", guestPath) + // DuckStation shares PCSX2's flags (src/duckstation-qt/qthost.cpp): the same launch and exit. + "duckstation" -> listOf("-batch", "-bigpicture", "-fullscreen", "--", guestPath) "dolphin" -> listOf("-e", guestPath) "cemu" -> listOf("-g", guestPath) else -> listOf(guestPath) diff --git a/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults b/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults index 45459a0e26..e9ca2b5d58 100755 --- a/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults +++ b/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults @@ -180,9 +180,121 @@ SmallMotor = SDL-0/SmallMotor """ +def ini_get(path, section, key): + try: + with open(path, encoding="utf-8", errors="replace") as f: + lines = f.read().splitlines() + except OSError: + return None + span = ini_section(lines, section) + if not span: + return None + for l in lines[span[0]:span[1]]: + if "=" in l and l.split("=", 1)[0].strip() == key: + return l.split("=", 1)[1].strip() + return None + + +def ini_set(path, section, key, value): + """Sets one key (the first of that name) in [section], adding either as needed.""" + with open(path, encoding="utf-8", errors="replace") as f: + lines = f.read().splitlines() + span = ini_section(lines, section) + if span is None: + lines += ["", f"[{section}]", f"{key} = {value}"] + else: + for i in range(span[0], span[1]): + if "=" in lines[i] and lines[i].split("=", 1)[0].strip() == key: + lines[i] = f"{key} = {value}" + break + else: + end = span[1] + while end > span[0] and not lines[end - 1].strip(): + end -= 1 + lines.insert(end, f"{key} = {value}") + with open(path + ".tmp", "w", encoding="utf-8") as f: + f.write("\n".join(lines) + "\n") + os.replace(path + ".tmp", path) + + +def drop_line(path, line): + with open(path, encoding="utf-8", errors="replace") as f: + lines = f.read().splitlines() + kept = [l for l in lines if l.replace(" ", "") != line.replace(" ", "")] + if len(kept) != len(lines): + with open(path + ".tmp", "w", encoding="utf-8") as f: + f.write("\n".join(kept) + "\n") + os.replace(path + ".tmp", path) + + +def system_folder(names, default): + for name in names: + for cand in (name, name.upper()): + d = os.path.join(ROMS, cand) + if os.path.isdir(d): + return d + return os.path.join(ROMS, default) + + +def bios_folder(base): + for name in ("bios", "BIOS", "firmware"): + d = os.path.join(base, name) + if os.path.isdir(d): + return d + d = os.path.join(base, "bios") + if os.path.isdir(ROMS): + try: + os.makedirs(d, exist_ok=True) # where the user is told to put their BIOS + except OSError: + pass + return d + + +# DuckStation (PS1) - set up like ARMSX2: users bring their own BIOS and games, in the ROMs folder. +# Front-end runs use -batch -bigpicture -fullscreen, so the guide button is the pause menu +# (Hotkeys OpenPauseMenu, src/core/hotkeys.cpp), not the analog toggle. Keys from +# src/core/settings.cpp: [BIOS] SearchDirectory, [GPU] Renderer ("Vulkan"), [Main] +# SetupWizardIncomplete (src/duckstation-qt/qthost.cpp). +DUCKSTATION_PAD1_GUIDE_FREE = "\n".join(l for l in DUCKSTATION_PAD1.splitlines() if not l.startswith("Analog ")) + "\n" + + def duckstation(): - for d in (os.path.join(CONFIG, "duckstation"), os.path.join(HOME, ".local/share/duckstation")): - patch_ini_section(os.path.join(d, "settings.ini"), "Pad1", DUCKSTATION_PAD1, "DuckStation") + ps1 = system_folder(("psx", "ps1"), "psx") + d = os.path.join(CONFIG, "duckstation") + ini = os.path.join(d, "settings.ini") + legacy = os.path.join(HOME, ".local/share/duckstation/settings.ini") + if not os.path.isfile(ini) and os.path.isfile(legacy): + ini = legacy + if not os.path.isfile(ini): + # A new player: DuckStation's own first-time setup still runs, looking in the ROMs folder. + bios = bios_folder(ps1) + seed(ini, "[Main]\nSetupWizardIncomplete = true\n\n" + f"[BIOS]\nSearchDirectory = {bios}\n\n" + f"[GameList]\nRecursivePaths = {ps1}\n\n" + "[GPU]\nRenderer = Vulkan\n\n" + "[Hotkeys]\nOpenPauseMenu = Keyboard/Escape\nOpenPauseMenu = SDL-0/Guide\n\n" + "[Pad1]\n" + DUCKSTATION_PAD1_GUIDE_FREE, "DuckStation", "first-time setup, BIOS from " + bios) + return + patch_ini_section(ini, "Pad1", DUCKSTATION_PAD1_GUIDE_FREE, "DuckStation") + drop_line(ini, "Analog = SDL-0/Guide") + patch_ini_section(ini, "Hotkeys", "OpenPauseMenu = SDL-0/Guide\n", "DuckStation", needle="SDL-0/Guide", + done="the guide button opens the pause menu") + patch_ini_section(ini, "GameList", f"RecursivePaths = {ps1}\n", "DuckStation", needle=ROMS, + done="games listed from the ROMs folder") + # Once, for a DuckStation set up before this: its own empty BIOS folder moves to the ROMs folder, + # and Automatic becomes Vulkan. A later choice in DuckStation's settings is kept. + marker = os.path.join(os.path.dirname(ini), ".droiddeck-setup") + if os.path.exists(marker): + return + current = ini_get(ini, "BIOS", "SearchDirectory") or "bios" + own = current if os.path.isabs(current) else os.path.join(os.path.dirname(ini), current) + if not (os.path.isdir(own) and os.listdir(own)): + ini_set(ini, "BIOS", "SearchDirectory", bios_folder(ps1)) + print(f"bannerlator-pad-defaults: DuckStation: BIOS from {bios_folder(ps1)}") + if (ini_get(ini, "GPU", "Renderer") or "Automatic") == "Automatic": + ini_set(ini, "GPU", "Renderer", "Vulkan") + print("bannerlator-pad-defaults: DuckStation: renderer Vulkan") + open(marker, "w").close() # PCSX2: FaceSouth/... names (pcsx2/Input/SDLInputSource.cpp), keys from SIO/Pad/PadDualshock2.cpp. From c5b58a938a442dcc25c71d26fdbef2a7d6014b4f Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 09:12:31 -0400 Subject: [PATCH 28/65] Front end: outline the rail item on open, remember the pane control across Left/Right --- .../droiddeck/launcher/ui/FrontEndScreen.kt | 37 +++++++++++++++---- 1 file changed, 29 insertions(+), 8 deletions(-) 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 0fbba69a88..25853b1076 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -84,6 +84,8 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.snapshotFlow +import kotlinx.coroutines.flow.first import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment @@ -105,6 +107,7 @@ import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.layout.positionInRoot import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalWindowInfo import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow @@ -240,13 +243,16 @@ private fun Modifier.shine(trigger: Boolean, strength: Float = 0.22f): Modifier /** * Controller focus on the front end: each rail item's requester and the page's main button (Play, - * Open desktop, Open , Launch...). The pane enters on the main button and leaves, to the - * left, for the selected rail item - whatever tile or button it leaves from. + * Open desktop, Open , Launch...). The pane leaves, to the left, for the selected rail + * item - whatever tile or button it leaves from - and remembers that control, so coming back in + * lands on it again; a page not yet visited enters on its main button. */ private class FrontFocus { val rail = HashMap() val primary = FocusRequester() + val pane = FocusRequester() var primaryAttached by mutableStateOf(0) + var railFocused by mutableStateOf(false) fun railFor(key: String): FocusRequester = rail.getOrPut(key) { FocusRequester() } } @@ -301,16 +307,29 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com modifier = if (wide) Modifier.width(236.dp).fillMaxHeight() else Modifier.fillMaxWidth().height(maxHeight * 0.42f), ) } - // The app opens with the selected rail item focused, so a controller sees where it is. + // The app opens with the selected rail item focused, so a controller sees where it is. A + // request before the window has focus is dropped, so wait for it and retry until it sticks. + val window = LocalWindowInfo.current LaunchedEffect(Unit) { - kotlinx.coroutines.delay(150) - runCatching { frontFocus.railFor(railSelection).requestFocus() } + snapshotFlow { window.isWindowFocused }.first { it } + repeat(20) { + if (frontFocus.railFocused) return@LaunchedEffect + runCatching { frontFocus.railFor(railSelection).requestFocus() } + kotlinx.coroutines.delay(100) + } } val back = if (wide) FocusDirection.Left else FocusDirection.Up val paneFocus = Modifier + .focusRequester(frontFocus.pane) .focusProperties { - enter = { if (frontFocus.primaryAttached > 0) frontFocus.primary else FocusRequester.Default } - exit = { dir -> if (dir == back) frontFocus.rail[railSelection] ?: FocusRequester.Default else FocusRequester.Default } + enter = { + if (frontFocus.pane.restoreFocusedChild()) FocusRequester.Cancel + else if (frontFocus.primaryAttached > 0) frontFocus.primary else FocusRequester.Default + } + exit = { dir -> + frontFocus.pane.saveFocusedChild() + if (dir == back) frontFocus.rail[railSelection] ?: FocusRequester.Default else FocusRequester.Default + } } .focusGroup() val content: @Composable (Modifier) -> Unit = { m -> Pane(s, selected, a, page, m.then(paneFocus)) { selected = it } } @@ -447,7 +466,9 @@ private fun NavItem( val colors = MaterialTheme.colorScheme val src = remember { MutableInteractionSource() } val focused by src.collectIsFocusedAsState() - val railRequester = if (register != null && key != "x") LocalFrontFocus.current?.railFor(key) else null + val frontFocus = if (register != null && key != "x") LocalFrontFocus.current else null + val railRequester = frontFocus?.railFor(key) + if (frontFocus != null) LaunchedEffect(focused) { if (focused) frontFocus.railFocused = true } val hovered by src.collectIsHoveredAsState() val pressed by src.collectIsPressedAsState() val fg by animateColorAsState(if (current) colors.onPrimary else if (muted) colors.onSurfaceVariant else colors.onBackground, Motion.tw(280), label = "navFg") From 3d051f018ebdd0b068d600a0404e3a4879a60a7d Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 09:19:10 -0400 Subject: [PATCH 29/65] Front end: leave touch mode on open so the rail item can take focus --- .../java/com/droiddeck/launcher/ui/FrontEndScreen.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 25853b1076..f562e19bd4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -108,6 +108,8 @@ import androidx.compose.ui.layout.positionInRoot import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalWindowInfo +import androidx.compose.ui.platform.LocalInputModeManager +import androidx.compose.ui.input.InputMode import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow @@ -307,13 +309,17 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com modifier = if (wide) Modifier.width(236.dp).fillMaxHeight() else Modifier.fillMaxWidth().height(maxHeight * 0.42f), ) } - // The app opens with the selected rail item focused, so a controller sees where it is. A - // request before the window has focus is dropped, so wait for it and retry until it sticks. + // The app opens with the selected rail item focused, so a controller sees where it is. An + // app starts in touch mode, where clickables refuse focus, so leave it first (a touch goes + // straight back to it); a request before the window has focus is dropped, so wait for + // that and retry until it sticks. val window = LocalWindowInfo.current + val inputMode = LocalInputModeManager.current LaunchedEffect(Unit) { snapshotFlow { window.isWindowFocused }.first { it } repeat(20) { if (frontFocus.railFocused) return@LaunchedEffect + if (inputMode.inputMode != InputMode.Keyboard) inputMode.requestInputMode(InputMode.Keyboard) runCatching { frontFocus.railFor(railSelection).requestFocus() } kotlinx.coroutines.delay(100) } From 9584f946814ff94fca43bf32dac48fe9d168c42d Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 09:26:46 -0400 Subject: [PATCH 30/65] Front end: come back to the last focused tile or button, not the grid --- .../droiddeck/launcher/ui/FrontEndScreen.kt | 51 ++++++++++++++----- 1 file changed, 37 insertions(+), 14 deletions(-) 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 f562e19bd4..1263caa898 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -8,6 +8,7 @@ import androidx.compose.ui.focus.FocusDirection import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.onFocusChanged import android.graphics.Bitmap import android.os.Build import android.provider.Settings @@ -252,10 +253,36 @@ private fun Modifier.shine(trigger: Boolean, strength: Float = 0.22f): Modifier private class FrontFocus { val rail = HashMap() val primary = FocusRequester() - val pane = FocusRequester() var primaryAttached by mutableStateOf(0) var railFocused by mutableStateOf(false) fun railFor(key: String): FocusRequester = rail.getOrPut(key) { FocusRequester() } + // The pane's controls by id (a tile's key, a button's label), how many of each are on screen, + // and the last one focused. + val items = HashMap() + val attached = HashMap() + var last: String? = null + fun paneEntry(): FocusRequester { + val id = last + return when { + id == PRIMARY && primaryAttached > 0 -> primary + id != null && id != PRIMARY && (attached[id] ?: 0) > 0 -> items.getValue(id) + primaryAttached > 0 -> primary + else -> FocusRequester.Default + } + } + companion object { const val PRIMARY = "\u0000primary" } +} + +/** Lets the pane come back to this control: it is remembered when focused. */ +@Composable +private fun Modifier.paneItem(id: String): Modifier { + val ff = LocalFrontFocus.current ?: return this + val req = remember(id) { ff.items.getOrPut(id) { FocusRequester() } } + DisposableEffect(id) { + ff.attached[id] = (ff.attached[id] ?: 0) + 1 + onDispose { ff.attached[id] = (ff.attached[id] ?: 1) - 1 } + } + return this.focusRequester(req).onFocusChanged { if (it.isFocused) ff.last = id } } private val LocalFrontFocus = staticCompositionLocalOf { null } @@ -326,14 +353,9 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com } val back = if (wide) FocusDirection.Left else FocusDirection.Up val paneFocus = Modifier - .focusRequester(frontFocus.pane) .focusProperties { - enter = { - if (frontFocus.pane.restoreFocusedChild()) FocusRequester.Cancel - else if (frontFocus.primaryAttached > 0) frontFocus.primary else FocusRequester.Default - } + enter = { frontFocus.paneEntry() } exit = { dir -> - frontFocus.pane.saveFocusedChild() if (dir == back) frontFocus.rail[railSelection] ?: FocusRequester.Default else FocusRequester.Default } } @@ -882,6 +904,7 @@ private fun PrimaryButton(text: String, enabled: Boolean = true, main: Boolean = frontFocus.primaryAttached++ onDispose { frontFocus.primaryAttached-- } } + val track = if (frontFocus == null) Modifier.paneItem("btn:$text") else Modifier val src = remember { MutableInteractionSource() } val hot = rememberHot(src) && enabled val pressed by src.collectIsPressedAsState() @@ -889,8 +912,8 @@ private fun PrimaryButton(text: String, enabled: Boolean = true, main: Boolean = val lift by animateFloatAsState(if (hot) 14f else 6f, Motion.tw(300), label = "btnLift") Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), - modifier = Modifier - .then(if (frontFocus != null) Modifier.focusRequester(frontFocus.primary) else Modifier) + modifier = track + .then(if (frontFocus != null) Modifier.focusRequester(frontFocus.primary).onFocusChanged { if (it.isFocused) frontFocus.last = FrontFocus.PRIMARY } else Modifier) .graphicsLayer { scaleX = scale; scaleY = scale; shadowElevation = if (enabled) lift.dp.toPx() else 0f; shape = Shape12; clip = false; ambientShadowColor = pal.signal; spotShadowColor = pal.signal } .clip(Shape12) .background(if (enabled) Brush.linearGradient(listOf(colors.primary, pal.primary2)) else Brush.linearGradient(listOf(colors.surfaceVariant, colors.surfaceVariant))) @@ -916,7 +939,7 @@ internal fun SecondaryButton(text: String, enabled: Boolean = true, onClick: () val edge by animateColorAsState(if (hot) pal.signal else pal.line2, Motion.tw(250), label = "secEdge") val fill by animateColorAsState(if (hot) pal.signal.copy(alpha = 0.14f) else Color.White.copy(alpha = 0.03f), Motion.tw(250), label = "secFill") Box( - modifier = Modifier.graphicsLayer { scaleX = scale; scaleY = scale }.clip(Shape12).background(fill).border(1.dp, edge, Shape12) + modifier = Modifier.paneItem("btn:$text").graphicsLayer { scaleX = scale; scaleY = scale }.clip(Shape12).background(fill).border(1.dp, edge, Shape12) .alpha(if (enabled) 1f else 0.5f) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, enabled = enabled, onClick = onClick) .padding(horizontal = 16.dp, vertical = 11.dp), @@ -933,7 +956,7 @@ private fun Cog(onClick: () -> Unit) { val edge by animateColorAsState(if (hot) pal.signal else pal.line2, Motion.tw(250), label = "cogEdge") Box( contentAlignment = Alignment.Center, - modifier = Modifier.size(42.dp).clip(Shape12).background(Color.White.copy(alpha = 0.03f)).border(1.dp, edge, Shape12) + modifier = Modifier.paneItem("cog").size(42.dp).clip(Shape12).background(Color.White.copy(alpha = 0.03f)).border(1.dp, edge, Shape12) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, onClick = onClick), ) { Icon(Icons.Filled.Settings, "Settings", tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(18.dp).rotate(rot)) } } @@ -974,7 +997,7 @@ private fun ArtGrid(tiles: List, wide: Boolean = false) { for (t in row) key(t.key) { val src = remember { MutableInteractionSource() } val hot = rememberHot(src) - Box(modifier = Modifier.width(tileWidth).zIndex(if (hot) 1f else 0f)) { GameTile(t, wide, square, src, hot) } + Box(modifier = Modifier.width(tileWidth).zIndex(if (hot) 1f else 0f)) { GameTile(t, wide, square, src, hot, Modifier.paneItem("tile:" + t.key)) } } } } @@ -983,7 +1006,7 @@ private fun ArtGrid(tiles: List, wide: Boolean = false) { } @Composable -private fun GameTile(t: Tile, wide: Boolean, square: Boolean, src: MutableInteractionSource, hot: Boolean) { +private fun GameTile(t: Tile, wide: Boolean, square: Boolean, src: MutableInteractionSource, hot: Boolean, track: Modifier) { val colors = MaterialTheme.colorScheme val pressed by src.collectIsPressedAsState() val scale by animateFloatAsState(if (pressed) 0.97f else if (hot) 1.04f else 1f, Motion.sp(0.55f, Spring.StiffnessMedium), label = "tileScale") @@ -992,7 +1015,7 @@ private fun GameTile(t: Tile, wide: Boolean, square: Boolean, src: MutableIntera val pal = LocalPalette.current val ring by animateColorAsState(if (hot) pal.signal else Color.Transparent, Motion.tw(220), label = "tileRing") Column( - modifier = Modifier + modifier = track .graphicsLayer { scaleX = scale; scaleY = scale; translationY = lift.dp.toPx(); shadowElevation = elev.dp.toPx(); shape = Shape12; clip = false; ambientShadowColor = if (hot) pal.signal else Color.Black; spotShadowColor = if (hot) pal.signal else Color.Black; transformOrigin = androidx.compose.ui.graphics.TransformOrigin(0.5f, 0.9f) } .clip(Shape12) .background(colors.surface) From 288e59e8654eb9b372baccabf0ae9e064ee9ce75 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Thu, 24 Sep 2026 09:30:34 -0400 Subject: [PATCH 31/65] Add display choice to Android app launches --- .../java/com/droiddeck/launcher/HomeApp.kt | 13 ++++- .../com/droiddeck/launcher/MainActivity.kt | 40 ++++++++++++++-- .../com/droiddeck/launcher/SessionActivity.kt | 18 +++---- .../launcher/input/SecondScreenMode.kt | 19 ++++++++ .../droiddeck/launcher/ui/FrontEndScreen.kt | 47 ++++++++++++++++--- .../com/droiddeck/launcher/ui/MainScreen.kt | 28 +++++++++++ .../droiddeck/launcher/ui/SessionOverlay.kt | 28 ++++++++++- 7 files changed, 167 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 8be97a55ca..c460825a00 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher +import android.app.ActivityOptions import android.app.role.RoleManager import android.graphics.Bitmap import android.content.ComponentName @@ -73,11 +74,19 @@ object HomeApp { return apps.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.label }) } - fun launch(context: Context, app: LaunchableApp) { + 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)) - context.startActivity(intent) + if (displayId == null) { + context.startActivity(intent) + return + } + // Keep the target app's task separate from DroidDeck. Without this, Android can put the + // app on top of the caller's task and move the entire task to the chosen display. + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + val options = ActivityOptions.makeBasic().setLaunchDisplayId(displayId) + context.startActivity(intent, options.toBundle()) } fun isActiveSteamSession(): Boolean = diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index ca68e8e057..3219ab7ff9 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -4,12 +4,14 @@ import android.Manifest import android.content.Intent import java.io.File import android.content.pm.PackageManager +import android.hardware.display.DisplayManager import android.net.Uri import android.provider.OpenableColumns import android.os.Bundle import android.os.Handler import android.os.Looper import android.util.Log +import android.view.Display import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.result.contract.ActivityResultContracts @@ -55,6 +57,8 @@ import com.droiddeck.launcher.files.InAppFilePicker import com.droiddeck.launcher.session.SessionArtifacts import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.session.GameStorage +import com.droiddeck.launcher.input.SecondScreenDisplay +import com.droiddeck.launcher.input.SecondScreenDisplays /** * The whole app outside a session: is the runtime installed, is there a newer one, frame @@ -186,6 +190,13 @@ class MainActivity : ComponentActivity() { private var homeAppSelected by mutableStateOf(false) private var defaultHomeLabel by mutableStateOf(null) private var androidApps by mutableStateOf>(emptyList()) + private var secondScreenDisplays by mutableStateOf>(emptyList()) + private lateinit var displayManager: DisplayManager + private val secondScreenDisplayListener = object : DisplayManager.DisplayListener { + override fun onDisplayAdded(displayId: Int) = refreshSecondScreenDisplays() + override fun onDisplayRemoved(displayId: Int) = refreshSecondScreenDisplays() + override fun onDisplayChanged(displayId: Int) = refreshSecondScreenDisplays() + } private val homeRoleRequest = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { refreshHomeAppState() @@ -211,6 +222,7 @@ class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + displayManager = getSystemService(DISPLAY_SERVICE) as DisplayManager theme = SessionPrefs.theme(this) backActionsInverted = SessionPrefs.backActionsInverted(this) setContent { @@ -237,6 +249,7 @@ class MainActivity : ComponentActivity() { isHomeApp = homeAppSelected, defaultHomeLabel = defaultHomeLabel, androidApps = androidApps, + secondScreenDisplays = secondScreenDisplays, packages = packageRows, packageCatalogLoading = catalogLoading, packageBusyId = pkgId, @@ -303,7 +316,7 @@ class MainActivity : ComponentActivity() { onPageBack = { settingsMode = null; showPerformance = false; showProtons = false }, onTheme = { id -> SessionPrefs.setTheme(this, id); theme = id }, onHomeApp = { manageHomeApp() }, - onAndroidApp = { app -> launchAndroidApp(app) }, + onAndroidApp = { app, displayId -> launchAndroidApp(app, displayId) }, onBackActionsInverted = { inverted -> SessionPrefs.setBackActionsInverted(this, inverted) backActionsInverted = inverted @@ -362,6 +375,7 @@ class MainActivity : ComponentActivity() { override fun onResume() { super.onResume() refreshHomeAppState() + refreshSecondScreenDisplays() refresh() // Added games' art (a store lookup for what the folders lack) starts here, not only when // the cog opens. @@ -370,17 +384,35 @@ class MainActivity : ComponentActivity() { if (!busy) Thread({ checkCatalog() }, "catalog").start() } + override fun onStart() { + super.onStart() + displayManager.registerDisplayListener(secondScreenDisplayListener, ui) + refreshSecondScreenDisplays() + } + + override fun onStop() { + displayManager.unregisterDisplayListener(secondScreenDisplayListener) + super.onStop() + } + private fun refreshHomeAppState() { homeAppSelected = HomeApp.isDefault(this) defaultHomeLabel = HomeApp.defaultLabel(this) androidApps = if (homeAppSelected) HomeApp.launchableApps(this) else emptyList() } - private fun launchAndroidApp(app: HomeApp.LaunchableApp) { + private fun refreshSecondScreenDisplays() { + if (!::displayManager.isInitialized) return + secondScreenDisplays = SecondScreenDisplays.available(displayManager) + } + + private fun launchAndroidApp(app: HomeApp.LaunchableApp, displayId: Int?) { try { - HomeApp.launch(this, app) + HomeApp.launch(this, app, displayId) } catch (_: Exception) { - android.widget.Toast.makeText(this, "Could not open ${app.label}", android.widget.Toast.LENGTH_SHORT).show() + val target = if (displayId == null || displayId == Display.DEFAULT_DISPLAY) "the primary screen" + else secondScreenDisplays.firstOrNull { it.id == displayId }?.label ?: "display $displayId" + android.widget.Toast.makeText(this, "Could not open ${app.label} on $target", android.widget.Toast.LENGTH_SHORT).show() } } diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index f2a088b7a1..b3ac1f1a9b 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -37,6 +37,7 @@ import com.droiddeck.launcher.input.OnScreenControls import com.droiddeck.launcher.input.PadBridge import com.droiddeck.launcher.input.PointerGestures import com.droiddeck.launcher.input.SecondScreenDisplay +import com.droiddeck.launcher.input.SecondScreenDisplays import com.droiddeck.launcher.input.SecondScreenMode import com.droiddeck.launcher.input.TouchpadGestures import com.droiddeck.launcher.runtime.LinuxRuntime @@ -246,12 +247,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onFexPreset = { v -> SessionPrefs.setFexPreset(this@SessionActivity, v); readPrefs() }, onSecondScreenMode = ::selectSecondScreenMode, onSecondScreenDisplay = ::selectSecondScreenDisplay, - onLaunchAndroidApp = { app -> + onLaunchAndroidApp = { app, displayId -> drawerOpen = false try { - HomeApp.launch(this@SessionActivity, app) + HomeApp.launch(this@SessionActivity, app, displayId) } catch (_: Exception) { - Toast.makeText(this@SessionActivity, "Could not open ${app.label}", Toast.LENGTH_SHORT).show() + val target = if (displayId == null || displayId == Display.DEFAULT_DISPLAY) "the primary screen" + else secondScreenDisplays.firstOrNull { it.id == displayId }?.label ?: "display $displayId" + Toast.makeText(this@SessionActivity, "Could not open ${app.label} on $target", Toast.LENGTH_SHORT).show() } }, onBackground = { drawerOpen = false; moveTaskToBack(true) }, @@ -826,14 +829,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun refreshSecondScreenDisplays() { if (!::displayManager.isInitialized) return val primaryId = display?.displayId ?: windowManager.defaultDisplay.displayId - val candidates = displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION) - .asSequence() - .filter { it.isValid && it.displayId != primaryId && (it.flags and Display.FLAG_PRESENTATION) != 0 } - .map { target -> - val mode = target.mode - SecondScreenDisplay(target.displayId, "${target.name} · ${mode.physicalWidth}×${mode.physicalHeight}") - } - .toList() + val candidates = SecondScreenDisplays.available(displayManager, primaryId) val oldIds = secondScreenDisplays.map { it.id }.toSet() secondScreenDisplays = candidates val newIds = candidates.map { it.id }.toSet() diff --git a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt index 86daa46204..85fc94ca8c 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt @@ -1,5 +1,8 @@ package com.droiddeck.launcher.input +import android.hardware.display.DisplayManager +import android.view.Display + /** The control surface shown on a secondary Android display during a Linux session. */ enum class SecondScreenMode(val id: String, val label: String) { NONE("none", "None"), @@ -8,3 +11,19 @@ enum class SecondScreenMode(val id: String, val label: String) { } data class SecondScreenDisplay(val id: Int, val label: String) + +/** The presentation-capable displays shared by the session controls and Android app launcher. */ +object SecondScreenDisplays { + fun available(displayManager: DisplayManager, primaryDisplayId: Int = Display.DEFAULT_DISPLAY): List = + displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION) + .asSequence() + .filter { it.isValid && it.displayId != primaryDisplayId && (it.flags and Display.FLAG_PRESENTATION) != 0 } + .map { target -> + val mode = target.mode + SecondScreenDisplay( + target.displayId, + "${target.name} · ${mode.physicalWidth}×${mode.physicalHeight}", + ) + } + .toList() +} 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 92774857a6..7b6f01f157 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.ui import android.graphics.Bitmap import android.os.Build import android.provider.Settings +import android.view.Display import androidx.activity.compose.BackHandler import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedVisibility @@ -106,8 +107,10 @@ import androidx.compose.ui.unit.sp import androidx.compose.ui.zIndex import coil.compose.AsyncImage import com.droiddeck.launcher.R +import com.droiddeck.launcher.HomeApp import com.droiddeck.launcher.frontend.Library import com.droiddeck.launcher.gpu.FrameGen +import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.session.SessionPrefs import java.io.File import kotlin.math.roundToInt @@ -135,7 +138,8 @@ class FrontEndState( val theme: String = Themes.PAPER, val isHomeApp: Boolean = false, val defaultHomeLabel: String? = null, - val androidApps: List = emptyList(), + val androidApps: List = emptyList(), + val secondScreenDisplays: List = emptyList(), val packages: List? = null, val packageCatalogLoading: Boolean = false, val packageBusyId: String? = null, @@ -170,7 +174,7 @@ class FrontEndActions( val onPageBack: () -> Unit = {}, val onTheme: (String) -> Unit = {}, val onHomeApp: () -> Unit = {}, - val onAndroidApp: (com.droiddeck.launcher.HomeApp.LaunchableApp) -> Unit = {}, + val onAndroidApp: (HomeApp.LaunchableApp, Int?) -> Unit = { _, _ -> }, val onBackActionsInverted: (Boolean) -> Unit = {}, ) @@ -233,6 +237,7 @@ private fun Modifier.shine(trigger: Boolean, strength: Float = 0.22f): Modifier @Composable fun FrontEndScreen(s: FrontEndState, a: FrontEndActions, page: (@Composable () -> Unit)? = null) { var selected by rememberSaveable { mutableStateOf("steam") } + var appToChooseDisplay by remember { mutableStateOf(null) } val colors = MaterialTheme.colorScheme val ctx = LocalContext.current BackHandler(enabled = s.pageKey != null && page != null) { a.onPageBack() } @@ -272,9 +277,31 @@ fun FrontEndScreen(s: FrontEndState, a: FrontEndActions, page: (@Composable () - modifier = if (wide) Modifier.width(236.dp).fillMaxHeight() else Modifier.fillMaxWidth().height(maxHeight * 0.42f), ) } - val content: @Composable (Modifier) -> Unit = { m -> Pane(s, selected, a, page, m) { selected = it } } + val content: @Composable (Modifier) -> Unit = { m -> + Pane(s, selected, a, page, m, { selected = it }) { app -> + if (s.secondScreenDisplays.isEmpty()) a.onAndroidApp(app, null) + else appToChooseDisplay = app + } + } if (wide) Row(modifier = Modifier.fillMaxSize()) { rail(); content(Modifier.weight(1f).fillMaxHeight()) } else Column(modifier = Modifier.fillMaxSize()) { rail(); content(Modifier.weight(1f).fillMaxWidth()) } + + appToChooseDisplay?.let { app -> + val secondaryDisplay = s.secondScreenDisplays.firstOrNull() + ChooseAppDisplayDialog( + app = app, + secondaryDisplay = secondaryDisplay, + onPrimary = { + appToChooseDisplay = null + a.onAndroidApp(app, Display.DEFAULT_DISPLAY) + }, + onSecondary = { + appToChooseDisplay = null + secondaryDisplay?.let { a.onAndroidApp(app, it.id) } + }, + onDismiss = { appToChooseDisplay = null }, + ) + } } } @@ -444,7 +471,10 @@ private fun NavItem( @Composable -private fun Pane(s: FrontEndState, selected: String, a: FrontEndActions, page: (@Composable () -> Unit)?, modifier: Modifier, onSelect: (String) -> Unit) { +private fun Pane( + s: FrontEndState, selected: String, a: FrontEndActions, page: (@Composable () -> Unit)?, modifier: Modifier, + onSelect: (String) -> Unit, onAndroidAppClick: (HomeApp.LaunchableApp) -> Unit, +) { Box(modifier = modifier) { val wash: Pair = when { s.pageKey != null && page != null -> null to 250f @@ -465,7 +495,7 @@ private fun Pane(s: FrontEndState, selected: String, a: FrontEndActions, page: ( .apply { targetContentZIndex = 1f } }, label = "pane", - ) { key -> if (page != null && key == s.pageKey) page() else Content(s, key, a, Modifier.fillMaxSize(), onSelect) } + ) { key -> if (page != null && key == s.pageKey) page() else Content(s, key, a, Modifier.fillMaxSize(), onSelect, onAndroidAppClick) } } } @@ -494,7 +524,10 @@ private fun romFor(s: FrontEndState, selected: String): Pair Unit) { +private fun Content( + s: FrontEndState, selected: String, a: FrontEndActions, modifier: Modifier, + onSelect: (String) -> Unit, onAndroidAppClick: (HomeApp.LaunchableApp) -> Unit, +) { val colors = MaterialTheme.colorScheme Column(modifier = modifier.padding(horizontal = 22.dp, vertical = 18.dp)) { when { @@ -510,7 +543,7 @@ private fun Content(s: FrontEndState, selected: String, a: FrontEndActions, modi null, null, "android:${app.packageName}", - onClick = { a.onAndroidApp(app) }, + onClick = { onAndroidAppClick(app) }, iconBitmap = app.icon, ) }) 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 5fb8fc0e63..f701360206 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/MainScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/MainScreen.kt @@ -12,6 +12,34 @@ import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.HomeApp +import com.droiddeck.launcher.input.SecondScreenDisplay + +@Composable +fun ChooseAppDisplayDialog( + app: HomeApp.LaunchableApp, + secondaryDisplay: SecondScreenDisplay?, + onPrimary: () -> Unit, + onSecondary: () -> Unit, + onDismiss: () -> Unit, +) { + AlertDialog( + onDismissRequest = onDismiss, + title = { Text("Launch ${app.label}") }, + text = { + Text( + secondaryDisplay?.let { "Choose a screen. Secondary: ${it.label}." } + ?: "The secondary display is no longer available.", + ) + }, + confirmButton = { TextButton(onClick = onPrimary) { Text("Primary screen") } }, + dismissButton = { + TextButton(onClick = onSecondary, enabled = secondaryDisplay != null) { + Text("Secondary screen") + } + }, + ) +} @Composable fun ConfirmDialog(title: String, text: String, confirm: String, onConfirm: () -> Unit, onDismiss: () -> Unit) { 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 c0bbd47b50..b0ed6722d6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import android.view.Display import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -179,7 +180,7 @@ class DrawerActions( val onFexPreset: (String) -> Unit, val onSecondScreenMode: (SecondScreenMode) -> Unit, val onSecondScreenDisplay: (Int) -> Unit, - val onLaunchAndroidApp: (HomeApp.LaunchableApp) -> Unit, + val onLaunchAndroidApp: (HomeApp.LaunchableApp, Int?) -> Unit, val onBackground: () -> Unit, val onStop: () -> Unit, val onClose: () -> Unit, @@ -192,6 +193,7 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { val pal = LocalPalette.current val host = rememberMenuHost() var androidAppsExpanded by rememberSaveable { mutableStateOf(false) } + var appToChooseDisplay by remember { mutableStateOf(null) } val veil by animateFloatAsState(if (open) 1f else 0f, Motion.tw(260), label = "veil") // A controller starts on the drawer's first control, highlighted, as on the app's main screen: // the STEAM button, or in a desktop session the first setting. @@ -305,7 +307,11 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { ) } }, - ) { a.onLaunchAndroidApp(app) } + ) { + host.open = null + if (a.secondScreenDisplays.isEmpty()) a.onLaunchAndroidApp(app, null) + else appToChooseDisplay = app + } } } } @@ -399,6 +405,24 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { } } } + + appToChooseDisplay?.let { app -> + val secondaryDisplay = a.secondScreenDisplays.firstOrNull { it.id == a.selectedSecondScreenDisplay } + ?: a.secondScreenDisplays.firstOrNull() + ChooseAppDisplayDialog( + app = app, + secondaryDisplay = secondaryDisplay, + onPrimary = { + appToChooseDisplay = null + a.onLaunchAndroidApp(app, Display.DEFAULT_DISPLAY) + }, + onSecondary = { + appToChooseDisplay = null + secondaryDisplay?.let { a.onLaunchAndroidApp(app, it.id) } + }, + onDismiss = { appToChooseDisplay = null }, + ) + } } @Composable From dbaaa5b54191bd8d180b5b4a6905097f032c8699 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 09:39:38 -0400 Subject: [PATCH 32/65] Front end: one tile per disc - hide tracks a .cue/.gdi/.m3u names, skip BIOS folders --- .../droiddeck/launcher/frontend/Library.kt | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) 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 f437de9a36..e255d314b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -104,7 +104,9 @@ object Library { // The root itself only one deep, for a file left loose there. val systemDirs = romsRoot.listFiles { f -> f.isDirectory && f.name.lowercase() in spec.folders }.orEmpty().toList() val dirs = LinkedHashSet() - for (top in systemDirs) top.walkTopDown().maxDepth(3).filter { it.isDirectory }.forEach { dirs.add(it) } + // A BIOS folder holds the console's firmware, not games (psx/bios/SCPH1001.BIN). + for (top in systemDirs) top.walkTopDown().maxDepth(3).onEnter { it.name.lowercase() !in firmwareFolders } + .filter { it.isDirectory }.forEach { dirs.add(it) } dirs.add(romsRoot) // ...and not into another system's folder: a PS3 .iso in ps3/ is not a PS2 game. romsRoot.listFiles { f -> f.isDirectory && f.name.lowercase() !in systemFolders }?.forEach { dirs.add(it) } @@ -117,10 +119,15 @@ object Library { art = File(dir, "PS3_GAME/ICON0.PNG").takeIf { it.isFile })) continue } - dir.listFiles()?.sortedBy { it.name.lowercase() }?.forEach { f -> + val files = dir.listFiles()?.sortedBy { it.name.lowercase() }.orEmpty() + // A disc sheet (.cue, .gdi) names its track files and a playlist (.m3u) its + // discs: the sheet is the game, what it names is part of it. A .bin beside a + // .cue of the same name is a track even when the sheet can't be read. + val parts = files.filter { it.isFile && it.extension.lowercase() in sheetExts }.flatMap(::sheetParts).toSet() + files.forEach { f -> val ext = f.extension.lowercase() - // A .bin beside a .cue is a track, not a game. - if (f.isFile && ext in spec.exts && !(ext == "bin" && File(dir, f.nameWithoutExtension + ".cue").isFile)) { + if (f.isFile && ext in spec.exts && f.name.lowercase() !in parts && + !(ext == "bin" && File(dir, f.nameWithoutExtension + ".cue").isFile)) { val rel = f.relativeTo(romsRoot).path games.add(Rom(displayTitle(f.nameWithoutExtension.removeSuffix(".dec")), f, "/root/ROMs/$rel", spec.id)) } @@ -134,6 +141,25 @@ object Library { } } + private val firmwareFolders = setOf("bios", "firmware") + private val sheetExts = setOf("cue", "gdi", "m3u") + + /** The file names (lower case) a .cue, .gdi or .m3u refers to, from its own folder. */ + private fun sheetParts(sheet: File): List = runCatching { + if (sheet.length() > 64 * 1024) return emptyList() + sheet.readLines().mapNotNull { line -> + val t = line.trim() + when (sheet.extension.lowercase()) { + // FILE "Tekken 3 (USA) (Track 1).bin" BINARY + "cue" -> Regex("^FILE\\s+\"([^\"]+)\"", RegexOption.IGNORE_CASE).find(t)?.groupValues?.get(1) + ?: Regex("^FILE\\s+(\\S+)", RegexOption.IGNORE_CASE).find(t)?.groupValues?.get(1) + // 1 0 4 2352 "track01.bin" 0 / 1 0 4 2352 track01.bin 0 + "gdi" -> Regex("\"([^\"]+)\"").find(t)?.groupValues?.get(1) ?: t.split(Regex("\\s+")).getOrNull(4) + else -> t.takeIf { it.isNotEmpty() && !it.startsWith("#") } + } + }.map { File(it.replace('\\', '/')).name.lowercase() } + }.getOrDefault(emptyList()) + /** * What RPCS3 has installed on its own HDD - packages (PSN games) land in dev_hdd0/game/ * with a PARAM.SFO for the title and an EBOOT to boot - as RPCS3's own file list would show From 3345f1c32b7c1b0ab80345315b9a04cedf5288e3 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Thu, 24 Sep 2026 09:40:50 -0400 Subject: [PATCH 33/65] Show build source and worktree state --- app/build.gradle | 11 +++++++++-- .../com/droiddeck/launcher/ui/FrontEndScreen.kt | 15 ++++++++++----- tools/build_local.sh | 9 +++++++++ 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bf8efebbe9..7fa1adc1bc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,9 +11,9 @@ def gitValue = { List arguments -> workingDir rootProject.projectDir ignoreExitValue = true } - output.result.get().exitValue == 0 ? output.standardOutput.asText.get().trim() : '' + output.result.get().exitValue == 0 ? output.standardOutput.asText.get().trim() : null } catch (Exception ignored) { - '' + null } } @@ -40,6 +40,13 @@ if (buildLabel == null || buildLabel.trim().isEmpty()) { buildLabel = "${branch} at ${commit}" } } +def buildOrigin = providers.environmentVariable('GITHUB_ACTIONS').getOrNull() == 'true' ? 'remote' : 'local' +def treeState = providers.environmentVariable('DROIDDECK_BUILD_TREE_STATE').getOrNull() +if (!(treeState in ['clean', 'dirty'])) { + def status = gitValue(['status', '--porcelain']) + treeState = status == null ? 'unknown' : (status.isEmpty() ? 'clean' : 'dirty') +} +buildLabel = "${buildOrigin} ${treeState} · ${buildLabel}" def escapedBuildLabel = buildLabel.replace('\\', '\\\\').replace('"', '\\"') android { 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 38a65ac75c..5a9c592d81 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -490,12 +490,15 @@ private fun BuildStatus(label: String, onCheckLatest: () -> Unit, modifier: Modi val pal = LocalPalette.current val interaction = remember { MutableInteractionSource() } val hot = rememberHot(interaction) - val divider = label.lastIndexOf(" at ") - val branch = if (divider >= 0) label.substring(0, divider).substringAfterLast('/') else label - val displayLabel = if (divider >= 0) "$branch${label.substring(divider)}" else branch + val contextDivider = label.indexOf(" · ") + val context = if (contextDivider >= 0) label.substring(0, contextDivider) else "" + val identity = if (contextDivider >= 0) label.substring(contextDivider + 3) else label + val identityDivider = identity.lastIndexOf(" at ") + val branch = (if (identityDivider >= 0) identity.substring(0, identityDivider) else identity).substringAfterLast('/') + val commit = if (identityDivider >= 0) identity.substring(identityDivider + 4) else "" Row( verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(6.dp), + horizontalArrangement = Arrangement.spacedBy(5.dp), modifier = modifier .fillMaxWidth() .clip(RoundedCornerShape(6.dp)) @@ -510,7 +513,9 @@ private fun BuildStatus(label: String, onCheckLatest: () -> Unit, modifier: Modi .heightIn(min = 40.dp) .padding(horizontal = 4.dp), ) { - Text(displayLabel, modifier = Modifier.weight(1f), fontSize = 9.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = if (hot) colors.onSurfaceVariant else colors.onSurfaceVariant.copy(alpha = 0.82f), maxLines = 1, overflow = TextOverflow.Ellipsis) + if (context.isNotEmpty()) Text(context, fontSize = 8.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = colors.onSurfaceVariant.copy(alpha = 0.82f), maxLines = 1) + Text(branch, modifier = Modifier.weight(1f), fontSize = 9.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = if (hot) colors.onSurfaceVariant else colors.onSurfaceVariant.copy(alpha = 0.82f), maxLines = 1, overflow = TextOverflow.Ellipsis) + if (commit.isNotEmpty()) Text("@$commit", fontSize = 8.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = colors.onSurfaceVariant.copy(alpha = 0.82f), maxLines = 1) Icon(Icons.Filled.Refresh, contentDescription = null, tint = if (hot) pal.signal else colors.onSurfaceVariant.copy(alpha = 0.82f), modifier = Modifier.size(12.dp)) } } diff --git a/tools/build_local.sh b/tools/build_local.sh index 450fef9cc3..cd831a8dfe 100755 --- a/tools/build_local.sh +++ b/tools/build_local.sh @@ -2,6 +2,15 @@ set -euo pipefail repo_root=$(CDPATH= cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd) +if tree_status=$(git -C "${repo_root}" status --porcelain 2>/dev/null); then + if [[ -n "${tree_status}" ]]; then + export DROIDDECK_BUILD_TREE_STATE=dirty + else + export DROIDDECK_BUILD_TREE_STATE=clean + fi +else + export DROIDDECK_BUILD_TREE_STATE=unknown +fi sdk_dir=${ANDROID_HOME:-${ANDROID_SDK_ROOT:-"${HOME}/Library/Android/sdk"}} java_dir=${JAVA_HOME:-"/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home"} image_name=${DROIDDECK_BUILD_IMAGE:-droiddeck-local-cross:24.04-v2} From 90391973494f68f46d93d449b6f280a24e8b69c0 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Thu, 24 Sep 2026 09:43:09 -0400 Subject: [PATCH 34/65] Put build source below watermark identity --- .../droiddeck/launcher/ui/FrontEndScreen.kt | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) 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 5a9c592d81..4a98d8ce22 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -496,9 +496,8 @@ private fun BuildStatus(label: String, onCheckLatest: () -> Unit, modifier: Modi val identityDivider = identity.lastIndexOf(" at ") val branch = (if (identityDivider >= 0) identity.substring(0, identityDivider) else identity).substringAfterLast('/') val commit = if (identityDivider >= 0) identity.substring(identityDivider + 4) else "" - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(5.dp), + Column( + verticalArrangement = Arrangement.spacedBy(1.dp), modifier = modifier .fillMaxWidth() .clip(RoundedCornerShape(6.dp)) @@ -510,13 +509,19 @@ private fun BuildStatus(label: String, onCheckLatest: () -> Unit, modifier: Modi role = Role.Button, onClick = onCheckLatest, ) - .heightIn(min = 40.dp) - .padding(horizontal = 4.dp), + .heightIn(min = 44.dp) + .padding(horizontal = 4.dp, vertical = 3.dp), ) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(5.dp), + modifier = Modifier.fillMaxWidth(), + ) { + Text(branch, modifier = Modifier.weight(1f), fontSize = 9.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = if (hot) colors.onSurfaceVariant else colors.onSurfaceVariant.copy(alpha = 0.82f), maxLines = 1, overflow = TextOverflow.Ellipsis) + if (commit.isNotEmpty()) Text("@$commit", fontSize = 8.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = colors.onSurfaceVariant.copy(alpha = 0.82f), maxLines = 1) + Icon(Icons.Filled.Refresh, contentDescription = null, tint = if (hot) pal.signal else colors.onSurfaceVariant.copy(alpha = 0.82f), modifier = Modifier.size(12.dp)) + } if (context.isNotEmpty()) Text(context, fontSize = 8.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = colors.onSurfaceVariant.copy(alpha = 0.82f), maxLines = 1) - Text(branch, modifier = Modifier.weight(1f), fontSize = 9.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = if (hot) colors.onSurfaceVariant else colors.onSurfaceVariant.copy(alpha = 0.82f), maxLines = 1, overflow = TextOverflow.Ellipsis) - if (commit.isNotEmpty()) Text("@$commit", fontSize = 8.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = colors.onSurfaceVariant.copy(alpha = 0.82f), maxLines = 1) - Icon(Icons.Filled.Refresh, contentDescription = null, tint = if (hot) pal.signal else colors.onSurfaceVariant.copy(alpha = 0.82f), modifier = Modifier.size(12.dp)) } } From c39ea70cf5ae0bcdb14fa38be0dbdc2e1938a6f7 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 09:46:59 -0400 Subject: [PATCH 35/65] DuckStation: don't try to inhibit a screensaver the session doesn't have --- .../linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults b/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults index e9ca2b5d58..890b053f9f 100755 --- a/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults +++ b/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults @@ -268,7 +268,7 @@ def duckstation(): if not os.path.isfile(ini): # A new player: DuckStation's own first-time setup still runs, looking in the ROMs folder. bios = bios_folder(ps1) - seed(ini, "[Main]\nSetupWizardIncomplete = true\n\n" + seed(ini, "[Main]\nSetupWizardIncomplete = true\nInhibitScreensaver = false\n\n" f"[BIOS]\nSearchDirectory = {bios}\n\n" f"[GameList]\nRecursivePaths = {ps1}\n\n" "[GPU]\nRenderer = Vulkan\n\n" @@ -281,6 +281,11 @@ def duckstation(): done="the guide button opens the pause menu") patch_ini_section(ini, "GameList", f"RecursivePaths = {ps1}\n", "DuckStation", needle=ROMS, done="games listed from the ROMs folder") + # Keeping the screen awake goes through org.freedesktop.ScreenSaver, which nothing in the session + # provides (Android decides when the screen sleeps): DuckStation only warns it failed, every game. + if (ini_get(ini, "Main", "InhibitScreensaver") or "true") == "true": + ini_set(ini, "Main", "InhibitScreensaver", "false") + print("bannerlator-pad-defaults: DuckStation: no screensaver inhibit (no such service here)") # Once, for a DuckStation set up before this: its own empty BIOS folder moves to the ROMs folder, # and Automatic becomes Vulkan. A later choice in DuckStation's settings is kept. marker = os.path.join(os.path.dirname(ini), ".droiddeck-setup") From fd4c019c9fca9fa6131c4a474499e6f5dd28ffea Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 10:09:45 -0400 Subject: [PATCH 36/65] DuckStation, ARMSX2: first-time setup answered for the user; ARMSX2 names the BIOS dump itself --- .../usr/local/bin/bannerlator-pad-defaults | 46 ++++++++++++++++--- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults b/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults index 890b053f9f..88e56d76de 100755 --- a/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults +++ b/tools/linuxfs/overlay/usr/local/bin/bannerlator-pad-defaults @@ -266,9 +266,10 @@ def duckstation(): if not os.path.isfile(ini) and os.path.isfile(legacy): ini = legacy if not os.path.isfile(ini): - # A new player: DuckStation's own first-time setup still runs, looking in the ROMs folder. + # A new player: everything DuckStation's first-time setup asks is answered here (it finds + # the BIOS in its folder by itself), so a game from the front end boots straight away. bios = bios_folder(ps1) - seed(ini, "[Main]\nSetupWizardIncomplete = true\nInhibitScreensaver = false\n\n" + seed(ini, "[Main]\nSetupWizardIncomplete = false\nInhibitScreensaver = false\n\n" f"[BIOS]\nSearchDirectory = {bios}\n\n" f"[GameList]\nRecursivePaths = {ps1}\n\n" "[GPU]\nRenderer = Vulkan\n\n" @@ -281,6 +282,10 @@ def duckstation(): done="the guide button opens the pause menu") patch_ini_section(ini, "GameList", f"RecursivePaths = {ps1}\n", "DuckStation", needle=ROMS, done="games listed from the ROMs folder") + # One set up by an earlier build still has its first-time setup pending, in the way of a game. + if ini_get(ini, "Main", "SetupWizardIncomplete") == "true": + ini_set(ini, "Main", "SetupWizardIncomplete", "false") + print("bannerlator-pad-defaults: DuckStation: first-time setup already done here") # Keeping the screen awake goes through org.freedesktop.ScreenSaver, which nothing in the session # provides (Android decides when the screen sleeps): DuckStation only warns it failed, every game. if (ini_get(ini, "Main", "InhibitScreensaver") or "true") == "true": @@ -448,17 +453,18 @@ def armsx2(): shutil.copytree(src, os.path.join(root, sub), dirs_exist_ok=True) print(f"bannerlator-pad-defaults: ARMSX2: settings and memory cards copied from PCSX2 ({root})") elif not os.path.isfile(ini): - # A new player: ARMSX2's own first-time setup still runs (SetupWizardIncomplete) to pick the - # BIOS, but looking in the ROMs folder, with the ps2 folder as its game list and the - # controller already on Player 1. + # A new player: everything ARMSX2's first-time setup asks is answered here - the BIOS + # folder in the ROMs folder, the ps2 folder as its game list, the controller on Player 1 - + # and the BIOS file itself is picked below once one is there. bios, games = ps2_bios_folder(), ps2_folder() - seed(ini, "[UI]\nSettingsVersion = 1\nSetupWizardIncomplete = true\n\n" + seed(ini, "[UI]\nSettingsVersion = 1\nSetupWizardIncomplete = false\n\n" f"[Folders]\nBios = {bios}\n\n" f"[GameList]\nRecursivePaths = {games}\n\n" # Vulkan outright rather than Auto's pick: the renderer every other path here uses. "[EmuCore/GS]\nRenderer = 14\n\n" "[Hotkeys]\nOpenPauseMenu = Keyboard/Escape\nOpenPauseMenu = SDL-0/Guide\n\n" "[Pad1]\n" + ARMSX2_PAD1, "ARMSX2", "first-time setup, BIOS from " + bios) + armsx2_bios(ini) return patch_ini_section(ini, "Pad1", ARMSX2_PAD1, "ARMSX2", require="SettingsVersion") # The guide button is the pause menu here; PCSX2's profile (ours, copied over) had it as the @@ -474,6 +480,34 @@ def armsx2(): require="SettingsVersion", done="the guide button opens the pause menu") patch_ini_section(ini, "GameList", f"RecursivePaths = {ps2_folder()}\n", "ARMSX2", needle=ROMS, require="SettingsVersion", done="games listed from the ROMs folder") + if ini_get(ini, "UI", "SetupWizardIncomplete") == "true": + ini_set(ini, "UI", "SetupWizardIncomplete", "false") + print("bannerlator-pad-defaults: ARMSX2: first-time setup already done here") + armsx2_bios(ini) + + +def armsx2_bios(ini): + """PCSX2 boots the one BIOS file named in [Filenames] BIOS (inside [Folders] Bios); its first-time + setup is what names it. With that skipped, the first dump in the folder is named here - a US one + first - while none is named or the named one is gone. A choice made in ARMSX2 is kept.""" + folder = ini_get(ini, "Folders", "Bios") or ps2_bios_folder() + if not os.path.isabs(folder): + folder = os.path.join(os.path.dirname(os.path.dirname(ini)), folder) + current = ini_get(ini, "Filenames", "BIOS") + if current and os.path.isfile(os.path.join(folder, current)): + return + try: + # A PS2 BIOS dump is 4 MiB (a few are 8); the .nvm/.mec files beside it are not dumps. + dumps = sorted(f for f in os.listdir(folder) + if os.path.isfile(os.path.join(folder, f)) and 4 << 20 <= os.path.getsize(os.path.join(folder, f)) <= 8 << 20) + except OSError: + return + if not dumps: + return + us = [f for f in dumps if any(t in f.lower() for t in ("usa", "(us)", "(us,", "ntsc-u"))] + pick = (us or dumps)[0] + ini_set(ini, "Filenames", "BIOS", pick) + print(f"bannerlator-pad-defaults: ARMSX2: BIOS {pick}") def dolphin(): From 1d2df612e07e694c3af3e891b99526b0b343bde3 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Thu, 24 Sep 2026 10:39:38 -0400 Subject: [PATCH 37/65] Snapshot CI tree state before generated assets --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8511575544..951d3a9b89 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,6 +149,12 @@ jobs: BUILD_REF: ${{ github.ref_name }} BUILD_SHA: ${{ github.sha }} run: | + if [[ -n "$(git status --porcelain)" ]]; then + tree_state=dirty + else + tree_state=clean + fi + echo "DROIDDECK_BUILD_TREE_STATE=$tree_state" >> "$GITHUB_ENV" if [[ -n "$PR_NUMBER" ]]; then label="pr${PR_NUMBER} at ${PR_HEAD_SHA:0:7}" else From 41e6f461fd8ef3c39696cea00377386fa521c90e Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 10:42:46 -0400 Subject: [PATCH 38/65] Front end: a page opened from a tile takes the pad on its main button --- .../com/droiddeck/launcher/ui/FrontEndScreen.kt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 1263caa898..3ad07f0293 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -315,7 +315,8 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com LaunchedEffect(s.isHomeApp) { if (!s.isHomeApp && selected == "android-apps") selected = "steam" } remember { Motion.scale = Settings.Global.getFloat(ctx.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f); true } - BoxWithConstraints(modifier = Modifier.fillMaxSize().background(colors.background).systemBarsPadding()) { + var anyFocused by remember { mutableStateOf(false) } + BoxWithConstraints(modifier = Modifier.fillMaxSize().background(colors.background).systemBarsPadding().onFocusChanged { anyFocused = it.hasFocus }) { val wide = maxWidth >= 640.dp val railSelection = when { s.pageKey == "performance" || s.pageKey == "protons" -> "setup" @@ -351,6 +352,17 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com kotlinx.coroutines.delay(100) } } + // A tile or button that opens a page goes away with the page it was on, and focus with it; + // the pad then had nothing to move from (a press landed back on the rail's first item). So + // once the new page is in, a controller lands on its main button. + val inputModeManager = LocalInputModeManager.current + LaunchedEffect(selected, s.pageKey) { + kotlinx.coroutines.delay(450) + if (!anyFocused && inputModeManager.inputMode == InputMode.Keyboard) runCatching { + if (frontFocus.primaryAttached > 0) frontFocus.primary.requestFocus() + else frontFocus.railFor(railSelection).requestFocus() + } + } val back = if (wide) FocusDirection.Left else FocusDirection.Up val paneFocus = Modifier .focusProperties { From cf36224ee9584b0429834ac94ef0faf15a5071dd Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 11:19:12 -0400 Subject: [PATCH 39/65] Front end: Down from a page's buttons goes to the first tile --- .../droiddeck/launcher/ui/FrontEndScreen.kt | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) 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 3ad07f0293..80bb7f6d86 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -261,6 +261,10 @@ private class FrontFocus { val items = HashMap() val attached = HashMap() var last: String? = null + // The first tile of the page's grid: Down from the page's buttons goes to it, not to whichever + // tile happens to sit under the button. + val firstTile = FocusRequester() + var firstTileAttached = 0 fun paneEntry(): FocusRequester { val id = last return when { @@ -273,6 +277,24 @@ private class FrontFocus { companion object { const val PRIMARY = "\u0000primary" } } +/** Down from this button goes to the first tile of the page's grid, when there is one. */ +@Composable +private fun Modifier.downToFirstTile(): Modifier { + val ff = LocalFrontFocus.current ?: return this + return this.focusProperties { down = if (ff.firstTileAttached > 0) ff.firstTile else FocusRequester.Default } +} + +/** Marks the first tile of the page's grid. */ +@Composable +private fun Modifier.firstTile(): Modifier { + val ff = LocalFrontFocus.current ?: return this + DisposableEffect(Unit) { + ff.firstTileAttached++ + onDispose { ff.firstTileAttached-- } + } + return this.focusRequester(ff.firstTile) +} + /** Lets the pane come back to this control: it is remembered when focused. */ @Composable private fun Modifier.paneItem(id: String): Modifier { @@ -916,7 +938,7 @@ private fun PrimaryButton(text: String, enabled: Boolean = true, main: Boolean = frontFocus.primaryAttached++ onDispose { frontFocus.primaryAttached-- } } - val track = if (frontFocus == null) Modifier.paneItem("btn:$text") else Modifier + val track = (if (frontFocus == null) Modifier.paneItem("btn:$text") else Modifier).downToFirstTile() val src = remember { MutableInteractionSource() } val hot = rememberHot(src) && enabled val pressed by src.collectIsPressedAsState() @@ -951,7 +973,7 @@ internal fun SecondaryButton(text: String, enabled: Boolean = true, onClick: () val edge by animateColorAsState(if (hot) pal.signal else pal.line2, Motion.tw(250), label = "secEdge") val fill by animateColorAsState(if (hot) pal.signal.copy(alpha = 0.14f) else Color.White.copy(alpha = 0.03f), Motion.tw(250), label = "secFill") Box( - modifier = Modifier.paneItem("btn:$text").graphicsLayer { scaleX = scale; scaleY = scale }.clip(Shape12).background(fill).border(1.dp, edge, Shape12) + modifier = Modifier.paneItem("btn:$text").downToFirstTile().graphicsLayer { scaleX = scale; scaleY = scale }.clip(Shape12).background(fill).border(1.dp, edge, Shape12) .alpha(if (enabled) 1f else 0.5f) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, enabled = enabled, onClick = onClick) .padding(horizontal = 16.dp, vertical = 11.dp), @@ -968,7 +990,7 @@ private fun Cog(onClick: () -> Unit) { val edge by animateColorAsState(if (hot) pal.signal else pal.line2, Motion.tw(250), label = "cogEdge") Box( contentAlignment = Alignment.Center, - modifier = Modifier.paneItem("cog").size(42.dp).clip(Shape12).background(Color.White.copy(alpha = 0.03f)).border(1.dp, edge, Shape12) + modifier = Modifier.paneItem("cog").downToFirstTile().size(42.dp).clip(Shape12).background(Color.White.copy(alpha = 0.03f)).border(1.dp, edge, Shape12) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, onClick = onClick), ) { Icon(Icons.Filled.Settings, "Settings", tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(18.dp).rotate(rot)) } } @@ -1009,7 +1031,8 @@ private fun ArtGrid(tiles: List, wide: Boolean = false) { for (t in row) key(t.key) { val src = remember { MutableInteractionSource() } val hot = rememberHot(src) - Box(modifier = Modifier.width(tileWidth).zIndex(if (hot) 1f else 0f)) { GameTile(t, wide, square, src, hot, Modifier.paneItem("tile:" + t.key)) } + val track = Modifier.paneItem("tile:" + t.key).then(if (t === tiles.first()) Modifier.firstTile() else Modifier) + Box(modifier = Modifier.width(tileWidth).zIndex(if (hot) 1f else 0f)) { GameTile(t, wide, square, src, hot, track) } } } } From 0d85bd3053c92beddabd6500c0e7d481bfe74d49 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 24 Sep 2026 11:33:14 -0400 Subject: [PATCH 40/65] Update DroidDeck branding to split D mark (#37) --- app/src/main/res/drawable-nodpi/logo.png | Bin 79984 -> 19939 bytes .../mipmap-hdpi/ic_launcher_background.png | Bin 924 -> 367 bytes .../mipmap-hdpi/ic_launcher_foreground.png | Bin 6417 -> 2957 bytes .../mipmap-mdpi/ic_launcher_background.png | Bin 530 -> 233 bytes .../mipmap-mdpi/ic_launcher_foreground.png | Bin 3556 -> 1937 bytes .../mipmap-xhdpi/ic_launcher_background.png | Bin 1387 -> 508 bytes .../mipmap-xhdpi/ic_launcher_foreground.png | Bin 11005 -> 3990 bytes .../mipmap-xxhdpi/ic_launcher_background.png | Bin 2640 -> 897 bytes .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin 21787 -> 6247 bytes .../mipmap-xxxhdpi/ic_launcher_background.png | Bin 4302 -> 1349 bytes .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 35370 -> 8427 bytes artwork/README.md | 5 +++++ artwork/droiddeck-mark.svg | 13 +++++++++++++ 13 files changed, 18 insertions(+) create mode 100644 artwork/README.md create mode 100644 artwork/droiddeck-mark.svg diff --git a/app/src/main/res/drawable-nodpi/logo.png b/app/src/main/res/drawable-nodpi/logo.png index 936dba3bd48115ea1ec1248c1f1398d1225f0adc..a9c737a39744119ced73336d35e1ebceab81c28f 100644 GIT binary patch literal 19939 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 axzNDfOII*HGm2z-5@C?UD7f4 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 VE}6M&e?`G-kIg>oO0rMl{{ipeet-Y~ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png index 4d43523810b281fb16c937a87921ae44f310a6eb..8538bed39259c15e6e0632c636b4a1430354080d 100644 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^i$Iuz4M-mPBqq(kz-Z>_;uunK>+K~*UIqr9Lk53l zvq}5k^NN^uh;br=a+9E;l7t}1R8NQC!43&Q(kTwNBOM7YJ)}|wN^UI5NiJkiWOxo3 b8b9-TU-#a;RQtdL7?2E}u6{1-oD!M<1iNG9 literal 924 zcmeAS@N?(olHy`uVBq!ia0vp^i$Iuz4M-mPBqj}{7>k44ofy`glX(f`SfoaHruq6Z zXaU(A42MJ!9kd|805Km=%Prw_ewHo1sHPMT)`DuvtLCXhH_Vks~}# z4JRBHF$xG9b1*6~cd|M7oKaxu;2Bjk8U#Z%6&zvT`HIOo)$(gKD3^G;`njxgN@xNA Dg_7^k diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index 70d64c0ed62eb844af802bd3b56bdd3b483e2294..6998da4247fc423501d72ba13623af38c01aaf77 100644 GIT binary patch literal 2957 zcmd6p`9BkmAIB&6y}3eSHfKtOh-sv4j)WoP$eH6q_;j!^DT{6Hh|1YiNHHnr<{VZN zmNK_Q&8?ARiN1O~zW>Ab`@{Qqyx;F%-tQk??`5F#AMc~qXf1RycgO|SiTC$)AN%-G+i8|5 zhZH4+!1fXcYX*n1>P7{RVSktQogO^mbeD3zYqY22?&iJ11Ns$pd(*sPd}|G=gqojHK|J}W;1Rk z`ixKl!f&drtt~_q`ZX4G3Y3NlB|pwCg!^{z#da*+qcjiB|8&A)v4<^m6Ck-lRv2Cv zBd}l9ot)|~8@T~`jn7(J|B!)0AO?>bMWphStgLKd=9>1=b+uUsnjWt<+ka$mcz9b1 z7k19^0S-tkPYwmo#?Tw6b#;ass)>*zyn4D7FJ8nL%cV?ctNy}jk?b^{px1?ni{20u zyBwf7=w_`9v!=A7A|#1ViCA8&kUpbi9>m>{^3fuhHOL@0RKPQy!dfy+%@UAPqK;8r zKSxd&EW`93hIe1Ur=C~$aX>^+(qqQ*b>|J2Z)!vEsj^zn>z~91weSf+;bn-@h;%=$ zY;NJ1GiP?lQQer{5+3y?M3OIEMN7@>{eciWHbA(c9#INH7ur&m!3hbMxJY5SX5w!m4 zejJ9K|8;P|MGJ{Q$9p_4KA!B>tgmvDdI2BEvbxhAefi)857oo0N=PQ>*2@*C)osHg zNod+~u-a0u^~5y7f3Z;IOSKp9IVKUEW?Qq<)-p7V4UFg(UMv4lis3`wBy4Ar2@fs2 zmM+(e*XX~NKM>EzDd7p~V3!jnCO_F}E{ zCMo4Vqal<=5?r{wOE<uH|{ztHY)#f?(1rk$nP5dy6+Po`BZOU(+PMn|IUz5}2@Ab)ooL z?rr}Qf5Q!NgT$QcUZRb9pO$8#cd^=LQ?R_eqd<@mp?;BhvB7VqGKAk3^zUs~SJytR z$3!7TO_Xk)USj#_&)?NyX9h=FyiEZFZIa=SQq%d|^h9rM8}l<8hV?(Q*7kHU#oKrX zJYF}yKxMElr{?4JP)VrxBU3NHFaBb=2v2o5L<~|ylTC50l}0PQ2))$wP5AKmrsGUz zYVj66LnsknReCuUT8mUDoz>Qz+12%rJM|0x269&pEdcS`70OSyY7_2k8-|7xN`KFN zQ+opufI~>HZ>zzUKSr?~AC^~lvgl8*-(qwu%il$5m5DeLol_hQ*smV)?azHIavB$Z zLl^d}rUwE3K}RZCOMIG5{}=^JDgoJmu2fkEYM6wST80}MceZNz0nB&bZ&(^AHz8~i zLW?5Bj!8v!3}9!Dko*IRgFERd;qRb@wxxIa3qUF$0Z>_D!TDQu%AK5)dmcsZ?(Pd{ z1J=9K?LiWRzguZMvekWWmsFmO&8jP~`qV3#EhNy})I?eBbWO)~6vUXDTmFp=;k4hox)W4NWo`rS@y zC1wbv;H$dU^L2W`5N5`+-jeZMCgJ!ar;+)6VXwjDUpzg|Vr^M+K)#P_*RqF(hO9>j z)UsI~53_8&JHeRo@2W8D`yB1Ol6H<0CutcZFQ)?10BMSgi+}42*&`~T=$FvBI>&~~ z{tamSaBlPY!otGma<&&_ayxB1)!{=Z3fCCB@TtPsOO@(v(Et3xifxmh|5nIWVPUu? zeT+ghlB#fiF?;>Zx_X%OQl*ZL&N6MIUba(93(Xim)hW@L(G%|AQ+9!qerj$i_N}5%}(b{Syy;~k& z(0i`#RsDys3yNH_6Ry1+NYPQq8sWftCF+;c($Yl3CTXzb0ryR>-2thg9VqHYVnk|} zUsW__U#E^sP@($hxXBqApGd^>i}4Xn7FF>0W^UP7Y^2|CP)%6Y@AzyLqW!A;p-qp2 z(VtkX{`t8%`NppC73UtM#tHdGg=)C!3_xnN+syu_!Y$j;Uc5dhQtaT2{N~sG&@NbV zOiaw=ahV!ZnJ@30B8C~kR4UaUUiowy#Qu8YK`%0oVF`X%ST!PY)??WaLA85n!ZC}X zpInO@&tjvpSItUJ*IgSU{nC5KtJL|5@+ek8djLAHq7)e_By7&j8X_^s6h1 zx6|3+X;aS0xW4zdUJ99=yD_SNb@a{RQ~EG=7<;zl=KWS2+YZ7pmf=`@e>OPJi+A>5 zR>a+tk^f}r0c-F`_j>ZN|;hrf>sq=qV)BQGb zwzlQAUd6pM*@)rf#A><~*Bd;g^m6Gzn$EKZv9n8ETKA*RoBJSsc0b6xO+4RpLFWYy zcp^l_hX64?A?2<`>L+81G6xpVNPq6=Cfd_&CB1}%qiq1bh@XO*%x~-S`#;kBfC!Wn zF9A{PlX#7jBbMj)Bqt{aHBQ7B2a|(cgdkro9rZ?Hf1rhhWzY)1AJ#{so6qQ;9R8P9 qzfA43^q)WXm3Djg6M?@p%?rR(WxSfYPJg~%0azpL5LFgFcmD&cQ)!L> literal 6417 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 literal 530 zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz1|<8_!p{OJ#^NA%Cx&(BWL^R}7O4@QX}-P; zT0k}j17mw80}DtA5K93u0|V0nCb&q>0%imoBza5thYC<}ho_5UNCo5D%Lh3b6a(O*!GMqud&6}6AmjBNg6md* O;>Od}&t;ucLK6UA*0CG_ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index 29b8eaef83498d8a35a3bf03c256b4fc058475e3..a9a5f33dc09479fcb8cd77fd4531793a0803c147 100644 GIT binary patch literal 1937 zcmb`I_d6R17{{abNbNlj&-4AHT3cEGxg@v%000nv3ub%KgMKCl+eOXt za~cHz*v;WEV|!fjPBA`6$V`fM58s_9Qg;jHEE@z?INn2#};A#Lpz zpPqL6yq`O}`Pvu52=UuvL}<0?>EUGrZm(U57nV;K{~yC+3T0z6xf7=2W(B9Vl2}Ja zM-A(7ckiC*2mNc#;nllB-kn}vUiOTPiaIq#O{%N1&Ren&6};Of9#t#ZRolzcO+3&L zG17;vt$jg|LSR0QeWN=+CucIz@pevr{`HaqNEr=s>rjq_L?RoKUtpTC0^*s)k=8Ib zZ7MdKp+!~mg~=^LFwRq|kgiIy&Zv#wpGG zMn^a&Kfm{PH92HDRCAWSPJ%dS<8B*4Bm(n{eefNQOvWNfTf> z+5EfMJ1rFL7gtXTlwTMTEt7 zXF&Vv2n0DSGo^R9>{pbY*CqzH#k5#`wLrZ%HMnOXOGhF0gMQD3lkwv~-C38u_dsrL z?zxJkIH8r6tpWVzy4DZNqE&g4sL%Lm0l{$l-@=%Q(!CEg?kP_biuv)}Dco-t_jqe2 zk-;jB(MMRZMH%Ch8KD(A{bu_Zx{_1GUH5!>kPLEuRBh~>0Ko^)Cvt@V8lTe@(P zXIP2gk;9t-9psBrTh`%BI)Bw3zoG(AOhr{iI98n{}b z7$}T)tXX0qlHDrmkf9ShO2t&1{rUnx)_&muYw+bMYB3q1u zh^23m+S7h6xdd|E=|62~Z1eZ4>kLR~1x3N?@GR>$zFO%jSfSOTYl2k{=B*K8F525Y zU_Y6~GXm7>fKHcR>ggSWw|kfhzre<35_tw`hxI{VgMHMS(Ut?_?dO$Dxdi89;ZRwW zTAK+US^f70!;7cL1!XAXn{7vIty=osbmPYvz<`%uzI$hNxH@|^I;3?DbShq`E;Tgj zf-@+H=06~rBwDy=R}R#R0{PVvaP#7J$e8HkbE^BD$AJMmvEoWtfCKxsuF+@r$BwxQ z>7LW^>Ve*Je7LwUiwJ1?Er;_6i~?Ath}8DSL=g__2Zd`r+xgcxEL z^K7Y`d5Y`}?UbGbeHMa1JZ4rU$CF9FA7NQpS+fLf+>mo}UqO+{qHw`t5n_GvsAo_> zfH>LZdTTblyb9OXZ6iu_iTp*Zx^Gg1Xfk^^U;7(VxO7@iPY;p7U>L#$rRHX36Wg!N zC;9U{%**qOjE;6JAJCTwm5C(iO;Cp6AUD}09Rl;IZ$!jlxCHB#hv?dBZ^G6R?r`-l!LWku=E~zCG4Ews-JgHJ+ z=+bvoPL){JJ@UnCP*B_*kL{n@!-sb7di};7}|U3uZ&vdvEiq8}hOxBzK&? zdWRFz))5CN1-^dvCr|X!4+4o%c=?LPhVK80oC|uLGXntU=jgYVcP_xn_LHd0fOwZe UdPR=*(8UA*H?xF2HSv1zABn|xXaE2J literal 3556 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 NOZUE^7DmG%`ai9)rC9&~ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png index 1ef58344be79091da632bc6a78b8261fd638b211..3ba37c9e975d0d1dbd3e2e713756334c54fdd532 100644 GIT binary patch literal 508 zcmeAS@N?(olHy`uVBq!ia0vp^H$a$!4M=t>=)PrOU_9*U;uunK>+NMjUIqr9!y7)S z-(7UW_@;o8D(g8HCIblx9uVeX17S915N>7!;>LpvKztyf0g4k04kRQP7)XFHrWUN) zkhNgfhGY}MHe_wcHsNs~L<>F#f^9zopr E06DORd;kCd literal 1387 zcmeAS@N?(olHy`uVBq!ia0vp^H$a$!4M=t>=)MI~jKx9jP7LeL$-D$|EK(yp(|mmy zw18|52FCVG1{RPKAeI7R1_q`DOmLAK3z!jXkmPwK!2kvZmWQ4$jv*C{Z!d4;Wl-Q@ z*?8ceH8ZPrOuEV~{WW)H&HTL2y}?0YL$mK>7LFRmMoU(vg$)OsVlK0=JY(Z%VPfJg z^c5DEA*~?5#i4V=)Yl;)ufah>VS~VR6UN4!jH8N2Lt`{;jOLU9ED9bleH3O||4C0_ Q0jSXPboFyt=akR{02S+v-T(jq diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 9eb6b35a8c559d1a7ae1acc266e84aea08c75a9a..98c616ee8cedab20cdc22c0cbcebac5b482c3255 100644 GIT binary patch literal 3990 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 C!$%kZ literal 11005 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 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png index abac9697ece4f121aa0de45ae81bbaa8082631eb..07f6de5a9bd4596ce0587731dbf65afc96a82f22 100644 GIT binary patch literal 897 zcmeAS@N?(olHy`uVBq!ia0y~yU~~at4mO}j{44ik3=GU3o-U3d6}R4AG2~@n;5oeE zllon+X2Y8TMJlWhT$mV~SqxlgL+}V55MZPcK^qrC!-96s2AWK(&<4AmMxhN35LyQL j6b9ObId$CKz|U5*%)EZ#++WVXti|Bz>gTe~DWM4fr~94Y literal 2640 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 mXJ3t8fIo@hU@o}j?Qnm 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%0ARE-SmT3Dn5_ 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 OXMD#@zv`At+`j>M&XH08 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png index 8ab6e6ea4c517c3c9a1e2a9e90f20ed5cb340103..5ae3008fea26d620e28d62b863faa171fb3fe8c4 100644 GIT binary patch literal 1349 zcmeAS@N?(olHy`uVBq!ia0y~yVB7%09Be?56MhC-3=FJ1o-U3d6}R4AHRNSr;5oeE zllt97Hw;g=+a-rfc*9vM7c L{an^LB{Ts5FVyd% literal 4302 zcmeAS@N?(olHy`uVBq!ia0y~yVB7%09Be?56MhC-K#H+A$lZxy-8q?;K#oOfglC$s zF9S$|gMqO@VR2RRuO z1egzA{#P9)Z?@5(>A!*HiCHs0?{jZpU}RzmVzQnZ7Qw{AA)xSqm1jnI?$k+Ej$ZkFwYF>QHPC&*k~FX&6T6Y#b^OLS|yFvm7}eT(e~JALvgfe lJ=z%=?In%&D{0dc7Z;ew62CS0yFF-J!PC{xWt~$(69C~(BohDt diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index 7e9120421c81f98ef17882c073696daa210b2a15..91ae0e397bd0e6f444085df4eb4cb3470f498806 100644 GIT binary patch literal 8427 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 + DroidDeck split D with a circular orb halo and solid blue orb + + + + + + + + + + + From 498a37db32f4c59b644070b863bee81167d4d7c2 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 12:35:32 -0400 Subject: [PATCH 41/65] The app's files in Android's file picker (documents provider), for every package name --- app/src/main/AndroidManifest.xml | 12 + .../launcher/files/AppFilesProvider.kt | 243 ++++++++++++++++++ 2 files changed, 255 insertions(+) create mode 100644 app/src/main/java/com/droiddeck/launcher/files/AppFilesProvider.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 362a87d12d..dbd5b4ac62 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -123,5 +123,17 @@ android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/log_share_paths" /> + + + + + + diff --git a/app/src/main/java/com/droiddeck/launcher/files/AppFilesProvider.kt b/app/src/main/java/com/droiddeck/launcher/files/AppFilesProvider.kt new file mode 100644 index 0000000000..c5bbef88e7 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/files/AppFilesProvider.kt @@ -0,0 +1,243 @@ +package com.droiddeck.launcher.files + +import android.content.Context +import android.content.pm.ProviderInfo +import android.content.res.AssetFileDescriptor +import android.database.Cursor +import android.database.MatrixCursor +import android.graphics.Point +import android.os.CancellationSignal +import android.os.ParcelFileDescriptor +import android.provider.DocumentsContract.Document +import android.provider.DocumentsContract.Root +import android.provider.DocumentsProvider +import android.webkit.MimeTypeMap +import com.droiddeck.launcher.R +import java.io.File +import java.io.FileNotFoundException +import java.io.IOException +import java.nio.file.FileVisitResult +import java.nio.file.Files +import java.nio.file.LinkOption +import java.nio.file.Path +import java.nio.file.SimpleFileVisitor +import java.nio.file.attribute.BasicFileAttributes + +/** + * The app's own data folder (the Linux runtime, settings, logs) in Android's file picker, under the + * app's name beside the phone's storage - what MT Manager's "documents provider" injection does, as + * part of the app. Only the system's documents UI can bind it (MANAGE_DOCUMENTS); another app sees + * a file only when the user picks it there. + * + * A document id is the file's absolute path, and nothing outside the data folder is ever handed out + * or accepted: every id is resolved and checked to lie inside it. + */ +class AppFilesProvider : DocumentsProvider() { + private lateinit var base: File + private lateinit var baseCanonical: String + + override fun attachInfo(context: Context, info: ProviderInfo) { + super.attachInfo(context, info) + base = context.dataDir + baseCanonical = base.canonicalPath + } + + override fun onCreate() = true + + override fun queryRoots(projection: Array?): Cursor { + val ctx = context!! + val result = MatrixCursor(projection ?: ROOT_COLUMNS) + result.newRow().apply { + add(Root.COLUMN_ROOT_ID, ROOT_ID) + add(Root.COLUMN_DOCUMENT_ID, base.absolutePath) + add(Root.COLUMN_TITLE, titleFor(ctx)) + add(Root.COLUMN_SUMMARY, null) + add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_CREATE or Root.FLAG_SUPPORTS_SEARCH or Root.FLAG_SUPPORTS_IS_CHILD) + add(Root.COLUMN_MIME_TYPES, "*/*") + add(Root.COLUMN_AVAILABLE_BYTES, base.freeSpace) + add(Root.COLUMN_ICON, R.mipmap.ic_launcher) + } + return result + } + + override fun queryDocument(documentId: String, projection: Array?): Cursor = + MatrixCursor(projection ?: DOCUMENT_COLUMNS).also { addRow(it, fileFor(documentId)) } + + override fun queryChildDocuments(parentDocumentId: String, projection: Array?, sortOrder: String?): Cursor { + val result = MatrixCursor(projection ?: DOCUMENT_COLUMNS) + // A link in the runtime that leads out of the data folder (/etc/localtime and the like) is + // left out rather than listed as something that cannot be opened. + fileFor(parentDocumentId).listFiles()?.filter { inside(it) }?.forEach { addRow(result, it) } + return result + } + + override fun openDocument(documentId: String, mode: String, signal: CancellationSignal?): ParcelFileDescriptor = + ParcelFileDescriptor.open(fileFor(documentId), ParcelFileDescriptor.parseMode(mode)) + + override fun openDocumentThumbnail(documentId: String, sizeHint: Point?, signal: CancellationSignal?): AssetFileDescriptor { + val file = fileFor(documentId) + return AssetFileDescriptor(ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY), 0, file.length()) + } + + override fun createDocument(parentDocumentId: String, mimeType: String, displayName: String): String { + val parent = fileFor(parentDocumentId) + val name = displayName.substringAfterLast('/') + var file = File(parent, name) + var n = 2 + while (file.exists()) file = File(parent, "$name (${n++})") + val made = try { + if (mimeType == Document.MIME_TYPE_DIR) file.mkdir() else file.createNewFile() + } catch (e: IOException) { + false + } + if (!made) throw FileNotFoundException("could not create ${file.path}") + return file.absolutePath + } + + override fun deleteDocument(documentId: String) { + val file = fileFor(documentId) + if (file.absolutePath == base.absolutePath) throw FileNotFoundException("the app folder itself is not deleted") + try { + deleteTree(file.toPath()) + } catch (e: IOException) { + throw FileNotFoundException("could not delete $documentId: ${e.message}") + } + } + + /** + * Deletes a file or a folder and what is in it without ever following a link: the runtime holds + * links to places outside it, and deleting a folder must remove the link, not what it points at. + */ + private fun deleteTree(root: Path) { + if (!Files.isDirectory(root, LinkOption.NOFOLLOW_LINKS)) { + Files.delete(root) + return + } + Files.walkFileTree(root, object : SimpleFileVisitor() { + override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult { + Files.delete(file) + return FileVisitResult.CONTINUE + } + + override fun postVisitDirectory(dir: Path, exc: IOException?): FileVisitResult { + if (exc != null) throw exc + Files.delete(dir) + return FileVisitResult.CONTINUE + } + }) + } + + override fun removeDocument(documentId: String, parentDocumentId: String) = deleteDocument(documentId) + + override fun renameDocument(documentId: String, displayName: String): String { + val file = fileFor(documentId) + val target = File(file.parentFile, displayName.substringAfterLast('/')) + if (target.exists() || !file.renameTo(target)) throw FileNotFoundException("could not rename $documentId") + return target.absolutePath + } + + override fun moveDocument(sourceDocumentId: String, sourceParentDocumentId: String, targetParentDocumentId: String): String { + val source = fileFor(sourceDocumentId) + val targetParent = fileFor(targetParentDocumentId) + if (!targetParent.isDirectory) throw FileNotFoundException("$targetParentDocumentId is not a folder") + val target = File(targetParent, source.name) + if (target.exists() || !source.renameTo(target)) throw FileNotFoundException("could not move $sourceDocumentId") + return target.absolutePath + } + + override fun getDocumentType(documentId: String): String = mimeOf(fileFor(documentId)) + + override fun isChildDocument(parentDocumentId: String, documentId: String): Boolean { + val parent = runCatching { fileFor(parentDocumentId).absolutePath }.getOrNull() ?: return false + val child = runCatching { fileFor(documentId).absolutePath }.getOrNull() ?: return false + return child == parent || child.startsWith("$parent/") + } + + override fun querySearchDocuments(rootId: String, query: String, projection: Array?): Cursor { + val result = MatrixCursor(projection ?: DOCUMENT_COLUMNS) + val needle = query.lowercase() + val pending = ArrayDeque(listOf(base)) + var visited = 0 + // The runtime is tens of thousands of files: a bounded walk, not the whole tree. + while (pending.isNotEmpty() && result.count < 50 && visited++ < 20000) { + val f = pending.removeFirst() + if (!inside(f)) continue + if (f.isDirectory) f.listFiles()?.let { pending.addAll(it) } + else if (f.name.lowercase().contains(needle)) addRow(result, f) + } + return result + } + + /** The file an id names, when it exists and lies inside the data folder (links followed). */ + private fun fileFor(documentId: String): File { + val f = File(documentId) + if (!f.isAbsolute || !inside(f)) throw FileNotFoundException("$documentId is outside the app's files") + if (!f.exists()) throw FileNotFoundException("$documentId not found") + return f + } + + private fun inside(f: File): Boolean { + // The folder's own entries are listed as they are; a link is judged by where it leads. + val abs = f.absoluteFile.normalize().path + if (abs != base.absolutePath && !abs.startsWith(base.absolutePath + "/")) return false + val real = runCatching { f.canonicalPath }.getOrNull() ?: return false + return real == baseCanonical || real.startsWith("$baseCanonical/") + } + + private fun addRow(result: MatrixCursor, file: File) { + var flags = 0 + if (file.isDirectory) { + if (file.canWrite()) flags = flags or Document.FLAG_DIR_SUPPORTS_CREATE + } else if (file.canWrite()) { + flags = flags or Document.FLAG_SUPPORTS_WRITE + } + if (file.absolutePath != base.absolutePath && file.parentFile?.canWrite() == true) { + flags = flags or Document.FLAG_SUPPORTS_DELETE or Document.FLAG_SUPPORTS_RENAME or + Document.FLAG_SUPPORTS_MOVE or Document.FLAG_SUPPORTS_REMOVE + } + val mime = mimeOf(file) + if (mime.startsWith("image/")) flags = flags or Document.FLAG_SUPPORTS_THUMBNAIL + result.newRow().apply { + add(Document.COLUMN_DOCUMENT_ID, file.absolutePath) + add(Document.COLUMN_DISPLAY_NAME, if (file.absolutePath == base.absolutePath) titleFor(context!!) else file.name) + add(Document.COLUMN_SIZE, if (file.isDirectory) null else file.length()) + add(Document.COLUMN_MIME_TYPE, mime) + add(Document.COLUMN_LAST_MODIFIED, file.lastModified()) + add(Document.COLUMN_FLAGS, flags) + } + } + + private fun mimeOf(file: File): String { + if (file.isDirectory) return Document.MIME_TYPE_DIR + val ext = file.extension.lowercase() + return MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext) ?: "application/octet-stream" + } + + companion object { + private const val ROOT_ID = "app" + + private val ROOT_COLUMNS = arrayOf( + Root.COLUMN_ROOT_ID, Root.COLUMN_MIME_TYPES, Root.COLUMN_FLAGS, Root.COLUMN_ICON, + Root.COLUMN_TITLE, Root.COLUMN_SUMMARY, Root.COLUMN_DOCUMENT_ID, Root.COLUMN_AVAILABLE_BYTES, + ) + private val DOCUMENT_COLUMNS = arrayOf( + Document.COLUMN_DOCUMENT_ID, Document.COLUMN_MIME_TYPE, Document.COLUMN_DISPLAY_NAME, + Document.COLUMN_LAST_MODIFIED, Document.COLUMN_FLAGS, Document.COLUMN_SIZE, + ) + + /** + * The name in the picker. The same app ships under other package names (for the performance + * modes some phones give only named apps); each says which it is, so four installs are not + * four identical "DroidDeck" entries. + */ + fun titleFor(context: Context): String { + val name = context.getString(R.string.app_name) + return when (context.packageName) { + "com.tencent.ig" -> "$name PUBG" + "com.antutu.benchmark.full" -> "$name AnTuTu" + "com.ludashi.benchmark" -> "$name Ludashi" + else -> name + } + } + } +} From cd28b189a2cb5188817dfc642aa6dddc7be78def Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 12:45:13 -0400 Subject: [PATCH 42/65] Signing with DroidDeck's own key: hand-over from the testkey, test builds and a four-package release --- .github/workflows/build.yml | 24 +++++++ .github/workflows/release.yml | 66 +++++++++++++++++++ .github/workflows/sign.yml | 104 ++++++++++++++++++++++++++++++ .gitignore | 12 ++++ tools/release/axml_rename.py | 74 +++++++++++++++++++++ tools/release/make-release-key.sh | 69 ++++++++++++++++++++ tools/release/sign-apk.sh | 95 +++++++++++++++++++++++++++ tools/release/variants.txt | 9 +++ 8 files changed, 453 insertions(+) create mode 100644 .github/workflows/release.yml create mode 100644 .github/workflows/sign.yml create mode 100644 tools/release/axml_rename.py create mode 100755 tools/release/make-release-key.sh create mode 100755 tools/release/sign-apk.sh create mode 100644 tools/release/variants.txt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 951d3a9b89..7b8e55d6ad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,6 +66,18 @@ jobs: # The pull request as it would be once merged onto main is what gets built. When it cannot # be merged, the conflicting files and the conflicting hunks go into the run summary and the # pull-request comment, and the job stops here: there is nothing coherent to build. + # DroidDeck's signing key lives only in GitHub environment secrets (see sign.yml). A key file + # committed by mistake would be in the history for good: stop at the first one. The AOSP + # testkey is public and meant to be here. + - name: No private key in the tree + run: | + set -euo pipefail + keys=$(git ls-files | grep -iE '\.(jks|keystore|p12|pfx|pk8|pem|key)$' | grep -vx 'keystore/testkey.p12' || true) + if [ -n "$keys" ]; then + echo "::error::a private key is committed - remove it from the history and make a new one: $keys" + exit 1 + fi + - name: Merge onto main, or say what conflicts if: github.event_name == 'pull_request_target' run: | @@ -480,3 +492,15 @@ jobs: retention-days: 30 # An apk is a zip already; compressing it again buys nothing and costs seconds. compression-level: 0 + + # The apk signed with DroidDeck's own key (tools/release), so a test build installs over a release + # and keeps its data. Main's builds sign straight away (signing-main); any other branch's wait for + # the owner's approval (signing-branch). A pull request's never: its code is not ours to sign, and + # the job that would hold the key never runs for it. The testkey apk above is unaffected. + sign: + needs: build + if: github.event_name != 'pull_request_target' + uses: ./.github/workflows/sign.yml + with: + environment: ${{ github.ref == 'refs/heads/main' && 'signing-main' || 'signing-branch' }} + variants: '["standard"]' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000000..7f2307f738 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,66 @@ +name: Release APKs +run-name: release ${{ inputs.version }} from main ${{ github.sha }} + +# Every package of a release, signed with DroidDeck's own key: the standard app and the named ones +# in tools/release/variants.txt, one matrix job each. Nothing is rebuilt - the apk is the one the +# Build APK run of this exact main commit made (with its caches) and that was tested, so the +# release is those bytes. Waits for the owner's approval (the release environment); publishing the +# GitHub release stays a separate, manual step. + +on: + workflow_dispatch: + inputs: + version: + description: Version for the file names, e.g. 0.1.7 + required: true + +permissions: + contents: read + actions: read + +concurrency: + group: release + cancel-in-progress: false + +jobs: + find: + name: find the main build + if: github.ref == 'refs/heads/main' + runs-on: ubuntu-24.04 + outputs: + run_id: ${{ steps.find.outputs.run_id }} + variants: ${{ steps.find.outputs.variants }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + - id: find + env: + GH_TOKEN: ${{ github.token }} + VERSION: ${{ inputs.version }} + run: | + set -euo pipefail + [[ $VERSION =~ ^[0-9A-Za-z._-]+$ ]] || { echo "::error::version '$VERSION': letters, digits, . _ - only"; exit 1; } + # This commit's Build APK run - a push or a dispatch on main, never a pull request's. + runs=$(gh run list -R "$GITHUB_REPOSITORY" --workflow build.yml --branch main --commit "$GITHUB_SHA" \ + --status success --json databaseId,event,headSha -L 20) + id=$(jq -r --arg sha "$GITHUB_SHA" \ + '[.[] | select(.headSha == $sha and (.event == "push" or .event == "workflow_dispatch"))][0].databaseId // empty' <<<"$runs") + if [ -z "$id" ]; then + echo "::error::main ${GITHUB_SHA::7} has no successful Build APK run yet: wait for it, then release" + exit 1 + fi + variants=$(awk '!/^#/ && NF { print $1 }' tools/release/variants.txt | jq -R . | jq -sc .) + echo "run_id=$id" >> "$GITHUB_OUTPUT" + echo "variants=$variants" >> "$GITHUB_OUTPUT" + echo "Signing Build APK run $id (main ${GITHUB_SHA::7}) as $VERSION: $variants" >> "$GITHUB_STEP_SUMMARY" + + sign: + needs: find + uses: ./.github/workflows/sign.yml + with: + environment: release + variants: ${{ needs.find.outputs.variants }} + run_id: ${{ needs.find.outputs.run_id }} + label: ${{ inputs.version }} + artifact: droiddeck-release diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml new file mode 100644 index 0000000000..ae70270fcf --- /dev/null +++ b/.github/workflows/sign.yml @@ -0,0 +1,104 @@ +name: Sign APKs + +# Called, never run by itself: turns a "Build APK" apk into packages signed with DroidDeck's own key, +# one matrix job per package in tools/release/variants.txt (tools/release/sign-apk.sh does the work +# and checks it). The key lives only in the GitHub environment named by the caller: +# signing-main builds of main +# signing-branch builds of any other branch - waits for the owner's approval +# release release.yml - main only, waits for the owner's approval +# Pull requests never get here (build.yml skips this for pull_request_target), so code from a pull +# request can never be signed with the key or come near it. + +on: + workflow_call: + inputs: + environment: + type: string + required: true + variants: + description: JSON array of names from tools/release/variants.txt + type: string + required: true + run_id: + description: The Build APK run whose apk to sign; empty for the calling run's own + type: string + default: '' + label: + description: Goes in the file names (a version); empty for - + type: string + default: '' + artifact: + type: string + default: droiddeck-signed + +permissions: + contents: read + actions: read + +jobs: + sign: + name: sign ${{ matrix.variant }} + runs-on: ubuntu-24.04 + timeout-minutes: 15 + environment: ${{ inputs.environment }} + strategy: + fail-fast: false + matrix: + variant: ${{ fromJSON(inputs.variants) }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + + - name: The apk (this run's build) + if: inputs.run_id == '' + uses: actions/download-artifact@v4 + with: + name: droiddeck-apk + path: in + + - name: The apk (a main build) + if: inputs.run_id != '' + env: + GH_TOKEN: ${{ github.token }} + RUN: ${{ inputs.run_id }} + run: gh run download "$RUN" -R "$GITHUB_REPOSITORY" -n droiddeck-apk -D in + + - name: Sign + env: + RELEASE_KEYSTORE_B64: ${{ secrets.RELEASE_KEYSTORE_B64 }} + RELEASE_STORE_PASSWORD: ${{ secrets.RELEASE_STORE_PASSWORD }} + RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }} + ENVIRONMENT: ${{ inputs.environment }} + VARIANT: ${{ matrix.variant }} + LABEL: ${{ inputs.label }} + run: | + set -euo pipefail + if [ -z "$RELEASE_KEYSTORE_B64" ]; then + echo "::error::environment '$ENVIRONMENT' has no signing key: run tools/release/make-release-key.sh once" + exit 1 + fi + export RELEASE_KEYSTORE="$RUNNER_TEMP/release.p12" + ( umask 077; base64 -d <<<"$RELEASE_KEYSTORE_B64" > "$RELEASE_KEYSTORE" ) + BUILD_TOOLS=$(ls -d "$ANDROID_HOME"/build-tools/* | sort -V | tail -n1) + export BUILD_TOOLS + [ -n "$LABEL" ] || LABEL="${GITHUB_REF_NAME//\//-}-${GITHUB_SHA::7}" + suffix=$(awk -v v="$VARIANT" '!/^#/ && $1 == v { print $3 }' tools/release/variants.txt) + [ "$suffix" = - ] && suffix= + apks=(in/*.apk) + [ ${#apks[@]} = 1 ] && [ -f "${apks[0]}" ] || { echo "::error::expected one apk in the build"; exit 1; } + mkdir -p out + out="out/DroidDeck-$LABEL$suffix.apk" + tools/release/sign-apk.sh "${apks[0]}" "$VARIANT" "$out" + ( cd out && sha256sum -- *.apk > "SHA256SUMS-$VARIANT.txt" && cat "SHA256SUMS-$VARIANT.txt" ) + echo "- \`$(basename "$out")\` - $(cut -c1-16 "out/SHA256SUMS-$VARIANT.txt")…" >> "$GITHUB_STEP_SUMMARY" + + - name: Forget the key + if: always() + run: rm -f "$RUNNER_TEMP/release.p12" + + - uses: actions/upload-artifact@v4 + with: + name: ${{ inputs.artifact }}-${{ matrix.variant }} + path: out/* + if-no-files-found: error diff --git a/.gitignore b/.gitignore index 97ca1e4c80..1fa2e10c15 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,15 @@ app/src/main/assets/linuxfs/ # Kotlin compiler session files (build-tool state, never source). .kotlin/ + +# Signing keys never enter the repo (DroidDeck's lives in GitHub environment secrets; see +# tools/release/make-release-key.sh). keystore/testkey.p12 is the public AOSP testkey. +*.jks +*.keystore +*.p12 +*.pfx +*.pk8 +*.pem +!keystore/testkey.p12 +droiddeck-release-key/ +password.txt diff --git a/tools/release/axml_rename.py b/tools/release/axml_rename.py new file mode 100644 index 0000000000..ec553a12c7 --- /dev/null +++ b/tools/release/axml_rename.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python3 +# axml_rename.py in.apk out.apk old=new ... : rewrite whole strings in AndroidManifest.xml's string +# pool (binary XML), leaving every other entry of the apk byte-identical. Unsigned output. +import struct, sys, zipfile + +def dec_len8(b, o): + n = b[o]; o += 1 + if n & 0x80: n = ((n & 0x7f) << 8) | b[o]; o += 1 + return n, o + +def dec_len16(b, o): + n = struct.unpack_from('> 8), n & 0xff]) + +def enc_len16(n): + return struct.pack('> 16), n & 0xffff) + +def rewrite(axml, repl): + ftype, fhs, fsize = struct.unpack_from('&2; exit 1; } +command -v keytool >/dev/null || die "keytool not found (Termux: pkg install openjdk-17)" +command -v gh >/dev/null || die "gh not found" +gh auth status >/dev/null 2>&1 || die "gh is not logged in (gh auth login)" +[ -e "$OUT/droiddeck-release.p12" ] && die "a key already exists in $OUT - there must only ever be one" +case "$OUT" in "$repo"|"$repo"/*) die "the key must not be made inside the repo" ;; esac +for env in "${ENVIRONMENTS[@]}"; do + gh api "repos/$REPO/environments/$env" >/dev/null 2>&1 || die "GitHub environment '$env' does not exist yet" +done + +umask 077 +mkdir -p "$OUT" +KS="$OUT/droiddeck-release.p12" +# 48 random characters; PKCS12 uses one password for the store and the key. +KS_PW=$(head -c 60 /dev/urandom | base64 -w0 | tr -d '/+=') +KS_PW=${KS_PW:0:48} +[ ${#KS_PW} -ge 40 ] || die "could not make a password" +export KS_PW +printf '%s\n' "$KS_PW" > "$OUT/password.txt" + +keytool -genkeypair -keystore "$KS" -storetype PKCS12 -alias "$ALIAS" \ + -keyalg RSA -keysize 4096 -validity 10950 -dname "CN=DroidDeck, O=The412Banner" \ + -storepass:env KS_PW -keypass:env KS_PW >/dev/null 2>&1 || die "keytool could not make the key" +listing=$(keytool -list -v -keystore "$KS" -storepass:env KS_PW -alias "$ALIAS") +SHA=$(awk '/SHA256:/ { print $2 }' <<<"$listing" | head -n1 | tr -d ':' | tr 'A-F' 'a-f') +[[ $SHA =~ ^[0-9a-f]{64}$ ]] || die "could not read the key's certificate digest" + +for env in "${ENVIRONMENTS[@]}"; do + base64 -w0 < "$KS" | gh secret set RELEASE_KEYSTORE_B64 --env "$env" -R "$REPO" >/dev/null + printf '%s' "$KS_PW" | gh secret set RELEASE_STORE_PASSWORD --env "$env" -R "$REPO" >/dev/null + printf '%s' "$ALIAS" | gh secret set RELEASE_KEY_ALIAS --env "$env" -R "$REPO" >/dev/null + echo "secrets set for environment: $env" +done +unset KS_PW + +printf '%s\n' "$SHA" > "$repo/keystore/release-signer.sha256" +cat < +# +# Turns a CI build (signed with the public AOSP testkey) into one package of tools/release/variants.txt +# signed with DroidDeck's own key, carrying the hand-over from the testkey: +# - v1 + v2 are signed by the testkey, v3 by our key, with a signed lineage testkey -> our key; +# - an install from before (testkey) updates to it and keeps its data; +# - the testkey loses its rollback right, so an apk signed with the testkey alone - which anyone +# can make - is refused as an update to it (device-proven on the Pocket FIT, 2026-09-24); +# - --rotation-min-sdk-version 28: the lineage applies from Android 9, not only from 13. +# +# The key comes from the environment and is never written anywhere but the path given: +# RELEASE_KEYSTORE path to the PKCS12 keystore +# RELEASE_STORE_PASSWORD its password (the key has the same one: PKCS12) +# RELEASE_KEY_ALIAS the key's alias +# BUILD_TOOLS Android build-tools dir (zipalign, apksigner, aapt) +# RELEASE_SIGNER_SHA256 optional: the expected certificate digest, else keystore/release-signer.sha256 +set -euo pipefail + +die() { echo "::error::$*" >&2; exit 1; } +[ $# -eq 3 ] || die "usage: sign-apk.sh " +in=$1 variant=$2 out=$3 +here=$(cd "$(dirname "$0")" && pwd) +repo=$(cd "$here/../.." && pwd) + +pkg=$(awk -v v="$variant" '!/^#/ && $1 == v { print $2 }' "$here/variants.txt") +[ -n "$pkg" ] || die "no variant '$variant' in tools/release/variants.txt" +expected=${RELEASE_SIGNER_SHA256:-$(tr -d ' \n' < "$repo/keystore/release-signer.sha256" 2>/dev/null || true)} +[[ $expected =~ ^[0-9a-f]{64}$ ]] \ + || die "keystore/release-signer.sha256 is missing: make the key first (tools/release/make-release-key.sh)" +: "${RELEASE_KEYSTORE:?}" "${RELEASE_STORE_PASSWORD:?}" "${RELEASE_KEY_ALIAS:?}" "${BUILD_TOOLS:?}" +[ -s "$RELEASE_KEYSTORE" ] || die "the release keystore is empty - is the secret set for this environment?" + +TESTKEY="$repo/keystore/testkey.p12" +TESTKEY_SHA256=a40da80a59d170caa950cf15c18c454d47a39b26989d8b640ecd745ba71bf5dc +export TESTKEY_PASSWORD=android +work=$(mktemp -d) +trap 'rm -rf "$work"' EXIT + +# The package name and everything the manifest derives from it; component class names stay. +P=com.droiddeck.launcher +if [ "$pkg" = "$P" ]; then + python3 "$here/axml_rename.py" "$in" "$work/renamed.apk" +else + python3 "$here/axml_rename.py" "$in" "$work/renamed.apk" \ + "$P=$pkg" "$P.androidx-startup=$pkg.androidx-startup" "$P.logs=$pkg.logs" \ + "$P.documents=$pkg.documents" "$P.home=$pkg.home" \ + "$P.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION=$pkg.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" +fi +got=$("$BUILD_TOOLS/aapt" dump badging "$work/renamed.apk" | sed -n "s/^package: name='\([^']*\)'.*/\1/p") +[ "$got" = "$pkg" ] || die "$variant: the apk says package '$got', not '$pkg'" +if [ "$pkg" != "$P" ]; then + # A provider left on the old authority would clash with the standard app installed beside it. + tree=$("$BUILD_TOOLS/aapt" dump xmltree "$work/renamed.apk" AndroidManifest.xml) + grep -E 'android:(authorities|taskAffinity)' <<<"$tree" | grep -F "\"$P." \ + && die "$variant: the manifest still names $P in an authority or task" +fi + +"$BUILD_TOOLS/zipalign" -p -f 4 "$work/renamed.apk" "$work/aligned.apk" + +# The lineage: the testkey vouches for our key. Made fresh each time (it is two certificates and +# a signature, nothing secret beyond the key that signs it). +"$BUILD_TOOLS/apksigner" rotate --out "$work/lineage" \ + --old-signer --ks "$TESTKEY" --ks-type PKCS12 --ks-pass env:TESTKEY_PASSWORD \ + --ks-key-alias testkey --key-pass env:TESTKEY_PASSWORD --set-rollback false \ + --new-signer --ks "$RELEASE_KEYSTORE" --ks-type PKCS12 --ks-pass env:RELEASE_STORE_PASSWORD \ + --ks-key-alias "$RELEASE_KEY_ALIAS" --key-pass env:RELEASE_STORE_PASSWORD + +"$BUILD_TOOLS/apksigner" sign \ + --ks "$TESTKEY" --ks-type PKCS12 --ks-pass env:TESTKEY_PASSWORD \ + --ks-key-alias testkey --key-pass env:TESTKEY_PASSWORD \ + --next-signer --ks "$RELEASE_KEYSTORE" --ks-type PKCS12 --ks-pass env:RELEASE_STORE_PASSWORD \ + --ks-key-alias "$RELEASE_KEY_ALIAS" --key-pass env:RELEASE_STORE_PASSWORD \ + --lineage "$work/lineage" --rotation-min-sdk-version 28 \ + --v1-signing-enabled true --v2-signing-enabled true --v3-signing-enabled true --v4-signing-enabled false \ + --out "$out" "$work/aligned.apk" +rm -f "$out.idsig" + +# What the apk must carry, checked rather than assumed. +"$BUILD_TOOLS/apksigner" verify --min-sdk-version 26 "$out" >/dev/null || die "$variant: does not verify" +# (Listed first, then searched: grep -q stops reading early, which fails a pipe under pipefail.) +listing=$(unzip -l "$out") +grep -qE 'META-INF/.*\.(SF|RSA)$' <<<"$listing" || die "$variant: no JAR signature (old installers)" +certs=$("$BUILD_TOOLS/apksigner" verify --min-sdk-version 28 --print-certs "$out") +v3=$(sed -n 's/^Signer #1 certificate SHA-256 digest: //p' <<<"$certs") +[ "$v3" = "$expected" ] || die "$variant: Android 9+ sees signer $v3, not DroidDeck's key $expected" +lineage=$("$BUILD_TOOLS/apksigner" lineage --in "$out" --print-certs) +grep -q "Signer #1 in lineage certificate SHA-256 digest: $TESTKEY_SHA256" <<<"$lineage" \ + || die "$variant: the lineage does not start at the testkey - old installs could not update" +grep -q "Signer #2 in lineage certificate SHA-256 digest: $expected" <<<"$lineage" \ + || die "$variant: the lineage does not hand over to DroidDeck's key" +rollback=$(awk '/Signer #1 in lineage/{s=1} /Signer #2 in lineage/{s=0} s && /rollback capability/' <<<"$lineage") +grep -q false <<<"$rollback" \ + || die "$variant: the testkey kept its rollback right - a testkey-signed apk could replace this one" +echo "$variant ($pkg): signed, hand-over from the testkey, v3 signer $expected" diff --git a/tools/release/variants.txt b/tools/release/variants.txt new file mode 100644 index 0000000000..6071068008 --- /dev/null +++ b/tools/release/variants.txt @@ -0,0 +1,9 @@ +# The packages a signed build ships as. The same apk, with only the manifest's package name (and +# the names derived from it) changed: some phones give their performance modes only to apps with +# certain names. Each is its own app to Android - installs beside the others, with its own data. +# +# name package file suffix +standard com.droiddeck.launcher - +pubg com.tencent.ig -pubg +antutu com.antutu.benchmark.full -antutu +ludashi com.ludashi.benchmark -ludashi From af66e29471b73134a9bc299f027e3aa313bf361e Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 12:46:39 -0400 Subject: [PATCH 43/65] CI: give the signing job the permissions sign.yml asks for --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7b8e55d6ad..a32dd0572f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -500,6 +500,10 @@ jobs: sign: needs: build if: github.event_name != 'pull_request_target' + # What sign.yml asks for; a called workflow never gets more than its caller gives it. + permissions: + contents: read + actions: read uses: ./.github/workflows/sign.yml with: environment: ${{ github.ref == 'refs/heads/main' && 'signing-main' || 'signing-branch' }} From 38151a150a4ceafd2b8533fbe4f92047c52ff5f6 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 12:59:34 -0400 Subject: [PATCH 44/65] The release key's certificate digest (public), checked against every signed apk --- keystore/release-signer.sha256 | 1 + 1 file changed, 1 insertion(+) create mode 100644 keystore/release-signer.sha256 diff --git a/keystore/release-signer.sha256 b/keystore/release-signer.sha256 new file mode 100644 index 0000000000..21b2147916 --- /dev/null +++ b/keystore/release-signer.sha256 @@ -0,0 +1 @@ +b241ea7d77822d39b89d3227e06f3ecf62adec6cbfd38ad06196787991b5d3f0 From bdf246bc1fd569e897cb02ed5460fa607fa21bec Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 13:06:26 -0400 Subject: [PATCH 45/65] CI: pass secrets on to sign.yml so it can read the environment's key --- .github/workflows/build.yml | 2 ++ .github/workflows/release.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a32dd0572f..25a6e633db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -508,3 +508,5 @@ jobs: with: environment: ${{ github.ref == 'refs/heads/main' && 'signing-main' || 'signing-branch' }} variants: '["standard"]' + # The key is an environment secret; a called workflow sees secrets only when they are passed on. + secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7f2307f738..2106659c84 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -64,3 +64,5 @@ jobs: run_id: ${{ needs.find.outputs.run_id }} label: ${{ inputs.version }} artifact: droiddeck-release + # The key is an environment secret; a called workflow sees secrets only when they are passed on. + secrets: inherit From c0a264564b805cd4cef5c2c5085c795326f1afcb Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 13:12:09 -0400 Subject: [PATCH 46/65] sign-apk: read the signer digest in either apksigner format --- tools/release/sign-apk.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/release/sign-apk.sh b/tools/release/sign-apk.sh index ba60203c84..73b7b745bb 100755 --- a/tools/release/sign-apk.sh +++ b/tools/release/sign-apk.sh @@ -81,9 +81,14 @@ rm -f "$out.idsig" # (Listed first, then searched: grep -q stops reading early, which fails a pipe under pipefail.) listing=$(unzip -l "$out") grep -qE 'META-INF/.*\.(SF|RSA)$' <<<"$listing" || die "$variant: no JAR signature (old installers)" +# Android 9+ must see our key and only our key. apksigner labels signers "Signer #1" or, in newer +# build-tools, "Signer (minSdkVersion=28, ...)"; the digests are what count. certs=$("$BUILD_TOOLS/apksigner" verify --min-sdk-version 28 --print-certs "$out") -v3=$(sed -n 's/^Signer #1 certificate SHA-256 digest: //p' <<<"$certs") -[ "$v3" = "$expected" ] || die "$variant: Android 9+ sees signer $v3, not DroidDeck's key $expected" +v3=$(sed -n 's/^Signer.* certificate SHA-256 digest: //p' <<<"$certs" | sort -u) +if [ "$v3" != "$expected" ]; then + echo "$certs" >&2 + die "$variant: Android 9+ sees signer(s) [$(tr '\n' ' ' <<<"$v3")], not only DroidDeck's key $expected" +fi lineage=$("$BUILD_TOOLS/apksigner" lineage --in "$out" --print-certs) grep -q "Signer #1 in lineage certificate SHA-256 digest: $TESTKEY_SHA256" <<<"$lineage" \ || die "$variant: the lineage does not start at the testkey - old installs could not update" From 709668a4790eee4cd9ad86835e81726dfcd52f98 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 13:17:57 -0400 Subject: [PATCH 47/65] sign-apk: match apksigner's 'V3.0 Signer:' lines too --- tools/release/sign-apk.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/release/sign-apk.sh b/tools/release/sign-apk.sh index 73b7b745bb..1337b9d766 100755 --- a/tools/release/sign-apk.sh +++ b/tools/release/sign-apk.sh @@ -81,10 +81,10 @@ rm -f "$out.idsig" # (Listed first, then searched: grep -q stops reading early, which fails a pipe under pipefail.) listing=$(unzip -l "$out") grep -qE 'META-INF/.*\.(SF|RSA)$' <<<"$listing" || die "$variant: no JAR signature (old installers)" -# Android 9+ must see our key and only our key. apksigner labels signers "Signer #1" or, in newer -# build-tools, "Signer (minSdkVersion=28, ...)"; the digests are what count. +# Android 9+ must see our key and only our key. apksigner labels signers "Signer #1", "Signer +# (minSdkVersion=28, ...)" or "V3.0 Signer:" depending on its version; the digests are what count. certs=$("$BUILD_TOOLS/apksigner" verify --min-sdk-version 28 --print-certs "$out") -v3=$(sed -n 's/^Signer.* certificate SHA-256 digest: //p' <<<"$certs" | sort -u) +v3=$(sed -n 's/^.*Signer.* certificate SHA-256 digest: //p' <<<"$certs" | sort -u) if [ "$v3" != "$expected" ]; then echo "$certs" >&2 die "$variant: Android 9+ sees signer(s) [$(tr '\n' ' ' <<<"$v3")], not only DroidDeck's key $expected" From f0c8e08af09eb5c9bc79d630f772049ec3e17968 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 24 Sep 2026 13:18:09 -0400 Subject: [PATCH 48/65] Improve session drawer stick navigation (#40) --- .../com/droiddeck/launcher/SessionActivity.kt | 104 ++++++++++++++---- 1 file changed, 83 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 9e9c3a146e..5a36bc60b2 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -13,6 +13,7 @@ import android.util.Log import android.view.InputDevice import android.view.KeyEvent import android.view.MotionEvent +import android.view.ViewConfiguration import android.view.Display import android.view.SurfaceHolder import android.view.SurfaceView @@ -92,8 +93,29 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var pendingBackAction: Runnable? = null private var drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN private var drawerDirectionDownTime = 0L - private var drawerDirectionLastRepeat = 0L private var drawerDirectionDeviceId = -1 + private var drawerDirectionRepeatCount = 0 + private val drawerFirstRepeatDelayMs = ViewConfiguration.getKeyRepeatTimeout().toLong() + private val drawerSlowRepeatIntervalMs = maxOf( + ViewConfiguration.getKeyRepeatDelay().toLong(), DRAWER_SLOW_REPEAT_FLOOR_MS, + ) + private val drawerDirectionRepeat = object : Runnable { + override fun run() { + if (drawerDirectionKey == KeyEvent.KEYCODE_UNKNOWN) return + + val now = SystemClock.uptimeMillis() + val heldMs = now - drawerDirectionDownTime + val progress = ((heldMs - drawerFirstRepeatDelayMs).toFloat() / DRAWER_REPEAT_ACCELERATION_MS) + .coerceIn(0f, 1f) + val intervalMs = ( + drawerSlowRepeatIntervalMs + + (DRAWER_FAST_REPEAT_INTERVAL_MS - drawerSlowRepeatIntervalMs) * progress + ).toLong() + + dispatchDrawerKey(KeyEvent.ACTION_DOWN, ++drawerDirectionRepeatCount, now) + uiHandler.postDelayed(this, intervalMs) + } + } private val resumeKeysDown = mutableSetOf>() // Compose reads these; the activity writes them. @@ -756,7 +778,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean { if (drawerOpen && event.device != null && PadBridge.isFromController(event.device)) { - dispatchDrawerDirection(event) + if (event.actionMasked == MotionEvent.ACTION_MOVE && + event.isFromSource(InputDevice.SOURCE_JOYSTICK) + ) { + dispatchDrawerDirection(event) + } return true } if (drawerDirectionKey != KeyEvent.KEYCODE_UNKNOWN) releaseDrawerDirection() @@ -769,36 +795,62 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun dispatchDrawerDirection(event: MotionEvent) { val hatX = event.getAxisValue(MotionEvent.AXIS_HAT_X) val hatY = event.getAxisValue(MotionEvent.AXIS_HAT_Y) - val x = if (abs(hatX) > 0.4f) hatX else event.getAxisValue(MotionEvent.AXIS_X) - val y = if (abs(hatY) > 0.4f) hatY else event.getAxisValue(MotionEvent.AXIS_Y) + val hatActive = maxOf(abs(hatX), abs(hatY)) >= DRAWER_HAT_THRESHOLD + val x = if (hatActive) hatX else centeredStickAxis(event, MotionEvent.AXIS_X) + val y = if (hatActive) hatY else centeredStickAxis(event, MotionEvent.AXIS_Y) + val directionThreshold = if (drawerDirectionKey == KeyEvent.KEYCODE_UNKNOWN) { + DRAWER_STICK_ENTER_THRESHOLD + } else { + DRAWER_STICK_EXIT_THRESHOLD + } + val previousWasHorizontal = drawerDirectionKey == KeyEvent.KEYCODE_DPAD_LEFT || + drawerDirectionKey == KeyEvent.KEYCODE_DPAD_RIGHT + val horizontalWins = if (previousWasHorizontal) { + abs(x) >= abs(y) * DRAWER_ACTIVE_DIRECTION_MARGIN + } else { + abs(x) > abs(y) * DRAWER_DIRECTION_MARGIN + } val keyCode = when { - maxOf(abs(x), abs(y)) < 0.45f -> KeyEvent.KEYCODE_UNKNOWN - abs(x) > abs(y) && x < 0f -> KeyEvent.KEYCODE_DPAD_LEFT - abs(x) > abs(y) -> KeyEvent.KEYCODE_DPAD_RIGHT + maxOf(abs(x), abs(y)) < directionThreshold -> KeyEvent.KEYCODE_UNKNOWN + horizontalWins && x < 0f -> KeyEvent.KEYCODE_DPAD_LEFT + horizontalWins -> KeyEvent.KEYCODE_DPAD_RIGHT y < 0f -> KeyEvent.KEYCODE_DPAD_UP else -> KeyEvent.KEYCODE_DPAD_DOWN } val now = SystemClock.uptimeMillis() - if (keyCode != drawerDirectionKey) { - Log.i(TAG, "drawer axis source=${event.source} x=$x y=$y direction=$keyCode") - releaseDrawerDirection() - if (keyCode == KeyEvent.KEYCODE_UNKNOWN) return - drawerDirectionKey = keyCode - drawerDirectionDeviceId = event.deviceId - drawerDirectionDownTime = now - drawerDirectionLastRepeat = now - dispatchDrawerKey(KeyEvent.ACTION_DOWN, 0, now) - } else if (keyCode != KeyEvent.KEYCODE_UNKNOWN && now - drawerDirectionLastRepeat >= 240L) { - drawerDirectionLastRepeat = now - dispatchDrawerKey(KeyEvent.ACTION_DOWN, 1, now) - } + if (keyCode == drawerDirectionKey) return + + Log.i(TAG, "drawer axis source=${event.source} x=$x y=$y direction=$keyCode") + releaseDrawerDirection() + if (keyCode == KeyEvent.KEYCODE_UNKNOWN) return + + drawerDirectionKey = keyCode + drawerDirectionDeviceId = event.deviceId + drawerDirectionDownTime = now + drawerDirectionRepeatCount = 0 + dispatchDrawerKey(KeyEvent.ACTION_DOWN, 0, now) + uiHandler.postDelayed(drawerDirectionRepeat, drawerFirstRepeatDelayMs) + } + + /** Use Android's per-device flat region, then rescale the remaining stick travel to 0..1. */ + private fun centeredStickAxis(event: MotionEvent, axis: Int): Float { + val value = event.getAxisValue(axis) + val flat = (event.device?.getMotionRange(axis, event.source)?.flat ?: 0f) + .coerceIn(0f, 0.95f) + val magnitude = abs(value) + if (magnitude <= flat) return 0f + + val centered = ((magnitude - flat) / (1f - flat)).coerceIn(0f, 1f) + return if (value < 0f) -centered else centered } private fun releaseDrawerDirection() { + uiHandler.removeCallbacks(drawerDirectionRepeat) if (drawerDirectionKey == KeyEvent.KEYCODE_UNKNOWN) return dispatchDrawerKey(KeyEvent.ACTION_UP, 0, SystemClock.uptimeMillis()) drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN drawerDirectionDeviceId = -1 + drawerDirectionRepeatCount = 0 } private fun dispatchDrawerKey(action: Int, repeatCount: Int, eventTime: Long) { @@ -806,7 +858,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { drawerDirectionDownTime, eventTime, action, drawerDirectionKey, repeatCount, 0, drawerDirectionDeviceId, 0, 0, InputDevice.SOURCE_DPAD, ) - if (action == KeyEvent.ACTION_DOWN) { + if (action == KeyEvent.ACTION_DOWN && repeatCount == 0) { Log.i(TAG, "drawer synthetic key=${KeyEvent.keyCodeToString(drawerDirectionKey)} viewFocused=${sessionOverlay.hasFocus()}") } super.dispatchKeyEvent(event) @@ -1086,6 +1138,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onPause() { (getSystemService(INPUT_SERVICE) as? InputManager)?.unregisterInputDeviceListener(deviceListener) + releaseDrawerDirection() // A button held when the app goes away would stay held in the ring for the whole session. onScreenControls?.releaseAll() keyboard?.takeIf { it.shown }?.hide() @@ -1120,6 +1173,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { // Deliberately does NOT end the session: this activity can be destroyed while the user is // in another app, and the whole point of the service is that Steam survives that. watching = false + releaseDrawerDirection() pendingBackAction?.let(uiHandler::removeCallbacks) pendingBackAction = null closeSecondScreen(reset = true) @@ -1139,6 +1193,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { companion object { private const val TAG = "SessionActivity" private const val BACK_DOUBLE_PRESS_TIMEOUT_MS = 500L + private const val DRAWER_HAT_THRESHOLD = 0.5f + private const val DRAWER_STICK_ENTER_THRESHOLD = 0.55f + private const val DRAWER_STICK_EXIT_THRESHOLD = 0.35f + private const val DRAWER_DIRECTION_MARGIN = 1.15f + private const val DRAWER_ACTIVE_DIRECTION_MARGIN = 0.85f + private const val DRAWER_SLOW_REPEAT_FLOOR_MS = 240L + private const val DRAWER_FAST_REPEAT_INTERVAL_MS = 90L + private const val DRAWER_REPEAT_ACCELERATION_MS = 1_400L /** Compositor scale modes (Container.FULLSCREEN_* values): 1 = fit with bars, centred. */ private const val SCALE_FIT = 1 private const val ALIGN_CENTER = 0 From f1ba5503c94ffb3095a56677056cd57e86b18155 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 13:24:47 -0400 Subject: [PATCH 49/65] CI: the key alias is plain text, not a secret --- .github/workflows/sign.yml | 3 ++- tools/release/make-release-key.sh | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index ae70270fcf..73d92b3e09 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -68,7 +68,8 @@ jobs: env: RELEASE_KEYSTORE_B64: ${{ secrets.RELEASE_KEYSTORE_B64 }} RELEASE_STORE_PASSWORD: ${{ secrets.RELEASE_STORE_PASSWORD }} - RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }} + # The alias is not a secret (and as one, GitHub would mask 'droiddeck' all over the logs). + RELEASE_KEY_ALIAS: droiddeck ENVIRONMENT: ${{ inputs.environment }} VARIANT: ${{ matrix.variant }} LABEL: ${{ inputs.label }} diff --git a/tools/release/make-release-key.sh b/tools/release/make-release-key.sh index 00f8eb48f9..96d423ae1c 100755 --- a/tools/release/make-release-key.sh +++ b/tools/release/make-release-key.sh @@ -49,7 +49,6 @@ SHA=$(awk '/SHA256:/ { print $2 }' <<<"$listing" | head -n1 | tr -d ':' | tr 'A- for env in "${ENVIRONMENTS[@]}"; do base64 -w0 < "$KS" | gh secret set RELEASE_KEYSTORE_B64 --env "$env" -R "$REPO" >/dev/null printf '%s' "$KS_PW" | gh secret set RELEASE_STORE_PASSWORD --env "$env" -R "$REPO" >/dev/null - printf '%s' "$ALIAS" | gh secret set RELEASE_KEY_ALIAS --env "$env" -R "$REPO" >/dev/null echo "secrets set for environment: $env" done unset KS_PW From 6125d853f403d72300eea8b6b1fcb374f7666924 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 13:37:43 -0400 Subject: [PATCH 50/65] CI: build pull requests with pull_request, not pull_request_target (no shared caches with main) --- .github/workflows/build.yml | 27 ++++++++++++++++----------- .github/workflows/sign.yml | 2 +- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25a6e633db..b2377bf6d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,5 @@ name: Build APK -run-name: ${{ github.event_name == 'pull_request_target' && format('building pr {0} on {1}', github.event.pull_request.number, github.event.pull_request.head.sha) || format('building {0} on {1}', github.ref_name, github.sha) }} +run-name: ${{ github.event_name == 'pull_request' && format('building pr {0} on {1}', github.event.pull_request.number, github.event.pull_request.head.sha) || format('building {0} on {1}', github.ref_name, github.sha) }} # One job: the two glibc preload libraries the session needs, then the app around them. # Nothing is built on a developer machine - this workflow is the only thing that produces an apk. @@ -22,10 +22,15 @@ on: # A pull request against main builds by itself: the contributor's branch, as it would be once # merged onto main, comes back as an apk on the run without anyone here pressing a button. # Every push to the pull request rebuilds it and cancels the build it replaces; a draft waits - # until it is marked ready. pull_request_target rather than pull_request: GitHub does not run - # the latter at all while a pull request conflicts with main, and saying what conflicts is the - # point. The workflow file is always main's; the pull request's own code is checked out below. - pull_request_target: + # until it is marked ready. + # + # pull_request, NOT pull_request_target. The _target form runs a pull request's code with main's + # context: its caches are main's caches, so a hostile pull request could leave a poisoned + # Gradle/CMake cache that main's next build - which is signed with DroidDeck's key - picks up. + # Under pull_request a fork's run has a read-only token, no secrets, and caches of its own that + # main never reads. The price: GitHub does not run pull_request while a pull request conflicts + # with main, so a conflicting one gets no build (the pull request page still shows the conflict). + pull_request: branches: [ main ] types: [ opened, synchronize, reopened, ready_for_review ] paths-ignore: @@ -50,7 +55,7 @@ env: jobs: build: - if: ${{ github.event_name != 'pull_request_target' || !github.event.pull_request.draft }} + if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} runs-on: ubuntu-24.04 timeout-minutes: 45 steps: @@ -59,7 +64,7 @@ jobs: # the next step is to say so and show where. - uses: actions/checkout@v4 with: - ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || github.sha }} + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} # Full history: the merge below needs it (a shallow clone refuses to merge at all). fetch-depth: 0 @@ -79,7 +84,7 @@ jobs: fi - name: Merge onto main, or say what conflicts - if: github.event_name == 'pull_request_target' + if: github.event_name == 'pull_request' run: | set -uo pipefail git config user.name "ci" @@ -427,7 +432,7 @@ jobs: # build failed, the compiler's own errors with paths made short. Fork pull requests carry a # read-only token and cannot comment; the same text is in the run summary either way. - name: Report on the pull request - if: always() && github.event_name == 'pull_request_target' + if: always() && github.event_name == 'pull_request' continue-on-error: true env: GH_TOKEN: ${{ github.token }} @@ -447,7 +452,7 @@ jobs: success) echo "### Build passed" echo - echo "The apk is the \`droiddeck-apk\` artifact on [this run]($RUN_URL) (signed with the same test key as every build, so it installs over any other)." + echo "The apk is the \`droiddeck-apk\` artifact on [this run]($RUN_URL) A pull request's build is signed only with the public test key: it installs on a phone without an official DroidDeck. To install it over one, sign it with DroidDeck's key or ask for a test build of the branch." ;; failure) echo "### ERROR: Build failed" @@ -499,7 +504,7 @@ jobs: # the job that would hold the key never runs for it. The testkey apk above is unaffected. sign: needs: build - if: github.event_name != 'pull_request_target' + if: github.event_name != 'pull_request' # What sign.yml asks for; a called workflow never gets more than its caller gives it. permissions: contents: read diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index 73d92b3e09..e1e6498695 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -6,7 +6,7 @@ name: Sign APKs # signing-main builds of main # signing-branch builds of any other branch - waits for the owner's approval # release release.yml - main only, waits for the owner's approval -# Pull requests never get here (build.yml skips this for pull_request_target), so code from a pull +# Pull requests never get here (build.yml skips this for pull_request), so code from a pull # request can never be signed with the key or come near it. on: From 7ec1fad2d1c4af6c2dc8790764a0a80f37529e67 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 13:57:10 -0400 Subject: [PATCH 51/65] Progress log: PS1, controller focus, own signing key, CI hardening (2026-09-24) --- docs/progress-log.md | 74 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/docs/progress-log.md b/docs/progress-log.md index 82c55b60ae..9109c676b6 100644 --- a/docs/progress-log.md +++ b/docs/progress-log.md @@ -7,6 +7,57 @@ the timeline, then lessons and backlog. Companion to the README (what the app *d --- +## 2026-09-24 (afternoon) - main `94f9935`: PS1, controller focus, own signing key, CI hardening + +State: **main = `94f9935`** (PR #41 merge), main build run 36036219740 - the first one signed with +DroidDeck's own key (`droiddeck-signed-standard`). No tag, no release since 0.1.6. Device-tested on +the AYANEO Pocket FIT unless marked. **main is now protected** (below). + +- **PR #34 → `63d7051`, PR #38 → `c7998a8`** (`feat/duckstation`, `feat/duckstation-play`) - PS1 and the front end: + - **DuckStation like ARMSX2**: Player 1 on the controller, BIOS from `ROMs/psx/bios`, `psx` as the game + list, Vulkan, guide → pause menu, `-batch -bigpicture -fullscreen` from the rail. Crash Bandicoot and + Tekken 3 at 60 fps from the desktop and from the front end. + - **One tap to play**: DuckStation's and ARMSX2's first-time setup is answered for the user + (`SetupWizardIncomplete = false`); ARMSX2 names its BIOS dump itself (`[Filenames] BIOS`, a US dump + first, re-checked before every launch) - PCSX2 needs a named file, DuckStation finds one in its folder. + DuckStation no longer warns it cannot inhibit a screensaver (no `org.freedesktop.ScreenSaver` here). + - **One tile per disc**: a `.cue`/`.gdi`/`.m3u` hides the files it names (Tekken 3 showed 4×, one per + `(Track N).bin`); `bios`/`firmware` folders are skipped (the BIOS showed as a game). + - **Controller focus**: the rail item is outlined on open (an app starts in touch mode, where clickables + refuse focus - the app now asks for keyboard mode first); Right enters a page on its main button, + Left from the page's edge returns to the rail, Right again returns to the tile or button last used + (explicit tracking - `FocusRequester.saveFocusedChild` restored into the grid, not the tile); a page + opened from a tile takes focus on its main button (focus used to vanish with the tile and the next + press landed on Steam); Down from a page's buttons goes to the first tile. +- **PR #41 → `94f9935`** (`feat/release-signing`) - signing, file access, hardening before going public: + - **Own signing key** (RSA 4096, made on device by `tools/release/make-release-key.sh`, digest + `b241ea7d…5d3f0` in `keystore/release-signer.sha256`). Every build before it - 0.1.6 included - was + signed with the public AOSP testkey, so anyone could sign an "update" that installs over DroidDeck. + - **Hand-over** (APK Signature Scheme v3 rotation): v1/v2 by the testkey, v3 by our key with a lineage + testkey → ours, testkey rollback off, `--rotation-min-sdk-version 28`. Proven on the FIT with a throwaway + key and package: a 0.1.6-style install updates and keeps its data; an apk signed with the testkey alone + is refused; so is one with an attacker's own lineage from the testkey; an apk signed with our key alone + (what MT Manager / APK Tool M make) installs over a hand-over install and fresh, not over a testkey one. + - **CI**: `sign.yml` (reusable, a matrix job per package) runs after every non-pull-request build + (environment `signing-main` on main, `signing-branch` elsewhere; the key is an environment secret). + `release.yml` (dispatch, version) signs the exact Build APK artifact of a main commit as four packages: + `com.droiddeck.launcher`, `com.tencent.ig`, `com.antutu.benchmark.full`, `com.ludashi.benchmark` + (`tools/release/variants.txt`; the manifest rename also covers `.documents` and the `.home` task affinity). + - **Documents provider** (`files/AppFilesProvider.kt`): the app's data folder in Android's file picker + ("Open from" → DroidDeck, per-package title), confined to the data folder (a `../` id is refused, links + out of it are hidden), and deleting never follows a link. + - **Hardening**: pull requests build with `pull_request`, not `pull_request_target` (a pull request could + write the caches main's signed builds restore); a build fails if a private key file is committed; + `.gitignore` covers key files; **main is protected** - pull request + passing `build` + one approval, + no force-push or deletion, the owner can override for his own pull requests. History scanned before + going public: no secrets. + - Max and Kurt get the key (jks, p12, pk8 + x509.pem, lineage) with a password and three plain guides + (MT Manager / APK Tool M signing, the hand-over, how pull requests / test builds / releases work). +- **Also merged today** (Kurt): #20 Back shortcuts (session menu, Steam QAM), #24 build identity on the + launcher, #33 per-launch Android display choice, #35 CI build-cleanliness snapshot, #37 the split-D logo, + #40 faster held-stick navigation in the session drawer; (The412Banner) #32 stretch games to fill the + screen, Quake-engine titles windowed at the session's size. + ## 2026-09-24 - main `08a6769`: GPU desktop, emulators like PS3, ARMSX2, game art State: **main = `08a6769`** (PR #29 merge), main build run 35983098806, staged as `Download/DroidDeck-main-08a6769(-Genshin).apk`. No tag, no release since 0.1.6. **Device-tested on the AYANEO Pocket FIT** (Adreno 750) unless marked. @@ -218,12 +269,27 @@ State: **main = `90c7574`** (PR #14 merge), main build run 35895701784. No tag, - Verify an emulator's config values from its source: RPCS3's GUI says "Async Shader Recompiler", the config value is "Async Recompiler (multi-threaded)". - Upstream PCSX2 has no ARM64 recompiler; a correct ARM64 build of it is still interpreter-slow. +- An Android app starts in touch mode, where Compose clickables refuse focus: `requestFocus()` on open + does nothing until the app asks for keyboard input mode. +- `grep -q` (or `head`) at the end of a pipe exits early; under `pipefail` that fails the whole line at + random. Capture the output first, then search it. +- A reusable workflow gets no more permission than its caller gives, and sees environment secrets only + with `secrets: inherit`. A workflow naming an environment that does not exist creates it unprotected. +- `pull_request_target` shares main's caches with the pull request's code - never with signed builds. +- apksigner prints signers as "Signer #1", "Signer (minSdkVersion=…)" or "V3.0 Signer:" by version. ## Backlog / next -- Play-test the other emulators one by one on the FIT: DuckStation, Dolphin, Cemu, melonDS, - PPSSPP, RetroArch (pad profiles and covers exist; nothing played yet). +- Play-test the other emulators one by one on the FIT: Dolphin, Cemu, melonDS, PPSSPP, RetroArch + (pad profiles and covers exist; nothing played yet). DuckStation done 2026-09-24. +- **Kurt's PR #39 (Non-Launcher flavor) breaks signing as written**: it replaces the `droiddeck-apk` + artifact with `droiddeck-home-apk` / `droiddeck-non-launcher-apk`, which `sign.yml` and `release.yml` + read, and it conflicts with today's `build.yml`. Adapt before merging: sign both editions (a release + would then be editions × packages). +- After the repo is public: add a required reviewer to the `release` environment (not allowed on a + private repo on the Pro plan). +- First release with the new key (0.1.7): run `release.yml`, publish; 0.1.6 users move over by the + hand-over. - Keyboard Esc in a rail game does not reach ARMSX2's pause menu (guide does). -- Kurt's PR #20 (Back shortcuts) conflicts with main since the keyboard/drawer work - rebase. - 0.1.7 pre-release when ready (everything above is on main only). - Pin a newer ARMSX2 nightly only after testing it (it changes daily). - Device-prove 0.1.4 on the FIT (list above). @@ -235,4 +301,4 @@ State: **main = `90c7574`** (PR #14 merge), main build run 35895701784. No tag, actions. Device confirmation is still needed. - FlatOut shrink: try `vk_wsi_force_swapchain_to_current_extent=false` via `steamdeck-env`. - Max's stricter `winnative-directaudio` guards; `winnative-epic-launch` (a feature). -- Rename before anything truly public: "SteamDeck" is Valve's mark. +- Rename before anything truly public: "SteamDeck" is Valve's mark. (Done 2026-09-23: DroidDeck.) From 952c28316fff308de3e8ea6f1d866d72f5eca79c Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 14:39:20 -0400 Subject: [PATCH 52/65] Home screen: a switch in Setup (off by default) instead of a second apk --- app/src/main/AndroidManifest.xml | 5 ++++- .../java/com/droiddeck/launcher/HomeApp.kt | 19 +++++++++++++++++++ .../com/droiddeck/launcher/MainActivity.kt | 9 ++++++++- .../droiddeck/launcher/ui/FrontEndScreen.kt | 11 ++++++++++- 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dbd5b4ac62..0fe0362886 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,9 +55,12 @@ + Home launch either back into a running Steam session or to the regular front end. + Off until the user turns on "Use as a Home screen" (Setup): while it is disabled the + app is not a Home app at all - not offered, not in the "choose Home" list. --> = Build.VERSION_CODES.Q) { val roles = context.getSystemService(RoleManager::class.java) diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 0617fde309..1d50ac50ad 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -189,6 +189,7 @@ class MainActivity : ComponentActivity() { private var logsEnabled by mutableStateOf(true) private var showRoms by mutableStateOf(false) private var homeAppSelected by mutableStateOf(false) + private var homeScreenEnabled by mutableStateOf(false) private var defaultHomeLabel by mutableStateOf(null) private var androidApps by mutableStateOf>(emptyList()) private var secondScreenDisplays by mutableStateOf>(emptyList()) @@ -248,6 +249,7 @@ class MainActivity : ComponentActivity() { pageKey = sm?.let { "settings:$it" } ?: if (showPerformance) "performance" else if (showProtons) "protons" else null, theme = theme, isHomeApp = homeAppSelected, + homeScreenEnabled = homeScreenEnabled, defaultHomeLabel = defaultHomeLabel, androidApps = androidApps, secondScreenDisplays = secondScreenDisplays, @@ -318,6 +320,10 @@ class MainActivity : ComponentActivity() { onPageBack = { settingsMode = null; showPerformance = false; showProtons = false }, onTheme = { id -> SessionPrefs.setTheme(this, id); theme = id }, onHomeApp = { manageHomeApp() }, + onHomeScreen = { on -> + HomeApp.setHomeScreenEnabled(this, on) + refreshHomeAppState() + }, onAndroidApp = { app, displayId -> launchAndroidApp(app, displayId) }, onBackActionsInverted = { inverted -> SessionPrefs.setBackActionsInverted(this, inverted) @@ -401,7 +407,8 @@ class MainActivity : ComponentActivity() { } private fun refreshHomeAppState() { - homeAppSelected = HomeApp.isDefault(this) + homeScreenEnabled = HomeApp.isHomeScreenEnabled(this) + homeAppSelected = homeScreenEnabled && HomeApp.isDefault(this) defaultHomeLabel = HomeApp.defaultLabel(this) androidApps = if (homeAppSelected) HomeApp.launchableApps(this) else emptyList() } 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 0d355d5d93..5c73281b7c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -157,6 +157,7 @@ class FrontEndState( val pageKey: String? = null, val theme: String = Themes.PAPER, val isHomeApp: Boolean = false, + val homeScreenEnabled: Boolean = false, val defaultHomeLabel: String? = null, val androidApps: List = emptyList(), val secondScreenDisplays: List = emptyList(), @@ -195,6 +196,7 @@ class FrontEndActions( val onPageBack: () -> Unit = {}, val onTheme: (String) -> Unit = {}, val onHomeApp: () -> Unit = {}, + val onHomeScreen: (Boolean) -> Unit = {}, val onAndroidApp: (HomeApp.LaunchableApp, Int?) -> Unit = { _, _ -> }, val onBackActionsInverted: (Boolean) -> Unit = {}, val onCheckLatestBuild: () -> Unit = {}, @@ -972,7 +974,14 @@ private fun SetupPanel(s: FrontEndState, a: FrontEndActions) { } } } - ActionRow("Default Home app", s.defaultHomeLabel ?: "Choose a Home app", "Choose", a.onHomeApp) + ToggleRow( + host, "home-screen", "Use as a Home screen", + if (s.homeScreenEnabled) "DroidDeck can be the phone's Home app" else "Off: DroidDeck is never offered as a Home app", + s.homeScreenEnabled, + ) { a.onHomeScreen(it) } + if (s.homeScreenEnabled) { + ActionRow("Default Home app", s.defaultHomeLabel ?: "Choose a Home app", "Choose", a.onHomeApp) + } } } } From ff213de6c3665eeb7443850c55c2ad66db369d04 Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Thu, 24 Sep 2026 16:07:28 -0400 Subject: [PATCH 53/65] CI: publish each pull request's APK to DroidDeck-CI After a pull request's Build APK run succeeds, its APK is published as the pr- prerelease in Droid-Deck/DroidDeck-CI, named DroidDeck-PR.-.apk, with release notes taken from the pull request. New commits to the same pull request replace its APK. Pull requests from forks are resolved by head owner, branch and commit. A pull request's build is signed only with the committed testkey, so every CI build installs over the last; the publish checks the certificate against it and refuses anything else. Needs a DROIDDECK_CI_TOKEN secret: a fine-grained token with Contents read/write on Droid-Deck/DroidDeck-CI. Without it the run skips with a warning. --- .github/workflows/pr-release-publish.yml | 169 +++++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 .github/workflows/pr-release-publish.yml diff --git a/.github/workflows/pr-release-publish.yml b/.github/workflows/pr-release-publish.yml new file mode 100644 index 0000000000..7c327015b6 --- /dev/null +++ b/.github/workflows/pr-release-publish.yml @@ -0,0 +1,169 @@ +name: PR Release Publish + +on: + workflow_run: + workflows: + - Build APK + types: + - completed + +concurrency: + group: pr-release-${{ github.event.workflow_run.head_repository.full_name }}-${{ github.event.workflow_run.head_branch }} + cancel-in-progress: false + +permissions: {} + +jobs: + publish: + if: >- + github.event.workflow_run.conclusion == 'success' && + contains(fromJSON('["pull_request", "pull_request_target"]'), github.event.workflow_run.event) + runs-on: ubuntu-24.04 + permissions: + actions: read + pull-requests: read + env: + SOURCE_REPO: ${{ github.repository }} + TARGET_REPO: Droid-Deck/DroidDeck-CI + RUN_ID: ${{ github.event.workflow_run.id }} + HEAD_REPO: ${{ github.event.workflow_run.head_repository.full_name }} + HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }} + HEAD_SHA: ${{ github.event.workflow_run.head_sha }} + SIGNING_CERT_SHA256: a40da80a59d170caa950cf15c18c454d47a39b26989d8b640ecd745ba71bf5dc + steps: + - name: Resolve the pull request + id: scope + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CI_TOKEN: ${{ secrets.DROIDDECK_CI_TOKEN }} + RUN_PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }} + run: | + set -euo pipefail + if [ -z "$CI_TOKEN" ]; then + echo "::warning::DROIDDECK_CI_TOKEN is not set; nothing is published to $TARGET_REPO" + echo "allowed=false" >> "$GITHUB_OUTPUT" + exit 0 + fi + pr_number="$RUN_PR_NUMBER" + if [ -z "$pr_number" ]; then + head_owner=${HEAD_REPO%%/*} + pr_number=$(gh pr list --repo "$SOURCE_REPO" --state all --head "$HEAD_BRANCH" \ + --json number,headRefOid,headRepositoryOwner \ + --jq "map(select(.headRepositoryOwner.login == \"$head_owner\" and .headRefOid == \"$HEAD_SHA\")) | first | .number // \"\"") + fi + if [ -z "$pr_number" ]; then + echo "No pull request found for $HEAD_REPO $HEAD_BRANCH at $HEAD_SHA" + echo "allowed=false" >> "$GITHUB_OUTPUT" + exit 0 + fi + gh api "repos/$SOURCE_REPO/pulls/$pr_number" > pr.json + base_repo=$(jq -r '.base.repo.full_name // ""' pr.json) + pr_head=$(jq -r '.head.sha' pr.json) + if [ "$base_repo" != "$SOURCE_REPO" ]; then + echo "PR #$pr_number targets $base_repo, not $SOURCE_REPO" + echo "allowed=false" >> "$GITHUB_OUTPUT" + exit 0 + fi + if [ "$pr_head" != "$HEAD_SHA" ]; then + echo "PR #$pr_number has moved on to $pr_head; its own build publishes it" + echo "allowed=false" >> "$GITHUB_OUTPUT" + exit 0 + fi + short_sha=$(printf '%s' "$HEAD_SHA" | cut -c1-5) + { + echo "allowed=true" + echo "pr_number=$pr_number" + echo "tag=pr-$pr_number" + echo "apk=DroidDeck-PR.$pr_number-$short_sha.apk" + } >> "$GITHUB_OUTPUT" + + - name: Download the APK + if: steps.scope.outputs.allowed == 'true' + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + APK_NAME: ${{ steps.scope.outputs.apk }} + run: | + set -euo pipefail + gh run download "$RUN_ID" --repo "$SOURCE_REPO" --name droiddeck-apk --dir downloaded + found=$(find downloaded -name '*.apk') + test "$(printf '%s\n' "$found" | grep -c .)" = 1 + mkdir -p release-assets + mv "$found" "release-assets/$APK_NAME" + + - name: Check the signing key + if: steps.scope.outputs.allowed == 'true' + env: + APK_NAME: ${{ steps.scope.outputs.apk }} + run: | + set -euo pipefail + build_tools=$(find "$ANDROID_SDK_ROOT/build-tools" -mindepth 1 -maxdepth 1 -type d | sort -V | tail -1) + certs=$("$build_tools/apksigner" verify --print-certs "release-assets/$APK_NAME") + printf '%s\n' "$certs" + signers=$(printf '%s\n' "$certs" | grep -c 'certificate SHA-256 digest') + digest=$(printf '%s\n' "$certs" | sed -n 's/.*certificate SHA-256 digest: //p' | head -1) + if [ "$signers" != 1 ] || [ "$digest" != "$SIGNING_CERT_SHA256" ]; then + echo "::error::$APK_NAME is not signed with the CI key, so it would not install over earlier builds" + exit 1 + fi + + - name: Write the release notes + if: steps.scope.outputs.allowed == 'true' + id: notes + env: + PR_NUMBER: ${{ steps.scope.outputs.pr_number }} + APK_NAME: ${{ steps.scope.outputs.apk }} + run: | + set -euo pipefail + title=$(jq -r '.title' pr.json | tr '\r\n' ' ' | sed 's/[[:space:]]\+/ /g; s/ $//') + author=$(jq -r '.user.login // "unknown"' pr.json) + url=$(jq -r '.html_url' pr.json) + body=$(jq -r '.body // ""' pr.json) + head_ref=$(jq -r '.head.ref' pr.json) + echo "title=$title" >> "$GITHUB_OUTPUT" + { + printf '# PR #%s\n\n' "$PR_NUMBER" + printf 'Title: %s\n\n' "$title" + printf 'Author: @%s\n\n' "$author" + printf 'Source PR: %s\n' "$url" + printf 'Source branch: %s\n' "$head_ref" + printf 'Source commit: `%s`\n' "$HEAD_SHA" + printf 'Build workflow run: https://github.com/%s/actions/runs/%s\n\n' "$SOURCE_REPO" "$RUN_ID" + printf '## What This PR Is About\n\n' + if [ -n "$body" ]; then + printf '%s\n' "$body" + else + printf 'No PR description was provided.\n' + fi + printf '\n## Attached Artifacts\n\n' + printf -- '- %s\n' "$APK_NAME" + printf '\nBuilt from source commit `%s`, signed with the CI key (SHA-256 `%s`), so it installs over any other DroidDeck CI build.\n' \ + "$(printf '%s' "$HEAD_SHA" | cut -c1-5)" "$SIGNING_CERT_SHA256" + } > release-notes.md + + - name: Publish to DroidDeck-CI + if: steps.scope.outputs.allowed == 'true' + env: + GH_TOKEN: ${{ secrets.DROIDDECK_CI_TOKEN }} + PR_NUMBER: ${{ steps.scope.outputs.pr_number }} + TAG: ${{ steps.scope.outputs.tag }} + APK_NAME: ${{ steps.scope.outputs.apk }} + PR_TITLE: ${{ steps.notes.outputs.title }} + run: | + set -euo pipefail + title="PR #$PR_NUMBER: $PR_TITLE" + if view_out=$(gh api "repos/$TARGET_REPO/releases/tags/$TAG" 2>&1); then + gh release edit "$TAG" --repo "$TARGET_REPO" --title "$title" --notes-file release-notes.md --prerelease + elif printf '%s' "$view_out" | grep -qi 'Not Found'; then + gh release create "$TAG" --repo "$TARGET_REPO" --target main --title "$title" --notes-file release-notes.md --prerelease \ + || gh release edit "$TAG" --repo "$TARGET_REPO" --title "$title" --notes-file release-notes.md --prerelease + else + printf '%s\n' "$view_out" + exit 1 + fi + gh api "repos/$TARGET_REPO/releases/tags/$TAG" \ + --jq '.assets[] | select(.name | endswith(".apk")) | .id' | + while IFS= read -r asset_id; do + gh api --method DELETE "repos/$TARGET_REPO/releases/assets/$asset_id" >/dev/null + done + gh release upload "$TAG" "release-assets/$APK_NAME" --repo "$TARGET_REPO" --clobber + gh release view "$TAG" --repo "$TARGET_REPO" --json url --jq '"Published: \(.url)"' From b3794ffc20ac31c1129efd3b21ea8288313dd53d Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 16:37:31 -0400 Subject: [PATCH 54/65] Release 0.1.7 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7fa1adc1bc..dcc9db8519 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,8 +63,8 @@ android { // file out of its own data directory, and this app's entire job is to exec a rootfs: // proot, gamescope, the Steam client and everything it launches all live under files/. targetSdkVersion 28 - versionCode 7 - versionName "0.1.6" + versionCode 8 + versionName "0.1.7" buildConfigField "String", "BUILD_LABEL", "\"${escapedBuildLabel}\"" ndk { From cbb66ea1887f692b5e74b0ed686b64a0f6f28aab Mon Sep 17 00:00:00 2001 From: xXJSONDeruloXx Date: Thu, 24 Sep 2026 19:38:04 -0400 Subject: [PATCH 55/65] chore: harden release signing boundaries --- .github/workflows/build.yml | 11 +++++------ .github/workflows/release.yml | 4 ++-- .github/workflows/sign.yml | 6 ++---- tools/release/make-release-key.sh | 8 ++++---- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2377bf6d3..607cd6d495 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,6 +55,7 @@ env: jobs: build: + name: Build APK if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} runs-on: ubuntu-24.04 timeout-minutes: 45 @@ -498,20 +499,18 @@ jobs: # An apk is a zip already; compressing it again buys nothing and costs seconds. compression-level: 0 - # The apk signed with DroidDeck's own key (tools/release), so a test build installs over a release - # and keeps its data. Main's builds sign straight away (signing-main); any other branch's wait for - # the owner's approval (signing-branch). A pull request's never: its code is not ours to sign, and - # the job that would hold the key never runs for it. The testkey apk above is unaffected. + # Only main is signed with DroidDeck's private key. Pull requests and other branches keep the + # public AOSP testkey build, so unreviewed branch code never gets access to the release key. sign: needs: build - if: github.event_name != 'pull_request' + if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' # What sign.yml asks for; a called workflow never gets more than its caller gives it. permissions: contents: read actions: read uses: ./.github/workflows/sign.yml with: - environment: ${{ github.ref == 'refs/heads/main' && 'signing-main' || 'signing-branch' }} + environment: signing-main variants: '["standard"]' # The key is an environment secret; a called workflow sees secrets only when they are passed on. secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2106659c84..f9d705aed5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,8 +4,8 @@ run-name: release ${{ inputs.version }} from main ${{ github.sha }} # Every package of a release, signed with DroidDeck's own key: the standard app and the named ones # in tools/release/variants.txt, one matrix job each. Nothing is rebuilt - the apk is the one the # Build APK run of this exact main commit made (with its caches) and that was tested, so the -# release is those bytes. Waits for the owner's approval (the release environment); publishing the -# GitHub release stays a separate, manual step. +# release is those bytes. This workflow is manually dispatched from main; publishing the GitHub +# release stays a separate, manual step. on: workflow_dispatch: diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index e1e6498695..8f98ecc1e4 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -4,10 +4,8 @@ name: Sign APKs # one matrix job per package in tools/release/variants.txt (tools/release/sign-apk.sh does the work # and checks it). The key lives only in the GitHub environment named by the caller: # signing-main builds of main -# signing-branch builds of any other branch - waits for the owner's approval -# release release.yml - main only, waits for the owner's approval -# Pull requests never get here (build.yml skips this for pull_request), so code from a pull -# request can never be signed with the key or come near it. +# release manually dispatched release.yml from main +# Pull requests and other branches never call this workflow with the release key. on: workflow_call: diff --git a/tools/release/make-release-key.sh b/tools/release/make-release-key.sh index 96d423ae1c..cc1c241239 100755 --- a/tools/release/make-release-key.sh +++ b/tools/release/make-release-key.sh @@ -3,8 +3,8 @@ # # - The key is made on this device, in ~/droiddeck-release-key (outside the repo), with a long # random password written beside it. Nothing secret is printed. -# - The key and password go to GitHub as secrets of the three signing environments -# (signing-main, signing-branch, release). GitHub never shows a secret again. +# - The key and password go to GitHub as secrets of the two signing environments +# (signing-main and release). Branch builds and pull requests keep using the public test key. # - The key's certificate digest - public, not a secret - goes to keystore/release-signer.sha256, # which CI checks every signed apk against. That file is the only thing to commit. # @@ -12,8 +12,8 @@ # Without it no update can ever be signed for the people who installed a signed build. set -euo pipefail -REPO=The412Banner/DroidDeck -ENVIRONMENTS=(signing-main signing-branch release) +REPO=Droid-Deck/DroidDeck +ENVIRONMENTS=(signing-main release) ALIAS=droiddeck OUT=${DROIDDECK_KEY_DIR:-$HOME/droiddeck-release-key} here=$(cd "$(dirname "$0")" && pwd) From 31cea4e0e355c07ee39f225316587a7c95ce6c45 Mon Sep 17 00:00:00 2001 From: xXJSONDeruloXx Date: Thu, 24 Sep 2026 20:08:33 -0400 Subject: [PATCH 56/65] Gate release-signed PR APKs on maintainer approval --- .github/workflows/build.yml | 2 +- .github/workflows/pr-release-publish.yml | 363 ++++++++++++++--------- .github/workflows/sign.yml | 3 +- 3 files changed, 229 insertions(+), 139 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 607cd6d495..228ef26f72 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -453,7 +453,7 @@ jobs: success) echo "### Build passed" echo - echo "The apk is the \`droiddeck-apk\` artifact on [this run]($RUN_URL) A pull request's build is signed only with the public test key: it installs on a phone without an official DroidDeck. To install it over one, sign it with DroidDeck's key or ask for a test build of the branch." + echo "The unprivileged apk is the \`droiddeck-apk\` artifact on [this run]($RUN_URL), signed with the public test key. After a maintainer approves this exact commit and CI is green, a maintainer can run **PR Release Publish** from \`main\` with this PR number. That workflow signs the artifact with the release identity, checks that its versionCode matches main's stable baseline, and publishes it for in-place update testing. The release key is never available to this PR build." ;; failure) echo "### ERROR: Build failed" diff --git a/.github/workflows/pr-release-publish.yml b/.github/workflows/pr-release-publish.yml index 7c327015b6..1b9e7f04a3 100644 --- a/.github/workflows/pr-release-publish.yml +++ b/.github/workflows/pr-release-publish.yml @@ -1,169 +1,258 @@ name: PR Release Publish +run-name: sign PR #${{ inputs.pr_number }} with the release key +# This is deliberately manual and exists on main. PR CI builds without secrets. A maintainer +# dispatches this workflow after reviewing the PR; it checks that the current head has a fresh +# maintainer approval and a successful Build APK run before it calls the release signer. on: - workflow_run: - workflows: - - Build APK - types: - - completed + workflow_dispatch: + inputs: + pr_number: + description: Open, approved pull request to sign and publish + required: true + type: number + +permissions: + actions: read + contents: read + pull-requests: read concurrency: - group: pr-release-${{ github.event.workflow_run.head_repository.full_name }}-${{ github.event.workflow_run.head_branch }} + group: pr-release-${{ inputs.pr_number }} cancel-in-progress: false -permissions: {} - jobs: - publish: - if: >- - github.event.workflow_run.conclusion == 'success' && - contains(fromJSON('["pull_request", "pull_request_target"]'), github.event.workflow_run.event) + authorize: + name: verify maintainer approval and PR build + if: github.ref == 'refs/heads/main' runs-on: ubuntu-24.04 + timeout-minutes: 10 + outputs: + run_id: ${{ steps.authorize.outputs.run_id }} + pr_number: ${{ steps.authorize.outputs.pr_number }} + head_sha: ${{ steps.authorize.outputs.head_sha }} + label: ${{ steps.authorize.outputs.label }} + apk_name: ${{ steps.authorize.outputs.apk_name }} + steps: + - uses: actions/checkout@v4 + with: + ref: main + persist-credentials: false + + - name: Authorize this exact PR revision + id: authorize + env: + GH_TOKEN: ${{ github.token }} + PR_NUMBER: ${{ inputs.pr_number }} + run: | + set -euo pipefail + [[ "$GITHUB_REF" == refs/heads/main ]] || { echo "::error::Run this workflow from main"; exit 1; } + [[ "$PR_NUMBER" =~ ^[1-9][0-9]*$ ]] || { echo "::error::PR number must be a positive integer"; exit 1; } + + pr=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER") + state=$(jq -r '.state' <<<"$pr") + draft=$(jq -r '.draft' <<<"$pr") + base_ref=$(jq -r '.base.ref' <<<"$pr") + base_sha=$(jq -r '.base.sha' <<<"$pr") + head_sha=$(jq -r '.head.sha' <<<"$pr") + [[ "$state" == open && "$draft" == false && "$base_ref" == main ]] || { + echo "::error::PR #$PR_NUMBER must be open, ready for review, and target main"; exit 1; + } + + # Branch protection requires an approval. Repeat the check here so manually dispatching + # this workflow cannot bypass it. The review must approve this exact head commit, and the + # reviewer must be a repository owner, member, or collaborator with review access. + decision=$(gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json reviewDecision --jq '.reviewDecision') + [[ "$decision" == APPROVED ]] || { + echo "::error::PR #$PR_NUMBER does not currently have its required approving review"; exit 1; + } + reviews=$(gh api --paginate --slurp "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER/reviews?per_page=100" | jq 'add') + maintainer_approvals=$(jq --arg sha "$head_sha" ' + [ .[] + | select(.commit_id == $sha) + | select(.author_association == "OWNER" or .author_association == "MEMBER" or .author_association == "COLLABORATOR") + | { login: .user.login, state: .state, submitted_at: .submitted_at } + ] + | sort_by(.submitted_at) + | group_by(.login) + | map(last) + | map(select(.state == "APPROVED")) + | length + ' <<<"$reviews") + (( maintainer_approvals > 0 )) || { + echo "::error::No maintainer has approved the current PR commit $head_sha"; exit 1; + } + + # Find the newest PR CI run for this commit. A newer failed or in-progress run prevents + # signing even if an older attempt for the same commit passed. + runs=$(gh run list --repo "$GITHUB_REPOSITORY" --workflow build.yml \ + --event pull_request --commit "$head_sha" \ + --json databaseId,headSha,status,conclusion,attempt,createdAt -L 100) + latest=$(jq -ce --arg sha "$head_sha" ' + [ .[] | select(.headSha == $sha) ] + | sort_by([.createdAt, .attempt]) + | last + ' <<<"$runs") + [[ $(jq -r '.status' <<<"$latest") == completed && $(jq -r '.conclusion' <<<"$latest") == success ]] || { + echo "::error::The latest Build APK run for this PR commit is not green"; exit 1; + } + run_id=$(jq -r '.databaseId' <<<"$latest") + run=$(gh api "repos/$GITHUB_REPOSITORY/actions/runs/$run_id") + run_pr=$(jq -ce --argjson number "$PR_NUMBER" ' + [ .pull_requests[]? | select(.number == $number) ] | first + ' <<<"$run") + [[ $(jq -r '.event' <<<"$run") == pull_request && \ + $(jq -r '.head_sha' <<<"$run") == "$head_sha" && \ + $(jq -r '.status' <<<"$run") == completed && \ + $(jq -r '.conclusion' <<<"$run") == success && \ + $(jq -r '.head.sha' <<<"$run_pr") == "$head_sha" && \ + $(jq -r '.base.ref' <<<"$run_pr") == main && \ + $(jq -r '.base.sha' <<<"$run_pr") == "$base_sha" ]] || { + echo "::error::The successful CI artifact is not for the current PR head and base"; exit 1; + } + + # Keep test builds at main's current stable versionCode so stable and PR builds can be + # installed over one another. A code bump belongs in a release, not in this test APK. + sdk=${ANDROID_HOME:-${ANDROID_SDK_ROOT:-}} + [[ -n "$sdk" && -d "$sdk/build-tools" ]] || { echo "::error::Android build-tools are unavailable"; exit 1; } + build_tools=$(find "$sdk/build-tools" -mindepth 1 -maxdepth 1 -type d | sort -V | tail -1) + expected_code=$(sed -nE 's/^[[:space:]]*versionCode[[:space:]]+([0-9]+).*$/\1/p' app/build.gradle | head -1) + [[ "$expected_code" =~ ^[0-9]+$ ]] || { echo "::error::Could not read main's versionCode"; exit 1; } + mkdir -p "$RUNNER_TEMP/pr-apk" + gh run download "$run_id" --repo "$GITHUB_REPOSITORY" --name droiddeck-apk --dir "$RUNNER_TEMP/pr-apk" + mapfile -t apks < <(find "$RUNNER_TEMP/pr-apk" -type f -name '*.apk' -print) + [[ ${#apks[@]} -eq 1 ]] || { echo "::error::Expected exactly one APK in droiddeck-apk"; exit 1; } + badging=$("$build_tools/aapt" dump badging "${apks[0]}") + apk_package=$(sed -n "s/^package: name='\\([^']*\\)'.*/\\1/p" <<<"$badging") + apk_code=$(sed -n "s/^package:.*versionCode='\\([^']*\\)'.*/\\1/p" <<<"$badging") + [[ "$apk_package" == com.droiddeck.launcher ]] || { + echo "::error::Expected the standard package, got '$apk_package'"; exit 1; + } + [[ "$apk_code" == "$expected_code" ]] || { + echo "::error::PR APK versionCode $apk_code differs from main's stable baseline $expected_code; keep PR builds at the stable code so testers can switch back in place"; exit 1; + } + + # Close the race with a new push/base update while approval and CI were being checked. + latest_pr=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER") + [[ $(jq -r '.state' <<<"$latest_pr") == open && \ + $(jq -r '.head.sha' <<<"$latest_pr") == "$head_sha" && \ + $(jq -r '.base.sha' <<<"$latest_pr") == "$base_sha" ]] || { + echo "::error::The PR changed while authorization was being checked; wait for fresh approval and CI"; exit 1; + } + + short_sha=${head_sha:0:7} + label="PR-$PR_NUMBER-$short_sha" + apk_name="DroidDeck-$label.apk" + { + echo "run_id=$run_id" + echo "pr_number=$PR_NUMBER" + echo "head_sha=$head_sha" + echo "label=$label" + echo "apk_name=$apk_name" + } >> "$GITHUB_OUTPUT" + { + echo "### Authorized PR signing" + echo + printf 'PR #%s at %s has an approving maintainer review and a green Build APK run (%s).\n' "$PR_NUMBER" "$short_sha" "$run_id" + printf 'The APK versionCode matches the main stable baseline (%s).\n' "$expected_code" + } >> "$GITHUB_STEP_SUMMARY" + + sign: + name: sign with the release identity + needs: authorize + if: needs.authorize.result == 'success' + uses: ./.github/workflows/sign.yml + with: + environment: signing-main + variants: '["standard"]' + run_id: ${{ needs.authorize.outputs.run_id }} + label: ${{ needs.authorize.outputs.label }} + artifact: droiddeck-pr-signed + secrets: inherit + + publish: + name: publish the approved PR APK + needs: [authorize, sign] + if: needs.authorize.result == 'success' && needs.sign.result == 'success' + runs-on: ubuntu-24.04 + timeout-minutes: 10 permissions: actions: read + contents: read pull-requests: read - env: - SOURCE_REPO: ${{ github.repository }} - TARGET_REPO: Droid-Deck/DroidDeck-CI - RUN_ID: ${{ github.event.workflow_run.id }} - HEAD_REPO: ${{ github.event.workflow_run.head_repository.full_name }} - HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }} - HEAD_SHA: ${{ github.event.workflow_run.head_sha }} - SIGNING_CERT_SHA256: a40da80a59d170caa950cf15c18c454d47a39b26989d8b640ecd745ba71bf5dc steps: - - name: Resolve the pull request - id: scope - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CI_TOKEN: ${{ secrets.DROIDDECK_CI_TOKEN }} - RUN_PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }} - run: | - set -euo pipefail - if [ -z "$CI_TOKEN" ]; then - echo "::warning::DROIDDECK_CI_TOKEN is not set; nothing is published to $TARGET_REPO" - echo "allowed=false" >> "$GITHUB_OUTPUT" - exit 0 - fi - pr_number="$RUN_PR_NUMBER" - if [ -z "$pr_number" ]; then - head_owner=${HEAD_REPO%%/*} - pr_number=$(gh pr list --repo "$SOURCE_REPO" --state all --head "$HEAD_BRANCH" \ - --json number,headRefOid,headRepositoryOwner \ - --jq "map(select(.headRepositoryOwner.login == \"$head_owner\" and .headRefOid == \"$HEAD_SHA\")) | first | .number // \"\"") - fi - if [ -z "$pr_number" ]; then - echo "No pull request found for $HEAD_REPO $HEAD_BRANCH at $HEAD_SHA" - echo "allowed=false" >> "$GITHUB_OUTPUT" - exit 0 - fi - gh api "repos/$SOURCE_REPO/pulls/$pr_number" > pr.json - base_repo=$(jq -r '.base.repo.full_name // ""' pr.json) - pr_head=$(jq -r '.head.sha' pr.json) - if [ "$base_repo" != "$SOURCE_REPO" ]; then - echo "PR #$pr_number targets $base_repo, not $SOURCE_REPO" - echo "allowed=false" >> "$GITHUB_OUTPUT" - exit 0 - fi - if [ "$pr_head" != "$HEAD_SHA" ]; then - echo "PR #$pr_number has moved on to $pr_head; its own build publishes it" - echo "allowed=false" >> "$GITHUB_OUTPUT" - exit 0 - fi - short_sha=$(printf '%s' "$HEAD_SHA" | cut -c1-5) - { - echo "allowed=true" - echo "pr_number=$pr_number" - echo "tag=pr-$pr_number" - echo "apk=DroidDeck-PR.$pr_number-$short_sha.apk" - } >> "$GITHUB_OUTPUT" + - uses: actions/checkout@v4 + with: + ref: main + persist-credentials: false - - name: Download the APK - if: steps.scope.outputs.allowed == 'true' - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - APK_NAME: ${{ steps.scope.outputs.apk }} - run: | - set -euo pipefail - gh run download "$RUN_ID" --repo "$SOURCE_REPO" --name droiddeck-apk --dir downloaded - found=$(find downloaded -name '*.apk') - test "$(printf '%s\n' "$found" | grep -c .)" = 1 - mkdir -p release-assets - mv "$found" "release-assets/$APK_NAME" + - uses: actions/download-artifact@v4 + with: + name: droiddeck-pr-signed-standard + path: signed - - name: Check the signing key - if: steps.scope.outputs.allowed == 'true' + - name: Verify the release signer and checksum env: - APK_NAME: ${{ steps.scope.outputs.apk }} + EXPECTED_SHA256: b241ea7d7e8180e2e58a8a2cc6e819eedc36eff5a0a04f382a34cabba4b5d3f0 + APK_NAME: ${{ needs.authorize.outputs.apk_name }} run: | set -euo pipefail - build_tools=$(find "$ANDROID_SDK_ROOT/build-tools" -mindepth 1 -maxdepth 1 -type d | sort -V | tail -1) - certs=$("$build_tools/apksigner" verify --print-certs "release-assets/$APK_NAME") - printf '%s\n' "$certs" - signers=$(printf '%s\n' "$certs" | grep -c 'certificate SHA-256 digest') - digest=$(printf '%s\n' "$certs" | sed -n 's/.*certificate SHA-256 digest: //p' | head -1) - if [ "$signers" != 1 ] || [ "$digest" != "$SIGNING_CERT_SHA256" ]; then - echo "::error::$APK_NAME is not signed with the CI key, so it would not install over earlier builds" - exit 1 + apk="signed/$APK_NAME" + test -s "$apk" || { echo "::error::Signed APK is missing: $APK_NAME"; exit 1; } + sdk=${ANDROID_HOME:-${ANDROID_SDK_ROOT:-}} + [[ -n "$sdk" && -d "$sdk/build-tools" ]] || { echo "::error::Android build-tools are unavailable"; exit 1; } + tools=$(find "$sdk/build-tools" -mindepth 1 -maxdepth 1 -type d | sort -V | tail -1) + certs=$("$tools/apksigner" verify --min-sdk-version 28 --print-certs "$apk") + digest=$(sed -n 's/.*certificate SHA-256 digest: //p' <<<"$certs" | sort -u) + [[ "$digest" == "$EXPECTED_SHA256" ]] || { + printf '%s\n' "$certs" >&2 + echo "::error::PR APK is not signed with the release certificate"; exit 1; + } + (cd signed && sha256sum -- "$APK_NAME" > SHA256SUMS.txt) + cat signed/SHA256SUMS.txt + + - name: Publish to DroidDeck-CI when its token is configured + env: + GH_TOKEN: ${{ secrets.DROIDDECK_CI_TOKEN }} + PR_NUMBER: ${{ needs.authorize.outputs.pr_number }} + HEAD_SHA: ${{ needs.authorize.outputs.head_sha }} + APK_NAME: ${{ needs.authorize.outputs.apk_name }} + SOURCE_REPO: ${{ github.repository }} + TARGET_REPO: Droid-Deck/DroidDeck-CI + SIGNING_CERT_SHA256: b241ea7d7e8180e2e58a8a2cc6e819eedc36eff5a0a04f382a34cabba4b5d3f0 + run: | + set -euo pipefail + if [ -z "$GH_TOKEN" ]; then + echo "::warning::DROIDDECK_CI_TOKEN is not configured; the release-signed APK remains available as this workflow run's artifact" + exit 0 fi - - - name: Write the release notes - if: steps.scope.outputs.allowed == 'true' - id: notes - env: - PR_NUMBER: ${{ steps.scope.outputs.pr_number }} - APK_NAME: ${{ steps.scope.outputs.apk }} - run: | - set -euo pipefail - title=$(jq -r '.title' pr.json | tr '\r\n' ' ' | sed 's/[[:space:]]\+/ /g; s/ $//') - author=$(jq -r '.user.login // "unknown"' pr.json) - url=$(jq -r '.html_url' pr.json) - body=$(jq -r '.body // ""' pr.json) - head_ref=$(jq -r '.head.ref' pr.json) - echo "title=$title" >> "$GITHUB_OUTPUT" + pr=$(gh api "repos/$SOURCE_REPO/pulls/$PR_NUMBER") + title=$(jq -r '.title' <<<"$pr" | tr '\r\n' ' ' | sed 's/[[:space:]]\+/ /g; s/ $//') + url=$(jq -r '.html_url' <<<"$pr") + tag="pr-$PR_NUMBER" + notes=$(mktemp) + trap 'rm -f "$notes"' EXIT { printf '# PR #%s\n\n' "$PR_NUMBER" printf 'Title: %s\n\n' "$title" - printf 'Author: @%s\n\n' "$author" printf 'Source PR: %s\n' "$url" - printf 'Source branch: %s\n' "$head_ref" - printf 'Source commit: `%s`\n' "$HEAD_SHA" - printf 'Build workflow run: https://github.com/%s/actions/runs/%s\n\n' "$SOURCE_REPO" "$RUN_ID" - printf '## What This PR Is About\n\n' - if [ -n "$body" ]; then - printf '%s\n' "$body" - else - printf 'No PR description was provided.\n' - fi - printf '\n## Attached Artifacts\n\n' - printf -- '- %s\n' "$APK_NAME" - printf '\nBuilt from source commit `%s`, signed with the CI key (SHA-256 `%s`), so it installs over any other DroidDeck CI build.\n' \ - "$(printf '%s' "$HEAD_SHA" | cut -c1-5)" "$SIGNING_CERT_SHA256" - } > release-notes.md - - - name: Publish to DroidDeck-CI - if: steps.scope.outputs.allowed == 'true' - env: - GH_TOKEN: ${{ secrets.DROIDDECK_CI_TOKEN }} - PR_NUMBER: ${{ steps.scope.outputs.pr_number }} - TAG: ${{ steps.scope.outputs.tag }} - APK_NAME: ${{ steps.scope.outputs.apk }} - PR_TITLE: ${{ steps.notes.outputs.title }} - run: | - set -euo pipefail - title="PR #$PR_NUMBER: $PR_TITLE" - if view_out=$(gh api "repos/$TARGET_REPO/releases/tags/$TAG" 2>&1); then - gh release edit "$TAG" --repo "$TARGET_REPO" --title "$title" --notes-file release-notes.md --prerelease + printf "Source commit: \`%s\`\n" "$HEAD_SHA" + printf "Signed with DroidDeck release certificate SHA-256 \`%s\`.\n" "$SIGNING_CERT_SHA256" + printf 'This is a review-approved test build. Back up app data before installing test builds.\n' + } > "$notes" + if view_out=$(gh api "repos/$TARGET_REPO/releases/tags/$tag" 2>&1); then + gh release edit "$tag" --repo "$TARGET_REPO" --title "PR #$PR_NUMBER: $title" --notes-file "$notes" --prerelease elif printf '%s' "$view_out" | grep -qi 'Not Found'; then - gh release create "$TAG" --repo "$TARGET_REPO" --target main --title "$title" --notes-file release-notes.md --prerelease \ - || gh release edit "$TAG" --repo "$TARGET_REPO" --title "$title" --notes-file release-notes.md --prerelease + gh release create "$tag" --repo "$TARGET_REPO" --target main \ + --title "PR #$PR_NUMBER: $title" --notes-file "$notes" --prerelease else printf '%s\n' "$view_out" exit 1 fi - gh api "repos/$TARGET_REPO/releases/tags/$TAG" \ + gh api "repos/$TARGET_REPO/releases/tags/$tag" \ --jq '.assets[] | select(.name | endswith(".apk")) | .id' | while IFS= read -r asset_id; do gh api --method DELETE "repos/$TARGET_REPO/releases/assets/$asset_id" >/dev/null done - gh release upload "$TAG" "release-assets/$APK_NAME" --repo "$TARGET_REPO" --clobber - gh release view "$TAG" --repo "$TARGET_REPO" --json url --jq '"Published: \(.url)"' + gh release upload "$tag" "signed/$APK_NAME" "signed/SHA256SUMS.txt" --repo "$TARGET_REPO" --clobber + gh release view "$tag" --repo "$TARGET_REPO" --json url --jq '"Published: \(.url)"' diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index 8f98ecc1e4..01d72c111b 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -5,7 +5,8 @@ name: Sign APKs # and checks it). The key lives only in the GitHub environment named by the caller: # signing-main builds of main # release manually dispatched release.yml from main -# Pull requests and other branches never call this workflow with the release key. +# PR CI stays test-key-only. The main-only PR Release Publish workflow may call this after it checks +# for an approving maintainer review, green CI, the exact current PR commit, and the stable versionCode. on: workflow_call: From 7aa56118aecf0d2df167a85bbb7818554ac8d647 Mon Sep 17 00:00:00 2001 From: xXJSONDeruloXx Date: Thu, 24 Sep 2026 20:13:40 -0400 Subject: [PATCH 57/65] Require repo write access for signing approvals --- .github/workflows/pr-release-publish.yml | 55 +++++++++++++----------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/.github/workflows/pr-release-publish.yml b/.github/workflows/pr-release-publish.yml index 1b9e7f04a3..165cec0cd0 100644 --- a/.github/workflows/pr-release-publish.yml +++ b/.github/workflows/pr-release-publish.yml @@ -59,30 +59,6 @@ jobs: echo "::error::PR #$PR_NUMBER must be open, ready for review, and target main"; exit 1; } - # Branch protection requires an approval. Repeat the check here so manually dispatching - # this workflow cannot bypass it. The review must approve this exact head commit, and the - # reviewer must be a repository owner, member, or collaborator with review access. - decision=$(gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json reviewDecision --jq '.reviewDecision') - [[ "$decision" == APPROVED ]] || { - echo "::error::PR #$PR_NUMBER does not currently have its required approving review"; exit 1; - } - reviews=$(gh api --paginate --slurp "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER/reviews?per_page=100" | jq 'add') - maintainer_approvals=$(jq --arg sha "$head_sha" ' - [ .[] - | select(.commit_id == $sha) - | select(.author_association == "OWNER" or .author_association == "MEMBER" or .author_association == "COLLABORATOR") - | { login: .user.login, state: .state, submitted_at: .submitted_at } - ] - | sort_by(.submitted_at) - | group_by(.login) - | map(last) - | map(select(.state == "APPROVED")) - | length - ' <<<"$reviews") - (( maintainer_approvals > 0 )) || { - echo "::error::No maintainer has approved the current PR commit $head_sha"; exit 1; - } - # Find the newest PR CI run for this commit. A newer failed or in-progress run prevents # signing even if an older attempt for the same commit passed. runs=$(gh run list --repo "$GITHUB_REPOSITORY" --workflow build.yml \ @@ -140,6 +116,37 @@ jobs: echo "::error::The PR changed while authorization was being checked; wait for fresh approval and CI"; exit 1; } + # Check approval after the build and artifact checks, as close as possible to signing. + # The reviewer must approve this exact head commit and have write or admin access. + decision=$(gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json reviewDecision --jq '.reviewDecision') + [[ "$decision" == APPROVED ]] || { + echo "::error::PR #$PR_NUMBER does not currently have its required approving review"; exit 1; + } + reviews=$(gh api --paginate --slurp "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER/reviews?per_page=100" | jq 'add') + approved_reviewers=$(jq -r --arg sha "$head_sha" ' + [ .[] + | select(.commit_id == $sha) + | { login: .user.login, state: .state, submitted_at: .submitted_at } + ] + | sort_by(.submitted_at) + | group_by(.login) + | map(last) + | map(select(.state == "APPROVED")) + | .[].login + ' <<<"$reviews") + maintainer_approved=false + while IFS= read -r reviewer; do + [[ "$reviewer" =~ ^[A-Za-z0-9-]{1,39}$ ]] || continue + if permission=$(gh api "repos/$GITHUB_REPOSITORY/collaborators/$reviewer/permission" --jq '.permission' 2>/dev/null); then + case "$permission" in + write|admin) maintainer_approved=true ;; + esac + fi + done <<<"$approved_reviewers" + [[ "$maintainer_approved" == true ]] || { + echo "::error::No reviewer with write or admin access has approved the current PR commit $head_sha"; exit 1; + } + short_sha=${head_sha:0:7} label="PR-$PR_NUMBER-$short_sha" apk_name="DroidDeck-$label.apk" From 2a0f85970183b87c9c1dff4a707fe429a2332a39 Mon Sep 17 00:00:00 2001 From: xXJSONDeruloXx Date: Thu, 24 Sep 2026 20:16:28 -0400 Subject: [PATCH 58/65] Use the pinned release signer for PR APKs --- .github/workflows/build.yml | 5 +++-- .github/workflows/pr-release-publish.yml | 11 +++++++---- .github/workflows/sign.yml | 6 +++--- tools/release/make-release-key.sh | 3 ++- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 228ef26f72..b2bebb92a0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -499,8 +499,9 @@ jobs: # An apk is a zip already; compressing it again buys nothing and costs seconds. compression-level: 0 - # Only main is signed with DroidDeck's private key. Pull requests and other branches keep the - # public AOSP testkey build, so unreviewed branch code never gets access to the release key. + # This workflow signs only main. PR build jobs keep using the public AOSP test key; the separate + # main-only approval workflow can later sign an approved PR artifact without running PR code with + # the release key. sign: needs: build if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' diff --git a/.github/workflows/pr-release-publish.yml b/.github/workflows/pr-release-publish.yml index 165cec0cd0..439cbb1b24 100644 --- a/.github/workflows/pr-release-publish.yml +++ b/.github/workflows/pr-release-publish.yml @@ -200,18 +200,21 @@ jobs: - name: Verify the release signer and checksum env: - EXPECTED_SHA256: b241ea7d7e8180e2e58a8a2cc6e819eedc36eff5a0a04f382a34cabba4b5d3f0 APK_NAME: ${{ needs.authorize.outputs.apk_name }} run: | set -euo pipefail apk="signed/$APK_NAME" test -s "$apk" || { echo "::error::Signed APK is missing: $APK_NAME"; exit 1; } + expected_sha256=$(tr -d '[:space:]' < keystore/release-signer.sha256) + [[ "$expected_sha256" =~ ^[[:xdigit:]]{64}$ ]] || { + echo "::error::keystore/release-signer.sha256 is not a SHA-256 digest"; exit 1; + } sdk=${ANDROID_HOME:-${ANDROID_SDK_ROOT:-}} [[ -n "$sdk" && -d "$sdk/build-tools" ]] || { echo "::error::Android build-tools are unavailable"; exit 1; } tools=$(find "$sdk/build-tools" -mindepth 1 -maxdepth 1 -type d | sort -V | tail -1) certs=$("$tools/apksigner" verify --min-sdk-version 28 --print-certs "$apk") digest=$(sed -n 's/.*certificate SHA-256 digest: //p' <<<"$certs" | sort -u) - [[ "$digest" == "$EXPECTED_SHA256" ]] || { + [[ "$digest" == "$expected_sha256" ]] || { printf '%s\n' "$certs" >&2 echo "::error::PR APK is not signed with the release certificate"; exit 1; } @@ -226,7 +229,6 @@ jobs: APK_NAME: ${{ needs.authorize.outputs.apk_name }} SOURCE_REPO: ${{ github.repository }} TARGET_REPO: Droid-Deck/DroidDeck-CI - SIGNING_CERT_SHA256: b241ea7d7e8180e2e58a8a2cc6e819eedc36eff5a0a04f382a34cabba4b5d3f0 run: | set -euo pipefail if [ -z "$GH_TOKEN" ]; then @@ -236,6 +238,7 @@ jobs: pr=$(gh api "repos/$SOURCE_REPO/pulls/$PR_NUMBER") title=$(jq -r '.title' <<<"$pr" | tr '\r\n' ' ' | sed 's/[[:space:]]\+/ /g; s/ $//') url=$(jq -r '.html_url' <<<"$pr") + signing_cert_sha256=$(tr -d '[:space:]' < keystore/release-signer.sha256) tag="pr-$PR_NUMBER" notes=$(mktemp) trap 'rm -f "$notes"' EXIT @@ -244,7 +247,7 @@ jobs: printf 'Title: %s\n\n' "$title" printf 'Source PR: %s\n' "$url" printf "Source commit: \`%s\`\n" "$HEAD_SHA" - printf "Signed with DroidDeck release certificate SHA-256 \`%s\`.\n" "$SIGNING_CERT_SHA256" + printf "Signed with DroidDeck release certificate SHA-256 \`%s\`.\n" "$signing_cert_sha256" printf 'This is a review-approved test build. Back up app data before installing test builds.\n' } > "$notes" if view_out=$(gh api "repos/$TARGET_REPO/releases/tags/$tag" 2>&1); then diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index 01d72c111b..7445e2adf7 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -3,10 +3,10 @@ name: Sign APKs # Called, never run by itself: turns a "Build APK" apk into packages signed with DroidDeck's own key, # one matrix job per package in tools/release/variants.txt (tools/release/sign-apk.sh does the work # and checks it). The key lives only in the GitHub environment named by the caller: -# signing-main builds of main +# signing-main main builds and maintainer-approved PR artifacts # release manually dispatched release.yml from main -# PR CI stays test-key-only. The main-only PR Release Publish workflow may call this after it checks -# for an approving maintainer review, green CI, the exact current PR commit, and the stable versionCode. +# PR Build APK jobs stay test-key-only. PR Release Publish calls this from main only after approval, +# green CI, the exact current commit, and the stable versionCode have been checked. on: workflow_call: diff --git a/tools/release/make-release-key.sh b/tools/release/make-release-key.sh index cc1c241239..b707d833ba 100755 --- a/tools/release/make-release-key.sh +++ b/tools/release/make-release-key.sh @@ -4,7 +4,8 @@ # - The key is made on this device, in ~/droiddeck-release-key (outside the repo), with a long # random password written beside it. Nothing secret is printed. # - The key and password go to GitHub as secrets of the two signing environments -# (signing-main and release). Branch builds and pull requests keep using the public test key. +# (signing-main and release). PR build jobs use the public test key; a separate workflow signs +# an approved PR artifact from main. # - The key's certificate digest - public, not a secret - goes to keystore/release-signer.sha256, # which CI checks every signed apk against. That file is the only thing to commit. # From 097f56cd6c60a39d9b0d6263025dcc2811edc505 Mon Sep 17 00:00:00 2001 From: xXJSONDeruloXx Date: Thu, 24 Sep 2026 20:19:14 -0400 Subject: [PATCH 59/65] Match PR APK version to latest stable --- .github/workflows/build.yml | 2 +- .github/workflows/pr-release-publish.yml | 45 ++++++++++++++---------- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2bebb92a0..87621846a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -453,7 +453,7 @@ jobs: success) echo "### Build passed" echo - echo "The unprivileged apk is the \`droiddeck-apk\` artifact on [this run]($RUN_URL), signed with the public test key. After a maintainer approves this exact commit and CI is green, a maintainer can run **PR Release Publish** from \`main\` with this PR number. That workflow signs the artifact with the release identity, checks that its versionCode matches main's stable baseline, and publishes it for in-place update testing. The release key is never available to this PR build." + echo "The unprivileged apk is the \`droiddeck-apk\` artifact on [this run]($RUN_URL), signed with the public test key. After a maintainer approves this exact commit and CI is green, a maintainer can run **PR Release Publish** from \`main\` with this PR number. That workflow signs the artifact with the release identity, checks that its versionCode matches the latest stable release, and publishes it for in-place update testing. The release key is never available to this PR build." ;; failure) echo "### ERROR: Build failed" diff --git a/.github/workflows/pr-release-publish.yml b/.github/workflows/pr-release-publish.yml index 439cbb1b24..db1b1e5bb8 100644 --- a/.github/workflows/pr-release-publish.yml +++ b/.github/workflows/pr-release-publish.yml @@ -87,13 +87,25 @@ jobs: echo "::error::The successful CI artifact is not for the current PR head and base"; exit 1; } - # Keep test builds at main's current stable versionCode so stable and PR builds can be - # installed over one another. A code bump belongs in a release, not in this test APK. + # Use the last public stable APK as the versionCode baseline. Main can be ahead of the + # shipped release, but testers still need to switch back to that release in place. sdk=${ANDROID_HOME:-${ANDROID_SDK_ROOT:-}} [[ -n "$sdk" && -d "$sdk/build-tools" ]] || { echo "::error::Android build-tools are unavailable"; exit 1; } build_tools=$(find "$sdk/build-tools" -mindepth 1 -maxdepth 1 -type d | sort -V | tail -1) - expected_code=$(sed -nE 's/^[[:space:]]*versionCode[[:space:]]+([0-9]+).*$/\1/p' app/build.gradle | head -1) - [[ "$expected_code" =~ ^[0-9]+$ ]] || { echo "::error::Could not read main's versionCode"; exit 1; } + stable_repo=The412Banner/DroidDeck + stable_tag=$(gh api "repos/$stable_repo/releases/latest" --jq '.tag_name') + [[ "$stable_tag" =~ ^[0-9A-Za-z._-]+$ ]] || { echo "::error::Could not identify the latest stable release"; exit 1; } + mkdir -p "$RUNNER_TEMP/stable-apk" + gh release download "$stable_tag" --repo "$stable_repo" \ + --pattern "DroidDeck-$stable_tag.apk" --dir "$RUNNER_TEMP/stable-apk" + stable_apk="$RUNNER_TEMP/stable-apk/DroidDeck-$stable_tag.apk" + test -s "$stable_apk" || { echo "::error::The latest stable release has no standard APK"; exit 1; } + stable_badging=$("$build_tools/aapt" dump badging "$stable_apk") + stable_package=$(sed -n "s/^package: name='\\([^']*\\)'.*/\\1/p" <<<"$stable_badging") + expected_code=$(sed -n "s/^package:.*versionCode='\\([^']*\\)'.*/\\1/p" <<<"$stable_badging") + [[ "$stable_package" == com.droiddeck.launcher && "$expected_code" =~ ^[0-9]+$ ]] || { + echo "::error::Could not read the standard package and versionCode from stable release $stable_tag"; exit 1; + } mkdir -p "$RUNNER_TEMP/pr-apk" gh run download "$run_id" --repo "$GITHUB_REPOSITORY" --name droiddeck-apk --dir "$RUNNER_TEMP/pr-apk" mapfile -t apks < <(find "$RUNNER_TEMP/pr-apk" -type f -name '*.apk' -print) @@ -105,23 +117,11 @@ jobs: echo "::error::Expected the standard package, got '$apk_package'"; exit 1; } [[ "$apk_code" == "$expected_code" ]] || { - echo "::error::PR APK versionCode $apk_code differs from main's stable baseline $expected_code; keep PR builds at the stable code so testers can switch back in place"; exit 1; - } - - # Close the race with a new push/base update while approval and CI were being checked. - latest_pr=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER") - [[ $(jq -r '.state' <<<"$latest_pr") == open && \ - $(jq -r '.head.sha' <<<"$latest_pr") == "$head_sha" && \ - $(jq -r '.base.sha' <<<"$latest_pr") == "$base_sha" ]] || { - echo "::error::The PR changed while authorization was being checked; wait for fresh approval and CI"; exit 1; + echo "::error::PR APK versionCode $apk_code differs from stable release $stable_tag versionCode $expected_code; keep PR builds at the stable code so testers can switch back in place"; exit 1; } # Check approval after the build and artifact checks, as close as possible to signing. # The reviewer must approve this exact head commit and have write or admin access. - decision=$(gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json reviewDecision --jq '.reviewDecision') - [[ "$decision" == APPROVED ]] || { - echo "::error::PR #$PR_NUMBER does not currently have its required approving review"; exit 1; - } reviews=$(gh api --paginate --slurp "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER/reviews?per_page=100" | jq 'add') approved_reviewers=$(jq -r --arg sha "$head_sha" ' [ .[] @@ -146,6 +146,15 @@ jobs: [[ "$maintainer_approved" == true ]] || { echo "::error::No reviewer with write or admin access has approved the current PR commit $head_sha"; exit 1; } + # Re-read PR head, base, and review decision after the permission lookups. + latest_pr=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER") + decision=$(gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json reviewDecision --jq '.reviewDecision') + [[ $(jq -r '.state' <<<"$latest_pr") == open && \ + $(jq -r '.head.sha' <<<"$latest_pr") == "$head_sha" && \ + $(jq -r '.base.sha' <<<"$latest_pr") == "$base_sha" && \ + "$decision" == APPROVED ]] || { + echo "::error::The PR or its approval changed while authorization was being checked"; exit 1; + } short_sha=${head_sha:0:7} label="PR-$PR_NUMBER-$short_sha" @@ -161,7 +170,7 @@ jobs: echo "### Authorized PR signing" echo printf 'PR #%s at %s has an approving maintainer review and a green Build APK run (%s).\n' "$PR_NUMBER" "$short_sha" "$run_id" - printf 'The APK versionCode matches the main stable baseline (%s).\n' "$expected_code" + printf 'The APK versionCode matches stable release %s (%s).\n' "$stable_tag" "$expected_code" } >> "$GITHUB_STEP_SUMMARY" sign: From 6d4fc6775c52a0f3b57f60a92966269b93a9d0ed Mon Sep 17 00:00:00 2001 From: xXJSONDeruloXx Date: Thu, 24 Sep 2026 20:22:36 -0400 Subject: [PATCH 60/65] Preserve the current PR APK until upload succeeds --- .github/workflows/pr-release-publish.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr-release-publish.yml b/.github/workflows/pr-release-publish.yml index db1b1e5bb8..be35d690c7 100644 --- a/.github/workflows/pr-release-publish.yml +++ b/.github/workflows/pr-release-publish.yml @@ -157,7 +157,7 @@ jobs: } short_sha=${head_sha:0:7} - label="PR-$PR_NUMBER-$short_sha" + label="PR.$PR_NUMBER-$short_sha" apk_name="DroidDeck-$label.apk" { echo "run_id=$run_id" @@ -248,6 +248,7 @@ jobs: title=$(jq -r '.title' <<<"$pr" | tr '\r\n' ' ' | sed 's/[[:space:]]\+/ /g; s/ $//') url=$(jq -r '.html_url' <<<"$pr") signing_cert_sha256=$(tr -d '[:space:]' < keystore/release-signer.sha256) + apk_sha256=$(awk 'NR == 1 { print $1 }' signed/SHA256SUMS.txt) tag="pr-$PR_NUMBER" notes=$(mktemp) trap 'rm -f "$notes"' EXIT @@ -256,11 +257,12 @@ jobs: printf 'Title: %s\n\n' "$title" printf 'Source PR: %s\n' "$url" printf "Source commit: \`%s\`\n" "$HEAD_SHA" + printf "APK SHA-256: \`%s\`\n" "$apk_sha256" printf "Signed with DroidDeck release certificate SHA-256 \`%s\`.\n" "$signing_cert_sha256" printf 'This is a review-approved test build. Back up app data before installing test builds.\n' } > "$notes" if view_out=$(gh api "repos/$TARGET_REPO/releases/tags/$tag" 2>&1); then - gh release edit "$tag" --repo "$TARGET_REPO" --title "PR #$PR_NUMBER: $title" --notes-file "$notes" --prerelease + : elif printf '%s' "$view_out" | grep -qi 'Not Found'; then gh release create "$tag" --repo "$TARGET_REPO" --target main \ --title "PR #$PR_NUMBER: $title" --notes-file "$notes" --prerelease @@ -268,10 +270,11 @@ jobs: printf '%s\n' "$view_out" exit 1 fi - gh api "repos/$TARGET_REPO/releases/tags/$tag" \ - --jq '.assets[] | select(.name | endswith(".apk")) | .id' | + gh release upload "$tag" "signed/$APK_NAME" --repo "$TARGET_REPO" --clobber + gh release edit "$tag" --repo "$TARGET_REPO" --title "PR #$PR_NUMBER: $title" --notes-file "$notes" --prerelease + gh api "repos/$TARGET_REPO/releases/tags/$tag" | + jq -r --arg keep "$APK_NAME" '.assets[] | select(.name | endswith(".apk")) | select(.name != $keep) | .id' | while IFS= read -r asset_id; do gh api --method DELETE "repos/$TARGET_REPO/releases/assets/$asset_id" >/dev/null done - gh release upload "$tag" "signed/$APK_NAME" "signed/SHA256SUMS.txt" --repo "$TARGET_REPO" --clobber gh release view "$tag" --repo "$TARGET_REPO" --json url --jq '"Published: \(.url)"' From 98066f85ef6f3445a3b4ccc1cd14b0b072be71ba Mon Sep 17 00:00:00 2001 From: xXJSONDeruloXx Date: Thu, 24 Sep 2026 20:45:25 -0400 Subject: [PATCH 61/65] Simplify approved PR signing workflow --- .github/workflows/build.yml | 6 +- .github/workflows/pr-release-publish.yml | 282 +++++++---------------- .github/workflows/sign.yml | 9 +- tools/release/make-release-key.sh | 5 +- 4 files changed, 83 insertions(+), 219 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87621846a5..b1af540899 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -453,7 +453,7 @@ jobs: success) echo "### Build passed" echo - echo "The unprivileged apk is the \`droiddeck-apk\` artifact on [this run]($RUN_URL), signed with the public test key. After a maintainer approves this exact commit and CI is green, a maintainer can run **PR Release Publish** from \`main\` with this PR number. That workflow signs the artifact with the release identity, checks that its versionCode matches the latest stable release, and publishes it for in-place update testing. The release key is never available to this PR build." + echo "The \`droiddeck-apk\` artifact is [on this run]($RUN_URL), signed with the public test key. After approval, a maintainer can run **PR Release Publish** from \`main\` to create an APK that installs over the release." ;; failure) echo "### ERROR: Build failed" @@ -499,9 +499,7 @@ jobs: # An apk is a zip already; compressing it again buys nothing and costs seconds. compression-level: 0 - # This workflow signs only main. PR build jobs keep using the public AOSP test key; the separate - # main-only approval workflow can later sign an approved PR artifact without running PR code with - # the release key. + # PR builds use the test key; only main calls the release signer. sign: needs: build if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' diff --git a/.github/workflows/pr-release-publish.yml b/.github/workflows/pr-release-publish.yml index be35d690c7..2b74c6495f 100644 --- a/.github/workflows/pr-release-publish.yml +++ b/.github/workflows/pr-release-publish.yml @@ -1,14 +1,11 @@ name: PR Release Publish run-name: sign PR #${{ inputs.pr_number }} with the release key -# This is deliberately manual and exists on main. PR CI builds without secrets. A maintainer -# dispatches this workflow after reviewing the PR; it checks that the current head has a fresh -# maintainer approval and a successful Build APK run before it calls the release signer. on: workflow_dispatch: inputs: pr_number: - description: Open, approved pull request to sign and publish + description: Open, approved pull request required: true type: number @@ -23,160 +20,87 @@ concurrency: jobs: authorize: - name: verify maintainer approval and PR build if: github.ref == 'refs/heads/main' runs-on: ubuntu-24.04 - timeout-minutes: 10 outputs: - run_id: ${{ steps.authorize.outputs.run_id }} - pr_number: ${{ steps.authorize.outputs.pr_number }} - head_sha: ${{ steps.authorize.outputs.head_sha }} - label: ${{ steps.authorize.outputs.label }} - apk_name: ${{ steps.authorize.outputs.apk_name }} + run_id: ${{ steps.gate.outputs.run_id }} + head_sha: ${{ steps.gate.outputs.head_sha }} + label: ${{ steps.gate.outputs.label }} steps: - - uses: actions/checkout@v4 - with: - ref: main - persist-credentials: false - - - name: Authorize this exact PR revision - id: authorize + - name: Check the PR, review, and build + id: gate env: GH_TOKEN: ${{ github.token }} PR_NUMBER: ${{ inputs.pr_number }} run: | set -euo pipefail - [[ "$GITHUB_REF" == refs/heads/main ]] || { echo "::error::Run this workflow from main"; exit 1; } - [[ "$PR_NUMBER" =~ ^[1-9][0-9]*$ ]] || { echo "::error::PR number must be a positive integer"; exit 1; } - pr=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER") - state=$(jq -r '.state' <<<"$pr") - draft=$(jq -r '.draft' <<<"$pr") - base_ref=$(jq -r '.base.ref' <<<"$pr") - base_sha=$(jq -r '.base.sha' <<<"$pr") - head_sha=$(jq -r '.head.sha' <<<"$pr") - [[ "$state" == open && "$draft" == false && "$base_ref" == main ]] || { - echo "::error::PR #$PR_NUMBER must be open, ready for review, and target main"; exit 1; - } + jq -e '.state == "open" and .draft == false and .base.ref == "main"' <<<"$pr" >/dev/null + head=$(jq -r '.head.sha' <<<"$pr") + base=$(jq -r '.base.sha' <<<"$pr") - # Find the newest PR CI run for this commit. A newer failed or in-progress run prevents - # signing even if an older attempt for the same commit passed. - runs=$(gh run list --repo "$GITHUB_REPOSITORY" --workflow build.yml \ - --event pull_request --commit "$head_sha" \ - --json databaseId,headSha,status,conclusion,attempt,createdAt -L 100) - latest=$(jq -ce --arg sha "$head_sha" ' - [ .[] | select(.headSha == $sha) ] - | sort_by([.createdAt, .attempt]) - | last - ' <<<"$runs") - [[ $(jq -r '.status' <<<"$latest") == completed && $(jq -r '.conclusion' <<<"$latest") == success ]] || { - echo "::error::The latest Build APK run for this PR commit is not green"; exit 1; - } - run_id=$(jq -r '.databaseId' <<<"$latest") + run_id=$(gh run list -R "$GITHUB_REPOSITORY" --workflow build.yml \ + --event pull_request --commit "$head" \ + --json databaseId,headSha,status,conclusion,createdAt,attempt -L 100 | + jq -r --arg head "$head" '[.[] | select(.headSha == $head)] | + sort_by([.createdAt, .attempt]) | last | + select(.status == "completed" and .conclusion == "success") | .databaseId // empty') + [[ -n "$run_id" ]] || { echo '::error::The latest PR build is not green'; exit 1; } run=$(gh api "repos/$GITHUB_REPOSITORY/actions/runs/$run_id") - run_pr=$(jq -ce --argjson number "$PR_NUMBER" ' - [ .pull_requests[]? | select(.number == $number) ] | first - ' <<<"$run") - [[ $(jq -r '.event' <<<"$run") == pull_request && \ - $(jq -r '.head_sha' <<<"$run") == "$head_sha" && \ - $(jq -r '.status' <<<"$run") == completed && \ - $(jq -r '.conclusion' <<<"$run") == success && \ - $(jq -r '.head.sha' <<<"$run_pr") == "$head_sha" && \ - $(jq -r '.base.ref' <<<"$run_pr") == main && \ - $(jq -r '.base.sha' <<<"$run_pr") == "$base_sha" ]] || { - echo "::error::The successful CI artifact is not for the current PR head and base"; exit 1; - } + jq -e --arg head "$head" --arg base "$base" --argjson number "$PR_NUMBER" ' + .event == "pull_request" and .head_sha == $head and .conclusion == "success" and + any(.pull_requests[]?; .number == $number and .head.sha == $head and .base.sha == $base) + ' <<<"$run" >/dev/null - # Use the last public stable APK as the versionCode baseline. Main can be ahead of the - # shipped release, but testers still need to switch back to that release in place. - sdk=${ANDROID_HOME:-${ANDROID_SDK_ROOT:-}} - [[ -n "$sdk" && -d "$sdk/build-tools" ]] || { echo "::error::Android build-tools are unavailable"; exit 1; } - build_tools=$(find "$sdk/build-tools" -mindepth 1 -maxdepth 1 -type d | sort -V | tail -1) - stable_repo=The412Banner/DroidDeck - stable_tag=$(gh api "repos/$stable_repo/releases/latest" --jq '.tag_name') - [[ "$stable_tag" =~ ^[0-9A-Za-z._-]+$ ]] || { echo "::error::Could not identify the latest stable release"; exit 1; } - mkdir -p "$RUNNER_TEMP/stable-apk" - gh release download "$stable_tag" --repo "$stable_repo" \ - --pattern "DroidDeck-$stable_tag.apk" --dir "$RUNNER_TEMP/stable-apk" - stable_apk="$RUNNER_TEMP/stable-apk/DroidDeck-$stable_tag.apk" - test -s "$stable_apk" || { echo "::error::The latest stable release has no standard APK"; exit 1; } - stable_badging=$("$build_tools/aapt" dump badging "$stable_apk") - stable_package=$(sed -n "s/^package: name='\\([^']*\\)'.*/\\1/p" <<<"$stable_badging") - expected_code=$(sed -n "s/^package:.*versionCode='\\([^']*\\)'.*/\\1/p" <<<"$stable_badging") - [[ "$stable_package" == com.droiddeck.launcher && "$expected_code" =~ ^[0-9]+$ ]] || { - echo "::error::Could not read the standard package and versionCode from stable release $stable_tag"; exit 1; - } - mkdir -p "$RUNNER_TEMP/pr-apk" - gh run download "$run_id" --repo "$GITHUB_REPOSITORY" --name droiddeck-apk --dir "$RUNNER_TEMP/pr-apk" - mapfile -t apks < <(find "$RUNNER_TEMP/pr-apk" -type f -name '*.apk' -print) - [[ ${#apks[@]} -eq 1 ]] || { echo "::error::Expected exactly one APK in droiddeck-apk"; exit 1; } - badging=$("$build_tools/aapt" dump badging "${apks[0]}") - apk_package=$(sed -n "s/^package: name='\\([^']*\\)'.*/\\1/p" <<<"$badging") - apk_code=$(sed -n "s/^package:.*versionCode='\\([^']*\\)'.*/\\1/p" <<<"$badging") - [[ "$apk_package" == com.droiddeck.launcher ]] || { - echo "::error::Expected the standard package, got '$apk_package'"; exit 1; - } - [[ "$apk_code" == "$expected_code" ]] || { - echo "::error::PR APK versionCode $apk_code differs from stable release $stable_tag versionCode $expected_code; keep PR builds at the stable code so testers can switch back in place"; exit 1; - } - - # Check approval after the build and artifact checks, as close as possible to signing. - # The reviewer must approve this exact head commit and have write or admin access. - reviews=$(gh api --paginate --slurp "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER/reviews?per_page=100" | jq 'add') - approved_reviewers=$(jq -r --arg sha "$head_sha" ' - [ .[] - | select(.commit_id == $sha) - | { login: .user.login, state: .state, submitted_at: .submitted_at } - ] - | sort_by(.submitted_at) - | group_by(.login) - | map(last) - | map(select(.state == "APPROVED")) - | .[].login - ' <<<"$reviews") + approved=$(gh api --paginate --slurp \ + "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER/reviews?per_page=100" | + jq -r --arg head "$head" '[.[][] | select(.commit_id == $head)] | + group_by(.user.login) | map(max_by(.id)) | .[] | + select(.state == "APPROVED") | .user.login') maintainer_approved=false while IFS= read -r reviewer; do - [[ "$reviewer" =~ ^[A-Za-z0-9-]{1,39}$ ]] || continue - if permission=$(gh api "repos/$GITHUB_REPOSITORY/collaborators/$reviewer/permission" --jq '.permission' 2>/dev/null); then - case "$permission" in - write|admin) maintainer_approved=true ;; - esac - fi - done <<<"$approved_reviewers" - [[ "$maintainer_approved" == true ]] || { - echo "::error::No reviewer with write or admin access has approved the current PR commit $head_sha"; exit 1; + [[ -n "$reviewer" ]] || continue + permission=$(gh api "repos/$GITHUB_REPOSITORY/collaborators/$reviewer/permission" --jq .permission) + [[ "$permission" == write || "$permission" == admin ]] && maintainer_approved=true + done <<<"$approved" + [[ "$maintainer_approved" == true ]] || { echo '::error::A maintainer must approve this commit'; exit 1; } + + # PR builds use the public test key. Keep their versionCode at the shipped release + # so testers can install the stable APK over a signed PR build. + sdk=${ANDROID_HOME:-${ANDROID_SDK_ROOT:-}} + tools=$(find "$sdk/build-tools" -mindepth 1 -maxdepth 1 -type d | sort -V | tail -1) + stable_tag=$(gh api repos/The412Banner/DroidDeck/releases/latest --jq .tag_name) + mkdir -p "$RUNNER_TEMP/stable" "$RUNNER_TEMP/pr" + gh release download "$stable_tag" -R The412Banner/DroidDeck \ + -p "DroidDeck-$stable_tag.apk" -D "$RUNNER_TEMP/stable" + gh run download "$run_id" -R "$GITHUB_REPOSITORY" -n droiddeck-apk -D "$RUNNER_TEMP/pr" + mapfile -t apks < <(find "$RUNNER_TEMP/pr" -type f -name '*.apk') + [[ ${#apks[@]} == 1 ]] || { echo '::error::Expected one PR APK'; exit 1; } + package_line() { + "$tools/aapt" dump badging "$1" | sed -n "s/^package: name='\\([^']*\\)' versionCode='\\([^']*\\)'.*/\\1 \\2/p" } - # Re-read PR head, base, and review decision after the permission lookups. - latest_pr=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER") - decision=$(gh pr view "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --json reviewDecision --jq '.reviewDecision') - [[ $(jq -r '.state' <<<"$latest_pr") == open && \ - $(jq -r '.head.sha' <<<"$latest_pr") == "$head_sha" && \ - $(jq -r '.base.sha' <<<"$latest_pr") == "$base_sha" && \ - "$decision" == APPROVED ]] || { - echo "::error::The PR or its approval changed while authorization was being checked"; exit 1; + stable=$(package_line "$RUNNER_TEMP/stable/DroidDeck-$stable_tag.apk") + candidate=$(package_line "${apks[0]}") + [[ "$stable" =~ ^com\.droiddeck\.launcher\ [0-9]+$ && "$candidate" == "$stable" ]] || { + echo "::error::PR package/versionCode '$candidate' differs from stable '$stable'"; exit 1; } - short_sha=${head_sha:0:7} - label="PR.$PR_NUMBER-$short_sha" - apk_name="DroidDeck-$label.apk" + current=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER") + jq -e --arg head "$head" --arg base "$base" ' + .state == "open" and .draft == false and .base.ref == "main" and + .head.sha == $head and .base.sha == $base + ' <<<"$current" >/dev/null + [[ $(gh pr view "$PR_NUMBER" -R "$GITHUB_REPOSITORY" --json reviewDecision --jq .reviewDecision) == APPROVED ]] || { + echo '::error::The current PR revision still needs approval'; exit 1; + } { echo "run_id=$run_id" - echo "pr_number=$PR_NUMBER" - echo "head_sha=$head_sha" - echo "label=$label" - echo "apk_name=$apk_name" + echo "head_sha=$head" + echo "label=PR.$PR_NUMBER-${head:0:7}" } >> "$GITHUB_OUTPUT" - { - echo "### Authorized PR signing" - echo - printf 'PR #%s at %s has an approving maintainer review and a green Build APK run (%s).\n' "$PR_NUMBER" "$short_sha" "$run_id" - printf 'The APK versionCode matches stable release %s (%s).\n' "$stable_tag" "$expected_code" - } >> "$GITHUB_STEP_SUMMARY" sign: - name: sign with the release identity needs: authorize - if: needs.authorize.result == 'success' uses: ./.github/workflows/sign.yml with: environment: signing-main @@ -187,94 +111,42 @@ jobs: secrets: inherit publish: - name: publish the approved PR APK needs: [authorize, sign] - if: needs.authorize.result == 'success' && needs.sign.result == 'success' runs-on: ubuntu-24.04 - timeout-minutes: 10 permissions: actions: read contents: read - pull-requests: read steps: - - uses: actions/checkout@v4 - with: - ref: main - persist-credentials: false - - uses: actions/download-artifact@v4 with: name: droiddeck-pr-signed-standard path: signed - - - name: Verify the release signer and checksum - env: - APK_NAME: ${{ needs.authorize.outputs.apk_name }} - run: | - set -euo pipefail - apk="signed/$APK_NAME" - test -s "$apk" || { echo "::error::Signed APK is missing: $APK_NAME"; exit 1; } - expected_sha256=$(tr -d '[:space:]' < keystore/release-signer.sha256) - [[ "$expected_sha256" =~ ^[[:xdigit:]]{64}$ ]] || { - echo "::error::keystore/release-signer.sha256 is not a SHA-256 digest"; exit 1; - } - sdk=${ANDROID_HOME:-${ANDROID_SDK_ROOT:-}} - [[ -n "$sdk" && -d "$sdk/build-tools" ]] || { echo "::error::Android build-tools are unavailable"; exit 1; } - tools=$(find "$sdk/build-tools" -mindepth 1 -maxdepth 1 -type d | sort -V | tail -1) - certs=$("$tools/apksigner" verify --min-sdk-version 28 --print-certs "$apk") - digest=$(sed -n 's/.*certificate SHA-256 digest: //p' <<<"$certs" | sort -u) - [[ "$digest" == "$expected_sha256" ]] || { - printf '%s\n' "$certs" >&2 - echo "::error::PR APK is not signed with the release certificate"; exit 1; - } - (cd signed && sha256sum -- "$APK_NAME" > SHA256SUMS.txt) - cat signed/SHA256SUMS.txt - - - name: Publish to DroidDeck-CI when its token is configured + - name: Publish to DroidDeck-CI when configured env: GH_TOKEN: ${{ secrets.DROIDDECK_CI_TOKEN }} - PR_NUMBER: ${{ needs.authorize.outputs.pr_number }} + PR_NUMBER: ${{ inputs.pr_number }} HEAD_SHA: ${{ needs.authorize.outputs.head_sha }} - APK_NAME: ${{ needs.authorize.outputs.apk_name }} - SOURCE_REPO: ${{ github.repository }} - TARGET_REPO: Droid-Deck/DroidDeck-CI + LABEL: ${{ needs.authorize.outputs.label }} run: | set -euo pipefail - if [ -z "$GH_TOKEN" ]; then - echo "::warning::DROIDDECK_CI_TOKEN is not configured; the release-signed APK remains available as this workflow run's artifact" + if [[ -z "$GH_TOKEN" ]]; then + echo '::warning::No CI token; download the signed APK from this run' exit 0 fi - pr=$(gh api "repos/$SOURCE_REPO/pulls/$PR_NUMBER") - title=$(jq -r '.title' <<<"$pr" | tr '\r\n' ' ' | sed 's/[[:space:]]\+/ /g; s/ $//') - url=$(jq -r '.html_url' <<<"$pr") - signing_cert_sha256=$(tr -d '[:space:]' < keystore/release-signer.sha256) - apk_sha256=$(awk 'NR == 1 { print $1 }' signed/SHA256SUMS.txt) + repo=Droid-Deck/DroidDeck-CI tag="pr-$PR_NUMBER" - notes=$(mktemp) - trap 'rm -f "$notes"' EXIT - { - printf '# PR #%s\n\n' "$PR_NUMBER" - printf 'Title: %s\n\n' "$title" - printf 'Source PR: %s\n' "$url" - printf "Source commit: \`%s\`\n" "$HEAD_SHA" - printf "APK SHA-256: \`%s\`\n" "$apk_sha256" - printf "Signed with DroidDeck release certificate SHA-256 \`%s\`.\n" "$signing_cert_sha256" - printf 'This is a review-approved test build. Back up app data before installing test builds.\n' - } > "$notes" - if view_out=$(gh api "repos/$TARGET_REPO/releases/tags/$tag" 2>&1); then - : - elif printf '%s' "$view_out" | grep -qi 'Not Found'; then - gh release create "$tag" --repo "$TARGET_REPO" --target main \ - --title "PR #$PR_NUMBER: $title" --notes-file "$notes" --prerelease - else - printf '%s\n' "$view_out" - exit 1 + apk="DroidDeck-$LABEL.apk" + sha=$(sha256sum "signed/$apk" | cut -d ' ' -f 1) + notes="Source: https://github.com/$GITHUB_REPOSITORY/pull/$PR_NUMBER + Commit: $HEAD_SHA + APK SHA-256: $sha" + if ! gh release view "$tag" -R "$repo" >/dev/null 2>&1; then + gh release create "$tag" -R "$repo" --target main --title "PR #$PR_NUMBER" --notes "$notes" --prerelease fi - gh release upload "$tag" "signed/$APK_NAME" --repo "$TARGET_REPO" --clobber - gh release edit "$tag" --repo "$TARGET_REPO" --title "PR #$PR_NUMBER: $title" --notes-file "$notes" --prerelease - gh api "repos/$TARGET_REPO/releases/tags/$tag" | - jq -r --arg keep "$APK_NAME" '.assets[] | select(.name | endswith(".apk")) | select(.name != $keep) | .id' | - while IFS= read -r asset_id; do - gh api --method DELETE "repos/$TARGET_REPO/releases/assets/$asset_id" >/dev/null + gh release upload "$tag" "signed/$apk" -R "$repo" --clobber + gh release edit "$tag" -R "$repo" --title "PR #$PR_NUMBER" --notes "$notes" --prerelease + gh api "repos/$repo/releases/tags/$tag" | + jq -r --arg keep "$apk" '.assets[] | select(.name | endswith(".apk")) | select(.name != $keep) | .id' | + while IFS= read -r id; do + gh api --method DELETE "repos/$repo/releases/assets/$id" >/dev/null done - gh release view "$tag" --repo "$TARGET_REPO" --json url --jq '"Published: \(.url)"' diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index 7445e2adf7..9d630c529f 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -1,12 +1,7 @@ name: Sign APKs -# Called, never run by itself: turns a "Build APK" apk into packages signed with DroidDeck's own key, -# one matrix job per package in tools/release/variants.txt (tools/release/sign-apk.sh does the work -# and checks it). The key lives only in the GitHub environment named by the caller: -# signing-main main builds and maintainer-approved PR artifacts -# release manually dispatched release.yml from main -# PR Build APK jobs stay test-key-only. PR Release Publish calls this from main only after approval, -# green CI, the exact current commit, and the stable versionCode have been checked. +# Called from main to sign builds, approved PR artifacts, and releases. The key lives in +# the caller's protected environment; PR build jobs use only the public test key. on: workflow_call: diff --git a/tools/release/make-release-key.sh b/tools/release/make-release-key.sh index b707d833ba..680fcab913 100755 --- a/tools/release/make-release-key.sh +++ b/tools/release/make-release-key.sh @@ -3,9 +3,8 @@ # # - The key is made on this device, in ~/droiddeck-release-key (outside the repo), with a long # random password written beside it. Nothing secret is printed. -# - The key and password go to GitHub as secrets of the two signing environments -# (signing-main and release). PR build jobs use the public test key; a separate workflow signs -# an approved PR artifact from main. +# - The key and password are secrets in the signing-main and release environments. +# PR build jobs use only the public test key. # - The key's certificate digest - public, not a secret - goes to keystore/release-signer.sha256, # which CI checks every signed apk against. That file is the only thing to commit. # From 67b675066f0ae68863ea64d40b17472e3a068e57 Mon Sep 17 00:00:00 2001 From: xXJSONDeruloXx Date: Thu, 24 Sep 2026 21:01:35 -0400 Subject: [PATCH 62/65] Trim workflow commentary and redundant build output --- .github/workflows/build.yml | 108 ----------------------- .github/workflows/pr-release-publish.yml | 2 - .github/workflows/release.yml | 8 -- .github/workflows/sign.yml | 4 - 4 files changed, 122 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b1af540899..81068f159f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,35 +1,13 @@ name: Build APK run-name: ${{ github.event_name == 'pull_request' && format('building pr {0} on {1}', github.event.pull_request.number, github.event.pull_request.head.sha) || format('building {0} on {1}', github.ref_name, github.sha) }} -# One job: the two glibc preload libraries the session needs, then the app around them. -# Nothing is built on a developer machine - this workflow is the only thing that produces an apk. -# -# This repo is private, so every minute here is billed. Three caches carry the cost of a rebuild -# down to what actually changed: -# • Gradle's own (dependencies, wrapper, build cache, configuration cache) via setup-gradle -# • the CMake/ninja tree, so a Kotlin-only change does not recompile the compositor -# • the two cross-compiled preloads, which also skips installing the cross toolchain -# A run that changes only Kotlin should not touch the C compiler at all. - on: push: branches: [ main ] - # Documentation changes cannot alter the apk, so they do not buy a build. paths-ignore: - '**/*.md' - 'LICENSE' - '.gitignore' - # A pull request against main builds by itself: the contributor's branch, as it would be once - # merged onto main, comes back as an apk on the run without anyone here pressing a button. - # Every push to the pull request rebuilds it and cancels the build it replaces; a draft waits - # until it is marked ready. - # - # pull_request, NOT pull_request_target. The _target form runs a pull request's code with main's - # context: its caches are main's caches, so a hostile pull request could leave a poisoned - # Gradle/CMake cache that main's next build - which is signed with DroidDeck's key - picks up. - # Under pull_request a fork's run has a read-only token, no secrets, and caches of its own that - # main never reads. The price: GitHub does not run pull_request while a pull request conflicts - # with main, so a conflicting one gets no build (the pull request page still shows the conflict). pull_request: branches: [ main ] types: [ opened, synchronize, reopened, ready_for_review ] @@ -41,16 +19,13 @@ on: permissions: contents: read - # The pull-request report below is one comment on the pull request, kept up to date. pull-requests: write -# A newer push makes the running build pointless; stop paying for it. concurrency: group: build-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true env: - # Bump to force the preload cache to miss (e.g. after changing a compiler flag below). PRELOAD_CACHE_VERSION: v1 jobs: @@ -60,21 +35,11 @@ jobs: runs-on: ubuntu-24.04 timeout-minutes: 45 steps: - # A pull request is checked out at its own head with full history, not at GitHub's merge - # ref: that ref does not exist while the pull request conflicts with main, and the point of - # the next step is to say so and show where. - uses: actions/checkout@v4 with: ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} - # Full history: the merge below needs it (a shallow clone refuses to merge at all). fetch-depth: 0 - # The pull request as it would be once merged onto main is what gets built. When it cannot - # be merged, the conflicting files and the conflicting hunks go into the run summary and the - # pull-request comment, and the job stops here: there is nothing coherent to build. - # DroidDeck's signing key lives only in GitHub environment secrets (see sign.yml). A key file - # committed by mistake would be in the history for good: stop at the first one. The AOSP - # testkey is public and meant to be here. - name: No private key in the tree run: | set -euo pipefail @@ -104,7 +69,6 @@ jobs: fi FILES=$(git diff --name-only --diff-filter=U) if [ -z "$FILES" ]; then - # The merge did not even start (git said why): quote it rather than list nothing. { echo "### ERROR: Could not merge onto main (\`$BASE\`)" echo @@ -146,8 +110,6 @@ jobs: distribution: temurin java-version: '17' - # Caches ~/.gradle (dependencies, wrapper distribution, build cache, configuration cache) - # and prunes what the run did not use, so the entry cannot grow without bound. - uses: gradle/actions/setup-gradle@v4 with: cache-cleanup: on-success @@ -156,7 +118,6 @@ jobs: run: | NDK="${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}" VERSION=$(sed -n 's/^Pkg.Revision *= *//p' "$NDK/source.properties") - echo "NDK $VERSION at $NDK" echo "NDK_VERSION=$VERSION" >> "$GITHUB_ENV" - name: Set the APK build label @@ -181,11 +142,6 @@ jobs: echo "label=$label" >> "$GITHUB_OUTPUT" echo "Build: \`$label\`" >> "$GITHUB_STEP_SUMMARY" - # ── The session's preloads ─────────────────────────────────────────────────────────── - # Both are glibc aarch64 libraries that live inside the rootfs, so they are cross-compiled - # here rather than by the NDK. They ship in assets (not in the runtime tarball) so a fix in - # either reaches an already-installed runtime on the next launch instead of waiting on a - # ~790 MB runtime re-host. Their inputs change rarely, so most runs restore them. - name: Cache the preloads id: preloads uses: actions/cache@v4 @@ -203,9 +159,6 @@ jobs: sudo apt-get install -y -qq gcc-aarch64-linux-gnu g++-aarch64-linux-gnu >/dev/null D=app/src/main/assets/linuxfs mkdir -p "$D" - # Statically linked C++ runtime: this is preloaded into every Steam process, and Steam - # ships its own libstdc++ while rewriting LD_LIBRARY_PATH. Pulling the system one in - # ahead of it is a version conflict waiting to happen. Only libc is left as a dependency. aarch64-linux-gnu-g++ -shared -fPIC -O2 -Wall -Wno-attributes -Wno-nonnull-compare \ -pthread -std=c++17 -static-libstdc++ -static-libgcc \ -o "$D/libfakeinput.so" app/src/main/cpp/fakeinput_steam.cpp -ldl @@ -213,26 +166,20 @@ jobs: aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ -o "$D/libblsession.so" tools/linuxfs/preload/*.c -ldl aarch64-linux-gnu-strip --strip-unneeded "$D/libblsession.so" - # The session's scripts travel the same way, for the same reason. for script in tools/linuxfs/overlay/usr/local/bin/bannerlator-*; do install -Dm644 "$script" "$D/usr/local/bin/$(basename "$script")" done - # The SteamOS helpers the client calls in Deck mode, as no-op stubs (see each file). for f in tools/linuxfs/overlay/usr/bin/* tools/linuxfs/overlay/usr/bin/steamos-polkit-helpers/*; do [ -f "$f" ] && install -Dm644 "$f" "$D/${f#tools/linuxfs/overlay/}" done - # The patched gamescope, when a build of it has been published (tools/gamescope/release.env - # names the release and the archive's sha256); see tools/gamescope/PATCHES.md. if [ -f tools/gamescope/release.env ]; then . tools/gamescope/release.env - # Through the API: the repository is private, so the plain download URL answers 404. gh release download "${GAMESCOPE_TAG}" -R "${GITHUB_REPOSITORY}" -p gamescope.tzst -O gamescope.tzst echo "${GAMESCOPE_SHA256} gamescope.tzst" | sha256sum -c - tar --use-compress-program=unzstd -xf gamescope.tzst -C "$D" test -f "$D/usr/local/bin/gamescope" rm gamescope.tzst fi - # The patched wlroots for the desktop's GPU renderers (tools/wlroots), the same way. if [ -f tools/wlroots/release.env ]; then . tools/wlroots/release.env gh release download "${WLROOTS_TAG}" -R "${GITHUB_REPOSITORY}" -p wlroots.tzst -O wlroots.tzst @@ -241,9 +188,6 @@ jobs: test -f "$D/usr/local/lib/droiddeck-wlroots/libwlroots-0.20.so" rm wlroots.tzst fi - # Valve's aarch64 mangoapp for Deck mode's performance overlay, plus the five libraries the - # runtime lacks, pinned by sha256 in tools/mangoapp/packages.txt. Stored under the SONAME - # each is loaded by, as real files: assets cannot carry symlinks. M="$D/usr/local/lib/mangoapp" mkdir -p "$M" mango-pkgs grep -v '^#' tools/mangoapp/packages.txt | while read -r sum url; do @@ -260,7 +204,6 @@ jobs: install -Dm644 tools/mangoapp/mangoapp "$D/usr/local/bin/mangoapp" rm -rf mango-pkgs ls -l "$M" - # And the desktop's launcher and labwc defaults, staged over the desktop package's copies. install -Dm644 tools/linuxfs/desktop/droiddeck-desktop "$D/usr/local/bin/droiddeck-desktop" install -Dm644 tools/linuxfs/desktop/droiddeck-gpu "$D/usr/local/bin/droiddeck-gpu" install -Dm644 tools/linuxfs/desktop/droiddeck-desktop-gpu "$D/usr/local/bin/droiddeck-desktop-gpu" @@ -270,10 +213,6 @@ jobs: install -Dm644 tools/linuxfs/desktop/firefox-droiddeck.js "$D/usr/lib/firefox/defaults/pref/droiddeck.js" ls -lR "$D" - # The daemon's AAudio sink (tools/aaudio-sink), compiled here against upstream PulseAudio 13 - # headers and the app's own libpulse*, then put into the audio bundle the apk carries. The - # committed bundle holds every other module and no sink, so a build without this step would - # have no audio - the unpack check in PulseAudioComponent would then fail loudly, not quietly. - name: Cache PulseAudio 13.0 source id: pa-src uses: actions/cache@v4 @@ -301,21 +240,17 @@ jobs: tar --use-compress-program=unzstd -tf app/src/main/assets/pulseaudio.tzst | grep -c '\.so$' rm -rf pa-bundle sink-out - # Runs whether the preloads were built or restored: readelf reads any ELF whatever the host, - # so these assertions cost nothing and need no cross toolchain. - name: Check the preloads run: | set -euo pipefail D=app/src/main/assets/linuxfs NEED=$(readelf -d "$D/libfakeinput.so" | sed -n 's/.*NEEDED.*\[\(.*\)\]/\1/p') - echo "libfakeinput NEEDED: $NEED" for bad in libstdc++.so.6 libgcc_s.so.1; do if printf '%s\n' "$NEED" | grep -qx "$bad"; then echo "::error::libfakeinput.so links $bad - the C++ runtime must stay static"; exit 1 fi done syms() { readelf -Ws "$1" | awk '$4 == "FUNC" && $5 == "GLOBAL" {sub(/@.*/, "", $8); print $8}'; } - # The interposers are the whole point: if one is missing the client sees no controller. FAKE=$(syms "$D/libfakeinput.so") for sym in open openat ioctl read close poll ppoll select stat fstat access scandir; do grep -qx "$sym" <<<"$FAKE" || { echo "::error::libfakeinput.so does not export $sym"; exit 1; } @@ -326,12 +261,7 @@ jobs: done test -f "$D/usr/local/bin/bannerlator-session" test -f "$D/usr/local/bin/bannerlator-proton-extra" - echo "preloads check out" - # ── The native build ───────────────────────────────────────────────────────────────── - # The compositor and adrenotools are the slowest part of a build and change least often. - # The key pins the C sources and the NDK; the restore-key still hands an older tree to - # ninja, which then rebuilds only the files that differ. - name: Cache the CMake build tree uses: actions/cache@v4 with: @@ -342,9 +272,6 @@ jobs: restore-keys: | cxx-${{ env.NDK_VERSION }}- - # Release, not debug: AGP quietly drops v1 (JAR) signing from a debug build once minSdk is - # 24 or higher, and the apk has to carry all three schemes. Nothing is minified either way. - # The whole log is kept so a failed build's errors can be quoted back on a pull request. - name: Build id: build env: @@ -353,18 +280,6 @@ jobs: set -o pipefail ./gradlew assembleRelease --console=plain -PndkVersion="$NDK_VERSION" 2>&1 | tee /tmp/build.log - - name: Describe the apk - run: | - set -euo pipefail - APK=$(find app/build/outputs/apk -name '*.apk' | head -1) - echo "apk: $APK" - ls -l "$APK" - sha256sum "$APK" - unzip -l "$APK" | grep -E 'lib/arm64-v8a|assets/linuxfs' | awk 'NR <= 30' # awk reads to the end: head would break the pipe under pipefail - - # Every NEEDED of every library we ship must resolve inside the apk or on the device. The - # first build shipped libwayland-server.so without libffi.so, and the app died on - # System.loadLibrary the moment a session started - a check this step would have caught. - name: Check the native dependency closure run: | set -euo pipefail @@ -372,8 +287,6 @@ jobs: WORK=$(mktemp -d) unzip -q "$APK" 'lib/arm64-v8a/*' -d "$WORK" cd "$WORK/lib/arm64-v8a" - # Provided by the platform, so never packaged. libstdc++.so is Android's minimal system - # C++ runtime; the Termux PTY JNI library has this in its NEEDED list. SYSTEM="libc.so libm.so libdl.so liblog.so libandroid.so libz.so libvulkan.so libstdc++.so libGLESv2.so libEGL.so libnativewindow.so libjnigraphics.so libaaudio.so libOpenSLES.so libmediandk.so libcamera2ndk.so libsync.so libneuralnetworks.so" @@ -381,19 +294,13 @@ jobs: for so in *.so; do for need in $(readelf -d "$so" | sed -n 's/.*NEEDED.*\[\(.*\)\]/\1/p'); do [ -f "$need" ] && continue - # $SYSTEM spans lines; unquoted echo folds its newlines to spaces, or the last - # name on each line could never match (libaaudio.so did not, for the relay helper). case " $(echo $SYSTEM) " in *" $need "*) continue ;; esac echo "::error::$so needs $need, which is neither in the apk nor a platform library" fail=1 done done - [ "$fail" = 0 ] && echo "every NEEDED resolves" exit $fail - # AGP signs with v2+v3 and drops v1 whenever minSdk is 24 or higher, and setting - # enableV1Signing in the DSL does not move it. Re-signing here with apksigner is the one way - # to be sure of what the apk carries: zipalign first, then all three schemes explicitly. - name: Sign with the testkey (v1 + v2 + v3) run: | set -euo pipefail @@ -407,18 +314,12 @@ jobs: --out "$APK" "$APK.aligned" rm -f "$APK.aligned" "$APK.idsig" - # The apk must stay installable over the last one, and on every Android version: that means - # one stable key and all three signature schemes. Cheap to assert, easy to lose silently. - name: Check the signature run: | set -euo pipefail APK=$(find app/build/outputs/apk -name '*.apk' | head -1) APKSIGNER=$(find "$ANDROID_HOME/build-tools" -name apksigner | sort -V | tail -1) - # --min-sdk-version 21: apksigner only verifies the schemes an apk's own minSdk requires, - # so at minSdk 26 it reports v1 as false whether or not the JAR signature is there. - # Asking it to verify from 21 makes it actually look. "$APKSIGNER" verify --min-sdk-version 21 --verbose --print-certs "$APK" | tee /tmp/sig.txt - # And the files themselves, which is what an old installer reads. unzip -l "$APK" | grep -qE 'META-INF/.*\.(SF|RSA|DSA)$' \ || { echo "::error::apk carries no JAR signature files"; exit 1; } for scheme in "v1 scheme (JAR signing): true" "v2 scheme (APK Signature Scheme v2): true" \ @@ -428,10 +329,6 @@ jobs: grep -qi "CN=Android, OU=Android, O=Android" /tmp/sig.txt \ || { echo "::error::apk is not signed with the AOSP testkey"; exit 1; } - # ── The pull-request report ────────────────────────────────────────────────────────── - # One comment per pull request, rewritten on every push: whether it merges, and when the - # build failed, the compiler's own errors with paths made short. Fork pull requests carry a - # read-only token and cannot comment; the same text is in the run summary either way. - name: Report on the pull request if: always() && github.event_name == 'pull_request' continue-on-error: true @@ -480,7 +377,6 @@ jobs: ;; esac echo - echo "_Updated on every push to this pull request._" } > /tmp/pr-report.md cat /tmp/pr-report.md >> "$GITHUB_STEP_SUMMARY" ID=$(gh api "repos/${GITHUB_REPOSITORY}/issues/${PR}/comments" --paginate --jq ".[] | select(.body | startswith(\"$MARK\")) | .id" | head -1 || true) @@ -496,14 +392,11 @@ jobs: path: app/build/outputs/apk/release/*.apk if-no-files-found: error retention-days: 30 - # An apk is a zip already; compressing it again buys nothing and costs seconds. compression-level: 0 - # PR builds use the test key; only main calls the release signer. sign: needs: build if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' - # What sign.yml asks for; a called workflow never gets more than its caller gives it. permissions: contents: read actions: read @@ -511,5 +404,4 @@ jobs: with: environment: signing-main variants: '["standard"]' - # The key is an environment secret; a called workflow sees secrets only when they are passed on. secrets: inherit diff --git a/.github/workflows/pr-release-publish.yml b/.github/workflows/pr-release-publish.yml index 2b74c6495f..72ef506be7 100644 --- a/.github/workflows/pr-release-publish.yml +++ b/.github/workflows/pr-release-publish.yml @@ -65,8 +65,6 @@ jobs: done <<<"$approved" [[ "$maintainer_approved" == true ]] || { echo '::error::A maintainer must approve this commit'; exit 1; } - # PR builds use the public test key. Keep their versionCode at the shipped release - # so testers can install the stable APK over a signed PR build. sdk=${ANDROID_HOME:-${ANDROID_SDK_ROOT:-}} tools=$(find "$sdk/build-tools" -mindepth 1 -maxdepth 1 -type d | sort -V | tail -1) stable_tag=$(gh api repos/The412Banner/DroidDeck/releases/latest --jq .tag_name) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f9d705aed5..2620b96dfa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,12 +1,6 @@ name: Release APKs run-name: release ${{ inputs.version }} from main ${{ github.sha }} -# Every package of a release, signed with DroidDeck's own key: the standard app and the named ones -# in tools/release/variants.txt, one matrix job each. Nothing is rebuilt - the apk is the one the -# Build APK run of this exact main commit made (with its caches) and that was tested, so the -# release is those bytes. This workflow is manually dispatched from main; publishing the GitHub -# release stays a separate, manual step. - on: workflow_dispatch: inputs: @@ -41,7 +35,6 @@ jobs: run: | set -euo pipefail [[ $VERSION =~ ^[0-9A-Za-z._-]+$ ]] || { echo "::error::version '$VERSION': letters, digits, . _ - only"; exit 1; } - # This commit's Build APK run - a push or a dispatch on main, never a pull request's. runs=$(gh run list -R "$GITHUB_REPOSITORY" --workflow build.yml --branch main --commit "$GITHUB_SHA" \ --status success --json databaseId,event,headSha -L 20) id=$(jq -r --arg sha "$GITHUB_SHA" \ @@ -64,5 +57,4 @@ jobs: run_id: ${{ needs.find.outputs.run_id }} label: ${{ inputs.version }} artifact: droiddeck-release - # The key is an environment secret; a called workflow sees secrets only when they are passed on. secrets: inherit diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index 9d630c529f..cad16ca037 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -1,8 +1,5 @@ name: Sign APKs -# Called from main to sign builds, approved PR artifacts, and releases. The key lives in -# the caller's protected environment; PR build jobs use only the public test key. - on: workflow_call: inputs: @@ -62,7 +59,6 @@ jobs: env: RELEASE_KEYSTORE_B64: ${{ secrets.RELEASE_KEYSTORE_B64 }} RELEASE_STORE_PASSWORD: ${{ secrets.RELEASE_STORE_PASSWORD }} - # The alias is not a secret (and as one, GitHub would mask 'droiddeck' all over the logs). RELEASE_KEY_ALIAS: droiddeck ENVIRONMENT: ${{ inputs.environment }} VARIANT: ${{ matrix.variant }} From 4bc7c8dc99996535b813a0c1b41fb16ef804064f Mon Sep 17 00:00:00 2001 From: xXJSONDeruloXx Date: Thu, 24 Sep 2026 21:02:13 -0400 Subject: [PATCH 63/65] Trim signing key script comments --- tools/release/make-release-key.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tools/release/make-release-key.sh b/tools/release/make-release-key.sh index 680fcab913..1278ff8003 100755 --- a/tools/release/make-release-key.sh +++ b/tools/release/make-release-key.sh @@ -1,15 +1,4 @@ #!/usr/bin/env bash -# make-release-key.sh - run ONCE, by the owner. Makes DroidDeck's signing key and gives it to GitHub. -# -# - The key is made on this device, in ~/droiddeck-release-key (outside the repo), with a long -# random password written beside it. Nothing secret is printed. -# - The key and password are secrets in the signing-main and release environments. -# PR build jobs use only the public test key. -# - The key's certificate digest - public, not a secret - goes to keystore/release-signer.sha256, -# which CI checks every signed apk against. That file is the only thing to commit. -# -# BACK UP ~/droiddeck-release-key (both files) somewhere safe - a password manager, a USB stick. -# Without it no update can ever be signed for the people who installed a signed build. set -euo pipefail REPO=Droid-Deck/DroidDeck @@ -32,7 +21,6 @@ done umask 077 mkdir -p "$OUT" KS="$OUT/droiddeck-release.p12" -# 48 random characters; PKCS12 uses one password for the store and the key. KS_PW=$(head -c 60 /dev/urandom | base64 -w0 | tr -d '/+=') KS_PW=${KS_PW:0:48} [ ${#KS_PW} -ge 40 ] || die "could not make a password" From 870a0b62798d7a5fae8234fa4c85adce107e7e68 Mon Sep 17 00:00:00 2001 From: xXJSONDeruloXx Date: Thu, 24 Sep 2026 21:14:55 -0400 Subject: [PATCH 64/65] feat: add paged in-session drawer navigation --- .../com/droiddeck/launcher/SessionActivity.kt | 37 +- .../launcher/session/SessionPrefs.kt | 6 +- .../launcher/ui/ModeSettingsDialog.kt | 4 +- .../droiddeck/launcher/ui/SessionOverlay.kt | 354 +++++++++++------- .../droiddeck/launcher/ui/SettingsWidgets.kt | 11 +- 5 files changed, 250 insertions(+), 162 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 5a36bc60b2..2d0c3c2438 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -24,6 +24,7 @@ import android.widget.Toast import androidx.activity.ComponentActivity import androidx.activity.OnBackPressedCallback import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier @@ -120,6 +121,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { // Compose reads these; the activity writes them. private var drawerOpen by mutableStateOf(false) + private var drawerPage by mutableIntStateOf(0) + private var drawerControllerActive by mutableStateOf(false) private var backActionsInverted by mutableStateOf(false) /** The on-screen PC keyboard (ui/PcKeyboard): real key presses, Esc and F1 included. */ private var pcKeyboardOpen by mutableStateOf(false) @@ -234,7 +237,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onAndroidKeyboard = { pcKeyboardOpen = false; keyboard?.toggle() }, onClose = { pcKeyboardOpen = false }, ) - SessionDrawer(drawerOpen, DrawerActions( + SessionDrawer(drawerOpen, drawerPage, drawerControllerActive, onPageChange = { drawerPage = it }, a = DrawerActions( steam = SessionState.mode == SessionService.MODE_STEAM, title = if (SessionState.mode == SessionService.MODE_RUN) com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) ?: "Game" else null, @@ -565,7 +568,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { // Wider than 16:9 is fine - games and the client cope with a phone's 20:9 - so the // panel's aspect is kept above that, unless the user pinned 16:9 for a foldable, and the // compositor letterboxes onto a squarer panel. - // "Exactly this panel" drops that floor, for a 4:3 or 3:2 handheld whose games should + // "Match screen" drops that floor, for a 4:3 or 3:2 handheld whose games should // fill it. val aspect = when (SessionPrefs.shapeMode(this)) { SessionPrefs.SHAPE_WIDE -> 16f / 9f @@ -704,7 +707,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> return super.dispatchKeyEvent(event) } + val fromController = event.device != null && PadBridge.isFromController(event.device) + if (fromController && event.action == KeyEvent.ACTION_DOWN) { + if (drawerOpen && !drawerControllerActive) sessionOverlay.requestFocus() + drawerControllerActive = 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) { + drawerPage = (drawerPage + if (event.keyCode == KeyEvent.KEYCODE_BUTTON_R1) 1 else 2) % 3 + releaseDrawerDirection() + } + return true + } val handled = super.dispatchKeyEvent(event) if (event.action == KeyEvent.ACTION_DOWN) { Log.i(TAG, "drawer key=${KeyEvent.keyCodeToString(event.keyCode)} handled=$handled viewFocused=${sessionOverlay.hasFocus()}") @@ -715,7 +730,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } return true } - val fromController = PadBridge.isFromController(event.device) val resumeKey = event.keyCode == KeyEvent.KEYCODE_BUTTON_A || event.keyCode == KeyEvent.KEYCODE_BUTTON_START val resumeKeyId = event.deviceId to event.keyCode if (fromController && resumeKey && (SessionState.suspended || resumeKeyId in resumeKeysDown)) { @@ -727,14 +741,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } return true } - if (drawerOpen) { - if (event.keyCode == KeyEvent.KEYCODE_BACK || event.keyCode == KeyEvent.KEYCODE_BUTTON_B) { - if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) drawerOpen = false - releaseDrawerDirection() - return true - } - return super.dispatchKeyEvent(event) - } if (pcKeyboardOpen && event.device != null && PadBridge.isFromController(event.device)) return super.dispatchKeyEvent(event) if (event.keyCode != KeyEvent.KEYCODE_BACK && padBridge?.onKeyEvent(event) == true) return true // A hardware keyboard, forwarded to the compositor's wl_keyboard. Back is left to the @@ -778,6 +784,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean { if (drawerOpen && event.device != null && PadBridge.isFromController(event.device)) { + if (!drawerControllerActive) sessionOverlay.requestFocus() + drawerControllerActive = true if (event.actionMasked == MotionEvent.ACTION_MOVE && event.isFromSource(InputDevice.SOURCE_JOYSTICK) ) { @@ -792,6 +800,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return super.dispatchGenericMotionEvent(event) } + override fun dispatchTouchEvent(event: MotionEvent): Boolean { + if (event.actionMasked == MotionEvent.ACTION_DOWN && event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) { + drawerControllerActive = false + } + return super.dispatchTouchEvent(event) + } + private fun dispatchDrawerDirection(event: MotionEvent) { val hatX = event.getAxisValue(MotionEvent.AXIS_HAT_X) val hatY = event.getAxisValue(MotionEvent.AXIS_HAT_Y) 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 3498e525c2..c44ead89a8 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -52,9 +52,9 @@ object SessionPrefs { /** The choices the settings offer, in order. */ val shapeChoices = listOf( - SHAPE_AUTO to "The panel's shape (16:9 or wider)", - SHAPE_EXACT to "Exactly this panel (4:3, 3:2…)", - SHAPE_WIDE to "16:9 with bars", + SHAPE_AUTO to "Auto (16:9+)", + SHAPE_EXACT to "Match screen", + SHAPE_WIDE to "Always 16:9", ) /** 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 06af6c7459..6eb2cc913d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -183,8 +183,8 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { onPick = { v -> if (v == CUSTOM) editCustom = true else { a.onCustomResolution(null); a.onResolution(v) } }, ) ChoiceRow( - host, "shape", "Shape", - if (custom != null) "Set by the custom resolution." else "The panel's shape stays at 16:9 or wider; pick Exactly this panel for a 4:3 or 3:2 screen.", + host, "shape", "Screen ratio", + if (custom != null) "Set by the custom resolution." else "Auto uses at least 16:9.", com.droiddeck.launcher.session.SessionPrefs.shapeChoices, s.shapeMode, enabled = custom == null, onPick = a.onShape, ) if (editCustom) CustomResolutionDialog( 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 b3eab4b6c5..59e5fddfb9 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -7,11 +7,11 @@ import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.focusGroup import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.ui.focus.focusRequester import androidx.compose.material3.ButtonDefaults import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.interaction.PressInteraction import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -23,19 +23,17 @@ 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.rememberScrollState +import androidx.compose.foundation.ScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton -import androidx.compose.material3.Switch import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Alignment import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier -import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.res.painterResource @@ -56,7 +54,6 @@ import androidx.compose.animation.slideOutHorizontally import androidx.compose.foundation.LocalIndication import androidx.compose.foundation.border import androidx.compose.foundation.hoverable -import androidx.compose.foundation.focusGroup import androidx.compose.foundation.interaction.collectIsFocusedAsState import androidx.compose.foundation.interaction.collectIsHoveredAsState import androidx.compose.foundation.layout.Arrangement @@ -75,6 +72,7 @@ import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.input.InputMode import androidx.compose.ui.platform.LocalInputModeManager +import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.font.FontWeight @@ -85,6 +83,29 @@ import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.input.SecondScreenMode import kotlinx.coroutines.flow.collect +private val drawerPageTitles = listOf("Now", "Controls", "Session") +private val drawerPageEntries = listOf("hud", "touch", "shape") + +private class DrawerFocus { + private val requesters = HashMap() + private val last = arrayOfNulls(3) + var focused by mutableStateOf(null) + private set + + private fun requester(key: String) = requesters.getOrPut(key) { FocusRequester() } + + fun track(page: Int, key: String): Modifier = Modifier.focusRequester(requester(key)).onFocusChanged { + if (it.isFocused) { + last[page] = key + focused = key + } else if (focused == key) focused = null + } + + fun target(page: Int) = last[page] ?: drawerPageEntries[page] + fun request(key: String) = runCatching { requester(key).requestFocus() } + fun forget(page: Int) { last[page] = null } +} + @Composable fun HudText(text: String) { Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopEnd) { @@ -204,32 +225,38 @@ class DrawerActions( @OptIn(ExperimentalComposeUiApi::class) @Composable -fun SessionDrawer(open: Boolean, a: DrawerActions) { +fun SessionDrawer(open: Boolean, page: Int, controllerActive: Boolean, onPageChange: (Int) -> Unit, a: DrawerActions) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val host = rememberMenuHost() var androidAppsExpanded by rememberSaveable { mutableStateOf(false) } var appToChooseDisplay by remember { mutableStateOf(null) } + val pageScroll = remember { List(3) { ScrollState(0) } } val veil by animateFloatAsState(if (open) 1f else 0f, Motion.tw(260), label = "veil") - // A controller starts on the drawer's first control, highlighted, as on the app's main screen: - // the STEAM button, or in a desktop session the first setting. - val firstFocus = remember { androidx.compose.ui.focus.FocusRequester() } - var firstControlFocused by remember { mutableStateOf(false) } + val focus = remember { DrawerFocus() } val inputModeManager = LocalInputModeManager.current - val steamButtons = a.onSteamMenu != null && a.onQam != null + val focusManager = LocalFocusManager.current BackHandler(enabled = open) { if (host.open != null) host.open = null else a.onClose() } - LaunchedEffect(open) { - if (open) { + LaunchedEffect(page) { host.open = null; appToChooseDisplay = null } + LaunchedEffect(open, controllerActive) { + if (open && !controllerActive) focusManager.clearFocus(force = true) + } + LaunchedEffect(open, page, controllerActive, host.open, appToChooseDisplay) { + if (!open) { + host.open = null + } else if (controllerActive) { inputModeManager.requestInputMode(InputMode.Keyboard) - var attempts = 0 - while (attempts < 24 && !firstControlFocused) { - firstFocus.requestFocus() + if (host.open != null || appToChooseDisplay != null) return@LaunchedEffect + val target = focus.target(page) + repeat(24) { androidx.compose.runtime.withFrameNanos { } - attempts++ + focus.request(target) + if (focus.focused == target) return@LaunchedEffect } - if (!firstControlFocused) android.util.Log.w("SessionDrawer", "first controller focus request did not focus a control") + focus.forget(page) + focus.request(drawerPageEntries[page]) } } if (open || veil > 0.01f) Box( @@ -252,7 +279,6 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { .controllerBack { if (host.open != null) host.open = null else a.onClose() } - .verticalScroll(rememberScrollState()) .padding(horizontal = 14.dp, vertical = 16.dp), ) { Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(start = 4.dp, bottom = 6.dp)) { @@ -282,11 +308,7 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { OutlinedButton( onClick = { host.open = null; a.onSteamMenu.invoke() }, interactionSource = steamSrc, - modifier = Modifier.weight(1f).height(48.dp).focusRequester(firstFocus) - .onFocusChanged { - firstControlFocused = it.isFocused - android.util.Log.i("SessionDrawer", "first control focused=${it.isFocused}") - }.controllerConfirm { + modifier = Modifier.weight(1f).height(48.dp).then(focus.track(page, "steam")).controllerConfirm { host.open = null a.onSteamMenu.invoke() }, @@ -303,7 +325,8 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { qamStartedOnPress = false }, interactionSource = qamInteraction, - modifier = Modifier.weight(1f).height(48.dp).semantics { contentDescription = "Open Quick Access Menu" }.controllerConfirm { + modifier = Modifier.weight(1f).height(48.dp).then(focus.track(page, "qam")) + .semantics { contentDescription = "Open Quick Access Menu" }.controllerConfirm { host.open = null a.onQam.invoke() }, @@ -311,132 +334,162 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { border = BorderStroke(if (qamHot) 2.dp else 1.dp, if (qamHot) pal.signal else colors.outline), colors = ButtonDefaults.outlinedButtonColors(containerColor = if (qamHot) pal.signal.copy(alpha = 0.16f) else Color.Transparent), ) { - Text("…", fontSize = 22.sp, fontWeight = FontWeight.SemiBold) + Text("QAM", fontSize = 13.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 0.5.sp) } } } - if (a.isHomeApp) SettingsGroup("Android apps") { - ActionRow("Launch an app", null, if (androidAppsExpanded) "Hide" else "Show") { - androidAppsExpanded = !androidAppsExpanded + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp), + ) { + DrawerOutlineButton("LB ‹", modifier = Modifier.height(48.dp).then(focus.track(page, "prev"))) { + host.open = null; onPageChange((page + 2) % 3) } - if (androidAppsExpanded) { - if (a.androidApps.isEmpty()) { - Text("No launchable apps found", fontSize = 12.sp, color = colors.onSurfaceVariant, - modifier = Modifier.padding(horizontal = 14.dp, vertical = 10.dp)) - } else { - for (app in a.androidApps) { - MenuItem( - app.label, - checked = false, - leading = { - app.icon?.let { icon -> - Image( - bitmap = icon.asImageBitmap(), - contentDescription = null, - modifier = Modifier.size(26.dp).clip(RoundedCornerShape(6.dp)), - ) + Row( + horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.weight(1f), + ) { + drawerPageTitles.forEachIndexed { index, title -> + val dotSource = remember { MutableInteractionSource() } + val dotFocused = dotSource.collectIsFocusedAsState().value + val select = { host.open = null; onPageChange(index) } + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.size(38.dp) + .semantics { contentDescription = "$title page" } + .hoverable(dotSource) + .clickable(interactionSource = dotSource, indication = LocalIndication.current, onClick = select) + .controllerConfirm(onClick = select), + ) { + Box( + Modifier.size(if (index == page) 16.dp else 10.dp) + .clip(CircleShape) + .background(if (index == page) pal.signal else colors.onSurfaceVariant) + .border(if (dotFocused) 2.dp else 0.dp, colors.onBackground, CircleShape), + ) + } + } + } + DrawerOutlineButton("› RB", modifier = Modifier.height(48.dp).then(focus.track(page, "next"))) { + host.open = null; onPageChange((page + 1) % 3) + } + } + + Column( + modifier = Modifier.weight(1f).fillMaxWidth().verticalScroll(pageScroll[page]), + ) { + when (page) { + 0 -> SettingsGroup("Now") { + ToggleRow(host, "hud", "Performance HUD", null, a.hudOn, + chipModifier = focus.track(page, "hud"), onChange = a.onHud) + if (a.fillScreen != null) ToggleRow( + host, "fill", "Stretch games to fill", null, a.fillScreen, + chipModifier = focus.track(page, "fill"), onChange = a.onFillScreen, + ) + val fgOpen = host.open == "fg" + val fgLabel = when (a.frameGenEngine) { + FrameGen.ENGINE_WINFG -> "Win-FG ${a.frameGenMultiplier}×" + FrameGen.ENGINE_LSFG -> "LSFG ${a.frameGenMultiplier}×" + else -> "Off" + } + SettingsRow("Frame generation", null, highlighted = fgOpen) { + Box { + ValueChip(fgLabel, fgOpen, modifier = focus.track(page, "fg")) { host.open = if (fgOpen) null else "fg" } + AnchoredMenu(fgOpen, onDismiss = { if (host.open == "fg") host.open = null }, title = "Frame generation") { firstItemFocus -> + val need = if (a.lsfgReady) null else "Requires Lossless Scaling" + MenuItem("Off", checked = a.frameGenEngine == FrameGen.ENGINE_OFF, focusRequester = firstItemFocus) { a.onFrameGenPick(FrameGen.ENGINE_OFF, 2); host.open = null } + for (m in 2..4) MenuItem("Win-FG ${m}×", checked = a.frameGenEngine == FrameGen.ENGINE_WINFG && a.frameGenMultiplier == m) { a.onFrameGenPick(FrameGen.ENGINE_WINFG, m); host.open = null } + for (m in 2..4) MenuItem("LSFG ${m}×", checked = a.frameGenEngine == FrameGen.ENGINE_LSFG && a.frameGenMultiplier == m, enabled = a.lsfgReady, detail = need) { a.onFrameGenPick(FrameGen.ENGINE_LSFG, m); host.open = null } + } + } + } + } + 1 -> { + SettingsGroup("Controls") { + ChoiceRow(host, "touch", "Touch", null, + listOf(SessionPrefs.TOUCH_AUTO to "Auto (${a.touchAuto})", SessionPrefs.TOUCH_PAD to "Touchpad", SessionPrefs.TOUCH_DIRECT to "Direct"), + a.touchMode, chipModifier = focus.track(page, "touch"), onPick = a.onTouch) + ChoiceRow(host, "osc", "On-screen controls", null, + if (a.steam) listOf(SessionPrefs.OSC_AUTO to "Auto", SessionPrefs.OSC_ALWAYS to "Always", SessionPrefs.OSC_STEAM_QAM to "Steam + QAM", SessionPrefs.OSC_NEVER to "Never") + else listOf(SessionPrefs.OSC_AUTO to "Auto", SessionPrefs.OSC_ALWAYS to "Always", SessionPrefs.OSC_NEVER to "Never"), + a.oscMode, chipModifier = focus.track(page, "osc"), onPick = a.onOsc) + if (a.steam) ChoiceRow(host, "back-actions", "Back", null, + listOf(false to SessionPrefs.BACK_MENU_THEN_QAM, true to SessionPrefs.BACK_QAM_THEN_MENU), + a.backActionsInverted, chipModifier = focus.track(page, "back-actions"), onPick = a.onBackActionsInverted) + } + SettingsGroup("Keyboard") { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(8.dp)) { + DrawerOutlineButton("Hardware", modifier = Modifier.weight(1f).height(42.dp).then(focus.track(page, "hardware"))) { + host.open = null; a.onHardwareKeyboard() + } + DrawerOutlineButton("Android", modifier = Modifier.weight(1f).height(42.dp).then(focus.track(page, "android"))) { + host.open = null; a.onKeyboard() + } + } + } + if (a.steam && a.secondScreenDisplays.isNotEmpty()) SettingsGroup("Second screen") { + ChoiceRow(host, "second-screen-mode", "Controls", null, + listOf(SecondScreenMode.NONE, SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL).map { it to it.label }, + a.secondScreenMode, chipModifier = focus.track(page, "second-screen-mode"), onPick = a.onSecondScreenMode) + if (a.secondScreenDisplays.size > 1) ChoiceRow(host, "second-screen-display", "Display", null, + a.secondScreenDisplays.map { it.id to it.label }, a.selectedSecondScreenDisplay, + chipModifier = focus.track(page, "second-screen-display"), onPick = a.onSecondScreenDisplay) + } + } + else -> { + if (a.isHomeApp) SettingsGroup("Android apps") { + SettingsRow("Launch an app", null) { + DrawerOutlineButton(if (androidAppsExpanded) "Hide" else "Show", modifier = focus.track(page, "apps")) { + androidAppsExpanded = !androidAppsExpanded + } + } + if (androidAppsExpanded) { + if (a.androidApps.isEmpty()) { + Text("No launchable apps", fontSize = 12.sp, color = colors.onSurfaceVariant, + modifier = Modifier.padding(horizontal = 14.dp, vertical = 10.dp)) + } else for (app in a.androidApps) { + MenuItem( + app.label, checked = false, + modifier = focus.track(page, "app:${app.packageName}/${app.className}"), + leading = { + app.icon?.let { icon -> + Image(bitmap = icon.asImageBitmap(), contentDescription = null, + modifier = Modifier.size(26.dp).clip(RoundedCornerShape(6.dp))) + } + }, + ) { + host.open = null + if (a.secondScreenDisplays.isEmpty()) a.onLaunchAndroidApp(app, null) + else appToChooseDisplay = app } - }, - ) { - host.open = null - if (a.secondScreenDisplays.isEmpty()) a.onLaunchAndroidApp(app, null) - else appToChooseDisplay = app + } + } + } + SettingsGroup("Next session") { + ChoiceRow(host, "shape", "Screen ratio", null, + SessionPrefs.shapeChoices, a.shapeMode, + chipModifier = focus.track(page, "shape"), onPick = a.onShape) + if (a.steam) ChoiceRow(host, "fex", "FEX preset", null, + FexPreset.all.map { it.id to it.label }, a.fexPreset, + chipModifier = focus.track(page, "fex"), onPick = a.onFexPreset) + } + Spacer(Modifier.height(18.dp)) + Row( + horizontalArrangement = if (a.isHomeApp) Arrangement.End else Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxWidth(), + ) { + if (!a.isHomeApp) DrawerOutlineButton("Background", modifier = focus.track(page, "background")) { + host.open = null; a.onBackground() + } + DangerButton("Stop session", modifier = focus.track(page, "stop")) { + host.open = null; a.onStop() } } } } } - - SettingsGroup("Now") { - ToggleRow( - host, "hud", "Performance HUD", null, a.hudOn, - chipModifier = if (steamButtons) Modifier else Modifier.focusRequester(firstFocus) - .onFocusChanged { firstControlFocused = it.isFocused }, onChange = a.onHud, - ) - if (a.fillScreen != null) ToggleRow( - host, "fill", "Stretch games to fill the screen", - "Off for a game that shows up small in a corner (Quake 3).", a.fillScreen, onChange = a.onFillScreen, - ) - val fgOpen = host.open == "fg" - val fgLabel = when (a.frameGenEngine) { - FrameGen.ENGINE_WINFG -> "Win-FG ${a.frameGenMultiplier}×" - FrameGen.ENGINE_LSFG -> "LSFG ${a.frameGenMultiplier}×" - else -> "Off" - } - SettingsRow("Frame generation", null, highlighted = fgOpen) { - Box { - ValueChip(fgLabel, fgOpen) { host.open = if (fgOpen) null else "fg" } - AnchoredMenu(fgOpen, onDismiss = { if (host.open == "fg") host.open = null }, title = "Frame generation") { firstItemFocus -> - val need = if (a.lsfgReady) null else "install Lossless Scaling in Steam" - MenuItem("Off", checked = a.frameGenEngine == FrameGen.ENGINE_OFF, focusRequester = firstItemFocus) { a.onFrameGenPick(FrameGen.ENGINE_OFF, 2); host.open = null } - for (m in 2..4) MenuItem("Win-FG ${m}×", checked = a.frameGenEngine == FrameGen.ENGINE_WINFG && a.frameGenMultiplier == m) { a.onFrameGenPick(FrameGen.ENGINE_WINFG, m); host.open = null } - for (m in 2..4) MenuItem("LSFG ${m}×", checked = a.frameGenEngine == FrameGen.ENGINE_LSFG && a.frameGenMultiplier == m, enabled = a.lsfgReady, detail = need) { a.onFrameGenPick(FrameGen.ENGINE_LSFG, m); host.open = null } - } - } - } - ChoiceRow( - host, "touch", "Touch", null, - listOf(SessionPrefs.TOUCH_AUTO to "Auto (${a.touchAuto})", SessionPrefs.TOUCH_PAD to "Touchpad", SessionPrefs.TOUCH_DIRECT to "Direct"), a.touchMode, - onPick = a.onTouch, - ) - ChoiceRow( - host, "osc", "On-screen controls", null, - if (a.steam) listOf(SessionPrefs.OSC_AUTO to "Auto", SessionPrefs.OSC_ALWAYS to "Always", SessionPrefs.OSC_STEAM_QAM to "Steam + QAM", SessionPrefs.OSC_NEVER to "Never") - else listOf(SessionPrefs.OSC_AUTO to "Auto", SessionPrefs.OSC_ALWAYS to "Always", SessionPrefs.OSC_NEVER to "Never"), - a.oscMode, - onPick = a.onOsc, - ) - if (a.steam) ChoiceRow( - host, "back-actions", "Back", SessionPrefs.backActionsOrder(a.backActionsInverted), - listOf( - false to SessionPrefs.BACK_MENU_THEN_QAM, - true to SessionPrefs.BACK_QAM_THEN_MENU, - ), a.backActionsInverted, onPick = a.onBackActionsInverted, - ) - SettingsRow("Keyboard", null) { - Row(verticalAlignment = Alignment.CenterVertically) { - SecondaryButton("Hardware") { host.open = null; a.onHardwareKeyboard() } - Spacer(Modifier.width(8.dp)) - SecondaryButton("Android") { host.open = null; a.onKeyboard() } - } - } - } - - if (a.steam && a.secondScreenDisplays.isNotEmpty()) SettingsGroup("Second screen") { - ChoiceRow( - host, "second-screen-mode", "Controls", null, - listOf(SecondScreenMode.NONE, SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL) - .map { it to it.label }, a.secondScreenMode, - onPick = a.onSecondScreenMode, - ) - if (a.secondScreenDisplays.size > 1) ChoiceRow( - host, "second-screen-display", "Display", null, - a.secondScreenDisplays.map { it.id to it.label }, a.selectedSecondScreenDisplay, - onPick = a.onSecondScreenDisplay, - ) - } - - SettingsGroup("Next session") { - ChoiceRow( - host, "shape", "Display shape", null, - SessionPrefs.shapeChoices, a.shapeMode, onPick = a.onShape, - ) - if (a.steam) ChoiceRow( - host, "fex", "FEX preset", null, - FexPreset.all.map { it.id to it.label }, a.fexPreset, note = FexPreset.byId(a.fexPreset).detail, onPick = a.onFexPreset, - ) - } - - Spacer(Modifier.height(18.dp)) - Row( - horizontalArrangement = if (a.isHomeApp) Arrangement.End else Arrangement.spacedBy(10.dp), - modifier = Modifier.fillMaxWidth(), - ) { - if (!a.isHomeApp) SecondaryButton("Send to background") { host.open = null; a.onBackground() } - DangerButton("Stop session") { host.open = null; a.onStop() } - } - Spacer(Modifier.height(12.dp)) } } } @@ -461,13 +514,30 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { } @Composable -private fun DangerButton(text: String, onClick: () -> Unit) { +private fun DrawerOutlineButton(text: String, modifier: Modifier = Modifier, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val source = remember { MutableInteractionSource() } + val hot = source.collectIsFocusedAsState().value || source.collectIsHoveredAsState().value + OutlinedButton( + onClick = onClick, + interactionSource = source, + modifier = modifier.controllerConfirm(onClick = onClick), + 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), + colors = ButtonDefaults.outlinedButtonColors(containerColor = if (hot) pal.signal.copy(alpha = 0.16f) else Color.Transparent), + ) { Text(text, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1) } +} + +@Composable +private fun DangerButton(text: String, modifier: Modifier = Modifier, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val src = remember { MutableInteractionSource() } val hot = src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value val fill by animateColorAsState(if (hot) colors.error.copy(alpha = 0.18f) else Color.Transparent, Motion.tw(220), label = "dangerFill") Box( - modifier = Modifier.clip(RoundedCornerShape(12.dp)).background(fill).border(1.dp, colors.error.copy(alpha = if (hot) 0.9f else 0.5f), RoundedCornerShape(12.dp)) + modifier = modifier.clip(RoundedCornerShape(12.dp)).background(fill).border(1.dp, colors.error.copy(alpha = if (hot) 0.9f else 0.5f), RoundedCornerShape(12.dp)) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, onClick = onClick) .controllerConfirm(onClick = onClick) .padding(horizontal = 16.dp, vertical = 11.dp), 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 a7322987b0..981440b836 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -57,7 +57,9 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.TransformOrigin import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.input.InputMode import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalInputModeManager import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.IntOffset @@ -118,8 +120,9 @@ fun AnchoredMenu(open: Boolean, onDismiss: () -> Unit, title: String? = null, no state.targetState = open if (!state.currentState && !state.targetState && state.isIdle) return val firstItemFocus = remember { FocusRequester() } - LaunchedEffect(open) { - if (open) { + val inputMode = LocalInputModeManager.current.inputMode + LaunchedEffect(open, inputMode) { + if (open && inputMode == InputMode.Keyboard) { repeat(2) { androidx.compose.runtime.withFrameNanos { } } runCatching { firstItemFocus.requestFocus() } android.util.Log.i("AnchoredMenu", "requested first option focus") @@ -169,7 +172,7 @@ fun AnchoredMenu(open: Boolean, onDismiss: () -> Unit, title: String? = null, no fun MenuItem( label: String, checked: Boolean, enabled: Boolean = true, detail: String? = null, trailing: (@Composable () -> Unit)? = null, leading: (@Composable () -> Unit)? = null, - focusRequester: FocusRequester? = null, onClick: () -> Unit, + focusRequester: FocusRequester? = null, modifier: Modifier = Modifier, onClick: () -> Unit, ) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current @@ -178,7 +181,7 @@ fun MenuItem( val shift by animateFloatAsState(if (hot) 2f else 0f, Motion.sp(0.5f), label = "miShift") Row( verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth() + modifier = modifier.fillMaxWidth() .graphicsLayer { translationX = shift.dp.toPx() } .then(focusRequester?.let { Modifier.focusRequester(it) } ?: Modifier) .clip(RoundedCornerShape(8.dp)) From e95600ed0bb8a126050c52e22d76ae56c6cecc23 Mon Sep 17 00:00:00 2001 From: xXJSONDeruloXx Date: Thu, 24 Sep 2026 21:19:20 -0400 Subject: [PATCH 65/65] feat: confirm session stop from drawer header --- .../droiddeck/launcher/ui/SessionOverlay.kt | 66 +++++++++++++------ 1 file changed, 47 insertions(+), 19 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 59e5fddfb9..db5d83889a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -28,7 +28,9 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.AlertDialog import androidx.compose.material3.Text +import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Alignment @@ -76,6 +78,7 @@ import androidx.compose.ui.platform.LocalFocusManager 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 com.droiddeck.launcher.core.FexPreset import com.droiddeck.launcher.gpu.FrameGen import com.droiddeck.launcher.session.SessionPrefs @@ -231,6 +234,7 @@ fun SessionDrawer(open: Boolean, page: Int, controllerActive: Boolean, onPageCha val host = rememberMenuHost() var androidAppsExpanded by rememberSaveable { mutableStateOf(false) } var appToChooseDisplay by remember { mutableStateOf(null) } + var confirmStop by remember { mutableStateOf(false) } val pageScroll = remember { List(3) { ScrollState(0) } } val veil by animateFloatAsState(if (open) 1f else 0f, Motion.tw(260), label = "veil") val focus = remember { DrawerFocus() } @@ -239,16 +243,18 @@ fun SessionDrawer(open: Boolean, page: Int, controllerActive: Boolean, onPageCha BackHandler(enabled = open) { if (host.open != null) host.open = null else a.onClose() } + BackHandler(enabled = open && confirmStop) { confirmStop = false } LaunchedEffect(page) { host.open = null; appToChooseDisplay = null } LaunchedEffect(open, controllerActive) { if (open && !controllerActive) focusManager.clearFocus(force = true) } - LaunchedEffect(open, page, controllerActive, host.open, appToChooseDisplay) { + LaunchedEffect(open, page, controllerActive, host.open, appToChooseDisplay, confirmStop) { if (!open) { host.open = null + confirmStop = false } else if (controllerActive) { inputModeManager.requestInputMode(InputMode.Keyboard) - if (host.open != null || appToChooseDisplay != null) return@LaunchedEffect + if (host.open != null || appToChooseDisplay != null || confirmStop) return@LaunchedEffect val target = focus.target(page) repeat(24) { androidx.compose.runtime.withFrameNanos { } @@ -281,10 +287,12 @@ fun SessionDrawer(open: Boolean, page: Int, controllerActive: Boolean, onPageCha } .padding(horizontal = 14.dp, vertical = 16.dp), ) { - Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(start = 4.dp, bottom = 6.dp)) { + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(start = 4.dp, bottom = 6.dp)) { Box(modifier = Modifier.size(10.dp).clip(CircleShape).background(Brush.linearGradient(listOf(colors.primary, pal.primary2)))) Spacer(Modifier.width(10.dp)) - Text(a.title ?: if (a.steam) "Steam" else "Desktop", fontSize = 17.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) + Text(a.title ?: if (a.steam) "Steam" else "Desktop", fontSize = 17.sp, fontWeight = FontWeight.Bold, + color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + StopSessionButton(modifier = focus.track(page, "stop")) { host.open = null; confirmStop = true } } if (a.onSteamMenu != null && a.onQam != null) { val qamInteraction = remember { MutableInteractionSource() } @@ -476,16 +484,8 @@ fun SessionDrawer(open: Boolean, page: Int, controllerActive: Boolean, onPageCha chipModifier = focus.track(page, "fex"), onPick = a.onFexPreset) } Spacer(Modifier.height(18.dp)) - Row( - horizontalArrangement = if (a.isHomeApp) Arrangement.End else Arrangement.spacedBy(10.dp), - modifier = Modifier.fillMaxWidth(), - ) { - if (!a.isHomeApp) DrawerOutlineButton("Background", modifier = focus.track(page, "background")) { - host.open = null; a.onBackground() - } - DangerButton("Stop session", modifier = focus.track(page, "stop")) { - host.open = null; a.onStop() - } + if (!a.isHomeApp) DrawerOutlineButton("Background", modifier = focus.track(page, "background")) { + host.open = null; a.onBackground() } } } @@ -511,6 +511,33 @@ fun SessionDrawer(open: Boolean, page: Int, controllerActive: Boolean, onPageCha onDismiss = { appToChooseDisplay = null }, ) } + if (confirmStop) { + val cancelFocus = remember { FocusRequester() } + val cancel = { confirmStop = false } + val stop = { confirmStop = false; a.onStop() } + LaunchedEffect(controllerActive) { + if (controllerActive) { + androidx.compose.runtime.withFrameNanos { } + runCatching { cancelFocus.requestFocus() } + } + } + AlertDialog( + onDismissRequest = cancel, + modifier = Modifier.controllerBack(onBack = cancel), + title = { Text("Stop session?") }, + confirmButton = { + TextButton( + onClick = stop, + modifier = Modifier.controllerConfirm(onClick = stop), + colors = ButtonDefaults.textButtonColors(contentColor = colors.error), + ) { Text("Stop") } + }, + dismissButton = { + TextButton(onClick = cancel, modifier = Modifier.focusRequester(cancelFocus) + .controllerConfirm(onClick = cancel)) { Text("Cancel") } + }, + ) + } } @Composable @@ -531,15 +558,16 @@ private fun DrawerOutlineButton(text: String, modifier: Modifier = Modifier, onC } @Composable -private fun DangerButton(text: String, modifier: Modifier = Modifier, onClick: () -> Unit) { +private fun StopSessionButton(modifier: Modifier = Modifier, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val src = remember { MutableInteractionSource() } val hot = src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value val fill by animateColorAsState(if (hot) colors.error.copy(alpha = 0.18f) else Color.Transparent, Motion.tw(220), label = "dangerFill") Box( - modifier = modifier.clip(RoundedCornerShape(12.dp)).background(fill).border(1.dp, colors.error.copy(alpha = if (hot) 0.9f else 0.5f), RoundedCornerShape(12.dp)) + contentAlignment = Alignment.Center, + modifier = modifier.size(42.dp).semantics { contentDescription = "Stop session" } + .clip(RoundedCornerShape(12.dp)).background(fill).border(1.dp, colors.error.copy(alpha = if (hot) 0.9f else 0.5f), RoundedCornerShape(12.dp)) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, onClick = onClick) - .controllerConfirm(onClick = onClick) - .padding(horizontal = 16.dp, vertical = 11.dp), - ) { Text(text, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 0.5.sp, color = colors.error, maxLines = 1) } + .controllerConfirm(onClick = onClick), + ) { Text("×", fontSize = 25.sp, fontWeight = FontWeight.Medium, color = colors.error) } }