Repository navigation
Keep the lock screen dark after a media key wakes it - #18595
raffsmagic wants to merge 3 commits into
Conversation
[Medium impact] The PR appears safe to merge; no new blocking issues were found. SummaryThe lock screen now blanks again after five quiet seconds following a media-key wake.
No new actionable issues found. raffsmagic declined the remote Reviews (4) · Last reviewed commit: "Merge remote-tracking branch 'origin/qua..." · Reviewed by Greptile |
|
Tested on an NVIDIA desktop, and it fixes #18781 here. Setup: Omarchy 4.5.0-3, Hyprland 0.56.2, Quickshell 0.3.2.r7, RTX 2060 SUPER (proprietary driver), one DisplayPort monitor. The installed Run: I locked, waited for the lock to blank the display, then sent keys through the uinput script from #18781. Times are measured from when the injector exits, which is about half a second after the key press. Without the patch, the same volume-key run was still lit 27 seconds later, with nothing left to turn it off. Unlocking with the password still worked afterwards. The lock and shell logged no errors. Not tested: suspend/resume and the 15-second resume run-up, the idle-service wake path from #18574, and the wake-without-input case Greptile raised. |
|
Thanks for testing on NVIDIA, and for the timed log! |
Hyprland turns the panel on for any key press, but a bound key like volume never reaches the lock surface, so the blank timer is never re-armed and the lock screen stays lit until unlock or suspend. Watch compositor idle while locked and blank once input has been quiet for the usual run-up. This also covers the idle service waking the display behind the lock, which jordi-adame traced in omacom#18574.
24b3169 to
23f5bdc
Compare
|
Reviewed at 23f5bdc by Claude Opus 5.5 in Claude Code and reproduced on a worker VM built from the Omarchy ISO, running real Hyprland. The fix works for the bug in #18781, and nothing in the 14 lines needs changing. Two lines in the description do need changing; details below. Reproduction. I locked, waited for the lock to blank the display, then sent
Suspend/resume and the 15 s resume run-up were not exercised. Both reviewers read that path, and the Tests on the worker. Second opinion. Codex Medium and muse-wonder (pi, thinking high) reviewed the head. They agreed the change is correct and the right size, and independence is not guaranteed. Both also raised, without being pointed at it, the problem with the #18574 reference below. I then confirmed that on the worker. What it waits on: two edits to the description, @raffsmagic.
Related. #10130 adds the same kind of idle monitor. Its resume handler re-arms the 5 s countdown unconditionally, so input the lock never sees would cut a pending 15 s resume run-up short; this one leaves the run-up alone. #16368 blanks again only on the next lock request. Thanks to @theharshl for the NVIDIA run, which matches what the worker showed. Once the description is updated, this goes to the maintainer. |
|
The two description findings are resolved at unchanged head Opus 5.5 High and muse-wonder via pi, thinking high reviewed the updated description and code, found no runtime defect and agreed that nothing remains for the author; independence is not guaranteed. This re-review reused the 17 November worker reproduction and test logs at the same head, with no new test run. The relevant lock, idle, wake and brightness code on current |
|
I merged current What was checked, on an Omarchy worker, against the merged branch:
Claude Opus 5.5 at high effort reviewed the changes as a second opinion; its findings are folded in. Its independence from my review isn't guaranteed. Greptile scores the new head 5/5 with no open findings. This waits on the maintainer, starting with approving the workflow run: CI hasn't run on this head yet. |
Refs #18574
What changes
Hyprland turns the screen on for any key press while locked. A bound key like volume never reaches the lock screen, so its 5 second blank timer never re-arms and the screen stays lit until you unlock or the laptop sleeps.
The lock now watches compositor idle too, and blanks once input has been quiet for 5 seconds. It leaves the resume run-up and password checks alone.
This doesn't cover the no-input wake @jordi-adame traced in the issue, where the idle service wakes the display behind the lock, so that issue stays open. Thanks for the detailed write-up, it made this easy to find.
Verification
Dell XPS 9320, quattro:
lock-appear-budget,sleep-lock,system-lockandshell-idle-spawntests pass.Not tested: the idle service path from the issue, and resume from suspend.
Screenshots
No visible change: it's when the screen goes dark, not how anything looks.
Fixes #18781