fix: put the popup close button in the dock, and clear the printer location
Three things, none of them redesigns. The close affordance for a secondary Chrome window was a separate layer-shell surface anchored to that window's corner, repositioned by a five-per-second poll. Any position change tore the surface down and built another, so on real hardware it chased the window and flickered. Removed entirely: the GTK button process, the geometry maths that placed it, the --close-button mode that spawned it, and the poll loop that drove it. The window helper no longer imports GTK at all. The behaviour underneath it was right and is kept. The first Chrome top-level is the classroom browser, tiled and borderless; later ones float centred at about three quarters of the output. Creation order is the only thing that can tell them apart — confirmed on a real session, where every Chrome top-level shares app_id, shell, PID and a null transient_for, and sway exposes no window properties for Wayland toplevels at all. Titles are still not used. It now follows sway's own window events instead of polling, so dragging a popup costs nothing. Close moved into the dock, which was already on screen and does not move, so it cannot chase anything. It appears only while a secondary window is focused and runs kill on that one container. The helper publishes which window that is; the dock watches the file rather than polling. A stock sway title bar has no close button, so restoring the border would not have solved this either. Two bugs found by looking rather than by testing state. Chrome renegotiates the size of a popup opened with explicit dimensions after the resize returns, which left windows centred for a width they no longer had; placement now settles and repeats once, at creation only, so dragging is still free. And the dock's Close button came up empty because show_all does not recurse into a no-show-all widget. The printer's Location is now blank. CUPS prints it under the queue name in every dialog, so "Ekklesia Classroom" was a second line the teacher had to read past; the identity is one word. The already-configured check includes Location, so a machine set up before this is corrected rather than left as close enough. Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
ekklesia
co-authored by
Claude Opus 5
Claude Opus 5
parent
a1d8150d7c
commit
f65c814eff
@@ -35,18 +35,119 @@ check_absent() {
|
||||
fi
|
||||
}
|
||||
|
||||
mkdir -p "$WORK/bin"
|
||||
mkdir -p "$WORK/bin" "$WORK/state"
|
||||
|
||||
for command in lpadmin cupsenable cupsaccept; do
|
||||
cat > "$WORK/bin/$command" <<'SHIM'
|
||||
cat > "$WORK/bin/lpadmin" <<'SHIM'
|
||||
#!/bin/bash
|
||||
echo "$(basename "$0") $*" >> "$CUPS_LOG"
|
||||
SHIM
|
||||
echo "lpadmin $*" >> "$CUPS_LOG"
|
||||
|
||||
if [[ "$1" == "-x" ]]; then
|
||||
rm -f "$CUPS_STATE/legacy"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ "$1" == "-d" ]]; then
|
||||
echo "$2" > "$CUPS_STATE/default"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
queue=""
|
||||
uri=""
|
||||
description=""
|
||||
location=""
|
||||
location_given=false
|
||||
printout=""
|
||||
color=""
|
||||
model=false
|
||||
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case "$1" in
|
||||
-p) queue="$2"; shift 2 ;;
|
||||
-v) uri="$2"; shift 2 ;;
|
||||
-m) model=true; shift 2 ;;
|
||||
-D) description="$2"; shift 2 ;;
|
||||
-L) location="$2"; location_given=true; shift 2 ;;
|
||||
-o)
|
||||
[[ "$2" == PrintoutMode=* ]] && printout="${2#*=}"
|
||||
[[ "$2" == ColorModel=* ]] && color="${2#*=}"
|
||||
shift 2
|
||||
;;
|
||||
*) shift ;;
|
||||
esac
|
||||
done
|
||||
|
||||
[[ -n "$queue" ]] || exit 0
|
||||
[[ -z "$uri" ]] || echo "$uri" > "$CUPS_STATE/uri"
|
||||
[[ -z "$description" ]] || echo "$description" > "$CUPS_STATE/description"
|
||||
[[ "$location_given" == false ]] || printf '%s' "$location" > "$CUPS_STATE/location"
|
||||
|
||||
# Match CUPS on Trixie: PPD choices sent while selecting the model are not
|
||||
# retained. The production helper must set them in a follow-up request.
|
||||
if [[ "$model" == false ]]; then
|
||||
[[ -z "$printout" ]] || echo "$printout" > "$CUPS_STATE/printout"
|
||||
[[ -z "$color" ]] || echo "$color" > "$CUPS_STATE/color"
|
||||
fi
|
||||
|
||||
touch "$CUPS_STATE/queue"
|
||||
SHIM
|
||||
|
||||
cat > "$WORK/bin/cupsenable" <<'SHIM'
|
||||
#!/bin/bash
|
||||
echo "cupsenable $*" >> "$CUPS_LOG"
|
||||
touch "$CUPS_STATE/enabled"
|
||||
SHIM
|
||||
|
||||
cat > "$WORK/bin/cupsaccept" <<'SHIM'
|
||||
#!/bin/bash
|
||||
echo "cupsaccept $*" >> "$CUPS_LOG"
|
||||
touch "$CUPS_STATE/accepting"
|
||||
SHIM
|
||||
|
||||
cat > "$WORK/bin/lpstat" <<'SHIM'
|
||||
#!/bin/bash
|
||||
[[ "${FAKE_CUPS_RUNNING:-true}" == "true" ]]
|
||||
case "$1" in
|
||||
-r)
|
||||
[[ "${FAKE_CUPS_RUNNING:-true}" == "true" ]]
|
||||
;;
|
||||
-v)
|
||||
[[ -f "$CUPS_STATE/queue" ]] || exit 1
|
||||
echo "device for Elmer: $(cat "$CUPS_STATE/uri")"
|
||||
;;
|
||||
-a)
|
||||
[[ -f "$CUPS_STATE/accepting" ]] || exit 1
|
||||
echo "Elmer accepting requests since now"
|
||||
;;
|
||||
-d)
|
||||
[[ -f "$CUPS_STATE/default" ]] || exit 1
|
||||
echo "system default destination: $(cat "$CUPS_STATE/default")"
|
||||
;;
|
||||
-l)
|
||||
[[ -f "$CUPS_STATE/queue" ]] || exit 1
|
||||
echo "printer Elmer is idle. enabled since now"
|
||||
echo " Description: $(cat "$CUPS_STATE/description")"
|
||||
echo " Location: $(cat "$CUPS_STATE/location" 2>/dev/null || true)"
|
||||
;;
|
||||
-p)
|
||||
if [[ "$2" == "Classroom_Color" ]]; then
|
||||
[[ -f "$CUPS_STATE/legacy" ]] || exit 1
|
||||
echo "printer Classroom_Color is idle. enabled since now"
|
||||
else
|
||||
[[ -f "$CUPS_STATE/queue" ]] || exit 1
|
||||
enabled=disabled
|
||||
[[ -f "$CUPS_STATE/enabled" ]] && enabled=enabled
|
||||
echo "printer Elmer is idle. $enabled since now"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
SHIM
|
||||
|
||||
cat > "$WORK/bin/lpoptions" <<'SHIM'
|
||||
#!/bin/bash
|
||||
[[ -f "$CUPS_STATE/queue" ]] || exit 1
|
||||
printout="$(cat "$CUPS_STATE/printout")"
|
||||
color="$(cat "$CUPS_STATE/color")"
|
||||
echo "PrintoutMode/Printout Mode: Draft *${printout} High"
|
||||
echo "ColorModel/Color Mode: Gray *${color}"
|
||||
SHIM
|
||||
|
||||
cat > "$WORK/bin/lpinfo" <<'SHIM'
|
||||
@@ -58,37 +159,71 @@ else
|
||||
fi
|
||||
SHIM
|
||||
|
||||
cat > "$WORK/bin/systemctl" <<'SHIM'
|
||||
#!/bin/bash
|
||||
echo "systemctl $*" >> "$SERVICE_LOG"
|
||||
SHIM
|
||||
|
||||
chmod +x "$WORK/bin"/*
|
||||
export PATH="$WORK/bin:$PATH"
|
||||
export CUPS_LOG="$WORK/cups.log"
|
||||
export SERVICE_LOG="$WORK/services.log"
|
||||
export CUPS_STATE="$WORK/state"
|
||||
export CLASSROOM_PRINTER_SETUP_TESTING=true
|
||||
|
||||
run() {
|
||||
"$SCRIPT" "$@" 2>&1
|
||||
}
|
||||
|
||||
echo "1. creates the explicit classroom queue"
|
||||
echo "1. provisions the site printer exactly"
|
||||
: > "$CUPS_LOG"
|
||||
out="$(run 10.20.30.40)"
|
||||
: > "$SERVICE_LOG"
|
||||
touch "$CUPS_STATE/legacy"
|
||||
out="$(run)"
|
||||
log="$(cat "$CUPS_LOG")"
|
||||
check "uses AppSocket by IP" "-v socket://10.20.30.40:9100" "$log"
|
||||
services="$(cat "$SERVICE_LOG")"
|
||||
check "uses the verified site AppSocket URI" "-v socket://10.10.0.155:9100" "$log"
|
||||
check "creates the Elmer queue" "lpadmin -p Elmer" "$log"
|
||||
check "description is Elmer" "-D Elmer" "$log"
|
||||
check "uses Trixie's generic color PCL 6 driver" \
|
||||
"Generic-PCL_6_PCL_XL_Printer-pxlcolor.ppd" "$log"
|
||||
check "uses one stable queue name" "lpadmin -p Classroom_Color" "$log"
|
||||
check "enables the queue" "cupsenable Classroom_Color" "$log"
|
||||
check "accepts jobs" "cupsaccept Classroom_Color" "$log"
|
||||
check "defaults the queue" "lpadmin -d Classroom_Color" "$log"
|
||||
check "reports offline-safe behavior" "may remain offline" "$out"
|
||||
check "forces normal quality" "-o PrintoutMode=Normal" "$log"
|
||||
check "forces color" "-o ColorModel=Color" "$log"
|
||||
check "sets driver defaults after selecting the PPD" \
|
||||
"lpadmin -p Elmer -o PrintoutMode=Normal -o ColorModel=Color" "$log"
|
||||
check "enables Elmer" "cupsenable Elmer" "$log"
|
||||
check "accepts jobs" "cupsaccept Elmer" "$log"
|
||||
check "defaults Elmer" "lpadmin -d Elmer" "$log"
|
||||
check "removes the legacy queue" "lpadmin -x Classroom_Color" "$log"
|
||||
check "disables Avahi service and socket" "disable --now avahi-daemon.socket avahi-daemon.service" "$services"
|
||||
check "masks Avahi service and socket" "mask avahi-daemon.socket avahi-daemon.service" "$services"
|
||||
check "reports color defaults" "PrintoutMode=Normal, ColorModel=Color" "$out"
|
||||
# The teacher-facing identity is just "Elmer". CUPS prints Location under
|
||||
# the queue name in every print dialog, so it has to be empty.
|
||||
check "passes an empty Location to CUPS" "-D Elmer -L" "$log"
|
||||
check "no location text is written" "0" \
|
||||
"$(grep -c 'Ekklesia Classroom' "$CUPS_LOG")"
|
||||
check "the queue is left with no location" "" \
|
||||
"$(cat "$CUPS_STATE/location" 2>/dev/null)"
|
||||
|
||||
echo
|
||||
echo "2. repeated setup updates the same queue"
|
||||
run 10.20.30.40 >/dev/null
|
||||
configs="$(grep -c '^lpadmin -p Classroom_Color' "$CUPS_LOG")"
|
||||
check "two runs configured the same queue twice" "2" "$configs"
|
||||
check_absent "no generated queue suffix" "Classroom_Color_" "$(cat "$CUPS_LOG")"
|
||||
echo "2. a correct repeated run is a quick no-op"
|
||||
: > "$CUPS_LOG"
|
||||
out="$(run)"
|
||||
check "reports already configured" "Elmer is already correctly configured" "$out"
|
||||
check "does not rewrite the queue" "0" "$(wc -l < "$CUPS_LOG")"
|
||||
|
||||
echo
|
||||
echo "3. explicit URIs and non-default setup"
|
||||
echo "2b. a machine configured the old way is corrected"
|
||||
printf 'Ekklesia Classroom' > "$CUPS_STATE/location"
|
||||
: > "$CUPS_LOG"
|
||||
out="$(run)"
|
||||
check "notices the stale location" "configuring Elmer" "$out"
|
||||
check "clears it" "" "$(cat "$CUPS_STATE/location" 2>/dev/null)"
|
||||
check "and then settles" "Elmer is already correctly configured" "$(run)"
|
||||
|
||||
echo
|
||||
echo "3. explicit URI remains available for administration"
|
||||
: > "$CUPS_LOG"
|
||||
run --no-default ipp://printer.example.test/ipp/print >/dev/null
|
||||
log="$(cat "$CUPS_LOG")"
|
||||
@@ -104,7 +239,8 @@ else
|
||||
fi
|
||||
|
||||
export FAKE_DRIVER_PRESENT=false
|
||||
if out="$(run 10.20.30.40)"; then
|
||||
rm -f "$CUPS_STATE/queue"
|
||||
if out="$(run)"; then
|
||||
check "missing driver fails" "failure" "unexpected success"
|
||||
else
|
||||
check "missing driver is explained" "generic color PCL 6 driver is not installed" "$out"
|
||||
|
||||
Reference in New Issue
Block a user