The VK key-event vocabulary cannot express text an input method COMMITS (autocorrect, gesture typing, non-Latin scripts, emoji). Add a first-class text event and negotiate it: - punktfunk-core: InputKind::TextInput (= 15) carries one Unicode scalar per event in `code`; HOST_CAP_TEXT_INPUT (0x04) in Welcome::host_caps. - Host advertises the cap only where the session's inject backend can type text: Windows SendInput (KEYEVENTF_UNICODE, surrogate-pair aware) and the Linux wlroots backend — a dedicated second zwp_virtual_keyboard whose xkb keymap grows Unicode keysyms on demand (the wtype model), so keymap re-uploads never disturb the main device's layout/modifier state. The KWin-fake-input/libei/gamescope backends can only press layout keycodes, so those sessions don't set the bit and clients keep the VK fallback. - GameStream plane: Moonlight's UTF-8 text packet (MAGIC_UTF8, previously recognized-and-dropped) now decodes to the same TextInput events. - Android: KeyCaptureView picks a real editable InputConnection when the host has the cap — the IME runs its full machinery, mirrored to the host live via common-prefix diffs of the composition (backspaces + new suffix), with setComposingRegion adopting committed text so autocorrect-revert flows diff instead of retyping; newline→Enter, deleteSurroundingText→Backspace/Delete. Older hosts keep the TYPE_NULL raw-key path unchanged. - keymap: media VKs (0xB0-0xB3) → evdev so the Android media keys land on Linux hosts too. Verified: punktfunk-core + host gamestream + pf-inject tests green on Linux (Ubuntu box), clippy clean; Android app+native builds. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
169 lines
7.0 KiB
Rust
169 lines
7.0 KiB
Rust
//! Key/button mapping tables (plan §W4, carved out of the inject facade): the Windows Virtual-Key
|
|
//! → Linux-evdev keyboard map (mirrored bit-for-bit by the Windows SendInput positional table), the
|
|
//! GameStream mouse-button → evdev `BTN_*` map, and the in-process semantic-VK flag. Pure lookup
|
|
//! tables — no state, no OS handles.
|
|
|
|
/// In-process tag on a key event's `flags`: the VK in `code` is **layout-semantic** (already
|
|
/// resolved under the sending client's keyboard layout — the GameStream/Moonlight convention)
|
|
/// rather than the punktfunk-native **US-positional** convention (the physical key's US-layout VK,
|
|
/// which every first-party client sends — the client's local layout never touches the wire).
|
|
/// The Windows injector maps semantic VKs through the foreground app's layout and positional VKs
|
|
/// through a fixed table; conflating the two is exactly the German y↔z / ö→ü scramble.
|
|
/// Set ONLY by `gamestream::input::decode`; the punktfunk/1 ingest strips it from wire events, so
|
|
/// a network client can never flip the host's key-decoding convention.
|
|
pub const KEY_FLAG_SEMANTIC_VK: u32 = 0x8000_0000;
|
|
|
|
/// Map a Windows Virtual-Key code (as sent by Moonlight/GameStream) to a Linux evdev key code.
|
|
pub fn vk_to_evdev(vk: u8) -> Option<u16> {
|
|
match vk {
|
|
// --- Navigation / editing / whitespace ---
|
|
0x08 => Some(14), // VK_BACK -> KEY_BACKSPACE
|
|
0x09 => Some(15), // VK_TAB -> KEY_TAB
|
|
0x0D => Some(28), // VK_RETURN -> KEY_ENTER
|
|
0x13 => Some(119), // VK_PAUSE -> KEY_PAUSE
|
|
0x14 => Some(58), // VK_CAPITAL -> KEY_CAPSLOCK
|
|
0x1B => Some(1), // VK_ESCAPE -> KEY_ESC
|
|
0x20 => Some(57), // VK_SPACE -> KEY_SPACE
|
|
0x21 => Some(104), // VK_PRIOR -> KEY_PAGEUP
|
|
0x22 => Some(109), // VK_NEXT -> KEY_PAGEDOWN
|
|
0x23 => Some(107), // VK_END -> KEY_END
|
|
0x24 => Some(102), // VK_HOME -> KEY_HOME
|
|
0x25 => Some(105), // VK_LEFT -> KEY_LEFT
|
|
0x26 => Some(103), // VK_UP -> KEY_UP
|
|
0x27 => Some(106), // VK_RIGHT -> KEY_RIGHT
|
|
0x28 => Some(108), // VK_DOWN -> KEY_DOWN
|
|
0x2C => Some(99), // VK_SNAPSHOT -> KEY_SYSRQ
|
|
0x2D => Some(110), // VK_INSERT -> KEY_INSERT
|
|
0x2E => Some(111), // VK_DELETE -> KEY_DELETE
|
|
|
|
// --- Consumer/media keys (Android TV remotes, keyboard media rows) ---
|
|
0xB0 => Some(163), // VK_MEDIA_NEXT_TRACK -> KEY_NEXTSONG
|
|
0xB1 => Some(165), // VK_MEDIA_PREV_TRACK -> KEY_PREVIOUSSONG
|
|
0xB2 => Some(166), // VK_MEDIA_STOP -> KEY_STOPCD
|
|
0xB3 => Some(164), // VK_MEDIA_PLAY_PAUSE -> KEY_PLAYPAUSE
|
|
|
|
// --- Generic modifiers ---
|
|
0x10 => Some(42), // VK_SHIFT -> KEY_LEFTSHIFT
|
|
0x11 => Some(29), // VK_CONTROL -> KEY_LEFTCTRL
|
|
0x12 => Some(56), // VK_MENU -> KEY_LEFTALT
|
|
|
|
// --- Digit row (KEY_0 is 11, KEY_1..KEY_9 are 2..10) ---
|
|
0x30 => Some(11), // VK_0
|
|
0x31 => Some(2), // VK_1
|
|
0x32 => Some(3), // VK_2
|
|
0x33 => Some(4), // VK_3
|
|
0x34 => Some(5), // VK_4
|
|
0x35 => Some(6), // VK_5
|
|
0x36 => Some(7), // VK_6
|
|
0x37 => Some(8), // VK_7
|
|
0x38 => Some(9), // VK_8
|
|
0x39 => Some(10), // VK_9
|
|
|
|
// --- Letters A-Z (NOT sequential in evdev) ---
|
|
0x41 => Some(30), // A
|
|
0x42 => Some(48), // B
|
|
0x43 => Some(46), // C
|
|
0x44 => Some(32), // D
|
|
0x45 => Some(18), // E
|
|
0x46 => Some(33), // F
|
|
0x47 => Some(34), // G
|
|
0x48 => Some(35), // H
|
|
0x49 => Some(23), // I
|
|
0x4A => Some(36), // J
|
|
0x4B => Some(37), // K
|
|
0x4C => Some(38), // L
|
|
0x4D => Some(50), // M
|
|
0x4E => Some(49), // N
|
|
0x4F => Some(24), // O
|
|
0x50 => Some(25), // P
|
|
0x51 => Some(16), // Q
|
|
0x52 => Some(19), // R
|
|
0x53 => Some(31), // S
|
|
0x54 => Some(20), // T
|
|
0x55 => Some(22), // U
|
|
0x56 => Some(47), // V
|
|
0x57 => Some(17), // W
|
|
0x58 => Some(45), // X
|
|
0x59 => Some(21), // Y
|
|
0x5A => Some(44), // Z
|
|
|
|
// --- Meta / context-menu ---
|
|
0x5B => Some(125), // VK_LWIN -> KEY_LEFTMETA
|
|
0x5C => Some(126), // VK_RWIN -> KEY_RIGHTMETA
|
|
0x5D => Some(127), // VK_APPS -> KEY_COMPOSE
|
|
|
|
// --- Numpad ---
|
|
0x60 => Some(82), // KP0
|
|
0x61 => Some(79), // KP1
|
|
0x62 => Some(80), // KP2
|
|
0x63 => Some(81), // KP3
|
|
0x64 => Some(75), // KP4
|
|
0x65 => Some(76), // KP5
|
|
0x66 => Some(77), // KP6
|
|
0x67 => Some(71), // KP7
|
|
0x68 => Some(72), // KP8
|
|
0x69 => Some(73), // KP9
|
|
0x6A => Some(55), // VK_MULTIPLY -> KEY_KPASTERISK
|
|
0x6B => Some(78), // VK_ADD -> KEY_KPPLUS
|
|
0x6C => Some(96), // VK_SEPARATOR -> KEY_KPENTER
|
|
0x6D => Some(74), // VK_SUBTRACT -> KEY_KPMINUS
|
|
0x6E => Some(83), // VK_DECIMAL -> KEY_KPDOT
|
|
0x6F => Some(98), // VK_DIVIDE -> KEY_KPSLASH
|
|
|
|
// --- Function keys (F1..F10 = 59..68, F11/F12 = 87/88) ---
|
|
0x70 => Some(59),
|
|
0x71 => Some(60),
|
|
0x72 => Some(61),
|
|
0x73 => Some(62),
|
|
0x74 => Some(63),
|
|
0x75 => Some(64),
|
|
0x76 => Some(65),
|
|
0x77 => Some(66),
|
|
0x78 => Some(67),
|
|
0x79 => Some(68),
|
|
0x7A => Some(87),
|
|
0x7B => Some(88),
|
|
|
|
// --- Locks ---
|
|
0x90 => Some(69), // VK_NUMLOCK -> KEY_NUMLOCK
|
|
0x91 => Some(70), // VK_SCROLL -> KEY_SCROLLLOCK
|
|
|
|
// --- Left/right modifiers ---
|
|
0xA0 => Some(42), // VK_LSHIFT -> KEY_LEFTSHIFT
|
|
0xA1 => Some(54), // VK_RSHIFT -> KEY_RIGHTSHIFT
|
|
0xA2 => Some(29), // VK_LCONTROL -> KEY_LEFTCTRL
|
|
0xA3 => Some(97), // VK_RCONTROL -> KEY_RIGHTCTRL
|
|
0xA4 => Some(56), // VK_LMENU -> KEY_LEFTALT
|
|
0xA5 => Some(100), // VK_RMENU -> KEY_RIGHTALT
|
|
|
|
// --- OEM punctuation (US layout) ---
|
|
0xBA => Some(39), // VK_OEM_1 -> KEY_SEMICOLON
|
|
0xBB => Some(13), // VK_OEM_PLUS -> KEY_EQUAL
|
|
0xBC => Some(51), // VK_OEM_COMMA -> KEY_COMMA
|
|
0xBD => Some(12), // VK_OEM_MINUS -> KEY_MINUS
|
|
0xBE => Some(52), // VK_OEM_PERIOD -> KEY_DOT
|
|
0xBF => Some(53), // VK_OEM_2 -> KEY_SLASH
|
|
0xC0 => Some(41), // VK_OEM_3 -> KEY_GRAVE
|
|
0xDB => Some(26), // VK_OEM_4 -> KEY_LEFTBRACE
|
|
0xDC => Some(43), // VK_OEM_5 -> KEY_BACKSLASH
|
|
0xDD => Some(27), // VK_OEM_6 -> KEY_RIGHTBRACE
|
|
0xDE => Some(40), // VK_OEM_7 -> KEY_APOSTROPHE
|
|
0xE2 => Some(86), // VK_OEM_102 -> KEY_102ND
|
|
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
/// Map a GameStream mouse button id (1=left … 5=X2) to a Linux evdev `BTN_*` code.
|
|
#[cfg(target_os = "linux")]
|
|
pub(crate) fn gs_button_to_evdev(b: u32) -> Option<u32> {
|
|
Some(match b {
|
|
1 => 0x110, // BTN_LEFT
|
|
2 => 0x112, // BTN_MIDDLE
|
|
3 => 0x111, // BTN_RIGHT
|
|
4 => 0x113, // BTN_SIDE (X1)
|
|
5 => 0x114, // BTN_EXTRA (X2)
|
|
_ => return None,
|
|
})
|
|
}
|