`zwp_virtual_keyboard_v1`, spoken by the process that already speaks
`zwlr_virtual_pointer_v1`. One device for the seat, one keymap uploaded
once, keysym names on our socket and evdev codes only on the Wayland
request -- the division buttons.py already draws.
keymap.py is the new seam, and it holds the three decisions that have a
wrong version which looks right:
* A capital is the MASK, not a synthetic Shift keycode. Hyprland's
virtual keyboard never runs updateXkbStateWithKey, so a virtual
KEY_LEFTSHIFT changes no modifier state at all -- and sending both
is how a toolkit applies Shift twice.
* A modifier is whatever the keymap says is one, measured by pressing
each key in a throwaway xkb state. Not a name list: `@` on `de` is a
level-three symbol, and a Shift-only special case types the wrong
character. (The measured set is also smaller than the canonical one,
because no keycode on us/pc105 carries Meta or Hyper.)
* A lock is not a modifier. Caps_Lock reports a *locked* mask, so
`type` refuses while it is held rather than guessing the case.
The whole string resolves before anything is emitted, and every refusal
names the scalar INDEX, never the character: these messages reach the
driver's log and the string is a password as often as not.
Folding in the review's changes 1, 2, 3 and 6:
1 a Rejected now carries a `kind`. A bad keysym or an unmappable
character is `invalid_argument`; a missing keyboard global is
`refused`. Without the token the broker would have to tell exit 2
from exit 10 by reading English, and _drive maps every `ok: false`
to driver_refused today.
2 the keymap `size` on the wire includes the trailing NUL, and the fd
outlives a roundtrip rather than a flush. Hyprland mmaps exactly
that many bytes and hands the pointer to xkb_keymap_new_from_string.
3 release_all lifts buttons, then keys in press order, then zeroes the
mask -- and the mask only if something set it, so a compositor with
no keyboard global still gets its buttons lifted. One release_all is
the whole of expiry; an exception in the key half would abandon it.
6 `key` and `type` never call _aimed(). A keyboard has no output, and
one test deliberately never warps so that stays true.
Also: `--xkb-layout/-model/-variant/-options`, compiled BEFORE any
Wayland call so a bad layout is exit 2 rather than exit 10; a comma in
the layout refused outright, because v1 always sends group 0 and
xkbcommon would hand back a second group nothing could reach; the
keymap uploaded after connect and before listen, with one
modifiers(0,0,0,0) after it; and xkbcommon as a hard, non-optional
dependency -- an optional one would let test_keymap.py skip, and the
unmappable-character path is the one that must not rot.
nix develop -c python -m pytest tests/pointer tests/sessions/unit -q
549 passed in 25.70s
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GhNPM6rGcuzxocM1nATnuM
33 lines
1.4 KiB
TOML
33 lines
1.4 KiB
TOML
[build-system]
|
|
requires = ["setuptools>=68"]
|
|
build-backend = "setuptools.build_meta"
|
|
|
|
[project]
|
|
name = "hhstream"
|
|
version = "0.1.0"
|
|
description = "Publish a headless Hyprland session's frames on a Unix socket"
|
|
requires-python = ">=3.11"
|
|
# The frame socket, the CLI and the broker are stdlib-only by policy
|
|
# (docs/CONTRACT-sessions.md §6, rule 3). The input driver is the one
|
|
# exception, twice over: talking Wayland means speaking the wire protocol, and
|
|
# turning a keysym name into the keycode-plus-modifier-mask that *this* layout
|
|
# needs means compiling an XKB keymap. Re-implementing either here would be a
|
|
# worse idea than a dependency, and `xkbcommon` is deliberately NOT optional --
|
|
# an optional one would let `tests/pointer/test_keymap.py` skip, and the
|
|
# unmappable-character path is exactly the one that must not rot.
|
|
dependencies = ["pywayland>=0.4", "xkbcommon>=1.0"]
|
|
|
|
[project.scripts]
|
|
hhstream-server = "hhstream.server:main"
|
|
hhstream-client = "hhstream.client:main"
|
|
# The one front door: frames/launch/record verbs plus the `session` namespace.
|
|
hhstream = "hhstream.cli:main"
|
|
# The session daemon. A separate process on purpose: it outlives every CLI call.
|
|
hhstreamd = "hhstreamd.__main__:main"
|
|
# The pointer driver. Its own process because a Wayland client needs its own
|
|
# connection, and a blocked one must not stall the broker.
|
|
hhstream-pointer = "hhstream_pointer.__main__:main"
|
|
|
|
[tool.setuptools.packages.find]
|
|
where = ["src"]
|