fix: keep the dock's Close button reachable

The Close button followed focus, and moving the pointer down to the dock
moves focus off the popup. So the button disappeared somewhere on the
journey to it, and a secondary Chrome window could not be closed with a
mouse at all. Found on the endpoint; my fault.

The target is remembered instead. Once a secondary window has been
focused the dock keeps offering to close it, and losing focus — to the
dock, the main browser, a print dialog, any layer-shell surface —
changes nothing. It moves on only when that window closes or another
secondary takes over, and it falls back to another open secondary rather
than to nothing, so cancelling a print dialog leaves the render window
still closeable. It is chosen from the secondary list, which never
contains the first window, so it can never name the main browser.

Restoring the floating role to a window that already existed no longer
moves or focuses it. Moving it would undo wherever the teacher dragged
it; focusing it would raise the render window over the print dialog
sitting above it, which is one way the print flow was getting disturbed.

Verified by driving a real pointer through the exact path that was
broken: pointer over the popup, click to focus, then travel down to the
dock in steps, screenshotting throughout. The button is still there on
arrival, at 992,1041. Then the print flow: main browser, render window
and a separate Print dialog, pointer to the dock, button still there,
and killing the dialog leaves the render window as the new target with
the main browser untouched.

The button's own action could not be actuated in that harness, because
synthetic pointer input does not reach Wayland clients under headless
sway — the Browser button does not respond to it either. The action was
run directly instead, closing exactly the remembered container and
leaving main Chrome alive.

Co-Authored-By: Claude Opus 5 <[email protected]>

tests/test-classroom-chrome-windows.sh

@@ -111,6 +111,16 @@ check("placed exactly twice, never on a loop",
 check("never matches all Chrome windows at once",
       all("app_id" not in item for item in commands))
 
+commands.clear()
+script.configure_secondary(8, arriving=False)
+check("restoring the role never moves the window",
+      not any("move position" in item for item in commands), commands)
+check("restoring the role never raises it over a dialog",
+      not any("focus" in item for item in commands), commands)
+check("it only puts the window back to floating and borderless",
+      commands == ["[con_id=8] floating enable", "[con_id=8] border none"],
+      commands)
+
 commands.clear()
 script.configure_primary(8)
 check("a promoted window goes back to tiled",
@@ -118,22 +128,51 @@ check("a promoted window goes back to tiled",
 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)
+print("4. the dock's Close target survives losing focus")
+# The whole point: the pointer has to travel from the popup down to the
+# dock, and that moves focus. If the target followed focus the button
+# would vanish before anyone could reach it.
+active = script.ActiveSecondary()
+
+chrome = {5: window(5, "main", focused=True)}
+check("nothing to close with only the main browser",
+      active.update([], chrome) is None)
 
 chrome = {5: window(5, "main"), 8: window(8, "popup", focused=True)}
-check("the focused popup", script.focused_secondary([8], chrome) == 8)
+check("a focused popup becomes the target", active.update([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 = {5: window(5, "main"), 8: window(8, "popup")}
+check("it stays the target when nothing is focused",
+      active.update([8], chrome) == 8)
 
-chrome = {8: window(8, "one", hidden=True, focused=True)}
-check("never a minimised one", script.focused_secondary([8], chrome) is None)
+chrome = {5: window(5, "main", focused=True), 8: window(8, "popup")}
+check("it stays when focus moves to the main browser",
+      active.update([8], chrome) == 8)
+check("the main browser is never the target", active.target != 5)
 
-check("nothing focused means nothing to close",
-      script.focused_secondary([8], {8: window(8, "p")}) is None)
+chrome = {5: window(5, "main"), 8: window(8, "popup"), 9: window(9, "dialog", focused=True)}
+check("a newer focused popup takes over", active.update([8, 9], chrome) == 9)
+
+chrome = {5: window(5, "main"), 8: window(8, "popup"), 9: window(9, "dialog")}
+check("and keeps it after focus moves to the dock",
+      active.update([8, 9], chrome) == 9)
+
+chrome = {5: window(5, "main"), 8: window(8, "popup")}
+check("closing the dialog falls back to the render window",
+      active.update([8], chrome) == 8)
+
+chrome = {5: window(5, "main")}
+check("closing the last popup clears it", active.update([], chrome) is None)
+
+fresh = script.ActiveSecondary()
+chrome = {5: window(5, "main", focused=True), 8: window(8, "popup")}
+check("an unfocused popup is still closeable",
+      fresh.update([8], chrome) == 8)
+
+hidden = script.ActiveSecondary()
+chrome = {8: window(8, "one", hidden=True)}
+check("a minimised popup is not adopted",
+      hidden.update([8], chrome) is None)
 
 print()
 print("5. the state the dock reads")