`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
23 lines
1.2 KiB
Python
23 lines
1.2 KiB
Python
"""The two input protocols, generated and vendored.
|
|
|
|
``wlr_virtual_pointer_unstable_v1/`` and ``virtual_keyboard_unstable_v1/`` are
|
|
byte-for-byte pywayland scanner output for
|
|
``wlr-virtual-pointer-unstable-v1.xml`` and
|
|
``virtual-keyboard-unstable-v1.xml``; do not hand-edit either. Regenerate with
|
|
:mod:`hhstream_pointer._protocol.regenerate`, which prints the command and
|
|
records where each XML actually lives — the keyboard one is not where either
|
|
plan says it is, and its docstring says so at length.
|
|
|
|
One thing the keyboard XML does *not* give us, and it matters: it names
|
|
``keymap_format`` and ``key_state`` in its request descriptions and defines
|
|
neither enum, so there is nothing generated to read ``xkb_v1 == 1`` or
|
|
``pressed == 1`` off. Those live in :data:`hhstream_pointer.keymap.XKB_V1` and
|
|
:data:`hhstream_pointer.buttons.STATES` instead, with the citation.
|
|
|
|
Vendored rather than generated at build time for one reason: the scanner needs
|
|
``wlr-protocols`` and a working pywayland on the *build* host, so generating
|
|
would put a code generator between a checkout and a runnable driver — including
|
|
in the dev shell, which has neither. Vendored, the file is reviewable in a
|
|
diff, and a protocol bump shows up as a protocol bump.
|
|
"""
|