Fix stale screen effects callbacks

This commit is contained in:
EnzoDLofi committed 2026-11-13 22:16:12 -04:00
1 parent 6b1af8f2aa
commit 08f666174e
2 files changed
+25 -12

No files matched your search

@@ -983,6 +983,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
isFocusableInTouchMode = true
defaultFocusHighlightEnabled = false
setContent {
val effectsEditorProfileId = androidx.compose.runtime.remember(drawerOpen) {
if (drawerOpen) currentScreenEffectsProfileId() else null
}
val uiPointer = appUiOwnsPointer()
androidx.compose.runtime.SideEffect {
com.droiddeck.launcher.glasses.GlassesMenuMirror.setSessionMenuVisible(this@SessionActivity,
@@ -1349,9 +1352,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde
WaylandCompositor.nativeSetUpscaleSharpness(pct)
},
onEffects = { e ->
SessionPrefs.setScreenEffects(this@SessionActivity, currentScreenEffectsProfileId(), e)
effects = e
e.push(upscaler)
if (drawerOpen && effectsEditorProfileId != null &&
currentScreenEffectsProfileId() == effectsEditorProfileId) {
SessionPrefs.setScreenEffects(this@SessionActivity, effectsEditorProfileId, e)
effects = e
e.push(upscaler)
}
},
onTextureAnisotropy = { value ->
drawerGameProfileId?.let { appId ->
@@ -109,6 +109,7 @@ class SessionService : Service() {
private var freezeCancelled = false
private var pendingSteamGameId: String? = null
private var pendingSteamGameGeneration = -1
private var pendingSteamGameExitWatchToken = -1
@Volatile private var gameExitWatchToken = 0
private val flushSteamGame = object : Runnable {
override fun run() = flushQueuedSteamGame()
@@ -397,7 +398,9 @@ class SessionService : Service() {
cancelQueuedSteamGame(clearMailbox = false)
clearSteamGameMailbox()
if (SessionState.mode == MODE_STEAM) SessionState.steamUrl
?.takeIf { it.startsWith(GAME_URL_PREFIX) }?.let { watchGameExit(it.removePrefix(GAME_URL_PREFIX), gen) }
?.takeIf { it.startsWith(GAME_URL_PREFIX) }?.let {
watchGameExit(it.removePrefix(GAME_URL_PREFIX), gen, ++gameExitWatchToken)
}
acquireLocks()
Thread({
OrphanReaper.reap("session starting")
@@ -1505,6 +1508,7 @@ class SessionService : Service() {
}
val accepted = gameId!!
if (pendingSteamGameId != null) Log.i(TAG, "replacing a queued game launch with $accepted")
pendingSteamGameExitWatchToken = ++gameExitWatchToken
SessionState.gameId = accepted
val effectsProfileId = SessionPrefs.screenEffectsProfileId(MODE_STEAM, accepted, null)
SessionPrefs.setActiveScreenEffectsProfile(this, effectsProfileId)
@@ -1519,7 +1523,8 @@ class SessionService : Service() {
private fun flushQueuedSteamGame() {
val gameId = pendingSteamGameId ?: return
val gen = pendingSteamGameGeneration
if (gen != sessionGen || !SessionState.running || SessionState.stopRequested ||
val exitWatchToken = pendingSteamGameExitWatchToken
if (exitWatchToken != gameExitWatchToken || gen != sessionGen || !SessionState.running || SessionState.stopRequested ||
SessionState.mode != MODE_STEAM || !GameLaunchLink.validId(gameId)) {
cancelQueuedSteamGame()
return
@@ -1548,14 +1553,14 @@ class SessionService : Service() {
}
pendingSteamGameId = null
pendingSteamGameGeneration = -1
pendingSteamGameExitWatchToken = -1
SessionEvents.record("steam.game_launch_requested", mapOf("gameId" to gameId, "generation" to gen))
watchGameExit(gameId, gen)
watchGameExit(gameId, gen, exitWatchToken)
Log.i(TAG, "queued Steam game $gameId for the running client")
}
private fun watchGameExit(gameId: String, gen: Int) {
private fun watchGameExit(gameId: String, gen: Int, token: Int) {
val returnToLauncher = SessionPrefs.returnAfterGame(this)
val token = ++gameExitWatchToken
Thread({
val startBy = android.os.SystemClock.elapsedRealtime() + GAME_START_TIMEOUT_MS
var seen = false
@@ -1569,7 +1574,7 @@ class SessionService : Service() {
} else if (!seen) {
if (now > startBy) {
Log.i(TAG, "game $gameId did not start; clearing its screen effects profile")
mainHandler.post { clearActiveScreenEffectsProfile(gameId, gen) }
mainHandler.post { clearActiveScreenEffectsProfile(gameId, gen, token) }
return@Thread
}
} else if (goneSince == 0L) {
@@ -1577,7 +1582,7 @@ class SessionService : Service() {
} else if (now - goneSince >= GAME_EXIT_GRACE_MS) {
mainHandler.post {
if (returnToLauncher) returnAfterGame(gameId, gen, token)
else clearActiveScreenEffectsProfile(gameId, gen)
else clearActiveScreenEffectsProfile(gameId, gen, token)
}
return@Thread
}
@@ -1586,8 +1591,8 @@ class SessionService : Service() {
}, "game-exit-watch").start()
}
private fun clearActiveScreenEffectsProfile(gameId: String, gen: Int) {
if (gen != sessionGen || !SessionState.running || SessionState.stopRequested) return
private fun clearActiveScreenEffectsProfile(gameId: String, gen: Int, token: Int) {
if (token != gameExitWatchToken || gen != sessionGen || !SessionState.running || SessionState.stopRequested) return
val gameProfileId = SessionPrefs.screenEffectsProfileId(MODE_STEAM, gameId, null)
if (SessionPrefs.activeScreenEffectsProfileId(this) != gameProfileId) return
SessionPrefs.setActiveScreenEffectsProfile(this, null)
@@ -1625,6 +1630,8 @@ class SessionService : Service() {
mainHandler.removeCallbacks(flushSteamGame)
pendingSteamGameId = null
pendingSteamGameGeneration = -1
pendingSteamGameExitWatchToken = -1
gameExitWatchToken++
if (clearMailbox) clearSteamGameMailbox()
}