`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
46 lines
1.5 KiB
Nix
46 lines
1.5 KiB
Nix
{
|
|
lib,
|
|
python3,
|
|
...
|
|
}:
|
|
python3.pkgs.buildPythonApplication {
|
|
pname = "hhstream";
|
|
version = "0.1.0";
|
|
pyproject = true;
|
|
|
|
src = ../.;
|
|
|
|
build-system = [ python3.pkgs.setuptools ];
|
|
|
|
# `hhstream-pointer` is a Wayland client, so it needs libwayland's
|
|
# marshalling; and it resolves keysym names against the XKB layout it
|
|
# uploads, so it needs xkbcommon.
|
|
#
|
|
# Neither protocol XML is a build input: both generated modules are vendored
|
|
# under src/hhstream_pointer/_protocol, so a checkout builds without a code
|
|
# generator. See that package's docstring for why, and
|
|
# hhstream_pointer._protocol.regenerate for how to refresh them -- including
|
|
# the note that virtual-keyboard-unstable-v1.xml is not in wayland-protocols
|
|
# or wlr-protocols in this nixpkgs and comes from pkgs.hyprland.src.
|
|
dependencies = [ python3.pkgs.pywayland python3.pkgs.xkbcommon ];
|
|
|
|
# Unit tests are wired up in the flake's `checks` so they can run without
|
|
# installing the package; see docs/CONTRACT.md.
|
|
doCheck = false;
|
|
|
|
# Cheap proof that the vendored protocols still bind against this pywayland:
|
|
# importing each runs the scanner-generated `_gen_c()` for its interfaces.
|
|
pythonImportsCheck = [
|
|
"hhstream_pointer.ops"
|
|
"hhstream_pointer.keymap"
|
|
"hhstream_pointer._protocol.wlr_virtual_pointer_unstable_v1"
|
|
"hhstream_pointer._protocol.virtual_keyboard_unstable_v1"
|
|
];
|
|
|
|
meta = {
|
|
description = "Publish a headless Hyprland session's frames on a Unix socket";
|
|
license = lib.licenses.mit;
|
|
mainProgram = "hhstream-server";
|
|
};
|
|
}
|