Repository navigation
Replace the terminal screensaver with the native Wayland one (4.5) - #19068
Conversation
Cherry-pick of #16800 to 4.5.1. The screensaver becomes the omarchy-screensaver package: one overlay per display, closed by any key, click, scroll or mouse movement. The terminal launcher, its configs, window rules and tests go, and a migration installs the package. Conflicts were the 4.5-only fixes to the terminal screensaver (#17511 and a test fix), resolved by taking quattro's side: bin/omarchy-launch-screensaver is quattro's, and bin/omarchy-screensaver, screensaver-workspace-test.sh and #17511's screensaver-mouse-test.sh are removed. (cherry picked from commit ce0ef48)
The English chapter changed with the native screensaver. Each language's paragraph about omarchy toggle screensaver now matches quattro's translation, and the manifest marks those chapters current against the new English.
[Medium impact] The changes affect the screensaver and idle-lock workflow across Omarchy 4.5 installs. The reviewed code appears safe to merge, with a non-blocking gap in tests for idle timing. Findings
SummaryReplaces the terminal screensaver with the native Wayland package.
Acknowledged by
|
| function handleScreensaverExited() { | ||
| // Closing while the user is active is a dismissal, even inside the launch grace. | ||
| if (root.idleEnabled && root.idledThisCycle && root.screensaverStartedThisCycle && !idleMonitor.isIdle) { | ||
| cancelIdleCycle("screensaver-dismissed") |
There was a problem hiding this comment.
The new dismissal and launch-grace branches have no regression coverage. idle-test.sh still checks only timeout math and the stay-awake flag. Add focused tests showing that activity during the grace period cancels the pending lock, later activity stops the screensaver, and an unattended session still locks at its deadline. These branches decide whether the user gets locked, but the current tests cannot catch changes to that behavior.
Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!
Brings 4.6's native screensaver to 4.5.1, so both lines run the same one and the terminal screensaver's 4.5.0 bugs go with it:
Depends on the package reaching rc and stable
omarchy-screensaveris only published onedgetoday. The migration installs it, so don't merge this until it's inrc, oromarchy updatefails for rc testers. A Promote channel run (edge -> rc,omarchy-screensaver) carries it over. The dry run moves only 1.3.1-1, on both architectures, with no Mac set impact: https://github.com/omacom/omarchy-pkgs/actions/runs/43800649255. Shipping 4.5.1 promotes rc to stable.What's in it
ce0ef48a8). Every screensaver file matchesquattro. The conflicts were the 4.5-only terminal screensaver fixes, resolved by takingquattro's side:bin/omarchy-launch-screensaverisquattro's, andbin/omarchy-screensaver,screensaver-workspace-test.shand Backport to v4-5-0: exit the screensaver when the mouse moves #17511'sscreensaver-mouse-test.share removed. That takes Backport to v4-5-0: exit the screensaver when the mouse moves #17511 back out, since the native screensaver covers it.quattro. Replace the terminal screensaver with the native Wayland one #16800 changed the English paragraph aboutomarchy toggle screensaver. Each language's paragraph now matchesquattro's translation, and the manifest marks those chapters current.quattrohasn't changed any of this since #16800 merged.Testing
idle-test.sh(12),system-lock-test.sh,i18n-test.sh(401),bin-style-test.shand./test/clipass on this branch. Not run live on a 4.5 desktop; the package isn't installable from 4.5's channels yet.Supersedes #18008 and #18282.