Repository navigation
Blank a locked session's displays again after they are lit behind the lock - #16368
omarchybot wants to merge 3 commits into
Conversation
… lock The lock arms its five-second blank only from beginLock() and its own wakes. An idle cycle that ended while the session was already locked ran omarchy-system-wake, lighting the panels without the lock knowing, and the next idle lock found the session locked and did nothing, so the panels stayed on the lock screen for hours. The idle service now leaves a locked session's displays to the lock, and every lock request re-arms the blank, which also turns off panels lit by a resume or by Hyprland's own DPMS once the next request arrives. Blanking can now repeat without a wake in between, and brightnessctl saves the keyboard level as it turns it off, so a second off would save the 0 and every restore after it would bring back darkness. Only the first blank since a wake turns the keyboard off. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Co-Authored-By: Codex Medium <noreply@openai.com>
[Medium impact] The PR appears safe to merge; the remaining feedback concerns missing regression coverage. Findings
SummaryThe PR gives the lock control over waking and blanking displays while the session is locked.
Reviews (2) · Last reviewed commit: "Watch for the resume when a held suspend..." · Reviewed by Greptile |
| blankProcess.keyboard = !root.keyboardBlank | ||
| root.keyboardBlank = true | ||
| blankProcess.running = true |
There was a problem hiding this comment.
Repeated blanks lack regression coverage
The new keyboardBlank logic has no regression test. AGENTS.md requires a bug fix with logic to include a test that fails before the fix and passes afterward. This requirement must be met before merging.
Extend the existing lock tests to exercise two blanks without a wake, then a wake and another blank. Check that every blank turns off the displays, but keyboard brightness is saved only once between wakes. The current tests would not catch a broken keyboardBlank reset.
File Used: AGENTS.md (source)
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!
|
Reviewed at f034677 and run on a worker VM built from the Omarchy ISO, with the shell serving this branch. No defects found. What was run, through
Second opinion from Codex Medium and muse-spark-1.3 (high). Neither found a defect. Both had access to the earlier diagnosis on #15897, so their agreement with it is not independent. They raised three things worth knowing:
On Greptile's request for a regression test: none is added. The tests for this area check the QML source against regexes, and the repository's This waits on the maintainer. |
# Conflicts: # shell/plugins/lock/Service.qml
Every lock request now re-arms the five-second blank, including omarchy-system-sleep-lock before a suspend. When the panel was still lit, noteSleepRequested() did not start the resume watch, and if logind held the suspend past five seconds the blank paused the reader before the machine slept. The resume then lit the panel with nothing left to blank it again or bring the reader back. The sleep request is now remembered, and pausing the reader within its window starts the watch. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Co-Authored-By: Codex Medium <noreply@openai.com> Co-Authored-By: muse-wonder High <noreply@pi.dev>
|
This branch had fallen behind The merge. One conflict, in The defect, now fixed (4a2fb5f). Run on a worker VM built from the Omarchy ISO, reading DPMS from
Tests. Second opinion. Codex Medium, with muse-wonder at high thinking alongside, reviewed the merge and found the held-suspend defect above independently. They reviewed the fix and found nothing further in the PR. Their independence from this review is not guaranteed. Both noted one case that is already on There is still no automated test for the re-arm on repeated lock requests or for the idle-wake guard. The area's fixture deliberately avoids |
|
Thank you for reproducing this and for the lock/idle split. I read the same two sites on current The CI I am not opening a second PR for #15897. Happy to help with a follow-up for the remaining case you noted (a panel lit with no later lock request, which needs the lock to watch DPMS). |
A locked session's panels could come back on and stay on the lock screen for hours. The lock arms its five-second blank only when it first locks and when it wakes the displays itself, and two things lit the panels without going through it:
cancelIdleCycle()ranomarchy-system-wake, which turns every output on, and the lock never heard about it. In the reporter's second log that is theidle-cycle-cancel: activity→process-start: wake omarchy-system-wakeat 01:17:47, followed by an hour and a half of lit panels. The wake now runs only when the session is not locked, the same guard the screensaver launch beside it already uses. While locked, the lock owns the displays: it wakes them on input and blanks them again.omarchy-shell lock lockon a session that was already locked did nothing about the displays, so the idle service's lock every cycle, andomarchy-system-sleep-lockbefore a suspend, left lit panels lit. That is despiteomarchy-system-lockbeing described as "Lock the computer and turn off the display". Every lock request now re-arms the blank, so panels lit by a resume or by Hyprland's own DPMS go off again within five seconds of the next request.Blanking can now repeat without a wake between.
omarchy-brightness-keyboard offsaves the current level before setting 0, so a second blank would save the 0, and every restore after it would bring back a dark keyboard. Only the first blank since a wake turns the keyboard backlight off.Not covered here: panels lit with no input and no later lock request still have nothing to blank them until one comes. Closing that needs the lock to watch DPMS itself. The pointer half of the report (motion on the lock surface waking the panels with
misc:mouse_move_enables_dpms = false) is a separate behaviour, and #15342 and #11991 are open for it.Fixes #15897