Gabriel Brown
6016efa436
The rebase itself is the previous five commits replayed onto main; this is what
they needed once they landed there, kept separate so the replay stays readable.
The shell did not start. A Column in this branch's notification settings menu
assigned its own implicitWidth and implicitHeight, which a Qt 6 positioner
computes and does not let you set. That took out every contract that launches a
shell -- six of the seven failures were this one line, and none of them said so
until the error was read to the bottom. A Column already measures itself from its
children, so the bindings are simply gone.
Three assertions pinned an implementation main has since replaced, and each is
updated to pin the intent rather than the mechanism:
- The display picker now reads primaryFirstMonitors, which is monitors sorted
with the primary first. Still populated from what is connected, which is what
the contract is for; the sorted list is the point, so the picker opens on the
display somebody is most likely to mean. This branch made that change and
broke its own contract without noticing.
- The accent swatches come from the accentName schema rather than
Object.keys(Theme.accents). Same swatches, same order, one source shared with
every other enum row.
- The OSD used to take no pointer input at all. It takes some now, because this
branch's own design calls for a secondary click on a visible OSD to open its
settings, and a Wayland input region cannot admit one button and refuse
another. The rule that survives is that the region stays bounded to the OSD's
own card: it floats over other windows for a couple of seconds, and a region
bigger than the card would swallow clicks meant for something underneath.
Theme's accent table moved to ThemeProfiles, which is this branch's point -- a
curated accent and a custom profile become the same kind of record. main had
meanwhile given each accent a `gnome` member, the nearest name in GNOME's fixed
accent-color enum, which is what makes libadwaita applications recolor instead of
staying in GNOME blue. That member moved into the curated table rather than being
dropped, and adwaita-accent-contract now reads it where it lives.
Where main had simply moved further along the same path, main won: the focused
border driven by the chosen accent rather than a hardcoded pair, the gradient
built through the shared serializer rather than a hand-rolled string, the
multi-edge dock geometry. This branch's context menu, keyboard focus and
accessibility work sit on top of those rather than beside them.
Three new contracts arrived carrying .sh and lost it, along with the references
in this branch's own plan.
124 contracts pass.
Claude-Session: https://claude.ai/code/session_01NvgBuSWB5sE43yWmg21ozj
74 lines
3.0 KiB
Bash
Executable File
74 lines
3.0 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -euo pipefail
|
|
|
|
repo_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/../.." && pwd)"
|
|
qs_dir="$repo_dir/config/dot/quickshell"
|
|
osd="$qs_dir/modules/osd/Osd.qml"
|
|
state="$qs_dir/services/OsdState.qml"
|
|
shell_file="$qs_dir/shell.qml"
|
|
keybinds="$repo_dir/config/dot/hypr/keybinds.lua"
|
|
|
|
fail() {
|
|
printf 'osd ui contract: %s\n' "$1" >&2
|
|
exit 1
|
|
}
|
|
|
|
[[ -f "$osd" ]] || fail 'Prism OSD surface is missing'
|
|
[[ -f "$state" ]] || fail 'OSD presentation state is missing'
|
|
[[ -f "$qs_dir/modules/osd/qmldir" ]] || fail 'OSD module manifest is missing'
|
|
rg -q '^import Quickshell$' "$state" \
|
|
|| fail 'OSD singleton does not import the Quickshell Singleton type'
|
|
|
|
rg -Fq 'import qs.modules.osd' "$shell_file" || fail 'shell does not import the OSD module'
|
|
[[ "$(rg -c '^[[:space:]]*Osd \{\}' "$shell_file")" -eq 1 ]] \
|
|
|| fail 'shell does not create exactly one OSD per screen'
|
|
rg -Fq 'target: "osd"' "$shell_file" || fail 'OSD IPC target is missing'
|
|
rg -Fq 'OsdState.progress(kind, value, maximum, label)' "$shell_file" \
|
|
|| fail 'progress IPC is not wired to OSD state'
|
|
rg -Fq 'OsdState.message(kind, label)' "$shell_file" \
|
|
|| fail 'message IPC is not wired to OSD state'
|
|
|
|
rg -Fq 'WlrLayershell.namespace: "qs-popover-osd"' "$osd" \
|
|
|| fail 'OSD does not use the existing Prism blur namespace'
|
|
rg -Fq 'WlrLayershell.keyboardFocus: WlrKeyboardFocus.None' "$osd" \
|
|
|| fail 'OSD may steal keyboard focus'
|
|
# The OSD used to take no pointer input at all. It now takes some, because a
|
|
# secondary click on a visible OSD opens its settings and dismisses it -- and a
|
|
# Wayland input region cannot be told to admit one button and not another, so
|
|
# the feature is not available without a region.
|
|
#
|
|
# What still has to hold is that the region is BOUNDED to the OSD's own surface
|
|
# rather than the screen. The OSD floats over whatever is underneath for a
|
|
# couple of seconds; a region larger than the card would swallow clicks meant
|
|
# for a window nobody could see was being covered.
|
|
rg -Fq 'mask: Region {' "$osd" || fail 'OSD declares no input region at all'
|
|
rg -Fq 'item: inputMask' "$osd" \
|
|
|| fail 'the OSD input region is not bound to an item, so it may cover more than the OSD itself'
|
|
rg -Fq 'anchors.fill: parent' "$osd" \
|
|
|| fail 'the OSD input mask does not track the surface it belongs to'
|
|
rg -Fq 'PrismEdge {' "$osd" || fail 'OSD is missing the Prism signature edge'
|
|
rg -Fq 'font.features: Theme.tabularFigures' "$osd" \
|
|
|| fail 'changing percentages do not use tabular figures'
|
|
|
|
rg -Fq '$HOME/.config/quickshell/scripts/panama-osd' "$keybinds" \
|
|
|| fail 'keybinds do not use the deployed Panama OSD helper'
|
|
for action in \
|
|
'volume up 6' \
|
|
'volume down 6' \
|
|
'volume toggle' \
|
|
'microphone toggle' \
|
|
'volume up 1' \
|
|
'volume down 1' \
|
|
'media play-pause' \
|
|
'media next' \
|
|
'media previous' \
|
|
'media stop' \
|
|
'brightness up 5' \
|
|
'brightness down 5'; do
|
|
rg -Fq "osd(\"$action\")" "$keybinds" \
|
|
|| fail "keybind is not routed through panama-osd $action"
|
|
done
|
|
|
|
printf 'osd ui contract: PASS\n'
|