ekklesiaandClaude Opus 5
f65c814eff
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]>
189 lines
6.6 KiB
Bash
Executable File
189 lines
6.6 KiB
Bash
Executable File
#!/bin/bash
|
|
set -uo pipefail
|
|
|
|
# Secondary Chrome windows: which window is which, how a popup is placed,
|
|
# and which one the dock offers to close.
|
|
#
|
|
# tests/test-classroom-chrome-windows.sh
|
|
|
|
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
|
|
|
PYTHONPATH="$ROOT/lib" python3 - "$ROOT" <<'PY'
|
|
import importlib.machinery
|
|
import importlib.util
|
|
import json
|
|
import os
|
|
import sys
|
|
import tempfile
|
|
from pathlib import Path
|
|
|
|
from classroom_chrome import ChromeRoles, chrome_windows
|
|
|
|
root = Path(sys.argv[1])
|
|
path = root / "scripts/classroom-chrome-windows"
|
|
loader = importlib.machinery.SourceFileLoader("classroom_chrome_windows", str(path))
|
|
spec = importlib.util.spec_from_loader(loader.name, loader)
|
|
script = importlib.util.module_from_spec(spec)
|
|
loader.exec_module(script)
|
|
|
|
source = path.read_text()
|
|
dock_source = (root / "scripts/classroom-dock").read_text()
|
|
|
|
passed = failed = 0
|
|
|
|
|
|
def check(label, condition, detail=""):
|
|
global passed, failed
|
|
if condition:
|
|
print(f" ok {label}")
|
|
passed += 1
|
|
else:
|
|
print(f" FAIL {label}")
|
|
if detail:
|
|
print(f" {detail}")
|
|
failed += 1
|
|
|
|
|
|
def window(identifier, title, floating=False, hidden=False, focused=False):
|
|
return {
|
|
"id": identifier,
|
|
"app_id": "google-chrome",
|
|
"class": "",
|
|
"instance": "",
|
|
"pid": 4242,
|
|
"name": title,
|
|
"focused": focused,
|
|
"floating": floating,
|
|
"hidden": hidden,
|
|
}
|
|
|
|
|
|
print("1. creation order decides which window is the browser")
|
|
roles = ChromeRoles()
|
|
main = window(5, "Main browser - Google Chrome")
|
|
popup = window(8, "about:blank - Google Chrome")
|
|
|
|
change = roles.update([main])
|
|
check("the first Chrome window is the browser", change["primary"] == 5)
|
|
check("it is not a popup", change["new_secondary"] == [])
|
|
|
|
change = roles.update([main, popup])
|
|
check("a later Chrome window is a popup", change["new_secondary"] == [8])
|
|
check("the browser stays the browser", change["primary"] == 5)
|
|
|
|
renamed_main = window(5, "Something else entirely")
|
|
renamed_popup = window(8, "A different page title")
|
|
change = roles.update([renamed_main, renamed_popup])
|
|
check("titles never change a role",
|
|
change["primary"] == 5 and not change["new_secondary"])
|
|
check("a shared PID never confuses roles",
|
|
len(chrome_windows([renamed_main, renamed_popup])) == 2)
|
|
|
|
print()
|
|
print("2. several popups at once")
|
|
third = window(9, "Third window")
|
|
change = roles.update([main, popup, third])
|
|
check("a third top-level is also a popup", change["new_secondary"] == [9])
|
|
change = roles.update([main, popup])
|
|
check("closing one leaves the other a popup", roles.secondary == [8])
|
|
check("the closed one is reported", change["removed"] == [9])
|
|
|
|
print()
|
|
print("3. how a popup is placed")
|
|
commands = []
|
|
script.command = lambda argument: commands.append(argument)
|
|
|
|
script.SETTLE_SECONDS = 0
|
|
script.configure_secondary(8)
|
|
check("floats exactly one container", commands[0] == "[con_id=8] floating enable")
|
|
check("borderless, like the main browser", commands[1] == "[con_id=8] border none")
|
|
check("about three quarters of the output",
|
|
"width 76 ppt height 76 ppt" in commands[2], commands)
|
|
check("centred", commands[3] == "[con_id=8] move position center")
|
|
check("focused", commands[4] == "[con_id=8] focus")
|
|
# Chrome resizes a popup after the fact, so the placement is repeated
|
|
# once the size has settled or the window ends up off to one side.
|
|
check("placed again after Chrome settles",
|
|
commands[-1] == "[con_id=8] move position center"
|
|
and "width 76 ppt" in commands[-2], commands)
|
|
check("placed exactly twice, never on a loop",
|
|
commands.count("[con_id=8] move position center") == 2, commands)
|
|
check("never matches all Chrome windows at once",
|
|
all("app_id" not in item for item in commands))
|
|
|
|
commands.clear()
|
|
script.configure_primary(8)
|
|
check("a promoted window goes back to tiled",
|
|
commands[0] == "[con_id=8] floating disable")
|
|
check("and borderless", commands[1] == "[con_id=8] border none")
|
|
|
|
print()
|
|
print("4. which popup the dock offers to close")
|
|
chrome = {5: window(5, "main", focused=True), 8: window(8, "popup")}
|
|
check("none while the main browser is focused",
|
|
script.focused_secondary([8], chrome) is None)
|
|
|
|
chrome = {5: window(5, "main"), 8: window(8, "popup", focused=True)}
|
|
check("the focused popup", script.focused_secondary([8], chrome) == 8)
|
|
|
|
chrome = {8: window(8, "one"), 9: window(9, "two", focused=True)}
|
|
check("the focused one of several", script.focused_secondary([8, 9], chrome) == 9)
|
|
|
|
chrome = {8: window(8, "one", hidden=True, focused=True)}
|
|
check("never a minimised one", script.focused_secondary([8], chrome) is None)
|
|
|
|
check("nothing focused means nothing to close",
|
|
script.focused_secondary([8], {8: window(8, "p")}) is None)
|
|
|
|
print()
|
|
print("5. the state the dock reads")
|
|
work = Path(tempfile.mkdtemp())
|
|
state = work / "chrome-close-target"
|
|
|
|
script.publish(9, state)
|
|
check("publishes the container id", state.read_text().strip() == "9")
|
|
check("published by rename, not left half written",
|
|
not (work / "chrome-close-target.tmp").exists())
|
|
|
|
script.publish(None, state)
|
|
check("empty when there is nothing to close", state.read_text().strip() == "")
|
|
|
|
print()
|
|
print("6. the dock owns the button, not the window")
|
|
check("no layer-shell surface in the window helper",
|
|
"GtkLayerShell" not in source)
|
|
check("no second GTK process spawned for a button",
|
|
"Gtk.main" not in source and "show_close_button" not in source)
|
|
check("no geometry maths chasing a window",
|
|
"output_rect" not in source and "button_margins" not in source)
|
|
check("the dock has a close action", '"close"' in dock_source)
|
|
check("the dock closes exactly one container",
|
|
'[con_id={self.close_target}] kill' in dock_source)
|
|
check("the dock never kills Chrome processes",
|
|
"pkill" not in dock_source and "killall" not in dock_source)
|
|
check("the dock watches rather than polls for it",
|
|
"monitor_directory" in dock_source)
|
|
|
|
print()
|
|
print("7. driven by Sway events, not a poll")
|
|
check("subscribes to window events", '"-t", "subscribe"' in source)
|
|
check("ignores title churn",
|
|
"title" not in script.INTERESTING and "new" in script.INTERESTING)
|
|
check("reacts to focus and movement",
|
|
{"focus", "move", "close"} <= set(script.INTERESTING))
|
|
check("no polling loop constant", "POLL_SECONDS" not in source)
|
|
|
|
print()
|
|
print("8. the session still starts it")
|
|
config = (root / "config/sway/config").read_text()
|
|
check("started with the session",
|
|
"exec --no-startup-id /usr/local/bin/classroom-chrome-windows" in config)
|
|
check("no broad Chrome floating rule",
|
|
not any("floating enable" in line and "google-chrome" in line
|
|
for line in config.splitlines()))
|
|
|
|
print()
|
|
print(f"passed: {passed} failed: {failed}")
|
|
sys.exit(1 if failed else 0)
|
|
PY
|