Repository navigation
Dismiss screensaver on seat input and conceal idle lock handoff - #11746
Closed
Arash-Afshar wants to merge 2 commits into
Closed
Arash-Afshar wants to merge 2 commits into
Arash-Afshar wants to merge 2 commits into
Conversation
Arash-Afshar
marked this pull request as ready for review
September 13, 2026 23:02
Author
|
Hey @omarchybot how do I get this PR reviewed and merged by @dhh and/or @ryanrhughes ? |
Contributor
[Medium impact] The changes since the previous review appear safe to merge. SummaryAdds seat-input dismissal and a concealed idle-to-lock handoff.
|
This was referenced Oct 9, 2026
This was referenced Oct 23, 2026
Open
After launch settles, pointer, touch, and keyboard dismiss the screensaver, and that dismissal stops the pending lock deadline before the covering windows come down. Idle locking keeps a black surface up until the session lock is secure, then removes the screensaver without requesting another lock. The secure wait gives up after 10 seconds so a lock with no real screen cannot poll forever. Co-authored-by: Cursor <cursoragent@cursor.com>
Arash-Afshar
force-pushed
the
fix/screensaver-dismiss-and-lock-handoff
branch
from
October 23, 2026 21:37
fdbd2bd to
ad62d54
Compare
The handoff decisions and the secure-wait script now execute in tests, so a dismissal that still races the lock deadline fails the suite. Co-authored-by: Cursor <cursoragent@cursor.com>
This was referenced Oct 27, 2026
Collaborator
|
Thanks for working on this. #16800, now merged, replaced the terminal screensaver with a native Wayland overlay that dismisses itself on any key, click, scroll or mouse movement, so this fix to the terminal version is no longer needed. Closing in favour of it. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The idle screensaver only exited on a keypress in its terminal, and locking while it was up could flash the desktop before the lock UI appeared. This change dismisses the screensaver on compositor seat activity (pointer, touch, keyboard) after launch has settled, and keeps it mapped until a concealed lock surface is secure on every output before teardown.
Tests
Automated:
test/shell.d/idle-test.sh(IdleModel launch-complete / dismiss-state cases),test/shell.d/idle-lock-handoff-test.sh(dismiss monitor, arm timer,lockFromIdle, concealed LockView, OWE poster/feed suppress, lock-timer stop on dismiss, and the 10s secure-wait deadline),test/shell.d/system-lock-test.sh, andtest/shell.d/video-background-test.shfor conceal-awarefeedActive/ poster path.VM verification is still outstanding: trackpad dismiss, touch dismiss, fingerprint unlock during the concealed handoff, and idle handoff with an OWE video lock wallpaper.
Architecture
The main
IdleMonitorstill starts the idle cycle (screensaver + lock timers). Whileorg.omarchy.screensaverwindows exist, a second shortIdleMonitoris enabled only after launch is complete (windowCount >= monitorCount, or grace with ≥1 window) and not during lock handoff. Each new screensaveropenwindowresets settle so sequential multi-monitor focus warps are not treated as user input. A 1.2s arm timer after launch-complete force-settles dismiss when a jittery pointer never stays idle long enough for the monitor alone.dismissScreensaver()setsdismissInFlightand stops the screensaver and lock timers before it signals the screensaver supervisor.lockSystem()returns immediately while dismissal is in flight, so a deadline that was about to fire cannot start a lock while the covering windows are already coming down.For lock, idle calls
lockFromIdle, which enables concealed black lock surfaces (no wallpaper/password, blank cursor) beforeext-session-lock. It polls untilsecure, then runsomarchy-system-lock cleanupso fingerprint unlock cannot race into a second lock request. Ifsecurenever arrives within 10 seconds, the wait exits and leaves the screensaver mapped. Pointer wake on the lock surface is ignored until a short post-secure settle; keyboard wake still reveals immediately. While concealed, LockView clears the poster/still path, keepsfeedActivefalse so the OWE feed does not load, and hides the blur/darken layers and the fingerprint-unavailable notice.