Repository navigation
Conversation
c9f64fd to
d2f5aaa
Compare
d2f5aaa to
dcffddf
Compare
|
Rebased onto current |
|
Looked at this at So far I have only read the diff, #7399 and the neighbouring pull requests, without running anything. Two of them touch the same wake path. #9632 changes Next: the classification is asked again on a later run, once the second reviewer is available, and the full review and a worker run follow from there. Nothing is needed from you in the meantime. |
dcffddf to
4946c74
Compare
|
Rebased onto current
|
[Medium impact] Adjusts lock screen blank timing for slow display hardware. The PR appears safe to merge, with a non-blocking gap in its timing tests. Findings
SummaryThe PR keeps the initial five-second blank delay and adds a 30-second grace window after a blanked display wakes.
|
| /id: systemResumeGapTimer[\s\S]*if \(elapsed > interval \+ 2000\) root\.handleSystemResume\(elapsed\)/.test(serviceQml), | ||
| 'a wall-clock gap detects resume even after the ordinary blank timer stopped' | ||
| ) | ||
|
|
There was a problem hiding this comment.
Broken wake timing passes tests
lock-wake-grace-test.sh checks source text but never runs the wake or resume logic. Removing running: true from systemResumeGapTimer would disable resume detection after blanking, yet every assertion would still pass.
Add checks that run the changed functions with a controlled clock and timer. Cover the initial five-second delay, repeated input during grace, and resume after the blank timer has stopped.
|
Reviewed at Competing fix. #8561 (opened 2026-08-27, the day before this one) fixes the same thing, the 5-second re-blank that starts at the wake request rather than when the panel shows a picture, by raising Read, not run. These were found by reading
Not reproducible here. A VM's display comes back from DPMS off instantly. On #7399, the reporter found that a 30-second interval did not fix their 6K panel, and another user found that 20 seconds did. So whichever fix lands, the reporter's machine may still have a second cause. Next: this waits on the maintainer to choose between #8561 and this PR, which comes down to whether an untouched lock should still blank after 5 seconds. Nothing is needed from you in the meantime. |
|
Tested this locally on a Xiaomi Mi Monitor at 3440×1440@120 Hz over DisplayPort with an NVIDIA GTX 970. Previously, the monitor’s slow wake meant the lock screen sometimes blanked again before I could enter my password. With this PR applied, waking and unlocking worked as expected, and the prompt stayed visible long enough to enter my password. I’ve since reverted the test checkout and returned to stock Omarchy. This is an important usability fix that I’d strongly encourage merging as soon as possible. On slow-waking monitors, the current behavior can prevent users from reliably unlocking their sessions. Thanks for the fix! |
|
Retested locally on my Framework laptop with two external RTK FlipGo panels connected over USB-C carrying DisplayPort video, with this PR's patch applied. After locking at 12:20:30, the displays went to sleep at 12:20:36. A key press woke the Framework's built-in panel first. The external panels came back one at a time while I was typing my password; the journal shows DP-2/DP-3 disconnecting and reconnecting, including a transient “Displays are still connecting” response. I unlocked at 12:20:59. This confirms the slow external display wake behavior affects my setup. The lock session stayed available long enough to enter my password, though I unlocked about 14 seconds after the first wake, so I did not verify the full 30-second grace period. |
Summary
This addresses the wake-then-immediate-black symptom reported in #7399 without making every initial lock wait 30 seconds. Hyprland can report DPMS enabled before the physical panel is visibly ready, and QML timers resume before a slow panel finishes training, so either path can otherwise blank the output underneath monitor startup.
This is separate from #7806: that PR concerns wake-key leakage and keyboard auto-repeat into the password field.
Testing
test/shell.d/lock-wake-grace-test.shtest/shell.d/lock-blank-fingerprint-test.shtest/shell.d/lock-stranded-recovery-test.shtest/shell.d/lock-password-overflow-test.shgit diff --checkThe complete test suite was also run for the original change. The focused wake-grace test was rerun after adding system-resume coverage; all eight assertions pass.
Addresses #7399.