3b08a85ad1
A monitor powered off when the machine boots — a smart strip cutting AC, the PC coming back on its own — still answers DDC, but with a partial EDID that carries no video modes. Hyprland takes the connector as present and brings the monitor up at 0x0. Powering it on afterwards changes nothing: the connector never dropped at DRM level, so no hotplug fires, nothing re-reads the EDID, and the screen stays black until a reboot. Only a reload re-reads it. Forcing a DRM re-probe would work too but needs root, and the kernel's cached mode list stays empty without one, so there is nothing cheaper to poll: the reload is both the fix and the only way to learn whether it was needed. Poll only while a monitor is in that state, back off from three seconds to a minute, and stop as soon as one reports a mode — the machine can sit black all night, and powering the monitor on fires no event to stop on. Nothing will ask again if this loop gives up, so an unreadable answer is not taken for a healthy monitor. It is also not waited on forever: a compositor that stays silent has gone, and with it the session and any reason to keep asking. Reloading on our own schedule means minding the reload guard, which exists to keep Hyprland out of package-owned config mid-transaction, and which only disables the automatic reloads. The guard can now be asked, and recovery holds off while a transaction is in flight. A reload lands a monitor at 0x0 the same way a boot does, so configreloaded is watched alongside the hotplug events. The recovery's own reload comes back through it, and a lock keeps that from stacking a second loop. Contention waits rather than drops: a trigger arriving while a loop is exiting is the last one that will come, and one arriving while a loop is running is answered by its next pass anyway. Mirrors are dropped from `hyprctl monitors`, so the check asks for all of them and filters the disabled ones itself. Monitors turned off on purpose sit at 0x0 too, and re-applying config would fight the user over those. The existing poll here recovers internal panels on docked laptops and never runs on a desktop, which is where this happens. Reported in #6668. Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
111 lines
6.2 KiB
Bash
Executable File
111 lines
6.2 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -euo pipefail
|
|
|
|
source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
|
|
|
|
monitor_watch="$ROOT/bin/omarchy-hyprland-monitor-watch"
|
|
monitor_internal="$ROOT/bin/omarchy-hyprland-monitor-internal"
|
|
monitor_mirror="$ROOT/bin/omarchy-hyprland-monitor-internal-mirror"
|
|
monitor_laptop="$ROOT/bin/omarchy-hyprland-monitor-laptop"
|
|
monitor_external_active="$ROOT/bin/omarchy-hyprland-monitor-external-active"
|
|
system_wake="$ROOT/bin/omarchy-system-wake"
|
|
clamshell="$ROOT/bin/omarchy-hyprland-monitor-clamshell"
|
|
lock_service="$ROOT/shell/plugins/lock/Service.qml"
|
|
hw_clamshell="$ROOT/bin/omarchy-hw-clamshell"
|
|
hw_laptop_closed="$ROOT/bin/omarchy-hw-laptop-closed"
|
|
utilities="$ROOT/default/hypr/bindings/utilities.lua"
|
|
|
|
grep -F 'sleep "$delay"' "$monitor_watch" >/dev/null
|
|
grep -F 'for delay in 1 3 7; do' "$monitor_watch" >/dev/null
|
|
grep -F 'poll_clamshell_state &' "$monitor_watch" >/dev/null
|
|
grep -F 'flock -n 9' "$monitor_watch" >/dev/null
|
|
grep -F 'omarchy-hyprland-monitor-clamshell' "$monitor_watch" >/dev/null
|
|
pass "monitor watcher retries internal monitor recovery after removal"
|
|
|
|
grep -F 'monitoradded\>\>*|monitoraddedv2\>\>*)' "$monitor_watch" >/dev/null
|
|
grep -F 'omarchy-hyprland-monitor-clamshell' "$monitor_watch" >/dev/null
|
|
pass "monitor watcher disables the internal monitor after closed-lid external hotplug"
|
|
|
|
grep -F 'sync_clamshell_after_monitor_change' "$monitor_watch" >/dev/null
|
|
grep -F 'socat -U - "UNIX-CONNECT:$SOCKET"' "$monitor_watch" >/dev/null
|
|
pass "monitor watcher reconciles clamshell state on startup"
|
|
|
|
grep -F 'omarchy-hw-laptop && omarchy-hyprland-monitor-external-active' "$monitor_watch" >/dev/null
|
|
grep -F 'sync_poll_state' "$monitor_watch" >/dev/null
|
|
grep -F 'done < <(socat' "$monitor_watch" >/dev/null
|
|
pass "clamshell poll only runs on a docked laptop, not desktops or undocked laptops"
|
|
|
|
# Recovery costs a reload per attempt, so it must not run on a healthy machine,
|
|
# and only one loop may run across the events that start it.
|
|
grep -F '(( state == 1 )) && break' "$monitor_watch" >/dev/null
|
|
grep -F 'delay = delay * 2 > 60 ? 60 : delay * 2' "$monitor_watch" >/dev/null
|
|
grep -F '9>"$MODELESS_LOCK"' "$monitor_watch" >/dev/null
|
|
grep -F 'flock -w 1 9 || exit 0' "$monitor_watch" >/dev/null
|
|
pass "modeless monitor recovery runs one backing-off loop while a monitor has no mode"
|
|
|
|
# Nothing fires an event for this state, so an unanswered query must not end
|
|
# recovery -- but a compositor that never answers has gone with the session.
|
|
grep -F '(( state == 2 )) && (( ++unanswered > 20 )) && break' "$monitor_watch" >/dev/null
|
|
pass "modeless recovery retries unanswered queries without waiting on a dead compositor"
|
|
|
|
grep -F 'configreloaded\>\>*)' "$monitor_watch" >/dev/null
|
|
pass "modeless recovery also runs after a config reload"
|
|
|
|
grep -F 'omarchy-hyprland-reload-guard paused' "$monitor_watch" >/dev/null
|
|
pass "modeless recovery does not reload into a package transaction"
|
|
|
|
grep -F '.disabled != true and (.width == 0 or .height == 0)' "$ROOT/bin/omarchy-hyprland-monitor-modeless" >/dev/null
|
|
grep -F 'hyprctl monitors all -j' "$ROOT/bin/omarchy-hyprland-monitor-modeless" >/dev/null
|
|
pass "modeless helper sees mirrors and ignores monitors disabled on purpose"
|
|
|
|
grep -F 'omarchy-hw-laptop-closed && omarchy-hw-external-monitors' "$hw_clamshell" >/dev/null
|
|
grep -F '/proc/acpi/button/lid/*/state' "$hw_laptop_closed" >/dev/null
|
|
pass "clamshell helper detects closed-lid external monitor state"
|
|
|
|
grep -F 'hyprctl monitors -j' "$monitor_external_active" >/dev/null
|
|
grep -F 'select(.name | test("^(eDP|LVDS|DSI)-") | not)' "$monitor_external_active" >/dev/null
|
|
grep -F 'select(.disabled == false)' "$monitor_external_active" >/dev/null
|
|
pass "active external monitor helper checks Hyprland outputs"
|
|
|
|
grep -F 'omarchy-hyprland-monitor-internal recover >/dev/null 2>&1 || true' "$clamshell" >/dev/null
|
|
grep -F 'omarchy-hyprland-monitor-internal-mirror recover >/dev/null 2>&1 || true' "$clamshell" >/dev/null
|
|
grep -F 'internal-monitor-clamshell.lua' "$clamshell" >/dev/null
|
|
grep -F 'disabled = true' "$clamshell" >/dev/null
|
|
grep -F 'MANUAL_DISABLE_FLAG' "$clamshell" >/dev/null
|
|
! grep -F 'rm -f "$MANUAL_DISABLE_FLAG"' "$clamshell" >/dev/null
|
|
! grep -F '>"$MANUAL_DISABLE_FLAG"' "$clamshell" >/dev/null
|
|
grep -F 'read_monitor_scale' "$clamshell" >/dev/null
|
|
grep -F 'scale = $scale' "$clamshell" >/dev/null
|
|
grep -F 'hyprctl dispatch "hl.dsp.dpms({ action = \"$action\", monitor = \"$INTERNAL\" })"' "$clamshell" >/dev/null
|
|
grep -F 'hyprctl monitors all -j' "$clamshell" >/dev/null
|
|
grep -F 'omarchy-hyprland-monitor-external-active' "$clamshell" >/dev/null
|
|
grep -F 'omarchy-hw-clamshell' "$clamshell" >/dev/null
|
|
pass "clamshell monitor sync disables laptop output and force-recovers it"
|
|
|
|
grep -F "hyprctl dispatch 'hl.dsp.dpms({ action = \"enable\" })' >/dev/null 2>&1 || true" "$monitor_internal" >/dev/null
|
|
grep -F 'omarchy-hyprland-monitor-laptop' "$monitor_internal" >/dev/null
|
|
grep -F 'hyprctl monitors all -j' "$monitor_laptop" >/dev/null
|
|
grep -F 'omarchy-hyprland-monitor-external-active' "$monitor_internal" >/dev/null
|
|
grep -F 'wake' "$monitor_internal" >/dev/null
|
|
grep -F 'omarchy-hyprland-toggle-enabled $TOGGLE || return 0' "$monitor_internal" >/dev/null
|
|
pass "internal monitor helper can re-enable disabled laptop displays"
|
|
pass "internal monitor recovery only wakes displays when it re-enables one"
|
|
|
|
grep -F 'omarchy-hyprland-monitor-external-active' "$monitor_mirror" >/dev/null
|
|
pass "internal mirror helper recovers when no active external display remains"
|
|
|
|
grep -F 'switch:on:Lid Switch", nil, "omarchy-system-lid-close"' "$utilities" >/dev/null
|
|
grep -F 'switch:off:Lid Switch", nil, "omarchy-hyprland-monitor-clamshell"' "$utilities" >/dev/null
|
|
pass "lid switch bindings lock on close and reconcile clamshell display state"
|
|
|
|
grep -F 'omarchy-hyprland-monitor-clamshell >/dev/null 2>&1 || true' "$system_wake" >/dev/null
|
|
pass "system wake resyncs clamshell display state"
|
|
|
|
grep -F 'lock-pending: no-real-screen' "$lock_service" >/dev/null
|
|
grep -F 'lock-pending: screen-stabilizing' "$lock_service" >/dev/null
|
|
grep -F 'id: sessionLockStabilizeTimer' "$lock_service" >/dev/null
|
|
grep -Pzo 'function onScreensChanged\(\) \{\n(.*\n)*?\s*root\.requestSessionLock\(\)\n' "$lock_service" >/dev/null
|
|
grep -F 'realScreens: root.realScreenCount()' "$lock_service" >/dev/null
|
|
pass "lock service waits for stable real screens before session lock"
|