One keyboard and mouse for a Mac and a Windows PC over the local network, in either direction.
Beamer 1.5.3
Toby Kalkmancbe8317c1295
diff --git a/README.md b/README.mdindex ddcd890..e317d71 100644--- a/README.md+++ b/README.md@@ -22,11 +22,11 @@ Free, with no account. Mac, Windows and Linux downloads are on the [releases pag|---|---|---|| macOS 13 or later, Apple silicon or Intel | `Beamer-<version>.dmg` | One universal app, signed and notarised by Apple || Windows 10 and 11 | `Beamer-Setup-<version>.exe` | Not code-signed; see step 1 below |-| Linux, 64-bit x86 (Flatpak) | [Install from the Kalkman Code repository](https://flatpak.kalkmancode.co.uk/beamer.flatpakref); `Beamer-<version>-x86_64.flatpak` is available as an offline alternative | Tested on Fedora 44 GNOME under Wayland; KDE Plasma is experimental and not yet tested on real hardware; X11 is not yet verified |+| Linux, 64-bit x86 and arm64 (Flatpak) | [Install from the Kalkman Code repository](https://flatpak.kalkmancode.co.uk/beamer.flatpakref); `Beamer-<version>-x86_64.flatpak` and `Beamer-<version>-aarch64.flatpak` are available as an offline alternative | Tested on Fedora 44 GNOME under Wayland; KDE Plasma is experimental and not yet tested on real hardware; X11 is not yet verified |### Install on Linux-Beamer for Linux is a Flatpak for 64-bit x86. There is no AppImage. Fedora, Linux+Beamer for Linux is a Flatpak for 64-bit x86 and arm64. There is no AppImage. Fedora, LinuxMint, Pop!_OS and other distributions with Flatpak can install it with one command:```sh@@ -60,9 +60,9 @@ flatpak uninstall --user uk.co.kalkman.beamerflatpak install --user https://flatpak.kalkmancode.co.uk/beamer.flatpakref```-The downloadable `Beamer-<version>-x86_64.flatpak` bundle remains available from the [releases-page](https://github.com/kalkman-code/beamer/releases/latest) as an offline alternative. To build-for arm64, follow [the Linux instructions](docs/flatpak-build.md).+The downloadable `Beamer-<version>-x86_64.flatpak` and `Beamer-<version>-aarch64.flatpak` bundles+remain available from the [releases page](https://github.com/kalkman-code/beamer/releases/latest)+as an offline alternative; the repository picks the right one for your machine by itself.## Quick start@@ -75,8 +75,9 @@ for arm64, follow [the Linux instructions](docs/flatpak-build.md).Beamer on Windows runs as administrator, so expect one UAC prompt when you open it. On Linux,follow [Install on Linux](#install-on-linux) to install Beamer from the Kalkman Code repository.2. **Pair them.** On one machine, choose Pair a machine to show a six-digit code. On the other,- choose that machine from the list and enter the code. It lasts a minute and works once. If it- does not appear in the list, enter the address shown with its code on the other machine.+ choose that machine from the list and enter the code. It lasts a minute and works once. Or choose+ Pair nearby on both machines, compare the six digits shown on each, and confirm on both. If the+ machine does not appear in the list, enter the address shown with its code on the other machine.3. **Cross.** Push the pointer through the edge you set, or use the shortcut. On Wayland, an edgesends input out and the shortcut brings it back. The other machine's keyboard and pointer comewith it. Cross back through the edge or use the shortcut again.@@ -90,8 +91,8 @@ In your own appearance: light if your GitHub is light, dark if it is dark.<table><tr><th>Mac</th><th>Windows</th></tr>-<tr><td><picture><source media="(prefers-color-scheme: light)" srcset="assets/mac-overview-light.png"><img src="assets/mac-overview-dark.png" width="400" alt="Beamer's Overview page on the Mac: a Pair a machine button and a card for each paired machine, a desktop PC, a laptop and a Linux box, each showing it is linked, with an In use switch and Rename, Leave out, Directions and Remove buttons"></picture></td><td><picture><source media="(prefers-color-scheme: light)" srcset="assets/windows-overview-light.png"><img src="assets/windows-overview-dark.png" width="400" alt="Beamer's Overview page on Windows: a Pair a machine button and a card for each paired machine, a Mac, a laptop and a Linux box, each showing it is linked, with an In use switch and Rename, Directions, Leave out and Remove buttons"></picture></td></tr>-<tr><td><picture><source media="(prefers-color-scheme: light)" srcset="assets/mac-crossing-light.png"><img src="assets/mac-crossing-dark.png" width="400" alt="Beamer's Crossing page on the Mac: a map with this Mac in the middle, a laptop to its left, a desktop PC to its right and a Linux box below, each edge lit where the pointer crosses, and a ledger of how each machine is reached"></picture></td><td><picture><source media="(prefers-color-scheme: light)" srcset="assets/windows-crossing-light.png"><img src="assets/windows-crossing-dark.png" width="400" alt="Beamer's Crossing page on Windows: a map with this PC in the middle, a Mac to its left, a laptop to its right and a Linux box below, each edge lit where the pointer crosses, and a ledger of how each machine is reached"></picture></td></tr>+<tr><td><picture><source media="(prefers-color-scheme: light)" srcset="assets/mac-overview-light.png"><img src="assets/mac-overview-dark.png" width="400" alt="Beamer's Overview page on the Mac: the pairing buttons, Pair nearby first, and a card for each paired machine, a desktop PC, a laptop and a Linux box, each showing it is linked, with an In use switch and Rename, Leave out, Directions and Remove buttons"></picture></td><td><picture><source media="(prefers-color-scheme: light)" srcset="assets/windows-overview-light.png"><img src="assets/windows-overview-dark.png" width="400" alt="Beamer's Overview page on Windows: the pairing buttons, Pair nearby first, and a card for each paired machine, a Mac, a laptop and a Linux box, each showing it is linked, with an In use switch and Rename, Directions, Leave out and Remove buttons"></picture></td></tr>+<tr><td><picture><source media="(prefers-color-scheme: light)" srcset="assets/mac-crossing-light.png"><img src="assets/mac-crossing-dark.png" width="400" alt="Beamer's Crossing page on the Mac: a map with this Mac in the middle, a laptop to its left, a desktop PC to its right and a Linux box below, each edge lit where the pointer crosses, and a ledger of how each machine is reached, its edges and corners as chips"></picture></td><td><picture><source media="(prefers-color-scheme: light)" srcset="assets/windows-crossing-light.png"><img src="assets/windows-crossing-dark.png" width="400" alt="Beamer's Crossing page on Windows: a map with this PC in the middle, a Mac to its left, a laptop to its right and a Linux box below, each edge lit where the pointer crosses, and a ledger of how each machine is reached, its edges and corners as chips"></picture></td></tr><tr><td><picture><source media="(prefers-color-scheme: light)" srcset="assets/mac-design-light.png"><img src="assets/mac-design-dark.png" width="400" alt="Beamer's Design page on the Mac: switches to animate crossings on this Mac and show where the pointer lands, a choice of style for crossing or for the shortcut and menu, shown at the edge, a corner or the notch, and a Light section of preview tiles"></picture></td><td><picture><source media="(prefers-color-scheme: light)" srcset="assets/windows-design-light.png"><img src="assets/windows-design-dark.png" width="400" alt="Beamer's Design page on Windows: switches to animate crossings on this PC and show where the pointer lands, a choice of style for crossing or for the shortcut and menu, shown at the edge or a corner, and a Light section of preview tiles"></picture></td></tr></table>@@ -110,7 +111,8 @@ In your own appearance: light if your GitHub is light, dark if it is dark.- **Either way round.** The Mac drives the PC and the PC drives the Mac. Each machine has a switchper direction, so you can turn one way off and keep the other. Macs can drive Macs, and WindowsPCs can drive Windows PCs, too.-- **Pair them clearly.** Pair a machine is at the top of Overview, and the six digits are centred.+- **Pair them clearly.** Pair a machine and Pair nearby are at the top of Overview. Pair nearby+ shows six digits to compare and confirm on both machines.- **Three machines.** Pair each machine with the others in the group. A chain needs a directpairing between every pair of machines in it.- **The clipboard comes with you.** Text and images, both ways, at the moment you switch. Files@@ -131,10 +133,17 @@ In your own appearance: light if your GitHub is light, dark if it is dark.- **Make it yours.** Glow, Beam and Aperture, or effects in Membrane, Sparks, Instrument, Folio andSelvedge, each with colour packs of its own. Set the effect's Size and Length, the MacBook notchas an outline or an island with a meter, how hard you push before it crosses, and whether settings- windows follow the system's light or dark appearance. Beam fades softly inward from the edge.+ windows follow the system's light or dark appearance. Choose Match display, Half or Quarter for+ the effect frame rate. Beam fades softly inward from the edge.- **Feels like your own.** Each machine sets how the other's pointer moves and scrolls on it, from25% to 400%, and can reverse its scrolling, so a Mac trackpad and a PC mouse each feel right onthe other screen.+- **Hide the pointer on the machine not in use.** On by default, it hides the pointer left behind+ until that machine's own mouse or trackpad moves it, or a machine drives it again, and a PC or+ Linux machine under X11 hides its own pointer while it drives another. Wayland does not allow apps+ to hide the pointer.+- **See where input is.** The Windows and Linux tray icon shows whether input is here, on another+ machine or held here while crossing is paused, like the Mac menu bar icon.- **Out of the way when it should be.** On macOS and Windows, you can choose whether a full-screenapp on each machine holds its edges; it is off by default, and shortcuts still work. A drag thatreaches the edge stays a drag. Switch to a machine that is asleep and Beamer wakes it, where that@@ -162,9 +171,9 @@ About Beamer.|---|---|---|| Overview | Paired machines, where input is, the links and their round trips, Send input and Pause crossing, a switch per direction, Same on all machines, start at login, the update check | Paired machines, where input is, the links and their round trips, Send input and Pause crossing, a switch per direction, Same on all machines, start at sign-in, the update check || Permissions | Accessibility and Input Monitoring, with Relaunch Beamer | None; the firewall check is on Connection |-| Crossing | A map of the arrangement and a ledger of how each machine is reached (edge or its thirds, corner, notch) with its jump key, the full-screen hold, resistance, the shortcut | A map of the arrangement and a ledger of how each machine is reached (edge or its thirds, corner) with its jump key, the full-screen hold, resistance, the shortcut |+| Crossing | A map of the arrangement and a ledger of edge and corner chips for each machine, plus the notch and Return through the notch, with its jump key, full-screen hold, resistance and shortcut | A map of the arrangement and a ledger of edge and corner chips for each machine, with its jump key, full-screen hold, resistance and shortcut || Keyboard | Key mapping, what stays on this Mac, each peer's pointer and scroll speed | Key mapping, including a Mac layout, what stays on this PC, each peer's pointer and scroll speed |-| Design | Crossing and switch styles, colours, Size and Length, landing animation, Match design, notch and trackpad controls, window appearance (System, Light or Dark) | Crossing and switch styles, colours, Size and Length, landing animation, Match design, window appearance (System, Light or Dark) |+| Design | Crossing and switch styles, colours, Size and Length, Frame rate, landing animation, Match design, notch and trackpad controls, window appearance (System, Light or Dark) | Crossing and switch styles, colours, Size and Length, Frame rate, landing animation, Match design, window appearance (System, Light or Dark) || Connection | Hide addresses, a peer's address, port and pairing details | Whether Windows Firewall lets a peer in, with a one-button fix; hide addresses; this PC's address, port and pairing details |Each machine sets its own zones and the machine beyond each one. These settings stay local even@@ -219,13 +228,14 @@ time you overshoot a close button. The default is 120 points; zero switches on c| Way in | Where it triggers | Mac | Windows ||---|---|---|---|| Shortcut | Double-tap the trigger key, or hold it | Yes | Yes |-| Edge | The whole of one outer edge, or the thirds of it you pick in the ledger's Edge cell, measured on the display under the pointer | Yes | Yes |-| Corner | An 8pt box in one corner, needing a diagonal push | Yes | Yes |+| Edge | An edge chip in the ledger; a machine can have several. At a touching edge, only the shared span crosses; a free edge can wrap round | Yes | Yes |+| Corner | A corner chip in the ledger; a machine can have several. Each is an 8pt box needing a diagonal push | Yes | Yes || Notch | The top edge, only within the notch's width | Yes | No |-Edge, corner and notch can all be on at once; with all three thirds lit, the whole edge crosses. On the Mac,-Shortcut and the right-hand edge are on to start with. On Linux under Wayland, the shortcut only-brings input back; the desktop only lets it go to another machine at an edge.+Edges and corners are chips in each machine's ledger, and each machine can have several of each. A+touching edge crosses only along the span where the screens meet; a free edge can wrap round to+another machine. On the Mac, Shortcut and the right-hand edge are on to start with. On Linux under+Wayland, the shortcut only brings input back; the desktop only lets it go to another machine at an edge.- The notch has no pixels to light, so a push there draws on the notch itself. Outline, the default,runs a comet of light round a small tab under the notch that brightens and speeds up with the@@ -242,7 +252,8 @@ brings input back; the desktop only lets it go to another machine at an edge.that screen holds pointer crossings; it does not apply to Beamer's own window. Shortcuts and jumpkeys still work. Wayland cannot detect a full-screen app.- Only one machine's input is on another at a time. The receiving machine can send it home or pass- it on through one of its own configured zones.+ it on through one of its own configured zones. If its driver sends no input for three seconds,+ another machine can take over.- A machine's own switch, menu or shortcut sends input home. On Wayland, the shortcut only bringsinput back.- Switching to a sleeping PC sends wake-on-LAN when that PC supports it.@@ -401,8 +412,9 @@ password. Without it, the Mac reports `Windows is locked — unlock it at the PC<details><summary><strong>Linux</strong></summary>-Linux support has been tested on GNOME; KDE Plasma support is experimental. There is no AppImage. Install the 64-bit x86 Flatpak from the Kalkman-Code repository using [Install on Linux](#install-on-linux), or build for arm64 with [the Flatpak+Linux support has been tested on GNOME; KDE Plasma support is experimental. There is no AppImage. Install the Flatpak, for 64-bit x86 or arm64, from the+Kalkman Code repository using [Install on Linux](#install-on-linux). The arm64 build has so far only+been started in a virtual machine, not on arm64 hardware. To build it yourself, follow [the Flatpakinstructions](docs/flatpak-build.md). On one Fedora 44 GNOME desktop under Wayland, paired with aMac and a Windows PC, the window and tray, pairing, crossing both ways, typing and the clipboardwork, and crossings show their effect through XWayland. X11 runs with Beamer's keyboard, pointer, pairing and clipboard features, but has notdiff --git a/VERSION b/VERSIONindex 4cda8f1..8af85be 100644--- a/VERSION+++ b/VERSION@@ -1 +1 @@-1.5.2+1.5.3diff --git a/WIRE.md b/WIRE.mdindex 4468a42..374fd00 100644--- a/WIRE.md+++ b/WIRE.md@@ -557,9 +557,11 @@ Either way:trackpad's continuous delta in points, or `"line"` for whole wheel notches. Both are in the Mac'sconvention, as version 5 sends them: `dy` and `dx` are Core Graphics' scroll axes 1 and 2 as aMac reports them, the user's scrolling direction already applied, and a Mac receiver posts them- as they stand. A Windows receiver takes positive `dy` as its wheel's positive and positive `dx`- as its horizontal wheel's positive; the `dx` mapping is still to be confirmed- on hardware. Any other sender, a phone included, sends what a Mac would for the same+ as they stand. Positive `dy` moves the view up and positive `dx` moves it left, measured on+ macOS 27. A Windows receiver takes positive `dy` as its wheel's positive and positive `dx` as+ its horizontal wheel's negative, since that wheel's positive moves the view right; X11 and libei+ turn `dx` round the same way, and a Windows or Linux sender turns its horizontal wheel round+ before sending. Any other sender, a phone included, sends what a Mac would for the samemovement. A sender always sends all three; a receiver takes amissing `dx` as 0 and a missing `mode` as `"line"`, as version 5 did.- **Clipboard limits**: text at most 256 KiB as UTF-8. An image at most 8 MiB before base64,@@ -619,7 +621,8 @@ responder's own id. The responder decides under one lock, in this order:drives and is driven at once.5. This machine sent this initiator home, or ended its ownership by force, less than 5 secondsago: `refuse {why: "sent_home"}`.-6. Another peer is the owner: `refuse {why: "owned"}`.+6. Another peer is the owner and has sent input within the last 3 seconds, or this is a+ `stay`: `refuse {why: "owned"}`.7. A `stay` from an initiator that is not the owner: `refuse {why: "malformed"}`.8. Otherwise it accepts, and the initiator is the owner. When it already was, the `focus` movesthe pointer or re-arms the zones in place.@@ -629,8 +632,13 @@ before the pointer is placed, an arrival plays or a lock screen is dealt with. Athis machine whose `route` or `target` is itself malformed cannot be answered with its route andis ignored; the owner's wait for an answer (section 5) covers it.-There is no taking over. A second machine waits until the owner lets go. This differs from-version 5, where any new link replaced the old one.+An idle owner can be taken over by a new take at or after 3 seconds without valid input+received from that owner. The responder measures this with its own monotonic clock, starting+when ownership begins. Re-arms, clipboard messages and heartbeats do not renew activity.+It sends the old owner `switch {route, next: old owner, taken_over_by: new owner}`, ends the+old ownership and releases held input before accepting the new owner. Late input and let-go+messages from the old owner cannot affect the new ownership. The old owner is refused+`sent_home` for 5 seconds, as with an ordinary send-home.**What a non-owner's messages do:**@@ -646,13 +654,13 @@ version 5, where any new link replaced the old one.**Ownership ends** when the owner sends a `focus` naming another target; when its link ends forany reason or is replaced by another from the same peer; when the user removes the peer or turnsits `allow_drive` off; and by force, when this machine sent the owner home and it has not let go-within 1 second. Every time it ends, the responder:+within 1 second; or when another peer takes over the idle owner. Every time it ends, the responder:1. releases every key and button it injected for that owner, before injecting anything else;2. drops its armed zones;3. on a let-go `focus` only, sends the owner its own clipboard when something other than a`clipboard` message changed it while that owner drove (section 5, the clipboard);-4. when it ended in any way but a let-go `focus` and the link is still up, sends+4. when it ended in any way but a let-go `focus` or an idle takeover and the link is still up, sends`refuse {route, why}` on it (`not_allowed` when `allow_drive` was turned off, `sent_home` whenit was ended by force), and from then on drops that link's input, still acknowledging it,until a `focus` of its is accepted again.@@ -735,6 +743,11 @@ unknown key (Encodings).| `next` | `b64`: where input should go. The owner's own id means home || `edge`, `offset` | where to arrive on `next`, both or neither, as in `focus` (`offset` clamped, never malformed for its range) || `display`, `side` | optional pair naming `next`'s display key and the side to arrive at; an unknown display falls back to `edge` and `offset` |+| `taken_over_by` | optional machine id on a switch home: the new driver that took over the responder after the old driver became idle |++Older peers ignore `taken_over_by` and obey the switch home as usual. New peers use a valid+id only on a switch home to say "<machine> took over <driven machine>" through their usual+notice; an unknown machine is named "Another machine". An invalid optional id is ignored.### The route@@ -1318,7 +1331,7 @@ every peer."trigger_key": "alt_r", "shortcut_goes_to": "last", "trigger_style": "double_tap", "double_tap_ms": 300},"design": {"glow_style": "glow", "glow_colour": "colourful", "effect_length": "normal","effect_size": "medium", "effect_pace": 1.0, "effect_size_fraction": 0.045,- "shortcut_arrival": true, "shortcut_arrival_style": "match"},+ "frame_rate": "display", "shortcut_arrival": true, "shortcut_arrival_style": "match"},"groups": ["crossing", "design", "shortcut", "names"],"stamps": {"trigger_style": [1789990000, "<b64>"], "glow_colour": [1790000000, "<b64>"]},"names": {"<id>": {"label": "Studio", "set_at": 1790000000, "by": "<b64>"}}}}@@ -1374,6 +1387,7 @@ every peer.| `effect_size` | `"small"`, `"medium"` or `"large"` || `effect_pace` | number 0.25 to 2.5; when valid it takes precedence over `effect_length` || `effect_size_fraction` | number 0.02 to 0.08; when valid it takes precedence over `effect_size` |+ | `frame_rate` | `"display"`, `"half"` or `"quarter"`: each machine plays at its own display's refresh, or a half or a quarter of it; 1.5.3 and later, absent from older peers, which leaves the receiver's own; an unknown value is dropped || `shortcut_arrival_style` | `"match"`, `"locator"`, or an effect id from `effects.py` |The optional numeric fields are also sent in `design_sync.values`. If absent or invalid, a new@@ -1444,7 +1458,7 @@ even while Same on all machines is off. The state is:{"type":"settings","data":{"on":false,"set_at":1790000000,"by":"<b64>","design_sync":{"set_at":1790000001,"by":"<b64>","values":{"glow_style":"glow","glow_colour":"colourful","effect_length":"normal",- "effect_size":"medium","effect_pace":1.0,"effect_size_fraction":0.045,+ "effect_size":"medium","effect_pace":1.0,"effect_size_fraction":0.045,"frame_rate":"display","shortcut_arrival":true,"shortcut_arrival_style":"match"}}}}```diff --git a/assets/linux-crossing.png b/assets/linux-crossing.pngindex f867247..6fe1fa5 100644Binary files a/assets/linux-crossing.png and b/assets/linux-crossing.png differdiff --git a/assets/linux-design.png b/assets/linux-design.pngindex aca1324..b50dfd9 100644Binary files a/assets/linux-design.png and b/assets/linux-design.png differdiff --git a/assets/linux-overview.png b/assets/linux-overview.pngindex 1c76b28..a78ee80 100644Binary files a/assets/linux-overview.png and b/assets/linux-overview.png differdiff --git a/assets/mac-crossing-dark.png b/assets/mac-crossing-dark.pngindex 86a60ea..f26688b 100644Binary files a/assets/mac-crossing-dark.png and b/assets/mac-crossing-dark.png differdiff --git a/assets/mac-crossing-light.png b/assets/mac-crossing-light.pngindex 2789906..1caa0a2 100644Binary files a/assets/mac-crossing-light.png and b/assets/mac-crossing-light.png differdiff --git a/assets/mac-design-dark.png b/assets/mac-design-dark.pngindex c72246f..f2f4ff8 100644Binary files a/assets/mac-design-dark.png and b/assets/mac-design-dark.png differdiff --git a/assets/mac-design-light.png b/assets/mac-design-light.pngindex d1e9088..c883830 100644Binary files a/assets/mac-design-light.png and b/assets/mac-design-light.png differdiff --git a/assets/mac-overview-dark.png b/assets/mac-overview-dark.pngindex 01e639f..56c9dad 100644Binary files a/assets/mac-overview-dark.png and b/assets/mac-overview-dark.png differdiff --git a/assets/mac-overview-light.png b/assets/mac-overview-light.pngindex 4eec6c2..402e84d 100644Binary files a/assets/mac-overview-light.png and b/assets/mac-overview-light.png differdiff --git a/assets/windows-crossing-dark.png b/assets/windows-crossing-dark.pngindex 9deead5..6e2158a 100644Binary files a/assets/windows-crossing-dark.png and b/assets/windows-crossing-dark.png differdiff --git a/assets/windows-crossing-light.png b/assets/windows-crossing-light.pngindex 3ce5728..52b7857 100644Binary files a/assets/windows-crossing-light.png and b/assets/windows-crossing-light.png differdiff --git a/assets/windows-design-dark.png b/assets/windows-design-dark.pngindex 5f9f1a6..81a435c 100644Binary files a/assets/windows-design-dark.png and b/assets/windows-design-dark.png differdiff --git a/assets/windows-design-light.png b/assets/windows-design-light.pngindex ca1a7fa..84e240d 100644Binary files a/assets/windows-design-light.png and b/assets/windows-design-light.png differdiff --git a/assets/windows-overview-dark.png b/assets/windows-overview-dark.pngindex 88ad0b4..641ee18 100644Binary files a/assets/windows-overview-dark.png and b/assets/windows-overview-dark.png differdiff --git a/assets/windows-overview-light.png b/assets/windows-overview-light.pngindex 0dee126..5b0bf3b 100644Binary files a/assets/windows-overview-light.png and b/assets/windows-overview-light.png differdiff --git a/core/crossing_state.py b/core/crossing_state.pyindex b9316dd..70df322 100644--- a/core/crossing_state.py+++ b/core/crossing_state.py@@ -39,6 +39,11 @@ def _initial(settings, capable=(), fill=True):if ways._zoned(entry):entry["ways"] = ways._read_intent(settings, entry["id"])entry.pop("left_out_ways", None)+ # With no machine in use holding the notch, a left-out one keeps its tick for Put back.+ holder = ways.notch_holder(saved)+ for entry in saved.get("peers", []):+ if holder is not None and ways._zoned(entry) and entry["id"] != holder:+ entry["ways"]["notch"] = Falseif not saved.get("layout"):saved["layout"] = ways.derive_layout(saved, gap=0)elif fill:@@ -129,8 +134,8 @@ def drop(settings, tiles, moved, *, platform, capable, live, gone, now, snap_radreturn _outcome(settings, saved, result, tell=_tells(settings, saved, sides=True), send_picture=True)-def edit_ways(settings, peer, *, platform, edge=None, thirds=None, corner=None,- corner_at=None, notch=None, live, gone, now, capable=()):+def edit_ways(settings, peer, *, platform, edge=None, thirds=None, edges=None, corners=None,+ corner=None, corner_at=None, notch=None, notch_return=None, live, gone, now, capable=()):"""Update only specified choices; an empty third selection keeps the last choice."""saved = _initial(settings, capable)entry = ways._entry(saved, peer)@@ -142,12 +147,33 @@ def edit_ways(settings, peer, *, platform, edge=None, thirds=None, corner=None,for key, value in (("edge", edge), ("corner", corner), ("notch", notch)):if value is not None and (key != "notch" or platform == "mac"):intent[key] = bool(value)+ if notch_return is not None and platform == "mac":+ entry["notch_return"] = bool(notch_return)+ if notch and platform == "mac":+ # One machine has the notch: ticking it here unticks it everywhere else.+ for other in saved.get("peers", []):+ if ways._zoned(other) and other["id"] != peer:+ other["ways"]["notch"] = Falseif thirds is not None:picked = [part for part in ways.PARTS if part in thirds]if picked:intent["thirds"] = picked- if corner_at in ways.CORNERS:- intent["corner_at"] = corner_at+ if edges is not None:+ intent["edges"] = [side for side in ways.EDGES if isinstance(edges, list) and side in edges]+ if corners is not None:+ picked = [value for value in ways.CORNERS if isinstance(corners, list) and value in corners+ and ways.corner_holder(saved, value, exclude=peer) is None]+ intent["corners"] = picked+ intent["corner"] = bool(picked)+ if picked:+ intent["corner_at"] = picked[0]+ if corners is None and (corner is not None or corner_at in ways.CORNERS):+ # 1.5.2's one-corner form: a held corner is refused without a write, keeping the one held.+ wanted = corner_at if corner_at in ways.CORNERS else intent["corner_at"]+ enabled = intent["corner"] if corner is None else bool(corner)+ if enabled and ways.corner_holder(saved, wanted, exclude=peer) is not None:+ return _outcome(settings, accepted=False)+ intent.update(corner_at=wanted, corners=[wanted] if enabled else [], corner=enabled)result = _compile(saved, platform, capable=capable, live=live, gone=gone, now=now)saved = result["settings"]return _outcome(settings, saved, result, tell=_tells(settings, saved))diff --git a/core/easy_pair.py b/core/easy_pair.pynew file mode 100644index 0000000..f693b4a--- /dev/null+++ b/core/easy_pair.py@@ -0,0 +1,206 @@+"""Experimental committed SAS pairing; see docs/spec-easy-pair-1.6.md before release."""++from __future__ import annotations++import hashlib+import hmac+import json+import secrets+import time++from nacl.bindings import crypto_scalarmult_base++from . import pairing as p++PAIR_MODES = ["cpace_v3", "sas_v1"]+EASY_TYPES = frozenset(("easy_commit", "easy_reveal", "easy_proof", "easy_approve"))+DOMAIN = b"beamer-sas-v1/"+WINDOW_SECONDS = 60.0+++def canonical(value):+ return json.dumps(value, sort_keys=True, separators=(",", ":"), ensure_ascii=True).encode("ascii")+++def window_ok(value):+ return isinstance(value, str) and len(value) == 32 and all(c in "0123456789abcdef" for c in value)+++def eligible(machine):+ return (machine.get("pair_modes") == PAIR_MODES and window_ok(machine.get("nearby"))+ and p._id_text_ok(machine.get("id")) and p._name_ok(machine.get("name"))+ and p._platform_ok(machine.get("platform")) and p._port_ok(machine.get("port"))+ and machine.get("port") != 0)+++class EasyPairWindow:+ def __init__(self, name, identity, platform, port, *, clock=time.monotonic, entropy=secrets.token_bytes):+ p._check_own(identity, platform, port)+ self.clock = clock+ self.deadline = clock() + WINDOW_SECONDS+ self.window = entropy(16).hex()+ self._scalar = entropy(32)+ self._nonce = entropy(32)+ self._own = {"nearby": self.window, "id": p._b64(identity), "name": name[:p.MAX_NAME_CHARS],+ "platform": platform, "port": port, "pair_modes": PAIR_MODES.copy()}+ self.peer = None+ self.reveal = None+ self.remote_commit = None+ self.remote_reveal = None+ self._commit = None+ self._digest = None+ self._proof_key = self._approval_key = None+ self._state = "searching"+ self._sas = self.token = None+ self.local_approved = self.remote_approved = self.remote_proved = False++ @property+ def state(self):+ if self.clock() >= self.deadline:+ if self._state not in ("paired", "refused", "inactive", "not_saved", "expired"):+ self.cancel("expired")+ elif self._state == "paired":+ self._forget()+ return self._state++ @property+ def seconds_left(self):+ return max(0, int(self.deadline - self.clock() + 0.999))++ @property+ def active(self):+ return self.state in ("searching", "exchanging", "confirm", "waiting")++ @property+ def sas(self):+ return self._sas if self.state in ("confirm", "waiting") else None++ @property+ def attempt(self):+ return ":".join(sorted((self.window, self.peer["nearby"]))) if self.peer else None++ @property+ def ready(self):+ return self.active and self.remote_proved and self.local_approved and self.remote_approved++ def offer(self, address, reply_port):+ return {**self._own, "address": address, "reply_port": reply_port, "pairing": p.PAIRING_V3}++ def select(self, machine):+ if self.state != "searching" or not eligible(machine):+ raise p.PairingError(p.ERROR_VERSION if not eligible(machine) else p.ERROR_REFUSED)+ if machine["nearby"] == self.window or machine["id"] == self._own["id"]:+ raise p.PairingError(p.ERROR_REFUSED)+ self.peer = {key: machine[key] for key in (*self._own, "address", "reply_port")}+ self.reveal = {**self._own, "to": self.peer["nearby"], "share": p._b64(crypto_scalarmult_base(self._scalar)),+ "nonce": p._b64(self._nonce)}+ self._commit = hashlib.sha512(DOMAIN + b"commit\0" + canonical(self.reveal)).digest()+ self._state = "exchanging"++ def _message(self, kind, **fields):+ return {"type": kind, "from": self.window, "to": self.peer["nearby"], **fields}++ def messages(self):+ state = self.state+ if self.peer is None or state in ("inactive", "refused", "expired", "not_saved") or self.clock() >= self.deadline:+ return []+ messages = [self._message("easy_commit", commit=p._b64(self._commit))]+ if self.remote_commit is not None:+ messages.append(self._message("easy_reveal", reveal=self.reveal))+ if self._digest is not None:+ messages.append(self._message("easy_proof", tag=p._b64(self._tag("proof", self.window))))+ if self.local_approved:+ messages.append(self._message("easy_approve", tag=p._b64(self._tag("approved", self.window))))+ return messages++ def _tag(self, label, sender):+ key = self._proof_key if label == "proof" else self._approval_key+ return hmac.new(key, DOMAIN + label.encode("ascii") + b"\0" + sender.encode("ascii") + self._digest,+ hashlib.sha512).digest()++ def receive(self, message, address):+ if not self.active or self.peer is None or address != self.peer["address"]:+ return+ if message.get("from") != self.peer["nearby"] or message.get("to") != self.window:+ return+ kind = message.get("type")+ field = {"easy_commit": "commit", "easy_reveal": "reveal", "easy_proof": "tag", "easy_approve": "tag"}.get(kind)+ if field is None:+ return+ if set(message) - {"beamy"} != {"type", "from", "to", field}:+ self.cancel("refused")+ return+ try:+ if kind == "easy_commit":+ commit = p._unb64(message["commit"])+ if len(commit) != 64 or (self.remote_commit is not None and not hmac.compare_digest(commit, self.remote_commit)):+ raise p.PairingError(p.ERROR_REFUSED)+ self.remote_commit = commit+ elif kind == "easy_reveal":+ if self.remote_commit is None:+ return+ reveal = message["reveal"]+ if not isinstance(reveal, dict) or set(reveal) != set(self.reveal):+ raise p.PairingError(p.ERROR_REFUSED)+ if not hmac.compare_digest(hashlib.sha512(DOMAIN + b"commit\0" + canonical(reveal)).digest(), self.remote_commit):+ raise p.PairingError(p.ERROR_REFUSED)+ if self.remote_reveal is not None:+ if reveal != self.remote_reveal:+ raise p.PairingError(p.ERROR_REFUSED)+ return+ expected = {key: self.peer[key] for key in self._own}+ if any(reveal[key] != value or type(reveal[key]) is not type(value) for key, value in expected.items()) or reveal["to"] != self.window:+ raise p.PairingError(p.ERROR_REFUSED)+ share, nonce = p._unb64(reveal["share"]), p._unb64(reveal["nonce"])+ if len(share) != 32 or len(nonce) != 32 or not p._machine_id_ok(p._unb64(reveal["id"])):+ raise p.PairingError(p.ERROR_REFUSED)+ shared = p._x25519(self._scalar, share)+ transcript = sorted((self.reveal, reveal), key=lambda item: item["nearby"])+ self._digest = hashlib.sha512(DOMAIN + b"transcript\0" + canonical(transcript)).digest()+ key = hmac.new(self._digest, shared, hashlib.sha512).digest()+ derive = lambda label: hmac.new(key, DOMAIN + label + b"\0" + self._digest, hashlib.sha512).digest()+ self.token = p._b64(derive(b"token")[:32])+ self._proof_key, self._approval_key = derive(b"proof-key"), derive(b"approval-key")+ sas_key = derive(b"sas-key")+ counter = 0+ while True:+ value = int.from_bytes(hmac.new(sas_key, DOMAIN + b"digits\0" + counter.to_bytes(4, "big"), hashlib.sha512).digest()[:4], "big")+ if value < 4294000000:+ self._sas = f"{value % 1000000:06d}"+ break+ counter += 1+ self.remote_reveal = reveal.copy()+ elif self._digest is not None:+ tag = p._unb64(message["tag"])+ label = "proof" if kind == "easy_proof" else "approved"+ if not hmac.compare_digest(tag, self._tag(label, self.peer["nearby"])):+ raise p.PairingError(p.ERROR_REFUSED)+ if kind == "easy_proof":+ self.remote_proved = True+ self._state = "waiting" if self.local_approved else "confirm"+ elif self.remote_proved:+ self.remote_approved = True+ except (p.PairingError, ValueError, TypeError, KeyError, UnicodeError):+ self.cancel("refused")++ def approve(self, sas, attempt):+ if self.state != "confirm" or sas != self.sas or attempt != self.attempt:+ self.cancel("refused")+ raise p.PairingError(p.ERROR_REFUSED)+ self.local_approved = True+ self._state = "waiting"++ def saved(self):+ # Authorisation was checked before store began. A disk write crossing the+ # deadline must still report the entry it actually saved.+ if self._state != "waiting" or not (self.remote_proved and self.local_approved and self.remote_approved):+ raise p.PairingError(p.ERROR_REFUSED)+ self._state = "paired"+ self._scalar = self._nonce = None++ def _forget(self):+ self._scalar = self._nonce = self._proof_key = self._approval_key = self.token = self._sas = None++ def cancel(self, state="inactive"):+ self._state = state+ self._forget()diff --git a/core/effects.py b/core/effects.pyindex 488dc58..0431729 100644--- a/core/effects.py+++ b/core/effects.py@@ -584,7 +584,9 @@ LOCATOR = Effect("locator", "Ring", "quiet", "A ring in the chosen colours close# deepening with the push and flashing through at breakthrough, or a thin line with a comet running# along it that runs off the end; in a corner, the band along both walls, brightest where they meet.CLASSIC_ARM = 200.0-CLASSIC_FLASH_S = 0.35+# The flash the real glow plays as the push goes through: the Mac's EdgeGlow.FLASH_SECONDS (the PC's+# is 0.14). The tiles had 0.35, so Glow lit on for twice as long as it does at the edge.+CLASSIC_FLASH_S = 0.18CLASSIC_FINISH_S = 0.6_CLASSIC_COMET = 0.3_CLASSIC_STOPS = 24@@ -642,7 +644,7 @@ def _classic_depart(beam):if strength <= 0.0:returnw, h = s.screen.w, s.screen.h- full_depth = edge_depth(w, h, getattr(s, "effect_size", "medium"))+ full_depth = edge_depth(w, h, getattr(s, "effect_size", "medium"), getattr(s, "effect_size_fraction", None))depth = full_depth if beam else full_depth * (0.35 + 0.65 * max(pressure, flash))# The comet sweeps as the push builds, then runs off the far end after breakthrough.centre = -0.15 + 1.1 * pressure if since is None else 0.95 + (1.0 + _CLASSIC_COMET) * (1.0 - finish)@@ -735,9 +737,10 @@ def pack(pack_id):return _load()[1].get(pack_id)-def draw(effect_obj, kind, s, origin=(0.0, 0.0)):+def draw(effect_obj, kind, s, origin=(0.0, 0.0), scale=1.0):"""One frame of `kind` ("depart" or "arrive") into a new Pen, or None when it draws nothing.- `origin` shifts everything drawn, for a scene holding more than one screen. A failing effect+ `origin` shifts everything drawn, for a scene holding more than one screen, and `scale` shrinks+ it, strokes and gradients included, for a preview of a full-size screen. A failing effectraises; the caller logs it once and turns the effects off for the run."""limit = effect_obj.depart_seconds if kind == "depart" else effect_obj.arrive_secondssince = getattr(s, "since", None)@@ -748,6 +751,8 @@ def draw(effect_obj, kind, s, origin=(0.0, 0.0)):pen = Pen()if origin != (0.0, 0.0):pen.translate(*origin)+ if scale != 1.0:+ pen.scale(scale, scale)(effect_obj.depart if kind == "depart" else effect_obj.arrive)(pen, s)if kind == "depart" and since is None and s.pressure < PUSH_FADE:# Several designs' reduced-motion pushes draw at a floor opacity however light the push, so@@ -767,9 +772,21 @@ PREVIEW_NOTCH = {"x": 307.5, "y": 0.0, "w": 185.0, "h": 32.0, "r": 10.0}PREVIEW_POINTER = ((0.0, 0.0), (0.0, 1.0), (0.26, 0.76), (0.44, 1.12),(0.56, 1.06), (0.39, 0.7), (0.72, 0.7))PREVIEW_LOOP_S = 4.4+# The previews' screens stand for screens this many times their size: the effects are drawn on a+# 1600 by 900 desktop, as large as they draw on a real one against its edge, and shrunk whole, so+# a tile shows the real thing scaled down rather than an effect drawn for a screen half the size.+PREVIEW_REAL = 2.0_P_GLIDE, _P_PUSH, _P_CROSS, _P_REST = 0.4, 0.6, 2.2, 3.4-# Where still_time looks for a tile's fullest frame, in preview_still_scene's points: the crossing-# with the screens joined at their seam, and the pointer a switch plays round.+# Each tile's resting frame, in seconds from the crossing at pace 1 (before it, the push), picked from+# the effect's real crossing timeline as its most recognisable moment; the renders are in Kalkman-Code's+# docs/beamer-design-previews-10-10.+STILL_AT = {"glow": -0.05, "beam": 0.05, "aperture": 0.0, "skin": 0.10, "film": 0.18,+ "rupture": 0.20, "flint": 0.05, "filings": 0.10, "discharge": 0.10, "rule": 0.0,+ "gauge": 0.20, "rangefinder": 0.08, "crease": 0.03, "pleat": 0.03,+ "concertina": 0.03, "thread": 0.10, "weave": 0.10, "jacquard": 0.10}+# A switch plays only the arrival, round a still pointer: never before 0.1s, and Rupture's rings read+# best before they spread.+SWITCH_AT = {"rupture": 0.15}PREVIEW_TILE_CROPS = {"edge": (680.0, 142.0, 240.0, 120.0),"corner": (680.0, -20.0, 240.0, 120.0),@@ -784,20 +801,22 @@ PREVIEW_TILE_GROUND = "#0e0f0d"PREVIEW_TILE_VIEW = {"edge": (150.0, 340.0), "corner": (150.0, 340.0), "notch": (150.0, 540.0),"switch": (150.0, 540.0)}PREVIEW_TILE_ROOM = 2.5-# A still's marks against the live loop's: a still is read at a glance at thumbnail size, a frame-# of the loop is gone in 16 ms.-PREVIEW_STILL_ALPHA = 2.2+# Below and right of the pointer's tip, in scene points, the arrow's body: kept in every crossing's camera.+PREVIEW_POINTER_ROOM = 24.0PREVIEW_LIGHT_CASING = 0.3# The most relative luminance a mark keeps on the Light card (#f1f0ea, 0.86): 3.4:1 against it.PREVIEW_LIGHT_MARK = 0.22-PREVIEW_STILL_WIDTH = 1.3+# A tile is about this many points across, and no stroke in it is drawn thinner than+# PREVIEW_HAIRLINE points: shrunk whole, an effect's 1pt rules would fall to a third of a pixel and+# vanish, where on screen they read as the hairlines they are. Every mark is lifted by the same+# PREVIEW_MARK_ALPHA and PREVIEW_MARK_WIDTH, the least that keeps every tile at 3:1 on its card, still+# and hovering alike; the 5.9x strokes they replace merged Rupture's rings into one disc and hid its+# torn membrane.+PREVIEW_TILE_POINTS = 200.0+PREVIEW_HAIRLINE = 1.25+PREVIEW_MARK_ALPHA = 2.8+PREVIEW_MARK_WIDTH = 1.6-# Fixed cameras leave room for both legs of the pointer journey, including the arrow's body.-PREVIEW_CROSSING_VIEWS = {- "edge": (500.0, 52.5, 600.0, 300.0),- "corner": (500.0, -20.0, 600.0, 300.0),- "notch": (-40.0, 300.0, 880.0, 440.0),-}def preview_time(still_at, elapsed=None, reduced=False, switch=False):@@ -817,7 +836,7 @@ def preview_size(method):def preview_scene(fx, t, method, palette, reduced=False, dark=True, pace=1.0, effect_size="medium",- effect_size_fraction=None, notch_geometry=None, pointer_t=None):+ effect_size_fraction=None, notch_geometry=None):"""The Design pages' loop, identical on both apps: the pointer glides to the Mac's boundary,pushes through with three ticks, lands on the PC, and rests. Returns dict(screens=[(x, y, w,h, os)], notch=(x, y, w, h, r) or None, pointer=(x, y, os) or None, pens=[Pen]) for time `t`@@ -826,21 +845,23 @@ def preview_scene(fx, t, method, palette, reduced=False, dark=True, pace=1.0, efw, h = PREVIEW_SCREENif method == "notch":pc_origin, mac_origin = (0.0, 0.0), (0.0, h + PREVIEW_GAP)- notch = dict(PREVIEW_NOTCH)+ # PREVIEW_NOTCH and `notch_geometry` are a real notch's points; the scene's screens stand for+ # screens PREVIEW_REAL times their size, so the notch shrinks with the effects drawn round it.+ notch = {key: value / PREVIEW_REAL for key, value in PREVIEW_NOTCH.items()}if notch_geometry is not None:- notch["w"], notch["h"] = notch_geometry- notch["x"] = (w - notch["w"]) / 2.0+ notch["w"], notch["h"] = (value / PREVIEW_REAL for value in notch_geometry)+ notch["x"] = (w - notch["w"]) / 2.0region = {"kind": "notch", "edge": "top", "x": notch["x"], "y": 0.0, "w": notch["w"], "h": 1.0}- at, start = (w / 2.0, 0.0), (w / 2.0 - 90.0, 220.0)- land, land_edge, inside = (w / 2.0 + 10.0, h - 2.0), "bottom", (w / 2.0 + 40.0, h - 140.0)+ at, start = (w / 2.0, 0.0), (w / 2.0 - 50.0, 80.0)+ land, land_edge, inside = (w / 2.0 + 10.0, h - 2.0), "bottom", (w / 2.0 + 30.0, h - 70.0)else:mac_origin, pc_origin = (0.0, 0.0), (w + PREVIEW_GAP, 0.0)if method == "corner":region = {"kind": "corner", "edge": "right", "corner": "top_right", "x": w - 8.0, "y": 0.0, "w": 8.0, "h": 8.0}- at, start, land, inside = (w - 1.0, 0.0), (w - 220.0, 160.0), (2.0, 4.0), (200.0, 140.0)+ at, start, land, inside = (w - 1.0, 0.0), (w - 120.0, 90.0), (2.0, 4.0), (100.0, 80.0)else:region = {"kind": "edge", "edge": "right", "x": w - 1.0, "y": 0.0, "w": 1.0, "h": h}- at, start, land, inside = (w - 1.0, h * 0.45), (w - 260.0, h * 0.55), (2.0, h * 0.45), (240.0, h * 0.5)+ at, start, land, inside = (w - 1.0, h * 0.45), (w - 110.0, h * 0.52), (2.0, h * 0.45), (100.0, h * 0.48)land_edge, notch = "left", Nonescene = {"screens": [mac_origin + (w, h, "mac"), pc_origin + (w, h, "windows")],@@ -850,7 +871,11 @@ def preview_scene(fx, t, method, palette, reduced=False, dark=True, pace=1.0, ef}common = dict(reduced=reduced, dark=dark)palette = legible(palette, dark, fx)- mac_notch = notch if method == "notch" else None+ k = PREVIEW_REAL+ rw, rh = w * k, h * k+ real_region = SimpleNamespace(**{key: value * k if key in ("x", "y", "w", "h") else value+ for key, value in region.items()})+ mac_notch = ({key: value * k for key, value in notch.items()} if method == "notch" else None)# At the notch the hardware covers a pointer pinned at y=0. Show the approach just below# that cutout and the arrival just inside B; effect states still use the real boundary points.pointer_at = (at[0], notch["h"] + 8.0) if method == "notch" else at@@ -870,28 +895,27 @@ def preview_scene(fx, t, method, palette, reduced=False, dark=True, pace=1.0, efif index:crossed_at = _P_PUSH + (_P_CROSS - _P_PUSH) * math.acos(1.0 - 2.0 * index / 4.0) / math.pitick = SimpleNamespace(index=index, age=t - crossed_at)- s = state(w, h, "mac", method, palette, notch=mac_notch, region=SimpleNamespace(**region),- point=point(*at), along=at[1] / h if region["edge"] == "right" else at[0] / w,+ s = state(rw, rh, "mac", method, palette, notch=mac_notch, region=real_region,+ point=point(at[0] * k, at[1] * k), along=at[1] / h if region["edge"] == "right" else at[0] / w,pressure=pressure, tick=tick, since=None, pace=pace, effect_size=effect_size,effect_size_fraction=effect_size_fraction, **common)- pen = draw(fx, "depart", s, mac_origin)+ pen = draw(fx, "depart", s, mac_origin, 1.0 / k)if pen is not None:scene["pens"].append(pen)return scenesince = (t - _P_CROSS) / pace- s = state(w, h, "mac", method, palette, notch=mac_notch, region=SimpleNamespace(**region), point=point(*at),+ s = state(rw, rh, "mac", method, palette, notch=mac_notch, region=real_region, point=point(at[0] * k, at[1] * k),along=0.5, pressure=0.0, tick=None, since=since, pace=pace, effect_size=effect_size,effect_size_fraction=effect_size_fraction, **common)- pen = draw(fx, "depart", s, mac_origin)+ pen = draw(fx, "depart", s, mac_origin, 1.0 / k)if pen is not None:scene["pens"].append(pen)- s = state(w, h, "windows", method, palette, point=point(*land), edge=land_edge, since=since, pace=pace,+ s = state(rw, rh, "windows", method, palette, point=point(land[0] * k, land[1] * k), edge=land_edge, since=since, pace=pace,effect_size=effect_size, effect_size_fraction=effect_size_fraction, **common)- pen = draw(fx, "arrive", s, pc_origin)+ pen = draw(fx, "arrive", s, pc_origin, 1.0 / k)if pen is not None:scene["pens"].append(pen)- # `pointer_t` places the landed pointer at another moment than the effect, as a still does.- u = ease_in_out(clamp(((t if pointer_t is None else pointer_t) - _P_CROSS - 0.1) / (_P_REST - _P_CROSS - 0.1)))+ u = ease_in_out(clamp((t - _P_CROSS - 0.1) / (_P_REST - _P_CROSS - 0.1)))p = (lerp(pointer_land[0], inside[0], u), lerp(pointer_land[1], inside[1], u))scene["pointer"] = (pc_origin[0] + p[0], pc_origin[1] + p[1], "windows")return scene@@ -916,10 +940,11 @@ def preview_switch_scene(fx, t, palette, os_name="mac", reduced=False, dark=Truescene = {"screens": [(0.0, 0.0, w, h, os_name)], "notch": None, "pointer": (at[0], at[1], os_name), "pens": []}since = (t - _S_START) / paceif since >= 0.0:- s = state(w, h, os_name, "switch", legible(palette, dark, fx), reduced=reduced, dark=dark,- effect_size=effect_size, effect_size_fraction=effect_size_fraction, point=point(*at),+ k = PREVIEW_REAL+ s = state(w * k, h * k, os_name, "switch", legible(palette, dark, fx), reduced=reduced, dark=dark,+ effect_size=effect_size, effect_size_fraction=effect_size_fraction, point=point(at[0] * k, at[1] * k),edge=nearest_edge(at[0], at[1], w, h), since=since, pace=pace)- pen = draw(fx, "arrive", s)+ pen = draw(fx, "arrive", s, scale=1.0 / k)if pen is not None:scene["pens"].append(pen)return scene@@ -972,8 +997,9 @@ def _deepened(rgb):return tuple(c * low for c in rgb)-def _stronger(pen, alpha, width, casing_alpha=1.0, deepen=False):- """`pen` with every stroke `width` times as wide and every coloured op `alpha` times as opaque,+def _stronger(pen, alpha, floor, casing_alpha=1.0, deepen=False, width=1.0):+ """`pen` with every stroke `width` times as wide but none thinner than `floor`, every coloured+ op `alpha` times as opaque,gradient stops included, and with `deepen` its colours _deepened. The dark casing most effectsstroke under a mark is not strengthened but taken to `casing_alpha` of its own opacity: drawnfor a desktop, at a tile's zoom on a light card it outlines every mark in black."""@@ -1000,7 +1026,7 @@ def _stronger(pen, alpha, width, casing_alpha=1.0, deepen=False):else:op = op[:2] + (stronger_paint(paint), min(1.0, op[3] * alpha)) + op[4:]if op[0] == "stroke":- op = op[:5] + (op[5] * width,) + op[6:]+ op = op[:5] + (max(op[5] * width, floor),) + op[6:]ops.append(op)pen.ops = opsreturn pen@@ -1019,17 +1045,20 @@ def preview_still_scene(fx, t, place, palette, reduced=False, dark=True, pace=1.if place != "switch" and reduced:t = still_time(fx, place, effect_size, pace, effect_size_fraction)live, reduced = False, False+ if not live and pace != 1.0:+ # A still is the frame its effect shows at Normal, whatever the Length: still_time stretches+ # the moment with the pace, and drawn at that pace the Instrument detents, which keep their+ # holds at any pace, and the landed pointer, which follows the hand, would not match it.+ start = _S_START if place == "switch" else _P_CROSS+ # Rounded: Rupture rests on a phase boundary, which float error from the pace would tip.+ t, pace = (start + round((t - start) / pace, 9) if t > start else t), 1.0if place == "switch":scene = preview_switch_scene(fx, t, palette, reduced=reduced, dark=dark, pace=pace, effect_size=effect_size,effect_size_fraction=effect_size_fraction)scene["seam"] = Noneelse:- # A still is the same frame at every Length (still_time stretches it), the pointer included:- # the hand does not slow with the pace, so it stands where it does at Normal.- pointer_t = _P_CROSS + (t - _P_CROSS) / pace if not live and t > _P_CROSS else Nonescene = preview_scene(fx, t, place, palette, reduced=reduced, dark=dark, pace=pace, effect_size=effect_size,- effect_size_fraction=effect_size_fraction, notch_geometry=notch_geometry,- pointer_t=pointer_t)+ effect_size_fraction=effect_size_fraction, notch_geometry=notch_geometry)# The PC's half moves across the gap onto the Mac's edge. A pen is the PC's when its middle# is past the middle of the gap: an arrival may reach back over the edge it lands at.if place == "notch":@@ -1054,15 +1083,9 @@ def preview_still_scene(fx, t, place, palette, reduced=False, dark=True, pace=1.(pc[0] + shift[0], pc[1] + shift[1], pc[2], pc[3], "windows")]if place == "switch":scene["screens"] = []- reference = PREVIEW_TILE_CROPS[place][2]- width = PREVIEW_STILL_WIDTH * (view_width or reference) / reference- if place != "switch":- # The complete journey has a wider camera than the old specimen. Keep the quiet styles'- # thin marks legible at tile size on both native rasterisers.- width *= 1.8+ floor = PREVIEW_HAIRLINE * (view_width or PREVIEW_TILE_CROPS[place][2]) / PREVIEW_TILE_POINTSfor pen in scene["pens"]:- alpha = PREVIEW_STILL_ALPHA * (1.4 if place != "switch" else 1.0)- _stronger(pen, 1.0 if live else alpha, width, 1.0 if dark else PREVIEW_LIGHT_CASING, not dark)+ _stronger(pen, PREVIEW_MARK_ALPHA, floor, 1.0 if dark else PREVIEW_LIGHT_CASING, not dark, PREVIEW_MARK_WIDTH)if not live and place == "switch":scene["pointer"] = Nonereturn scene@@ -1089,18 +1112,28 @@ def _op_boxes(scene):@functools.lru_cache(maxsize=256)def _still_view(effect, place, effect_size, pace, effect_size_fraction):- if place in PREVIEW_CROSSING_VIEWS:- return PREVIEW_CROSSING_VIEWS[place]fx = effect if isinstance(effect, Effect) else preview_effect(effect)scene = preview_still_scene(fx, still_time(effect, place, effect_size, pace, effect_size_fraction), place,("#ffffff",), pace=pace, effect_size=effect_size, live=True,effect_size_fraction=effect_size_fraction)- return _fit(scene, place) or PREVIEW_TILE_CROPS[place]+ return _fit(scene, place, _journey(place)) or PREVIEW_TILE_CROPS[place]++[email protected]_cache(maxsize=8)+def _journey(place):+ """The box round every place a crossing's pointer goes, arrow included, which every effect's camera+ keeps in view; None for a switch, whose pointer stands still."""+ if place == "switch":+ return None+ points = [preview_still_scene(CLASSIC["glow"], t * PREVIEW_LOOP_S / 40, place, ("#ffffff",), live=True)["pointer"]+ for t in range(40)]+ xs, ys = [p[0] for p in points if p], [p[1] for p in points if p]+ return (min(xs), min(ys), max(xs) + PREVIEW_POINTER_ROOM, max(ys) + PREVIEW_POINTER_ROOM)-def _fit(scene, place):- """The 2:1 view still_view describes for `scene`, or None when it draws nothing."""- boxes = [box for box, _alpha in _op_boxes(scene)]+def _fit(scene, place, keep=None):+ """The 2:1 view still_view describes for `scene`, holding `keep` too, or None when it draws nothing."""+ boxes = [box for box, _alpha in _op_boxes(scene)] + ([keep] if keep is not None else [])if not boxes:return Noneleft, top = min(b[0] for b in boxes), min(b[1] for b in boxes)@@ -1130,85 +1163,25 @@ def _fit(scene, place):def still_view(effect, place, effect_size="medium", pace=1.0, effect_size_fraction=None):"""The part of preview_still_scene a Design tile shows for `effect` at `place`, (x, y, w, h) in- scene points, 2:1: fixed round a crossing's complete pointer journey, or fitted round a switch's- marks. Idle, reduced motion and the hover loop share the camera."""+ scene points, 2:1, fitted round the marks of its resting frame: an effect shown at its real size+ against the whole pointer journey filled a hundredth of its tile. The pointer glides in from+ outside it. Idle, reduced motion and the hover loop share the camera. It is fitted at Normal, as+ the still is drawn, so a Length step neither moves it nor builds a scene."""still_time(effect, place, effect_size, pace, effect_size_fraction)- return _still_view(_still_key(effect), place, effect_size, pace, effect_size_fraction)---def _cells(low, high, origin, size, n):- """How many of n cell centres across `size` from `origin` fall within [low, high]."""- first = max(0, math.ceil((low - origin) * n / size - 0.5))- last = min(n - 1, math.floor((high - origin) * n / size - 0.5))- return max(0, last - first + 1)---# Every Length and Size step used to search 60 frames per tile again, so the Design page froze for-# a second at each slider step. The search is for Normal and Medium only, and Length only stretches-# when the found frame comes.-STILL_SEARCH_STEPS = 30---# _search_still's answers for every effect at Edge, Corner, Notch and a switch, worked out once so the-# page opens without building 2,000 scenes; test_style_previews holds them equal to the search.-STILL_SEARCHED = {- "glow": (2.2103448275862068, 2.2103448275862068, 1.9000000000000001, 0.0),- "beam": (2.2103448275862068, 2.2103448275862068, 1.9000000000000001, 0.0),- "aperture": (2.3551724137931034, 2.2103448275862068, 2.396551724137931, 0.4),- "skin": (2.3551724137931034, 2.2103448275862068, 2.2517241379310344, 0.6),- "film": (2.2103448275862068, 2.2103448275862068, 2.2103448275862068, 0.6),- "rupture": (2.4586206896551723, 2.2103448275862068, 2.2517241379310344, 0.6666666666666666),- "flint": (2.2724137931034485, 2.2724137931034485, 2.2724137931034485, 0.4),- "filings": (2.293103448275862, 2.293103448275862, 2.293103448275862, 0.4666666666666667),- "discharge": (2.293103448275862, 2.293103448275862, 2.293103448275862, 0.4666666666666667),- "rule": (2.2103448275862068, 2.2103448275862068, 2.2103448275862068, 0.4),- "gauge": (2.2103448275862068, 2.2103448275862068, 2.2103448275862068, 0.4),- "rangefinder": (2.2103448275862068, 2.2103448275862068, 2.2103448275862068, 0.4),- "crease": (2.2724137931034485, 2.4586206896551723, 2.2517241379310344, 0.4),- "pleat": (2.2103448275862068, 2.4793103448275864, 2.2724137931034485, 0.4),- "concertina": (2.2103448275862068, 2.5, 2.2724137931034485, 0.4),- "thread": (2.2724137931034485, 2.2103448275862068, 2.231034482758621, 0.4),- "weave": (2.231034482758621, 2.2724137931034485, 2.2103448275862068, 0.4),- "jacquard": (2.2103448275862068, 2.231034482758621, 2.293103448275862, 0.4),-}-_PLACE_INDEX = {"edge": 0, "corner": 1, "notch": 2, "switch": 3}---def _still_at(effect_id, place):- found = STILL_SEARCHED.get(effect_id) if isinstance(effect_id, str) else None- return found[_PLACE_INDEX[place]] if found is not None else _search_still(effect_id, place)--[email protected]_cache(maxsize=256)-def _search_still(effect_id, place):- fx = effect_id if isinstance(effect_id, Effect) else preview_effect(effect_id)- crop = PREVIEW_CROSSING_VIEWS.get(place, PREVIEW_TILE_CROPS[place])- best_time, best_coverage = 0.0, -1- for step in range(STILL_SEARCH_STEPS):- if place == "switch":- at = SWITCH_LOOP_S * step / STILL_SEARCH_STEPS- else:- end = _P_CROSS + min(0.3, max(fx.depart_seconds, fx.arrive_seconds))- at = _P_CROSS - 0.3 + (end - _P_CROSS + 0.3) * step / (STILL_SEARCH_STEPS - 1)- scene = preview_still_scene(fx, at, place, ("#ffffff",), live=True)- coverage = 0.0- for (x0, y0, x1, y1), alpha in _op_boxes(scene):- coverage += (_cells(y0, y1, crop[1], crop[3], 24) * _cells(x0, x1, crop[0], crop[2], 48)) * alpha- if coverage > best_coverage:- best_time, best_coverage = at, coverage- return best_time+ return _still_view(_still_key(effect), place, effect_size, 1.0, effect_size_fraction)def still_time(effect, place, effect_size="medium", pace=1.0, effect_size_fraction=None):- """The fullest real seam frame for a crossing, or arrival specimen for a switch."""+ """An authored frame on the effect's timeline for the chosen crossing or arrival."""if not isinstance(effect, Effect) and effect not in CLASSIC and effect not in EFFECT_IDS:raise ValueError(f"unknown preview effect: {effect}")if place not in PREVIEW_TILE_CROPS:raise ValueError(f"unknown preview place: {place}")- at = _still_at(_still_key(effect), place)- start = _S_START if place == "switch" else _P_CROSS- # The push follows the hand, so only what comes after the crossing or the arrival stretches.- return at if at < start else start + (at - start) * pace+ effect_id = effect.id if isinstance(effect, Effect) else effect+ at = STILL_AT.get(effect_id, 0.1)+ if place == "switch":+ return _S_START + SWITCH_AT.get(effect_id, max(at, 0.1)) * pace+ return _P_CROSS + at if at < 0 else _P_CROSS + at * pacedef _still_key(effect):@@ -1225,6 +1198,9 @@ PACES = {"short": 0.5, "normal": 1.0, "long": 2.0}_SIZE_FRACTIONS = {"small": 0.03, "medium": 0.045, "large": 0.06}DESIGN_READOUT_WIDTH = 58_PACE_STEPS = (0.5, 1.0, 2.0)+# The Design pages' Frame rate: each machine plays every effect at its own display's refresh, or a+# half or a quarter of it.+FRAME_RATES = (("display", "Match display", 1), ("half", "Half", 2), ("quarter", "Quarter", 4))_PACE_PRESETS = ("short", "normal", "long")_SIZE_STOPS = (0.03, 0.045, 0.06)_SIZE_PRESETS = ("small", "medium", "large")@@ -1241,6 +1217,10 @@ def _number(value, low, high):return not isinstance(value, bool) and isinstance(value, (int, float)) and low <= value <= high+def frame_divisor(frame_rate):+ return next((divisor for value, _name, divisor in FRAME_RATES if value == frame_rate), 1)++def valid_effect_pace(value):return _number(value, MIN_EFFECT_PACE, MAX_EFFECT_PACE)diff --git a/core/idle_pointer.py b/core/idle_pointer.pynew file mode 100644index 0000000..0c84f9e--- /dev/null+++ b/core/idle_pointer.py@@ -0,0 +1,88 @@+"""Hide a driven machine's pointer once its driver lets go, until that pointer moves again.++Without it the pointer stays wherever the driver last put it, and on a desk of two screens the one+not in use still shows a pointer, so which machine has the input is a guess (rufusmp on Instagram,+12-10-2026). Any movement shows it again, whoever makes it: this machine's own mouse or trackpad, or+a driver coming back, whose first injected move is the end of the hide.++Movement is read by polling the pointer's position, the one reading every platform has, and only+while hidden. The baseline is taken SETTLE_SECONDS after the hide, not at it: the driver's last+moves are still being injected as it lets go, and reading one of those as this machine's own hand+would show the pointer the moment it was hidden.+"""++import logging+import threading+from typing import Callable, Optional, Tuple++POLL_SECONDS = 0.1+SETTLE_SECONDS = 0.3+++class IdlePointer:+ def __init__(+ self,+ hide: Callable[[], None],+ show: Callable[[], None],+ position: Callable[[], Tuple[int, int]],+ poll_seconds: float = POLL_SECONDS,+ settle_seconds: float = SETTLE_SECONDS,+ logger: Optional[logging.Logger] = None,+ ) -> None:+ self._hide = hide+ self._show = show+ self._position = position+ self._poll = poll_seconds+ self._settle = settle_seconds+ self._logger = logger or logging.getLogger(__name__)+ self._lock = threading.Lock()+ self._stop: Optional[threading.Event] = None++ @property+ def hidden(self) -> bool:+ return self._stop is not None++ def driver_left(self) -> None:+ with self._lock:+ if self._stop is not None:+ return+ try:+ self._hide()+ except Exception:+ self._logger.exception("could not hide the pointer after the driver left")+ return+ stop = self._stop = threading.Event()+ threading.Thread(target=self._watch, args=(stop,), name="Beamer-idle-pointer", daemon=True).start()++ def cancel(self) -> None:+ """Show the pointer now: a driver arrived, or the app is stopping."""+ with self._lock:+ stop, self._stop = self._stop, None+ if stop is None:+ return+ stop.set()+ self._show_quietly()++ def _watch(self, stop: threading.Event) -> None:+ if stop.wait(self._settle):+ return+ try:+ start = self._position()+ while not stop.wait(self._poll):+ if self._position() != start:+ break+ except Exception:+ # A pointer that cannot be read cannot be watched, and a hidden one nobody can bring+ # back is worse than one left showing.+ self._logger.exception("could not read the pointer while it was hidden; showing it")+ with self._lock:+ if self._stop is not stop:+ return+ self._stop = None+ self._show_quietly()++ def _show_quietly(self) -> None:+ try:+ self._show()+ except Exception:+ self._logger.exception("could not show the pointer again")diff --git a/core/owner.py b/core/owner.pyindex a43ff81..9214a3b 100644--- a/core/owner.py+++ b/core/owner.py@@ -235,7 +235,9 @@ class Owner:if nxt == self.own_id:if not isinstance(route, int) or route < self._visit_route:return []- return self._come_home("switch", edge, offset, display=display, side=side)+ other = data.get("taken_over_by")+ return self._come_home("taken_over" if other is not None else "switch", edge, offset,+ other=other, display=display, side=side)if route != self.route or (self._wait is not None and self._wait.chain):return []if nxt not in self.reach_sent or nxt not in self._links & self._accepting:diff --git a/core/pairing.py b/core/pairing.pyindex 984240b..634fa2f 100644--- a/core/pairing.py+++ b/core/pairing.py@@ -410,16 +410,25 @@ def decode(data: bytes):if len(data) > MAX_DATAGRAM_BYTES:return Nonetry:- message = json.loads(data.decode("utf-8"))+ message = json.loads(data.decode("utf-8"), object_pairs_hook=_unique_keys)except (UnicodeDecodeError, ValueError, RecursionError):# RecursionError is what a datagram of nothing but brackets raises on some Pythons, and# left uncaught it would end the socket loop that called this.return None- if not isinstance(message, dict) or message.get("beamy") != BEACON_VERSION:+ if not isinstance(message, dict) or type(message.get("beamy")) is not int or message.get("beamy") != BEACON_VERSION:return Nonereturn message+def _unique_keys(pairs):+ result = {}+ for key, value in pairs:+ if key in result:+ raise ValueError("duplicate JSON key")+ result[key] = value+ return result++def beacon_msg(name: str, port: int, pair_id: str = None) -> dict:message = {"type": MSG_BEACON, "name": name, "port": int(port), "pairing": PAIRING_VERSION}if pair_id:@@ -1829,12 +1838,131 @@ class PairingService(Discovery):self._own_addresses = frozenset()# Why the TCP listener is not up while a code is, or None.self.tcp_error = None+ self._nearby = None+ self._nearby_choice = False+ self._nearby_next = 0.0++ def begin_nearby(self) -> None:+ from .easy_pair import EasyPairWindow+ with self._host_lock:+ self.host.cancel()+ self._close_listener()+ if self._nearby is not None:+ self._nearby.cancel()+ self._nearby = EasyPairWindow(self.name, self.identity, self.platform, self.port_getter(), clock=self.clock)+ self._nearby_choice = False+ self._nearby_next = 0.0++ def cancel_nearby(self) -> None:+ with self._host_lock:+ if self._nearby is not None:+ self._nearby.cancel()++ def _nearby_candidates(self):+ from .easy_pair import eligible+ paired_ids = {entry.get("id") for entry in self._peer_entries()}+ # A beacon repeating this machine's own window is a copy: select() refuses it, and as the+ # sole candidate it would be auto-selected on every tick.+ own_window = self._nearby.window if self._nearby is not None else None+ return [item for item in self.machines() if eligible(item) and item["id"] != _b64(self.identity)+ and item["id"] not in paired_ids and item.get("nearby") != own_window]++ @property+ def nearby_status(self) -> dict:+ with self._host_lock:+ window = self._nearby+ if window is None:+ return {"state": "inactive", "seconds_left": 0, "peers": [], "peer": None, "sas": None, "attempt": None}+ peers = self._nearby_candidates() if window.state == "searching" else []+ if len(peers) > 1:+ self._nearby_choice = True+ state = "choosing" if window.state == "searching" and self._nearby_choice else window.state+ return {"state": state, "seconds_left": window.seconds_left, "peers": peers,+ "peer": dict(window.peer) if window.peer else None, "sas": window.sas, "attempt": window.attempt}++ def choose_nearby(self, machine: dict) -> None:+ with self._host_lock:+ window = self._nearby+ if window is None or not isinstance(machine, dict):+ raise PairingError(ERROR_NOT_PAIRING)+ found = next((item for item in self._nearby_candidates()+ if all(item.get(key) == machine.get(key) for key in ("id", "nearby", "address"))), None)+ if found is None:+ raise PairingError(ERROR_NOT_PAIRING)+ window.select(found)+ self._nearby_next = 0.0++ def confirm_nearby(self, sas: str, attempt: str) -> None:+ with self._host_lock:+ if self._nearby is None:+ raise PairingError(ERROR_NOT_PAIRING)+ self._nearby.approve(sas, attempt)+ self._nearby_next = 0.0++ def _save_nearby(self):+ window = self._nearby+ if window is None or not window.ready:+ return None+ remote = window.remote_reveal+ peers = self._peer_entries()+ identity = _unb64(remote["id"])+ known, replaced = _find_known(peers, self.identity, identity, remote["name"], remote["platform"], self.wall())+ if known is not None or _clashes(peers, window.token, replaced) or (replaced is None and len(peers) >= MAX_PEERS):+ window.cancel("refused")+ return None+ entry = peer_entry(identity, remote["name"], remote["platform"], remote["port"], window.token,+ window.peer["address"], self.wall())+ try:+ self.store(entry, replaced)+ except Exception:+ self.logger.warning("the nearby peer entry could not be saved")+ window.cancel("not_saved")+ return None+ window.saved()+ self.host.cancel()+ self._close_listener()+ return entry++ def _tick_nearby(self, sock) -> None:+ with self._host_lock:+ window = self._nearby+ if window is None:+ return+ if window.state == "searching":+ candidates = self._nearby_candidates()+ if len(candidates) > 1:+ self._nearby_choice = True+ if len(candidates) == 1 and not self._nearby_choice:+ window.select(candidates[0])+ entry = self._save_nearby()+ packets = window.messages() if sock is not None and self.clock() >= self._nearby_next else []+ self._nearby_next = self.clock() + .5 if packets else self._nearby_next+ target = (window.peer["address"], window.peer["reply_port"]) if packets else None+ self._paired(entry, entry["host"] if entry else "")+ for packet in packets:+ try:+ # The canonical commitment uses ASCII escaping; wire JSON can use UTF-8 to+ # keep a full-length non-ASCII name inside the existing datagram ceiling.+ data = json.dumps({"beamy": BEACON_VERSION, **packet}, separators=(",", ":"), ensure_ascii=False).encode("utf-8")+ self._answer(sock, data, target)+ except OSError:+ pass++ def _receive_nearby(self, message, address):+ with self._host_lock:+ if self._nearby is None:+ return+ self._nearby.receive(message, address[0])+ entry = self._save_nearby()+ self._paired(entry, address[0])# The host's side.def begin_pairing(self) -> str:"""Shows a new code; capacity is checked when the requester identity is known."""with self._host_lock:+ if self._nearby is not None:+ self._nearby.cancel()self.host.port = self.port_getter()code = self.host.begin()self._open_listener()@@ -1888,6 +2016,8 @@ class PairingService(Discovery):def stop(self) -> None:super().stop()with self._host_lock:+ if self._nearby is not None:+ self._nearby.cancel()self.host.cancel()self._close_listener()self._slots.close_all()@@ -1913,8 +2043,9 @@ class PairingService(Discovery):self.tcp_port = listener.getsockname()[1]self.tcp_error = Nonestop = threading.Event()- self._listener = (listener, stop)- threading.Thread(target=self._accept, args=(listener, stop), name="Beamer-pairing-tcp", daemon=True).start()+ thread = threading.Thread(target=self._accept, args=(listener, stop), name="Beamer-pairing-tcp", daemon=True)+ self._listener = (listener, stop, thread)+ thread.start()def _close_listener(self, only=None) -> None:with self._listener_lock:@@ -1924,6 +2055,8 @@ class PairingService(Discovery):if held is not None:held[1].set()held[0].close()+ if len(held) > 2 and held[2] is not None and held[2] is not threading.current_thread():+ held[2].join(timeout=1.0)def _accept(self, listener, stop) -> None:while not stop.is_set():@@ -1998,6 +2131,8 @@ class PairingService(Discovery):reply = self.host.handle(message, address, via)paired, self.host.paired = self.host.paired, Nonefresh, self.host.fresh_answer = self.host.fresh_answer, False+ if paired is not None and self._nearby is not None:+ self._nearby.cancel()if pin is not None and fresh and message.get("type") == MSG_PAIR_START and reply is not None and reply.get("ok") is True:if not pin():# Replaced in the instant before its pin: the code is bound to a connection@@ -2020,7 +2155,13 @@ class PairingService(Discovery):def _beacon(self) -> bytes:with self._host_lock:- return encode(self.host.beacon(self.port_getter()))+ from .easy_pair import PAIR_MODES+ beacon = self.host.beacon(self.port_getter())+ beacon["pair_modes"] = PAIR_MODES.copy()+ if self._nearby is not None and self._nearby.active:+ beacon["nearby"] = self._nearby.window+ beacon["id"] = _b64(self.identity)+ return encode(beacon)def _announce(self, sock) -> None:beacon = self._beacon()@@ -2060,6 +2201,15 @@ class PairingService(Discovery):next_beacon = now + BEACON_INTERVAL_SECONDSself._announce(sock)self._send_find(sock)+ try:+ self._tick_nearby(sock)+ except Exception:+ # A nearby attempt that fails must not take beacons and code pairing with it,+ # and is ended so the same failure is not logged on every pass.+ self.logger.exception("nearby pairing tick failed")+ with self._host_lock:+ if self._nearby is not None:+ self._nearby.cancel("refused")try:data, address = sock.recvfrom(MAX_DATAGRAM_BYTES + 1)except socket.timeout:@@ -2091,8 +2241,11 @@ class PairingService(Discovery):sock.close()def _dispatch(self, sock, message: dict, address, arrived: float, answered: dict, refused: dict) -> None:+ from .easy_pair import EASY_TYPESkind = message.get("type")- if kind == MSG_BEACON:+ if isinstance(kind, str) and kind in EASY_TYPES:+ self._receive_nearby(message, address)+ elif kind == MSG_BEACON:# This machine hears its own broadcasts, from its own port at one of its own addresses.if address[1] != self.bind_port or address[0] not in self._own_addresses:self._note_beacon(message, address)@@ -2148,6 +2301,9 @@ class PairingService(Discovery):platform = message.get("platform")entry["platform"] = platform if _platform_ok(platform) else Noneentry["id"] = message.get("id") if _id_text_ok(message.get("id")) else None+ from .easy_pair import PAIR_MODES, window_ok+ entry["pair_modes"] = PAIR_MODES.copy() if message.get("pair_modes") == PAIR_MODES else []+ entry["nearby"] = message.get("nearby") if window_ok(message.get("nearby")) else Nonereturn entry# The requester's side.@@ -2258,6 +2414,8 @@ class PairingService(Discovery):except Exception as exc:self.logger.warning("the new peer entry could not be saved: %s", exc)raise PairingError("not_saved") from exc+ if self._nearby is not None:+ self._nearby.cancel()return entrydiff --git a/core/protocol.py b/core/protocol.pyindex 01f9766..dbe72a1 100644--- a/core/protocol.py+++ b/core/protocol.py@@ -1109,8 +1109,12 @@ def read_switch(message):if (not isinstance(display, str) or not display.isascii() or not _DISPLAY_KEY.fullmatch(display)or side not in EDGES):return None- return {"route": route, "next": next_id, "edge": edge, "offset": offset,- "display": display, "side": side}+ result = {"route": route, "next": next_id, "edge": edge, "offset": offset,+ "display": display, "side": side}+ taken_over_by = read_id(data.get("taken_over_by"))+ if taken_over_by is not None:+ result["taken_over_by"] = taken_over_by+ return resultdef ack_v6(seq: int, held_us: int, locked: bool = False) -> dict:diff --git a/core/receiver.py b/core/receiver.pyindex 46c6593..4e97056 100644--- a/core/receiver.py+++ b/core/receiver.py@@ -115,6 +115,7 @@ LINK_READ_TIMEOUT_SECONDS = 2.5# initiator is refused `sent_home` for SENT_HOME_SECONDS (section 4).FORCED_END_SECONDS = 1.0SENT_HOME_SECONDS = 5.0+IDLE_TAKEOVER_SECONDS = 3.0# Frames waiting to go to one peer. A peer that stops reading is closed at this, rather than let a# queue grow without end; it is well past anything a working link queues between two writes.OUTBOX_LIMIT = 512@@ -197,6 +198,8 @@ def zone_models(zones, peers, allowed, resistance_px: int, notch_span=None) -> ldisplay = zone.get("display")target_display = zone.get("target_display")target_side = zone.get("target_side")+ contact_span = zone.get("contact_span")+ target_span = zone.get("target_span")if display is not None and (not isinstance(display, str) or not display or not display.isascii()):continueif side not in crossing.EDGES and kind in ("edge", "part"):@@ -204,14 +207,17 @@ def zone_models(zones, peers, allowed, resistance_px: int, notch_span=None) -> ltry:if kind == "edge" and side in crossing.EDGES:model = crossing.ReturnEdge(side, resistance_px, display=display,- target_display=target_display, target_side=target_side)+ target_display=target_display, target_side=target_side,+ contact_span=contact_span, target_span=target_span)elif kind == "part" and side in crossing.EDGES and isinstance(zone.get("parts"), list):model = crossing.PartEdge(side, [part for part in zone["parts"] if isinstance(part, str)],resistance_px, display=display, target_display=target_display,- target_side=target_side)+ target_side=target_side, contact_span=contact_span,+ target_span=target_span)elif kind == "corner" and isinstance(zone.get("corner"), str) and zone.get("edge") in zone["corner"].split("_"):model = crossing.CornerPush(zone["corner"], zone["edge"], resistance_px, display=display,- target_display=target_display, target_side=target_side)+ target_display=target_display, target_side=target_side,+ contact_span=contact_span, target_span=target_span)elif kind == "notch" and notch_span is not None:model = crossing.SpanEdge("top", notch_span, resistance_px)else:@@ -511,16 +517,23 @@ class LinkResponder:self._handshaking = 0 # threads for connections not yet authenticatedself._links = {} # peer id: _Linkself._owner: Optional[_Link] = None+ self._owner_input_at = Noneself._claiming: Optional[_Link] = None # a take being decided, visible before `away` is readself._visit = 0 # raised each time an ownership beginsself._generation = 0 # raised on every change to the peers or the zonesself._reach = frozenset()self._resistance = protocol.DEFAULT_RESISTANCE_PXself._armed = [] # [(peer id, model)] while the zones are live+ self._way_back = None # (peer id, arrival display, arrival side), for this visitself._zones_live = Falseself._sent_home_at = {} # peer id: when it was sent home or ended by forceself._forced = None # the forced end's timer after a send-homeself._clipboard_mark = None # the clipboard's change stamp when this owner's visit began+ # The platform clipboard is touched on one worker thread, in order, never on a link's reader+ # (a write that blocks would stop its input being read and acknowledged) and never under the lock.+ self._clipboard_jobs = collections.deque()+ self._clipboard_running = False+ self._clipboard_jobs_lock = threading.Lock()# Ownership changes for owner_callback, queued under the lock and delivered in order, one# thread at a time, so the app never hears an end after the next owner's beginning.self._owner_events = collections.deque()@@ -977,7 +990,10 @@ class LinkResponder:after = []try:with self._lock:- if self._owner is not link or not self._takes(link, read):+ takes = self._owner is link and self._takes(link, read)+ if takes:+ self._owner_input_at = time.monotonic()+ if not takes:passelif self._unlocking.is_set():# Input that arrives while the lock screen clears is dropped, but a release of@@ -1079,6 +1095,7 @@ class LinkResponder:dx, dy = self.input_scale.move(dx, dy)if not (dx or dy):return+ dx, dy = self._clip_to_return_seam(dx, dy)injector.inject_mouse_move(dx, dy)elif kind in (protocol.MSG_MOUSEDOWN, protocol.MSG_MOUSEUP):down = kind == protocol.MSG_MOUSEDOWN@@ -1106,6 +1123,42 @@ class LinkResponder:else:injector.inject_text(run)+ def _clip_to_return_seam(self, dx: int, dy: int) -> Tuple[int, int]:+ if not self._armed or not (dx or dy):+ return dx, dy+ desktop = self._desktop_module()+ monitors, pointer = desktop.monitors(), desktop.cursor_position()+ display_map = getattr(desktop, "display_map", lambda: {})()+ bounds = crossing.union(monitors)+ earliest = 1.0+ for _peer, model in self._armed:+ screen = display_map.get(model.display) if model.display and isinstance(display_map, dict) else bounds+ if not isinstance(screen, crossing.Rect):+ screen = bounds+ if model.edge == "left" and dx < 0:+ distance, travel = pointer[0] - screen.x, -dx+ seam = (screen.x, pointer[1] + dy * max(0, distance) / travel)+ elif model.edge == "right" and dx > 0:+ distance, travel = screen.right - pointer[0], dx+ seam = (screen.right, pointer[1] + dy * max(0, distance) / travel)+ elif model.edge == "top" and dy < 0:+ distance, travel = pointer[1] - screen.y, -dy+ seam = (pointer[0] + dx * max(0, distance) / travel, screen.y)+ elif model.edge == "bottom" and dy > 0:+ distance, travel = screen.bottom - pointer[1], dy+ seam = (pointer[0] + dx * max(0, distance) / travel, screen.bottom)+ else:+ continue+ if distance < 0 or distance > travel:+ continue+ fraction = distance / travel+ point = (round(seam[0]), round(seam[1]))+ if fraction < earliest and model._at_edge(monitors, point, display_map):+ earliest = fraction+ if earliest == 1.0:+ return dx, dy+ return round(dx * earliest), round(dy * earliest)+def _release_locked(self, link: _Link) -> None:"""Let go of every key and button injected for this owner (section 4, step 1), then theinjector's own record of what it holds, as the backstop."""@@ -1134,8 +1187,20 @@ class LinkResponder:self._armed, self._zones_live = [], Falsereturntry:+ active_zones = list(zones)+ if self._way_back is not None:+ peer, display, side = self._way_back+ has_way = any(zone.get("peer") == peer and zone.get("kind") in ("edge", "part")+ and zone.get("off") is not True for zone in zones)+ arrival_covered = any(zone.get("peer") == peer and zone.get("kind") in ("edge", "part")+ and zone.get("off") is not True+ and zone.get("display") == display and zone.get("side") == side+ for zone in zones)+ if has_way and not arrival_covered:+ active_zones.append({"peer": peer, "kind": "edge", "display": display,+ "side": side, "target_side": crossing.OPPOSITE[side]})previous = self._armed- self._armed = zone_models(zones, peers, {owner.peer_id} | self._reach, self._resistance, self._notch_span)+ self._armed = zone_models(active_zones, peers, {owner.peer_id} | self._reach, self._resistance, self._notch_span)if arrival_peer is None:crossing.keep_grace(previous, self._armed)# A take that lands the pointer on an edge holds every zone, not only the way back: a hand@@ -1257,10 +1322,17 @@ class LinkResponder:reason, other = whylink.post(protocol.refuse_msg(focus["route"], reason, other=other))return+ previous = self._owner+ if previous is not None and previous is not link:+ message = protocol.switch_v6(previous.route, previous.peer_id)+ message["data"]["taken_over_by"] = protocol.id_text(link.peer_id)+ previous.post(message)+ self._sent_home_at[previous.peer_id] = time.monotonic()+ after += self._end_locked(previous)link.route = focus["route"]# The answer goes before the pointer is placed or anything plays.link.post(protocol.accept_msg(focus["route"]))- after = self._own_locked(link, focus, peers, zones)+ after += self._own_locked(link, focus, peers, zones)stale = focus["here"] and generation != self._generationself._run(after)if stale:@@ -1292,8 +1364,10 @@ class LinkResponder:elif sent_home_at is not None and time.monotonic() - sent_home_at < SENT_HOME_SECONDS:why = "sent_home"elif self._owner is not None and self._owner is not link:- why = "owned"- other = self._owner.peer_id+ if (focus["stay"] or self._owner_input_at is None+ or time.monotonic() - self._owner_input_at < IDLE_TAKEOVER_SECONDS):+ why = "owned"+ other = self._owner.peer_idelif focus["stay"] and self._owner is not link:why = "malformed"if why is not None:@@ -1307,6 +1381,12 @@ class LinkResponder:self._claiming = Noneself._reach = frozenset(peer for peer in focus["reach"] if peer not in (link.peer_id, link.own_id))self._resistance = focus["resistance_px"]+ if began:+ self._owner_input_at = time.monotonic()+ display, side = focus.get("display"), focus.get("side")+ self._way_back = ((protocol.id_text(link.peer_id), display, side)+ if focus.get("edge") is not None and display is not None+ and side in crossing.EDGES else None)self._arm_locked(peers, zones, link.peer_id if began else None, landed=focus.get("edge") is not None)after = []if began:@@ -1331,7 +1411,9 @@ class LinkResponder:if link is None or self._owner is not link:return []self._owner = None+ self._owner_input_at = Noneself._reach = frozenset()+ self._way_back = Noneself._arriving_visit = Noneself._disarm_locked()self._cancel_forced_locked()@@ -1339,8 +1421,8 @@ class LinkResponder:self._owner_events.append(None)after = []if let_go:- mark, visit = self._clipboard_mark, self._visit- after.append(lambda: self._clipboard_back(link, mark, visit))+ visit = self._visit+ after.append(lambda: self._clipboard_later(lambda: self._clipboard_back(link, visit)))elif why is not None and not link.closed.is_set():link.post(protocol.refuse_msg(link.route, why))return after@@ -1432,17 +1514,52 @@ class LinkResponder:image = read["image"] if "clipboard_image" in link.own_caps else Noneif text is None and image is None:return- # Checked and set under one hold of the lock, so an ownership ending meanwhile cannot let- # a peer that no longer owns this machine set its clipboard.with self._lock:if self._owner is not link:return+ visit = self._visit+ self._clipboard_later(lambda: self._set_clipboard(link, visit, text, image))++ def _clipboard_later(self, job) -> None:+ with self._clipboard_jobs_lock:+ self._clipboard_jobs.append(job)+ if self._clipboard_running:+ return+ self._clipboard_running = True+ try:+ threading.Thread(target=self._clipboard_worker, name="Beamer-v6-clipboard", daemon=True).start()+ except BaseException:+ with self._clipboard_jobs_lock:+ self._clipboard_running = False+ raise++ def _clipboard_worker(self) -> None:+ while True:+ with self._clipboard_jobs_lock:+ if not self._clipboard_jobs:+ self._clipboard_running = False+ return+ job = self._clipboard_jobs.popleft()try:- if not self._clipboard_module().set_contents(text, image):- LOGGER.warning("Could not set the clipboard %s sent", link.name)+ job()except Exception:- LOGGER.exception("Could not set the clipboard %s sent", link.name)- self._clipboard_mark = self._clipboard_stamp()+ LOGGER.exception("A clipboard job failed")++ def _set_clipboard(self, link: _Link, visit: int, text, image) -> None:+ """A write begins only while its sender still owns this machine in the visit it was sent in;+ one already in flight when the ownership ends is not taken back, as it cannot be."""+ with self._lock:+ if self._owner is not link or self._visit != visit:+ return+ try:+ if not self._clipboard_module().set_contents(text, image):+ LOGGER.warning("Could not set the clipboard %s sent", link.name)+ except Exception:+ LOGGER.exception("Could not set the clipboard %s sent", link.name)+ stamp = self._clipboard_stamp()+ with self._lock:+ if self._visit == visit:+ self._clipboard_mark = stampdef _clipboard_stamp(self):stamp = getattr(self._clipboard_module(), "change_stamp", None)@@ -1454,12 +1571,17 @@ class LinkResponder:LOGGER.exception("Could not read the clipboard's change stamp")return None- def _clipboard_back(self, link: _Link, mark, visit: int) -> None:+ def _clipboard_back(self, link: _Link, visit: int) -> None:"""A let-go owner gets this machine's clipboard only when something other than its own`clipboard` messages changed it during the visit, so an idle machine gives nothing away;and never once another ownership has begun or the clipboard changed while it was read, sowhat it gets is never the next owner's. Nor when the clipboard could not be read as the- visit began (a Wayland session not up yet): what changed during it cannot be told."""+ visit began (a Wayland session not up yet): what changed during it cannot be told. The mark+ is read here, after any write the owner had queued has updated it."""+ with self._lock:+ if self._visit != visit:+ return+ mark = self._clipboard_markstamp = self._clipboard_stamp()if stamp is None or mark is None or stamp == mark:returndiff --git a/core/return_edge.py b/core/return_edge.pyindex 1857db6..743abcf 100644--- a/core/return_edge.py+++ b/core/return_edge.py@@ -10,6 +10,7 @@ outward travel the edge gives."""import time+import mathfrom dataclasses import dataclassfrom typing import Callable, Iterable, List, Optional, Tuple@@ -132,7 +133,7 @@ def landing_monitor(monitors: List[Rect], edge: str, along: float) -> Rect:def distance(r: Rect):low, high = span(r)- return max(low - along, along - (high - 1), 0)+ return max(low - along, along - high, 0)return min(monitors, key=lambda r: (distance(r), outer(r)))@@ -148,7 +149,7 @@ def arrival_position(monitors: List[Rect], edge: str, offset: float, display=Nonif isinstance(target, Rect):offset = _clamp(float(offset), 0.0, 1.0)along = round((target.y if side in ("left", "right") else target.x)- + offset * ((target.height if side in ("left", "right") else target.width) - 1))+ + offset * (target.height if side in ("left", "right") else target.width))if side == "left":return target.x, _clear(along, target.y, target.bottom)if side == "right":@@ -187,6 +188,21 @@ def _clear(along, low, high):return _clamp(along, low, high)+def _normalised_span(value):+ if not isinstance(value, (list, tuple)) or len(value) != 2:+ return None+ try:+ low, high = map(float, value)+ except (TypeError, ValueError):+ return None+ if not math.isfinite(low) or not math.isfinite(high) or low < -1e-9 or high > 1 + 1e-9:+ return None+ low, high = _clamp(low, 0.0, 1.0), _clamp(high, 0.0, 1.0)+ if not low < high:+ return None+ return low, high++def keep_grace(previous, models) -> None:"""[(peer, model)] rebuilt from `previous` (a settings change, a peer starting to accept) keep thearrival grace of the zone each replaces: a re-arm just after a landing must not end it."""@@ -207,13 +223,16 @@ class ReturnEdge:def __init__(self, edge: str, resistance_px: int = DEFAULT_RESISTANCE_PX,clock: Callable[[], float] = time.monotonic, display: str = None,- target_display: str = None, target_side: str = None) -> None:+ target_display: str = None, target_side: str = None,+ contact_span=None, target_span=None) -> None:if edge not in EDGES:raise ValueError(f"unknown edge {edge!r}")self.edge = edgeself.display = displayself.target_display = target_displayself.target_side = target_side+ self.contact_span = _normalised_span(contact_span)+ self.target_span = _normalised_span(target_span)self.resistance_px = max(0, int(resistance_px))self._clock = clockself._travel = 0.0@@ -270,10 +289,15 @@ class ReturnEdge:"top": y <= target.y + 1.5,"bottom": y >= target.bottom - 1.5,}[self.edge]- return along and near- step_x, step_y = {"left": (-1, 0), "right": (1, 0), "top": (0, -1), "bottom": (0, 1)}[self.edge]- beyond = (x + step_x, y + step_y)- return any(_contains(m, pointer) for m in monitors) and not any(_contains(m, beyond) for m in monitors)+ at_edge = along and near+ else:+ step_x, step_y = {"left": (-1, 0), "right": (1, 0), "top": (0, -1), "bottom": (0, 1)}[self.edge]+ beyond = (x + step_x, y + step_y)+ at_edge = any(_contains(m, pointer) for m in monitors) and not any(_contains(m, beyond) for m in monitors)+ if not at_edge or self.contact_span is None:+ return at_edge+ bounds = target if isinstance(target, Rect) else union(monitors)+ return self.contact_span[0] <= edge_offset(bounds, self.edge, pointer) <= self.contact_span[1]def feed(self, monitors: List[Rect], pointer: Tuple[int, int], dx: float, dy: float, display_map=None) -> Outcome:bounds = union(monitors)@@ -313,6 +337,11 @@ class ReturnEdge:if self._travel >= self.resistance_px:self.armed = Falseoffset = edge_offset(edge_bounds, self.edge, pointer)+ if self.contact_span is not None and self.target_span is not None:+ low, high = self.contact_span+ target_low, target_high = self.target_span+ ratio = _clamp((offset - low) / max(high - low, 1e-12), 0.0, 1.0)+ offset = target_low + ratio * (target_high - target_low)self._travel = 0.0# A display and its side go together (WIRE.md section 5), as the Mac's engine sends them.return Outcome(CROSS, 1.0, edge=OPPOSITE[self.edge], offset=offset,@@ -331,9 +360,10 @@ class PartEdge(ReturnEdge):thirds are measured along the display the pointer is on, by `display_fraction`."""def __init__(self, edge: str, parts, resistance_px: int = DEFAULT_RESISTANCE_PX, clock=time.monotonic,- display: str = None, target_display: str = None, target_side: str = None) -> None:+ display: str = None, target_display: str = None, target_side: str = None,+ contact_span=None, target_span=None) -> None:super().__init__(edge, resistance_px, clock, display=display, target_display=target_display,- target_side=target_side)+ target_side=target_side, contact_span=contact_span, target_span=target_span)self.parts = frozenset(part for part in parts if part in PARTS)def _at_edge(self, monitors: List[Rect], pointer: Tuple[int, int], display_map=None) -> bool:@@ -373,11 +403,11 @@ class CornerPush(ReturnEdge):def __init__(self, corner: str, edge: str, resistance_px: int = DEFAULT_RESISTANCE_PX,clock=time.monotonic, display: str = None, target_display: str = None,- target_side: str = None) -> None:+ target_side: str = None, contact_span=None, target_span=None) -> None:if corner not in CORNERS:raise ValueError(f"unknown corner {corner!r}")super().__init__(edge, resistance_px, clock, display=display, target_display=target_display,- target_side=target_side)+ target_side=target_side, contact_span=contact_span, target_span=target_span)self.corner = cornerself.vertical, self.horizontal = corner.split("_")@@ -395,9 +425,17 @@ class CornerPush(ReturnEdge):reason the edge test is: on a staggered arrangement the bounding boxhas corners no display reaches."""x, y = pointer- home = display_map.get(self.display) if self.display and isinstance(display_map, dict) else None- if not isinstance(home, Rect):- home = next((m for m in monitors if _contains(m, pointer)), None)+ if self.display is not None:+ home = display_map.get(self.display) if isinstance(display_map, dict) else None+ if not isinstance(home, Rect) or not _contains(home, pointer):+ return False+ near_x = x <= home.x + CORNER_PX if self.horizontal == "left" else x >= home.right - CORNER_PX+ near_y = y <= home.y + CORNER_PX if self.vertical == "top" else y >= home.bottom - CORNER_PX+ at_x = x <= home.x + 1.5 if self.horizontal == "left" else x >= home.right - 1.5+ at_y = y <= home.y + 1.5 if self.vertical == "top" else y >= home.bottom - 1.5+ return near_x and near_y and (at_x or at_y)++ home = next((m for m in monitors if _contains(m, pointer)), None)if home is None:return Falsenear_x = x <= home.x + CORNER_PX if self.horizontal == "left" else x >= home.right - CORNER_PXdiff --git a/core/settings_sync.py b/core/settings_sync.pyindex 7b230d9..b4288f6 100644--- a/core/settings_sync.py+++ b/core/settings_sync.py@@ -40,7 +40,7 @@ CROSSING_KEYS = ("resistance_px", "block_while_dragging", "shortcut", "trigger_kSHORTCUT_KEYS = ("shortcut", "trigger_key", "shortcut_goes_to", "trigger_style", "double_tap_ms")CROSSING_GROUP_KEYS = ("resistance_px", "block_while_dragging")DESIGN_KEYS = ("glow_style", "glow_colour", "effect_length", "effect_size", "effect_pace",- "effect_size_fraction", "shortcut_arrival", "shortcut_arrival_style")+ "effect_size_fraction", "frame_rate", "shortcut_arrival", "shortcut_arrival_style")GROUP_KEYS = {"crossing": CROSSING_GROUP_KEYS, "design": DESIGN_KEYS, "shortcut": SHORTCUT_KEYS, "names": ()}ALL_GROUPS = tuple(GROUP_KEYS)DESIGN_UNAVAILABLE = "Design not available yet: connect to this machine with Beamer 1.5.0 beta.6 or later."@@ -171,6 +171,7 @@ PC_FIELDS = {"trigger_style": "trigger_style", "double_tap_ms": "double_tap_ms","glow_style": "glow_style", "glow_colour": "glow_colour", "effect_length": "effect_length","effect_size": "effect_size", "effect_pace": "effect_pace", "effect_size_fraction": "effect_size_fraction",+ "frame_rate": "frame_rate","shortcut_arrival": "shortcut_arrival", "shortcut_arrival_style": "shortcut_arrival_style",}# The Mac keeps the shortcut's key at the top of its settings and the rest in `crossing`.@@ -206,6 +207,8 @@ def _valid(key, value, trigger_keys):return effects.valid_effect_pace(value)if key == "effect_size_fraction":return effects.valid_effect_size_fraction(value)+ if key == "frame_rate":+ return value in tuple(value for value, _name, _divisor in effects.FRAME_RATES)if key == "shortcut_arrival_style":return value in effects.SWITCH_STYLESreturn Falsediff --git a/core/tests/crossing_harness.py b/core/tests/crossing_harness.pyindex 0e2c410..f997813 100644--- a/core/tests/crossing_harness.py+++ b/core/tests/crossing_harness.py@@ -41,6 +41,28 @@ CORNER_PUSH = {"top_left": (-30, -30), "top_right": (30, -30), "bottom_left": (-THIRD_AT = {"start": 1 / 6, "middle": 0.5, "end": 5 / 6}+def per_screen_layout(a_id, b_id, *, b1_x=None, a_sizes=((100, 100), (100, 100)),+ b_sizes=((100, 100), (100, 100))):+ """A0–B0–A1 / B1-below; display offsets move screens beyond the nominal machine tile."""+ a0, a1 = a_sizes+ b0, b1 = b_sizes+ b_x = a0[0]+ a1_x = a0[0]+ b1_x = b_x if b1_x is None else b1_x+ a_tile = {"x": 0, "y": 0, "w": a0[0] + a1[0], "h": max(a0[1], a1[1]), "displays": {+ "0": {"x": 0, "y": 0, "w": a0[0], "h": a0[1]},+ "1": {"x": a1_x, "y": 0, "w": a1[0], "h": a1[1]},+ }, "display_offsets": {"1": {"x": b0[0], "y": 0}}}+ b_tile = {"x": b_x, "y": 0, "w": max(b0[0], b1[0]), "h": b0[1] + b1[1], "displays": {+ "0": {"x": 0, "y": 0, "w": b0[0], "h": b0[1]},+ "1": {"x": 0, "y": b0[1], "w": b1[0], "h": b1[1]},+ }}+ b_offset = b1_x - b_x+ if b_offset:+ b_tile["display_offsets"] = {"1": {"x": b_offset, "y": 0}}+ return {a_id: a_tile, b_id: b_tile}++def key(one, other):"""The token one pair shares, whichever end asks."""low, high = sorted((one, other))@@ -98,7 +120,8 @@ class Hand:self.sent = []self.moved = []self._closed = threading.Event()- threading.Thread(target=self._keep_alive, name="hand-pings", daemon=True).start()+ self._keep_alive_thread = threading.Thread(target=self._keep_alive, name="hand-pings", daemon=True)+ self._keep_alive_thread.start()def _keep_alive(self):# core/link.py pings every PING_SECONDS while nothing else is sent; without it the responder@@ -133,6 +156,7 @@ class Hand:self._closed.set()for link in list(self.links.values()):link.close()+ self._keep_alive_thread.join()def carry_out(self, actions):for action in actions:@@ -311,6 +335,7 @@ class Net:def add(self, name, platform, displays, seed, tile=(160, 100)):desk = Desk(self, ident(seed), name, platform, displays, tile)+ self.test.addCleanup(desk.hand.close)desk.shell = self.shells[platform](desk)self.test.addCleanup(desk.shell.stop)self.desks[name] = desk@@ -343,7 +368,6 @@ class Net:for other in self.desks.values():if other is not desk:desk.hand.connect(other)- self.test.addCleanup(desk.hand.close)for desk in self.desks.values():for other in self.desks.values():if other is not desk:diff --git a/core/tests/crossing_shells.py b/core/tests/crossing_shells.pyindex 2e0df1a..8ce4bc2 100644--- a/core/tests/crossing_shells.py+++ b/core/tests/crossing_shells.py@@ -141,13 +141,14 @@ class Shell:self.carry_out(outcome)return True- def edit(self, other, methods, parts=None, corner=None):+ def edit(self, other, methods, parts=None, corner=None, *, edges=None, corners=None):with self.lock:settings = self.current()held = ways.ways(settings, other.id)thirds = list(ways.PARTS) if "edge" in methods else (parts if parts is not None else held["parts"])outcome = crossing_state.edit_ways(settings, other.id, edge=bool(set(methods) & {"edge", "part"}),- thirds=thirds, corner="corner" in methods, corner_at=corner,+ thirds=thirds, edges=edges, corners=corners,+ corner="corner" in methods if corners is None else None, corner_at=corner,notch="notch" in methods, capable=self.capable(), **self._args())self.carry_out(outcome)return Truediff --git a/core/tests/settings_behaviour.py b/core/tests/settings_behaviour.pyindex 8af23c0..d5d905e 100644--- a/core/tests/settings_behaviour.py+++ b/core/tests/settings_behaviour.py@@ -21,7 +21,7 @@ ROOT = Path(__file__).resolve().parents[2]IDS = [protocol.id_text(bytes([value]) * 16) for value in (1, 2, 3)]SETTINGS_ROOT = tempfile.TemporaryDirectory()VALUES = dict(glow_style="beam", glow_colour="ocean", effect_length="long",- effect_size="large", shortcut_arrival=False, shortcut_arrival_style="locator")+ effect_size="large", frame_rate="half", shortcut_arrival=False, shortcut_arrival_style="locator")def mac_adapter():@@ -295,12 +295,16 @@ def status_fixture(platform, caps, cached=False, following=False, offline=()):class Model:def __init__(self, choice):self.rows = []+ def clear(self):+ self.rows.clear()def appendRow(self, item):self.rows.append(item)namespace.update(QStandardItemModel=Model, QStandardItem=Item,Qt=SimpleNamespace(ItemDataRole=SimpleNamespace(UserRole=0)))app._peer_entries = app.peersapp._shown = lambda text: text+ app._hide_addresses = lambda: False+ app._design_follow_signature = object()choice = SimpleNamespace(blockSignals=lambda on: None, findData=lambda *args: 0,setCurrentIndex=lambda index: None)choice.setModel = lambda model: setattr(choice, "model", model)diff --git a/core/tests/test_arrival_grace.py b/core/tests/test_arrival_grace.pyindex 9ca8722..78f3fa8 100644--- a/core/tests/test_arrival_grace.py+++ b/core/tests/test_arrival_grace.py@@ -58,6 +58,19 @@ class ReturnEdgeArrivalGrace(unittest.TestCase):edge.reset()self.assertEqual(edge.feed(MONITORS, (99, 50), 20, 0).action, return_edge.CROSS)+ def test_contact_span_gates_the_seam_and_maps_the_landing_into_the_target_span(self):+ source = return_edge.Rect(0, 0, 100, 100)+ edge = return_edge.ReturnEdge("right", 10, self.clock, display="source", target_display="target",+ target_side="left", contact_span=(0.25, 1.0), target_span=(0.0, 0.75))+ displays = {"source": source}++ outside = edge.feed([source], (99, 10), 10, 0, display_map=displays)+ self.assertEqual(outside.action, return_edge.PASS)+ landed = edge.feed([source], (99, 50), 10, 0, display_map=displays)++ self.assertEqual(landed.action, return_edge.CROSS)+ self.assertAlmostEqual(landed.offset, 0.25)+def test_start_grace_begins_a_new_grace_period(self):self.clock.now += 0.3edge = return_edge.ReturnEdge("right", resistance_px=10, clock=self.clock)diff --git a/core/tests/test_atlas.py b/core/tests/test_atlas.pyindex 8886ef9..51e6d96 100644--- a/core/tests/test_atlas.py+++ b/core/tests/test_atlas.py@@ -3,9 +3,130 @@ import mathimport unittestfrom core import settings_sync, ways+from core.tests.crossing_harness import per_screen_layoutclass AtlasTests(unittest.TestCase):+ def test_taller_a_display_keeps_both_contacts_that_share_its_end_third(self):+ held = {"machine_id": "A", "peers": [{"id": "B", "port": 24820, "side": ""}], "zones": []}+ layout = {+ "A": {"x": 100, "y": 0, "w": 200, "h": 120, "displays": {+ "a1": {"x": 0, "y": 0, "w": 100, "h": 120},+ "a0": {"x": 100, "y": 0, "w": 100, "h": 100},+ }},+ "B": {"x": 0, "y": 0, "w": 100, "h": 200, "displays": {+ "b0": {"x": 0, "y": 0, "w": 100, "h": 100},+ "b1": {"x": 0, "y": 100, "w": 100, "h": 100},+ }},+ }++ result = ways.compile_layout(held, layout, now=10)++ routes = {(zone.get("display"), zone.get("target_display"), zone["kind"])+ for zone in result["settings"]["zones"] if zone.get("side") == "left"}+ self.assertIn(("a1", "b1", "part"), routes)++ def test_per_screen_contact_zones_keep_only_the_shared_span(self):+ own, other = "own", "other"+ held = {"machine_id": own, "peers": [{"id": other, "port": 24820, "side": "right"}], "zones": []}+ layout = {+ own: {"x": 0, "y": 0, "w": 100, "h": 100,+ "displays": {"source": {"x": 0, "y": 0, "w": 100, "h": 100}}},+ other: {"x": 100, "y": 0, "w": 100, "h": 125,+ "displays": {"above": {"x": 0, "y": 0, "w": 100, "h": 25},+ "target": {"x": 0, "y": 25, "w": 100, "h": 100}}},+ }++ result = ways.compile_layout(held, layout, now=10)++ zone = next(zone for zone in result["settings"]["zones"] if zone.get("target_display") == "target")+ self.assertEqual(zone["contact_span"], [0.25, 1.0])+ self.assertEqual(zone["target_span"], [0.0, 0.75])++ def test_per_screen_aba_below_compiles_on_both_machines(self):+ def routes(result):+ return {(zone["kind"], zone.get("display"), zone.get("side"), zone.get("corner"),+ zone.get("target_display"), zone.get("target_side"), tuple(zone.get("parts", ())))+ for zone in result["settings"]["zones"]}++ cases = (+ ("equal displays", {}, "right", "left",+ {("edge", "0", "right", None, "0", "left", ()),+ ("corner", "0", "right", "bottom_right", "1", "left", ()),+ ("edge", "1", "left", None, "0", "right", ()),+ ("corner", "1", "left", "bottom_left", "1", "right", ())},+ {("edge", "0", "left", None, "0", "right", ()),+ ("edge", "0", "right", None, "1", "left", ()),+ ("corner", "1", "left", "top_left", "0", "right", ()),+ ("corner", "1", "right", "top_right", "1", "left", ())}),+ ("mixed logical display sizes", {"a_sizes": ((120, 100), (150, 100)),+ "b_sizes": ((100, 100), (130, 90))}, "right", "left",+ {("edge", "0", "right", None, "0", "left", ()),+ ("corner", "0", "right", "bottom_right", "1", "left", ()),+ ("edge", "1", "left", None, "0", "right", ()),+ ("part", "1", "bottom", None, "1", "top", ("start",))},+ {("edge", "0", "left", None, "0", "right", ()),+ ("edge", "0", "right", None, "1", "left", ()),+ ("corner", "1", "left", "top_left", "0", "right", ()),+ ("part", "1", "top", None, "1", "bottom", ("end",))}),+ ("B1 offset left", {"b1_x": 80}, "right", "left",+ {("edge", "0", "right", None, "0", "left", ()),+ ("part", "0", "bottom", None, "1", "top", ("end",)),+ ("edge", "1", "left", None, "0", "right", ())},+ {("edge", "0", "left", None, "0", "right", ()),+ ("edge", "0", "right", None, "1", "left", ()),+ ("part", "1", "top", None, "0", "bottom", ("start",))}),+ ("B1 offset right", {"b1_x": 120}, "right", "left",+ {("edge", "0", "right", None, "0", "left", ()),+ ("edge", "1", "left", None, "0", "right", ()),+ ("part", "1", "bottom", None, "1", "top", ("start",))},+ {("edge", "0", "left", None, "0", "right", ()),+ ("edge", "0", "right", None, "1", "left", ()),+ ("part", "1", "top", None, "1", "bottom", ("end",))}),+ )+ for label, kwargs, side_a, side_b, zones_a, zones_b in cases:+ with self.subTest(layout=label):+ tiles = per_screen_layout(A, B, **kwargs)+ settings_a = {"machine_id": A, "peers": [{"id": B, "port": 24820, "side": ""}], "zones": []}+ settings_b = {"machine_id": B, "peers": [{"id": A, "port": 24820, "side": ""}], "zones": []}+ from_a = ways.compile_layout(settings_a, tiles, now=10)+ from_b = ways.compile_layout(settings_b, tiles, now=10)++ self.assertTrue(from_a["accepted"])+ self.assertTrue(from_b["accepted"])+ self.assertEqual(from_a["settings"]["peers"][0]["side"], side_a)+ self.assertEqual(from_b["settings"]["peers"][0]["side"], side_b)+ self.assertEqual(routes(from_a), zones_a)+ self.assertEqual(routes(from_b), zones_b)++ def test_shifted_b1_keeps_the_machine_tile_scale_and_moves_only_its_display(self):+ for offset in (80, 120):+ with self.subTest(b1_offset=offset):+ tile = per_screen_layout(A, B, b1_x=offset)[B]+ frames = {frame["display"]: frame for frame in ways._display_frames(tile)}+ self.assertEqual((tile["x"], tile["w"]), (100, 100))+ self.assertEqual((frames["0"]["x"], frames["0"]["w"]), (100, 100))+ self.assertEqual((frames["1"]["x"], frames["1"]["w"]), (offset, 100))++ def test_per_screen_zones_include_both_aba_edges_and_b1_corner_routes(self):+ tiles = per_screen_layout(A, B)+ settings_a = {"machine_id": A, "peers": [{"id": B, "port": 24820, "side": ""}], "zones": []}+ settings_b = {"machine_id": B, "peers": [{"id": A, "port": 24820, "side": ""}], "zones": []}+ from_a = ways.compile_layout(settings_a, tiles, now=10)["settings"]["zones"]+ from_b = ways.compile_layout(settings_b, tiles, now=10)["settings"]["zones"]+ a_edges = {(zone.get("display"), zone.get("side"), zone.get("target_display"), zone.get("target_side"))+ for zone in from_a if zone["kind"] == "edge"}+ b_edges = {(zone.get("display"), zone.get("side"), zone.get("target_display"), zone.get("target_side"))+ for zone in from_b if zone["kind"] == "edge"}+ self.assertEqual(a_edges, {("0", "right", "0", "left"), ("1", "left", "0", "right")})+ self.assertEqual(b_edges, {("0", "left", "0", "right"), ("0", "right", "1", "left")})+ self.assertEqual({(zone.get("display"), zone.get("corner"), zone.get("target_display"), zone.get("target_side"))+ for zone in from_a if zone["kind"] == "corner"},+ {("0", "bottom_right", "1", "left"), ("1", "bottom_left", "1", "right")})+ self.assertEqual({(zone.get("display"), zone.get("corner"), zone.get("target_display"), zone.get("target_side"))+ for zone in from_b if zone["kind"] == "corner"},+ {("1", "top_left", "0", "right"), ("1", "top_right", "1", "left")})+def test_layout_compile_edge_part_gap_and_corner(self):settings = self.settings(A)layout = self.picture(settings, A, self.tile(160, 0, 160, 100))@@ -20,7 +141,9 @@ class AtlasTests(unittest.TestCase):result = ways.compile_layout(settings, self.picture(settings, A, self.tile(160, 67, 160, 33)), now=10)self.assertEqual(result["tiles"][A]["state"], "part")self.assertEqual(ways.ways(result["settings"], A)["parts"], ["start", "middle", "end"])- self.assertEqual(result["settings"]["zones"], [{"peer": A, "kind": "part", "parts": ["end"], "side": "right"}])+ self.assertEqual(result["settings"]["zones"], [{"peer": A, "kind": "part", "parts": ["end"],+ "side": "right", "contact_span": [0.67, 1.0],+ "target_span": [0.0, 1.0]}])settings = self.settings(A)result = ways.compile_layout(settings, self.picture(settings, A, self.tile(160, 20, 160, 10)), now=10)@@ -41,8 +164,10 @@ class AtlasTests(unittest.TestCase):self.assertEqual(ways.ways(result["settings"], A)["parts"], ["start", "middle", "end"])self.assertEqual(ways.ways(result["settings"], B)["parts"], ["start", "middle", "end"])self.assertEqual(result["settings"]["zones"], [- {"peer": A, "kind": "part", "parts": ["start"], "side": "right"},- {"peer": B, "kind": "part", "parts": ["end"], "side": "right"},+ {"peer": A, "kind": "part", "parts": ["start"], "side": "right",+ "contact_span": [0.0, 0.33], "target_span": [0.0, 1.0]},+ {"peer": B, "kind": "part", "parts": ["end"], "side": "right",+ "contact_span": [0.67, 1.0], "target_span": [0.0, 1.0]},])self.assertEqual(result["tiles"][A]["state"], "part")self.assertEqual(result["tiles"][B]["state"], "part")diff --git a/core/tests/test_crossing_e2e.py b/core/tests/test_crossing_e2e.pyindex ed98155..3a94787 100644--- a/core/tests/test_crossing_e2e.py+++ b/core/tests/test_crossing_e2e.py@@ -17,7 +17,7 @@ from unittest import mockfrom core import return_edge, waysfrom core.return_edge import Rect-from core.tests.crossing_harness import THIRD_AT, Net+from core.tests.crossing_harness import THIRD_AT, Net, per_screen_layoutfrom core.tests.crossing_shells import SHELLSMAC_DISPLAYS = {"0": Rect(0, 0, 1728, 1117)}@@ -90,6 +90,116 @@ class Pair(Desks):self.mac, self.pc = self.desk["This Mac"], self.desk["DESK-WIN11"]+class SameSideArrival(Pair):+ def test_left_departure_lands_right_even_when_the_way_back_is_left(self):+ self.assertTrue(self.place(self.mac, self.pc, "left"))+ self.settled()+ self.assertTrue(self.pc.shell.edit(self.mac, ["edge"], edges=["left"]))+ self.settled()+ self.assertTrue(any(zone.get("peer") == self.mac.id and zone.get("side") == "left"+ for zone in self.pc.settings["zones"]))+ self.assert_cross(self.mac, "left", self.pc, along=0.3)+ self.assertEqual(self.net.landed(self.pc), ("0", "right"))+ self.assertAlmostEqual(self.pc.screen.placed[-1][1] / 2160, 0.3, delta=0.002)+ start = len(self.pc.machine.injector.calls)+ self.mac.hand.move(-40, 0)+ self.assertTrue(self.mac.hand.until(+ lambda: ("move", -40, 0) in self.pc.machine.injector.calls[start:], SETTLE_LIMIT))+ self.assertIs(self.net.at(self.mac), self.pc)+ self.assert_cross(self.mac, "left", self.mac, along=0.3)+ self.assertEqual(self.net.landed(self.mac), ("0", "right"))++ def test_ordinary_left_departure_still_lands_at_the_right_way_back(self):+ self.assertTrue(self.place(self.mac, self.pc, "left"))+ self.settled()+ self.assert_round_trip(self.mac, self.pc, "left", along=0.3)+++ def test_left_corner_departure_lands_right_with_clearance_from_the_ends(self):+ self.assertTrue(self.place(self.mac, self.pc, "left"))+ self.settled()+ self.assertTrue(self.mac.shell.edit(self.pc, [], corners=["top_left"]))+ self.assertTrue(self.pc.shell.edit(self.mac, ["edge"], edges=["left"]))+ self.settled()+ self.assertIs(self.net.push_corner(self.mac, "top_left"), self.pc)+ self.assertEqual(self.net.landed(self.pc), ("0", "right"))+ self.assertEqual(self.pc.screen.placed[-1][1], return_edge.LANDING_CLEAR_PX)+++class PerScreenPair(Pair):+ """The literal A0–B0–A1 / B1-below desk, with both pictures exchanged over the link."""++ LAYOUT_OPTIONS = {}++ DESKS = (("This Mac", "mac", {"0": Rect(0, 0, 100, 100), "1": Rect(100, 0, 100, 100)}, 90),+ ("DESK-WIN11", "pc", {"0": Rect(0, 0, 100, 100), "1": Rect(0, 100, 100, 100)}, 60))++ def setUp(self):+ super().setUp()+ self.picture = per_screen_layout(self.mac.id, self.pc.id, **self.LAYOUT_OPTIONS)+ settings = copy.deepcopy(self.mac.settings)+ settings["layout"] = copy.deepcopy(self.picture)+ self.mac.save(settings)+ self.assertTrue(self.mac.shell.drop(self.pc, self.picture[self.pc.id]["x"],+ self.picture[self.pc.id]["y"], snap=False))+ self.settled()+ self.assert_agree()+ self.assertEqual(self.net.bad_zones(), [])++ def test_pc_b0_crosses_to_mac_a0_and_returns(self):+ self.assertIs(self.net.push(self.pc, "left", display="0"), self.mac)+ self.assertEqual(self.net.landed(self.mac), ("0", "right"))+ self.assertIs(self.net.push(self.pc, "right", display="0"), self.pc)+ self.assertEqual(self.net.landed(self.pc), ("0", "left"))++ def test_a0_crosses_to_b0_and_reciprocally_lands_on_a0(self):+ self.assertIs(self.net.push(self.mac, "right", display="0"), self.pc)+ self.assertEqual(self.net.landed(self.pc), ("0", "left"))+ self.assertIs(self.net.push(self.mac, "left", display="0"), self.mac)+ self.assertEqual(self.net.landed(self.mac), ("0", "right"))++ def test_a1_crosses_to_b0_and_reciprocally_lands_on_a1(self):+ self.assertIs(self.net.push(self.mac, "left", display="1"), self.pc)+ self.assertEqual(self.net.landed(self.pc), ("0", "right"))+ self.assertIs(self.net.push(self.mac, "right", display="0"), self.mac)+ self.assertEqual(self.net.landed(self.mac), ("1", "left"))++ def test_b1_corner_routes_to_the_two_adjacent_a_displays(self):+ for corner, target_display in (("top_left", "0"), ("top_right", "1")):+ with self.subTest(corner=corner):+ self.assertIs(self.net.push_corner(self.pc, corner, display="1"), self.mac)+ self.assertEqual(self.net.landed(self.mac)[0], target_display)+ self.net.shortcut(self.pc)+++class UnevenContactABA(Pair):+ DESKS = (("This Mac", "mac", {"0": Rect(0, 0, 100, 80), "1": Rect(100, 0, 100, 120)}, 90),+ ("DESK-WIN11", "pc", {"0": Rect(0, 0, 100, 100), "1": Rect(0, 100, 100, 100)}, 60))+ LAYOUT_OPTIONS = {"a_sizes": ((100, 80), (100, 120)), "b_sizes": ((100, 100), (100, 100))}++ def setUp(self):+ super().setUp()+ self.picture = per_screen_layout(self.mac.id, self.pc.id, **self.LAYOUT_OPTIONS)+ settings = copy.deepcopy(self.mac.settings)+ settings["layout"] = copy.deepcopy(self.picture)+ self.mac.save(settings)+ self.assertTrue(self.mac.shell.drop(self.pc, self.picture[self.pc.id]["x"],+ self.picture[self.pc.id]["y"], snap=False))+ self.settled()+ self.assert_agree()+ self.assertEqual(self.net.bad_zones(), [])++ def test_a0_lands_proportionally_inside_b0_contact_with_b1_below(self):+ self.assertIs(self.net.push(self.pc, "left", 0.9, display="0"), self.pc)+ self.assertIs(self.net.push(self.mac, "right", 0.5, display="0"), self.pc)++ self.assertEqual(self.net.landed(self.pc), ("0", "left"))+ self.assertEqual(self.pc.screen.placed[-1][1], 40)+ self.assertIs(self.net.push(self.pc, "left", 0.4, display="0"), self.mac)+ self.assertEqual(self.net.landed(self.mac), ("0", "right"))+ self.assertEqual(self.mac.screen.placed[-1][1], 40)++class Rc12Report(Pair):"""10-10, rc12, from both machines' logs: the Mac crossed up to the rig and the rig's first push backraised in switch_v6 ("display and side go together"), leaving its zones disarmed; the user then moved@@ -405,6 +515,61 @@ class EdgeOff(Pair):self.assert_round_trip(self.mac, self.pc, "right", "on again")+class Wrap(Pair):+ def test_two_wrap_edges_and_corners_cross_and_can_be_removed(self):+ self.assertTrue(self.place(self.mac, self.pc, "right"))+ self.settled()+ self.assertTrue(self.mac.shell.edit(self.pc, ["edge"], edges=["left", "top"],+ corners=["top_left", "bottom_left"]))+ self.assert_cross(self.mac, "left", self.pc, "left wrap")+ self.assertEqual(self.net.landed(self.pc)[1], "right")+ self.assert_cross(self.mac, "right", self.mac, "way back through arrival side")+ self.assertEqual(self.net.landed(self.mac)[1], "left")+ for corner in ("top_left", "bottom_left"):+ self.assertIs(self.net.push_corner(self.mac, corner), self.pc, corner)+ self.assertEqual(self.net.landed(self.pc)[1], "right")+ self.assert_cross(self.mac, "right", self.mac, f"{corner} way back")+ self.assert_cross(self.mac, "top", self.pc, "top wrap")+ self.assertEqual(self.net.landed(self.pc)[1], "bottom")+ self.assert_cross(self.mac, "bottom", self.mac, "top wrap way back")+ self.settled()+ self.assert_agree()++ self.assertTrue(self.mac.shell.edit(self.pc, ["edge"], edges=["left"], corners=["top_left"]))+ self.assertIs(self.net.push(self.mac, "top"), self.mac, "removed top wrap")+ self.assertIs(self.net.push(self.mac, "left"), self.pc, "left wrap retained")+ self.assert_cross(self.mac, "right", self.mac, "return after removing a way")+ self.assertTrue(self.mac.shell.edit(self.pc, [], edges=["left"], corners=["top_left"]))+ self.assertIs(self.net.push_corner(self.mac, "bottom_left"), self.mac, "removed corner")+ self.assertIs(self.net.push_corner(self.mac, "top_left"), self.pc, "retained corner")+ self.assert_cross(self.mac, "right", self.mac, "corner return")+ self.settled()+ self.assert_agree()++ def test_edge_off_remembers_wrap_edges_until_restored(self):+ self.assertTrue(self.place(self.mac, self.pc, "right"))+ self.settled()+ self.assertTrue(self.mac.shell.edit(self.pc, [], edges=["left"]))+ self.assertEqual(ways.ways(self.mac.settings, self.pc.id)["edges"], ["left"])+ self.assertIs(self.net.push(self.mac, "left"), self.mac)+ self.assertTrue(self.mac.shell.edit(self.pc, ["edge"], edges=["left"]))+ self.assertIs(self.net.push(self.mac, "left"), self.pc)+ self.assert_cross(self.mac, "right", self.mac, "restored wrap way back")+ self.settled()+ self.assert_agree()++ def test_wrap_works_from_the_other_maps_intent_too(self):+ self.assertTrue(self.place(self.mac, self.pc, "right"))+ self.settled()+ self.assertTrue(self.pc.shell.edit(self.mac, ["edge"], edges=["right"]))+ self.assert_cross(self.pc, "right", self.mac, "PC wrap")+ self.assertEqual(self.net.landed(self.mac)[1], "left")+ self.assert_cross(self.pc, "left", self.pc, "PC wrap way back")+ self.assertEqual(self.net.landed(self.pc)[1], "right")+ self.settled()+ self.assert_agree()++class Shortcut(Pair):def test_the_shortcut_goes_and_comes_back_whatever_the_edges(self):self.assertIs(self.net.shortcut(self.mac, self.pc), self.pc)@@ -453,7 +618,7 @@ class Three(Desks):self.assertTrue(self.place(self.mac, self.linux, "left"))self.settled()self.assert_agree()- self.assert_round_trip(self.mac, self.pc, "top", "rig above")+ self.assert_round_trip(self.mac, self.pc, "top", "rig above", along=0.25, back=0.75)self.assert_round_trip(self.mac, self.linux, "left", "Fedora left")self.assert_round_trip(self.pc, self.mac, "bottom", "the rig's own pointer")self.assert_round_trip(self.linux, self.mac, "right", "Fedora's own pointer")@@ -488,6 +653,20 @@ class Three(Desks):self.assert_round_trip(self.mac, self.pc, side, f"rig {side}")self.assert_round_trip(self.mac, self.linux, "left", f"Fedora still left, rig {side}")+ def test_a_wrap_edge_takes_only_the_thirds_not_held_by_a_peer_contact(self):+ self.assertTrue(self.place(self.mac, self.pc, "right"))+ self.assertTrue(self.place(self.mac, self.linux, "left", shift=25))+ self.settled()+ self.assertTrue(self.mac.shell.edit(self.pc, ["edge"], edges=["left"]))+ map_entry = ways.compile_layout(self.mac.settings, self.mac.settings["layout"],+ capable=self.mac.shell.capable())["tiles"][self.pc.id]+ self.assertEqual(map_entry["wraps"], [{"display": "0", "side": "left", "parts": ["start"]}])+ self.assert_cross(self.mac, "left", self.pc, "free wrap third", THIRD_AT["start"])+ self.assert_cross(self.mac, "right", self.mac, "way back from the free wrap third")+ self.assert_cross(self.mac, "left", self.linux, "contact-owned thirds", THIRD_AT["middle"])+ self.settled()+ self.assert_agree()+class Rc14Corner(Three):"""10-10, rc14, from the Mac's and the rig's logs: the rig's corner for the Mac (top left, edges@@ -495,13 +674,17 @@ class Rc14Corner(Three):the hand still moving left crossed the Mac's left zone to the machine there 14 ms later."""def test_a_corner_crossing_home_lands_clear_of_the_edge_beside_it(self):- self.assertTrue(self.place(self.mac, self.pc, "bottom"))+ # The rig half a tile left of centre, so Fedora shares part of its top edge. Placed before the+ # tiles were exchanged, the rig sometimes went exactly below the Mac instead; Fedora then+ # touched the rig's top left corner and, since 1.5.3, holds it, so the Mac's corner was refused.+ self.settled()+ self.assertTrue(self.place(self.mac, self.pc, "bottom", shift=-self.mac.settings["layout"][self.mac.id]["w"] // 2))self.assertTrue(self.place(self.mac, self.linux, "left"))self.settled()for corner in ("top_left", "top_right"):with self.subTest(corner=corner):self.assertTrue(self.pc.shell.edit(self.mac, ["corner"], corner=corner))- self.assert_cross(self.mac, "bottom", self.pc, "Mac down to the rig")+ self.assert_cross(self.mac, "bottom", self.pc, "Mac down to the rig", along=0.25)self.assertIs(self.net.push_corner(self.mac, corner), self.mac, f"the rig's {corner} corner home")display, side = self.net.landed(self.mac)self.assertEqual(side, "bottom", "landed on the Mac's bottom edge")diff --git a/core/tests/test_crossing_state.py b/core/tests/test_crossing_state.pyindex d808cff..7a2ee70 100644--- a/core/tests/test_crossing_state.py+++ b/core/tests/test_crossing_state.py@@ -1,11 +1,12 @@"""The saved picture and local intent, exercised without either desktop toolkit."""import copy+import threadingimport unittestfrom types import SimpleNamespace-from core import owner, protocol, return_edge, ways-from core.tests.crossing_harness import Hand, Screen+from core import owner, protocol, return_edge, settings_sync, ways+from core.tests.crossing_harness import Hand, Net, Screen, per_screen_layoutfrom core.tests.responder_harness import ident@@ -35,6 +36,48 @@ class CrossingStateTests(unittest.TestCase):def args(self):return dict(platform="mac", live=lambda _: True, gone=lambda _: False, now=100)+ def test_hand_close_waits_for_keep_alive_thread_to_exit(self):+ started = threading.Event()+ release = threading.Event()+ closed = threading.Event()++ class HeldHand(Hand):+ def _keep_alive(self):+ started.set()+ release.wait()++ before = {thread.ident for thread in threading.enumerate()}+ hand = HeldHand(SimpleNamespace(own=ident(91)))+ thread = next(thread for thread in threading.enumerate()+ if thread.name == "hand-pings" and thread.ident not in before)+ closer = threading.Thread(target=lambda: (hand.close(), closed.set()))+ self.assertTrue(started.wait(1))+ closer.start()+ try:+ self.assertFalse(closed.wait(0.05), "Hand.close returned before its keep-alive thread exited")+ finally:+ release.set()+ closer.join(1)+ self.assertTrue(closed.is_set())+ self.assertFalse(thread.is_alive())++ def test_net_add_closes_hand_when_setup_stops_before_start(self):+ class Shell:+ def __init__(self, desk):+ self.desk = desk++ def stop(self):+ pass++ net = Net(self, {"mac": Shell})+ desk = net.add("mac", "mac", DISPLAYS, 92)+ hand = desk.hand+ try:+ self.doCleanups()+ self.assertFalse(hand._keep_alive_thread.is_alive())+ finally:+ hand.close()+def test_paired_defaults_and_own_displays_are_pure(self):held = settings()held["layout"] = {}@@ -42,7 +85,8 @@ class CrossingStateTests(unittest.TestCase):out = self.state().paired(held, platform="mac", own_displays=DISPLAYS, now=100)self.assertEqual(held, original)self.assertEqual(out["settings"]["peers"][0]["ways"],- dict(edge=True, thirds=ALL, corner=False, corner_at="top_left", notch=False))+ dict(edge=True, thirds=ALL, edges=[], corner=False, corner_at="top_left",+ corners=[], notch=False))self.assertEqual(out["settings"]["layout"][A]["x"], 160)self.assertEqual(out["settings"]["layout"][OWN]["displays"]["0"]["w"], 1728)@@ -58,6 +102,19 @@ class CrossingStateTests(unittest.TestCase):self.assertEqual(ways.ways(enabled["settings"], A)["parts"], ["start"])self.assertEqual(enabled["tell"], [A])+ def test_edit_replaces_edges_and_corners_in_canonical_order_and_drops_held_corners(self):+ held = settings()+ held["peers"].append({"id": B, "port": 24820,+ "ways": {"edge": True, "thirds": ALL, "edges": [], "corner": True,+ "corner_at": "top_left", "corners": ["top_left"], "notch": False}})+ out = self.state().edit_ways(held, A, edges=["bottom", "bogus", "left"],+ corners=["bottom_right", "top_left", "bogus"], **self.args())+ intent = ways.ways(out["settings"], A)+ self.assertEqual(intent["edges"], ["left", "bottom"])+ self.assertEqual(intent["corners"], ["bottom_right"])+ self.assertIn("corner", intent["methods"])+ self.assertEqual(out["settings"]["peers"][0]["ways"]["corner_at"], "bottom_right")+def test_arrangement_from_picture_peer_never_moves_or_echoes(self):held = self.state().paired(settings(), platform="mac", own_displays=DISPLAYS, now=100)["settings"]picture = copy.deepcopy(held["layout"])@@ -259,7 +316,8 @@ class CrossingStateTests(unittest.TestCase):on_upper["peers"] = [dict(id=OWN, port=24820)]out = ways.compile_layout(on_upper, on_upper["layout"], platform="pc", now=100)self.assertEqual(out["settings"]["zones"], [- dict(peer=OWN, kind="part", side="left", parts=["middle", "end"])])+ dict(peer=OWN, kind="part", side="left", parts=["middle", "end"],+ contact_span=[0.5, 1.0], target_span=[0.0, 0.5])])def test_peer_spanning_two_display_tops_compiles_both_contacts(self):held = settings()@@ -303,7 +361,8 @@ class CrossingStateTests(unittest.TestCase):out = ways.compile_layout(held, held["layout"], platform="pc", now=100)self.assertEqual(out["settings"]["zones"], [dict(peer=B, kind="part", parts=["middle", "end"]),- dict(peer=A, kind="part", parts=["start"], side="right")])+ dict(peer=A, kind="part", parts=["start"], side="right",+ contact_span=[0.0, 0.33], target_span=[0.0, 1.0])])def test_target_fields_are_written_together_and_side_is_derived(self):held = settings()@@ -322,10 +381,77 @@ class CrossingStateTests(unittest.TestCase):screen = Screen({"1": return_edge.Rect(0, 0, 100, 100),"2": return_edge.Rect(100, 0, 200, 100)})hand = Hand(SimpleNamespace(own=ident(90), screen=screen))+ self.addCleanup(hand.close)hand.carry_out([owner.Moved(None, A, "switch", "bottom", 0.5,display="2", side="top")])self.assertEqual(screen.placed[-1], (200, 0))+ def test_per_screen_split_picture_round_trips_between_mac_pc_and_two_pcs(self):+ picture = per_screen_layout(OWN, A, b1_x=80)+ picture[A]["display_offsets"] = {"1": {"x": -20, "y": 12}}+ picture[OWN]["display_offsets"] = {"1": {"x": 25, "y": -8}}+ pairs = (("Mac and PC", "mac", "pc"), ("two PCs", "pc", "pc"))++ for label, first_platform, second_platform in pairs:+ with self.subTest(pair=label):+ for sender, receiver, receiver_platform in (+ (OWN, A, second_platform), (A, OWN, first_platform),+ ):+ state = {"set_at": 100, "by": sender, "tiles": copy.deepcopy(picture)}+ wire = settings_sync.message_data(False, 100, by=sender, layout_state=state)+ local = picture[receiver]+ own_displays = {+ display: return_edge.Rect(frame["x"], frame["y"], frame["w"], frame["h"])+ for display, frame in local["displays"].items()+ }+ held = {"machine_id": receiver, "peers": [{"id": sender, "port": 24820, "side": ""}],+ "zones": [], "layout": {receiver: copy.deepcopy(local)}}+ parsed = settings_sync.read_layout_state(wire, now=101)+ out = self.state().receive_picture(held, parsed, source=sender,+ capable={OWN, A}, own_displays=own_displays,+ platform=receiver_platform, live=lambda _: True,+ gone=lambda _: False, now=101)+ self.assertTrue(out["changed"])+ self.assertEqual(out["settings"]["layout"][receiver]["display_offsets"],+ picture[receiver]["display_offsets"])+ self.assertEqual(out["settings"]["layout"][sender]["display_offsets"],+ picture[sender]["display_offsets"])+ compiled = ways.compile_layout(out["settings"], out["settings"]["layout"], now=102)+ self.assertTrue(compiled["accepted"])+ self.assertEqual(compiled["settings"]["zones"], out["settings"]["zones"])++ def test_a_152_peer_keeps_only_the_first_arrangement_side_and_no_display_routes(self):+ picture = per_screen_layout(OWN, A)+ wire = settings_sync.message_data(False, 100, by=OWN,+ layout_state={"set_at": 100, "by": OWN, "tiles": picture})+ old_wire = settings_sync.for_capabilities(wire, {"settings", "layout"})+ old_state = settings_sync.read_layout_state(old_wire, now=101)+ self.assertNotIn("displays", old_state["tiles"][OWN])+ self.assertNotIn("display_offsets", old_state["tiles"][A])++ held = {"machine_id": A, "peers": [{"id": OWN, "port": 24820, "side": ""}], "zones": [],+ "layout": {A: picture[A]}}+ received = self.state().receive_arrangement(held, OWN,+ {"edge": "right", "set_at": 101, "by": ident(90), "way_back": True},+ capable={A}, platform="pc", live=lambda _: True, gone=lambda _: False, now=102)+ self.assertTrue(received["changed"])+ self.assertEqual(received["settings"]["peers"][0]["side"], "left")+ self.assertEqual(received["settings"]["zones"], [{"peer": OWN, "kind": "edge"}])++ def test_reciprocal_landing_grace_holds_the_zone_beside_the_target_display(self):+ clock = [0.0]+ display = return_edge.Rect(100, 0, 100, 100)+ model = return_edge.ReturnEdge("right", resistance_px=10, clock=lambda: clock[0],+ display="B0", target_display="A1", target_side="left")+ model.start_grace()+ clock[0] = 0.1+ held = model.feed([display], (display.right, 50), 12, 0, {"B0": display})+ self.assertEqual(held.action, return_edge.HOLD)+ clock[0] = return_edge.ARRIVAL_GRACE_SECONDS + 0.01+ crossed = model.feed([display], (display.right, 50), 12, 0, {"B0": display})+ self.assertEqual(crossed.action, return_edge.CROSS)+ self.assertEqual((crossed.display, crossed.side), ("A1", "left"))+def test_rc12_migration_reads_once_and_removes_old_marks(self):own, rig = "TnY4DcwqoBkkPubq9P00QA", "GRMYVCd7dKksFjy5FejD4Q"held = {"machine_id": own, "peers": [dict(id=rig, side="left", port=24820)], "zones": [@@ -339,10 +465,11 @@ class CrossingStateTests(unittest.TestCase):rig: tile(-329, 241, displays={"0": dict(x=0, y=0, w=3840, h=2160)})}}out = self.state().migrate(held, "mac")saved = out["settings"]- self.assertEqual(saved["peers"][0]["ways"], dict(edge=True, thirds=ALL, corner=False,- corner_at="top_left", notch=True))+ self.assertEqual(saved["peers"][0]["ways"], dict(edge=True, thirds=ALL, edges=[], corner=False,+ corner_at="top_left", corners=[], notch=True))self.assertEqual(saved["zones"], [dict(peer=rig, kind="edge", display="0", side="left",- target_display="0", target_side="right"),+ target_display="0", target_side="right",+ contact_span=[0.0, 1.0], target_span=[0.0, 1.0]),dict(peer=rig, kind="notch")])self.assertFalse(self.state().migrate(saved, "mac")["changed"])held["zones"][0].update(off=True, page_off=True, aside=True)@@ -352,6 +479,56 @@ class CrossingStateTests(unittest.TestCase):self.assertEqual(saved["peers"][0]["ways"]["thirds"], ["end"])self.assertEqual(saved["zones"], [dict(peer=rig, kind="notch")])+ def two_with_notch(self, a_notch, b_notch):+ held = settings()+ held["peers"].append({"id": B, "port": 24820, "side": "left"})+ held["layout"][B] = tile(-160)+ for peer, notch in ((A, a_notch), (B, b_notch)):+ entry = next(item for item in held["peers"] if item["id"] == peer)+ entry["ways"] = dict(edge=True, thirds=ALL, edges=[], corner=False, corner_at="top_left",+ corners=[], notch=notch)+ return held++ def test_the_notch_leads_to_one_machine_ticking_it_on_one_unticks_the_others(self):+ # 1.5.3: the notch goes to one machine only.+ held = self.state().edit_ways(self.two_with_notch(True, False), B, notch=True, **self.args())["settings"]+ self.assertEqual([entry["ways"]["notch"] for entry in held["peers"]], [False, True])+ self.assertNotIn("notch", ways.ways(held, A)["methods"])+ self.assertIn("notch", ways.ways(held, B)["methods"])+ self.assertEqual([zone["peer"] for zone in held["zones"] if zone["kind"] == "notch"], [B])++ def test_an_old_file_with_several_notches_keeps_the_first_in_ways_order(self):+ held = self.two_with_notch(True, True)+ self.assertIn("notch", ways.ways(held, A)["methods"])+ self.assertNotIn("notch", ways.ways(held, B)["methods"])+ saved = self.state().edit_ways(held, B, edge=True, **self.args())["settings"]+ self.assertEqual([entry["ways"]["notch"] for entry in saved["peers"]], [True, False])+ self.assertEqual([zone["peer"] for zone in saved["zones"] if zone["kind"] == "notch"], [A])++ def test_a_left_out_machine_never_keeps_the_notch_from_one_in_use(self):+ # AGY review, 14-10: a left-out first machine held it, cleared the second, and no notch armed.+ held = self.two_with_notch(True, True)+ held["peers"][0]["left_out"] = True+ self.assertNotIn("notch", ways.ways(held, A)["methods"])+ self.assertIn("notch", ways.ways(held, B)["methods"])+ saved = self.state().edit_ways(held, B, edge=True, **self.args())["settings"]+ self.assertEqual([zone["peer"] for zone in saved["zones"] if zone["kind"] == "notch"], [B])+ self.assertEqual([entry["ways"]["notch"] for entry in saved["peers"]], [False, True])+ alone = self.two_with_notch(True, False)+ alone["peers"][0]["left_out"] = True+ saved = self.state().edit_ways(alone, B, edge=True, **self.args())["settings"]+ self.assertTrue(saved["peers"][0]["ways"]["notch"], "kept for Put back while nobody in use has it")++ def test_return_through_the_notch_rides_on_the_notch_zone(self):+ held = self.state().edit_ways(self.two_with_notch(False, True), B, notch_return=True, **self.args())["settings"]+ self.assertEqual([zone for zone in held["zones"] if zone["kind"] == "notch"],+ [dict(peer=B, kind="notch", return_here=True)])+ held = self.state().edit_ways(held, B, notch_return=False, **self.args())["settings"]+ self.assertEqual([zone for zone in held["zones"] if zone["kind"] == "notch"], [dict(peer=B, kind="notch")])+ pc = self.state().edit_ways(self.two_with_notch(False, True), B, notch_return=True,+ **{**self.args(), "platform": "pc"})["settings"]+ self.assertNotIn("notch_return", pc["peers"][1])+def test_migration_keeps_a_left_out_machines_ways_for_put_back(self):# Codex review, 10-10: rc12 kept the kinds in use in left_out_ways and turned every zone off.held = settings()@@ -360,8 +537,8 @@ class CrossingStateTests(unittest.TestCase):edge="right", off=True),dict(peer=A, kind="notch", off=True)]saved = self.state().migrate(held, "mac")["settings"]- self.assertEqual(saved["peers"][0]["ways"], dict(edge=True, thirds=ALL, corner=True,- corner_at="top_right", notch=True))+ self.assertEqual(saved["peers"][0]["ways"], dict(edge=True, thirds=ALL, edges=[], corner=True,+ corner_at="top_right", corners=["top_right"], notch=True))self.assertEqual(saved["zones"], [])back = self.state().put_back(saved, A, platform="mac", now=100)["settings"]self.assertIn("edge", [zone["kind"] for zone in back["zones"]])diff --git a/core/tests/test_dormant_repair.py b/core/tests/test_dormant_repair.pyindex f4c1731..2ab09d5 100644--- a/core/tests/test_dormant_repair.py+++ b/core/tests/test_dormant_repair.py@@ -86,8 +86,10 @@ class DormantPeerTests(unittest.TestCase):self.assertEqual(outcome, receiver.ADMITTED)self.assertEqual(self.settings["zones"], [- {"peer": PEER, "kind": "part", "parts": ["start"], "side": "left"},- {"peer": other_id, "kind": "part", "parts": ["middle", "end"], "side": "left"},+ {"peer": PEER, "kind": "part", "parts": ["start"], "side": "left",+ "contact_span": [0.0, 0.5], "target_span": [0.0, 1.0]},+ {"peer": other_id, "kind": "part", "parts": ["middle", "end"], "side": "left",+ "contact_span": [0.5, 1.0], "target_span": [0.0, 1.0]},])self.assertEqual(ways.ways(self.settings, PEER)["methods"], ["edge"])self.assertTrue(all("off" not in zone for zone in self.settings["zones"]))@@ -120,7 +122,8 @@ class DormantPeerTests(unittest.TestCase):self.assertTrue(ways.has_way(self.settings, PEER))self.assertEqual(ways.ways(self.settings, PEER)["methods"], ["edge"])- self.assertEqual(self.settings["zones"], [{"peer": PEER, "kind": "edge", "side": "left"}])+ self.assertEqual(self.settings["zones"], [{"peer": PEER, "kind": "edge", "side": "left",+ "contact_span": [0.0, 1.0], "target_span": [0.0, 1.0]}])def test_qr_known_check_allows_a_dormant_same_id_peer(self):service = pairing.PairingService.__new__(pairing.PairingService)diff --git a/core/tests/test_easy_pair.py b/core/tests/test_easy_pair.pynew file mode 100644index 0000000..bf39d62--- /dev/null+++ b/core/tests/test_easy_pair.py@@ -0,0 +1,191 @@+import copy+import hashlib+import unittest++from core import pairing+from core.easy_pair import EasyPairWindow, PAIR_MODES+++def windows():+ clock = [100.0]+ a = EasyPairWindow("Mac", b"a" * 16, "mac", 24800, clock=lambda: clock[0])+ b = EasyPairWindow("PC", b"b" * 16, "win", 24801, clock=lambda: clock[0])+ a.select(b.offer("192.0.2.2", 9002))+ b.select(a.offer("192.0.2.1", 9001))+ return a, b, clock+++def exchange(a, b):+ for _ in range(4):+ for sender, receiver, address in ((a, b, "192.0.2.1"), (b, a, "192.0.2.2")):+ for message in sender.messages():+ receiver.receive(message, address)+++def deterministic(label):+ counter = 0++ def entropy(size):+ nonlocal counter+ counter += 1+ return hashlib.sha512(label + bytes([counter])).digest()[:size]++ return entropy+++class EasyPairWindowTests(unittest.TestCase):+ def test_matching_confirmation_requires_both_approvals(self):+ a, b, _ = windows()+ exchange(a, b)+ assert a.state == b.state == "confirm"+ assert a.sas == b.sas and len(a.sas) == 6+ assert not a.ready and not b.ready+ a.approve(a.sas, a.attempt)+ exchange(a, b)+ assert not a.ready and not b.ready+ b.approve(b.sas, b.attempt)+ exchange(a, b)+ assert a.ready and b.ready+ assert a.token == b.token++ def test_mismatch_consumes_window(self):+ a, b, _ = windows()+ exchange(a, b)+ with self.assertRaises(pairing.PairingError):+ a.approve("999999" if a.sas != "999999" else "000000", a.attempt)+ assert a.state == "refused" and not a.messages() and not a.ready++ def test_third_machine_and_cross_window_replay_do_not_advance(self):+ a, b, _ = windows()+ commit = b.messages()[0]+ a.receive(commit, "192.0.2.3")+ assert a.remote_commit is None+ wrong = {**commit, "to": "c" * 32}+ a.receive(wrong, "192.0.2.2")+ assert a.remote_commit is None+ a.receive(commit, "192.0.2.2")+ changed = {**commit, "commit": pairing._b64(b"x" * 64)}+ a.receive(changed, "192.0.2.2")+ assert a.state == "refused"++ def test_expiry_discards_keys_and_approval(self):+ a, b, clock = windows()+ exchange(a, b)+ sas, attempt = a.sas, a.attempt+ clock[0] += 60+ assert a.state == "expired"+ with self.assertRaises(pairing.PairingError):+ a.approve(sas, attempt)+ assert not a.ready and not a.messages() and a.token is None++ def test_old_peer_cannot_select_nearby(self):+ a, b, _ = windows()+ c = EasyPairWindow("New", b"c" * 16, "linux", 24802)+ offer = b.offer("192.0.2.2", 9002)+ offer.pop("pair_modes")+ with self.assertRaises(pairing.PairingError):+ c.select(offer)+ assert c.state == "searching"++ def test_reveal_before_commit_and_modified_reveal(self):+ a, b, _ = windows()+ a.receive(b._message("easy_reveal", reveal=b.reveal), "192.0.2.2")+ assert a.remote_reveal is None+ a.receive(b.messages()[0], "192.0.2.2")+ reveal = copy.deepcopy(b.reveal)+ reveal["name"] = "Intruder"+ a.receive(b._message("easy_reveal", reveal=reveal), "192.0.2.2")+ assert a.state == "refused"++ def test_invalid_proof_and_replayed_approval_are_refused(self):+ a, b, _ = windows()+ a.receive(b.messages()[0], "192.0.2.2")+ b.receive(a.messages()[0], "192.0.2.1")+ for msg in b.messages():+ a.receive(msg, "192.0.2.2")+ a.receive(b._message("easy_proof", tag=pairing._b64(bytes(64))), "192.0.2.2")+ assert a.state == "refused"+ a, b, _ = windows()+ exchange(a, b)+ with self.assertRaises(pairing.PairingError):+ a.approve(a.sas, "old-attempt")+ assert a.state == "refused"++ def test_duplicate_messages_do_not_change_transcript(self):+ a, b, _ = windows()+ exchange(a, b)+ sas, token = a.sas, a.token+ exchange(a, b)+ assert (a.sas, a.token) == (sas, token)+ assert a.reveal["pair_modes"] == PAIR_MODES++ def test_committed_interleaved_mitm_has_different_confirmations(self):+ a = EasyPairWindow("Mac", b"a" * 16, "mac", 24800, entropy=deterministic(b"a"))+ b = EasyPairWindow("PC", b"b" * 16, "win", 24801, entropy=deterministic(b"b"))+ fake_b = EasyPairWindow("PC", b"b" * 16, "win", 24801, entropy=deterministic(b"fake-b"))+ fake_a = EasyPairWindow("Mac", b"a" * 16, "mac", 24800, entropy=deterministic(b"fake-a"))+ a.select(fake_b.offer("192.0.2.2", 9002))+ fake_b.select(a.offer("192.0.2.1", 9001))+ # Attacker fully learns one leg before committing to the other. The fresh honest+ # nonce on that second leg was still hidden when its attacker commitment was fixed.+ exchange(a, fake_b)+ b.select(fake_a.offer("192.0.2.1", 9001))+ fake_a.select(b.offer("192.0.2.2", 9002))+ exchange(fake_a, b)+ assert a.sas == fake_b.sas and b.sas == fake_a.sas+ assert a.sas != b.sas and a.token != b.token+ assert not a.ready and not b.ready++ def test_invalid_but_committed_peer_payload_is_refused(self):+ from core.easy_pair import canonical, DOMAIN+ cases = [("port", True), ("pair_modes", ["sas_v1"]),+ ("id", pairing._b64(bytes(16))), ("share", pairing._b64(bytes(32))),+ ("nonce", "invalid"), ("extra", "unexpected")]+ for field, value in cases:+ with self.subTest(field=field):+ a, b, _ = windows()+ reveal = {**b.reveal, field: value}+ commitment = hashlib.sha512(DOMAIN + b"commit\0" + canonical(reveal)).digest()+ a.receive(b._message("easy_commit", commit=pairing._b64(commitment)), "192.0.2.2")+ a.receive(b._message("easy_reveal", reveal=reveal), "192.0.2.2")+ assert a.state == "refused" and a.token is None++ def test_cannot_confirm_before_key_proof_or_after_cancellation(self):+ a, b, _ = windows()+ with self.assertRaises(pairing.PairingError):+ a.approve("000000", a.attempt)+ assert a.state == "refused"+ a, b, _ = windows()+ exchange(a, b)+ sas, attempt = a.sas, a.attempt+ a.cancel()+ with self.assertRaises(pairing.PairingError):+ a.approve(sas, attempt)+ assert not a.ready++ def test_approval_replay_from_previous_window_and_reflected_proof(self):+ a, b, _ = windows()+ exchange(a, b)+ b.approve(b.sas, b.attempt)+ old = next(msg for msg in b.messages() if msg["type"] == "easy_approve")+ a, b, _ = windows()+ exchange(a, b)+ a.receive({**old, "from": b.window, "to": a.window}, "192.0.2.2")+ assert a.state == "refused" and not a.ready+ a, b, _ = windows()+ exchange(a, b)+ proof = next(msg for msg in a.messages() if msg["type"] == "easy_proof")+ a.receive({**proof, "from": b.window, "to": a.window}, "192.0.2.2")+ assert a.state == "refused"++ def test_full_length_unicode_reveal_fits_existing_datagram_ceiling(self):+ import json+ a = EasyPairWindow("\U00020000" * 48, b"a" * 16, "macos", 24800)+ b = EasyPairWindow("PC", b"b" * 16, "windows", 24801)+ a.select(b.offer("192.0.2.2", 9002))+ b.select(a.offer("192.0.2.1", 9001))+ a.receive(b.messages()[0], "192.0.2.2")+ for message in a.messages():+ datagram = json.dumps({"beamy": 1, **message}, ensure_ascii=False, separators=(",", ":")).encode()+ assert len(datagram) <= pairing.MAX_DATAGRAM_BYTES+ assert pairing.decode(datagram) == {"beamy": 1, **message}diff --git a/core/tests/test_easy_pair_service.py b/core/tests/test_easy_pair_service.pynew file mode 100644index 0000000..7288d27--- /dev/null+++ b/core/tests/test_easy_pair_service.py@@ -0,0 +1,187 @@+import time+import unittest++from core import pairing+++def service(name, ident, clock=None):+ entries, notified = [], []+ kwargs = {"clock": clock} if clock else {}+ instance = pairing.PairingService(name, ident * 16, "mac" if name == "Mac" else "win", lambda: 24800,+ lambda: entries, lambda entry, replaced: entries.append(entry),+ on_paired=notified.append, bind_port=0, tcp_port=0,+ announce_to=("127.0.0.1", 9), **kwargs)+ return instance, entries, notified+++def note(a, b, address):+ a._note_beacon(pairing.decode(b._beacon()), address)+++def pump(a, b):+ class Wire:+ def __init__(self, receiver, address):+ self.receiver, self.address = receiver, address++ def sendto(self, data, target):+ self.receiver._dispatch(None, pairing.decode(data), self.address, 0, {}, {})++ for _ in range(6):+ a._nearby_next = b._nearby_next = 0+ a._tick_nearby(Wire(b, ("192.0.2.1", 9001)))+ b._tick_nearby(Wire(a, ("192.0.2.2", 9002)))+++class EasyPairServiceTests(unittest.TestCase):+ def test_service_stores_only_after_both_screens_confirm(self):+ a, ae, an = service("Mac", b"a")+ b, be, bn = service("PC", b"b")+ a.begin_nearby()+ b.begin_nearby()+ note(a, b, ("192.0.2.2", 9002))+ note(b, a, ("192.0.2.1", 9001))+ pump(a, b)+ sa, sb = a.nearby_status, b.nearby_status+ assert sa["state"] == sb["state"] == "confirm" and sa["sas"] == sb["sas"]+ a.confirm_nearby(sa["sas"], sa["attempt"])+ pump(a, b)+ assert ae == be == []+ b.confirm_nearby(sb["sas"], sb["attempt"])+ pump(a, b)+ assert len(ae) == len(be) == len(an) == len(bn) == 1+ assert ae[0]["token"] == be[0]["token"]+ assert a.nearby_status["state"] == b.nearby_status["state"] == "paired"+ assert "nearby" not in pairing.decode(a._beacon())+ pump(a, b)+ assert len(ae) == len(be) == 1++ def test_multiple_candidates_latch_explicit_selection(self):+ a, _, _ = service("Mac", b"a")+ b, _, _ = service("PC", b"b")+ c, _, _ = service("Third", b"c")+ for instance in (a, b, c):+ instance.begin_nearby()+ note(a, b, ("192.0.2.2", 9002))+ note(a, c, ("192.0.2.3", 9003))+ assert a.nearby_status["state"] == "choosing"+ assert len(a.nearby_status["peers"]) == 2+ a._tick_nearby(None)+ assert a.nearby_status["peer"] is None+ a.choose_nearby(a.nearby_status["peers"][1])+ assert a.nearby_status["peer"]["name"] == "Third"+ with self.assertRaises(pairing.PairingError):+ a.choose_nearby(a.machines()[0])++ def test_ambiguous_discovery_never_auto_selects_after_one_peer_disappears(self):+ a, _, _ = service("Mac", b"a")+ b, _, _ = service("PC", b"b")+ c, _, _ = service("Third", b"c")+ for instance in (a, b, c):+ instance.begin_nearby()+ note(a, b, ("192.0.2.2", 9002))+ note(a, c, ("192.0.2.3", 9003))+ assert a.nearby_status["state"] == "choosing"+ with a._lock:+ a._seen.pop("192.0.2.3")+ a._tick_nearby(None)+ assert a.nearby_status["state"] == "choosing" and a.nearby_status["peer"] is None++ def test_old_peer_and_expiry_preserve_code_route(self):+ clock = [100.0]+ a, entries, _ = service("Mac", b"a", lambda: clock[0])+ a.begin_nearby()+ a._note_beacon({"type": "beacon", "name": "Old", "port": 24800, "pairing": 3}, ("192.0.2.2", 9002))+ assert a.nearby_status["peers"] == []+ clock[0] += 60+ assert a.nearby_status["state"] == "expired" and not entries+ a.begin_pairing()+ assert a.code and a.nearby_status["state"] == "inactive"+ a.stop()++ def test_invalid_duplicate_keys_rejected(self):+ assert pairing.decode(b'{"beamy":1,"type":"easy_commit","from":"a","from":"b"}') is None+ assert pairing.decode(b'{"beamy":true,"type":"easy_commit"}') is None++ def test_storage_finishes_once_or_reports_failure(self):+ for slow, fail in [(True, False), (False, True)]:+ with self.subTest(slow=slow, fail=fail):+ clock = [100.0]+ a, ae, an = service("Mac", b"a", lambda: clock[0])+ b, _, _ = service("PC", b"b", lambda: clock[0])+ a.begin_nearby()+ b.begin_nearby()+ note(a, b, ("192.0.2.2", 9002))+ note(b, a, ("192.0.2.1", 9001))+ pump(a, b)+ for instance in (a, b):+ status = instance.nearby_status+ instance.confirm_nearby(status["sas"], status["attempt"])++ def store(entry, replaced):+ if fail:+ raise OSError("disk full")+ ae.append(entry)+ if slow:+ clock[0] += 61++ a.store = store+ pump(a, b)+ assert a.nearby_status["state"] == ("not_saved" if fail else "paired")+ assert len(ae) == len(an) == (0 if fail else 1)++ def test_cancel_while_searching_and_known_peer_cannot_pair(self):+ a, ae, _ = service("Mac", b"a")+ b, _, _ = service("PC", b"b")+ a.begin_nearby()+ b.begin_nearby()+ note(a, b, ("192.0.2.2", 9002))+ ae.append({"id": pairing._b64(b.identity)})+ assert a.nearby_status["peers"] == []+ a.cancel_nearby()+ assert a.nearby_status["state"] == "inactive"++ def test_lost_final_approval_retransmits_after_local_save(self):+ a, ae, _ = service("Mac", b"a")+ b, be, _ = service("PC", b"b")+ a.begin_nearby()+ b.begin_nearby()+ note(a, b, ("192.0.2.2", 9002))+ note(b, a, ("192.0.2.1", 9001))+ pump(a, b)+ for instance in (a, b):+ status = instance.nearby_status+ instance.confirm_nearby(status["sas"], status["attempt"])+ # Deliver only A's approval. B saves, but A must still receive B's cached approval.+ approval = next(msg for msg in a._nearby.messages() if msg["type"] == "easy_approve")+ b._receive_nearby(approval, ("192.0.2.1", 9001))+ assert be and not ae+ pump(a, b)+ assert ae and len(be) == 1++ def test_real_loopback_udp_pairing(self):+ a, ae, _ = service("Mac", b"a")+ b, be, _ = service("PC", b"b")+ a.start()+ b.start()+ try:+ deadline = time.monotonic() + 6+ while not a.listening_port or not b.listening_port:+ assert time.monotonic() < deadline+ time.sleep(.01)+ a.announce_to = ("127.0.0.1", b.listening_port)+ b.announce_to = ("127.0.0.1", a.listening_port)+ a.begin_nearby()+ b.begin_nearby()+ while a.nearby_status["state"] != "confirm" or b.nearby_status["state"] != "confirm":+ assert time.monotonic() < deadline+ time.sleep(.02)+ sa, sb = a.nearby_status, b.nearby_status+ a.confirm_nearby(sa["sas"], sa["attempt"])+ b.confirm_nearby(sb["sas"], sb["attempt"])+ while not ae or not be:+ assert time.monotonic() < deadline+ time.sleep(.02)+ assert ae[0]["token"] == be[0]["token"]+ finally:+ a.stop()+ b.stop()diff --git a/core/tests/test_feature_flags.py b/core/tests/test_feature_flags.pynew file mode 100644index 0000000..75bbb20--- /dev/null+++ b/core/tests/test_feature_flags.py@@ -0,0 +1,9 @@+import unittest++from core import feature_flags+++class ShippedDefaultsTests(unittest.TestCase):+ def test_phone_pairing_is_hidden_by_default(self):+ # Phone pairing stays hidden until the phone apps ship.+ self.assertIs(feature_flags.PAIRING_QR_VISIBLE, False)diff --git a/core/tests/test_idle_pointer.py b/core/tests/test_idle_pointer.pynew file mode 100644index 0000000..c9f6a1a--- /dev/null+++ b/core/tests/test_idle_pointer.py@@ -0,0 +1,101 @@+import threading+import time+import unittest++from core.idle_pointer import IdlePointer+++class Pointer:+ def __init__(self):+ self.at = (100, 100)+ self.calls = []+ self.shown = threading.Event()++ def hide(self):+ self.calls.append("hide")++ def show(self):+ self.calls.append("show")+ self.shown.set()++ def position(self):+ return self.at+++def wait_for(predicate, seconds=1.0):+ end = time.monotonic() + seconds+ while time.monotonic() < end:+ if predicate():+ return True+ time.sleep(0.005)+ return predicate()+++class IdlePointerTests(unittest.TestCase):+ def setUp(self):+ self.pointer = Pointer()+ self.idle = IdlePointer(+ self.pointer.hide, self.pointer.show, self.pointer.position, poll_seconds=0.01, settle_seconds=0.05+ )++ def test_hidden_until_the_pointer_moves(self):+ self.idle.driver_left()+ self.assertEqual(self.pointer.calls, ["hide"])+ time.sleep(0.1)+ self.assertEqual(self.pointer.calls, ["hide"])+ self.pointer.at = (101, 100)+ self.assertTrue(self.pointer.shown.wait(1))+ self.assertTrue(wait_for(lambda: not self.idle.hidden))+ self.assertEqual(self.pointer.calls, ["hide", "show"])++ def test_a_move_while_settling_is_the_drivers_and_does_not_show_it(self):+ self.idle.driver_left()+ self.pointer.at = (140, 90)+ time.sleep(0.15)+ self.assertEqual(self.pointer.calls, ["hide"])+ self.assertTrue(self.idle.hidden)+ self.idle.cancel()++ def test_a_driver_arriving_shows_it_once(self):+ self.idle.driver_left()+ self.idle.cancel()+ self.idle.cancel()+ time.sleep(0.1)+ self.assertEqual(self.pointer.calls, ["hide", "show"])++ def test_leaving_twice_hides_once(self):+ self.idle.driver_left()+ self.idle.driver_left()+ self.assertEqual(self.pointer.calls, ["hide"])+ self.idle.cancel()++ def test_hide_again_after_a_cancel_is_watched_afresh(self):+ self.idle.driver_left()+ self.idle.cancel()+ self.idle.driver_left()+ time.sleep(0.1)+ self.pointer.at = (0, 0)+ self.assertTrue(wait_for(lambda: self.pointer.calls == ["hide", "show", "hide", "show"]))++ def test_an_unreadable_pointer_is_shown_rather_than_left_hidden(self):+ def broken():+ raise OSError("gone")++ idle = IdlePointer(self.pointer.hide, self.pointer.show, broken, poll_seconds=0.01, settle_seconds=0.01)+ idle.driver_left()+ self.assertTrue(self.pointer.shown.wait(1))+ self.assertFalse(wait_for(lambda: idle.hidden, 0.05))++ def test_a_failed_hide_watches_nothing(self):+ def refuse():+ raise OSError("no")++ idle = IdlePointer(refuse, self.pointer.show, self.pointer.position)+ idle.driver_left()+ self.assertFalse(idle.hidden)+ idle.cancel()+ self.assertEqual(self.pointer.calls, [])+++if __name__ == "__main__":+ unittest.main()diff --git a/core/tests/test_owner.py b/core/tests/test_owner.pyindex 15679a6..b74c6b9 100644--- a/core/tests/test_owner.py+++ b/core/tests/test_owner.py@@ -274,6 +274,11 @@ class ReachTests(OwnerCase):class SwitchTests(OwnerCase):+ def test_a_takeover_sends_input_home_with_the_new_driver(self):+ self.take("B")+ actions = self.switch("B", "A", taken_over_by="C")+ self.assertEqual(moved(actions), Moved(None, "B", "taken_over", other="C"))+def test_a_switch_naming_the_owner_brings_the_input_home_landing_where_it_says(self):self.take("B")actions = self.switch("B", "A", edge="right", offset=0.25)diff --git a/core/tests/test_pairing_paths.py b/core/tests/test_pairing_paths.pyindex 9963b01..942173b 100644--- a/core/tests/test_pairing_paths.py+++ b/core/tests/test_pairing_paths.py@@ -51,6 +51,12 @@ class BroadcastTargetTests(unittest.TestCase):class InterfaceTests(unittest.TestCase):+ def test_qr_address_keeps_default_when_it_is_on_lan(self):+ with mock.patch.object(pairing, "_interfaces", return_value=[("192.168.50.20", "255.255.255.0"),+ ("192.168.60.20", "255.255.255.0")]), \+ mock.patch.object(pairing, "local_address_towards", return_value="192.168.60.20"):+ self.assertEqual(pairing.pairing_address(), "192.168.60.20")+def test_this_machine_s_interfaces_are_read_with_real_netmasks(self):found = pairing._interfaces()if not found:@@ -294,6 +300,54 @@ class OversizedDatagramTests(unittest.TestCase):self.assertIsNone(mac.service.error)+class HostileNearbyDatagramTests(unittest.TestCase):+ """Datagrams a LAN host can send while easy pair is in 1.5.3 (reviews of 10-10-2026)."""++ def setUp(self):+ self.mac = Machine(self, "Loop Mac", MAC_ID, "macos")+ patcher = mock.patch.object(self.mac.service.logger, "exception")+ self.dropped = patcher.start()+ self.addCleanup(patcher.stop)+ self.stranger = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)+ self.addCleanup(self.stranger.close)+ self.stranger.bind(("127.0.0.1", 0))+ self.stranger.settimeout(3.0)++ def send(self, message):+ self.stranger.sendto(pairing.encode(message), ("127.0.0.1", self.mac.udp_port))++ def assert_still_answering(self):+ # A `find` is answered after everything sent before it has been dispatched, and after a+ # pass of the loop's nearby tick.+ self.send({"type": pairing.MSG_FIND})+ reply, _ = self.stranger.recvfrom(65536)+ self.assertEqual(pairing.decode(reply)["type"], pairing.MSG_BEACON)+ self.dropped.assert_not_called()+ self.assertIsNone(self.mac.service.error)++ def test_a_list_or_object_type_is_dropped_without_a_traceback(self):+ # `kind in EASY_TYPES` raised TypeError for an unhashable type and logged a traceback per datagram.+ for kind in ([], ["easy_commit"], {}, {"easy_commit": 1}):+ self.assertIsNotNone(pairing.decode(pairing.encode({"type": kind})), "the datagram reaches the dispatch")+ self.send({"type": kind})+ self.assert_still_answering()+ self.assertEqual(self.mac.service.nearby_status["state"], "inactive")++ def test_a_beacon_copying_this_machine_s_window_is_not_a_candidate(self):+ # As the sole candidate it was auto-selected, select() refused it, and the raise ended the+ # pairing loop: beacons and code pairing stopped until the app restarted.+ service = self.mac.service+ service.begin_nearby()+ forged = pairing.decode(service._beacon())+ self.assertEqual(forged["nearby"], service._nearby.window)+ forged["id"] = pairing._b64(PC_ID)+ self.send(forged)+ self.assertTrue(wait_until(lambda: any(item["id"] == forged["id"] for item in service.machines())))+ self.assert_still_answering()+ status = service.nearby_status+ self.assertEqual((status["state"], status["peers"], status["peer"]), ("searching", [], None))++class HostAnswersFromTheRequesterSNetworkTests(unittest.TestCase):def test_both_ends_send_from_the_address_on_the_other_s_network(self):mac = Machine(self, "Loop Mac", MAC_ID, "macos")diff --git a/core/tests/test_pairing_service.py b/core/tests/test_pairing_service.pyindex bbb7de5..9973511 100644--- a/core/tests/test_pairing_service.py+++ b/core/tests/test_pairing_service.py@@ -200,7 +200,8 @@ class BeaconTests(unittest.TestCase):def test_id_and_pair_only_while_a_code_is_up(self):idle = self._next_beacon()- self.assertEqual(idle, {"beamy": 1, "type": "beacon", "name": "Beacon PC", "port": 24820, "pairing": 3, "platform": "windows"})+ self.assertEqual(idle, {"beamy": 1, "type": "beacon", "name": "Beacon PC", "port": 24820, "pairing": 3,+ "platform": "windows", "pair_modes": ["cpace_v3", "sas_v1"]})self.pc.service.begin_pairing()live = self._next_beacon()while "id" not in live:diff --git a/core/tests/test_peerlist.py b/core/tests/test_peerlist.pyindex e86989c..24aef99 100644--- a/core/tests/test_peerlist.py+++ b/core/tests/test_peerlist.py@@ -107,15 +107,18 @@ class AddPeerTests(unittest.TestCase):# (the rig and the laptop, 01-10-2026).held = settings(peer(A, side="left"), zones=[{"peer": A, "kind": "edge"}])peerlist.add_peer(held, peer(B, token="second"))- self.assertEqual(held["zones"], [{"peer": A, "kind": "edge", "side": "left"},- {"peer": B, "kind": "edge", "side": "bottom"}])+ self.assertEqual(held["zones"], [{"peer": A, "kind": "edge", "side": "left",+ "contact_span": [0.0, 1.0], "target_span": [0.0, 1.0]},+ {"peer": B, "kind": "edge", "side": "bottom",+ "contact_span": [0.0, 1.0], "target_span": [0.0, 1.0]}])self.assertEqual(ways.ways(held, B)["methods"], ["edge"])self.assertEqual(ways.ways(held, B)["parts"], list(ways.PARTS))def test_the_replaced_entrys_zones_go_with_it_when_it_was_matched_by_name_alone(self):held = settings(peer("", token="legacy", host="10.1.1.9", from_1_4=True), zones=[{"peer": "", "kind": "edge"}])peerlist.add_peer(held, peer(A), replaced=copy.deepcopy(held["peers"][0]))- self.assertEqual(held["zones"], [{"peer": A, "kind": "edge", "side": "bottom"}])+ self.assertEqual(held["zones"], [{"peer": A, "kind": "edge", "side": "bottom",+ "contact_span": [0.0, 1.0], "target_span": [0.0, 1.0]}])self.assertEqual(ways.ways(held, A)["methods"], ["edge"])def test_the_machine_at_the_1_4_entrys_host_takes_over_its_side_and_zones(self):@@ -126,7 +129,8 @@ class AddPeerTests(unittest.TestCase):held = settings(old, zones=[{"peer": "", "kind": "edge"}, {"peer": "", "kind": "corner", "corner": "top_left","edge": "left", "off": True}])peerlist.add_peer(held, peer(A, token="fresh"), replaced=copy.deepcopy(old))- self.assertEqual(held["zones"], [{"peer": A, "kind": "edge", "side": "left"}])+ self.assertEqual(held["zones"], [{"peer": A, "kind": "edge", "side": "left",+ "contact_span": [0.0, 1.0], "target_span": [0.0, 1.0]}])self.assertEqual(ways.ways(held, A)["methods"], ["edge"])entry = held["peers"][0]self.assertEqual((entry["side"], entry["side_set_at"], entry["side_by"]), ("left", 1_790_000_000, C))@@ -136,7 +140,8 @@ class AddPeerTests(unittest.TestCase):old = peer("", token="legacy", platform="macos", from_1_4=True, side="left")held = settings(old, zones=[{"peer": "", "kind": "edge"}])peerlist.add_peer(held, peer(A, token="fresh"), replaced=copy.deepcopy(old))- self.assertEqual(held["zones"], [{"peer": A, "kind": "edge", "side": "bottom"}])+ self.assertEqual(held["zones"], [{"peer": A, "kind": "edge", "side": "bottom",+ "contact_span": [0.0, 1.0], "target_span": [0.0, 1.0]}])self.assertEqual(ways.ways(held, A)["methods"], ["edge"])self.assertEqual(held["peers"][0]["side"], "bottom")@@ -144,13 +149,15 @@ class AddPeerTests(unittest.TestCase):old = peer(B, token="legacy", linked=False, side="left")held = settings(old, zones=[{"peer": B, "kind": "edge"}])peerlist.add_peer(held, peer(A, token="fresh"), replaced=copy.deepcopy(old))- self.assertEqual(held["zones"], [{"peer": A, "kind": "edge", "side": "bottom"}])+ self.assertEqual(held["zones"], [{"peer": A, "kind": "edge", "side": "bottom",+ "contact_span": [0.0, 1.0], "target_span": [0.0, 1.0]}])self.assertEqual(ways.ways(held, A)["methods"], ["edge"])def test_zones_of_a_machine_paired_again_under_its_own_id_stay(self):held = settings(peer(A, linked=False), zones=[{"peer": A, "kind": "edge"}])peerlist.add_peer(held, peer(A, token="fresh"), replaced=copy.deepcopy(held["peers"][0]))- self.assertEqual(held["zones"], [{"peer": A, "kind": "edge", "side": "bottom"}])+ self.assertEqual(held["zones"], [{"peer": A, "kind": "edge", "side": "bottom",+ "contact_span": [0.0, 1.0], "target_span": [0.0, 1.0]}])self.assertEqual(ways.ways(held, A)["methods"], ["edge"])self.assertEqual(held["peers"][0]["token"], "fresh")@@ -158,8 +165,10 @@ class AddPeerTests(unittest.TestCase):held = settings(peer(A), peer("", token="legacy", from_1_4=True), zones=[{"peer": A, "kind": "edge"}])peerlist.add_peer(held, peer(B), replaced=copy.deepcopy(held["peers"][1]))self.assertEqual(held["zones"], [- {"peer": A, "kind": "part", "parts": ["start"], "side": "bottom"},- {"peer": B, "kind": "part", "parts": ["middle", "end"], "side": "bottom"},+ {"peer": A, "kind": "part", "parts": ["start"], "side": "bottom",+ "contact_span": [0.0, 0.5], "target_span": [0.5, 1.0]},+ {"peer": B, "kind": "part", "parts": ["middle", "end"], "side": "bottom",+ "contact_span": [0.5, 1.0], "target_span": [0.0, 0.5]},])self.assertEqual(ways.ways(held, A)["methods"], ["edge"])self.assertEqual(ways.ways(held, B)["methods"], ["edge"])diff --git a/core/tests/test_protocol_v6.py b/core/tests/test_protocol_v6.pyindex 034cb1a..dcdcd26 100644--- a/core/tests/test_protocol_v6.py+++ b/core/tests/test_protocol_v6.py@@ -690,6 +690,14 @@ class Answers(unittest.TestCase):with self.subTest(data=data):self.assertIsNone(protocol.read_switch({"type": "switch", "data": data}))+ def test_switch_takeover_names_the_new_driver_and_ignores_invalid_ids(self):+ message = protocol.switch_v6(3, ID_A)+ message["data"]["taken_over_by"] = protocol.id_text(ID_B)+ self.assertEqual(protocol.read_switch(message)["taken_over_by"], ID_B)+ for invalid in (None, "x", 7, protocol.id_text(bytes(16))):+ message["data"]["taken_over_by"] = invalid+ self.assertNotIn("taken_over_by", protocol.read_switch(message))+def test_ack(self):self.assertEqual(protocol.read_ack(protocol.ack_v6(4, 250)), {"seq": 4, "held_us": 250, "locked": False})self.assertEqual(protocol.ack_v6(4, -3)["data"]["held_us"], 0)diff --git a/core/tests/test_responder_input.py b/core/tests/test_responder_input.pyindex 7ac0d0a..77d0be6 100644--- a/core/tests/test_responder_input.py+++ b/core/tests/test_responder_input.py@@ -7,7 +7,7 @@ import timeimport unittestfrom unittest import mock-from core import protocol, receiver+from core import protocol, receiver, return_edgefrom core.tests import pngsfrom core.tests.responder_harness import B, C, TOKENS, Initiator, Machine, entry, wait_for@@ -167,6 +167,30 @@ class Injecting(Case):self.assertIsNotNone(link.acked(seq))self.assertEqual(self.machine.injected(), [("move", 6, 2)])+ def test_a_driven_move_stops_at_the_return_seam_before_injection(self):+ from core.tests.responder_harness import ident+ a_peer = ident(130)++ self.machine.desktop._monitors = [return_edge.Rect(0, 0, 100, 100), return_edge.Rect(100, 0, 100, 100)]+ self.machine.desktop.display_map = lambda: {"0": return_edge.Rect(0, 0, 100, 100),+ "1": return_edge.Rect(100, 0, 100, 100)}+ peer = next(item for item in self.machine.settings.data["peers"] if item["id"] == protocol.id_text(C))+ peer["side"] = "right"+ self.machine.settings.data["peers"].append(entry(a_peer, "Aye", side="right"))+ self.machine.settings.data["zones"] = [{"peer": protocol.id_text(a_peer), "kind": "edge",+ "display": "0", "side": "right"}]+ link = Initiator(self.machine, B)+ self.addCleanup(link.close)+ link.handshake()+ route = link.take(reach=[a_peer], resistance_px=120)+ self.assertEqual(link.answer(route)[0], protocol.MSG_ACCEPT)+ self.machine.desktop.cursor = (90, 50)++ seq = link.move(200, 0)++ self.assertIsNotNone(link.acked(seq))+ self.assertEqual(self.machine.injected()[-1], ("move", 9, 0))+class LockScreen(Case):class Unlock:diff --git a/core/tests/test_responder_ownership.py b/core/tests/test_responder_ownership.pyindex 6c09276..c859db9 100644--- a/core/tests/test_responder_ownership.py+++ b/core/tests/test_responder_ownership.py@@ -13,6 +13,96 @@ from core.tests.responder_harness import B, C, D, HERE, TOKENS, Initiator, MachiACCEPT, REFUSE = protocol.MSG_ACCEPT, protocol.MSG_REFUSE+class IdleTakeover(unittest.TestCase):+ def setUp(self):+ self.machine = Machine([])+ self.responder = self.machine.responder+ self.now = 100.0+ clock = mock.patch.object(receiver.time, "monotonic", side_effect=lambda: self.now)+ clock.start()+ self.addCleanup(clock.stop)+ self.b = self.make_link(B)+ self.c = self.make_link(C)+ self.take(self.b, 1)++ def make_link(self, peer):+ link = mock.Mock(peer_id=peer, own_id=HERE, route=0, allow_drive=True, held={})+ link.closed.is_set.return_value = False+ return link++ def take(self, link, route, **fields):+ self.responder._on_focus(link, protocol.focus_v6(route, HERE, **fields))++ def test_idle_owner_is_sent_home_with_the_new_driver_and_replaced_at_boundary(self):+ self.now += 3.0+ self.take(self.c, 1)+ self.assertEqual(self.responder.owner, C)+ self.b.post.assert_called_with({"type": protocol.MSG_SWITCH, "data": {+ "route": 1, "next": protocol.id_text(B), "taken_over_by": protocol.id_text(C)}})+ self.assertEqual(self.machine.owners, [B, None, C])++ def test_owner_before_boundary_still_refuses(self):+ self.now += 2.999+ self.take(self.c, 1)+ self.assertEqual(self.responder.owner, B)+ self.c.post.assert_called_with(protocol.refuse_msg(1, "owned", other=B))++ def test_valid_owner_input_refreshes_activity_but_non_owner_input_does_not(self):+ self.now += 2.0+ message = protocol.key_msg(protocol.MSG_KEYDOWN, "a")+ message["data"]["seq"] = 1+ self.responder._on_input(self.b, message)+ self.now += 2.0+ self.take(self.c, 1)+ self.assertEqual(self.responder.owner, B)+ self.responder._on_input(self.c, message)+ self.now += 1.0+ self.take(self.c, 2)+ self.assertEqual(self.responder.owner, C)+ self.assertEqual(self.b.held, {})+ injected = self.machine.injected()+ self.responder._on_input(self.b, message)+ self.assertEqual(self.machine.injected(), injected)+ self.responder._on_focus(self.b, protocol.focus_v6(2, B))+ self.assertEqual(self.responder.owner, C)+ self.take(self.b, 3)+ self.b.post.assert_called_with(protocol.refuse_msg(3, "sent_home"))+ new_input = protocol.key_msg(protocol.MSG_KEYDOWN, "b")+ new_input["data"]["seq"] = 2+ self.responder._on_input(self.c, new_input)+ self.assertEqual(self.machine.injected(), [+ ("key", "a", True), ("key", "a", False), ("key", "b", True)])++ def test_malformed_owner_input_does_not_refresh_activity(self):+ self.now += 2.0+ self.responder._on_input(self.b, {"type": protocol.MSG_MOUSEMOVE, "data": {"seq": 1}})+ self.now += 1.0+ self.take(self.c, 1)+ self.assertEqual(self.responder.owner, C)++ def test_stay_does_not_refresh_idle_time_or_steal_ownership(self):+ self.now += 2.0+ self.take(self.b, 2, stay=True, resistance_px=120, reach=[])+ self.now += 1.0+ self.take(self.c, 1, stay=True, resistance_px=120, reach=[])+ self.assertEqual(self.responder.owner, B)+ self.take(self.c, 2)+ self.assertEqual(self.responder.owner, C)++ def test_unsupported_input_heartbeat_and_clipboard_do_not_refresh_activity(self):+ self.b.own_caps = frozenset()+ self.b.response_time_enabled = True+ self.now += 2.0+ message = protocol.gesture_msg(protocol.GESTURE_SWIPE_UP)+ message["data"]["seq"] = 1+ self.responder._on_input(self.b, message)+ self.responder._on_ping(self.b, protocol.ping_msg(probe=1))+ self.responder._on_clipboard(self.b, protocol.clipboard_msg("clipboard"))+ self.now += 1.0+ self.take(self.c, 1)+ self.assertEqual(self.responder.owner, C)++def ids(*peers):return [protocol.id_text(peer) for peer in peers]@@ -455,6 +545,7 @@ class Zones(Case):self.assertEqual(self.machine.desktop.placed[-1], (0, 500))self.assertNotIn(("move", -200, 0), self.machine.injected())+def test_resistance_out_of_range_is_malformed(self):self.refused(self.link(B), "malformed", resistance_px=1001)@@ -496,6 +587,30 @@ class Zones(Case):self.assertIsNone(b.expect(protocol.MSG_SWITCH, timeout=0.2))+class WrapWayBack(Case):+ sides = {B: "right"}+ zones = [{"peer": protocol.id_text(B), "kind": "edge", "display": "main", "side": "right"}]++ def test_wrap_arrival_arms_its_way_back_until_the_visit_ends(self):+ b = self.link(B)+ self.own(b, edge="right", offset=0.5, display="main", side="left")+ marker = (B, "left", "main", "right")+ self.assertIn(marker, [(peer, model.edge, model.display, model.target_side)+ for peer, model in self.machine.responder._armed])+ self.machine.responder.rearm()+ self.assertIn(marker, [(peer, model.edge, model.display, model.target_side)+ for peer, model in self.machine.responder._armed])+ b.let_go()+ self.assertTrue(wait_for(lambda: self.machine.responder.owner is None))+ self.assertEqual(self.machine.responder._armed, [])++ def test_edge_off_does_not_add_a_way_back(self):+ self.machine.responder._zones = lambda: []+ b = self.link(B)+ self.own(b, edge="right", offset=0.5, display="main", side="left")+ self.assertEqual(self.machine.responder._armed, [])++class ZoneModels(unittest.TestCase):peers = [entry(B, "Bee", side="left"), entry(C, "Sea", side="top"), entry(D, "Dee", side="")]diff --git a/core/tests/test_responder_races.py b/core/tests/test_responder_races.pyindex f4d0e4f..3f96edd 100644--- a/core/tests/test_responder_races.py+++ b/core/tests/test_responder_races.py@@ -53,17 +53,42 @@ class TheClipboardAndTheOwnerCallbacks(Case):self.assertTrue(wait_for(lambda: len(self.machine.owners) == 3))self.assertEqual(self.machine.owners, [B, None, C])- def test_a_clipboard_is_never_set_after_its_senders_ownership_ended(self):+ def test_a_clipboard_waiting_behind_a_slow_write_is_not_set_once_its_senders_ownership_ended(self):b = self.link(B)self.own(b)self.machine.clipboard.slow_set = 0.4- b.send(protocol.clipboard_msg("from b"))+ b.send(protocol.clipboard_msg("first"))+ b.send(protocol.clipboard_msg("second"))time.sleep(0.1)self.machine.settings.peer(TOKENS[B])["allow_drive"] = Falseself.machine.responder.peers_changed()self.assertTrue(wait_for(lambda: ("owner", None) in self.machine.events))- events = [e for e in self.machine.events if e in (("set", "from b"), ("owner", None))]- self.assertEqual(events, [("set", "from b"), ("owner", None)])+ # The first write was already under way and cannot be taken back; the second had not begun.+ self.assertTrue(wait_for(lambda: ("set", "first") in self.machine.events))+ time.sleep(0.6)+ self.assertNotIn(("set", "second"), self.machine.events)++ def test_a_let_go_during_a_slow_write_does_not_send_the_owners_own_clipboard_back(self):+ b = self.link(B)+ self.own(b)+ self.machine.clipboard.slow_set = 0.4+ b.send(protocol.clipboard_msg("from b"))+ time.sleep(0.1)+ b.let_go()+ self.assertTrue(wait_for(lambda: self.machine.responder.owner is None))+ self.assertTrue(wait_for(lambda: ("set", "from b") in self.machine.events))+ self.assertIsNone(b.expect(protocol.MSG_CLIPBOARD, timeout=1.0))++ def test_a_clipboard_write_that_blocks_for_seconds_does_not_delay_the_next_input_acknowledgement(self):+ b = self.link(B)+ self.own(b)+ self.machine.clipboard.slow_set = 3.0+ b.send(protocol.clipboard_msg("slow"))+ started = time.monotonic()+ self.assertIsNotNone(b.acked(b.move(5, 0), timeout=1.0))+ self.assertLess(time.monotonic() - started, 1.0)+ self.assertEqual(self.machine.clipboard.set_calls, [])+ self.assertTrue(wait_for(lambda: self.machine.clipboard.set_calls == [("slow", None)], timeout=5.0))class ALargeFrameToASlowReader(Case):diff --git a/core/tests/test_scoped_corner.py b/core/tests/test_scoped_corner.pynew file mode 100644index 0000000..635bba7--- /dev/null+++ b/core/tests/test_scoped_corner.py@@ -0,0 +1,32 @@+import unittest++from core.return_edge import CROSS, PASS, CornerPush, Rect+++class ScopedCornerTests(unittest.TestCase):+ def setUp(self):+ self.displays = {+ "a0": Rect(0, 0, 100, 100),+ "b0": Rect(100, 0, 100, 100),+ "a1": Rect(200, 0, 100, 100),+ "b1": Rect(100, 100, 100, 100),+ }+ self.monitors = list(self.displays.values())++ def test_scoped_corner_crosses_when_both_nominated_walls_are_internal(self):+ edge = CornerPush("bottom_right", "right", resistance_px=10, display="b0")+ outcome = edge.feed(self.monitors, (199, 99), 10, 10, display_map=self.displays)+ self.assertEqual((outcome.action, outcome.edge), (CROSS, "left"))++ def test_scoped_corner_box_without_wall_contact_does_not_hold(self):+ edge = CornerPush("bottom_right", "right", display="b0")+ self.assertFalse(edge._at_edge(self.monitors, (194, 94), self.displays))++ def test_unknown_nominated_display_does_not_fall_back_to_an_outer_corner(self):+ edge = CornerPush("bottom_right", "right", resistance_px=10, display="missing")+ outcome = edge.feed(self.monitors, (299, 99), 10, 10, display_map=self.displays)+ self.assertEqual(outcome.action, PASS)+++if __name__ == "__main__":+ unittest.main()diff --git a/core/tests/test_settings_sync.py b/core/tests/test_settings_sync.pyindex 7b273d5..5b340b6 100644--- a/core/tests/test_settings_sync.py+++ b/core/tests/test_settings_sync.py@@ -19,6 +19,7 @@ def mac_raw(**crossing):"methods": ["shortcut", "edge", "notch"], "edge": "right", "edge_parts": ["middle"],"corner": "top_right", "resistance_px": 120, "block_while_dragging": True, "glow": True,"glow_style": "glow", "glow_colour": "signal", "effect_length": "normal", "effect_size": "medium",+ "frame_rate": "display","shortcut_arrival": True,"shortcut_goes_to": "last","shortcut_arrival_style": "match", "notch_style": "beam", "notch_after_ms": 1200, "haptics": True,@@ -36,6 +37,7 @@ def pc_config(**fields):shortcut_goes_to="last",double_tap_ms=300, glow_style="glow", glow_colour="signal", effect_length="normal", effect_size="medium",shortcut_arrival=True, shortcut_arrival_style="match", mac_return_edge="left", edge_glow=True,+ frame_rate="display",appearance="light",)base.update(fields)@@ -196,6 +198,19 @@ class MessageTests(unittest.TestCase):{"on": False, "set_at": NOW, "by": b64(bytes(16)), "design_sync": state}, KEYS),{"set_at": NOW, "by": state["by"], "values": {"glow_style": "beam"}})+ def test_frame_rate_is_validated_and_an_older_peer_can_omit_it(self):+ envelope = {"on": False, "set_at": NOW, "by": b64(bytes(16))}+ valid = {"set_at": NOW, "by": b64(bytes(16)), "values": {"frame_rate": "quarter"}}+ invalid = {**valid, "values": {"frame_rate": "eighth"}}++ self.assertEqual(settings_sync.read_design_state({**envelope, "design_sync": valid}, KEYS)["values"],+ {"effect_size_fraction": 0.045, "effect_size": "medium", "frame_rate": "quarter"})+ self.assertNotIn("frame_rate", settings_sync.read_design_state(+ {**envelope, "design_sync": invalid}, KEYS)["values"])+ local = pc_config(frame_rate="quarter")+ settings_sync.apply_pc(local, {"glow_style": "beam"})+ self.assertEqual(local.frame_rate, "quarter")+def test_a_design_state_in_a_malformed_settings_envelope_is_ignored(self):for outer in ({"on": "no"}, {"set_at": True}, {"by": "not an id"}):data = {"on": False, "set_at": NOW, "by": b64(bytes(16)), **outer,@@ -241,7 +256,7 @@ class MessageTests(unittest.TestCase):current = settings_sync.mac_values(mac_raw())desired = dict(glow_style="beam", glow_colour="ocean", effect_length="long",effect_size="large", effect_pace=2.0, effect_size_fraction=0.06,- shortcut_arrival=False, shortcut_arrival_style="locator")+ frame_rate="display", shortcut_arrival=False, shortcut_arrival_style="locator")state = {"set_at": 10, "by": peer, "values": desired}taken = settings_sync.followed_design(current, state, peer, peer, False, 500, "", force=True)self.assertEqual({key: taken["values"][key] for key in settings_sync.DESIGN_KEYS}, desired)diff --git a/core/tests/test_style_previews.py b/core/tests/test_style_previews.pyindex 8520f08..cbf0121 100644--- a/core/tests/test_style_previews.py+++ b/core/tests/test_style_previews.py@@ -1,6 +1,7 @@"""Whole-crossing specimens retain the journey and freeze at the seam."""import unittest+from unittest import mockfrom core import effects@@ -16,23 +17,19 @@ def marks(scene):class StylePreviewTests(unittest.TestCase):- def test_the_shipped_still_table_is_what_the_search_finds(self):- for style in STYLES:- for place, index in effects._PLACE_INDEX.items():- with self.subTest(style=style, place=place):- effects._search_still.cache_clear()- self.assertEqual(effects.STILL_SEARCHED[style][index], effects._search_still(style, place))-- def test_a_length_or_size_step_builds_no_scene(self):- from unittest import mock+ def test_still_times_use_the_authored_timeline_without_building_scenes(self):+ expected = effects.STILL_ATwith mock.patch.object(effects, "preview_still_scene", side_effect=AssertionError("scene built")):- for style in STYLES:- for place in (*PLACES, "switch"):- for pace, fraction in ((0.37, 0.021), (1.0, None), (2.5, 0.079)):- at = effects.still_time(style, place, pace=pace, effect_size_fraction=fraction)- start = effects._S_START if place == "switch" else effects._P_CROSS- searched = effects.STILL_SEARCHED[style][effects._PLACE_INDEX[place]]- self.assertAlmostEqual(at, searched if searched < start else start + (searched - start) * pace)+ for effect, at in expected.items():+ for place in ("edge", "corner", "notch"):+ for pace in (0.25, 1.0, 2.0):+ expected_time = effects._P_CROSS + at if at < 0 else effects._P_CROSS + at * pace+ with self.subTest(effect=effect, place=place, pace=pace):+ self.assertEqual(effects.still_time(effect, place, pace=pace), expected_time)+ for pace in (0.25, 1.0, 2.0):+ with self.subTest(effect=effect, place="switch", pace=pace):+ self.assertEqual(effects.still_time(effect, "switch", pace=pace),+ effects._S_START + effects.SWITCH_AT.get(effect, max(at, 0.1)) * pace)def test_a_still_is_the_same_picture_at_every_length(self):for style in STYLES:@@ -41,15 +38,21 @@ class StylePreviewTests(unittest.TestCase):fx = effects.preview_effect(style)stills = [effects.preview_still_scene(fx, effects.still_time(style, place, pace=pace), place,PALETTE, pace=pace) for pace in (0.25, 1.0, 2.5)]- def rounded(value):- if isinstance(value, float):- return round(value, 6)+ def flat(value):if isinstance(value, (list, tuple)):- return type(value)(rounded(item) for item in value)- return value+ return [leaf for item in value for leaf in flat(item)]+ return [value]+ # Within a level of colour: the pace divides back out with float error, which can+ # tip a mixed colour by one step in 255.for scene in stills[1:]:- self.assertEqual(rounded(scene["pointer"]), rounded(stills[0]["pointer"]))- self.assertEqual(rounded(marks(scene)), rounded(marks(stills[0])))+ for got, want in ((flat(scene["pointer"]), flat(stills[0]["pointer"])),+ (flat(marks(scene)), flat(marks(stills[0])))):+ self.assertEqual(len(got), len(want))+ for a, b in zip(got, want):+ if isinstance(a, float) or isinstance(b, float):+ self.assertAlmostEqual(a, b, delta=0.005)+ else:+ self.assertEqual(a, b)def test_hover_begins_at_approach_after_intent_and_reduced_motion_holds_still(self):held = effects.still_time("beam", "edge")@@ -85,9 +88,9 @@ class StylePreviewTests(unittest.TestCase):with self.subTest(style=style, place=place, pace=pace):fx = effects.preview_effect(style)at = effects.still_time(fx, place, pace=pace)- self.assertGreaterEqual(at, effects._P_CROSS - 0.3)- # The same frame of the effect at every Length: after the crossing it comes later.- self.assertLessEqual(at, effects._P_CROSS + 0.3 * max(1.0, pace))+ self.assertEqual(at, effects._P_CROSS + effects.STILL_AT[style] * pace+ if effects.STILL_AT[style] >= 0+ else effects._P_CROSS + effects.STILL_AT[style])scene = effects.preview_still_scene(fx, at, place, PALETTE, pace=pace)self.assertIsNotNone(scene["pointer"])self.assertEqual(len(scene["screens"]), 2)@@ -120,4 +123,5 @@ class StylePreviewTests(unittest.TestCase):_x, top, _w, height, _r = contact["notch"]self.assertGreater(contact["pointer"][1], top + height)self.assertLess(arrival["pointer"][1] + 20, top)- self.assertEqual(contact["notch"][2:4], notch)+ # A real notch's points, drawn at the scale the scene's screens stand for.+ self.assertEqual(contact["notch"][2:4], tuple(value / effects.PREVIEW_REAL for value in notch))diff --git a/core/tests/test_ways.py b/core/tests/test_ways.pyindex bd50ef6..bb6cb9e 100644--- a/core/tests/test_ways.py+++ b/core/tests/test_ways.py@@ -39,10 +39,33 @@ PC = ("edge", "part", "corner")class ReadingOnePeer(unittest.TestCase):+ def test_new_edges_and_corners_require_the_legacy_corner_keys_to_agree(self):+ held = settings(peer(A, "Ay", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": ["bottom", "left"],+ "corner": True, "corner_at": "top_left", "corners": ["top_left", "bottom_right"],+ "notch": False,+ }))+ self.assertEqual(ways.ways(held, A)["edges"], ["left", "bottom"])+ self.assertEqual(ways.ways(held, A)["corners"], ["top_left", "bottom_right"])++ held["peers"][0]["ways"]["corner_at"] = "top_right"+ found = ways.ways(held, A)+ self.assertEqual(found["corners"], ["top_right"])++ def test_152_zones_migrate_as_one_corner_without_new_keys(self):+ held = settings(peer(A, "Ay", ways={+ "edge": True, "thirds": list(ways.PARTS), "corner": True,+ "corner_at": "bottom_left", "notch": False,+ }))+ found = ways.ways(held, A)+ self.assertEqual(found["corners"], ["bottom_left"])+ self.assertEqual(found["edges"], [])+def test_a_peer_with_no_zones_reads_as_nothing_in_use_and_the_defaults(self):found = ways.ways(settings(peer(A, "Ay", side="left")), A)self.assertEqual(found, {"side": "left", "methods": ["edge"],- "parts": ["start", "middle", "end"], "corner": "top_left"})+ "parts": ["start", "middle", "end"], "corner": "top_left",+ "edges": [], "corners": []})def test_only_that_peers_zones_in_use_count(self):held = settings(peer(A, "Ay", side="left"), peer(B, "Bee", side="right"), zones=[@@ -51,9 +74,10 @@ class ReadingOnePeer(unittest.TestCase):{"peer": B, "kind": "part", "parts": ["start", "end"]},{"peer": B, "kind": "corner", "corner": "top_right", "edge": "right"},])- self.assertEqual(ways.ways(held, A), {"side": "left", "methods": ["edge"], "parts": ["start", "middle", "end"], "corner": "bottom_left"})+ self.assertEqual(ways.ways(held, A), {"side": "left", "methods": ["edge"], "parts": ["start", "middle", "end"],+ "corner": "bottom_left", "edges": [], "corners": []})self.assertEqual(ways.ways(held, B), {"side": "right", "methods": ["part", "corner"], "parts": ["start", "end"],- "corner": "top_right"})+ "corner": "top_right", "edges": [], "corners": ["top_right"]})def test_an_unknown_peer_reads_as_nothing(self):self.assertEqual(ways.ways(settings(), A)["methods"], [])@@ -81,6 +105,8 @@ class PageOffZones(unittest.TestCase):self.assertEqual(ways.ways(held, A)["methods"], [])self.assertEqual(held["zones"], [])++self.assertFalse(ways.has_way(held, A))self.assertFalse(ways.crosses_on_map(held, A))@@ -230,6 +256,221 @@ class PageOffZones(unittest.TestCase):self.assertIn("notch", ways.ways(compiled, A)["methods"])+class WrapAroundWays(unittest.TestCase):+ def test_wrap_edge_uses_free_thirds_and_records_the_map_entry(self):+ held = settings(peer(A, "Ay", side="right", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": ["left"],+ "corner": False, "corner_at": "top_left", "corners": [], "notch": False,+ }))+ layout = {HERE: {"x": 0, "y": 0, "w": 160, "h": 100},+ A: {"x": 160, "y": 0, "w": 160, "h": 100}}++ out = ways.compile_layout(held, layout, capable={HERE, A}, now=100)++ zone = next(z for z in out["settings"]["zones"] if z["side"] == "left")+ self.assertEqual((zone["kind"], zone.get("parts"), zone.get("target_side")),+ ("edge", None, None))+ self.assertEqual(out["tiles"][A]["wraps"], [+ {"display": None, "side": "left", "parts": list(ways.PARTS)}])++ def test_wrap_target_uses_the_outermost_peer_display_and_overlap_tie_break(self):+ for displays, expected in (+ ({"main": {"x": 0, "y": 0, "w": 160, "h": 100}}, "main"),+ ({"a": {"x": 0, "y": 0, "w": 160, "h": 50},+ "b": {"x": 0, "y": 50, "w": 160, "h": 50}}, "a"),+ ({"a": {"x": 0, "y": 0, "w": 80, "h": 100},+ "b": {"x": 80, "y": 0, "w": 80, "h": 100}}, "b")):+ with self.subTest(expected=expected):+ held = settings(peer(A, "Ay", side="right", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": ["left"],+ "corner": False, "corner_at": "top_left", "corners": [], "notch": False,+ }))+ held["layout"] = {+ HERE: {"x": 0, "y": 0, "w": 160, "h": 100,+ "displays": {"own": {"x": 0, "y": 0, "w": 160, "h": 100}}},+ A: {"x": 160, "y": 0, "w": 160, "h": 100, "displays": displays},+ }+ out = ways.compile_layout(held, held["layout"], capable={HERE, A}, now=100)+ zone = next(z for z in out["settings"]["zones"] if z.get("side") == "left")+ self.assertEqual((zone["target_display"], zone["target_side"]), (expected, "right"))++ def test_wrap_edge_does_not_use_an_internal_display_edge(self):+ held = settings(peer(A, "Ay", side="right", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": ["left"],+ "corner": False, "corner_at": "top_left", "corners": [], "notch": False,+ }))+ held["layout"] = {+ HERE: {"x": 0, "y": 0, "w": 160, "h": 100,+ "displays": {"left": {"x": 0, "y": 0, "w": 80, "h": 100},+ "right": {"x": 80, "y": 0, "w": 80, "h": 100}}},+ A: {"x": 160, "y": 0, "w": 160, "h": 100},+ }+ out = ways.compile_layout(held, held["layout"], capable={HERE, A}, now=100)+ self.assertEqual(out["tiles"][A]["wraps"], [+ {"display": "left", "side": "left", "parts": list(ways.PARTS)}])++ def test_reach_reports_contact_holders_and_old_or_missing_tiles(self):+ held = settings(peer(A, "Ay", side="right", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": ["left"],+ "corner": False, "corner_at": "top_left", "corners": [], "notch": False,+ }), peer(B, "Bee", side="left"))+ held["layout"] = {HERE: {"x": 0, "y": 0, "w": 160, "h": 100},+ A: {"x": 160, "y": 0, "w": 160, "h": 100},+ B: {"x": -160, "y": 0, "w": 160, "h": 100}}+ held["peers"][0]["ways"]["edges"] = []+ reach = ways.reach(held, A, platform="pc", capable={HERE, A, B})+ self.assertEqual(reach["sides"]["left"], {"state": "held", "by": B})+ self.assertEqual(reach["sides"]["right"], {"state": "contact", "by": A})+ held["peers"][0]["caps"] = []+ self.assertEqual(ways.reach(held, A, platform="pc", capable={HERE, B})["sides"]["left"],+ {"state": "unavailable", "by": None})+ self.assertEqual(ways.reach(held, A, platform="pc", capable={HERE, A, B})["sides"]["right"],+ {"state": "contact", "by": A}, "an old peer keeps its contact chip, to turn Edge off")+ held["layout"].pop(A)+ self.assertEqual(ways.reach(held, A, platform="pc", capable={HERE, A, B})["sides"]["right"],+ {"state": "contact", "by": A}, "no tile yet: placed by its side, as the compile does")+ held["peers"][0].pop("caps")+ held["layout"][A] = {"x": 40, "y": 0, "w": 160, "h": 100}+ self.assertTrue(all(item == {"state": "unavailable", "by": None}+ for item in ways.reach(held, A, platform="pc", capable={HERE, A, B})["sides"].values()))++ def test_reach_uses_the_compiled_contact_and_wrap_assignment(self):+ held = settings(peer(A, "Ay", side="right", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": ["left"],+ "corner": True, "corner_at": "top_left", "corners": ["top_left"], "notch": False,+ }))+ held["layout"] = {HERE: {"x": 0, "y": 0, "w": 160, "h": 100},+ A: {"x": 160, "y": 0, "w": 160, "h": 100}}+ reach = ways.reach(held, A, platform="mac", capable={HERE, A})+ self.assertEqual(set(reach), {"sides", "corners"})+ self.assertTrue(all(set(item) == {"state", "by"}+ for section in reach.values() for item in section.values()))+ self.assertEqual(reach["sides"]["right"], {"state": "contact", "by": A})+ self.assertEqual(reach["sides"]["left"], {"state": "on", "by": None})+ self.assertEqual(reach["sides"]["top"], {"state": "free", "by": None})+ self.assertEqual(reach["sides"]["bottom"], {"state": "free", "by": None})+ self.assertEqual(reach["corners"]["top_left"], {"state": "on", "by": None})+ self.assertEqual(reach["corners"]["top_right"], {"state": "free", "by": None})++ held["peers"][0]["ways"]["edge"] = False+ reach = ways.reach(held, A, platform="mac", capable={HERE, A},+ live=lambda _peer: True, gone=lambda _peer: False)+ self.assertEqual(reach["sides"]["left"], {"state": "kept", "by": None})++ def test_a_contact_holds_its_side_against_wraps_even_with_its_edge_off(self):+ held = settings(peer(A, "Ay", side="right", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": ["left"],+ "corner": False, "corner_at": "top_left", "corners": [], "notch": False,+ }), peer(B, "Bee", side="left", ways={+ "edge": False, "thirds": list(ways.PARTS), "edges": [],+ "corner": False, "corner_at": "top_left", "corners": [], "notch": False,+ }))+ held["layout"] = {HERE: {"x": 0, "y": 0, "w": 160, "h": 100},+ A: {"x": 160, "y": 0, "w": 160, "h": 100},+ B: {"x": -160, "y": 0, "w": 160, "h": 100}}+ out = ways.compile_layout(held, held["layout"], capable={HERE, A, B}, now=100)+ self.assertEqual(out["tiles"][A]["wraps"], [])+ self.assertEqual(ways.reach(held, A, platform="pc", capable={HERE, A, B})["sides"]["left"],+ {"state": "kept", "by": None})+ held["peers"][0]["ways"]["edges"] = []+ self.assertEqual(ways.reach(held, A, platform="pc", capable={HERE, A, B})["sides"]["left"],+ {"state": "held", "by": B})++ def test_reach_places_a_sideless_tileless_peer_and_answers_a_not_in_use_row_as_put_back(self):+ held = settings(peer(A, "Ay", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": ["left"],+ "corner": False, "corner_at": "top_left", "corners": [], "notch": False,+ }))+ held["layout"] = {HERE: {"x": 0, "y": 0, "w": 160, "h": 100}}+ reach = ways.reach(held, A, platform="pc", capable={HERE, A})+ self.assertIn("contact", {item["state"] for item in reach["sides"].values()})+ held["layout"][A] = {"x": 160, "y": 0, "w": 160, "h": 100}+ held["peers"][0]["in_use"] = False+ reach = ways.reach(held, A, platform="pc", capable={HERE, A})+ self.assertEqual(reach["sides"]["right"], {"state": "contact", "by": A})+ self.assertEqual(reach["sides"]["left"], {"state": "on", "by": None})++ def test_an_overlapping_peer_gets_no_wrap_zones(self):+ held = settings(peer(A, "Ay", side="right", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": ["left"],+ "corner": False, "corner_at": "top_left", "corners": [], "notch": False,+ }))+ held["layout"] = {HERE: {"x": 0, "y": 0, "w": 160, "h": 100},+ A: {"x": 100, "y": 0, "w": 160, "h": 100}}+ out = ways.compile_layout(held, held["layout"], capable={HERE, A}, now=100)+ self.assertEqual([zone for zone in out["settings"]["zones"] if zone["peer"] == A], [])++ def test_a_wrap_lands_on_the_display_at_the_same_height_as_a_fraction_of_each_machine(self):+ frames = [{"display": "a", "x": 0, "y": 100, "w": 100, "h": 50},+ {"display": "z", "x": 0, "y": 150, "w": 100, "h": 50}]+ leaving = {"display": "0", "x": 300, "y": 50, "w": 100, "h": 50}+ own_tile = {"x": 300, "y": 0, "w": 100, "h": 100}+ self.assertEqual(ways._wrap_target(frames, "right", leaving, own_tile)["display"], "z")++ def test_the_one_corner_form_refuses_a_held_corner_without_a_write(self):+ held = settings(peer(A, "Ay", side="right", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": [],+ "corner": True, "corner_at": "top_right", "corners": ["top_right"], "notch": False,+ }), peer(B, "Bee", side="left", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": [],+ "corner": True, "corner_at": "bottom_left", "corners": ["bottom_left"], "notch": False,+ }))+ held["layout"] = {HERE: {"x": 0, "y": 0, "w": 160, "h": 100},+ A: {"x": 160, "y": 0, "w": 160, "h": 100},+ B: {"x": -160, "y": 0, "w": 160, "h": 100}}+ out = crossing_state.edit_ways(held, A, platform="pc", corner=True, corner_at="bottom_left",+ live=None, gone=None, now=100, capable={HERE, A, B})+ self.assertFalse(out["changed"])+ self.assertEqual(ways.ways(out["settings"], A)["corners"], ["top_right"])++ def test_reach_shows_a_left_out_rows_kept_ways_and_a_corner_held_only_by_intent(self):+ held = settings(peer(A, "Ay", side="right", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": ["left"],+ "corner": True, "corner_at": "top_left", "corners": ["top_left"], "notch": False,+ }), peer(B, "Bee", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": [],+ "corner": True, "corner_at": "bottom_right", "corners": ["bottom_right"], "notch": False,+ }))+ held["layout"] = {HERE: {"x": 0, "y": 0, "w": 160, "h": 100},+ A: {"x": 160, "y": 0, "w": 160, "h": 100},+ B: {"x": 0, "y": 300, "w": 160, "h": 100}}+ held["peers"][0]["left_out"] = True+ reach = ways.reach(held, A, platform="pc", capable={HERE, A, B})+ self.assertEqual(reach["sides"]["right"], {"state": "contact", "by": A})+ self.assertEqual(reach["sides"]["left"], {"state": "on", "by": None})+ self.assertEqual(reach["corners"]["top_left"], {"state": "on", "by": None})+ self.assertEqual(reach["corners"]["bottom_right"], {"state": "held", "by": B})+ self.assertEqual(reach["sides"]["right"], {"state": "contact", "by": A})+ unavailable = ways.reach(held, A, platform="mac", capable={HERE, A}, gone=lambda _peer: True)+ self.assertTrue(all(item == {"state": "unavailable", "by": None}+ for section in unavailable.values() for item in section.values()))++ def test_corner_screen_measures_left_and_top_from_the_tile_vertex(self):+ screens = [+ {"display": "far", "x": 500, "y": 500, "w": 100, "h": 100},+ {"display": "near", "x": 1000, "y": 1000, "w": 100, "h": 100},+ ]+ tile = {"x": 1000, "y": 1000, "w": 200, "h": 200}++ self.assertEqual(ways._corner_screen(screens, "top_left", tile)["display"], "near")++ def test_reach_marks_corners_unavailable_without_a_side_contact(self):+ held = settings(peer(A, "Ay", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": [],+ "corner": False, "corner_at": "top_left", "corners": [], "notch": False,+ }), peer(B, "Bee", side="right", ways={+ "edge": True, "thirds": list(ways.PARTS), "edges": [],+ "corner": True, "corner_at": "top_left", "corners": ["top_left"], "notch": False,+ }))+ held["layout"] = {HERE: {"x": 0, "y": 0, "w": 160, "h": 100},+ A: {"x": 400, "y": 0, "w": 160, "h": 100},+ B: {"x": 160, "y": 0, "w": 160, "h": 100}}++ reach = ways.reach(held, A, platform="pc", capable={HERE, A, B})++ self.assertEqual(reach["corners"]["top_left"], {"state": "unavailable", "by": None})++class LeavingOut(unittest.TestCase):def test_leave_out_turns_every_zone_off_and_put_back_restores_only_the_recorded_kinds(self):held = settings(peer(A, "Ay", side="right"), zones=[@@ -245,7 +486,8 @@ class LeavingOut(unittest.TestCase):self.assertTrue(held["peers"][0]["left_out"])self.assertNotIn("left_out_ways", held["peers"][0])self.assertEqual(held["peers"][0]["ways"], {"edge": True, "thirds": list(ways.PARTS),- "corner": False, "corner_at": "bottom_left", "notch": False})+ "edges": [], "corner": False, "corner_at": "bottom_left",+ "corners": [], "notch": False})self.assertEqual(held["zones"], [])self.assertFalse(ways.has_way(held, A))@@ -285,7 +527,8 @@ class LeavingOut(unittest.TestCase):self.assertEqual(held["peers"][0]["ways"]["edge"], True)self.assertTrue(ways.has_way(held, A))- self.assertEqual(held["zones"], [{"peer": A, "kind": "edge", "side": "right"}])+ self.assertEqual(held["zones"], [{"peer": A, "kind": "edge", "side": "right",+ "contact_span": [0.0, 1.0], "target_span": [0.0, 1.0]}])class InactiveZones(unittest.TestCase):@@ -1203,6 +1446,13 @@ class PartOfTheEdgeIsOneChoiceWithTheEdge(unittest.TestCase):held["peers"][0]["left_out"] = Trueself.assertIsNone(ways.corner_holder(held, "top_left", exclude=B))+ def test_a_diagonal_corner_contact_holds_the_corner_too(self):+ held = settings(peer(A, "Ay"), peer(B, "Bee"))+ held["layout"] = {HERE: {"x": 0, "y": 0, "w": 160, "h": 100},+ A: {"x": -160, "y": -100, "w": 160, "h": 100},+ B: {"x": 160, "y": 100, "w": 160, "h": 100}}+ self.assertEqual(ways.corner_holder(held, "top_left", exclude=B), A)+def test_every_combination_round_trips_through_the_settings(self):for thirds in THIRDS_COMBINATIONS:with self.subTest(thirds=thirds):diff --git a/core/ways.py b/core/ways.pyindex 2f8183d..2584941 100644--- a/core/ways.py+++ b/core/ways.py@@ -290,6 +290,42 @@ def _display_frames(tile):for key, rect in sorted(screens.items(), key=lambda item: (item[1]["y"], item[1]["x"], item[0]))]+def _wrap_target(frames, side, leaving, own_tile):+ """The peer display furthest out on the edge opposite a wrap-around departure."""+ if not frames or not any(frame.get("display") is not None for frame in frames):+ return None+ opposite = return_edge.OPPOSITE[side]+ coordinate = {"left": lambda frame: frame["x"], "right": lambda frame: frame["x"] + frame["w"],+ "top": lambda frame: frame["y"], "bottom": lambda frame: frame["y"] + frame["h"]}+ extreme = min(coordinate[opposite](frame) for frame in frames) if opposite in ("left", "top") else max(+ coordinate[opposite](frame) for frame in frames)+ candidates = [frame for frame in frames if coordinate[opposite](frame) == extreme]+ along = "y" if side in ("left", "right") else "x"+ size = "h" if along == "y" else "w"+ # Spans compared as fractions of each machine's own extent, so a bottom display lands on a bottom one.+ def fraction(low, high, origin, length):+ return ((low - origin) / length, (high - origin) / length) if length else (0, 0)+ start, end = fraction(leaving[along], leaving[along] + leaving[size], own_tile[along], own_tile[size])+ origin = min(frame[along] for frame in frames)+ length = max(frame[along] + frame[size] for frame in frames) - origin+ def rank(frame):+ low, high = fraction(frame[along], frame[along] + frame[size], origin, length)+ return max(0, min(end, high) - max(start, low))+ best_ratio = max(rank(frame) for frame in candidates)+ return min((frame for frame in candidates if rank(frame) == best_ratio),+ key=lambda frame: str(frame.get("display", "")))+++def _corner_screen(screens, corner, tile):+ """The display vertex nearest the requested outer vertex of the machine tile."""+ vertical, horizontal = corner.split("_")+ x = tile["x"] if horizontal == "left" else tile["x"] + tile["w"]+ y = tile["y"] if vertical == "top" else tile["y"] + tile["h"]+ return min(screens, key=lambda frame: (((frame["x"] if horizontal == "left" else frame["x"] + frame["w"]) - x) ** 2+ + ((frame["y"] if vertical == "top" else frame["y"] + frame["h"]) - y) ** 2,+ str(frame.get("display", ""))), default=None)++def snap_position(tile, own_id, layout, radius=12):"""Nearest free snap on a side's thirds, centre, flush alignments or a corner."""own = layout.get(own_id, {"x": 0, "y": 0, "w": 160, "h": 100})@@ -443,14 +479,25 @@ def _read_intent(settings, peer):entry = _entry(settings, peer) or {}held = entry.get("ways")if isinstance(held, dict):+ corner = held.get("corner", False) is True+ corner_at = held.get("corner_at") if held.get("corner_at") in CORNERS else DEFAULT_CORNER+ raw_corners = held.get("corners")+ picked_corners = ([value for value in CORNERS if value in raw_corners]+ if isinstance(raw_corners, list) else [])+ corners_agree = (isinstance(raw_corners, list) and raw_corners == picked_corners+ and bool(picked_corners) == corner+ and (not corner or corner_at in picked_corners))+ corners = picked_corners if corners_agree else ([corner_at] if corner else [])+ raw_edges = held.get("edges", [])return {"edge": held.get("edge", True) is True,"thirds": [part for part in PARTS if part in held.get("thirds", PARTS)] or list(PARTS),- "corner": held.get("corner", False) is True,- "corner_at": held.get("corner_at") if held.get("corner_at") in CORNERS else DEFAULT_CORNER,+ "edges": [side for side in EDGES if isinstance(raw_edges, list) and side in raw_edges],+ "corner": corner, "corner_at": corner_at, "corners": corners,"notch": held.get("notch", False) is True}mine = [zone for zone in settings.get("zones", []) if zone.get("peer") == peer]if not mine:- return dict(edge=True, thirds=list(PARTS), corner=False, corner_at=DEFAULT_CORNER, notch=False)+ return dict(edge=True, thirds=list(PARTS), edges=[], corner=False,+ corner_at=DEFAULT_CORNER, corners=[], notch=False)kept = entry.get("left_out_ways") if entry.get("left_out") is True else Noneif isinstance(kept, list):# Left out in rc12: every zone is off and the kinds in use were kept here for Put back.@@ -475,10 +522,12 @@ def _read_intent(settings, peer):parts = next((zone.get("parts") for zone in mine if zone.get("kind") == "part"and zone.get("parts")), list(PARTS))corner = next((zone.get("corner") for zone in mine if zone.get("kind") == "corner"), DEFAULT_CORNER)+ if corner not in CORNERS:+ corner = DEFAULT_CORNER+ corner_on = any(zone.get("kind") == "corner" and on(zone) for zone in mine)return dict(edge=active_edge or bool(active_part),thirds=[part for part in PARTS if part in parts] or list(PARTS),- corner=any(zone.get("kind") == "corner" and on(zone) for zone in mine),- corner_at=corner if corner in CORNERS else DEFAULT_CORNER,+ edges=[], corner=corner_on, corner_at=corner, corners=[corner] if corner_on else [],notch=any(zone.get("kind") == "notch" and on(zone) for zone in mine))@@ -539,7 +588,8 @@ def compile_layout(settings, layout, moved=None, capable=(), now=None, platform=if moved in active and moved != own_id:result.update(snap={moved: snap_position(active[moved], own_id,{key: tile for key, tile in active.items() if key != moved})},- tiles={moved: {"state": "overlap", "thirds": [], "sentence_keys": []}})+ tiles={moved: {"state": "overlap", "thirds": [], "wraps": [], "corners": [],+ "sentence_keys": []}})return resultcapable = picture_capable(saved, capable)picture_peers = set(capable) if capable else set(layout)@@ -551,9 +601,12 @@ def compile_layout(settings, layout, moved=None, capable=(), now=None, platform=else:saved["layout"] = copy.deepcopy(layout)allocations = {}+ # Thirds a wrap-around edge may not take: an old peer's picked contact, and a picture peer's contact+ # with its Edge off, which would otherwise take the side back silently when turned on.+ old_contact_blocks = set()for peer, found in contacts.items():entry = peers[peer]- if peer not in picture_peers or not _zoned(entry) or not entry["ways"]["edge"]:+ if not _zoned(entry):continuefor index, (screen, contact, target) in enumerate(found):side, start, end = contact@@ -565,12 +618,19 @@ def compile_layout(settings, layout, moved=None, capable=(), now=None, platform=if overlap + 1e-9 < length / 6:continuekey = (screen["display"], side, part)- rank = (overlap, _id_bytes(peer) or peer.encode(), -index)+ if peer not in picture_peers:+ if entry["ways"]["edge"] and part in entry["ways"]["thirds"]:+ old_contact_blocks.add(key)+ continue+ if not entry["ways"]["edge"]:+ old_contact_blocks.add(key)+ continue+ rank =(overlap, _id_bytes(peer) or peer.encode(), -index)if key not in allocations or rank > allocations[key][0]:allocations[key] = (rank, peer, index)- zones, tiles, corners = [], {}, set()+ zones, tiles, corners, wrap_taken = [], {}, set(), set()notch_taken = False- def add_zone(peer, kind, screen=None, side=None, target=None, **fields):+ def add_zone(peer, kind, screen=None, side=None, target=None, contact=None, **fields):zone = dict(peer=peer, kind=kind, **fields)if screen is not None:if screen["display"] is not None:@@ -578,50 +638,117 @@ def compile_layout(settings, layout, moved=None, capable=(), now=None, platform=zone["side"] = sideif target is not None and target["display"] is not None and side in EDGES:zone.update(target_display=target["display"], target_side=return_edge.OPPOSITE[side])+ if target is not None and side in EDGES and contact is not None:+ axis = "y" if side in ("left", "right") else "x"+ size = "h" if axis == "y" else "w"+ start, end = contact[1:]+ zone["contact_span"] = [(start - screen[axis]) / screen[size],+ (end - screen[axis]) / screen[size]]+ zone["target_span"] = [(start - target[axis]) / target[size],+ (end - target[axis]) / target[size]]zones.append(zone)for peer, entry in peers.items():if not _zoned(entry):- tiles[peer] = {"state": "gap", "thirds": [], "sentence_keys": ["gap"]}+ tiles[peer] = {"state": "gap", "thirds": [], "wraps": [], "corners": [],+ "sentence_keys": ["gap"]}continueintent = entry["ways"]found = contacts.get(peer, [])if peer in inactive:- tiles[peer] = {"state": "dormant", "thirds": [], "sentence_keys": []}+ tiles[peer] = {"state": "dormant", "thirds": [], "wraps": [], "corners": [],+ "sentence_keys": []}continueif peer in picture_peers:side = next((contact[0] for screen, contact, target in found if contact[0] in EDGES), "")if side != entry.get("side", ""):entry.update(side=side, side_set_at=saved.get("layout_set_at", int(stamp)),side_by=saved.get("layout_by") or own_id)- states, touched = [], set()+ derived_side = entry.get("side", "")+ states, touched, wraps, corner_zones = [], set(), [], []if peer in picture_peers:for index, (screen, contact, target) in enumerate(found):- side = contact[0]+ side, start, end = contactif side == "corner":corner = contact[1]- key = (screen["display"], corner)- if (intent["edge"] or intent["corner"]) and key not in corners:- corners.add(key)+ if (intent["edge"] or intent["corner"]) and corner not in corners:+ corners.add(corner)edge = corner.split("_")[1]add_zone(peer, "corner", screen, edge, target, corner=corner, edge=edge)+ corner_zones.append(corner)states.append("corner")continue- assigned = [part for part in PARTS if allocations.get((screen["display"], side, part), (None, None, None))[1:] == (peer, index)]+ origin, length = ((screen["y"], screen["h"]) if side in ("left", "right")+ else (screen["x"], screen["w"]))+ assigned = []+ for part_index, part in enumerate(PARTS):+ if allocations.get((screen["display"], side, part), (None, None, None))[1] != peer:+ continue+ low = origin + part_index * length / 3+ high = origin + (part_index + 1) * length / 3+ if min(end, high) - max(start, low) + 1e-9 >= length / 6:+ assigned.append(part)touched.update(assigned)kept = [part for part in assigned if part in intent["thirds"]]if intent["edge"] and kept:- kind = "edge" if len(kept) == 3 else "part"- add_zone(peer, kind, screen, side, target, **({"parts": kept} if kind == "part" else {}))+ kind = "edge" if len(kept) == len(PARTS) else "part"+ add_zone(peer, kind, screen, side, target, contact=contact,+ **({"parts": kept} if kind == "part" else {}))states.append(kind)- if intent["corner"]:- corner = intent["corner_at"]- key = (screen["display"], corner)- if key not in corners:- corners.add(key)- edge = corner.split("_")[1] if platform == "mac" else corner_edge(corner, side)- # A corner may cross a different edge from the contact; its landing pair follows that edge.- add_zone(peer, "corner", screen, edge, target, corner=corner, edge=edge)- states.append("corner")+ side_contacts = {contact[0] for _screen, contact, _target in found if contact[0] in EDGES}+ own_tile = active.get(own_id, layout[own_id])+ peer_frames = screens.get(peer, [])+ if intent["edge"] and peer not in overlaps:+ for wrap_side in intent["edges"]:+ if wrap_side in side_contacts:+ continue+ for screen in screens.get(own_id, []):+ origin, length = ((screen["y"], screen["h"]) if wrap_side in ("left", "right")+ else (screen["x"], screen["w"]))+ free = []+ for part_index, part in enumerate(PARTS):+ key = (screen["display"], wrap_side, part)+ if key in wrap_taken or key in allocations or key in old_contact_blocks:+ continue+ low, high = origin + part_index * length / 3, origin + (part_index + 1) * length / 3+ internal = False+ for other_screen in screens.get(own_id, []):+ if other_screen is screen:+ continue+ internal_contact = _rect_contact(screen, other_screen)+ if internal_contact is None or internal_contact[0] != wrap_side:+ continue+ overlap = max(0, min(high, internal_contact[2]) - max(low, internal_contact[1]))+ if overlap >= (high - low) / 6:+ internal = True+ break+ if not internal:+ free.append(part)+ wrap_taken.add(key)+ if not free:+ continue+ target = _wrap_target(peer_frames, wrap_side, screen, own_tile)+ kind = "edge" if len(free) == len(PARTS) else "part"+ add_zone(peer, kind, screen, wrap_side, target,+ **({"parts": free} if kind == "part" else {}))+ wraps.append({"display": screen["display"], "side": wrap_side, "parts": free})+ states.append(kind)+ if side_contacts:+ for corner in intent["corners"]:+ if corner in corners:+ continue+ screen = _corner_screen(screens.get(own_id, []), corner, own_tile)+ if screen is None:+ continue+ _vertical, horizontal = corner.split("_")+ edge = horizontal if platform == "mac" else corner_edge(corner, derived_side)+ contact_target = next((target for contact_screen, contact, target in found+ if contact_screen["display"] == screen["display"]+ and contact[0] == edge), None)+ target = contact_target or _wrap_target(peer_frames, edge, screen, own_tile)+ corners.add(corner)+ add_zone(peer, "corner", screen, edge, target, corner=corner, edge=edge)+ corner_zones.append(corner)+ states.append("corner")else:side = entry.get("side", "")# Picture contacts reserve their thirds even when the local pick narrows them.@@ -635,16 +762,18 @@ def compile_layout(settings, layout, moved=None, capable=(), now=None, platform=add_zone(peer, kind, **({"parts": kept} if kind == "part" else {}))states.append(kind)touched.update(kept)- if intent["corner"] and (None, intent["corner_at"]) not in corners:- corners.add((None, intent["corner_at"]))+ if intent["corner"] and intent["corner_at"] not in corners:+ corners.add(intent["corner_at"])edge = intent["corner_at"].split("_")[1] if platform == "mac" else corner_edge(intent["corner_at"], side)add_zone(peer, "corner", corner=intent["corner_at"], edge=edge)+ corner_zones.append(intent["corner_at"])states.append("corner")if platform == "mac" and intent["notch"] and not notch_taken:- add_zone(peer, "notch")+ add_zone(peer, "notch", **({"return_here": True} if entry.get("notch_return") is True else {}))notch_taken = Truestate = next((kind for kind in ("edge", "part", "corner") if kind in states), "gap")tiles[peer] = {"state": state, "thirds": [part for part in PARTS if part in touched],+ "wraps": wraps, "corners": corner_zones,"sentence_keys": ["gap"] if state == "gap" else []}if found and not states and intent["edge"] and touched:tiles[peer].update(unpicked=True, sentence_keys=["unpicked"])@@ -654,10 +783,12 @@ def compile_layout(settings, layout, moved=None, capable=(), now=None, platform=for other in contacts:if other != peer and other not in inactive and not contacts[other] and other in active and _rect_contact(active[peer], active[other]):state = "between" if peer in capable and other in capable else "set-elsewhere"- tiles[peer] = {"state": state, "thirds": [], "sentence_keys": ["between" if state == "between" else "set_elsewhere"]}+ tiles[peer] = {"state": state, "thirds": [], "wraps": [], "corners": [],+ "sentence_keys": ["between" if state == "between" else "set_elsewhere"]}for peer, others in overlaps.items():if peer in peers and peer not in inactive:- tiles[peer] = {"state": "overlap", "thirds": [], "sentence_keys": ["overlap"], "overlap_with": min(others)}+ tiles[peer] = {"state": "overlap", "thirds": [], "wraps": [], "corners": [],+ "sentence_keys": ["overlap"], "overlap_with": min(others)}saved["zones"] = zonesarrangements = [{"peer": peer, "side": entry.get("side", ""), "set_at": entry.get("side_set_at", 0),"by": entry.get("side_by", "")} for peer, entry in peers.items()@@ -760,17 +891,33 @@ def toggle_edge(methods, parts):return pick_thirds(methods, PARTS)+def notch_holder(settings: dict) -> Optional[str]:+ """The one machine the notch leads to: the first active one in ways order whose intent has it. A+ file from before 1.5.3 could tick several; the first keeps it, as the zones always did. A machine+ left out does not hold it, so it never keeps the notch from one in use."""+ return next((entry["id"] for entry in settings.get("peers", [])+ if _zoned(entry) and entry.get("left_out") is not True and entry.get("in_use", True) is not False+ and peerlist.dormant_reason(entry) is None and _read_intent(settings, entry["id"])["notch"]),+ None)++def corner_holder(settings: dict, corner: str, exclude: Optional[str] = None) -> Optional[str]:- """The machine, other than `exclude`, whose Corner is on at `corner` of this machine's screen:- one corner per machine, never shared, so the page refuses that corner to anyone else. Left-out,- not-in-use and phone entries hold none."""+ """The first active machine, other than `exclude`, holding this screen corner by intent or contact."""+ layout = settings.get("layout") if isinstance(settings.get("layout"), dict) else {}+ own_tile = layout.get(settings.get("machine_id"))for entry in settings.get("peers", []):ident = entry.get("id")if (ident == exclude or not _zoned(entry) or entry.get("left_out") is True- or entry.get("in_use", True) is False):+ or entry.get("in_use", True) is False or peerlist.dormant_reason(entry) is not None):continueintent = _read_intent(settings, ident)- if intent["corner"] and intent["corner_at"] == corner:+ if corner in intent["corners"]:+ return ident+ tile = layout.get(ident)+ if (own_tile and isinstance(tile, dict) and (intent["edge"] or intent["corner"])+ and any((contact := _rect_contact(screen, target)) is not None+ and contact[0] == "corner" and contact[1] == corner+ for screen in _display_frames(own_tile) for target in _display_frames(tile))):return identreturn None@@ -909,9 +1056,104 @@ def ways(settings: dict, peer: str) -> dict:methods = []if entry and intent["edge"]:methods.append("edge" if len(intent["thirds"]) == 3 else "part")- methods += [kind for kind in ("corner", "notch") if entry and intent[kind]]+ methods += [kind for kind in ("corner", "notch") if entry and intent[kind]+ and (kind != "notch" or notch_holder(settings) == peer)]return dict(side=entry.get("side") if entry.get("side") in EDGES else "",- methods=methods, parts=list(intent["thirds"]), corner=intent["corner_at"])+ methods=methods, parts=list(intent["thirds"]), corner=intent["corner_at"],+ edges=list(intent["edges"]), corners=list(intent["corners"]))+++def reach(settings: dict, peer: str, *, platform, capable=(), live=None, gone=None) -> dict:+ """Describe each side and corner for one peer from the current compiled map."""+ entry = _entry(settings, peer)+ layout = settings.get("layout") if isinstance(settings.get("layout"), dict) else {}+ if peer not in layout and entry and _zoned(entry):+ # A tile not in the picture yet sits where the derived layout puts it, as the map draws it.+ layout = {**derive_layout(settings, gap=0), **layout}+ tile = layout.get(peer)+ unavailable = {"state": "unavailable", "by": None}+ if not entry or not _zoned(entry) or not isinstance(tile, dict):+ return {"sides": {side: dict(unavailable) for side in EDGES},+ "corners": {corner: dict(unavailable) for corner in CORNERS}}+ if entry.get("left_out") is True or entry.get("in_use", True) is False:+ # A left-out row still shows its kept ways (the page makes them inert), as if put back.+ back = copy.deepcopy(settings)+ _entry(back, peer).pop("left_out", None)+ _entry(back, peer)["in_use"] = True+ return reach(back, peer, platform=platform, capable=capable, live=live, gone=gone)+ compiled = compile_layout(settings, layout, platform=platform, capable=capable, live=live, gone=gone)+ if not compiled.get("accepted", True):+ return {"sides": {side: dict(unavailable) for side in EDGES},+ "corners": {corner: dict(unavailable) for corner in CORNERS}}+ map_entry = compiled.get("tiles", {}).get(peer, {})+ if map_entry.get("state") in ("overlap", "dormant"):+ return {"sides": {side: dict(unavailable) for side in EDGES},+ "corners": {corner: dict(unavailable) for corner in CORNERS}}+ picture_peers = set(capable) if capable else set(layout)+ if not capable and any("caps" in item for item in settings.get("peers", [])):+ picture_peers = {settings.get("machine_id")} | {+ item.get("id") for item in settings.get("peers", []) if "layout" in item.get("caps", [])}+ intent = _read_intent(settings, peer)+ if peer not in picture_peers:+ # An old peer (1.5.0, 1.5.1) crosses by its side and one corner: no wrap-around, no second corner.+ side_held = entry.get("side")+ holder = lambda corner: corner_holder(settings, corner, exclude=peer)+ return {"sides": {side: ({"state": "contact", "by": peer} if side == side_held else dict(unavailable))+ for side in EDGES},+ "corners": {corner: ({"state": "on", "by": None} if corner in intent["corners"]+ else {"state": "held", "by": holder(corner)} if holder(corner)+ else dict(unavailable) if intent["corners"] or side_held not in EDGES+ else {"state": "free", "by": None})+ for corner in CORNERS}}+ wrap_sides = {item["side"]: item["parts"] for item in map_entry.get("wraps", [])}+ zones = compiled.get("settings", {}).get("zones", [])+ own_frames = _display_frames(compiled.get("settings", {}).get("layout", {}).get(+ settings.get("machine_id", ""), derive_layout(settings).get(settings.get("machine_id", ""))))+ peer_frames = _display_frames(tile)+ peer_contacts = [_rect_contact(own, other) for own in own_frames for other in peer_frames]+ contact_sides = {contact[0] for contact in peer_contacts if contact and contact[0] in EDGES}+ sides = {}+ for side in EDGES:+ if side in contact_sides:+ sides[side] = {"state": "contact", "by": peer}+ elif side in wrap_sides:+ sides[side] = {"state": "on", "by": None}+ elif side in intent["edges"]:+ sides[side] = {"state": "kept", "by": None}+ else:+ # Free exactly when picking it would cross now: the compile answers, so the two never differ.+ trial = copy.deepcopy(settings)+ _entry(trial, peer)["ways"] = {**intent, "edge": True, "edges": [*intent["edges"], side]}+ tried = compile_layout(trial, layout, platform=platform, capable=capable, live=live, gone=gone)+ if any(item["side"] == side for item in tried.get("tiles", {}).get(peer, {}).get("wraps", [])):+ sides[side] = {"state": "free", "by": None}+ continue+ holder = next((zone.get("peer") for zone in zones if zone.get("peer") != peer+ and zone.get("side") == side and zone.get("kind") in ("edge", "part")), None)+ if holder is None:+ inactive = {item.get("id") for item in settings.get("peers", [])+ if item.get("left_out") is True or item.get("in_use", True) is False+ or peerlist.dormant_reason(item) is not None or (gone is not None and gone(item.get("id")))}+ holder = next((other for other, other_tile in layout.items()+ if other not in (peer, settings.get("machine_id")) and other not in inactive+ and isinstance(other_tile, dict)+ and any((contact := _rect_contact(own, frame)) is not None and contact[0] == side+ for own in own_frames for frame in _display_frames(other_tile))), None)+ sides[side] = {"state": "held", "by": holder} if holder else dict(unavailable)+ corner_states = {}+ for corner in CORNERS:+ holder = next((zone.get("peer") for zone in zones if zone.get("peer") != peer+ and zone.get("kind") == "corner" and zone.get("corner") == corner),+ None) or corner_holder(settings, corner, exclude=peer)+ if corner in map_entry.get("corners", []):+ corner_states[corner] = {"state": "on", "by": None}+ elif not contact_sides:+ corner_states[corner] = dict(unavailable)+ elif holder:+ corner_states[corner] = {"state": "held", "by": holder}+ else:+ corner_states[corner] = {"state": "free", "by": None}+ return {"sides": sides, "corners": corner_states}def edit(settings: dict, peer: str, *, side: str, methods, parts, corner: str, kinds,diff --git a/docs/flatpak-build.md b/docs/flatpak-build.mdindex c142fec..cb50926 100644--- a/docs/flatpak-build.md+++ b/docs/flatpak-build.md@@ -1,6 +1,6 @@# Build Beamer's Linux Flatpak-Linux support in Beamer 1.5 is experimental. Each release from 1.5.1 carries an x86_64 Flatpak; this page is for building it yourself, or for another architecture. On one Fedora 44 GNOME desktop under Wayland, paired with a Mac and with a Windows PC, the window and tray, pairing, crossing both ways, typing and the clipboard work; there, crossings show no edge animation on the Linux machine and the selected option in settings is not filled in. X11 on real hardware has not been tested. Please tell us how it goes.+Linux support in Beamer 1.5 is experimental. Each release from 1.5.1 carries an x86_64 Flatpak, and from 1.5.3 an aarch64 (arm64) one too; this page is for building it yourself. On one Fedora 44 GNOME desktop under Wayland, paired with a Mac and with a Windows PC, the window and tray, pairing, crossing both ways, typing and the clipboard work. X11 on real hardware has not been tested. Please tell us how it goes.The app ID is `uk.co.kalkman.beamer`, matching the existing app's bundle identifier. The manifest uses PySide BaseApp 6.11 (PySide 6.11.2) and KDE Platform/SDK 6.11. Python modules and libei 1.6.0 are pinned, downloaded with SHA-256 verification and built offline. The KDE runtime already provides libxcb and libxkbcommon, including its X11 library.@@ -17,7 +17,7 @@ flatpak run --env=XDG_SESSION_TYPE=wayland --command=python3 uk.co.kalkman.beameflatpak run --env=XDG_SESSION_TYPE=x11 --command=python3 uk.co.kalkman.beamer /app/share/beamer/tools/flatpak_import_probe.py```-The script installs the SDK, runtime and BaseApp from Flathub automatically. No host Python, pip, compiler, development libraries or pip generator is needed. Omit the architecture argument to build for the current machine. The output, build repository and builder cache are gitignored. The bundle is the app, not the KDE runtime; installing it needs Flathub and downloads the runtime if absent. Rebuilding uses the checked-in `VERSION` without changing Mac or Windows build numbers.+The script installs the SDK, runtime and BaseApp from Flathub automatically. No host Python, pip, compiler, development libraries or pip generator is needed. Pass `aarch64` instead to build for arm64, or omit the architecture argument to build for the current machine. The output, build repository and builder cache are gitignored. The bundle is the app, not the KDE runtime; installing it needs Flathub and downloads the runtime if absent. Rebuilding uses the checked-in `VERSION` without changing Mac or Windows build numbers.Flatpak **1.18.2 has a BaseApp/SELinux build regression**, [upstream issue #6818](https://github.com/flatpak/flatpak/issues/6818), fixed in [1.18.3](https://github.com/flatpak/flatpak/releases/tag/1.18.3). The script refuses 1.18.2 rather than changing SELinux. If Fedora still supplies 1.18.2, update it first. On 03-10-2026, Fedora 44's updates-testing repository supplies released Flatpak 1.18.4:diff --git a/flatpak/uk.co.kalkman.beamer.metainfo.xml b/flatpak/uk.co.kalkman.beamer.metainfo.xmlindex 3469063..f90b272 100644--- a/flatpak/uk.co.kalkman.beamer.metainfo.xml+++ b/flatpak/uk.co.kalkman.beamer.metainfo.xml@@ -15,7 +15,7 @@<url type="homepage">https://kalkmancode.co.uk/beamer</url><url type="bugtracker">https://github.com/kalkman-code/beamer/issues</url><url type="vcs-browser">https://github.com/kalkman-code/beamer</url>- <url type="contribute">https://github.com/kalkman-code/beamer/blob/v1.5.2/CONTRIBUTING.md</url>+ <url type="contribute">https://github.com/kalkman-code/beamer/blob/v1.5.3/CONTRIBUTING.md</url><branding><color type="primary" scheme_preference="light">#006a88</color><color type="primary" scheme_preference="dark">#5fd4f4</color>@@ -29,21 +29,24 @@</recommends><screenshots><screenshot type="default">- <image>https://raw.githubusercontent.com/kalkman-code/beamer/v1.5.2/assets/linux-overview.png</image>+ <image>https://raw.githubusercontent.com/kalkman-code/beamer/v1.5.3/assets/linux-overview.png</image><caption>See which machine has input and manage paired computers</caption></screenshot><screenshot>- <image>https://raw.githubusercontent.com/kalkman-code/beamer/v1.5.2/assets/linux-crossing.png</image>+ <image>https://raw.githubusercontent.com/kalkman-code/beamer/v1.5.3/assets/linux-crossing.png</image><caption>Choose where input crosses between screens</caption></screenshot><screenshot>- <image>https://raw.githubusercontent.com/kalkman-code/beamer/v1.5.2/assets/linux-design.png</image>+ <image>https://raw.githubusercontent.com/kalkman-code/beamer/v1.5.3/assets/linux-design.png</image><caption>Choose crossing styles and colours for screen edges and machine hand-offs</caption></screenshot></screenshots><content_rating type="oars-1.1"/><releases>- <release version="1.5.2" date="2026-10-08">+ <release version="1.5.3" date="2026-10-13">+ <description><p>Adds pointer hiding on idle screens, idle takeover, per-screen crossing with contact-span matching, and Mac and Qt refresh improvements.</p></description>+ </release>+ <release version="1.5.2" date="2026-10-11"><description><p>Adds the shared desk map, granular settings, dormant pairing repair and Linux crossing effects.</p></description></release><release version="1.5.1" date="2026-10-06">diff --git a/mac_app/bridge.py b/mac_app/bridge.pyindex b4e9e03..bf76477 100644--- a/mac_app/bridge.py+++ b/mac_app/bridge.py@@ -15,6 +15,7 @@ from dataclasses import dataclassimport objcimport Quartz+from PyObjCTools import AppHelperimport clipboard_macimport config as config_module@@ -22,8 +23,11 @@ import crossingimport desktop_macfrom input_injector_mac import INJECTED_MARKimport gestures+from core import idle_pointerfrom core import ignoredfrom core import crossing_state+from core import effects+import frame_clockimport keyboard_layoutimport media_keysfrom core import keytable@@ -159,7 +163,7 @@ class QuartzEventTranslator:if event_type == quartz.kCGEventFlagsChanged:if keycode not in MODIFIER_KEY_CODES:return KeyResult(is_trigger, False, False, [])- if keycode == 0x39:+ if keycode == CAPS_LOCK_KEY_CODE:messages = [] if is_trigger else self._caps_lock_messages(key_map)return KeyResult(is_trigger, True, False, messages)is_down = self._modifier_transition(keycode, event)@@ -400,6 +404,28 @@ def _default_gesture_event_converter(cg_event):return _GestureEventView(ns_event)+def _on_main_thread(callback):+ if threading.current_thread() is threading.main_thread():+ return callback()+ completed = threading.Event()+ result = []++ def run():+ try:+ result.append((True, callback()))+ except BaseException as exc:+ result.append((False, exc))+ finally:+ completed.set()++ AppHelper.callAfter(run)+ completed.wait()+ succeeded, value = result[0]+ if not succeeded:+ raise value+ return value++def _default_system_event_converter(cg_event):"""Read (subtype, data1) off a system-defined CGEvent. Returns None ifAppKit is unavailable or the event does not carry those fields, which@@ -503,6 +529,7 @@ class KVMController:hardware=None,):self.cfg = cfg+ frame_clock.set_divisor(effects.frame_divisor(cfg.crossing.get("frame_rate")))self.logger = logger or logging.getLogger("Beamer")self.quartz = quartzself.clock = clock@@ -527,6 +554,12 @@ class KVMController:# Hidden for as long as input is on the other machine. Made before `redirecting`, whose# setter shows it: input being local is the one condition under which it is never hidden.self.pointer = PointerHider(quartz, logger=self.logger)+ # Hidden once a driver lets go of this Mac, until it moves; a hide of its own, since the+ # window server counts hides and the one above is shown whenever input comes home.+ idle_hider = PointerHider(quartz, logger=self.logger)+ self.idle_pointer = idle_pointer.IdlePointer(+ hide=idle_hider.hide, show=idle_hider.show, position=self._pointer_location, logger=self.logger,+ )self._cursor_assoc_status_logged = Falseself._cursor_warp_error_logged = Falseself._redirecting = False@@ -595,6 +628,7 @@ class KVMController:self.crossing = crossing.CrossingEngine.from_config(cfg.crossing)self.desktop_bounds = desktop_bounds or self._default_desktop_boundsself.notch_range = None+ self.notch_depth = 0.0self.on_crossing = Noneself._crossing_failed = Falseself._crossing_failed_at = 0.0@@ -1052,6 +1086,7 @@ class KVMController:self._force_local(self.input_error)def stop(self):+ self.idle_pointer.cancel()self._return_local()# The let-go and what is ahead of it may be waiting behind a clipboard read: sent first.deadline = time.monotonic() + 1.0@@ -1076,6 +1111,7 @@ class KVMController:self._return_local()with self._cfg_lock:self.cfg = cfg+ frame_clock.set_divisor(effects.frame_divisor(cfg.crossing.get("frame_rate")))self.trigger_code = KEY_NAME_TO_CODE[cfg.trigger_key]self.last_trigger_down = 0.0self.trigger_suppressed = False@@ -1105,6 +1141,7 @@ class KVMController:which has to reconnect."""with self._cfg_lock:self.cfg = cfg+ frame_clock.set_divisor(effects.frame_divisor(cfg.crossing.get("frame_rate")))# No machine's side goes from here: the flat settings only mirror the first machine's, and a# new first machine's would be the default. Sides go from the window, one machine at a time# (`send_arrangement`), and with every link that comes up.@@ -1265,6 +1302,14 @@ class KVMController:self.set_redirecting(False, came_home=False)self.receiving = valueself.crossing.reset()+ if value:+ self.idle_pointer.cancel()+ elif not self.stop_event.is_set() and self.cfg.hide_idle_pointer:+ self.idle_pointer.driver_left()++ def _pointer_location(self):+ x, y = self.quartz.CGEventGetLocation(self.quartz.CGEventCreate(None))+ return round(x), round(y)def _enqueue_control(self, message):"""Queue a message the event tap made itself, which must never block. Best-effort: a@@ -1811,7 +1856,7 @@ class KVMController:if not self.redirecting:return eventtry:- decoded = self.system_event_converter(event)+ decoded = _on_main_thread(lambda: self.system_event_converter(event))except Exception:self.logger.debug("failed to convert a system-defined event", exc_info=True)return event@@ -1907,7 +1952,7 @@ class KVMController:def _convert_gesture_event(self, event):try:- return self.gesture_event_converter(event)+ return _on_main_thread(lambda: self.gesture_event_converter(event))except Exception:self.logger.debug("failed to convert a gesture event", exc_info=True)return None@@ -2179,6 +2224,8 @@ class KVMController:if read is not None:data = {"route": read["route"], "next": protocol.id_text(read["next"]),"edge": read["edge"], "offset": read["offset"]}+ if "taken_over_by" in read:+ data["taken_over_by"] = read["taken_over_by"]self._step(lambda owner: owner.switch(peer, data))elif kind == protocol.MSG_ACCEPT:read = protocol.read_accept(message)@@ -2497,25 +2544,37 @@ class KVMController:other = peerlist.label_for(self.book.peers(), peer_id=protocol.id_text(moved.other))name = self._name_of(moved.left)text = peerlist.refusal_text(moved.why, name, other)+ if moved.why == "taken_over":+ text = f"{other or 'Another machine'} took over {name}"if text is None and moved.why in WHY_TEXT:text = WHY_TEXT[moved.why].format(name=name)if text is not None:self.logger.warning("%s; input returned to this Mac", text)self._alert("Beamer", text)if moved.why == "switch":- self._arrive(moved.edge, moved.offset, moved.display, moved.side)+ self._arrive(moved.edge, moved.offset, moved.display, moved.side, moved.left)- def _arrive(self, edge, offset, display=None, side=None):+ def _arrive(self, edge, offset, display=None, side=None, peer=None):"""The other machine sent input back: land the pointer where it left, `edge` being the edge- of this Mac to arrive at and `offset` the fraction along it. Without an edge the pointer- stays where it was and the arrival says so."""+ of this Mac to arrive at and `offset` the fraction along it, or below the notch when `peer`+ holds the notch with Return through the notch on. Without an edge the pointer stays where+ it was and the arrival says so."""crossed = edge in crossing.EDGES and isinstance(offset, (int, float)) and not isinstance(offset, bool)point = Noneif crossed:try:- point = crossing.CrossingEngine.arrival_point(- edge, offset, self._current_desktop_bounds(), displays=self._current_displays(),- display=display, side=side)+ peer = protocol.id_text(peer) if isinstance(peer, bytes) else peer+ notch = self.notch_range+ if notch is not None and peer and any(+ zone.get("kind") == "notch" and zone.get("peer") == peer and zone.get("return_here") is True+ for zone in self.book.zones()):+ edge = "top"+ point = crossing.CrossingEngine.notch_arrival_point(+ notch, self.notch_depth, self._current_desktop_bounds(), displays=self._current_displays())+ else:+ point = crossing.CrossingEngine.arrival_point(+ edge, offset, self._current_desktop_bounds(), displays=self._current_displays(),+ display=display, side=side)except Exception:self.logger.exception("failed to place the pointer on arrival")else:@@ -2572,11 +2631,14 @@ class KVMController:link = self._peers_up.get(peer)if link is None:return- if text and len(text.encode("utf-8")) > protocol.CLIPBOARD_MAX_BYTES:- self.logger.warning("local clipboard text is too large; skipping the text")+ caps = getattr(link, "caps", ()) or ()+ if text and ("clipboard" not in caps or len(text.encode("utf-8")) > protocol.CLIPBOARD_MAX_BYTES):+ if "clipboard" in caps:+ self.logger.warning("local clipboard text is too large; skipping the text")text = None- if image is not None and not protocol.png_fits(image):- self.logger.warning("local clipboard image (%d bytes) is past what a clipboard may carry; skipping the image", len(image))+ if image is not None and ("clipboard_image" not in caps or not protocol.png_fits(image)):+ if "clipboard_image" in caps:+ self.logger.warning("local clipboard image (%d bytes) is past what a clipboard may carry; skipping the image", len(image))image = Noneif not text and image is None:self.logger.debug("local clipboard is empty; not sending it")diff --git a/mac_app/config.py b/mac_app/config.pyindex 39df0ef..9fc655e 100644--- a/mac_app/config.py+++ b/mac_app/config.py@@ -77,6 +77,9 @@ class Config:check_updates: bool = True# Every address the window shows is hidden; see pages.redact.hide_addresses: bool = False+ # Only the machine in use shows a pointer: this Mac's after a driver lets go of it, until it+ # moves (core/idle_pointer). Its pointer always hides while it drives. This Mac's own choice.+ hide_idle_pointer: bool = True# Same on all machines: the Crossing and Design pages kept in step with the PC's, and the unix# seconds of the last change to that or to a shared value; see settings_sync.same_on_both: bool = False@@ -203,6 +206,7 @@ def parse_config(raw: dict) -> Config:allow_windows_to_drive=raw.get("allow_windows_to_drive", True) is not False,check_updates=raw.get("check_updates", True) is not False,hide_addresses=raw.get("hide_addresses", False) is True,+ hide_idle_pointer=raw.get("hide_idle_pointer", True) is not False,same_on_both=raw.get("same_on_both", False) is True,same_set_at=_stamp(raw.get("same_set_at", 0)),same_groups=groups,diff --git a/mac_app/crossing.py b/mac_app/crossing.pyindex ffa2179..24086cf 100644--- a/mac_app/crossing.py+++ b/mac_app/crossing.py@@ -54,6 +54,7 @@ DEFAULT_CROSSING = {"effect_size": "medium","effect_pace": 1.0,"effect_size_fraction": 0.045,+ "frame_rate": "display",# Unix seconds at the moment this Mac last changed the arrangement -- which# edge leads to the PC. Either machine may change it, so when two ends meet# holding different answers the newer stamp wins. Never read by the engine;@@ -118,6 +119,8 @@ class Ways:display: str = Nonetarget_display: str = Nonetarget_side: str = None+ contact_span: tuple = None+ target_span: tuple = Noneclass CrossingEngine:@@ -139,6 +142,9 @@ class CrossingEngine:# Outside reset(): a click while the pointer lands must not end the grace (keep_grace for a rebuild).self._grace_inward = dict.fromkeys(EDGES, 0.0)self._grace_at = None+ self._seam_overshoot = False+ self._seam_pin = None+ self._seam_previous = Noneself.reset()def start_grace(self, now):@@ -179,10 +185,15 @@ class CrossingEngine:continuedisplay = zone.get("display")edge = zone.get("side", sides[peer])- key = (peer, display, edge)+ corner_key = zone.get("corner") if zone.get("kind") == "corner" else None+ contact_span = return_edge._normalised_span(zone.get("contact_span"))+ target_span = return_edge._normalised_span(zone.get("target_span"))+ key = (peer, display, edge, corner_key, zone.get("target_display"), contact_span, target_span)held = found.setdefault(key, {"methods": set(), "parts": ("middle",), "corner": "top_right","target_display": zone.get("target_display"),- "target_side": zone.get("target_side")})+ "target_side": zone.get("target_side"),+ "contact_span": zone.get("contact_span"),+ "target_span": zone.get("target_span")})kind = zone.get("kind")if kind in ("edge", "part") and edge not in EDGES:continue@@ -197,8 +208,10 @@ class CrossingEngine:held["methods"].add(kind)ways = [Ways(peer, frozenset(held["methods"]), edge if edge in EDGES else "right",frozenset(held["parts"]), held["corner"], display, held["target_display"],- held["target_side"])- for (peer, display, edge), held in found.items() if held["methods"]]+ held["target_side"], return_edge._normalised_span(held["contact_span"]),+ return_edge._normalised_span(held["target_span"]))+ for (peer, display, edge, _corner, _target_display, _contact_span, _target_span), held+ in found.items() if held["methods"]]return cls(resistance_px=crossing["resistance_px"], block_while_dragging=crossing["block_while_dragging"],ways=ways)@@ -269,17 +282,31 @@ class CrossingEngine:self.touching = Falsereturn self._release()- target = self._target(x, y, bounds, notch_range, displays, ready=ready)+ self._seam_overshoot = False+ self._seam_pin = None+ target = self._target(x, y, bounds, notch_range, displays, ready=ready,+ previous=(previous_x, previous_y), delta=(dx, dy))# Whether the pointer is at an armed region at all, whatever the pressure: a slow push# drains to nothing between events and releases, but is still against the edge.self.touching = target is not Noneif target is None:return self._release()mac_edge, region, diagonal, via, peer = target- outward, inward = self._push(mac_edge, diagonal, x, y, dx, dy, previous_x, previous_y, self._push_box)+ if self._seam_overshoot and previous_x is None and self._seam_previous is not None:+ previous_x, previous_y = self._seam_previous+ if via == "corner" and self._selected_way and self._selected_way.display is not None:+ vertical, horizontal = self._selected_way.corner.split("_")+ out_x = -dx if horizontal == "left" else dx+ out_y = -dy if vertical == "top" else dy+ outward = (out_x * out_x + out_y * out_y) ** 0.5 if out_x > 0 and out_y > 0 else 0.0+ inward = (min(0.0, out_x) ** 2 + min(0.0, out_y) ** 2) ** 0.5+ else:+ outward, inward = self._push(mac_edge, diagonal, x, y, dx, dy,+ previous_x, previous_y, self._push_box)if via == "corner" and outward <= 0.0:# A straight push in the corner's box is still a push on the edge it sits on, as on the PC.- edge_target = self._target(x, y, bounds, notch_range, displays, corner=False, ready=ready)+ edge_target = self._target(x, y, bounds, notch_range, displays, corner=False, ready=ready,+ previous=(previous_x, previous_y))if edge_target is not None:mac_edge, region, diagonal, via, peer = edge_targetoutward, inward = self._push(mac_edge, diagonal, x, y, dx, dy, previous_x, previous_y, self._push_box)@@ -296,17 +323,23 @@ class CrossingEngine:if self.pressure <= 0.0:return self._release()if self.pin is None:- self.pin = (x, y)+ self.pin = self._seam_pin or (self._pin_point(x, y, self._push_box)+ if self._seam_overshoot else (x, y))self.mac_edge = mac_edgeself.region = regionif outward > 0.0 and self.pressure >= self.resistance_px:+ source_bounds = bounds+ display = self._selected_way.display if self._selected_way else None+ if isinstance(display, str) and display.isdigit() and int(display) < len(displays or ()):+ source_bounds = displays[int(display)]step = Step(pressure=1.0,crossed=True,pin=self.pin,edge=OPPOSITE[mac_edge],- offset=self._offset(mac_edge, self.pin, bounds),+ offset=self._landing_offset(self._offset(mac_edge, self.pin, source_bounds),+ self._selected_way),mac_edge=mac_edge,region=region,via=via,@@ -323,9 +356,12 @@ class CrossingEngine:quarter = self._quarter(self.pressure)tick = quarter > self._quarter_reachedself._quarter_reached = max(self._quarter_reached, quarter)+ holding = before >= HOLD_MIN_PX or self._seam_overshoot+ if holding:+ self._last_x, self._last_y = self.pinreturn Step(pressure=self._fraction(self.pressure),- hold=before >= HOLD_MIN_PX,+ hold=holding,pin=self.pin,tick=tick,mac_edge=mac_edge,@@ -373,6 +409,14 @@ class CrossingEngine:return (left + inset if edge == "left" else right - 1 - inset, along)return (along, top + inset if edge == "top" else bottom - 1 - inset)+ @staticmethod+ def notch_arrival_point(notch_range, depth, bounds, displays=None):+ """Where input coming home through the notch lands: the middle of the notch's span, just below+ it, through the same top-edge landing as any arrival."""+ left, _top, right, _bottom = bounds+ offset = ((notch_range[0] + notch_range[1]) / 2 - left) / max(1, right - 1 - left)+ return CrossingEngine.arrival_point("top", offset, bounds, inset=depth + 2.0, displays=displays)+def _decay(self, elapsed):if elapsed <= 0 or self.resistance_px <= 0:return 0.0@@ -398,7 +442,8 @@ class CrossingEngine:return 0return min(3, int(4 * pressure / self.resistance_px))- def _target(self, x, y, bounds, notch_range, displays=None, corner=True, ready=None):+ def _target(self, x, y, bounds, notch_range, displays=None, corner=True, ready=None,+ previous=None, delta=(0.0, 0.0)):"""Which armed region the pointer is touching, as (mac_edge, region, diagonal, method, peer).Every machine's corners are checked first, then edges, then thirds, then the notch (WIRE.mdsection 8): a corner wins over the edge it sits on, since its box is inside that edge's strip.@@ -424,10 +469,60 @@ class CrossingEngine:edge_box[edge] = own# What the push is measured against: the display's own edge when that is the wall.self._push_box = bounds+ previous_point = previous if previous and previous[0] is not None and previous[1] is not None else Nonefor way in ways if corner else ():if "corner" not in way.methods:continuevertical, horizontal = way.corner.split("_")+ screen = display_frames.get(way.display) if way.display is not None else None+ if way.display is not None and screen is None:+ continue+ if screen is not None:+ sx, sy, sr, sb = screen+ if sx <= x < sr and sy <= y < sb:+ near_x = x <= sx + CORNER_PX if horizontal == "left" else x >= sr - CORNER_PX+ near_y = y <= sy + CORNER_PX if vertical == "top" else y >= sb - CORNER_PX+ at_x = x <= sx + EDGE_TOLERANCE if horizontal == "left" else x >= sr - 1 - EDGE_TOLERANCE+ at_y = y <= sy + EDGE_TOLERANCE if vertical == "top" else y >= sb - 1 - EDGE_TOLERANCE+ if near_x and near_y and (at_x or at_y):+ box_x = sx if horizontal == "left" else sr - CORNER_PX+ box_y = sy if vertical == "top" else sb - CORNER_PX+ self._push_box = screen+ self._selected_way = way+ return horizontal, (box_x, box_y, CORNER_PX, CORNER_PX), vertical, "corner", way.peer+ prior = previous_point+ if prior is None:+ candidate = (x - delta[0], y - delta[1])+ if not (x < sx or x >= sr or y < sy or y >= sb):+ continue+ prior = candidate+ px, py = prior+ in_corner = (sx <= px < sr and sy <= py < sb+ and (px <= sx + CORNER_PX if horizontal == "left" else px >= sr - CORNER_PX)+ and (py <= sy + CORNER_PX if vertical == "top" else py >= sb - CORNER_PX))+ crossed_x = px < sr <= x if horizontal == "right" else x < sx <= px+ crossed_y = py < sb <= y if vertical == "bottom" else y < sy <= py+ if in_corner and (crossed_x or crossed_y):+ box_x = sx if horizontal == "left" else sr - CORNER_PX+ box_y = sy if vertical == "top" else sb - CORNER_PX+ self._seam_overshoot = True+ fractions = []+ if crossed_x:+ wall_x = sx if horizontal == "left" else sr+ fractions.append((wall_x - px) / (x - px))+ if crossed_y:+ wall_y = sy if vertical == "top" else sb+ fractions.append((wall_y - py) / (y - py))+ fraction = min(fractions)+ hit_x, hit_y = px + fraction * (x - px), py + fraction * (y - py)+ pin_x = min(max(hit_x, sx), sr - 1)+ pin_y = min(max(hit_y, sy), sb - 1)+ self._seam_pin = (pin_x, pin_y)+ self._seam_previous = prior+ self._push_box = screen+ self._selected_way = way+ return horizontal, (box_x, box_y, CORNER_PX, CORNER_PX), vertical, "corner", way.peer+ continuenear_x = x <= left + CORNER_PX if horizontal == "left" else x >= x_max - CORNER_PXnear_y = y <= top + CORNER_PX if vertical == "top" else y >= y_max - CORNER_PXif near_x and near_y and (at[horizontal] or at[vertical]):@@ -437,7 +532,10 @@ class CrossingEngine:return horizontal, (box_x, box_y, CORNER_PX, CORNER_PX), vertical, "corner", way.peerfor way in ways:screen = display_frames.get(way.display) if way.display is not None else None+ if way.display is not None and screen is None:+ continueedge_at = at[way.edge]+ overshot_pin = Noneif screen is not None:sx, sy, sr, sb = screenedge_at = (sx <= x < sr and sy <= y < sb and {@@ -446,13 +544,26 @@ class CrossingEngine:"top": y <= sy + EDGE_TOLERANCE,"bottom": y >= sb - 1 - EDGE_TOLERANCE,}[way.edge])+ overshot_pin = self._overshot_edge(way.edge, previous, (x, y), delta, screen)+ edge_at = edge_at or overshot_pin is not Noneif "edge" in way.methods and edge_at:+ point = overshot_pin or (x, y)+ if not self._within_contact(way, point, screen, bounds):+ continue+ if screen is not None and overshot_pin is not None:+ self._seam_overshoot = True+ self._seam_pin = overshot_pin+ self._seam_previous = (previous if previous[0] is not None else+ (x - delta[0], y - delta[1]))self._push_box = screen or edge_box[way.edge]self._selected_way = wayreturn way.edge, self._strip(way.edge, self._push_box), None, "edge", way.peerfor way in ways:screen = display_frames.get(way.display) if way.display is not None else None+ if way.display is not None and screen is None:+ continueedge_at = at[way.edge]+ overshot_pin = Noneif screen is not None:sx, sy, sr, sb = screenedge_at = (sx <= x < sr and sy <= y < sb and {@@ -461,12 +572,22 @@ class CrossingEngine:"top": y <= sy + EDGE_TOLERANCE,"bottom": y >= sb - 1 - EDGE_TOLERANCE,}[way.edge])+ overshot_pin = self._overshot_edge(way.edge, previous, (x, y), delta, screen)+ edge_at = edge_at or overshot_pin is not Noneif "part" in way.methods and edge_at:# The thirds are the pointer's own display's, as the PC measures them: along the whole# desktop, a short display beside a tall one could hold none of the middle third.local_bounds = screen or own or bounds- part = return_edge.part_of(self._offset(way.edge, (x, y), local_bounds))+ point = overshot_pin or (x, y)+ if not self._within_contact(way, point, screen, bounds):+ continue+ part = return_edge.part_of(self._offset(way.edge, point, local_bounds))if part in way.parts:+ if screen is not None and overshot_pin is not None:+ self._seam_overshoot = True+ self._seam_pin = overshot_pin+ self._seam_previous = (previous if previous[0] is not None else+ (x - delta[0], y - delta[1]))self._push_box = local_boundsself._selected_way = wayreturn way.edge, self._part_strip(way.edge, local_bounds, part), None, "edge", way.peer@@ -477,6 +598,56 @@ class CrossingEngine:return "top", (notch_left, top, notch_right - notch_left, 1), None, "notch", way.peerreturn None+ @classmethod+ def _within_contact(cls, way, point, screen, bounds=None):+ if way.contact_span is None:+ return True+ target = screen or bounds+ if target is None:+ return False+ fraction = cls._offset(way.edge, point, target)+ return way.contact_span[0] <= fraction <= way.contact_span[1]++ @staticmethod+ def _landing_offset(offset, way):+ if way is None or way.contact_span is None or way.target_span is None:+ return offset+ low, high = way.contact_span+ target_low, target_high = way.target_span+ ratio = max(0.0, min(1.0, (offset - low) / max(high - low, 1e-12)))+ return round(target_low + ratio * (target_high - target_low), 4)++ def _overshot_edge(self, edge, previous, current, delta, screen):+ if previous is None or previous[0] is None or previous[1] is None:+ previous = (current[0] - delta[0], current[1] - delta[1])+ sx, sy, sr, sb = screen+ px, py = previous+ x, y = current+ delta_x, delta_y = x - px, y - py+ if not (sx <= px < sr and sy <= py < sb):+ return None+ if edge == "right" and sx <= px < sr and delta_x > 0 and x >= sr:+ fraction = (sr - px) / delta_x+ elif edge == "left" and sx <= px < sr and delta_x < 0 and x < sx:+ fraction = (sx - px) / delta_x+ elif edge == "bottom" and sy <= py < sb and delta_y > 0 and y >= sb:+ fraction = (sb - py) / delta_y+ elif edge == "top" and sy <= py < sb and delta_y < 0 and y < sy:+ fraction = (sy - py) / delta_y+ else:+ return None+ along = py + fraction * delta_y if edge in ("left", "right") else px + fraction * delta_x+ low, high = (sy, sb) if edge in ("left", "right") else (sx, sr)+ if not low <= along < high:+ return None+ return ((sx if edge == "left" else sr - 1, along) if edge in ("left", "right")+ else (along, sy if edge == "top" else sb - 1))++ @staticmethod+ def _pin_point(x, y, bounds):+ left, top, right, bottom = bounds+ return min(max(x, left), right - 1), min(max(y, top), bottom - 1)+@staticmethoddef _exposed(edge, x, y, own, displays):"""Whether the pointer is at `own`'s `edge` with no display just beyond it."""diff --git a/mac_app/diagram.py b/mac_app/diagram.pyindex 925c0b8..c735a6f 100644--- a/mac_app/diagram.py+++ b/mac_app/diagram.py@@ -393,7 +393,7 @@ class AtlasCanvas(AppKit.NSView):@objc.python_methoddef setup(self):self.setTranslatesAutoresizingMaskIntoConstraints_(False)- self.heightAnchor().constraintGreaterThanOrEqualToConstant_(self.HEIGHT).setActive_(True)+ self.heightAnchor().constraintEqualToConstant_(self.HEIGHT).setActive_(True)self.setWantsLayer_(True)theme.tint(self.layer(), background="well", border="edge")self.layer().setBorderWidth_(1)@@ -424,6 +424,7 @@ class AtlasCanvas(AppKit.NSView):self.seam_segments = []self.mark_layers = {}self.corner_halo_layers = {}+ self.wrap_layers = {}self.recentre_layer = _box("panel", None, 4)self.recentre_label = _text_layer(theme.TYPE["note"], "ink_3")self.recentre_layer.addSublayer_(self.recentre_label)@@ -769,7 +770,8 @@ class AtlasCanvas(AppKit.NSView):theme.tint(state_layer, foreground="amber" if gap else "ink_3")crosses = status_info.get("crosses", is_own)outcome = ("Offline" if not is_own and not status_info.get("linked") else- "Crosses" if crosses and (status_info.get("corner_way") or status_info.get("notch_way")) else+ "Crosses" if crosses and (status_info.get("corner_ways") or status_info.get("wrap_sides")+ or status_info.get("notch_way")) else"Edge off" if status_info.get("edge_off") or status_info.get("unpicked") elseoutcome_for_tile(state, crosses, is_own))if is_own:@@ -908,6 +910,145 @@ class AtlasCanvas(AppKit.NSView):Quartz.CGPathAddLineToPoint(path, None, x2, y)layer.setPath_(path)self._draw_thirds(frames)+ self._draw_wraps(frames)++ @objc.python_method+ def _draw_wraps(self, frames):+ """A wrap-around edge: a seam along This Mac's own side, with a label inside the tile naming+ where it leads and, on a left or right side, an arrow pointing out of it. A side kept while+ Edge is off is a faint dashed seam and says so."""+ wanted = {}+ own = frames.get(self.own_id)+ if own is not None:+ pads = self._pad_corners(frames)+ for peer, state in self.states.items():+ if peer == self.own_id or peer not in frames or state.get("in_use") is False:+ continue+ opacity = (1.0 if state.get("linked", True) else 0.55) * (1.0 if peer == self.selected else 0.7)+ for kept, sides in ((False, state.get("wrap_sides", [])), (True, state.get("kept_sides", []))):+ for side in sides:+ wanted[(peer, side)] = (kept, opacity)+ for key in list(self.wrap_layers):+ if key not in wanted:+ for layer in self.wrap_layers.pop(key):+ layer.removeFromSuperlayer()+ for (peer, side), (kept, opacity) in wanted.items():+ if (peer, side) not in self.wrap_layers:+ seam = Quartz.CAShapeLayer.layer()+ seam.setFillColor_(AppKit.NSColor.clearColor().CGColor())+ seam.setLineCap_(Quartz.kCALineCapRound)+ arrow = Quartz.CAShapeLayer.layer()+ arrow.setFillColor_(AppKit.NSColor.clearColor().CGColor())+ arrow.setLineWidth_(1.6)+ arrow.setLineCap_(Quartz.kCALineCapRound)+ arrow.setLineJoin_(Quartz.kCALineJoinRound)+ text = _text_layer(theme.TYPE["eyebrow"], "signal", Quartz.kCAAlignmentLeft)+ for layer in (seam, arrow, text):+ layer.setZPosition_(21)+ self.layer().addSublayer_(layer)+ self.wrap_layers[(peer, side)] = (seam, arrow, text)+ seam, arrow, text = self.wrap_layers[(peer, side)]+ x, y, width, height = own+ horizontal = side in ("top", "bottom")+ first, last = {"left": ("top_left", "bottom_left"), "right": ("top_right", "bottom_right"),+ "top": ("top_left", "top_right"), "bottom": ("bottom_left", "bottom_right")}[side]+ start = (x if horizontal else y) + (13 if first in pads else 2)+ end = (x + width if horizontal else y + height) - (13 if last in pads else 2)+ fixed = {"left": x, "right": x + width, "top": y, "bottom": y + height}[side]+ path = Quartz.CGPathCreateMutable()+ if end > start:+ Quartz.CGPathMoveToPoint(path, None, *((start, fixed) if horizontal else (fixed, start)))+ Quartz.CGPathAddLineToPoint(path, None, *((end, fixed) if horizontal else (fixed, end)))+ seam.setPath_(path)+ seam.setLineWidth_(2 if kept else 4)+ seam.setLineDashPattern_([3, 5] if kept else None)+ theme.tint(seam, stroke="signal")+ seam.setOpacity_(0.35 if kept else opacity)+ ink = "ink_3" if kept else "signal"+ label = "wrap kept, Edge off" if kept else f"wraps to {self.labels.get(peer, 'another machine')}"+ text.setString_(label)+ theme.tint(text, foreground=ink)+ text.setOpacity_(0.8 if kept else opacity)+ theme.tint(arrow, stroke=ink)+ arrow.setOpacity_(0.7 if kept else opacity)+ if own is not None:+ self._place_wrap_labels(own, [(side, *self.wrap_layers[(peer, side)][1:]) for peer, side in wanted])++ @objc.python_method+ def _place_wrap_labels(self, own, marks):+ """Each wrap label gets its own row below This Mac's name and status line, so none ever lands on+ them or on another label: a top side's row nearest the name, a bottom side's nearest the+ bottom edge, left and right in between, sharing one row when both fit. Sides that say the+ same thing, as when one machine wraps on several, share one label naming them. Rows that do+ not fit the tile are hidden; the seam still shows the side."""+ x, y, width, height = own+ header = y + (51 if height >= 72 else 30)+ first, last = header + 4, y + height - 22+ order = {"merged": 0, "top": 0, "left": 1, "right": 2, "bottom": 3}+ marks = sorted(marks, key=lambda mark: order[mark[0]])+ said = {}+ for side, arrow, text in marks:+ said.setdefault(text.string(), []).append((side, arrow, text))+ marks = []+ for words, same in said.items():+ marks.append(same[0])+ if len(same) > 1:+ side, arrow, text = same[0]+ # The sides named, else counted, else the plain words: the seams still show which.+ merged = next((option for option in (f"{words} · {', '.join(mark[0] for mark in same)}",+ f"{words} · {len(same)} sides")+ if _text_width(option, text.font()) + 2 <= width - 24), words)+ text.setString_(merged)+ marks[-1] = ("merged", arrow, text)+ for _side, other_arrow, other_text in same[1:]:+ other_text.setHidden_(True)+ other_arrow.setHidden_(True)+ rows = []+ for side, arrow, text in sorted(marks, key=lambda mark: order[mark[0]]):+ label_width = min(math.ceil(_text_width(text.string(), text.font())) + 2,+ max(1, width - (52 if side in ("left", "right") else 24)))+ mark = (side, arrow, text, label_width)+ if (side == "right" and rows and len(rows[-1]) == 1 and rows[-1][0][0] == "left"+ and 26 + rows[-1][0][3] + 8 + label_width + 26 <= width):+ rows[-1].append(mark)+ else:+ rows.append([mark])+ room = 0 if height < 56 or last < first else int((last - first) // 18) + 1+ wanted = {"top": first, "merged": first, "left": y + height / 2 + 10, "right": y + height / 2 + 10,+ "bottom": last}+ tops = []+ for row in rows[:room]:+ tops.append(max(min(last, wanted[row[0][0]]), tops[-1] + 18 if tops else first))+ for index in range(len(tops) - 1, -1, -1):+ tops[index] = min(tops[index], last if index == len(tops) - 1 else tops[index + 1] - 18)+ for index, row in enumerate(rows):+ for side, arrow, text, label_width in row:+ shown = index < len(tops)+ text.setHidden_(not shown)+ arrow.setHidden_(not shown or side not in ("left", "right"))+ if not shown:+ continue+ label_y = tops[index]+ label_x = (x + 26 if side == "left" else x + width - 26 - label_width if side == "right"+ else x + width - 12 - label_width)+ _set_layer_frame_if_changed(text, ((label_x, label_y), (label_width, 16)))+ arrow_path = Quartz.CGPathCreateMutable()+ if side in ("left", "right"):+ direction = -1 if side == "left" else 1+ tip, centre = (x + 16 if side == "left" else x + width - 16), label_y + 8+ Quartz.CGPathMoveToPoint(arrow_path, None, tip - direction * 9, centre)+ Quartz.CGPathAddLineToPoint(arrow_path, None, tip, centre)+ Quartz.CGPathMoveToPoint(arrow_path, None, tip - direction * 4, centre - 4)+ Quartz.CGPathAddLineToPoint(arrow_path, None, tip, centre)+ Quartz.CGPathAddLineToPoint(arrow_path, None, tip - direction * 4, centre + 4)+ arrow.setPath_(arrow_path)++ @objc.python_method+ def _pad_corners(self, frames):+ """Every corner of This Mac's tile that carries a pad, whichever machine's it is."""+ return {corner for peer, state in self.states.items()+ if peer != self.own_id and peer in frames and state.get("in_use") is not False+ for corner in state.get("corner_ways", [])}@objc.python_methoddef _side_contacts(self, peer):@@ -950,8 +1091,7 @@ class AtlasCanvas(AppKit.NSView):@objc.python_methoddef _stop_at_corner_halos(self, frames, side, start, end):x, y, width, height = frames[self.own_id]- corners = {state.get("corner_way") for peer, state in self.states.items()- if peer != self.own_id and peer in frames and state.get("in_use") is not False}+ corners = self._pad_corners(frames)if side in ("left", "right"):low = y + (11 if f"top_{side}" in corners else 0)high = y + height - (11 if f"bottom_{side}" in corners else 0)@@ -1053,8 +1193,7 @@ class AtlasCanvas(AppKit.NSView):for peer, state in self.states.items():if peer == self.own_id or peer not in frames or state.get("in_use") is False:continue- corner = state.get("corner_way")- if corner in core_ways.CORNERS:+ for corner in state.get("corner_ways", []):px = x if corner.endswith("left") else x + widthpy = y if corner.startswith("top") else y + heightpath = Quartz.CGPathCreateMutable()diff --git a/mac_app/dock_visibility.py b/mac_app/dock_visibility.pyindex 0c533fe..98aa1c5 100644--- a/mac_app/dock_visibility.py+++ b/mac_app/dock_visibility.py@@ -1,17 +1,29 @@-"""Pure policy selection for the Mac app's Dock presence."""+"""Pure policy selection for the Mac app's Dock and menu bar presence."""DEFAULT_SHOW_IN_DOCK = True+# One key on all three apps: the menu bar item on the Mac, the tray icon on Windows and Linux.+DEFAULT_SHOW_IN_TRAY = Truedef complete_settings(settings):settings.setdefault("show_in_dock", DEFAULT_SHOW_IN_DOCK)+ settings.setdefault("show_in_tray", DEFAULT_SHOW_IN_TRAY)return settingsdef validate_settings(settings):if not isinstance(settings.get("show_in_dock"), bool):raise ValueError("show_in_dock must be true or false")+ if not isinstance(settings.get("show_in_tray"), bool):+ raise ValueError("show_in_tray must be true or false")def activation_policy(show_in_dock, window_open):return "regular" if show_in_dock or window_open else "accessory"+++def menu_bar_visible(show_in_dock, show_in_tray):+ """The menu bar item stays whenever the Dock icon is hidden. With both switched off and the+ window closed there would be nothing to reopen Beamer from, and the menu bar is the one to keep:+ it is where a Dock-less Beamer already lived, and it carries the drive state and Quit."""+ return bool(show_in_tray) or not show_in_dockdiff --git a/mac_app/frame_clock.py b/mac_app/frame_clock.pyindex 81dd689..588e641 100644--- a/mac_app/frame_clock.py+++ b/mac_app/frame_clock.py@@ -7,6 +7,13 @@ import Quartz# page's work for nothing anyone can see, so they play at 60 at most.PREVIEW_MAX_RATE = 60+_DIVISOR = 1+++def set_divisor(n):+ global _DIVISOR+ _DIVISOR = n+class _Fire(AppKit.NSObject):def fire_(self, _sender):@@ -41,12 +48,14 @@ class FrameClock:rate = max(1, int(screen.maximumFramesPerSecond()))if self.max_rate:rate = min(rate, self.max_rate)- link.setPreferredFrameRateRange_(Quartz.CAFrameRateRangeMake(min(30, rate), rate, rate))+ target_rate = max(1, rate // _DIVISOR)+ link.setPreferredFrameRateRange_(Quartz.CAFrameRateRangeMake(min(30, target_rate), target_rate, target_rate))link.addToRunLoop_forMode_(runloop, AppKit.NSRunLoopCommonModes)self.source = linkelse:+ # macOS 13 has no display link for a view or screen: 60 a second, capped and divided alike.timer = AppKit.NSTimer.timerWithTimeInterval_target_selector_userInfo_repeats_(- 1.0 / 60.0, target, "fire:", None, True+ _DIVISOR / min(60, self.max_rate or 60), target, "fire:", None, True)runloop.addTimer_forMode_(timer, AppKit.NSRunLoopCommonModes)self.source = timerdiff --git a/mac_app/kvm_bridge_app.py b/mac_app/kvm_bridge_app.pyindex bd3a7b0..6514450 100644--- a/mac_app/kvm_bridge_app.py+++ b/mac_app/kvm_bridge_app.py@@ -29,7 +29,7 @@ import config as config_moduleimport crossingfrom core import return_edgeimport desktop_mac-from frame_clock import FrameClock+from frame_clock import FrameClock, set_divisorimport dock_visibilityfrom core import crash_logfrom core import effects@@ -358,6 +358,13 @@ def notch_x_range():return None+def notch_depth():+ """How far the notch reaches down from the top of the desktop, in points: the safe-area inset+ of the screen notch_x_range found it on."""+ return max((screen.safeAreaInsets().top for screen in AppKit.NSScreen.screens()+ if hasattr(screen, "safeAreaInsets")), default=0.0)++def menu_bar_height(display):"""The height in points of the menu bar across the top of `display`, a Quartz (left, top,right, bottom), or 0 where it has none or hides itself: the gap between the screen's top and@@ -692,13 +699,11 @@ class EdgeGlow:])self.fill.setMask_(self.comet)self.fill.setOpacity_(min(1.0, strength))- elif fade is not None:- self.comet.setLocations_([0.0, fade, 1.0 - fade, 1.0])- self.comet.setColors_([AppKit.NSColor.colorWithWhite_alpha_(1.0, a).CGColor() for a in (0.0, 1.0, 1.0, 0.0)])- self.fill.setMask_(self.comet)- self.fill.setOpacity_(min(1.0, 0.3 + 0.7 * level + 0.6 * flash))else:- self.fill.setMask_(None)+ self.comet.setLocations_([0.0, 1.0] if fade is None else [0.0, fade, 1.0 - fade, 1.0])+ self.comet.setColors_([AppKit.NSColor.colorWithWhite_alpha_(1.0, a).CGColor()+ for a in ((1.0, 1.0) if fade is None else (0.0, 1.0, 1.0, 0.0))])+ self.fill.setMask_(self.comet)self.fill.setOpacity_(min(1.0, 0.3 + 0.7 * level + 0.6 * flash))finally:Quartz.CATransaction.commit()@@ -1523,6 +1528,7 @@ class ControlWindow(AppKit.NSObject):self.appearance_select.value = raw["appearance"]self._apply_appearance(raw["appearance"])self.updates_switch.value = raw["check_updates"]+ self.pointer_box.value = raw["hide_idle_pointer"]self.modifier_select.value = raw["key_map"] if isinstance(raw["key_map"], str) else "custom"crossing_raw = raw["crossing"]self._load_ways(crossing_raw)@@ -1553,6 +1559,8 @@ class ControlWindow(AppKit.NSObject):self.switch_style_select.value = crossing_raw["shortcut_arrival_style"]self.dragging_box.value = crossing_raw["block_while_dragging"]self.glow_style_select.value = crossing_raw["glow_style"]+ self.frame_rate_select.value = crossing_raw.get("frame_rate", "display")+ set_divisor(effects.frame_divisor(self.frame_rate_select.value))self.length_select.set_numeric(crossing_raw.get("effect_pace", 1.0))self.size_select.set_numeric(crossing_raw.get("effect_size_fraction", 0.045))self._refresh_design_readouts()@@ -1771,8 +1779,14 @@ class ControlWindow(AppKit.NSObject):lit_thirds=[part for part in picked if part in state.get("thirds", picked)]if "part" in held["methods"] else [],edge_off=not bool(picked))- if peer not in excluded and "corner" in held["methods"]:- state["corner_way"] = held["corner"]+ wraps = [wrap["side"] for wrap in state.get("wraps", [])]+ state["wrap_sides"] = [side for side in core_ways.EDGES if side in wraps] if peer not in excluded else []+ state["corner_ways"] = ([corner for corner in core_ways.CORNERS if corner in state.get("corners", [])]+ if peer not in excluded else [])+ state["kept_sides"] = []+ if peer not in excluded and held["edges"]:+ sides = self._reach(peer, settings)["sides"]+ state["kept_sides"] = [side for side in core_ways.EDGES if sides[side]["state"] == "kept"]state["notch_way"] = bool(peer not in excluded and self.has_notch and "notch" in held["methods"])states[peer] = statetry:@@ -2755,27 +2769,56 @@ class ControlWindow(AppKit.NSObject):module = widgets.Module()module.add(widgets.eyebrow("Window"))self.dock_switch = widgets.Switch("Show in Dock", on_change=self._set_show_in_dock)- self.dock_switch.value = self.settings_store.current().get("show_in_dock", True)+ self.tray_switch = widgets.Switch("Show in menu bar", on_change=self._set_show_in_tray)module.add(self.dock_switch.view)+ module.add(self.tray_switch.view)module.add(widgets.note(- "When off, Beamer stays in the menu bar and appears in the Dock while its window is open."+ "With the Dock icon off, Beamer stays in the menu bar and appears in the Dock while its window is open. "+ "The Dock and the menu bar are never both off: the one still showing cannot be switched off.").view)+ self._reflect_visibility()return module@objc.python_method- def _set_show_in_dock(self, on):+ def _reflect_visibility(self):+ """Both switches from the saved choice. The menu bar item shows whenever the Dock icon is+ hidden, so with the Dock off its switch reads on and is dimmed; with the menu bar off the+ Dock's is."""+ settings = self.settings_store.current()+ show_in_dock = settings.get("show_in_dock", True)+ show_in_menu_bar = dock_visibility.menu_bar_visible(show_in_dock, settings.get("show_in_tray", True))+ self.dock_switch.value = show_in_dock+ self.tray_switch.value = show_in_menu_bar+ self.dock_switch.set_enabled(show_in_menu_bar)+ self.tray_switch.set_enabled(show_in_dock)++ @objc.python_method+ def _save_visibility(self, name, on):+ """Writes the Dock or menu bar choice, refusing the one that would hide both."""try:with self.settings_store.lock:settings = copy.deepcopy(self.settings_store.current())- settings["show_in_dock"] = bool(on)+ # A hand-edited file with both off already reads as the menu bar on.+ settings["show_in_tray"] = dock_visibility.menu_bar_visible(settings["show_in_dock"], settings["show_in_tray"])+ settings[name] = bool(on)+ if not settings["show_in_dock"] and not settings["show_in_tray"]:+ self._reflect_visibility()+ returnself.settings_store.save_settings(settings)except (SettingsError, TypeError, ValueError) as exc:- self.logger.warning("Show in Dock not saved: %s", exc)- self.dock_switch.value = self.settings_store.current().get("show_in_dock", True)- return+ self.logger.warning("%s not saved: %s", name, exc)+ self._reflect_visibility()if self.activation_policy_handler is not None:self.activation_policy_handler()+ @objc.python_method+ def _set_show_in_dock(self, on):+ self._save_visibility("show_in_dock", on)++ @objc.python_method+ def _set_show_in_tray(self, on):+ self._save_visibility("show_in_tray", on)+@objc.python_methoddef _updates_module(self):module = widgets.Module()@@ -2945,15 +2988,18 @@ class ControlWindow(AppKit.NSObject):if why_not == settings_sync.NEEDS_DESIGN_SYNC:title += f" — {why_not}"choices.append((entry["id"], title))- if not hasattr(self, "follow_select"):+ menu_key = (tuple(choices), tuple(sorted(unsupported.items())))+ if menu_key != getattr(self, "_follow_menu_key", None):+ for view in self.follow_host.arrangedSubviews():+ self.follow_host.removeArrangedSubview_(view)+ view.removeFromSuperview()self.follow_select = widgets.MenuChoice(choices, on_change=self._set_design_follow)+ for value, cell in self.follow_select.items:+ cell.setEnabled_(value not in unsupported)+ cell.setToolTip_(unsupported[value] if value in unsupported else cell.title())widgets.add(self.follow_host, self.follow_select.view, full_width=False)- else:- self.follow_select.set_choices(choices)+ self._follow_menu_key = menu_keyself.follow_select.value = self.controller.cfg.design_follow_peer- for value, cell in self.follow_select.items:- cell.setEnabled_(value not in unsupported)- cell.setToolTip_(unsupported[value] if value in unsupported else cell.title())peer = self.controller.cfg.design_follow_peerentry = next((item for item in peers if item.get("id") == peer), {}) if peer else {}name = labels.get(entry.get("token", "")) or "that machine"@@ -3132,8 +3178,27 @@ class ControlWindow(AppKit.NSObject):)module.add(self.hold_note.view)self.hold_box.view.setToolTip_("This screen's setting applies to every pointer on it.")+ self.pointer_box = widgets.Switch("Hide the pointer on the machine not in use", on_change=self._set_hide_idle_pointer)+ self.pointer_box.value = self.controller.cfg.hide_idle_pointer+ module.add(self.pointer_box.view)+ module.add(widgets.note(+ "This Mac's pointer always hides while it drives another machine. On, it also hides after another "+ "machine stops driving it, until its own mouse or trackpad moves."+ ).view)return module+ @objc.python_method+ def _set_hide_idle_pointer(self, on):+ try:+ cfg = self.settings_store.save(config_to_raw(replace(self.controller.cfg, hide_idle_pointer=bool(on))))+ except SettingsError as exc:+ self.logger.warning("pointer hiding not saved: %s", exc)+ self.pointer_box.value = self.controller.cfg.hide_idle_pointer+ return+ self.controller.update_config(cfg)+ if not on:+ self.controller.idle_pointer.cancel()+@objc.python_methoddef _resistance_module(self):module = widgets.Module()@@ -3175,7 +3240,7 @@ class ControlWindow(AppKit.NSObject):module.add(self.atlas_legend)self.crossing_ledger = ledger.Ledger.alloc().init().setup(self)module.add(self.crossing_ledger)- module.add(widgets.note("Three lit segments are the whole edge; click one to leave it out. A corner is a diagonal push, shown as a square on the map. The notch is this Mac only.").view)+ module.add(widgets.note("Each chip is a side of this screen; click one to add or remove it. The side a machine touches crosses on its lit thirds; any other free side wraps round to it, arriving on its far side. A corner is a diagonal push, shown as a square on the map. The notch is this Mac only.").view)return module@objc.python_method@@ -3232,18 +3297,58 @@ class ControlWindow(AppKit.NSObject):self._load_ways()self._reflect()+ @objc.python_method+ def _reach(self, peer, settings=None):+ """`core.ways.reach` for one machine, kept until the settings or who is live change: the status+ tick refreshes the ledger and the map every 0.4 s, and each answer is several compiles."""+ settings = settings or self.settings_store.current()+ args = self._crossing_args()+ ids = [entry.get("id") for entry in settings.get("peers", [])]+ stamp = (repr(settings), args["platform"], frozenset(args["capable"] or ()),+ tuple(bool(args["live"](ident)) for ident in ids), tuple(bool(args["gone"](ident)) for ident in ids))+ if getattr(self, "_reach_stamp", None) != stamp:+ self._reach_stamp, self._reach_held = stamp, {}+ if peer not in self._reach_held:+ self._reach_held[peer] = core_ways.reach(settings, peer, platform=args["platform"],+ capable=args["capable"], live=args["live"], gone=args["gone"])+ return copy.deepcopy(self._reach_held[peer])++ @objc.python_method+ def _ledger_side(self, peer, side):+ """A side chip: the contact side toggles Edge as a whole; a free side is added (turning Edge on+ if it was off), one that wraps is removed, and a kept one turns Edge back on or is removed."""+ settings = self.settings_store.current()+ entry = next((item for item in settings["peers"] if item["id"] == peer), None)+ if entry is None or entry.get("left_out") or entry.get("in_use", True) is False:+ return+ state = self._reach(peer, settings)["sides"][side]["state"]+ if state == "contact":+ return self._ledger_edge(peer)+ held = core_ways.ways(settings, peer)+ edge_on = bool(set(held["methods"]) & {"edge", "part"})+ edges = [item for item in core_ways.EDGES if item in held["edges"] and item != side]+ if state == "kept" and not edge_on:+ self._write_ways(peer, edge=True)+ elif state == "free":+ self._write_ways(peer, edges=[item for item in core_ways.EDGES if item in edges + [side]],+ **({} if edge_on else {"edge": True}))+ elif state in ("on", "kept"):+ self._write_ways(peer, edges=edges)+@objc.python_methoddef _ledger_corner(self, peer, corner):+ """A corner button: several may be on; another machine's, or one with no side contact to leave+ from, is refused without a write (a corner already on can always be taken off)."""settings = self.settings_store.current()entry = next((item for item in settings["peers"] if item["id"] == peer), None)- if (entry is None or entry.get("left_out") or entry.get("in_use", True) is False- or core_ways.corner_holder(settings, corner, exclude=peer)):+ if entry is None or entry.get("left_out") or entry.get("in_use", True) is False:returnheld = core_ways.ways(settings, peer)- enabled = not ("corner" in held["methods"] and held["corner"] == corner)- self._write_ways(peer, corner=enabled, corner_at=corner)- self._load_ways()- self._reflect()+ if corner not in held["corners"]:+ if self._reach(peer, settings)["corners"][corner]["state"] != "free":+ return+ chosen = [item for item in core_ways.CORNERS if (item in held["corners"]) != (item == corner)]+ self._write_ways(peer, corners=chosen)@objc.python_methoddef _ledger_notch(self, peer, enabled):@@ -3253,6 +3358,11 @@ class ControlWindow(AppKit.NSObject):self._write_ways(peer, notch=enabled)self._reflect()@objc.python_method+ def _ledger_notch_return(self, peer, enabled):+ if self.has_notch:+ self._write_ways(peer, notch_return=enabled)++ @objc.python_methoddef _atlas_third(self, peer, part):self._ledger_edge(peer, part)@objc.python_method@@ -3505,7 +3615,7 @@ class ControlWindow(AppKit.NSObject):returnlocked = entry is not Nonefor control in (self.glow_style_select, self.switch_style_select, self.glow_colour_select,- self.length_select, self.size_select, self.landing_box):+ self.length_select, self.size_select, self.frame_rate_select, self.landing_box):control.set_enabled(not locked)self.follow_banner_label.set(settings_sync.following_banner(name) if locked else "")self.follow_banner.setHidden_(not locked)@@ -3610,10 +3720,16 @@ class ControlWindow(AppKit.NSObject):widgets.add(size_control, self.size_readout.view, full_width=False)self.length_row = widgets.field_row("Length", length_control)[0]self.size_row = widgets.field_row("Size", size_control)[0]+ self.frame_rate_select = widgets.Segmented(+ tuple((value, name) for value, name, _divisor in effects.FRAME_RATES),+ on_change=self._changed,+ )+ self.frame_rate_row = widgets.field_row("Frame rate", self.frame_rate_select.view)[0]module.add(self.length_row)module.add(widgets.note("Sets the effect's playback time.", ink="ink_2").view)module.add(self.size_row)module.add(widgets.note("Sets effect depth relative to the shorter screen edge.", ink="ink_2").view)+ module.add(self.frame_rate_row)module.add(self.place_note.view)module.add(self.notch_row)return module@@ -3936,6 +4052,7 @@ class ControlWindow(AppKit.NSObject):"effect_size": self.size_select.value or "medium","effect_pace": self.length_select.numeric_value(),"effect_size_fraction": self.size_select.numeric_value(),+ "frame_rate": self.frame_rate_select.value or "display","block_while_dragging": self.dragging_box.value,"shortcut_goes_to": self.shortcut_goes_to.value or "last","hold_full_screen": self.hold_box.value,@@ -3966,6 +4083,7 @@ class ControlWindow(AppKit.NSObject):self._say(str(exc), "fault")returnself.controller.apply_settings(cfg)+ set_divisor(effects.frame_divisor(cfg.crossing.get("frame_rate", "display")))if self.previews is not None:# The tiles' renderers read the colour from the applied settings, which land only now.self.previews.repaint()@@ -4323,6 +4441,22 @@ def _set_tray_title(item, title):item.title = americanise(title)+# What a click on the Dock icon does while no window is open. With the menu bar item switched off+# the Dock is the only way back to Beamer, and rumps' delegate has no answer to the reopen event.+_reopen_window = None+++def applicationShouldHandleReopen_hasVisibleWindows_(self, _app, has_visible_windows):+ if not has_visible_windows and _reopen_window is not None:+ _reopen_window()+ return True+++objc.classAddMethods(rumps.rumps.NSApp, [objc.selector(+ applicationShouldHandleReopen_hasVisibleWindows_, selector=b"applicationShouldHandleReopen:hasVisibleWindows:",+ signature=b"Z@:@Z")])++class TrayApp(rumps.App):def __init__(self, controller, settings_store, logger, hidden=False):self.hidden = hidden@@ -4340,6 +4474,8 @@ class TrayApp(rumps.App):controller, settings_store, logger)self.control_window.activation_policy_handler = self.apply_activation_policy+ global _reopen_window+ _reopen_window = self.control_window.showself.control_window.quit_handler = self.quit_appself.control_window.direction_handler = self._set_directionself.control_window.left_out_handler = self._set_left_out@@ -4518,8 +4654,8 @@ class TrayApp(rumps.App):item, and Bring input back on the one input is on; with one, the one item as it always was."""controller = self.controllerwanted = pages.send_items(controller.book.peers(), controller.owner.on if controller.redirecting else None,- controller.cfg.hide_addresses)- keys = [ident for ident, _title in wanted]+ controller.cfg.hide_addresses, live=self._peer_live)+ keys = [ident for ident, _title, _enabled in wanted]if keys != self._send_keys:for key in self._send_keys:del self.menu[key]@@ -4529,10 +4665,17 @@ class TrayApp(rumps.App):self.menu.insert_after(anchor, _tray_item(ident, callback=lambda _sender, ident=ident: self._send_to(ident)))anchor = identself._send_keys = keys- for ident, title in wanted:- _set_tray_title(self.menu[ident], title)+ for ident, title, enabled in wanted:+ item = self.menu[ident]+ _set_tray_title(item, title)+ # rumps dims an item with no callback.+ item.set_callback((lambda _sender, ident=ident: self._send_to(ident)) if enabled else None)self.toggle_item.hidden = bool(keys)+ def _peer_live(self, entry):+ link = self.controller.links.get(entry.get("token"))+ return link is not None and link.live()+def _send_to(self, peer):"""One machine's item: input goes to it, straight from the machine it is on (WIRE.md section 5,"Moving input"), or home when it is already there."""@@ -4598,12 +4741,16 @@ class TrayApp(rumps.App):def apply_activation_policy(self, window_open=None):if window_open is None:window_open = self.control_window.window.isVisible()- show_in_dock = self.settings_store.current().get("show_in_dock", True)+ settings = self.settings_store.current()+ show_in_dock = settings.get("show_in_dock", True)policy = dock_visibility.activation_policy(show_in_dock, window_open)AppKit.NSApp.setActivationPolicy_(AppKit.NSApplicationActivationPolicyRegularif policy == "regular" else AppKit.NSApplicationActivationPolicyAccessory)+ item = getattr(self, "status_item_view", None)+ if item is not None:+ item.setVisible_(dock_visibility.menu_bar_visible(show_in_dock, settings.get("show_in_tray", True)))def toggle_send_to_windows(self, _sender):"""The menu's tick covers every machine: all on turns them all off, anything else all on."""@@ -4693,6 +4840,7 @@ class TrayApp(rumps.App):returntry:self.controller.notch_range = notch_x_range()+ self.controller.notch_depth = notch_depth() if self.controller.notch_range is not None else 0.0except Exception:self._notch_failed = Trueself.controller.notch_range = Nonediff --git a/mac_app/ledger.py b/mac_app/ledger.pyindex 95ac2f9..0fb9982 100644--- a/mac_app/ledger.py+++ b/mac_app/ledger.py@@ -1,12 +1,24 @@"""The Crossing ledger: saved intent, with stable native controls for each paired desktop."""+import math+import AppKitimport objc+import Quartzimport themeimport widgetsfrom core import peerlist, ways+# The columns' narrowest widths sum to this plus the gaps; under it the table stacks.+CHIP_HEIGHT = 26+CHIP_GAP = 6+CORNER_SIZE = 28+CORNER_GAP = 4+CORNERS_COLUMN = 70+# Wide enough for the "Notch" checkbox in the body face.+NOTCH_COLUMN = 64+class _ActionButton(AppKit.NSButton):def acceptsFirstResponder(self):@@ -21,18 +33,6 @@ class _CellView(AppKit.NSView):def isFlipped(self):return True- def hitTest_(self, point):- hit = objc.super(_CellView, self).hitTest_(point)- if hit is None:- # Glyph hit bands extend beyond the cell while their visible outline stays inside.- local = self.convertPoint_fromView_(point, self.superview())- for child in self.subviews():- if isinstance(child, Glyph):- hit = child.hitTest_(local)- if hit is not None:- return hit- return hit-def quiet_button(title, callback):target = widgets.callback_target(callback)@@ -52,107 +52,226 @@ def quiet_button(title, callback):return view-class Glyph(AppKit.NSView):+def _stroke(path, name, alpha=1.0, width=1.5, dash=None):+ colour = theme.colour(name)+ (colour.colorWithAlphaComponent_(alpha) if alpha < 1 else colour).setStroke()+ path.setLineWidth_(width)+ path.setLineCapStyle_(AppKit.NSRoundLineCapStyle)+ path.setLineJoinStyle_(AppKit.NSRoundLineJoinStyle)+ if dash:+ path.setLineDash_count_phase_(dash, len(dash), 0)+ path.stroke()+++def _icon(kind, name, x, y):+ """The 14 px drawn icons of the chips, on the 14 px grid of the render, at (x, y)."""+ def at(px, py):+ return (x + px, y + py)+ path = AppKit.NSBezierPath.bezierPath()+ if kind == "plus":+ path.moveToPoint_(at(7, 3)); path.lineToPoint_(at(7, 11))+ path.moveToPoint_(at(3, 7)); path.lineToPoint_(at(11, 7))+ elif kind == "wrap":+ path.moveToPoint_(at(10.5, 4.5)); path.lineToPoint_(at(5, 4.5))+ path.curveToPoint_controlPoint1_controlPoint2_(at(5, 9.5), at(1.67, 4.5), at(1.67, 9.5))+ path.lineToPoint_(at(11, 9.5))+ path.moveToPoint_(at(9, 7.5)); path.lineToPoint_(at(11, 9.5)); path.lineToPoint_(at(9, 11.5))+ else:+ path.moveToPoint_(at(2, 2.5)); path.lineToPoint_(at(2, 11.5))+ path.moveToPoint_(at(5, 7)); path.lineToPoint_(at(12, 7))+ path.moveToPoint_(at(9.5, 4.5)); path.lineToPoint_(at(12, 7)); path.lineToPoint_(at(9.5, 9.5))+ _stroke(path, name)+++class _Control(widgets.Pressable):+ """A drawn button of the ledger: the pointing hand, a hover and a pressed look, Space and Return,+ and the signal focus ring Pressable already draws. A control that is not `enabled` takes none."""++ hovered = False+ pressed = False+def isFlipped(self):return True+ def resetCursorRects(self):+ self.addCursorRect_cursor_(self.bounds(), AppKit.NSCursor.pointingHandCursor()+ if self.enabled else AppKit.NSCursor.arrowCursor())++ def updateTrackingAreas(self):+ objc.super(_Control, self).updateTrackingAreas()+ for area in list(self.trackingAreas()):+ self.removeTrackingArea_(area)+ self.addTrackingArea_(AppKit.NSTrackingArea.alloc().initWithRect_options_owner_userInfo_(+ self.bounds(), AppKit.NSTrackingMouseEnteredAndExited | AppKit.NSTrackingActiveInKeyWindow+ | AppKit.NSTrackingInVisibleRect, self, None))++ def mouseEntered_(self, _event):+ self.hovered = True+ self.setNeedsDisplay_(True)++ def mouseExited_(self, _event):+ self.hovered = False+ self.pressed = False+ self.setNeedsDisplay_(True)++ def mouseDown_(self, event):+ objc.super(_Control, self).mouseDown_(event)+ self.pressed = True+ self.setNeedsDisplay_(True)++ def mouseUp_(self, event):+ self.pressed = False+ self.setNeedsDisplay_(True)+ objc.super(_Control, self).mouseUp_(event)+@objc.python_method- def setup(self, row, kind):- self.row, self.kind = row, kind- self.hits = {}- self.setAccessibilityElement_(False)- keys = ways.PARTS if kind == "edge" else ways.CORNERS- for key in keys:- callback = (lambda key=key: row.control._ledger_edge(row.peer, key)) if kind == "edge" else (- lambda key=key: row.control._ledger_corner(row.peer, key))- button = quiet_button("", callback)- button.setTransparent_(True)- self.addSubview_(button)- self.hits[key] = button+ def paint_box(self, fill, border, border_alpha, dashed, radius, bounds):+ path = AppKit.NSBezierPath.bezierPathWithRoundedRect_xRadius_yRadius_(+ AppKit.NSInsetRect(bounds, .5, .5), radius, radius)+ for name, alpha in fill or ():+ theme.colour(name).colorWithAlphaComponent_(alpha).setFill()+ path.fill()+ _stroke(path, border, border_alpha, 1, [3, 3] if dashed else None)++ @objc.python_method+ def refresh_cursor(self):+ if self.window() is not None:+ self.window().invalidateCursorRectsForView_(self)+++class Chip(_Control):+ """One side of This Mac's screen as a chip: the side the machine touches (with its thirds bar), a+ side that wraps round to it, one kept while Edge is off, a free one to add, or one another+ machine holds."""++ kind = "free"+ label = ""+ bar = None+ segments = None++ @objc.python_method+ def setup(self, callback):+ self.callback = callback+ self.enabled = True+ self.segments = {}+ self.setAccessibilityRole_(AppKit.NSAccessibilityButtonRole)return self@objc.python_method- def refresh(self):- held, entry = self.row.held, self.row.entry- out = entry.get("left_out") is True or entry.get("in_use", True) is False- side = self.row.side or held["side"] or "top"- picked = ways.picked_thirds(held["methods"], held["parts"])- for index, (key, button) in enumerate(self.hits.items()):- if self.kind == "edge":- vertical = side in ("left", "right")- rect = ((-6 if side == "left" else 32, index * 26 / 3), (12, 26 / 3)) if vertical else (- (index * 38 / 3, -6 if side == "top" else 20), (38 / 3, 12))- name = ways.part_names(side)[key]- on = key in picked- label = f"{side.capitalize()} edge, {name.lower()} third, {'on' if on else 'off'}"- tooltip = f"{name} third: click to {'leave it out' if on else 'turn it on'}"- enabled = bool(self.row.side) and not out- else:- x = 4.5 if key.endswith("left") else 33.5- y = 4.5 if key.startswith("top") else 21.5- rect = ((x - 7, y - 7), (14, 14))- holder = ways.corner_holder(self.row.settings, key, exclude=self.row.peer)- on = "corner" in held["methods"] and held["corner"] == key- label = f"{key.replace('_', ' ').capitalize()} corner, {'on' if on else 'off'}"- tooltip = (peerlist.label_for(self.row.settings["peers"], peer_id=holder) + "'s corner") if holder else (- f"{key.replace('_', ' ').capitalize()} corner: click to " +- ("turn it off" if on else "move the corner here" if "corner" in held["methods"] else "turn it on"))- enabled = not holder and not out- (x, y), size = rect- button.setFrame_(((x+6, y+6), size))- button.setEnabled_(enabled)- button.setAccessibilityLabel_(label)- button.setAccessibilityValue_("on" if on else "off")- button.setToolTip_("Left out: Put back to change its ways" if out else tooltip)- self.setNeedsDisplay_(True)+ def natural_width(self):+ label = widgets.attributed(self.label, 12).size().width+ return math.ceil(label) + 40 + (28 if self.bar is not None else 0)- def drawRect_(self, rect):- AppKit.NSGraphicsContext.saveGraphicsState()- transform = AppKit.NSAffineTransform.transform()- transform.translateXBy_yBy_(6, 6)- transform.concat()- outline = AppKit.NSBezierPath.bezierPathWithRoundedRect_xRadius_yRadius_(((0, 0), (38, 26)), 2.5, 2.5)- theme.colour("well").setFill()- outline.fill()- theme.colour("edge").setStroke()- outline.setLineWidth_(1)- outline.stroke()- held = self.row.held- if self.kind == "corner":- for corner in ways.CORNERS:- on = "corner" in held["methods"] and corner == held["corner"]- holder = ways.corner_holder(self.row.settings, corner, exclude=self.row.peer)- radius = 3.2 if on else 2- x = 4.5 if corner.endswith("left") else 33.5- y = 4.5 if corner.startswith("top") else 21.5- dot = AppKit.NSBezierPath.bezierPathWithOvalInRect_(((x-radius, y-radius), (radius*2, radius*2)))- colour = theme.colour("signal" if on or holder else "edge")- if holder:- colour = colour.colorWithAlphaComponent_(.45)- colour.setFill()- colour.setStroke()- dot.fill() if on else dot.stroke()+ @objc.python_method+ def apply(self, kind, label, bar, enabled):+ if (kind, label, bar, enabled) != (self.kind, self.label, self.bar, self.enabled):+ self.kind, self.label, self.bar, self.enabled = kind, label, bar, enabled+ self.setNeedsDisplay_(True)+ self.refresh_cursor()++ @objc.python_method+ def bar_x(self):+ return self.bounds().size.width - 11 - 22++ @objc.python_method+ def place_segments(self):+ for index, button in enumerate(self.segments.values()):+ button.setFrame_(((self.bar_x() - 1 + index * 22 / 3, 0), (9, CHIP_HEIGHT)))++ def setFrameSize_(self, size):+ objc.super(Chip, self).setFrameSize_(size)+ if self.segments:+ self.place_segments()++ def drawRect_(self, _rect):+ bounds = self.bounds()+ width = bounds.size.width+ context = AppKit.NSGraphicsContext.currentContext()+ context.saveGraphicsState()+ held = self.kind == "held"+ if held:+ Quartz.CGContextSetAlpha(context.CGContext(), .45)+ hover = self.hovered and self.enabled and not held+ pressed = self.pressed and self.enabled and not held+ fill, border, alpha, dashed = None, "edge", 1.0, False+ text, icon = "ink_2", "ink_2"+ if self.kind in ("contact_on", "on"):+ fill, border, text, icon = [("signal_dim", 1)], "signal", "ink", "signal"+ elif self.kind == "contact_off":+ text, icon = "ink_3", "ink_3"+ elif self.kind == "kept":+ border, alpha, dashed, text = "signal", .45, True, "ink_3"+ elif self.kind == "free":+ dashed = Trueelse:- side = self.row.side or held["side"] or "top"- picked = ways.picked_thirds(held["methods"], held["parts"]) if self.row.side else []- vertical = side in ("left", "right")- length = 26 if vertical else 38+ border, text, icon = "rule", "ink_3", "ink_3"+ if hover:+ fill, border, alpha, dashed, text = [("well", 1)], "ink_2", 1.0, False, "ink"+ if pressed:+ fill, border, alpha, dashed, text = [("well", 1), ("signal", .35)], "signal", 1.0, False, "ink"+ self.paint_box(fill, border, alpha, dashed, 5, bounds)+ _icon({"free": "plus", "on": "wrap", "kept": "wrap"}.get(self.kind, "touch"), icon, 9, 6)+ bar_room = 28 if self.bar is not None else 0+ title = widgets.attributed(self.label, 12, ink=text)+ height = title.size().height+ title.drawInRect_(((29, (CHIP_HEIGHT - height) / 2), (max(1, width - 29 - 11 - bar_room), height)))+ if self.bar is not None:for index, part in enumerate(ways.PARTS):- start, end = index*length/3+1, (index+1)*length/3-1- fixed = 0 if side in ("top", "left") else length- if vertical:- fixed = 0 if side == "left" else 38- else:- fixed = 0 if side == "top" else 26+ on = part in self.barpath = AppKit.NSBezierPath.bezierPath()- path.moveToPoint_((fixed, start) if vertical else (start, fixed))- path.lineToPoint_((fixed, end) if vertical else (end, fixed))- on = part in picked- theme.colour("signal" if on else "edge").colorWithAlphaComponent_(1 if on else .7).setStroke()- path.setLineWidth_(3 if on else 1.5)- path.setLineCapStyle_(AppKit.NSRoundLineCapStyle)- path.stroke()- AppKit.NSGraphicsContext.restoreGraphicsState()+ path.moveToPoint_((self.bar_x() + 1 + index * 7.3, 13))+ path.lineToPoint_((self.bar_x() + 6 + index * 7.3, 13))+ _stroke(path, "signal" if on else "edge", 1, 3 if on else 1.5)+ context.restoreGraphicsState()+++class CornerButton(_Control):+ """One corner of This Mac's screen: an L bracket in a square, on or free to add, held by another+ machine, or not offered until the machine sits beside this one."""++ corner = ""+ kind = "free"++ @objc.python_method+ def setup(self, corner, callback):+ self.corner, self.callback, self.enabled = corner, callback, True+ self.setAccessibilityRole_(AppKit.NSAccessibilityButtonRole)+ return self++ @objc.python_method+ def apply(self, kind, enabled):+ if (kind, enabled) != (self.kind, self.enabled):+ self.kind, self.enabled = kind, enabled+ self.setNeedsDisplay_(True)+ self.refresh_cursor()++ def drawRect_(self, _rect):+ bounds = self.bounds()+ context = AppKit.NSGraphicsContext.currentContext()+ context.saveGraphicsState()+ if self.kind == "unavailable":+ Quartz.CGContextSetAlpha(context.CGContext(), .4)+ hover = self.hovered and self.enabled+ pressed = self.pressed and self.enabled+ fill, border, alpha, dashed, bracket, bracket_alpha = None, "edge", 1.0, True, "ink_2", 1.0+ if self.kind == "on":+ fill, border, dashed, bracket = [("signal", 1)], "signal", False, "ground"+ elif self.kind == "held":+ border, alpha, dashed, bracket, bracket_alpha = "signal", .35, False, "signal", .5+ if hover:+ fill, border, alpha, dashed = ([("well", 1)] if self.kind != "on" else fill), "ink_2", 1.0, False+ if pressed:+ fill, border, alpha, dashed = [("well", 1), ("signal", .35)], "signal", 1.0, False+ self.paint_box(fill, border, alpha, dashed, 5, bounds)+ vertical, horizontal = self.corner.split("_")+ sx, sy = (5 if horizontal == "left" else 13) + 5, (5 if vertical == "top" else 13) + 5+ dx, dy = (1 if horizontal == "left" else -1), (1 if vertical == "top" else -1)+ path = AppKit.NSBezierPath.bezierPath()+ path.moveToPoint_((sx, sy + dy * 7))+ path.lineToPoint_((sx, sy))+ path.lineToPoint_((sx + dx * 7, sy))+ _stroke(path, bracket, bracket_alpha, 1.8)+ context.restoreGraphicsState()class Row(AppKit.NSView):@@ -168,6 +287,8 @@ class Row(AppKit.NSView):self.cells = {}for key in ("machine", "edge", "corner", "notch", "keys"):cell = _CellView.alloc().init()+ if hasattr(cell, "setClipsToBounds_"):+ cell.setClipsToBounds_(False)self.addSubview_(cell)self.cells[key] = cellself.name = widgets.Label("", theme.TYPE["body"], 600)@@ -184,25 +305,28 @@ class Row(AppKit.NSView):for item in (self.name.view, self.status.view, self.rename, self.leave, self.name_field,self.rename_hint.view, self.scope.view):self._add("machine", item)- self.edge_glyph = Glyph.alloc().init().setup(self, "edge")- self.corner_glyph = Glyph.alloc().init().setup(self, "corner")- self.edge_title = quiet_button("Off", lambda: self.control._ledger_edge(self.peer))- self.edge_detail = quiet_button("", lambda: self.control._ledger_edge(self.peer))- self.corner_title = widgets.Label("", 12.5)- self.corner_detail = widgets.Label("", 11, ink="ink_3")- for label in (self.corner_title, self.corner_detail):- label.view.cell().setLineBreakMode_(AppKit.NSLineBreakByTruncatingTail)- label.view.cell().setUsesSingleLineMode_(True)- label.view.cell().setWraps_(False)- for item in (self.edge_glyph, self.edge_title, self.edge_detail):- self._add("edge", item)- for item in (self.corner_glyph, self.corner_title.view, self.corner_detail.view):- self._add("corner", item)+ self.chips, self.chip_order = {}, list(ways.EDGES)+ for side in ways.EDGES:+ chip = self._chip(side)+ self.chips[side] = chip+ self._add("edge", chip)+ self.edge_note = widgets.Label("Place it on the map", theme.TYPE["small"], ink="ink_3")+ self._add("edge", self.edge_note.view)+ self.corner_buttons = {}+ for corner in ways.CORNERS:+ button = widgets.box(None, None, 5, cls=CornerButton).setup(+ corner, lambda corner=corner: self.control._ledger_corner(self.peer, corner))+ button._ledger_target = widgets._Target.alloc().initWithCallback_(lambda _sender, b=button: b.press())+ self.corner_buttons[corner] = button+ self._add("corner", button)self.notch = self._check(lambda on: self.control._ledger_notch(self.peer, on))self.no_notch = widgets.Label("No notch", theme.TYPE["body"], ink="ink_3")self.cycle = self._check(lambda on: self.control._set_shortcut_cycle(self.peer, on))+ self.notch_return = self._check(lambda on: self.control._ledger_notch_return(self.peer, on))+ self.notch_return.setTitle_("Return through the notch")self._add("notch", self.notch)self._add("notch", self.no_notch.view)+ self._add("notch", self.notch_return)self._add("keys", self.cycle)self.jump_caption = widgets.Label("Jump", theme.TYPE["small"], ink="ink_3")self.jump = widgets.JumpKeyRecorder(on_change=lambda value: self.control._save_jump_key(value, self.peer),@@ -212,6 +336,17 @@ class Row(AppKit.NSView):self._add("keys", item)return self+ @objc.python_method+ def _chip(self, side):+ chip = widgets.box(None, None, 5, cls=Chip).setup(lambda side=side: self.control._ledger_side(self.peer, side))+ chip._ledger_target = widgets._Target.alloc().initWithCallback_(lambda _sender: chip.press())+ for part in ways.PARTS:+ segment = quiet_button("", lambda part=part: self.control._ledger_edge(self.peer, part))+ segment.setTransparent_(True)+ chip.addSubview_(segment)+ chip.segments[part] = segment+ return chip+@objc.python_methoddef _add(self, cell, view):view.setTranslatesAutoresizingMaskIntoConstraints_(True)@@ -259,6 +394,12 @@ class Row(AppKit.NSView):self.ledger.refresh(self.control.settings_store.current(), self.control.chosen_peer)self.control.window.makeFirstResponder_(self.control.atlas_canvas)+ @objc.python_method+ def _reach(self, settings, out):+ """What each side and corner of This Mac is to this machine. A left-out machine is answered as+ if put back, so its kept ways are drawn as they would cross; `out` makes them inert."""+ return self.control._reach(self.peer, settings)+@objc.python_methoddef refresh(self, settings, entry, selected):self.settings, self.entry, self.selected = settings, entry, selected@@ -281,37 +422,27 @@ class Row(AppKit.NSView):self.name.view.setToolTip_(name)self.name.view.setLineBreakMode_(AppKit.NSLineBreakByTruncatingTail)self.status.set(self.status_text)- self.leave.setAttributedTitle_(widgets.attributed("Put back" if out else "Leave out", 12.5, 500, "ink_2"))+ leave_title = "Put back" if out else "Leave out"+ if self.leave.title() != leave_title:+ self.leave.setAttributedTitle_(widgets.attributed(leave_title, 12.5, 500, "ink_2"))self.leave.setAccessibilityLabel_("Put back" if out else "Leave out")self.leave.setToolTip_("Left out machines stay paired and linked. The shortcut, menu and clipboard still reach them." if out else "Leave this machine out of pointer crossings")- picked = ways.picked_thirds(self.held["methods"], self.held["parts"]) if self.side else []- title = ways.edge_form_detail(self.side, self.held["methods"], self.held["parts"]) if picked else "Off"- detail = f"{self.side} edge" + (" off" if not picked else "") if self.side else "place it on the map"- self.edge_text = title- for button, text, size, ink in ((self.edge_title, title, 12.5, "ink" if picked else "ink_3"),- (self.edge_detail, detail, 11, "ink_3")):- button.setAttributedTitle_(widgets.attributed(text, size, ink=ink))- button.setAlignment_(AppKit.NSTextAlignmentLeft)- button.setAccessibilityLabel_("Edge, off" if not picked else- f"Edge, whole {self.side} edge" if len(picked) == 3 else- f"Edge, {title.lower()}, {self.side} edge")- button.setEnabled_(bool(self.side) and not out)- button.setToolTip_(text + ": " + ("Left out: Put back to change its ways" if out else- "Edge: click to turn it off" if picked else f"Edge: click for the whole {self.side} edge"))- corner_on = "corner" in self.held["methods"]- self.corner_title.set(self.held["corner"].replace("_", " ").capitalize() if corner_on else "None",- ink="ink" if corner_on else "ink_3")- self.corner_detail.set("diagonal push" if corner_on else "click a dot")- self.edge_glyph.refresh()- self.corner_glyph.refresh()- self.notch.setTitle_("" if not self.control.has_notch else- "On" if "notch" in self.held["methods"] else "Off")+ self.reach = self._reach(settings, out)+ self._refresh_chips(name, out)+ self._refresh_corners(name, out)+ self.notch.setTitle_("Notch" if self.control.has_notch else "")self.no_notch.view.setHidden_(self.control.has_notch)self.notch.setAccessibilityLabel_("Notch, no notch" if not self.control.has_notch else"Notch, on" if "notch" in self.held["methods"] else "Notch, off")self.notch.setState_(int("notch" in self.held["methods"]))self.notch.setEnabled_(self.control.has_notch and not out)self.notch.setToolTip_(f"Push into the notch to reach {name}")+ notch_return = entry.get("notch_return") is True+ self.notch_return.setHidden_(not self.control.has_notch or "notch" not in self.held["methods"])+ self.notch_return.setState_(int(notch_return))+ self.notch_return.setEnabled_(not out)+ self.notch_return.setAccessibilityLabel_(f"Return through the notch, {'on' if notch_return else 'off'}")+ self.notch_return.setToolTip_(f"Coming back from {name}, arrive just below the notch")self.cycle.setTitle_(widgets.key_title(self.control.key_recorder.value))self.cycle.setState_(int(entry.get("shortcut_cycle") is not False))self.cycle.setToolTip_("In the shortcut's cycle")@@ -325,33 +456,130 @@ class Row(AppKit.NSView):self.setAccessibilityLabel_(name)self.setNeedsDisplay_(True)+ @objc.python_method+ def contact(self):+ """The chip of the side this machine touches, None when it touches none."""+ return next((chip for chip in self.chips.values() if chip.kind in ("contact_on", "contact_off")), None)++ @objc.python_method+ def _holder(self, state):+ return self.control._shown(peerlist.label_for(self.settings["peers"], peer_id=state.get("by")) or peerlist.UNNAMED)++ @objc.python_method+ def _refresh_chips(self, name, out):+ sides = self.reach["sides"]+ contact = [side for side in ways.EDGES if sides[side]["state"] == "contact"]+ self.chip_order = contact + [side for side in ways.EDGES if side not in contact]+ picked = ways.picked_thirds(self.held["methods"], self.held["parts"])+ for side, chip in self.chips.items():+ state = sides[side]+ kind, bar = state["state"], None+ title = side.capitalize()+ lead = f"{title} edge"+ if kind == "contact":+ kind, bar = "contact_on" if picked else "contact_off", picked+ tip = f"{lead}: touches {name}; click to turn it {'off' if picked else 'on'}"+ label = f"{lead}, touches {name}, {'on' if picked else 'off'}"+ elif kind == "on":+ title += ", wraps"+ tip = f"{lead} wraps round to {name}; click to remove"+ label = f"{lead}, wraps round, on"+ elif kind == "kept":+ title += ", wraps"+ tip = (f"{lead} wraps round to {name} once Edge is on; click to turn Edge on" if not picked else+ f"{lead}: none of it is free just now; click to remove")+ label = f"{lead}, wraps round, kept"+ elif kind == "free":+ tip = f"{lead}: click to wrap round to {name}"+ label = f"{lead}, wraps round, off"+ elif kind == "held":+ other = self._holder(state)+ title += f", {other}"+ tip = f"{lead}: {other}'s"+ label = f"{lead}, held by {other}"+ else:+ tip = label = ""+ chip.setToolTip_("Left out: Put back to change its ways" if out and kind != "unavailable" else tip)+ chip.setAccessibilityLabel_(label)+ chip.setAccessibilityValue_("on" if kind in ("contact_on", "on") else "off")+ chip.apply(kind, title, bar, kind not in ("held", "unavailable") and not out)+ # A left-out row shows only the ways it keeps.+ chip.setHidden_(kind == "unavailable" or out and kind in ("free", "held"))+ for part, segment in chip.segments.items():+ segment.setHidden_(bar is None)+ if bar is not None:+ third = ways.part_names(side)[part]+ segment.setEnabled_(not out)+ segment.setAccessibilityLabel_(f"{lead}, {third.lower()} third, {'on' if part in picked else 'off'}")+ segment.setAccessibilityValue_("on" if part in picked else "off")+ segment.setToolTip_("Left out: Put back to change its ways" if out else+ f"{third} third: click to {'leave it out' if part in picked else 'turn it on'}")+ chip.place_segments()+ self.edge_note.view.setHidden_(any(not chip.isHidden() for chip in self.chips.values()))++ @objc.python_method+ def _refresh_corners(self, name, out):+ for corner, button in self.corner_buttons.items():+ state = self.reach["corners"][corner]+ kind = state["state"]+ if kind == "unavailable" and corner in self.held["corners"]:+ # A corner left on after its machine moved away must still be removable.+ kind = "on"+ title = corner.replace("_", " ").capitalize()+ tip = {"on": f"{title} corner: click to turn it off",+ "free": f"{title} corner: click to turn it on",+ "held": f"{self._holder(state) if kind == 'held' else ''}'s corner",+ "unavailable": f"Place {name} beside this Mac first"}[kind]+ button.setToolTip_("Left out: Put back to change its ways" if out else tip)+ button.setAccessibilityLabel_(f"{title} corner, " + {"on": "on", "free": "off", "unavailable": "unavailable",+ "held": f"held by {self._holder(state) if kind == 'held' else ''}"}[kind])+ button.setAccessibilityValue_("on" if kind == "on" else "off")+ button.apply(kind, kind in ("on", "free") and not out)+def mouseDown_(self, event):self.control._atlas_selected(self.peer)def accessibilityRowHeaderUIElements(self):return [self.name.view]+ @objc.python_method+ def _flow(self, width):+ """Lay the visible chips out in wrapping lines; the cell is as tall as the lines."""+ x = y = 0+ placed = False+ for side in self.chip_order:+ chip = self.chips[side]+ if chip.isHidden():+ continue+ chip_width = min(chip.natural_width(), max(1, width))+ if x and x + chip_width > width:+ x, y = 0, y + CHIP_HEIGHT + CHIP_GAP+ chip.setFrame_(((x, y), (chip_width, CHIP_HEIGHT)))+ x += chip_width + CHIP_GAP+ placed = True+ return y + CHIP_HEIGHT if placed else 22+@objc.python_methoddef arrange(self, width, narrow):rename_space = 74 if self.renaming else 0positions = self.ledger.columns(width)if narrow:- half = (width-40)/2- positions = [(0, width), (12, half), (half+28, half), (12, half), (half+28, half)]+ inner = width - 24+ keys_x = 12 + CORNERS_COLUMN + 16 + NOTCH_COLUMN + 16+ positions = [(0, width), (12, inner), (12, CORNERS_COLUMN), (12 + CORNERS_COLUMN + 16, NOTCH_COLUMN),+ (keys_x, max(128, width - 12 - keys_x))]positions[0] = (12, positions[0][1] - 12)for key, (x, w) in zip(self.cells, positions):self.cells[key].setFrame_(((x, 12), (w, 72)))self.cells[key].setAlphaValue_(.5 if self.dimmed else 1)- cell_heights = {"machine": 72 + rename_space, "notch": 28}- for kind, glyph, title, detail in (("edge", self.edge_glyph, self.edge_title, self.edge_detail),- ("corner", self.corner_glyph, self.corner_title.view, self.corner_detail.view)):- w = max(1, self.cells[kind].bounds().size.width - 48)- title_h, detail_h = 22, 20- # The glyph's six-point hit halo is outside its 38 × 26 visible outline.- glyph.setFrame_(((-6, -6), (50, 38)))- title.setFrame_(((48, 0), (w, title_h)))- detail.setFrame_(((48, title_h), (w, detail_h)))- cell_heights[kind] = max(38, title_h + detail_h)+ cell_heights = {"machine": 72 + rename_space, "notch": 28,+ "corner": 2 * CORNER_SIZE + CORNER_GAP}+ cell_heights["edge"] = self._flow(self.cells["edge"].bounds().size.width)+ self.edge_note.view.setFrame_(((0, 2), (self.cells["edge"].bounds().size.width, 20)))+ for index, corner in enumerate(ways.CORNERS):+ self.corner_buttons[corner].setFrame_((+ ((index % 2) * (CORNER_SIZE + CORNER_GAP), (index // 2) * (CORNER_SIZE + CORNER_GAP)),+ (CORNER_SIZE, CORNER_SIZE)))w = self.cells["keys"].bounds().size.widthself.cycle.setFrame_(((0, 0), (w, 28)))self.jump_caption.view.setFrame_(((0, 34), (35, 24)))@@ -365,14 +593,18 @@ class Row(AppKit.NSView):self.clear.setHidden_(not self.jump.value or self.jump.monitor is not None)cell_heights["keys"] = max(60, 32 + jump_h,clear_y + 24 if not self.clear.isHidden() else 0)+ # Return through the notch runs on under the notch, corners and keys, from the notch's column to+ # the row's end: no column is wide enough for it.+ return_y = max(cell_heights["corner"], cell_heights["notch"], cell_heights["keys"]) + 8+ if not self.notch_return.isHidden():+ cell_heights["notch"] = return_y + 28if narrow:edge_y = 12 + cell_heights["machine"] + 12- edge_h = max(cell_heights["edge"], cell_heights["corner"])- keys_y = edge_y + edge_h + 12- bottom_h = max(cell_heights["notch"], cell_heights["keys"])- places = [(12, cell_heights["machine"]), (edge_y, edge_h), (edge_y, edge_h),- (keys_y, bottom_h), (keys_y, bottom_h)]- height = keys_y + bottom_h + 12+ bottom_y = edge_y + cell_heights["edge"] + 12+ bottom_h = max(cell_heights["corner"], cell_heights["notch"], cell_heights["keys"])+ places = [(12, cell_heights["machine"]), (edge_y, cell_heights["edge"]), (bottom_y, bottom_h),+ (bottom_y, bottom_h), (bottom_y, bottom_h)]+ height = bottom_y + bottom_h + 12else:height = max(76, max(cell_heights.values()) + 24)places = [(12, height-24)] * 5@@ -393,6 +625,7 @@ class Row(AppKit.NSView):w = self.cells["notch"].bounds().size.widthself.notch.setFrame_(((0, 0), (w if self.control.has_notch else 22, 28)))self.no_notch.view.setFrame_(((0, 32), (w, 22)))+ self.notch_return.setFrame_(((0, return_y), (max(w, width - 12 - self.cells["notch"].frame().origin.x), 28)))return heightdef drawRect_(self, rect):@@ -422,7 +655,7 @@ class Ledger(AppKit.NSView):self.setAccessibilityRole_(AppKit.NSAccessibilityTableRole)self.setAccessibilityLabel_("Machines and crossing ways")self.headers = []- for title in ("Machine", "Edge", "Corner", "Notch", "Keys"):+ for title in ("Machine", "Edges", "Corners", "Notch", "Keys"):label = widgets.Label(title, theme.TYPE["eyebrow"], 700, "ink_3",tracking=theme.TRACKING["eyebrow"], upper=True)label.view.setTranslatesAutoresizingMaskIntoConstraints_(True)@@ -431,12 +664,17 @@ class Ledger(AppKit.NSView):self.headers.append(label)return self+ @objc.python_method+ def narrow_below(self):+ """The narrowest table every column's least width fits: under it the rows stack."""+ return 132 + 220 + CORNERS_COLUMN + NOTCH_COLUMN + 132 + 4 * 16+@objc.python_methoddef columns(self, width):- weights = (1.3, 1, .9, 0, 1)- widths = [132, 124, 104, 56, 128]- remaining = max(488, width - 64 - 56)- flexible = {0, 1, 2, 4}+ weights = (1.3, 2, 0, 0, 1)+ widths = [132, 220, CORNERS_COLUMN, NOTCH_COLUMN, 132]+ remaining = max(480, width - 64 - CORNERS_COLUMN - NOTCH_COLUMN)+ flexible = {0, 1, 4}while flexible:unit = remaining / sum(weights[index] for index in flexible)fixed = {index for index in flexible if widths[index] > unit * weights[index]}@@ -476,7 +714,7 @@ class Ledger(AppKit.NSView):@objc.python_methoddef reflow(self):width = self.bounds().size.width- narrow = width < 620+ narrow = width < self.narrow_below()y = 0 if narrow or not self.rows else 34for label, (x, w) in zip(self.headers, self.columns(width)):label.view.setHidden_(narrow or not self.rows)diff --git a/mac_app/machines_panel.py b/mac_app/machines_panel.pyindex 817c085..01dd6e1 100644--- a/mac_app/machines_panel.py+++ b/mac_app/machines_panel.py@@ -75,6 +75,9 @@ class MachinesPanel:self._hosted = Noneself._pair_ink = "ink_2"self._qr_for = None+ self._nearby_key = None+ self._nearby_confirm_sas = None+ self._nearby_confirm_attempt = Noneself.machines_module = self._machines_module()self.sheet = self._sheet()@@ -84,8 +87,12 @@ class MachinesPanel:module = widgets.Module()header = widgets.stack(spacing=12)widgets.add(header, widgets.eyebrow("Machines"))- self.pair_button = widgets.action_button("Pair a machine", self._toggle_sheet, style="primary")- widgets.add(header, self.pair_button.view, full_width=False)+ self.nearby_button = widgets.action_button("Pair nearby", self.pair_nearby, style="primary")+ self.phone_button = widgets.action_button("Pair a phone", self.pair_phone)+ self.phone_button.view.setHidden_(not feature_flags.PAIRING_QR_VISIBLE)+ self.pair_button = widgets.action_button("Pair a machine", self._toggle_sheet)+ for button in (self.nearby_button, self.phone_button, self.pair_button):+ widgets.add(header, button.view, full_width=False)module.add(header)self.list = widgets.stack(spacing=8)module.add(self.list)@@ -172,6 +179,27 @@ class MachinesPanel:def _enter_half(self):half = widgets.stack(spacing=8)+ nearby = widgets.stack(spacing=6)+ self.nearby_status_label = widgets.note()+ widgets.add(nearby, self.nearby_status_label.view)+ self.nearby_expiry = widgets.Label("", theme.TYPE["small"], mono=True, ink="ink_3")+ widgets.add(nearby, self.nearby_expiry.view)+ self.nearby_choices = widgets.stack(spacing=2)+ widgets.add(nearby, self.nearby_choices)+ self.nearby_sas = widgets.Label("", theme.TYPE["readout"], 700, mono=True, ink="ink")+ self.nearby_sas.view.setAccessibilityLabel_("Nearby pairing digits")+ widgets.add(nearby, self.nearby_sas.view)+ self.nearby_peer_label = widgets.Label("", theme.TYPE["note"], ink="ink_2")+ widgets.add(nearby, self.nearby_peer_label.view)+ nearby_buttons = widgets.stack(vertical=False, spacing=8)+ self.nearby_confirm = widgets.action_button("Confirm", self._confirm_nearby, style="primary")+ self.nearby_cancel = widgets.action_button("Cancel", self._cancel_nearby, scale="small")+ nearby_buttons.addArrangedSubview_(self.nearby_confirm.view)+ nearby_buttons.addArrangedSubview_(self.nearby_cancel.view)+ widgets.add(nearby, nearby_buttons)+ self.nearby_view = nearby+ self._nearby_widgets(False)+ widgets.add(half, nearby)widgets.add(half, widgets.label("Enter a code from another machine", theme.TYPE["body"], 600))heard = widgets.stack(spacing=8)widgets.add(heard, widgets.label("On this network", theme.TYPE["note"], 600, ink="ink_2"))@@ -514,13 +542,165 @@ class MachinesPanel:def _toggle_sheet(self):self.open = not self.openif not self.open:+ self._cancel_nearby()self._leave_sheet()self.refresh()+ def pair_phone(self):+ """Open the pairing sheet and start the existing QR-host flow in one action."""+ self.open = True+ self.refresh()+ self._show_code()++ def pair_nearby(self):+ """Open the pairing sheet and begin a fresh nearby pairing window."""+ self.open = True+ self.refresh()+ self._cancel_code()+ service = self.service+ if service is None:+ self._say("Pairing is not available on this Mac.", "fault")+ return+ try:+ service.begin_nearby()+ except pairing.PairingError as exc:+ self._say(f"Nearby pairing is not available: {exc}", "fault")+ return+ self._nearby_key = None+ self._refresh_nearby()++ def _nearby_widgets(self, showing):+ for view in (self.nearby_status_label.view, self.nearby_expiry.view, self.nearby_sas.view,+ self.nearby_peer_label.view,+ self.nearby_confirm.view, self.nearby_cancel.view):+ view.setHidden_(not showing)+ self.nearby_view.setHidden_(not showing)++ def _refresh_nearby(self):+ status = self.service.nearby_status if self.service is not None else {"state": "inactive"}+ state = status.get("state", "inactive")+ visible = state != "inactive"+ self._nearby_widgets(visible)+ if not visible:+ self._nearby_key = None+ self.nearby_sas.set("")+ self.nearby_peer_label.set("")+ self.nearby_expiry.set("")+ self._nearby_confirm_sas = None+ self._nearby_confirm_attempt = None+ return++ messages = {+ "searching": "Press Pair nearby on the other machine within 60 seconds.",+ "choosing": "Choose a machine to pair nearby.",+ "confirm": "Compare all six digits on both machines, then confirm on each.",+ "waiting": "Waiting for confirmation on the other machine.",+ "paired": "Nearby pairing complete.",+ "expired": "Nearby pairing expired. Press Pair nearby to try again.",+ "refused": "Nearby pairing refused. Use a new window to try again.",+ "not_saved": "The new peer could not be saved.",+ }+ message = messages.get(state, "Connecting to the selected machine…" if state == "exchanging" else "")+ tone = "fault" if state in {"refused", "expired", "not_saved"} else "ink_2"+ self.nearby_status_label.set(message, ink=tone)+ seconds_left = status.get("seconds_left", 0)+ self.nearby_expiry.set(f"Expires in {seconds_left} s" if state in {"searching", "choosing", "exchanging", "confirm", "waiting"} else "")+ self.nearby_expiry.view.setHidden_(state not in {"searching", "choosing", "exchanging", "confirm", "waiting"})++ peers = status.get("peers") or []+ peer = status.get("peer")+ choices_visible = state == "choosing"+ self.nearby_choices.setHidden_(not choices_visible)+ key = (state, tuple(tuple(sorted((k, str(v)) for k, v in candidate.items())) for candidate in peers),+ tuple(sorted((k, str(v)) for k, v in peer.items())) if isinstance(peer, dict) else None,+ self.controller.cfg.hide_addresses)+ if key != self._nearby_key:+ self._nearby_key = key+ for view in list(self.nearby_choices.arrangedSubviews()):+ self.nearby_choices.removeArrangedSubview_(view)+ view.removeFromSuperview()+ if choices_visible:+ for candidate in peers:+ picked = isinstance(peer, dict) and candidate == peer+ row = widgets.pressable(lambda item=candidate: self._choose_nearby(item),+ "well" if picked else "ground", "rule", 5,+ role=AppKit.NSAccessibilityRadioButtonRole)+ label = candidate.get("name") or "Another machine"+ platform = machines.platform_name(candidate.get("platform") or "")+ address = candidate.get("address")+ detail = " · ".join(part for part in (label, platform, address) if part)+ row.setAccessibilityLabel_(self._shown(detail))+ row.setAccessibilityValue_("Selected" if picked else "Not selected")+ text = widgets.Label(self._shown(detail), theme.TYPE["note"], 600 if picked else 400)+ row.addSubview_(text.view)+ widgets.pin(text.view, row, (7, 10, 7, 10))+ self.nearby_choices.addArrangedSubview_(row)++ sas = status.get("sas") if state in {"confirm", "waiting"} else None+ valid_sas = isinstance(sas, str) and len(sas) == pairing.CODE_DIGITS and sas.isascii() and sas.isdigit()+ shown_sas = grouped(sas) if valid_sas else ""+ self.nearby_sas.set(shown_sas)+ self.nearby_sas.view.setHidden_(not shown_sas)+ if isinstance(peer, dict):+ peer_name = peer.get("name") or "Another machine"+ peer_platform = machines.platform_name(peer.get("platform") or "")+ selected = f"Selected: {peer_name} · {peer_platform}"+ else:+ selected = ""+ self.nearby_peer_label.set(self._shown(selected))+ self.nearby_peer_label.view.setHidden_(not selected)+ if state == "confirm" and shown_sas and status.get("attempt"):+ self._nearby_confirm_sas = sas+ self._nearby_confirm_attempt = status["attempt"]+ else:+ self._nearby_confirm_sas = None+ self._nearby_confirm_attempt = None+ self.nearby_confirm.set_enabled(state == "confirm" and bool(shown_sas) and bool(status.get("attempt")))+ self.nearby_confirm.view.setHidden_(state != "confirm")+ self.nearby_cancel.view.setHidden_(state not in {"searching", "choosing", "exchanging", "confirm", "waiting"})++ def _choose_nearby(self, machine):+ if self.service is None:+ return+ if self.service.nearby_status.get("state") != "choosing":+ self._nearby_key = None+ self._refresh_nearby()+ return+ try:+ self.service.choose_nearby(machine)+ except pairing.PairingError:+ self._nearby_key = None+ self._refresh_nearby()+ return+ self._nearby_key = None+ self._refresh_nearby()++ def _confirm_nearby(self):+ sas, attempt = self._nearby_confirm_sas, self._nearby_confirm_attempt+ self._nearby_confirm_sas = None+ self._nearby_confirm_attempt = None+ if self.service is None or not sas or not attempt:+ return+ try:+ self.service.confirm_nearby(sas, attempt)+ except pairing.PairingError:+ self._refresh_nearby()+ return+ self._refresh_nearby()++ def _cancel_nearby(self):+ if self.service is not None:+ self.service.cancel_nearby()+ self._nearby_key = None+ self._nearby_confirm_sas = None+ self._nearby_confirm_attempt = None+ self._refresh_nearby()+def re_pair(self, token):entry = next((item for item in self.controller.book.peers() if item.get("token") == token), None)if entry is None:return+ self._cancel_nearby()self.open = Trueself.chosen = Nonefor field in (self.find_field, self.find_secret):@@ -541,6 +721,7 @@ class MachinesPanel:def _refresh_sheet(self, hide):self._refresh_code(hide)self._refresh_heard()+ self._refresh_nearby()self.confirm_button.set_enabled(not self.pairing and self._wanted() is not None)def invalidate(self):@@ -549,6 +730,7 @@ class MachinesPanel:def stop_showing(self):"""The window closed: a code nobody can see does not stay up."""+ self._cancel_nearby()if self._showing or (self.service is not None and self.service.code is not None):self._cancel_code()self.open = False@@ -569,6 +751,7 @@ class MachinesPanel:service = self.serviceif service is None:return+ self._cancel_nearby()try:service.begin_pairing()except pairing.PairingError as exc:@@ -757,6 +940,7 @@ class MachinesPanel:self._say(f"The code is {pairing.CODE_DIGITS} digits.", "fault")returnkind, target = wanted+ self._cancel_nearby()if kind == "machine":# The list may have refreshed since the row was chosen; pair with the latest beacon.target = next((item for item in self._heard if item["address"] == target["address"]), target)diff --git a/mac_app/notch_beam.py b/mac_app/notch_beam.pyindex 1d0008b..82ff4cf 100644--- a/mac_app/notch_beam.py+++ b/mac_app/notch_beam.py@@ -73,17 +73,15 @@ EDGE_FALLOFF = ((0.0, 1.0), (0.08, 0.85), (0.3, 0.25), (1.0, 0.0))def mask_edge_falloff(layer, edge, beam):- """Cut the along-edge mask inward as Windows' live Beam does. Layer coordinates run up."""- if not beam:- layer.setMask_(None)- return+ """Cut the along-edge mask inward as Windows' live styles do. Layer coordinates run up."""falloff = layer.mask()if falloff is None:falloff = Quartz.CAGradientLayer.layer()- falloff.setLocations_([at for at, _alpha in EDGE_FALLOFF])- falloff.setColors_([AppKit.NSColor.colorWithWhite_alpha_(1.0, alpha).CGColor()- for _at, alpha in EDGE_FALLOFF])layer.setMask_(falloff)+ stops = EDGE_FALLOFF if beam else ((0.0, 1.0), (1.0, 0.0))+ falloff.setLocations_([at for at, _alpha in stops])+ falloff.setColors_([AppKit.NSColor.colorWithWhite_alpha_(1.0, alpha).CGColor()+ for _at, alpha in stops])falloff.setFrame_(layer.bounds())start, end = {"left": ((0.0, 0.5), (1.0, 0.5)),diff --git a/mac_app/pages.py b/mac_app/pages.pyindex 37d4414..3422a95 100644--- a/mac_app/pages.py+++ b/mac_app/pages.py@@ -237,17 +237,26 @@ def arrangement_description(machines, sentence):return " ".join(where + [sentence + "." if sentence else "No way in is on."])-def send_items(peers, on, hide):- """The menu bar's items for sending input with more than one machine to send to: (id, title)- for each machine this Mac sends to, "Bring input back" on the one input is on (`on`). [] with- one or none, where the one Send input item stands as it always has."""+def send_items(peers, on, hide, live=lambda entry: True):+ """The menu bar's items for sending input with more than one machine to send to: (id, title,+ enabled) for each machine this Mac sends to, "Bring input back" on the one input is on (`on`). A+ machine whose link is down (`live`) is listed dimmed as unavailable: Beamer is not running there,+ or the machine is off or away. [] with one or none, where the one Send input item stands as it+ always has."""labels = peerlist.labels(peers)targets = [entry for entry in peers if entry.get("id") and entry.get("in_use", True) is Trueand entry.get("send") is True and entry.get("port") != 0]if len(targets) < 2:return []- return [(entry["id"], "Bring input back" if entry["id"] == on else redact(f"Send input to {labels[entry['token']]}", hide))- for entry in targets]+ items = []+ for entry in targets:+ if entry["id"] == on:+ items.append((entry["id"], "Bring input back", True))+ elif live(entry):+ items.append((entry["id"], redact(f"Send input to {labels[entry['token']]}", hide), True))+ else:+ items.append((entry["id"], redact(f"{labels[entry['token']]} is unavailable", hide), False))+ return itemsdef where_caption(label):diff --git a/mac_app/previews.py b/mac_app/previews.pyindex eae4309..70b8ca9 100644--- a/mac_app/previews.py+++ b/mac_app/previews.py@@ -220,7 +220,11 @@ class HostedNotchScene(effects_overlay.EffectsCanvas):Quartz.CGContextScaleCTM(ctx, scale, scale)Quartz.CGContextTranslateCTM(ctx, -crop[0], -crop[1])Quartz.CGContextClipToRect(ctx, ((crop[0], crop[1]), (scene_w, scene_h)))- Quartz.CGContextTranslateCTM(ctx, x + w / 2.0 - stage_width / 2.0, y)+ # The renderer's layers are a real notch's size, as the scene's effects are drawn on a+ # screen PREVIEW_REAL times its own and shrunk.+ Quartz.CGContextTranslateCTM(ctx, x + w / 2.0, y)+ Quartz.CGContextScaleCTM(ctx, 1.0 / effects.PREVIEW_REAL, 1.0 / effects.PREVIEW_REAL)+ Quartz.CGContextTranslateCTM(ctx, -stage_width / 2.0, 0.0)self.stage.renderInContext_(ctx)finally:Quartz.CGContextRestoreGState(ctx)diff --git a/mac_app/settings_store.py b/mac_app/settings_store.pyindex f4ab8e6..e11a711 100644--- a/mac_app/settings_store.py+++ b/mac_app/settings_store.py@@ -48,7 +48,7 @@ MOVED_CROSSING = ("methods", "edge", "edge_parts", "corner", "arrangement_set_atZONE_KINDS = tuple(method for method in METHODS if method != "shortcut")# Fields settings.json has that Config has no name for; everything else in it is Config's own.SETTINGS_ONLY = ("schema", "machine_id", "name", "port", "shortcut", "migrated_token_sha256", "peers", "zones", "crossing",- "layout", "layout_set_at", "layout_by", "show_in_dock")+ "layout", "layout_set_at", "layout_by", "show_in_dock", "show_in_tray")PEER_DEFAULTS = {"id": "", "name": "", "platform": "", "token": "", "host": "", "port": 0, "hw": "", "send": True,"allow_drive": True, "in_use": True, "side": "", "side_set_at": 0, "side_by": "", "paired_with": [], "paired_at": 0,@@ -109,6 +109,7 @@ def editable_default_config():allow_windows_to_drive=True,check_updates=True,hide_addresses=False,+ hide_idle_pointer=True,same_on_both=False,same_set_at=0,same_groups=[],@@ -146,6 +147,7 @@ def config_to_raw(cfg):"allow_windows_to_drive": cfg.allow_windows_to_drive,"check_updates": cfg.check_updates,"hide_addresses": cfg.hide_addresses,+ "hide_idle_pointer": cfg.hide_idle_pointer,"same_on_both": cfg.same_on_both,"same_set_at": cfg.same_set_at,"same_groups": list(cfg.same_groups),@@ -570,6 +572,7 @@ class SettingsStore:"layout_by": "","same_groups": [],"show_in_dock": True,+ "show_in_tray": True,}def _read(self):@@ -821,6 +824,7 @@ class SettingsStore:("shortcut_arrival_style", effects.SWITCH_STYLES),("effect_length", tuple(value for value, _name in effects.LENGTHS)),("effect_size", tuple(value for value, _name in effects.SIZES)),+ ("frame_rate", tuple(value for value, _name, _divisor in effects.FRAME_RATES)),)for name, allowed in choices:if crossing[name] not in allowed:diff --git a/mac_app/setup.py b/mac_app/setup.pyindex 696151f..a29cd21 100644--- a/mac_app/setup.py+++ b/mac_app/setup.py@@ -78,7 +78,7 @@ setup(# the scan misses cannot drop out; naming the package whole would ship its tests too."includes": ["objc", "AppKit", "ApplicationServices", "Quartz", "UserNotifications",- "core.crash_log", "core.effects", "core.ignored", "core.keytable", "core.link", "core.owner", "core.pairing",+ "core.crash_log", "core.effects", "core.idle_pointer", "core.ignored", "core.keytable", "core.link", "core.owner", "core.pairing","core.peerlist", "core.protocol", "core.receiver", "core.return_edge", "core.settings_sync","core.updates", "core.wol","core.fx_ink", "core.fx_instrument", "core.fx_membrane", "core.fx_sparks", "core.fx_warp",diff --git a/mac_app/tests/bridge_fakes.py b/mac_app/tests/bridge_fakes.pyindex 69f58a3..3706a68 100644--- a/mac_app/tests/bridge_fakes.py+++ b/mac_app/tests/bridge_fakes.py@@ -86,6 +86,18 @@ class FakeQuartz:def CGEventGetLocation(cls, event):return event.get("location", cls.cursor_pin_location)+ @staticmethod+ def CGMainDisplayID():+ return 1++ @staticmethod+ def CGDisplayHideCursor(display):+ return 0++ @staticmethod+ def CGDisplayShowCursor(display):+ return 0+@classmethoddef CGAssociateMouseAndMouseCursorPosition(cls, follows):cls.associate_calls.append(follows)diff --git a/mac_app/tests/fixtures/effects_parity/qt_reference_frames.zip b/mac_app/tests/fixtures/effects_parity/qt_reference_frames.zipindex 74984a4..3bd20ad 100644Binary files a/mac_app/tests/fixtures/effects_parity/qt_reference_frames.zip and b/mac_app/tests/fixtures/effects_parity/qt_reference_frames.zip differdiff --git a/mac_app/tests/render_crossing_ledger.py b/mac_app/tests/render_crossing_ledger.pyindex b3e2117..0d66dff 100644--- a/mac_app/tests/render_crossing_ledger.py+++ b/mac_app/tests/render_crossing_ledger.py@@ -62,7 +62,7 @@ def built_state(number, destination):assert not control.window.isVisible()assert not control.pages["crossing"].hasHorizontalScroller()assert not geometry["overflows"], geometry["overflows"]- assert (control.crossing_ledger.bounds().size.width < 620) == (number == 7)+ assert (control.crossing_ledger.bounds().size.width < control.crossing_ledger.narrow_below()) == (number == 7)print(f"state {number}: {page.bounds().size.width:g} x {page.bounds().size.height:g} pt, "f"{len(control.crossing_ledger.rows)} rows, ledger {control.crossing_ledger.bounds().size.width:g} pt, "f"{len(geometry['overflows'])} overflows")diff --git a/mac_app/tests/test_atlas_canvas.py b/mac_app/tests/test_atlas_canvas.pyindex fe1f379..d3ab9d1 100644--- a/mac_app/tests/test_atlas_canvas.py+++ b/mac_app/tests/test_atlas_canvas.py@@ -1,4 +1,5 @@import copy+import itertoolsimport sysimport unittestfrom pathlib import Path@@ -26,6 +27,22 @@ class AtlasCanvas(Page):capture.start()self.addCleanup(capture.stop)+ def test_per_screen_desk_canvas_draws_both_machine_display_groups(self):+ from core.tests.crossing_harness import per_screen_layout++ window = self.build([(BEE, token(100), "Studio PC", {"side": "right"})])+ own = self.store.current()["machine_id"]+ tiles = per_screen_layout(own, BEE)+ canvas = window.atlas_canvas+ canvas.setFrame_(((0, 0), (560, canvas.HEIGHT)))+ canvas.show_layout(tiles, {own: {"state": "this"}, BEE: {"state": "edge", "crosses": True}},+ {own: "This Mac", BEE: "Studio PC"}, own, BEE)++ self.assertEqual(len(canvas.display_layers[own]), 2)+ self.assertEqual(len(canvas.display_layers[BEE]), 2)+ self.assertEqual([frame["display"] for frame in core_ways._display_frames(tiles[own])], ["0", "1"])+ self.assertEqual([frame["display"] for frame in core_ways._display_frames(tiles[BEE])], ["0", "1"])+def layout(self, bee_x=320, bee_y=100):window = self.build([(BEE, token(100), "Bee", {"side": "right"}),(SEA, token(150), "Sea", {"side": "left"})])@@ -708,7 +725,7 @@ class AtlasCanvas(Page):window = self.layout(bee_x=320, bee_y=0)canvas = window.atlas_canvascanvas.setFrame_(((0, 0), (480, canvas.HEIGHT)))- canvas.states[BEE] = {"state": "corner", "crosses": True, "corner_way": "top_right"}+ canvas.states[BEE] = {"state": "corner", "crosses": True, "corner_ways": ["top_right"]}canvas._draw(False)self.assertNotIn((canvas.own_id, BEE, "signal"), canvas.contact_layers)pad = canvas.mark_layers[(BEE, "corner", "top_right")]@@ -872,5 +889,160 @@ class AtlasCanvas(Page):self.assertEqual(window.controller._shortcut_cycle(), [SEA, BEE, None])+class WrapAroundSeams(unittest.TestCase):+ """The map's wrap-around edges and corner pads, drawn from the per-machine lists the page builds."""++ def canvas(self, **state):+ canvas = diagram.AtlasCanvas.alloc().init().setup()+ canvas.own_id, canvas.selected = "own", BEE+ canvas.tiles = {"own": {"x": 100, "y": 100, "w": 160, "h": 100},+ BEE: {"x": 260, "y": 100, "w": 160, "h": 100}}+ canvas.labels = {"own": "This Mac", BEE: "Bee"}+ canvas.states = {BEE: {"state": "edge", "crosses": True, "linked": True, "picked_thirds": list(core_ways.PARTS),+ "lit_thirds": [], "wrap_sides": [], "kept_sides": [], "corner_ways": [], **state}}+ return canvas, {"own": (30, 40, 160, 100), BEE: (190, 40, 160, 100)}++ def bounds(self, layer):+ box = Quartz.CGPathGetBoundingBox(layer.path())+ return (box.origin.x, box.origin.y, box.size.width, box.size.height)++ def test_each_wrap_around_side_has_a_four_point_seam_on_this_macs_own_side(self):+ canvas, frames = self.canvas(wrap_sides=["left", "top"])+ canvas._draw_wraps(frames)+ self.assertEqual(set(canvas.wrap_layers), {(BEE, "left"), (BEE, "top")})+ seam, _arrow, _text = canvas.wrap_layers[(BEE, "left")]+ self.assertEqual(seam.lineWidth(), 4)+ self.assertEqual(self.bounds(seam), (30, 42, 0, 96))+ seam, _arrow, _text = canvas.wrap_layers[(BEE, "top")]+ self.assertEqual(self.bounds(seam), (32, 40, 156, 0))++ def test_a_seam_stops_thirteen_points_short_of_a_corner_pads_vertex(self):+ canvas, frames = self.canvas(wrap_sides=["left", "top"], corner_ways=["top_left", "bottom_right"])+ canvas._draw_wraps(frames)+ self.assertEqual(self.bounds(canvas.wrap_layers[(BEE, "left")][0]), (30, 53, 0, 85))+ self.assertEqual(self.bounds(canvas.wrap_layers[(BEE, "top")][0]), (43, 40, 145, 0))++ def test_another_machines_pad_also_stops_the_seam(self):+ canvas, frames = self.canvas(wrap_sides=["bottom"])+ canvas.states[SEA] = {"corner_ways": ["bottom_left"], "in_use": True}+ frames[SEA] = (-130, 40, 160, 100)+ canvas._draw_wraps(frames)+ self.assertEqual(self.bounds(canvas.wrap_layers[(BEE, "bottom")][0]), (43, 140, 145, 0))++ def test_label_and_arrow_sit_inside_the_tile_by_side(self):+ for side in ("left", "right", "top", "bottom"):+ canvas, frames = self.canvas(wrap_sides=[side])+ canvas._draw_wraps(frames)+ _seam, arrow, text = canvas.wrap_layers[(BEE, side)]+ self.assertEqual(text.string(), "wraps to Bee")+ self.assertEqual(arrow.isHidden(), side in ("top", "bottom"))+ frame = text.frame()+ with self.subTest(side=side):+ if side == "left":+ self.assertEqual((frame.origin.x, frame.origin.y), (56, 40 + 50 + 10))+ box = self.bounds(arrow)+ self.assertEqual((box[0], box[0] + box[2]), (46, 55))+ if side == "right":+ self.assertAlmostEqual(frame.origin.x + frame.size.width, 30 + 160 - 26)+ box = self.bounds(arrow)+ self.assertEqual((box[0], box[0] + box[2]), (165, 174))+ if side == "top":+ self.assertAlmostEqual(frame.origin.x + frame.size.width, 30 + 160 - 12)+ self.assertEqual(frame.origin.y, 40 + 51 + 4)+ if side == "bottom":+ self.assertAlmostEqual(frame.origin.x + frame.size.width, 30 + 160 - 12)+ self.assertEqual(frame.origin.y, 40 + 100 - 22)++ def test_no_wrap_label_ever_lands_on_the_name_the_status_line_or_another_label(self):+ """rc4: with Top on, "wraps to <the PC>" was drawn over the "This Mac" title, and with Top,+ Right and Bottom three of them stacked. Every set of sides for one machine, at every height,+ and for two machines at once."""+ def rect(layer):+ frame = layer.frame()+ return frame.origin.x, frame.origin.y, frame.origin.x + frame.size.width, frame.origin.y + frame.size.height++ def meet(one, two):+ return one[0] < two[2] and two[0] < one[2] and one[1] < two[3] and two[1] < one[3]++ sets = [list(sides) for count in range(0, 5) for sides in itertools.combinations(core_ways.EDGES, count)]+ cases = [(height, sides, []) for height in (48, 52, 60, 64, 72, 88, 104, 140, 190) for sides in sets[1:]]+ cases += [(104, sides, others) for sides in sets for others in sets[1:]]+ for height, sides, others in cases:+ canvas, _frames = self.canvas(wrap_sides=sides)+ canvas.tiles[SEA] = {"x": 100, "y": 100 - height, "w": 160, "h": height}+ canvas.labels[SEA] = "Sea"+ canvas.states[SEA] = dict(canvas.states[BEE], wrap_sides=others)+ canvas.tiles["own"]["h"] = canvas.tiles[BEE]["h"] = height+ canvas.setFrame_(((0, 0), (1000, 1000)))+ canvas._draw(False)+ x, y, width, tall = canvas._map()[0]["own"]+ title, state = canvas.label_for_tile["own"], canvas.state_for_tile["own"]+ title_box = rect(title)+ name = diagram._text_width(title.string(), title.font())+ middle = (title_box[0] + title_box[2]) / 2+ fixed = [(middle - name / 2, title_box[1], middle + name / 2, title_box[3])]+ if not state.isHidden():+ fixed.append(rect(state))+ labels = [rect(text) for _seam, _arrow, text in canvas.wrap_layers.values() if not text.isHidden()]+ with self.subTest(height=height, sides=sides, others=others):+ for index, label in enumerate(labels):+ self.assertTrue(x <= label[0] and label[2] <= x + width and y <= label[1] and label[3] <= y + tall)+ for other in fixed + labels[index + 1:]:+ self.assertFalse(meet(label, other), (label, other))+ if tall >= 100:+ self.assertEqual(len(labels), bool(sides) + bool(others))+ elif 56 <= tall < 72 or tall >= 77:+ self.assertTrue(labels, "a tile with room for one row shows a label")++ def test_opacity_follows_the_seam_rules_offline_and_not_selected(self):+ canvas, frames = self.canvas(wrap_sides=["left"], linked=False)+ canvas._draw_wraps(frames)+ seam, arrow, text = canvas.wrap_layers[(BEE, "left")]+ self.assertAlmostEqual(seam.opacity(), 0.55)+ self.assertAlmostEqual(text.opacity(), 0.55)+ canvas.states[BEE]["linked"] = True+ canvas.selected = "own"+ canvas._draw_wraps(frames)+ self.assertAlmostEqual(seam.opacity(), 0.7)+ canvas.selected = BEE+ canvas._draw_wraps(frames)+ self.assertAlmostEqual(seam.opacity(), 1.0)++ def test_a_kept_side_is_a_two_point_dashed_seam_that_says_edge_is_off(self):+ canvas, frames = self.canvas(kept_sides=["left"])+ canvas._draw_wraps(frames)+ seam, _arrow, text = canvas.wrap_layers[(BEE, "left")]+ self.assertEqual(seam.lineWidth(), 2)+ self.assertTrue(seam.lineDashPattern())+ self.assertAlmostEqual(seam.opacity(), 0.35)+ self.assertEqual(text.string(), "wrap kept, Edge off")++ def test_a_side_that_stops_wrapping_loses_its_layers(self):+ canvas, frames = self.canvas(wrap_sides=["left"])+ canvas._draw_wraps(frames)+ layers = canvas.wrap_layers[(BEE, "left")]+ canvas.states[BEE]["wrap_sides"] = []+ canvas._draw_wraps(frames)+ self.assertEqual(canvas.wrap_layers, {})+ self.assertTrue(all(layer.superlayer() is None for layer in layers))++ def test_a_pad_is_drawn_for_every_corner_in_a_machines_list(self):+ canvas, frames = self.canvas(corner_ways=["top_left", "top_right", "bottom_right"])+ canvas._draw_marks(frames)+ self.assertEqual(sorted(key[2] for key in canvas.mark_layers),+ ["bottom_right", "top_left", "top_right"])+ self.assertEqual(sorted(key[2] for key in canvas.corner_halo_layers),+ ["bottom_right", "top_left", "top_right"])++ def test_outcome_is_crosses_for_a_wrap_around_edge_even_with_the_contact_unpicked(self):+ canvas, _frames = self.canvas(wrap_sides=["left"], unpicked=True, picked_thirds=[])+ canvas.setFrame_(((0, 0), (480, 260)))+ canvas._draw(False)+ self.assertEqual(canvas.outcome_for_tile[BEE].string(), "Crosses")+ canvas.states[BEE].update(wrap_sides=[], crosses=False, edge_off=True)+ canvas._draw(False)+ self.assertEqual(canvas.outcome_for_tile[BEE].string(), "Edge off")++if __name__ == "__main__":unittest.main()diff --git a/mac_app/tests/test_beam_live.py b/mac_app/tests/test_beam_live.pyindex 34393ef..0f1d72d 100644--- a/mac_app/tests/test_beam_live.py+++ b/mac_app/tests/test_beam_live.py@@ -55,7 +55,7 @@ class LiveBeamFalloffTest(unittest.TestCase):self.assertLess(rgba[3], 5)self.assertLess(rgba[((height - 2) * width) * 4 + 3], 5)- def test_switching_back_to_glow_removes_the_beam_mask(self):+ def test_switching_back_to_glow_uses_the_linear_falloff(self):glow = live_glow("left", "medium")glow.controller.cfg.crossing["glow_style"] = "glow"# The real reconfiguration path, held offscreen by OffscreenPanel.@@ -64,7 +64,8 @@ class LiveBeamFalloffTest(unittest.TestCase):with mock.patch.object(kvm_bridge_app.time, "monotonic", return_value=100):glow._draw()values = profile(glow, "left", 2)- self.assertGreater(values[len(values) // 2], 200)+ self.assertAlmostEqual(values[len(values) // 2] / values[0], 0.5, delta=.04)+ self.assertLessEqual(values[-1], 5)if __name__ == "__main__":diff --git a/mac_app/tests/test_bridge.py b/mac_app/tests/test_bridge.pyindex 224a8b6..510fb5f 100644--- a/mac_app/tests/test_bridge.py+++ b/mac_app/tests/test_bridge.py@@ -853,6 +853,25 @@ class ClipboardSyncTests(unittest.TestCase):self._take_with(FakeClipboard("shot.png", pngs.png(16384, 16384)))self.assertEqual(self.link.posted[1], protocol.clipboard_msg("shot.png"))+ def test_text_is_sent_only_to_a_peer_advertising_clipboard(self):+ controller = make_controller(self.clock)+ link = bring_up(controller, caps=("clipboard_image",))+ link.posted.clear()+ controller.clipboard = FakeClipboard("hello from the Mac", None)+ controller.set_redirecting(True)+ settle(controller)+ self.assertEqual(link.types(), [protocol.MSG_FOCUS])++ def test_image_is_sent_only_to_a_peer_advertising_clipboard_image(self):+ controller = make_controller(self.clock)+ link = bring_up(controller, caps=("clipboard",))+ link.posted.clear()+ controller.clipboard = FakeClipboard("shot.png", FAKE_PNG)+ controller.set_redirecting(True)+ settle(controller)+ self.assertEqual(link.types(), [protocol.MSG_FOCUS, protocol.MSG_CLIPBOARD])+ self.assertEqual(link.posted[1], protocol.clipboard_msg("shot.png"))+def test_an_inbound_clipboard_sets_text_and_image(self):fake = FakeClipboard()self.controller.clipboard = fake@@ -1369,6 +1388,44 @@ class CrossingWiringTests(unittest.TestCase):def _own(self):return protocol.read_id(protocol.id_text(self.controller.identity()["id"]))+ def _install_internal_crossing(self):+ from crossing import CrossingEngine, Ways++ self.controller.crossing = CrossingEngine(+ resistance_px=20,+ ways=[Ways(None, frozenset({"edge"}), "right", frozenset(), "top_right",+ "0", "peer-display", "left")],+ )+ self.controller._displays_cache = [(0, 0, 100, 100), (100, 0, 200, 100)]+ self.controller._displays_at = self.clock.value+ self.controller._bounds_cache = (0, 0, 200, 100)+ self.controller._bounds_at = self.clock.value++ def test_first_internal_seam_event_is_warped_to_the_source_display(self):+ self._install_internal_crossing()++ event, returned = self._move(105, 50, 10)++ self.assertIsNone(returned)+ self.assertEqual(FakeQuartz.warp_calls, [(99, 50)])+ self.assertGreater(self.controller.crossing.pressure, 0)+ self.assertFalse(self.controller.redirecting)++ def test_paused_and_unready_internal_seams_do_not_warp_or_build_pressure(self):+ self._install_internal_crossing()+ self.controller.crossing_paused = True+ event, returned = self._move(105, 50, 10)+ self.assertIs(returned, event)+ self.assertEqual(FakeQuartz.warp_calls, [])+ self.assertEqual(self.controller.crossing.pressure, 0.0)++ self.controller.crossing_paused = False+ self.controller._peers_up.clear()+ event, returned = self._move(105, 50, 10)+ self.assertIs(returned, event)+ self.assertEqual(FakeQuartz.warp_calls, [])+ self.assertEqual(self.controller.crossing.pressure, 0.0)+def test_movement_away_from_the_edge_passes_through(self):event, returned = self._move(800.0, 500.0, 30)self.assertIs(returned, event)diff --git a/mac_app/tests/test_caps_lock.py b/mac_app/tests/test_caps_lock.pynew file mode 100644index 0000000..71dbf4f--- /dev/null+++ b/mac_app/tests/test_caps_lock.py@@ -0,0 +1,385 @@+"""Regression tests verifying that Caps Lock handling and input-source switching+(e.g. System Settings > Keyboard > Input Sources > 'Use Caps Lock to switch to and from Latin')+cannot raise, abort, or terminate Beamer.++Covers:+1. FlagsChanged with keycode 57 (0x39) without AlphaShift flag toggling (input-source switch).+2. Keycode 57 with unexpected or arbitrary flags.+3. Keycode 57 arriving as KeyDown / KeyUp.+4. Input source change notifications (TISNotifySelectedKeyboardInputSourceChanged) arriving+ mid-press, including when switching to Korean (IME with no uchr layout data).+5. Uncaught exception containment in the CGEventTap callback.+6. Thread safety of keyboard_layout lookups off the main thread.+"""++import os+import queue+import sys+import threading+import time+import unittest+from dataclasses import replace+from types import SimpleNamespace+from unittest import mock+from PyObjCTools import AppHelper++sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))++from core import ignored+from core import protocol+import bridge+from bridge import KVMController, QuartzEventTranslator, CAPS_LOCK_KEY_CODE+from bridge_fakes import (+ PAIRED_TOKEN,+ FakeClock,+ FakeQuartz,+ make_config,+ quiet_logger,+ redirect_to,+)+from fake_link import FakeLink+import keyboard_layout+++class CapsLockEventTapTests(unittest.TestCase):+ def setUp(self):+ self.controller = KVMController(+ make_config(PAIRED_TOKEN),+ logger=quiet_logger(),+ quartz=FakeQuartz,+ clock=FakeClock(),+ link_factory=FakeLink,+ system_event_converter=lambda event: event,+ )++ def tap(self, event_type, event):+ return self.controller._event_tap_callback(None, event_type, event, None)++ def sent(self):+ messages = []+ while not self.controller.outbound.empty():+ messages.append(self.controller.outbound.get_nowait())+ return [(m["type"], m["data"]) for m in messages]++ def tap_on_worker(self, event_type, event):+ callbacks = queue.Queue()+ dispatched = []+ returned = []+ tap_thread = threading.Thread(+ target=lambda: returned.append(self.tap(event_type, event)),+ daemon=True,+ )+ with mock.patch.object(+ AppHelper,+ "callAfter",+ lambda callback: (dispatched.append(callback), callbacks.put(callback)),+ ):+ tap_thread.start()+ deadline = time.monotonic() + 2+ while tap_thread.is_alive() and time.monotonic() < deadline:+ try:+ callback = callbacks.get(timeout=0.05)+ except queue.Empty:+ continue+ callback()+ tap_thread.join(timeout=0.1)+ return returned, dispatched, tap_thread.is_alive()++ def test_caps_lock_without_alphashift_flag_passes_through_locally(self):+ """When input is at home and macOS consumes Caps Lock as an input-source switch+ (Use Caps Lock to switch to and from Latin), flagsChanged arrives with keycode 57+ and NO AlphaShift flag. It must pass through locally to macOS without raising or quitting."""+ event = {FakeQuartz.kCGKeyboardEventKeycode: CAPS_LOCK_KEY_CODE, "flags": 0}+ returned = self.tap(FakeQuartz.kCGEventFlagsChanged, event)+ self.assertIs(returned, event)+ self.assertEqual(self.sent(), [])++ def test_flags_changed_caps_lock_never_calls_event_converters_on_tap_thread(self):+ event = {FakeQuartz.kCGKeyboardEventKeycode: CAPS_LOCK_KEY_CODE, "flags": 0}+ calls = []++ def event_with_cg_event(raw_event):+ calls.append(threading.current_thread())+ raise AssertionError("Caps Lock flagsChanged reached an AppKit event converter")++ appkit = SimpleNamespace(NSEvent=SimpleNamespace(eventWithCGEvent_=event_with_cg_event))+ self.controller.system_event_converter = bridge._default_system_event_converter+ self.controller.gesture_event_converter = bridge._default_gesture_event_converter+ redirect_to(self.controller)+ with mock.patch.object(bridge, "AppKit", appkit):+ returned, dispatched, thread_alive = self.tap_on_worker(+ FakeQuartz.kCGEventFlagsChanged, event+ )++ self.assertFalse(thread_alive)+ self.assertEqual(calls, [])+ self.assertEqual(dispatched, [])+ self.assertEqual(returned, [None])+ self.assertEqual(+ self.sent(),+ [+ (protocol.MSG_KEYDOWN, {"key": "caps_lock"}),+ (protocol.MSG_KEYUP, {"key": "caps_lock"}),+ ],+ )++ def test_system_defined_event_conversion_runs_on_main_thread(self):+ converted = []++ def event_with_cg_event(event):+ converted.append(threading.current_thread())+ return SimpleNamespace(subtype=lambda: 8, data1=lambda: 0x0010000A)++ appkit = SimpleNamespace(NSEvent=SimpleNamespace(eventWithCGEvent_=event_with_cg_event))+ self.controller.system_event_converter = bridge._default_system_event_converter+ redirect_to(self.controller)+ event = object()+ with mock.patch.object(bridge, "AppKit", appkit):+ returned, dispatched, thread_alive = self.tap_on_worker(+ bridge.media_keys.NX_SYSDEFINED_EVENT_TYPE, event+ )++ self.assertFalse(thread_alive)+ self.assertEqual(len(dispatched), 1)+ self.assertEqual(converted, [threading.main_thread()])+ self.assertEqual(returned, [None])++ def test_gesture_event_conversion_runs_on_main_thread(self):+ converted = []++ def event_with_cg_event(event):+ converted.append(threading.current_thread())+ return SimpleNamespace(deltaX=lambda: 1.0)++ appkit = SimpleNamespace(NSEvent=SimpleNamespace(eventWithCGEvent_=event_with_cg_event))+ self.controller.gesture_event_converter = bridge._default_gesture_event_converter+ redirect_to(self.controller)+ with mock.patch.object(bridge, "AppKit", appkit):+ returned, dispatched, thread_alive = self.tap_on_worker(+ bridge.gestures.SWIPE_TYPE, object()+ )++ self.assertFalse(thread_alive)+ self.assertEqual(len(dispatched), 1)+ self.assertEqual(converted, [threading.main_thread()])+ self.assertEqual(returned, [None])++ def test_caps_lock_with_alphashift_flag_passes_through_locally(self):+ """Standard Caps Lock toggle with AlphaShift flag set while at home passes through."""+ event = {+ FakeQuartz.kCGKeyboardEventKeycode: CAPS_LOCK_KEY_CODE,+ "flags": FakeQuartz.kCGEventFlagMaskAlphaShift,+ }+ returned = self.tap(FakeQuartz.kCGEventFlagsChanged, event)+ self.assertIs(returned, event)+ self.assertEqual(self.sent(), [])++ def test_caps_lock_without_alphashift_flag_redirects_when_away(self):+ """When redirecting away, Caps Lock without AlphaShift sends paired down/up messages+ and clears the gate route without pinning."""+ redirect_to(self.controller)+ event = {FakeQuartz.kCGKeyboardEventKeycode: CAPS_LOCK_KEY_CODE, "flags": 0}+ returned = self.tap(FakeQuartz.kCGEventFlagsChanged, event)+ self.assertIsNone(returned)+ sent = self.sent()+ self.assertEqual(len(sent), 2)+ self.assertEqual(sent[0], (protocol.MSG_KEYDOWN, {"key": "caps_lock"}))+ self.assertEqual(sent[1], (protocol.MSG_KEYUP, {"key": "caps_lock"}))++ def test_caps_lock_unexpected_flags_never_raises(self):+ """Unexpected flags masks on keycode 57 (arbitrary bits, device bits, high masks)+ never cause key_result or event tap callback to raise."""+ translator = QuartzEventTranslator(FakeQuartz)+ weird_flags = [0, 0xFFFFFFFF, 1 << 16, 1 << 17, 1 << 18, 1 << 19, 1 << 20, 0x0010, 0x2000]+ for flags in weird_flags:+ event = {FakeQuartz.kCGKeyboardEventKeycode: CAPS_LOCK_KEY_CODE, "flags": flags}+ result = translator.key_result(FakeQuartz.kCGEventFlagsChanged, event, 0x3D, {})+ self.assertTrue(result.is_down)+ self.assertEqual(len(result.messages), 2)++ returned = self.tap(FakeQuartz.kCGEventFlagsChanged, event)+ self.assertIs(returned, event)++ def test_caps_lock_as_keydown_and_keyup_never_raises(self):+ """If an input-source switch or third-party tool delivers Caps Lock as KeyDown/KeyUp,+ it maps as a special key and passes through without raising or quitting."""+ translator = QuartzEventTranslator(FakeQuartz)+ down_event = {+ FakeQuartz.kCGKeyboardEventKeycode: CAPS_LOCK_KEY_CODE,+ FakeQuartz.kCGKeyboardEventAutorepeat: 0,+ }+ res_down = translator.key_result(FakeQuartz.kCGEventKeyDown, down_event, 0x3D, {})+ self.assertTrue(res_down.is_down)+ self.assertEqual(res_down.messages, [{"type": protocol.MSG_KEYDOWN, "data": {"key": "caps_lock"}}])++ up_event = {+ FakeQuartz.kCGKeyboardEventKeycode: CAPS_LOCK_KEY_CODE,+ FakeQuartz.kCGKeyboardEventAutorepeat: 0,+ }+ res_up = translator.key_result(FakeQuartz.kCGEventKeyUp, up_event, 0x3D, {})+ self.assertFalse(res_up.is_down)+ self.assertEqual(res_up.messages, [{"type": protocol.MSG_KEYUP, "data": {"key": "caps_lock"}}])++ self.assertIs(self.tap(FakeQuartz.kCGEventKeyDown, down_event), down_event)+ self.assertIs(self.tap(FakeQuartz.kCGEventKeyUp, up_event), up_event)++ def test_synthetic_jis_lang_keys_pass_through_safely(self):+ """When Caps Lock input switching emits synthetic keycodes (0x66/0x68 JIS Eisu/Kana),+ they are safely handled as unmapped or control characters without raising or quitting."""+ translator = QuartzEventTranslator(FakeQuartz)+ for code in (0x66, 0x68):+ down_event = {+ FakeQuartz.kCGKeyboardEventKeycode: code,+ FakeQuartz.kCGKeyboardEventAutorepeat: 0,+ "unicode": "\x10", # DLE non-printable control char typical of JIS switches+ }+ res_down = translator.key_result(FakeQuartz.kCGEventKeyDown, down_event, 0x3D, {})+ self.assertTrue(res_down.is_down)+ self.assertEqual(res_down.messages, [])+ self.assertIs(self.tap(FakeQuartz.kCGEventKeyDown, down_event), down_event)++ up_event = {+ FakeQuartz.kCGKeyboardEventKeycode: code,+ FakeQuartz.kCGKeyboardEventAutorepeat: 0,+ "unicode": "\x10",+ }+ res_up = translator.key_result(FakeQuartz.kCGEventKeyUp, up_event, 0x3D, {})+ self.assertFalse(res_up.is_down)+ self.assertEqual(res_up.messages, [])+ self.assertIs(self.tap(FakeQuartz.kCGEventKeyUp, up_event), up_event)+++class CapsLockLayoutSwitchTests(unittest.TestCase):+ def tearDown(self):+ keyboard_layout.install({})++ @unittest.skipUnless(sys.platform == "darwin", "reads macOS real input sources")+ def test_real_system_korean_sources_decode_cleanly(self):+ """On macOS, tests layout extraction from real installed Korean sources:+ com.apple.keylayout.2SetHangul (real uchr table) and+ com.apple.inputmethod.Korean.2SetKorean (IME with no uchr data).+ Both must decode without crashing, segfaulting, or raising."""+ import ctypes+ import Foundation+ import objc++ carbon = keyboard_layout._Carbon()+ lib, core = carbon.carbon, carbon.core+ lib.TISCreateInputSourceList.restype = ctypes.c_void_p+ lib.TISCreateInputSourceList.argtypes = [ctypes.c_void_p, ctypes.c_bool]+ core.CFArrayGetCount.restype = ctypes.c_long+ core.CFArrayGetCount.argtypes = [ctypes.c_void_p]+ core.CFArrayGetValueAtIndex.restype = ctypes.c_void_p+ core.CFArrayGetValueAtIndex.argtypes = [ctypes.c_void_p, ctypes.c_long]+ core.CFRelease.argtypes = [ctypes.c_void_p]++ key = objc.objc_object(c_void_p=ctypes.c_void_p.in_dll(lib, "kTISPropertyInputSourceID").value)++ # 1. 2SetHangul layout has real layout data with 48 characters+ q_hangul = Foundation.NSDictionary.dictionaryWithObject_forKey_("com.apple.keylayout.2SetHangul", key)+ sources_h = lib.TISCreateInputSourceList(objc.pyobjc_id(q_hangul), True)+ if sources_h and core.CFArrayGetCount(sources_h):+ try:+ src_h = core.CFArrayGetValueAtIndex(sources_h, 0)+ chars_h = carbon.layout_chars(src_h)+ self.assertEqual(len(chars_h), 48)+ self.assertEqual(chars_h.get(0x00), "ㅁ")+ finally:+ core.CFRelease(sources_h)++ # 2. 2SetKorean IME mode has no uchr data; layout_chars returns {} safely+ q_ime = Foundation.NSDictionary.dictionaryWithObject_forKey_("com.apple.inputmethod.Korean.2SetKorean", key)+ sources_ime = lib.TISCreateInputSourceList(objc.pyobjc_id(q_ime), True)+ if sources_ime and core.CFArrayGetCount(sources_ime):+ try:+ src_ime = core.CFArrayGetValueAtIndex(sources_ime, 0)+ chars_ime = carbon.layout_chars(src_ime)+ self.assertEqual(chars_ime, {})+ finally:+ core.CFRelease(sources_ime)++ def test_korean_input_source_without_uchr_data_retains_fallbacks_safely(self):+ """Korean input methods (e.g. com.apple.inputmethod.Korean.2SetKorean) have no+ kTISPropertyUnicodeKeyLayoutData. When selected, layout_chars returns an empty dict+ and refresh() safely logs info and returns False, leaving US fallbacks intact without raising."""+ class FakeCarbonWithoutLayoutData:+ def current_chars(self):+ return {}++ saved_carbon = keyboard_layout._carbon+ try:+ keyboard_layout._carbon = FakeCarbonWithoutLayoutData()+ self.assertFalse(keyboard_layout.refresh())+ self.assertEqual(keyboard_layout.char_for(0x00), "a")+ self.assertEqual(keyboard_layout.code_for("a"), 0x00)+ finally:+ keyboard_layout._carbon = saved_carbon++ def test_layout_switch_notification_mid_press_does_not_desync(self):+ """Simulate an input-source switch notification (NSDistributedNotificationCenter)+ arriving during an active Caps Lock press sequence."""+ controller = KVMController(+ make_config(PAIRED_TOKEN),+ logger=quiet_logger(),+ quartz=FakeQuartz,+ clock=FakeClock(),+ link_factory=FakeLink,+ system_event_converter=lambda event: event,+ )++ caps_event = {FakeQuartz.kCGKeyboardEventKeycode: CAPS_LOCK_KEY_CODE, "flags": 0}+ self.assertIs(controller._event_tap_callback(None, FakeQuartz.kCGEventFlagsChanged, caps_event, None), caps_event)++ # Layout notification fires mid-session+ keyboard_layout.install({0x06: "y", 0x10: "z"}) # German layout switch+ self.assertEqual(keyboard_layout.char_for(0x06), "y")++ # Next Caps Lock press still passes through cleanly+ self.assertIs(controller._event_tap_callback(None, FakeQuartz.kCGEventFlagsChanged, caps_event, None), caps_event)+++class EventTapSafetyTests(unittest.TestCase):+ def test_uncaught_exception_in_tap_callback_never_escapes(self):+ """Verifies that an unexpected exception during event processing is caught by+ _event_tap_callback's BaseException handler, forcing local cleanup and returning+ the event rather than allowing an unhandled exception to crash/quit the app."""+ class ExplodingQuartz(FakeQuartz):+ @classmethod+ def CGEventGetIntegerValueField(cls, event, field):+ if field == FakeQuartz.kCGKeyboardEventKeycode and event.get("explode"):+ raise RuntimeError("simulated unexpected Quartz failure")+ return super().CGEventGetIntegerValueField(event, field)++ controller = KVMController(+ make_config(PAIRED_TOKEN),+ logger=quiet_logger(),+ quartz=ExplodingQuartz,+ clock=FakeClock(),+ link_factory=FakeLink,+ system_event_converter=lambda event: event,+ )+ redirect_to(controller)+ self.assertTrue(controller.redirecting)++ bad_event = {FakeQuartz.kCGKeyboardEventKeycode: CAPS_LOCK_KEY_CODE, "explode": True}+ # The callback must catch BaseException, return local, and return the event safely+ returned = controller._event_tap_callback(None, ExplodingQuartz.kCGEventFlagsChanged, bad_event, None)+ self.assertIs(returned, bad_event)+ self.assertFalse(controller.redirecting)++ def test_tap_and_injector_never_call_tis_off_main_thread(self):+ """The event tap thread and input injector thread only read char_for / code_for dicts;+ they never invoke Carbon TIS functions directly."""+ import input_injector_mac++ # char_for and code_for do not touch Carbon+ self.assertIsNotNone(keyboard_layout.char_for(0x00))+ self.assertIsNotNone(keyboard_layout.code_for("a"))++ # injector planning reads only cached lookups+ plan = input_injector_mac.plan_key_event("a", down=True, held={}, mods_down=frozenset())+ self.assertEqual(plan, (0x00, None))+++if __name__ == "__main__":+ unittest.main()diff --git a/mac_app/tests/test_corner_marks.py b/mac_app/tests/test_corner_marks.pyindex 3f01a16..42c3039 100644--- a/mac_app/tests/test_corner_marks.py+++ b/mac_app/tests/test_corner_marks.py@@ -90,7 +90,7 @@ class CornerMarks(Page):def test_disabled_ways_have_no_marks(self):canvas = self.marked(off=True, notch=True, has_notch=True).atlas_canvas- self.assertNotIn("corner_way", canvas.states[BEE])+ self.assertFalse(canvas.states[BEE]["corner_ways"])self.assertFalse(canvas.states[BEE].get("notch_way"))self.assertEqual(canvas.mark_layers, {})@@ -106,7 +106,7 @@ class CornerMarks(Page):for extra in ({"left_out": True}, {"dormant": True}, {"in_use": False}):with self.subTest(extra=extra):canvas = self.marked(extra=extra, notch=True, has_notch=True).atlas_canvas- self.assertNotIn("corner_way", canvas.states[BEE])+ self.assertFalse(canvas.states[BEE]["corner_ways"])self.assertFalse(canvas.states[BEE].get("notch_way"))self.assertEqual(canvas.mark_layers, {})@@ -174,7 +174,7 @@ class CanvasCornerGeometry(unittest.TestCase):canvas.tiles = {"own": own, BEE: peer}canvas.states = {BEE: {"state": "edge", "crosses": not edge_off, "edge_off": edge_off,"linked": True, "picked_thirds": picked or [],- "lit_thirds": picked or [], "corner_way": "top_right"}}+ "lit_thirds": picked or [], "corner_ways": ["top_right"]}}return canvas, {"own": (30, 40, 160, 100), BEE: (190, 40, 160, 100)}def test_corner_mark_is_square_pad_with_halo_and_outward_chevron(self):@@ -206,8 +206,8 @@ class CanvasCornerGeometry(unittest.TestCase):def test_halo_clips_another_machines_seam_at_the_same_vertex(self):canvas, frames = self.canvas(picked=["start", "middle", "end"])- canvas.states[BEE].pop("corner_way")- canvas.states[SEA] = {"corner_way": "top_right"}+ canvas.states[BEE]["corner_ways"] = []+ canvas.states[SEA] = {"corner_ways": ["top_right"]}frames[SEA] = (350, 40, 160, 100)canvas._draw_contacts(frames)bounds = Quartz.CGPathGetBoundingBox(canvas.contact_layers[("own", BEE, "signal")].path())diff --git a/mac_app/tests/test_crossing.py b/mac_app/tests/test_crossing.pyindex 693d6de..107f774 100644--- a/mac_app/tests/test_crossing.py+++ b/mac_app/tests/test_crossing.py@@ -31,6 +31,44 @@ def push_right(machine, times, dx=20, y=500.0, dragging=False):return drive(machine, RIGHT_X, y, dx, 0, times, dragging=dragging)+class ArrivalDirectionTests(unittest.TestCase):+ def test_left_wrap_departure_preserves_offset_and_lands_on_the_right(self):+ machine = CrossingEngine(resistance_px=0, ways=[+ Ways("peer", frozenset({"edge"}), "left", frozenset(), "top_left", "0", "0", "right")])+ step = machine.feed(0, 335, -20, 0, BOUNDS, 1.0, displays=[BOUNDS])+ self.assertTrue(step.crossed)+ self.assertEqual((step.edge, step.display, step.side), ("right", "0", "right"))+ point = CrossingEngine.arrival_point(step.edge, step.offset, BOUNDS,+ displays=[BOUNDS], display=step.display, side=step.side)+ self.assertEqual(point[0], RIGHT_X - 2)+ self.assertAlmostEqual(point[1], 335, delta=1)+++class ContactSpanTests(unittest.TestCase):+ def test_single_screen_contact_span_does_not_block_crossing(self):+ machine = CrossingEngine(resistance_px=0, ways=[+ Ways("peer", frozenset({"edge"}), "right", frozenset(), "top_right",+ contact_span=(0.0, 1.0), target_span=(0.0, 1.0)),+ ])++ step = machine.feed(1919, 540, 10, 0, (0, 0, 1920, 1080), 1.0)++ self.assertTrue(step.crossed)+ self.assertAlmostEqual(step.offset, 0.5, places=3)++ def test_single_screen_contact_span_still_gates_crossings(self):+ ways = [Ways("peer", frozenset({"edge"}), "right", frozenset(), "top_right",+ contact_span=(0.25, 0.75), target_span=(0.0, 1.0))]++ inside = CrossingEngine(resistance_px=0, ways=ways).feed(+ 1919, 500, 10, 0, (0, 0, 1920, 1080), 1.0)+ outside = CrossingEngine(resistance_px=0, ways=ways).feed(+ 1919, 100, 10, 0, (0, 0, 1920, 1080), 1.0)++ self.assertTrue(inside.crossed)+ self.assertFalse(outside.crossed)++class TickStepsTests(unittest.TestCase):def test_which_quarter_ticks_are_felt(self):from crossing import tick_fires@@ -170,6 +208,48 @@ class ResistanceTests(unittest.TestCase):class BreakthroughTests(unittest.TestCase):+ def scoped_corner_step(self):+ machine = CrossingEngine(resistance_px=120, ways=[+ Ways("peer", frozenset({"corner"}), "bottom", frozenset(), "bottom_left", "1", "B1", "right")+ ])+ displays = [(0, 0, 100, 100), (100, 0, 300, 100)]+ return machine.feed(100.0, 99.0, -30.0, 30.0, (0, 0, 400, 100), 1.0,+ displays=displays, ready=lambda _peer: True)++ def seam_overshoot_step(self):+ machine = CrossingEngine(resistance_px=120, ways=[+ Ways("peer", frozenset({"edge"}), "right", frozenset(), "top_right", "0", "B0", "left")+ ])+ displays = [(0, 0, 100, 100), (100, 0, 300, 100)]+ return machine.feed(105.0, 50.0, 10.0, 0.0, (0, 0, 400, 100), 1.0,+ displays=displays, ready=lambda _peer: True)++ def test_per_screen_mac_gap_probes_return_steps(self):+ self.assertIsNotNone(self.scoped_corner_step())+ self.assertIsNotNone(self.seam_overshoot_step())++ def test_scoped_corner_on_second_display_is_selected_at_that_displays_corner(self):+ step = self.scoped_corner_step()+ self.assertGreater(step.pressure, 0,+ "Mac scoped corners gap: the B1 route must be evaluated at A1's nominated corner")++ def test_per_screen_seam_captures_a_single_event_overshoot(self):+ step = self.seam_overshoot_step()+ self.assertGreater(step.pressure, 0, "Mac seam capture gap: one event crossed the display edge uncaptured")++ def test_per_screen_landing_offset_uses_the_departing_display(self):+ machine = CrossingEngine(resistance_px=0, ways=[+ Ways("peer", frozenset({"edge"}), "bottom", frozenset(), "top_right", "1", "B1", "top")+ ])+ displays = [(0, 0, 100, 100), (100, 0, 300, 100)]++ step = machine.feed(200.0, 99.0, 0.0, 1.0, (0, 0, 300, 100), 1.0,+ displays=displays, ready=lambda _peer: True)++ self.assertTrue(step.crossed)+ self.assertAlmostEqual(step.offset, 0.5, places=2,+ msg="Mac landing offset gap: fraction must be relative to source display A1")+def test_breakthrough_carries_the_windows_edge_and_offset(self):machine = engine()step = push_right(machine, 8, dx=30, y=558.0)@@ -393,6 +473,246 @@ class MonitorLayoutTests(unittest.TestCase):self.assertTrue(result.crossed)self.assertEqual((result.display, result.side), ("display-a", "left"))+ def test_one_event_can_cross_an_armed_internal_seam_in_any_direction(self):+ cases = (+ ("right", [(0, 0, 100, 100), (100, 0, 200, 100)], (0, 0, 200, 100),+ "0", 105, 50, 10, 0),+ ("left", [(0, 0, 100, 100), (100, 0, 200, 100)], (0, 0, 200, 100),+ "1", 95, 50, -10, 0),+ ("bottom", [(0, 0, 100, 100), (0, 100, 100, 200)], (0, 0, 100, 200),+ "0", 50, 105, 0, 10),+ ("top", [(0, 0, 100, 100), (0, 100, 100, 200)], (0, 0, 100, 200),+ "1", 50, 95, 0, -10),+ )+ for edge, displays, bounds, display, x, y, dx, dy in cases:+ with self.subTest(edge=edge):+ machine = CrossingEngine(+ resistance_px=10,+ ways=[Ways("peer", frozenset({"edge"}), edge, frozenset(), "top_right",+ display, "peer-display", "left")],+ )+ machine.feed(x - dx, y - dy, 0, 0, bounds, 0.99, displays=displays)+ step = machine.feed(x, y, dx, dy, bounds, 1.0, displays=displays)+ self.assertTrue(step.hold)+ self.assertFalse(step.crossed)+ self.assertGreater(machine.pressure, 0)+ pinned_x, pinned_y = step.pin+ step = machine.feed(pinned_x, pinned_y, dx, dy, bounds, 1.01, displays=displays)+ self.assertTrue(step.crossed)+ self.assertEqual((step.display, step.side), ("peer-display", "left"))++ def test_consecutive_outward_overshoots_keep_building_from_a_pinned_seam(self):+ cases = (+ ("right", (0, 0, 100, 100), (95, 50), (105, 50), (110, 50)),+ ("left", (100, 0, 200, 100), (105, 50), (95, 50), (90, 50)),+ ("bottom", (0, 0, 100, 100), (50, 95), (50, 105), (50, 110)),+ ("top", (0, 100, 100, 200), (50, 105), (50, 95), (50, 90)),+ )+ for edge, display, start, first, second in cases:+ with self.subTest(edge=edge):+ displays = [display, (200, 200, 300, 300)]+ bounds = (0, 0, 300, 300)+ machine = CrossingEngine(+ resistance_px=40,+ ways=[Ways("peer", frozenset({"edge"}), edge, frozenset(), "top_right",+ "0", "peer-display", "left")],+ )++ def feed(point, previous, now):+ dx, dy = point[0] - previous[0], point[1] - previous[1]+ return machine.feed(*point, dx, dy, bounds, now, displays=displays)++ first_step = feed(first, start, 1.0)+ self.assertTrue(first_step.hold)+ self.assertEqual(first_step.pin, (display[0] if edge == "left" else+ display[2] - 1 if edge == "right" else first[0],+ display[1] if edge == "top" else+ display[3] - 1 if edge == "bottom" else first[1]))+ first_pressure = machine.pressure++ second_step = feed(second, first, 1.01)+ self.assertTrue(second_step.hold)+ self.assertGreater(machine.pressure, first_pressure)+++ def test_first_scoped_event_uses_its_delta_to_locate_the_previous_point(self):+ machine = CrossingEngine(+ resistance_px=20,+ ways=[Ways("peer", frozenset({"edge"}), "right", frozenset(), "top_right",+ "0", "peer-display", "left")],+ )+ step = machine.feed(105, 50, 10, 0, (0, 0, 200, 100), 1.0,+ displays=[(0, 0, 100, 100), (100, 0, 200, 100)])+ self.assertTrue(step.hold)+ self.assertEqual(step.pin, (99, 50))+ self.assertAlmostEqual(machine.pressure, 6.0)++ def test_scoped_motion_misses_do_not_hold_and_first_wall_event_keeps_legacy_threshold(self):+ displays = [(0, 0, 100, 100), (100, 0, 200, 100)]+ machine = CrossingEngine(+ resistance_px=20,+ ways=[Ways("peer", frozenset({"edge"}), "right", frozenset(), "top_right", "0")],+ )+ machine.feed(50, 50, 0, 0, (0, 0, 200, 100), 0.99, displays=displays)+ ordinary = machine.feed(60, 50, 10, 0, (0, 0, 200, 100), 1.0, displays=displays)+ self.assertFalse(ordinary.hold)+ self.assertFalse(ordinary.crossed)+ self.assertEqual(machine.pressure, 0.0)++ machine.reset()+ first_wall = machine.feed(99, 50, 10, 0, (0, 0, 200, 100), 1.1, displays=displays)+ self.assertFalse(first_wall.hold)+ self.assertFalse(first_wall.crossed)+ self.assertEqual(machine.pressure, 10.0)+ self.assertEqual(first_wall.pin, (99, 50))++ def test_diagonal_overshoot_that_misses_the_display_corner_does_not_hold(self):+ displays = [(0, 0, 100, 100), (100, 0, 200, 100)]+ machine = CrossingEngine(+ resistance_px=20,+ ways=[Ways("peer", frozenset({"edge"}), "right", frozenset(), "top_right", "0")],+ )+ machine.feed(95, 95, 0, 0, (0, 0, 200, 100), 0.99, displays=displays)+ miss = machine.feed(105, 105, 10, 10, (0, 0, 200, 100), 1.0, displays=displays)+ self.assertFalse(miss.hold)+ self.assertFalse(miss.crossed)+ self.assertEqual(machine.pressure, 0.0)++ def test_scoped_corner_one_wall_overshoot_uses_corner_pressure_and_first_hit_pin(self):+ displays = [+ (0, 0, 100, 100), (100, 0, 200, 100), (200, 0, 300, 100),+ (100, 100, 200, 200),+ ]+ machine = CrossingEngine(+ resistance_px=20,+ ways=[Ways("peer", frozenset({"corner"}), "right", frozenset(),+ "bottom_right", "1")],+ )+ machine.feed(195, 95, 0, 0, (0, 0, 300, 200), 0.99, displays=displays)+ step = machine.feed(205, 99, 10, 4, (0, 0, 300, 200), 1.0, displays=displays)+ self.assertTrue(step.hold)+ self.assertEqual(step.pin, (199, 97))+ self.assertAlmostEqual(machine.pressure, (10 ** 2 + 4 ** 2) ** 0.5)++ machine.reset()+ at_wall = machine.feed(199, 97, 10, 4, (0, 0, 300, 200), 1.1, displays=displays)+ self.assertFalse(at_wall.crossed)+ self.assertAlmostEqual(machine.pressure, (10 ** 2 + 4 ** 2) ** 0.5)++ def test_one_event_overshoot_still_obeys_thirds_reversal_dragging_and_readiness(self):+ displays = [(0, 0, 100, 100), (100, 0, 200, 100)]+ bounds = (0, 0, 200, 100)+ way = Ways("peer", frozenset({"part"}), "right", frozenset({"middle"}), "top_right",+ "0", "peer-display", "left")++ def new_engine():+ return CrossingEngine(resistance_px=20, ways=[way])++ machine = new_engine()+ machine.feed(95, 10, 0, 0, bounds, 0.99, displays=displays)+ outside_third = machine.feed(105, 10, 10, 0, bounds, 1.0, displays=displays)+ self.assertFalse(outside_third.hold)+ self.assertEqual(machine.pressure, 0.0)++ machine = new_engine()+ machine.feed(95, 50, 0, 0, bounds, 0.99, displays=displays)+ machine.feed(105, 50, 10, 0, bounds, 1.0, displays=displays)+ reverse = machine.feed(95, 50, -10, 0, bounds, 1.01, displays=displays)+ self.assertFalse(reverse.crossed)+ self.assertFalse(reverse.hold)+ self.assertEqual(machine.pressure, 0.0)++ machine = new_engine()+ machine.feed(95, 50, 0, 0, bounds, 0.99, displays=displays)+ dragging = machine.feed(105, 50, 10, 0, bounds, 1.0, dragging=True, displays=displays)+ self.assertFalse(dragging.hold)+ self.assertEqual(machine.pressure, 0.0)++ machine = CrossingEngine(resistance_px=10, block_while_dragging=False, ways=[way])+ machine.feed(95, 50, 0, 0, bounds, 0.99, displays=displays)+ first = machine.feed(105, 50, 10, 0, bounds, 1.0, dragging=True, displays=displays)+ self.assertTrue(first.hold)+ crossed = machine.feed(99, 50, 10, 0, bounds, 1.01, dragging=True, displays=displays)+ self.assertTrue(crossed.crossed)++ machine = new_engine()+ machine.feed(95, 50, 0, 0, bounds, 0.99, displays=displays)+ unready = machine.feed(105, 50, 10, 0, bounds, 1.0, displays=displays,+ ready=lambda _peer: False)+ self.assertFalse(unready.hold)+ self.assertEqual(machine.pressure, 0.0)++ def test_diagonal_seam_overshoot_uses_the_seam_intersection_for_thirds(self):+ displays = [(0, 0, 100, 100), (100, 0, 200, 100)]+ machine = CrossingEngine(+ resistance_px=20,+ ways=[Ways("peer", frozenset({"part"}), "right", frozenset({"middle"}),+ "top_right", "0", "peer-display", "left")],+ )+ machine.feed(95, 30, 0, 0, (0, 0, 200, 100), 0.99, displays=displays)+ step = machine.feed(105, 75, 10, 45, (0, 0, 200, 100), 1.0, displays=displays)+ self.assertTrue(step.hold)+ self.assertEqual(step.pin, (99, 52.5))++ def test_scoped_horizontal_and_vertical_departures_use_source_display_offsets(self):+ cases = (+ ("left", [(0, 0, 100, 100), (0, 100, 100, 200)],+ (0, 0, 100, 200), "1", (0, 149.5), (-10, 0)),+ ("bottom", [(0, 0, 100, 100), (100, 0, 200, 100)],+ (0, 0, 200, 100), "1", (149.5, 99), (0, 10)),+ )+ for edge, displays, bounds, source_display, point, delta in cases:+ with self.subTest(edge=edge):+ machine = CrossingEngine(+ resistance_px=0,+ ways=[Ways("peer", frozenset({"edge"}), edge, frozenset(), "top_right",+ source_display, "peer-display", "left")],+ )+ x, y = point+ dx, dy = delta+ machine.feed(x, y, 0, 0, bounds, 0.99, displays=displays)+ step = machine.feed(x, y, dx, dy, bounds, 1.0, displays=displays)+ self.assertTrue(step.crossed)+ self.assertAlmostEqual(step.offset, 0.5, places=3)++ def test_scoped_corner_uses_its_display_when_both_corner_walls_are_internal(self):+ displays = [(0, 0, 100, 100), (100, 0, 200, 100),+ (200, 0, 300, 100), (100, 100, 200, 200)]+ machine = CrossingEngine(+ resistance_px=15,+ ways=[Ways("peer", frozenset({"corner"}), "right", frozenset(), "bottom_right",+ "1", "peer-display", "left")],+ )+ machine.feed(199, 99, 0, 0, (0, 0, 300, 200), 0.99, displays=displays)+ step = machine.feed(205, 105, 10, 10, (0, 0, 300, 200), 1.0, displays=displays)+ self.assertTrue(step.hold)+ self.assertEqual(step.pin, (199, 99))+ step = machine.feed(199, 99, 10, 10, (0, 0, 300, 200), 1.01, displays=displays)+ self.assertTrue(step.crossed)+ self.assertEqual((step.via, step.mac_edge, step.display, step.side),+ ("corner", "right", "peer-display", "left"))++ def test_unknown_scoped_corner_does_not_fall_back_to_desktop_corner(self):+ displays = [(0, 0, 100, 100), (100, 0, 200, 100)]+ machine = CrossingEngine(+ ways=[Ways("peer", frozenset({"corner"}), "right", frozenset(), "bottom_right",+ "missing", "peer-display", "left")],+ )+ step = machine.feed(199, 99, 10, 10, (0, 0, 200, 100), 1.0, displays=displays)+ self.assertFalse(step.crossed)+ self.assertEqual(machine.pressure, 0.0)++ def test_scoped_corner_box_without_wall_contact_does_not_hold(self):+ displays = [(0, 0, 100, 100), (100, 0, 200, 100),+ (200, 0, 300, 100), (100, 100, 200, 200)]+ machine = CrossingEngine(+ ways=[Ways("peer", frozenset({"corner"}), "right", frozenset(), "bottom_right",+ "1", "peer-display", "left")],+ )+ step = machine.feed(194, 94, 0, 0, (0, 0, 300, 200), 1.0, displays=displays)+ self.assertFalse(step.hold)+ self.assertEqual(machine.pressure, 0.0)+def test_the_bottom_of_a_short_display_beside_a_tall_one_crosses(self):tall_short = [(0, 0, 100, 300), (100, 0, 200, 100)]step = self.feed_at(engine(edge="bottom"), 150.0, 99.0, 0, 20, tall_short, (0, 0, 200, 300))diff --git a/mac_app/tests/test_crossing_ledger.py b/mac_app/tests/test_crossing_ledger.pyindex 0a18aae..34d8d9a 100644--- a/mac_app/tests/test_crossing_ledger.py+++ b/mac_app/tests/test_crossing_ledger.py@@ -9,6 +9,7 @@ import AppKitfrom core import waysimport test_part_edge_thirds as thirdsfrom test_crossing_page_machines import BEE, SEA, Page, press, token+import ledgerclass LedgerTests(Page):@@ -37,47 +38,169 @@ class LedgerTests(Page):self.assertEqual(self.picked(), list(combination))self.assertEqual(self.window.atlas_canvas.states[BEE]["picked_thirds"], list(combination))+ def chip(self, side, peer=BEE):+ return self.window.crossing_ledger.rows[peer].chips[side]++ def corner(self, corner, peer=BEE):+ return self.window.crossing_ledger.rows[peer].corner_buttons[corner]++ def test_reach_is_compiled_once_per_settings_not_once_per_status_tick(self):+ self.layout()+ self.window._reach_stamp = None+ with mock.patch.object(ways, "reach", wraps=ways.reach) as reach:+ for _ in range(3):+ self.window._show_arrangement()+ self.window.crossing_ledger.refresh(self.store.current(), self.window.chosen_peer)+ self.assertEqual(reach.call_count, 1)+ press(self.chip("top"))+ self.assertGreater(reach.call_count, 1, "a change to the settings asks again")++ def test_a_corner_left_on_after_its_machine_moved_away_stays_removable(self):+ self.layout()+ press(self.corner("top_left"))+ settings = self.store.current()+ settings["layout"][BEE] = {"x": 400, "y": 400, "w": 160, "h": 100}+ self.store.save_settings(settings)+ self.window._show_arrangement()+ self.assertTrue(self.corner("top_left").enabled)+ press(self.corner("top_left"))+ self.assertEqual(self.store.current()["peers"][0]["ways"]["corners"], [])+def test_last_ledger_segment_off_then_off_click_lights_only_that_segment(self):self.layout()self.pick_thirds(["start"])- press(self.row().edge_glyph.hits["start"])- self.assertEqual(self.row().edge_text, "Off")+ press(self.row().contact().segments["start"])+ self.assertEqual(self.row().contact().kind, "contact_off")self.assertEqual(self.picked(), [])self.assertFalse(self.store.current()["peers"][0]["ways"]["edge"])- press(self.row().edge_glyph.hits["middle"])+ press(self.row().contact().segments["middle"])self.assertEqual(self.picked(), ["middle"])- press(self.row().edge_detail)+ self.assertEqual(self.row().contact().kind, "contact_on")+ press(self.row().contact())self.assertEqual(self.picked(), [])- press(self.row().edge_title)+ press(self.row().contact())self.assertEqual(self.picked(), list(ways.PARTS))+ def test_every_chip_state_round_trips_through_the_saved_ways_the_ledger_and_the_map(self):+ self.layout()+ self.assertEqual([side for side, chip in self.row().chips.items() if not chip.isHidden()],+ list(ways.EDGES))+ self.assertEqual(self.chip("right").kind, "contact_on")+ self.assertEqual(self.chip("left").kind, "free")+ press(self.chip("left"))+ self.assertEqual(self.ways_of(BEE)["edges"], ["left"])+ self.rebuilt()+ self.assertEqual(self.chip("left").kind, "on")+ self.assertEqual(self.chip("left").label, "Left, wraps")+ self.assertEqual(self.window.atlas_canvas.states[BEE]["wrap_sides"], ["left"])+ self.assertIn((BEE, "left"), self.window.atlas_canvas.wrap_layers)+ press(self.chip("left"))+ self.assertEqual(self.ways_of(BEE)["edges"], [])+ self.rebuilt()+ self.assertEqual(self.chip("left").kind, "free")+ self.assertNotIn((BEE, "left"), self.window.atlas_canvas.wrap_layers)+ press(self.chip("top"))+ press(self.chip("left"))+ self.assertEqual(self.ways_of(BEE)["edges"], ["left", "top"])+ press(self.chip("right"))+ self.assertEqual(self.chip("right").kind, "contact_off")+ self.rebuilt()+ self.assertEqual(self.chip("left").kind, "kept")+ self.assertEqual(self.window.atlas_canvas.states[BEE]["kept_sides"], ["left", "top"])+ self.assertEqual(self.window.atlas_canvas.states[BEE]["wrap_sides"], [])+ press(self.chip("left"))+ self.assertTrue(self.ways_of(BEE)["methods"])+ self.assertEqual(self.ways_of(BEE)["edges"], ["left", "top"])+ self.rebuilt()+ self.assertEqual(self.chip("right").kind, "contact_on")+ self.assertEqual(self.chip("left").kind, "on")+ press(self.chip("top"))+ self.assertEqual(self.ways_of(BEE)["edges"], ["left"])++ def test_chip_added_while_edge_is_off_turns_edge_on_with_the_remembered_thirds(self):+ self.layout()+ self.pick_thirds(["start", "end"])+ press(self.row().contact())+ self.assertEqual(self.picked(), [])+ press(self.chip("bottom"))+ self.assertEqual(self.picked(), ["start", "end"])+ self.assertEqual(self.ways_of(BEE)["edges"], ["bottom"])++ def test_contact_chip_leads_and_a_machine_cannot_wrap_to_its_own_contact(self):+ self.layout("top")+ row = self.row()+ self.assertEqual(row.chip_order[0], "top")+ self.assertEqual(self.chip("top").kind, "contact_on")+ self.assertEqual(self.chip("top").label, "Top")+ self.assertEqual(self.chip("top").toolTip(), "Top edge: touches Bee; click to turn it off")+ self.assertEqual(self.chip("left").toolTip(), "Left edge: click to wrap round to Bee")+def test_every_corner_on_and_off_survives_page_rebuild(self):self.layout()for corner in ways.CORNERS:with self.subTest(corner=corner):- press(self.row().corner_glyph.hits[corner])+ press(self.corner(corner))self.assertIn("corner", self.ways_of(BEE)["methods"])- self.assertEqual(self.ways_of(BEE)["corner"], corner)+ self.assertEqual(self.ways_of(BEE)["corners"], [corner])self.rebuilt()- self.assertEqual(self.row().corner_title.text, corner.replace("_", " ").capitalize())- self.assertEqual(self.row().corner_glyph.hits[corner].accessibilityValue(), "on")+ self.assertEqual(self.corner(corner).kind, "on")+ self.assertEqual(self.corner(corner).accessibilityLabel(), f"{corner.replace('_', ' ').capitalize()} corner, on")self.assertIn((BEE, "corner", corner), self.window.atlas_canvas.mark_layers)- press(self.row().corner_glyph.hits[corner])+ press(self.corner(corner))self.rebuilt()self.assertNotIn("corner", self.ways_of(BEE)["methods"])- self.assertEqual(self.row().corner_title.text, "None")+ self.assertEqual(self.corner(corner).kind, "free")++ def test_two_corners_on_at_once_and_a_pad_for_each(self):+ self.layout()+ press(self.corner("top_left"))+ press(self.corner("bottom_right"))+ self.assertEqual(self.ways_of(BEE)["corners"], ["top_left", "bottom_right"])+ self.rebuilt()+ canvas = self.window.atlas_canvas+ self.assertEqual(canvas.states[BEE]["corner_ways"], ["top_left", "bottom_right"])+ self.assertIn((BEE, "corner", "top_left"), canvas.mark_layers)+ self.assertIn((BEE, "corner", "bottom_right"), canvas.mark_layers)+ press(self.corner("top_left"))+ self.assertEqual(self.ways_of(BEE)["corners"], ["bottom_right"])- def test_second_corner_moves_and_another_machines_corner_refuses_the_click(self):+ def test_another_machines_corner_and_a_corner_with_no_contact_refuse_without_a_write(self):self.layout(second=True)- row = self.row()- press(row.corner_glyph.hits["top_left"])- press(row.corner_glyph.hits["bottom_right"])- self.assertEqual(self.ways_of(BEE)["corner"], "bottom_right")+ press(self.corner("top_left"))+ self.assertEqual(self.ways_of(BEE)["corners"], ["top_left"])sea = self.window.crossing_ledger.rows[SEA]- self.assertFalse(sea.corner_glyph.hits["bottom_right"].isEnabled())- self.assertEqual(sea.corner_glyph.hits["bottom_right"].toolTip(), "Bee's corner")+ held = sea.corner_buttons["top_left"]+ self.assertEqual(held.kind, "held")+ self.assertFalse(held.enabled)+ self.assertEqual(held.toolTip(), "Bee's corner")+ before = copy.deepcopy(self.store.current())+ press(held)+ self.assertEqual(self.store.current(), before)+ self.window._ledger_corner(SEA, "top_left")+ self.assertEqual(self.store.current(), before)+ settings = self.store.current()+ settings["layout"][BEE]["x"] += 100+ self.store.save_settings(settings)+ self.window._show_arrangement()+ loose = self.window.crossing_ledger.rows[BEE].corner_buttons["bottom_right"]+ self.assertEqual(loose.kind, "unavailable")+ self.assertEqual(loose.toolTip(), "Place Bee beside this Mac first")+ before = copy.deepcopy(self.store.current())+ press(loose)+ self.window._ledger_corner(BEE, "bottom_right")+ self.assertEqual(self.store.current(), before)++ def test_a_side_held_by_another_machine_is_a_dimmed_chip_that_refuses_the_click(self):+ self.layout(second=True)+ row = self.row()+ held = row.chips["left"]+ self.assertEqual(held.kind, "held")+ self.assertEqual(held.label, "Left, Sea")+ self.assertFalse(held.enabled)+ self.assertEqual(held.toolTip(), "Left edge: Sea's")before = copy.deepcopy(self.store.current())- press(sea.corner_glyph.hits["bottom_right"])+ press(held)+ self.window._ledger_side(BEE, "left")self.assertEqual(self.store.current(), before)def test_notch_on_and_off_rebuild_and_no_notch_is_disabled(self):@@ -100,6 +223,32 @@ class LedgerTests(Page):self.assertEqual(self.row().notch.accessibilityLabel(), "Notch, no notch")self.assertFalse(self.row().notch.isEnabled())+ def test_the_notch_checkbox_says_notch_and_return_through_it_shows_only_with_the_notch(self):+ # rc4: the checkbox said only On or Off, so where the notch was chosen could not be found.+ self.layout()+ self.window.has_notch = True+ self.window._show_arrangement()+ self.assertEqual(self.row().notch.title(), "Notch")+ self.assertEqual(self.row().notch.accessibilityLabel(), "Notch, off")+ self.assertTrue(self.row().notch_return.isHidden())+ self.row().notch.setState_(1)+ press(self.row().notch)+ self.window._show_arrangement()+ self.assertEqual(self.row().notch.accessibilityLabel(), "Notch, on")+ returns = self.row().notch_return+ self.assertFalse(returns.isHidden())+ self.assertEqual(returns.title(), "Return through the notch")+ returns.setState_(1)+ press(returns)+ zone = next(zone for zone in self.store.current()["zones"] if zone["kind"] == "notch")+ self.assertEqual((zone["peer"], zone.get("return_here")), (BEE, True))+ self.window._show_arrangement()+ self.assertEqual(self.row().notch_return.state(), 1)+ self.row().notch_return.setState_(0)+ press(self.row().notch_return)+ zone = next(zone for zone in self.store.current()["zones"] if zone["kind"] == "notch")+ self.assertNotIn("return_here", zone)+def test_cycle_tick_and_jump_chord_round_trip_without_changing_ways(self):self.layout()before = self.ways_of(BEE)@@ -136,8 +285,9 @@ class LedgerTests(Page):self.assertTrue(row.dimmed)self.assertEqual(row.status_text, "Windows · Offline, ways kept")self.assertEqual(row.cells["edge"].alphaValue(), .5)- self.assertTrue(row.edge_glyph.hits["start"].isEnabled())- press(row.edge_glyph.hits["middle"])+ self.assertTrue(row.contact().segments["start"].isEnabled())+ self.assertTrue(row.contact().enabled)+ press(row.contact().segments["middle"])self.assertEqual(self.picked(), ["start", "end"])def test_armed_jump_survives_a_cell_refresh_and_escape_cancels(self):@@ -149,7 +299,7 @@ class LedgerTests(Page):with mock.patch.object(widgets.AppKit, "NSEvent", event_api):recorder._clicked()prompt = recorder.key.text- press(self.row().edge_glyph.hits["start"])+ press(self.row().contact().segments["start"])self.assertIsNotNone(recorder.monitor)self.assertEqual(recorder.key.text, prompt)escape = mock.Mock()@@ -180,49 +330,45 @@ class LedgerTests(Page):second.cancel()self.assertFalse(self.controller.jump_recording)- def test_in_use_false_disables_kept_glyphs_like_left_out(self):+ def test_in_use_false_disables_kept_chips_like_left_out(self):self.layout()+ press(self.chip("left"))+ press(self.corner("top_left"))settings = self.store.current()settings["peers"][0]["in_use"] = Falseself.store.save_settings(settings)self.window._show_arrangement()row = self.row()self.assertIn("Left out", row.status_text)- for glyph in (row.edge_glyph, row.corner_glyph):- for button in glyph.hits.values():- self.assertFalse(button.isEnabled())- self.assertEqual(button.toolTip(), "Left out: Put back to change its ways")+ self.assertEqual(row.chips["left"].kind, "on", "kept ways drawn as they would cross, inert")+ self.assertEqual(row.corner_buttons["top_left"].kind, "on")+ for control in (*row.chips.values(), *row.corner_buttons.values(), *row.contact().segments.values()):+ if control.isHidden():+ continue+ self.assertFalse(control.enabled if hasattr(control, "enabled") and not isinstance(control, AppKit.NSButton)+ else control.isEnabled())+ self.assertEqual(control.toolTip(), "Left out: Put back to change its ways")- def test_glyphs_sit_left_of_top_aligned_text_in_both_layouts(self):- self.layout()+ def test_chips_wrap_in_lines_and_corner_grid_is_two_by_two_at_both_widths(self):+ __import__("theme").init_fonts()+ self.layout(second=True)for width in (687, 399):self.window.crossing_ledger.setFrameSize_((width, 700))row = self.row()- for glyph, title, detail in ((row.edge_glyph, row.edge_title, row.edge_detail),- (row.corner_glyph, row.corner_title.view, row.corner_detail.view)):- self.assertGreaterEqual(title.frame().origin.x,- glyph.frame().origin.x + glyph.frame().size.width)- self.assertEqual(title.frame().origin.y, 0)- self.assertEqual(detail.frame().origin.x, title.frame().origin.x)- self.assertLessEqual(detail.frame().origin.y + detail.frame().size.height,- row.cells["edge"].frame().size.height)-- def test_standard_width_corner_text_fits_on_one_line_and_elides_when_constrained(self):- __import__("theme").init_fonts()- self.layout()- press(self.row().corner_glyph.hits["bottom_left"])- ledger = self.window.crossing_ledger- ledger.setFrameSize_((687, 700))- for label in (self.row().corner_title, self.row().corner_detail):- view = label.view- self.assertGreaterEqual(view.frame().size.width - 4,- view.attributedStringValue().size().width)- self.assertFalse(view.cell().wraps())- self.assertEqual(view.cell().lineBreakMode(), AppKit.NSLineBreakByTruncatingTail)- self.assertEqual(view.toolTip(), label.text)- ledger.setFrameSize_((620, 700))- self.assertEqual(self.row().corner_title.text, "Bottom left")- self.assertEqual(self.row().corner_detail.view.toolTip(), "diagonal push")+ cell = row.cells["edge"].bounds().size.width+ shown = [chip for chip in row.chips.values() if not chip.isHidden()]+ for chip in shown:+ frame = chip.frame()+ self.assertEqual(frame.size.height, 26)+ self.assertLessEqual(frame.origin.x + frame.size.width, cell + .01)+ self.assertGreaterEqual(frame.size.width, chip.natural_width() - .01)+ first = next(chip for side in row.chip_order for chip in [row.chips[side]] if not chip.isHidden())+ self.assertEqual(first.frame().origin.x, 0)+ frames = [button.frame() for button in row.corner_buttons.values()]+ self.assertEqual([(f.origin.x, f.origin.y, f.size.width, f.size.height) for f in frames],+ [(0, 0, 28, 28), (32, 0, 28, 28), (0, 32, 28, 28), (32, 32, 28, 28)])+ self.assertLessEqual(row.cells["corner"].frame().size.width, 70)+ self.assertGreaterEqual(row.cells["corner"].frame().size.height, 60)def test_selected_machine_status_dot_is_inset_from_the_rule_at_both_widths(self):self.layout()@@ -239,7 +385,7 @@ class LedgerTests(Page):import widgetsself.layout()row = self.row()- self.window.crossing_ledger.setFrameSize_((687, 700))+ self.window.crossing_ledger.setFrameSize_((760, 700))self.assertGreaterEqual(row.jump_caption.view.frame().size.width - 4,row.jump_caption.view.attributedStringValue().size().width)self.assertEqual(row.jump.key.text, "Set a key")@@ -277,22 +423,29 @@ class LedgerTests(Page):def test_left_out_row_keeps_intent_and_put_back_restores_controls(self):self.layout()+ press(self.chip("left"))+ press(self.corner("top_left"))before = self.ways_of(BEE)press(self.row().leave)row = self.row()self.assertTrue(row.dimmed)self.assertEqual(row.status_text, "Windows · Left out")self.assertIn("Put back", row.leave.accessibilityLabel())- self.assertFalse(row.edge_glyph.hits["start"].isEnabled())- self.assertFalse(row.corner_glyph.hits["top_left"].isEnabled())+ self.assertEqual(row.chips["left"].kind, "on", "kept ways drawn as they would cross, inert")+ self.assertEqual(row.corner_buttons["top_left"].kind, "on")+ self.assertFalse(row.contact().segments["start"].isEnabled())+ self.assertFalse(row.chips["left"].enabled)+ self.assertFalse(row.corner_buttons["top_left"].enabled)held = copy.deepcopy(self.store.current())- press(row.edge_glyph.hits["start"])- press(row.corner_glyph.hits["top_left"])+ press(row.contact().segments["start"])+ press(row.chips["left"])+ press(row.corner_buttons["top_left"])self.assertEqual(self.store.current(), held)self.assertEqual(self.ways_of(BEE), before)press(row.leave)self.assertFalse(self.row().dimmed)- self.assertTrue(self.row().edge_glyph.hits["start"].isEnabled())+ self.assertTrue(self.row().contact().segments["start"].isEnabled())+ self.assertTrue(self.row().chips["left"].enabled)self.assertEqual(self.ways_of(BEE), before)def test_row_order_follows_map_position_and_left_out_stays_present(self):@@ -301,20 +454,20 @@ class LedgerTests(Page):press(window.crossing_ledger.rows[SEA].leave)self.assertIn(SEA, window.crossing_ledger.order)- def test_no_contact_disables_edge_while_corner_stays_clickable(self):+ def test_no_contact_has_no_contact_chip_and_corners_are_not_offered(self):self.layout()settings = self.store.current()settings["layout"][BEE]["x"] += 100self.store.save_settings(settings)self.window._show_arrangement()- self.assertEqual(self.row().edge_text, "Off")- self.assertEqual(self.row().edge_detail.attributedTitle().string(), "place it on the map")- self.assertFalse(self.row().edge_title.isEnabled())+ row = self.row()+ self.assertIsNone(row.contact())+ self.assertEqual({chip.kind for chip in row.chips.values()}, {"free"})+ self.assertTrue(row.edge_note.view.isHidden())+ self.assertTrue(all(button.kind == "unavailable" and not button.enabled for button in row.corner_buttons.values()))before = copy.deepcopy(self.store.current())- press(self.row().edge_glyph.hits["start"])+ self.window._ledger_corner(BEE, "top_left")self.assertEqual(self.store.current(), before)- press(self.row().corner_glyph.hits["top_left"])- self.assertIn("corner", self.ways_of(BEE)["methods"])def test_narrow_cells_and_visible_controls_fit_inside_the_ledger(self):self.layout()@@ -324,8 +477,13 @@ class LedgerTests(Page):self.assertTrue(all(header.view.isHidden() for header in ledger.headers))row = self.row()self.assertEqual(row.cells["machine"].frame().origin.x + row.cells["machine"].frame().size.width, 440)- self.assertEqual(row.cells["edge"].frame().origin.y, row.cells["corner"].frame().origin.y)+ self.assertEqual(row.cells["edge"].frame().size.width, 440 - 24)+ self.assertGreaterEqual(row.cells["edge"].frame().origin.y,+ row.cells["machine"].frame().origin.y + row.cells["machine"].frame().size.height)+ self.assertEqual(row.cells["corner"].frame().origin.y, row.cells["notch"].frame().origin.y)self.assertEqual(row.cells["notch"].frame().origin.y, row.cells["keys"].frame().origin.y)+ self.assertGreaterEqual(row.cells["corner"].frame().origin.y,+ row.cells["edge"].frame().origin.y + row.cells["edge"].frame().size.height)for cell in row.cells.values():frame = cell.frame()self.assertGreaterEqual(frame.origin.x, 0)@@ -349,66 +507,71 @@ class LedgerTests(Page):for _ in range(4):settle(self.window.window)table = self.window.crossing_ledger- self.assertEqual(table.bounds().size.width < 620, narrow)+ self.assertEqual(table.bounds().size.width < table.narrow_below(), narrow)self.assertEqual(all(header.view.isHidden() for header in table.headers), narrow)self.assertFalse(self.window.pages["crossing"].hasHorizontalScroller())self.assertEqual(measure(self.window, "crossing")["overflows"], [])self.assertFalse(self.window.window.isVisible())- def test_glyph_hit_bands_reach_the_button_outside_the_screen_outline(self):+ def test_thirds_bar_segments_are_nine_point_hit_targets_inside_the_contact_chip(self):for side in ways.EDGES:self.layout(side)self.window._select_page("crossing")self.window.crossing_ledger.setFrameSize_((700, 700))- row = self.row()- cell = row.cells["edge"]- glyph = row.edge_glyph- band = glyph.hits["middle"]- frame = band.frame()- if side in ("top", "bottom"):- point = (frame.origin.x + frame.size.width / 2,- frame.origin.y + (1 if side == "top" else frame.size.height - 1))- else:- point = (frame.origin.x + (1 if side == "left" else frame.size.width - 1),- frame.origin.y + frame.size.height / 2)- point = (glyph.frame().origin.x + point[0], glyph.frame().origin.y + point[1])- point = (cell.frame().origin.x + point[0], cell.frame().origin.y + point[1])- with self.subTest(side=side):- self.assertIs(cell.hitTest_(point), band)+ chip = self.row().contact()+ for part, segment in chip.segments.items():+ frame = segment.frame()+ with self.subTest(side=side, part=part):+ self.assertEqual(frame.size.width, 9)+ self.assertEqual(frame.size.height, 26)+ centre = (frame.origin.x + 4.5, 13)+ self.assertIs(chip.hitTest_(chip.convertPoint_toView_(centre, chip.superview())), segment)+ self.assertEqual(chip.segments["start"].toolTip(), f"{ways.part_names(side)['start']} third: click to leave it out")def test_changes_keep_the_same_row_controls_and_do_not_hide_the_ledger(self):self.layout()row = self.row()- controls = list(row.edge_glyph.hits.values()) + list(row.corner_glyph.hits.values())+ controls = list(row.chips.values()) + list(row.corner_buttons.values())with mock.patch("motion.set_hidden", wraps=__import__("motion").set_hidden) as hidden:- press(row.edge_glyph.hits["middle"])- press(row.corner_glyph.hits["top_left"])+ press(row.contact().segments["middle"])+ press(self.chip("left"))+ press(self.corner("top_left"))self.assertIs(self.row(), row)- self.assertEqual(controls, list(row.edge_glyph.hits.values()) + list(row.corner_glyph.hits.values()))+ self.assertEqual(controls, list(row.chips.values()) + list(row.corner_buttons.values()))self.assertFalse(self.window.crossing_ledger.isHidden())self.assertFalse(any(call.args[0] in (row, self.window.crossing_ledger) for call in hidden.call_args_list))- def test_accessibility_table_rows_columns_named_segment_states_and_text_button(self):+ def test_accessibility_table_rows_columns_chips_corners_and_segments_are_named_buttons(self):self.layout("top")ledger, row = self.window.crossing_ledger, self.row()self.assertEqual(ledger.accessibilityRole(), AppKit.NSAccessibilityTableRole)self.assertEqual(row.accessibilityRole(), AppKit.NSAccessibilityRowRole)self.assertEqual(ledger.accessibilityRows(), [row])self.assertEqual(len(ledger.accessibilityColumns()), 5)+ self.assertEqual([header.text for header in ledger.headers], ["Machine", "Edges", "Corners", "Notch", "Keys"])self.assertEqual(row.accessibilityLabel(), "Bee")- button = row.edge_glyph.hits["start"]- self.assertEqual(button.accessibilityRole(), AppKit.NSAccessibilityButtonRole)- self.assertEqual(button.accessibilityLabel(), "Top edge, left third, on")- press(button)- self.assertEqual(button.accessibilityLabel(), "Top edge, left third, off")- corner = row.corner_glyph.hits["top_left"]+ segment = row.contact().segments["start"]+ self.assertEqual(segment.accessibilityRole(), AppKit.NSAccessibilityButtonRole)+ self.assertEqual(segment.accessibilityLabel(), "Top edge, left third, on")+ press(segment)+ self.assertEqual(segment.accessibilityLabel(), "Top edge, left third, off")+ chip = self.chip("left")+ self.assertEqual(chip.accessibilityRole(), AppKit.NSAccessibilityButtonRole)+ self.assertTrue(chip.isAccessibilityElement())+ self.assertEqual(chip.accessibilityLabel(), "Left edge, wraps round, off")+ self.assertEqual(chip.accessibilityValue(), "off")+ press(chip)+ self.assertEqual(chip.accessibilityLabel(), "Left edge, wraps round, on")+ self.assertEqual(chip.accessibilityValue(), "on")+ corner = self.corner("top_left")+ self.assertEqual(corner.accessibilityRole(), AppKit.NSAccessibilityButtonRole)self.assertEqual(corner.accessibilityLabel(), "Top left corner, off")press(corner)self.assertEqual(corner.accessibilityLabel(), "Top left corner, on")- self.whole_edge()- self.assertEqual(row.edge_title.accessibilityLabel(), "Edge, whole top edge")- press(row.edge_title)- self.assertEqual(row.edge_title.accessibilityLabel(), "Edge, off")+ self.assertEqual(corner.accessibilityValue(), "on")+ self.assertEqual(row.contact().accessibilityLabel(), "Top edge, touches Bee, on")+ press(row.contact())+ self.assertEqual(row.contact().accessibilityLabel(), "Top edge, touches Bee, off")def test_inline_rename_cancel_and_save_use_the_same_row(self):self.layout()diff --git a/mac_app/tests/test_crossing_page_machines.py b/mac_app/tests/test_crossing_page_machines.pyindex 77a70a7..88f0e26 100644--- a/mac_app/tests/test_crossing_page_machines.py+++ b/mac_app/tests/test_crossing_page_machines.py@@ -101,7 +101,7 @@ class Page(unittest.TestCase):def toggle(self, way):peer = self.window.chosen_peerif way == "edge":- press(self.window.crossing_ledger.rows[peer].edge_title)+ press(self.window.crossing_ledger.rows[peer].contact())elif way == "corner":self.window._ledger_corner(peer, self.ways_of(peer)["corner"])elif way == "notch":@@ -139,7 +139,7 @@ class Machines(Page):window = self.two()before = self.ways_of(BEE)self.pick(SEA)- press(window.crossing_ledger.rows[SEA].edge_title)+ press(window.crossing_ledger.rows[SEA].contact())self.assertFalse(set(self.ways_of(SEA)["methods"]) & {"edge", "part"})self.assertEqual(self.ways_of(BEE), before)self.assertFalse(window._save_pending)@@ -147,7 +147,7 @@ class Machines(Page):def test_way_change_rearms_the_engine(self):window = self.two()with mock.patch.object(self.controller, "zones_changed") as rebuilt:- press(window.crossing_ledger.rows[BEE].edge_title)+ press(window.crossing_ledger.rows[BEE].contact())rebuilt.assert_called()def test_pairing_and_forgetting_add_and_remove_rows(self):diff --git a/mac_app/tests/test_crossing_zones.py b/mac_app/tests/test_crossing_zones.pyindex 44b1aa4..6cf112e 100644--- a/mac_app/tests/test_crossing_zones.py+++ b/mac_app/tests/test_crossing_zones.py@@ -30,6 +30,15 @@ def push(machine, x, y, dx, dy, notch_range=None, displays=None):class EachZoneSaysItsMachine(unittest.TestCase):+ def test_two_corners_on_one_edge_both_arm_for_the_same_machine(self):+ machine = engine([peer(A, "right")], [+ {"peer": A, "kind": "corner", "corner": "top_right", "edge": "right"},+ {"peer": A, "kind": "corner", "corner": "bottom_right", "edge": "right"},+ ])+ self.assertEqual({way.corner for way in machine.ways}, {"top_right", "bottom_right"})+ self.assertEqual(push(machine, RIGHT_X, 2.0, 20, -20).peer, A)+ self.assertEqual(push(machine, RIGHT_X, 1114.0, 20, 20).peer, A)+def test_two_machines_on_two_edges_each_take_their_own_push(self):machine = engine([peer(A, "right"), peer(B, "left")],[{"peer": A, "kind": "edge"}, {"peer": B, "kind": "edge"}])diff --git a/mac_app/tests/test_design_sliders.py b/mac_app/tests/test_design_sliders.pyindex 499e511..c541c9a 100644--- a/mac_app/tests/test_design_sliders.py+++ b/mac_app/tests/test_design_sliders.py@@ -4,7 +4,7 @@ from pathlib import Pathfrom unittest import mocksys.path.insert(0, str(Path(__file__).resolve().parents[1]))-from mac_app import kvm_bridge_app+import kvm_bridge_appfrom core import effectsimport config as mac_configdiff --git a/mac_app/tests/test_design_tiles.py b/mac_app/tests/test_design_tiles.pyindex 078603a..69d7d61 100644--- a/mac_app/tests/test_design_tiles.py+++ b/mac_app/tests/test_design_tiles.py@@ -102,9 +102,10 @@ class DesignTileMeasurements(unittest.TestCase):with self.subTest(family=family, style=style, appearance=appearance, scale=scale):self.assertGreaterEqual(contrast, 3.0)# The Qt test holds the same 1% floor. The Rule switch is four- # small ticks round the pointer, under 1% in Light, and its- # geometry is the effect's own, so it alone is held to 0.5%.- floor = .005 if (family, style) == ("switch", "rule") else .01+ # small ticks round the pointer, under 1% in Light, so it alone is+ # held to 0.5%; Flint is a few short sparks drawn at their real size,+ # 0.4% at least.+ floor = {("switch", "rule"): .005, ("crossing", "flint"): .004}.get((family, style), .01)self.assertGreaterEqual(coverage, floor)finally:theme.set_dark(previous)diff --git a/mac_app/tests/test_dock_visibility.py b/mac_app/tests/test_dock_visibility.pyindex 91f2925..214ea4f 100644--- a/mac_app/tests/test_dock_visibility.py+++ b/mac_app/tests/test_dock_visibility.py@@ -24,6 +24,18 @@ class DockVisibilityTests(unittest.TestCase):self.assertEqual(dock_visibility.activation_policy(False, True), "regular")self.assertEqual(dock_visibility.activation_policy(False, False), "accessory")+ def test_the_menu_bar_defaults_on_and_rejects_non_boolean_values(self):+ self.assertTrue(dock_visibility.complete_settings({})["show_in_tray"])+ self.assertFalse(dock_visibility.complete_settings({"show_in_tray": False})["show_in_tray"])+ with self.assertRaises(ValueError):+ dock_visibility.validate_settings({"show_in_dock": True, "show_in_tray": 1})++ def test_the_menu_bar_stays_whenever_the_dock_is_hidden(self):+ self.assertTrue(dock_visibility.menu_bar_visible(True, True))+ self.assertTrue(dock_visibility.menu_bar_visible(False, True))+ self.assertFalse(dock_visibility.menu_bar_visible(True, False))+ self.assertTrue(dock_visibility.menu_bar_visible(False, False))+if __name__ == "__main__":unittest.main()diff --git a/mac_app/tests/test_dock_window.py b/mac_app/tests/test_dock_window.pyindex 0d0ef71..ceebfc4 100644--- a/mac_app/tests/test_dock_window.py+++ b/mac_app/tests/test_dock_window.py@@ -1,4 +1,4 @@-"""Show in Dock through the real window, tray and launch code: which activation policy each moment+"""Show in Dock and Show in menu bar through the real window, tray and launch code: which activation policy each momentasks for. NSApp's calls are recorded rather than made, so no Dock icon or window appears."""import json@@ -52,8 +52,9 @@ class DockWindowTests(unittest.TestCase):patch.start()self.addCleanup(patch.stop)self.visible = False+ self.status_item = mock.Mock()self.tray = types.SimpleNamespace(- settings_store=self.store, hidden=False, notices=mock.Mock(),+ settings_store=self.store, hidden=False, notices=mock.Mock(), status_item_view=self.status_item,control_window=types.SimpleNamespace(window=types.SimpleNamespace(isVisible=lambda: self.visible)))self.tray.apply_activation_policy = lambda window_open=None: kvm_bridge_app.TrayApp.apply_activation_policy(self.tray, window_open)@@ -118,5 +119,86 @@ class DockWindowTests(unittest.TestCase):self.assertNotIn("show_in_dock", json.dumps(self.sent))+ def saved(self):+ return type(self.store)(self.store.path).current()++ def test_an_existing_settings_file_shows_beamer_in_the_menu_bar(self):+ self.assertTrue(self.saved()["show_in_tray"])+ self.assertTrue(self.window.tray_switch.value)+ self.tray.apply_activation_policy(window_open=False)+ self.status_item.setVisible_.assert_called_with(True)++ def test_turned_off_the_menu_bar_item_goes_and_the_choice_is_kept(self):+ self.window._set_show_in_tray(False)+ self.assertFalse(self.saved()["show_in_tray"])+ self.assertTrue(self.saved()["show_in_dock"])+ self.status_item.setVisible_.assert_called_with(False)+ self.assertEqual(self.policies[-1], REGULAR)++ def test_the_menu_bar_and_the_dock_are_never_both_off(self):+ self.window._set_show_in_dock(False)+ self.window._set_show_in_tray(False)+ self.assertTrue(self.saved()["show_in_tray"])+ self.assertTrue(self.window.tray_switch.value)+ self.window._set_show_in_dock(True)+ self.window._set_show_in_tray(False)+ self.window._set_show_in_dock(False)+ self.assertTrue(self.saved()["show_in_dock"])+ self.assertTrue(self.window.dock_switch.value)++ def test_the_switch_that_would_hide_the_last_one_is_dimmed(self):+ self.assertTrue(self.window.dock_switch.enabled and self.window.tray_switch.enabled)+ self.window._set_show_in_dock(False)+ self.assertFalse(self.window.tray_switch.enabled)+ self.assertTrue(self.window.tray_switch.value)+ self.window._set_show_in_dock(True)+ self.window._set_show_in_tray(False)+ self.assertFalse(self.window.dock_switch.enabled)+ self.assertTrue(self.window.dock_switch.value)++ def test_a_settings_file_with_both_off_still_shows_the_menu_bar(self):+ with self.store.lock:+ settings = self.store.current()+ settings.update(show_in_dock=False, show_in_tray=False)+ self.store.save_settings(settings)+ self.window._reflect_visibility()+ self.assertTrue(self.window.tray_switch.value)+ self.tray.apply_activation_policy(window_open=False)+ self.status_item.setVisible_.assert_called_with(True)+ self.assertEqual(self.policies[-1], ACCESSORY)++ def test_turning_the_dock_on_from_a_both_off_file_keeps_the_menu_bar_it_showed(self):+ with self.store.lock:+ settings = self.store.current()+ settings.update(show_in_dock=False, show_in_tray=False)+ self.store.save_settings(settings)+ self.window._set_show_in_dock(True)+ self.assertTrue(self.saved()["show_in_tray"])+ self.assertTrue(self.saved()["show_in_dock"])++ def test_with_the_menu_bar_off_a_second_launch_or_a_dock_click_raises_the_window(self):+ self.window._set_show_in_tray(False)+ self.assertEqual(self.policies[-1], REGULAR)+ # TrayApp.open_window is what the second-launch socket calls; the Dock click is the delegate.+ self.tray.control_window.show = self.show+ kvm_bridge_app.TrayApp.open_window(self.tray, None)+ self.assertTrue(self.visible)+ self.close()+ self.assertEqual(self.policies[-1], REGULAR)+ with mock.patch.object(kvm_bridge_app, "_reopen_window", self.show):+ kvm_bridge_app.applicationShouldHandleReopen_hasVisibleWindows_(None, None, False)+ self.assertTrue(self.visible)++ def test_same_on_all_machines_never_changes_this_macs_menu_bar_choice(self):+ self.window._set_show_in_tray(False)+ data = pc_message(True, 100, by=PEER)+ for section in (data, data["crossing"], data["design"]):+ section["show_in_tray"] = True+ self.window.apply_same(data, peer=PEER)+ self.assertFalse(self.saved()["show_in_tray"])+ self.window._set_same(True)+ self.assertNotIn("show_in_tray", json.dumps(self.sent))++if __name__ == "__main__":unittest.main()diff --git a/mac_app/tests/test_dormant_rows.py b/mac_app/tests/test_dormant_rows.pyindex 3a2b75a..0e33a96 100644--- a/mac_app/tests/test_dormant_rows.py+++ b/mac_app/tests/test_dormant_rows.py@@ -53,6 +53,8 @@ class DormantRowTests(unittest.TestCase):panel.open = Falsepanel.chosen = Nonepanel._heard_key = None+ panel.service = None+ panel._refresh_nearby = mock.Mock()panel.re_pair(TOKEN)diff --git a/mac_app/tests/test_driven_mac.py b/mac_app/tests/test_driven_mac.pyindex 250ea86..41b35c9 100644--- a/mac_app/tests/test_driven_mac.py+++ b/mac_app/tests/test_driven_mac.py@@ -280,6 +280,16 @@ class ScrollRemainderTests(InjectorCase):injector.inject_scroll(2)self.assertEqual(self.scrolls(), [(FakeQuartz.kCGScrollEventUnitLine, 2, 0)])+ def test_a_macs_scroll_is_posted_on_the_axes_it_was_read_from(self):+ # The wire is Core Graphics' axes as the driving Mac's tap read them, its natural setting+ # already applied (bridge.mouse_messages passes them as they are), so a Mac posts them as+ # they stand on both axes; a PC turns axis 2 round (win_app/tests/test_horizontal_scroll.py).+ for dy, dx in ((40, 0), (-40, 0), (0, 40), (0, -40)):+ with self.subTest(dy=dy, dx=dx):+ self.quartz.posted.clear()+ injector.inject_scroll_from_peer(dy, dx, "pixel", "macos")+ self.assertEqual(self.scrolls(), [(FakeQuartz.kCGScrollEventUnitPixel, dy, dx)])+def test_horizontal_carries_its_own_remainder(self):for _ in range(3):injector.inject_scroll(0, 0.5)diff --git a/mac_app/tests/test_effect_layouts.py b/mac_app/tests/test_effect_layouts.pyindex 835df18..399fa6c 100644--- a/mac_app/tests/test_effect_layouts.py+++ b/mac_app/tests/test_effect_layouts.py@@ -284,8 +284,10 @@ class ClassicPreviewTests(unittest.TestCase):fx = effects.preview_effect("glow")pen = effects.preview_scene(fx, 2.0, "corner", PALETTE)["pens"][0]w, h = effects.PREVIEW_SCREEN- self.assertLess(pen.bounds[0], w - effects.CLASSIC_ARM + 10)- self.assertGreater(pen.bounds[3], effects.CLASSIC_ARM - 10)+ # The arm is a real screen's, drawn at the preview's scale.+ arm = effects.CLASSIC_ARM / effects.PREVIEW_REAL+ self.assertLess(pen.bounds[0], w - arm + 10)+ self.assertGreater(pen.bounds[3], arm - 10)self.assertLessEqual(pen.bounds[2], w + 4)def test_aperture_is_a_light_effect_and_has_a_preview(self):diff --git a/mac_app/tests/test_frame_clock.py b/mac_app/tests/test_frame_clock.pyindex e0e39e9..9781dc8 100644--- a/mac_app/tests/test_frame_clock.py+++ b/mac_app/tests/test_frame_clock.py@@ -9,17 +9,47 @@ import AppKitimport Quartzfrom unittest import mock-from frame_clock import PREVIEW_MAX_RATE, FrameClock+from frame_clock import PREVIEW_MAX_RATE, FrameClock, set_divisorclass FrameClockTests(unittest.TestCase):+ def test_preferred_rate_uses_the_display_divisor(self):+ ranges = []++ class Link:+ def setPreferredFrameRateRange_(self, value):+ ranges.append(value)++ def addToRunLoop_forMode_(self, *_args):+ pass++ def invalidate(self):+ pass++ link = Link()+ screen = mock.Mock()+ screen.maximumFramesPerSecond.return_value = 120+ # A view in a window, as the previews give it: NSScreen itself cannot be patched under PyObjC.+ view = mock.Mock()+ view.window.return_value.screen.return_value = screen+ view.displayLinkWithTarget_selector_.return_value = link+ try:+ with mock.patch.object(Quartz, "CAFrameRateRangeMake", side_effect=lambda *args: args):+ for divisor, expected in ((1, (30, 120, 120)), (2, (30, 60, 60)), (4, (30, 30, 30))):+ set_divisor(divisor)+ clock = FrameClock(view, lambda: None)+ clock.start()+ clock.stop()+ self.assertEqual(ranges[-1], expected)+ finally:+ set_divisor(1)+def test_a_preview_clock_runs_at_sixty_at_most(self):ranges = []link = mock.Mock()link.setPreferredFrameRateRange_.side_effect = ranges.appendscreen = mock.Mock()screen.maximumFramesPerSecond.return_value = 120- # A view in a window, as the previews give it: NSScreen itself cannot be patched under PyObjC.view = mock.Mock()view.window.return_value.screen.return_value = screenview.displayLinkWithTarget_selector_.return_value = linkdiff --git a/mac_app/tests/test_glow_falloff.py b/mac_app/tests/test_glow_falloff.pynew file mode 100644index 0000000..d7ea1f1--- /dev/null+++ b/mac_app/tests/test_glow_falloff.py@@ -0,0 +1,109 @@+"""Inward alpha must fade before live and hosted glow layers meet their bounds."""++import sys+import math+from pathlib import Path+from unittest import mock++import pytest++sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "tools"))+from beam_live_offscreen import live_glow, layer_profile, profile+import tokens+from core import effects+++def assert_soft_end(values):+ assert values[0] > 10+ tail = values[int(len(values) * .8):] + [0]+ # A fractional band can leave the last sampled pixel more than half a pixel from zero;+ # Core Animation also dithers its 8-bit gradient by a few alpha levels.+ tolerance = math.ceil(2 * 255 / len(values)) + 2+ assert max(abs(a - b) for a, b in zip(tail, tail[1:])) <= tolerance+ assert values[-1] <= tolerance++[email protected]("style", ["glow", "beam"])[email protected]("edge", ["left", "right", "top", "bottom"])[email protected]("scale", [1, 2])[email protected]("size", ["small", "medium", "large"])+def test_edges_fade_without_a_step_at_the_panel_boundary(style, edge, scale, size):+ assert_soft_end(profile(live_glow(edge, size, style=style), edge, scale))++[email protected]("style", ["glow", "beam"])[email protected]("corner", ["top_left", "top_right", "bottom_left", "bottom_right"])[email protected]("scale", [1, 2])+def test_corner_walls_fade_without_a_step_at_the_layer_boundary(style, corner, scale):+ glow = live_glow("left", "medium", style=style, corner=corner)+ for wall, layer in zip(corner.split("_"), (glow.fill, glow.side)):+ assert_soft_end(layer_profile(layer, wall, scale))++[email protected]("style", ["glow", "beam"])+def test_thirds_keep_the_inward_fade(style):+ assert_soft_end(profile(live_glow("left", "medium", style=style, third=True), "left", 2))+++def test_style_changes_refresh_the_existing_inward_mask():+ import kvm_bridge_app++ glow = live_glow("left", "medium", style="beam")+ for style in ("glow", "beam", "glow"):+ glow.controller.cfg.crossing["glow_style"] = style+ with mock.patch.object(kvm_bridge_app.time, "monotonic", return_value=100):+ glow._draw()+ assert_soft_end(profile(glow, "left", 2))++[email protected]("style", ["glow", "beam"])+def test_design_preview_uses_the_same_inward_fade(style):+ import AppKit+ import kvm_bridge_app+ import previews++ source = live_glow("right", "medium", style=style)+ screen = AppKit.NSView.alloc().initWithFrame_(AppKit.NSMakeRect(0, 0, 300, 180))+ glow = previews.hosted_edge(kvm_bridge_app.EdgeGlow)(source.controller, source.logger, screen)+ glow.timer = mock.Mock()+ glow.visible = True+ glow.mac_edge, glow.region, glow.centre = source.mac_edge, source.region, source.centre+ with mock.patch.object(kvm_bridge_app.time, "monotonic", return_value=100):+ glow._draw()+ assert_soft_end(layer_profile(glow.fill, "right", 2))++[email protected]("style", ["glow", "beam"])[email protected]("colour", list(tokens.PALETTES) + list(effects.PACK_IDS))+def test_every_palette_keeps_the_inward_alpha_profile(style, colour):+ import kvm_bridge_app++ glow = live_glow("left", "medium", style=style)+ expected = profile(glow, "left", 2)+ glow.controller.cfg.crossing["glow_colour"] = colour+ with mock.patch.object(kvm_bridge_app.time, "monotonic", return_value=100):+ glow._draw()+ values = profile(glow, "left", 2)+ assert max(abs(a - b) for a, b in zip(expected, values)) <= 2+ assert_soft_end(values)++[email protected]("style", ["glow", "beam"])[email protected]("pressure", [.1, .5, 1.0])+def test_pressure_and_menu_bar_depth_do_not_clip_the_fade(style, pressure):+ import kvm_bridge_app++ glow = live_glow("top", "medium", style=style, pressure=pressure)+ with mock.patch.object(kvm_bridge_app, "menu_bar_height", return_value=24), \+ mock.patch.object(kvm_bridge_app.time, "monotonic", return_value=100):+ glow._draw()+ assert_soft_end(profile(glow, "top", 2))+++def test_screen_colour_space_does_not_change_the_alpha():+ import Quartz++ glow = live_glow("left", "medium", style="glow")+ screen = profile(glow, "left", 2)+ srgb = profile(glow, "left", 2, Quartz.CGColorSpaceCreateWithName(Quartz.kCGColorSpaceSRGB))+ assert max(abs(a - b) for a, b in zip(screen, srgb)) <= 2diff --git a/mac_app/tests/test_hide_addresses_window.py b/mac_app/tests/test_hide_addresses_window.pyindex b219f20..483df4c 100644--- a/mac_app/tests/test_hide_addresses_window.py+++ b/mac_app/tests/test_hide_addresses_window.py@@ -37,7 +37,8 @@ class HideAddressesWindowTests(unittest.TestCase):self.window = kvm_bridge_app.ControlWindow.alloc().initWithController_settingsStore_logger_(WakingController(store.load(), logger=logger), store, logger)- self.service = mock.Mock(machines=mock.Mock(return_value=[]), error=None, code=None)+ self.service = mock.Mock(machines=mock.Mock(return_value=[]), error=None, code=None,+ nearby_status={"state": "inactive"})self.window.panel.service = self.servicedef tearDown(self):diff --git a/mac_app/tests/test_mac_arrival_grace.py b/mac_app/tests/test_mac_arrival_grace.pyindex 0f355ff..1349773 100644--- a/mac_app/tests/test_mac_arrival_grace.py+++ b/mac_app/tests/test_mac_arrival_grace.py@@ -39,6 +39,26 @@ class ArrivalGrace(unittest.TestCase):self.assertGreaterEqual(x, return_edge.LANDING_CLEAR_PX, offset)self.assertLessEqual(x, BOUNDS[2] - 1 - return_edge.LANDING_CLEAR_PX, offset)+ def test_coming_home_through_the_notch_lands_mid_notch_just_below_it(self):+ # 1.5.3: an option to always come home through the same spot.+ self.assertEqual(CrossingEngine.notch_arrival_point((790, 938), 32, BOUNDS, displays=[BOUNDS]), (864, 34))++ def test_the_bridge_lands_at_the_notch_only_for_the_machine_returning_through_it(self):+ from types import SimpleNamespace+ import bridge+ warped = []+ fake = SimpleNamespace(+ notch_range=(790, 938), notch_depth=32, logger=None,+ book=SimpleNamespace(zones=lambda: [dict(peer="rig", kind="notch", return_here=True)]),+ _current_desktop_bounds=lambda: BOUNDS, _current_displays=lambda: [BOUNDS],+ _warp_cursor_to=warped.append, _notify_crossing=lambda *_: None)+ bridge.KVMController._arrive(fake, "right", 0.5, peer="rig")+ bridge.KVMController._arrive(fake, "right", 0.5, peer="acg")+ fake.notch_range = None+ bridge.KVMController._arrive(fake, "right", 0.5, peer="rig")+ self.assertEqual(warped[0], (864, 34))+ self.assertEqual([point[0] for point in warped[1:]], [BOUNDS[2] - 1 - 2.0] * 2)+def test_the_push_that_brought_input_home_does_not_go_on_to_another_machine(self):machine = three_ways()machine.start_grace(10.0)diff --git a/mac_app/tests/test_mac_links.py b/mac_app/tests/test_mac_links.pyindex e97e49e..de9da18 100644--- a/mac_app/tests/test_mac_links.py+++ b/mac_app/tests/test_mac_links.py@@ -479,6 +479,28 @@ class ComingHomeTests(Base):def arrives(self, message):self.link.arrives(self.controller, message)+ def test_a_takeover_comes_home_and_names_the_new_driver(self):+ peer = dict(self.controller.book.data["peers"][0], id=protocol.id_text(OTHER_ID),+ token="second-peer", name="Desk-PC")+ self.controller.book.data["peers"].append(peer)+ message = protocol.switch_v6(1, protocol.read_id(self.own))+ message["data"]["taken_over_by"] = protocol.id_text(OTHER_ID)+ self.controller.crossing.touching = True+ self.controller.crossing.pressure = 10+ self.arrives(message)+ self.assertFalse(self.controller.redirecting)+ self.assertEqual(self.alerts, ["Desk-PC took over Office PC"])+ self.assertEqual(FakeQuartz.associate_calls[-1], True)+ self.assertFalse(self.controller.pointer._hidden)+ self.assertFalse(self.controller.crossing.touching)+ self.assertEqual(self.controller.crossing.pressure, 0)++ def test_a_takeover_by_an_unknown_machine_uses_the_fallback_name(self):+ message = protocol.switch_v6(1, protocol.read_id(self.own))+ message["data"]["taken_over_by"] = protocol.id_text(OTHER_ID)+ self.arrives(message)+ self.assertEqual(self.alerts, ["Another machine took over Office PC"])+def test_the_peer_sending_input_home_lands_the_pointer_where_it_left(self):self.arrives(protocol.switch_v6(1, protocol.read_id(self.own), "right", 0.25))self.assertFalse(self.controller.redirecting)diff --git a/mac_app/tests/test_mac_loopback.py b/mac_app/tests/test_mac_loopback.pyindex a01cbb3..3f7d7cb 100644--- a/mac_app/tests/test_mac_loopback.py+++ b/mac_app/tests/test_mac_loopback.py@@ -63,6 +63,16 @@ class MacDrivesPcTests(unittest.TestCase):keys = [("key", "ctrl", True), ("key", "a", True), ("key", "a", False), ("key", "ctrl", False)]self.assertTrue(wait_for(lambda: [call for call in self.pc.injected() if call[0] == "key"] == keys), self.pc.injected())+ def test_caps_lock_from_the_redirecting_mac_reaches_the_windows_responder(self):+ self.cross()+ event = {+ FakeQuartz.kCGKeyboardEventKeycode: 0x39,+ "flags": 0,+ }+ self.assertIsNone(self.tap((FakeQuartz.kCGEventFlagsChanged, event)))+ caps = [("key", "caps_lock", True), ("key", "caps_lock", False)]+ self.assertTrue(wait_for(lambda: [call for call in self.pc.injected() if call[0] == "key"] == caps), self.pc.injected())+def test_a_key_held_when_the_input_comes_home_is_released_on_the_pc_first(self):self.cross()self.tap(key_event(True, A_KEYCODE, "a"))@@ -112,6 +122,25 @@ class PcDrivesMacTests(unittest.TestCase):calls = [call for call in self.duo.mac_injector.seen() if call[0] in ("key", "move")]self.assertEqual(calls, [("key", "a", True), ("move", -4, 5), ("key", "a", False)])+ def test_caps_lock_from_the_windows_peer_reaches_the_mac_injector(self):+ pc = self.duo.pc+ for kind in (protocol.MSG_KEYDOWN, protocol.MSG_KEYUP):+ self.assertIsNotNone(pc.acked(pc.key(kind, "caps_lock")))+ caps = [("key", "caps_lock", True), ("key", "caps_lock", False)]+ self.assertTrue(wait_for(lambda: [call for call in self.duo.mac_injector.seen() if call[0] == "key"] == caps))++ def test_caps_lock_shortcut_hands_the_pcs_input_home_while_the_mac_is_driven(self):+ self.duo.link_mac_to_pc()+ self.duo.mac.cfg.trigger_key = "caps_lock"+ self.duo.mac.trigger_code = 0x39+ self.duo.mac.cfg.crossing["methods"] = ("edge", "shortcut")+ event = {FakeQuartz.kCGKeyboardEventKeycode: 0x39, "flags": 0}+ tap = self.duo.mac._event_tap_callback++ self.assertIs(tap(None, FakeQuartz.kCGEventFlagsChanged, event, None), event)+ self.assertIsNone(tap(None, FakeQuartz.kCGEventFlagsChanged, event, None))+ self.assertTrue(wait_for(lambda: not self.duo.mac.receiving), "the PC kept driving after the Caps Lock shortcut")+def test_the_macs_own_events_pass_through_untouched_while_the_pc_drives(self):event = {"location": (400.0, 300.0), FakeQuartz.kCGMouseEventDeltaX: 5, FakeQuartz.kCGMouseEventDeltaY: 0}self.assertIs(self.duo.mac._event_tap_callback(None, FakeQuartz.kCGEventMouseMoved, event, None), event)diff --git a/mac_app/tests/test_machines_panel.py b/mac_app/tests/test_machines_panel.pyindex 41777b2..ff0b4a8 100644--- a/mac_app/tests/test_machines_panel.py+++ b/mac_app/tests/test_machines_panel.py@@ -55,6 +55,14 @@ class FakeService:self.paired = []self.qr = "beamer://pair?host=192.0.2.9&port=24821&code=123456&k=" + "A" * 22self.result = None+ self.nearby_status = {"state": "inactive", "seconds_left": 0, "peers": [], "peer": None,+ "sas": None, "attempt": None}+ self.nearby_begun = 0+ self.nearby_cancelled = 0+ self.nearby_chosen = []+ self.nearby_confirmed = []+ self.nearby_choose_error = None+ self.nearby_confirm_error = Nonedef begin_pairing(self):self.begun += 1@@ -66,6 +74,32 @@ class FakeService:self.cancelled += 1self.code = None+ def begin_nearby(self):+ self.nearby_begun += 1+ self.nearby_status = {"state": "searching", "seconds_left": 60, "peers": [], "peer": None,+ "sas": None, "attempt": None}++ def cancel_nearby(self):+ self.nearby_cancelled += 1+ self.nearby_status = {"state": "inactive", "seconds_left": 0, "peers": [], "peer": None,+ "sas": None, "attempt": None}++ def choose_nearby(self, machine):+ self.nearby_chosen.append(machine)+ if self.nearby_choose_error is not None:+ error, self.nearby_choose_error = self.nearby_choose_error, None+ self.nearby_status = {**self.nearby_status, "state": "expired"}+ raise error+ self.nearby_status = {**self.nearby_status, "state": "exchanging", "peer": machine}++ def confirm_nearby(self, sas, attempt):+ self.nearby_confirmed.append((sas, attempt))+ if self.nearby_confirm_error is not None:+ error, self.nearby_confirm_error = self.nearby_confirm_error, None+ self.nearby_status = {**self.nearby_status, "state": "refused"}+ raise error+ self.nearby_status = {**self.nearby_status, "state": "waiting"}+def machines(self):return self.heard@@ -403,7 +437,7 @@ class FollowTheFirstMachineTests(Base):class ShowingACodeTests(Base):- # The pairing QR is hidden until 1.6 (core.feature_flags); these tests prove both states.+ # Keep the rollback gate covered beside 1.6's default visible QR.def test_while_the_qr_flag_is_off_the_code_shows_without_a_qr(self):with mock.patch.object(feature_flags, "PAIRING_QR_VISIBLE", False), \mock.patch.object(kvm_bridge_app.machines_panel.pairing, "pairing_address", return_value="192.0.2.9"):@@ -412,6 +446,7 @@ class ShowingACodeTests(Base):self.panel.refresh()self.assertEqual(self.panel.shown_code_boxes.value, "482913")self.assertIn("192.0.2.9", self.panel.code_address.text)+ self.assertTrue(self.panel.phone_button.view.isHidden())self.assertTrue(self.panel.qr_view.isHidden())self.assertTrue(self.panel.qr_caption.view.isHidden())@@ -432,6 +467,16 @@ class ShowingACodeTests(Base):self.assertEqual(render.call_args.args[0], self.service.qr)self.assertTrue(self.panel.show_button.view.isHidden())+ @mock.patch.object(feature_flags, "PAIRING_QR_VISIBLE", True)+ def test_pair_a_phone_opens_the_sheet_and_starts_the_qr_host_flow_in_one_action(self):+ with mock.patch.object(kvm_bridge_app.machines_panel.pairing, "pairing_address", return_value="192.0.2.9"):+ self.panel.pair_phone()+ self.panel.refresh()+ self.assertTrue(self.panel.open)+ self.assertEqual(self.service.begun, 1)+ self.assertEqual(self.panel.shown_code_boxes.value, "482913")+ self.assertIsNotNone(self.panel.qr_view.image())+@mock.patch.object(feature_flags, "PAIRING_QR_VISIBLE", True)def test_with_addresses_hidden_there_is_no_qr_and_no_address(self):self.controller.cfg.hide_addresses = True@@ -493,6 +538,86 @@ class EnteringACodeTests(Base):self.said = []self.window._say = lambda message, ink="ink_2": self.said.append((message, ink))+ def test_pair_nearby_opens_the_sheet_and_shows_the_searching_instruction(self):+ self.panel.pair_nearby()+ self.panel.refresh()+ self.assertTrue(self.panel.open)+ self.assertEqual(self.service.nearby_begun, 1)+ self.assertEqual(self.panel.nearby_status_label.text,+ "Press Pair nearby on the other machine within 60 seconds.")+ self.assertFalse(self.panel.nearby_view.isHidden())++ def test_choosing_nearby_peer_is_explicit_and_sas_waits_for_authenticated_confirmation_state(self):+ first = heard("First PC", pair_id=None, id="first")+ second = heard("Second PC", pair_id=None, id="second", address="192.0.2.41")+ self.service.nearby_status = {"state": "choosing", "seconds_left": 55, "peers": [first, second],+ "peer": None, "sas": None, "attempt": None}+ self.panel.refresh()+ self.assertEqual(len(self.panel.nearby_choices.arrangedSubviews()), 2)+ self.assertEqual(self.panel.nearby_status_label.text, "Choose a machine to pair nearby.")+ self.panel._choose_nearby(second)+ self.assertEqual(self.service.nearby_chosen, [second])+ self.assertEqual(self.service.nearby_status["state"], "exchanging")+ self.service.nearby_status = {**self.service.nearby_status, "state": "confirm", "sas": "004283",+ "attempt": "attempt-1"}+ self.panel.refresh()+ self.assertEqual(self.panel.nearby_sas.text, "004 283")+ self.assertTrue(self.panel.nearby_confirm.enabled)+ self.assertEqual(self.panel.nearby_confirm.view.keyEquivalent(), "")+ self.assertEqual(self.panel.nearby_peer_label.text, "Selected: Second PC · Mac")+ self.panel._confirm_nearby()+ self.assertEqual(self.service.nearby_confirmed, [("004283", "attempt-1")])+ self.assertEqual(self.service.nearby_status["state"], "waiting")+ self.assertEqual(self.panel.nearby_status_label.text, "Waiting for confirmation on the other machine.")++ def test_confirm_uses_only_the_sas_and_attempt_that_were_displayed(self):+ peer = heard("Studio", pair_id=None)+ self.service.nearby_status = {"state": "confirm", "seconds_left": 35, "peers": [], "peer": peer,+ "sas": "004283", "attempt": "displayed-attempt"}+ self.panel.refresh()+ self.service.nearby_status = {**self.service.nearby_status, "sas": "999999", "attempt": "new-attempt"}+ self.panel._confirm_nearby()+ self.assertEqual(self.service.nearby_confirmed, [("004283", "displayed-attempt")])++ def test_rejected_confirmation_refreshes_the_refused_state(self):+ peer = heard("Studio", pair_id=None)+ self.service.nearby_status = {"state": "confirm", "seconds_left": 35, "peers": [], "peer": peer,+ "sas": "004283", "attempt": "attempt-1"}+ self.panel.refresh()+ self.service.nearby_confirm_error = pairing.PairingError(pairing.ERROR_REFUSED)+ self.panel._confirm_nearby()+ self.assertEqual(self.panel.nearby_status_label.text,+ "Nearby pairing refused. Use a new window to try again.")++ def test_stale_peer_choice_refreshes_the_expired_state_without_raising(self):+ peer = heard("Studio", pair_id=None)+ self.service.nearby_status = {"state": "choosing", "seconds_left": 1, "peers": [peer], "peer": None,+ "sas": None, "attempt": None}+ self.panel.refresh()+ self.service.nearby_choose_error = pairing.PairingError(pairing.ERROR_NOT_PAIRING)+ self.panel._choose_nearby(peer)+ self.assertEqual(self.panel.nearby_status_label.text,+ "Nearby pairing expired. Press Pair nearby to try again.")++ def test_selected_peer_name_and_platform_are_shown_without_an_address(self):+ self.controller.cfg.hide_addresses = True+ peer = heard("Studio", pair_id=None, address="192.0.2.41", platform="macos")+ self.service.nearby_status = {"state": "confirm", "seconds_left": 35, "peers": [], "peer": peer,+ "sas": "004283", "attempt": "attempt-1"}+ self.panel.refresh()+ self.assertEqual(self.panel.nearby_peer_label.text, "Selected: Studio · Mac")+ self.assertNotIn("192.0.2.41", self.panel.nearby_peer_label.text)++ def test_closing_the_sheet_cancels_nearby_and_starting_the_code_route_cancels_it_too(self):+ self.panel.pair_nearby()+ self.panel._toggle_sheet()+ self.assertGreaterEqual(self.service.nearby_cancelled, 1)+ self.panel._toggle_sheet()+ self.panel.pair_nearby()+ self.panel._show_code()+ self.assertGreaterEqual(self.service.nearby_cancelled, 2)+ self.assertEqual(self.service.begun, 1)+def run_pair(self):threads = []@@ -776,6 +901,31 @@ class CodeBoxCentringTests(Base):self.window.window.firstResponder().insertText_("408819")self.assertEqual(boxes.value, "408819")+ def test_pasting_digits_into_middle_box_spreads_forward_and_focuses_after(self):+ self.panel._toggle_sheet()+ boxes = self.panel.code_boxes+ self.window.window.makeFirstResponder_(boxes.fields[2])+ self.window.window.firstResponder().insertText_("4-5-6")+ self.assertEqual(boxes.fields[2].stringValue(), "4")+ self.assertEqual(boxes.fields[3].stringValue(), "5")+ self.assertEqual(boxes.fields[4].stringValue(), "6")+ self.assertEqual(self.window.window.firstResponder().delegate(), boxes.fields[5])++ def test_a_digit_typed_beside_a_held_one_replaces_it_and_leaves_the_next_box(self):+ self.panel._toggle_sheet()+ boxes = self.panel.code_boxes+ window = self.window.window+ window.makeFirstResponder_(boxes.fields[0])+ window.firstResponder().insertText_("408819")+ for caret in (1, 0):+ with self.subTest(caret=caret):+ window.makeFirstResponder_(boxes.fields[2])+ window.firstResponder().setSelectedRange_((caret, 0))+ window.firstResponder().insertText_("7")+ self.assertEqual(boxes.value, "407819")+ boxes.fields[2].setStringValue_("8")+ boxes._remember()+class TrayTests(Base):"""The menu bar's side: one machine's switch, every machine's tick, a pairing this Mac hosted."""diff --git a/mac_app/tests/test_notch_style_previews.py b/mac_app/tests/test_notch_style_previews.pyindex dd4a1d1..7461060 100644--- a/mac_app/tests/test_notch_style_previews.py+++ b/mac_app/tests/test_notch_style_previews.py@@ -99,9 +99,11 @@ class HostedNotchCrossingPreviewTest(unittest.TestCase):bounds = changed_bounds(without_marks, with_marks)self.assertIsNotNone(bounds)left, top, right, bottom = bounds- self.assertGreaterEqual(left, 90)- self.assertLessEqual(right, 210)- self.assertGreaterEqual(top, 55)+ # Centred on the notch, in a camera fitted to the crossing rather than the whole journey.+ self.assertGreaterEqual(left, 65)+ self.assertLessEqual(right, 235)+ self.assertAlmostEqual((left + right) / 2, 150, delta=8)+ self.assertGreaterEqual(top, 40)self.assertLessEqual(bottom, 115)def test_renderer_frame_uses_the_selected_notch_duration(self):diff --git a/mac_app/tests/test_pages.py b/mac_app/tests/test_pages.pyindex a5a5914..bbcc713 100644--- a/mac_app/tests/test_pages.py+++ b/mac_app/tests/test_pages.py@@ -365,12 +365,22 @@ class SendItemsTest(unittest.TestCase):def test_each_machine_this_mac_sends_to_has_its_own_and_the_one_input_is_on_brings_it_back(self):peers = [self.entry("A", "Bee"), self.entry("B", "Sea"), self.entry("C", "Oak", send=False)]- self.assertEqual(pages.send_items(peers, None, False), [("A", "Send input to Bee"), ("B", "Send input to Sea")])- self.assertEqual(pages.send_items(peers, "B", False), [("A", "Send input to Bee"), ("B", "Bring input back")])+ self.assertEqual(pages.send_items(peers, None, False), [("A", "Send input to Bee", True), ("B", "Send input to Sea", True)])+ self.assertEqual(pages.send_items(peers, "B", False), [("A", "Send input to Bee", True), ("B", "Bring input back", True)])def test_a_machine_not_in_use_has_no_send_item(self):peers = [self.entry("A", "Bee"), self.entry("B", "Sea"), self.entry("C", "Oak", in_use=False)]- self.assertEqual(pages.send_items(peers, None, False), [("A", "Send input to Bee"), ("B", "Send input to Sea")])+ self.assertEqual(pages.send_items(peers, None, False), [("A", "Send input to Bee", True), ("B", "Send input to Sea", True)])++ def test_a_machine_whose_link_is_down_is_listed_dimmed_as_unavailable(self):+ peers = [self.entry("A", "Bee"), self.entry("B", "Sea")]+ live = lambda entry: entry["id"] == "A"+ self.assertEqual(pages.send_items(peers, None, False, live=live),+ [("A", "Send input to Bee", True), ("B", "Sea is unavailable", False)])++ def test_the_machine_input_is_on_can_always_bring_it_back(self):+ peers = [self.entry("A", "Bee"), self.entry("B", "Sea")]+ self.assertEqual(pages.send_items(peers, "B", False, live=lambda entry: False)[1], ("B", "Bring input back", True))def test_a_nameless_machines_address_is_hidden_when_asked(self):peers = [self.entry("A", ""), self.entry("B", "Sea")]diff --git a/mac_app/tests/test_pairing_pixels.py b/mac_app/tests/test_pairing_pixels.pyindex d655959..60c9936 100644--- a/mac_app/tests/test_pairing_pixels.py+++ b/mac_app/tests/test_pairing_pixels.py@@ -19,6 +19,7 @@ import machines_panelimport kvm_bridge_appimport themeimport widgets+from core import feature_flagsdef bitmap(view, scale):@@ -102,6 +103,7 @@ class PairingPixelsTests(unittest.TestCase):self.panel.rows = lambda: []self.panel.service = SimpleNamespace(code=None, machines=lambda: [], seconds_left=60, outcome=None,known=None, error=None, tcp_error=None, tcp_port=24821,+ nearby_status={"state": "inactive"},qr_text=lambda address: None)self.address_patch = mock.patch.object(machines_panel.pairing, "pairing_address", return_value="192.0.2.20")self.address_patch.start()@@ -177,7 +179,9 @@ class PairingPixelsTests(unittest.TestCase):save(bitmap(panel.sheet.view, scale), self.renders / f"mac-sheet-empty-{scale}x.png")order = list(panel.machines_module.body.arrangedSubviews())self.assertLess(order.index(panel.pair_button.view.superview()), order.index(panel.list))- self.assertEqual(panel.pair_button.style, "primary")+ self.assertEqual(panel.nearby_button.style, "primary")+ self.assertNotEqual(panel.pair_button.style, "primary")+ self.assertTrue(panel.phone_button.view.isHidden())self.assertFalse(panel.pair_button.view.isHidden())entry = {"token": "synthetic-test-token", "id": "test-pc", "name": "Studio PC", "platform": "windows","host": "192.0.2.30", "port": 24820, "send": True, "allow_drive": True, "linked": True}@@ -188,6 +192,12 @@ class PairingPixelsTests(unittest.TestCase):for scale in (1, 2):save(bitmap(panel.machines_module.view, scale), self.renders / f"mac-machines-filled-{scale}x.png")+ def test_phone_button_visibility_tracks_the_feature_flag(self):+ self.assertTrue(self.panel.phone_button.view.isHidden())+ with mock.patch.object(feature_flags, "PAIRING_QR_VISIBLE", True):+ self.panel._machines_module()+ self.assertFalse(self.panel.phone_button.view.isHidden())+def test_machine_addresses_use_the_reading_face_without_mono_dot_spacing(self):panel = self.panelpanel.service.code = "482913"@@ -239,6 +249,7 @@ class PairingPixelsTests(unittest.TestCase):for scale in (1, 2):save(bitmap(self.panel.sheet.view, scale), self.renders / f"mac-sheet-shown-{scale}x.png")+ @mock.patch.object(feature_flags, "PAIRING_QR_VISIBLE", False)def test_pairing_dialog_hides_the_qr_and_caption(self):self.panel.service.code = "482913"self.panel.service.qr_text = lambda _address: "synthetic pairing payload"diff --git a/mac_app/tests/test_part_edge_thirds.py b/mac_app/tests/test_part_edge_thirds.pyindex 1d268b2..c603bd0 100644--- a/mac_app/tests/test_part_edge_thirds.py+++ b/mac_app/tests/test_part_edge_thirds.py@@ -51,19 +51,19 @@ class PartEdgeThirds(Page):return self.window.crossing_ledger.rows[BEE]def picked(self):- return [part for part, button in self.row().edge_glyph.hits.items()+ return [part for part, button in self.row().contact().segments.items()if button.accessibilityValue() == "on"]def pick_thirds(self, picked):self.whole_edge()for part in ways.PARTS:if part not in picked:- press(self.row().edge_glyph.hits[part])+ press(self.row().contact().segments[part])def whole_edge(self):if self.picked():- press(self.row().edge_title)- press(self.row().edge_title)+ press(self.row().contact())+ press(self.row().contact())def third_point(self, third, offset=0, peer=BEE):canvas = self.window.atlas_canvas@@ -96,7 +96,7 @@ class PartEdgeThirds(Page):def test_all_seven_choices_round_trip_ledger_saved_intent_and_map(self):window = self.layout()row = self.row()- buttons = dict(row.edge_glyph.hits)+ buttons = dict(row.contact().segments)for count in (1, 2, 3):for picked in itertools.combinations(ways.PARTS, count):with self.subTest(picked=picked):@@ -110,7 +110,7 @@ class PartEdgeThirds(Page):self.assertEqual(window.atlas_canvas.states[BEE]["picked_thirds"], list(picked))self.assertIs(self.row(), row)for part, button in buttons.items():- self.assertIs(row.edge_glyph.hits[part], button)+ self.assertIs(row.contact().segments[part], button)def test_map_clicks_each_third_on_each_side_and_ledger_follows(self):for side in ways.EDGES:@@ -228,12 +228,12 @@ class PartEdgeThirds(Page):with self.subTest(scoped=scoped):window = self.layout(scoped=scoped)self.pick_thirds(["start", "end"])- press(self.row().edge_title)+ press(self.row().contact())window._atlas_layout_changed(copy.deepcopy(self.store.current()["layout"]), BEE, snap=False)self.assertFalse(set(self.ways_of(BEE)["methods"]) & {"edge", "part"})self.assertEqual(self.picked(), [])window.atlas_canvas._draw(False)self.assertFalse(any(key[-1] == "track" for key in window.atlas_canvas.third_layers))- press(self.row().edge_title)+ press(self.row().contact())self.assertEqual(self.picked(), list(ways.PARTS))self.assertEqual(self.ways_of(BEE)["methods"], ["edge"])diff --git a/mac_app/tests/test_pointer_hide.py b/mac_app/tests/test_pointer_hide.pyindex eccf244..56af397 100644--- a/mac_app/tests/test_pointer_hide.py+++ b/mac_app/tests/test_pointer_hide.py@@ -2,6 +2,7 @@pointer is visible whenever input is local, by whichever path it came home, so a hide is neverleft behind. A fake Quartz counts the hide and show calls, which must balance."""+import dataclassesimport osimport sysimport threading@@ -166,5 +167,63 @@ class ControllerPointerTests(unittest.TestCase):self.assertEqual((len(CountingQuartz.hide_calls), len(CountingQuartz.show_calls)), (5, 5))+class DrivenPointerTests(unittest.TestCase):+ """Once a driver lets go of this Mac its pointer is hidden, until it moves or a driver returns."""++ def setUp(self):+ CountingQuartz.reset_cursor_spies()+ CountingQuartz.cursor_pin_location = (300.0, 400.0)+ self.controller = KVMController(make_config(PAIRED_TOKEN), logger=quiet_logger(), quartz=CountingQuartz, clock=FakeClock(),+ clipboard=FakeClipboard(""), link_factory=FakeLink, desktop_bounds=lambda: (0, 0, 1920, 1080))+ self.idle = self.controller.idle_pointer+ self.idle._poll, self.idle._settle = 0.01, 0.02++ def tearDown(self):+ self.idle.cancel()+ CountingQuartz.cursor_pin_location = FakeQuartz.cursor_pin_location++ def hidden(self):+ return len(CountingQuartz.hide_calls) - len(CountingQuartz.show_calls)++ def wait_shown(self):+ for _ in range(200):+ if self.hidden() == 0 and not self.idle.hidden:+ return True+ threading.Event().wait(0.005)+ return False++ def test_the_driver_letting_go_hides_it(self):+ self.controller.set_receiving(True)+ self.assertEqual(self.hidden(), 0)+ self.controller.set_receiving(False)+ self.assertEqual(self.hidden(), 1)++ def test_a_driver_arriving_shows_it(self):+ self.controller.set_receiving(True)+ self.controller.set_receiving(False)+ self.controller.set_receiving(True)+ self.assertEqual(self.hidden(), 0)++ def test_moving_the_pointer_shows_it(self):+ self.controller.set_receiving(True)+ self.controller.set_receiving(False)+ threading.Event().wait(0.06)+ self.assertEqual(self.hidden(), 1)+ CountingQuartz.cursor_pin_location = (301.0, 400.0)+ self.assertTrue(self.wait_shown())++ def test_switched_off_the_driver_letting_go_leaves_it(self):+ self.controller.cfg = dataclasses.replace(self.controller.cfg, hide_idle_pointer=False)+ self.controller.set_receiving(True)+ self.controller.set_receiving(False)+ self.assertEqual(self.hidden(), 0)++ def test_stopping_shows_it(self):+ self.controller.set_receiving(True)+ self.controller.set_receiving(False)+ self.controller.stop()+ self.assertEqual(self.hidden(), 0)++if __name__ == "__main__":unittest.main()diff --git a/mac_app/tests/test_same_on_both.py b/mac_app/tests/test_same_on_both.pyindex 8c240c4..c6fae6e 100644--- a/mac_app/tests/test_same_on_both.py+++ b/mac_app/tests/test_same_on_both.py@@ -67,9 +67,10 @@ class SameOnBothTests(unittest.TestCase):self.window._design_states[PEER] = {"set_at": 100, "by": PEER,"values": {"effect_length": "long"}}self.window._refresh_design_follow()- self.assertIs(self.window.follow_select, choice)- self.assertTrue(cell.isEnabled())- self.assertEqual(cell.toolTip(), cell.title())+ self.assertIsNot(self.window.follow_select, choice)+ recovered = next(cell for value, cell in self.window.follow_select.items if value == PEER)+ self.assertTrue(recovered.isEnabled())+ self.assertEqual(recovered.toolTip(), recovered.title())def setUp(self):capture = mock.patch.object(WakingController, "start_input_capture")diff --git a/mac_app/tests/test_settings_v6.py b/mac_app/tests/test_settings_v6.pyindex 9bbae42..977824b 100644--- a/mac_app/tests/test_settings_v6.py+++ b/mac_app/tests/test_settings_v6.py@@ -756,7 +756,8 @@ class PairedAndRemovedTests(Base):after = self.settings()self.assertEqual([peer["id"] for peer in after["peers"]], [PEER_ID])# Only the new machine's own edge, which every machine paired starts with.- self.assertEqual(after["zones"], [{"peer": PEER_ID, "kind": "edge", "side": "right"}])+ self.assertEqual(after["zones"], [{"peer": PEER_ID, "kind": "edge", "side": "right",+ "contact_span": [0.0, 1.0], "target_span": [0.0, 1.0]}])self.assertEqual(self.store.load().auth_token, OTHER_TOKEN)def test_a_pairing_that_cannot_be_written_raises_and_changes_nothing(self):@@ -778,7 +779,8 @@ class PairedAndRemovedTests(Base):self.store.add_peer(self.entry(SECOND_ID, OTHER_TOKEN))self.store.remove_peer(TOKEN)self.assertEqual(self.store.load().auth_token, OTHER_TOKEN)- self.assertEqual(self.settings()["zones"], [{"peer": SECOND_ID, "kind": "edge", "side": "right"}])+ self.assertEqual(self.settings()["zones"], [{"peer": SECOND_ID, "kind": "edge", "side": "right",+ "contact_span": [0.0, 1.0], "target_span": [0.0, 1.0]}])def test_removing_the_only_machine_leaves_this_one_unpaired_and_it_stays_so(self):self.store.remove_peer(TOKEN)@@ -1136,7 +1138,8 @@ class OverlapTests(Base):self.assertNotIn("part", zones)self.assertEqual(self.store.current()["peers"][0]["ways"]["thirds"], list(ways.PARTS))- def test_two_machines_keep_notch_intent_while_the_picture_compiles_one_notch(self):+ def test_an_old_file_with_two_notches_keeps_the_first_machine(self):+ # 1.5.3: the notch reaches one machine; an old file that ticked two keeps the first in ways order.def two_notches(s):s["peers"][0]["id"] = PEER_IDs["zones"] = [{**z, "peer": PEER_ID} for z in s["zones"]]@@ -1146,7 +1149,7 @@ class OverlapTests(Base):s["peers"].append(second)s["zones"].append({"peer": SECOND_ID, "kind": "notch"})saved = self.compiled(two_notches)- self.assertTrue(all(peer["ways"]["notch"] for peer in saved["peers"]))+ self.assertEqual([peer["ways"]["notch"] for peer in saved["peers"]], [True, False])self.assertEqual([zone["kind"] for zone in saved["zones"]].count("notch"), 1)diff --git a/mac_app/tests/test_status_memory.py b/mac_app/tests/test_status_memory.pynew file mode 100644index 0000000..824ad19--- /dev/null+++ b/mac_app/tests/test_status_memory.py@@ -0,0 +1,132 @@+"""Status refreshes retain current controls, not every control they replace."""+import gc+import unittest+import weakref+import tracemalloc+from types import SimpleNamespace+from unittest import mock++import objc++import widgets+from mac_app.tests.test_crossing_page_machines import Page, BEE, SEA, token+++class MenuLifetime(unittest.TestCase):+ def test_discarded_menu_releases_its_python_owner(self):+ with objc.autorelease_pool():+ menu = widgets.MenuChoice([("", "None")])+ reference = weakref.ref(menu)+ del menu+ gc.collect()+ self.assertIsNone(reference())++ def test_a_live_menu_still_dispatches_its_selection(self):+ selected = []+ menu = widgets.MenuChoice([("", "None"), ("peer", "Peer")], on_change=selected.append)+ menu.value = "peer"+ menu.target.fire_(menu.popup)+ self.assertEqual(selected, ["peer"])+++class IdleControls(unittest.TestCase):+ def test_unchanged_enabled_state_does_not_repaint_choices(self):+ controls = [widgets.Segmented([("a", "A"), ("b", "B")]),+ widgets.ChoiceTiles([("a", "A", "", widgets.box()), ("b", "B", "", widgets.box())]),+ widgets.Swatches([(name, name) for name in list(widgets.theme.PALETTES)[:2]])]+ for control in controls:+ control.value = control.values[0] if isinstance(control, widgets.Swatches) else "a"+ control.set_enabled(False)+ control.set_enabled(True)+ with mock.patch.object(widgets, "paint", wraps=widgets.paint) as paint, \+ mock.patch.object(widgets.theme, "tint", wraps=widgets.theme.tint) as tint:+ for _ in range(20):+ control.set_enabled(True)+ self.assertEqual(paint.call_count + tint.call_count, 0, type(control).__name__)+ control.set_enabled(False)+ self.assertEqual(control.view.alphaValue(), 0.45)+++class FollowRefresh(Page):+ def test_unchanged_ledger_row_does_not_retain_title_attributes(self):+ window = self.build([(BEE, token(100), "Bee")])+ row = window.crossing_ledger.rows[BEE]+ settings = self.store.current()+ entry = settings["peers"][0]+ row.refresh(settings, entry, True)+ tracemalloc.start()+ try:+ gc.collect()+ before = tracemalloc.take_snapshot()+ for _ in range(200):+ with objc.autorelease_pool():+ row.refresh(settings, entry, True)+ gc.collect()+ after = tracemalloc.take_snapshot()+ retained = sum(stat.size_diff for stat in after.compare_to(before, "filename")+ if stat.traceback[0].filename == widgets.__file__)+ self.assertLess(retained, 2048)+ row.refresh(settings, {**entry, "left_out": True}, True)+ self.assertEqual(row.leave.title(), "Put back")+ finally:+ tracemalloc.stop()++ def test_unchanged_sidebar_status_does_not_retain_a_string_per_tick(self):+ window = self.build([(BEE, token(100), "Bee")])+ state = SimpleNamespace(led="signal", blink=False, word="Connected", tone="signal")+ window.sidebar.set_link(state, "Bee")+ tracemalloc.start()+ try:+ gc.collect()+ before = tracemalloc.take_snapshot()+ for _ in range(200):+ with objc.autorelease_pool():+ window.sidebar.set_link(state, "Bee")+ gc.collect()+ after = tracemalloc.take_snapshot()+ retained = sum(stat.size_diff for stat in after.compare_to(before, "filename")+ if stat.traceback[0].filename == widgets.__file__)+ self.assertLess(retained, 2048)+ self.assertEqual(window.sidebar.header.accessibilityLabel(), "Connected, Bee")+ finally:+ tracemalloc.stop()++ def test_unchanged_ticks_keep_the_same_menu(self):+ window = self.build([(BEE, token(100), "Bee"), (SEA, token(150), "Sea")])+ window._refresh_design_follow()+ menu = window.follow_select+ for _ in range(100):+ with objc.autorelease_pool():+ window._refresh_design_follow()+ self.assertIs(window.follow_select, menu)++ def test_peer_and_selection_changes_reach_the_menu(self):+ window = self.build([(BEE, token(100), "Bee")])+ settings = self.store.current()+ self.store.save_settings({**settings, "peers": [{**settings["peers"][0], "label": "Renamed"}]})+ window.controller.cfg.design_follow_peer = BEE+ window._refresh_design_follow()+ self.assertEqual(window.follow_select.value, BEE)+ self.assertIn((BEE, "Renamed"), window.follow_select.choices)+ self.store.remove_peer(token(100))+ window._refresh_design_follow()+ self.assertEqual(window.follow_select.choices, [("", "None")])++ def test_changed_capabilities_and_arriving_design_update_availability(self):+ window = self.build([(BEE, token(100), "Bee")])+ known = {BEE: frozenset()}+ window._design_peer_caps = lambda: known+ window._refresh_design_follow()+ old = weakref.ref(window.follow_select)+ self.assertFalse(window.follow_select.items[1][1].isEnabled())+ known[BEE] = frozenset({"design_sync"})+ window._design_states[BEE] = {}+ window._refresh_design_follow()+ with objc.autorelease_pool():+ gc.collect()+ self.assertTrue(window.follow_select.items[1][1].isEnabled())+ self.assertIsNone(old())+++if __name__ == "__main__":+ unittest.main()diff --git a/mac_app/tests/test_window_geometry.py b/mac_app/tests/test_window_geometry.pyindex e63ddbd..1e2134e 100644--- a/mac_app/tests/test_window_geometry.py+++ b/mac_app/tests/test_window_geometry.py@@ -105,7 +105,7 @@ class WindowGeometryTests(unittest.TestCase):right = page.frame().size.width - left - body.frame().size.widthself.assertAlmostEqual(left, right, delta=1)- def test_ledger_uses_blocks_under_620_and_columns_above(self):+ def test_ledger_uses_blocks_under_its_least_table_width_and_columns_above(self):from mac_app.tests.test_crossing_page_machines import Page, BEE, tokenfixture = Page()fixture.setUp()@@ -119,7 +119,7 @@ class WindowGeometryTests(unittest.TestCase):ledger = window.crossing_ledgerledger.reflow()row = ledger.rows[BEE]- narrow = ledger.bounds().size.width < 620+ narrow = ledger.bounds().size.width < ledger.narrow_below()self.assertEqual(ledger.headers[0].view.isHidden(), narrow)machine, edge = row.cells["machine"].frame(), row.cells["edge"].frame()self.assertGreater(edge.origin.y, machine.origin.y) if narrow else self.assertEqual(diff --git a/mac_app/widgets.py b/mac_app/widgets.pyindex 0ac5cb3..9890d21 100644--- a/mac_app/widgets.py+++ b/mac_app/widgets.py@@ -1264,6 +1264,8 @@ class Segmented:motion.fade_paint(self.view, mark)def set_enabled(self, enabled):+ if enabled == self.enabled:+ returnself.enabled = enabledself.view.setAlphaValue_(1.0 if enabled else 0.45)for _value, cell, _words in self.cells:@@ -1293,14 +1295,13 @@ class MenuChoice:pin(self.popup, self.view, (0, 4, 0, 4))self.items = []self.set_choices(choices)- # PyObjC's target holds Python attributes outside the cyclic GC graph. A bound method- # here keeps this picker, its popup and its target alive after removal from the stack.+ # PyObjC cannot collect a cycle through an NSObject's Python attributes.owner = weakref.ref(self)def changed(sender):- choice = owner()- if choice is not None:- choice._changed(sender)+ menu = owner()+ if menu is not None:+ menu._changed(sender)self.target = _Target.alloc().initWithCallback_(changed)self.popup.setTarget_(self.target)@@ -1958,6 +1959,7 @@ class CodeBoxes:control.setAccessibilityLabel_(f"Digit {index + 1}")self.view.addArrangedSubview_(container)self.fields.append(control)+ self._held = [""] * digits@propertydef value(self):@@ -1966,6 +1968,10 @@ class CodeBoxes:def clear(self):for control in self.fields:control.setStringValue_("")+ self._remember()++ def _remember(self):+ self._held = [control.stringValue() for control in self.fields]def focus(self, window):window.makeFirstResponder_(self.fields[0])@@ -1994,13 +2000,24 @@ class CodeBoxes:def changed(self, control):index = self.fields.index(control)digits = "".join(character for character in control.stringValue() if character.isdigit())- if len(digits) > 1 and index == 0 or len(digits) >= len(self.fields):+ held = self._held[index]+ if len(digits) == 2 and held and held in digits:+ # One digit typed beside the one the box held, not a paste of two: it replaces it.+ digits = digits.replace(held, "", 1)+ if len(digits) >= len(self.fields):for position, control_at in enumerate(self.fields):control_at.setStringValue_(digits[position] if position < len(digits) else "")target = self.fields[min(len(digits), len(self.fields) - 1)]+ elif len(digits) > 1:+ for offset, digit in enumerate(digits):+ if index + offset < len(self.fields):+ self.fields[index + offset].setStringValue_(digit)+ filled = min(index + len(digits), len(self.fields))+ target = self.fields[filled] if filled < len(self.fields) else self.fields[-1]else:control.setStringValue_(digits[-1:] if digits else "")target = self.fields[index + 1] if digits and index + 1 < len(self.fields) else None+ self._remember()if target is not None and control.window() is not None:control.window().makeFirstResponder_(target)@@ -2012,6 +2029,7 @@ class CodeBoxes:if selector == "deleteBackward:" and not control.stringValue() and index > 0:previous = self.fields[index - 1]previous.setStringValue_("")+ self._remember()control.window().makeFirstResponder_(previous)return Truereturn False@@ -2235,8 +2253,10 @@ class Sidebar:self.response_rail.view.setAccessibilityLabel_(spoken_response)self.response_rail.view.setHidden_(not connected or not getattr(self, "collapsed", False))description = ", ".join(part for part in (state.word, peer, spoken_response) if part)- self.header.setAccessibilityLabel_(description)- self.header.setToolTip_(description)+ if self.header.accessibilityLabel() != description:+ self.header.setAccessibilityLabel_(description)+ if self.header.toolTip() != description:+ self.header.setToolTip_(description)def set_dots(self, marks):for page, (name, row, _icon, _words, _bar, dot) in self.rows.items():diff --git a/scripts/ui_audit/qt_audit.py b/scripts/ui_audit/qt_audit.pyindex 93bf86b..9495de2 100644--- a/scripts/ui_audit/qt_audit.py+++ b/scripts/ui_audit/qt_audit.py@@ -29,6 +29,10 @@ class FakePairing:self.outcome = ""self.known = Noneself.discovered = []+ self.nearby_status = {"state": "inactive"}++ def cancel_nearby(self):+ self.nearby_status = {"state": "inactive"}def machines(self):return self.discovereddiff --git a/tools/readme_shots_mac.py b/tools/readme_shots_mac.pyindex 592804d..22e44a1 100644--- a/tools/readme_shots_mac.py+++ b/tools/readme_shots_mac.py@@ -3,8 +3,11 @@ config (documentation addresses, no house detail) and drawn page by page into aever being put on screen. Starts nothing: no event tap, no link, no discovery."""import json+import getpassimport loggingimport os+import platform+import socketimport sysimport tempfileimport time@@ -23,26 +26,95 @@ AppKit.NSApplication.sharedApplication()import kvm_bridge_app # noqa: E402import settings_store # noqa: E402from wake import WakingController as KVMController # noqa: E402+from core import pairing, protocol, crossing_state # noqa: E402kvm_bridge_app.VERSION = os.environ.get("SHOT_VERSION", kvm_bridge_app.VERSION)kvm_bridge_app.accessibility_granted = lambda: Truekvm_bridge_app.input_monitoring_granted = lambda: True+four = os.environ.get("FOUR") == "1"+real_hostname = socket.gethostname() if four else ""+real_username = getpass.getuser() if four else ""+# Always: the window falls back to the machine's own hostname wherever the config names none.+socket.gethostname = lambda: "Studio Mac"+platform.node = lambda: "Studio Mac"+getpass.getuser = lambda: "Studio Mac"+pairing.machine_name = lambda: "Studio Mac"+path = Path(tempfile.mkdtemp()) / "config.json"raw = settings_store.config_to_raw(settings_store.editable_default_config())-raw.update(host="192.168.1.20", auth_token="synthetic", pc_name="Desktop PC",+raw.update(host="" if four else "192.168.1.20", auth_token="" if four else "synthetic", pc_name="" if four else "Desktop PC",ignored_inputs=["button:back", "button:forward", "media:volume_up", "key:105"],appearance=os.environ.get("APPEARANCE", "dark"))path.write_text(json.dumps(raw))store = settings_store.SettingsStore(path)+if four:+ names = ("Desk PC", "Studio Mac", "Laptop", "Linux box")+ platforms = ("windows", "macos", "windows", "linux")+ hosts = ("192.0.2.10", "192.0.2.11", "192.0.2.12", "192.0.2.13")+ ids = [bytes([index + 31]) * 16 for index in range(4)]+ tokens = [pairing._b64(bytes([index + 41]) * 32) for index in range(4)] # pairing's shape, or the app shows "Pair again"+ own_index = 1+ current = store.load_settings()+ current["machine_id"] = protocol.id_text(ids[own_index])+ current["name"] = names[own_index]+ store.save_settings(current)+ for index, name in enumerate(names):+ if index == own_index:+ continue+ entry = pairing.peer_entry(ids[index], name, platforms[index], protocol.DEFAULT_PORT,+ tokens[index], hosts[index], 1791321600 + index)+ entry["linked"] = True+ store.add_peer(entry)+ current = store.current()+ current["name"] = names[own_index]+ # This machine in the middle with one machine left, one right and one below, so every one+ # touches it and crosses: a machine that touches none reads "Drag to connect" in amber.+ # Laptop left, Desk PC right, Linux box below: the mirror of the Windows shot, where the+ # Studio Mac sits left of Desk PC, so the two read as one setup side by side.+ others = [2, 0, 3]+ spots = [(160, 0)] + [(0, 0), (320, 0), (160, 100)]+ current["layout"] = {+ protocol.id_text(ids[index]): {"x": x, "y": y, "w": 160, "h": 100}+ for index, (x, y) in zip([own_index] + others, spots)+ }+ current = crossing_state.migrate(current, "mac")["settings"]+ store.save_settings(current)logger = logging.getLogger("shots")-controller = KVMController(store.load(), logger=logger)+if four:+ # The app's own wiring: without the store's book the controller holds only the config's+ # migrated 1.4 peer, and Overview lists that one machine as "Pair again".+ import bridge # noqa: E402+ book, identity = bridge.links_from_store(store, kvm_bridge_app.VERSION)+ controller = KVMController(store.load(), logger=logger, book=book, identity=identity)+else:+ controller = KVMController(store.load(), logger=logger)if os.environ.get("CONNECTED"):controller.sock = object()controller.connected_at = controller.last_ack_at = time.monotonic()controller.tap_ready.set()controller.event_tap = object()window = kvm_bridge_app.ControlWindow.alloc().initWithController_settingsStore_logger_(controller, store, logger)+if four:+ window._live = lambda _peer: True++ class _UpLink:+ # The sidebar reads `connected` from the link in question, not the CONNECTED socket stub.+ peer_locked = via_tunnel = False+ status, kind, caps = "", "live", {"settings", "layout"} # without "layout" a peer reads as pre-1.5.2+ response_time_ms = 3++ def __init__(self, peer_id=protocol.id_text(ids[0])):+ self.peer_id = peer_id++ def live(self):+ return True++ controller._status_link = lambda *_args: _UpLink()+ controller._link_of = lambda peer, *_args: _UpLink(peer)+ # Each Overview row and map tile asks its own peer's link.+ for entry in store.current()["peers"]:+ controller.links[entry["token"]] = controller._peers_up[entry["id"]] = _UpLink(entry["id"])window.has_notch = Truecontroller.notch_range = (656.0, 856.0)width, height = (int(v) for v in os.environ.get("SIZE", "900x640").split("x"))@@ -52,6 +124,28 @@ if os.environ.get("SWITCH_TO"):window._apply_appearance(os.environ["SWITCH_TO"])window.window.setContentSize_((width, height))OUT.mkdir(parents=True, exist_ok=True)+rendered_texts = []+def visible_window_texts():+ texts = []+ def inspect(view):+ if isinstance(view, AppKit.NSTextField):+ value = view.stringValue()+ if value:+ texts.append(value)+ if isinstance(view, AppKit.NSComboBox):+ texts.extend(view.itemObjectValueAtIndex_(i) for i in range(view.numberOfItems()))+ if isinstance(view, AppKit.NSButton):+ value = view.title()+ if value:+ texts.append(value)+ if isinstance(view, AppKit.NSPopUpButton):+ texts.extend(item.title() for item in view.itemArray())+ for child in view.subviews():+ if not child.isHidden():+ inspect(child)+ inspect(window.window.contentView())+ return texts+for key in PAGES:window._select_page(key)window.refresh()@@ -67,4 +161,33 @@ for key in PAGES:data = rep.representationUsingType_properties_(AppKit.NSBitmapImageFileTypePNG, {})suffix = os.environ.get("SUFFIX", "")data.writeToFile_atomically_(str(OUT / f"mac-{key}{suffix}.png"), True)+ if four and key == "crossing":+ map_rect = window.atlas_canvas.convertRect_toView_(window.atlas_canvas.bounds(), view)+ ledger_rect = window.crossing_ledger.convertRect_toView_(window.crossing_ledger.bounds(), view)+ union = AppKit.NSUnionRect(map_rect, ledger_rect)+ # 8 points up and down: 16 slices the Machines heading above and the note below.+ crop = AppKit.NSIntersectionRect(AppKit.NSInsetRect(union, -16.0, -8.0), view.bounds())+ crop_rep = view.bitmapImageRepForCachingDisplayInRect_(crop)+ view.cacheDisplayInRect_toBitmapImageRep_(crop, crop_rep)+ crop_data = crop_rep.representationUsingType_properties_(AppKit.NSBitmapImageFileTypePNG, {})+ crop_data.writeToFile_atomically_(str(OUT / f"mac-crossing-map{suffix}.png"), True)+ # The map alone, for README widths where the ledger's small text cannot be read.+ crop = AppKit.NSIntersectionRect(AppKit.NSInsetRect(map_rect, -16.0, -8.0), view.bounds())+ crop_rep = view.bitmapImageRepForCachingDisplayInRect_(crop)+ view.cacheDisplayInRect_toBitmapImageRep_(crop, crop_rep)+ crop_data = crop_rep.representationUsingType_properties_(AppKit.NSBitmapImageFileTypePNG, {})+ crop_data.writeToFile_atomically_(str(OUT / f"mac-crossing-mapview{suffix}.png"), True)+ if four:+ rendered_texts.extend(visible_window_texts())++if four:+ banned = [real_hostname, real_hostname.split(".", 1)[0], real_username,+ "10.0.0.", "fedora",+ *filter(None, os.environ.get("BEAMER_SHOT_DENY", "").split(","))]+ rendered_texts.extend(("Desk PC", "Studio Mac", "Laptop", "Linux box"))+ matches = [text for text in rendered_texts+ if any(term and term.casefold() in str(text).casefold() for term in banned)]+ if matches:+ print("Forbidden visible text: " + "; ".join(map(str, matches)), file=sys.stderr)+ raise SystemExit(1)print(OUT)diff --git a/tools/readme_shots_win.py b/tools/readme_shots_win.pyindex 0ad29cf..e609f08 100644--- a/tools/readme_shots_win.py+++ b/tools/readme_shots_win.py@@ -8,7 +8,10 @@ before anything is shot -- proving the live switch renders the same as buildingappearance directly, not just the initial build."""import json+import getpassimport os+import platform+import socketimport sysimport tempfileimport time@@ -21,56 +24,122 @@ LINUX = sys.argv[1] == "--linux"if LINUX:REPO = Path(__file__).resolve().parents[1]OUT = Path(sys.argv[2])+ os.environ.setdefault("QT_SCALE_FACTOR", "2")else:REPO = Path(sys.argv[1])OUT = Path(sys.argv[2])sys.path.insert(0, str(REPO / "win_app"))-from PySide6.QtWidgets import QApplication # noqa: E402+from PySide6.QtCore import QPoint, QRect # noqa: E402+from PySide6.QtWidgets import QAbstractScrollArea, QApplication, QWidget, QLabel, QAbstractButton, QLineEdit, QComboBox # noqa: E402import theme # noqa: E402app = QApplication(sys.argv[:1])theme.init_fonts()-appearance = os.environ.get("APPEARANCE", "dark").strip().lower()+appearance = os.environ.get("APPEARANCE", "light" if LINUX else "dark").strip().lower()app.setFont(theme.font(theme.TYPE["body"]))import kvm_bridge_win # noqa: E402import app_config # noqa: E402from core.receiver import ServerState # noqa: E402-from core import pairing, peerlist # noqa: E402+from core import pairing, peerlist, protocol, crossing_state # noqa: E402kvm_bridge_win.VERSION = os.environ.get("SHOT_VERSION", kvm_bridge_win.VERSION)# Drawn as the installed app is, not as a run from source, which cannot start at sign-in.kvm_bridge_win.autostart_win.installed_exe = lambda: Path("Beamer.exe")kvm_bridge_win.autostart_win.is_enabled = lambda: not LINUXfolder = Path(tempfile.mkdtemp())+four = os.environ.get("FOUR", "1" if LINUX else "0") == "1"+real_hostname = socket.gethostname() if four else ""+real_username = getpass.getuser() if four else ""+own_name = ("Linux box" if LINUX else "Desk PC") if four else ("Linux PC" if LINUX else "Desktop PC")+if four:+ # Over SSH there is no signed-in desktop session to name, which would draw the sign-in row as unavailable.+ kvm_bridge_win.autostart_win.can_run_for_current_user = lambda: True+# Always: the window falls back to the machine's own hostname wherever the config names none.+platform.node = lambda: own_name+socket.gethostname = lambda: own_name+pairing.machine_name = lambda: own_namefixture = {"host": "192.168.1.20", "port": 24820, "auth_token": "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8", "paired_with": "MacBook Pro","mac_host": "192.168.1.10", "mac_return_edge": "left", "glow_colour": "signal","ignored_inputs": ["button:back", "button:forward", "key:175", "key:174"],"appearance": appearance,}-if LINUX:+if four:+ names = ("Desk PC", "Studio Mac", "Laptop", "Linux box")+ platforms = ("windows", "macos", "windows", "linux")+ hosts = ("192.0.2.10", "192.0.2.11", "192.0.2.12", "192.0.2.13")+ ids = [bytes([index + 31]) * 16 for index in range(4)]+ tokens = [pairing._b64(bytes([index + 41]) * 32) for index in range(4)] # pairing's shape, or the app shows "Pair again"+ own_index = 3 if LINUX else 0+ fixture.update(name=names[own_index], paired_with="", peers=[])+ fixture["auth_token"] = ""+ fixture["host"] = ""+ settings = app_config.migrate(fixture, machine_id=protocol.id_text(ids[own_index]))+ settings["name"] = names[own_index]+ for index, name in enumerate(names):+ if index == own_index:+ continue+ entry = pairing.peer_entry(ids[index], name, platforms[index], fixture["port"], tokens[index],+ hosts[index], 1791321600 + index)+ entry["linked"] = True+ peerlist.add_peer(settings, entry)+ # This machine in the middle with one machine left, one right and one below, so every one+ # touches it and crosses: a machine that touches none reads "Drag to connect" in amber.+ others = [index for index in range(4) if index != own_index]+ spots = [(160, 0)] + [(0, 0), (320, 0), (160, 100)]+ settings["layout"] = {+ protocol.id_text(ids[index]): {"x": x, "y": y, "w": 160, "h": 100}+ for index, (x, y) in zip([own_index] + others, spots)+ }+ settings = crossing_state.migrate(settings, "pc")["settings"]+ config_path = folder / "settings.json"+ app_config.write_settings(config_path, settings)+elif LINUX:fixture["paired_with"] = ""+ token_32 = pairing._b64(bytes([42]) * 32)fixture["peers"] = [pairing.peer_entry(- bytes([1]) * 16, "MacBook Pro", "macos", fixture["port"], fixture["auth_token"],+ bytes([1]) * 16, "MacBook Pro", "macos", fixture["port"], token_32,fixture["mac_host"], 1791321600,)]-if LINUX:+if four:+ pass+elif LINUX:settings = app_config.migrate(fixture)peerlist.add_peer(settings, fixture["peers"][0], settings["peers"][0])+ for p in settings["peers"]:+ p["from_1_4"] = False+ p["linked"] = Trueapp_config.write_settings(folder / "settings.json", settings)else:(folder / "config.json").write_text(json.dumps(fixture))window = kvm_bridge_win.WindowsApplication(folder / "settings.json")-window._set_status(ServerState.CONNECTED, "Connected to 192.168.1.10")-if LINUX:+window._set_status(ServerState.CONNECTED, "Connected to 192.0.2.11" if four else "Connected to 192.168.1.10")+if LINUX or four:window.sender.links.up = lambda _peer: True+if four:+ class _UpLink:+ # The sidebar's "Response: 3 ms" reads the link's own measurement; with none it shows a dash.+ response_time_ms = 3+ peer_locked = via_tunnel = False+ status, kind, caps = "", "live", {"settings", "layout"} # without "layout" a peer reads as pre-1.5.2++ def live(self):+ return True++ window.sender.links._link = lambda _peer: _UpLink()+if four or LINUX:+ window.sender.refresh()+ window._reflect_ways()# This PC's own link to the Mac, as the Mac tool's CONNECTED fakes its socket: without it Overview# says "not connected" under "Mac connected".window.sender._sock = object()-window.resize(1200, 675) if LINUX else window.resize(820, 700)+if os.environ.get("SIZE"):+ window.resize(*(int(v) for v in os.environ["SIZE"].split("x")))+else:+ window.resize(1200, 675) if LINUX else window.resize(820, 700)window.show()# _set_status only takes effect on the next _refresh_window, whose status heading then cross-fades# in: forced and settled here, before anything is timed, so that fade never lands mid-shot.@@ -96,9 +165,25 @@ if switch_to:OUT.mkdir(parents=True, exist_ok=True)# PAGES names pages, space-separated; the README's three by default.pages = os.environ.get("PAGES", "overview crossing design" if LINUX else "overview design keyboard").split()+rendered_texts = []+def visible_widget_texts():+ texts = []+ for widget in window.findChildren(QWidget):+ if not widget.isVisibleTo(window):+ continue+ if isinstance(widget, QLabel) or isinstance(widget, QAbstractButton):+ texts.append(widget.text())+ if isinstance(widget, QLineEdit):+ texts.append(widget.text())+ if isinstance(widget, QComboBox):+ texts.extend([widget.currentText(), *(widget.itemText(i) for i in range(widget.count()))])+ return texts+for key in pages:settle = 0.3window._select_page(key)+ if key == "crossing":+ window._reflect_ways()window.stack.setFocus()started = time.monotonic()while time.monotonic() - started < settle:@@ -107,5 +192,38 @@ for key in pages:window._refresh_window()app.processEvents()prefix = "linux" if LINUX else "windows"- window.grab().save(str(OUT / f"{prefix}-{key}{os.environ.get('SUFFIX', '')}.png"))+ suffix = os.environ.get("SUFFIX", "")+ shot = window.grab()+ shot.save(str(OUT / f"{prefix}-{key}{suffix}.png"))+ if four and key == "crossing" and not LINUX:+ map_rect = QRect(window.atlas_canvas.mapTo(window, QPoint(0, 0)), window.atlas_canvas.size())+ ledger_rect = QRect(window.crossing_ledger.mapTo(window, QPoint(0, 0)), window.crossing_ledger.size())+ # Clipped to the page's scroll viewport: past it the ledger runs under the footer.+ scroller = window.atlas_canvas.parentWidget()+ while scroller is not None and not isinstance(scroller, QAbstractScrollArea):+ scroller = scroller.parentWidget()+ visible = window.rect() if scroller is None else QRect(+ scroller.viewport().mapTo(window, QPoint(0, 0)), scroller.viewport().size())+ crop = map_rect.united(ledger_rect).adjusted(-16, -8, 16, 8).intersected(visible)+ ratio = shot.devicePixelRatio()+ pixels = QRect(round(crop.x() * ratio), round(crop.y() * ratio),+ round(crop.width() * ratio), round(crop.height() * ratio))+ shot.copy(pixels).save(str(OUT / f"{prefix}-crossing-map{suffix}.png"))+ # The map alone, for README widths where the ledger's small text cannot be read.+ crop = map_rect.adjusted(-16, -8, 16, 8).intersected(visible)+ shot.copy(QRect(round(crop.x() * ratio), round(crop.y() * ratio), round(crop.width() * ratio),+ round(crop.height() * ratio))).save(str(OUT / f"{prefix}-crossing-mapview{suffix}.png"))+ if four:+ rendered_texts.extend(visible_widget_texts())++if four:+ banned = [real_hostname, real_hostname.split(".", 1)[0], real_username,+ "10.0.0.", "fedora",+ *filter(None, os.environ.get("BEAMER_SHOT_DENY", "").split(","))]+ rendered_texts.extend(("Desk PC", "Studio Mac", "Laptop", "Linux box"))+ found = [text for text in rendered_texts if text and+ any(term and term.casefold() in text.casefold() for term in banned)]+ if found:+ print("Forbidden visible text: " + "; ".join(found), file=sys.stderr)+ raise SystemExit(1)print(OUT)diff --git a/tools/render_colour_choices.py b/tools/render_colour_choices.pyindex 18e5a06..5c98597 100644--- a/tools/render_colour_choices.py+++ b/tools/render_colour_choices.py@@ -284,7 +284,7 @@ class QtRenderer:self.design.resize(1400, 1100)self.design.show()choice = self.design.glow_style_choice if family == "crossing" else self.design.switch_style_choice- self.app.setStyleSheet(self.theme.stylesheet())+ self.theme.apply_stylesheet(self.app)choice.set_value(style if selected else None)preview = choice.tile(style).layout().itemAt(0).widget()preview._image = Nonediff --git a/tools/wayland_proof.py b/tools/wayland_proof.pyindex 6bbdae3..b52313b 100644--- a/tools/wayland_proof.py+++ b/tools/wayland_proof.py@@ -186,13 +186,14 @@ class Sender:"""What capture_portal's callbacks reach, with the sender's crossing as a threshold of pushedpixels, as the zone model's resistance is."""- def __init__(self, threshold=60):+ def __init__(self, threshold=60, axis="x", sign=1):self.lock = threading.Lock()self.threshold = thresholdself.away = Falseself.pushed = 0self.keys, self.mice, self.motions = [], [], []self.block_keys = 0.0+ self.axis, self.sign = axis, signdef on_key(self, name, down, vk, us):if self.block_keys:@@ -210,7 +211,7 @@ class Sender:with self.lock:self.motions.append((dx, dy))if not self.away:- self.pushed += dx+ self.pushed += (dx if self.axis == "x" else dy) * self.signif self.pushed >= self.threshold:self.away = True@@ -221,14 +222,14 @@ class Sender:return found-def start_capture(hand, sender, observer):+def start_capture(hand, sender, observer, models=None):import capture_portalfrom core import return_edgeobserver.close()hooks = capture_portal.Hooks(sender.on_key, sender.on_mouse, sender.on_motion)hooks.grab_while(lambda: sender.away)- hooks.barriers_from(lambda: [return_edge.ReturnEdge("right")])+ hooks.barriers_from(lambda: models if models is not None else [return_edge.ReturnEdge("right")])homes = []hooks.on_home = lambda: homes.append(True) or setattr(sender, "away", False)failures_seen = []@@ -240,6 +241,87 @@ def start_capture(hand, sender, observer):return hooks, ok, homes, failures_seen+def proof_two_monitor_barriers(hand, observer, layout):+ """Exercise display-scoped real portal barriers and Mutter's cancel shortcut."""+ import capture_portal+ import desktop_portal+ from core import return_edge++ from PySide6.QtGui import QGuiApplication++ app = QGuiApplication.instance()+ screens = [screen.geometry() for screen in app.screens()] if app is not None else []+ rects = [return_edge.Rect(r.x(), r.y(), r.width(), r.height()) for r in screens]+ print(f"NOTE Qt screen geometry for {layout}: {rects}", flush=True)+ check(f"Mutter exposes two virtual screens for {layout}", len(rects) == 2, rects)+ if len(rects) != 2:+ return++ if layout == "stacked":+ a = min(rects, key=lambda rect: (rect.y, rect.x))+ b = max(rects, key=lambda rect: (rect.y, rect.x))+ else:+ a = min(rects, key=lambda rect: (rect.x, rect.y))+ b = max(rects, key=lambda rect: (rect.x, rect.y))+ display_a = str(rects.index(a))+ desktop_portal.refresh_qt_screens()++ sender = Sender(axis="y", sign=-1)+ model = return_edge.ReturnEdge("top", display=display_a)+ hooks, enabled, _homes, _problems = start_capture(hand, sender, observer, [model])+ try:+ zones = list(hooks._zones)+ desktop_portal.refresh_qt_screens()+ display_map = desktop_portal.display_map()+ check(f"InputCapture exposes two portal zones for {layout}", len(zones) == 2, zones)+ check("Qt displays match both portal geometries", len(display_map) == 2 and+ sorted((r.x, r.y, r.width, r.height) for r in display_map.values()) ==+ sorted((r.x, r.y, r.width, r.height) for r in zones), display_map)+ expected = capture_portal.barriers([model], zones, display_map=display_map)+ check("only display A receives its top barrier", enabled and len(zones) == 2 and+ len(display_map) == 2 and hooks._placed == expected and+ len(expected) == 1 and expected[0][0] == "top",+ f"enabled={enabled} placed={hooks._placed} expected={expected}")+ check("no display key was rejected by geometry matching", not hooks._unmatched_displays_logged,+ hooks._unmatched_displays_logged)++ bx = b.x + b.width // 2+ by = b.y + min(12, max(1, b.height // 8))+ hand.to(bx, by)+ for _ in range(12):+ hand.move(0, -10)+ time.sleep(0.02)+ time.sleep(0.2)+ check("pushing the top of display B stays on this machine", not sender.away and not hooks.holding,+ f"away={sender.away} holding={hooks.holding} position={desktop_portal.cursor_position()}")++ ax, ay = a.x + a.width // 2, a.y + min(12, max(1, a.height // 8))+ hand.to(ax, ay)+ for _ in range(12):+ hand.move(0, -10)+ time.sleep(0.02)+ crossed = wait(lambda: sender.away and hooks.holding)+ check("pushing the top of display A crosses to the peer", crossed,+ f"away={sender.away} holding={hooks.holding} walls={hooks._walls}")+ if crossed:+ hand.tap(125, 42, ESC)+ rearmed = wait(lambda: hooks._session is not None and hooks._session.enabled and not hooks.holding,+ timeout=4)+ check("the Mutter cancel shortcut re-arms the capture session", rearmed,+ f"enabled={getattr(hooks._session, 'enabled', None)} walls={hooks._walls}")+ sender.away = False+ hand.to(ax, ay)+ for _ in range(12):+ hand.move(0, -10)+ time.sleep(0.02)+ crossed_again = wait(lambda: sender.away and hooks.holding)+ check("display A crosses again after the cancel shortcut", crossed_again,+ f"away={sender.away} holding={hooks.holding} walls={hooks._walls}")+ finally:+ hooks.stop()+ sender.away = False++def push_to_edge(hand, y=400, pushes=12, step=10):hand.to(1270, y)for _ in range(pushes):@@ -438,6 +520,18 @@ def proof_injection(hand, observer):keys = [key for key in observer.keys()]check("keys and text type as the layout has them", typed and keys == expect, str(keys))+ observer.mark()+ # A letter straight after Caps Lock, as a sender sends one: in the new lock's case (KWin typed+ # the old one before 1.5.3; 14-10-2026).+ for name in ("caps_lock", "B", "caps_lock", "c"):+ inject_portal.inject_key(name, True, name.lower() if len(name) == 1 else None)+ inject_portal.inject_key(name, False, name.lower() if len(name) == 1 else None)+ expect = [("Caps_Lock", True), ("Caps_Lock", False), ("B", True), ("B", False),+ ("Caps_Lock", True), ("Caps_Lock", False), ("c", True), ("c", False)]+ typed = wait(lambda: len(observer.keys()) >= len(expect), timeout=3)+ check("a letter right after Caps Lock types in the new lock's case", typed and observer.keys() == expect,+ str(observer.keys()))+observer.mark()inject_portal.inject_key("é", True)inject_portal.inject_key("é", False)@@ -540,6 +634,12 @@ def main():import logginglogging.basicConfig(level=logging.INFO, format="LOG %(name)s %(levelname)s %(message)s")+ layout = os.environ.get("BEAMER_MONITOR_LAYOUT", "single")+ qt_app = None+ if layout in ("side-by-side", "stacked"):+ from PySide6.QtGui import QGuiApplication++ qt_app = QGuiApplication.instance() or QGuiApplication([])hand = Hand()hand.tap(ESC) # out of the Overview the headless shell starts in# The portal and its GNOME back end start on first use, slowly: woken here, so the first dialog@@ -550,11 +650,16 @@ def main():time.sleep(1.0)observer = Observer()try:- proof_injection(hand, observer)- proof_capture(hand, observer)- proof_killed_process_lets_go(hand, observer)+ if layout in ("side-by-side", "stacked"):+ proof_two_monitor_barriers(hand, observer, layout)+ else:+ proof_injection(hand, observer)+ proof_capture(hand, observer)+ proof_killed_process_lets_go(hand, observer)finally:observer.close()+ if qt_app is not None:+ qt_app.quit()if __name__ == "__main__":diff --git a/tools/wayland_proof.sh b/tools/wayland_proof.shindex 222084b..ec807eb 100755--- a/tools/wayland_proof.sh+++ b/tools/wayland_proof.sh@@ -1,13 +1,15 @@#!/usr/bin/env bash# The Wayland back ends against a real GNOME Shell and its portals (tools/wayland_proof.py says what-# is proved). Starts a headless GNOME Shell on a D-Bus session of its own with one virtual monitor,-# so it never touches the desktop it is started from, then the proof, which opens the observer app.+# is proved). Starts a headless GNOME Shell on a D-Bus session of its own, so it never touches the+# desktop it is started from. BEAMER_MONITOR_LAYOUT may be single, side-by-side or stacked.# Needs GNOME Shell 45 or later, xdg-desktop-portal-gnome, libei, wl-clipboard, PyGObject with# GTK 4 for the system python3, and win_app/requirements-linux.txt for PYTHON's.# Exit status: 0 when every check passes.set -euo pipefailhere="$(cd "$(dirname "$0")" && pwd)"python="${PYTHON:-python3}"+system_python="${SYSTEM_PYTHON:-/usr/bin/python3}"+layout="${BEAMER_MONITOR_LAYOUT:-single}"if [ -z "${BEAMER_PROOF_DIR:-}" ]; thenfor tool in gnome-shell dbus-run-session wl-paste; docommand -v "$tool" >/dev/null || { echo "$tool is not installed" >&2; exit 2; }@@ -21,7 +23,19 @@ fidisplay="beamer-proof-$$"export XDG_CURRENT_DESKTOP=GNOME XDG_SESSION_TYPE=wayland XDG_SESSION_DESKTOP=gnome WAYLAND_DISPLAY="$display"unset DISPLAY-gnome-shell --headless --wayland --no-x11 --wayland-display "$display" --virtual-monitor 1280x800 \+case "$layout" in+ single)+ monitors=(--virtual-monitor 1280x800)+ ;;+ side-by-side|stacked)+ monitors=(--virtual-monitor 1280x800 --virtual-monitor 1280x800)+ ;;+ *)+ echo "Unknown BEAMER_MONITOR_LAYOUT: $layout" >&2+ exit 2+ ;;+esac+gnome-shell --headless --wayland --no-x11 --wayland-display "$display" "${monitors[@]}" \>"$BEAMER_PROOF_DIR/shell.log" 2>&1 &shell=$!trap 'kill "$shell" 2>/dev/null || true' EXIT@@ -34,4 +48,12 @@ touch "$BEAMER_PROOF_DIR/commands"# Beamer's remembered permissions start empty: a fresh state directory.export XDG_STATE_HOME="$BEAMER_PROOF_DIR/state"sleep 2-"$python" "$here/wayland_proof.py"+if [ "$layout" != single ]; then+ "$system_python" "$here/wayland_monitor_layout.py" "$layout"+fi+GTK_A11Y=none "$python" "$here/wayland_proof.py" 2>&1 | tee "$BEAMER_PROOF_DIR/client.log"+if grep -Fq 'Could not match display' "$BEAMER_PROOF_DIR/client.log" "$BEAMER_PROOF_DIR/shell.log"; then+ echo "FAIL no unmatched display warning in the headless GNOME log"+ exit 1+fi+echo "PASS no unmatched display warning in the headless GNOME log"diff --git a/tools/x11_proof.py b/tools/x11_proof.pyindex ebd8722..963cb6a 100644--- a/tools/x11_proof.py+++ b/tools/x11_proof.py@@ -147,7 +147,9 @@ def proof_injection_and_capture():check("a warp moves the pointer", desktop_x11.cursor_position() == (123, 45), desktop_x11.cursor_position())check("a warp makes no motion", motions == [], motions)monitors = desktop_x11.monitors()- check("RandR reports the screen", len(monitors) == 1 and (monitors[0].width, monitors[0].height) == (1920, 1080), monitors)+ check("RandR reports the X server root geometry",+ any((m.width, m.height) == (1920, 1080) for m in monitors) or (+ sum(m.width for m in monitors) == 1920 and all(m.height == 1080 for m in monitors)), monitors)expected = {"shift": "shift", "shift_r": "shift_r", "ctrl": "cmd", "ctrl_r": "cmd_r","alt": "alt", "alt_r": "alt_r", "cmd": "ctrl", "cmd_r": "ctrl_r"}@@ -163,7 +165,7 @@ def proof_injection_and_capture():check("a letter reads back with its code and US place", keys == [("q", True, 16, "q"), ("q", False, 16, "q")], keys)for message_dy, message_dx, expect in ((1, 0, ("wheel", 1.0, 0.0)), (-1, 0, ("wheel", -1.0, 0.0)),- (0, 1, ("wheel", 0.0, 1.0)), (0, -1, ("wheel", 0.0, -1.0))):+ (0, 1, ("wheel", 0.0, -1.0)), (0, -1, ("wheel", 0.0, 1.0))):inject_x11.inject_scroll(message_dy, message_dx, "line")_, mice, _ = seen.take(0.15)events = [capture_x11.mouse_event(message, data) for message, data in mice]@@ -218,6 +220,85 @@ def proof_injection_and_capture():hooks.stop()+def proof_seams():+ """Exercise directional XFixes seam barriers with real XTest pointer motion.++ Xvfb exposes one RandR output, so the seam controller receives the two logical monitor+ rectangles explicitly. This still exercises the same XFixes barriers and pointer path as a+ two-monitor X11 desktop; the result record distinguishes the geometry fixture from hardware.+ """+ import desktop_x11+ import inject_x11+ import x11_seams+ from core.return_edge import PartEdge, Rect, ReturnEdge+ from Xlib import display++ monitors = [Rect(0, 0, 960, 1080), Rect(960, 0, 960, 1080)]+ display_map = {"A": monitors[0], "B": monitors[1]}+ connection = display.Display()+ controller = x11_seams.Controller(x11_seams.XlibBackend(connection, connection.screen().root))++ randr_monitors = desktop_x11.monitors()+ expected = {(monitor.x, monitor.y, monitor.width, monitor.height) for monitor in monitors}+ observed = {(monitor.x, monitor.y, monitor.width, monitor.height) for monitor in randr_monitors}+ check("RandR reports two virtual monitors", observed == expected, randr_monitors)++ xfixes = connection.xfixes_query_version()+ if (xfixes.major_version, xfixes.minor_version) < (5, 0):+ detail = f"XFixes {xfixes.major_version}.{xfixes.minor_version}; pointer barriers require 5.0"+ check("XFixes provides pointer barriers for seam proofs", False, detail)+ check("an armed selected seam third holds XTest motion", False, detail)+ check("an unarmed seam third lets XTest motion pass", False, detail)+ check("paused seam capture lets XTest motion pass", False, detail)+ check("unready display mapping lets XTest motion pass", False, detail)+ check("the rearranged stacked seam holds at the new boundary", False, detail)+ controller.close()+ connection.close()+ return++ def move_from(point, dx, dy):+ desktop_x11.set_cursor_position(*point)+ time.sleep(0.1)+ inject_x11.inject_mouse_move(dx, dy)+ time.sleep(0.2)+ return desktop_x11.cursor_position()++ try:+ controller.configure(monitors, 30, display_map=display_map,+ models=[PartEdge("right", {"start"}, display="A")])+ connection.sync()+ check("the selected seam barrier is installed", controller.active, controller._barriers)+ start = move_from((950, 180), 30, 0)+ check("an armed selected seam third holds XTest motion", start[0] <= 960, start)++ unselected = move_from((950, 900), 30, 0)+ check("an unarmed seam third lets XTest motion pass", unselected[0] > 960, unselected)++ controller.configure(monitors, 30, enabled=False, display_map=display_map,+ models=[ReturnEdge("right", display="A")])+ paused = move_from((950, 500), 30, 0)+ check("paused seam capture lets XTest motion pass", paused[0] > 960, paused)++ controller.configure(monitors, 30, display_map={}, models=[ReturnEdge("right", display="missing")])+ unready = move_from((950, 500), 30, 0)+ check("unready display mapping lets XTest motion pass", unready[0] > 960, unready)++ stacked = [Rect(0, 0, 960, 540), Rect(0, 540, 960, 540)]+ controller.configure(stacked, 30, display_map={"A": stacked[0], "B": stacked[1]},+ models=[ReturnEdge("bottom", display="A")])+ connection.sync()+ rearranged = move_from((480, 530), 0, 30)+ check("the rearranged stacked seam holds at the new boundary", rearranged[1] <= 540, rearranged)+ check("RandR root remains available for the two-monitor geometry fixture",+ any((m.width, m.height) == (1920, 1080) for m in randr_monitors) or (+ sum(m.width for m in randr_monitors) == 1920 and all(m.height == 1080 for m in randr_monitors)), randr_monitors)+ except Exception as exc:+ check("XFixes seam proof completed", False, repr(exc))+ finally:+ controller.close()+ connection.close()++def fake(keycode, down=None):"""A key through XTest directly, for keys the injector never names (the keypad, Num Lock)."""from Xlib import X, display@@ -442,6 +523,7 @@ if __name__ == "__main__":clipboard_other(sys.argv[2])else:proof_injection_and_capture()+ proof_seams()proof_killed_process_lets_go()proof_clipboard()print(f"{len(failures)} failed" if failures else "all passed", flush=True)diff --git a/tools/x11_proof.sh b/tools/x11_proof.shindex 1916f99..248ca93 100755--- a/tools/x11_proof.sh+++ b/tools/x11_proof.sh@@ -1,21 +1,104 @@#!/usr/bin/env bash-# The X11 back ends against a real X server (tools/x11_proof.py says what is proved). Starts Xvfb-# on a free display, so it runs headless and never touches the desktop it is started from.-# Needs Xvfb, Python 3 and win_app/requirements-linux.txt; PYTHON picks the interpreter.+# The X11 back ends against a real X server (tools/x11_proof.py says what is proved). Starts+# Xorg with the dummy driver (or Xvfb) on a free display, so it runs headless and never touches+# the desktop it is started from.+# Needs Python 3 and win_app/requirements-linux.txt; PYTHON picks the interpreter.# Exit status: 0 when every check passes.set -euo pipefailhere="$(cd "$(dirname "$0")" && pwd)"python="${PYTHON:-python3}"-command -v Xvfb >/dev/null || { echo "Xvfb is not installed (Fedora: xorg-x11-server-Xvfb, Debian/Ubuntu: xvfb)" >&2; exit 2; }+for number in $(seq 90 120); do[ -e "/tmp/.X11-unix/X$number" ] || [ -e "/tmp/.X$number-lock" ] || breakdone-Xvfb ":$number" -screen 0 1920x1080x24 -nolisten tcp >/dev/null 2>&1 &-server=$!-trap 'kill "$server" 2>/dev/null || true' EXIT-for _ in $(seq 50); do- [ -e "/tmp/.X11-unix/X$number" ] && break- sleep 0.1++xorg_bin=""+for candidate in /usr/libexec/Xorg /usr/bin/Xorg Xorg; do+ if command -v "$candidate" >/dev/null 2>&1; then+ for drv in /usr/lib64/xorg/modules/drivers/dummy_drv.so /usr/lib/xorg/modules/drivers/dummy_drv.so; do+ if [ -f "$drv" ]; then+ xorg_bin="$candidate"+ break 2+ fi+ done+ fidone++if [ -n "$xorg_bin" ]; then+ conf="$(mktemp -t xorg-dummy-XXXXXX.conf)"+ log="$(mktemp -t xorg-dummy-XXXXXX.log)"+ cat << "EOF" > "$conf"+Section "ServerFlags"+ Option "AutoAddDevices" "false"+ Option "AutoEnableDevices" "false"+EndSection++Section "Device"+ Identifier "DummyDevice"+ Driver "dummy"+ VideoRam 256000+EndSection++Section "Monitor"+ Identifier "DummyMonitor0"+ HorizSync 30.0-130.0+ VertRefresh 50.0-150.0+EndSection++Section "Screen"+ Identifier "DummyScreen"+ Device "DummyDevice"+ Monitor "DummyMonitor0"+ DefaultDepth 24+ SubSection "Display"+ Viewport 0 0+ Depth 24+ Modes "1920x1080"+ EndSubSection+EndSection++Section "InputDevice"+ Identifier "DummyPointer"+ Driver "inputtest"+EndSection++Section "InputDevice"+ Identifier "DummyKeyboard"+ Driver "inputtest"+EndSection++Section "ServerLayout"+ Identifier "DummyLayout"+ Screen 0 "DummyScreen"+ InputDevice "DummyPointer" "CorePointer"+ InputDevice "DummyKeyboard" "CoreKeyboard"+EndSection+EOF+ "$xorg_bin" ":$number" -config "$conf" -logfile "$log" -noreset >/dev/null 2>&1 &+ server=$!+ trap 'kill "$server" 2>/dev/null || true; rm -f "$conf" "$log" 2>/dev/null || true' EXIT+ for _ in $(seq 50); do+ [ -e "/tmp/.X11-unix/X$number" ] && break+ sleep 0.1+ done+ # Two RandR outputs with 960x1080 resolution side by side+ DISPLAY=":$number" xrandr --newmode "960x1080" 86.94 960 1024 1128 1296 1080 1081 1084 1118 -HSync +Vsync >/dev/null 2>&1 || true+ DISPLAY=":$number" xrandr --addmode DUMMY0 960x1080 >/dev/null 2>&1 || true+ DISPLAY=":$number" xrandr --addmode DUMMY1 960x1080 >/dev/null 2>&1 || true+ DISPLAY=":$number" xrandr --output DUMMY0 --mode 960x1080 --pos 0x0 --output DUMMY1 --mode 960x1080 --pos 960x0 >/dev/null 2>&1 || true+else+ command -v Xvfb >/dev/null || { echo "Neither Xorg with dummy driver nor Xvfb is installed" >&2; exit 2; }+ Xvfb ":$number" -screen 0 1920x1080x24 -nolisten tcp >/dev/null 2>&1 &+ server=$!+ trap 'kill "$server" 2>/dev/null || true' EXIT+ for _ in $(seq 50); do+ [ -e "/tmp/.X11-unix/X$number" ] && break+ sleep 0.1+ done+ # RandR 1.5 monitor objects give the seam proof two logical displays on one X screen.+ DISPLAY=":$number" xrandr --setmonitor A 960/254x1080/286+0+0 none >/dev/null 2>&1 || true+ DISPLAY=":$number" xrandr --setmonitor B 960/254x1080/286+960+0 none >/dev/null 2>&1 || true+fi+unset WAYLAND_DISPLAYDISPLAY=":$number" XDG_SESSION_TYPE=x11 "$python" "$here/x11_proof.py"diff --git a/win_app/app_config.py b/win_app/app_config.pyindex e865887..ac625e6 100644--- a/win_app/app_config.py+++ b/win_app/app_config.py@@ -93,6 +93,7 @@ class Config:effect_size: str = "medium"effect_pace: float = 1.0effect_size_fraction: float = 0.045+ frame_rate: str = "display"# The Mac's name from the last pairing, for the window to say who this PC is paired with.paired_with: str = ""# Whether each machine may take the other's input. Two plain switches: the@@ -139,6 +140,12 @@ class Config:block_while_dragging: bool = True# A full-screen app in front holds this PC's edges. This PC's own choice, never shared.hold_full_screen: bool = False+ # The tray icon, one key on all three apps (the Mac's is the menu bar item). This machine's own+ # choice, never shared.+ show_in_tray: bool = True+ # Only the machine in use shows a pointer: this PC's while it drives another, and after a driver+ # lets go of it until it moves (core/idle_pointer). This machine's own choice, never shared.+ hide_idle_pointer: bool = True# The Mac's address is learned, never typed: it is the peer address the# Mac's own link arrives from.mac_host: str = ""@@ -233,6 +240,10 @@ def validate_config(config: Config) -> None:raise ConfigError("block_while_dragging must be true or false")if not isinstance(config.hold_full_screen, bool):raise ConfigError("hold_full_screen must be true or false")+ if not isinstance(config.show_in_tray, bool):+ raise ConfigError("show_in_tray must be true or false")+ if not isinstance(config.hide_idle_pointer, bool):+ raise ConfigError("hide_idle_pointer must be true or false")if not isinstance(config.mac_hardware_address, str):raise ConfigError("mac_hardware_address must be text")if not isinstance(config.crossing_methods, list) or any(@@ -297,6 +308,8 @@ def validate_config(config: Config) -> None:raise ConfigError("effect_pace must be a number from 0.25 to 2.5")if not effects.valid_effect_size_fraction(config.effect_size_fraction):raise ConfigError("effect_size_fraction must be a number from 0.02 to 0.08")+ if config.frame_rate not in tuple(value for value, _name, _divisor in effects.FRAME_RATES):+ raise ConfigError("frame_rate must be one of: display, half, quarter")if not isinstance(config.paired_with, str):raise ConfigError("paired_with must be text")if not isinstance(config.send_to_mac, bool):@@ -347,6 +360,7 @@ def config_from_dict(raw: dict) -> Config:effect_size=raw.get("effect_size", "medium"),effect_pace=raw.get("effect_pace"),effect_size_fraction=raw.get("effect_size_fraction"),+ frame_rate=raw.get("frame_rate", "display"),paired_with=raw.get("paired_with", "") or "",allow_mac_to_drive=raw.get("allow_mac_to_drive", True),check_updates=raw.get("check_updates", True),@@ -375,6 +389,8 @@ def config_from_dict(raw: dict) -> Config:modifier_style=raw.get("modifier_style", "semantic"),block_while_dragging=raw.get("block_while_dragging", True),hold_full_screen=raw.get("hold_full_screen", False),+ show_in_tray=raw.get("show_in_tray", True),+ hide_idle_pointer=raw.get("hide_idle_pointer", True),mac_hardware_address=raw.get("mac_hardware_address", "") or "",mac_host=raw.get("mac_host", "") or "",mac_return_edge=raw.get("mac_return_edge", "") or "",@@ -428,6 +444,7 @@ def config_to_dict(config: Config) -> dict:"effect_size": config.effect_size,"effect_pace": config.effect_pace,"effect_size_fraction": config.effect_size_fraction,+ "frame_rate": config.frame_rate,"paired_with": config.paired_with,"allow_mac_to_drive": config.allow_mac_to_drive,"check_updates": config.check_updates,@@ -455,6 +472,8 @@ def config_to_dict(config: Config) -> dict:"modifier_style": config.modifier_style,"block_while_dragging": config.block_while_dragging,"hold_full_screen": config.hold_full_screen,+ "show_in_tray": config.show_in_tray,+ "hide_idle_pointer": config.hide_idle_pointer,"mac_hardware_address": config.mac_hardware_address,"mac_host": config.mac_host,"mac_return_edge": config.mac_return_edge,@@ -877,6 +896,12 @@ class ReadFallbackPeerBook(receiver.PeerBook):with self.lock:return copy.deepcopy(list((self._tolerant() or {}).get("zones") or []))+ def snapshot(self) -> tuple[list, list]:+ with self.lock:+ settings = self._tolerant() or {}+ return (copy.deepcopy(list(settings.get("peers") or [])),+ copy.deepcopy(list(settings.get("zones") or [])))+def save_config(path: Path, config: Config) -> None:payload = config_to_dict(config)diff --git a/win_app/autostart_win.py b/win_app/autostart_win.pyindex 8b12d7a..dca55d8 100644--- a/win_app/autostart_win.py+++ b/win_app/autostart_win.py@@ -178,6 +178,8 @@ def migrate_legacy_task(run: Runner = _run, user: Optional[str] = None) -> None:owner = root.findtext("t:Principals/t:Principal/t:UserId", "", ns)# schtasks can export the principal as a SID rather than its account name.if owner.casefold() != user.casefold():+ if not owner.casefold().startswith("s-1-"):+ returntry:if owner.casefold() != _user_sid(user).casefold():returndiff --git a/win_app/build.spec b/win_app/build.specindex 3676ad7..8f3fb58 100644--- a/win_app/build.spec+++ b/win_app/build.spec@@ -23,12 +23,21 @@ analysis = Analysis(noarchive=False,)+# Windows 10/11 provide the UCRT and ApiSet stubs in the OS. Do not bundle copies PyInstaller+# finds in third-party runtimes; keep Qt's versioned ICU DLLs if a future PySide build needs them.+excluded_binaries = {"ucrtbase.dll"}+filtered_binaries = [+ b for b in analysis.binaries+ if b[0].lower() not in excluded_binaries+ and not b[0].lower().startswith("api-ms-win-")+]+python_archive = PYZ(analysis.pure)executable = EXE(python_archive,analysis.scripts,- analysis.binaries,+ filtered_binaries,analysis.datas,[],name="Beamer",diff --git a/win_app/capture_portal.py b/win_app/capture_portal.pyindex 26a40cd..34275c8 100644--- a/win_app/capture_portal.py+++ b/win_app/capture_portal.py@@ -171,6 +171,10 @@ def _clip(stretches, low: int, high: int) -> List[Tuple[int, int]]:return [(max(a, low), min(b, high)) for a, b in stretches if min(b, high) > max(a, low)]+def _geometry(rect: crossing.Rect) -> tuple:+ return rect.x, rect.y, rect.width, rect.height++def _thirds(monitor: crossing.Rect, edge: str) -> List[Tuple[int, int]]:"""Each third of `monitor` along `edge`, as [start, end), split where return_edge.part_ofsplits a fraction of the display."""@@ -179,7 +183,8 @@ def _thirds(monitor: crossing.Rect, edge: str) -> List[Tuple[int, int]]:return [(cuts[i], cuts[i + 1]) for i in range(3)]-def barriers(models: list, monitors: List[crossing.Rect], whole_edges=False) -> List[Tuple[str, Tuple[int, int, int, int]]]:+def barriers(models: list, monitors: List[crossing.Rect], whole_edges=False, display_map=None,+ warn_unmatched: Optional[Callable[[str], None]] = None) -> List[Tuple[str, Tuple[int, int, int, int]]]:"""(wall, position) for every barrier the sender's zone models need on these displays, in theportal's coordinates, each once: a whole edge, the chosen thirds of it, or a corner's two wallsof CORNER_PX + 1 pixels. A notch stretch (SpanEdge) is the Mac's and has none here."""@@ -190,9 +195,20 @@ def barriers(models: list, monitors: List[crossing.Rect], whole_edges=False) ->found.append((wall, position))for model in models:+ selected = monitors+ if model.display is not None:+ display = display_map.get(model.display) if isinstance(display_map, dict) else None+ matches = [monitor for monitor in monitors if display is not None and+ _geometry(monitor) == _geometry(display)]+ if len(matches) == 1:+ selected = matches+ else:+ if warn_unmatched is not None:+ warn_unmatched(model.display)+ continueif isinstance(model, crossing.SpanEdge):continue- for monitor in monitors:+ for monitor in selected:if whole_edges:walls = (model.vertical, model.horizontal) if isinstance(model, crossing.CornerPush) else (model.edge,)for wall in walls:@@ -224,7 +240,8 @@ def barriers(models: list, monitors: List[crossing.Rect], whole_edges=False) ->def model_key(models: list) -> tuple:"""What about the models places barriers, so they are set again only when it changes."""- return tuple((type(m).__name__, m.edge, tuple(sorted(getattr(m, "parts", ()))), getattr(m, "corner", None))+ return tuple((type(m).__name__, m.edge, tuple(sorted(getattr(m, "parts", ()))), getattr(m, "corner", None),+ getattr(m, "display", None))for m in models)@@ -395,6 +412,7 @@ class Hooks:self._tokens = tokens or portal.TokenStore("input-capture")self._clock = clockself._whole_edges = linux_desktop.desktop() == "kde"+ self._unmatched_displays_logged = set()self._thread: Optional[threading.Thread] = Noneself._ready = threading.Event()self._stopping = threading.Event()@@ -422,6 +440,9 @@ class Hooks:self._reject_unannounced = Falseself._sequences: Dict[object, int] = {} # libei device: the sequence it emulates underself._disabled_at: Optional[float] = None+ self._expect_disabled = False # Beamer's own SetPointerBarriers on an enabled session, whose Disabled is to come+ self._devices = set() # ids of the captured devices the desktop has added and not removed+ self._leaving = set() # of those, the ones a disable Beamer knows of is about to removeself._sent_home_at: Optional[float] = Noneself._key = Noneself._zones: List[crossing.Rect] = []@@ -605,8 +626,14 @@ class Hooks:desktop_portal.note_position(*point)if member == "Disabled":self._session.enabled = False- self._key = None # set the barriers and enable again, after DISABLED_SECONDSself._disabled_at = self._clock()+ if self._expect_disabled:+ # KWin sends this for its own disable inside every SetPointerBarriers, after the+ # Enable that follows; it keeps the barriers, so setting them again would loop.+ self._expect_disabled = False+ else:+ self._key = None # set the barriers and enable again, after DISABLED_SECONDS+ self._leaving = set(self._devices)# Asked of the sender too: a tray switch may have sent input away a moment ago.if was_away or self._away_wanted():LOGGER.info("The desktop ended the capture while input was away; bringing it home")@@ -614,6 +641,7 @@ class Hooks:elif member == "ZonesChanged":# Mutter and KWin disable the session on a monitor change; mutter says only this.self._session.enabled = False+ self._leaving = set(self._devices)self._set_zones(self._session.zones())def _activated(self, options: dict) -> None:@@ -774,30 +802,57 @@ class Hooks:except Exception:LOGGER.exception("Could not read the zones; no barriers until the next change")models = []- key = (model_key(models), tuple(self._zones))+ display_map = desktop_portal.display_map()+ key = (model_key(models), tuple(self._zones),+ tuple(sorted((name, _geometry(rect)) for name, rect in display_map.items())))if key == self._key:if models and not session.enabled:session.enable()returnself._key = key- self._selected = barriers(models, self._zones)- placed = self._placed = barriers(models, self._zones, whole_edges=self._whole_edges)+ self._expect_disabled = session.enabled+ if session.enabled:+ self._leaving = set(self._devices)+ self._selected = barriers(models, self._zones, display_map=display_map,+ warn_unmatched=self._warn_unmatched_display)+ placed = self._placed = barriers(models, self._zones, whole_edges=self._whole_edges, display_map=display_map,+ warn_unmatched=self._warn_unmatched_display)failed = session.set_barriers([position for _wall, position in placed])self._walls = {index + 1: wall for index, (wall, _position) in enumerate(placed) if index + 1 not in failed}if failed:LOGGER.warning("The desktop refused %d of %d edge barriers", len(failed), len(placed))+ def _warn_unmatched_display(self, display: str) -> None:+ if display in self._unmatched_displays_logged:+ return+ self._unmatched_displays_logged.add(display)+ LOGGER.warning("Could not match display %r to one portal zone by geometry; skipping its barriers", display)+# -- ei events -------------------------------------------------------------def _ei_event(self, event: tuple) -> None:kind = event[0]if kind == "device_added":device = event[1]+ self._devices.add(id(device))+ self._leaving.discard(id(device))if hasattr(device, "keymap") and 4 in getattr(device, "caps", ()): # libei.CAP_KEYBOARDself._read_keymap(device)returnif kind == "disconnect":raise CaptureUnavailable(ENDED.format(detail="its input connection closed"))+ if kind == "device_removed":+ self._devices.discard(id(event[1]))+ if id(event[1]) in self._leaving:+ self._leaving.discard(id(event[1]))+ elif self._session is not None and self._session.enabled:+ # Mutter's cancel shortcut leaves the session disabled and says nothing but this:+ # a release only stops the devices, a disable removes them. Its barriers stand, so+ # Enable alone brings the edges back.+ LOGGER.info("The desktop removed the capture's input devices; enabling the session again")+ self._session.enabled = False+ self._disabled_at = self._clock()+ returnif kind == "device_paused":device = event[1]for device_id, code in tuple(self._names_down):diff --git a/win_app/capture_x11.py b/win_app/capture_x11.pyindex 168af34..de7e58a 100644--- a/win_app/capture_x11.py+++ b/win_app/capture_x11.py@@ -85,7 +85,6 @@ XI_HIERARCHY_CHANGED = 11XI_RAW_KEY_PRESS, XI_RAW_KEY_RELEASE = 13, 14XI_RAW_BUTTON_PRESS, XI_RAW_BUTTON_RELEASE = 15, 16XI_RAW_MOTION = 17-XI_BARRIER_HIT, XI_BARRIER_LEAVE = x11_seams.XI_BARRIER_HIT, x11_seams.XI_BARRIER_LEAVEXI_ALL_DEVICES, XI_ALL_MASTER_DEVICES = 0, 1XI_MASTER_POINTER, XI_MASTER_KEYBOARD, XI_SLAVE_POINTER = 1, 2, 3XI_KEY_REPEAT = 1 << 16@@ -296,8 +295,7 @@ class _Connection:if not self.display.has_extension("XTEST"):raise RuntimeError("This X server has no XTEST extension")self._opcode = self.display.display.get_extension_major("XInputExtension")- # XI 2.3 adds barrier-hit events and the release request used for seam resistance.- # Older servers negotiate down and retain the existing 2.1 capture behaviour.+ # XI 2.3 is needed only for the optional XFixes seam barriers.reply = xinput.XIQueryVersion(display=self.display.display, opcode=self._opcode, major_version=2, minor_version=3)self._xi_version = (reply.major_version, reply.minor_version)if (reply.major_version, reply.minor_version) < (2, 1):@@ -342,8 +340,6 @@ class _Connection:def _generic(self, event) -> list:kind = event.evtype- if kind in (XI_BARRIER_HIT, XI_BARRIER_LEAVE):- return [x11_seams.parse_barrier_event(kind, event.data)]if XI_RAW_KEY_PRESS <= kind <= XI_RAW_MOTION:deviceid, detail, sourceid, flags, raw = parse_raw(event.data)return [("raw", kind, detail, sourceid, flags, raw, deviceid, event.sequence_number)]@@ -421,15 +417,16 @@ class _Connection:finally:self.display.close()- def configure_seams(self, monitors, resistance_px: int, enabled: bool = True) -> bool:+ def configure_seams(self, monitors, resistance_px: int, enabled: bool = True,+ display_map=None, models=()) -> bool:"""Configure XFixes holds on internal RandR monitor seams."""if self._seam_unavailable:return Falsetry:if self._seam_controller is None:- if self._xi_version < (2, 3) or not self.display.has_extension("XFIXES"):+ if not self.display.has_extension("XFIXES"):self._seam_unavailable = True- LOGGER.info("X11 seam holds need XInput 2.3 and XFixes 5; leaving this desktop unchanged")+ LOGGER.info("X11 seam holds need XFixes 5; leaving this desktop unchanged")return Falsefrom Xlib.ext import xfixes@@ -445,12 +442,13 @@ class _Connection:LOGGER.info("X11 seam holds need XFixes 5; leaving this desktop unchanged")return Falseself.root.xinput_select_events([- (XI_ALL_MASTER_DEVICES, RAW_MASK | x11_seams.XI_BARRIER_EVENTS),+ (XI_ALL_MASTER_DEVICES, RAW_MASK),(XI_ALL_DEVICES, 1 << XI_HIERARCHY_CHANGED),])self.display.sync()self._seam_controller = x11_seams.Controller(x11_seams.XlibBackend(self.display, self.root))- self._seam_controller.configure(monitors, resistance_px, enabled)+ self._seam_controller.configure(monitors, resistance_px, enabled,+ display_map=display_map, models=models)self.display.flush()return Trueexcept Exception:@@ -464,11 +462,6 @@ class _Connection:self._seam_controller = Nonereturn False- def handle_seam_event(self, event: tuple) -> None:- if self._seam_controller is not None:- self._seam_controller.handle(event)--class Hooks:"""The listener, the grab and the thread that owns both, with capture_win.Hooks' callbacks:`on_key(name, down, vk, us)`, `on_mouse(message, x, y, mouse_data)` and `on_motion(dx, dy)`.@@ -519,14 +512,14 @@ class Hooks:and never block."""self._predicate = predicate- def configure_seams(self, monitors, resistance_px: int) -> None:+ def configure_seams(self, monitors, resistance_px: int, display_map=None, models=()) -> None:"""Enable X11 internal-monitor seam holds using X root-pixel rectangles.- Call again when the monitor layout or crossing resistance changes. Barriers are managed- on the capture thread, and are suspended while a peer is driving this machine.+ Live providers are read on the capture thread, so hot-plug and changes to armed zones take+ effect together with the existing pause and redirect state."""with self._seam_lock:- self._seam_config = (tuple(monitors), max(0, int(resistance_px)))+ self._seam_config = (monitors, max(0, int(resistance_px)), display_map, models)@propertydef grabbed(self) -> bool:@@ -640,7 +633,14 @@ class Hooks:if config is None:returntry:- configure(config[0], config[1], enabled=enabled)+ monitors, resistance, display_map, models = config+ if callable(monitors):+ monitors = monitors()+ if callable(display_map):+ display_map = display_map()+ if callable(models):+ models = models()+ configure(monitors, resistance, enabled=enabled, display_map=display_map, models=models)except Exception:LOGGER.exception("Could not update X11 seam barriers; disabling them")try:@@ -760,11 +760,7 @@ class Hooks:def _handle(self, event: tuple) -> None:kind = event[0]- if kind == "barrier":- handle = getattr(self._connection, "handle_seam_event", None)- if callable(handle):- handle(event)- elif kind == "raw":+ if kind == "raw":_, evtype, detail, sourceid, flags, raw, master, sequence = eventif self.drop_injected and sourceid in self._xtest:returndiff --git a/win_app/crossing_ledger.py b/win_app/crossing_ledger.pyindex bee536e..ec935ad 100644--- a/win_app/crossing_ledger.py+++ b/win_app/crossing_ledger.py@@ -1,9 +1,9 @@"""The Crossing ledger: kept intent, edited directly in each machine's row."""-from PySide6.QtCore import QEvent, QPointF, QRectF, QSize, Qt-from PySide6.QtGui import QAccessible, QColor, QFontMetrics, QPainter, QPen+from PySide6.QtCore import QEvent, QPoint, QPointF, QRect, QRectF, QSize, Qt+from PySide6.QtGui import QAccessible, QColor, QFontMetrics, QPainter, QPainterPath, QPenfrom PySide6.QtWidgets import (QAccessibleWidget, QCheckBox, QFrame, QGraphicsOpacityEffect,- QGridLayout, QHBoxLayout, QLabel, QLineEdit, QPushButton,+ QGridLayout, QHBoxLayout, QLabel, QLayout, QLineEdit, QPushButton,QSizePolicy, QStyle, QStyleOptionButton, QVBoxLayout, QWidget)from core import ways@@ -41,92 +41,457 @@ def _quiet_style(button):button.setStyleSheet(f"QPushButton {{ color: {theme.colour('ink_2')}; background: transparent; border: 0; padding: 0; font-size: {round(theme.TYPE['note'])}px; font-weight: 400; text-align: left; }} QPushButton:focus {{ border: 1px solid {theme.colour('signal')}; }}")-class ScreenGlyph(QWidget):- def __init__(self, kind, callback, parent=None):+SIDE_NAMES = {"left": "Left", "right": "Right", "top": "Top", "bottom": "Bottom"}+CORNER_TITLES = {corner: corner.replace("_", " ").capitalize() for corner in ways.CORNERS}+CHIP_HEIGHT = 26+++def _tone(name, alpha=1.0):+ tone = QColor(theme.colour(name))+ tone.setAlphaF(alpha)+ return tone+++def _mix(one, two, amount):+ one, two = QColor(theme.colour(one)), QColor(theme.colour(two))+ return QColor(*(round(a + (b - a) * amount) for a, b in zip(one.getRgb()[:3], two.getRgb()[:3])))+++class _Flow(QLayout):+ """Chips that wrap onto further lines at the cell's width, 6 px apart."""++ def __init__(self, parent=None, gap=6):super().__init__(parent)- self.kind, self.callback = kind, callback- self.side, self.picked, self.corner, self.holders = "", [], "", {}- self.setFixedSize(50, 38)- self.buttons = {}- details = ways.PARTS if kind == "edge" else ways.CORNERS- for detail in details:- button = QPushButton(self)- button.setCheckable(True)- button.setCursor(Qt.CursorShape.PointingHandCursor)- button.setStyleSheet("QPushButton { background: transparent; border: 0; padding: 0; } QPushButton:focus { border: 1px solid " + theme.colour("signal") + "; }")- button.clicked.connect(lambda _checked=False, value=detail: self.callback(value))- self.buttons[detail] = button-- def reflect(self, side="", picked=(), corner="", holders=None, left_out=False):- self.side, self.picked, self.corner, self.holders = side or "", list(picked), corner, holders or {}- rect = QRectF(7.5, 7.5, 35, 23)- for index, (detail, button) in enumerate(self.buttons.items()):- button.setStyleSheet("QPushButton { background: transparent; border: 0; padding: 0; } QPushButton:focus { border: 1px solid " + theme.colour("signal") + "; }")- if self.kind == "edge":- horizontal = side in ("top", "bottom")- span = rect.width() if horizontal else rect.height()- fixed = rect.top() if side == "top" else rect.bottom() if side == "bottom" else rect.left() if side == "left" else rect.right()- start = (rect.left() if horizontal else rect.top()) + index * span / 3- hit = QRectF(start, fixed - 6, span / 3, 12) if horizontal else QRectF(fixed - 6, start, 12, span / 3)- title = ways.part_names(side or "top")[detail]- on = detail in picked- name = f"{(side or 'Unplaced').capitalize()} edge, {title.lower()} third, {'on' if on else 'off'}"- tooltip = f"{title} third: click to {'leave it out' if on else 'turn it on'}"- allowed = bool(side)- else:- x = 10.5 if detail.endswith("left") else 39.5- y = 10.5 if detail.startswith("top") else 27.5- hit = QRectF(x - 7, y - 7, 14, 14)- title = detail.replace("_", " ").capitalize()- on = corner == detail- name = f"{title} corner, {'on' if on else 'off'}"- tooltip = (f"{self.holders[detail]}'s corner" if detail in self.holders else- f"{title} corner: click to {'turn it off' if on else 'move the corner here' if corner else 'turn it on'}")- allowed = detail not in self.holders- button.setGeometry(hit.toAlignedRect())- button.setAccessibleName(name)- button.setToolTip("Left out: Put back to change its ways" if left_out else tooltip)- button.setEnabled(allowed and not left_out)- button.blockSignals(True)- button.setChecked(on)- button.blockSignals(False)+ self._items, self._gap = [], gap+ self.setContentsMargins(0, 0, 0, 0)++ def addItem(self, item):+ self._items.append(item)++ def count(self):+ return len(self._items)++ def itemAt(self, index):+ return self._items[index] if 0 <= index < len(self._items) else None++ def takeAt(self, index):+ return self._items.pop(index) if 0 <= index < len(self._items) else None++ def order(self, widgets):+ by_widget = {item.widget(): item for item in self._items}+ self._items = [by_widget[widget] for widget in widgets if widget in by_widget]+ self.invalidate()++ def hasHeightForWidth(self):+ return True++ def heightForWidth(self, width):+ return self._place(QRect(0, 0, width, 0), False)++ def minimumHeightForWidth(self, width):+ return self.heightForWidth(width)++ def setGeometry(self, rect):+ super().setGeometry(rect)+ self._place(rect, True)++ def sizeHint(self):+ shown = [item for item in self._items if not item.isEmpty()]+ width = sum(item.sizeHint().width() for item in shown) + self._gap * max(0, len(shown) - 1)+ return QSize(width, CHIP_HEIGHT)++ def minimumSize(self):+ shown = [item for item in self._items if not item.isEmpty()]+ return QSize(max((item.minimumSize().width() for item in shown), default=0), CHIP_HEIGHT if shown else 0)++ def _place(self, rect, apply):+ x, y, line = rect.x(), rect.y(), 0+ for item in self._items:+ if item.isEmpty():+ continue+ hint = item.sizeHint()+ width = min(hint.width(), max(1, rect.width()))+ if x > rect.x() and x + width > rect.x() + rect.width():+ x, y = rect.x(), y + line + self._gap+ line = 0+ if apply:+ item.setGeometry(QRect(QPoint(x, y), QSize(width, hint.height())))+ x += width + self._gap+ line = max(line, hint.height())+ return y + line - rect.y() if line else 0+++class _Segment(QPushButton):+ """One third of a contact chip's bar: a 9 px wide button laid over the drawn bar."""++ def __init__(self, parent, callback):+ super().__init__(parent)+ self.setCheckable(True)+ self.setCursor(Qt.CursorShape.PointingHandCursor)+ self.setFlat(True)+ self.restyle()+ self.clicked.connect(lambda _checked=False: callback())++ def restyle(self):+ self.setStyleSheet("QPushButton { background: transparent; border: 0; padding: 0; min-width: 0; min-height: 0; }"+ " QPushButton[keyboard_ring=\"true\"]:focus { border: 1px solid " + theme.colour("signal") + "; }")++ def nextCheckState(self):+ pass+++class _Chip(QPushButton):+ """One side of This PC as a chip: a drawn icon, the label, and for the contact side a thirds bar."""++ def __init__(self, side, on_click, on_third):+ super().__init__()+ self.side, self.kind, self.text_, self.picked = side, "free", "", ()+ self.edge_on = False+ self.setCheckable(True)+ self.setCursor(Qt.CursorShape.PointingHandCursor)+ self.setFixedHeight(CHIP_HEIGHT)+ self.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)+ self.setStyleSheet("QPushButton { padding: 0; min-width: 0; min-height: 0; }")+ self.setFont(theme.font(12))+ self.clicked.connect(lambda _checked=False: on_click(self.side))+ self.segments = {}+ for third in ways.PARTS:+ segment = _Segment(self, lambda third=third: on_third(third))+ segment.hide()+ self.segments[third] = segment++ def nextCheckState(self):+ pass++ def set_state(self, kind, text, on, tooltip, name, edge_on=False, picked=(), enabled=True, segments_enabled=True):+ self.kind, self.text_, self.edge_on, self.picked = kind, text, edge_on, tuple(picked)+ self.setFont(theme.font(12))+ self.setToolTip(tooltip)+ self.setAccessibleName(name)+ self.setEnabled(enabled)+ self.setCursor(Qt.CursorShape.PointingHandCursor if enabled else Qt.CursorShape.ArrowCursor)+ self.blockSignals(True)+ self.setChecked(on)+ self.blockSignals(False)+ for third, segment in self.segments.items():+ segment.restyle()+ segment.setVisible(kind == "contact")+ segment.setEnabled(segments_enabled)+ title = ways.part_names(self.side)[third]+ lit = edge_on and third in picked+ segment.setAccessibleName(f"{SIDE_NAMES[self.side]} edge, {title.lower()} third, {'on' if lit else 'off'}")+ segment.setToolTip(f"{title} third: click to {'leave it out' if lit else 'turn it on'}")+ segment.blockSignals(True)+ segment.setChecked(lit)+ segment.blockSignals(False)+ self.updateGeometry()+ self.update()++ def _natural(self):+ advance = QFontMetrics(self.font()).horizontalAdvance(self.text_)+ return 8 + 14 + 6 + advance + 10 + (28 if self.kind == "contact" else 0) + 2++ def sizeHint(self):+ return QSize(self._natural(), CHIP_HEIGHT)++ def minimumSizeHint(self):+ return QSize(min(self._natural(), 84), CHIP_HEIGHT)++ def resizeEvent(self, event):+ super().resizeEvent(event)+ bar_x = self.width() - 10 - 22+ for index, segment in enumerate(self.segments.values()):+ centre = bar_x + 1 + index * 7.3 + 2.5+ segment.setGeometry(round(centre - 4.5), 2, 9, CHIP_HEIGHT - 4)++ def enterEvent(self, event):+ super().enterEvent(event)+ self.update()++ def leaveEvent(self, event):+ super().leaveEvent(event)+ self.update()++ def focusInEvent(self, event):+ super().focusInEvent(event)+ self.update()++ def focusOutEvent(self, event):+ super().focusOutEvent(event)self.update()+ def _icon(self, painter, colour):+ pen = QPen(colour, 1.5)+ pen.setCapStyle(Qt.PenCapStyle.RoundCap)+ pen.setJoinStyle(Qt.PenJoinStyle.RoundJoin)+ painter.setPen(pen)+ painter.setBrush(Qt.BrushStyle.NoBrush)+ painter.save()+ painter.translate(8, (CHIP_HEIGHT - 14) / 2)+ path = QPainterPath()+ if self.kind == "free":+ path.moveTo(7, 3)+ path.lineTo(7, 11)+ path.moveTo(3, 7)+ path.lineTo(11, 7)+ elif self.kind in ("on", "kept"):+ path.moveTo(10.5, 4.5)+ path.lineTo(5, 4.5)+ path.arcTo(QRectF(2.5, 4.5, 5, 5), 90, 180)+ path.lineTo(11, 9.5)+ path.moveTo(9, 7.5)+ path.lineTo(11, 9.5)+ path.lineTo(9, 11.5)+ else:+ path.moveTo(2, 2.5)+ path.lineTo(2, 11.5)+ path.moveTo(5, 7)+ path.lineTo(12, 7)+ path.moveTo(9.5, 4.5)+ path.lineTo(12, 7)+ path.lineTo(9.5, 9.5)+ painter.drawPath(path)+ painter.restore()+def paintEvent(self, _event):painter = QPainter(self)painter.setRenderHint(QPainter.RenderHint.Antialiasing)- painter.setPen(QPen(QColor(theme.colour("edge")), 1))- painter.setBrush(QColor(theme.colour("well")))- rect = QRectF(7.5, 7.5, 35, 23)- painter.drawRoundedRect(rect, 2.5, 2.5)- if self.kind == "edge" and self.side:- horizontal = self.side in ("top", "bottom")- fixed = rect.top() if self.side == "top" else rect.bottom() if self.side == "bottom" else rect.left() if self.side == "left" else rect.right()- span = rect.width() if horizontal else rect.height()- origin = rect.left() if horizontal else rect.top()+ kind, live = self.kind, self.isEnabled()+ lit = kind == "on" or (kind == "contact" and self.edge_on)+ hover = self.underMouse() and live+ pressed = self.isDown() and live+ border, fill, ink, icon = _tone("edge"), None, _tone("ink_2"), _tone("ink_2")+ dashed = False+ if lit:+ border, fill, ink, icon = _tone("signal"), _tone("signal_dim"), _tone("ink"), _tone("signal")+ elif kind == "contact":+ ink = icon = _tone("ink_3")+ elif kind == "kept":+ border, ink, icon, dashed = _tone("signal", .45), _tone("ink_3"), _tone("ink_3"), True+ elif kind == "free":+ dashed = True+ elif kind == "held":+ border, ink, icon = _tone("rule"), _tone("ink_3"), _tone("ink_3")+ painter.setOpacity(.45)+ if pressed:+ border, fill, ink, dashed = _tone("signal"), _mix("signal_dim", "signal", .12), _tone("ink"), False+ elif hover:+ border, fill, ink, dashed = _tone("ink_2"), _mix("panel", "well", .5), _tone("ink"), False+ rect = QRectF(self.rect()).adjusted(.5, .5, -.5, -.5)+ pen = QPen(border, 1)+ if dashed:+ pen.setDashPattern([3.0, 3.0])+ painter.setPen(pen)+ painter.setBrush(fill if fill is not None else Qt.BrushStyle.NoBrush)+ painter.drawRoundedRect(rect, 5, 5)+ if pressed:+ painter.setPen(QPen(QColor(0, 0, 0, 90), 1))+ painter.setBrush(Qt.BrushStyle.NoBrush)+ painter.drawRoundedRect(rect.adjusted(1, 1, -1, -1), 4, 4)+ self._icon(painter, icon)+ bar = 28 if kind == "contact" else 0+ painter.setFont(self.font())+ painter.setPen(ink)+ room = max(1, self.width() - 28 - 10 - bar)+ painter.drawText(QRectF(28, 0, room, CHIP_HEIGHT), Qt.AlignmentFlag.AlignVCenter | Qt.AlignmentFlag.AlignLeft,+ QFontMetrics(self.font()).elidedText(self.text_, Qt.TextElideMode.ElideRight, round(room)))+ if kind == "contact":+ bar_x = self.width() - 10 - 22for index, third in enumerate(ways.PARTS):- on = third in self.picked- colour = QColor(theme.colour("signal" if on else "edge"))- colour.setAlphaF(1 if on else .7)- pen = QPen(colour, 3 if on else 1.5)- pen.setCapStyle(Qt.PenCapStyle.RoundCap)- painter.setPen(pen)- start, end = origin + index * span / 3 + 1, origin + (index + 1) * span / 3 - 1- painter.drawLine(QPointF(start, fixed), QPointF(end, fixed)) if horizontal else painter.drawLine(QPointF(fixed, start), QPointF(fixed, end))- elif self.kind == "corner":- for corner in ways.CORNERS:- x = 10.5 if corner.endswith("left") else 39.5- y = 10.5 if corner.startswith("top") else 27.5- on, held = corner == self.corner, corner in self.holders- colour = QColor(theme.colour("signal" if on or held else "edge"))- colour.setAlphaF(.45 if held else 1)- painter.setPen(QPen(colour, 1))- painter.setBrush(colour if on else Qt.BrushStyle.NoBrush)- radius = 3.2 if on else 2- painter.drawEllipse(QPointF(x, y), radius, radius)+ on = self.edge_on and third in self.picked+ stroke = QPen(_tone("signal" if on else "edge"), 3 if on else 1.5)+ stroke.setCapStyle(Qt.PenCapStyle.RoundCap)+ painter.setPen(stroke)+ start = bar_x + 1 + index * 7.3+ painter.drawLine(QPointF(start, CHIP_HEIGHT / 2), QPointF(start + 5, CHIP_HEIGHT / 2))+ if widgets.focus_ring_visible(self):+ painter.setOpacity(1)+ painter.setPen(QPen(_tone("signal"), 2))+ painter.setBrush(Qt.BrushStyle.NoBrush)+ painter.drawRoundedRect(QRectF(self.rect()).adjusted(1, 1, -1, -1), 5, 5)painter.end()+class EdgeChips(QWidget):+ """The Edges cell: the contact side first, then left, right, top and bottom, as chips."""++ def __init__(self, peer, owner, parent=None):+ super().__init__(parent)+ self.setProperty("vernier", "plain")+ self.setMinimumWidth(0)+ self.flow = _Flow(self)+ self.chips = {side: _Chip(side, lambda side, peer=peer: self._clicked(peer, owner, side),+ lambda third, peer=peer: owner._ledger_third(peer, third)) for side in ways.EDGES}+ for chip in self.chips.values():+ self.flow.addWidget(chip)+ chip.hide()+ self.kinds = {}++ def _clicked(self, peer, owner, side):+ if self.kinds.get(side) == "contact":+ owner._ledger_edge(peer)+ else:+ owner._ledger_side(peer, side)++ def reflect(self, sides, name, labels, edge_on, picked, contact, left_out):+ order = ([contact] if contact else []) + [side for side in ways.EDGES if side != contact]+ self.flow.order([self.chips[side] for side in order])+ self.kinds = {side: sides.get(side, {}).get("state", "unavailable") for side in ways.EDGES}+ lock = "Left out: Put back to change its ways"+ for side in ways.EDGES:+ chip, kind = self.chips[side], self.kinds[side]+ title = SIDE_NAMES[side]+ if kind == "unavailable" or left_out and kind in ("free", "held"):+ # A left-out row shows only the ways it keeps.+ chip.hide()+ continue+ held_by = labels.get(sides[side].get("by"), "Another machine") if kind == "held" else ""+ if kind == "contact":+ answer = "turn it off" if edge_on else "turn it on"+ chip.set_state("contact", title, edge_on, lock if left_out else f"{title} edge: touches {name}; click to {answer}",+ f"{title} edge, touches {name}, {'on' if edge_on else 'off'}", edge_on, picked,+ enabled=not left_out, segments_enabled=not left_out)+ elif kind == "on":+ chip.set_state("on", f"{title}, wraps", True, lock if left_out else f"{title} edge wraps round to {name}; click to remove",+ f"{title} edge, wraps round, on", enabled=not left_out)+ elif kind == "kept":+ chip.set_state("kept", f"{title}, wraps", False,+ lock if left_out else (f"{title} edge wraps round to {name} once Edge is on; click to turn Edge on" if not edge_on+ else f"{title} edge: none of it is free just now; click to remove"),+ f"{title} edge, wraps round, kept", enabled=not left_out)+ elif kind == "held":+ chip.set_state("held", f"{title}, {held_by}", False, f"{title} edge: {held_by}'s",+ f"{title} edge, held by {held_by}", enabled=False)+ else:+ chip.set_state("free", title, False, lock if left_out else f"{title} edge: click to wrap round to {name}",+ f"{title} edge, wraps round, off", enabled=not left_out)+ chip.show()+ self.updateGeometry()++ def any_shown(self):+ return any(kind != "unavailable" for kind in self.kinds.values())+++class _CornerButton(QPushButton):+ """One corner of This PC: a 28 px square with an L bracket drawn at that corner."""++ def __init__(self, corner, callback):+ super().__init__()+ self.corner, self.kind = corner, "unavailable"+ self.setCheckable(True)+ self.setFixedSize(28, 28)+ self.setStyleSheet("QPushButton { padding: 0; min-width: 0; min-height: 0; }")+ self.clicked.connect(lambda _checked=False: callback(self.corner))++ def nextCheckState(self):+ pass++ def set_state(self, kind, tooltip, name, enabled):+ self.kind = kind+ self.setToolTip(tooltip)+ self.setAccessibleName(name)+ self.setEnabled(enabled)+ self.setCursor(Qt.CursorShape.PointingHandCursor if enabled else Qt.CursorShape.ArrowCursor)+ self.blockSignals(True)+ self.setChecked(kind == "on")+ self.blockSignals(False)+ self.update()++ def enterEvent(self, event):+ super().enterEvent(event)+ self.update()++ def leaveEvent(self, event):+ super().leaveEvent(event)+ self.update()++ def focusInEvent(self, event):+ super().focusInEvent(event)+ self.update()++ def focusOutEvent(self, event):+ super().focusOutEvent(event)+ self.update()++ def paintEvent(self, _event):+ painter = QPainter(self)+ painter.setRenderHint(QPainter.RenderHint.Antialiasing)+ kind = self.kind+ hover = self.underMouse() and self.isEnabled()+ pressed = self.isDown() and self.isEnabled()+ border, fill, bracket, dashed, opacity = _tone("edge"), None, _tone("ink_2"), True, 1.0+ if kind == "on":+ border, fill, bracket, dashed = _tone("signal"), _tone("signal"), _tone("ground"), False+ elif kind == "held":+ border, bracket, dashed = _tone("signal", .35), _tone("signal", .5), False+ elif kind == "unavailable":+ opacity = .4+ if pressed:+ border, fill, dashed = _tone("signal"), _mix("signal_dim", "signal", .12), False+ bracket = _tone("ink")+ elif hover:+ border, dashed = _tone("ink_2"), False+ fill = fill if fill is not None else _mix("panel", "well", .5)+ painter.setOpacity(opacity)+ pen = QPen(border, 1)+ if dashed:+ pen.setDashPattern([3.0, 3.0])+ painter.setPen(pen)+ painter.setBrush(fill if fill is not None else Qt.BrushStyle.NoBrush)+ painter.drawRoundedRect(QRectF(self.rect()).adjusted(.5, .5, -.5, -.5), 5, 5)+ vertical, horizontal = self.corner.split("_")+ dx, dy = (1 if horizontal == "left" else -1), (1 if vertical == "top" else -1)+ x, y = (10 if horizontal == "left" else 18), (10 if vertical == "top" else 18)+ stroke = QPen(bracket, 1.8)+ stroke.setCapStyle(Qt.PenCapStyle.RoundCap)+ stroke.setJoinStyle(Qt.PenJoinStyle.RoundJoin)+ painter.setPen(stroke)+ painter.setBrush(Qt.BrushStyle.NoBrush)+ path = QPainterPath(QPointF(x, y + dy * 7))+ path.lineTo(x, y)+ path.lineTo(x + dx * 7, y)+ painter.drawPath(path)+ if widgets.focus_ring_visible(self):+ painter.setOpacity(1)+ painter.setPen(QPen(_tone("signal"), 2))+ painter.setBrush(Qt.BrushStyle.NoBrush)+ painter.drawRoundedRect(QRectF(self.rect()).adjusted(1, 1, -1, -1), 5, 5)+ painter.end()+++class CornerGrid(QWidget):+ """The Corners cell: a 2 x 2 grid of corner buttons in screen order."""++ def __init__(self, peer, owner, parent=None):+ super().__init__(parent)+ self.setProperty("vernier", "plain")+ grid = QGridLayout(self)+ grid.setContentsMargins(0, 0, 0, 0)+ grid.setSpacing(4)+ self.buttons = {}+ for index, corner in enumerate(("top_left", "top_right", "bottom_left", "bottom_right")):+ button = _CornerButton(corner, lambda corner, peer=peer: owner._ledger_corner(peer, corner))+ self.buttons[corner] = button+ grid.addWidget(button, index // 2, index % 2)+ self.setFixedWidth(60)++ def reflect(self, corners, name, labels, platform_word, left_out):+ lock = "Left out: Put back to change its ways"+ for corner, button in self.buttons.items():+ kind = corners.get(corner, {}).get("state", "unavailable")+ title = CORNER_TITLES[corner]+ if kind == "held":+ holder = labels.get(corners[corner].get("by"), "Another machine")+ button.set_state("held", lock if left_out else f"{holder}'s corner", f"{title} corner, held by {holder}", False)+ elif kind == "unavailable":+ button.set_state("unavailable", lock if left_out else f"Place {name} beside this {platform_word} first",+ f"{title} corner, unavailable", False)+ else:+ on = kind == "on"+ button.set_state(kind, lock if left_out else f"{title} corner: click to turn it {'off' if on else 'on'}",+ f"{title} corner, {'on' if on else 'off'}", not left_out)++class _Name(QLabel):def __init__(self):super().__init__()@@ -223,6 +588,10 @@ class _Cycle(QCheckBox):painter.end()+# Machine, Edges, Corners, Keys: minimum width and stretch, the spec's minmax(132, 1.3fr), minmax(220, 2fr), 70, minmax(128, 1fr).+COLUMNS = (("Machine", 132, 13), ("Edges", 220, 20), ("Corners", 70, 0), ("Keys", 128, 10))++class LedgerRow(QFrame):def minimumSizeHint(self):return QSize(0, self.grid.minimumSize().height())@@ -280,36 +649,20 @@ class LedgerRow(QFrame):actions.addWidget(self.leave)actions.addStretch()machine.addLayout(actions)- self.edge_glyph = ScreenGlyph("edge", lambda third: owner._ledger_third(peer, third))- self.corner_glyph = ScreenGlyph("corner", lambda corner: owner._ledger_corner(peer, corner))- self.edge_text = _quiet("", lambda: owner._ledger_edge(peer))- self.edge_text.setMaximumHeight(16777215)- self.edge_text.setMinimumHeight(40)- text = QVBoxLayout(self.edge_text)- text.setContentsMargins(0, 0, 0, 0)- text.setSpacing(1)- text.setSizeConstraint(text.SizeConstraint.SetMinimumSize)- self.edge_value = widgets.label("", "body", wrap=True)- self.edge_detail = widgets.label("", "small", wrap=True)- for label in (self.edge_value, self.edge_detail):- label.setAttribute(Qt.WidgetAttribute.WA_TransparentForMouseEvents)- text.addWidget(label)- for cell, glyph, content in ((self.edge, self.edge_glyph, self.edge_text), (self.corner_cell, self.corner_glyph, None)):- box = QHBoxLayout(cell)- box.setContentsMargins(0, 0, 0, 0)- box.setSpacing(4)- box.addWidget(glyph, 0, Qt.AlignmentFlag.AlignTop)- if content is None:- content = QWidget()- content.setProperty("vernier", "plain")- texts = QVBoxLayout(content)- texts.setContentsMargins(0, 0, 0, 0)- texts.setSpacing(1)- self.corner_value = widgets.label("", "body", wrap=True)- self.corner_detail = widgets.label("", "small", wrap=True)- texts.addWidget(self.corner_value)- texts.addWidget(self.corner_detail)- box.addWidget(content, 1, Qt.AlignmentFlag.AlignTop)+ machine.addStretch()+ self.edge_chips = EdgeChips(peer, owner)+ edges = QVBoxLayout(self.edge)+ edges.setContentsMargins(0, 0, 0, 0)+ edges.setSpacing(2)+ edges.addWidget(self.edge_chips, 0, Qt.AlignmentFlag.AlignTop)+ self.edge_note = widgets.label("Place it on the map", "small", wrap=True)+ edges.addWidget(self.edge_note, 0, Qt.AlignmentFlag.AlignTop)+ edges.addStretch()+ self.corner_grid = CornerGrid(peer, owner)+ corners = QVBoxLayout(self.corner_cell)+ corners.setContentsMargins(0, 0, 0, 0)+ corners.addWidget(self.corner_grid, 0, Qt.AlignmentFlag.AlignTop)+ corners.addStretch()keys = QVBoxLayout(self.keys)keys.setContentsMargins(0, 0, 0, 0)keys.setSpacing(4)@@ -344,20 +697,24 @@ class LedgerRow(QFrame):self.grid.setColumnStretch(col, 0)if narrow:self.grid.addWidget(self.machine, 0, 0, 1, 2)- self.grid.addWidget(self.edge, 1, 0)- self.grid.addWidget(self.corner_cell, 1, 1)- self.grid.addWidget(self.keys, 2, 0, 1, 2)- self.grid.setColumnStretch(0, 1)+ self.grid.addWidget(self.edge, 1, 0, 1, 2)+ self.grid.addWidget(self.corner_cell, 2, 0)+ self.grid.addWidget(self.keys, 2, 1)+ self.grid.setColumnMinimumWidth(0, COLUMNS[2][1])self.grid.setColumnStretch(1, 1)else:- for index, (cell, minimum, stretch) in enumerate(zip(self.cells, (132, 124, 104, 128), (13, 10, 9, 10))):+ for index, (cell, (_title, minimum, stretch)) in enumerate(zip(self.cells, COLUMNS)):self.grid.addWidget(cell, 0, index)self.grid.setColumnMinimumWidth(index, minimum)self.grid.setColumnStretch(index, stretch)- def reflect(self, settings, entry, name, side, linked, selected, trigger, labels, legacy=""):- self._reflection = (settings, entry, name, side, linked, selected, trigger, labels, legacy)- for button in (self.rename, self.leave, self.edge_text, self.clear):+ def reflect(self, settings, entry, name, side, linked, selected, trigger, labels, legacy="", reach=None):+ seen = (theme.is_dark(), id(settings), repr(entry), name, side, linked, selected, trigger, repr(labels), legacy, repr(reach))+ if seen == getattr(self, "_reflection_seen", None):+ return+ self._reflection_seen = seen+ self._reflection = (settings, entry, name, side, linked, selected, trigger, labels, legacy, reach)+ for button in (self.rename, self.leave, self.clear):_quiet_style(button)self.entry, self.left_out, self.selected = entry, bool(entry.get("left_out")), selectedself.setAccessibleName(name)@@ -374,21 +731,16 @@ class LedgerRow(QFrame):self.leave.setToolTip("Left out machines stay paired and linked. The shortcut, menu and clipboard still reach them." if self.left_out else "Leave this machine out of crossings")held = ways.ways(settings, self.peer)picked = ways.picked_thirds(held["methods"], held["parts"])- on = bool(picked) and bool(side)- self.edge_glyph.reflect(side, picked if on else (), left_out=self.left_out)- self.edge_value.setText(ways.edge_form_detail(side, held["methods"], held["parts"], here="This PC") if on else "Off")- self.edge_value.setStyleSheet(f"color: {theme.colour('ink' if on else 'ink_3')}")- self.edge_detail.setText(f"{side} edge{' off' if not on else ''}" if side else "place it on the map")- self.edge_text.setEnabled(bool(side) and not self.left_out)- self.edge_text.setToolTip("Left out: Put back to change its ways" if self.left_out else "Edge: click to turn it off" if on else f"Edge: click for the whole {side} edge")- self.edge_text.setAccessibleName(f"Edge, {'whole ' + side + ' edge' if len(picked) == 3 and side else self.edge_value.text().lower()}")- corner = held["corner"] if "corner" in held["methods"] else ""- holders = {c: labels.get(holder, "Another machine") for c in ways.CORNERS- if (holder := ways.corner_holder(settings, c, exclude=self.peer))}- self.corner_glyph.reflect(corner=corner, holders=holders, left_out=self.left_out)- self.corner_value.setText(corner.replace("_", " ").capitalize() if corner else "None")- self.corner_value.setStyleSheet(f"color: {theme.colour('ink' if corner else 'ink_3')}")- self.corner_detail.setText("diagonal push" if corner else "click a dot")+ edge_on = bool(picked)+ reach = reach or {}+ # A left-out row's reach is answered as if put back; `self.left_out` makes it inert below.+ sides, corners = reach.get("sides", {}), reach.get("corners", {})+ corners ={corner: ({"state": "on"} if corner in held["corners"] and value.get("state") == "unavailable" else value)+ for corner, value in corners.items()}+ contact = next((edge for edge, value in sides.items() if value.get("state") == "contact"), "")+ self.edge_chips.reflect(sides, name, labels, edge_on, picked if edge_on else (), contact, self.left_out)+ self.edge_note.setVisible(not self.edge_chips.any_shown())+ self.corner_grid.reflect(corners, name, labels, "PC", self.left_out)self.cycle.blockSignals(True)self.cycle.setText(trigger)self.cycle.setChecked(entry.get("shortcut_cycle", True))@@ -458,7 +810,7 @@ class CrossingLedger(QWidget):head = QGridLayout(self.header)head.setContentsMargins(12, 0, 0, 8)head.setHorizontalSpacing(16)- for index, (title, minimum, stretch) in enumerate(zip(("Machine", "Edge", "Corner", "Keys"), (132, 124, 104, 128), (13, 10, 9, 10))):+ for index, (title, minimum, stretch) in enumerate(COLUMNS):label = widgets.Eyebrow(title)label.setProperty("ledger_role", "columnheader")label.setAccessibleName(title)@@ -475,7 +827,7 @@ class CrossingLedger(QWidget):def refresh_colours(self):self.header.setStyleSheet(f"border-bottom: 1px solid {theme.colour('rule')};")- def reflect(self, settings, layout, labels, chosen, live, trigger, legacy=None):+ def reflect(self, settings, layout, labels, chosen, live, trigger, legacy=None, reach=None):self.header.setStyleSheet(f"border-bottom: 1px solid {theme.colour('rule')};")entries = {p["id"]: p for p in settings.get("peers", [])}order = sorted(entries, key=lambda p: (0, layout[p]["x"], layout[p]["y"]) if p in layout else (1, 0, 0))@@ -483,6 +835,8 @@ class CrossingLedger(QWidget):row = self.rows.pop(peer)row.jump.cancel()self.column.removeWidget(row)+ row.hide()+ row.setParent(None)row.deleteLater()for index, peer in enumerate(order):row = self.rows.get(peer)@@ -496,7 +850,7 @@ class CrossingLedger(QWidget):tile = layout.get(peer)contact = ways._rect_contact(own, tile) if own and tile else Noneside = contact[0] if contact and contact[0] != "corner" else ""- row.reflect(settings, entries[peer], labels.get(peer, "Other machine"), side, live(peer), chosen == peer, trigger, labels, (legacy or {}).get(peer, ""))+ row.reflect(settings, entries[peer], labels.get(peer, "Other machine"), side, live(peer), chosen == peer, trigger, labels, (legacy or {}).get(peer, ""), (reach or {}).get(peer))self.setVisible(bool(entries))def resizeEvent(self, event):diff --git a/win_app/desktop_portal.py b/win_app/desktop_portal.pyindex bcac384..39bbf6e 100644--- a/win_app/desktop_portal.py+++ b/win_app/desktop_portal.py@@ -10,15 +10,18 @@ keeps the last position as the truth, and the capture and injection modules keep- inject_portal registers a mover, which places the pointer with libei's absolute pointer whilea peer drives this machine (and while nothing is captured).-The displays are the portal's zones when the InputCapture session has them, else the regions of-the RemoteDesktop absolute pointer, else what Qt says, all in the desktop's logical pixels. If-someone moves this machine's own mouse while a peer drives it, the position here is stale until-the peer's next move puts it back: no portal reports the local pointer.+InputCapture zones and RemoteDesktop absolute-pointer regions can describe the same displays at+different scales and in different orders. Qt's display keys are reconciled to each portal's+rectangles; remembered pointer positions stay in the InputCapture coordinate space and are+translated before libei absolute moves. If someone moves this machine's own mouse while a peer+drives it, the position here is stale until the peer's next move puts it back: no portal reports+the local pointer.A full-screen app cannot be seen and no button can be asked after (button_down is False), so thefull-screen hold and the drag guard have nothing to go on here."""import logging+import mathimport threadingfrom typing import Callable, List, Optional, Tuple@@ -33,6 +36,7 @@ _regions: List[Rect] = [] # the RemoteDesktop absolute pointer's_mover: Optional[Callable[[int, int], None]] = None_captured = False_screens: List[Rect] = []+_mapping_warning_logged = Falsedef set_zones(zones: List[Rect]) -> None:@@ -119,12 +123,156 @@ def _displays() -> List[Rect]:return known or _qt_screens()+def _warn_ambiguous_mapping() -> None:+ global _mapping_warning_logged+ with _lock:+ if _mapping_warning_logged:+ return+ _mapping_warning_logged = True+ LOGGER.warning("Portal rectangles do not uniquely identify Qt displays; skipping display mapping")++def monitors() -> List[Rect]:return _displays() or [Rect(0, 0, 1920, 1080)]+def _match_rectangles(screens: List[Rect], rectangles: List[Rect]) -> List[Rect]:+ """Match portal rectangles to Qt's display order without relying on portal enumeration or+ absolute scale. The portal exposes no display IDs, so aspect ratio and relative desktop layout+ are the identity available across the two coordinate spaces."""+ if not screens or len(screens) != len(rectangles):+ return []+ if len(screens) == 1:+ return list(rectangles)++ def normalised_centres(items):+ left = min(rect.x for rect in items)+ top = min(rect.y for rect in items)+ right = max(rect.x + rect.width for rect in items)+ bottom = max(rect.y + rect.height for rect in items)+ width, height = max(right - left, 1), max(bottom - top, 1)+ return [((r.x + r.width / 2 - left) / width,+ (r.y + r.height / 2 - top) / height) for r in items]++ screen_centres = normalised_centres(screens)+ rect_centres = normalised_centres(rectangles)++ costs = []+ for i, screen in enumerate(screens):+ row = []+ for j, rect in enumerate(rectangles):+ screen_width, screen_height = max(screen.width, 1), max(screen.height, 1)+ rect_width, rect_height = max(rect.width, 1), max(rect.height, 1)+ ratio_error = abs(math.log((screen_width / screen_height) / (rect_width / rect_height)))+ sx, sy = screen_centres[i]+ rx, ry = rect_centres[j]+ row.append(ratio_error * 8 + abs(sx - rx) + abs(sy - ry))+ costs.append(row)++ def solve(matrix):+ count = len(matrix)+ row_potential = [0.0] * (count + 1)+ column_potential = [0.0] * (count + 1)+ assigned_row = [0] * (count + 1)+ previous_column = [0] * (count + 1)+ for row in range(1, count + 1):+ assigned_row[0] = row+ column = 0+ minimum = [float("inf")] * (count + 1)+ used = [False] * (count + 1)+ while True:+ used[column] = True+ active_row = assigned_row[column]+ delta, next_column = float("inf"), 0+ for candidate in range(1, count + 1):+ if used[candidate]:+ continue+ reduced = (matrix[active_row - 1][candidate - 1]+ - row_potential[active_row] - column_potential[candidate])+ if reduced < minimum[candidate]:+ minimum[candidate] = reduced+ previous_column[candidate] = column+ if minimum[candidate] < delta:+ delta, next_column = minimum[candidate], candidate+ for candidate in range(count + 1):+ if used[candidate]:+ row_potential[assigned_row[candidate]] += delta+ column_potential[candidate] -= delta+ else:+ minimum[candidate] -= delta+ column = next_column+ if assigned_row[column] == 0:+ break+ while True:+ prior = previous_column[column]+ assigned_row[column] = assigned_row[prior]+ column = prior+ if column == 0:+ break++ columns = [0] * count+ for column in range(1, count + 1):+ columns[assigned_row[column] - 1] = column - 1+ return columns++ # If another full assignment has the same geometry score, the portal gave no identity+ # signal for those displays. Leave them unmatched instead of targeting one by guesswork.+ assignment = solve(costs)+ best_cost = sum(costs[row][column] for row, column in enumerate(assignment))+ for row, column in enumerate(assignment):+ alternative = [line[:] for line in costs]+ alternative[row][column] = float("inf")+ other = solve(alternative)+ other_cost = sum(costs[index][candidate] for index, candidate in enumerate(other))+ if abs(other_cost - best_cost) <= 1e-9:+ _warn_ambiguous_mapping()+ return []+ return [rectangles[column] for column in assignment]+++def _map_rectangles(rectangles: List[Rect]) -> dict:+ screens = _qt_screens()+ if not rectangles:+ rectangles = screens+ matched = _match_rectangles(screens, rectangles)+ return {str(index): rect for index, rect in enumerate(matched)}++def display_map() -> dict:- return {str(index): rect for index, rect in enumerate(_qt_screens())}+ """Qt display keys expressed in the InputCapture zone coordinates used for crossing."""+ with _lock:+ zones, regions = list(_zones), list(_regions)+ return _map_rectangles(zones or regions)+++def absolute_display_map() -> dict:+ """Qt display keys expressed in libei's absolute pointer coordinate space."""+ with _lock:+ regions = list(_regions)+ return _map_rectangles(regions) if regions else display_map()+++def absolute_position(x: int, y: int) -> Optional[Tuple[int, int]]:+ """Translate a point from InputCapture coordinates into libei's absolute-pointer regions."""+ source = display_map()+ target = absolute_display_map()+ if not source or not target:+ with _lock:+ zones = list(_zones)+ if not zones:+ return x, y+ _warn_ambiguous_mapping()+ return None+ for key, rect in source.items():+ if rect.x <= x <= rect.right and rect.y <= y <= rect.bottom:+ other = target.get(key)+ if other is None:+ break+ px = (x - rect.x) / max(rect.width - 1, 1)+ py = (y - rect.y) / max(rect.height - 1, 1)+ return (other.x + round(px * max(other.width - 1, 0)),+ other.y + round(py * max(other.height - 1, 0)))+ return x, ydef cursor_position() -> Tuple[int, int]:diff --git a/win_app/desktop_win.py b/win_app/desktop_win.pyindex 2e46f47..fae0728 100644--- a/win_app/desktop_win.py+++ b/win_app/desktop_win.py@@ -4,15 +4,19 @@ and EnumDisplayMonitors share one coordinate space — virtual-desktop pixels,DPI-virtualised identically for this process — so values from one feed theothers unconverted."""+import atexitimport ctypesimport loggingimport osimport sys+import threading+import timefrom typing import List, Tuplefrom core.return_edge import Rect_IS_WINDOWS = sys.platform == "win32"+CAN_HIDE_POINTER = _IS_WINDOWSuser32 = ctypes.WinDLL("user32", use_last_error=True) if _IS_WINDOWS else NoneLOGGER = logging.getLogger(__name__)@@ -37,6 +41,22 @@ if _IS_WINDOWS:user32.MonitorFromWindow.argtypes = [ctypes.c_void_p, ctypes.c_ulong]user32.GetMonitorInfoW.argtypes = [ctypes.c_void_p, ctypes.c_void_p]user32.GetAsyncKeyState.restype = ctypes.c_short+ user32.CreateCursor.restype = ctypes.c_void_p+ user32.CreateCursor.argtypes = [+ ctypes.c_void_p, ctypes.c_int, ctypes.c_int, ctypes.c_int, ctypes.c_int, ctypes.c_void_p, ctypes.c_void_p+ ]+ user32.SetSystemCursor.argtypes = [ctypes.c_void_p, ctypes.c_ulong]+ user32.SystemParametersInfoW.argtypes = [ctypes.c_uint, ctypes.c_uint, ctypes.c_void_p, ctypes.c_uint]+ user32.GetWindowLongPtrW.restype = ctypes.c_ssize_t+ user32.GetWindowLongPtrW.argtypes = [ctypes.c_void_p, ctypes.c_int]+ user32.SetWindowLongPtrW.restype = ctypes.c_ssize_t+ user32.SetWindowLongPtrW.argtypes = [ctypes.c_void_p, ctypes.c_int, ctypes.c_ssize_t]+ user32.OpenInputDesktop.restype = ctypes.c_void_p+ user32.OpenInputDesktop.argtypes = [ctypes.c_ulong, ctypes.c_int, ctypes.c_ulong]+ user32.GetUserObjectInformationW.argtypes = [+ ctypes.c_void_p, ctypes.c_int, ctypes.c_void_p, ctypes.c_ulong, ctypes.POINTER(ctypes.c_ulong)+ ]+ user32.CloseDesktop.argtypes = [ctypes.c_void_p]kernel32 = ctypes.WinDLL("kernel32", use_last_error=True)kernel32.OpenProcess.restype = ctypes.c_void_pkernel32.OpenProcess.argtypes = [ctypes.c_ulong, ctypes.c_int, ctypes.c_ulong]@@ -205,3 +225,153 @@ def _foreground_app_name():return name[:-4] if name.lower().endswith(".exe") else namefinally:kernel32.CloseHandle(handle)+++# Every system cursor a pointer can show as, the OCR_* ids SetSystemCursor takes.+_SYSTEM_CURSORS = (+ 32512, 32513, 32514, 32515, 32516, 32642, 32643, 32644, 32645, 32646, 32648, 32649, 32650, 32651, 32671,+ 32672,+)+_SPI_SETCURSORS = 0x0057+_DESKTOP_READOBJECTS = 0x0001+_UOI_NAME = 2+_GUARD_SECONDS = 0.25+_pointer_lock = threading.Lock()+_pointer_hidden_for = set()+_guard = [0]+_exit_hook = [False]+++_GWL_EXSTYLE = -20+_WS_EX_TRANSPARENT = 0x20+_WS_EX_LAYERED = 0x80000+++def set_click_through(hwnd: int, through: bool) -> None:+ """Let clicks pass through a window, or stop them. Safe from any thread and immediate, which a+ Qt hide queued for the window's own thread is not."""+ _require()+ style = user32.GetWindowLongPtrW(hwnd, _GWL_EXSTYLE)+ wanted = (style | _WS_EX_TRANSPARENT | _WS_EX_LAYERED) if through else (style & ~_WS_EX_TRANSPARENT)+ if wanted != style:+ user32.SetWindowLongPtrW(hwnd, _GWL_EXSTYLE, wanted)+++def _pointer_marker():+ base = os.environ.get("LOCALAPPDATA")+ return os.path.join(base, "Beamer", "pointer-hidden") if base else None+++def hide_pointer(reason: str) -> None:+ """Hide the pointer everywhere until show_pointer(reason) and every other reason is shown again.++ ShowCursor only reaches this process's own windows, so the system cursors themselves are swapped+ for a blank one, and given back with SPI_SETCURSORS, which reloads the user's own scheme, size and+ colour included. That outlives the process, so a marker file stands for the hide until it is+ undone: if Beamer dies first, restore_pointer at the next start gives the pointer back, and any+ Python exit gives it back on the way out.++ The lock screen, Ctrl+Alt+Del and a UAC prompt share the session's cursors but not the hooks, so+ a pointer hidden while driving would be a blank one moving over a password box. A guard gives the+ cursors back for as long as another desktop has the input, and blanks them again on return."""+ _require()+ with _pointer_lock:+ first = not _pointer_hidden_for+ _pointer_hidden_for.add(reason)+ if not first:+ return+ marker = _pointer_marker()+ if marker:+ try:+ os.makedirs(os.path.dirname(marker), exist_ok=True)+ open(marker, "w").close()+ except OSError:+ LOGGER.exception("Could not write the pointer-hidden marker")+ if not _exit_hook[0]:+ _exit_hook[0] = True+ atexit.register(restore_pointer)+ _blank_cursors()+ _guard[0] += 1+ threading.Thread(target=_guard_desktop, args=(_guard[0],), name="Beamer-pointer-guard", daemon=True).start()+++def _blank_cursors() -> None:+ and_mask = (ctypes.c_ubyte * 128)(*([0xFF] * 128))+ xor_mask = (ctypes.c_ubyte * 128)()+ for cursor_id in _SYSTEM_CURSORS:+ # SetSystemCursor takes the handle over and destroys it, so each id gets its own.+ blank = user32.CreateCursor(None, 0, 0, 32, 32, and_mask, xor_mask)+ if not blank or not user32.SetSystemCursor(blank, cursor_id):+ LOGGER.warning("Could not blank system cursor %s (error %s)", cursor_id, ctypes.get_last_error())+++def _on_default_desktop() -> bool:+ """False while the lock screen, the secure attention screen or UAC has the input: Beamer may not+ even open those, which is itself the answer."""+ desktop = user32.OpenInputDesktop(0, False, _DESKTOP_READOBJECTS)+ if not desktop:+ return False+ try:+ name = ctypes.create_unicode_buffer(64)+ needed = ctypes.c_ulong(0)+ if not user32.GetUserObjectInformationW(desktop, _UOI_NAME, name, ctypes.sizeof(name), ctypes.byref(needed)):+ return False+ return name.value.lower() == "default"+ finally:+ user32.CloseDesktop(desktop)+++def _guard_desktop(generation: int) -> None:+ blanked = True+ while True:+ time.sleep(_GUARD_SECONDS)+ with _pointer_lock:+ if _guard[0] != generation or not _pointer_hidden_for:+ return+ try:+ here = _on_default_desktop()+ except Exception:+ LOGGER.exception("Could not read the input desktop; showing the pointer")+ here = False+ if blanked and not here:+ LOGGER.info("Another desktop has the input; the pointer is shown until it returns")+ user32.SystemParametersInfoW(_SPI_SETCURSORS, 0, None, 0)+ blanked = False+ elif here and not blanked:+ _blank_cursors()+ blanked = True+++def show_pointer(reason: str) -> None:+ _require()+ with _pointer_lock:+ if reason not in _pointer_hidden_for:+ return+ _pointer_hidden_for.discard(reason)+ if not _pointer_hidden_for:+ _restore_pointer()+++def restore_pointer() -> None:+ """Give back a pointer a previous run hid and never showed, and every hide on the way out."""+ _require()+ with _pointer_lock:+ marker = _pointer_marker()+ if _pointer_hidden_for or (marker and os.path.exists(marker)):+ _pointer_hidden_for.clear()+ _restore_pointer()+++def _restore_pointer() -> None:+ _guard[0] += 1+ if not user32.SystemParametersInfoW(_SPI_SETCURSORS, 0, None, 0):+ LOGGER.warning("Could not reload the system cursors (error %s)", ctypes.get_last_error())+ return+ marker = _pointer_marker()+ if marker:+ try:+ os.remove(marker)+ except FileNotFoundError:+ pass+ except OSError:+ LOGGER.exception("Could not remove the pointer-hidden marker")diff --git a/win_app/desktop_x11.py b/win_app/desktop_x11.pyindex 0d5dc23..232e823 100644--- a/win_app/desktop_x11.py+++ b/win_app/desktop_x11.py@@ -18,8 +18,11 @@ from typing import List, Optional, Tuplefrom core.return_edge import Rect+CAN_HIDE_POINTER = True_lock = threading.Lock()_conn = None+# The reasons the pointer is hidden for, each one XFixes hide on _conn.+_pointer_hidden_for = set()# Core pointer-state mask bits; X has none for the back and forward buttons._BUTTON_MASKS = {"left": 1 << 8, "middle": 1 << 9, "right": 1 << 10}@@ -42,6 +45,8 @@ def _connect():def _drop() -> None:global _conndead, _conn = _conn, None+ # The server gave back this connection's hides with it.+ _pointer_hidden_for.clear()try:dead.display.close()except Exception:@@ -106,6 +111,36 @@ def set_cursor_position(x: int, y: int) -> None:conn.display.flush()+def hide_pointer(reason: str) -> None:+ """Hide the pointer everywhere until show_pointer(reason) and every other reason is shown again.+ XFixes counts hides per client and gives them all back when the connection closes, so a Beamer+ that dies hidden leaves nothing behind; each reason here is one hide and one show."""+ with _session() as conn:+ if _pointer_hidden_for:+ _pointer_hidden_for.add(reason)+ return+ conn.display.xfixes_query_version()+ conn.root.xfixes_hide_cursor()+ conn.display.flush()+ _pointer_hidden_for.add(reason)+++def show_pointer(reason: str) -> None:+ with _session() as conn:+ if reason not in _pointer_hidden_for:+ return+ _pointer_hidden_for.discard(reason)+ if not _pointer_hidden_for:+ conn.root.xfixes_show_cursor()+ conn.display.flush()+++def restore_pointer() -> None:+ """Nothing outlives the connection on X11; this shows whatever this run still has hidden."""+ for reason in list(_pointer_hidden_for):+ show_pointer(reason)++def button_down(name: str) -> bool:mask = _BUTTON_MASKS.get(name)if mask is None:diff --git a/win_app/diagram.py b/win_app/diagram.pyindex 31aecea..a722997 100644--- a/win_app/diagram.py+++ b/win_app/diagram.py@@ -376,6 +376,8 @@ class AtlasCanvas(QWidget):self._hover = Noneself._third_press = Noneself.corner_marks = []+ self.wrap_marks = []+ self.wrap_label_rects = []self.seam_paths = []self.ledger_height = Falseself._height_timer = QTimer(self)@@ -402,6 +404,10 @@ class AtlasCanvas(QWidget):def set_tiles(self, tiles, labels, states, selected, cycle_mode="last", cycle=None, capable=(), own_id=None,rename_values=None):+ seen = (tiles, labels, states, selected, cycle_mode, cycle, tuple(sorted(capable or ())), own_id, rename_values)+ if seen == getattr(self, "_tiles_seen", None):+ return+ self._tiles_seen = seenself.tiles = {key: dict(tile) for key, tile in tiles.items()}self.labels = dict(labels)self.rename_values = dict(rename_values if rename_values is not None else labels)@@ -427,6 +433,10 @@ class AtlasCanvas(QWidget):self.update()def set_left_out(self, peers, in_use=None, dormant=()):+ seen = (set(peers), in_use, set(dormant))+ if seen == getattr(self, "_left_out_seen", None):+ return+ self._left_out_seen = seenself.left_out_ids = set(peers)self.in_use = dict(in_use or {})self.shelf_ids = self.left_out_ids | set(dormant) | {peer for peer, enabled in self.in_use.items() if enabled is False}@@ -626,8 +636,7 @@ class AtlasCanvas(QWidget):if broken and high - high_inset <= low + low_inset:return Noneif tile is self.tiles.get(self._own_id()):- corners = {data.get("corner_way") for peer, data in self.states.items()- if peer in self.tiles and peer not in self.shelf_ids}+ corners = self._pad_corners()near, far = {"top": ("top_left", "top_right"), "bottom": ("bottom_left", "bottom_right"),"left": ("top_left", "bottom_left"), "right": ("top_right", "bottom_right")}[side]if near in corners and abs(low - first) < 2.1:@@ -649,6 +658,118 @@ class AtlasCanvas(QWidget):engine finds them; thirds are measured along `screen`, the pointer's own display."""return ways.side_contacts(self.tiles[self._own_id()], self.tiles[peer])+ def _pad_corners(self):+ """Every corner of This PC that carries a pad, whichever machine holds it."""+ return {corner for peer, data in self.states.items()+ if peer in self.tiles and peer not in self.shelf_ids and peer != self._own_id()+ for corner in data.get("corners", ()) if corner in pages_win.CORNER_NAMES}++ @staticmethod+ def _wrap_sides(data):+ """The sides of This PC a machine's wrap-around crosses by now, each once, in map order."""+ sides = {item["side"] if isinstance(item, dict) else item for item in data.get("wraps", ())}+ return [side for side in ways.EDGES if side in sides]++ def wrap_seam(self, rect, side):+ """Pixel endpoints of a wrap-around seam along one of This PC's own sides: inset 2 px at each+ end, or 13 px where a corner pad sits on that vertex, so it stops at the pad's halo."""+ pads = self._pad_corners()+ vertical = side in ("left", "right")+ first, last = (rect.top(), rect.bottom()) if vertical else (rect.left(), rect.right())+ near, far = {"top": ("top_left", "top_right"), "bottom": ("bottom_left", "bottom_right"),+ "left": ("top_left", "bottom_left"), "right": ("top_right", "bottom_right")}[side]+ low = first + (13 if near in pads else 2)+ high = max(low, last - (13 if far in pads else 2))+ fixed = rect.left() if side == "left" else rect.right() if side == "right" else rect.top() if side == "top" else rect.bottom()+ return (QPointF(fixed, low), QPointF(fixed, high)) if vertical else (QPointF(low, fixed), QPointF(high, fixed))++ @staticmethod+ def _paint_push_arrow(painter, tip, side, colour):+ dx, dy = {"left": (-1, 0), "right": (1, 0), "top": (0, -1), "bottom": (0, 1)}[side]+ pen = QPen(colour, 1.6)+ pen.setCapStyle(Qt.PenCapStyle.RoundCap)+ pen.setJoinStyle(Qt.PenJoinStyle.RoundJoin)+ painter.setPen(pen)+ painter.setBrush(Qt.BrushStyle.NoBrush)+ painter.drawLine(QPointF(tip.x() - dx * 9, tip.y() - dy * 9), tip)+ path = QPainterPath(QPointF(tip.x() - dx * 4 - dy * 4, tip.y() - dy * 4 - dx * 4))+ path.lineTo(tip)+ path.lineTo(QPointF(tip.x() - dx * 4 + dy * 4, tip.y() - dy * 4 + dx * 4))+ painter.drawPath(path)++ def _paint_wrap(self, painter, rect, side, name, kept, alpha, peer=None):+ """A wrap-around side: the seam along This PC's own edge and, inside the tile, where it leads."""+ one, two = self.wrap_seam(rect, side)+ if kept:+ pen = QPen(_colour("signal", .35), 2.0)+ pen.setDashPattern([2.0, 2.5])+ else:+ pen = QPen(_colour("signal", alpha), 4.0)+ pen.setCapStyle(Qt.PenCapStyle.RoundCap)+ painter.setPen(pen)+ painter.setBrush(Qt.BrushStyle.NoBrush)+ painter.drawLine(one, two)+ self.seam_paths.append((side, one, two, .35 if kept else alpha, pen.widthF()))+ text = "wrap kept, Edge off" if kept else f"wraps to {name}"+ self.wrap_marks.append((peer, side, text, kept, .35 if kept else alpha))++ def _paint_wrap_labels(self, painter, rect, marks):+ """Each wrap label gets its own row below This PC's name and detail line, so none ever lands on+ them or on another label: a top side's row nearest the name, a bottom side's nearest the+ bottom edge, left and right in between, sharing one row when both fit. Sides that say the+ same thing, as when one machine wraps on several, share one label naming them. Rows that do+ not fit the tile are left out; the seam still shows the side."""+ self.wrap_label_rects = []+ if rect.height() < 78:+ return+ painter.setFont(theme.font(tokens.TYPE["small"]))+ metrics = painter.fontMetrics()+ order = {"merged": 0, "top": 0, "left": 1, "right": 2, "bottom": 3}+ said = {}+ for side, text, kept, alpha in sorted(marks, key=lambda mark: order[mark[0]]):+ said.setdefault((text, kept), []).append((side, text, kept, alpha))+ labels = []+ for same in said.values():+ side, text, kept, alpha = same[0]+ if len(same) > 1:+ # The sides named, else counted, else the plain words: the seams still show which.+ text = next((option for option in (f"{text} · {', '.join(mark[0] for mark in same)}",+ f"{text} · {len(same)} sides")+ if metrics.horizontalAdvance(option) <= rect.width() - 24), text)+ side = "merged"+ room = rect.width() - (52 if side in ("left", "right") else 24)+ text = metrics.elidedText(text, Qt.TextElideMode.ElideRight, max(1, round(room)))+ labels.append((side, text, kept, alpha, metrics.horizontalAdvance(text)))+ rows = []+ for label in sorted(labels, key=lambda label: order[label[0]]):+ if (label[0] == "right" and rows and len(rows[-1]) == 1 and rows[-1][0][0] == "left"+ and 26 + rows[-1][0][4] + 8 + label[4] + 26 <= rect.width()):+ rows[-1].append(label)+ else:+ rows.append([label])+ first, last = rect.top() + 51, rect.bottom() - 22+ room = int((last - first) // 18) + 1 if last >= first else 0+ wanted = {"top": first, "merged": first, "left": rect.center().y() + 10,+ "right": rect.center().y() + 10, "bottom": last}+ tops = []+ for row in rows[:room]:+ tops.append(max(min(last, wanted[row[0][0]]), tops[-1] + 18 if tops else first))+ for index in range(len(tops) - 1, -1, -1):+ tops[index] = min(tops[index], last if index == len(tops) - 1 else tops[index + 1] - 18)+ for top, row in zip(tops, rows):+ for side, text, kept, alpha, width in row:+ ink = _colour("ink_3", .8) if kept else _colour("signal", alpha)+ x = (rect.left() + 26 if side == "left" else rect.right() - 26 - width if side == "right"+ else rect.right() - 12 - width)+ box = QRectF(x, top, width + 1, 16)+ if side in ("left", "right"):+ self._paint_push_arrow(painter, QPointF(rect.left() + 16 if side == "left" else rect.right() - 16,+ box.center().y()), side, ink)+ painter.setFont(theme.font(tokens.TYPE["small"]))+ painter.setPen(ink)+ painter.drawText(box, Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter, text)+ self.wrap_label_rects.append((side, text, box))+def _third_segment_at(self, point):own_id, peer = self._own_id(), self.selectedif (own_id not in self.tiles or peer not in self.tiles or peer == own_id@@ -743,6 +864,8 @@ class AtlasCanvas(QWidget):def paintEvent(self, _event):self._geometry()self.seam_paths = []+ self.wrap_marks = []+ self.wrap_label_rects = []painter = QPainter(self)painter.setRenderHint(QPainter.RenderHint.Antialiasing)painter.setPen(QPen(_colour("edge"), 1.0))@@ -818,7 +941,8 @@ class AtlasCanvas(QWidget):painter.setFont(theme.font(tokens.TYPE["note"]))painter.drawText(rect.adjusted(4, 0, -4, -6), Qt.AlignmentFlag.AlignBottom | Qt.AlignmentFlag.AlignHCenter, label)foot = ("" if is_own else "Offline" if state_data.get("linked") is False else- "Crosses" if state_data.get("corner_way") else "Edge off" if state_data.get("edge_off") else+ "Crosses" if state_data.get("corners") or state_data.get("wraps") else+ "Edge off" if state_data.get("edge_off") else"Drag to connect" if state == "gap" else "Overlaps" if state == "overlap" elseoutcome_for_tile(state, state_data.get("crosses", is_own), is_own,state_data.get("other_name", "")))@@ -884,15 +1008,29 @@ class AtlasCanvas(QWidget):for screen, contact in found:for stretch in ways.crossing_stretches(contact, screen, held.get("lit", held.get("thirds", []))):self._paint_contact(painter, own, own_rect, stretch, alpha=seam_alpha, screen=screen)+ for peer, data in self.states.items():+ if peer == own_id or peer not in self.tiles or peer in self.shelf_ids:+ continue+ alpha = (1.0 if data.get("linked", True) else .55) * (1.0 if peer == self.selected else .7)+ name = self.labels.get(peer, OTHER)+ for side in self._wrap_sides(data):+ self._paint_wrap(painter, own_rect, side, name, False, alpha, peer)+ crossing = set(self._wrap_sides(data))+ for side in data.get("kept_wraps", ()):+ if side in ways.EDGES and side not in crossing:+ self._paint_wrap(painter, own_rect, side, name, True, alpha, peer)+ self._paint_wrap_labels(painter, own_rect, [(side, text, kept, alpha)+ for _peer, side, text, kept, alpha in self.wrap_marks])self.corner_marks = []for peer, data in self.states.items():- corner = data.get("corner_way", "")- if (peer == own_id or peer not in self.tiles or peer in self.shelf_ids- or corner not in pages_win.CORNER_NAMES):+ if peer == own_id or peer not in self.tiles or peer in self.shelf_ids:continue- opacity = 1.0 if peer == self.selected else 0.55- self.corner_marks.append((peer, corner, opacity))- self._paint_corner_pad(painter, own_rect, corner, opacity)+ for corner in ways.CORNERS:+ if corner not in data.get("corners", ()):+ continue+ opacity = 1.0 if peer == self.selected else 0.55+ self.corner_marks.append((peer, corner, opacity))+ self._paint_corner_pad(painter, own_rect, corner, opacity)else:self.corner_marks = []peers = [peer for peer in self.tiles if peer != own_id and peer not in self.shelf_ids]diff --git a/win_app/effect_overlay_x11.py b/win_app/effect_overlay_x11.pyindex e574603..8a804a0 100644--- a/win_app/effect_overlay_x11.py+++ b/win_app/effect_overlay_x11.py@@ -23,6 +23,10 @@ def mapped_point(x, y, source, target):def dispatch(command, overlay, glow, target, point_factory=None):op = command["op"]+ if op in ("effect_configure", "glow_configure"):+ # The helper is its own process: the Design page's Frame rate reaches its clocks only here.+ import frame_clock+ frame_clock.set_divisor(command.get("divisor", 1))if op == "effect_configure":overlay.configure(command["style"], command["colour"], command["length"], command["size"],command.get("effect_pace"), command.get("size_fraction"))@@ -67,6 +71,8 @@ class EffectOverlayX11Proxy:self._timer = Noneself._failed = Falseself._effect_ready = False+ self._showing = False+ self._pending = False@propertydef failed(self):@@ -79,14 +85,17 @@ class EffectOverlayX11Proxy:def configure(self, style, colour, length="normal", size="medium", effect_pace=None, size_fraction=None):self._effect_ready = bool(style)+ import frame_clockself._send("effect_configure", style=style, colour=colour, length=length, size=size,- effect_pace=effect_pace, size_fraction=size_fraction)+ effect_pace=effect_pace, size_fraction=size_fraction, divisor=frame_clock.divisor())def configure_glow(self, style, colour, length="normal", size="medium", effect_pace=None, size_fraction=None):+ import frame_clockself._send("glow_configure", style=style, colour=colour, length=length, size=size,- effect_pace=effect_pace, size_fraction=size_fraction)+ effect_pace=effect_pace, size_fraction=size_fraction, divisor=frame_clock.divisor())def push(self, edge, pressure, crossed, cursor=None, part=None, desk=None):+ self._showing = bool(pressure > 0.0 or crossed)values = {"edge": edge, "pressure": pressure, "crossed": crossed, "part": part}if cursor is not None:values.update(x=cursor.x(), y=cursor.y(),@@ -94,15 +103,19 @@ class EffectOverlayX11Proxy:self._send("push", **values)def set_pressure(self, edge, pressure, crossed, part=None):+ self._showing = bool(pressure > 0.0 or crossed)self._send("glow_pressure", edge=edge, pressure=pressure, crossed=crossed, part=part)def arrive(self, method, edge, x, y, desk):+ self._showing = Trueself._send("arrive", method=method, edge=edge, x=x, y=y, desk=desk)def crossed_in(self):+ self._showing = Trueself._send("crossed_in")def switched(self, x, y, desk, choice="match"):+ self._showing = Trueself._send("switched", x=x, y=y, desk=desk, choice=choice)def hide(self):@@ -112,8 +125,48 @@ class EffectOverlayX11Proxy:# Hides both windows and keeps the helper: _hide_crossing runs on every settings change# and departure, and a new helper costs a Python and Qt start. It exits when this# process closes its stdin, at quit.+ self._showing = False+ self._pending = Falseif self._process is not None:self._send("stop")+ self._update_timer()++ def _ensure_timer(self):+ if self._timer is None:+ try:+ from PySide6.QtWidgets import QApplication++ app = QApplication.instance()+ except ImportError:+ app = None+ if app is not None:+ from PySide6.QtCore import QTimer++ self._timer = QTimer()+ self._timer.setInterval(100)+ self._timer.timeout.connect(self._on_timer)+ return self._timer++ def _update_timer(self):+ timer = self._ensure_timer()+ if timer is None:+ return+ # Fast while something shows or a change is pending; slow while the helper idles, so one that+ # dies or fails at start is still noticed before the next crossing.+ busy = self._showing or self._pending+ should_run = not self._failed and (busy or self._process is not None)+ interval = 100 if busy else 1000+ if timer.interval() != interval:+ timer.setInterval(interval)+ if should_run and not timer.isActive():+ timer.start()+ elif not should_run and timer.isActive():+ timer.stop()++ def _on_timer(self):+ self.check_process()+ self._pending = False+ self._update_timer()def check_process(self):process = self._process@@ -142,19 +195,7 @@ class EffectOverlayX11Proxy:stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL,text=True, bufsize=1, env=env,)- try:- from PySide6.QtWidgets import QApplication-- app = QApplication.instance()- except ImportError:- app = None- if app is not None:- from PySide6.QtCore import QTimer-- self._timer = QTimer()- self._timer.setInterval(100)- self._timer.timeout.connect(self.check_process)- self._timer.start()+ self._ensure_timer()except OSError:self._fail()return@@ -162,16 +203,21 @@ class EffectOverlayX11Proxy:self.check_process()if self._failed:return+ if op != "stop":+ self._pending = Truetry:self._process.stdin.write(json.dumps({"op": op, **values}, separators=(",", ":")) + "\n")self._process.stdin.flush()except (BrokenPipeError, OSError, ValueError):self._fail()+ self._update_timer()def _fail(self):if self._failed:returnself._failed = True+ self._showing = False+ self._pending = Falseif self._timer is not None:self._timer.stop()process, self._process = self._process, None@@ -191,17 +237,39 @@ class EffectOverlayX11Proxy:self._on_failure()+def create_overlays(on_failure=None):+ from PySide6.QtCore import QRect, Qt+ from edge_glow import EdgeGlow+ from effect_overlay import EffectOverlay++ class X11Overlay(EffectOverlay):+ def _clear_fixed(self):+ # Keep the transparent surface mapped so compositor map/unmap handling+ # cannot flash the desktop or obscure the beginning of the next effect.+ dirty, self._dirty_rect = self._dirty_rect, QRect()+ self._hide_after_paint = False+ if not dirty.isNull():+ self.update(dirty)+ if not self.player.busy:+ self._timer.stop()++ overlay = X11Overlay(on_failure=on_failure, fixed_geometry=True)+ glow = EdgeGlow()+ for widget in (overlay, glow):+ # Identify an overlay rather than a utility window to the shell; the bypass+ # hint alone still leaves Qt's utility window type on the X surface.+ widget.setWindowFlags((widget.windowFlags() & ~Qt.WindowType.WindowType_Mask)+ | Qt.WindowType.ToolTip | Qt.WindowType.X11BypassWindowManagerHint)+ return overlay, glow++def run_helper():- from PySide6.QtCore import QPointF, QSocketNotifier, Qt+ from PySide6.QtCore import QPointF, QSocketNotifierfrom PySide6.QtWidgets import QApplication- from edge_glow import EdgeGlow- from effect_overlay import EffectOverlay, desktop_box+ from effect_overlay import desktop_boxapp = QApplication(sys.argv)- overlay = EffectOverlay(on_failure=lambda: print("failed effect", flush=True), fixed_geometry=True)- glow = EdgeGlow()- overlay.setWindowFlag(Qt.WindowType.X11BypassWindowManagerHint, True)- glow.setWindowFlag(Qt.WindowType.X11BypassWindowManagerHint, True)+ overlay, glow = create_overlays(on_failure=lambda: print("failed effect", flush=True))box = desktop_box()notifier = QSocketNotifier(0, QSocketNotifier.Type.Read)pending = bytearray()diff --git a/win_app/frame_clock.py b/win_app/frame_clock.pyindex 3fdb98b..dbd8e15 100644--- a/win_app/frame_clock.py+++ b/win_app/frame_clock.py@@ -3,6 +3,17 @@from PySide6.QtCore import QObject, Qt, QTimerfrom PySide6.QtGui import QGuiApplication+_DIVISOR = 1+++def set_divisor(n: int) -> None:+ global _DIVISOR+ _DIVISOR = n+++def divisor() -> int:+ return _DIVISOR+def refresh_rate(widget=None) -> float:"""`widget`'s screen's refresh rate, or with no widget the fastest screen's: an overlay is@@ -20,7 +31,7 @@ PREVIEW_MAX_RATE = 60def frame_interval_ms(widget=None, max_rate=None) -> int:rate = refresh_rate(widget)- return max(1, int(1000.0 / (min(rate, max_rate) if max_rate else rate)))+ return max(1, int(1000.0 * _DIVISOR / (min(rate, max_rate) if max_rate else rate)))def frame_timer(parent: QObject, tick, widget=None, max_rate=None) -> QTimer:diff --git a/win_app/inject_portal.py b/win_app/inject_portal.pyindex 686653a..a2fd1a3 100644--- a/win_app/inject_portal.py+++ b/win_app/inject_portal.py@@ -15,7 +15,9 @@ the device and whose locks and group it reports as they change. A character is twith two differences. The desktop's keymap cannot be changed, so a character the layout has no keyfor is not typed (logged once). And a held key is repeated by the app it reaches, not the server,so a key typed with Shift changed around it is let go at once and each of the peer's repeats types-it again.+it again. The desktop reports a lock's new state only after the lock key is let go, a moment later,+so input after a Caps Lock or Num Lock Beamer plays waits for that report (LOCK_SECONDS at most): a+letter planned before it is typed for the old lock, Shift and all (KWin 6.7.5, 14-10-2026).The pointer is moved with libei's absolute pointer where the desktop offers one (GNOME does), ata position Beamer keeps in desktop_portal, since no Wayland app can ask where the pointer is."""@@ -57,6 +59,10 @@ REQUEST_SECONDS = 10.0RETRY_SECONDS = 5.0# How long the desktop has, once connected, to offer the devices input waits for.DEVICE_SECONDS = 2.0+# How long input after a lock key Beamer played waits for the desktop to report the new locks.+LOCK_SECONDS = 0.15+# Caps Lock and Num Lock, as evdev numbers them.+LOCK_KEYS = (58, 69)# Input waiting for the session beyond this is dropped, not queued without end.MAX_PENDING = 512# How long an app pasting Beamer's clipboard has to take it.@@ -123,11 +129,12 @@ def wayland_steps(steps: list) -> List[Tuple[int, bool]]:def scroll_steps(dy: float, dx: float, mode: str, carry: List[float]) -> Tuple[str, float, float]:"""One scroll message as libei's: ("discrete", x, y) in 120ths of a click for the wheel's lines,the fraction carried in `carry` ([y, x]); ("pixels", x, y) for a pixel scroll. The wire's y is- positive away from the hand, libei's positive down."""+ positive away from the hand, libei's positive down; the wire's x is positive left, libei's+ positive right."""if mode == "pixel":- return "pixels", float(dx), -float(dy)+ return "pixels", -float(dx), -float(dy)carry[0] += float(dy) * DISCRETE_PER_CLICK- carry[1] += float(dx) * DISCRETE_PER_CLICK+ carry[1] -= float(dx) * DISCRETE_PER_CLICKwhole_y, whole_x = int(carry[0]), int(carry[1])carry[0] -= whole_ycarry[1] -= whole_x@@ -200,6 +207,7 @@ class Remote:self.layout: Optional[WaylandLayout] = Noneself.group = 0self.locks = 0+ self._locks_due: Optional[float] = None # set while the desktop's word on a lock key is awaitedself.state = KeyState()self.pressed: Set[int] = set()self.buttons: Dict[int, object] = {}@@ -417,7 +425,12 @@ class Remote:def _input_ready(self) -> bool:"""Whether input can be played: a keyboard and a pointer are up, or the desktop has had- DEVICE_SECONDS to offer them and what is up is all there will be."""+ DEVICE_SECONDS to offer them and what is up is all there will be; and no lock key's new+ state is still awaited."""+ if self._locks_due is not None:+ if time.monotonic() < self._locks_due:+ return False+ self._locks_due = Noneif self._with(CAP_KEYBOARD) is not None and (self._with(CAP_POINTER_ABSOLUTE) or self._with(CAP_POINTER)):return Truereturn self._eis_at is not None and time.monotonic() - self._eis_at >= DEVICE_SECONDS@@ -439,11 +452,14 @@ class Remote:if not self._held or not self._input_ready():returnheld, self._held = self._held, []- for work in held:+ for index, work in enumerate(held):try:work(self)except Exception:LOGGER.exception("Could not play an input from the peer")+ if self._locks_due is not None:+ self._held = held[index + 1:] + self._held+ returndef _end(self) -> None:desktop_portal.set_mover(None)@@ -519,9 +535,11 @@ class Remote:if event[1] in self._devices:self._devices.remove(event[1])elif kind == "modifiers" and self.layout is not None:- _device, _depressed, _latched, locked, group = event[1:6]+ _device, depressed, _latched, locked, group = event[1:6]self.group = groupself.locks = self.layout.keymap.core_mods(locked) & (LOCK_MASK | NUM_LOCK_MASK)+ if not self.layout.keymap.core_mods(depressed) & (LOCK_MASK | NUM_LOCK_MASK):+ self._locks_due = None # the word on the lock key's release, not its presselif kind == "disconnect":raise _Problem(ENDED.format(detail="its input connection closed"))@@ -558,6 +576,8 @@ class Remote:continueself.ei.key(device, code, down)self.ei.frame(device)+ if code in LOCK_KEYS and not down:+ self._locks_due = time.monotonic() + LOCK_SECONDSdef move_by(self, dx: float, dy: float) -> None:x, y = desktop_portal.cursor_position()@@ -575,7 +595,10 @@ class Remote:point = desktop_portal.position()device = self._with(CAP_POINTER_ABSOLUTE)if device is not None:- self.ei.absolute(device, float(point[0]), float(point[1]))+ absolute = desktop_portal.absolute_position(*point)+ if absolute is None:+ return+ self.ei.absolute(device, float(absolute[0]), float(absolute[1]))self.ei.frame(device)def button(self, code: int, down: bool) -> None:@@ -752,6 +775,8 @@ def _warn_once(message: str, item: str, _said: Set[str] = set()) -> None:def inject_key(name: str, down: bool, us: Optional[str] = None) -> None:def go(session: Remote) -> None:+ # As input_injector's: with BEAMER_DEBUG, the key as the peer named it and the locks it is planned for.+ LOGGER.debug("key %s %s (us %s, locks %s)", name, "down" if down else "up", us, session.locks)if session.layout is None and len(name) == 1:return # a named key needs no layout; a character doessession.keys(wayland_steps(plan_key(name, down, us, session.state, session.layout, session.group, session.locks)))diff --git a/win_app/inject_x11.py b/win_app/inject_x11.pyindex 22d1194..dd8087d 100644--- a/win_app/inject_x11.py+++ b/win_app/inject_x11.py@@ -278,10 +278,11 @@ def plan_text(text: str, state: KeyState, layout: Layout, group: int, locks: intdef plan_scroll(dy, dx, mode: str, carry: List[float]) -> Tuple[int, int]:"""Whole wheel clicks (vertical, horizontal) for one scroll message, the remainder carried in`carry` ([y, x]) as plan_scroll_units carries Windows' wheel units. Positive y is away from- the hand, positive x is right, as on Windows."""+ the hand, positive x is right, as on Windows; the wire's dx is positive left, so it is+ turned round."""scale = 1.0 / PIXELS_PER_CLICK if mode == "pixel" else 1.0carry[0] += float(dy) * scale- carry[1] += float(dx) * scale+ carry[1] -= float(dx) * scalewhole_y, whole_x = int(carry[0]), int(carry[1])carry[0] -= whole_ycarry[1] -= whole_xdiff --git a/win_app/input_injector.py b/win_app/input_injector.pyindex 8a43950..65ae3c2 100644--- a/win_app/input_injector.py+++ b/win_app/input_injector.py@@ -655,25 +655,18 @@ def plan_scroll_units(dy, dx, mode: str, accum: List[float]) -> Tuple[int, int]:wheel units via WHEEL_UNITS_PER_PIXEL and accumulated across calls soslow, precise motion isn't lost to integer truncation.- Sign convention: the vertical mapping below (dy -> +120 per unit) is- intentionally unchanged from today's dy*120 behaviour, whatever that- already works out to with Mac natural scrolling. MOUSEEVENTF_HWHEEL's- positive mouseData means "scroll right" (the mirror of- MOUSEEVENTF_WHEEL, where positive means "scroll up/away"); dx is- forwarded without an extra sign flip, on the assumption that a rightward- two-finger swipe on the Mac should scroll content right on Windows, the- same direction it would on the Mac itself. That assumption -- and the- WHEEL_UNITS_PER_PIXEL constant above -- still needs confirming on real- trackpad/mouse hardware; both are easy to retune if the felt direction or- speed is wrong.+ Sign convention: dy and dx are the wire's, Core Graphics' axes 1 and 2.+ Axis 1 positive moves the view up, as MOUSEEVENTF_WHEEL's positive does;+ axis 2 positive moves it left, where MOUSEEVENTF_HWHEEL's positive moves+ it right, so dx is turned round here (test_horizontal_scroll.py)."""if mode == "pixel":accum[0] += dy * WHEEL_UNITS_PER_PIXEL- accum[1] += dx * WHEEL_UNITS_PER_PIXEL+ accum[1] -= dx * WHEEL_UNITS_PER_PIXELelse:# float, not int: a receiver's scroll speed can make a click a fraction of one.accum[0] += float(dy) * 120- accum[1] += float(dx) * 120+ accum[1] -= float(dx) * 120whole_y = int(accum[0])whole_x = int(accum[1])accum[0] -= whole_ydiff --git a/win_app/kvm_bridge_win.py b/win_app/kvm_bridge_win.pyindex b933f0f..e035025 100644--- a/win_app/kvm_bridge_win.py+++ b/win_app/kvm_bridge_win.py@@ -19,7 +19,7 @@ import threadingfrom typing import Optionalfrom PySide6.QtCore import QEvent, QObject, QPointF, QRectF, QSize, QStandardPaths, QTimer, Qt, QUrl, Signal-from PySide6.QtGui import QAction, QColor, QDesktopServices, QIcon, QKeySequence, QPainter, QPixmap, QShortcut, QStandardItem, QStandardItemModel+from PySide6.QtGui import QAction, QColor, QCursor, QDesktopServices, QIcon, QKeySequence, QPainter, QPixmap, QShortcut, QStandardItem, QStandardItemModelfrom PySide6.QtNetwork import QLocalServer, QLocalSocketfrom PySide6.QtWidgets import (QApplication,@@ -66,9 +66,11 @@ from core.capture_types import DeadKey, TextInputfrom core import effectsfrom diagram import AtlasCanvas, PushStripfrom edge_glow import EdgeGlow, PreviewLoop+from frame_clock import set_divisorfrom effect_overlay import EffectOverlay, desktop_box, logical_pointfrom effect_overlay_x11 import EffectOverlayX11Proxy, available as xwayland_availablefrom effect_previews import EffectStill, SwitchStill, TileHover+from core import idle_pointerfrom core import ignoredimport motionfrom core import pairing@@ -91,6 +93,7 @@ from core import settings_syncfrom core import ways, crossing_statefrom sender import OWN_PLATFORM, LinkSenderimport theme+import tray_glyphimport tokensfrom core import updatesimport widgets@@ -98,6 +101,7 @@ import widgetsQPushButton = widgets.ActionButtonLOGGER = logging.getLogger(__name__)+VEIL_SIZE = 16# The repo-root VERSION file is the one place the version is set; build.spec bundles it.try:@@ -212,28 +216,6 @@ def arrival_method(edge: Optional[str], driver_platform: str) -> str:return "notch" if edge == "bottom" and keytable.is_mac(driver_platform) else "edge"-def status_icon(state: ServerState, size: int = 64) -> QPixmap:- """The shipped colour mark with the state dot over its lower right corner: signal connected,- amber waiting, fault needs attention, off stopped."""- # Ratio pinned to 1: the plain pixmap(size, size) comes back at the screen's scale (96px at- # 150%), which fails the width check below and leaves the tray showing only the dot.- pixmap = QIcon(str(ICON_PATH)).pixmap(QSize(size, size), 1.0)- if pixmap.isNull() or pixmap.width() != size:- pixmap = QPixmap(size, size)- pixmap.fill(QColor(theme.colour("panel")))- unit = size / 16- dot = 6 * unit- painter = QPainter(pixmap)- painter.setRenderHint(QPainter.RenderHint.Antialiasing)- painter.setPen(Qt.PenStyle.NoPen)- painter.setBrush(QColor(theme.colour("ground")))- painter.drawEllipse(QRectF(size - dot - 2 * unit, size - dot - 2 * unit, dot + 2 * unit, dot + 2 * unit))- painter.setBrush(QColor(theme.state_colour(state.value.lower())))- painter.drawEllipse(QRectF(size - dot - unit, size - dot - unit, dot, dot))- painter.end()- return pixmap--def page_column_width(free: float) -> float:"""One centred section column, with a 24 DIP margin on either side."""return min(880, max(1, free - 48))@@ -281,7 +263,7 @@ class ColumnFit(QObject):def fit(self) -> None:width = round(page_column_width(self.scroll.width() - 16))- if self.column.minimumWidth() != width or self.column.maximumWidth() != width:+ if width != self.column.width():self.column.setFixedWidth(width)def eventFilter(self, watched, event) -> bool:@@ -308,6 +290,7 @@ class StatusBridge(QObject):# The other direction: this PC's own input going to the Mac.sending = Signal(bool, str)redirecting = Signal(bool)+ veil = Signal(bool)# A peer began or stopped driving this PC: its id as base64, "" when none does.owner = Signal(str)# A link learnt something about a peer and saved it, or came up or went down.@@ -484,6 +467,9 @@ class _DesignChoiceSlider:class WindowsApplication(QWidget):+ # What the tray icon was last drawn from (drive state, receiver state, taskbar ink); unset until the first draw.+ _tray_icon_key = None+def paintEvent(self, event) -> None:super().paintEvent(event)if self._start_after_first_paint and not self._startup_painted:@@ -509,6 +495,10 @@ class WindowsApplication(QWidget):self._refusal_notices = peerlist.RefusalThrottle()self._config = Noneself._closing = False+ self._same_settings_signature = object()+ self._same_before_sync = None+ self._displays_signature = object()+ self._design_follow_signature = object()self.tray_available = QSystemTrayIcon.isSystemTrayAvailable()self._start_after_first_paint = start_after_first_paintself._startup_painted = False@@ -529,6 +519,11 @@ class WindowsApplication(QWidget):self.bridge.sending.connect(self._on_sending)self.bridge.redirecting.connect(self._on_redirecting)self.bridge.owner.connect(self._on_owner)+ self.bridge.veil.connect(self._show_veil)+ self._veil = None+ self._veil_hwnd = 0+ self._driven = False+ self._idle_pointer = self._make_idle_pointer()self.bridge.peers_changed.connect(self._on_peers_changed)self.bridge.arrangement.connect(self._on_arrangement)self.bridge.settings.connect(self._on_settings)@@ -600,7 +595,7 @@ class WindowsApplication(QWidget):hardware=hardware_win.hardware_address_towards,zones=self._zones,status_callback=self.bridge.sending.emit,- redirect_callback=self.bridge.redirecting.emit,+ redirect_callback=self._on_sender_redirecting,pressure_callback=self._relay_sender_pressure,arrival_callback=lambda edge, x, y: self.bridge.arrived.emit("switch" if edge is None else "edge", edge or "", float(x), float(y)@@ -680,6 +675,7 @@ class WindowsApplication(QWidget):try:# With nothing paired the window still has this PC's own settings to show and keep.self._config = load_config(config_path, unpaired_ok=True)+ set_divisor(effects.frame_divisor(self._config.frame_rate))self._same_seen = self._same_fields()self._design_seen = self._design_fields()self._apply_input_scale(self._config)@@ -861,11 +857,14 @@ class WindowsApplication(QWidget):self._remove_peer, self._toggle_pairing_sheet, self._rename_peer,on_cycle=self._set_shortcut_cycle,on_repair=self._re_pair,+ on_pair_phone=self._pair_phone,+ on_pair_nearby=self._start_nearby,)layout.addWidget(self.machines)layout.addWidget(self._name_module(current))self.sheet = machines_win.PairingSheet(- self._show_code, self._cancel_code, self._pair_clicked, self._pick_machine+ self._show_code, self._cancel_code, self._pair_clicked, self._pick_machine,+ self._choose_nearby, self._confirm_nearby, self._cancel_nearby,)self.sheet.setVisible(False)layout.addWidget(self.sheet)@@ -879,6 +878,7 @@ class WindowsApplication(QWidget):layout.addWidget(self.permissions_module)self.sign_in_module = self._sign_in_module()layout.addWidget(self.sign_in_module)+ layout.addWidget(self._tray_module(current))layout.addWidget(self._updates_module(current))self._refresh_peers()@@ -1006,6 +1006,27 @@ class WindowsApplication(QWidget):except Exception as exc:self.permission_state.report(direction, "unavailable", str(exc))+ def _tray_module(self, current: Config) -> QWidget:+ module = widgets.Module("Tray")+ self.tray_switch = widgets.Switch("Show in tray")+ self.tray_switch.setFont(theme.font(theme.TYPE["body"]))+ self.tray_switch.setChecked(current.show_in_tray)+ self.tray_switch.setEnabled(self.tray_available)+ self.tray_switch.toggled.connect(self._set_show_in_tray)+ module.body.addWidget(self.tray_switch)+ module.body.addWidget(widgets.label(+ "With it off, closing the window quits Beamer. Open Beamer again to bring the window back."+ if self.tray_available else "This desktop has no system tray, so Beamer's window is all there is: closing it quits Beamer.",+ "note", wrap=True))+ return module++ def _set_show_in_tray(self, enabled: bool) -> None:+ if self._config is None:+ return+ self._config.show_in_tray = bool(enabled)+ self._persist()+ self.tray.setVisible(self.tray_shown())+def _updates_module(self, current: Config) -> QWidget:module = widgets.Module("Updates")self.updates_switch = widgets.Switch("Check for updates")@@ -1096,6 +1117,11 @@ class WindowsApplication(QWidget):"note", wrap=True)self.redirect_note.setVisible(False)module.body.addWidget(self.redirect_note)+ self.wayland_send_note = widgets.label(+ "On Wayland the desktop lets input go to another machine only when the pointer pushes through an "+ "edge, so this button cannot send it.", "note", wrap=True)+ self.wayland_send_note.setVisible(False)+ module.body.addWidget(self.wayland_send_note)self.send_hint = widgets.label("", "note", wrap=True)self.send_hint.setVisible(False)module.body.addWidget(self.send_hint)@@ -1117,12 +1143,24 @@ class WindowsApplication(QWidget):"This screen decides, including when another machine drives it. On, a full-screen app here holds pointer crossings; shortcuts and jump keys still work. Off, another machine's pointer can go home or onward through the configured ways.", "note", wrap=True)module.body.addWidget(hold_note)self.hold_switch.setToolTip("This screen's setting applies to every pointer on it.")+ self.pointer_switch = widgets.Switch("Hide the pointer on the machine not in use")+ self.pointer_switch.setFont(theme.font(theme.TYPE["body"]))+ self.pointer_switch.setChecked(self._config.hide_idle_pointer if self._config else True)+ self.pointer_switch.toggled.connect(self._set_hide_idle_pointer)+ module.body.addWidget(self.pointer_switch)+ pointer_note = widgets.label(+ "This PC's pointer hides while it drives another machine, and after another machine stops driving it, "+ "until its own mouse moves.", "note", wrap=True)+ module.body.addWidget(pointer_note)self.wayland_crossing_note = widgets.label("On Wayland Beamer cannot see a full-screen app, or a mouse button held before the pointer reaches an ""edge, so the edges are never held for one and a drag can cross.", "note", wrap=True)module.body.addWidget(self.wayland_crossing_note)for widget in (self.hold_switch, own_note, hold_note):widget.setVisible(not platform_parts.WAYLAND)+ # Wayland gives an app no way to hide the pointer.+ for widget in (self.pointer_switch, pointer_note):+ widget.setVisible(self._idle_pointer is not None)self.wayland_crossing_note.setVisible(platform_parts.WAYLAND)return module@@ -1139,6 +1177,14 @@ class WindowsApplication(QWidget):def toggle_redirect(self) -> None:self.sender.toggle()+ def _can_send(self) -> bool:+ """Whether the Send button and the tray can move input now. On Wayland only bringing it back:+ there the desktop starts no capture for an app's button, and Send only beeped (KDE report,+ 13-10-2026)."""+ if self._config is None or not self._any_send():+ return False+ return not platform_parts.WAYLAND or self.sender.redirecting+def toggle_pause(self) -> None:self.sender.crossing_paused = not self.sender.crossing_pausedself._refresh_window()@@ -1161,6 +1207,9 @@ class WindowsApplication(QWidget):def _check_full_screen(self) -> None:"""This PC's rule: a full-screen app in front holds its edges, the shortcut still works.A failure stops the check for the run rather than logging once a second."""+ if platform.system() != "Windows" or self._config is None or not self._config.hold_full_screen:+ self.sender.full_screen_app = None+ returntry:self.sender.full_screen_app = desktop_win.full_screen_app()except Exception:@@ -1178,6 +1227,12 @@ class WindowsApplication(QWidget):returnif message.startswith("Cannot switch"):QApplication.beep()+ if sys.platform.startswith("linux"):+ import portal++ if portal.sandboxed():+ portal.notify(title, self._shown(message))+ returnself.tray.showMessage(title, self._shown(message), QIcon(str(ICON_PATH)), 4000)def _same_module(self, current: Config) -> QWidget:@@ -1239,8 +1294,15 @@ class WindowsApplication(QWidget):returnold = any("layout" not in caps for caps in self._peer_caps().values())groups = settings_sync.normalise_groups(self._config.same_groups)- stored = self._window_settings()- revert = settings_sync.snapshot_available(stored.get("same_before_sync"))+ signature = self._settings_file_signature()+ if signature != self._same_settings_signature:+ stored = self._window_settings(force=True)+ if not getattr(self, "_window_settings_stale", False):+ self._same_settings_signature = signature+ else:+ stored = self._window_settings()+ self._same_before_sync = stored.get("same_before_sync")+ revert = settings_sync.snapshot_available(self._same_before_sync)desktops = peerlist.desktops(self._peer_entries)on = self._config.same_on_bothwho = settings_sync.who([self._shown(label) for label in peerlist.labels(desktops).values()])@@ -1260,7 +1322,10 @@ class WindowsApplication(QWidget):self.same_checks["everything"].setEnabled(self._paired)self.same_everything_note.setVisible(len(groups) == len(settings_sync.ALL_GROUPS))self.same_old_note.setVisible(old)- self.same_revert.setVisible(revert)+ self.same_revert.setVisible(settings_sync.snapshot_available(self._same_before_sync))+ desktops = peerlist.desktops(self._peer_entries)+ on = self._config.same_on_both+ who = settings_sync.who([self._shown(label) for label in peerlist.labels(desktops).values()])self.same_note.setText(settings_sync.group_note(groups, on))self.same_note.setToolTip(settings_sync.switch_detail())widgets.set_role(self.same_note, "note")@@ -1395,23 +1460,37 @@ class WindowsApplication(QWidget):caps[protocol.id_text(peer)] = knownreturn {peer: known for peer, known in caps.items() if peer in desktops}+ def _settings_file_signature(self):+ version = []+ for path in (self.config_path, app_config.legacy_config_path(self.config_path)):+ try:+ stat = path.stat()+ version.append((stat.st_mtime_ns, stat.st_ctime_ns, stat.st_size, stat.st_ino))+ except OSError:+ version.append(None)+ return tuple(version)+def _refresh_design_follow(self) -> None:if not hasattr(self, "design_follow_choice") or self._config is None:returnchoice = self.design_follow_choicecaps = self._design_peer_caps()desktops = [entry for entry in peerlist.desktops(self._peer_entries) if protocol.read_id(entry.get("id")) is not None]- seen = repr((desktops, caps, self._design_states, self._config.design_follow_peer,- settings_sync.group_on(self._config, "design"), self._config.hide_addresses))- if seen == getattr(self, "_design_follow_seen", None):+ rows = settings_sync.follow_rows(desktops, caps, self._design_states, self._config.design_follow_peer)+ signature = (repr(desktops), repr(caps), repr(self._design_states), self._config.design_follow_peer,+ settings_sync.group_on(self._config, "design"), self._hide_addresses())+ if signature == self._design_follow_signature:return- self._design_follow_seen = seenchoice.blockSignals(True)- model = QStandardItemModel(choice)+ model = getattr(self, "_design_follow_model", None)+ if model is None:+ model = QStandardItemModel(choice)+ self._design_follow_model = model+ choice.setModel(model)+ model.clear()none = QStandardItem("None")none.setData("", Qt.ItemDataRole.UserRole)model.appendRow(none)- rows = settings_sync.follow_rows(desktops, caps, self._design_states, self._config.design_follow_peer)for entry, why_not in rows:name = self._shown(peerlist.label_for(desktops, peer_id=entry.get("id") or "")or entry.get("platform") or "Paired machine")@@ -1421,11 +1500,10 @@ class WindowsApplication(QWidget):item.setEnabled(False)item.setToolTip(why_not)model.appendRow(item)- choice.setModel(model)selected = choice.findData(self._config.design_follow_peer, Qt.ItemDataRole.UserRole)choice.setCurrentIndex(max(0, selected))choice.blockSignals(False)- desktops = peerlist.desktops(self._peer_entries)+ self._design_follow_signature = signaturepeer = next((item for item in desktops if item.get("id") == self._config.design_follow_peer), None)name = self._shown(peerlist.label_for(desktops, peer_id=peer.get("id") or "") or "that machine") if peer else ""if peer:@@ -1448,7 +1526,7 @@ class WindowsApplication(QWidget):returnlocked = entry is not Nonefor control in (self.glow_style_choice, self.switch_style_choice, self.glow_colour_choice,- self.length_choice, self.size_choice):+ self.length_choice, self.size_choice, self.frame_rate_choice):control.set_enabled(not locked)self.landing_toggle.setEnabled(not locked)widgets.set_dimmed(self.landing_toggle, locked)@@ -1917,7 +1995,8 @@ class WindowsApplication(QWidget):self.crossing_ledger = CrossingLedger(self)module.body.addWidget(self.crossing_ledger)module.body.addWidget(widgets.label(- "Three lit segments are the whole edge; click one to leave it out. "+ "Each chip is a side of this screen; click one to add or remove it. The side a machine touches "+ "crosses on its lit thirds; any other free side wraps round to it, arriving on its far side. ""A corner is a diagonal push, shown as a square on the map.", "note", wrap=True))return module@@ -2047,20 +2126,20 @@ class WindowsApplication(QWidget):def _reconcile_displays(self) -> None:if self._config is None:return- settings = self._window_settings()- displays = self._own_displays()- capable = self._layout_capable()- seen = (getattr(self, "_window_settings_version", None), repr(displays), frozenset(capable))- if seen == getattr(self, "_displays_seen", None):+ file_signature = self._settings_file_signature()+ signature = (file_signature, self._own_display_map)+ if signature == self._displays_signature:return+ displays = self._own_displays()with app_config.SETTINGS_LOCK:- # Recheck under the write lock: a link may have saved since the first stat.settings = self._window_settings()+ if self._window_settings_stale:+ returnoutcome = crossing_state.displays_changed(settings, platform="pc", own_displays=displays,- now=time.time(), capable=capable)+ now=time.time(), capable=self._layout_capable())self._carry_crossing(outcome)- self._displays_seen = seen+ self._displays_signature = (file_signature, copy.copy(self._own_display_map))@@ -2133,7 +2212,10 @@ class WindowsApplication(QWidget):return Falseif "methods" in changes:methods = changes.pop("methods")- changes.update(edge=bool(set(methods) & {"edge", "part"}), corner="corner" in methods)+ changes.update(edge=bool(set(methods) & {"edge", "part"}))+ # Corner only when its on/off changes, so an Edge write leaves several corners as they are.+ if ("corner" in methods) != bool(ways.ways(settings, peer)["corners"]):+ changes["corner"] = "corner" in methodsif "edge" in methods:changes["thirds"] = list(ways.PARTS)if "parts" in changes:@@ -2162,13 +2244,33 @@ class WindowsApplication(QWidget):methods, parts = ways.toggle_third(held["methods"], held["parts"], third)self._write_ways(peer=peer, methods=methods, parts=parts)- def _ledger_corner(self, peer, corner):+ def _reach(self, settings: dict, peer: str) -> dict:+ return ways.reach(settings, peer, **{k: v for k, v in self._crossing_event_args().items() if k != "now"})++ def _ledger_side(self, peer, side):+ """A wrap-around chip: free adds the side (turning Edge on), on removes it, kept with Edge+ off turns Edge on and otherwise removes it. Held and unavailable sides change nothing."""settings = self._crossing_settings()- if ways.corner_holder(settings, corner, exclude=peer):+ if self._reach(settings, peer)["sides"][side]["state"] not in ("free", "on", "kept"):returnheld = ways.ways(settings, peer)- on = not ("corner" in held["methods"] and held["corner"] == corner)- self._write_ways(peer=peer, corner=on, corner_at=corner)+ edge_on = bool(ways.picked_thirds(held["methods"], held["parts"]))+ edges = list(held["edges"])+ if side not in edges:+ self._write_ways(peer=peer, edges=edges + [side], edge=True)+ elif not edge_on:+ self._write_ways(peer=peer, edge=True)+ else:+ self._write_ways(peer=peer, edges=[kept for kept in edges if kept != side])++ def _ledger_corner(self, peer, corner):+ settings = self._crossing_settings()+ corners = list(ways.ways(settings, peer)["corners"])+ # A corner already on can always be taken off; a new one needs a side contact and nobody else holding it.+ if corner not in corners and self._reach(settings, peer)["corners"][corner]["state"] != "free":+ return+ self._write_ways(peer=peer, corners=[kept for kept in corners if kept != corner] if corner in corners+ else corners + [corner])def _ledger_jump(self, peer, value):if self._config is None:@@ -2239,6 +2341,7 @@ class WindowsApplication(QWidget):tile_states = result.get("tiles", {})tile_states[config.machine_id] = {"state": "this", "detail": config.name or platform.node()}legacy = {}+ ledger_reach = {entry["id"]: self._reach(settings, entry["id"]) for entry in entries}for entry in entries:peer = entry["id"]state = tile_states.setdefault(peer, {})@@ -2248,11 +2351,14 @@ class WindowsApplication(QWidget):own, tile = layout.get(config.machine_id), layout.get(peer)contact = ways._rect_contact(own, tile) if own and tile else Noneedge_on = bool(set(held["methods"]) & {"edge", "part"})- corner = held["corner"] if "corner" in held["methods"] and peer not in shelved else ""- state.update(methods=held["methods"], side=held["side"], corner=held["corner"],+ # Pads for the corners that cross now, from the compile, never the saved intent alone.+ corners = list(state.get("corners", [])) if peer not in shelved else []+ reached = ledger_reach[peer]["sides"]+ state.update(methods=held["methods"], side=held["side"], corner=held["corner"], corners=corners,+ kept_wraps=[side for side in ways.EDGES if reached[side]["state"] == "kept"],thirds=picked, lit=[part for part in picked if touched is None or part in touched],- corner_way=corner, crosses=bool((edge_on and state.get("state") in ("edge", "part")) or corner),- edge_off=not edge_on and not corner and bool(contact and contact[0] != "corner"),+ crosses=bool((edge_on and state.get("state") in ("edge", "part")) or state.get("wraps") or corners),+ edge_off=not edge_on and not corners and bool(contact and contact[0] != "corner"),linked=self._live(peer))if state["edge_off"]:state["state"] = "gap"@@ -2271,7 +2377,7 @@ class WindowsApplication(QWidget):for entry in entries})self.atlas_canvas.set_left_out(left_out, in_use, dormant)key = TRIGGER_KEYS.get(config.trigger_key, config.trigger_key)- self.crossing_ledger.reflect(settings, all_layout, labels, chosen, self._live, key, legacy)+ self.crossing_ledger.reflect(settings, all_layout, labels, chosen, self._live, key, legacy, ledger_reach)self.dragging_switch.setEnabled(bool(self._ways_in() & {"edge", "part", "corner"}))self.pointer_module.setVisible(not platform_parts.WAYLAND)self.resistance_module.setVisible(True)@@ -2301,6 +2407,18 @@ class WindowsApplication(QWidget):self._persist()self.sender.update_config(self._config)+ def _set_hide_idle_pointer(self, enabled: bool) -> None:+ if self._config is None:+ return+ self._config.hide_idle_pointer = bool(enabled)+ self._persist()+ if not enabled and self._idle_pointer is not None:+ self._idle_pointer.cancel()+ self._set_driving_pointer(bool(enabled) and self.sender.redirecting)++ def _hiding_pointer(self) -> bool:+ return self._idle_pointer is not None and (self._config is None or self._config.hide_idle_pointer)+def _set_block_while_dragging(self, enabled: bool) -> None:if self._config is None:return@@ -2837,6 +2955,11 @@ class WindowsApplication(QWidget):"Length", 25, 250, 5, 100, (0.5, 1.0, 2.0), effects.LENGTHS)self.size_choice = _DesignChoiceSlider("Size", 20, 80, 1, 1000, (0.03, 0.045, 0.06), effects.SIZES)+ self.frame_rate_choice = widgets.Choice(+ tuple((value, name) for value, name, _divisor in effects.FRAME_RATES),+ 3, current.frame_rate, on_change=self._apply_look)+ self.frame_rate_choice.set_names("Frame rate")+ self.frame_rate_choice.set_width(320)self.length_readout = design_readout()self.size_readout = design_readout()for title, control, readout, description in (@@ -2846,6 +2969,7 @@ class WindowsApplication(QWidget):row = self._row(widgets.label(title, "key"), control.view, readout)module.body.addWidget(row)module.body.addWidget(widgets.label(description, "small"))+ module.body.addWidget(self._row(widgets.label("Frame rate", "key"), self.frame_rate_choice.view))self.length_choice.slider.valueChanged.connect(self._apply_look)self.size_choice.slider.valueChanged.connect(self._apply_look)self.length_choice.slider.sliderReleased.connect(self._apply_look)@@ -2887,6 +3011,8 @@ class WindowsApplication(QWidget):self._config.effect_size = self.size_choice.value or "medium"self._config.effect_pace = self.length_choice.numeric_value()self._config.effect_size_fraction = self.size_choice.numeric_value()+ self._config.frame_rate = self.frame_rate_choice.value or "display"+ set_divisor(effects.frame_divisor(self._config.frame_rate))self._persist()self._hide_crossing()@@ -3146,7 +3272,7 @@ class WindowsApplication(QWidget):items.append((entry, labels[token], state, where))return items- def _window_settings(self) -> dict:+ def _window_settings(self, *, force: bool = False) -> dict:"""GUI-only snapshot; link read/modify/write paths continue to read under their lock."""with app_config.SETTINGS_LOCK:version = []@@ -3157,10 +3283,12 @@ class WindowsApplication(QWidget):except FileNotFoundError:version.append(None)version = tuple(version)- if version != getattr(self, "_window_settings_version", None):+ if force or version != getattr(self, "_window_settings_version", None):try:saved = app_config.load_settings(self.config_path)+ self._window_settings_stale = Falseexcept (ConfigError, OSError):+ self._window_settings_stale = Trueif hasattr(self, "_window_settings_cache"):return self._window_settings_cacheraise@@ -3171,8 +3299,8 @@ class WindowsApplication(QWidget):def _refresh_peers(self) -> None:try:- saved = self._window_settings()- peers, zones = copy.deepcopy((saved.get("peers", []), saved.get("zones", [])))+ snapshot = getattr(self.book, "snapshot", None)+ peers, zones = snapshot() if callable(snapshot) else (self.book.peers(), self.book.zones())except (ConfigError, OSError):LOGGER.exception("The peers could not be read")peers, zones = [], []@@ -3245,11 +3373,33 @@ class WindowsApplication(QWidget):self._last_drive_status = statetooltip = f"{state}\n{self._shown(self._last_refusal)}" if self._last_refusal else stateif hasattr(self, "tray"):- if getattr(self, "_tray_tooltip_seen", None) != tooltip:- self.tray.setToolTip(tooltip)- self._tray_tooltip_seen = tooltip- if hasattr(self, "status_action") and self.status_action.text() != state:+ self.tray.setToolTip(tooltip)+ if hasattr(self, "status_action"):self.status_action.setText(state)+ self._refresh_tray_icon()++ def tray_shown(self) -> bool:+ """Whether the tray icon is up: there is a tray and this PC's Show in tray is on."""+ return self.tray_available and (self._config is None or self._config.show_in_tray)++ def _drive_glyph(self) -> str:+ held = self.sender.edges_held and bool(self._ways_in())+ return tray_glyph.drive_state(self.sender.redirecting, self.server.owner is not None, held)++ def _refresh_tray_icon(self) -> None:+ """The tray's glyph for who holds input, with the receiver's state as its badge, set only+ when one of the three things it draws from changes."""+ if not hasattr(self, "tray"):+ return+ with self._status_lock:+ status = self._status.value.lower()+ dark = tray_glyph.taskbar_is_dark(theme.system_dark())+ drive = self._drive_glyph()+ key = (drive, status, dark)+ if key == self._tray_icon_key:+ return+ self._tray_icon_key = key+ self.tray.setIcon(tray_glyph.icon(drive, status, dark))def _current_chain_sentence(self) -> str:route = self.sender.route_chain@@ -3387,10 +3537,15 @@ class WindowsApplication(QWidget):owner = self.sender.owner if self.sender.redirecting else Nonefor ident, label in items:action = self.machine_actions[ident]- text = "Bring input back" if protocol.read_id(ident) == owner else f"Send input to {label}"+ peer = protocol.read_id(ident)+ # A machine whose link is down cannot take input: Beamer is not running there, or it is+ # off or away. Dimmed, so the row says so before a click does.+ live = peer == owner or self._live(ident)+ text = ("Bring input back" if peer == owner else f"Send input to {label}" if live+ else f"{label} is unavailable")if action.text() != text:action.setText(text)- action.setEnabled(True)+ action.setEnabled(live and (peer == owner or not platform_parts.WAYLAND))self.redirect_action.setVisible(not self.machine_actions)def _send_to_from_tray(self, peer: bytes) -> None:@@ -3476,16 +3631,73 @@ class WindowsApplication(QWidget):def _toggle_pairing_sheet(self) -> None:self._pairing_open = not self._pairing_open- if not self._pairing_open and self.pairing is not None:- self.pairing.cancel_pairing()+ if not self._pairing_open:+ if self.pairing is not None:+ self.pairing.cancel_pairing()+ self._cancel_nearby()self.sheet.setVisible(self._pairing_open)self.machines.set_pairing_open(self._pairing_open)self._refresh_pairing()+ def _open_pairing_sheet(self) -> None:+ if not self._pairing_open:+ self._pairing_open = True+ self.sheet.setVisible(True)+ self.machines.set_pairing_open(True)++ def _pair_phone(self) -> None:+ self._open_pairing_sheet()+ self._show_code()++ def _start_nearby(self) -> None:+ self._open_pairing_sheet()+ service = self.pairing+ if service is None:+ self.sheet.say_host("Pairing is not available: this PC's settings could not be read.", "note-fault")+ return+ if service.error:+ self.sheet.say_host(f"Pairing is not available: {service.error}", "note-fault")+ return+ self._cancel_code()+ self.sheet.say_host("", "note")+ try:+ service.begin_nearby()+ except pairing.PairingError as exc:+ self.sheet.say_host(f"Nearby pairing is not available: {exc}", "note-fault")+ self._refresh_pairing()++ def _choose_nearby(self, machine: dict) -> None:+ service = self.pairing+ if service is None:+ return+ try:+ service.choose_nearby(machine)+ except pairing.PairingError as exc:+ self.sheet.say_host(f"Nearby pairing could not continue: {exc}", "note-fault")+ self._refresh_pairing()++ def _confirm_nearby(self, sas: str, attempt: str) -> None:+ service = self.pairing+ if service is None:+ return+ try:+ service.confirm_nearby(sas, attempt)+ except pairing.PairingError as exc:+ self.sheet.say_host(f"Nearby pairing could not continue: {exc}", "note-fault")+ self._refresh_pairing()++ def _cancel_nearby(self) -> None:+ service = self.pairing+ if service is not None:+ service.cancel_nearby()+ if getattr(self, "sheet", None) is not None:+ self._refresh_pairing()+def _re_pair(self, token: str) -> None:entry = next((item for item in self._peer_entries if item.get("token") == token), None)if entry is None:return+ self._cancel_nearby()self._select_page("overview")self._pairing_open = Trueaddress = entry.get("host") or ""@@ -3508,6 +3720,7 @@ class WindowsApplication(QWidget):self.sheet.say_host(f"Pairing is not available: {self.pairing.error}", "note-fault")returnself.sheet.say_host("", "note")+ self.pairing.cancel_nearby()try:self.pairing.begin_pairing()except pairing.PairingError as exc:@@ -3538,6 +3751,7 @@ class WindowsApplication(QWidget):service = self.pairingif service is None:return+ self.sheet.set_nearby(service.nearby_status, self._shown)if self._pairing_open:self.sheet.set_machines(service.machines(), self._shown)code = service.code@@ -3580,6 +3794,7 @@ class WindowsApplication(QWidget):if service is None:self.sheet.say_pair("Pairing is not available: this PC's settings could not be read.", "note-fault")return+ service.cancel_nearby()self._pairing_target = machine["name"] if machine is not None else addressself.sheet.say_pair("", "note")self.sheet.busy(True)@@ -3710,6 +3925,7 @@ class WindowsApplication(QWidget):@_crossing_refreshdef _apply_config(self, config: Config) -> None:self._config = config+ set_divisor(effects.frame_divisor(config.frame_rate))self._settings_port = config.portself._same_seen = self._same_fields()self._design_seen = self._design_fields()@@ -3738,7 +3954,8 @@ class WindowsApplication(QWidget):if not callable(configure):returntry:- configure(self.sender._desktop_module().monitors(), config.crossing_resistance_px)+ configure(self.sender._cached_monitors, config.crossing_resistance_px,+ display_map=self.sender._cached_display_map, models=self.sender.zone_models)except Exception:LOGGER.exception("Could not configure X11 display seam holds")@@ -3898,7 +4115,8 @@ class WindowsApplication(QWidget):motion.fade_from(self._body, shot)def _build_tray(self) -> None:- self.tray = QSystemTrayIcon(QIcon(status_icon(self._status)), self)+ self.tray = QSystemTrayIcon(self)+ self._refresh_tray_icon()self.tray.setToolTip(self._drive_status())menu = QMenu()self.status_action = menu.addAction(self._drive_status())@@ -3935,8 +4153,7 @@ class WindowsApplication(QWidget):# Left click opens the window; right click is the# context menu Qt already gives QSystemTrayIcon for free.self.tray.activated.connect(self._on_tray_activated)- if self.tray_available:- self.tray.show()+ self.tray.setVisible(self.tray_shown())self._refresh_tray_state()def reload_config(self) -> None:@@ -3957,11 +4174,15 @@ class WindowsApplication(QWidget):@_crossing_refreshdef _reflect_config(self, config: Config) -> None:"""Every control on every page set from `config`, without any of them saving back."""+ set_divisor(effects.frame_divisor(config.frame_rate))for box in ( self.dragging_switch, self.hold_switch, self.glow_toggle,- self.landing_toggle,+ self.landing_toggle, self.tray_switch, self.pointer_switch,self.resistance_slider, self.double_tap_slider):box.blockSignals(True)try:+ self.tray_switch.setChecked(config.show_in_tray)+ self.tray.setVisible(self.tray_shown())+ self.pointer_switch.setChecked(config.hide_idle_pointer)self.dragging_switch.setChecked(config.block_while_dragging)self.hold_switch.setChecked(config.hold_full_screen)self.glow_toggle.setChecked(config.edge_glow)@@ -3971,7 +4192,7 @@ class WindowsApplication(QWidget):self.double_tap_slider.setValue(config.double_tap_ms)finally:for box in ( self.dragging_switch, self.hold_switch, self.glow_toggle,- self.landing_toggle,+ self.landing_toggle, self.tray_switch, self.pointer_switch,self.resistance_slider, self.double_tap_slider):box.blockSignals(False)self._crossing_text(self.resistance_readout, f"{config.crossing_resistance_px} px")@@ -3988,6 +4209,7 @@ class WindowsApplication(QWidget):self.glow_colour_choice.set_value(config.glow_colour)self.length_choice.set_numeric(config.effect_pace)self.size_choice.set_numeric(config.effect_size_fraction)+ self.frame_rate_choice.set_value(config.frame_rate)self._reflect_look()self.appearance_choice.set_value(config.appearance)self._apply_appearance(config.appearance)@@ -4157,6 +4379,12 @@ class WindowsApplication(QWidget):"""A peer took input on this PC, or gave it back. Either way the outward edge follows:this PC's input is never here and elsewhere at once."""self.sender.set_receiving(bool(peer))+ was_driven, self._driven = self._driven, bool(peer)+ if self._idle_pointer is not None:+ if self._driven:+ self._idle_pointer.cancel()+ elif was_driven and not self._closing and self._hiding_pointer():+ self._idle_pointer.driver_left()self._refresh_tray_state()def _on_peers_changed(self) -> None:@@ -4171,6 +4399,80 @@ class WindowsApplication(QWidget):def _on_sending(self, connected: bool, detail: str) -> None:self._sending_detail = detail+ def _make_idle_pointer(self):+ """The pointer hiding of this desktop, or None where it cannot hide another app's pointer+ (Wayland). A run that died with the pointer hidden is undone first."""+ if not getattr(desktop_win, "CAN_HIDE_POINTER", False):+ return None+ try:+ desktop_win.restore_pointer()+ except Exception:+ LOGGER.exception("Could not give back a pointer an earlier run left hidden")+ return idle_pointer.IdlePointer(+ hide=lambda: desktop_win.hide_pointer("idle"),+ show=lambda: desktop_win.show_pointer("idle"),+ position=desktop_win.cursor_position,+ logger=LOGGER,+ )++ def _set_driving_pointer(self, redirecting: bool) -> None:+ """While this PC drives another machine its own pointer sits pinned at the edge it left by;+ hidden, so only the machine in use shows one (rufusmp, 12-10-2026). The Mac does the same."""+ if self._idle_pointer is None:+ return+ hide = redirecting and self._hiding_pointer()+ try:+ if hide:+ desktop_win.hide_pointer("driving")+ else:+ desktop_win.show_pointer("driving")+ except Exception:+ LOGGER.exception("Could not %s the pointer", "hide" if redirecting else "show")+ if sys.platform == "win32":+ veil = self._veil_hwnd+ if not hide and veil:+ # Input is local from this moment, on this thread; the queued hide below may run+ # later, so the veil stops taking clicks now.+ try:+ desktop_win.set_click_through(veil, True)+ except Exception:+ LOGGER.exception("Could not let clicks through the pointer veil")+ self.bridge.veil.emit(hide)++ def _show_veil(self, shown: bool) -> None:+ """Blanking the system cursors leaves an app's own cursor (a browser's `cursor: url()`, a+ game's) showing where the pointer was pinned. A tiny window under the pin owns the cursor+ there instead; the sender's warp back to the pin on every move makes Windows ask it."""+ if not shown:+ if self._veil is not None:+ self._veil.hide()+ return+ if self._veil is None:+ self._veil = QWidget(None, Qt.WindowType.Tool | Qt.WindowType.FramelessWindowHint+ | Qt.WindowType.WindowStaysOnTopHint | Qt.WindowType.WindowDoesNotAcceptFocus)+ self._veil.setAttribute(Qt.WidgetAttribute.WA_ShowWithoutActivating)+ # Nearly invisible, not invisible: a fully transparent layered window is hit-test+ # transparent, and the cursor would come from the window beneath after all.+ self._veil.setWindowOpacity(0.01)+ self._veil.setCursor(Qt.CursorShape.BlankCursor)+ self._veil.resize(VEIL_SIZE, VEIL_SIZE)+ point = QCursor.pos()+ self._veil.move(point.x() - VEIL_SIZE // 2, point.y() - VEIL_SIZE // 2)+ self._veil.show()+ self._veil.raise_()+ if sys.platform == "win32":+ self._veil_hwnd = int(self._veil.winId())+ try:+ desktop_win.set_click_through(self._veil_hwnd, False)+ except Exception:+ LOGGER.exception("Could not make the pointer veil take the cursor")++ def _on_sender_redirecting(self, redirecting: bool) -> None:+ # On the sender's thread, not through the window's: input coming home must show the pointer+ # even while the window is busy.+ self._set_driving_pointer(redirecting)+ self.bridge.redirecting.emit(redirecting)+def _on_redirecting(self, redirecting: bool) -> None:self._sending_detail = (f"This PC's keyboard and mouse are on {self._label_of(self.sender.owner)}" if redirecting else self.sender.status@@ -4224,6 +4526,11 @@ class WindowsApplication(QWidget):self.ignored_recorder.cancel()self.trigger_recorder.cancel()self.crossing_ledger.cancel_recording()+ service = getattr(self, "pairing", None)+ if service is not None and not getattr(self, "_closing", False):+ service.cancel_nearby()+ if getattr(self, "sheet", None) is not None:+ self._refresh_pairing()self._run_previews()def changeEvent(self, event) -> None:@@ -4240,6 +4547,7 @@ class WindowsApplication(QWidget):self.refresh_timer.stop()self.update_checker.stop()if self.pairing is not None:+ self.pairing.cancel_nearby()self.pairing.stop()self.server.stop()self._stop_sending()@@ -4247,6 +4555,12 @@ class WindowsApplication(QWidget):if stop_injector is not None:stop_injector()self._hide_crossing()+ if self._idle_pointer is not None:+ self._idle_pointer.cancel()+ try:+ desktop_win.restore_pointer()+ except Exception:+ LOGGER.exception("Could not show the pointer on the way out")if hasattr(self, "tray"):self.tray.hide()QApplication.quit()@@ -4406,7 +4720,6 @@ class WindowsApplication(QWidget):if self._closing:returntry:- self.tray.setIcon(QIcon(status_icon(state)))self._refresh_tray_state()except Exception:LOGGER.exception("Tray status update failed")@@ -4442,7 +4755,7 @@ class WindowsApplication(QWidget):self.redirect_action.setText(redirect)if self.redirect_button.full_text != redirect:self.redirect_button.set_full_text(redirect)- self.redirect_action.setEnabled(self._config is not None and self._any_send())+ self.redirect_action.setEnabled(self._can_send())returnself._show_same()with self._status_lock:@@ -4476,10 +4789,12 @@ class WindowsApplication(QWidget):if redirect_text != self.redirect_button.full_text:self.redirect_button.set_full_text(redirect_text)self.redirect_action.setText(redirect_text)- sending = self._config is not None and self._any_send()+ sending = self._can_send()self.redirect_button.setEnabled(sending)self.redirect_action.setEnabled(sending)- self.redirect_note.setVisible(not sending and self._paired)+ allowed = self._config is not None and self._any_send()+ self.redirect_note.setVisible(not allowed and self._paired)+ self.wayland_send_note.setVisible(allowed and not sending)pause_text = "Resume crossing" if self.sender.crossing_paused else "Pause crossing"if pause_text != self.pause_button.text():self.pause_button.setText(pause_text)@@ -4628,7 +4943,7 @@ def main() -> None:instance_signal = InstanceSignal(application.show_window, parent=app)if not instance_signal.listening:LOGGER.warning("Could not start the second-launch listener: %s", instance_signal.server.errorString())- if not arguments.hidden or not application.tray_available:+ if not arguments.hidden or not application.tray_shown():application.show()if arguments.hidden:QTimer.singleShot(0, application.start)diff --git a/win_app/machines_win.py b/win_app/machines_win.pyindex 6d93dec..862174a 100644--- a/win_app/machines_win.py+++ b/win_app/machines_win.py@@ -546,7 +546,9 @@ class MachinesModule(widgets.Module):def __init__(self, on_send: Callable, on_allow: Callable, on_in_use: Callable, on_left_out: Callable,on_remove: Callable, on_pair: Callable, on_rename: Optional[Callable] = None,- on_cycle: Optional[Callable] = None, on_repair: Optional[Callable] = None) -> None:+ on_cycle: Optional[Callable] = None, on_repair: Optional[Callable] = None,+ on_pair_phone: Optional[Callable] = None,+ on_pair_nearby: Optional[Callable] = None) -> None:super().__init__("Machines")self._callbacks = (on_send, on_allow, on_in_use, on_left_out, on_remove,on_rename or (lambda *_: None), on_cycle,@@ -555,20 +557,39 @@ class MachinesModule(widgets.Module):self.rows_layout = QVBoxLayout()self.rows_layout.setContentsMargins(0, 0, 0, 0)self.rows_layout.setSpacing(0)- self.pair_button = _button("Pair a machine", "primary")+ self.pair_button = _button("Pair a machine")self.pair_button.clicked.connect(on_pair)- self.body.addWidget(self.pair_button, 0, Qt.AlignmentFlag.AlignLeft)+ self.pair_phone_button = _button("Pair a phone")+ self.pair_phone_button.setVisible(feature_flags.PAIRING_QR_VISIBLE)+ self.pair_phone_button.clicked.connect(on_pair_phone or (lambda: None))+ self.pair_nearby_button = _button("Pair nearby", "primary")+ self.pair_nearby_button.clicked.connect(on_pair_nearby or (lambda: None))+ pair_actions = QBoxLayout(QBoxLayout.Direction.LeftToRight)+ self.pair_actions = pair_actions+ pair_actions.setContentsMargins(0, 0, 0, 0)+ pair_actions.setSpacing(8)+ pair_actions.addWidget(self.pair_nearby_button)+ pair_actions.addWidget(self.pair_phone_button)+ pair_actions.addWidget(self.pair_button)+ pair_actions.addStretch(1)+ self.body.addLayout(pair_actions)self.body.addLayout(self.rows_layout)self.empty = widgets.label(EMPTY, "note", wrap=True)self.body.addWidget(self.empty)- def set_peers(self, items: list, same_on: bool = False, *, cycle_mode: str) -> None:+ def resizeEvent(self, event) -> None:+ super().resizeEvent(event)+ direction = QBoxLayout.Direction.LeftToRight if event.size().width() >= 440 else QBoxLayout.Direction.TopToBottom+ self.pair_actions.setDirection(direction)++ def set_peers(self, items: list, same_on: bool = False, cycle_mode: str = "last") -> None:"""`items`: (entry, label, state, where) for each paired machine, in the order to show them."""tokens = [entry["token"] for entry, *_ in items]for token in [held for held in self.rows if held not in tokens]:row = self.rows.pop(token)self.rows_layout.removeWidget(row)row.hide()+ row.setParent(None)row.deleteLater()for index, (entry, label, state, where) in enumerate(items):row = self.rows.get(entry["token"])@@ -586,7 +607,7 @@ class MachinesModule(widgets.Module):text = "Cancel" if opened else "Pair a machine"if self.pair_button.text() != text:self.pair_button.setText(text)- widgets.set_role(self.pair_button, "" if opened else "primary")+ widgets.set_role(self.pair_button, "")class QrView(QWidget):@@ -624,13 +645,21 @@ class QrView(QWidget):class PairingSheet(widgets.Module):"""Both halves of pairing: showing a code on this PC, and entering one from another machine."""- def __init__(self, on_show: Callable, on_cancel: Callable, on_pair: Callable, on_pick: Callable) -> None:+ def __init__(self, on_show: Callable, on_cancel: Callable, on_pair: Callable, on_pick: Callable,+ on_choose_nearby: Optional[Callable] = None,+ on_confirm_nearby: Optional[Callable] = None,+ on_cancel_nearby: Optional[Callable] = None) -> None:super().__init__("Pair a machine")self._on_pair = on_pairself._on_pick = on_pickself._machines: list = []self._listed: tuple = ()self._working = False+ self._nearby_state = "inactive"+ self._nearby_rows: tuple = ()+ self._on_choose_nearby = on_choose_nearby or (lambda *_: None)+ self._on_confirm_nearby = on_confirm_nearby or (lambda *_: None)+ self._on_cancel_nearby = on_cancel_nearby or (lambda: None)self.body.addWidget(widgets.label("Show a code on this PC", "tile-name"))self.show_button = _button("Show a code", "primary")self.show_button.clicked.connect(on_show)@@ -683,6 +712,49 @@ class PairingSheet(widgets.Module):self.code_box.setVisible(False)self.body.addWidget(self.code_box)+ self.nearby_box = _plain()+ nearby = QVBoxLayout(self.nearby_box)+ nearby.setContentsMargins(0, 8, 0, 8)+ nearby.setSpacing(8)+ self.nearby_note = widgets.label("", "note", wrap=True)+ self.nearby_note.setAccessibleName("Nearby pairing status")+ nearby.addWidget(self.nearby_note)+ self.nearby_count = widgets.label("", "count")+ self.nearby_count.setFont(theme.mono_font(theme.TYPE["body"]))+ self.nearby_count.setAccessibleName("Nearby pairing time left")+ nearby.addWidget(self.nearby_count)+ self.nearby_choices = QWidget()+ self.nearby_choices.setProperty("vernier", "plain")+ self.nearby_choices_layout = QVBoxLayout(self.nearby_choices)+ self.nearby_choices_layout.setContentsMargins(0, 0, 0, 0)+ self.nearby_choices_layout.setSpacing(6)+ self.nearby_group = QButtonGroup(self.nearby_choices)+ self.nearby_group.setExclusive(True)+ nearby.addWidget(self.nearby_choices)+ self.nearby_peer = widgets.label("", "note-quiet", wrap=True)+ nearby.addWidget(self.nearby_peer)+ self.nearby_digits = PairCodeLabel()+ self.nearby_digits.setFont(theme.mono_font(theme.PAIRING_CODE))+ self.nearby_digits.setFixedHeight(self.nearby_digits.sizeHint().height())+ self.nearby_digits.setVisible(False)+ nearby.addWidget(self.nearby_digits, 0, Qt.AlignmentFlag.AlignLeft)+ nearby_buttons = QHBoxLayout()+ nearby_buttons.setSpacing(8)+ self.nearby_confirm = _button("Confirm", "primary")+ self.nearby_confirm.setDefault(False)+ self.nearby_confirm.setAutoDefault(False)+ self.nearby_confirm.clicked.connect(self._confirm_nearby)+ self.nearby_cancel = _button("Cancel", "small")+ self.nearby_cancel.setDefault(False)+ self.nearby_cancel.setAutoDefault(False)+ self.nearby_cancel.clicked.connect(self._on_cancel_nearby)+ nearby_buttons.addWidget(self.nearby_confirm)+ nearby_buttons.addWidget(self.nearby_cancel)+ nearby_buttons.addStretch(1)+ nearby.addLayout(nearby_buttons)+ self.nearby_box.setVisible(False)+ self.body.addWidget(self.nearby_box)+self.body.addWidget(widgets.rule(False))self.body.addWidget(widgets.label("Enter a code from another machine", "tile-name"))self.body.addWidget(widgets.label("On this network", "note-quiet"))@@ -702,7 +774,7 @@ class PairingSheet(widgets.Module):self.body.addWidget(widgets.label("Not listed? Type its address.", "note-quiet"))self.code = PairCodeEdit()self.code.setAccessibleName("Code")- self.code.setValidator(QRegularExpressionValidator(QRegularExpression(r"[0-9 ]{0,12}"), self.code))+ self.code.setValidator(QRegularExpressionValidator(QRegularExpression(r"[0-9 \s–—\-]{0,32}"), self.code))self.code.setFont(theme.mono_font(20))self.code.setFixedHeight(self.code.fontMetrics().height() + CODE_CELL_PAD_Y * 2 + 4)self.code.textEdited.connect(self._typed_code)@@ -716,6 +788,85 @@ class PairingSheet(widgets.Module):self.body.addWidget(self.pair_note)self._refresh_pair_button()+ def _confirm_nearby(self) -> None:+ if self._nearby_state == "confirm" and self.nearby_digits.text():+ sas = self.nearby_digits.text().replace(" ", "")+ self._on_confirm_nearby(sas, self._nearby_attempt)++ def set_nearby(self, status: dict, shown: Callable[[str], str] = lambda text: text) -> None:+ """Render the nearby exchange without exposing addresses or turning Enter into approval."""+ status = status or {}+ state = status.get("state", "inactive")+ self._nearby_state = state+ self._nearby_attempt = status.get("attempt")+ self.nearby_box.setVisible(state != "inactive")+ if state == "inactive":+ return++ copy = {+ "searching": "Press Pair nearby on the other machine within 60 seconds.",+ "choosing": "Choose a machine to pair nearby.",+ "exchanging": "Connecting to the selected machine…",+ "confirm": "Compare all six digits on both machines, then confirm on each.",+ "waiting": "Waiting for confirmation on the other machine.",+ "paired": "Nearby pairing complete.",+ "refused": "Nearby pairing refused. Use a new window to try again.",+ "expired": "Nearby pairing expired. Press Pair nearby to try again.",+ "not_saved": "The new peer could not be saved.",+ }+ self.nearby_note.setText(copy.get(state, "Nearby pairing could not continue."))+ widgets.set_role(self.nearby_note, "note-fault" if state in {"refused", "expired", "not_saved"} else "note")+ seconds_left = max(0, int(status.get("seconds_left", 0)))+ self.nearby_count.setText(f"Expires in {seconds_left} s")+ self.nearby_count.setVisible(state in {"searching", "choosing", "exchanging", "confirm", "waiting"})++ peers = status.get("peers") or []+ peer = status.get("peer")+ signature = (+ state,+ tuple((item.get("id"), item.get("identity"), item.get("nearby"), item.get("name"),+ item.get("platform"), item.get("address"),+ shown(" · ".join(part for part in (str(item.get("name") or "Another machine"),+ peers_view.platform_name(item), str(item.get("address") or "")) if part)))+ for item in peers),+ tuple(sorted((key, str(value)) for key, value in peer.items())) if isinstance(peer, dict) else None,+ )+ if signature != self._nearby_rows:+ self._nearby_rows = signature+ for button in list(self.nearby_group.buttons()):+ self.nearby_group.removeButton(button)+ self.nearby_choices_layout.removeWidget(button)+ button.hide()+ button.setParent(None)+ button.deleteLater()+ for candidate in peers:+ name = str(candidate.get("name") or "Another machine")+ platform = peers_view.platform_name(candidate)+ address = str(candidate.get("address") or "")+ detail = shown(" · ".join(part for part in (name, platform, address) if part))+ button = _button(detail, "choice")+ button.setAccessibleName(detail)+ button.setStyleSheet("text-align: left; padding-left: 12px;")+ button.setCheckable(True)+ button.setProperty("nearby_peer", candidate)+ button.clicked.connect(lambda _checked=False, selected=candidate: self._on_choose_nearby(selected))+ self.nearby_group.addButton(button)+ self.nearby_choices_layout.addWidget(button)+ self.nearby_choices.setVisible(state == "choosing")+ selected_name = str((peer or {}).get("name") or "")+ selected_platform = peers_view.platform_name(peer) if peer else ""+ selected = f"Selected: {selected_name} · {selected_platform}" if selected_name else ""+ self.nearby_peer.setText(shown(selected) if selected else "")+ self.nearby_peer.setVisible(bool(self.nearby_peer.text()))+ sas = status.get("sas") if state in {"confirm", "waiting"} else None+ grouped = f"{sas[:3]} {sas[3:]}" if isinstance(sas, str) and len(sas) == 6 and sas.isascii() and sas.isdigit() else ""+ self.nearby_digits.setText(grouped)+ self.nearby_digits.setAccessibleName(f"Pairing digits {' '.join(sas)}" if grouped else "Pairing digits")+ self.nearby_digits.setVisible(bool(grouped))+ self.nearby_confirm.setVisible(state == "confirm")+ self.nearby_confirm.setEnabled(state == "confirm" and bool(grouped) and bool(self._nearby_attempt))+ self.nearby_cancel.setVisible(state not in {"paired", "refused", "expired", "not_saved"})+# The host half.def show_code(self, code: str, seconds: int, address: str, qr_rows: Optional[list], qr_note: str) -> None:@@ -779,6 +930,7 @@ class PairingSheet(widgets.Module):self.group.removeButton(button)self.heard_layout.removeWidget(button)button.hide()+ button.setParent(None)button.deleteLater()for item, where in zip(listed, wheres):version = item.get("pairing") == pairing.PAIRING_V3@@ -834,7 +986,10 @@ class PairingSheet(widgets.Module):def _typed_code(self, text: str) -> None:digits = "".join(char for char in text if char.isdigit())[:CODE_DIGITS]if digits != text:+ cursor = self.code.cursorPosition()+ target = min(sum(1 for char in text[:cursor] if char.isdigit()), len(digits))self.code.setText(digits)+ self.code.setCursorPosition(target)self._refresh_pair_button()def _refresh_pair_button(self) -> None:diff --git a/win_app/portal.py b/win_app/portal.pyindex 651a3e6..4813e12 100644--- a/win_app/portal.py+++ b/win_app/portal.py@@ -18,6 +18,7 @@ import collectionsimport loggingimport osimport socket+import threadingimport timefrom pathlib import Pathfrom typing import Callable, Optional@@ -29,6 +30,7 @@ OBJECT_PATH = "/org/freedesktop/portal/desktop"REQUEST = "org.freedesktop.portal.Request"SESSION = "org.freedesktop.portal.Session"PROPERTIES = "org.freedesktop.DBus.Properties"+NOTIFICATION = "org.freedesktop.portal.Notification"CALL_SECONDS = 10.0TICK_SECONDS = 0.1@@ -246,6 +248,36 @@ class JeepneyBus:LOGGER.exception("The portal connection did not close cleanly")+def sandboxed() -> bool:+ """Whether Beamer runs in a Flatpak. The sandbox cannot reach the desktop's notification+ service, where Qt sends a tray message, so one never shows there and only the click's sound is+ left (the 1.5.3 Flatpak on Fedora 44, 14-10-2026); the Notification portal reaches it."""+ return os.path.exists("/.flatpak-info")+++def notify(title: str, body: str, connect: Optional[Callable[[], object]] = None) -> threading.Thread:+ """Show a message through the Notification portal, in place of the one before, on a thread of+ its own so the caller never waits on the bus."""++ def send() -> None:+ try:+ bus = (connect or JeepneyBus)()+ except PortalError as exc:+ LOGGER.warning("Could not show a message: %s", exc)+ return+ try:+ Portal(bus).call(NOTIFICATION, "AddNotification", "sa{sv}",+ ("alert", {"title": ("s", title), "body": ("s", body)}))+ except PortalError as exc:+ LOGGER.warning("Could not show a message: %s", exc)+ finally:+ bus.close()++ thread = threading.Thread(target=send, name="Beamer-notify", daemon=True)+ thread.start()+ return thread++def _raw_fds(body):"""jeepney hands fds over as FileDescriptor objects that close themselves when dropped; each istaken as a plain fd the caller now owns."""diff --git a/win_app/sender.py b/win_app/sender.pyindex 44de7bf..6970ee5 100644--- a/win_app/sender.py+++ b/win_app/sender.py@@ -641,14 +641,16 @@ class LinkSender:return self._input({"type": protocol.MSG_MOUSEDOWN if down else protocol.MSG_MOUSEUP, "data": {"button": name}})def on_wheel(self, dy: float, dx: float) -> bool:- """The wheel, in notches, positive away from the hand: True when it is not for this PC."""+ """The wheel in notches, as Windows counts them, positive up and right: True when it is+ not for this PC. The wire's dx is Core Graphics' axis 2, positive left, so it goes out+ turned round."""if not self.redirecting:return Falseif not self._live():self._lost()return Falseself._send_pending_windows_key()- return self._input(protocol.scroll_msg(dy, dx, "line"))+ return self._input(protocol.scroll_msg(dy, -dx, "line"))def on_pointer_move(self) -> bool:"""A move the hook saw, never the distance it covered, which comes from on_motion. While@@ -745,9 +747,10 @@ class LinkSender:def zone_models(self) -> list:"""The models of this PC's ways out, where a desktop that captures input at barriers putsthem; none while the edges are held."""- if self.edges_held or self._owner is None:- return []- return [model for _peer, model in list(self._models)]+ with self._lock:+ if self.edges_held or self._owner is None:+ return []+ return [model for _peer, model in self._models]def seam_clip_position(self, x: int, y: int):"""Keep a local pointer on an armed display edge when it enters an adjacent display."""@@ -1269,6 +1272,8 @@ class LinkSender:if isinstance(moved.other, bytes) and moved.other != self._own_id:other = peerlist.label_for(self._entries, peer_id=protocol.id_text(moved.other))reason = peerlist.refusal_text(moved.why, self._name(moved.left), other)+ if moved.why == "taken_over":+ reason = f"{other or 'Another machine'} took over {self._name(moved.left)}"if reason is None:reason = HOME_REASONS.get(moved.why, "{name} returned the input").format(name=self._name(moved.left))self._alert(reason)diff --git a/win_app/tests/render_settings_layout.py b/win_app/tests/render_settings_layout.pyindex 7a2353d..453fc90 100644--- a/win_app/tests/render_settings_layout.py+++ b/win_app/tests/render_settings_layout.py@@ -332,7 +332,8 @@ def run_crossing_state(state, destination):- window.atlas_canvas.mapTo(window.ways_module, QPoint(0, window.atlas_canvas.height())).y()),"horizontal_scroll": scroll.horizontalScrollBar().maximum(),"rows": [{"name": row.name.full_text, "status": row.status.text(),- "edge": row.edge_value.text(), "corner": row.corner_value.text(),+ "edges": {side: chip.kind for side, chip in row.edge_chips.chips.items() if not chip.isHidden()},+ "corners": [corner for corner, button in row.corner_grid.buttons.items() if button.isChecked()],"jump": row.jump.value} for row in window.crossing_ledger.rows.values()]}(scratch / f"ledger-render-{state}.json").write_text(json.dumps(record, indent=2) + "\n")print(json.dumps(record))diff --git a/win_app/tests/test_app_config.py b/win_app/tests/test_app_config.pyindex 98db5df..60dd052 100644--- a/win_app/tests/test_app_config.py+++ b/win_app/tests/test_app_config.py@@ -147,6 +147,13 @@ class OverlappingZonesTests(unittest.TestCase):with self.assertRaises(ConfigError):config_from_dict({**BASE, "effect_size": "huge"})+ def test_frame_rate_defaults_to_display_and_round_trips(self):+ self.assertEqual(config_from_dict(dict(BASE)).frame_rate, "display")+ config = config_from_dict({**BASE, "frame_rate": "quarter"})+ self.assertEqual(config_to_dict(config)["frame_rate"], "quarter")+ with self.assertRaises(ConfigError):+ config_from_dict({**BASE, "frame_rate": "eighth"})+def test_a_saved_warp_choice_reads_as_its_stand_in(self):# Warp is offered nowhere for now; a PC that chose it keeps working.config = config_from_dict({**BASE, "glow_style": "light_slit", "glow_colour": "neon",diff --git a/win_app/tests/test_atlas_canvas.py b/win_app/tests/test_atlas_canvas.pyindex 30216e1..92ec0a0 100644--- a/win_app/tests/test_atlas_canvas.py+++ b/win_app/tests/test_atlas_canvas.py@@ -14,6 +14,44 @@ class AtlasCanvasTests(unittest.TestCase):self.app = QApplication.instance() or QApplication([])+ def test_per_screen_desk_canvas_keeps_a0_b0_a1_and_b1_grouped_by_machine(self):+ from diagram import AtlasCanvas+ from core.tests.crossing_harness import per_screen_layout++ tiles = per_screen_layout("home", "peer")+ canvas = AtlasCanvas()+ self.addCleanup(canvas.deleteLater)+ canvas.resize(720, 360)+ canvas.set_tiles(tiles, {"home": "This PC", "peer": "Studio Mac"},+ {"home": {}, "peer": {"state": "edge", "crosses": True}},+ "peer", own_id="home")++ a0, a1 = canvas.display_rect("home", "0"), canvas.display_rect("home", "1")+ b0, b1 = canvas.display_rect("peer", "0"), canvas.display_rect("peer", "1")+ self.assertLess(a0.center().x(), b0.center().x())+ self.assertLess(b0.center().x(), a1.center().x())+ self.assertGreater(b1.top(), b0.top())++ def test_split_b1_offset_draws_past_the_nominal_group_bounds(self):+ from diagram import AtlasCanvas+ from core.tests.crossing_harness import per_screen_layout++ canvas = AtlasCanvas()+ self.addCleanup(canvas.deleteLater)+ canvas.resize(720, 360)+ labels = {"home": "This PC", "peer": "Studio Mac"}+ statuses = {"home": {}, "peer": {"state": "edge", "crosses": True}}+ for offset in (80, 120):+ with self.subTest(b1_offset=offset):+ tiles = per_screen_layout("home", "peer", b1_x=offset)+ canvas.set_tiles(tiles, labels, statuses, "peer", own_id="home")+ group = canvas.tile_rect("peer")+ b1 = canvas.display_rect("peer", "1")+ if offset < 100:+ self.assertLess(b1.left(), group.left())+ else:+ self.assertGreater(b1.right(), group.right())+def test_this_pc_tile_shows_platform_and_linked_status(self):import sys@@ -64,6 +102,123 @@ class AtlasCanvasTests(unittest.TestCase):for x in range(max(0, int(rect.left()) + 20), min(image.width(), int(rect.right()) - 20)))self.assertTrue(visible_ink)+ def _wrapping_canvas(self, **states):+ from PySide6.QtCore import Qt+ from PySide6.QtGui import QImage++ from diagram import AtlasCanvas++ canvas = AtlasCanvas()+ self.addCleanup(canvas.deleteLater)+ canvas.resize(880, 260)+ tiles = {"home": {"x": 0, "y": 0, "w": 160, "h": 100}, "a": {"x": 160, "y": 0, "w": 160, "h": 100},+ "b": {"x": -160, "y": 0, "w": 160, "h": 100}}+ base = {"a": {"state": "edge", "thirds": ["start", "middle", "end"], "linked": True},+ "b": {"state": "edge", "thirds": ["start", "middle", "end"], "linked": True}}+ for peer, extra in states.items():+ base[peer].update(extra)+ canvas.set_tiles(tiles, {"home": "This PC", "a": "MacBook Pro", "b": "Studio Linux"}, base, "a", own_id="home")+ image = QImage(canvas.size(), QImage.Format.Format_ARGB32)+ image.fill(Qt.GlobalColor.transparent)+ canvas.render(image)+ return canvas, canvas.tile_rect("home")++ def test_each_wrap_around_side_draws_a_seam_and_a_label(self):+ canvas, rect = self._wrapping_canvas(a={"wraps": [{"display": None, "side": "left", "parts": ["start", "middle", "end"]},+ {"display": None, "side": "top", "parts": ["start", "middle", "end"]}]})+ seams = {side: (one, two, alpha) for side, one, two, alpha, _width in canvas.seam_paths if side in ("left", "top")}+ one, two, alpha = seams["left"]+ self.assertAlmostEqual((one.x(), one.y(), two.y()), (rect.left(), rect.top() + 2, rect.bottom() - 2))+ self.assertEqual(alpha, 1.0)+ one, two, _alpha = seams["top"]+ self.assertAlmostEqual((one.y(), one.x(), two.x()), (rect.top(), rect.left() + 2, rect.right() - 2))+ self.assertEqual({(side, text) for _peer, side, text, kept, _alpha in canvas.wrap_marks if not kept},+ {("left", "wraps to MacBook Pro"), ("top", "wraps to MacBook Pro")})++ def test_no_wrap_label_ever_lands_on_the_name_the_detail_line_or_another_label(self):+ """rc4 on the Mac: wrap labels over the tile's name, and three of them stacked when one machine+ wrapped Top, Right and Bottom. Every set of sides for one machine at every height, and for two."""+ import itertools+ from PySide6.QtCore import QRectF, Qt+ from PySide6.QtGui import QFontMetrics, QImage++ import theme+ import tokens+ from diagram import AtlasCanvas++ sets = [list(sides) for count in range(0, 5)+ for sides in itertools.combinations(("left", "right", "top", "bottom"), count)]+ cases = [(height, sides, []) for height in (60, 70, 80, 90, 100, 130, 180) for sides in sets[1:]]+ cases += [(100, sides, others) for sides in sets for others in sets[1:]]+ canvas = AtlasCanvas()+ self.addCleanup(canvas.deleteLater)+ canvas.resize(880, 400)+ image = QImage(canvas.size(), QImage.Format.Format_ARGB32)+ for height, sides, others in cases:+ tiles = {"home": {"x": 0, "y": 0, "w": 160, "h": height}, "a": {"x": 160, "y": 0, "w": 160, "h": height},+ "b": {"x": -160, "y": 0, "w": 160, "h": height}}+ states = {"a": {"state": "edge", "thirds": ["start", "middle", "end"], "linked": True, "wraps": sides},+ "b": {"state": "edge", "thirds": ["start", "middle", "end"], "linked": True, "wraps": others}}+ canvas.set_tiles(tiles, {"home": "This PC", "a": "MacBook Pro", "b": "Studio Linux"}, states, "a",+ own_id="home")+ image.fill(Qt.GlobalColor.transparent)+ canvas.render(image)+ rect = canvas.tile_rect("home")+ title = canvas._title_rect("home", rect)+ name = QFontMetrics(theme.font(tokens.TYPE["body"], 650)).horizontalAdvance("This PC")+ fixed = [QRectF(title.center().x() - name / 2, title.top(), name, title.height()),+ QRectF(rect.left() + 24, rect.top() + 31, rect.width() - 32, 16)]+ boxes = [box for _side, _text, box in canvas.wrap_label_rects]+ with self.subTest(height=height, sides=sides, others=others):+ for index, box in enumerate(boxes):+ self.assertTrue(rect.contains(box), (rect, box))+ for other in fixed + boxes[index + 1:]:+ self.assertFalse(box.intersects(other), (box, other))+ if rect.height() >= 100:+ self.assertEqual(len(boxes), bool(sides) + bool(others))++ def test_a_wrap_around_seam_stops_thirteen_pixels_short_of_a_corner_pad(self):+ canvas, rect = self._wrapping_canvas(a={"wraps": ["left", "bottom"], "corners": ["top_left", "bottom_right"]})+ seams = {side: (one, two) for side, one, two, _alpha, _width in canvas.seam_paths if side in ("left", "bottom")}+ self.assertAlmostEqual(seams["left"][0].y(), rect.top() + 13)+ self.assertAlmostEqual(seams["left"][1].y(), rect.bottom() - 2)+ self.assertAlmostEqual(seams["bottom"][0].x(), rect.left() + 2)+ self.assertAlmostEqual(seams["bottom"][1].x(), rect.right() - 13)++ def test_wrap_seams_follow_the_offline_and_not_selected_opacities(self):+ canvas, _rect = self._wrapping_canvas(a={"wraps": ["left"], "linked": False}, b={"wraps": ["right"]})+ alphas = {peer: alpha for peer, _side, _text, _kept, alpha in canvas.wrap_marks}+ self.assertAlmostEqual(alphas["a"], .55)+ self.assertAlmostEqual(alphas["b"], .7)++ def test_a_kept_side_is_a_dashed_faint_seam_with_its_own_label(self):+ canvas, rect = self._wrapping_canvas(a={"kept_wraps": ["bottom"], "edge_off": True})+ (peer, side, text, kept, alpha), = canvas.wrap_marks+ self.assertEqual((peer, side, text, kept, alpha), ("a", "bottom", "wrap kept, Edge off", True, .35))++ def test_one_pad_per_corner_of_every_machine_at_full_and_quiet_opacity(self):+ canvas, _rect = self._wrapping_canvas(a={"corners": ["top_left", "bottom_right"]}, b={"corners": ["top_right"]})+ self.assertEqual(set(canvas.corner_marks), {("a", "top_left", 1.0), ("a", "bottom_right", 1.0), ("b", "top_right", .55)})++ def test_the_tile_says_crosses_for_any_wrap_or_corner_and_edge_off_otherwise(self):+ from PySide6.QtGui import QColor+ from diagram import outcome_for_tile+ import theme++ def foot_is_signal(canvas, peer):+ rect = canvas.tile_rect(peer)+ image = canvas.grab().toImage()+ signal = QColor(theme.colour("signal"))+ return any(abs(image.pixelColor(x, y).red() - signal.red()) < 20 and abs(image.pixelColor(x, y).blue() - signal.blue()) < 20+ for y in range(int(rect.bottom()) - 24, int(rect.bottom()) - 8)+ for x in range(int(rect.left()) + 40, int(rect.right()) - 40))+ wrapped, _rect = self._wrapping_canvas(b={"crosses": True, "wraps": ["right"]})+ self.assertTrue(foot_is_signal(wrapped, "b"))+ off, _rect = self._wrapping_canvas(b={"crosses": False, "edge_off": True})+ self.assertFalse(foot_is_signal(off, "b"))+ self.assertEqual(outcome_for_tile("edge", False), "Edge off")+ self.assertEqual(outcome_for_tile("edge", True), "Crosses")+def test_drag_compiles_layout_and_refuses_overlap_at_nearest_free_snap(self):from PySide6.QtCore import QPoint, Qtfrom PySide6.QtTest import QTestdiff --git a/win_app/tests/test_capture_portal.py b/win_app/tests/test_capture_portal.pyindex 722a696..2456133 100644--- a/win_app/tests/test_capture_portal.py+++ b/win_app/tests/test_capture_portal.py@@ -25,6 +25,70 @@ SESSION = "/org/freedesktop/portal/desktop/session/1_42/beamer2"class BarrierTest(unittest.TestCase):+ def test_a_scoped_wayland_zone_does_not_create_barriers_on_another_display(self):+ screens = [Rect(0, 0, 1920, 1080), Rect(1920, 0, 1920, 1080)]+ model = return_edge.ReturnEdge("left", display="1")++ found = capture_portal.barriers([model], screens, display_map={"0": screens[0], "1": screens[1]})++ self.assertEqual(found, [],+ "display 1's left seam is internal and cannot be captured")++ def test_a_display_key_selects_its_zone_by_geometry_side_by_side(self):+ screens = [Rect(0, 0, 1920, 1080), Rect(1920, 0, 1920, 1080)]+ models = [return_edge.ReturnEdge("top", display="A")]+ self.assertEqual(capture_portal.barriers(models, list(reversed(screens)), display_map={"A": screens[0], "B": screens[1]}),+ [("top", (0, 0, 1919, 0))])++ def test_a_display_key_selects_its_zone_by_geometry_when_stacked(self):+ screens = [Rect(0, 0, 1600, 900), Rect(200, 950, 1200, 700)]+ models = [return_edge.ReturnEdge("right", display="A")]+ self.assertEqual(capture_portal.barriers(models, list(reversed(screens)), display_map={"A": screens[0], "B": screens[1]}),+ [("right", (1600, 0, 1600, 899))])++ def test_kde_places_a_selected_whole_edge_in_reconciled_zone_coordinates(self):+ qt_screens = [Rect(-1920, 0, 1920, 1080), Rect(0, 0, 2560, 1440)]+ zones = [Rect(0, 0, 1280, 720), Rect(-960, 0, 960, 540)]+ desktop_portal._screens = qt_screens+ desktop_portal.set_zones(zones)+ self.addCleanup(desktop_portal.set_zones, [])+ self.addCleanup(setattr, desktop_portal, "_screens", [])++ self.assertEqual(capture_portal.barriers([return_edge.ReturnEdge("top", display="0")], zones,+ whole_edges=True,+ display_map=desktop_portal.display_map()),+ [("top", (-960, 0, -1, 0))])++ def test_a_display_key_scopes_split_edges_and_corners(self):+ screens = [Rect(0, 0, 1920, 1080), Rect(1920, 0, 1920, 1080)]+ display_map = {"A": screens[0], "B": screens[1]}+ self.assertEqual(capture_portal.barriers([return_edge.PartEdge("left", {"middle"}, display="A")], screens,+ display_map=display_map),+ [("left", (0, 360, 0, 719))])+ self.assertEqual(sorted(capture_portal.barriers([return_edge.CornerPush("top_right", "right", display="A")], screens,+ display_map=display_map)),+ [("top", (1911, 0, 1919, 0))])++ def test_an_unmatched_display_does_not_install_barriers_on_other_displays(self):+ screens = [Rect(0, 0, 1920, 1080), Rect(1920, 0, 1920, 1080)]+ unmatched = []+ found = capture_portal.barriers([return_edge.ReturnEdge("top", display="missing")], screens,+ display_map={"A": screens[0], "B": screens[1]},+ warn_unmatched=unmatched.append)+ self.assertEqual(found, [])+ self.assertEqual(unmatched, ["missing"])++ def test_an_unmatched_display_is_logged_once(self):+ hooks = capture_portal.Hooks(None, None, None)+ with self.assertLogs(capture_portal.LOGGER, level="WARNING") as logged:+ hooks._warn_unmatched_display("missing")+ hooks._warn_unmatched_display("missing")+ self.assertEqual(len(logged.records), 1)++ def test_a_display_key_is_part_of_the_barrier_model_key(self):+ self.assertNotEqual(capture_portal.model_key([return_edge.ReturnEdge("top", display="A")]),+ capture_portal.model_key([return_edge.ReturnEdge("top", display="B")]))+def test_kde_uses_one_complete_edge_for_selected_thirds(self):models = [return_edge.PartEdge("left", {"middle"}), return_edge.PartEdge("left", {"end"})]self.assertEqual(capture_portal.barriers(models, ONE, whole_edges=True), [("left", (0, 0, 0, 1079))])@@ -232,16 +296,38 @@ class GnomeBus(FakeBus):self.emit(portal.OBJECT_PATH, capture_portal.INTERFACE, "Disabled", (SESSION, {}))+class KdeBus(FakeBus):+ """The InputCapture portal as xdg-desktop-portal-kde and KWin run it: SetPointerBarriers on a+ session not disabled disables it first, KWin saying so with a Disabled signal that reaches the+ client after the request's Response and so after its own Enable; Enable on an enabled session+ and Disable (which the portal sends as an enable) are no-ops. `disableds` counts the signals."""++ def __init__(self, **kwargs):+ super().__init__(**kwargs)+ self.enabled = False+ self.disableds = 0++ def call(self, path, interface, method, signature, body):+ if method == "Enable":+ self.enabled = True+ result = super().call(path, interface, method, signature, body)+ if method == "SetPointerBarriers" and self.enabled:+ self.enabled = False+ self.disableds += 1+ self.emit(portal.OBJECT_PATH, capture_portal.INTERFACE, "Disabled", (SESSION, {}))+ return result++class Harness:"""A Hooks on a fake portal, its callbacks recorded, and a sender stand-in that crosses after`push_to_cross` pushes, as the zone model does. `gnome` makes the portal GNOME's, on the zonethe laptop reports."""- def __init__(self, version=1, models=None, push_to_cross=2, tokens=None, gnome=False):+ def __init__(self, version=1, models=None, push_to_cross=2, tokens=None, gnome=False, kde=False):if gnome:self.bus = GnomeBus(LAPTOP, versions={capture_portal.INTERFACE: version})else:- self.bus = FakeBus(versions={capture_portal.INTERFACE: version})+ self.bus = (KdeBus if kde else FakeBus)(versions={capture_portal.INTERFACE: version})self.bus.answers["SetPointerBarriers"] = (0, {"failed_barriers": []})self.bus.answers["CreateSession"] = (0, {"session_handle": SESSION, "capabilities": 3})self.bus.answers["GetZones"] = (0, {"zones": [(1600, 900, 0, 0)] if gnome else [(1920, 1080, 0, 0)], "zone_set": 7})@@ -581,6 +667,74 @@ class HooksTest(unittest.TestCase):self.assertEqual((h.bus.refused, h.bus.wasted), ([], []))self.assertEqual(h.failures, [])+ def test_kwins_disabled_after_every_set_of_barriers_does_not_set_them_again_and_again(self):+ with mock.patch.object(capture_portal, "DISABLED_SECONDS", 0.1):+ h = self.make(kde=True)+ h.start()+ h.models = [return_edge.ReturnEdge("right"), return_edge.ReturnEdge("bottom")]+ wait_for(lambda: h.bus.disableds == 1, what="the changed barriers placed on the enabled session")+ time.sleep(0.8)+ self.assertEqual(len(h.bus.made("SetPointerBarriers")), 2)+ self.assertEqual(h.bus.disableds, 1)+ self.assertTrue(h.bus.enabled)+ self.assertLessEqual(len(h.bus.made("Enable")), 4)+ self.assertEqual(h.failures, [])++ def devices(self, h):+ h.ei.feed(("device_added", h.pointer), ("device_added", h.keyboard))+ time.sleep(0.15)++ def cancel(self, h):+ """Mutter's cancel shortcut: the session back in init, its input devices removed, no signal."""+ h.bus.enabled = False+ h.ei.feed(("device_removed", h.pointer), ("device_removed", h.keyboard))++ def test_gnomes_cancel_shortcut_enables_the_session_again_without_setting_the_barriers(self):+ with mock.patch.object(capture_portal, "DISABLED_SECONDS", 0.1):+ h = self.make(gnome=True)+ h.start()+ self.devices(h)+ self.cancel(h)+ wait_for(lambda: len(h.bus.made("Enable")) == 2, what="the session enabled again")+ time.sleep(0.4)+ self.assertEqual(len(h.bus.made("SetPointerBarriers")), 1)+ self.assertEqual(h.bus.made("Disable"), [])+ self.assertEqual(len(h.bus.made("Enable")), 2)+ self.assertTrue(h.bus.enabled)+ self.assertEqual((h.bus.refused, h.bus.wasted), ([], []))++ def test_the_cancel_shortcut_while_input_is_captured_ends_it_and_the_edges_come_back(self):+ with mock.patch.object(capture_portal, "DISABLED_SECONDS", 0.1):+ h = self.make(gnome=True)+ h.start()+ self.devices(h)+ h.activate(x=1600.0, y=450.0)+ h.bus.emit(portal.OBJECT_PATH, capture_portal.INTERFACE, "Deactivated",+ (SESSION, vardict({"activation_id": 3, "cursor_position": (800.0, 450.0)})))+ wait_for(lambda: not h.hooks.holding, what="the capture to end")+ time.sleep(0.3)+ self.assertEqual(len(h.bus.made("Enable")), 1) # an ordinary end leaves the session as it is+ self.cancel(h)+ wait_for(lambda: len(h.bus.made("Enable")) == 2, what="the session enabled again")+ self.assertTrue(h.bus.enabled)+ self.assertEqual(len(h.bus.made("SetPointerBarriers")), 1)+ self.assertEqual((h.bus.refused, h.bus.wasted), ([], []))+ self.assertEqual(h.failures, [])++ def test_the_devices_a_disable_of_its_own_removes_are_not_taken_for_a_cancel(self):+ with mock.patch.object(capture_portal, "DISABLED_SECONDS", 0.1):+ h = self.make(gnome=True, models=[return_edge.ReturnEdge("bottom")])+ h.start()+ self.devices(h)+ h.models = [return_edge.ReturnEdge("bottom"), return_edge.ReturnEdge("left")]+ wait_for(lambda: len(h.bus.made("Disable")) == 1, what="the session disabled")+ h.ei.feed(("device_removed", h.pointer), ("device_removed", h.keyboard))+ wait_for(lambda: len(h.bus.made("Enable")) == 2, what="the session enabled with the new barriers")+ time.sleep(0.5)+ self.assertEqual(len(h.bus.made("Enable")), 2)+ self.assertEqual(len(h.bus.made("SetPointerBarriers")), 2)+ self.assertEqual((h.bus.refused, h.bus.wasted), ([], []))+def test_a_disable_the_portal_refuses_is_logged_and_the_barriers_are_still_set(self):h = self.make(models=[return_edge.ReturnEdge("bottom")])h.start()diff --git a/win_app/tests/test_capture_win_seam.py b/win_app/tests/test_capture_win_seam.pyindex 48e350d..63a369c 100644--- a/win_app/tests/test_capture_win_seam.py+++ b/win_app/tests/test_capture_win_seam.py@@ -3,7 +3,7 @@ import unittestfrom unittest.mock import Mock, patchimport capture_win-from core.return_edge import PartEdge, Rect, ReturnEdge+from core.return_edge import CornerPush, PartEdge, Rect, ReturnEdgeclass HookPoint(ctypes.Structure):@@ -60,6 +60,15 @@ class InternalSeamTests(unittest.TestCase):(50, 99),)+ def test_scoped_corner_is_checked_on_its_display_when_both_walls_are_internal(self):+ upper_left = Rect(0, 0, 100, 100)+ nominated = Rect(100, 0, 100, 100)+ right = Rect(200, 0, 100, 100)+ below = Rect(100, 100, 100, 100)+ monitors = [upper_left, nominated, right, below]+ corner = CornerPush("bottom_right", "right", display="b0")+ self.assertTrue(corner._at_edge(monitors, (199, 99), {"b0": nominated}))+def test_mouse_hook_restores_the_cursor_and_swallows_the_seam_move(self):on_mouse = Mock(return_value=False)on_seam = Mock(return_value=(99, 50))diff --git a/win_app/tests/test_capture_x11.py b/win_app/tests/test_capture_x11.pyindex 31e6a2b..0386811 100644--- a/win_app/tests/test_capture_x11.py+++ b/win_app/tests/test_capture_x11.py@@ -16,6 +16,7 @@ sys.path.append(str(Path(__file__).resolve().parent.parent.parent))import capture_x11 # noqa: E402from capture_x11 import Device # noqa: E402+from core.return_edge import Rect, ReturnEdge # noqa: E402POINTER = Device(2, capture_x11.XI_MASTER_POINTER, "Virtual core pointer")KEYBOARD = Device(3, capture_x11.XI_MASTER_KEYBOARD, "Virtual core keyboard")@@ -91,6 +92,7 @@ class FakeConnection:self.grabs = []self.refuse = set()self.calls = []+ self.seam_configs = []self.mods, self.group = 0, 0self.mapping = list(range(1, 11))self.closed = False@@ -147,6 +149,9 @@ class FakeConnection:self.calls.append(("state",))return self.mods, self.group+ def configure_seams(self, monitors, resistance_px, enabled=True, display_map=None, models=()):+ self.seam_configs.append((list(monitors), resistance_px, enabled, dict(display_map or {}), list(models)))+def abort(self):self.aborted = True@@ -561,6 +566,25 @@ class ThreadTest(unittest.TestCase):self.assertEqual(connection.grabs, [])self.assertTrue(connection.closed)+ def test_seam_sources_follow_zone_and_monitor_changes_while_capture_runs(self):+ connection = FakeConnection()+ hooks = self.make(connection)+ monitors = [Rect(0, 0, 100, 100)]+ display_map = {"0": monitors[0]}+ models = []+ hooks.configure_seams(lambda: monitors, 30, display_map=lambda: display_map,+ models=lambda: models)+ hooks.start()+ self.assertTrue(self.wait_for(lambda: connection.seam_configs))+ self.assertEqual(connection.seam_configs[-1][4], [])++ monitors[:] = [Rect(0, 0, 100, 100), Rect(100, 0, 100, 100)]+ display_map["1"] = monitors[1]+ models[:] = [ReturnEdge("right", display="0")]+ self.assertTrue(self.wait_for(lambda: connection.seam_configs[-1][4] == models+ and len(connection.seam_configs[-1][0]) == 2))+ hooks.stop()+def test_the_loop_dying_lets_go(self):connection = FakeConnection()hooks = self.make(connection)diff --git a/win_app/tests/test_crossing_fix_pass.py b/win_app/tests/test_crossing_fix_pass.pyindex 563355c..593cefc 100644--- a/win_app/tests/test_crossing_fix_pass.py+++ b/win_app/tests/test_crossing_fix_pass.py@@ -137,13 +137,21 @@ class CrossingFixPass(unittest.TestCase):bottom = canvas.mapTo(root, QPoint(0, canvas.height())).y()self.assertEqual(hint.mapTo(root, QPoint()).y() - bottom, 12)- def test_wrapped_edge_text_has_room_for_every_line_and_detail(self):+ def test_wrapped_chips_have_room_for_every_line_in_the_edges_cell(self):row = self.window.crossing_ledger.rows[self.peers[0]["id"]]- self.window._ledger_edge(row.peer)- self.window._ledger_third(row.peer, "middle")- parity.settle(self.window)- self.assertGreaterEqual(row.edge_value.height(), row.edge_value.heightForWidth(row.edge_value.width()))- self.assertGreaterEqual(row.edge_text.height(), row.edge_text.layout().heightForWidth(row.edge_text.width()))+ self.window._ledger_side(row.peer, "top")+ self.window._ledger_side(row.peer, "bottom")+ for width in (900, 640):+ self.window.resize(width, 760)+ parity.settle(self.window)+ chips = row.edge_chips+ shown = [chip for chip in chips.chips.values() if not chip.isHidden()]+ self.assertEqual(len(shown), 4)+ self.assertGreaterEqual(chips.height(), chips.flow.heightForWidth(chips.width()))+ self.assertGreaterEqual(row.height(), chips.mapTo(row, QPoint()).y() + chips.height())+ for chip in shown:+ self.assertLessEqual(chip.geometry().right(), chips.width())+ self.assertLessEqual(chip.geometry().bottom(), chips.height())def test_narrow_jump_stays_beside_its_label(self):self.window.resize(640, 700)diff --git a/win_app/tests/test_crossing_ledger.py b/win_app/tests/test_crossing_ledger.pyindex 934556c..0549a65 100644--- a/win_app/tests/test_crossing_ledger.py+++ b/win_app/tests/test_crossing_ledger.py@@ -14,9 +14,20 @@ from core import waysimport test_crossing_page_parity as parity+def row_of(window, peer):+ return window.crossing_ledger.rows[peer]+++def contact_chip(window, peer):+ return next(chip for chip in row_of(window, peer).edge_chips.chips.values() if chip.kind == "contact")+++def chip_kinds(window, peer):+ return {side: chip.kind for side, chip in row_of(window, peer).edge_chips.chips.items() if not chip.isHidden()}++def picked(window, peer):- return [third for third, button in window.crossing_ledger.rows[peer].edge_glyph.buttons.items()- if button.isChecked()]+ return [third for third, segment in contact_chip(window, peer).segments.items() if segment.isChecked()]def band_point(canvas, third, side="right"):@@ -48,11 +59,11 @@ class CrossingLedgerTests(unittest.TestCase):with self.subTest(subset=subset):window = self.windowif picked(window, peer):- window.crossing_ledger.rows[peer].edge_text.click()- window.crossing_ledger.rows[peer].edge_text.click()+ contact_chip(window, peer).click()+ contact_chip(window, peer).click()for third in ways.PARTS:if third not in subset:- window.crossing_ledger.rows[peer].edge_glyph.buttons[third].click()+ contact_chip(window, peer).segments[third].click()held = ways.ways(app_config.load_settings(self.path), peer)self.assertEqual(ways.picked_thirds(held["methods"], held["parts"]), list(subset))self.assertEqual(picked(window, peer), list(subset))@@ -66,24 +77,23 @@ class CrossingLedgerTests(unittest.TestCase):for surface in ("ledger", "map"):with self.subTest(surface=surface):window = self.window- row = window.crossing_ledger.rows[peer]if not picked(window, peer):- row.edge_text.click()+ contact_chip(window, peer).click()def click(third):if surface == "ledger":- row.edge_glyph.buttons[third].click()+ contact_chip(window, peer).segments[third].click()else:QTest.mouseClick(window.atlas_canvas, Qt.MouseButton.LeftButton, pos=band_point(window.atlas_canvas, third))for third in ways.PARTS:click(third)self.assertEqual(picked(window, peer), [])- self.assertEqual(row.edge_value.text(), "Off")+ self.assertFalse(contact_chip(window, peer).isChecked())self.assertFalse(window.atlas_canvas.states[peer]["crosses"])click("middle")self.assertEqual(picked(window, peer), ["middle"])- self.assertEqual(row.edge_value.text(), "Middle third")- row.edge_text.click()- row.edge_text.click()+ self.assertTrue(contact_chip(window, peer).isChecked())+ contact_chip(window, peer).click()+ contact_chip(window, peer).click()self.assertEqual(picked(window, peer), list(ways.PARTS))def test_each_corner_on_and_off_round_trips(self):@@ -91,41 +101,150 @@ class CrossingLedgerTests(unittest.TestCase):for corner in ways.CORNERS:for on in (True, False):with self.subTest(corner=corner, on=on):- self.window.crossing_ledger.rows[peer].corner_glyph.buttons[corner].click()+ row_of(self.window, peer).corner_grid.buttons[corner].click()held = ways.ways(app_config.load_settings(self.path), peer)- self.assertEqual("corner" in held["methods"], on)- self.assertEqual(self.window.atlas_canvas.states[peer]["corner_way"], corner if on else "")+ self.assertEqual(corner in held["corners"], on)+ self.assertEqual(self.window.atlas_canvas.states[peer]["corners"], [corner] if on else [])self._close_window()self._open_window()- self.assertEqual(self.window.crossing_ledger.rows[peer].corner_glyph.buttons[corner].isChecked(), on)+ self.assertEqual(row_of(self.window, peer).corner_grid.buttons[corner].isChecked(), on)- def test_corner_moves_refuses_held_dot_and_pads_have_both_opacities(self):+ def test_two_corners_at_once_a_held_one_and_an_unavailable_one_refuse_without_a_write(self):first, second = [entry["id"] for entry in self.peers]rows = self.window.crossing_ledger.rows- rows[first].corner_glyph.buttons["top_left"].click()- rows[first].corner_glyph.buttons["bottom_right"].click()- self.assertFalse(rows[first].corner_glyph.buttons["top_left"].isChecked())+ rows[first].corner_grid.buttons["top_left"].click()+ rows[first].corner_grid.buttons["bottom_right"].click()+ self.assertTrue(rows[first].corner_grid.buttons["top_left"].isChecked())+ self.assertTrue(rows[first].corner_grid.buttons["bottom_right"].isChecked())+ self.assertEqual(ways.ways(app_config.load_settings(self.path), first)["corners"], ["top_left", "bottom_right"])before = app_config.load_settings(self.path)- self.assertFalse(rows[second].corner_glyph.buttons["bottom_right"].isEnabled())- self.assertEqual(rows[second].corner_glyph.buttons["bottom_right"].toolTip(), "MacBook Pro's corner")- rows[second].corner_glyph.buttons["bottom_right"].click()+ held = rows[second].corner_grid.buttons["bottom_right"]+ self.assertFalse(held.isEnabled())+ self.assertEqual(held.toolTip(), "MacBook Pro's corner")+ held.click()+ self.window._ledger_corner(second, "bottom_right")self.assertEqual(app_config.load_settings(self.path), before)- rows[second].corner_glyph.buttons["bottom_left"].click()+ rows[second].corner_grid.buttons["bottom_left"].click()self.window._choose_machine(second)paint(self.window.atlas_canvas)- self.assertEqual(set(self.window.atlas_canvas.corner_marks), {(first, "bottom_right", .55), (second, "bottom_left", 1.0)})+ self.assertEqual(set(self.window.atlas_canvas.corner_marks),+ {(first, "top_left", .55), (first, "bottom_right", .55), (second, "bottom_left", 1.0)})+ layout = copy.deepcopy(app_config.load_settings(self.path)["layout"])+ layout[second] = {"x": 0, "y": 400, "w": 160, "h": 100}+ self.window._config.layout = layout+ self.window._reflect_ways()+ paint(self.window.atlas_canvas)+ self.assertNotIn(second, {peer for peer, _corner, _opacity in self.window.atlas_canvas.corner_marks},+ "a corner that no longer crosses draws no pad")+ apart = rows[second].corner_grid.buttons["top_right"]+ self.assertFalse(apart.isEnabled())+ self.assertEqual(apart.toolTip(), "Place Desktop PC beside this PC first")+ before = app_config.load_settings(self.path)+ self.window._ledger_corner(second, "top_right")+ self.assertEqual(app_config.load_settings(self.path), before)+ # A corner already on stays removable after its machine loses the side contact.+ rows[second].corner_grid.buttons["bottom_left"].click()+ self.assertEqual(ways.ways(app_config.load_settings(self.path), second)["corners"], [])- def test_seam_and_track_stop_at_corner_halo(self):- peer = self.peers[0]["id"]+ def test_every_chip_state_round_trips_through_the_saved_ways_and_the_map(self):+ peer, other = [entry["id"] for entry in self.peers]+ window = self.window+ def saved():+ return ways.ways(app_config.load_settings(self.path), peer)+ def edge_on():+ return bool(ways.picked_thirds(saved()["methods"], saved()["parts"]))+ def chip(side):+ return row_of(window, peer).edge_chips.chips[side]+ def agree():+ held = saved()+ for side, mine in row_of(window, peer).edge_chips.chips.items():+ if mine.kind in ("on", "kept"):+ self.assertIn(side, held["edges"])+ wraps = {item["side"] if isinstance(item, dict) else item+ for item in window.atlas_canvas.states[peer].get("wraps", ())}+ self.assertEqual(wraps, {side for side, mine in row_of(window, peer).edge_chips.chips.items() if mine.kind == "on"})+ self.assertEqual(set(window.atlas_canvas.states[peer]["kept_wraps"]),+ {side for side, mine in row_of(window, peer).edge_chips.chips.items() if mine.kind == "kept"})+ self.assertEqual(chip_kinds(window, peer), {"left": "held", "right": "contact", "top": "free", "bottom": "free"})+ self.assertFalse(edge_on())+ chip("top").click()+ self.assertEqual((saved()["edges"], edge_on(), chip("top").kind), (["top"], True, "on"))+ self.assertTrue(contact_chip(window, peer).isChecked())+ agree()+ chip("bottom").click()+ self.assertEqual(saved()["edges"], ["top", "bottom"])+ agree()+ chip("top").click()+ self.assertEqual((saved()["edges"], chip("top").kind), (["bottom"], "free"))+ agree()+ contact_chip(window, peer).click()+ self.assertFalse(edge_on())+ self.assertEqual((saved()["edges"], chip("bottom").kind), (["bottom"], "kept"))+ self.assertFalse(contact_chip(window, peer).isChecked())+ agree()+ chip("bottom").click()+ self.assertEqual((saved()["edges"], edge_on(), chip("bottom").kind), (["bottom"], True, "on"))+ agree()+ contact_chip(window, peer).click()+ contact_chip(window, peer).click()+ self.assertEqual((saved()["edges"], edge_on()), (["bottom"], True))+ before = app_config.load_settings(self.path)+ self.assertFalse(chip("left").isEnabled())+ self.window._ledger_side(peer, "left")+ self.assertEqual(app_config.load_settings(self.path), before)+ self._close_window()+ self._open_window()+ self.assertEqual(chip_kinds(self.window, peer), {"left": "held", "right": "contact", "top": "free", "bottom": "on"})+ agree()+ self.assertEqual(saved()["edges"], ["bottom"])+ self.assertEqual(chip_kinds(self.window, other)["right"], "held")++ def test_chips_are_ordered_contact_first_and_labelled_by_state(self):+ peer, other = [entry["id"] for entry in self.peers]+ edges = row_of(self.window, peer).edge_chips+ chips = edges.chips+ shown = lambda: [side for side in (chip.side for chip in+ sorted((c for c in chips.values() if not c.isHidden()), key=lambda c: c.geometry().top() * 10000 + c.geometry().left()))]+ self.assertEqual(shown()[0], "right")+ self.window._ledger_side(peer, "top")+ chip_texts = {side: chip.text_ for side, chip in chips.items()}+ self.assertEqual(chip_texts, {"left": "Left, Desktop PC", "right": "Right", "top": "Top, wraps", "bottom": "Bottom"})+ self.assertEqual(chips["right"].toolTip(), "Right edge: touches MacBook Pro; click to turn it off")+ self.assertEqual(chips["top"].toolTip(), "Top edge wraps round to MacBook Pro; click to remove")+ self.assertEqual(chips["bottom"].toolTip(), "Bottom edge: click to wrap round to MacBook Pro")+ self.assertEqual(chips["left"].toolTip(), "Left edge: Desktop PC's")self.window._ledger_edge(peer)- self.window._ledger_corner(peer, "top_right")- self.window._ledger_third(peer, "start")- canvas = self.window.atlas_canvas+ self.assertEqual(chips["right"].toolTip(), "Right edge: touches MacBook Pro; click to turn it on")+ self.assertEqual(chips["top"].toolTip(), "Top edge wraps round to MacBook Pro once Edge is on; click to turn Edge on")+ self.assertEqual(chips["top"].kind, "kept")++ def test_map_draws_a_seam_and_label_for_each_wrap_and_stops_short_of_a_pad(self):+ peer = self.peers[0]["id"]+ window = self.window+ window._ledger_side(peer, "top")+ window._ledger_side(peer, "bottom")+ window._ledger_corner(peer, "top_left")+ window._ledger_corner(peer, "bottom_right")+ canvas = window.atlas_canvaspaint(canvas)rect = canvas.tile_rect(canvas._own_id())- right_paths = [path for path in canvas.seam_paths if path[0] == "right"]- self.assertTrue(right_paths)- self.assertAlmostEqual(min(one.y() for _side, one, _two, _alpha, _width in right_paths), rect.top() + 11)+ wrapped = {side: (one, two, alpha) for side, one, two, alpha, _width in canvas.seam_paths+ if side in ("top", "bottom") and alpha == 1.0}+ self.assertEqual(set(wrapped), {"top", "bottom"})+ one, two, _alpha = wrapped["top"]+ self.assertAlmostEqual(one.x(), rect.left() + 13)+ self.assertAlmostEqual(two.x(), rect.right() - 2)+ one, two, _alpha = wrapped["bottom"]+ self.assertAlmostEqual(one.x(), rect.left() + 2)+ self.assertAlmostEqual(two.x(), rect.right() - 13)+ self.assertEqual({(side, text) for _peer, side, text, kept, _alpha in canvas.wrap_marks if not kept},+ {("top", "wraps to MacBook Pro"), ("bottom", "wraps to MacBook Pro")})+ self.assertEqual({(corner) for _peer, corner, _opacity in canvas.corner_marks}, {"top_left", "bottom_right"})+ window._ledger_edge(peer)+ paint(canvas)+ self.assertEqual({(side, kept) for _peer, side, _text, kept, _alpha in canvas.wrap_marks}, {("top", True), ("bottom", True)})+ self.assertEqual([text for *_head, text, _kept, _alpha in canvas.wrap_marks][0], "wrap kept, Edge off")+ self.assertEqual(canvas.states[peer]["crosses"], True)def test_shortcut_cycle_and_jump_chord_round_trip(self):peer = self.peers[0]["id"]@@ -148,22 +267,30 @@ class CrossingLedgerTests(unittest.TestCase):def test_offline_and_left_out_rows_keep_intent_and_put_back_controls(self):peer = self.peers[0]["id"]self.window._ledger_edge(peer)+ self.window._ledger_side(peer, "top")row = self.window.crossing_ledger.rows[peer]self.window._live = lambda _peer: Falseself.window._reflect_ways()self.assertEqual(row.effect.opacity(), .5)self.assertEqual(row.status.text(), "macOS · Offline, ways kept")- self.assertTrue(row.edge_text.isEnabled())+ self.assertTrue(contact_chip(self.window, peer).isEnabled())self.window._canvas_left_out(peer, True)self.assertIs(row, self.window.crossing_ledger.rows[peer])self.assertEqual(row.status.text(), "macOS · Left out")self.assertEqual(row.leave.text(), "Put back")- self.assertFalse(row.edge_text.isEnabled())+ self.assertFalse(contact_chip(self.window, peer).isEnabled())+ self.assertEqual(chip_kinds(self.window, peer), {"right": "contact", "top": "on"})+ self.assertEqual(row.edge_chips.chips["top"].toolTip(), "Left out: Put back to change its ways")+ self.assertFalse(row.corner_grid.buttons["top_left"].isEnabled())self.assertEqual(picked(self.window, peer), list(ways.PARTS))row.leave.click()- self.assertTrue(row.edge_text.isEnabled())+ self.assertTrue(contact_chip(self.window, peer).isEnabled())+ self.assertEqual(chip_kinds(self.window, peer)["top"], "on")def test_narrow_has_no_horizontal_scroll_and_all_controls_fit(self):+ for peer in [entry["id"] for entry in self.peers]:+ self.window._ledger_side(peer, "top")+ self.window._ledger_side(peer, "bottom")self.window.resize(640, 700)parity.settle(self.window)ledger = self.window.crossing_ledger@@ -172,10 +299,21 @@ class CrossingLedgerTests(unittest.TestCase):scroll = self.window.stack.currentWidget()self.assertEqual(scroll.horizontalScrollBar().maximum(), 0)for row in ledger.rows.values():- for control in (*row.cells, row.rename, row.leave, row.cycle, row.jump):+ self.assertGreater(row.edge.width(), row.machine.width() * .9)+ self.assertLess(row.corner_cell.mapTo(ledger, QPoint()).y() + 1, row.keys.mapTo(ledger, QPoint()).y() + row.keys.height())+ self.assertEqual(row.corner_cell.mapTo(ledger, QPoint()).y(), row.keys.mapTo(ledger, QPoint()).y())+ shown = [chip for chip in row.edge_chips.chips.values() if not chip.isHidden()]+ self.assertEqual(len(shown), 4)+ for control in (*row.cells, row.rename, row.leave, row.cycle, row.jump, *shown,+ *row.corner_grid.buttons.values()):rect = control.mapTo(ledger, QPoint())self.assertGreaterEqual(rect.x(), 0)self.assertLessEqual(rect.x() + control.width(), ledger.width())+ self.assertGreater(control.width(), 0)+ self.assertGreater(control.height(), 0)+ for chip in shown:+ self.assertGreaterEqual(chip.mapTo(row.edge, QPoint()).y() + chip.height(), 1)+ self.assertLessEqual(chip.mapTo(row, QPoint()).y() + chip.height(), row.height())def test_accessibility_table_headers_and_named_stateful_controls(self):ledger = self.window.crossing_ledger@@ -184,10 +322,22 @@ class CrossingLedgerTests(unittest.TestCase):self.assertEqual(QAccessible.queryAccessibleInterface(row).role(), QAccessible.Role.Row)self.assertEqual(QAccessible.queryAccessibleInterface(row.machine).role(), QAccessible.Role.RowHeader)headers = ledger.header.findChildren(QWidget)- self.assertEqual([w.accessibleName() for w in headers if w.property("ledger_role") == "columnheader"], ["Machine", "Edge", "Corner", "Keys"])- for button in (*row.edge_glyph.buttons.values(), *row.corner_glyph.buttons.values()):- self.assertIn(", off", button.accessibleName())+ self.assertEqual([w.accessibleName() for w in headers if w.property("ledger_role") == "columnheader"], ["Machine", "Edges", "Corners", "Keys"])+ names = {side: chip.accessibleName() for side, chip in row.edge_chips.chips.items() if not chip.isHidden()}+ self.assertEqual(names, {"left": "Left edge, held by Desktop PC", "right": "Right edge, touches MacBook Pro, off",+ "top": "Top edge, wraps round, off", "bottom": "Bottom edge, wraps round, off"})+ self.window._ledger_side(self.peers[0]["id"], "top")+ self.assertEqual(row.edge_chips.chips["top"].accessibleName(), "Top edge, wraps round, on")+ self.assertEqual(row.edge_chips.chips["right"].accessibleName(), "Right edge, touches MacBook Pro, on")+ self.assertEqual([button.accessibleName() for button in row.corner_grid.buttons.values()],+ [f"{corner} corner, off" for corner in ("Top left", "Top right", "Bottom left", "Bottom right")])+ for button in (*row.edge_chips.chips.values(), *row.corner_grid.buttons.values()):self.assertEqual(QAccessible.queryAccessibleInterface(button).role(), QAccessible.Role.CheckBox)+ row.corner_grid.buttons["top_left"].click()+ self.assertEqual(row.corner_grid.buttons["top_left"].accessibleName(), "Top left corner, on")+ titles = ways.part_names("right")+ self.assertEqual([segment.accessibleName() for segment in contact_chip(self.window, self.peers[0]["id"]).segments.values()],+ [f"Right edge, {titles[third].lower()} third, on" for third in ways.PARTS])def test_selection_and_cell_updates_keep_all_rows_in_place(self):ledger = self.window.crossing_ledger@@ -197,7 +347,7 @@ class CrossingLedgerTests(unittest.TestCase):QTest.mouseClick(rows[peer].name, Qt.MouseButton.LeftButton)self.assertEqual(self.window.atlas_canvas.selected, peer)self.assertTrue(rows[peer].selected)- rows[peer].corner_glyph.buttons["top_left"].click()+ rows[peer].corner_grid.buttons["top_left"].click()self.assertEqual(ledger.rows, rows)self.assertEqual(parity.descendants(ledger).keys(), before.keys())diff --git a/win_app/tests/test_crossing_page_parity.py b/win_app/tests/test_crossing_page_parity.pyindex f796c8b..b9999ed 100644--- a/win_app/tests/test_crossing_page_parity.py+++ b/win_app/tests/test_crossing_page_parity.py@@ -92,6 +92,9 @@ class CrossingPageParityTests(unittest.TestCase):self.window.sender.refresh = lambda: Noneself.window.server.peers_changed = lambda: Noneself.window._sync_sending = lambda: None+ # The fixture peers are 1.5.3 desktops. Pinned, because what a live link has advertised by now+ # depends on the machine: on the rig neither had, and both read as 1.5.1 peers with no wraps.+ self.window._design_peer_caps = lambda: {entry["id"]: {"layout"} for entry in self.peers}self.window._read_crossing()self.window._chosen = self.peers[0]["id"]self.window._reflect_ways()@@ -156,11 +159,13 @@ class CrossingPageParityTests(unittest.TestCase):peer = self.peers[0]["id"]window._ledger_edge(peer)row = window.crossing_ledger.rows[peer]- self.assertEqual(row.edge_value.text(), "Whole edge")- self.assertEqual(row.corner_value.text(), "None")+ contact = next(chip for chip in row.edge_chips.chips.values() if chip.kind == "contact")+ self.assertTrue(contact.isChecked())+ self.assertEqual(contact.toolTip(), "Right edge: touches MacBook Pro; click to turn it off")+ self.assertFalse(any(button.isChecked() for button in row.corner_grid.buttons.values()))self.assertEqual(row.cycle.text(), "Right Ctrl")self.assertEqual(row.jump.key.text(), "Set a key")- self.assertTrue(row.corner_glyph.buttons["top_left"].isEnabled())+ self.assertTrue(row.corner_grid.buttons["top_left"].isEnabled())self.assertFalse(hasattr(window, "way_boxes"))self.assertFalse(hasattr(window, "left_out_shelf"))sequence = (window.ways_module, window.pointer_module, window.resistance_module, window.shortcut_module)@@ -186,10 +191,12 @@ class CrossingPageParityTests(unittest.TestCase):state = window.atlas_canvas.states[peer]self.assertFalse(state["crosses"])self.assertTrue(state["edge_off"])- self.assertEqual(window.crossing_ledger.rows[peer].edge_value.text(), "Off")+ contact = next(chip for chip in window.crossing_ledger.rows[peer].edge_chips.chips.values() if chip.kind == "contact")+ self.assertFalse(contact.isChecked())window._ledger_edge(peer)self.assertTrue(window.atlas_canvas.states[peer]["crosses"])- self.assertEqual(window.crossing_ledger.rows[peer].edge_value.text(), "Whole edge")+ self.assertTrue(contact.isChecked())+ self.assertEqual([segment.isChecked() for segment in contact.segments.values()], [True, True, True])def test_shortcut_settings_and_figures_keep_their_order(self):window = self.window@@ -208,7 +215,10 @@ class CrossingPageParityTests(unittest.TestCase):settle(self.window)ledger = self.window.crossing_ledgerfor row in ledger.rows.values():- for control in (*row.cells, row.rename, row.leave, row.jump, row.cycle):+ chips = [chip for chip in row.edge_chips.chips.values() if not chip.isHidden()]+ self.assertTrue(chips)+ for control in (*row.cells, row.rename, row.leave, row.jump, row.cycle, *chips,+ *row.corner_grid.buttons.values()):point = position(control, ledger)self.assertGreaterEqual(point.x(), 0)self.assertLessEqual(point.x() + control.width(), ledger.width() + 1)diff --git a/win_app/tests/test_desktop_portal_cache.py b/win_app/tests/test_desktop_portal_cache.pyindex f660190..2e800e2 100644--- a/win_app/tests/test_desktop_portal_cache.py+++ b/win_app/tests/test_desktop_portal_cache.py@@ -10,6 +10,12 @@ import desktop_portalclass DesktopPortalCache(unittest.TestCase):+ def test_display_mapping_tolerates_a_zero_size_geometry_during_refresh(self):+ screens = [Rect(0, 0, 0, 10), Rect(0, 10, 10, 10)]+ rectangles = [Rect(0, 0, 10, 10), Rect(0, 10, 10, 10)]++ self.assertEqual(desktop_portal._match_rectangles(screens, rectangles), rectangles)+def test_worker_readers_never_enumerate_qt_screens(self):app = QApplication.instance() or QApplication([])desktop_portal.set_zones([])@@ -33,6 +39,79 @@ class DesktopPortalCache(unittest.TestCase):self.addCleanup(desktop_portal.set_zones, [])self.assertEqual(desktop_portal.monitors(), [zone])+ def test_display_map_matches_reordered_mixed_scale_portal_zones(self):+ desktop_portal._screens = [Rect(-1920, 0, 1920, 1080), Rect(0, 0, 2560, 1440)]+ desktop_portal.set_zones([Rect(0, 0, 1280, 720), Rect(-960, 0, 960, 540)])+ self.addCleanup(desktop_portal.set_zones, [])+ self.addCleanup(setattr, desktop_portal, "_screens", [])++ self.assertEqual(desktop_portal.display_map(), {"0": Rect(-960, 0, 960, 540),+ "1": Rect(0, 0, 1280, 720)})++ def test_display_map_skips_ambiguous_row_of_differently_scaled_zones(self):+ desktop_portal._screens = [Rect(x, 0, 1920, 1080) for x in (0, 1920, 3840, 5760)]+ desktop_portal.set_zones([Rect(0, 0, 3840, 2160),+ Rect(3840, 0, 960, 540),+ Rect(4800, 0, 960, 540),+ Rect(5760, 0, 960, 540)])+ self.addCleanup(desktop_portal.set_zones, [])+ self.addCleanup(setattr, desktop_portal, "_screens", [])++ self.assertEqual(desktop_portal.display_map(), {})+ self.assertIsNone(desktop_portal.absolute_position(1920, 270))++ def test_display_map_skips_ambiguous_stacked_mixed_scale_zones(self):+ desktop_portal._screens = [Rect(0, 0, 1920, 1080), Rect(1920, 0, 1920, 1080),+ Rect(0, 1080, 1920, 1080), Rect(1920, 1080, 1920, 1080)]+ desktop_portal.set_zones([Rect(0, 0, 960, 540), Rect(960, 0, 960, 540),+ Rect(0, 540, 1920, 1080), Rect(1920, 540, 3840, 2160)])+ self.addCleanup(desktop_portal.set_zones, [])+ self.addCleanup(setattr, desktop_portal, "_screens", [])++ self.assertEqual(desktop_portal.display_map(), {})++ def test_display_map_skips_equal_axis_positions_with_ambiguous_identity(self):+ desktop_portal._screens = [Rect(x, 0, 1920, 1080) for x in (0, 1920, 3840, 5760)]+ desktop_portal.set_zones([Rect(0, 0, 960, 540), Rect(1920, 0, 960, 540),+ Rect(960, 0, 960, 540), Rect(2880, 0, 3840, 2160)])+ self.addCleanup(desktop_portal.set_zones, [])+ self.addCleanup(setattr, desktop_portal, "_screens", [])++ self.assertEqual(desktop_portal.display_map(), {})++ def test_absolute_display_map_tracks_the_same_displays_as_input_zones(self):+ desktop_portal._screens = [Rect(0, 0, 1920, 1080), Rect(1920, 0, 1280, 720)]+ desktop_portal.set_zones([Rect(0, 0, 1920, 1080), Rect(1920, 0, 1280, 720)])+ desktop_portal.set_regions([Rect(0, 0, 960, 540), Rect(960, 0, 2560, 1440)])+ self.addCleanup(desktop_portal.set_zones, [])+ self.addCleanup(desktop_portal.set_regions, [])+ self.addCleanup(setattr, desktop_portal, "_screens", [])++ self.assertEqual(desktop_portal.absolute_display_map(), {"0": Rect(0, 0, 960, 540),+ "1": Rect(960, 0, 2560, 1440)})++ def test_landing_position_translates_between_zone_and_absolute_coordinates(self):+ desktop_portal._screens = [Rect(0, 0, 1920, 1080), Rect(1920, 0, 1280, 720)]+ desktop_portal.set_zones([Rect(0, 0, 1920, 1080), Rect(1920, 0, 1280, 720)])+ desktop_portal.set_regions([Rect(0, 0, 960, 540), Rect(960, 0, 2560, 1440)])+ self.addCleanup(desktop_portal.set_zones, [])+ self.addCleanup(desktop_portal.set_regions, [])+ self.addCleanup(setattr, desktop_portal, "_screens", [])++ self.assertEqual(desktop_portal.absolute_position(2560, 360), (2241, 721))++ def test_hotplug_rebuilds_the_display_map_from_the_current_portal_zones(self):+ desktop_portal._screens = [Rect(-1920, 0, 1920, 1080), Rect(0, 0, 2560, 1440)]+ desktop_portal.set_zones([Rect(-960, 0, 960, 540), Rect(0, 0, 1280, 720)])+ self.addCleanup(desktop_portal.set_zones, [])+ self.addCleanup(setattr, desktop_portal, "_screens", [])++ self.assertEqual(desktop_portal.display_map()["0"], Rect(-960, 0, 960, 540))+ desktop_portal._screens = [Rect(0, 0, 2560, 1440)]+ desktop_portal.set_zones([Rect(0, 0, 1280, 720)])++ self.assertEqual(desktop_portal.display_map(), {"0": Rect(0, 0, 1280, 720)})+if __name__ == "__main__":unittest.main()diff --git a/win_app/tests/test_dormant_rows.py b/win_app/tests/test_dormant_rows.pyindex 260bbc2..3b069f0 100644--- a/win_app/tests/test_dormant_rows.py+++ b/win_app/tests/test_dormant_rows.py@@ -58,10 +58,12 @@ class DormantRowTests(unittest.TestCase):sheet=SimpleNamespace(address=mock.Mock(), setVisible=mock.Mock()),machines=SimpleNamespace(set_pairing_open=mock.Mock()),_refresh_pairing=mock.Mock(),+ _cancel_nearby=mock.Mock(),_select_page=mock.Mock(),)kvm_bridge_win.WindowsApplication._re_pair(app, "token")+ app._cancel_nearby.assert_called_once_with()self.assertTrue(app._pairing_open)app.sheet.address.setText.assert_called_once_with("192.0.2.10")@@ -107,10 +109,12 @@ class DormantRowTests(unittest.TestCase):sheet=sheet,machines=SimpleNamespace(set_pairing_open=mock.Mock()),_refresh_pairing=lambda: sheet.set_machines(machines),+ _cancel_nearby=mock.Mock(),_select_page=mock.Mock(),)kvm_bridge_win.WindowsApplication._re_pair(app, "token")+ app._cancel_nearby.assert_called_once_with()self.assertEqual(sheet.chosen_machine()["address"], "192.0.2.10")self.assertTrue(sheet.pair_button.isEnabled())diff --git a/win_app/tests/test_effect_layouts.py b/win_app/tests/test_effect_layouts.pyindex f07c174..dd67a80 100644--- a/win_app/tests/test_effect_layouts.py+++ b/win_app/tests/test_effect_layouts.py@@ -284,8 +284,10 @@ class ClassicPreviewTests(unittest.TestCase):fx = effects.preview_effect("glow")pen = effects.preview_scene(fx, 2.0, "corner", PALETTE)["pens"][0]w, h = effects.PREVIEW_SCREEN- self.assertLess(pen.bounds[0], w - effects.CLASSIC_ARM + 10)- self.assertGreater(pen.bounds[3], effects.CLASSIC_ARM - 10)+ # The arm is a real screen's, drawn at the preview's scale.+ arm = effects.CLASSIC_ARM / effects.PREVIEW_REAL+ self.assertLess(pen.bounds[0], w - arm + 10)+ self.assertGreater(pen.bounds[3], arm - 10)self.assertLessEqual(pen.bounds[2], w + 4)def test_only_the_styles_have_a_preview(self):diff --git a/win_app/tests/test_effect_overlay_x11.py b/win_app/tests/test_effect_overlay_x11.pyindex ba0b1a2..bad9ff0 100644--- a/win_app/tests/test_effect_overlay_x11.py+++ b/win_app/tests/test_effect_overlay_x11.py@@ -9,7 +9,127 @@ os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")sys.path.insert(0, str(Path(__file__).resolve().parents[1]))import effect_overlay_x11-from PySide6.QtCore import QPointF, QRect+from PySide6.QtCore import QPoint, QPointF, QRect, Qt+from PySide6.QtGui import QImage, QPainter+from PySide6.QtWidgets import QApplication+import effect_overlay+from core import effects+++def recorded_frame(pens):+ def value(item):+ if isinstance(item, effects.Gradient):+ return vars(item)+ if isinstance(item, (tuple, list)):+ return [value(part) for part in item]+ return item+ return [(pen.bounds, getattr(pen, "clip", None), value(pen.ops)) for pen in pens]+++def transparent_image(size):+ image = QImage(size, QImage.Format.Format_ARGB32_Premultiplied)+ image.fill(0)+ return image+++class HelperWindowTests(unittest.TestCase):+ @classmethod+ def setUpClass(cls):+ cls.app = QApplication.instance() or QApplication([])++ def test_helper_windows_bypass_shell_window_tracking(self):+ overlay, glow = effect_overlay_x11.create_overlays()+ for widget in (overlay, glow):+ self.assertEqual(widget.windowType(), Qt.WindowType.ToolTip)+ self.assertTrue(widget.windowFlags() & Qt.WindowType.X11BypassWindowManagerHint)+ self.assertTrue(widget.windowFlags() & Qt.WindowType.WindowDoesNotAcceptFocus)+ self.assertTrue(widget.windowFlags() & Qt.WindowType.WindowTransparentForInput)+ widget.close()++ def test_completed_effect_clears_without_unmapping(self):+ overlay, glow = effect_overlay_x11.create_overlays()+ overlay.show()+ overlay._dirty_rect = QRect(10, 20, 30, 40)+ updates = []+ overlay.update = lambda rect: updates.append(QRect(rect))+ overlay._clear_fixed()+ self.assertEqual(updates, [QRect(10, 20, 30, 40)])+ self.assertFalse(overlay._hide_after_paint)+ self.assertFalse(overlay.isHidden())+ self.assertFalse(overlay._timer.isActive())+ overlay.stop()+ self.assertTrue(overlay.isHidden())+ glow.close()++ def test_next_effect_reuses_the_transparent_mapped_surface(self):+ overlay, glow = effect_overlay_x11.create_overlays()+ overlay.configure("discharge", "signal")+ overlay.show = mock.Mock(wraps=overlay.show)+ now = [10.0]+ with mock.patch.object(effect_overlay.time, "monotonic", side_effect=lambda: now[0]), \+ mock.patch.object(effect_overlay, "system_reduced_motion", return_value=False):+ for start in (10.0, 20.0):+ now[0] = start+ overlay.arrive("edge", "left", QPointF(1, 100))+ for step in range(1, 100):+ now[0] = start + step * 0.05+ overlay._tick()+ if not overlay.player.busy:+ break+ self.assertFalse(overlay.player.busy)+ image = QImage(overlay.size(), QImage.Format.Format_ARGB32_Premultiplied)+ image.fill(0xffffffff)+ painter = QPainter(image)+ overlay.render(painter, QPoint(0, 0))+ painter.end()+ self.assertEqual(image, transparent_image(image.size()))+ self.assertFalse(overlay.isHidden())+ overlay.show.assert_called_once()+ overlay.stop()+ glow.close()++ def test_helper_size_and_lifetime_match_native_at_each_scale(self):+ now = [10.0]+ for scale in (1, 2):+ desk = QRect(0, 0, 1920 // scale, 1080 // scale)+ screen = mock.Mock()+ screen.geometry.return_value = desk+ screen.devicePixelRatio.return_value = scale+ screen.refreshRate.return_value = 60.0+ with mock.patch.object(effect_overlay.QGuiApplication, "screens", return_value=[screen]), \+ mock.patch.object(effect_overlay, "desktop_box", return_value=desk), \+ mock.patch.object(effect_overlay.time, "monotonic", side_effect=lambda: now[0]), \+ mock.patch.object(effect_overlay, "system_reduced_motion", return_value=False), \+ mock.patch.object(effect_overlay, "system_dark", return_value=True):+ for style in ("flint", "filings", "discharge"):+ for phase in ("departure", "arrival"):+ helper, glow = effect_overlay_x11.create_overlays()+ native = effect_overlay.EffectOverlay()+ now[0] = 10.0+ point = QPointF(desk.width() - 2, desk.height() * 0.4)+ for widget in (helper, native):+ widget.configure(style, "signal", "long", "large", 1.35, 0.052)+ if phase == "departure":+ widget.push("right", 1.0, True, point)+ else:+ widget.arrive("edge", "right", point)+ drawn = False+ for step in range(100):+ now[0] = 10.0 + step * 0.05+ helper._tick()+ native._tick()+ self.assertEqual(recorded_frame(helper._pens), recorded_frame(native._pens),+ (scale, style, phase, step))+ self.assertEqual(helper.player.busy, native.player.busy)+ if helper._pens:+ drawn = True+ self.assertFalse(helper.isHidden())+ if not helper.player.busy:+ break+ self.assertTrue(drawn)+ self.assertFalse(helper.player.busy)+ for widget in (helper, native, glow):+ widget.close()class FakeStdin:@@ -63,17 +183,29 @@ class ProxyTests(unittest.TestCase):self.assertEqual([json.loads(line) for line in self.process.stdin.lines], [{"op": "effect_configure", "style": "flint", "colour": "ocean", "length": "long", "size": "large",- "effect_pace": 1.35, "size_fraction": 0.052},+ "effect_pace": 1.35, "size_fraction": 0.052, "divisor": 1},{"op": "push", "edge": "right", "pressure": 0.7, "crossed": False, "part": "end"},{"op": "arrive", "method": "edge", "edge": "left", "x": 768, "y": 432, "desk": [0, 0, 1536, 864]},{"op": "crossed_in"},{"op": "switched", "x": 384, "y": 216, "desk": [0, 0, 1536, 864], "choice": "match"},{"op": "glow_configure", "style": "beam", "colour": "sunset", "length": "short", "size": "small",- "effect_pace": 0.75, "size_fraction": 0.03},+ "effect_pace": 0.75, "size_fraction": 0.03, "divisor": 1},{"op": "glow_pressure", "edge": "bottom", "pressure": 1.0, "crossed": True, "part": "start"},{"op": "stop"},])+ def test_the_frame_rate_divisor_reaches_the_helper_process(self):+ import frame_clock+ self.addCleanup(frame_clock.set_divisor, 1)+ frame_clock.set_divisor(4)+ self.proxy.configure("flint", "ocean")+ sent = json.loads(self.process.stdin.lines[-1])+ self.assertEqual(sent["divisor"], 4)+ frame_clock.set_divisor(1)+ overlay, glow = mock.Mock(), mock.Mock()+ effect_overlay_x11.dispatch(sent, overlay, glow, None)+ self.assertEqual(frame_clock.divisor(), 4)+def test_push_with_cursor_serialises_the_cursor_and_desktop_bounds(self):self.proxy.push("right", 0.7, False, cursor=QPointF(1590, 440), desk=QRect(100, -20, 1600, 900))@@ -121,7 +253,27 @@ class ProxyTests(unittest.TestCase):self.assertTrue(proxy.failed)self.assertEqual(self.failed, [True])-+ def test_timer_polls_fast_while_showing_slowly_while_idle_and_stops_once_failed(self):+ from PySide6.QtWidgets import QApplication+ _app = QApplication.instance() or QApplication([])+ self.proxy.configure("flint", "ocean")+ timer = self.proxy._timer+ self.assertIsNotNone(timer)+ self.assertEqual((timer.isActive(), timer.interval()), (True, 100))+ self.proxy._on_timer()+ self.assertEqual((timer.isActive(), timer.interval()), (True, 1000), "idle, the helper is still watched")+ self.proxy.push("right", 0.7, False)+ self.assertEqual((timer.isActive(), timer.interval()), (True, 100))+ self.proxy._on_timer()+ self.assertEqual(timer.interval(), 100, "still showing")+ self.proxy.stop()+ self.assertEqual((timer.isActive(), timer.interval()), (True, 1000))+ self.proxy.arrive("edge", "left", 768, 432, [0, 0, 1536, 864])+ self.assertEqual(timer.interval(), 100)+ self.process.returncode = 1+ self.proxy._on_timer()+ self.assertTrue(self.proxy.failed)+ self.assertFalse(timer.isActive())class DispatchTests(unittest.TestCase):def test_dispatch_maps_points_by_fraction_and_calls_the_overlays(self):overlay = mock.Mock()diff --git a/win_app/tests/test_frame_clock.py b/win_app/tests/test_frame_clock.pyindex f3e13c3..5e451a2 100644--- a/win_app/tests/test_frame_clock.py+++ b/win_app/tests/test_frame_clock.py@@ -27,6 +27,14 @@ class FrameClockTests(unittest.TestCase):return_value=[] if rate == 0.0 else [SimpleNamespace(refreshRate=lambda: screen_rate)]):self.assertEqual(frame_clock.frame_interval_ms(), expected)+ def test_interval_applies_the_selected_divisor(self):+ self.addCleanup(frame_clock.set_divisor, 1)+ with mock.patch.object(frame_clock, "refresh_rate", return_value=120.0):+ for divisor, expected in ((1, 8), (2, 16), (4, 33)):+ with self.subTest(divisor=divisor):+ frame_clock.set_divisor(divisor)+ self.assertEqual(frame_clock.frame_interval_ms(), expected)+def test_with_no_widget_the_fastest_screen_paces_the_clock(self):screens = [SimpleNamespace(refreshRate=lambda: 60.0), SimpleNamespace(refreshRate=lambda: 120.0)]with mock.patch.object(frame_clock.QGuiApplication, "screens", return_value=screens):diff --git a/win_app/tests/test_hide_pointer_setting.py b/win_app/tests/test_hide_pointer_setting.pynew file mode 100644index 0000000..3bf55e8--- /dev/null+++ b/win_app/tests/test_hide_pointer_setting.py@@ -0,0 +1,118 @@+"""Hide the pointer on the machine not in use: the switch, its saved value, and what the window hides+and shows through the desktop module, with a recording stand-in for the real cursors."""+import json+import os+from pathlib import Path+import tempfile+import unittest+from unittest import mock++try:+ from PySide6.QtWidgets import QApplication+ import kvm_bridge_win+ import theme+ from core.tests import responder_harness as harness+except ImportError: # PySide6 is only in the Windows venv+ kvm_bridge_win = None+++class RecordingDesktop:+ CAN_HIDE_POINTER = True++ def __init__(self):+ self.calls = []++ def hide_pointer(self, reason):+ self.calls.append(("hide", reason))++ def show_pointer(self, reason):+ self.calls.append(("show", reason))++ def restore_pointer(self):+ self.calls.append(("restore",))++ def set_click_through(self, hwnd, through):+ self.calls.append(("click_through", through))++ def cursor_position(self):+ return (10, 10)++[email protected](kvm_bridge_win is None, "needs PySide6")+class HidePointerSettingTests(unittest.TestCase):+ def setUp(self):+ os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")+ self.app = QApplication.instance() or QApplication([])+ theme.init_fonts()+ folder = Path(tempfile.mkdtemp())+ self.config = folder / "settings.json"+ raw = {"host": "192.0.2.20", "port": harness.free_port(), "auth_token": "synthetic", "paired_with": "MacBook Pro",+ "mac_host": "192.0.2.10", "mac_return_edge": "left"}+ (folder / "config.json").write_text(json.dumps(raw))+ self.desktop = RecordingDesktop()+ patch = mock.patch.object(kvm_bridge_win, "desktop_win", self.desktop)+ patch.start()+ self.addCleanup(patch.stop)+ self.window = kvm_bridge_win.WindowsApplication(self.config)+ self.addCleanup(self.window.deleteLater)+ self.addCleanup(self.window.server.stop)+ self.window._idle_pointer._settle = 60++ def test_defaults_on_and_persists(self):+ self.assertTrue(self.window._config.hide_idle_pointer)+ self.assertTrue(self.window.pointer_switch.isChecked())+ self.window.pointer_switch.setChecked(False)+ self.assertFalse(json.loads(self.config.read_text())["hide_idle_pointer"])++ def test_driving_hides_this_pcs_pointer_and_coming_home_shows_it(self):+ self.window._on_sender_redirecting(True)+ self.window._on_sender_redirecting(False)+ driving = [call for call in self.desktop.calls if call[:2] in (("hide", "driving"), ("show", "driving"))]+ self.assertEqual(driving[-2:], [("hide", "driving"), ("show", "driving")])++ def test_on_windows_a_veil_covers_an_apps_own_cursor_while_driving(self):+ with mock.patch.object(kvm_bridge_win.sys, "platform", "win32"):+ self.window._on_sender_redirecting(True)+ self.app.processEvents()+ self.assertTrue(self.window._veil.isVisible())+ self.assertIn(("click_through", False), self.desktop.calls)+ self.window._on_sender_redirecting(False)+ # Click-through at once, before the queued hide has run.+ self.assertEqual(self.desktop.calls[-1], ("click_through", True))+ self.app.processEvents()+ self.assertFalse(self.window._veil.isVisible())++ def test_switched_off_no_veil_is_shown(self):+ self.window.pointer_switch.setChecked(False)+ with mock.patch.object(kvm_bridge_win.sys, "platform", "win32"):+ self.window._on_sender_redirecting(True)+ self.app.processEvents()+ self.assertTrue(self.window._veil is None or not self.window._veil.isVisible())++ def test_a_driver_letting_go_hides_it_until_a_driver_returns(self):+ self.window._on_owner("peer")+ self.window._on_owner("")+ self.assertEqual(self.desktop.calls[-1], ("hide", "idle"))+ self.window._on_owner("peer")+ self.assertEqual(self.desktop.calls[-1], ("show", "idle"))++ def test_switched_off_nothing_is_hidden_and_what_was_hidden_comes_back(self):+ self.window._on_owner("peer")+ self.window._on_owner("")+ self.window.pointer_switch.setChecked(False)+ self.assertIn(("show", "idle"), self.desktop.calls)+ self.desktop.calls.clear()+ self.window._on_sender_redirecting(True)+ self.window._on_owner("peer")+ self.window._on_owner("")+ self.assertNotIn("hide", [call[0] for call in self.desktop.calls])++ def test_same_on_all_machines_leaves_it_alone(self):+ self.assertNotIn("hide_idle_pointer", json.dumps(self.window._same_fields(), default=str))++ def test_an_earlier_runs_hidden_pointer_is_given_back_at_start(self):+ self.assertEqual(self.desktop.calls[0], ("restore",))+++if __name__ == "__main__":+ unittest.main()diff --git a/win_app/tests/test_horizontal_scroll.py b/win_app/tests/test_horizontal_scroll.pynew file mode 100644index 0000000..d0c7e31--- /dev/null+++ b/win_app/tests/test_horizontal_scroll.py@@ -0,0 +1,134 @@+"""Both scroll axes keep the driving machine's direction on every receiver (WIRE.md section 6,+`scroll`). The wire is the Mac's: Core Graphics axis 1 positive moves the view up, axis 2 positive+moves it left, measured on macOS 27 on 13-10-2026 by handing CGEventCreateScrollWheelEvent's events+to an offscreen NSScrollView. Windows' horizontal wheel, X11's buttons 6 and 7 and libei's dx all+run the other way, which is what reversed horizontal scrolling between a Mac and a PC.++Directions here are where the view moves, right and up positive. The Mac's own setting (natural or+not) is already in the deltas its event tap reads, so each case says how the fingers moved, which+setting turned that into a view movement, and checks the receiver moves its view the same way."""++import unittest++from links_rig import B, Rig++import capture_win+import inject_portal+import inject_x11+import input_injector+from core import protocol++FINGERS = {"left": (-1, 0), "right": (1, 0), "up": (0, 1), "down": (0, -1)}+X11_BUTTONS = {4: (0, 1), 5: (0, -1), 6: (-1, 0), 7: (1, 0)}+++def sign(value):+ return (value > 0) - (value < 0)+++def view_for(fingers, natural):+ """Natural scrolling moves the content with the fingers, so the view goes the other way."""+ fx, fy = FINGERS[fingers]+ return (-fx, -fy) if natural else (fx, fy)+++def mac_axes(view, size):+ """The (axis 1, axis 2) a Mac reports for a view movement: the wire's (dy, dx)."""+ vx, vy = view+ return vy * size, -vx * size+++def mac_view(dy, dx):+ return sign(-dx), sign(dy)+++def windows_view(wheel, hwheel):+ return sign(hwheel), sign(wheel)+++def x11_view(buttons):+ moves = [X11_BUTTONS[button] for button in buttons]+ return sign(sum(x for x, _ in moves)), sign(sum(y for _, y in moves))+++def libei_view(x, y):+ return sign(x), sign(-y)+++def wheel_data(notches):+ return (int(notches * capture_win.WHEEL_DELTA) & 0xFFFF) << 16+++CASES = [(fingers, natural) for natural in (True, False) for fingers in FINGERS]+MODES = (("pixel", 40.0), ("line", 1))+++class MacDrivingAPc(unittest.TestCase):+ """A Mac's scroll as each PC injector posts it."""++ def check(self, view_of_plan):+ for fingers, natural in CASES:+ for mode, size in MODES:+ with self.subTest(fingers=fingers, natural=natural, mode=mode):+ expected = view_for(fingers, natural)+ dy, dx = mac_axes(expected, size)+ self.assertEqual(mac_view(dy, dx), expected)+ self.assertEqual(view_of_plan(dy, dx, mode), expected)++ def test_windows_scrolls_the_way_the_mac_would(self):+ self.check(lambda dy, dx, mode: windows_view(*input_injector.plan_scroll_units(dy, dx, mode, [0.0, 0.0])))++ def test_x11_scrolls_the_way_the_mac_would(self):+ def view(dy, dx, mode):+ return x11_view(inject_x11.scroll_buttons(*inject_x11.plan_scroll(dy, dx, mode, [0.0, 0.0])))++ self.check(view)++ def test_wayland_scrolls_the_way_the_mac_would(self):+ def view(dy, dx, mode):+ _kind, x, y = inject_portal.scroll_steps(dy, dx, mode, [0.0, 0.0])+ return libei_view(x, y)++ self.check(view)+++class PcDrivingOthers(unittest.TestCase):+ """A PC's wheel, from its hook through the sender to the wire, as a Mac and another PC post it.+ The PC's own scrolling setting is already in its wheel's deltas, as the Mac's is in its tap's."""++ def setUp(self):+ self.rig = Rig()+ self.rig.sender.set_redirecting(True)+ self.rig.accept_take()++ def sent_scroll(self, view):+ vx, vy = view+ sent = []+ for message, notches in ((capture_win.WM_MOUSEWHEEL, vy), (capture_win.WM_MOUSEHWHEEL, vx)):+ if notches:+ _kind, dy, dx = capture_win.mouse_event(message, wheel_data(notches))+ self.assertTrue(self.rig.sender.on_wheel(dy, dx))+ sent.append(self.rig.sent(B, protocol.MSG_SCROLL)[-1]["data"])+ self.assertEqual(len(sent), 1)+ return sent[0]++ def test_a_mac_scrolls_the_way_the_pc_would(self):+ for fingers, natural in CASES:+ with self.subTest(fingers=fingers, natural=natural):+ expected = view_for(fingers, natural)+ data = self.sent_scroll(expected)+ self.assertEqual(mac_view(data["dy"], data["dx"]), expected)++ def test_another_pc_scrolls_the_way_the_pc_would(self):+ for fingers, natural in CASES:+ with self.subTest(fingers=fingers, natural=natural):+ expected = view_for(fingers, natural)+ data = self.sent_scroll(expected)+ planned = input_injector.plan_scroll_units(data["dy"], data["dx"], data["mode"], [0.0, 0.0])+ self.assertEqual(windows_view(*planned), expected)+ buttons = inject_x11.scroll_buttons(*inject_x11.plan_scroll(data["dy"], data["dx"], data["mode"], [0.0, 0.0]))+ self.assertEqual(x11_view(buttons), expected)+++if __name__ == "__main__":+ unittest.main()diff --git a/win_app/tests/test_idle_refresh.py b/win_app/tests/test_idle_refresh.pyindex 7d4526c..32adc66 100644--- a/win_app/tests/test_idle_refresh.py+++ b/win_app/tests/test_idle_refresh.py@@ -8,6 +8,11 @@ import unittestfrom unittest.mock import patchos.environ.setdefault("QT_QPA_PLATFORM", "offscreen")+import sys+_WIN_APP = Path(__file__).resolve().parents[1]+_REPO_ROOT = Path(__file__).resolve().parents[2]+sys.path[:0] = [str(_WIN_APP), str(_REPO_ROOT)]+from PySide6.QtCore import QEvent, QObjectfrom PySide6.QtWidgets import QApplicationimport app_configimport kvm_bridge_win as kvm@@ -201,3 +206,71 @@ class IdleRefreshTest(unittest.TestCase):self.window._sending_detail = "Connected after minimising"self.window.showNormal()self.assertEqual(self.window.send_hint.text(), "Connected after minimising")++ def test_unrelated_setting_change_settles_without_endless_disk_reads(self):+ saved = app_config.load_settings(self.path)+ saved["volume"] = 75+ app_config.write_settings(self.path, saved)+ # First tick picks up the change+ self.window._refresh_window()+ # Subsequent ticks are settled and idle: must not load settings from disk+ with patch.object(app_config, "load_settings", side_effect=AssertionError("idle read")):+ for _ in range(8):+ self.window._refresh_window()++ def test_idle_window_bounds_timer_fires_and_generates_zero_paints(self):+ window = self.window+ class PaintTimerCounter(QObject):+ def __init__(self):+ super().__init__()+ self.paints = 0+ self.timers = 0+ def eventFilter(self, watched, event):+ target = watched+ while target is not None and target is not window:+ target = target.parent()+ if target is not window:+ return False+ if event.type() == QEvent.Type.Paint:+ self.paints += 1+ elif event.type() == QEvent.Type.Timer:+ self.timers += 1+ return False++ # Let initial show/layout paints settle before installing the filter+ self.app.processEvents()+ counter = PaintTimerCounter()+ self.app.installEventFilter(counter)+ try:+ self.app.processEvents()+ counter.paints = 0+ counter.timers = 0+ self.window.refresh_timer.start()+ start = time.monotonic()+ while time.monotonic() < start + 0.5:+ self.app.processEvents()+ time.sleep(0.01)+ self.window.refresh_timer.stop()+ self.assertEqual(counter.paints, 0, "Idle window must generate zero paint events")+ self.assertLessEqual(counter.timers, 6, "Idle window timers must be bounded")+ finally:+ self.app.removeEventFilter(counter)++ def test_atlas_canvas_skips_update_and_geometry_on_unchanged_tiles(self):+ if not hasattr(self.window, "atlas_canvas"):+ return+ canvas = self.window.atlas_canvas+ canvas.set_tiles(canvas.tiles, canvas.labels, canvas.states, canvas.selected,+ canvas.cycle_mode, canvas.cycle, canvas.capable, canvas.own_id,+ canvas.rename_values)+ canvas.set_left_out(canvas.left_out_ids, canvas.in_use)+ with patch.object(canvas, "update", wraps=canvas.update) as updater, \+ patch.object(canvas, "_geometry", wraps=canvas._geometry) as geometry:+ canvas.set_tiles(canvas.tiles, canvas.labels, canvas.states, canvas.selected,+ canvas.cycle_mode, canvas.cycle, canvas.capable, canvas.own_id,+ canvas.rename_values)+ updater.assert_not_called()+ geometry.assert_not_called()+ canvas.set_left_out(canvas.left_out_ids, canvas.in_use)+ updater.assert_not_called()+ geometry.assert_not_called()diff --git a/win_app/tests/test_inject_portal.py b/win_app/tests/test_inject_portal.pyindex 4f527e6..94e7891 100644--- a/win_app/tests/test_inject_portal.py+++ b/win_app/tests/test_inject_portal.py@@ -16,6 +16,7 @@ import clipboard_portalimport desktop_portalimport inject_portalimport portal+from core.return_edge import Rectfrom inject_x11 import MAP, NO_REPEAT, PRESS, RELEASE, REPEATfrom portal_fakes import FakeBus, FakeDevice, FakeEi, vardict, wait_for@@ -33,7 +34,8 @@ class FakeKeymap:pair = self.KEYS.get(keycode)if pair is None:return 0- return ord(pair[1] if mods & 1 else pair[0])+ upper = bool(mods & 1) != bool(mods & 2 and pair[0].isalpha()) # Caps Lock turns letters only+ return ord(pair[1] if upper else pair[0])def text(self, keysym):return chr(keysym) if keysym else None@@ -54,8 +56,8 @@ class StepsTest(unittest.TestCase):carry = [0.0, 0.0]self.assertEqual(inject_portal.scroll_steps(1, 0, "line", carry), ("discrete", 0, -120))self.assertEqual(inject_portal.scroll_steps(0.004, 0, "line", carry), ("discrete", 0, 0))- self.assertEqual(inject_portal.scroll_steps(0.005, -1, "line", carry), ("discrete", -120, -1))- self.assertEqual(inject_portal.scroll_steps(-3.5, 2, "pixel", carry), ("pixels", 2.0, 3.5))+ self.assertEqual(inject_portal.scroll_steps(0.005, 1, "line", carry), ("discrete", -120, -1))+ self.assertEqual(inject_portal.scroll_steps(-3.5, -2, "pixel", carry), ("pixels", 2.0, 3.5))def test_a_layout_with_no_key_for_a_character_has_no_spare_to_map(self):layout = inject_portal.WaylandLayout(FakeKeymap())@@ -121,6 +123,27 @@ class RemoteTest(unittest.TestCase):self.assertEqual(self.tokens.token, "new")self.assertEqual(desktop_portal.monitors()[0].width, 1920)+ def test_second_session_uses_updated_restore_token(self):+ self.up()+ self.assertEqual(self.tokens.token, "new")+ self.remote.stop()+ bus2 = FakeBus(versions={inject_portal.INTERFACE: 2, inject_portal.CLIPBOARD: 1})+ bus2.answers["CreateSession"] = (0, {"session_handle": SESSION})+ bus2.answers["Start"] = (0, {"devices": 3, "clipboard_enabled": True, "restore_token": "token_run_2"})+ bus2.returns["ConnectToEIS"] = (99,)+ remote2 = inject_portal.Remote(connect=lambda: bus2, ei=lambda fd: self.ei, tokens=self.tokens,+ keymap=lambda text: FakeKeymap())+ try:+ remote2.start()+ wait_for(remote2.ready.is_set, what="second session")+ select_calls = bus2.made("SelectDevices")+ self.assertEqual(len(select_calls), 1)+ options2 = select_calls[0][1]+ self.assertEqual((options2["restore_token"], options2["persist_mode"]), (("s", "new"), ("u", 2)))+ self.assertEqual(self.tokens.token, "token_run_2")+ finally:+ remote2.stop()+def test_clipboard_version_zero_still_requests_clipboard_before_start(self):self.bus.versions[inject_portal.CLIPBOARD] = 0self.up()@@ -142,6 +165,44 @@ class RemoteTest(unittest.TestCase):self.assertEqual([item[2:] for item in self.ei.sends("absolute")], [(100.0, 100.0), (110.0, 95.0), (1919.0, 95.0)])self.assertEqual(desktop_portal.cursor_position(), (1919, 95))+ def test_leftward_arrival_at_the_right_edge_continues_inward(self):+ from core.return_edge import Rect, arrival_position++ self.up()+ point = arrival_position([Rect(0, 0, 1920, 1080)], "right", 0.3)+ desktop_portal.set_cursor_position(*point)+ inject_portal.inject_mouse_move(-40, 0)+ wait_for(lambda: len(self.ei.sends("absolute")) == 2, what="arrival and inward move")+ self.assertEqual([item[2:] for item in self.ei.sends("absolute")],+ [(1919.0, 324.0), (1879.0, 324.0)])+ self.assertEqual(desktop_portal.cursor_position(), (1879, 324))++ def test_a_nominated_display_landing_is_translated_to_libei_region_coordinates(self):+ self.up()+ desktop_portal._screens = [Rect(0, 0, 1920, 1080), Rect(1920, 0, 1280, 720)]+ desktop_portal.set_zones([Rect(0, 0, 1920, 1080), Rect(1920, 0, 1280, 720)])+ desktop_portal.set_regions([Rect(0, 0, 960, 540), Rect(960, 0, 2560, 1440)])+ self.addCleanup(desktop_portal.set_zones, [])+ self.addCleanup(desktop_portal.set_regions, [])+ self.addCleanup(setattr, desktop_portal, "_screens", [])++ self.remote.place(2560, 360)++ self.assertEqual(self.ei.sends("absolute")[-1][2:], (2241.0, 721.0))++ def test_ambiguous_display_mapping_does_not_send_an_absolute_pointer_move(self):+ self.up()+ desktop_portal._screens = [Rect(x, 0, 1920, 1080) for x in (0, 1920, 3840, 5760)]+ desktop_portal.set_zones([Rect(0, 0, 3840, 2160), Rect(3840, 0, 960, 540),+ Rect(4800, 0, 960, 540), Rect(5760, 0, 960, 540)])+ self.addCleanup(desktop_portal.set_zones, [])+ self.addCleanup(setattr, desktop_portal, "_screens", [])+ before = len(self.ei.sends("absolute"))++ self.remote.place(100, 100)++ self.assertEqual(len(self.ei.sends("absolute")), before)+def test_nothing_is_moved_for_real_while_the_capture_holds_the_pointer(self):self.up()desktop_portal.set_captured(True)@@ -165,6 +226,52 @@ class RemoteTest(unittest.TestCase):(29, False), (30, False)])self.assertEqual([item[2:] for item in self.ei.sends("button")], [(0x110, True), (0x110, False)])+ def answer_locks(self, press, release):+ """The desktop's word on the locks after Beamer's Caps Lock, a moment later, as KWin and+ mutter send it: one for the press, with Lock still down, and one for the release."""+ sent = self.ei.key++ def key(device, code, down):+ sent(device, code, down)+ if code == 58:+ mods, delay = (press, 0.03) if down else (release, 0.06)+ threading.Timer(delay, lambda: self.ei.feed(("modifiers", device) + mods)).start()++ self.ei.key = key++ def test_a_letter_right_after_caps_lock_waits_for_the_desktop_to_say_it_is_on(self):+ # KWin 6.7.5, measured 14-10-2026: "A" typed as Shift+a under the new Caps Lock came out "a".+ self.up()+ self.answer_locks(press=(2, 0, 2, 0), release=(0, 0, 2, 0))+ for down in (True, False):+ inject_portal.inject_key("caps_lock", down)+ inject_portal.inject_key("A", True, "a")+ inject_portal.inject_key("A", False, "a")+ wait_for(lambda: len(self.ei.sends("key")) >= 4, what="the letter")+ self.assertEqual([item[2:] for item in self.ei.sends("key")], [(58, True), (58, False), (30, True), (30, False)])++ def test_the_desktops_word_on_the_press_is_not_taken_for_the_release(self):+ self.up()+ self.ei.feed(("modifiers", self.keyboard, 0, 0, 2, 0))+ wait_for(lambda: self.remote.locks == 2, what="Caps Lock on")+ self.answer_locks(press=(2, 0, 2, 0), release=(0, 0, 0, 0))+ for down in (True, False):+ inject_portal.inject_key("caps_lock", down)+ inject_portal.inject_key("a", True, "a")+ inject_portal.inject_key("a", False, "a")+ wait_for(lambda: len(self.ei.sends("key")) >= 4, what="the letter")+ self.assertEqual([item[2:] for item in self.ei.sends("key")], [(58, True), (58, False), (30, True), (30, False)])++ def test_a_desktop_that_never_says_still_gets_the_letter(self):+ self.up()+ began = time.monotonic()+ for down in (True, False):+ inject_portal.inject_key("caps_lock", down)+ inject_portal.inject_key("s", True, "s")+ wait_for(lambda: len(self.ei.sends("key")) >= 3, what="the letter")+ self.assertLess(time.monotonic() - began, 1.0)+ self.assertEqual([item[2:] for item in self.ei.sends("key")], [(58, True), (58, False), (31, True)])+def test_text_is_typed_with_the_peers_modifiers_let_go_around_it(self):self.up()inject_portal.inject_key("ctrl", True)diff --git a/win_app/tests/test_inject_x11.py b/win_app/tests/test_inject_x11.pyindex 2498d5f..d0d5841 100644--- a/win_app/tests/test_inject_x11.py+++ b/win_app/tests/test_inject_x11.py@@ -207,7 +207,7 @@ class TextTest(unittest.TestCase):class ScrollTest(unittest.TestCase):def test_line_clicks(self):carry = [0.0, 0.0]- self.assertEqual(inject_x11.plan_scroll(2, -1, "line", carry), (2, -1))+ self.assertEqual(inject_x11.plan_scroll(2, 1, "line", carry), (2, -1))self.assertEqual(inject_x11.scroll_buttons(2, -1), [4, 4, 6])self.assertEqual(inject_x11.scroll_buttons(-1, 1), [5, 7])diff --git a/win_app/tests/test_input_injector.py b/win_app/tests/test_input_injector.pyindex 03af069..cc7da71 100644--- a/win_app/tests/test_input_injector.py+++ b/win_app/tests/test_input_injector.py@@ -304,7 +304,7 @@ class PlanScrollUnitsLineModeTests(unittest.TestCase):accum = [0.0, 0.0]self.assertEqual(plan_scroll_units(1, 0, "line", accum), (120, 0))self.assertEqual(accum, [0.0, 0.0])- self.assertEqual(plan_scroll_units(-2, 3, "line", accum), (-240, 360))+ self.assertEqual(plan_scroll_units(-2, 3, "line", accum), (-240, -360))self.assertEqual(accum, [0.0, 0.0])def test_line_mode_defaults_to_no_horizontal_movement(self):@@ -340,7 +340,7 @@ class PlanScrollUnitsPixelModeTests(unittest.TestCase):def test_pixel_mode_tracks_horizontal_axis_independently(self):accum = [0.0, 0.0]- whole_y, whole_x = plan_scroll_units(0.0, 0.4, "pixel", accum)+ whole_y, whole_x = plan_scroll_units(0.0, -0.4, "pixel", accum)self.assertEqual((whole_y, whole_x), (0, 1))self.assertAlmostEqual(accum[0], 0.0)self.assertAlmostEqual(accum[1], 0.2, places=6)@@ -368,7 +368,7 @@ class InjectScrollDispatchTests(unittest.TestCase):def test_line_mode_sends_wheel_and_hwheel_with_expected_flags(self):with mock.patch.object(input_injector, "_send_input") as fake_send:- input_injector.inject_scroll(1, -2, "line")+ input_injector.inject_scroll(1, 2, "line")calls = [call.args[0] for call in fake_send.call_args_list]self.assertEqual(len(calls), 2)self.assertEqual(calls[0].union.mi.mouseData, 120)diff --git a/win_app/tests/test_links.py b/win_app/tests/test_links.pyindex 6d8a053..940cdea 100644--- a/win_app/tests/test_links.py+++ b/win_app/tests/test_links.py@@ -451,6 +451,26 @@ class OnwardTests(unittest.TestCase):self.assertEqual(self.rig.desktop.placed, [(0, 540)])self.assertEqual(self.rig.arrivals, [("left", 0, 540)])+ def test_a_takeover_comes_home_and_names_the_new_driver(self):+ message = protocol.switch_v6(self.sender._owner.route, HERE)+ message["data"]["taken_over_by"] = protocol.id_text(C)+ old_models = [model for _, model in self.sender._models]+ for model in old_models:+ model.armed = False+ self.rig.inbound(B, message)+ self.assertFalse(self.sender.redirecting)+ self.assertIsNone(self.sender._pin_point)+ self.assertEqual(self.rig.alerts, ["Other took over Mac"])+ self.assertEqual(self.rig.redirects[-1], False)+ self.assertTrue(self.sender._models)+ self.assertTrue(all(model.armed and model not in old_models for _, model in self.sender._models))++ def test_a_takeover_by_an_unknown_machine_uses_the_fallback_name(self):+ message = protocol.switch_v6(self.sender._owner.route, HERE)+ message["data"]["taken_over_by"] = protocol.id_text(bytes([99]) * 16)+ self.rig.inbound(B, message)+ self.assertEqual(self.rig.alerts, ["Another machine took over Mac"])+def test_the_log_names_the_edge_input_lands_at_both_ways(self):with self.assertLogs(sender.LOGGER, "INFO") as said:self.switch(C, edge="right", offset=0.25)diff --git a/win_app/tests/test_linux_permissions.py b/win_app/tests/test_linux_permissions.pyindex 8a5aae8..92a34d1 100644--- a/win_app/tests/test_linux_permissions.py+++ b/win_app/tests/test_linux_permissions.py@@ -243,8 +243,10 @@ class LinuxPermissionsTest(unittest.TestCase):surface._set_peer_left_out = surface._rename_peer = lambda *_args: Nonesurface._remove_peer = surface._toggle_pairing_sheet = lambda *_args: Nonesurface._show_code = surface._cancel_code = surface._pair_clicked = surface._pick_machine = lambda *_args: None+ surface._pair_phone = surface._start_nearby = surface._choose_nearby = lambda *_args: None+ surface._confirm_nearby = surface._cancel_nearby = lambda *_args: Nonesurface._link_module = surface._input_module = surface._same_module = surface._name_module = lambda *_args: QWidget()- surface._sign_in_module = surface._updates_module = lambda *_args: QWidget()+ surface._sign_in_module = surface._tray_module = surface._updates_module = lambda *_args: QWidget()surface._refresh_peers = lambda: Nonereturn surfacediff --git a/win_app/tests/test_linux_start.py b/win_app/tests/test_linux_start.pyindex 7ddce37..680321a 100644--- a/win_app/tests/test_linux_start.py+++ b/win_app/tests/test_linux_start.py@@ -102,6 +102,20 @@ def child(mode: str, config: Path) -> None:assert not window.wayland_shortcut_note.isHidden()assert window.hold_switch.isHidden() and window.pointer_module.isHidden()assert "full-screen" in window.wayland_crossing_note.text() and not window.wayland_crossing_note.isHidden()+ # The Send button only beeped on Wayland (KDE report, 13-10-2026): it is dimmed and says why.+ window._any_send = lambda: True # a linked machine this PC drives+ window._refresh_window()+ assert not window.redirect_button.isEnabled() and not window.redirect_action.isEnabled()+ assert "pushes through an edge" in window.wayland_send_note.text() and not window.wayland_send_note.isHidden()+ assert window.redirect_note.isHidden()+ # In a Flatpak a tray message never shows: the message goes through the Notification portal.+ import portal++ shown, sent = [], []+ window.tray.showMessage = lambda *args: shown.append(args)+ portal.sandboxed, portal.notify = (lambda: True), (lambda title, body: sent.append((title, body)))+ window._on_alert("Beamer", "Cannot switch — on this desktop input goes to another machine only by pushing")+ assert sent and sent[0][1].startswith("Cannot switch") and not shown, (sent, shown)window._on_pressure("right", 0.7, False)window._on_arrival("edge", "left", 10.0, 10.0)assert window.glow is None and window.effects is None@@ -168,6 +182,9 @@ def x11_child() -> None:assert window._identity()["platform"] == "linux"assert "gestures" not in window._identity()["caps"] and "text" in window._identity()["caps"]assert platform_parts.WAYLAND is False and window.wayland_shortcut_note.isHidden() and not window.hold_switch.isHidden()+ window._any_send = lambda: True+ window._refresh_window()+ assert window.redirect_button.isEnabled() and window.wayland_send_note.isHidden()assert window.hooks._predicate is not None and window.hooks._predicate() is Falsedeadline = time.monotonic() + 5while time.monotonic() < deadline and not window.server.listening:diff --git a/win_app/tests/test_page_column_geometry.py b/win_app/tests/test_page_column_geometry.pyindex 01b4720..60ea0cf 100644--- a/win_app/tests/test_page_column_geometry.py+++ b/win_app/tests/test_page_column_geometry.py@@ -3,6 +3,7 @@import osimport sysimport unittest+from unittest import mockfrom pathlib import Pathfrom types import MethodType, SimpleNamespace@@ -28,6 +29,21 @@ class PageColumnGeometryTests(unittest.TestCase):QCoreApplication.sendPostedEvents(None, QEvent.Type.LayoutRequest)self.app.processEvents()+ def test_fit_does_not_reset_an_unchanged_width(self):+ scroll = QWidget()+ column = QWidget()+ scroll.resize(900, 600)+ target = round(kvm.page_column_width(scroll.width() - 16))+ column.setFixedWidth(target)+ fit = kvm.ColumnFit(scroll, column)+ with mock.patch.object(column, "setFixedWidth", wraps=column.setFixedWidth) as set_width:+ fit.fit()+ set_width.assert_not_called()+ scroll.resize(1000, 600)+ with mock.patch.object(column, "setFixedWidth", wraps=column.setFixedWidth) as set_width:+ fit.fit()+ set_width.assert_called_once_with(round(kvm.page_column_width(scroll.width() - 16)))+def test_centred_column_stays_in_document_after_hidden_page_resize(self):window = QWidget()window.setMinimumSize(640, 600)diff --git a/win_app/tests/test_pages_win.py b/win_app/tests/test_pages_win.pyindex fb90c90..f342faf 100644--- a/win_app/tests/test_pages_win.py+++ b/win_app/tests/test_pages_win.py@@ -17,6 +17,19 @@ except ImportError: # PySide6 is only in the Windows venvwidgets = None+def _contact(row):+ return next((chip for chip in row.edge_chips.chips.values() if chip.kind == "contact" and not chip.isHidden()), None)+++def _picked(row):+ chip = _contact(row)+ return [third for third, segment in chip.segments.items() if segment.isChecked()] if chip else []+++def _corners(row):+ return [corner for corner, button in row.corner_grid.buttons.items() if button.isChecked()]++class PagesWinTest(unittest.TestCase):def test_crossing_machine_picker_omits_peers_not_in_use(self):peers = [@@ -345,6 +358,15 @@ class CrossingPageTest(unittest.TestCase):app_config.set_ways(self.path, self.peer, side=side, methods=list(methods), parts=list(parts), corner="top_left")self.page._pull_peer_fields()+ def test_design_frame_rate_offers_and_saves_all_three_choices(self):+ import frame_clock+ self.addCleanup(frame_clock.set_divisor, 1)+ choice = self.page.frame_rate_choice+ self.assertEqual([(value, button.text()) for value, button in choice._buttons.items()],+ [("display", "Match display"), ("half", "Half"), ("quarter", "Quarter")])+ choice._buttons["quarter"].click()+ self.assertEqual(app_config.load_config(self.path).frame_rate, "quarter")+def test_fixture_releases_window_before_the_next_case(self):from shiboken6 import isValid@@ -388,7 +410,10 @@ class CrossingPageTest(unittest.TestCase):settings["layout"][second] = dict(x=500, y=100, w=160, h=100)app_config.write_settings(self.path, settings)self.page._pull_peer_fields()- self.assertEqual(self.page.crossing_ledger.rows[second].edge_value.text(), "Off")+ row = self.page.crossing_ledger.rows[second]+ self.assertIsNone(_contact(row))+ self.assertEqual(_corners(row), [])+ self.assertFalse(any(button.isEnabled() for button in row.corner_grid.buttons.values()))def test_the_native_titlebar_can_maximise_and_has_no_width_cap(self):from PySide6.QtCore import Qt@@ -418,10 +443,10 @@ class CrossingPageTest(unittest.TestCase):def test_ledger_rows_stay_in_place_while_ways_change(self):self.ways()row = self.page.crossing_ledger.rows[self.peer]- self.assertEqual(row.edge_glyph.picked, [])- self.assertEqual(row.corner_glyph.corner, "")+ self.assertEqual(_picked(row), [])+ self.assertEqual(_corners(row), [])self.ways(["corner"])- self.assertEqual(row.corner_glyph.corner, "top_left")+ self.assertEqual(_corners(row), ["top_left"])self.assertIs(row, self.page.crossing_ledger.rows[self.peer])def test_the_canvas_replaces_the_side_and_thirds_choices(self):@@ -497,7 +522,7 @@ class CrossingPageTest(unittest.TestCase):self.page._choose_machine(self.peer)row = self.page.crossing_ledger.rows[self.peer]self.assertTrue(row.selected)- self.assertEqual(row.corner_glyph.corner, "top_left")+ self.assertEqual(_corners(row), ["top_left"])def test_crossing_refresh_accepts_an_ordinary_edge_without_a_sentence(self):self.ways(["edge"])@@ -528,9 +553,9 @@ class CrossingPageTest(unittest.TestCase):def test_corner_can_be_enabled_when_it_is_currently_off(self):self.ways(["edge"])row = self.page.crossing_ledger.rows[self.peer]- self.assertEqual(row.corner_glyph.corner, "")- row.corner_glyph.buttons["top_left"].click()- self.assertEqual(row.corner_glyph.corner, "top_left")+ self.assertEqual(_corners(row), [])+ row.corner_grid.buttons["top_left"].click()+ self.assertEqual(_corners(row), ["top_left"])self.assertTrue(app_config.load_settings(self.path)["peers"][0]["ways"]["corner"])def test_layout_drop_keeps_the_compiled_side_and_its_stamp(self):@@ -546,24 +571,24 @@ class CrossingPageTest(unittest.TestCase):self.ways([])self.assertEqual(self.page.atlas_canvas.states[self.peer]["state"], "gap")row = self.page.crossing_ledger.rows[self.peer]- self.assertEqual(row.edge_value.text(), "Off")- self.assertEqual(row.edge_glyph.picked, [])+ self.assertFalse(_contact(row).isChecked())+ self.assertEqual(_picked(row), [])self.assertFalse(ways.has_way(app_config.load_settings(self.path), self.peer))def test_ledger_edge_text_toggles_the_canonical_zone(self):self.ways(["edge"])row = self.page.crossing_ledger.rows[self.peer]- self.assertEqual(row.edge_value.text(), "Whole edge")- row.edge_text.click()+ self.assertEqual(_picked(row), list(ways.PARTS))+ _contact(row).click()self.assertFalse(ways.has_way(app_config.load_settings(self.path), self.peer))- row.edge_text.click()+ _contact(row).click()self.assertTrue(ways.has_way(app_config.load_settings(self.path), self.peer))def test_ledger_edge_text_turns_parts_off_and_remembers_them(self):self.ways(["part"], parts=["start"])row = self.page.crossing_ledger.rows[self.peer]- self.assertEqual(row.edge_glyph.picked, ["start"])- row.edge_text.click()+ self.assertEqual(_picked(row), ["start"])+ _contact(row).click()self.assertFalse(ways.has_way(app_config.load_settings(self.path), self.peer))self.assertEqual(app_config.load_settings(self.path)["peers"][0]["ways"]["thirds"], ["start"])@@ -574,9 +599,8 @@ class CrossingPageTest(unittest.TestCase):app_config.write_settings(self.path, settings)self.page._pull_peer_fields()row = self.page.crossing_ledger.rows[self.peer]- self.assertEqual(row.edge_detail.text(), "place it on the map")- self.assertFalse(row.edge_text.isEnabled())- row.edge_text.click()+ self.assertIsNone(_contact(row))+ self.assertFalse(any(button.isEnabled() for button in row.corner_grid.buttons.values()))current = app_config.load_settings(self.path)self.assertEqual(current["layout"][self.peer], settings["layout"][self.peer])self.assertFalse(ways.has_way(current, self.peer))@@ -584,9 +608,10 @@ class CrossingPageTest(unittest.TestCase):def test_ledger_and_map_light_the_picked_thirds(self):self.ways(["part"], parts=["start"])row = self.page.crossing_ledger.rows[self.peer]- self.assertEqual(row.edge_glyph.picked, ["start"])- self.assertTrue(row.edge_glyph.buttons["start"].isChecked())- self.assertFalse(row.edge_glyph.buttons["end"].isChecked())+ self.assertEqual(_picked(row), ["start"])+ segments = _contact(row).segments+ self.assertTrue(segments["start"].isChecked())+ self.assertFalse(segments["end"].isChecked())self.assertEqual(self.page.atlas_canvas.states[self.peer]["thirds"], ["start"])def test_overlapping_drop_persists_an_accepted_free_snap(self):diff --git a/win_app/tests/test_pair_code_caret.py b/win_app/tests/test_pair_code_caret.pyindex 22c2a65..916f37b 100644--- a/win_app/tests/test_pair_code_caret.py+++ b/win_app/tests/test_pair_code_caret.py@@ -193,6 +193,36 @@ class PairCodeCaretTests(unittest.TestCase):finally:code.setFont(original_font)+ def test_pasting_digits_with_separators_keeps_digits_and_places_caret_at_next_digit(self):+ code = self.sheet.code+ for raw, expected_text, expected_caret in (+ ("123-456", "123456", 6),+ ("123–456", "123456", 6),+ ("123 456", "123456", 6),+ ("12-3", "123", 3),+ ("123-456-789", "123456", 6),+ ):+ with self.subTest(raw=raw):+ code.clear()+ self.app.clipboard().setText(raw)+ code.paste()+ self.app.processEvents()+ self.assertEqual(code.text(), expected_text)+ self.assertEqual(code.cursorPosition(), expected_caret)++ def test_typing_space_or_hyphen_mid_code_does_not_move_caret_to_end(self):+ from PySide6.QtTest import QTest+ code = self.sheet.code+ for separator in (" ", "-"):+ with self.subTest(separator=separator):+ code.setText("1234")+ code.setCursorPosition(2)+ self.app.processEvents()+ QTest.keyClicks(code, separator)+ self.app.processEvents()+ self.assertEqual(code.text(), "1234")+ self.assertEqual(code.cursorPosition(), 2)+if __name__ == "__main__":unittest.main()diff --git a/win_app/tests/test_pair_nearby_ui.py b/win_app/tests/test_pair_nearby_ui.pynew file mode 100644index 0000000..3bd0404--- /dev/null+++ b/win_app/tests/test_pair_nearby_ui.py@@ -0,0 +1,218 @@+"""Focused action and state coverage for nearby pairing's Windows Qt surface."""++import os+import sys+import unittest+from pathlib import Path+from types import SimpleNamespace+from unittest import mock++sys.path.append(str(Path(__file__).resolve().parents[2]))+sys.path.append(str(Path(__file__).resolve().parents[1]))++from core import feature_flags++try:+ from PySide6.QtCore import QCoreApplication, QEvent, QSize+ from PySide6.QtGui import QResizeEvent+ from PySide6.QtWidgets import QApplication, QBoxLayout+ import kvm_bridge_win+ import machines_win+ import theme+except ImportError:+ QApplication = None++[email protected](QApplication is None, "needs PySide6")+class NearbyPairingUiTest(unittest.TestCase):+ @classmethod+ def setUpClass(cls):+ os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")+ cls.app = QApplication.instance() or QApplication([])+ theme.init_fonts()++ @mock.patch.object(feature_flags, "PAIRING_QR_VISIBLE", True)+ def test_machine_actions_keep_typed_pairing_and_add_phone_and_nearby(self):+ calls = []+ callbacks = [lambda *_args, action=action: calls.append(action)+ for action in ("send", "allow", "in_use", "left_out", "remove", "typed")]+ module = machines_win.MachinesModule(+ *callbacks,+ on_pair_phone=lambda: calls.append("phone"),+ on_pair_nearby=lambda: calls.append("nearby"),+ )++ self.assertEqual(module.pair_button.text(), "Pair a machine")+ self.assertEqual(module.pair_phone_button.text(), "Pair a phone")+ self.assertEqual(module.pair_nearby_button.text(), "Pair nearby")+ self.assertFalse(module.pair_phone_button.isHidden())+ self.assertEqual(module.pair_actions.itemAt(0).widget(), module.pair_nearby_button)+ self.assertEqual(module.pair_actions.itemAt(1).widget(), module.pair_phone_button)+ self.assertEqual(module.pair_actions.itemAt(2).widget(), module.pair_button)+ self.assertEqual(module.pair_nearby_button.property("vernier"), "primary")+ self.assertNotEqual(module.pair_phone_button.property("vernier"), "primary")+ self.assertNotEqual(module.pair_button.property("vernier"), "primary")+ module.resize(350, 300)+ module.resizeEvent(QResizeEvent(QSize(350, 300), QSize(600, 300)))+ self.assertEqual(module.pair_actions.direction(), QBoxLayout.Direction.TopToBottom)+ module.resize(600, 300)+ module.resizeEvent(QResizeEvent(QSize(600, 300), QSize(350, 300)))+ self.assertEqual(module.pair_actions.direction(), QBoxLayout.Direction.LeftToRight)+ module.pair_button.click()+ module.pair_phone_button.click()+ module.pair_nearby_button.click()++ self.assertEqual(calls, ["typed", "phone", "nearby"])++ def test_phone_pairing_stays_hidden_while_nearby_pairing_remains_available(self):+ calls = []+ callbacks = [lambda *_args: None for _ in range(6)]+ module = machines_win.MachinesModule(+ *callbacks,+ on_pair_phone=lambda: calls.append("phone"),+ on_pair_nearby=lambda: calls.append("nearby"),+ )++ self.assertTrue(module.pair_phone_button.isHidden())+ self.assertFalse(module.pair_nearby_button.isHidden())+ module.pair_nearby_button.click()+ self.assertEqual(calls, ["nearby"])++ def test_nearby_status_copy_candidates_and_manual_confirmation(self):+ calls = []+ sheet = machines_win.PairingSheet(+ lambda: None, lambda: None, lambda *_: None, lambda *_: None,+ lambda peer: calls.append(("choose", peer)),+ lambda sas, attempt: calls.append(("confirm", sas, attempt)),+ lambda: calls.append(("cancel",)),+ )+ self.addCleanup(sheet.deleteLater)+ sheet.set_nearby({"state": "searching", "seconds_left": 60, "peers": [], "peer": None,+ "sas": None, "attempt": "attempt-1"})+ self.assertEqual(sheet.nearby_note.text(), "Press Pair nearby on the other machine within 60 seconds.")+ self.assertEqual(sheet.nearby_count.text(), "Expires in 60 s")+ self.assertTrue(sheet.nearby_confirm.isHidden())++ peer = {"id": "machine-id", "nearby": "window-a", "name": "Studio Mac", "platform": "macos",+ "address": "192.0.2.50"}+ shown = lambda text: f"Private {text.replace('192.0.2.50', '•••')}" if text else ""+ sheet.set_nearby({"state": "choosing", "seconds_left": 50, "peers": [peer], "peer": None,+ "sas": None, "attempt": "attempt-1"}, shown)+ self.assertEqual(sheet.nearby_note.text(), "Choose a machine to pair nearby.")+ self.assertEqual(len(sheet.nearby_group.buttons()), 1)+ self.assertIn("Private Studio Mac", sheet.nearby_group.buttons()[0].text())+ self.assertIn("•••", sheet.nearby_group.buttons()[0].text())+ self.assertNotIn("192.0.2.50", sheet.nearby_group.buttons()[0].text())+ self.assertEqual(sheet.nearby_peer.text(), "")+ sheet.nearby_group.buttons()[0].click()+ self.assertEqual(calls, [("choose", peer)])+ renewed = dict(peer, nearby="window-b")+ sheet.set_nearby({"state": "choosing", "seconds_left": 48, "peers": [renewed], "peer": None,+ "sas": None, "attempt": "attempt-2"}, shown)+ self.assertEqual(sheet.nearby_group.buttons()[0].property("nearby_peer"), renewed)+ sheet.nearby_group.buttons()[0].click()+ self.assertEqual(calls[-1], ("choose", renewed))++ sheet.set_nearby({"state": "confirm", "seconds_left": 35, "peers": [], "peer": peer,+ "sas": "012345", "attempt": "attempt-1"}, shown)+ self.assertEqual(sheet.nearby_note.text(), "Compare all six digits on both machines, then confirm on each.")+ self.assertEqual(sheet.nearby_digits.text(), "012 345")+ self.assertEqual(sheet.nearby_peer.text(), "Private Selected: Studio Mac · Mac")+ self.assertTrue(sheet.nearby_confirm.isEnabled())+ self.assertFalse(sheet.nearby_confirm.isDefault())+ self.assertFalse(sheet.nearby_confirm.autoDefault())+ sheet.nearby_confirm.click()+ self.assertEqual(calls[-1], ("confirm", "012345", "attempt-1"))++ sheet.set_nearby({"state": "waiting", "seconds_left": 17, "peers": [], "peer": peer,+ "sas": "012345", "attempt": "attempt-1"}, shown)+ self.assertEqual(sheet.nearby_note.text(), "Waiting for confirmation on the other machine.")+ self.assertEqual(sheet.nearby_digits.text(), "012 345")+ self.assertFalse(sheet.nearby_digits.isHidden())+ self.assertTrue(sheet.nearby_confirm.isHidden())+ self.assertEqual(sheet.nearby_peer.text(), "Private Selected: Studio Mac · Mac")+ self.assertEqual(sheet.nearby_count.text(), "Expires in 17 s")++ sheet.set_nearby({"state": "exchanging", "seconds_left": 42, "peers": [], "peer": peer,+ "sas": None, "attempt": "attempt-1"}, shown)+ self.assertEqual(sheet.nearby_note.text(), "Connecting to the selected machine…")+ sheet.set_nearby({"state": "paired", "seconds_left": 0, "peers": [], "peer": peer,+ "sas": None, "attempt": "attempt-1"}, shown)+ self.assertEqual(sheet.nearby_note.text(), "Nearby pairing complete.")++ def test_waiting_terminal_copy_and_cancel_action(self):+ sheet = machines_win.PairingSheet(+ lambda: None, lambda: None, lambda *_: None, lambda *_: None,+ on_cancel_nearby=lambda: setattr(self, "cancelled", True),+ )+ self.addCleanup(sheet.deleteLater)+ cases = {+ "waiting": "Waiting for confirmation on the other machine.",+ "expired": "Nearby pairing expired. Press Pair nearby to try again.",+ "refused": "Nearby pairing refused. Use a new window to try again.",+ "not_saved": "The new peer could not be saved.",+ }+ for state, text in cases.items():+ with self.subTest(state=state):+ sheet.set_nearby({"state": state, "seconds_left": 0, "peers": [], "peer": None,+ "sas": None, "attempt": "attempt-1"})+ self.assertEqual(sheet.nearby_note.text(), text)+ sheet.nearby_cancel.click()+ self.assertTrue(self.cancelled)++ def test_nearby_candidates_removal_and_sheet_destruction_clears_deferred_deletes(self):+ sheet = machines_win.PairingSheet(+ lambda: None, lambda: None, lambda *_: None, lambda *_: None,+ lambda *_: None, lambda *_: None, lambda: None,+ )+ peer = {"id": "peer-1", "nearby": "win-1", "name": "Desk Rig", "platform": "windows",+ "address": "192.0.2.20"}+ sheet.set_nearby({"state": "choosing", "seconds_left": 50, "peers": [peer], "peer": None,+ "sas": None, "attempt": "attempt-1"})+ self.assertEqual(len(sheet.nearby_group.buttons()), 1)+ # Transitioning away from choosing removes candidate buttons via deleteLater.+ sheet.set_nearby({"state": "confirm", "seconds_left": 30, "peers": [], "peer": peer,+ "sas": "123456", "attempt": "attempt-1"})+ self.assertEqual(len(sheet.nearby_group.buttons()), 0)+ # Destroy the sheet while candidate buttons have pending deferred deletes.+ # Buttons must have been unparented so sheet's destruction doesn't double-free them+ # when deferred delete events are delivered.+ sheet.setParent(None)+ sheet.deleteLater()+ del sheet+ QCoreApplication.sendPostedEvents(None, QEvent.Type.DeferredDelete)++ def test_new_window_repair_and_window_close_cancel_nearby(self):+ calls = []+ service = SimpleNamespace(cancel_nearby=lambda: calls.append("cancel"), machines=lambda: [])+ address = SimpleNamespace(setText=lambda value: calls.append(("address", value)))+ sheet = SimpleNamespace(address=address, setVisible=lambda value: calls.append(("visible", value)))+ machines = SimpleNamespace(set_pairing_open=lambda value: calls.append(("open", value)))+ app = SimpleNamespace(+ _peer_entries=[{"token": "known", "host": "192.0.2.22"}],+ pairing=service,+ _pairing_open=False,+ _select_page=lambda page: calls.append(("page", page)),+ _hide_addresses=lambda: False,+ sheet=sheet,+ machines=machines,+ _refresh_pairing=lambda: calls.append("refresh"),+ _cancel_nearby=lambda: (service.cancel_nearby(), calls.append("refresh")),+ _closing=False,+ tray=SimpleNamespace(isVisible=lambda: False),+ quit=lambda: (service.cancel_nearby(), calls.append("cancel"), calls.append("quit")),+ )+ kvm_bridge_win.WindowsApplication._re_pair(app, "known")+ self.assertIn("cancel", calls)+ self.assertIn(("address", "192.0.2.22"), calls)++ calls.clear()+ event = SimpleNamespace(accept=lambda: calls.append("accept"), ignore=lambda: calls.append("ignore"))+ kvm_bridge_win.WindowsApplication.closeEvent(app, event)+ self.assertIn("cancel", calls)+ self.assertIn("quit", calls)+ self.assertIn("accept", calls)+++if __name__ == "__main__":+ unittest.main()diff --git a/win_app/tests/test_pairing_window.py b/win_app/tests/test_pairing_window.pyindex 30a315b..452d86c 100644--- a/win_app/tests/test_pairing_window.py+++ b/win_app/tests/test_pairing_window.py@@ -7,16 +7,18 @@ import socketimport sysimport tempfileimport unittest+from unittest import mockfrom pathlib import Pathfrom types import SimpleNamespacesys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))-from core import pairing, peerlist, protocol, ways+from core import feature_flags, pairing, peerlist, protocol, waysfrom core.tests import responder_harness as harnesstry:- from PySide6.QtCore import Qt+ from PySide6.QtCore import QCoreApplication, QEvent, Qtfrom PySide6.QtTest import QTestfrom PySide6.QtWidgets import QApplication@@ -50,8 +52,11 @@ class MachinesWindowTest(unittest.TestCase):def tearDown(self):if self.window is not None:+ self.window.hide()self.window.server.stop()self.window.deleteLater()+ self.app.processEvents()+ QCoreApplication.sendPostedEvents(None, QEvent.Type.DeferredDelete)def open(self, *entries, **top):settings = app_config.load_settings(self.path)@@ -181,6 +186,7 @@ class MachinesWindowTest(unittest.TestCase):again = kvm_bridge_win.WindowsApplication(self.path)self.stub(again)self.assertEqual((again._config.appearance, again._config.pointer_speed), ("dark", 1.5))+ again.server.stop()again.deleteLater()def test_a_switch_writes_that_machines_entry_only(self):@@ -384,7 +390,8 @@ class MachinesWindowTest(unittest.TestCase):saved = self.settings()["peers"][0]self.assertEqual(saved["token"], TOKEN_B)- self.assertEqual(saved["ways"], intent)+ # A 1.5.2 intent is read losslessly: its one corner becomes the corners list.+ self.assertEqual(saved["ways"], {**intent, "edges": [], "corners": ["top_right"]})self.assertFalse(saved["shortcut_cycle"])self.assertEqual(saved["jump_key"], "ctrl+shift+2")@@ -411,10 +418,11 @@ class MachinesWindowTest(unittest.TestCase):new_id = protocol.id_text(b"\x0c" * 16)from display_map_fixture import display_fieldsself.assertEqual(after["zones"], [{"peer": new_id, "kind": "edge", "side": "top",+ "contact_span": [0.0, 1.0], "target_span": [0.0, 1.0],**display_fields(window)}])self.assertEqual(after["peers"][0]["ways"],- {"edge": True, "thirds": list(ways.PARTS), "corner": False,- "corner_at": "top_left", "notch": False})+ {"edge": True, "thirds": list(ways.PARTS), "edges": [], "corner": False,+ "corner_at": "top_left", "corners": [], "notch": False})self.assertEqual((after["peers"][0]["side"], after["peers"][0]["side_set_at"]), ("top", 1_790_000_000))self.assertFalse(after["peers"][0]["shortcut_cycle"])self.assertEqual(after["peers"][0]["jump_key"], "ctrl+shift+2")@@ -431,6 +439,7 @@ class MachinesWindowTest(unittest.TestCase):side = ways._rect_contact(after["layout"][after["machine_id"]], after["layout"][new_id])[0]from display_map_fixture import display_fieldsself.assertEqual(after["zones"], [{"peer": new_id, "kind": "edge", "side": side,+ "contact_span": [0.0, 1.0], "target_span": [0.0, 1.0],**display_fields(window)}])self.assertEqual(after["peers"][0]["side"], side)self.assertNotEqual(side, "top")@@ -443,6 +452,9 @@ class MachinesWindowTest(unittest.TestCase):@unittest.skipIf(kvm_bridge_win is None, "needs PySide6")class PairingSheetWindowTest(unittest.TestCase):def setUp(self):+ self.phone_pairing_flag = mock.patch.object(feature_flags, "PAIRING_QR_VISIBLE", True)+ self.phone_pairing_flag.start()+ self.addCleanup(self.phone_pairing_flag.stop)os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")self.app = QApplication.instance() or QApplication([])theme.init_fonts()@@ -460,9 +472,12 @@ class PairingSheetWindowTest(unittest.TestCase):self.window._toggle_pairing_sheet()def tearDown(self):- self.service.cancel_pairing()+ self.service.stop()+ self.window.hide()self.window.server.stop()self.window.deleteLater()+ self.app.processEvents()+ QCoreApplication.sendPostedEvents(None, QEvent.Type.DeferredDelete)def show_code(self):self.window._show_code()@@ -474,6 +489,26 @@ class PairingSheetWindowTest(unittest.TestCase):self.assertTrue(self.window.sheet.code_showing)self.assertTrue(self.window.sheet.count_label.text().startswith("Expires in "))+ def test_pair_phone_button_opens_the_sheet_and_generates_a_qr_in_one_click(self):+ self.window._toggle_pairing_sheet()+ self.window._pairing_address = lambda: "192.0.2.20"+ self.window.machines.pair_phone_button.click()++ self.assertTrue(self.window._pairing_open)+ self.assertTrue(self.window.sheet.code_showing)+ self.assertIsNotNone(self.service.code)+ self.assertFalse(self.window.sheet.qr.isHidden())+ self.assertIn("192.0.2.20", self.window.sheet.address_note.text())++ def test_hiding_the_window_cancels_an_active_nearby_window(self):+ from PySide6.QtGui import QHideEvent++ self.service.begin_nearby()+ self.assertEqual(self.service.nearby_status["state"], "searching")+ self.window.hideEvent(QHideEvent())+ self.assertEqual(self.service.nearby_status["state"], "inactive")++ @mock.patch.object(feature_flags, "PAIRING_QR_VISIBLE", False)def test_pairing_dialog_hides_the_qr_and_caption(self):from PySide6.QtGui import QImagediff --git a/win_app/tests/test_part_edge_corners_qt.py b/win_app/tests/test_part_edge_corners_qt.pyindex 0322879..108bd06 100644--- a/win_app/tests/test_part_edge_corners_qt.py+++ b/win_app/tests/test_part_edge_corners_qt.py@@ -102,7 +102,7 @@ class PartEdgeCornersTests(unittest.TestCase):self.assertFalse(ways.has_way(app_config.load_settings(self.path), peer))self.assertEqual(picked_row(window), [])self.assertTrue(window.atlas_canvas.states[peer]["edge_off"])- window.crossing_ledger.rows[peer].edge_text.click()+ next(chip for chip in window.crossing_ledger.rows[peer].edge_chips.chips.values() if chip.kind == "contact").click()self.assertEqual(picked_row(window), list(ways.PARTS))self.assertTrue(window.atlas_canvas.states[peer]["crosses"])@@ -119,7 +119,7 @@ class PartEdgeCornersTests(unittest.TestCase):window._layout_dropped(layout, peer)parity.settle(window)row = window.crossing_ledger.rows[peer]- self.assertEqual(row.edge_glyph.side, side)+ self.assertEqual([chip.side for chip in row.edge_chips.chips.values() if chip.kind == "contact"], [side])for third in ways.PARTS:QTest.mouseClick(window.atlas_canvas, Qt.MouseButton.LeftButton, pos=band_point(window.atlas_canvas, third, side))self.assertNotIn(third, picked_row(window))@@ -175,17 +175,17 @@ class PartEdgeCornersTests(unittest.TestCase):self.window._canvas_left_out(peer, True)paint(self.window.atlas_canvas)self.assertFalse(self.window.atlas_canvas.corner_marks)- self.assertEqual(self.window.crossing_ledger.rows[peer].corner_value.text(), "Top right")+ self.assertEqual([corner for corner, button in self.window.crossing_ledger.rows[peer].corner_grid.buttons.items()+ if button.isChecked()], ["top_right"])- def test_edge_detail_waits_for_contact_but_corner_stays_live(self):+ def test_contact_chip_and_corner_buttons_wait_for_a_side_contact(self):window, peer = self.window, self.peers[0]["id"]layout = copy.deepcopy(window.atlas_canvas.tiles)layout[peer].update(x=600, y=300)window._layout_dropped(layout, peer)row = window.crossing_ledger.rows[peer]- self.assertEqual(row.edge_detail.text(), "place it on the map")- self.assertFalse(row.edge_text.isEnabled())- self.assertTrue(row.corner_glyph.buttons["top_right"].isEnabled())+ self.assertFalse(any(chip.kind == "contact" for chip in row.edge_chips.chips.values()))+ self.assertFalse(row.corner_grid.buttons["top_right"].isEnabled())if __name__ == "__main__":diff --git a/win_app/tests/test_pc_three_machines.py b/win_app/tests/test_pc_three_machines.pyindex 2613dce..6935e68 100644--- a/win_app/tests/test_pc_three_machines.py+++ b/win_app/tests/test_pc_three_machines.py@@ -17,7 +17,7 @@ from tests.links_rig import B, C, HERE, Rig, edge_zoneimport app_configimport pages_winimport sender as sender_module-from core import protocol+from core import crossing_state, protocolfrom core import waysfrom core.tests import responder_harness as harness@@ -499,6 +499,19 @@ class CrossingPageTests(WindowTests):self.assertTrue(window.crossing_ledger.rows[CT].selected)self.assertFalse(hasattr(window, "blocked_note"))+ def test_removing_a_machine_that_shared_a_side_leaves_the_zones_as_a_fresh_compile(self):+ # rc16 bug hunt #6 suspected the PC kept stale zones until the next link-up, as it skips the+ # Mac's compile on save; the narrowed thirds are the remaining machine's own saved choice, so+ # a compile changes nothing. This holds that.+ self.sharing_side()+ self.assertTrue(self.drop(CT, 160, 80, 160, 20, {BT: dict(x=160, y=0, w=160, h=80)}))+ self.assertIn((BT, "part"), {(z["peer"], z["kind"]) for z in self.saved()["zones"]})+ self.window._remove_peer(harness.TOKENS[C])+ saved = self.saved()+ compiled = crossing_state.migrate(saved, "pc", capable=self.window._layout_capable())["settings"]+ self.assertEqual(saved["zones"], compiled["zones"])+ self.assertNotIn(CT, {zone["peer"] for zone in saved["zones"]})+def test_dropping_tiles_on_separate_thirds_saves_and_tells_the_new_way_back(self):window = self.sharing_side()self.assertTrue(self.drop(CT, 160, 67, 160, 33, {BT: dict(x=160, y=0, w=160, h=33)}))@@ -558,12 +571,12 @@ class CrossingPageTests(WindowTests):return [(peer, message["data"]) for peer, message in self.sent if message["type"] == protocol.MSG_ARRANGEMENT]def test_ledger_way_changes_tell_the_peer_its_current_return_way(self):- self.window.crossing_ledger.rows[BT].edge_text.click()+ next(chip for chip in self.window.crossing_ledger.rows[BT].edge_chips.chips.values() if chip.kind == "contact").click()peer, data = self.arrangements()[-1]self.assertEqual(peer, B)self.assertFalse(data["way_back"])self.assertEqual(data["edge"], self.peer(BT)["side"])- self.window.crossing_ledger.rows[BT].corner_glyph.buttons["top_left"].click()+ self.window.crossing_ledger.rows[BT].corner_grid.buttons["top_left"].click()self.assertTrue(self.arrangements()[-1][1]["way_back"])def test_moving_one_machine_tells_every_machine_whose_way_back_it_changed(self):@@ -617,7 +630,7 @@ class CrossingPageTests(WindowTests):window = self.windowself.assertTrue(self.drop(CT, 160, 0))before = dict(self.peer(BT)["ways"])- window.crossing_ledger.rows[CT].corner_glyph.buttons["bottom_right"].click()+ window.crossing_ledger.rows[CT].corner_grid.buttons["bottom_right"].click()corners = [z for z in self.saved()["zones"] if z["peer"] == CT and z["kind"] == "corner"]self.assertEqual(corners[0]["corner"], "bottom_right")self.assertEqual(self.peer(BT)["ways"], before)@@ -716,6 +729,14 @@ class OneMachineTests(WindowTests):class TrayTests(WindowTests):+ def setUp(self):+ # The tray of a desktop that can send input from a menu; on Wayland only an edge can+ # (test_linux_start), and a Linux test run over SSH reads as Wayland.+ patcher = mock.patch("platform_parts.WAYLAND", False)+ patcher.start()+ self.addCleanup(patcher.stop)+ super().setUp()+def test_tray_groups_status_version_connection_directions_and_settings(self):window = self.windowactions = window.tray_menu.actions()@@ -740,6 +761,17 @@ class TrayTests(WindowTests):self.assertEqual(went, [C])self.assertFalse(window.redirect_action.isVisible())+ def test_a_machine_whose_link_is_down_is_dimmed_as_unavailable(self):+ window = self.window+ self.linked = {BT}+ window._refresh_tray_machines()+ bee, sea = window.machine_actions[BT], window.machine_actions[CT]+ self.assertEqual((bee.text(), bee.isEnabled()), ("Send input to Bee", True))+ self.assertEqual((sea.text(), sea.isEnabled()), ("Sea is unavailable", False))+ self.linked = {BT, CT}+ window._refresh_tray_machines()+ self.assertEqual((sea.text(), sea.isEnabled()), ("Send input to Sea", True))+def test_active_target_row_returns_input_and_owner_changes_update_existing_rows(self):window = self.windowreturned = []diff --git a/win_app/tests/test_phone_ui.py b/win_app/tests/test_phone_ui.pyindex 87684fc..63bf283 100644--- a/win_app/tests/test_phone_ui.py+++ b/win_app/tests/test_phone_ui.py@@ -30,6 +30,7 @@ def entries():def application(*methods, **extra):namespace = dict(Optional=Optional, Config=SimpleNamespace, peerlist=peerlist,protocol=protocol, settings_sync=settings_sync, pages_win=pages_win,+ platform_parts=SimpleNamespace(WAYLAND=False),Qt=SimpleNamespace(ItemDataRole=SimpleNamespace(UserRole=1)), **extra)namespace["TRIGGER_KEYS"] = ()return load_methods("win_app/kvm_bridge_win.py", "WindowsApplication", methods, namespace)()@@ -125,6 +126,7 @@ class PhoneUiTests(unittest.TestCase):def test_match_choices_ignore_phone(self):class Model:def __init__(self, parent): self.items = []+ def clear(self): self.items.clear()def appendRow(self, item): self.items.append(item)class Item(Control):@@ -136,6 +138,8 @@ class PhoneUiTests(unittest.TestCase):app._design_states = {PHONE: {}, DESKTOP: {}}app._design_peer_caps = lambda: {PHONE: {"design_sync"}, DESKTOP: {"design_sync"}}app._shown = lambda text: text+ app._hide_addresses = lambda: False+ app._design_follow_signature = object()choice = app.design_follow_choice = Control()choice.setModel = lambda model: setattr(choice, "model", model)choice.findData = lambda value, role: 0@@ -184,6 +188,7 @@ class PhoneUiTests(unittest.TestCase):app.pause_action = object()app.redirect_action = Control()app.sender = SimpleNamespace(owner=None, redirecting=False)+ app._live = lambda peer: Trueapp._refresh_tray_machines()self.assertEqual(set(app.machine_actions), {DESKTOP, other["id"]})self.assertTrue(all("phone" not in action.text() for action in app.machine_actions.values()))diff --git a/win_app/tests/test_portal.py b/win_app/tests/test_portal.pyindex 3dfd968..db1e84d 100644--- a/win_app/tests/test_portal.py+++ b/win_app/tests/test_portal.py@@ -1,6 +1,7 @@"""The portal client over a fake bus: a request waits for its own Response however the signalsinterleave, a refusal and a failure are told apart, other signals are kept, a stop ends a wait-for the user, and a restore token is kept for this user only."""+for the user, a restore token is kept for this user only, and a message goes out through the+Notification portal."""import osimport stat@@ -76,6 +77,26 @@ class RequestTest(unittest.TestCase):self.assertEqual(client.version("org.freedesktop.portal.RemoteDesktop"), 0)+class NotifyTest(unittest.TestCase):+ def test_a_message_goes_to_the_notification_portal_in_place_of_the_last_and_the_bus_is_closed(self):+ bus = FakeBus()+ portal.notify("Beamer", "Cannot switch", connect=lambda: bus).join(2)+ self.assertEqual(bus.calls, [(portal.NOTIFICATION, "AddNotification",+ ("alert", {"title": ("s", "Beamer"), "body": ("s", "Cannot switch")}))])+ self.assertTrue(bus.closed)++ def test_a_portal_that_fails_or_a_bus_out_of_reach_costs_only_the_message(self):+ bus = FakeBus()+ bus.failures["AddNotification"] = portal.PortalError("No such interface")+ portal.notify("Beamer", "x", connect=lambda: bus).join(2)+ self.assertTrue(bus.closed)++ def unreachable():+ raise portal.PortalError("Could not reach the session bus")++ portal.notify("Beamer", "x", connect=unreachable).join(2)++class TokenStoreTest(unittest.TestCase):def test_a_token_is_kept_for_this_user_only_and_an_empty_one_forgets_it(self):with tempfile.TemporaryDirectory() as directory:diff --git a/win_app/tests/test_qt_polish.py b/win_app/tests/test_qt_polish.pyindex d3d2779..327a744 100644--- a/win_app/tests/test_qt_polish.py+++ b/win_app/tests/test_qt_polish.py@@ -114,8 +114,8 @@ class QtPolishTests(unittest.TestCase):self.page_scroll("crossing")self.assertFalse(self.window.crossing_ledger.isHidden())for row in self.window.crossing_ledger.rows.values():- self.assertEqual(len(row.edge_glyph.buttons), 3)- self.assertEqual(len(row.corner_glyph.buttons), 4)+ self.assertEqual(len(row.edge_chips.chips), 4)+ self.assertEqual(len(row.corner_grid.buttons), 4)self.assertFalse(hasattr(self.window, "way_boxes"))def test_08_every_legend_way_has_a_description(self):@@ -126,7 +126,7 @@ class QtPolishTests(unittest.TestCase):self.assertFalse(hasattr(self.window, "selected_machine_header"))for row in self.window.crossing_ledger.rows.values():self.assertTrue(row.status.wordWrap())- self.assertTrue(row.edge_detail.wordWrap())+ self.assertTrue(row.edge_note.wordWrap())strip = self.window.resistance_stripstrip.resize(400, 72)strip.set_other_name("Other machine")diff --git a/win_app/tests/test_return_edge.py b/win_app/tests/test_return_edge.pyindex 5e973fb..0b36b28 100644--- a/win_app/tests/test_return_edge.py+++ b/win_app/tests/test_return_edge.py@@ -4,7 +4,8 @@ import syssys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))-from core.return_edge import CROSS, HOLD, PASS, Rect, ReturnEdge, arrival_position, edge_offset, union+from core.return_edge import (CROSS, HOLD, PASS, Rect, ReturnEdge, _normalised_span,+ arrival_position, edge_offset, landing_monitor, union)class FakeClock:@@ -37,6 +38,27 @@ class GeometryTests(unittest.TestCase):self.assertAlmostEqual(edge_offset(BOUNDS, "top", (-1920 + 1120, 0)), 0.25)self.assertEqual(edge_offset(BOUNDS, "right", (2559, 99999)), 1.0)+ def test_last_display_pixel_round_trips_at_the_end_of_its_edge(self):+ display = Rect(0, 0, 8, 8)+ offset = edge_offset(display, "bottom", (7, 7))++ self.assertEqual(offset, 0.875)+ self.assertEqual(arrival_position([display], "top", offset,+ display="peer", side="bottom",+ display_map={"peer": display}), (7, 7))++ def test_landing_monitor_treats_bottom_pixel_as_inside_its_inclusive_span(self):+ top = Rect(0, 0, 100, 100)+ lower_left = Rect(-100, 100, 100, 100)++ self.assertEqual(landing_monitor([lower_left, top], "left", 99), top)++ def test_normalised_span_clamps_floating_point_noise_at_one(self):+ span = _normalised_span((0.25, 1.0000000000000002))++ self.assertEqual(span, (0.25, 1.0))+ self.assertIsNone(_normalised_span((0.0, 1.01)))+def test_arrival_lands_on_the_monitor_owning_each_edge(self):# The offset is taken against the whole box, and lands on the outermost monitor spanning# that point: the left monitor for most of the left edge, the primary above it, where thediff --git a/win_app/tests/test_same_on_both.py b/win_app/tests/test_same_on_both.pyindex ea9f746..f099e8f 100644--- a/win_app/tests/test_same_on_both.py+++ b/win_app/tests/test_same_on_both.py@@ -5,6 +5,7 @@ starts no receiver, hooks or announcer; the two links' sends are recorded insteaimport jsonimport osimport tempfile+import timeimport unittestfrom pathlib import Pathfrom unittest import mock@@ -70,6 +71,124 @@ class SameOnBothTest(unittest.TestCase):self.assertEqual(set(self.window.same_checks), {"crossing", "design", "shortcut", "names", "everything"})self.assertEqual(self.window.scope_labels["design"].text(), pages_win.SCOPE["design"])+ def test_unchanged_refresh_does_not_reload_settings_for_same_on_all(self):+ self.window._show_same()+ with mock.patch.object(app_config, "load_settings", wraps=app_config.load_settings) as load:+ self.window._show_same()+ self.window._show_same()+ load.assert_not_called()++ def test_same_on_all_reloads_a_changed_settings_file(self):+ self.window._show_same()+ settings = app_config.load_settings(self.path)+ settings["same_before_sync"] = {"saved_at": int(time.time()), "groups": [],+ "values": {"shortcut": False}, "names": {}}+ app_config.write_settings(self.path, settings)++ with mock.patch.object(app_config, "load_settings", wraps=app_config.load_settings) as load:+ self.window._show_same()++ load.assert_called_once_with(self.path)+ self.assertFalse(self.window.same_revert.isHidden())++ def test_same_on_all_rechecks_a_write_that_lands_during_the_read(self):+ original_load = app_config.load_settings+ saved = {"saved_at": int(time.time()), "groups": [], "values": {"shortcut": False}, "names": {}}+ calls = 0++ def load_then_write(path):+ nonlocal calls+ settings = original_load(path)+ if calls == 0:+ changed = original_load(path)+ changed["same_before_sync"] = saved+ app_config.write_settings(path, changed)+ calls += 1+ return settings++ self.window._same_settings_signature = object()+ with mock.patch.object(app_config, "load_settings", side_effect=load_then_write):+ self.window._show_same()+ self.window._show_same()++ self.assertEqual(calls, 2)+ self.assertFalse(self.window.same_revert.isHidden())++ def test_display_reconciliation_skips_unchanged_inputs_and_runs_for_changes(self):+ self.window._refresh_own_displays = lambda: None+ self.window._own_display_map = {"screen": {"x": 0, "y": 0, "width": 1920, "height": 1080}}+ self.window._carry_crossing = mock.Mock()+ with mock.patch.object(kvm_bridge_win.crossing_state, "displays_changed",+ wraps=kvm_bridge_win.crossing_state.displays_changed) as reconcile:+ self.window._displays_changed()+ self.window._displays_changed()+ self.assertEqual(reconcile.call_count, 1)+ self.window._own_display_map = {"screen": {"x": 0, "y": 0, "width": 1600, "height": 900}}+ self.window._displays_changed()+ self.assertEqual(reconcile.call_count, 2)+ settings = app_config.load_settings(self.path)+ settings["name"] = "Changed from another process"+ app_config.write_settings(self.path, settings)+ self.window._displays_changed()+ self.assertEqual(reconcile.call_count, 3)++ def test_display_reconciliation_rechecks_a_write_that_lands_during_the_read(self):+ self.window._refresh_own_displays = lambda: None+ self.window._own_display_map = {"screen": {"x": 0, "y": 0, "width": 1920, "height": 1080}}+ self.window._carry_crossing = mock.Mock()+ original = kvm_bridge_win.crossing_state.displays_changed+ calls = 0++ def reconcile_then_write(*args, **kwargs):+ nonlocal calls+ outcome = original(*args, **kwargs)+ if calls == 0:+ settings = app_config.load_settings(self.path)+ settings["name"] = "Changed during reconciliation"+ app_config.write_settings(self.path, settings)+ calls += 1+ return outcome++ with mock.patch.object(kvm_bridge_win.crossing_state, "displays_changed",+ side_effect=reconcile_then_write):+ self.window._displays_changed()+ self.window._displays_changed()++ self.assertEqual(calls, 2)++ def test_display_reconciliation_retries_after_a_settings_read_recovers(self):+ self.window._refresh_own_displays = lambda: None+ self.window._own_display_map = {"screen": {"x": 0, "y": 0, "width": 1920, "height": 1080}}+ self.window._carry_crossing = mock.Mock()+ self.window._window_settings_version = None+ self.window._displays_signature = None+ original_load = app_config.load_settings++ with mock.patch.object(app_config, "load_settings",+ side_effect=[OSError("temporary read failure"), original_load(self.path)]), \+ mock.patch.object(kvm_bridge_win.crossing_state, "displays_changed",+ wraps=kvm_bridge_win.crossing_state.displays_changed) as reconcile:+ self.window._displays_changed()+ self.assertTrue(self.window._window_settings_stale)+ self.window._displays_changed()++ self.assertFalse(self.window._window_settings_stale)+ self.assertEqual(reconcile.call_count, 1)++ def test_display_reconciliation_tracks_legacy_settings_changes(self):+ self.window._refresh_own_displays = lambda: None+ self.window._own_display_map = {"screen": {"x": 0, "y": 0, "width": 1920, "height": 1080}}+ self.window._carry_crossing = mock.Mock()+ legacy_path = app_config.legacy_config_path(self.path)++ with mock.patch.object(kvm_bridge_win.crossing_state, "displays_changed",+ wraps=kvm_bridge_win.crossing_state.displays_changed) as reconcile:+ self.window._displays_changed()+ legacy_path.write_text(legacy_path.read_text() + "\n")+ self.window._displays_changed()++ self.assertEqual(reconcile.call_count, 2)+def test_everything_can_be_turned_off(self):self.window._set_same_groups(settings_sync.ALL_GROUPS)self.window.same_checks["everything"].setChecked(False)@@ -430,6 +549,103 @@ class SameOnBothTest(unittest.TestCase):self.assertFalse(self.window.design_follow_choice.model().item(1).isEnabled())self.assertIn("Needs beta.6 or later", self.window.design_follow_choice.itemText(1))+ def test_design_follow_keeps_its_model_until_inputs_change(self):+ self.window._design_peer_caps = lambda: {}+ self.window._refresh_design_follow()+ model = self.window.design_follow_choice.model()++ self.window._refresh_design_follow()++ self.assertIs(self.window.design_follow_choice.model(), model)++ def test_design_follow_refreshes_rows_when_peer_capabilities_change(self):+ peer = harness.entry(harness.B, "MacBook Pro")+ self.window._peer_entries = [peer]+ caps = {}+ self.window._design_peer_caps = lambda: caps+ self.window._refresh_design_follow()+ model = self.window.design_follow_choice.model()+ self.assertEqual(model.rowCount(), 1)++ caps[peer["id"]] = {"settings"}+ self.window._refresh_design_follow()++ self.assertIs(self.window.design_follow_choice.model(), model)+ self.assertEqual(model.rowCount(), 2)++ def test_design_follow_updates_lock_when_same_on_design_changes(self):+ peer = harness.entry(harness.B, "MacBook Pro")+ self.window._peer_entries = [peer]+ self.window._design_peer_caps = lambda: {peer["id"]: {"settings", "layout", "design_sync"}}+ self.window._config.design_follow_peer = peer["id"]+ self.window._config.same_on_both = False+ self.window._config.same_groups = []+ self.window._design_states[peer["id"]] = {"set_at": 1, "by": peer["id"], "values": {}}+ self.window._refresh_design_follow()+ self.assertFalse(self.window.follow_banner.isHidden())++ self.window._config.same_on_both = True+ self.window._config.same_groups = ["design"]+ self.window._refresh_design_follow()++ self.assertTrue(self.window.follow_banner.isHidden())++ def test_design_follow_label_refreshes_when_hide_addresses_changes(self):+ peer = harness.entry(harness.B, "192.168.1.10")+ self.window._peer_entries = [peer]+ self.window._design_peer_caps = lambda: {peer["id"]: {"settings", "layout", "design_sync"}}+ self.window._config.design_follow_peer = peer["id"]+ self.window._design_states[peer["id"]] = {"set_at": 1, "by": peer["id"], "values": {}}+ self.window._config.hide_addresses = False+ self.window._refresh_design_follow()+ model = self.window.design_follow_choice.model()+ self.assertEqual(model.item(1).text(), "192.168.1.10")++ self.window._config.hide_addresses = True+ self.window._refresh_design_follow()++ self.assertEqual(model.item(1).text(), pages_win.HIDDEN)++ def test_peer_refresh_reads_peers_and_zones_from_one_snapshot(self):+ peer = harness.entry(harness.B, "MacBook Pro")+ zone = {"peer": peer["id"], "side": "left"}+ snapshot = mock.Mock(return_value=([peer], [zone]))+ self.window.book.snapshot = snapshot+ peers = mock.Mock(side_effect=AssertionError("peers() must not read a second snapshot"))+ zones = mock.Mock(side_effect=AssertionError("zones() must not read a second snapshot"))+ self.window.book.peers = peers+ self.window.book.zones = zones++ self.window._refresh_peers()++ snapshot.assert_called_once_with()+ peers.assert_not_called()+ zones.assert_not_called()+ self.assertEqual(self.window._peer_entries, [peer])+ self.assertEqual(self.window._zone_entries, [zone])+ snapshot.return_value = ([], [])+ self.window._refresh_peers()+ self.assertEqual(snapshot.call_count, 2)+ self.assertEqual(self.window._peer_entries, [])++ def test_unchanged_refreshes_have_bounded_retained_python_memory(self):+ import gc+ import tracemalloc++ self.window._show_same()+ gc.collect()+ tracemalloc.start()+ before = tracemalloc.take_snapshot()+ for _ in range(400):+ self.window._refresh_window()+ gc.collect()+ after = tracemalloc.take_snapshot()+ tracemalloc.stop()+ retained = sum(stat.size_diff for stat in after.compare_to(before, "filename")+ if "/win_app/" in str(stat.traceback))++ self.assertLess(retained, 64 * 1024, f"retained Qt refresh allocations: {retained} bytes")+def test_the_macs_settings_arrive_on_this_pcs_fields_and_controls(self):self.window._on_settings(protocol.id_text(harness.B), mac_message(True, 100))config = self.window._configdiff --git a/win_app/tests/test_settings_layout_acceptance.py b/win_app/tests/test_settings_layout_acceptance.pyindex 356b66b..c26d7e1 100644--- a/win_app/tests/test_settings_layout_acceptance.py+++ b/win_app/tests/test_settings_layout_acceptance.py@@ -94,6 +94,9 @@ class NullTray:def show(self):pass+ def setVisible(self, _shown):+ pass+def showMessage(self, *_args):passdiff --git a/win_app/tests/test_sidebar_lifecycle.py b/win_app/tests/test_sidebar_lifecycle.pyindex 8862095..4791316 100644--- a/win_app/tests/test_sidebar_lifecycle.py+++ b/win_app/tests/test_sidebar_lifecycle.py@@ -105,6 +105,39 @@ class SidebarLifecycleTests(unittest.TestCase):window.deleteLater()QCoreApplication.sendPostedEvents(None, QEvent.Type.DeferredDelete)+ def test_unchanged_pointer_selection_does_not_walk_every_design_tile(self):+ window, sidebar = window_with_sidebar()+ sidebar._last_keyboard_mode = sidebar.keyboard_mode+ try:+ with patch.object(window, "findChildren", side_effect=AssertionError("tile scan on unchanged mode")):+ sidebar.select("overview")+ finally:+ window.deleteLater()+ QCoreApplication.sendPostedEvents(None, QEvent.Type.DeferredDelete)++ def test_keyboard_mode_change_refreshes_design_tile_focus_rings(self):+ window, sidebar = window_with_sidebar()+ sidebar._last_keyboard_mode = not sidebar.keyboard_mode+ try:+ with patch.object(window, "findChildren", wraps=window.findChildren) as find_children:+ sidebar._update_rings()+ find_children.assert_called_once_with(widgets._Tile)+ finally:+ window.deleteLater()+ QCoreApplication.sendPostedEvents(None, QEvent.Type.DeferredDelete)++ def test_pointer_selection_does_not_select_the_sidebar_twice(self):+ window, sidebar = window_with_sidebar()+ sidebar._on_select = lambda key: sidebar.select(key)+ original_select = sidebar.select+ try:+ with patch.object(sidebar, "select", wraps=original_select) as select:+ sidebar._pointer_select("crossing")+ self.assertEqual(select.call_count, 1)+ finally:+ window.deleteLater()+ QCoreApplication.sendPostedEvents(None, QEvent.Type.DeferredDelete)+def test_irrelevant_events_never_inspect_the_watched_window(self):class Watched:def window(self):diff --git a/win_app/tests/test_style_tiles.py b/win_app/tests/test_style_tiles.pyindex 6b1448b..9b64fcd 100644--- a/win_app/tests/test_style_tiles.py+++ b/win_app/tests/test_style_tiles.py@@ -133,7 +133,8 @@ class StyleTileTests(unittest.TestCase):with self.subTest(family=family, style=style, dark=dark, scale=scale):self.assertGreaterEqual(contrast, 3.0)# The baseline removes screen outlines and the pointer before coverage is measured.- self.assertGreaterEqual(coverage, .01)+ # Flint is a few short sparks drawn at their real size, as on the Mac.+ self.assertGreaterEqual(coverage, .004 if (family, style) == ("crossing", "flint") else .01)finally:theme.set_dark(previous)diff --git a/win_app/tests/test_tray_icon.py b/win_app/tests/test_tray_icon.pyindex d1d7bb6..f85efd7 100644--- a/win_app/tests/test_tray_icon.py+++ b/win_app/tests/test_tray_icon.py@@ -1,37 +1,228 @@+"""The tray icon: the glyph for who holds input, the receiver badge, and the Show in tray switch,+through the real window built offscreen, which starts no receiver, hooks or announcer."""++import jsonimport osfrom pathlib import Pathimport subprocessimport sys+import tempfile+import timeimport unittest+from unittest import mock++try:+ from PySide6.QtWidgets import QApplication, QSystemTrayIcon, QWidget++ import kvm_bridge_win+ import theme+ import tray_glyph+ from core import receiver+ from core.tests import responder_harness as harness+except ImportError: # PySide6 is only in the Windows venv+ kvm_bridge_win = None# The scale factor only takes effect before a QApplication exists, and another test may already# have made one, so the render runs in its own process.PROBE = """from PySide6.QtWidgets import QApplicationapp = QApplication([])-import kvm_bridge_win as k-pixmap = k.status_icon(k.ServerState.CONNECTED)-print(pixmap.width(), pixmap.toImage().pixelColor(32, 32).name())+import tray_glyph+pixmap = tray_glyph.pixmap(tray_glyph.LOCAL, "connected", 64, False)+print(pixmap.width(), pixmap.toImage().pixelColor(10, 28).alpha())"""-class TrayIconTest(unittest.TestCase):- def test_mark_survives_a_scaled_display(self):- # At 150% the tray once showed only the state dot on a taskbar-coloured square.[email protected](kvm_bridge_win is None, "needs PySide6")+class TrayGlyphTest(unittest.TestCase):+ @classmethod+ def setUpClass(cls):+ os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")+ cls.app = QApplication.instance() or QApplication([])+ theme.init_fonts()++ def test_glyph_survives_a_scaled_display(self):+ # At 150% the old tray mark once showed only the state dot on a taskbar-coloured square.env = dict(os.environ, QT_SCALE_FACTOR="1.5", QT_QPA_PLATFORM="offscreen")out = subprocess.run(- [sys.executable, "-c", PROBE],- cwd=Path(__file__).resolve().parent.parent,- env=env,- capture_output=True,- text=True,- timeout=60,+ [sys.executable, "-c", PROBE], cwd=Path(__file__).resolve().parent.parent, env=env,+ capture_output=True, text=True, timeout=60,)self.assertEqual(out.returncode, 0, out.stderr)- width, centre = out.stdout.split()+ width, alpha = out.stdout.split()self.assertEqual(width, "64")- # The centre of the mark is the cursor's off-white, not the fallback panel fill.- self.assertEqual(centre, "#efeee6")+ # The left screen is filled while input is on this PC.+ self.assertEqual(alpha, "255")++ def test_each_drive_state_draws_its_own_glyph(self):+ images = {drive: tray_glyph.pixmap(drive, "connected", 64, False).toImage() for drive in tray_glyph.DRIVE_STATES}+ self.assertEqual(len({image.constBits().tobytes() for image in images.values()}), 3)+ left, right = (10, 24), (50, 24)+ self.assertEqual(images[tray_glyph.LOCAL].pixelColor(*left).alpha(), 255)+ self.assertEqual(images[tray_glyph.LOCAL].pixelColor(*right).alpha(), 0)+ self.assertEqual(images[tray_glyph.ELSEWHERE].pixelColor(*left).alpha(), 0)+ self.assertEqual(images[tray_glyph.ELSEWHERE].pixelColor(*right).alpha(), 255)+ # Held fills neither screen and draws the bar between them.+ self.assertEqual(images[tray_glyph.HELD].pixelColor(*left).alpha(), 0)+ self.assertEqual(images[tray_glyph.HELD].pixelColor(*right).alpha(), 0)+ self.assertEqual(images[tray_glyph.HELD].pixelColor(32, 8).alpha(), 255)++ def test_a_receiver_that_is_not_running_dims_the_glyph(self):+ left = (10, 24)+ for status, alpha in (("connected", 255), ("waiting", 255), ("error", 102), ("stopped", 102)):+ self.assertEqual(tray_glyph.pixmap(tray_glyph.LOCAL, status, 64, False).toImage().pixelColor(*left).alpha(), alpha, status)++ def test_the_badge_follows_the_receiver_state(self):+ corner = (56, 56)+ colours = {status: tray_glyph.pixmap(tray_glyph.LOCAL, status, 64, False).toImage().pixelColor(*corner).name()+ for status in ("connected", "waiting", "error", "stopped")}+ self.assertEqual(len(set(colours.values())), 4, colours)++ def test_the_ink_follows_the_taskbar(self):+ left = (10, 24)+ self.assertEqual(tray_glyph.pixmap(tray_glyph.LOCAL, "connected", 64, False).toImage().pixelColor(*left).name(), "#000000")+ self.assertEqual(tray_glyph.pixmap(tray_glyph.LOCAL, "connected", 64, True).toImage().pixelColor(*left).name(), "#ffffff")++ def test_which_glyph(self):+ self.assertEqual(tray_glyph.drive_state(False, False, False), tray_glyph.LOCAL)+ self.assertEqual(tray_glyph.drive_state(True, False, False), tray_glyph.ELSEWHERE)+ self.assertEqual(tray_glyph.drive_state(False, True, False), tray_glyph.ELSEWHERE)+ self.assertEqual(tray_glyph.drive_state(False, False, True), tray_glyph.HELD)+ self.assertEqual(tray_glyph.drive_state(True, False, True), tray_glyph.ELSEWHERE)++ def test_every_size_a_tray_asks_for_is_drawn(self):+ icon = tray_glyph.icon(tray_glyph.LOCAL, "connected", False)+ self.assertEqual({size.width() for size in icon.availableSizes()}, set(tray_glyph.SIZES))++[email protected](kvm_bridge_win is None, "needs PySide6")+class TrayWindowTest(unittest.TestCase):+ def setUp(self):+ os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")+ self.app = QApplication.instance() or QApplication([])+ theme.init_fonts()+ folder = Path(tempfile.mkdtemp())+ self.config = folder / "settings.json"+ raw = {"host": "192.0.2.20", "port": harness.free_port(), "auth_token": "synthetic", "paired_with": "MacBook Pro",+ "mac_host": "192.0.2.10", "mac_return_edge": "left"}+ (folder / "config.json").write_text(json.dumps(raw))+ patch = mock.patch.object(QSystemTrayIcon, "isSystemTrayAvailable", return_value=True)+ patch.start()+ self.addCleanup(patch.stop)+ self.window = kvm_bridge_win.WindowsApplication(self.config)+ self.shown = [True]+ patch = mock.patch.object(self.window.tray, "setVisible", side_effect=self.shown.append)+ patch.start()+ self.addCleanup(patch.stop)+ # A real QSystemTrayIcon reports visible only on a desktop with a tray.+ patch = mock.patch.object(self.window.tray, "isVisible", side_effect=lambda: self.shown[-1])+ patch.start()+ self.addCleanup(patch.stop)++ def tearDown(self):+ self.window.server.stop()+ self.window.deleteLater()++ def test_each_drive_state_sets_the_matching_icon(self):+ cases = (+ ((), tray_glyph.LOCAL),+ ((True, None, False), tray_glyph.ELSEWHERE),+ ((False, b"peer", False), tray_glyph.ELSEWHERE),+ ((False, None, True), tray_glyph.HELD),+ )+ for args, expected in cases:+ with self.subTest(expected=expected, args=args):+ self.window._tray_icon_key = None+ with mock.patch.object(self.window.tray, "setIcon") as set_icon:+ stack = mock.patch.multiple(+ type(self.window.sender), redirecting=mock.PropertyMock(return_value=bool(args and args[0])),+ edges_held=mock.PropertyMock(return_value=bool(args and args[2])))+ owner = mock.patch.object(type(self.window.server), "owner",+ new_callable=mock.PropertyMock, return_value=args[1] if args else None)+ with stack, owner, mock.patch.object(self.window, "_ways_in", return_value={"edge"}):+ self.window._refresh_tray_state()+ self.assertEqual(self.window._tray_icon_key[0], expected)+ set_icon.assert_called_once()+ drawn = set_icon.call_args.args[0].pixmap(64, 64).toImage()+ status = self.window._status.value.lower()+ self.assertEqual(drawn, tray_glyph.pixmap(expected, status, 64, self.window._tray_icon_key[2]).toImage())++ def test_held_needs_a_way_to_hold(self):+ # Only the shortcut is on: there is nothing to pause, as on the Mac, which shows Local.+ with mock.patch.object(type(self.window.sender), "edges_held", new_callable=mock.PropertyMock, return_value=True), \+ mock.patch.object(self.window, "_ways_in", return_value=set()):+ self.assertEqual(self.window._drive_glyph(), tray_glyph.LOCAL)++ def test_the_icon_is_set_again_only_when_something_it_draws_changes(self):+ self.window._tray_icon_key = None+ with mock.patch.object(self.window.tray, "setIcon") as set_icon:+ self.window._refresh_tray_state()+ self.window._refresh_tray_state()+ self.assertEqual(set_icon.call_count, 1)+ self.window._set_status(receiver.ServerState.CONNECTED, "")+ self.app.processEvents()+ self.assertEqual(set_icon.call_count, 2)++ def test_show_in_tray_defaults_on_and_persists(self):+ self.assertTrue(self.window._config.show_in_tray)+ self.assertTrue(self.window.tray_switch.isChecked())+ self.assertTrue(self.window.tray_shown())+ self.window.tray_switch.setChecked(False)+ self.assertEqual(self.shown[-1], False)+ self.assertFalse(self.window.tray_shown())+ self.assertFalse(json.loads(self.config.read_text())["show_in_tray"])+ self.window.tray_switch.setChecked(True)+ self.assertEqual(self.shown[-1], True)+ self.assertTrue(json.loads(self.config.read_text())["show_in_tray"])++ def test_reloading_a_file_that_turns_it_off_takes_the_icon_down(self):+ raw = json.loads(self.config.read_text())+ raw["show_in_tray"] = False+ self.config.write_text(json.dumps(raw))+ self.window.reload_config()+ self.assertFalse(self.window.tray_switch.isChecked())+ self.assertEqual(self.shown[-1], False)++ def test_same_on_all_machines_leaves_it_alone(self):+ self.assertNotIn("show_in_tray", json.dumps(self.window._same_fields(), default=str))++ def test_closing_the_window_with_the_tray_off_quits(self):+ self.window.tray_switch.setChecked(False)+ with mock.patch.object(self.window, "quit") as quit_app:+ self.window.close()+ quit_app.assert_called_once()++ def test_closing_the_window_with_the_tray_on_keeps_beamer_running(self):+ self.window.show()+ with mock.patch.object(self.window, "quit") as quit_app:+ self.window.close()+ quit_app.assert_not_called()+ self.assertFalse(self.window.isVisible())++ def test_a_second_launch_raises_the_window_with_the_tray_off(self):+ self.window.tray_switch.setChecked(False)+ self.window.hide()+ signal = kvm_bridge_win.InstanceSignal(self.window.show_window, name=str(Path(self.config.parent) / "sig"))+ self.addCleanup(signal.close)+ self.assertTrue(signal.listening)+ code = ("import sys\nfrom PySide6.QtCore import QCoreApplication\napp = QCoreApplication([])\nimport kvm_bridge_win\n"+ "sys.exit(0 if kvm_bridge_win.send_instance_activation(sys.argv[1], None, timeout_ms=3000) else 1)\n")+ client = subprocess.Popen([sys.executable, "-c", code, str(Path(self.config.parent) / "sig")],+ cwd=Path(__file__).resolve().parent.parent)+ self.addCleanup(client.wait)+ deadline = time.monotonic() + 30+ while not self.window.isVisible() and time.monotonic() < deadline:+ self.app.processEvents()+ time.sleep(0.01)+ self.assertTrue(self.window.isVisible())+ self.assertEqual(client.wait(timeout=10), 0)++ def test_a_hidden_start_has_no_tray_to_stay_in_when_it_is_off(self):+ # main() shows the window of a hidden start whenever tray_shown() is false.+ self.window.tray_switch.setChecked(False)+ self.assertFalse(self.window.tray_shown())+ self.window._config.show_in_tray = True+ self.assertTrue(self.window.tray_shown())if __name__ == "__main__":diff --git a/win_app/tests/test_x11_seams.py b/win_app/tests/test_x11_seams.pyindex 6e51f4b..9791b4d 100644--- a/win_app/tests/test_x11_seams.py+++ b/win_app/tests/test_x11_seams.py@@ -1,6 +1,5 @@"""Internal X11 seam geometry and pressure without requiring an X server."""-import structimport sysimport unittestfrom pathlib import Path@@ -9,14 +8,13 @@ sys.path.insert(0, str(Path(__file__).resolve().parent.parent))sys.path.append(str(Path(__file__).resolve().parent.parent.parent))import x11_seams # noqa: E402-from core.return_edge import Rect # noqa: E402+from core.return_edge import CornerPush, PartEdge, Rect, ReturnEdge # noqa: E402class FakeBackend:def __init__(self):self.created = []self.destroyed = []- self.released = []def create_barrier(self, seam):self.created.append(seam)@@ -25,10 +23,6 @@ class FakeBackend:def destroy_barrier(self, barrier):self.destroyed.append(barrier)- def release_pointer(self, device, barrier, eventid):- self.released.append((device, barrier, eventid))--class SeamGeometryTest(unittest.TestCase):def test_only_shared_monitor_edge_segments_are_returned(self):found = x11_seams.seams([@@ -45,55 +39,164 @@ class SeamGeometryTest(unittest.TestCase):self.assertEqual(x11_seams.seams([Rect(0, 0, 100, 100), Rect(100, 101, 100, 100)]), [])self.assertEqual(x11_seams.seams([Rect(0, 0, 100, 100), Rect(101, 0, 100, 100)]), [])+ def test_only_armed_display_side_creates_an_internal_seam(self):+ monitors = [Rect(0, 0, 100, 100), Rect(100, 0, 100, 100)]+ display_map = {"0": monitors[0], "1": monitors[1]}+ model = ReturnEdge("right", display="0")++ found = x11_seams.armed_seams(monitors, display_map, [model])++ self.assertEqual([seam.key for seam in found], [(100, 0, 100, 99)])+ self.assertEqual(found[0].directions, x11_seams.BARRIER_NEGATIVE_X)++ def test_reverse_zone_uses_the_opposite_barrier_direction(self):+ monitors = [Rect(0, 0, 100, 100), Rect(100, 0, 100, 100)]+ display_map = {"0": monitors[0], "1": monitors[1]}++ found = x11_seams.armed_seams(monitors, display_map,+ [ReturnEdge("left", display="1")])++ self.assertEqual(found[0].directions, x11_seams.BARRIER_POSITIVE_X)++ def test_opposing_armed_zones_block_both_directions_on_shared_stretch(self):+ monitors = [Rect(0, 0, 100, 100), Rect(100, 0, 100, 100)]+ display_map = {"0": monitors[0], "1": monitors[1]}+ models = [ReturnEdge("right", display="0"), ReturnEdge("left", display="1")]++ found = x11_seams.armed_seams(monitors, display_map, models)++ self.assertEqual(len(found), 1)+ self.assertEqual(found[0].directions, 0)++ def test_part_edge_creates_only_its_selected_third(self):+ monitors = [Rect(0, 0, 100, 100), Rect(100, 0, 100, 100)]+ display_map = {"0": monitors[0], "1": monitors[1]}+ model = PartEdge("right", {"middle"}, display="0")++ found = x11_seams.armed_seams(monitors, display_map, [model])++ self.assertEqual([seam.key for seam in found], [(100, 34, 100, 66)])++ def test_disjoint_selected_thirds_leave_the_middle_open(self):+ monitors = [Rect(0, 0, 100, 100), Rect(100, 0, 100, 100)]+ display_map = {"0": monitors[0], "1": monitors[1]}+ model = PartEdge("right", {"start", "end"}, display="0")++ found = x11_seams.armed_seams(monitors, display_map, [model])++ self.assertEqual([seam.key for seam in found], [(100, 0, 100, 33), (100, 67, 100, 99)])++ def test_corner_push_creates_only_its_corner_stretch(self):+ monitors = [Rect(0, 0, 100, 100), Rect(100, 0, 100, 100)]+ display_map = {"0": monitors[0], "1": monitors[1]}+ model = CornerPush("top_right", "right", display="0")++ found = x11_seams.armed_seams(monitors, display_map, [model])++ self.assertEqual([seam.key for seam in found], [(100, 0, 100, 8)])++ def test_unarmed_or_unmapped_zones_do_not_block_local_monitor_movement(self):+ monitors = [Rect(0, 0, 100, 100), Rect(100, 0, 100, 100)]+ self.assertEqual(x11_seams.armed_seams(monitors, {"0": monitors[0]}, []), [])+ self.assertEqual(x11_seams.armed_seams(monitors, {}, [ReturnEdge("right", display="0")]), [])++ disarmed = ReturnEdge("right", display="0")+ disarmed.armed = False+ self.assertEqual(x11_seams.armed_seams(monitors, {"0": monitors[0], "1": monitors[1]},+ [disarmed]), [])+class SeamControllerTest(unittest.TestCase):def setUp(self):self.backend = FakeBackend()self.controller = x11_seams.Controller(self.backend)self.monitors = [Rect(0, 0, 100, 100), Rect(100, 0, 100, 100)]+ self.display_map = {"0": self.monitors[0], "1": self.monitors[1]}+ self.model = ReturnEdge("right", display="0")++ def configure_active(self, resistance=30, enabled=True):+ self.controller.configure(self.monitors, resistance, enabled,+ display_map=self.display_map, models=[self.model])++ def test_unselected_internal_seam_has_no_barrier(self):+ self.controller.configure(self.monitors, 30, enabled=True)++ self.assertEqual(self.backend.created, [],+ "X11 seam holds gap: barriers must follow an armed per-display zone")- def test_barrier_releases_only_after_configured_outward_pressure(self):- self.controller.configure(self.monitors, 30)- barrier = 101- self.controller.handle(("barrier", x11_seams.XI_BARRIER_HIT, 2, 44, barrier, 12.0, 0.0))- self.controller.handle(("barrier", x11_seams.XI_BARRIER_HIT, 2, 44, barrier, 15.0, 0.0))- self.assertEqual(self.backend.released, [])- self.controller.handle(("barrier", x11_seams.XI_BARRIER_HIT, 2, 44, barrier, 3.0, 0.0))- self.assertEqual(self.backend.released, [(2, barrier, 44)])- self.controller.handle(("barrier", x11_seams.XI_BARRIER_HIT, 2, 44, barrier, 20.0, 0.0))- self.assertEqual(len(self.backend.released), 1)-- def test_reversing_along_or_leaving_does_not_carry_pressure_forward(self):- self.controller.configure(self.monitors, 30)- barrier = 101- key = ("barrier", x11_seams.XI_BARRIER_HIT, 2, 45, barrier)- self.controller.handle(key + (18.0, 0.0))- self.controller.handle(key + (-12.0, 0.0))- self.assertEqual(self.backend.released, [])- self.controller.handle(("barrier", x11_seams.XI_BARRIER_LEAVE, 2, 45, barrier, 0.0, 0.0))- self.controller.handle(key + (18.0, 0.0))- self.assertEqual(self.backend.released, [])def test_disabled_state_removes_all_barriers_and_zero_resistance_creates_none(self):- self.controller.configure(self.monitors, 30)- self.controller.configure(self.monitors, 30, enabled=False)+ self.configure_active()+ self.controller.configure(self.monitors, 30, enabled=False,+ display_map=self.display_map, models=[self.model])self.assertEqual(self.backend.destroyed, [101])- self.controller.configure(self.monitors, 0)+ self.controller.configure(self.monitors, 0, display_map=self.display_map, models=[self.model])self.assertEqual(len(self.backend.created), 1)- def test_barrier_event_parser_reads_fixed_point_attempted_motion(self):- body = struct.pack("=HIIIIIIIIH2xii iI iI", 2, 10, 31, 1, 1, 104, 5, 12, 0,- 6, 12 * 65536, 24 * 65536, -4, 0x80000000, 2, 0)- event = x11_seams.parse_barrier_event(x11_seams.XI_BARRIER_HIT, body)- self.assertEqual(event[:5], ("barrier", x11_seams.XI_BARRIER_HIT, 2, 31, 104))- self.assertEqual(event[5:7], (-3.5, 2.0))- self.assertEqual(event[7:9], (12.0, 24.0))-- def test_parser_rejects_truncated_or_unrelated_event(self):- with self.assertRaises(ValueError):- x11_seams.parse_barrier_event(x11_seams.XI_BARRIER_HIT, b"short")- with self.assertRaises(ValueError):- x11_seams.parse_barrier_event(17, b"" * 62)+ def test_zone_change_rebuilds_only_armed_barriers_and_empty_zones_release_them(self):+ self.controller.configure(self.monitors, 30, display_map=self.display_map,+ models=[PartEdge("right", {"middle"}, display="0")])+ self.assertEqual([seam.key for seam in self.backend.created], [(100, 34, 100, 66)])++ self.controller.configure(self.monitors, 30, display_map=self.display_map, models=[])++ self.assertEqual(self.backend.destroyed, [101])+ self.assertFalse(self.controller.active)++ def test_direction_change_rebuilds_barrier(self):+ self.configure_active()+ self.model = ReturnEdge("left", display="1")++ self.configure_active()++ self.assertEqual(self.backend.destroyed, [101])+ self.assertEqual(self.backend.created[-1].directions, x11_seams.BARRIER_POSITIVE_X)+++class XlibBackendProtocolTest(unittest.TestCase):+ def test_create_pointer_barrier_wire_format_has_pad(self):+ try:+ import Xlib # noqa: F401+ except ImportError:+ self.skipTest("python-xlib not installed")++ create_cls, _ = x11_seams._request_classes()+ field_types = [type(f).__name__ for f in create_cls._request.fields]+ field_names = [f.name for f in create_cls._request.fields]+ dirs_idx = field_names.index("directions")+ self.assertIn("Pad", field_types[dirs_idx:],+ "CreatePointerBarrier wire format must include Pad(2) between directions and num_devices")++ def test_create_barrier_applies_to_all_devices(self):+ try:+ from Xlib import display+ except ImportError:+ self.skipTest("python-xlib not installed")++ recorded = []+ class MockProtocol:+ def allocate_resource_id(self):+ return 42+ def get_extension_major(self, name):+ return 138++ class MockDisplay:+ display = MockProtocol()++ class MockRoot:+ id = 999++ backend = x11_seams.XlibBackend(MockDisplay(), MockRoot())+ def mock_create(**kwargs):+ recorded.append(kwargs)+ backend._create = mock_create++ seam = x11_seams.Seam(100, 0, 100, 100, "x", directions=0)+ barrier = backend.create_barrier(seam)+ self.assertEqual(barrier, 42)+ self.assertEqual(len(recorded), 1)+ self.assertEqual(recorded[0]["devices"], [],+ "Global pointer barrier must specify empty devices list (num_devices=0)")if __name__ == "__main__":diff --git a/win_app/tray_glyph.py b/win_app/tray_glyph.pynew file mode 100644index 0000000..4020775--- /dev/null+++ b/win_app/tray_glyph.py@@ -0,0 +1,114 @@+"""The tray icon: the Mac menu bar's two-screen glyph (mac_app/kvm_bridge_app.py menu_bar_glyph) in+Qt, so the taskbar and a KDE or GNOME tray show where input is the way the menu bar does.++The drive state is the glyph. The receiver's state is a badge over its lower right corner, as the+old colour mark carried: signal connected, amber waiting, fault needs attention, off stopped. A+receiver that is not running, stopped or in error, cannot be driven, so it dims the glyph.+"""++from PySide6.QtCore import QRectF, Qt+from PySide6.QtGui import QColor, QIcon, QPainter, QPainterPath, QPen, QPixmap++import theme++# The Mac's local, windows and held. "elsewhere" is its "windows": on this PC the other end is+# whichever machine has input, or is driven from here.+LOCAL, ELSEWHERE, HELD = "local", "elsewhere", "held"+DRIVE_STATES = (LOCAL, ELSEWHERE, HELD)+DESCRIPTIONS = {+ LOCAL: "Input on this PC",+ ELSEWHERE: "Input on another machine",+ HELD: "Input held on this PC; crossing is paused",+}+# What a tray asks for: Windows takes 16 at 100%, 20 at 125%, 24 at 150% and 32 at 200%.+SIZES = (16, 20, 24, 32, 48, 64)+DIMMED_STATES = ("stopped", "error")+GLYPH_WIDTH, GLYPH_HEIGHT = 22.0, 16.0+++def drive_state(redirecting: bool, driven: bool, held: bool) -> str:+ """Which glyph: input is away from this PC, held, or here. Away wins, as on the Mac."""+ if redirecting or driven:+ return ELSEWHERE+ return HELD if held else LOCAL+++def _ink(dark: bool) -> QColor:+ return QColor("#ffffff" if dark else "#000000")+++def _draw_glyph(painter: QPainter, drive: str) -> None:+ for x, filled in ((1.0, drive == LOCAL), (13.0, drive == ELSEWHERE)):+ if filled:+ painter.drawRoundedRect(QRectF(x, 2, 8, 12), 1.5, 1.5)+ else:+ pen = QPen(painter.brush().color(), 1.5)+ outline = QPainterPath()+ outline.addRoundedRect(QRectF(x + 0.75, 2.75, 6.5, 10.5), 1, 1)+ painter.save()+ painter.setPen(pen)+ painter.setBrush(Qt.BrushStyle.NoBrush)+ painter.drawPath(outline)+ painter.restore()+ if drive == HELD:+ painter.drawRoundedRect(QRectF(10, 0, 2, 16), 1, 1)+ return+ tip, tail = (10.0, 12.0) if drive == LOCAL else (12.0, 10.0)+ chevron = QPainterPath()+ chevron.moveTo(tail, 5.5)+ chevron.lineTo(tip, 8.0)+ chevron.lineTo(tail, 10.5)+ pen = QPen(painter.brush().color(), 1.4, Qt.PenStyle.SolidLine, Qt.PenCapStyle.RoundCap, Qt.PenJoinStyle.RoundJoin)+ painter.save()+ painter.setPen(pen)+ painter.setBrush(Qt.BrushStyle.NoBrush)+ painter.drawPath(chevron)+ painter.restore()+++def pixmap(drive: str, status: str, size: int, dark: bool) -> QPixmap:+ """One square tray image: the glyph in the taskbar's ink along the top, with the receiver badge+ in the strip below its lower right corner, a hair of gap cut where they touch. `status` is a ServerState value in lower case; `dark` is the taskbar's."""+ image = QPixmap(size, size)+ image.fill(Qt.GlobalColor.transparent)+ painter = QPainter(image)+ painter.setRenderHint(QPainter.RenderHint.Antialiasing)+ painter.setPen(Qt.PenStyle.NoPen)+ painter.setBrush(_ink(dark))+ scale = size / GLYPH_WIDTH+ painter.save()+ painter.scale(scale, scale)+ painter.setOpacity(0.4 if status in DIMMED_STATES else 1.0)+ _draw_glyph(painter, drive)+ painter.restore()+ dot = size * 0.30+ gap = size / 32+ corner = size - dot+ painter.setCompositionMode(QPainter.CompositionMode.CompositionMode_Clear)+ painter.setOpacity(1.0)+ painter.drawEllipse(QRectF(corner - gap, corner - gap, dot + 2 * gap, dot + 2 * gap))+ painter.setCompositionMode(QPainter.CompositionMode.CompositionMode_SourceOver)+ painter.setBrush(QColor(theme.state_colour(status)))+ painter.drawEllipse(QRectF(corner, corner, dot, dot))+ painter.end()+ return image+++def icon(drive: str, status: str, dark: bool) -> QIcon:+ """Every size drawn natively, so the shell picks one rather than scaling a large image down."""+ result = QIcon()+ for size in SIZES:+ result.addPixmap(pixmap(drive, status, size, dark))+ return result+++def taskbar_is_dark(system_dark: bool) -> bool:+ """Windows has a taskbar theme of its own, apart from the apps': SystemUsesLightTheme. Anywhere+ else the panel follows the desktop's scheme, which `system_dark` is."""+ try:+ import winreg+ with winreg.OpenKey(winreg.HKEY_CURRENT_USER,+ r"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize") as key:+ return winreg.QueryValueEx(key, "SystemUsesLightTheme")[0] == 0+ except (ImportError, OSError):+ return system_darkdiff --git a/win_app/widgets.py b/win_app/widgets.pyindex e0e4c46..f69f814 100644--- a/win_app/widgets.py+++ b/win_app/widgets.py@@ -1581,7 +1581,7 @@ class Sidebar(QWidget):self.setProperty("vernier", "sidebar")self._on_select = on_selectself._selected = ""- keyboard_navigation()+ self._last_keyboard_mode = keyboard_navigation().activeapp = QApplication.instance()app.installEventFilter(self)focus_connection = app.focusChanged.connect(self._focus_changed)@@ -1676,11 +1676,16 @@ class Sidebar(QWidget):def _update_rings(self):if not isValid(self):return+ keyboard_mode = self.keyboard_modefor key, button in self._buttons.items():if not isValid(button):continue- button._keyboard_ring = self.keyboard_mode and key == self._selected+ button._keyboard_ring = keyboard_mode and key == self._selectedbutton.update()+ if keyboard_mode != self._last_keyboard_mode:+ for tile in self.window().findChildren(_Tile):+ tile.outline.update()+ self._last_keyboard_mode = keyboard_modefocused = QApplication.focusWidget()tiles = (getattr(self, "_ring_focus", None), focused)self._ring_focus = focused@@ -1697,6 +1702,9 @@ class Sidebar(QWidget):new.clearFocus()elif selected is not None and isValid(selected) and new is not selected:selected.setFocus(Qt.FocusReason.TabFocusReason)+ for widget in (old, new):+ if isinstance(widget, _Tile) and isValid(widget):+ widget.outline.update()self._update_rings()def _pointer_select(self, key):diff --git a/win_app/x11_seams.py b/win_app/x11_seams.pyindex 821438c..20948c6 100644--- a/win_app/x11_seams.py+++ b/win_app/x11_seams.py@@ -1,24 +1,17 @@-"""XFixes pointer barriers along the seams between this X11 desktop's monitors.--The small controller is independent of python-xlib so its geometry and resistance behaviour can-be checked without an X server. XFixes 5 creates the barriers; XI 2.3 reports hits and lets us-release a pointer after the configured pressure has been reached.-"""--import struct+"""Directional XFixes pointer barriers on armed zones at internal X11 monitor seams."""from dataclasses import dataclassfrom typing import Dict, Iterable, List, Tuple-from core.return_edge import Rect+from core.return_edge import CORNER_PX, CornerPush, PartEdge, Rect-XI_BARRIER_HIT = 25-XI_BARRIER_LEAVE = 26XI_ALL_MASTER_DEVICES = 1-XI_BARRIER_EVENTS = (1 << XI_BARRIER_HIT) | (1 << XI_BARRIER_LEAVE)+BARRIER_POSITIVE_X = 1 << 0+BARRIER_POSITIVE_Y = 1 << 1+BARRIER_NEGATIVE_X = 1 << 2+BARRIER_NEGATIVE_Y = 1 << 3_CREATE_POINTER_BARRIER = 31_DESTROY_POINTER_BARRIER = 32-_XI_BARRIER_RELEASE_POINTER = 61@dataclass(frozen=True)@@ -30,6 +23,7 @@ class Seam:x2: inty2: intaxis: str+ directions: int = 0@propertydef key(self) -> Tuple[int, int, int, int]:@@ -61,49 +55,117 @@ def seams(monitors: Iterable[Rect]) -> List[Seam]:return list(found.values())-def parse_barrier_event(kind: int, data: bytes) -> tuple:- """Decode the XI 2.3 event body python-xlib leaves opaque on GenericEvent."""- if kind not in (XI_BARRIER_HIT, XI_BARRIER_LEAVE):- raise ValueError(f"not an XI barrier event: {kind}")- # EVENTHEADER: deviceid, time; then eventid, root, event, barrier, full_sequence, dtime,- # flags, sourceid, padding, root_x, root_y, dx and dy (FP3232 pairs).- if len(data) < 62:- raise ValueError("truncated XI barrier event")- (deviceid, _time, eventid, _root, _event, barrier, _full_sequence, _dtime, _flags,- _sourceid, root_x, root_y, dx_i, dx_f, dy_i, dy_f) = struct.unpack_from("=HIIIIIIIIH2xii iI iI", data)- return ("barrier", kind, deviceid, eventid, barrier,- dx_i + dx_f / 2 ** 32, dy_i + dy_f / 2 ** 32,- root_x / 65536, root_y / 65536)+def armed_seams(monitors: Iterable[Rect], display_map: dict, models: Iterable) -> List[Seam]:+ """Return only internal stretches covered by an armed, display-scoped zone model."""+ displays = list(monitors)+ routes: Dict[Tuple[str, int], List[Tuple[int, int, int]]] = {}+ for model in models:+ if not getattr(model, "armed", True):+ continue+ display = getattr(model, "display", None)+ edge = getattr(model, "edge", None)+ rect = display_map.get(display) if isinstance(display, str) else None+ if not isinstance(rect, Rect) or edge not in ("left", "right", "top", "bottom"):+ continue+ spans = _zone_spans(model, rect, edge)+ if not spans:+ continue+ for span in spans:+ for other in displays:+ if other == rect:+ continue+ if edge in ("left", "right"):+ adjacent = other.x + other.width == rect.x if edge == "left" else other.x == rect.x + rect.width+ if not adjacent:+ continue+ start, end = max(span[0], other.y), min(span[1], other.bottom)+ if end > start:+ x = rect.x if edge == "left" else rect.x + rect.width+ route = (start, end, -1 if edge == "left" else 1)+ routes.setdefault(("x", x), []).append(route)+ else:+ continue+ else:+ adjacent = other.y + other.height == rect.y if edge == "top" else other.y == rect.y + rect.height+ if not adjacent:+ continue+ start, end = max(span[0], other.x), min(span[1], other.right)+ if end > start:+ y = rect.y if edge == "top" else rect.y + rect.height+ route = (start, end, -1 if edge == "top" else 1)+ routes.setdefault(("y", y), []).append(route)+ else:+ continue+ found = []+ for (axis, coordinate), spans in routes.items():+ breaks = sorted({point for start, end, _direction in spans for point in (start, end + 1)})+ for start, stop in zip(breaks, breaks[1:]):+ blocked = {direction for low, high, direction in spans if low <= start and high >= stop - 1}+ if not blocked:+ continue+ directions = _allowed_directions(axis, blocked)+ if axis == "x":+ item = Seam(coordinate, start, coordinate, stop - 1, axis, directions)+ else:+ item = Seam(start, coordinate, stop - 1, coordinate, axis, directions)+ found.append(item)+ return found+++def _allowed_directions(axis: str, blocked: set) -> int:+ if axis == "x":+ return (0 if 1 in blocked else BARRIER_POSITIVE_X) | (0 if -1 in blocked else BARRIER_NEGATIVE_X)+ return (0 if 1 in blocked else BARRIER_POSITIVE_Y) | (0 if -1 in blocked else BARRIER_NEGATIVE_Y)+++def _zone_spans(model, rect: Rect, edge: str):+ low, high = (rect.y, rect.bottom) if edge in ("left", "right") else (rect.x, rect.right)+ if isinstance(model, PartEdge):+ size = high - low + 1+ return [(low + (part * size + 2) // 3,+ low + ((part + 1) * size + 2) // 3 - 1)+ for part, name in enumerate(("start", "middle", "end")) if name in model.parts]+ if isinstance(model, CornerPush):+ if edge in ("left", "right"):+ if model.horizontal != edge:+ return []+ if model.vertical == "top":+ return [(low, min(high, low + CORNER_PX))]+ return [(max(low, high - CORNER_PX), high)]+ if model.vertical != edge:+ return []+ return [(low, min(high, low + CORNER_PX))] if model.horizontal == "left" else (+ [(max(low, high - CORNER_PX), high)])+ return [(low, high)]class Controller:- """Reconcile active internal seams and release each barrier after configured outward travel."""+ """Reconcile directional XFixes barriers for the sender's currently armed zones."""def __init__(self, backend) -> None:self._backend = backendself._barriers: Dict[int, Seam] = {}self._signature = None- self._pressure: Dict[Tuple[int, int, int], Tuple[int, float]] = {}- self._released = set()@propertydef active(self) -> bool:return bool(self._barriers)- def configure(self, monitors: Iterable[Rect], resistance_px: int, enabled: bool = True) -> None:+ def configure(self, monitors: Iterable[Rect], resistance_px: int, enabled: bool = True,+ display_map: dict = None, models: Iterable = ()) -> None:resistance = max(0.0, float(resistance_px))- wanted = seams(monitors) if enabled and resistance > 0 else []+ displays = list(monitors)+ wanted = armed_seams(displays, display_map or {}, models) if enabled and resistance > 0 else []# X protocol coordinates are signed 16-bit screen coordinates. Omit only unrepresentable# seams; a bad display arrangement must not prevent ordinary input capture from starting.wanted = [item for item in wanted if all(-32768 <= point <= 32767 for point in item.key)]- signature = (tuple(item.key for item in wanted), resistance, bool(enabled))+ signature = (tuple((item.key, item.directions) for item in wanted), resistance, bool(enabled))if signature == self._signature:returnself._remove_all()self._signature = signatureif not enabled or resistance <= 0:return- self._resistance = resistancetry:for item in wanted:barrier = self._backend.create_barrier(item)@@ -114,32 +176,6 @@ class Controller:self._signature = Noneraise- def handle(self, event: tuple) -> None:- """Consume (kind, device, event id, barrier, dx, dy, ...) from the capture thread."""- _tag, kind, device, eventid, barrier, dx, dy = event[:7]- key = (int(device), int(eventid), int(barrier))- if kind == XI_BARRIER_LEAVE:- self._pressure.pop(key, None)- self._released.discard(key)- return- seam = self._barriers.get(int(barrier))- if seam is None or key in self._released:- return- outward = float(dx if seam.axis == "x" else dy)- # A hit event already means the pointer is pushing into the barrier. Direction is kept so- # reversing against the same event id restarts, rather than completes, the pressure.- if outward == 0:- return- direction, distance = (1 if outward > 0 else -1), abs(outward)- previous_direction, accumulated = self._pressure.get(key, (direction, 0.0))- if previous_direction != direction:- accumulated = 0.0- accumulated += distance- self._pressure[key] = (direction, accumulated)- if accumulated >= self._resistance:- self._backend.release_pointer(device, barrier, eventid)- self._released.add(key)-def close(self) -> None:self._remove_all()self._signature = None@@ -150,59 +186,79 @@ class Controller:self._backend.destroy_barrier(barrier)finally:self._barriers.pop(barrier, None)- self._pressure.clear()- self._released.clear()+++def _patch_xfixes_query_version() -> None:+ try:+ import Xlib.ext.xfixes+ except Exception:+ return+ if getattr(Xlib.ext.xfixes, "_beamer_patched_v5", False):+ return++ def query_version(self, major_version=5, minor_version=0):+ return Xlib.ext.xfixes.QueryVersion(+ display=self.display,+ opcode=self.display.get_extension_major(Xlib.ext.xfixes.extname),+ major_version=major_version,+ minor_version=minor_version,+ )++ Xlib.ext.xfixes.query_version = query_version+ Xlib.ext.xfixes._beamer_patched_v5 = True+++_patch_xfixes_query_version()def _request_classes():# python-xlib is optional on macOS and Windows; keep its protocol types lazy like capture_x11's# connection itself.+ _patch_xfixes_query_version()from Xlib.protocol import rqclass CreatePointerBarrier(rq.Request):_request = rq.Struct(rq.Card8("opcode"), rq.Opcode(_CREATE_POINTER_BARRIER), rq.RequestLength(),rq.Card32("barrier"), rq.Card32("window"),rq.Int16("x1"), rq.Int16("y1"), rq.Int16("x2"), rq.Int16("y2"),- rq.Card32("directions"), rq.LengthOf("devices", 2),+ rq.Card32("directions"), rq.Pad(2), rq.LengthOf("devices", 2),rq.List("devices", rq.Card16))class DestroyPointerBarrier(rq.Request):_request = rq.Struct(rq.Card8("opcode"), rq.Opcode(_DESTROY_POINTER_BARRIER), rq.RequestLength(),rq.Card32("barrier"))- class ReleasePointer(rq.Request):- _request = rq.Struct(- rq.Card8("opcode"), rq.Opcode(_XI_BARRIER_RELEASE_POINTER), rq.RequestLength(),- rq.Card32("num_barriers"),- rq.Card16("deviceid"), rq.Pad(2), rq.Card32("barrier"), rq.Card32("eventid"),- )-- return CreatePointerBarrier, DestroyPointerBarrier, ReleasePointer+ return CreatePointerBarrier, DestroyPointerBarrierclass XlibBackend:"""The XFixes/XInput protocol requests needed by Controller, on Hooks' X connection."""def __init__(self, display, root) -> None:- self._create, self._destroy, self._release = _request_classes()+ _patch_xfixes_query_version()+ self._create, self._destroy = _request_classes()self._display = display- self._protocol = display.display+ self._protocol = getattr(display, "display", display)self._root = rootself._xfixes_opcode = self._protocol.get_extension_major("XFIXES")- self._xinput_opcode = self._protocol.get_extension_major("XInputExtension")+ if hasattr(self._display, "xfixes_query_version"):+ try:+ self._display.xfixes_query_version()+ except Exception:+ passdef create_barrier(self, seam: Seam) -> int:barrier = self._protocol.allocate_resource_id()self._create(display=self._protocol, opcode=self._xfixes_opcode, barrier=barrier, window=self._root.id,x1=seam.x1, y1=seam.y1, x2=seam.x2, y2=seam.y2,- directions=0, devices=[XI_ALL_MASTER_DEVICES],+ directions=seam.directions, devices=[],)+ if hasattr(self._display, "flush"):+ self._display.flush()return barrierdef destroy_barrier(self, barrier: int) -> None:self._destroy(display=self._protocol, opcode=self._xfixes_opcode, barrier=barrier)-- def release_pointer(self, device: int, barrier: int, eventid: int) -> None:- self._release(display=self._protocol, opcode=self._xinput_opcode, num_barriers=1,- deviceid=device, barrier=barrier, eventid=eventid)+ if hasattr(self._display, "flush"):+ self._display.flush()