Skip to content

Replace the terminal screensaver with the native Wayland one (4.5) - #19068

Merged
ryanrhughes merged 2 commits into
v4-5-1from
backport/v4-5-1-native-screensaver
Nov 16, 2026
Merged

ryanrhughes merged 2 commits into
v4-5-1from
backport/v4-5-1-native-screensaver

Conversation

@ryanrhughes

Copy link
Copy Markdown
Collaborator

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-screensaver is only published on edge today. The migration installs it, so don't merge this until it's in rc, or omarchy update fails 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

  1. Cherry-pick of Replace the terminal screensaver with the native Wayland one #16800 (ce0ef48a8). Every screensaver file matches quattro. The conflicts were the 4.5-only terminal screensaver fixes, resolved by taking quattro's side: bin/omarchy-launch-screensaver is quattro's, and bin/omarchy-screensaver, screensaver-workspace-test.sh and Backport to v4-5-0: exit the screensaver when the mouse moves #17511's screensaver-mouse-test.sh are removed. That takes Backport to v4-5-0: exit the screensaver when the mouse moves #17511 back out, since the native screensaver covers it.
  2. The manual's translations from quattro. Replace the terminal screensaver with the native Wayland one #16800 changed the English paragraph about omarchy toggle screensaver. Each language's paragraph now matches quattro's translation, and the manifest marks those chapters current.

quattro hasn't changed any of this since #16800 merged.

Testing

idle-test.sh (12), system-lock-test.sh, i18n-test.sh (401), bin-style-test.sh and ./test/cli pass 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.

omarchybot and others added 2 commits November 15, 2026 22:53
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.
@greptile-apps

greptile-apps Bot commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

RetriggerView in GreptileConfidence Score: 4/5

[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

  1. P2 Idle timing lacks tests ▶

Summary

Replaces the terminal screensaver with the native Wayland package.

  • The screensaver now runs as a native Wayland layer instead of in terminal windows.
  • The idle service now stops the native screensaver when activity returns.
  • New and upgraded Omarchy installs receive the native screensaver package.
  • The manual and translated CLI text now match the native screensaver.

Acknowledged by ryanrhughes: package promotion to rc is a prerequisite for merging; terminal-only tests are intentionally removed; translations are intentionally copied from quattro; live desktop testing was not performed.

Diagram

%%{init: {'theme': 'neutral'}}%%
flowchart TD
  Idle[Idle deadline] --> Launch[Launch native screensaver]
  Launch --> Grace[Three-second launch grace]
  Grace --> Activity[User activity]
  Activity --> Stop[Stop screensaver and cancel pending lock]
  Launch --> Deadline[Lock deadline]
  Deadline --> Lock[Lock session]
  Lock --> Cleanup[Stop screensaver and restore cursor]
Loading

Reviews (1) · Last reviewed commit: "Carry the screensaver manual's translati..." · Reviewed by Greptile

Comment on lines +142 to +145
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")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Idle timing lacks tests

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!

@ryanrhughes
ryanrhughes merged commit 58a32eb into v4-5-1 Nov 16, 2026
2 checks passed
@ryanrhughes
ryanrhughes deleted the backport/v4-5-1-native-screensaver branch November 16, 2026 04:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants