feat: take the last of sway out of the classroom
The DVD player was the only thing still speaking a compositor the room no longer runs. It asked sway's tree whether VLC's window had really gone fullscreen, because VLC reports playing while its window is still the black startup one the loading cover exists to hide. VLC's own status was measured as a replacement and is not one: it reports fullscreen true in the same 250ms poll as playing, because the flag is the option it was started with and not a report about its window. So the cover is held for a floor and capped by the deadline that was already there, and the compositor is not asked anything. Focus-or-launch went the same way. The session already takes an exclusive lock, so a second one cannot start, and bringing an existing one to the front is the panel's job. classroom-window, classroom_sway and classroom_chrome are gone with it — the last of them was reachable from nothing at all. DVD also moves out of the status row, where it sat beside the clock as though a disc were a machine reading. It is an application: it is in the row with Wonder Ink and the browser, and classroom-provision removes it from the layout on a machine with no optical drive, which retires DVD_ENABLED. A computer that moves between rooms takes its drive with it; nobody remembers to edit a file when it does. The panel is rebuilt from the package at every login now. Plasma keeps whatever panel it first built, so an update could change the bar in the package and never change it in a room — measured, with an icon that outlived the file it came from. Editing the live panel configuration was tried instead and destroyed the panel, because the shell owns that file. Removing it before the shell starts is safe and makes the desktop stateless. Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
co-authored by
Claude Opus 5
parent
18cf0249dd
commit
d2d30d6b0c
+16
-21
@@ -133,9 +133,6 @@ install -Dm644 \
|
||||
"$ROOT/lib/classroom_config.py" \
|
||||
"$STAGE/usr/local/lib/ekklesia-classroom/classroom_config.py"
|
||||
|
||||
install -Dm644 \
|
||||
"$ROOT/lib/classroom_chrome.py" \
|
||||
"$STAGE/usr/local/lib/ekklesia-classroom/classroom_chrome.py"
|
||||
|
||||
|
||||
install -Dm644 \
|
||||
@@ -257,9 +254,9 @@ install -Dm644 \
|
||||
"$ROOT/config/plasma/solid/ekklesia-dvd.desktop" \
|
||||
"$STAGE/usr/share/solid/actions/ekklesia-dvd.desktop"
|
||||
|
||||
# Wonder Ink needs a mark of its own. Parent Call does not: it uses
|
||||
# Breeze's call-outgoing, so there is one fewer drawing to maintain.
|
||||
for icon in ekklesia-wonderink; do
|
||||
# Two marks the classroom draws itself, because nothing in Breeze says
|
||||
# either thing: a lesson, and fetching a child's grown-up.
|
||||
for icon in ekklesia-wonderink ekklesia-parent-call; do
|
||||
install -Dm644 \
|
||||
"$ROOT/config/icons/${icon}.svg" \
|
||||
"$STAGE/usr/share/icons/hicolor/scalable/apps/${icon}.svg"
|
||||
@@ -275,6 +272,10 @@ install -Dm644 \
|
||||
"$ROOT/systemd/user/ekklesia-classroom-audio.service" \
|
||||
"$STAGE/etc/systemd/user/ekklesia-classroom-audio.service"
|
||||
|
||||
install -Dm644 \
|
||||
"$ROOT/systemd/user/ekklesia-classroom-desktop.service" \
|
||||
"$STAGE/etc/systemd/user/ekklesia-classroom-desktop.service"
|
||||
|
||||
install -Dm755 \
|
||||
"$ROOT/scripts/classroom-wonderink" \
|
||||
"$STAGE/usr/local/bin/classroom-wonderink"
|
||||
@@ -287,6 +288,14 @@ install -Dm755 \
|
||||
"$ROOT/scripts/classroom-parent-call" \
|
||||
"$STAGE/usr/local/bin/classroom-parent-call"
|
||||
|
||||
install -Dm755 \
|
||||
"$ROOT/scripts/classroom-desktop-layout" \
|
||||
"$STAGE/usr/local/bin/classroom-desktop-layout"
|
||||
|
||||
install -Dm755 \
|
||||
"$ROOT/scripts/classroom-desktop-reset" \
|
||||
"$STAGE/usr/local/bin/classroom-desktop-reset"
|
||||
|
||||
install -Dm755 \
|
||||
"$ROOT/scripts/classroom-theme" \
|
||||
"$STAGE/usr/local/bin/classroom-theme"
|
||||
@@ -299,18 +308,7 @@ install -Dm644 \
|
||||
"$ROOT/lib/classroom_parent_call.py" \
|
||||
"$STAGE/usr/local/lib/ekklesia-classroom/classroom_parent_call.py"
|
||||
|
||||
# Still here, and still sway-shaped.
|
||||
#
|
||||
# The DVD control surface and the MQTT notifier were deliberately not
|
||||
# rewritten in this change, because the room's disc playback works and
|
||||
# breaking it to tidy the tree would be a bad trade. classroom-window and
|
||||
# classroom_sway speak sway's IPC, so the DVD player's focus handling is
|
||||
# the one part of the classroom that does NOT yet work on this desktop.
|
||||
# See docs/classroom-v2-experiment.md.
|
||||
install -Dm755 \
|
||||
"$ROOT/scripts/classroom-window" \
|
||||
"$STAGE/usr/local/bin/classroom-window"
|
||||
|
||||
# The notifier the MQTT service uses to put a church message on screen.
|
||||
install -Dm755 \
|
||||
"$ROOT/scripts/classroom-notify" \
|
||||
"$STAGE/usr/local/bin/classroom-notify"
|
||||
@@ -319,9 +317,6 @@ install -Dm755 \
|
||||
"$ROOT/scripts/classroom-notify-test" \
|
||||
"$STAGE/usr/local/bin/classroom-notify-test"
|
||||
|
||||
install -Dm644 \
|
||||
"$ROOT/lib/classroom_sway.py" \
|
||||
"$STAGE/usr/local/lib/ekklesia-classroom/classroom_sway.py"
|
||||
|
||||
install -Dm644 \
|
||||
"$ROOT/lib/classroom_optical.py" \
|
||||
|
||||
Reference in New Issue
Block a user