mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0308498097 | ||
|
|
d8e3025fb3 | ||
|
|
21e9e690ae | ||
|
|
c489f3056f | ||
|
|
101123797a | ||
|
|
ac9606b872 | ||
|
|
4e91126561 | ||
|
|
10825c1fe0 | ||
|
|
36fd51a9d6 | ||
|
|
9271904be6 | ||
|
|
1004806035 | ||
|
|
af74af0f83 | ||
|
|
2dd3280b7e | ||
|
|
13c92d8f68 | ||
|
|
b0015a6c48 | ||
|
|
c60d9f1bfa | ||
|
|
6032129228 | ||
|
|
7ba71a5540 | ||
|
|
b774bf6b16 | ||
|
|
a22f576005 | ||
|
|
212e4943f9 | ||
|
|
0b3ac4c78e | ||
|
|
8b6de40605 | ||
|
|
7a0c40af73 | ||
|
|
f67de7cc7d | ||
|
|
b9586f226d |
No files matched your search
@@ -127,6 +127,7 @@ viewer does not reconnect them automatically.
|
|||||||
| `UU_NVENC_RGB=0` / `=1` | NVENC 4:2:0 without scaling takes packed BGRA/BGR0 directly (no CPU swscale). Default: on, except when a connected DRM connector belongs to an nvidia-bound card (desktop composited on the encoding GPU; #16 measured 82.6 vs 98 fps at 4K). `0` forces CPU conversion, `1` forces the direct path |
|
| `UU_NVENC_RGB=0` / `=1` | NVENC 4:2:0 without scaling takes packed BGRA/BGR0 directly (no CPU swscale). Default: on, except when a connected DRM connector belongs to an nvidia-bound card (desktop composited on the encoding GPU; #16 measured 82.6 vs 98 fps at 4K). `0` forces CPU conversion, `1` forces the direct path |
|
||||||
| `UU_TOUCH_INPUT` | Android/iOS controllers (connect header `controller_platform` 2/3) send a finger as a left-button drag at absolute positions. Default on the portal backend (gesture): per press, moving past 12 px within 450 ms scrolls (`NotifyPointerAxis` / EIS scroll, content follows the finger, `finish` on release), holding still selects with button 1 down, a short press clicks; needs no touchscreen consent. `touch`: replay as one finger on the portal touchscreen (`NotifyTouch*` / EIS touch; requested where `AvailableDeviceTypes` offers it; consents saved before touch support restore keyboard+pointer only, so the first mobile drag asks once per run in the background via `PortalSession::upgrade_touch`, swapped in only with the touchscreen granted for the same monitor; the saved consent is never removed first). `0`: plain mouse drags |
|
| `UU_TOUCH_INPUT` | Android/iOS controllers (connect header `controller_platform` 2/3) send a finger as a left-button drag at absolute positions. Default on the portal backend (gesture): per press, moving past 12 px within 450 ms scrolls (`NotifyPointerAxis` / EIS scroll, content follows the finger, `finish` on release), holding still selects with button 1 down, a short press clicks; needs no touchscreen consent. `touch`: replay as one finger on the portal touchscreen (`NotifyTouch*` / EIS touch; requested where `AvailableDeviceTypes` offers it; consents saved before touch support restore keyboard+pointer only, so the first mobile drag asks once per run in the background via `PortalSession::upgrade_touch`, swapped in only with the touchscreen granted for the same monitor; the saved consent is never removed first). `0`: plain mouse drags |
|
||||||
| `UU_INPUT_BACKEND` | `auto` (uinput on Wayland/portal when `/dev/uinput` is accessible, udev `uaccess` rule in README) / `uinput` / `native`. X11 keeps XTest (held-key autorepeat handling) |
|
| `UU_INPUT_BACKEND` | `auto` (uinput on Wayland/portal when `/dev/uinput` is accessible, udev `uaccess` rule in README) / `uinput` / `native`. X11 keeps XTest (held-key autorepeat handling) |
|
||||||
|
| `UU_PORTAL_CURSOR_MODE` | portal capture startup cursor mode: `embedded` draws the compositor pointer into the stream, default hidden. `input::inject_move` reports relative/absolute motion; `portal::note_pointer_motion` flips the mode after a 200 ms run of one kind and rebuilds the session via `Session::set_cursor_embedded`, because the portal only reads `cursor_mode` in `SelectSources`. Relative motion gives the viewer no position to draw its own pointer at, so the stream must carry one; absolute motion means the viewer draws its own and an embedded copy would trail it |
|
||||||
| Mac viewer Cmd | With 「使用 macOS 快捷键」 off the Mac viewer sends Cmd=VK_LWIN 0x5B, Option=0xA4, Ctrl=0xA2; connect header `controller_platform`=4 is macOS. For Mac controllers Cmd is held back: Cmd+C/V/A/F/X/Z → Ctrl+key (terminal: Cmd+C/V → Ctrl+Shift+C/V), other combos/alone → Super |
|
| Mac viewer Cmd | With 「使用 macOS 快捷键」 off the Mac viewer sends Cmd=VK_LWIN 0x5B, Option=0xA4, Ctrl=0xA2; connect header `controller_platform`=4 is macOS. For Mac controllers Cmd is held back: Cmd+C/V/A/F/X/Z → Ctrl+key (terminal: Cmd+C/V → Ctrl+Shift+C/V), other combos/alone → Super |
|
||||||
| `UU_TERMINAL_SHORTCUTS=0` | disable Ctrl+V → Ctrl+Shift+V in focused X11 terminals (Mac Cmd and Ctrl both arrive as VK_LCONTROL) |
|
| `UU_TERMINAL_SHORTCUTS=0` | disable Ctrl+V → Ctrl+Shift+V in focused X11 terminals (Mac Cmd and Ctrl both arrive as VK_LCONTROL) |
|
||||||
| `contrib/virtual-desktop/` | Xvfb + session (`UU_VIRTUAL_SESSION`, `UU_VIRTUAL_BUS=user|private`) for monitorless hosts; serve it with `DISPLAY=:99` |
|
| `contrib/virtual-desktop/` | Xvfb + session (`UU_VIRTUAL_SESSION`, `UU_VIRTUAL_BUS=user|private`) for monitorless hosts; serve it with `DISPLAY=:99` |
|
||||||
@@ -163,6 +164,7 @@ for a new QR login.
|
|||||||
| `src/privacy_screen/`, `c_engine/privacy_wallpaper.c` | host privacy screen (RPC 7): desktop-independent controller, recovery record, guard and cover processes; `Backend` per desktop (`kde/`: KWin virtual output, kscreen-doctor, KWin input devices). See docs/privacy-screen.md |
|
| `src/privacy_screen/`, `c_engine/privacy_wallpaper.c` | host privacy screen (RPC 7): desktop-independent controller, recovery record, guard and cover processes; `Backend` per desktop (`kde/`: KWin virtual output, kscreen-doctor, KWin input devices). See docs/privacy-screen.md |
|
||||||
| `src/session_lock.rs`, `c_engine/pam_check.c` | lock state reporting, auto unlock via PAM + logind |
|
| `src/session_lock.rs`, `c_engine/pam_check.c` | lock state reporting, auto unlock via PAM + logind |
|
||||||
| `src/system_actions.rs`, `src/system_metrics.rs` | SimpleAction system commands, mute, auto-lock, SystemMetrics |
|
| `src/system_actions.rs`, `src/system_metrics.rs` | SimpleAction system commands, mute, auto-lock, SystemMetrics |
|
||||||
|
| `src/annotation.rs`, `c_engine/annotation_overlay.c` | viewer annotation (RPC 27 `draw_req` → RpcResponse 23): click-through X11 ARGB overlay, needs a compositing manager |
|
||||||
| `src/initialization.rs`, `src/control_protocol.rs`, `src/protocol.rs` | protobuf encoders/decoders for CONTROL |
|
| `src/initialization.rs`, `src/control_protocol.rs`, `src/protocol.rs` | protobuf encoders/decoders for CONTROL |
|
||||||
| `src/session_ice.rs`, `src/network_diagnostics.rs` | cloud ICE servers, address-free path diagnostics |
|
| `src/session_ice.rs`, `src/network_diagnostics.rs` | cloud ICE servers, address-free path diagnostics |
|
||||||
| `src/desktop_backend.rs`, `src/wayland.rs`, `src/portal*.rs` | backend selection, Hyprland, GNOME/KDE portal |
|
| `src/desktop_backend.rs`, `src/wayland.rs`, `src/portal*.rs` | backend selection, Hyprland, GNOME/KDE portal |
|
||||||
@@ -194,7 +196,7 @@ started a second full host server instead, so check that a subcommand exists in
|
|||||||
- RPC = Message 21 `RpcRequest {1 header{1 request_id}, <case>}`, answered with Message 22
|
- RPC = Message 21 `RpcRequest {1 header{1 request_id}, <case>}`, answered with Message 22
|
||||||
`RpcResponse {1 header (same id), <case>}`. Cases used: 2 capture_setting, 3 fps, 4 video_quality,
|
`RpcResponse {1 header (same id), <case>}`. Cases used: 2 capture_setting, 3 fps, 4 video_quality,
|
||||||
6 resolution, 8 file transfer, 9 clipboard, 15 send_video_track, 16–20 plugins, 21 virtual audio policy,
|
6 resolution, 8 file transfer, 9 clipboard, 15 send_video_track, 16–20 plugins, 21 virtual audio policy,
|
||||||
28/29 terminal.
|
27 draw (annotation; answered on TEXT, a CONTROL reply times out with 9998), 28/29 terminal.
|
||||||
- CaptureSettingRequest: field 1 is an **fps option index** (1=30, 2=60, 3=90); the real frame rate is
|
- CaptureSettingRequest: field 1 is an **fps option index** (1=30, 2=60, 3=90); the real frame rate is
|
||||||
field 18 `fpsCount`. Field 2 quality: 1 Fast, 2 General (高清 2M), 3 HD (超清 8M), 4 Bluray (原画 20M),
|
field 18 `fpsCount`. Field 2 quality: 1 Fast, 2 General (高清 2M), 3 HD (超清 8M), 4 Bluray (原画 20M),
|
||||||
5 Auto, 6 Custom. Resolution: 16/17 pixel size or 5/6, 10 resolution_type (3 = follow remote).
|
5 Auto, 6 Custom. Resolution: 16/17 pixel size or 5/6, 10 resolution_type (3 = follow remote).
|
||||||
|
|||||||
Generated
+1
-1
@@ -2804,7 +2804,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.49"
|
version = "0.2.56"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ab_glyph",
|
"ab_glyph",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
|
|||||||
+2
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.49"
|
version = "0.2.56"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "uuremote-server"
|
default-run = "uuremote-server"
|
||||||
authors = ["uu-remote-linux contributors"]
|
authors = ["uu-remote-linux contributors"]
|
||||||
@@ -63,6 +63,7 @@ ab_glyph = { version = "0.2", optional = true }
|
|||||||
png = { version = "0.18", optional = true }
|
png = { version = "0.18", optional = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
tokio = { version = "1", features = ["test-util"] }
|
||||||
# Synthetic loopback WSS certificates only; both crates already occur in Cargo.lock.
|
# Synthetic loopback WSS certificates only; both crates already occur in Cargo.lock.
|
||||||
rcgen = "0.11.3"
|
rcgen = "0.11.3"
|
||||||
tokio-rustls = { version = "0.26.6", default-features = false, features = ["ring", "tls12"] }
|
tokio-rustls = { version = "0.26.6", default-features = false, features = ["ring", "tls12"] }
|
||||||
|
|||||||
+5
-3
@@ -77,10 +77,11 @@ Protocol strings and messages that come from the UU servers are shown as the ser
|
|||||||
| Mac shortcuts | **Recommended**: turn off 「使用 macOS 快捷键」 (use macOS shortcuts) in the Mac viewer's remote-window menu; then Cmd+C/V/A/F/X/Z work as on a Mac (Cmd+C/V become Ctrl+Shift+C/V in terminals) and Ctrl+C always interrupts. With the option on, the viewer sends Cmd as Ctrl: in a terminal Ctrl+V / Cmd+V paste, Ctrl+C interrupts, copy is Cmd+Shift+C (X11) |
|
| Mac shortcuts | **Recommended**: turn off 「使用 macOS 快捷键」 (use macOS shortcuts) in the Mac viewer's remote-window menu; then Cmd+C/V/A/F/X/Z work as on a Mac (Cmd+C/V become Ctrl+Shift+C/V in terminals) and Ctrl+C always interrupts. With the option on, the viewer sends Cmd as Ctrl: in a terminal Ctrl+V / Cmd+V paste, Ctrl+C interrupts, copy is Cmd+Shift+C (X11) |
|
||||||
| Pointer shape | Remote cursor shape is mirrored to the viewer (X11) |
|
| Pointer shape | Remote cursor shape is mirrored to the viewer (X11) |
|
||||||
| Clipboard | Two-way text sync; Wayland mobile IME text inputs use clipboard paste fallback (see below) |
|
| Clipboard | Two-way text sync; Wayland mobile IME text inputs use clipboard paste fallback (see below) |
|
||||||
|
| Viewer annotation | Strokes drawn with 「批注」 (annotate) in the viewer's watch mode appear on the Linux screen and stream back to the viewer (X11, needs a compositing manager; the overlay lets clicks through); cleared when annotation is turned off or the viewer disconnects. Verified with the Mac viewer 4.42.0; mobile viewers untested |
|
||||||
| Quality / frame rate / resolution | Auto, Original 20M, Ultra 8M, HD 2M, custom; 30/60/90/144 fps; on X11 a resolution choice changes the desktop resolution itself like the official Windows host (xrandr, adding the mode when missing; restored for "original" or on disconnect), `UU_DESKTOP_RESIZE=0` scales in the encoder instead; Wayland scales in the encoder |
|
| Quality / frame rate / resolution | Auto, Original 20M, Ultra 8M, HD 2M, custom; 30/60/90/144 fps; on X11 a resolution choice changes the desktop resolution itself like the official Windows host (xrandr, adding the mode when missing; restored for "original" or on disconnect), `UU_DESKTOP_RESIZE=0` scales in the encoder instead; Wayland scales in the encoder |
|
||||||
| Sound | System audio captured from PulseAudio / PipeWire and sent as Opus |
|
| Sound | System audio captured from PulseAudio / PipeWire and sent as Opus |
|
||||||
| File transfer | Upload, download (including folders), create folder, rename, delete |
|
| File transfer | Upload, download (including folders), create folder, rename, delete; iOS quick uploads use the default receive directory (the current user’s home) |
|
||||||
| Terminal | The official "Terminal" tool, PTY sessions, multiple sessions, rename |
|
| Terminal | The official "Terminal" tool, PTY sessions, multiple sessions, rename, termination and automatic list refresh; input and detach messages from an old connection cannot affect a reattached session |
|
||||||
| Lock state and auto unlock | Lock state is reported to the viewer; with "auto unlock" enabled in the client, the password is verified with PAM and the session is unlocked |
|
| Lock state and auto unlock | Lock state is reported to the viewer; with "auto unlock" enabled in the client, the password is verified with PAM and the session is unlocked |
|
||||||
| Lock after remote session | Stored on the host, so it still applies after reconnecting |
|
| Lock after remote session | Stored on the host, so it still applies after reconnecting |
|
||||||
| Mute host while controlled | Host speakers are muted while the viewer still hears the sound; the previous mute state is restored afterwards |
|
| Mute host while controlled | Host speakers are muted while the viewer still hears the sound; the previous mute state is restored afterwards |
|
||||||
@@ -393,10 +394,11 @@ Common environment variables:
|
|||||||
| `UU_X11_OUTPUT` | Initial X11 monitor name (`xrandr --listmonitors`); default: the primary |
|
| `UU_X11_OUTPUT` | Initial X11 monitor name (`xrandr --listmonitors`); default: the primary |
|
||||||
| `UU_WAYLAND_NO_VIRTUAL_KEYBOARD=1` | Native Wayland skips the virtual keyboard (e.g. Denial reserves it for its input method); keys go through uinput. Without wlr-virtual-pointer the pointer also uses uinput (#72) |
|
| `UU_WAYLAND_NO_VIRTUAL_KEYBOARD=1` | Native Wayland skips the virtual keyboard (e.g. Denial reserves it for its input method); keys go through uinput. Without wlr-virtual-pointer the pointer also uses uinput (#72) |
|
||||||
| `UU_INPUT_BACKEND` | `auto` (default: uinput on Wayland when accessible) / `uinput` / `native` |
|
| `UU_INPUT_BACKEND` | `auto` (default: uinput on Wayland when accessible) / `uinput` / `native` |
|
||||||
|
| `UU_PORTAL_CURSOR_MODE` | Startup cursor mode: `embedded` draws the compositor pointer into the stream; hidden by default. The host switches at runtime as the viewer sends relative or absolute motion. A switch rebuilds the portal session and interrupts picture and input for a moment |
|
||||||
| `UU_TERMINAL_SHORTCUTS=0` | Disable the Ctrl+V paste rewrite in terminal windows |
|
| `UU_TERMINAL_SHORTCUTS=0` | Disable the Ctrl+V paste rewrite in terminal windows |
|
||||||
| `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: opt-in Intel/AMD; `nvenc`: force NVENC; unset or `auto`: a background probe (one synthetic IDR per candidate, 3 s each). With an NVIDIA driver the order is NVENC then CPU; without one the only candidate is CPU and the probe is skipped. A session that starts before the probe finishes uses the previous rule (NVENC if NVIDIA is present, else CPU). On a self-built `--features inproc-av` binary, a process-only failure of NVENC when the in-process engine would try it first on X11 is logged `native_unprobed` and keeps the previous NVENC choice (Wayland, portal, and KMS fall back to CPU). The skipped CPU-only probe is logged `not probed (only candidate)`. A successful probe and that CPU-only skip stay cached while NVIDIA presence matches the report. A later desktop connection whose presence differs starts one background re-probe and still uses the cached encoder until the new result is stored. A hardware-candidate failure (NVENC failed, CPU chosen) is kept for 10 minutes; the next desktop connection after that starts the same re-probe and still uses the cached encoder until the new result is stored. Explicit `cpu` / `vaapi` / `nvenc` does not start the probe. Another failure restarts the 10 minutes. `native_unprobed` is not a temporary failure. A non-`auto` `video_encoder` in `host_settings.json` wins. VAAPI stays out of auto until #33 |
|
| `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: opt-in Intel/AMD; `nvenc`: force NVENC; unset or `auto`: a background probe (one synthetic IDR per candidate, 3 s each). With an NVIDIA driver the order is NVENC then CPU; without one the only candidate is CPU and the probe is skipped. A session that starts before the probe finishes uses the previous rule (NVENC if NVIDIA is present, else CPU). On a self-built `--features inproc-av` binary, a process-only failure of NVENC when the in-process engine would try it first on X11 is logged `native_unprobed` and keeps the previous NVENC choice (Wayland, portal, and KMS fall back to CPU). The skipped CPU-only probe is logged `not probed (only candidate)`. A successful probe and that CPU-only skip stay cached while NVIDIA presence matches the report. A later desktop connection whose presence differs starts one background re-probe and still uses the cached encoder until the new result is stored. A hardware-candidate failure (NVENC failed, CPU chosen) is kept for 10 minutes; the next desktop connection after that starts the same re-probe and still uses the cached encoder until the new result is stored. Explicit `cpu` / `vaapi` / `nvenc` does not start the probe. Another failure restarts the 10 minutes. `native_unprobed` is not a temporary failure. A non-`auto` `video_encoder` in `host_settings.json` wins. VAAPI stays out of auto until #33 |
|
||||||
| `UU_VAAPI_BUFFER_MS` | VAAPI VBV buffer in ms (10-1000, VAAPI only); raise it when keyframes are squeezed into a blur at high resolution |
|
| `UU_VAAPI_BUFFER_MS` | VAAPI VBV buffer in ms (10-1000, VAAPI only); raise it when keyframes are squeezed into a blur at high resolution |
|
||||||
| `UU_NVENC_BUFFER_MS` | NVENC VBV buffer in ms (10-1000, NVENC only, including the in-process engine); the default is 100-500 kbit, set `1000` when high-resolution keyframes blur and flicker once per GOP (#103) |
|
| `UU_NVENC_BUFFER_MS` | NVENC VBV buffer in ms (10-1000, NVENC only, including the in-process engine); the default matches libx264, one second of the bitrate cap within 500-8000 kbit, so high-resolution keyframes no longer blur and flicker once per GOP (#103). Set a small value (e.g. `50`) for a smaller low-latency buffer on a weak link |
|
||||||
| `UU_FFMPEG_ROOT` | Use FFmpeg from this prefix |
|
| `UU_FFMPEG_ROOT` | Use FFmpeg from this prefix |
|
||||||
| `UU_AUDIO=0` | Disable sound; `UU_AUDIO_SOURCE` picks the PulseAudio source |
|
| `UU_AUDIO=0` | Disable sound; `UU_AUDIO_SOURCE` picks the PulseAudio source |
|
||||||
| `UU_REMOTE_ASSIST=0` | Disable remote assistance (no guest assistance before sign-in either) |
|
| `UU_REMOTE_ASSIST=0` | Disable remote assistance (no guest assistance before sign-in either) |
|
||||||
|
|||||||
@@ -66,10 +66,11 @@ UU_LANG=en uuremote-server
|
|||||||
| Mac 快捷键 | **推荐**:在 Mac 远控窗口菜单里关闭「使用 macOS 快捷键」,之后和在 Mac 上一样:Cmd+C/V/A/F/X/Z 是复制、粘贴、全选、查找、剪切、撤销(终端里 Cmd+C/V 自动变成 Ctrl+Shift+C/V),Ctrl+C 在终端里始终是中断。保持开启时,客户端会把 Cmd 和 Ctrl 都当成 Ctrl 发送:终端里 Ctrl+V / Cmd+V 自动转成粘贴,Ctrl+C 是中断,复制用 Cmd+Shift+C(X11) |
|
| Mac 快捷键 | **推荐**:在 Mac 远控窗口菜单里关闭「使用 macOS 快捷键」,之后和在 Mac 上一样:Cmd+C/V/A/F/X/Z 是复制、粘贴、全选、查找、剪切、撤销(终端里 Cmd+C/V 自动变成 Ctrl+Shift+C/V),Ctrl+C 在终端里始终是中断。保持开启时,客户端会把 Cmd 和 Ctrl 都当成 Ctrl 发送:终端里 Ctrl+V / Cmd+V 自动转成粘贴,Ctrl+C 是中断,复制用 Cmd+Shift+C(X11) |
|
||||||
| 鼠标指针样式 | 远端指针形状实时同步(X11) |
|
| 鼠标指针样式 | 远端指针形状实时同步(X11) |
|
||||||
| 剪贴板 | 双向文本同步;Wayland 手机输入法输入通过剪贴板兜底粘贴,见下文 |
|
| 剪贴板 | 双向文本同步;Wayland 手机输入法输入通过剪贴板兜底粘贴,见下文 |
|
||||||
|
| 观看模式批注 | 控制端观看模式下开启「批注」后画的笔迹显示在 Linux 屏幕上,并随画面传回控制端(X11,需要合成器;覆盖层不拦截鼠标);关闭批注或断开连接时清除。已用 Mac 控制端 4.42.0 实测,手机控制端未测 |
|
||||||
| 画质 / 帧率 / 分辨率 | 自动、原画 20M、超清 8M、高清 2M、自定义;30/60/90/144 帧;X11 下切换分辨率会像官方 Windows 被控端一样真正修改桌面分辨率(xrandr,缺少该模式时自动添加;选「原始」或断开后恢复),`UU_DESKTOP_RESIZE=0` 改为仅由编码器缩放;Wayland 仍由编码器缩放 |
|
| 画质 / 帧率 / 分辨率 | 自动、原画 20M、超清 8M、高清 2M、自定义;30/60/90/144 帧;X11 下切换分辨率会像官方 Windows 被控端一样真正修改桌面分辨率(xrandr,缺少该模式时自动添加;选「原始」或断开后恢复),`UU_DESKTOP_RESIZE=0` 改为仅由编码器缩放;Wayland 仍由编码器缩放 |
|
||||||
| 声音 | 采集系统声音(PulseAudio / PipeWire),Opus 编码传到控制端 |
|
| 声音 | 采集系统声音(PulseAudio / PipeWire),Opus 编码传到控制端 |
|
||||||
| 文件传输 | 上传、下载(含文件夹)、新建文件夹、重命名、删除 |
|
| 文件传输 | 上传、下载(含文件夹)、新建文件夹、重命名、删除;iOS 直接上传使用默认接收目录(当前用户的主目录) |
|
||||||
| 终端 | 官方「终端」工具,PTY 会话,支持多会话和重命名 |
|
| 终端 | 官方「终端」工具,PTY 会话,支持多会话、重命名、结束会话和列表自动刷新;重连后旧连接的输入和断开消息不会影响当前会话 |
|
||||||
| 锁屏与自动解锁 | 向控制端上报锁屏状态;开启「自动解锁被控端」后,通过 PAM 校验密码并解锁当前会话 |
|
| 锁屏与自动解锁 | 向控制端上报锁屏状态;开启「自动解锁被控端」后,通过 PAM 校验密码并解锁当前会话 |
|
||||||
| 远程结束后自动锁屏 | 设置保存在本机,重连后依然生效 |
|
| 远程结束后自动锁屏 | 设置保存在本机,重连后依然生效 |
|
||||||
| 被控端静音运行 | 主机扬声器静音,控制端照常能听到声音;结束后恢复原来的音量设置 |
|
| 被控端静音运行 | 主机扬声器静音,控制端照常能听到声音;结束后恢复原来的音量设置 |
|
||||||
@@ -356,10 +357,11 @@ systemctl --user restart uuremote-native.service
|
|||||||
| `UU_X11_OUTPUT` | X11 默认采集的显示器名称(`xrandr --listmonitors`),默认主显示器 |
|
| `UU_X11_OUTPUT` | X11 默认采集的显示器名称(`xrandr --listmonitors`),默认主显示器 |
|
||||||
| `UU_WAYLAND_NO_VIRTUAL_KEYBOARD=1` | 原生 Wayland 不创建虚拟键盘(如 Denial 只把它给自己的输入法),键盘改走 uinput。合成器没有 wlr-virtual-pointer 时鼠标也自动改走 uinput(#72) |
|
| `UU_WAYLAND_NO_VIRTUAL_KEYBOARD=1` | 原生 Wayland 不创建虚拟键盘(如 Denial 只把它给自己的输入法),键盘改走 uinput。合成器没有 wlr-virtual-pointer 时鼠标也自动改走 uinput(#72) |
|
||||||
| `UU_INPUT_BACKEND` | `auto`(默认,Wayland 下可用时用 uinput)/ `uinput` / `native` |
|
| `UU_INPUT_BACKEND` | `auto`(默认,Wayland 下可用时用 uinput)/ `uinput` / `native` |
|
||||||
|
| `UU_PORTAL_CURSOR_MODE` | 启动时的光标模式:`embedded` 让合成器把指针画进抓屏流,默认隐藏。运行中按客户端发来的相对/绝对位移自动切换;每次切换重建一次 portal 会话,画面和输入短暂中断 |
|
||||||
| `UU_TERMINAL_SHORTCUTS=0` | 关闭终端窗口里的 Ctrl+V 粘贴转换 |
|
| `UU_TERMINAL_SHORTCUTS=0` | 关闭终端窗口里的 Ctrl+V 粘贴转换 |
|
||||||
| `UU_VIDEO_ENCODER` | `cpu` 强制 CPU;`vaapi` 显式启用 Intel/AMD 硬编;`nvenc` 强制 NVENC;未设置或 `auto` 时后台探测(每个候选编码一帧,限时 3 秒)。有 NVIDIA 驱动时顺序是 NVENC → CPU;没有 NVIDIA 时只有 CPU,不探测。探测未完成就建流则沿用旧规则(有 NVIDIA 用 NVENC,否则 CPU)。自行编译的 `--features inproc-av` 上,仅 X11 会先走进程内引擎:外部 FFmpeg 探测失败时记为 `native_unprobed`,沿用旧规则(NVENC);Wayland、portal、KMS 回退 CPU。只有 CPU 时跳过探测,记为 `not probed (only candidate)`。探测成功和这种只含 CPU 的跳过会缓存到 NVIDIA 是否存在发生变化为止(`/proc/driver/nvidia/version` 或 `/dev/nvidia0`)。之后的桌面连接在后台再探测一次(不挡住这一路,仍用缓存的编码器)。NVENC 探测失败、选用 CPU 时只缓存 10 分钟;到期后下一次桌面连接同样在后台再探测一次,再次失败则重新计 10 分钟。显式 `cpu` / `vaapi` / `nvenc` 不启动探测。`native_unprobed` 不算失败缓存。优先级低于 `host_settings.json` 里非 `auto` 的 `video_encoder`。VAAPI 要等 #33 解决后才会进入 auto |
|
| `UU_VIDEO_ENCODER` | `cpu` 强制 CPU;`vaapi` 显式启用 Intel/AMD 硬编;`nvenc` 强制 NVENC;未设置或 `auto` 时后台探测(每个候选编码一帧,限时 3 秒)。有 NVIDIA 驱动时顺序是 NVENC → CPU;没有 NVIDIA 时只有 CPU,不探测。探测未完成就建流则沿用旧规则(有 NVIDIA 用 NVENC,否则 CPU)。自行编译的 `--features inproc-av` 上,仅 X11 会先走进程内引擎:外部 FFmpeg 探测失败时记为 `native_unprobed`,沿用旧规则(NVENC);Wayland、portal、KMS 回退 CPU。只有 CPU 时跳过探测,记为 `not probed (only candidate)`。探测成功和这种只含 CPU 的跳过会缓存到 NVIDIA 是否存在发生变化为止(`/proc/driver/nvidia/version` 或 `/dev/nvidia0`)。之后的桌面连接在后台再探测一次(不挡住这一路,仍用缓存的编码器)。NVENC 探测失败、选用 CPU 时只缓存 10 分钟;到期后下一次桌面连接同样在后台再探测一次,再次失败则重新计 10 分钟。显式 `cpu` / `vaapi` / `nvenc` 不启动探测。`native_unprobed` 不算失败缓存。优先级低于 `host_settings.json` 里非 `auto` 的 `video_encoder`。VAAPI 要等 #33 解决后才会进入 auto |
|
||||||
| `UU_VAAPI_BUFFER_MS` | VAAPI 的 VBV 缓冲(10–1000 ms,仅 `UU_VIDEO_ENCODER=vaapi` 时生效);高分辨率下关键帧被压糊时用它换稳定画质 |
|
| `UU_VAAPI_BUFFER_MS` | VAAPI 的 VBV 缓冲(10–1000 ms,仅 `UU_VIDEO_ENCODER=vaapi` 时生效);高分辨率下关键帧被压糊时用它换稳定画质 |
|
||||||
| `UU_NVENC_BUFFER_MS` | NVENC 的 VBV 缓冲(10–1000 ms,仅 NVENC 生效,含进程内引擎);默认 100–500 kbit,1440p 等高分辨率下关键帧被压糊、按 GOP 周期闪烁时设 `1000`(#103) |
|
| `UU_NVENC_BUFFER_MS` | NVENC 的 VBV 缓冲(10–1000 ms,仅 NVENC 生效,含进程内引擎);默认与 libx264 相同,取 1 秒码率上限并限制在 500–8000 kbit,高分辨率关键帧不再被压糊、按 GOP 周期闪烁(#103)。弱网下想要更小的低延迟缓冲可设小值(如 `50`) |
|
||||||
| `UU_FFMPEG_ROOT` | 使用指定目录下的 FFmpeg |
|
| `UU_FFMPEG_ROOT` | 使用指定目录下的 FFmpeg |
|
||||||
| `UU_AUDIO=0` | 关闭声音转发;`UU_AUDIO_SOURCE` 指定 PulseAudio 采集源 |
|
| `UU_AUDIO=0` | 关闭声音转发;`UU_AUDIO_SOURCE` 指定 PulseAudio 采集源 |
|
||||||
| `UU_LOGIN_WINDOW=0` | 凭证缺失时不自动弹出登录窗口 |
|
| `UU_LOGIN_WINDOW=0` | 凭证缺失时不自动弹出登录窗口 |
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ fn main() {
|
|||||||
println!("cargo:rerun-if-changed=c_engine/wayland_transform.h");
|
println!("cargo:rerun-if-changed=c_engine/wayland_transform.h");
|
||||||
println!("cargo:rerun-if-changed=c_engine/portal_clipboard.inc");
|
println!("cargo:rerun-if-changed=c_engine/portal_clipboard.inc");
|
||||||
println!("cargo:rerun-if-changed=c_engine/x11_engine.c");
|
println!("cargo:rerun-if-changed=c_engine/x11_engine.c");
|
||||||
|
println!("cargo:rerun-if-changed=c_engine/annotation_overlay.c");
|
||||||
println!("cargo:rerun-if-changed=c_engine/uinput_keymap.c");
|
println!("cargo:rerun-if-changed=c_engine/uinput_keymap.c");
|
||||||
println!("cargo:rerun-if-changed=c_engine/uinput_keymap.h");
|
println!("cargo:rerun-if-changed=c_engine/uinput_keymap.h");
|
||||||
println!("cargo:rerun-if-changed=c_engine/nvenc_engine.c");
|
println!("cargo:rerun-if-changed=c_engine/nvenc_engine.c");
|
||||||
@@ -34,6 +35,7 @@ fn main() {
|
|||||||
}
|
}
|
||||||
let mut x11_build = cc::Build::new();
|
let mut x11_build = cc::Build::new();
|
||||||
x11_build.file("c_engine/x11_engine.c")
|
x11_build.file("c_engine/x11_engine.c")
|
||||||
|
.file("c_engine/annotation_overlay.c")
|
||||||
.file("c_engine/uinput_keymap.c")
|
.file("c_engine/uinput_keymap.c")
|
||||||
.file("c_engine/clipboard.c")
|
.file("c_engine/clipboard.c")
|
||||||
.file("c_engine/pam_check.c");
|
.file("c_engine/pam_check.c");
|
||||||
|
|||||||
@@ -0,0 +1,137 @@
|
|||||||
|
// Viewer annotation (观看模式「批注」) overlay for X11 desktops.
|
||||||
|
//
|
||||||
|
// A full-screen, override-redirect ARGB window with an empty input shape: strokes from the
|
||||||
|
// viewer are drawn on it, the compositor blends it over the desktop (so the capture shows the
|
||||||
|
// strokes), and every pointer event passes through to the windows below. The window only
|
||||||
|
// exists while the viewer keeps annotation enabled. One thread owns each handle (Xlib is not
|
||||||
|
// initialized for threads here).
|
||||||
|
#include <X11/Xlib.h>
|
||||||
|
#include <X11/Xatom.h>
|
||||||
|
#include <X11/Xutil.h>
|
||||||
|
#include <X11/extensions/shape.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
Display *dpy;
|
||||||
|
Window win, root;
|
||||||
|
Colormap cmap;
|
||||||
|
GC gc;
|
||||||
|
int x, y, width, height;
|
||||||
|
int root_width, root_height;
|
||||||
|
} uu_annotation;
|
||||||
|
|
||||||
|
static int has_compositor(Display *dpy, int screen) {
|
||||||
|
char name[32];
|
||||||
|
snprintf(name, sizeof name, "_NET_WM_CM_S%d", screen);
|
||||||
|
Atom selection = XInternAtom(dpy, name, False);
|
||||||
|
return XGetSelectionOwner(dpy, selection) != None;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Opens the overlay over the root region (x, y, width, height); width/height <= 0 = whole root.
|
||||||
|
// error: 1 display, 2 no compositing manager (an ARGB window would be opaque), 3 no 32-bit visual.
|
||||||
|
void *uu_annotation_open(const char *display, int x, int y, int width, int height, int *error) {
|
||||||
|
*error = 0;
|
||||||
|
Display *dpy = XOpenDisplay(display && *display ? display : NULL);
|
||||||
|
if (!dpy) { *error = 1; return NULL; }
|
||||||
|
int screen = DefaultScreen(dpy);
|
||||||
|
Window root = RootWindow(dpy, screen);
|
||||||
|
if (!has_compositor(dpy, screen)) { XCloseDisplay(dpy); *error = 2; return NULL; }
|
||||||
|
XVisualInfo info;
|
||||||
|
if (!XMatchVisualInfo(dpy, screen, 32, TrueColor, &info)) { XCloseDisplay(dpy); *error = 3; return NULL; }
|
||||||
|
if (width <= 0 || height <= 0) {
|
||||||
|
x = 0; y = 0;
|
||||||
|
width = DisplayWidth(dpy, screen);
|
||||||
|
height = DisplayHeight(dpy, screen);
|
||||||
|
}
|
||||||
|
Colormap cmap = XCreateColormap(dpy, root, info.visual, AllocNone);
|
||||||
|
XSetWindowAttributes attrs;
|
||||||
|
memset(&attrs, 0, sizeof attrs);
|
||||||
|
attrs.override_redirect = True;
|
||||||
|
attrs.background_pixel = 0;
|
||||||
|
attrs.border_pixel = 0;
|
||||||
|
attrs.colormap = cmap;
|
||||||
|
attrs.event_mask = ExposureMask | StructureNotifyMask;
|
||||||
|
Window win = XCreateWindow(dpy, root, x, y, (unsigned)width, (unsigned)height, 0, 32, InputOutput, info.visual,
|
||||||
|
CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWColormap | CWEventMask, &attrs);
|
||||||
|
// Empty input region: clicks, scrolls and hovers reach the windows below.
|
||||||
|
XShapeCombineRectangles(dpy, win, ShapeInput, 0, 0, NULL, 0, ShapeSet, Unsorted);
|
||||||
|
XStoreName(dpy, win, "uu-remote-linux annotation");
|
||||||
|
XClassHint hint = { "uu-remote-annotation", "uu-remote-linux" };
|
||||||
|
XSetClassHint(dpy, win, &hint);
|
||||||
|
// Keep the overlay composited (2 = never unredirect).
|
||||||
|
long bypass = 2;
|
||||||
|
XChangeProperty(dpy, win, XInternAtom(dpy, "_NET_WM_BYPASS_COMPOSITOR", False), XA_CARDINAL, 32,
|
||||||
|
PropModeReplace, (unsigned char *)&bypass, 1);
|
||||||
|
XMapRaised(dpy, win);
|
||||||
|
// Root ConfigureNotify reports RandR resizes, so the caller can rebuild at the new geometry.
|
||||||
|
XSelectInput(dpy, root, StructureNotifyMask);
|
||||||
|
GC gc = XCreateGC(dpy, win, 0, NULL);
|
||||||
|
XFlush(dpy);
|
||||||
|
uu_annotation *a = calloc(1, sizeof *a);
|
||||||
|
if (!a) { XFreeGC(dpy, gc); XDestroyWindow(dpy, win); XFreeColormap(dpy, cmap); XCloseDisplay(dpy); *error = 1; return NULL; }
|
||||||
|
a->dpy = dpy; a->win = win; a->root = root; a->cmap = cmap; a->gc = gc;
|
||||||
|
a->x = x; a->y = y; a->width = width; a->height = height;
|
||||||
|
a->root_width = DisplayWidth(dpy, screen); a->root_height = DisplayHeight(dpy, screen);
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
|
||||||
|
void uu_annotation_size(void *handle, int *width, int *height) {
|
||||||
|
uu_annotation *a = handle;
|
||||||
|
*width = a->width; *height = a->height;
|
||||||
|
}
|
||||||
|
|
||||||
|
// argb: premultiplied 0xAARRGGBB for the 32-bit visual. points: x0,y0,x1,y1,... in window pixels.
|
||||||
|
void uu_annotation_polyline(void *handle, const short *points, int count, unsigned int argb, int line_width) {
|
||||||
|
uu_annotation *a = handle;
|
||||||
|
if (count <= 0) return;
|
||||||
|
XSetForeground(a->dpy, a->gc, argb);
|
||||||
|
XSetLineAttributes(a->dpy, a->gc, line_width < 1 ? 1 : (unsigned)line_width, LineSolid, CapRound, JoinRound);
|
||||||
|
if (count == 1) {
|
||||||
|
int r = line_width / 2;
|
||||||
|
XFillArc(a->dpy, a->win, a->gc, points[0] - r, points[1] - r, (unsigned)line_width, (unsigned)line_width, 0, 360 * 64);
|
||||||
|
} else {
|
||||||
|
XDrawLines(a->dpy, a->win, a->gc, (XPoint *)points, count, CoordModeOrigin);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void uu_annotation_clear(void *handle) {
|
||||||
|
uu_annotation *a = handle;
|
||||||
|
XClearWindow(a->dpy, a->win);
|
||||||
|
}
|
||||||
|
|
||||||
|
void uu_annotation_flush(void *handle) {
|
||||||
|
uu_annotation *a = handle;
|
||||||
|
XRaiseWindow(a->dpy, a->win);
|
||||||
|
XFlush(a->dpy);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Drains pending events: 2 when the root was resized (reopen the overlay), 1 when the window needs
|
||||||
|
// a full repaint (exposed or remapped), else 0.
|
||||||
|
int uu_annotation_poll(void *handle) {
|
||||||
|
uu_annotation *a = handle;
|
||||||
|
int result = 0;
|
||||||
|
while (XPending(a->dpy)) {
|
||||||
|
XEvent event;
|
||||||
|
XNextEvent(a->dpy, &event);
|
||||||
|
if (event.type == ConfigureNotify && event.xconfigure.window == a->root
|
||||||
|
&& (event.xconfigure.width != a->root_width || event.xconfigure.height != a->root_height)) {
|
||||||
|
a->root_width = event.xconfigure.width; a->root_height = event.xconfigure.height;
|
||||||
|
result = 2;
|
||||||
|
} else if (result == 0 && ((event.type == Expose && event.xexpose.count == 0) || event.type == MapNotify)) {
|
||||||
|
result = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
void uu_annotation_close(void *handle) {
|
||||||
|
uu_annotation *a = handle;
|
||||||
|
if (!a) return;
|
||||||
|
XFreeGC(a->dpy, a->gc);
|
||||||
|
XDestroyWindow(a->dpy, a->win);
|
||||||
|
XFreeColormap(a->dpy, a->cmap);
|
||||||
|
XCloseDisplay(a->dpy);
|
||||||
|
free(a);
|
||||||
|
}
|
||||||
@@ -67,6 +67,7 @@ static void selection_owner(GDBusConnection *bus,const gchar *sender,const gchar
|
|||||||
pthread_mutex_lock(&p->lock);
|
pthread_mutex_lock(&p->lock);
|
||||||
g_free(p->clipboard_mime); p->clipboard_mime=selected;
|
g_free(p->clipboard_mime); p->clipboard_mime=selected;
|
||||||
p->clipboard_changed=!owner && selected!=NULL; p->clipboard_revision++;
|
p->clipboard_changed=!owner && selected!=NULL; p->clipboard_revision++;
|
||||||
|
p->clipboard_owns=owner?1:0;
|
||||||
pthread_mutex_unlock(&p->lock);
|
pthread_mutex_unlock(&p->lock);
|
||||||
if (types) g_variant_unref(types);
|
if (types) g_variant_unref(types);
|
||||||
}
|
}
|
||||||
@@ -100,16 +101,46 @@ int uu_portal_clipboard_set(struct uu_portal *p,const uint8_t *text,size_t lengt
|
|||||||
if (!uu_portal_clipboard_ready(p) || length>CLIP_LIMIT || !g_utf8_validate((const char *)text,(gssize)length,NULL)) return -1;
|
if (!uu_portal_clipboard_ready(p) || length>CLIP_LIMIT || !g_utf8_validate((const char *)text,(gssize)length,NULL)) return -1;
|
||||||
char *copy=g_malloc(length+1); memcpy(copy,text,length); copy[length]=0;
|
char *copy=g_malloc(length+1); memcpy(copy,text,length); copy[length]=0;
|
||||||
pthread_mutex_lock(&p->lock);
|
pthread_mutex_lock(&p->lock);
|
||||||
g_free(p->clipboard_text); p->clipboard_text=copy; p->clipboard_length=length;
|
/* Serve the new text while the portal announces it, and restore the old one on failure. */
|
||||||
p->clipboard_changed=0;
|
char *old_text=p->clipboard_text; size_t old_length=p->clipboard_length;
|
||||||
|
uint64_t revision=p->clipboard_revision;
|
||||||
|
p->clipboard_text=copy; p->clipboard_length=length; p->clipboard_changed=0;
|
||||||
pthread_mutex_unlock(&p->lock);
|
pthread_mutex_unlock(&p->lock);
|
||||||
const char *types[]={"text/plain;charset=utf-8","text/plain",NULL};
|
const char *types[]={"text/plain;charset=utf-8","text/plain",NULL};
|
||||||
GVariantBuilder options; g_variant_builder_init(&options,G_VARIANT_TYPE_VARDICT);
|
GVariantBuilder options; g_variant_builder_init(&options,G_VARIANT_TYPE_VARDICT);
|
||||||
g_variant_builder_add(&options,"{sv}","mime_types",g_variant_new_strv(types,-1));
|
g_variant_builder_add(&options,"{sv}","mime_types",g_variant_new_strv(types,-1));
|
||||||
GVariant *reply=g_dbus_connection_call_sync(p->bus,DEST,PATH,CLIPBOARD,"SetSelection",
|
GVariant *reply=g_dbus_connection_call_sync(p->bus,DEST,PATH,CLIPBOARD,"SetSelection",
|
||||||
g_variant_new("(o@a{sv})",p->session,g_variant_builder_end(&options)),NULL,G_DBUS_CALL_FLAGS_NONE,2000,NULL,NULL);
|
g_variant_new("(o@a{sv})",p->session,g_variant_builder_end(&options)),NULL,G_DBUS_CALL_FLAGS_NONE,2000,NULL,NULL);
|
||||||
if (!reply) return -1;
|
if (!reply) {
|
||||||
g_variant_unref(reply); return 0;
|
pthread_mutex_lock(&p->lock);
|
||||||
|
g_free(p->clipboard_text);
|
||||||
|
p->clipboard_text=old_text; p->clipboard_length=old_length;
|
||||||
|
pthread_mutex_unlock(&p->lock);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
g_variant_unref(reply);
|
||||||
|
g_free(old_text);
|
||||||
|
pthread_mutex_lock(&p->lock);
|
||||||
|
/* Another owner may have been reported meanwhile; its newer state must win. */
|
||||||
|
if (p->clipboard_revision==revision) p->clipboard_owns=1;
|
||||||
|
pthread_mutex_unlock(&p->lock);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
/* Hand the text this session is providing to a replacement session, so a session swap (cursor
|
||||||
|
* mode, privacy screen, monitor switch) does not drop the viewer's clipboard. Transfers only
|
||||||
|
* while this session still owns the selection. Returns 0 transferred, 1 nothing to transfer. */
|
||||||
|
int uu_portal_clipboard_copy(struct uu_portal *from, struct uu_portal *to) {
|
||||||
|
if (!from || !to) return -1;
|
||||||
|
/* A session that ended cannot know whether a newer owner took the selection since. */
|
||||||
|
if (!uu_portal_alive(from)) return 1;
|
||||||
|
pthread_mutex_lock(&from->lock);
|
||||||
|
char *copy=(from->clipboard_owns && from->clipboard_text)?g_memdup2(from->clipboard_text,from->clipboard_length+1):NULL;
|
||||||
|
size_t length=from->clipboard_length;
|
||||||
|
pthread_mutex_unlock(&from->lock);
|
||||||
|
if (!copy) return 1;
|
||||||
|
int result=uu_portal_clipboard_set(to,(const uint8_t *)copy,length);
|
||||||
|
g_free(copy);
|
||||||
|
return result==0?0:-1;
|
||||||
}
|
}
|
||||||
int uu_portal_clipboard_poll(struct uu_portal *p,uint8_t *out,size_t capacity) {
|
int uu_portal_clipboard_poll(struct uu_portal *p,uint8_t *out,size_t capacity) {
|
||||||
if (!out || !uu_portal_clipboard_ready(p) || capacity<CLIP_LIMIT) return -1;
|
if (!out || !uu_portal_clipboard_ready(p) || capacity<CLIP_LIMIT) return -1;
|
||||||
|
|||||||
+92
-13
@@ -38,7 +38,8 @@ struct uu_portal {
|
|||||||
char *session;
|
char *session;
|
||||||
char *restore_token;
|
char *restore_token;
|
||||||
guint closed_subscription, clipboard_owner_subscription, clipboard_transfer_subscription, display_subscription;
|
guint closed_subscription, clipboard_owner_subscription, clipboard_transfer_subscription, display_subscription;
|
||||||
int clipboard_enabled, clipboard_changed;
|
int clipboard_enabled, clipboard_changed, clipboard_owns;
|
||||||
|
int cursor_available, cursor_applied;
|
||||||
char *clipboard_text, *clipboard_mime;
|
char *clipboard_text, *clipboard_mime;
|
||||||
size_t clipboard_length;
|
size_t clipboard_length;
|
||||||
uint64_t clipboard_revision;
|
uint64_t clipboard_revision;
|
||||||
@@ -82,6 +83,13 @@ struct uu_portal {
|
|||||||
|
|
||||||
static pthread_once_t pw_once = PTHREAD_ONCE_INIT;
|
static pthread_once_t pw_once = PTHREAD_ONCE_INIT;
|
||||||
static atomic_uint token_sequence = 1;
|
static atomic_uint token_sequence = 1;
|
||||||
|
/* Cursor preference for sessions opened from now on; -1 defers to UU_PORTAL_CURSOR_MODE. */
|
||||||
|
static atomic_int cursor_mode_override = -1;
|
||||||
|
void uu_portal_set_cursor_mode(int mode) { atomic_store(&cursor_mode_override, mode); }
|
||||||
|
/* Cursor mode the last session actually requested: 1 hidden, 2 embedded, 0 when unavailable. */
|
||||||
|
int uu_portal_cursor_mode(struct uu_portal *p) { return p ? p->cursor_applied : 0; }
|
||||||
|
/* Cursor modes the backend advertised for the last session; 0 when the property was unreadable. */
|
||||||
|
int uu_portal_cursor_modes(struct uu_portal *p) { return p ? p->cursor_available : 0; }
|
||||||
static void initialize_pipewire(void) { pw_init(NULL, NULL); }
|
static void initialize_pipewire(void) { pw_init(NULL, NULL); }
|
||||||
static GVariant *empty_options(void) { return g_variant_new_array(G_VARIANT_TYPE("{sv}"), NULL, 0); }
|
static GVariant *empty_options(void) { return g_variant_new_array(G_VARIANT_TYPE("{sv}"), NULL, 0); }
|
||||||
static int open_cancelled(struct uu_portal *p) {
|
static int open_cancelled(struct uu_portal *p) {
|
||||||
@@ -89,10 +97,10 @@ static int open_cancelled(struct uu_portal *p) {
|
|||||||
}
|
}
|
||||||
static int wait_for_first_frame(struct uu_portal *p);
|
static int wait_for_first_frame(struct uu_portal *p);
|
||||||
#include "portal_eis.inc"
|
#include "portal_eis.inc"
|
||||||
/* A uint32 RemoteDesktop property (version, AvailableDeviceTypes); 0 when unreadable. */
|
/* A uint32 portal property; 0 when unreadable. */
|
||||||
static guint remote_property(struct uu_portal *p, const char *name) {
|
static guint interface_property(struct uu_portal *p, const char *interface, const char *name) {
|
||||||
GVariant *reply = g_dbus_connection_call_sync(p->bus, DEST, PATH,
|
GVariant *reply = g_dbus_connection_call_sync(p->bus, DEST, PATH,
|
||||||
"org.freedesktop.DBus.Properties", "Get", g_variant_new("(ss)", REMOTE, name),
|
"org.freedesktop.DBus.Properties", "Get", g_variant_new("(ss)", interface, name),
|
||||||
G_VARIANT_TYPE("(v)"), G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
|
G_VARIANT_TYPE("(v)"), G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
|
||||||
guint result = 0;
|
guint result = 0;
|
||||||
if (reply) {
|
if (reply) {
|
||||||
@@ -102,6 +110,10 @@ static guint remote_property(struct uu_portal *p, const char *name) {
|
|||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
/* A uint32 RemoteDesktop property (version, AvailableDeviceTypes). */
|
||||||
|
static guint remote_property(struct uu_portal *p, const char *name) {
|
||||||
|
return interface_property(p, REMOTE, name);
|
||||||
|
}
|
||||||
static void fail(struct uu_portal *p, int error) {
|
static void fail(struct uu_portal *p, int error) {
|
||||||
pthread_mutex_lock(&p->lock);
|
pthread_mutex_lock(&p->lock);
|
||||||
if (!p->error) p->error = error;
|
if (!p->error) p->error = error;
|
||||||
@@ -179,6 +191,8 @@ static void session_closed(GDBusConnection *bus, const gchar *sender, const gcha
|
|||||||
const gchar *interface, const gchar *signal, GVariant *parameters, gpointer data) {
|
const gchar *interface, const gchar *signal, GVariant *parameters, gpointer data) {
|
||||||
(void)bus; (void)sender; (void)path; (void)interface; (void)signal; (void)parameters;
|
(void)bus; (void)sender; (void)path; (void)interface; (void)signal; (void)parameters;
|
||||||
struct uu_portal *p = data;
|
struct uu_portal *p = data;
|
||||||
|
/* A closed session no longer tracks owner changes, so its cached claim is stale. */
|
||||||
|
pthread_mutex_lock(&p->lock); p->clipboard_owns=0; pthread_mutex_unlock(&p->lock);
|
||||||
atomic_store(&p->closed, 1); fail(p, 9);
|
atomic_store(&p->closed, 1); fail(p, 9);
|
||||||
}
|
}
|
||||||
static void *run_dbus(void *data) {
|
static void *run_dbus(void *data) {
|
||||||
@@ -558,7 +572,7 @@ static int wait_for_first_frame(struct uu_portal *p) {
|
|||||||
while (!p->sequence && !p->error && !open_cancelled(p) && !(p->dma_requested && p->dma_bad)) {
|
while (!p->sequence && !p->error && !open_cancelled(p) && !(p->dma_requested && p->dma_bad)) {
|
||||||
gint64 remaining = deadline - g_get_monotonic_time();
|
gint64 remaining = deadline - g_get_monotonic_time();
|
||||||
if (remaining <= 0) break;
|
if (remaining <= 0) break;
|
||||||
clock_gettime(CLOCK_REALTIME, &until);
|
clock_gettime(CLOCK_MONOTONIC, &until);
|
||||||
gint64 wait_us = MIN(100000, remaining);
|
gint64 wait_us = MIN(100000, remaining);
|
||||||
until.tv_nsec += wait_us * 1000;
|
until.tv_nsec += wait_us * 1000;
|
||||||
if (until.tv_nsec >= 1000000000) { until.tv_sec++; until.tv_nsec -= 1000000000; }
|
if (until.tv_nsec >= 1000000000) { until.tv_sec++; until.tv_nsec -= 1000000000; }
|
||||||
@@ -594,8 +608,14 @@ static int read_stream_result(struct uu_portal *p, GVariant *results) {
|
|||||||
if (streams) g_variant_unref(streams);
|
if (streams) g_variant_unref(streams);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
static void save_restore_token(struct uu_portal *p, void (*save_token)(const char *, void *),
|
||||||
|
uu_portal_save_detailed_fn save_detailed, void *save_data) {
|
||||||
|
if (!p->restore_token) return;
|
||||||
|
if (save_token) save_token(p->restore_token, save_data);
|
||||||
|
if (save_detailed) save_detailed(p->restore_token, save_data, p->has_position, p->position_x, p->position_y);
|
||||||
|
}
|
||||||
static struct uu_portal *open_persist(const char *restore, void (*save_token)(const char *, void *),
|
static struct uu_portal *open_persist(const char *restore, void (*save_token)(const char *, void *),
|
||||||
void *save_data, uu_portal_cancelled_fn cancelled, void *cancel_data,
|
uu_portal_save_detailed_fn save_detailed, void *save_data, uu_portal_cancelled_fn cancelled, void *cancel_data,
|
||||||
int prefer_dmabuf, int *error, uint32_t *width, uint32_t *height, uint32_t source_types) {
|
int prefer_dmabuf, int *error, uint32_t *width, uint32_t *height, uint32_t source_types) {
|
||||||
*error = 0; *width = *height = 0;
|
*error = 0; *width = *height = 0;
|
||||||
struct uu_portal *p = calloc(1, sizeof(*p));
|
struct uu_portal *p = calloc(1, sizeof(*p));
|
||||||
@@ -610,7 +630,12 @@ static struct uu_portal *open_persist(const char *restore, void (*save_token)(co
|
|||||||
for (gchar **desktop = desktops; *desktop; desktop++)
|
for (gchar **desktop = desktops; *desktop; desktop++)
|
||||||
if (!g_ascii_strcasecmp(*desktop, "GNOME")) p->absolute_stream_pixels = 1;
|
if (!g_ascii_strcasecmp(*desktop, "GNOME")) p->absolute_stream_pixels = 1;
|
||||||
g_strfreev(desktops);
|
g_strfreev(desktops);
|
||||||
pthread_mutex_init(&p->lock, NULL); pthread_cond_init(&p->changed, NULL);
|
pthread_mutex_init(&p->lock, NULL);
|
||||||
|
pthread_condattr_t cond_attr;
|
||||||
|
pthread_condattr_init(&cond_attr);
|
||||||
|
pthread_condattr_setclock(&cond_attr, CLOCK_MONOTONIC);
|
||||||
|
pthread_cond_init(&p->changed, &cond_attr);
|
||||||
|
pthread_condattr_destroy(&cond_attr);
|
||||||
p->context = g_main_context_new(); g_main_context_push_thread_default(p->context);
|
p->context = g_main_context_new(); g_main_context_push_thread_default(p->context);
|
||||||
p->bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
|
p->bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
|
||||||
if (!p->bus) { *error = 1; goto done; }
|
if (!p->bus) { *error = 1; goto done; }
|
||||||
@@ -647,7 +672,23 @@ static struct uu_portal *open_persist(const char *restore, void (*save_token)(co
|
|||||||
/* 1 monitor; 4 virtual (KDE creates a KWin virtual output for the stream). */
|
/* 1 monitor; 4 virtual (KDE creates a KWin virtual output for the stream). */
|
||||||
g_variant_builder_add(&options, "{sv}", "types", g_variant_new_uint32(source_types));
|
g_variant_builder_add(&options, "{sv}", "types", g_variant_new_uint32(source_types));
|
||||||
g_variant_builder_add(&options, "{sv}", "multiple", g_variant_new_boolean(FALSE));
|
g_variant_builder_add(&options, "{sv}", "multiple", g_variant_new_boolean(FALSE));
|
||||||
/* Hidden cursor avoids duplicate pointer; supported since ScreenCast v1. */
|
/* Hidden cursor avoids a duplicate pointer in absolute mode: the viewer draws its own where
|
||||||
|
* it last sent motion. Relative mode has no such position, so the game's cursor has to come
|
||||||
|
* from the compositor. The host flips this at runtime through uu_portal_set_cursor_mode();
|
||||||
|
* UU_PORTAL_CURSOR_MODE=embedded is the startup default. Only sent when the backend
|
||||||
|
* advertises embedded, since an unsupported value closes the session. */
|
||||||
|
int cursor_mode = atomic_load(&cursor_mode_override);
|
||||||
|
if (cursor_mode < 0) {
|
||||||
|
const char *wanted = g_getenv("UU_PORTAL_CURSOR_MODE");
|
||||||
|
cursor_mode = (wanted && !g_ascii_strcasecmp(wanted, "embedded")) ? 2 : 1;
|
||||||
|
}
|
||||||
|
/* The host reads these back so its belief matches what the session actually requested. */
|
||||||
|
p->cursor_available = (int)interface_property(p, SCREEN, "AvailableCursorModes");
|
||||||
|
p->cursor_applied = 1;
|
||||||
|
if (cursor_mode == 2 && (p->cursor_available & 2)) {
|
||||||
|
g_variant_builder_add(&options, "{sv}", "cursor_mode", g_variant_new_uint32(2));
|
||||||
|
p->cursor_applied = 2;
|
||||||
|
}
|
||||||
results = request(p, SCREEN, "SelectSources", &options, 1, error);
|
results = request(p, SCREEN, "SelectSources", &options, 1, error);
|
||||||
if (!results) goto done;
|
if (!results) goto done;
|
||||||
g_variant_unref(results);
|
g_variant_unref(results);
|
||||||
@@ -675,7 +716,7 @@ static struct uu_portal *open_persist(const char *restore, void (*save_token)(co
|
|||||||
fprintf(stderr, "Portal persistence: requested=%d restore_attempted=%d token_returned=%d\n",
|
fprintf(stderr, "Portal persistence: requested=%d restore_attempted=%d token_returned=%d\n",
|
||||||
version >= 2, restore && *restore, p->restore_token && *p->restore_token);
|
version >= 2, restore && *restore, p->restore_token && *p->restore_token);
|
||||||
}
|
}
|
||||||
if (!*error && p->restore_token && save_token) save_token(p->restore_token, save_data);
|
if (!*error) save_restore_token(p, save_token, save_detailed, save_data);
|
||||||
g_variant_unref(results);
|
g_variant_unref(results);
|
||||||
if (*error) goto done;
|
if (*error) goto done;
|
||||||
p->main_loop = g_main_loop_new(p->context, FALSE);
|
p->main_loop = g_main_loop_new(p->context, FALSE);
|
||||||
@@ -708,21 +749,27 @@ struct uu_portal *uu_portal_open_persist_cancellable(const char *restore,
|
|||||||
void (*save_token)(const char *, void *), void *save_data,
|
void (*save_token)(const char *, void *), void *save_data,
|
||||||
uu_portal_cancelled_fn cancelled, void *cancel_data,
|
uu_portal_cancelled_fn cancelled, void *cancel_data,
|
||||||
int *error, uint32_t *width, uint32_t *height) {
|
int *error, uint32_t *width, uint32_t *height) {
|
||||||
return open_persist(restore, save_token, save_data, cancelled, cancel_data, 0, error, width, height, 1);
|
return open_persist(restore, save_token, NULL, save_data, cancelled, cancel_data, 0, error, width, height, 1);
|
||||||
}
|
}
|
||||||
struct uu_portal *uu_portal_open_persist_capture(const char *restore,
|
struct uu_portal *uu_portal_open_persist_capture(const char *restore,
|
||||||
void (*save_token)(const char *, void *), void *save_data,
|
void (*save_token)(const char *, void *), void *save_data,
|
||||||
uu_portal_cancelled_fn cancelled, void *cancel_data, int prefer_dmabuf,
|
uu_portal_cancelled_fn cancelled, void *cancel_data, int prefer_dmabuf,
|
||||||
int *error, uint32_t *width, uint32_t *height) {
|
int *error, uint32_t *width, uint32_t *height) {
|
||||||
return open_persist(restore, save_token, save_data, cancelled, cancel_data, prefer_dmabuf, error, width, height, 1);
|
return open_persist(restore, save_token, NULL, save_data, cancelled, cancel_data, prefer_dmabuf, error, width, height, 1);
|
||||||
}
|
}
|
||||||
struct uu_portal *uu_portal_open_persist(const char *restore, void (*save_token)(const char *, void *),
|
struct uu_portal *uu_portal_open_persist(const char *restore, void (*save_token)(const char *, void *),
|
||||||
void *data, int *error, uint32_t *width, uint32_t *height) {
|
void *data, int *error, uint32_t *width, uint32_t *height) {
|
||||||
return open_persist(restore, save_token, data, NULL, NULL, 0, error, width, height, 1);
|
return open_persist(restore, save_token, NULL, data, NULL, NULL, 0, error, width, height, 1);
|
||||||
}
|
}
|
||||||
struct uu_portal *uu_portal_open_virtual(const char *restore, void (*save_token)(const char *, void *),
|
struct uu_portal *uu_portal_open_virtual(const char *restore, void (*save_token)(const char *, void *),
|
||||||
void *data, int *error, uint32_t *width, uint32_t *height) {
|
void *data, int *error, uint32_t *width, uint32_t *height) {
|
||||||
return open_persist(restore, save_token, data, NULL, NULL, 0, error, width, height, 4);
|
return open_persist(restore, save_token, NULL, data, NULL, NULL, 0, error, width, height, 4);
|
||||||
|
}
|
||||||
|
struct uu_portal *uu_portal_open_detailed(const char *restore, uu_portal_save_detailed_fn save_token,
|
||||||
|
void *save_data, uu_portal_cancelled_fn cancelled, void *cancel_data, int prefer_dmabuf,
|
||||||
|
uint32_t source_types, int *error, uint32_t *width, uint32_t *height) {
|
||||||
|
if (source_types != 1 && source_types != 4) { *error = 3; *width = *height = 0; return NULL; }
|
||||||
|
return open_persist(restore, NULL, save_token, save_data, cancelled, cancel_data, prefer_dmabuf, error, width, height, source_types);
|
||||||
}
|
}
|
||||||
struct uu_portal *uu_portal_open_restore(const char *restore, int *error, uint32_t *width, uint32_t *height) {
|
struct uu_portal *uu_portal_open_restore(const char *restore, int *error, uint32_t *width, uint32_t *height) {
|
||||||
return uu_portal_open_persist(restore, NULL, NULL, error, width, height);
|
return uu_portal_open_persist(restore, NULL, NULL, error, width, height);
|
||||||
@@ -820,6 +867,36 @@ int uu_portal_capture_alive(struct uu_portal *p) {
|
|||||||
pthread_mutex_unlock(&p->lock);
|
pthread_mutex_unlock(&p->lock);
|
||||||
return alive;
|
return alive;
|
||||||
}
|
}
|
||||||
|
int uu_portal_wait_frame(struct uu_portal *p, int64_t timeout_us) {
|
||||||
|
if (!p || atomic_load(&p->closed)) return -1;
|
||||||
|
pthread_mutex_lock(&p->lock);
|
||||||
|
if (p->error || atomic_load(&p->closed) || stream_stalled(p)) {
|
||||||
|
pthread_mutex_unlock(&p->lock);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
uint64_t prev_seq = p->sequence;
|
||||||
|
if (timeout_us <= 0) {
|
||||||
|
int ready = (p->sequence != prev_seq);
|
||||||
|
pthread_mutex_unlock(&p->lock);
|
||||||
|
return ready;
|
||||||
|
}
|
||||||
|
struct timespec until;
|
||||||
|
clock_gettime(CLOCK_MONOTONIC, &until);
|
||||||
|
until.tv_sec += timeout_us / 1000000LL;
|
||||||
|
until.tv_nsec += (long)(timeout_us % 1000000LL) * 1000L;
|
||||||
|
if (until.tv_nsec >= 1000000000L) {
|
||||||
|
until.tv_sec += 1;
|
||||||
|
until.tv_nsec -= 1000000000L;
|
||||||
|
}
|
||||||
|
while (p->sequence == prev_seq && !p->error && !atomic_load(&p->closed) && !stream_stalled(p)) {
|
||||||
|
int rc = pthread_cond_timedwait(&p->changed, &p->lock, &until);
|
||||||
|
if (rc != 0) break; // timeout or error
|
||||||
|
}
|
||||||
|
int res = (p->error || atomic_load(&p->closed) || stream_stalled(p)) ? -1 :
|
||||||
|
(p->sequence != prev_seq) ? 1 : 0;
|
||||||
|
pthread_mutex_unlock(&p->lock);
|
||||||
|
return res;
|
||||||
|
}
|
||||||
void uu_portal_input_dispatch(struct uu_portal *p) {
|
void uu_portal_input_dispatch(struct uu_portal *p) {
|
||||||
if (p->ei) portal_eis_dispatch(p);
|
if (p->ei) portal_eis_dispatch(p);
|
||||||
}
|
}
|
||||||
@@ -985,6 +1062,8 @@ int uu_portal_monitors(char *out, size_t length) {
|
|||||||
* captures then report a closed stream until the handle is replaced. */
|
* captures then report a closed stream until the handle is replaced. */
|
||||||
void uu_portal_end(struct uu_portal *p) {
|
void uu_portal_end(struct uu_portal *p) {
|
||||||
if (!p || atomic_exchange(&p->closed, 1)) return;
|
if (!p || atomic_exchange(&p->closed, 1)) return;
|
||||||
|
/* A closed session no longer tracks owner changes, so its cached claim is stale. */
|
||||||
|
pthread_mutex_lock(&p->lock); p->clipboard_owns=0; pthread_mutex_unlock(&p->lock);
|
||||||
if (p->bus && p->session) {
|
if (p->bus && p->session) {
|
||||||
GVariant *reply = g_dbus_connection_call_sync(p->bus, DEST, p->session, SESSION, "Close",
|
GVariant *reply = g_dbus_connection_call_sync(p->bus, DEST, p->session, SESSION, "Close",
|
||||||
NULL, NULL, G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
|
NULL, NULL, G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
|
||||||
|
|||||||
@@ -5,6 +5,9 @@
|
|||||||
#include "dmabuf_frame.h"
|
#include "dmabuf_frame.h"
|
||||||
struct uu_portal;
|
struct uu_portal;
|
||||||
typedef int (*uu_portal_cancelled_fn)(void *data);
|
typedef int (*uu_portal_cancelled_fn)(void *data);
|
||||||
|
typedef void (*uu_portal_save_detailed_fn)(const char *token, void *data, int has_position, int32_t x, int32_t y);
|
||||||
|
/* Reports the granted position alongside the rotated token before video initialization. */
|
||||||
|
struct uu_portal *uu_portal_open_detailed(const char *restore, uu_portal_save_detailed_fn save_token, void *save_data, uu_portal_cancelled_fn cancelled, void *cancel_data, int prefer_dmabuf, uint32_t source_types, int *error, uint32_t *width, uint32_t *height);
|
||||||
/* One object owns one consent/session and one PipeWire stream. */
|
/* One object owns one consent/session and one PipeWire stream. */
|
||||||
struct uu_portal *uu_portal_open(int *error, uint32_t *width, uint32_t *height);
|
struct uu_portal *uu_portal_open(int *error, uint32_t *width, uint32_t *height);
|
||||||
/* Saves the rotated token immediately after Start, before video initialization. */
|
/* Saves the rotated token immediately after Start, before video initialization. */
|
||||||
@@ -15,13 +18,25 @@ struct uu_portal *uu_portal_open_persist_cancellable(const char *restore, void (
|
|||||||
/* Select the capture transport before connecting, including on same-process recovery. */
|
/* Select the capture transport before connecting, including on same-process recovery. */
|
||||||
struct uu_portal *uu_portal_open_persist_capture(const char *restore, void (*save_token)(const char *, void *), void *save_data, uu_portal_cancelled_fn cancelled, void *cancel_data, int prefer_dmabuf, int *error, uint32_t *width, uint32_t *height);
|
struct uu_portal *uu_portal_open_persist_capture(const char *restore, void (*save_token)(const char *, void *), void *save_data, uu_portal_cancelled_fn cancelled, void *cancel_data, int prefer_dmabuf, int *error, uint32_t *width, uint32_t *height);
|
||||||
struct uu_portal *uu_portal_open_restore(const char *restore, int *error, uint32_t *width, uint32_t *height);
|
struct uu_portal *uu_portal_open_restore(const char *restore, int *error, uint32_t *width, uint32_t *height);
|
||||||
|
/* Cursor mode for subsequent sessions: 1 hidden, 2 embedded (the compositor draws the pointer
|
||||||
|
* into the stream). -1 restores the UU_PORTAL_CURSOR_MODE default. The host switches this at
|
||||||
|
* runtime because the viewer cannot draw a pointer of its own during relative motion. */
|
||||||
|
void uu_portal_set_cursor_mode(int mode);
|
||||||
|
/* What the last session requested and what the backend offered, for host bookkeeping. */
|
||||||
|
int uu_portal_cursor_mode(struct uu_portal *portal);
|
||||||
|
int uu_portal_cursor_modes(struct uu_portal *portal);
|
||||||
const char *uu_portal_restore_token(struct uu_portal *portal);
|
const char *uu_portal_restore_token(struct uu_portal *portal);
|
||||||
void uu_portal_close(struct uu_portal *portal);
|
void uu_portal_close(struct uu_portal *portal);
|
||||||
int uu_portal_clipboard_ready(struct uu_portal *portal);
|
int uu_portal_clipboard_ready(struct uu_portal *portal);
|
||||||
int uu_portal_clipboard_set(struct uu_portal *portal, const uint8_t *text, size_t length);
|
int uu_portal_clipboard_set(struct uu_portal *portal, const uint8_t *text, size_t length);
|
||||||
|
/* Offers the text `from` still owns to `to`; 0 transferred, 1 nothing to transfer. */
|
||||||
|
int uu_portal_clipboard_copy(struct uu_portal *from, struct uu_portal *to);
|
||||||
int uu_portal_clipboard_poll(struct uu_portal *portal, uint8_t *text, size_t capacity);
|
int uu_portal_clipboard_poll(struct uu_portal *portal, uint8_t *text, size_t capacity);
|
||||||
int uu_portal_alive(struct uu_portal *portal);
|
int uu_portal_alive(struct uu_portal *portal);
|
||||||
int uu_portal_capture_alive(struct uu_portal *portal);
|
int uu_portal_capture_alive(struct uu_portal *portal);
|
||||||
|
/* Wait for a new frame or status change with a timeout in microseconds.
|
||||||
|
* Returns 1 if a new frame or status change occurred, 0 on timeout, <0 on closed/error. */
|
||||||
|
int uu_portal_wait_frame(struct uu_portal *portal, int64_t timeout_us);
|
||||||
void uu_portal_input_dispatch(struct uu_portal *portal);
|
void uu_portal_input_dispatch(struct uu_portal *portal);
|
||||||
void uu_portal_logical_size(struct uu_portal *portal, uint32_t *width, uint32_t *height);
|
void uu_portal_logical_size(struct uu_portal *portal, uint32_t *width, uint32_t *height);
|
||||||
void uu_portal_reset_frame(struct uu_portal *portal);
|
void uu_portal_reset_frame(struct uu_portal *portal);
|
||||||
|
|||||||
+34
-60
@@ -159,37 +159,10 @@ static size_t symbols_close(const char *text) {
|
|||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
/* Named keycodes the keymap gives no symbol to. Reading the compositor's own list is the only
|
/* Reusable codes for the separate text-only keyboard. Remapping real printable keys on that device
|
||||||
portable way: pressing an unmapped keycode types nothing, and uu_wl_key never matches one
|
keeps the physical-key map untouched and is the form Chromium accepts; the evdev "reserved" codes
|
||||||
because it searches by keysym. Highest first, since uu_wl_key takes the lowest match. */
|
that have no symbol are discarded by some clients. */
|
||||||
static unsigned find_spare_codes(xkb_keycode_t *out,unsigned limit) {
|
static unsigned find_spare_codes(xkb_keycode_t *out,unsigned limit) {
|
||||||
unsigned count=0;
|
|
||||||
xkb_keycode_t min=xkb_keymap_min_keycode(keymap);
|
|
||||||
for(xkb_keycode_t code=xkb_keymap_max_keycode(keymap);code>min && count<limit;code--) {
|
|
||||||
if(code<8 || code>=sizeof(held_keys) || !xkb_keymap_key_get_name(keymap,code)) continue;
|
|
||||||
int mapped=0;
|
|
||||||
for(xkb_level_index_t level=0;level<xkb_keymap_num_levels_for_key(keymap,code,0) && !mapped;level++) {
|
|
||||||
const xkb_keysym_t *syms;
|
|
||||||
if(xkb_keymap_key_get_syms_by_level(keymap,code,0,level,&syms)>0) mapped=1;
|
|
||||||
}
|
|
||||||
if(!mapped) out[count++]=code;
|
|
||||||
}
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
/* A keycode the session keymap already produces this symbol with, unshifted. Typing through it
|
|
||||||
needs no upload, so no client can mistranslate it - and it is how plain latin text and spaces
|
|
||||||
arrive without touching the keymap at all. Spares never match: the pristine keymap leaves them
|
|
||||||
unmapped. */
|
|
||||||
static xkb_keycode_t existing_keycode(xkb_keysym_t symbol) {
|
|
||||||
for(xkb_keycode_t code=xkb_keymap_min_keycode(keymap);code<=xkb_keymap_max_keycode(keymap);code++) {
|
|
||||||
if(code<8 || code>=sizeof(held_keys)) continue;
|
|
||||||
const xkb_keysym_t *syms;
|
|
||||||
if(xkb_keymap_key_get_syms_by_level(keymap,code,0,0,&syms)==1 && syms[0]==symbol) return code;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
static unsigned find_niri_text_codes(xkb_keycode_t *out,unsigned limit) {
|
|
||||||
/* Printable physical keys work in Chromium; reserved evdev codes can be discarded. */
|
|
||||||
static const xkb_keycode_t text_codes[]={24,25,26,27,28,29,30,31,32,33,38,39,40,41,42,43,44,45,46,52,53,54,55,56,57,58};
|
static const xkb_keycode_t text_codes[]={24,25,26,27,28,29,30,31,32,33,38,39,40,41,42,43,44,45,46,52,53,54,55,56,57,58};
|
||||||
unsigned count=0;
|
unsigned count=0;
|
||||||
for(unsigned i=0;i<sizeof(text_codes)/sizeof(text_codes[0]) && count<limit;i++)
|
for(unsigned i=0;i<sizeof(text_codes)/sizeof(text_codes[0]) && count<limit;i++)
|
||||||
@@ -216,8 +189,12 @@ static void release_held_keys_locked(void) {
|
|||||||
key_state and held_keys: pressed and released here. */
|
key_state and held_keys: pressed and released here. */
|
||||||
static int flush_batch(char *buffer,size_t capacity,const char names[][64],const xkb_keycode_t *codes,unsigned count,int *typed) {
|
static int flush_batch(char *buffer,size_t capacity,const char names[][64],const xkb_keycode_t *codes,unsigned count,int *typed) {
|
||||||
release_held_keys_locked();
|
release_held_keys_locked();
|
||||||
if(getenv("NIRI_SOCKET")) {if(sync_display()!=0) return -1;usleep(8000);}
|
if(sync_display()!=0) return -1;
|
||||||
else if(rekey_keyboard()!=0) return -1;
|
usleep(8000);
|
||||||
|
/* A keymap re-sent on a keyboard the client already knows is not handed to it again, so the
|
||||||
|
next batch would still decode with the previous one and repeat it. Re-attaching the text
|
||||||
|
keyboard is what makes the compositor deliver the new keymap. */
|
||||||
|
if(rekey_keyboard()!=0) return -1;
|
||||||
size_t at=keymap_insert;
|
size_t at=keymap_insert;
|
||||||
memcpy(buffer,keymap_text,at);
|
memcpy(buffer,keymap_text,at);
|
||||||
for(unsigned i=0;i<count;i++) {
|
for(unsigned i=0;i<count;i++) {
|
||||||
@@ -227,16 +204,16 @@ static int flush_batch(char *buffer,size_t capacity,const char names[][64],const
|
|||||||
}
|
}
|
||||||
memcpy(buffer+at,keymap_text+keymap_insert,keymap_text_len-keymap_insert);
|
memcpy(buffer+at,keymap_text+keymap_insert,keymap_text_len-keymap_insert);
|
||||||
if(upload_keymap(buffer,at+(keymap_text_len-keymap_insert))!=0) return -1;
|
if(upload_keymap(buffer,at+(keymap_text_len-keymap_insert))!=0) return -1;
|
||||||
if(getenv("NIRI_SOCKET")) zwp_virtual_keyboard_v1_modifiers(keyboard,0,0,0,0);
|
zwp_virtual_keyboard_v1_modifiers(keyboard,0,0,0,0);
|
||||||
if(sync_display()!=0) return -1;
|
if(sync_display()!=0) return -1;
|
||||||
if(getenv("NIRI_SOCKET")) usleep(8000);
|
usleep(8000);
|
||||||
for(unsigned i=0;i<count;i++) { press_keycode(codes[i]); (*typed)++; }
|
for(unsigned i=0;i<count;i++) { press_keycode(codes[i]); (*typed)++; }
|
||||||
if(getenv("NIRI_SOCKET")) {if(sync_display()!=0) return -1;usleep(8000);}
|
if(sync_display()!=0) return -1;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
/* Type UTF-8 like xdotool type does on X11, but on Wayland: characters the session keymap already
|
/* Type UTF-8 like xdotool type does on X11: each character is a Unicode keysym carried by the
|
||||||
has go out as ordinary keycodes, the rest share the spares of one keymap upload (~70 KB, so one
|
text-only keyboard's printable codes, one keymap upload (~70 KB, so one batch per upload) in text
|
||||||
batch per upload), in text order. Never logs the text. */
|
order. Never logs the text. */
|
||||||
static int type_utf8_locked(const char *text) {
|
static int type_utf8_locked(const char *text) {
|
||||||
size_t capacity=keymap_text_len+(size_t)UU_TEXT_SPARE*96+64;
|
size_t capacity=keymap_text_len+(size_t)UU_TEXT_SPARE*96+64;
|
||||||
char *buffer=malloc(capacity);
|
char *buffer=malloc(capacity);
|
||||||
@@ -258,16 +235,11 @@ static int type_utf8_locked(const char *text) {
|
|||||||
if(cp=='\n') sym=0xff0d; /* Return */
|
if(cp=='\n') sym=0xff0d; /* Return */
|
||||||
else if(cp=='\t') sym=0xff09; /* Tab */
|
else if(cp=='\t') sym=0xff09; /* Tab */
|
||||||
else if(cp<0x20 || cp==0x7f || (cp>=0x80 && cp<0xa0)) continue; /* controls carry no text */
|
else if(cp<0x20 || cp==0x7f || (cp>=0x80 && cp<0xa0)) continue; /* controls carry no text */
|
||||||
else if(cp<0x100) sym=cp; /* Latin-1 keysyms equal the code point */
|
/* Every character goes out as a Unicode keysym, including ASCII: a plain Latin-1 keysym
|
||||||
else sym=(xkb_keysym_t)(0x1000000|cp); /* Unicode keysym */
|
is what a running input method composes as pinyin, so "abc" would turn into candidates
|
||||||
xkb_keycode_t existing=getenv("NIRI_SOCKET")?0:existing_keycode(sym);
|
instead of reaching the field. */
|
||||||
if(existing) {
|
else sym=(xkb_keysym_t)(0x1000000|cp);
|
||||||
if(count && flush_batch(buffer,capacity,names,codes,count,&typed)!=0) { failed=1; break; }
|
if(count==spare_count) {
|
||||||
count=0;
|
|
||||||
press_keycode(existing); typed++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if(count==(getenv("NIRI_SOCKET")?spare_count:UU_TEXT_SPARE)) {
|
|
||||||
if(flush_batch(buffer,capacity,names,codes,count,&typed)!=0) { failed=1; break; }
|
if(flush_batch(buffer,capacity,names,codes,count,&typed)!=0) { failed=1; break; }
|
||||||
count=0;
|
count=0;
|
||||||
}
|
}
|
||||||
@@ -278,23 +250,25 @@ static int type_utf8_locked(const char *text) {
|
|||||||
}
|
}
|
||||||
if(!failed && count) failed=flush_batch(buffer,capacity,names,codes,count,&typed)!=0;
|
if(!failed && count) failed=flush_batch(buffer,capacity,names,codes,count,&typed)!=0;
|
||||||
free(buffer);
|
free(buffer);
|
||||||
/* Restore the pristine keymap whatever happened above, so uu_wl_key keeps its own symbol map. */
|
|
||||||
if(getenv("NIRI_SOCKET")) {if(sync_display()!=0) return -1;usleep(8000);}
|
|
||||||
else if(upload_keymap(keymap_text,keymap_text_len)!=0) return -1;
|
|
||||||
return failed && !typed?-1:typed;
|
return failed && !typed?-1:typed;
|
||||||
}
|
}
|
||||||
int uu_wl_type_utf8(const char *text) {
|
int uu_wl_type_utf8(const char *text) {
|
||||||
pthread_mutex_lock(&lock);
|
pthread_mutex_lock(&lock);
|
||||||
int typed=-1;
|
int typed=-1;
|
||||||
if(initialized && text && keymap_text && keymap_insert && spare_count) {
|
if(initialized && text && keymap_text && keymap_insert && spare_count) {
|
||||||
if(getenv("NIRI_SOCKET")) {
|
if(!keyboard_manager) { pthread_mutex_unlock(&lock); return -1; }
|
||||||
/* Only niri uses printable codes on a separate text device; preserve the Hyprland path. */
|
/* Text has its own device: remapping printable codes must not change physical-key input. */
|
||||||
release_held_keys_locked();
|
release_held_keys_locked();
|
||||||
struct zwp_virtual_keyboard_v1 *saved=keyboard;
|
/* The original device stays alive, so key-up alone must not leave its modifiers held. */
|
||||||
keyboard=zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(keyboard_manager,seat);
|
zwp_virtual_keyboard_v1_modifiers(keyboard,
|
||||||
if(keyboard) {typed=type_utf8_locked(text);sync_display();usleep(8000);if(keyboard) zwp_virtual_keyboard_v1_destroy(keyboard);}
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_DEPRESSED),
|
||||||
keyboard=saved;
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LATCHED),
|
||||||
} else typed=type_utf8_locked(text);
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LOCKED),
|
||||||
|
xkb_state_serialize_layout(key_state,XKB_STATE_LAYOUT_EFFECTIVE));
|
||||||
|
struct zwp_virtual_keyboard_v1 *saved=keyboard;
|
||||||
|
keyboard=zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(keyboard_manager,seat);
|
||||||
|
if(keyboard) {typed=type_utf8_locked(text);sync_display();usleep(8000);if(keyboard) zwp_virtual_keyboard_v1_destroy(keyboard);}
|
||||||
|
keyboard=saved;
|
||||||
}
|
}
|
||||||
if(typed>=0 && wl_display_flush(display)<0) typed=-1;
|
if(typed>=0 && wl_display_flush(display)<0) typed=-1;
|
||||||
pthread_mutex_unlock(&lock); return typed;
|
pthread_mutex_unlock(&lock); return typed;
|
||||||
@@ -597,7 +571,7 @@ int uu_wl_init(int32_t *w,int32_t *h) {
|
|||||||
/* Text typing needs unmapped keycodes and a place to declare them. A keymap without either
|
/* Text typing needs unmapped keycodes and a place to declare them. A keymap without either
|
||||||
only costs that path - uu_wl_type_utf8 refuses and the caller keeps its own fallback. */
|
only costs that path - uu_wl_type_utf8 refuses and the caller keeps its own fallback. */
|
||||||
keymap_insert=symbols_close(keymap_text);
|
keymap_insert=symbols_close(keymap_text);
|
||||||
spare_count=getenv("NIRI_SOCKET")?find_niri_text_codes(spare_codes,UU_TEXT_SPARE):find_spare_codes(spare_codes,UU_TEXT_SPARE);
|
spare_count=find_spare_codes(spare_codes,UU_TEXT_SPARE);
|
||||||
}
|
}
|
||||||
initialized=1; *w=width; *h=height; result=0;
|
initialized=1; *w=width; *h=height; result=0;
|
||||||
end:
|
end:
|
||||||
|
|||||||
+36
-4
@@ -331,12 +331,30 @@ static int class_is_terminal(const char *value) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Returns 1 when the focused window belongs to a terminal emulator, else 0. */
|
/* Returns 1 when the focused window belongs to a terminal emulator, else 0.
|
||||||
|
Cached by focused Window with a 1000ms TTL, so key bursts on the same window
|
||||||
|
avoid redundant 12-level XQueryTree walks, while focus changes invalidate immediately. */
|
||||||
int x11_terminal_shortcut_state(void) {
|
int x11_terminal_shortcut_state(void) {
|
||||||
|
static Window cached_window = 0;
|
||||||
|
static int cached_terminal = 0;
|
||||||
|
static struct timespec last_query = {0, 0};
|
||||||
|
|
||||||
if (!g_probe && !(g_probe = XOpenDisplay(NULL))) return 0;
|
if (!g_probe && !(g_probe = XOpenDisplay(NULL))) return 0;
|
||||||
Window focus = 0; int revert = 0;
|
Window focus = 0; int revert = 0;
|
||||||
XGetInputFocus(g_probe, &focus, &revert);
|
XGetInputFocus(g_probe, &focus, &revert);
|
||||||
if (focus == None || focus == PointerRoot) return 0;
|
if (focus == None || focus == PointerRoot) {
|
||||||
|
cached_window = 0;
|
||||||
|
cached_terminal = 0;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct timespec now;
|
||||||
|
clock_gettime(CLOCK_MONOTONIC, &now);
|
||||||
|
long diff_ms = (now.tv_sec - last_query.tv_sec) * 1000 + (now.tv_nsec - last_query.tv_nsec) / 1000000;
|
||||||
|
if (focus == cached_window && last_query.tv_sec != 0 && diff_ms >= 0 && diff_ms < 1000) {
|
||||||
|
return cached_terminal;
|
||||||
|
}
|
||||||
|
|
||||||
Window cur = focus;
|
Window cur = focus;
|
||||||
for (int depth = 0; depth < 12 && cur; depth++) {
|
for (int depth = 0; depth < 12 && cur; depth++) {
|
||||||
XClassHint hint = {0};
|
XClassHint hint = {0};
|
||||||
@@ -344,14 +362,28 @@ int x11_terminal_shortcut_state(void) {
|
|||||||
int terminal = class_is_terminal(hint.res_name) || class_is_terminal(hint.res_class);
|
int terminal = class_is_terminal(hint.res_name) || class_is_terminal(hint.res_class);
|
||||||
if (hint.res_name) XFree(hint.res_name);
|
if (hint.res_name) XFree(hint.res_name);
|
||||||
if (hint.res_class) XFree(hint.res_class);
|
if (hint.res_class) XFree(hint.res_class);
|
||||||
|
cached_window = focus;
|
||||||
|
cached_terminal = terminal;
|
||||||
|
last_query = now;
|
||||||
return terminal;
|
return terminal;
|
||||||
}
|
}
|
||||||
Window root, parent, *children = NULL; unsigned int n = 0;
|
Window root, parent, *children = NULL; unsigned int n = 0;
|
||||||
if (!XQueryTree(g_probe, cur, &root, &parent, &children, &n)) return 0;
|
if (!XQueryTree(g_probe, cur, &root, &parent, &children, &n)) {
|
||||||
|
cached_window = 0;
|
||||||
|
cached_terminal = 0;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
if (children) XFree(children);
|
if (children) XFree(children);
|
||||||
if (parent == root) return 0;
|
if (parent == root) {
|
||||||
|
cached_window = 0;
|
||||||
|
cached_terminal = 0;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
cur = parent;
|
cur = parent;
|
||||||
}
|
}
|
||||||
|
cached_window = focus;
|
||||||
|
cached_terminal = 0;
|
||||||
|
last_query = now;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,13 @@ is aimed at the virtual output's region. Needs GTK3.
|
|||||||
`portal-permissions/kde-virtual`)。窗口会被 KWin 移到虚拟屏,恢复后位置可能变化。
|
`portal-permissions/kde-virtual`)。窗口会被 KWin 移到虚拟屏,恢复后位置可能变化。
|
||||||
The virtual size is KDE's (1920x1080 by default; the first share may ask on the host, later ones
|
The virtual size is KDE's (1920x1080 by default; the first share may ask on the host, later ones
|
||||||
reuse `portal-permissions/kde-virtual`). KWin moves windows to it; positions may change on restore.
|
reuse `portal-permissions/kde-virtual`). KWin moves windows to it; positions may change on restore.
|
||||||
|
- 壁纸模式下新出现的窗口也会被送到虚拟输出:KWin 按它认为"当前活动"的屏幕放置新窗口,而那块
|
||||||
|
屏幕可能是遮罩下的物理屏,远端就看不到。主机在防窥期间保持加载一个 KWin 脚本,新窗口和换了
|
||||||
|
屏幕的窗口都会被送回虚拟输出,恢复时卸载。
|
||||||
|
In wallpaper mode, windows that appear later are also sent to the virtual output: KWin places a
|
||||||
|
new window on the screen it considers active, which may be one under the cover, where the viewer
|
||||||
|
cannot see it. The host keeps a KWin script loaded for the privacy session that sends new windows
|
||||||
|
and windows that changed screen back to the virtual output, and unloads it on restore.
|
||||||
- KDE 不处理虚拟输出共享上的 portal 输入,防窥期间指针、按键和文字改走 uinput(需要 `/dev/uinput`
|
- KDE 不处理虚拟输出共享上的 portal 输入,防窥期间指针、按键和文字改走 uinput(需要 `/dev/uinput`
|
||||||
权限,见 README);手机拖动手势在此期间按普通鼠标拖动处理。
|
权限,见 README);手机拖动手势在此期间按普通鼠标拖动处理。
|
||||||
KDE ignores portal input on a virtual-output share, so pointer, keys and text use uinput while the
|
KDE ignores portal input on a virtual-output share, so pointer, keys and text use uinput while the
|
||||||
@@ -79,6 +86,10 @@ is aimed at the virtual output's region. Needs GTK3.
|
|||||||
The host answers before switching (the viewer times out with 9998); a failed switch sends ReportError -7.
|
The host answers before switching (the viewer times out with 9998); a failed switch sends ReportError -7.
|
||||||
成功不发送 ReportError;Mac 4.43.0 的 -9 是系统会话变化提示,不是防窥成功通知。
|
成功不发送 ReportError;Mac 4.43.0 的 -9 是系统会话变化提示,不是防窥成功通知。
|
||||||
Success does not send ReportError; -9 in Mac 4.43.0 reports a system session change, not privacy success.
|
Success does not send ReportError; -9 in Mac 4.43.0 reports a system session change, not privacy success.
|
||||||
|
- iOS 控制端选“关闭显示器”发 `enable=0, privacy_type=3`:iOS 的 `enable` 是图片模式开关,关屏意图由 `type=3` 表达;iOS“不启用”发 `enable=0, privacy_type=1`。主机只对 iOS 控制端把 `0/3` 归一化为开屏保关屏(日志 `iOS screen-off encoding normalized`),其他控制端(包括已验收的 Android 4.43.0)保持字段 1 的语义。
|
||||||
|
The iOS viewer sends `enable=0, privacy_type=3` for "turn off the display": its `enable` is the picture-mode switch and `type=3` carries the intent; iOS "off" is `enable=0, privacy_type=1`. The host normalizes `0/3` to screen-off for iOS controllers only (log: `iOS screen-off encoding normalized`); other controllers, including the verified Android 4.43.0, keep the field-1 semantics.
|
||||||
|
- Windows 控制端每个 RPC 7 都带 `enable=0`,意图全在 `type`:`0/0` 关闭、`0/2` 屏保、`0/3` 关屏。其中 `0/0` 和 `0/2` 已在 Windows 客户端上实测;主机只对 `controller_platform=1` 做这层归一化(日志 `Windows encoding normalized`),Android 和 macOS 保持字段 1 的语义。
|
||||||
|
The Windows viewer sends every RPC 7 with `enable=0` and carries the intent in `type`: `0/0` off, `0/2` picture, `0/3` screen off. `0/0` and `0/2` were verified live on the Windows client. The host normalizes this for `controller_platform=1` only (log: `Windows encoding normalized`); Android and macOS keep the field-1 semantics.
|
||||||
- RPC 25 `update_screen_saver_req` → RpcResponse 21:开启隐私模式前发送,主机回空成功应答,画面仍用本机壁纸。
|
- RPC 25 `update_screen_saver_req` → RpcResponse 21:开启隐私模式前发送,主机回空成功应答,画面仍用本机壁纸。
|
||||||
Sent before picture mode; answered empty (success), the host keeps its own wallpaper.
|
Sent before picture mode; answered empty (success), the host keeps its own wallpaper.
|
||||||
- FeatureFlag 4 `ff_private_screen` = 2 (ENHANCED_PRIVACY);SettingMetric 4 `private_screen`、7 `private_screen_type`
|
- FeatureFlag 4 `ff_private_screen` = 2 (ENHANCED_PRIVACY);SettingMetric 4 `private_screen`、7 `private_screen_type`
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
观看模式「批注」可用(X11),空闲主机 CPU 占用下降,防窥重启后可恢复输入设备,Portal 授权不再因中途失败丢失。/ Watch-mode annotation works on X11, idle hosts use less CPU, privacy restore survives a reboot, and rotated Portal consent is no longer lost.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **观看模式批注(#174,感谢 @Chr0mium24)**:主机应答官方查看端的批注 RPC(draw_req),笔迹画在可穿透点击的 X11 覆盖窗口上(需要合成器),分辨率变化时覆盖层随之重建。此前查看端报「批注开启失败(9998)」。仅 X11;Wayland、移动端查看端和多显示器未实测。
|
||||||
|
The host answers the official viewer's annotation RPC (draw_req) and draws strokes on a click-through X11 overlay (needs a compositor), rebuilt when the resolution changes. X11 only; Wayland, mobile viewers and multiple monitors untested.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **空闲主机 CPU(#172,感谢 @ferstar)**:指针工作线程在没有指针/滚轮/按键/触控手势时挂起,不再以 4 ms 周期空转(无查看端时约 3% CPU)。/ The pointer worker parks while no pointer, scroll, button or gesture work is pending, instead of ticking every 4 ms (~3% CPU idle).
|
||||||
|
- **防窥重启后恢复输入设备(#173,感谢 @RiverOnVenus)**:KDE 防窥记录按设备名称/产品/厂商匹配,重启后 eventN 编号变化也能重新启用被禁用的设备;已不存在的设备跳过,不再让后续防窥切换一直失败。/ KDE privacy records match devices by name/product/vendor, so a renumbered device is re-enabled after a reboot; missing devices are skipped.
|
||||||
|
- **Portal 授权先持久化(#175,感谢 @jinpeng2700-tech)**:Portal 返回轮换后的一次性 restore token 时立即保存,不再等首帧;采集失败或取消时不会丢失授权、下次重新弹窗。/ Rotated single-use Portal restore tokens are saved as soon as Portal returns them, so a failed or cancelled capture no longer forces a new consent prompt.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI。批注由贡献者用 Mac 查看端 4.42.0 在 Ubuntu 22.04 GNOME X11 实机验证;#172 在报告者的 KDE Wayland 主机验证原始版本;#173 由贡献者在 KDE Plasma 6.8 用 release 构建回放记录验证;#175 为单元/合成测试。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.50_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.50-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.50`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
Hyprland 等 wlroots 合成器上,手机查看端输入法打出的中文/符号文字可正常上屏。/ Phone IME text (Chinese and symbols) from mobile viewers now types correctly on Hyprland and other wlroots compositors.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **wlroots 手机输入法文字(#176,感谢 @Onekki)**:所有 wlroots 合成器统一用独立的虚拟文字键盘,每批文字重新 attach 键位表,ASCII 也按 Unicode keysym 发送;Wayland 下先走 keysym、失败再回退 uinput;输入前释放按键后同步原设备的修饰键状态,避免 Ctrl/Shift 残留。/ All wlroots compositors use a dedicated virtual text keyboard, re-attaching the keymap per batch and sending ASCII as Unicode keysyms; Wayland tries keysyms before falling back to uinput, and modifier state is re-synced to the original device so Ctrl/Shift do not stick.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;贡献者在 Hyprland 0.56.2 + fcitx5 实机验证。niri 等其他 wlroots 合成器未实测。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.51_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.51-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.51`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
性能优化版:降低视频推流与输入通道的拷贝和解析开销,功能行为不变。/ Performance release: less copying and parsing on the video and input paths; no behavior change.
|
||||||
|
|
||||||
|
### 优化 / Improved
|
||||||
|
- **编码帧零拷贝(#184)**:编码完成帧改用共享缓冲,去掉每帧码流深拷贝。/ Encoded frames use shared buffers, removing a per-frame bitstream deep copy.
|
||||||
|
- **H.265 关键帧检测与 RTP 分包(#180、#182)**:IRAP 检测改为单趟流式扫描,HEVC RTP 分包改为零拷贝子切片。/ Single-pass streaming IRAP scan; zero-copy sub-slices for HEVC RTP packetization.
|
||||||
|
- **数据通道解析(#180、#191)**:数据通道包单次解码、CONTROL 通道 JSON 单次解析。/ Single-pass data-channel decoding and single JSON parse on the CONTROL channel.
|
||||||
|
- **X11 终端检测缓存(#182)**:100ms 缓存,减少高频查询。/ 100 ms cache for X11 terminal detection.
|
||||||
|
- **文字输入不阻塞(#189)**:文字输入移到阻塞线程池执行,保持先后顺序。/ Text input runs on the blocking pool while preserving order.
|
||||||
|
|
||||||
|
感谢 @ferstar 提交这批优化。/ Thanks to @ferstar for these optimizations.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;各 PR 经 Codex 审查。未做实机性能对比与 Mac/手机客户端界面验收。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.52_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.52-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.52`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
性能优化版:Wayland(Portal)进程内推流改为事件驱动取帧,功能行为不变。/ Performance release: event-driven frame wait for in-process Wayland (Portal) streaming; no behavior change.
|
||||||
|
|
||||||
|
### 优化 / Improved
|
||||||
|
- **Portal 取帧事件驱动(#193,关闭 #192)**:Portal VAAPI 推流循环由固定间隔休眠轮询改为条件变量等待新帧(单调时钟),新帧到达即编码,空闲时不再空转。/ The Portal VAAPI loop waits on a condition variable (monotonic clock) for new frames instead of sleep-polling, so frames are encoded as soon as they arrive and idle loops no longer spin.
|
||||||
|
|
||||||
|
感谢 @ferstar 提交这项优化。/ Thanks to @ferstar for this optimization.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;PR 经 Codex 审查。未做 Wayland 实机性能对比与 Mac/手机客户端界面验收。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.53_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.53-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.53`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
修复版:终端会话结束/重连归属与列表通知,iOS 上传默认目录与关闭显示器兼容。/ Fix release: terminal session termination, reconnect ownership and list notifications; iOS default upload directory and screen-off compatibility.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **终端会话生命周期(#197)**:结束会话按 JSON `session_id` 选择目标(不再误用帧头请求编号),并清理该 PTY 会话内的全部进程组;Ctrl+C 发往前台进程组;重连后只接受当前附着连接的输入/缩放/信号;会话列表补齐 shell 名称、连接状态与 `last_active_ms`,变更时发送列表通知。/ Terminal close now targets the JSON `session_id` and cleans up all process groups of that PTY session; signals go to the foreground process group; after reconnect only the attached channel may drive the session; the session list gains shell name, attach state and `last_active_ms`, with change notifications.
|
||||||
|
- **iOS 上传默认目录(#198)**:iOS 直接上传时解析 `:/Default` 默认接收目录。/ iOS direct uploads resolve the `:/Default` receive-directory alias.
|
||||||
|
- **iOS 关闭显示器(#199)**:兼容 iOS 端 `enable=0,type=3` 的关闭显示器编码。/ Accept the iOS screen-off encoding (`enable=0,type=3`).
|
||||||
|
|
||||||
|
感谢 @cnetst、@RiverOnVenus 的贡献。/ Thanks to @cnetst and @RiverOnVenus.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;#197 作者在 Ubuntu ARM64 上与官方客户端实测,#199 附 iOS 实机日志。维护方未做 Mac/手机客户端界面验收。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.54_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.54-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.54`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
修复版:Linux → Windows 文本剪贴板。/ Fix release: Linux → Windows text clipboard.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **Windows 文本剪贴板(#200,修 #151)**:主机提供 Windows Unicode 文本(预定义格式 id 13)时不再附带格式名字段,避免 Windows 控制端把它注册成自定义格式、导致无法粘贴。Mac 格式名、UTF-16LE 编码、CRLF 与结尾 NUL 不变。/ The host now offers predefined Windows Unicode text (id 13) without a format name, so the Windows viewer no longer registers it as a custom format and standard paste works. Mac format names, UTF-16LE encoding, CRLF and the terminating NUL are unchanged.
|
||||||
|
|
||||||
|
感谢 @max2787 的贡献。/ Thanks to @max2787.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;#200 作者在 Debian 13 / Xfce 上与官方 Windows 控制端实测双向复制粘贴(中文、多行、emoji)。维护方未做 Windows/Mac 客户端界面验收。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.55_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.55-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.55`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
功能与修复版:防窥模式、嵌入式光标、NVENC 关键帧画质。/ Feature and fix release: privacy mode, embedded cursor, NVENC keyframe quality.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **嵌入式光标跟随控制端鼠标模式(#203)**:Portal 采集在控制端使用相对移动("使用被控端鼠标"、Mac 触控板模式)时请求 `cursor_mode=embedded`,让游戏光标出现在画面中;绝对移动时保持隐藏,只显示一个指针。/ Portal capture asks for an embedded cursor while the viewer sends relative motion, so the game's cursor shows in the picture; absolute motion keeps it hidden.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **Windows 控制端防窥请求(#202)**:Windows 控制端(平台 1)以 `enable=0` 加 `privacy_type` 表达意图,主机现在按类型(2 画面、3 熄屏)开启防窥,不再误判为关闭。/ The host now honours the Windows viewer's `enable=0` + `privacy_type` encoding instead of treating it as "off".
|
||||||
|
- **防窥画面模式下的新窗口(#201)**:KWin 防窥模式中后出现的窗口和桌宠会被移到虚拟输出,不再落在被遮盖的物理屏上而看不见。/ Windows that appear later in KWin picture mode are moved to the virtual output instead of the covered physical screen.
|
||||||
|
- **NVENC 关键帧模糊(#205,修 #103)**:NVENC 的 VBV 缓冲默认按 libx264 规则取码率并限制在 500–8000 kbit,关键帧不再糊;VAAPI 不变,`UU_NVENC_BUFFER_MS` 仍可覆盖。/ The NVENC VBV buffer now follows the libx264 rule (bitrate, clamped to 500–8000 kbit) so keyframes stop blurring; VAAPI is unchanged and `UU_NVENC_BUFFER_MS` still overrides.
|
||||||
|
|
||||||
|
感谢 @RiverOnVenus 与 @Chr0mium24 的贡献。/ Thanks to @RiverOnVenus and @Chr0mium24.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;#201、#203 作者在 KDE Plasma 6 Wayland 上实测。维护方未做 Windows/Mac 客户端界面验收。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.56_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.56-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.56`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,538 @@
|
|||||||
|
//! Viewer annotation (观看模式「批注」): the viewer draws on the host screen while watching.
|
||||||
|
//!
|
||||||
|
//! RpcRequest field 27 `draw_req` (gv_pb.DrawRequest) is answered with RpcResponse field 23
|
||||||
|
//! `draw_resp` (gv_pb.DrawResponse). Schema read from the official Mac 4.42.0 build
|
||||||
|
//! (UURemoteService: SwiftProtobuf name maps and Swift field metadata):
|
||||||
|
//!
|
||||||
|
//! - DrawRequest { oneof: 1 stroke_request, 2 clear_request, 3 toggle_request }
|
||||||
|
//! - DrawResponse { oneof: 1 stroke_response, 2 clear_response, 3 toggle_response }
|
||||||
|
//! - DrawStrokeRequest { 1 uint32 stroke_id, 2 repeated DrawPoint points, 3 optional int32 screen_id,
|
||||||
|
//! 4 optional float line_width, 5 optional uint32 color }; DrawPoint { 1 float x, 2 float y }
|
||||||
|
//! - DrawClearRequest { 1 ClearType clear_type (1 all, 2 by id), 2 uint32 stroke_id, 3 optional int32 screen_id }
|
||||||
|
//! - DrawToggleRequest { 1 bool enable }
|
||||||
|
//! - Draw*Response { 1 int32 error_code }, 0 = success
|
||||||
|
//!
|
||||||
|
//! The Mac viewer sends normalized points (`annotationNormalizedPoint`) in batches that share a
|
||||||
|
//! stroke id (`flushAnnotationStrokePoints`), clears before a screen switch and toggles off on exit.
|
||||||
|
//! Without this handler the request went unanswered and the viewer showed 「批注开启失败」.
|
||||||
|
//!
|
||||||
|
//! The strokes are drawn on a click-through X11 overlay (c_engine/annotation_overlay.c), so the
|
||||||
|
//! person at the host sees them and the capture streams them back to the viewer.
|
||||||
|
|
||||||
|
use crate::protocol::{decode_wire, WireField, WireValue};
|
||||||
|
use std::sync::mpsc;
|
||||||
|
use std::sync::{Mutex, OnceLock};
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
pub const RPC_REQUEST: u32 = 27;
|
||||||
|
pub const RPC_RESPONSE: u64 = 23;
|
||||||
|
|
||||||
|
const SLOT_STROKE: u64 = 1;
|
||||||
|
const SLOT_CLEAR: u64 = 2;
|
||||||
|
const SLOT_TOGGLE: u64 = 3;
|
||||||
|
|
||||||
|
/// error_code: the overlay cannot be shown (no X display, no compositor or no ARGB visual).
|
||||||
|
const ERR_UNAVAILABLE: i32 = 1;
|
||||||
|
|
||||||
|
/// iOS system red, opaque: the viewer sends no color of its own (Mac 4.42.0).
|
||||||
|
const DEFAULT_COLOR: u32 = 0xFFFF_3B30;
|
||||||
|
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
extern "C" {
|
||||||
|
fn uu_annotation_open(display: *const libc::c_char, x: libc::c_int, y: libc::c_int, width: libc::c_int,
|
||||||
|
height: libc::c_int, error: *mut libc::c_int) -> *mut libc::c_void;
|
||||||
|
fn uu_annotation_size(handle: *mut libc::c_void, width: *mut libc::c_int, height: *mut libc::c_int);
|
||||||
|
fn uu_annotation_polyline(handle: *mut libc::c_void, points: *const i16, count: libc::c_int, argb: libc::c_uint,
|
||||||
|
line_width: libc::c_int);
|
||||||
|
fn uu_annotation_clear(handle: *mut libc::c_void);
|
||||||
|
fn uu_annotation_flush(handle: *mut libc::c_void);
|
||||||
|
fn uu_annotation_poll(handle: *mut libc::c_void) -> libc::c_int;
|
||||||
|
fn uu_annotation_close(handle: *mut libc::c_void);
|
||||||
|
}
|
||||||
|
|
||||||
|
// macOS development builds: no X display, so the overlay never opens.
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
unsafe fn uu_annotation_open(_: *const libc::c_char, _: libc::c_int, _: libc::c_int, _: libc::c_int, _: libc::c_int,
|
||||||
|
error: *mut libc::c_int) -> *mut libc::c_void { *error = 1; std::ptr::null_mut() }
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
unsafe fn uu_annotation_size(_: *mut libc::c_void, _: *mut libc::c_int, _: *mut libc::c_int) {}
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
unsafe fn uu_annotation_polyline(_: *mut libc::c_void, _: *const i16, _: libc::c_int, _: libc::c_uint, _: libc::c_int) {}
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
unsafe fn uu_annotation_clear(_: *mut libc::c_void) {}
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
unsafe fn uu_annotation_flush(_: *mut libc::c_void) {}
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
unsafe fn uu_annotation_poll(_: *mut libc::c_void) -> libc::c_int { 0 }
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
unsafe fn uu_annotation_close(_: *mut libc::c_void) {}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
pub enum Request {
|
||||||
|
Stroke { id: u32, points: Vec<(f32, f32)>, screen: Option<i32>, width: Option<f32>, color: Option<u32> },
|
||||||
|
Clear { all: bool, id: u32 },
|
||||||
|
Toggle(bool),
|
||||||
|
}
|
||||||
|
|
||||||
|
fn varint_field(fields: &[WireField], number: u32) -> Option<u64> {
|
||||||
|
fields.iter().find_map(|f| match (f.number, &f.value) { (n, WireValue::Varint(v)) if n == number => Some(*v), _ => None })
|
||||||
|
}
|
||||||
|
|
||||||
|
fn float_field(fields: &[WireField], number: u32) -> Option<f32> {
|
||||||
|
fields.iter().find_map(|f| match (f.number, &f.value) { (n, WireValue::Fixed32(b)) if n == number => Some(f32::from_le_bytes(*b)), _ => None })
|
||||||
|
}
|
||||||
|
|
||||||
|
fn bytes_field<'a>(fields: &'a [WireField<'a>], number: u32) -> Option<&'a [u8]> {
|
||||||
|
fields.iter().find_map(|f| match (f.number, &f.value) { (n, WireValue::Bytes(b)) if n == number => Some(*b), _ => None })
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Decodes a DrawRequest body (the bytes of RpcRequest field 27).
|
||||||
|
pub fn parse(body: &[u8]) -> Option<Request> {
|
||||||
|
let fields = decode_wire(body).ok()?;
|
||||||
|
if let Some(stroke) = bytes_field(&fields, 1) {
|
||||||
|
let s = decode_wire(stroke).ok()?;
|
||||||
|
let mut points = Vec::new();
|
||||||
|
for field in &s {
|
||||||
|
if let (2, WireValue::Bytes(point)) = (field.number, &field.value) {
|
||||||
|
let p = decode_wire(point).ok()?;
|
||||||
|
points.push((float_field(&p, 1).unwrap_or(0.0), float_field(&p, 2).unwrap_or(0.0)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Some(Request::Stroke {
|
||||||
|
id: varint_field(&s, 1).unwrap_or(0) as u32,
|
||||||
|
points,
|
||||||
|
screen: varint_field(&s, 3).map(|v| v as i32),
|
||||||
|
width: float_field(&s, 4),
|
||||||
|
color: varint_field(&s, 5).map(|v| v as u32),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if let Some(clear) = bytes_field(&fields, 2) {
|
||||||
|
let c = decode_wire(clear).ok()?;
|
||||||
|
let kind = varint_field(&c, 1).unwrap_or(0);
|
||||||
|
return Some(Request::Clear { all: kind != 2, id: varint_field(&c, 2).unwrap_or(0) as u32 });
|
||||||
|
}
|
||||||
|
if let Some(toggle) = bytes_field(&fields, 3) {
|
||||||
|
let t = decode_wire(toggle).ok()?;
|
||||||
|
return Some(Request::Toggle(varint_field(&t, 1).unwrap_or(0) != 0));
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
fn varint(mut v: u64, out: &mut Vec<u8>) {
|
||||||
|
while v >= 128 { out.push((v as u8 & 127) | 128); v >>= 7; }
|
||||||
|
out.push(v as u8);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn bytes(field: u64, v: &[u8], out: &mut Vec<u8>) {
|
||||||
|
varint(field << 3 | 2, out);
|
||||||
|
varint(v.len() as u64, out);
|
||||||
|
out.extend_from_slice(v);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// RpcResponse { 1 response_header (echoed request header), 23 DrawResponse { slot: { 1 error_code } } }.
|
||||||
|
pub fn encode_response(header: &[u8], slot: u64, error_code: i32) -> Vec<u8> {
|
||||||
|
let mut result = Vec::new();
|
||||||
|
if error_code != 0 { varint(1 << 3, &mut result); varint(error_code as i64 as u64, &mut result); }
|
||||||
|
let mut draw = Vec::new();
|
||||||
|
bytes(slot, &result, &mut draw);
|
||||||
|
let mut out = Vec::new();
|
||||||
|
bytes(1, header, &mut out);
|
||||||
|
bytes(RPC_RESPONSE, &draw, &mut out);
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
/// (request header, DrawRequest body) of an RpcRequest 27 draw_req; None for every other RPC.
|
||||||
|
pub fn draw_request(rpc: &[WireField]) -> Option<(Vec<u8>, Vec<u8>)> {
|
||||||
|
let body = bytes_field(rpc, RPC_REQUEST)?;
|
||||||
|
Some((bytes_field(rpc, 1).unwrap_or(&[]).to_vec(), body.to_vec()))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The peer a request came from: the address of that peer's `PeerActions`. Its session tracker
|
||||||
|
/// holds the Arc until it has sent its last reset, so a newer peer cannot reuse the key meanwhile.
|
||||||
|
pub type Owner = usize;
|
||||||
|
|
||||||
|
pub fn owner<T>(peer: &std::sync::Arc<T>) -> Owner { std::sync::Arc::as_ptr(peer) as *const () as usize }
|
||||||
|
|
||||||
|
/// Applies a draw_req from `owner` and builds its RpcResponse. Blocking: a toggle waits for the overlay.
|
||||||
|
pub fn respond(owner: Owner, header: &[u8], body: &[u8]) -> Vec<u8> {
|
||||||
|
let Some(request) = parse(body) else {
|
||||||
|
log::warn!("Annotation request not understood: {}", crate::protocol::wire_shape(body, 3));
|
||||||
|
return encode_response(header, SLOT_TOGGLE, ERR_UNAVAILABLE);
|
||||||
|
};
|
||||||
|
let (slot, code) = match request {
|
||||||
|
Request::Toggle(enable) => {
|
||||||
|
let (reply, result) = mpsc::channel();
|
||||||
|
send(Command::Toggle { owner, enable, reply });
|
||||||
|
// Opening the overlay is a few X round trips; never stall the channel for long.
|
||||||
|
let code = result.recv_timeout(Duration::from_secs(2)).unwrap_or(ERR_UNAVAILABLE);
|
||||||
|
log::info!("Annotation toggle: enable={} error_code={}", enable, code);
|
||||||
|
(SLOT_TOGGLE, code)
|
||||||
|
}
|
||||||
|
Request::Clear { all, id } => {
|
||||||
|
log::info!("Annotation clear: all={} stroke_present={}", all, id != 0);
|
||||||
|
send(Command::Clear { owner, all, id });
|
||||||
|
(SLOT_CLEAR, 0)
|
||||||
|
}
|
||||||
|
stroke @ Request::Stroke { .. } => {
|
||||||
|
send(Command::Stroke(owner, stroke));
|
||||||
|
(SLOT_STROKE, 0)
|
||||||
|
}
|
||||||
|
};
|
||||||
|
encode_response(header, slot, code)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `owner`'s desktop session ended: remove its overlay and strokes. A delayed reset from a replaced
|
||||||
|
/// peer leaves the annotation of the viewer that took over alone.
|
||||||
|
pub fn reset(owner: Owner) {
|
||||||
|
if let Some(worker) = WORKER.get() {
|
||||||
|
let _ = worker.lock().unwrap().send(Command::Reset(owner));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
enum Command {
|
||||||
|
Toggle { owner: Owner, enable: bool, reply: mpsc::Sender<i32> },
|
||||||
|
Stroke(Owner, Request),
|
||||||
|
Clear { owner: Owner, all: bool, id: u32 },
|
||||||
|
Reset(Owner),
|
||||||
|
/// Tests: (owner, overlay size, stroke count) while an overlay is shown.
|
||||||
|
#[cfg(test)]
|
||||||
|
Probe(mpsc::Sender<Option<(Owner, i32, i32, usize)>>),
|
||||||
|
}
|
||||||
|
|
||||||
|
static WORKER: OnceLock<Mutex<mpsc::Sender<Command>>> = OnceLock::new();
|
||||||
|
|
||||||
|
fn send(command: Command) {
|
||||||
|
let worker = WORKER.get_or_init(|| {
|
||||||
|
let (tx, rx) = mpsc::channel();
|
||||||
|
std::thread::Builder::new().name("annotation".into()).spawn(move || run(rx)).expect("annotation thread");
|
||||||
|
Mutex::new(tx)
|
||||||
|
});
|
||||||
|
let _ = worker.lock().unwrap().send(command);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A stroke keeps the viewer's points, so it can be laid out again when the overlay is rebuilt.
|
||||||
|
struct Stroke { id: u32, normalized: bool, argb: u32, line: Option<f32>, raw: Vec<(f32, f32)>, width: i32, points: Vec<i16> }
|
||||||
|
|
||||||
|
impl Stroke {
|
||||||
|
fn new(id: u32, raw: Vec<(f32, f32)>, line: Option<f32>, color: Option<u32>) -> Self {
|
||||||
|
let normalized = raw.iter().all(|&(x, y)| x.abs() <= 1.5 && y.abs() <= 1.5);
|
||||||
|
Self { id, normalized, argb: argb(color), line, raw, width: 0, points: Vec::new() }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Overlay pixels for all points; a single point is a dot (a zero-length round-capped segment).
|
||||||
|
fn layout(&mut self, width: i32, height: i32) {
|
||||||
|
self.width = line_width(self.line, height);
|
||||||
|
self.points = to_pixels(&self.raw, self.normalized, width, height);
|
||||||
|
if self.points.len() == 2 { self.points.extend_from_within(0..2); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Overlay { handle: *mut libc::c_void, screen: Option<i32>, region: (i32, i32, i32, i32), width: i32, height: i32 }
|
||||||
|
|
||||||
|
impl Overlay {
|
||||||
|
fn open(screen: Option<i32>) -> Result<Self, i32> {
|
||||||
|
let region = region(screen);
|
||||||
|
let display = crate::capture::x11_display().and_then(|d| std::ffi::CString::new(d).ok());
|
||||||
|
let mut error = 0;
|
||||||
|
let handle = unsafe {
|
||||||
|
uu_annotation_open(display.as_ref().map_or(std::ptr::null(), |d| d.as_ptr()), region.0, region.1, region.2, region.3, &mut error)
|
||||||
|
};
|
||||||
|
if handle.is_null() { return Err(error); }
|
||||||
|
let (mut width, mut height) = (0, 0);
|
||||||
|
unsafe { uu_annotation_size(handle, &mut width, &mut height) };
|
||||||
|
log::info!("Annotation overlay shown: {}x{}+{}+{}", width, height, region.0, region.1);
|
||||||
|
Ok(Self { handle, screen, region, width, height })
|
||||||
|
}
|
||||||
|
|
||||||
|
fn draw(&self, stroke: &Stroke, from: usize) {
|
||||||
|
let points = &stroke.points[from.min(stroke.points.len())..];
|
||||||
|
if points.len() < 2 { return; }
|
||||||
|
unsafe { uu_annotation_polyline(self.handle, points.as_ptr(), (points.len() / 2) as libc::c_int, stroke.argb, stroke.width) };
|
||||||
|
}
|
||||||
|
|
||||||
|
fn repaint(&self, strokes: &[Stroke]) {
|
||||||
|
unsafe { uu_annotation_clear(self.handle) };
|
||||||
|
for stroke in strokes { self.draw(stroke, 0); }
|
||||||
|
self.flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn flush(&self) { unsafe { uu_annotation_flush(self.handle) } }
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for Overlay {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
unsafe { uu_annotation_close(self.handle) };
|
||||||
|
log::info!("Annotation overlay removed");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The capture region a screen id maps to: an X11 multi-screen monitor, else the whole root (0 size).
|
||||||
|
fn region(screen: Option<i32>) -> (i32, i32, i32, i32) {
|
||||||
|
if crate::wayland::x11_multiscreen() {
|
||||||
|
let id = screen.filter(|s| *s >= 0).map_or_else(crate::wayland::selected, |s| s as usize);
|
||||||
|
if let Some(o) = crate::wayland::source(id) { return (o.x, o.y, o.width as i32, o.height as i32); }
|
||||||
|
}
|
||||||
|
(0, 0, 0, 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Premultiplied ARGB for the 32-bit visual; a color without alpha is opaque.
|
||||||
|
pub fn argb(color: Option<u32>) -> u32 {
|
||||||
|
let c = color.unwrap_or(DEFAULT_COLOR);
|
||||||
|
let c = if c >> 24 == 0 { c | 0xFF00_0000 } else { c };
|
||||||
|
let a = c >> 24;
|
||||||
|
let mul = |shift: u32| (((c >> shift) & 0xFF) * a / 255) << shift;
|
||||||
|
a << 24 | mul(16) | mul(8) | mul(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Line width in overlay pixels: values up to 1 are a fraction of the height, larger ones pixels.
|
||||||
|
pub fn line_width(width: Option<f32>, height: i32) -> i32 {
|
||||||
|
match width {
|
||||||
|
Some(w) if w.is_finite() && w > 0.0 => (if w <= 1.0 { w * height as f32 } else { w }).round().clamp(1.0, 64.0) as i32,
|
||||||
|
_ => (height as f32 / 360.0).round().max(3.0) as i32,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn to_pixels(points: &[(f32, f32)], normalized: bool, width: i32, height: i32) -> Vec<i16> {
|
||||||
|
let mut out = Vec::with_capacity(points.len() * 2);
|
||||||
|
for &(x, y) in points {
|
||||||
|
let (x, y) = if normalized { (x * width as f32, y * height as f32) } else { (x, y) };
|
||||||
|
let clamp = |v: f32| if v.is_finite() { v.round().clamp(-16_000.0, 16_000.0) as i16 } else { 0 };
|
||||||
|
out.push(clamp(x));
|
||||||
|
out.push(clamp(y));
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The worker's state: one overlay at a time, owned by the peer that last toggled it on or drew.
|
||||||
|
#[derive(Default)]
|
||||||
|
struct Annotation { overlay: Option<Overlay>, strokes: Vec<Stroke>, owner: Owner, unavailable: bool, logged: usize }
|
||||||
|
|
||||||
|
impl Annotation {
|
||||||
|
fn close(&mut self) { self.overlay = None; self.strokes.clear(); }
|
||||||
|
|
||||||
|
/// A request from another peer: the newer viewer takes over and the old strokes go.
|
||||||
|
fn claim(&mut self, owner: Owner) {
|
||||||
|
if self.owner != owner { self.close(); self.owner = owner; self.unavailable = false; }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn open(&mut self, screen: Option<i32>) -> bool {
|
||||||
|
match Overlay::open(screen) {
|
||||||
|
Ok(o) => { self.overlay = Some(o); true }
|
||||||
|
Err(error) => { log::warn!("Annotation overlay unavailable: error={}", error); self.unavailable = true; false }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn stroke(&mut self, id: u32, points: Vec<(f32, f32)>, screen: Option<i32>, width: Option<f32>, color: Option<u32>) {
|
||||||
|
if self.overlay.as_ref().is_some_and(|o| o.region != region(screen)) { self.close(); }
|
||||||
|
// A stroke without a toggle (e.g. after a host restart) shows the overlay anyway, but only
|
||||||
|
// one attempt until the next toggle instead of one per batch.
|
||||||
|
if self.overlay.is_none() && (self.unavailable || !self.open(screen)) { return; }
|
||||||
|
if self.logged < 8 {
|
||||||
|
// Counts and presence only: the drawing itself is the viewer's content.
|
||||||
|
self.logged += 1;
|
||||||
|
let normalized = points.iter().all(|&(x, y)| x.abs() <= 1.5 && y.abs() <= 1.5);
|
||||||
|
log::info!("Annotation stroke batch: points={} normalized={} screen_set={} width_set={} color_set={}",
|
||||||
|
points.len(), normalized, screen.is_some(), width.is_some(), color.is_some());
|
||||||
|
}
|
||||||
|
let o = self.overlay.as_ref().unwrap();
|
||||||
|
match self.strokes.iter_mut().find(|s| s.id == id) {
|
||||||
|
Some(stroke) => {
|
||||||
|
let from = stroke.points.len().saturating_sub(2);
|
||||||
|
stroke.points.extend(to_pixels(&points, stroke.normalized, o.width, o.height));
|
||||||
|
stroke.raw.extend(points);
|
||||||
|
o.draw(stroke, from);
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
let mut stroke = Stroke::new(id, points, width, color);
|
||||||
|
stroke.layout(o.width, o.height);
|
||||||
|
o.draw(&stroke, 0);
|
||||||
|
self.strokes.push(stroke);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
o.flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The root was resized (RandR; on X11 the viewer's resolution choice does this): rebuild the
|
||||||
|
/// overlay at the new geometry and lay the strokes out again.
|
||||||
|
fn follow_resize(&mut self) {
|
||||||
|
let Some(screen) = self.overlay.take().map(|o| o.screen) else { return };
|
||||||
|
if !self.open(screen) { self.strokes.clear(); return; }
|
||||||
|
let o = self.overlay.as_ref().unwrap();
|
||||||
|
for stroke in &mut self.strokes { stroke.layout(o.width, o.height); }
|
||||||
|
o.repaint(&self.strokes);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn handle(&mut self, command: Command) {
|
||||||
|
match command {
|
||||||
|
Command::Toggle { owner, enable: true, reply } => {
|
||||||
|
self.claim(owner);
|
||||||
|
self.unavailable = false;
|
||||||
|
let code = if self.overlay.is_some() || self.open(None) { 0 } else { ERR_UNAVAILABLE };
|
||||||
|
let _ = reply.send(code);
|
||||||
|
}
|
||||||
|
Command::Toggle { owner, enable: false, reply } => {
|
||||||
|
if owner == self.owner { self.close(); }
|
||||||
|
let _ = reply.send(0);
|
||||||
|
}
|
||||||
|
Command::Reset(owner) => {
|
||||||
|
if owner != self.owner { return; }
|
||||||
|
if self.overlay.is_some() { log::info!("Annotation ended with the viewer session"); }
|
||||||
|
self.close();
|
||||||
|
self.unavailable = false;
|
||||||
|
}
|
||||||
|
Command::Clear { owner, all, id } => {
|
||||||
|
if owner != self.owner { return; }
|
||||||
|
if all { self.strokes.clear(); } else { self.strokes.retain(|s| s.id != id); }
|
||||||
|
if let Some(o) = &self.overlay { o.repaint(&self.strokes); }
|
||||||
|
}
|
||||||
|
Command::Stroke(owner, Request::Stroke { id, points, screen, width, color }) => {
|
||||||
|
self.claim(owner);
|
||||||
|
self.stroke(id, points, screen, width, color);
|
||||||
|
}
|
||||||
|
Command::Stroke(..) => {}
|
||||||
|
#[cfg(test)]
|
||||||
|
Command::Probe(reply) => {
|
||||||
|
let _ = reply.send(self.overlay.as_ref().map(|o| (self.owner, o.width, o.height, self.strokes.len())));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run(rx: mpsc::Receiver<Command>) {
|
||||||
|
let mut state = Annotation::default();
|
||||||
|
loop {
|
||||||
|
let wait = if state.overlay.is_some() { Duration::from_millis(50) } else { Duration::from_secs(3600) };
|
||||||
|
match rx.recv_timeout(wait) {
|
||||||
|
Ok(command) => state.handle(command),
|
||||||
|
Err(mpsc::RecvTimeoutError::Timeout) => {}
|
||||||
|
Err(mpsc::RecvTimeoutError::Disconnected) => return,
|
||||||
|
}
|
||||||
|
match state.overlay.as_ref().map_or(0, |o| unsafe { uu_annotation_poll(o.handle) }) {
|
||||||
|
2 => state.follow_resize(),
|
||||||
|
1 => if let Some(o) = &state.overlay { o.repaint(&state.strokes); },
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn float(field: u64, v: f32, out: &mut Vec<u8>) { varint(field << 3 | 5, out); out.extend_from_slice(&v.to_le_bytes()); }
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parses_toggle_stroke_and_clear() {
|
||||||
|
let mut toggle = Vec::new();
|
||||||
|
bytes(3, &[8, 1], &mut toggle);
|
||||||
|
assert_eq!(parse(&toggle), Some(Request::Toggle(true)));
|
||||||
|
let mut off = Vec::new();
|
||||||
|
bytes(3, &[], &mut off);
|
||||||
|
assert_eq!(parse(&off), Some(Request::Toggle(false)));
|
||||||
|
|
||||||
|
let mut point = Vec::new();
|
||||||
|
float(1, 0.25, &mut point);
|
||||||
|
float(2, 0.75, &mut point);
|
||||||
|
let mut stroke = vec![8, 7];
|
||||||
|
bytes(2, &point, &mut stroke);
|
||||||
|
bytes(2, &point, &mut stroke);
|
||||||
|
stroke.extend_from_slice(&[24, 0]);
|
||||||
|
float(4, 4.0, &mut stroke);
|
||||||
|
stroke.push(40);
|
||||||
|
varint(0xFF00_FF00, &mut stroke);
|
||||||
|
let mut request = Vec::new();
|
||||||
|
bytes(1, &stroke, &mut request);
|
||||||
|
assert_eq!(parse(&request), Some(Request::Stroke {
|
||||||
|
id: 7, points: vec![(0.25, 0.75), (0.25, 0.75)], screen: Some(0), width: Some(4.0), color: Some(0xFF00_FF00) }));
|
||||||
|
|
||||||
|
let mut clear = Vec::new();
|
||||||
|
bytes(2, &[8, 2, 16, 9], &mut clear);
|
||||||
|
assert_eq!(parse(&clear), Some(Request::Clear { all: false, id: 9 }));
|
||||||
|
let mut clear_all = Vec::new();
|
||||||
|
bytes(2, &[8, 1], &mut clear_all);
|
||||||
|
assert_eq!(parse(&clear_all), Some(Request::Clear { all: true, id: 0 }));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn response_echoes_header_in_field_23() {
|
||||||
|
let ok = encode_response(&[8, 5], SLOT_TOGGLE, 0);
|
||||||
|
assert_eq!(ok, vec![10, 2, 8, 5, 186, 1, 2, 26, 0]);
|
||||||
|
let failed = encode_response(&[], SLOT_STROKE, 1);
|
||||||
|
assert_eq!(failed, vec![10, 0, 186, 1, 4, 10, 2, 8, 1]);
|
||||||
|
let fields = decode_wire(&failed).unwrap();
|
||||||
|
assert_eq!(fields[1].number, 23);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn answers_only_draw_requests() {
|
||||||
|
let mut other = Vec::new();
|
||||||
|
bytes(1, &[8, 1], &mut other);
|
||||||
|
bytes(28, &[], &mut other);
|
||||||
|
assert!(draw_request(&decode_wire(&other).unwrap()).is_none());
|
||||||
|
let mut draw = Vec::new();
|
||||||
|
bytes(1, &[8, 5], &mut draw);
|
||||||
|
bytes(27, &[26, 2, 8, 1], &mut draw);
|
||||||
|
assert_eq!(draw_request(&decode_wire(&draw).unwrap()), Some((vec![8, 5], vec![26, 2, 8, 1])));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Needs a composited X display: DISPLAY=:0 cargo test -- --ignored annotation_overlay_smoke
|
||||||
|
/// On a disposable display, UU_ANNOTATION_SMOKE_RESIZE=1024x768 also resizes the root (xrandr --fb).
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn annotation_overlay_smoke() {
|
||||||
|
let wait = Duration::from_secs(5);
|
||||||
|
let toggle = |owner, enable| { let (reply, r) = mpsc::channel(); send(Command::Toggle { owner, enable, reply }); r.recv_timeout(wait).unwrap() };
|
||||||
|
let probe = || { let (reply, r) = mpsc::channel(); send(Command::Probe(reply)); r.recv_timeout(wait).unwrap() };
|
||||||
|
let stroke = |owner, id, points: &[(f32, f32)], width, color| send(Command::Stroke(owner, Request::Stroke {
|
||||||
|
id, points: points.to_vec(), screen: None, width, color }));
|
||||||
|
assert_eq!(toggle(1, true), 0);
|
||||||
|
let diagonal: Vec<(f32, f32)> = (0..=20).map(|i| (0.3 + i as f32 * 0.02, 0.3 + i as f32 * 0.01)).collect();
|
||||||
|
stroke(1, 1, &diagonal[..10], None, None);
|
||||||
|
stroke(1, 1, &diagonal[10..], None, None);
|
||||||
|
stroke(1, 2, &[(0.5, 0.6)], Some(30.0), Some(0x0000FF));
|
||||||
|
std::thread::sleep(Duration::from_secs(
|
||||||
|
std::env::var("UU_ANNOTATION_SMOKE_SECS").ok().and_then(|s| s.parse().ok()).unwrap_or(3)));
|
||||||
|
assert_eq!(probe().map(|p| (p.0, p.3)), Some((1, 2)));
|
||||||
|
if let Ok(size) = std::env::var("UU_ANNOTATION_SMOKE_RESIZE") {
|
||||||
|
// xrandr may report an error for an output larger than the new size yet still resize.
|
||||||
|
let _ = std::process::Command::new("xrandr").args(["--fb", &size]).status();
|
||||||
|
std::thread::sleep(Duration::from_millis(500));
|
||||||
|
let (w, h) = size.split_once('x').map(|(w, h)| (w.parse().unwrap(), h.parse().unwrap())).unwrap();
|
||||||
|
assert_eq!(probe().map(|p| (p.1, p.2, p.3)), Some((w, h, 2)), "overlay follows the {size} root");
|
||||||
|
}
|
||||||
|
// A newer viewer takes over; the replaced peer's delayed reset and toggle-off leave it alone.
|
||||||
|
assert_eq!(toggle(2, true), 0);
|
||||||
|
reset(1);
|
||||||
|
assert_eq!(toggle(1, false), 0);
|
||||||
|
assert_eq!(probe().map(|p| (p.0, p.3)), Some((2, 0)));
|
||||||
|
stroke(2, 1, &diagonal, None, None);
|
||||||
|
assert_eq!(probe().map(|p| (p.0, p.3)), Some((2, 1)));
|
||||||
|
reset(2);
|
||||||
|
assert_eq!(probe(), None);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn strokes_are_laid_out_again_after_a_resize() {
|
||||||
|
let mut dot = Stroke::new(1, vec![(0.5, 0.5)], None, None);
|
||||||
|
dot.layout(100, 200);
|
||||||
|
assert_eq!((dot.points.clone(), dot.width), (vec![50, 100, 50, 100], 3));
|
||||||
|
dot.layout(3840, 2160);
|
||||||
|
assert_eq!((dot.points.clone(), dot.width), (vec![1920, 1080, 1920, 1080], 6));
|
||||||
|
let mut pixels = Stroke::new(2, vec![(10.0, 20.0), (30.0, 40.0)], Some(8.0), None);
|
||||||
|
pixels.layout(100, 200);
|
||||||
|
assert_eq!((pixels.normalized, pixels.points.clone(), pixels.width), (false, vec![10, 20, 30, 40], 8));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn colors_widths_and_points() {
|
||||||
|
assert_eq!(argb(None), 0xFFFF_3B30);
|
||||||
|
assert_eq!(argb(Some(0x00FF00)), 0xFF00_FF00);
|
||||||
|
assert_eq!(argb(Some(0x80FF_0000)), 0x8080_0000);
|
||||||
|
assert_eq!(line_width(None, 2160), 6);
|
||||||
|
assert_eq!(line_width(None, 720), 3);
|
||||||
|
assert_eq!(line_width(Some(8.0), 2160), 8);
|
||||||
|
assert_eq!(line_width(Some(0.01), 2000), 20);
|
||||||
|
assert_eq!(to_pixels(&[(0.5, 1.0)], true, 3840, 2160), vec![1920, 2160]);
|
||||||
|
assert_eq!(to_pixels(&[(12.4, f32::NAN)], false, 3840, 2160), vec![12, 0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
+35
-6
@@ -17,9 +17,9 @@ impl TextFormat {
|
|||||||
}
|
}
|
||||||
fn id(self)->u64{match self{Self::Windows=>UNICODE_TEXT,Self::Mac=>0}}
|
fn id(self)->u64{match self{Self::Windows=>UNICODE_TEXT,Self::Mac=>0}}
|
||||||
fn name(self)->&'static str{match self{Self::Windows=>"CF_UNICODETEXT",Self::Mac=>MAC_TEXT}}
|
fn name(self)->&'static str{match self{Self::Windows=>"CF_UNICODETEXT",Self::Mac=>MAC_TEXT}}
|
||||||
/// Name in a format-list offer. Official Windows peers name predefined formats `predefined_<id>`; a plain
|
/// Issue #151 reports that Windows registers even `predefined_13` as a custom format.
|
||||||
/// `CF_UNICODETEXT` makes the Windows viewer register a custom format instead of id 13 (issue #151).
|
/// Omit the name for predefined id 13; verified with the official Windows viewer on an X11 host.
|
||||||
fn offer_name(self)->&'static str{match self{Self::Windows=>WINDOWS_OFFER_NAME,Self::Mac=>MAC_TEXT}}
|
fn offer_name(self)->Option<&'static str>{match self{Self::Windows=>None,Self::Mac=>Some(MAC_TEXT)}}
|
||||||
fn encode(self,text:&str)->Vec<u8>{match self{Self::Windows=>encode_windows(text),Self::Mac=>text.as_bytes().to_vec()}}
|
fn encode(self,text:&str)->Vec<u8>{match self{Self::Windows=>encode_windows(text),Self::Mac=>text.as_bytes().to_vec()}}
|
||||||
fn decode(self,data:&[u8])->Result<String,&'static str>{
|
fn decode(self,data:&[u8])->Result<String,&'static str>{
|
||||||
match self{
|
match self{
|
||||||
@@ -34,7 +34,6 @@ impl TextFormat {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const WINDOWS_OFFER_NAME:&str="predefined_13";
|
|
||||||
const BLOCK_BYTES:usize=0x20000;
|
const BLOCK_BYTES:usize=0x20000;
|
||||||
const MAX_BYTES:usize=MAX_TEXT*2+2;
|
const MAX_BYTES:usize=MAX_TEXT*2+2;
|
||||||
pub struct ResultMessages {pub messages:Vec<(u32,Vec<u8>)>,pub text:Option<String>}
|
pub struct ResultMessages {pub messages:Vec<(u32,Vec<u8>)>,pub text:Option<String>}
|
||||||
@@ -100,7 +99,7 @@ impl State{
|
|||||||
if text.contains('\0')||encode_windows(&text).len()>MAX_BYTES{return Err("clipboard encoded text exceeds limit");}
|
if text.contains('\0')||encode_windows(&text).len()>MAX_BYTES{return Err("clipboard encoded text exceeds limit");}
|
||||||
self.local=Some(text);
|
self.local=Some(text);
|
||||||
let mut list=Vec::new();
|
let mut list=Vec::new();
|
||||||
for kind in formats {let mut format=Vec::new();int(1,kind.id(),&mut format);string(2,kind.offer_name(),&mut format);nested(1,&format,&mut list);}
|
for kind in formats {let mut format=Vec::new();int(1,kind.id(),&mut format);if let Some(name)=kind.offer_name(){string(2,name,&mut format);}nested(1,&format,&mut list);}
|
||||||
Ok(request(id,1,&list))
|
Ok(request(id,1,&list))
|
||||||
}
|
}
|
||||||
pub fn request(&mut self,rpc:&[u8],next:&mut impl FnMut()->u64)->Result<ResultMessages,&'static str>{
|
pub fn request(&mut self,rpc:&[u8],next:&mut impl FnMut()->u64)->Result<ResultMessages,&'static str>{
|
||||||
@@ -192,6 +191,36 @@ impl State{
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests{
|
mod tests{
|
||||||
use super::*;
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn windows_format_offer_omits_name_field_entirely(){
|
||||||
|
for offer in [State::default().offer(42,"hi".into()).unwrap(),State::default().offer_any_host(42,"hi".into()).unwrap()]{
|
||||||
|
assert_eq!(number(header(&offer).unwrap(),1),Ok(42));
|
||||||
|
let list=bytes(bytes(&offer,9).unwrap().unwrap(),1).unwrap().unwrap();
|
||||||
|
let formats=decode_wire(list).unwrap();
|
||||||
|
let WireValue::Bytes(windows)=formats[0].value else{panic!("missing Windows format")};
|
||||||
|
assert_eq!(windows,&[8,13]); // Only field 1: not even an empty field 2.
|
||||||
|
assert!(decode_wire(windows).unwrap().iter().all(|field|field.number!=2));
|
||||||
|
if formats.len()==2{
|
||||||
|
let WireValue::Bytes(mac)=formats[1].value else{panic!("missing Mac format")};
|
||||||
|
assert_eq!(number(mac,1),Ok(0));
|
||||||
|
assert_eq!(bytes(mac,2),Ok(Some(MAC_TEXT.as_bytes())));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn unnamed_windows_offer_still_serves_utf16le_with_crlf_and_nul(){
|
||||||
|
let mut provider=State::default();
|
||||||
|
provider.offer(1,"A中🙂\nB\r\n".into()).unwrap();
|
||||||
|
let mut ask=Vec::new();int(1,13,&mut ask);string(2,"test-key",&mut ask);
|
||||||
|
let out=provider.request(&request(2,2,&ask),&mut||3).unwrap();
|
||||||
|
assert_eq!(out.messages.iter().map(|m|m.0).collect::<Vec<_>>(),vec![22,21]);
|
||||||
|
let confirm=bytes(bytes(&out.messages[0].1,5).unwrap().unwrap(),2).unwrap().unwrap();
|
||||||
|
assert_eq!(number(confirm,1),Ok(1));assert_eq!(number(confirm,3),Ok(1));
|
||||||
|
let block=bytes(bytes(&out.messages[1].1,9).unwrap().unwrap(),3).unwrap().unwrap();
|
||||||
|
assert_eq!(text_field(block,1),Ok("test-key"));
|
||||||
|
assert_eq!(number(block,2),Ok(0));
|
||||||
|
assert_eq!(bytes(block,3).unwrap().unwrap(),&[0x41,0,0x2d,0x4e,0x3d,0xd8,0x42,0xde,13,0,10,0,0x42,0,13,0,10,0,0,0]);
|
||||||
|
}
|
||||||
#[test] fn mac_utf8_text_round_trips_both_directions(){
|
#[test] fn mac_utf8_text_round_trips_both_directions(){
|
||||||
// Mac host offer: format list {1 id 0, 2 "public.utf8-plain-text"} (observed live).
|
// Mac host offer: format list {1 id 0, 2 "public.utf8-plain-text"} (observed live).
|
||||||
let mut mac=Vec::new();int(1,0,&mut mac);string(2,MAC_TEXT,&mut mac);
|
let mut mac=Vec::new();int(1,0,&mut mac);string(2,MAC_TEXT,&mut mac);
|
||||||
@@ -218,7 +247,7 @@ mod tests{
|
|||||||
assert_eq!(format_ids(&host_offer),vec![13]);
|
assert_eq!(format_ids(&host_offer),vec![13]);
|
||||||
let list=bytes(bytes(&host_offer,9).unwrap().unwrap(),1).unwrap().unwrap();
|
let list=bytes(bytes(&host_offer,9).unwrap().unwrap(),1).unwrap().unwrap();
|
||||||
let format=bytes(list,1).unwrap().unwrap();
|
let format=bytes(list,1).unwrap().unwrap();
|
||||||
assert_eq!(text_field(format,2),Ok(WINDOWS_OFFER_NAME));
|
assert_eq!(bytes(format,2),Ok(None));
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
fn desktop_clipboard_negotiates_and_buffers_unicode_until_confirmation(){
|
fn desktop_clipboard_negotiates_and_buffers_unicode_until_confirmation(){
|
||||||
|
|||||||
+63
-1
@@ -147,6 +147,10 @@ fn io_error(e: &std::io::Error) -> u64 {
|
|||||||
/// anything else is rooted at "/".
|
/// anything else is rooted at "/".
|
||||||
pub fn normalize(path: &str) -> PathBuf {
|
pub fn normalize(path: &str) -> PathBuf {
|
||||||
let p = path.replace('\\', "/");
|
let p = path.replace('\\', "/");
|
||||||
|
// Official Mac 4.46.0 UURemoteServer (x86_64, 0x10019f8a5–0x10019f9f7)
|
||||||
|
// resolves :/Default to its receive directory. iOS quick upload sends this alias;
|
||||||
|
// our receive directory is HOME, also reported in SystemMetrics/RemoteDownloadPath.
|
||||||
|
if p.trim_end_matches('/') == ":/Default" { return home(); }
|
||||||
// The host registers as a PC, so the viewer builds drive paths ("C:/x", or ":/" when it
|
// The host registers as a PC, so the viewer builds drive paths ("C:/x", or ":/" when it
|
||||||
// knows no drive letter). Linux has a single root: any drive prefix maps to "/".
|
// knows no drive letter). Linux has a single root: any drive prefix maps to "/".
|
||||||
let p = match p.split_once(':') {
|
let p = match p.split_once(':') {
|
||||||
@@ -455,7 +459,10 @@ impl FileSession {
|
|||||||
/// Upload to this host. receive_request{1 id,2 path,3 files,4 strategy,5 folder_name,6 list_data,7 task_unique_id}
|
/// Upload to this host. receive_request{1 id,2 path,3 files,4 strategy,5 folder_name,6 list_data,7 task_unique_id}
|
||||||
fn receive_request(&self, rid: u64, f: &[WireField]) {
|
fn receive_request(&self, rid: u64, f: &[WireField]) {
|
||||||
let id = TaskId::parse(f);
|
let id = TaskId::parse(f);
|
||||||
let target = normalize(&get_text(f, 2));
|
let raw_target = get_text(f, 2);
|
||||||
|
let target = normalize(&raw_target);
|
||||||
|
log::info!("File transfer upload destination: default={} exists={}",
|
||||||
|
raw_target.replace('\\', "/").trim_end_matches('/') == ":/Default", target.is_dir());
|
||||||
let folder = get_text(f, 5);
|
let folder = get_text(f, 5);
|
||||||
let strategy = get_uint(f, 4);
|
let strategy = get_uint(f, 4);
|
||||||
let files = parse_files(get_all(f, 3), get_bytes(f, 6));
|
let files = parse_files(get_all(f, 3), get_bytes(f, 6));
|
||||||
@@ -715,6 +722,61 @@ mod tests {
|
|||||||
assert_eq!(parse_files(vec![], Some(&gz.finish().unwrap())), files);
|
assert_eq!(parse_files(vec![], Some(&gz.finish().unwrap())), files);
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
|
fn ios_default_path_resolves_to_the_advertised_receive_directory() {
|
||||||
|
for path in [":/Default", ":\\Default", ":/Default/"] {
|
||||||
|
assert_eq!(normalize(path), home());
|
||||||
|
assert!(!is_this_pc(path));
|
||||||
|
}
|
||||||
|
assert_eq!(normalize("/Default"), PathBuf::from("/Default"));
|
||||||
|
assert_eq!(normalize("C:/Default"), PathBuf::from("/Default"));
|
||||||
|
assert_eq!(normalize(":/Default-other"), PathBuf::from("/Default-other"));
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn ios_quick_upload_checks_conflicts_writes_and_completes_in_default_directory() {
|
||||||
|
let name = format!(".uu-ios-test-{}-{}", std::process::id(),
|
||||||
|
std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos());
|
||||||
|
let dir = home().join(&name);
|
||||||
|
std::fs::create_dir(&dir).unwrap();
|
||||||
|
struct Cleanup(PathBuf);
|
||||||
|
impl Drop for Cleanup { fn drop(&mut self) { let _ = std::fs::remove_dir_all(&self.0); } }
|
||||||
|
let _cleanup = Cleanup(dir.clone());
|
||||||
|
let rel = format!("{name}/x.bin");
|
||||||
|
std::fs::write(dir.join("x.bin"), b"old").unwrap();
|
||||||
|
let (tx, mut rx) = mpsc::unbounded_channel();
|
||||||
|
let s = FileSession::new(tx, Arc::new(AtomicU64::new(1)));
|
||||||
|
let call = |case: u32, body: Enc| {
|
||||||
|
let rpc = Enc::default().msg(1, Enc::default().uint(1, 17)).msg(8, Enc::default().msg(case, body));
|
||||||
|
assert!(s.handle(&decode_wire(&crate::initialization::envelope(1, 1, 21, &rpc.0)).unwrap()));
|
||||||
|
};
|
||||||
|
let response = |m: Vec<u8>, case: u32| {
|
||||||
|
let outer = decode_wire(&m).unwrap();
|
||||||
|
let rpc = decode_wire(get_bytes(&outer, 22).unwrap()).unwrap();
|
||||||
|
assert_eq!(get_uint(&decode_wire(get_bytes(&rpc, 1).unwrap()).unwrap(), 1), 17);
|
||||||
|
let ftp = decode_wire(get_bytes(&rpc, 4).unwrap()).unwrap();
|
||||||
|
get_bytes(&ftp, case).unwrap().to_vec()
|
||||||
|
};
|
||||||
|
call(11, Enc::default().text(1, ":/Default").text(2, &rel));
|
||||||
|
let exist = response(rx.try_recv().unwrap(), 8);
|
||||||
|
let exist = decode_wire(&exist).unwrap();
|
||||||
|
assert_eq!(get_text(&exist, 1), ":/Default");
|
||||||
|
assert_eq!(get_uint(&decode_wire(get_bytes(&exist, 2).unwrap()).unwrap(), 2), 1);
|
||||||
|
let id = TaskId { task: 991, index: 1 };
|
||||||
|
let info = FileInfo { rel_path: rel, size: 6, modified: 0 };
|
||||||
|
call(1, Enc::default().msg(1, id.enc()).text(2, ":/Default").bytes(6, &list_data(&[info])));
|
||||||
|
let received = response(rx.try_recv().unwrap(), 1);
|
||||||
|
assert_eq!(get_uint(&decode_wire(&received).unwrap(), 3), FT_SUCCEEDED);
|
||||||
|
call(3, Enc::default().msg(1, id.enc()).uint(3, 6));
|
||||||
|
let confirmed = response(rx.try_recv().unwrap(), 3);
|
||||||
|
assert_eq!(get_uint(&decode_wire(&confirmed).unwrap(), 3), FT_SUCCEEDED);
|
||||||
|
call(4, Enc::default().msg(1, id.enc()).bytes(3, b"abcdef"));
|
||||||
|
let block = response(rx.try_recv().unwrap(), 4);
|
||||||
|
assert_eq!(get_uint(&decode_wire(&block).unwrap(), 3), FT_SUCCEEDED);
|
||||||
|
call(9, Enc::default().msg(1, id.enc()).uint(2, FT_SUCCEEDED));
|
||||||
|
let done = response(rx.try_recv().unwrap(), 6);
|
||||||
|
assert_eq!(get_uint(&decode_wire(&done).unwrap(), 2), FT_SUCCEEDED);
|
||||||
|
assert_eq!(std::fs::read(dir.join("x.bin")).unwrap(), b"abcdef");
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
fn upload_writes_blocks_and_confirms() {
|
fn upload_writes_blocks_and_confirms() {
|
||||||
let dir = std::env::temp_dir().join(format!("uu-up-{}", std::process::id()));
|
let dir = std::env::temp_dir().join(format!("uu-up-{}", std::process::id()));
|
||||||
std::fs::create_dir_all(&dir).unwrap();
|
std::fs::create_dir_all(&dir).unwrap();
|
||||||
|
|||||||
+40
@@ -36,6 +36,46 @@ pub fn payload(mtu: usize, annex_b: &[u8]) -> Result<Vec<Bytes>, String> {
|
|||||||
Ok(out)
|
Ok(out)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Payload HEVC Annex-B bitstream with zero-copy sub-slicing for single NAL units <= MTU.
|
||||||
|
pub fn payload_bytes(mtu: usize, annex_b: &Bytes) -> Result<Vec<Bytes>, String> {
|
||||||
|
if mtu < 4 { return Err("HEVC payload MTU too small".into()); }
|
||||||
|
let mut starts = Vec::new();
|
||||||
|
let mut i = 0;
|
||||||
|
let bytes = annex_b.as_ref();
|
||||||
|
while i + 3 <= bytes.len() {
|
||||||
|
let prefix = if bytes[i..].starts_with(&[0, 0, 0, 1]) { 4 }
|
||||||
|
else if bytes[i..].starts_with(&[0, 0, 1]) { 3 } else { i += 1; continue; };
|
||||||
|
starts.push((i, i + prefix)); i += prefix;
|
||||||
|
}
|
||||||
|
if starts.is_empty() { return Err("HEVC access unit has no Annex-B start code".into()); }
|
||||||
|
let mut out = Vec::new();
|
||||||
|
for (index, &(_, start)) in starts.iter().enumerate() {
|
||||||
|
let mut end = starts.get(index + 1).map_or(bytes.len(), |s| s.0);
|
||||||
|
while end > start && bytes[end - 1] == 0 { end -= 1; } // trailing_zero_8bits
|
||||||
|
let nal_slice = &bytes[start..end];
|
||||||
|
if nal_slice.len() < 2 || nal_slice[0] & 0x80 != 0 || nal_slice[1] & 7 == 0 {
|
||||||
|
return Err("Invalid HEVC NAL header".into());
|
||||||
|
}
|
||||||
|
let kind = (nal_slice[0] >> 1) & 63;
|
||||||
|
if kind >= 48 { return Err("HEVC Annex-B contains RTP packet type".into()); }
|
||||||
|
if nal_slice.len() <= mtu {
|
||||||
|
// Zero-copy reference-counted sub-slice:
|
||||||
|
out.push(annex_b.slice(start..end));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let chunks = nal_slice[2..].chunks(mtu - 3);
|
||||||
|
let last = chunks.len() - 1;
|
||||||
|
for (n, chunk) in chunks.enumerate() {
|
||||||
|
let mut fu = Vec::with_capacity(3 + chunk.len());
|
||||||
|
// Keep F, LayerId and TID, replacing only the NAL type with FU=49.
|
||||||
|
fu.extend_from_slice(&[(nal_slice[0] & 0x81) | (49 << 1), nal_slice[1],
|
||||||
|
kind | if n == 0 { 0x80 } else { 0 } | if n == last { 0x40 } else { 0 }]);
|
||||||
|
fu.extend_from_slice(chunk); out.push(fu.into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(out)
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|||||||
+12
-1
@@ -450,7 +450,18 @@ fn run_portal_vaapi(
|
|||||||
if dma_disabled { log::info!("Portal VAAPI DMA-BUF disabled by setting; pipeline=host-upload"); }
|
if dma_disabled { log::info!("Portal VAAPI DMA-BUF disabled by setting; pipeline=host-upload"); }
|
||||||
loop {
|
loop {
|
||||||
if stop.load(Ordering::Relaxed) || units.is_closed() { return Ok(()); }
|
if stop.load(Ordering::Relaxed) || units.is_closed() { return Ok(()); }
|
||||||
std::thread::sleep(next_poll.saturating_duration_since(Instant::now()).min(Duration::from_millis(20)));
|
let wait_dur = next_poll.saturating_duration_since(Instant::now());
|
||||||
|
if wait_dur > Duration::ZERO {
|
||||||
|
match portal.wait_frame(wait_dur) {
|
||||||
|
Ok(true) | Ok(false) => (),
|
||||||
|
Err(_) => {
|
||||||
|
// Frame wait failed or stream closed/stalled: back off to next_poll
|
||||||
|
// (preventing 100% core busy-spin) and allow existing recovery in with_dmabuf
|
||||||
|
// and capture_changed to handle lock/scaling without prematurely aborting the encoder.
|
||||||
|
std::thread::sleep(wait_dur);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
let now = Instant::now();
|
let now = Instant::now();
|
||||||
if now < next_poll { continue; }
|
if now < next_poll { continue; }
|
||||||
next_poll = (next_poll + interval).max(now);
|
next_poll = (next_poll + interval).max(now);
|
||||||
|
|||||||
+234
-19
@@ -43,6 +43,28 @@ struct PendingPointer {
|
|||||||
unsafe fn x11_pointer_state(_: *mut libc::c_int,_:*mut libc::c_int,_:*mut libc::c_uint)->libc::c_int {-1}
|
unsafe fn x11_pointer_state(_: *mut libc::c_int,_:*mut libc::c_int,_:*mut libc::c_uint)->libc::c_int {-1}
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
struct HeldInput { buttons: std::collections::BTreeSet<i32>, keys: std::collections::BTreeSet<u64> }
|
struct HeldInput { buttons: std::collections::BTreeSet<i32>, keys: std::collections::BTreeSet<u64> }
|
||||||
|
/// Inputs held through the portal session are dropped when that session is replaced; the
|
||||||
|
/// cursor-mode rebuild waits until they are released. uinput devices survive the swap.
|
||||||
|
static PORTAL_INPUT_HELD: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
|
||||||
|
/// An active contact on the portal touchscreen is also lost when the session is replaced.
|
||||||
|
static PORTAL_TOUCH_HELD: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
|
||||||
|
pub fn portal_input_held() -> bool {
|
||||||
|
PORTAL_INPUT_HELD.load(std::sync::atomic::Ordering::Relaxed) || PORTAL_TOUCH_HELD.load(std::sync::atomic::Ordering::Relaxed)
|
||||||
|
}
|
||||||
|
/// Inputs currently bound to the portal session; a replacement tears those devices down.
|
||||||
|
static PORTAL_HELD: std::sync::Mutex<HeldInput> = std::sync::Mutex::new(HeldInput { buttons: std::collections::BTreeSet::new(), keys: std::collections::BTreeSet::new() });
|
||||||
|
/// Serializes recording an input with retiring the records of a replaced handle.
|
||||||
|
static PORTAL_HELD_SERIAL: std::sync::Mutex<()> = std::sync::Mutex::new(());
|
||||||
|
pub fn lock_portal_held() -> std::sync::MutexGuard<'static, ()> {
|
||||||
|
PORTAL_HELD_SERIAL.lock().unwrap_or_else(std::sync::PoisonError::into_inner)
|
||||||
|
}
|
||||||
|
/// The portal replaced its native devices: records of held portal inputs no longer apply.
|
||||||
|
/// The caller holds `lock_portal_held()`, so an input recorded against the new handle stays.
|
||||||
|
pub fn portal_session_replaced() {
|
||||||
|
if let Ok(mut held)=PORTAL_HELD.lock() { *held=HeldInput::default(); }
|
||||||
|
PORTAL_INPUT_HELD.store(false, std::sync::atomic::Ordering::Relaxed);
|
||||||
|
PORTAL_TOUCH_HELD.store(false, std::sync::atomic::Ordering::Relaxed);
|
||||||
|
}
|
||||||
/// Held modifier VKs (bit 0 Ctrl, 1 Shift, 2 Alt, 3 Win) and keys that got a synthetic Shift.
|
/// Held modifier VKs (bit 0 Ctrl, 1 Shift, 2 Alt, 3 Win) and keys that got a synthetic Shift.
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
struct Shortcuts { modifiers: u8, shifted: std::collections::BTreeSet<i32> }
|
struct Shortcuts { modifiers: u8, shifted: std::collections::BTreeSet<i32> }
|
||||||
@@ -81,15 +103,22 @@ fn finger_held(finger: Finger, now: std::time::Instant) -> Option<(i32,i32)> {
|
|||||||
/// Viewer platform from the connect header `controller_platform` (website enum: 1 windows, 2 android,
|
/// Viewer platform from the connect header `controller_platform` (website enum: 1 windows, 2 android,
|
||||||
/// 3 ios, 4 macos, 5 tv).
|
/// 3 ios, 4 macos, 5 tv).
|
||||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
||||||
pub enum Controller { #[default] Other, Mac, Mobile }
|
pub enum Controller { #[default] Other, Windows, Mac, Mobile, Ios }
|
||||||
impl Controller {
|
impl Controller {
|
||||||
|
/// Touch semantics cover both mobile platforms; the iOS RPC 7 screen-off encoding is its own quirk.
|
||||||
|
pub fn is_mobile(self) -> bool { matches!(self, Self::Mobile | Self::Ios) }
|
||||||
pub fn from_platform(platform: Option<&serde_json::Value>) -> Self {
|
pub fn from_platform(platform: Option<&serde_json::Value>) -> Self {
|
||||||
let Some(v) = platform else { return Self::Other };
|
let Some(v) = platform else { return Self::Other };
|
||||||
let text = v.as_str().map(str::to_ascii_lowercase);
|
let text = v.as_str().map(str::to_ascii_lowercase);
|
||||||
match v.as_i64().or_else(|| text.as_deref().and_then(|s| s.parse().ok())) {
|
match v.as_i64().or_else(|| text.as_deref().and_then(|s| s.parse().ok())) {
|
||||||
Some(4) => Self::Mac,
|
Some(4) => Self::Mac,
|
||||||
Some(2 | 3) => Self::Mobile,
|
Some(3) => Self::Ios,
|
||||||
_ if text.is_some_and(|s| s.contains("mac") || s.contains("darwin")) => Self::Mac,
|
Some(2) => Self::Mobile,
|
||||||
|
Some(1) => Self::Windows,
|
||||||
|
_ if text.as_deref().is_some_and(|s| s.contains("mac") || s.contains("darwin")) => Self::Mac,
|
||||||
|
_ if text.as_deref().is_some_and(|s| s.contains("ios") || s.contains("iphone") || s.contains("ipad")) => Self::Ios,
|
||||||
|
_ if text.as_deref().is_some_and(|s| s.contains("android")) => Self::Mobile,
|
||||||
|
_ if text.as_deref().is_some_and(|s| s.contains("windows")) => Self::Windows,
|
||||||
_ => Self::Other,
|
_ => Self::Other,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -99,7 +128,7 @@ impl Controller {
|
|||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
struct CmdState { held: bool, pending: bool, passthrough: bool, combos: std::collections::BTreeMap<i32, bool> }
|
struct CmdState { held: bool, pending: bool, passthrough: bool, combos: std::collections::BTreeMap<i32, bool> }
|
||||||
|
|
||||||
pub struct InputInjector { mac_controller: std::sync::atomic::AtomicBool, cmd: std::sync::Mutex<CmdState>, serial:std::sync::Mutex<()>, owner:std::sync::Mutex<DesktopOwner>, shortcuts: std::sync::Mutex<Shortcuts>, uinput: Option<crate::uinput::Devices>, uinput_pointer: bool, screen: std::sync::Mutex<(u32,u32)>, portal_failures: std::sync::atomic::AtomicUsize, portal_outcomes: [std::sync::atomic::AtomicUsize; 3], portal:std::sync::Mutex<Option<std::sync::Arc<crate::portal::PortalSession>>>, backend: crate::desktop_backend::DesktopBackend, pending: std::sync::Mutex<PendingPointer>, held: std::sync::Mutex<HeldInput>, touch: std::sync::Mutex<TouchDrag> }
|
pub struct InputInjector { mac_controller: std::sync::atomic::AtomicBool, cmd: std::sync::Mutex<CmdState>, serial:std::sync::Mutex<()>, owner:std::sync::Mutex<DesktopOwner>, shortcuts: std::sync::Mutex<Shortcuts>, uinput: Option<crate::uinput::Devices>, uinput_pointer: bool, screen: std::sync::Mutex<(u32,u32)>, portal_failures: std::sync::atomic::AtomicUsize, portal_outcomes: [std::sync::atomic::AtomicUsize; 3], portal:std::sync::Mutex<Option<std::sync::Arc<crate::portal::PortalSession>>>, backend: crate::desktop_backend::DesktopBackend, pending: std::sync::Mutex<PendingPointer>, held: std::sync::Mutex<HeldInput>, touch: std::sync::Mutex<TouchDrag>, pointer_wake: tokio::sync::Notify }
|
||||||
|
|
||||||
fn active_output_count(json: &[u8]) -> Option<usize> {
|
fn active_output_count(json: &[u8]) -> Option<usize> {
|
||||||
let data: serde_json::Value = serde_json::from_slice(json).ok()?;
|
let data: serde_json::Value = serde_json::from_slice(json).ok()?;
|
||||||
@@ -135,7 +164,7 @@ impl InputInjector {
|
|||||||
|| (backend == crate::desktop_backend::DesktopBackend::Portal && single_portal_output()));
|
|| (backend == crate::desktop_backend::DesktopBackend::Portal && single_portal_output()));
|
||||||
if uinput_pointer { log::info!("Input pointer backend: uinput (motion, buttons and wheel)"); }
|
if uinput_pointer { log::info!("Input pointer backend: uinput (motion, buttons and wheel)"); }
|
||||||
else if backend == crate::desktop_backend::DesktopBackend::Portal { log::info!("Input pointer backend: portal (monitor-local coordinates)"); }
|
else if backend == crate::desktop_backend::DesktopBackend::Portal { log::info!("Input pointer backend: portal (monitor-local coordinates)"); }
|
||||||
Self { mac_controller: std::sync::atomic::AtomicBool::new(false), cmd: std::sync::Mutex::new(CmdState::default()), serial:std::sync::Mutex::new(()), owner:std::sync::Mutex::new(DesktopOwner::default()), shortcuts: std::sync::Mutex::new(Shortcuts::default()), uinput, uinput_pointer, screen: std::sync::Mutex::new((0,0)), portal_failures: std::sync::atomic::AtomicUsize::new(0), portal_outcomes: std::array::from_fn(|_| std::sync::atomic::AtomicUsize::new(0)), portal:std::sync::Mutex::new(None), backend, pending: std::sync::Mutex::new(PendingPointer::default()), held:std::sync::Mutex::new(HeldInput::default()), touch:std::sync::Mutex::new(TouchDrag::default()) }
|
Self { mac_controller: std::sync::atomic::AtomicBool::new(false), cmd: std::sync::Mutex::new(CmdState::default()), serial:std::sync::Mutex::new(()), owner:std::sync::Mutex::new(DesktopOwner::default()), shortcuts: std::sync::Mutex::new(Shortcuts::default()), uinput, uinput_pointer, screen: std::sync::Mutex::new((0,0)), portal_failures: std::sync::atomic::AtomicUsize::new(0), portal_outcomes: std::array::from_fn(|_| std::sync::atomic::AtomicUsize::new(0)), portal:std::sync::Mutex::new(None), backend, pending: std::sync::Mutex::new(PendingPointer::default()), held:std::sync::Mutex::new(HeldInput::default()), touch:std::sync::Mutex::new(TouchDrag::default()), pointer_wake: tokio::sync::Notify::new() }
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn bind_portal(&self,session:Option<std::sync::Arc<crate::portal::PortalSession>>) {
|
pub fn bind_portal(&self,session:Option<std::sync::Arc<crate::portal::PortalSession>>) {
|
||||||
@@ -153,6 +182,7 @@ impl InputInjector {
|
|||||||
let mut pending = self.pending.lock().unwrap();
|
let mut pending = self.pending.lock().unwrap();
|
||||||
pending.absolute = Some(position);
|
pending.absolute = Some(position);
|
||||||
pending.relative = (0,0);
|
pending.relative = (0,0);
|
||||||
|
self.pointer_wake.notify_one();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn mouse_relative(&self, dx: i32, dy: i32) {
|
pub fn mouse_relative(&self, dx: i32, dy: i32) {
|
||||||
@@ -160,6 +190,7 @@ impl InputInjector {
|
|||||||
let mut pending = self.pending.lock().unwrap();
|
let mut pending = self.pending.lock().unwrap();
|
||||||
pending.relative.0 = (pending.relative.0 + i64::from(dx)).clamp(-65535,65535);
|
pending.relative.0 = (pending.relative.0 + i64::from(dx)).clamp(-65535,65535);
|
||||||
pending.relative.1 = (pending.relative.1 + i64::from(dy)).clamp(-65535,65535);
|
pending.relative.1 = (pending.relative.1 + i64::from(dy)).clamp(-65535,65535);
|
||||||
|
self.pointer_wake.notify_one();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn mouse_scroll(&self, dx: i32, dy: i32) {
|
pub fn mouse_scroll(&self, dx: i32, dy: i32) {
|
||||||
@@ -167,15 +198,38 @@ impl InputInjector {
|
|||||||
let mut pending = self.pending.lock().unwrap();
|
let mut pending = self.pending.lock().unwrap();
|
||||||
pending.scroll.0 = (pending.scroll.0 + i64::from(dx)).clamp(-12000,12000);
|
pending.scroll.0 = (pending.scroll.0 + i64::from(dx)).clamp(-12000,12000);
|
||||||
pending.scroll.1 = (pending.scroll.1 + i64::from(dy)).clamp(-12000,12000);
|
pending.scroll.1 = (pending.scroll.1 + i64::from(dy)).clamp(-12000,12000);
|
||||||
|
self.pointer_wake.notify_one();
|
||||||
}
|
}
|
||||||
pub fn start_pointer_worker(self: &std::sync::Arc<Self>) -> tokio::task::JoinHandle<()> {
|
pub fn start_pointer_worker(self: &std::sync::Arc<Self>) -> tokio::task::JoinHandle<()> {
|
||||||
let input = self.clone();
|
let input = self.clone();
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
|
// Parked until pointer work exists: a fixed 4 ms tick burned ~250 wakeups/s
|
||||||
|
// (≈3% CPU with pow-heavy flush math) even with no viewer connected.
|
||||||
|
// notify_one() stores a permit, so an event racing the park check cannot be lost.
|
||||||
let mut tick = tokio::time::interval(std::time::Duration::from_millis(4));
|
let mut tick = tokio::time::interval(std::time::Duration::from_millis(4));
|
||||||
tick.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
|
tick.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
|
||||||
loop { tick.tick().await; input.flush_pointer(); }
|
loop {
|
||||||
|
input.pointer_wake.notified().await;
|
||||||
|
// The first event is immediate; later events coalesce until the next tick.
|
||||||
|
tick.reset();
|
||||||
|
loop {
|
||||||
|
input.flush_pointer();
|
||||||
|
tick.tick().await;
|
||||||
|
if input.pointer_idle() { break; }
|
||||||
|
}
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
/// Whether the worker may park: nothing accumulated, no full scroll notch waiting and no
|
||||||
|
/// touch gesture in flight (`Pending` needs ticks until its hold resolves, `Scroll`/`Select`
|
||||||
|
/// and `down` until release). Sub-notch scroll residue cannot inject alone, so it parks.
|
||||||
|
fn pointer_idle(&self) -> bool {
|
||||||
|
let pending = self.pending.lock().unwrap();
|
||||||
|
let touch = self.touch.lock().unwrap();
|
||||||
|
pending.absolute.is_none() && pending.relative == (0,0)
|
||||||
|
&& pending.scroll.0 / 120 == 0 && pending.scroll.1 / 120 == 0
|
||||||
|
&& !touch.down && touch.finger == Finger::Up
|
||||||
|
}
|
||||||
pub fn discard_pointer(&self) { *self.pending.lock().unwrap() = PendingPointer::default(); }
|
pub fn discard_pointer(&self) { *self.pending.lock().unwrap() = PendingPointer::default(); }
|
||||||
pub fn flush_pointer(&self) {
|
pub fn flush_pointer(&self) {
|
||||||
let _serial=self.serial.lock().unwrap();
|
let _serial=self.serial.lock().unwrap();
|
||||||
@@ -229,6 +283,8 @@ impl InputInjector {
|
|||||||
}
|
}
|
||||||
pub fn mouse_button(&self, button: i32, is_press: bool) {
|
pub fn mouse_button(&self, button: i32, is_press: bool) {
|
||||||
let _serial=self.serial.lock().unwrap();
|
let _serial=self.serial.lock().unwrap();
|
||||||
|
// The worker cannot consume the wake and flush until this transition is published.
|
||||||
|
self.pointer_wake.notify_one();
|
||||||
self.flush_pointer_locked();
|
self.flush_pointer_locked();
|
||||||
if button == 1 && self.touch_button(is_press) { return; }
|
if button == 1 && self.touch_button(is_press) { return; }
|
||||||
let result = self.inject_button(button,is_press);
|
let result = self.inject_button(button,is_press);
|
||||||
@@ -276,7 +332,7 @@ impl InputInjector {
|
|||||||
*self.cmd.lock().unwrap() = CmdState::default();
|
*self.cmd.lock().unwrap() = CmdState::default();
|
||||||
let mut touch = self.touch.lock().unwrap();
|
let mut touch = self.touch.lock().unwrap();
|
||||||
self.lift_finger(&mut touch);
|
self.lift_finger(&mut touch);
|
||||||
let mode = if controller != Controller::Mobile || self.uinput_pointer { TouchMode::Mouse } else {
|
let mode = if !controller.is_mobile() || self.uinput_pointer { TouchMode::Mouse } else {
|
||||||
match std::env::var("UU_TOUCH_INPUT").as_deref() { Ok("0") => TouchMode::Mouse, Ok("touch") => TouchMode::Touch, _ => TouchMode::Gesture }
|
match std::env::var("UU_TOUCH_INPUT").as_deref() { Ok("0") => TouchMode::Mouse, Ok("touch") => TouchMode::Touch, _ => TouchMode::Gesture }
|
||||||
};
|
};
|
||||||
*touch = TouchDrag { mode, ..TouchDrag::default() };
|
*touch = TouchDrag { mode, ..TouchDrag::default() };
|
||||||
@@ -354,8 +410,20 @@ impl InputInjector {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
fn inject_touch(&self, phase: i32, x: i32, y: i32) -> i32 {
|
fn inject_touch(&self, phase: i32, x: i32, y: i32) -> i32 {
|
||||||
|
// Serialize the contact with handle replacement: a contact sent to the new devices
|
||||||
let Some(portal) = self.portal.lock().unwrap().clone() else { return -1 };
|
let Some(portal) = self.portal.lock().unwrap().clone() else { return -1 };
|
||||||
self.portal_result("touch", portal.touch(phase, f64::from(x), f64::from(y)))
|
// Serialize with handle replacement while the contact is sent; portal then recording
|
||||||
|
// lock, the same order the button and key recorders use.
|
||||||
|
let _serial = lock_portal_held();
|
||||||
|
let result = self.portal_result("touch", portal.touch(phase, f64::from(x), f64::from(y)));
|
||||||
|
if result == 0 {
|
||||||
|
match phase {
|
||||||
|
0 => PORTAL_TOUCH_HELD.store(true, std::sync::atomic::Ordering::Relaxed),
|
||||||
|
2 => PORTAL_TOUCH_HELD.store(false, std::sync::atomic::Ordering::Relaxed),
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result
|
||||||
}
|
}
|
||||||
|
|
||||||
fn terminal_focused(&self) -> bool {
|
fn terminal_focused(&self) -> bool {
|
||||||
@@ -470,6 +538,16 @@ impl InputInjector {
|
|||||||
if !keys_ok {log::warn!("Desktop input reset incomplete: backend unavailable");}
|
if !keys_ok {log::warn!("Desktop input reset incomplete: backend unavailable");}
|
||||||
}
|
}
|
||||||
*held=HeldInput::default();
|
*held=HeldInput::default();
|
||||||
|
// Inputs bound to the portal session are not covered by the uinput release above.
|
||||||
|
let (portal_buttons, portal_keys) = {
|
||||||
|
let _serial=lock_portal_held();
|
||||||
|
let mut pending=PORTAL_HELD.lock().unwrap();
|
||||||
|
(std::mem::take(&mut pending.buttons), std::mem::take(&mut pending.keys))
|
||||||
|
};
|
||||||
|
// Stop on the first failure like the sweep above: each call can wait out the portal timeout.
|
||||||
|
let buttons_ok = portal_buttons.into_iter().all(|button| self.inject_button(button,false)==0);
|
||||||
|
if buttons_ok { for key in portal_keys { if self.inject_key(key,false)!=0 { break; } } }
|
||||||
|
PORTAL_INPUT_HELD.store(false,std::sync::atomic::Ordering::Relaxed);
|
||||||
*self.shortcuts.lock().unwrap()=Shortcuts::default();
|
*self.shortcuts.lock().unwrap()=Shortcuts::default();
|
||||||
*self.cmd.lock().unwrap()=CmdState::default();
|
*self.cmd.lock().unwrap()=CmdState::default();
|
||||||
}
|
}
|
||||||
@@ -503,7 +581,22 @@ impl InputInjector {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// Inputs bound to the portal session are dropped when that session is replaced.
|
||||||
|
fn record_portal_button(&self, button: i32, pressed: bool) {
|
||||||
|
// Callers hold the serial lock across the injection they are recording.
|
||||||
|
let mut held = PORTAL_HELD.lock().unwrap();
|
||||||
|
if pressed { held.buttons.insert(button); } else { held.buttons.remove(&button); }
|
||||||
|
PORTAL_INPUT_HELD.store(!held.buttons.is_empty() || !held.keys.is_empty(), std::sync::atomic::Ordering::Relaxed);
|
||||||
|
}
|
||||||
|
fn record_portal_key(&self, symbol: u64, pressed: bool) {
|
||||||
|
let mut held = PORTAL_HELD.lock().unwrap();
|
||||||
|
if pressed { held.keys.insert(symbol); } else { held.keys.remove(&symbol); }
|
||||||
|
PORTAL_INPUT_HELD.store(!held.buttons.is_empty() || !held.keys.is_empty(), std::sync::atomic::Ordering::Relaxed);
|
||||||
|
}
|
||||||
fn inject_move(&self,x:i32,y:i32,relative:bool)->i32 {
|
fn inject_move(&self,x:i32,y:i32,relative:bool)->i32 {
|
||||||
|
// The viewer's mouse mode decides whether the stream must carry the pointer (see
|
||||||
|
// portal::note_pointer_motion); only the portal backend can change that.
|
||||||
|
if self.backend==crate::desktop_backend::DesktopBackend::Portal { crate::portal::note_pointer_motion(relative); }
|
||||||
if self.uinput_pointer && self.backend != crate::desktop_backend::DesktopBackend::X11 {
|
if self.uinput_pointer && self.backend != crate::desktop_backend::DesktopBackend::X11 {
|
||||||
if let Some(uinput) = &self.uinput {
|
if let Some(uinput) = &self.uinput {
|
||||||
if relative { return Self::uinput_result(uinput.move_relative(x,y)); }
|
if relative { return Self::uinput_result(uinput.move_relative(x,y)); }
|
||||||
@@ -573,14 +666,25 @@ impl InputInjector {
|
|||||||
// Portal: clicks follow absolute motion on the same session, so a tap cannot land
|
// Portal: clicks follow absolute motion on the same session, so a tap cannot land
|
||||||
// before the compositor has moved the pointer there (uinput is a separate queue).
|
// before the compositor has moved the pointer there (uinput is a separate queue).
|
||||||
if !self.uinput_pointer && self.backend==crate::desktop_backend::DesktopBackend::Portal && !self.virtual_uinput() {
|
if !self.uinput_pointer && self.backend==crate::desktop_backend::DesktopBackend::Portal && !self.virtual_uinput() {
|
||||||
if let Some(portal)=self.portal.lock().unwrap().as_ref() { return self.portal_result("button", portal.button(button,pressed)); }
|
if let Some(portal)=self.portal.lock().unwrap().as_ref() {
|
||||||
|
// The injection and its record must both predate or both postdate a swap.
|
||||||
|
let _serial=lock_portal_held();
|
||||||
|
let result=self.portal_result("button", portal.button(button,pressed));
|
||||||
|
if result==0 { self.record_portal_button(button,pressed); }
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if let Some(uinput)=&self.uinput {
|
if let Some(uinput)=&self.uinput {
|
||||||
if let Some((v,h))=crate::uinput::wheel_step(button) { return if pressed { Self::uinput_result(uinput.wheel(v,h)) } else { 0 }; }
|
if let Some((v,h))=crate::uinput::wheel_step(button) { return if pressed { Self::uinput_result(uinput.wheel(v,h)) } else { 0 }; }
|
||||||
if let Some(code)=crate::uinput::button_code(button) { return Self::uinput_result(uinput.button(code,pressed)); }
|
if let Some(code)=crate::uinput::button_code(button) { return Self::uinput_result(uinput.button(code,pressed)); }
|
||||||
}
|
}
|
||||||
if self.backend==crate::desktop_backend::DesktopBackend::Kms { return -1; }
|
if self.backend==crate::desktop_backend::DesktopBackend::Kms { return -1; }
|
||||||
if let Some(portal)=self.portal.lock().unwrap().as_ref() { return self.portal_result("button", portal.button(button,pressed)); }
|
if let Some(portal)=self.portal.lock().unwrap().as_ref() {
|
||||||
|
let _serial=lock_portal_held();
|
||||||
|
let result=self.portal_result("button", portal.button(button,pressed));
|
||||||
|
if result==0 { self.record_portal_button(button,pressed); }
|
||||||
|
return result;
|
||||||
|
}
|
||||||
if self.backend==crate::desktop_backend::DesktopBackend::Portal {return self.portal_result("button", Err("Portal input session is not bound".into()));}
|
if self.backend==crate::desktop_backend::DesktopBackend::Portal {return self.portal_result("button", Err("Portal input session is not bound".into()));}
|
||||||
if self.backend==crate::desktop_backend::DesktopBackend::Wayland { crate::wayland::button(button,pressed) }
|
if self.backend==crate::desktop_backend::DesktopBackend::Wayland { crate::wayland::button(button,pressed) }
|
||||||
else { unsafe { x11_mouse_button(button,i32::from(pressed)) } }
|
else { unsafe { x11_mouse_button(button,i32::from(pressed)) } }
|
||||||
@@ -590,7 +694,12 @@ impl InputInjector {
|
|||||||
if let Some(code)=crate::uinput::keysym_to_evdev(symbol) { return Self::uinput_result(uinput.key(code,pressed)); }
|
if let Some(code)=crate::uinput::keysym_to_evdev(symbol) { return Self::uinput_result(uinput.key(code,pressed)); }
|
||||||
}
|
}
|
||||||
if self.backend==crate::desktop_backend::DesktopBackend::Kms { return -1; }
|
if self.backend==crate::desktop_backend::DesktopBackend::Kms { return -1; }
|
||||||
if let Some(portal)=self.portal.lock().unwrap().as_ref() { return self.portal_result("keyboard", portal.key(symbol,pressed)); }
|
if let Some(portal)=self.portal.lock().unwrap().as_ref() {
|
||||||
|
let _serial=lock_portal_held();
|
||||||
|
let result=self.portal_result("keyboard", portal.key(symbol,pressed));
|
||||||
|
if result==0 { self.record_portal_key(symbol,pressed); }
|
||||||
|
return result;
|
||||||
|
}
|
||||||
if self.backend==crate::desktop_backend::DesktopBackend::Portal {return self.portal_result("keyboard", Err("Portal input session is not bound".into()));}
|
if self.backend==crate::desktop_backend::DesktopBackend::Portal {return self.portal_result("keyboard", Err("Portal input session is not bound".into()));}
|
||||||
if self.backend==crate::desktop_backend::DesktopBackend::Wayland { crate::wayland::key(symbol,pressed) }
|
if self.backend==crate::desktop_backend::DesktopBackend::Wayland { crate::wayland::key(symbol,pressed) }
|
||||||
else { unsafe { x11_key_symbol(symbol as libc::c_ulong,i32::from(pressed)) } }
|
else { unsafe { x11_key_symbol(symbol as libc::c_ulong,i32::from(pressed)) } }
|
||||||
@@ -715,14 +824,21 @@ impl InputInjector {
|
|||||||
self.emit_uinput_text(&crate::uinput::text_plan(text))
|
self.emit_uinput_text(&crate::uinput::text_plan(text))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Mobile input-method text (`text_input`). uinput types the layout-mappable ASCII prefix
|
/// Mobile input-method text (`text_input`). X11 types directly. Native Wayland uses the text
|
||||||
/// without clipboard access. X11 types directly; native Wayland re-maps a spare
|
/// keyboard's Unicode keysyms first: uinput sends physical keycodes, which a running input
|
||||||
/// keycode in the virtual keyboard's keymap. Portal and other Wayland environments inject
|
/// method composes as pinyin, so "hello" would become candidates instead of text. uinput stays
|
||||||
/// via clipboard paste (Shift+Insert). Set UU_WAYLAND_TEXT=0 to disable Wayland text injection.
|
/// as the fallback when the keymap path is unavailable. Portal and other Wayland environments
|
||||||
|
/// inject via clipboard paste (Shift+Insert).
|
||||||
|
/// Set UU_WAYLAND_TEXT=0 to disable Wayland text injection.
|
||||||
pub fn text_input(&self, text: &str) {
|
pub fn text_input(&self, text: &str) {
|
||||||
let _serial=self.serial.lock().unwrap();
|
let _serial=self.serial.lock().unwrap();
|
||||||
if self.backend != crate::desktop_backend::DesktopBackend::X11 {
|
if self.backend != crate::desktop_backend::DesktopBackend::X11 {
|
||||||
if std::env::var("UU_WAYLAND_TEXT").is_ok_and(|v| v == "0") { return; }
|
if std::env::var("UU_WAYLAND_TEXT").is_ok_and(|v| v == "0") { return; }
|
||||||
|
if self.backend == crate::desktop_backend::DesktopBackend::Wayland
|
||||||
|
&& crate::wayland::type_utf8(text) >= 0 {
|
||||||
|
log::info!("Desktop text input: chars={} result=keysyms", text.chars().count());
|
||||||
|
return;
|
||||||
|
}
|
||||||
let typed = self.type_uinput_text(text);
|
let typed = self.type_uinput_text(text);
|
||||||
if typed > 0 { log::info!("Desktop text input (uinput): chars={typed}"); }
|
if typed > 0 { log::info!("Desktop text input (uinput): chars={typed}"); }
|
||||||
if typed == text.len() { return; }
|
if typed == text.len() { return; }
|
||||||
@@ -841,6 +957,98 @@ mod motion_tests {
|
|||||||
input.mouse_relative(1,2); input.discard_pointer();
|
input.mouse_relative(1,2); input.discard_pointer();
|
||||||
assert_eq!(input.pending.lock().unwrap().relative,(0,0));
|
assert_eq!(input.pending.lock().unwrap().relative,(0,0));
|
||||||
}
|
}
|
||||||
|
#[test]
|
||||||
|
fn parks_when_pointer_state_is_idle() {
|
||||||
|
let input = InputInjector::new();
|
||||||
|
assert!(input.pointer_idle());
|
||||||
|
input.mouse_relative(5,5);
|
||||||
|
assert!(!input.pointer_idle());
|
||||||
|
input.flush_pointer();
|
||||||
|
assert!(input.pointer_idle());
|
||||||
|
input.mouse_scroll(0,125); input.flush_pointer();
|
||||||
|
assert!(input.pointer_idle(), "sub-notch scroll residue cannot inject alone");
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn live_touch_gesture_stays_busy_until_it_resolves() {
|
||||||
|
let input = InputInjector::new();
|
||||||
|
input.touch.lock().unwrap().finger = Finger::Pending { start: (5,5), at: std::time::Instant::now() };
|
||||||
|
assert!(!input.pointer_idle());
|
||||||
|
input.touch.lock().unwrap().finger = Finger::Scroll { last: (9,9) };
|
||||||
|
assert!(!input.pointer_idle());
|
||||||
|
*input.touch.lock().unwrap() = TouchDrag::default();
|
||||||
|
assert!(input.pointer_idle());
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn button_wake_waits_for_the_serialized_transition() {
|
||||||
|
use futures_util::FutureExt;
|
||||||
|
let input = std::sync::Arc::new(InputInjector::without_desktop());
|
||||||
|
let serial = input.serial.lock().unwrap();
|
||||||
|
let ready = std::sync::Arc::new(std::sync::Barrier::new(2));
|
||||||
|
let pressing = input.clone();
|
||||||
|
let started = ready.clone();
|
||||||
|
let button = std::thread::spawn(move || { started.wait(); pressing.mouse_button(1,true); });
|
||||||
|
ready.wait();
|
||||||
|
let runtime = tokio::runtime::Builder::new_current_thread().enable_time().build().unwrap();
|
||||||
|
let premature = runtime.block_on(async {
|
||||||
|
tokio::time::timeout(std::time::Duration::from_millis(50), input.pointer_wake.notified()).await.is_ok()
|
||||||
|
});
|
||||||
|
drop(serial);
|
||||||
|
button.join().unwrap();
|
||||||
|
assert!(!premature, "a parked worker must not wake before the button owns the serial lock");
|
||||||
|
assert!(input.pointer_wake.notified().now_or_never().is_some());
|
||||||
|
}
|
||||||
|
#[tokio::test(start_paused = true)]
|
||||||
|
async fn worker_coalesces_one_ms_motion_on_four_ms_ticks() {
|
||||||
|
let input = std::sync::Arc::new(InputInjector::without_desktop());
|
||||||
|
let worker = input.start_pointer_worker();
|
||||||
|
input.mouse_relative(1,0);
|
||||||
|
tokio::task::yield_now().await;
|
||||||
|
assert_eq!(input.portal_input_counts_for_test()[0],1, "first motion is immediate");
|
||||||
|
for ms in 1..=12 {
|
||||||
|
tokio::time::advance(std::time::Duration::from_millis(1)).await;
|
||||||
|
tokio::task::yield_now().await;
|
||||||
|
input.mouse_relative(1,0);
|
||||||
|
tokio::task::yield_now().await;
|
||||||
|
assert_eq!(input.portal_input_counts_for_test()[0],1+ms/4, "motion at {ms} ms bypassed the cadence");
|
||||||
|
}
|
||||||
|
tokio::time::advance(std::time::Duration::from_millis(4)).await;
|
||||||
|
tokio::task::yield_now().await;
|
||||||
|
assert_eq!(input.portal_input_counts_for_test()[0],5);
|
||||||
|
assert_eq!(input.pending.lock().unwrap().relative,(0,0));
|
||||||
|
worker.abort();
|
||||||
|
assert!(worker.await.unwrap_err().is_cancelled());
|
||||||
|
}
|
||||||
|
#[tokio::test(start_paused = true)]
|
||||||
|
async fn worker_parks_and_resets_the_tick_after_a_quiet_period() {
|
||||||
|
let input = std::sync::Arc::new(InputInjector::without_desktop());
|
||||||
|
let worker = input.start_pointer_worker();
|
||||||
|
tokio::task::yield_now().await;
|
||||||
|
// Without a notification, raw queued state must remain untouched while parked.
|
||||||
|
input.pending.lock().unwrap().relative = (1,0);
|
||||||
|
tokio::time::advance(std::time::Duration::from_secs(1)).await;
|
||||||
|
tokio::task::yield_now().await;
|
||||||
|
assert_eq!(input.portal_input_counts_for_test()[0],0);
|
||||||
|
input.mouse_relative(1,0);
|
||||||
|
tokio::task::yield_now().await;
|
||||||
|
assert_eq!(input.portal_input_counts_for_test()[0],1);
|
||||||
|
tokio::time::advance(std::time::Duration::from_millis(4)).await;
|
||||||
|
tokio::task::yield_now().await;
|
||||||
|
input.pending.lock().unwrap().relative = (1,0);
|
||||||
|
tokio::time::advance(std::time::Duration::from_millis(997)).await;
|
||||||
|
tokio::task::yield_now().await;
|
||||||
|
assert_eq!(input.portal_input_counts_for_test()[0],1, "idle ticks must stop after activity");
|
||||||
|
input.mouse_relative(1,0);
|
||||||
|
tokio::task::yield_now().await;
|
||||||
|
assert_eq!(input.portal_input_counts_for_test()[0],2);
|
||||||
|
input.mouse_relative(1,0);
|
||||||
|
tokio::task::yield_now().await;
|
||||||
|
assert_eq!(input.portal_input_counts_for_test()[0],2, "a stale interval must not flush a second time immediately");
|
||||||
|
tokio::time::advance(std::time::Duration::from_millis(4)).await;
|
||||||
|
tokio::task::yield_now().await;
|
||||||
|
assert_eq!(input.portal_input_counts_for_test()[0],3);
|
||||||
|
worker.abort();
|
||||||
|
assert!(worker.await.unwrap_err().is_cancelled());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(all(test, target_os = "linux"))]
|
#[cfg(all(test, target_os = "linux"))]
|
||||||
@@ -921,7 +1129,7 @@ mod kernel_pointer_tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn full_uinput_bypasses_portal_binding_and_preserves_move_click_order() {
|
fn full_uinput_bypasses_portal_binding_and_preserves_move_click_order() {
|
||||||
for controller in [Controller::Other, Controller::Mobile] {
|
for controller in [Controller::Other, Controller::Mobile, Controller::Ios] {
|
||||||
let (devices, mut keyboard, mut pointer) = crate::uinput::Devices::recording_for_test();
|
let (devices, mut keyboard, mut pointer) = crate::uinput::Devices::recording_for_test();
|
||||||
let mut input = InputInjector::without_desktop();
|
let mut input = InputInjector::without_desktop();
|
||||||
input.uinput = Some(devices);
|
input.uinput = Some(devices);
|
||||||
@@ -1088,7 +1296,7 @@ impl InputInjector {
|
|||||||
portal_outcomes:std::array::from_fn(|_|std::sync::atomic::AtomicUsize::new(0)),
|
portal_outcomes:std::array::from_fn(|_|std::sync::atomic::AtomicUsize::new(0)),
|
||||||
portal:std::sync::Mutex::new(None), backend:crate::desktop_backend::DesktopBackend::Portal,
|
portal:std::sync::Mutex::new(None), backend:crate::desktop_backend::DesktopBackend::Portal,
|
||||||
pending:std::sync::Mutex::new(PendingPointer::default()), held:std::sync::Mutex::new(HeldInput::default()),
|
pending:std::sync::Mutex::new(PendingPointer::default()), held:std::sync::Mutex::new(HeldInput::default()),
|
||||||
touch:std::sync::Mutex::new(TouchDrag::default()) }
|
touch:std::sync::Mutex::new(TouchDrag::default()), pointer_wake: tokio::sync::Notify::new() }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1170,10 +1378,17 @@ mod touch_tests {
|
|||||||
fn controller_from_platform_numbers_and_mac_strings() {
|
fn controller_from_platform_numbers_and_mac_strings() {
|
||||||
use serde_json::json;
|
use serde_json::json;
|
||||||
assert_eq!(Controller::from_platform(Some(&json!(2))), Controller::Mobile);
|
assert_eq!(Controller::from_platform(Some(&json!(2))), Controller::Mobile);
|
||||||
assert_eq!(Controller::from_platform(Some(&json!("3"))), Controller::Mobile);
|
assert_eq!(Controller::from_platform(Some(&json!("3"))), Controller::Ios);
|
||||||
|
assert_eq!(Controller::from_platform(Some(&json!("ios"))), Controller::Ios);
|
||||||
|
assert_eq!(Controller::from_platform(Some(&json!("Android"))), Controller::Mobile);
|
||||||
|
assert_eq!(Controller::from_platform(Some(&json!("iPadOS"))), Controller::Ios);
|
||||||
|
assert!(Controller::Ios.is_mobile());
|
||||||
|
assert!(Controller::Mobile.is_mobile());
|
||||||
|
assert!(!Controller::Mac.is_mobile());
|
||||||
assert_eq!(Controller::from_platform(Some(&json!(4))), Controller::Mac);
|
assert_eq!(Controller::from_platform(Some(&json!(4))), Controller::Mac);
|
||||||
assert_eq!(Controller::from_platform(Some(&json!("MacOS"))), Controller::Mac);
|
assert_eq!(Controller::from_platform(Some(&json!("MacOS"))), Controller::Mac);
|
||||||
assert_eq!(Controller::from_platform(Some(&json!(1))), Controller::Other);
|
assert_eq!(Controller::from_platform(Some(&json!(1))), Controller::Windows);
|
||||||
|
assert_eq!(Controller::from_platform(Some(&json!("Windows"))), Controller::Windows);
|
||||||
assert_eq!(Controller::from_platform(None), Controller::Other);
|
assert_eq!(Controller::from_platform(None), Controller::Other);
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ mod audio;
|
|||||||
mod virtual_audio;
|
mod virtual_audio;
|
||||||
mod privacy_screen;
|
mod privacy_screen;
|
||||||
mod system_actions;
|
mod system_actions;
|
||||||
|
mod annotation;
|
||||||
mod capability;
|
mod capability;
|
||||||
mod protocol;
|
mod protocol;
|
||||||
mod control_protocol;
|
mod control_protocol;
|
||||||
@@ -1037,6 +1038,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
if desktop { portal_desktop.clone() } else { None }).await {
|
if desktop { portal_desktop.clone() } else { None }).await {
|
||||||
Ok(mut sess) => {
|
Ok(mut sess) => {
|
||||||
sess.controller = controller;
|
sess.controller = controller;
|
||||||
|
if desktop { crate::privacy_screen::set_viewer_controller(controller); }
|
||||||
if !desktop {
|
if !desktop {
|
||||||
let (requests, peer) = (desktop_requests.clone(), ice.clone());
|
let (requests, peer) = (desktop_requests.clone(), ice.clone());
|
||||||
sess.on_desktop_request(move || { let _ = requests.send(peer.clone()); });
|
sess.on_desktop_request(move || { let _ = requests.send(peer.clone()); });
|
||||||
@@ -1118,6 +1120,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
} else { None };
|
} else { None };
|
||||||
video::warm_auto_probe(); video::check_ffmpeg_usable();
|
video::warm_auto_probe(); video::check_ffmpeg_usable();
|
||||||
input.set_controller(controller);
|
input.set_controller(controller);
|
||||||
|
crate::privacy_screen::set_viewer_controller(controller);
|
||||||
input.bind_portal(screen.as_ref().map_or_else(|| sessions[&ice].capture.portal.clone(), |screen| screen.portal.clone()));
|
input.bind_portal(screen.as_ref().map_or_else(|| sessions[&ice].capture.portal.clone(), |screen| screen.portal.clone()));
|
||||||
// One desktop at a time, as for a new desktop offer. Peers offered as desktops
|
// One desktop at a time, as for a new desktop offer. Peers offered as desktops
|
||||||
// close; a promoted tool peer only stops its desktop and keeps its tools.
|
// close; a promoted tool peer only stops its desktop and keeps its tools.
|
||||||
|
|||||||
+528
-66
@@ -35,19 +35,25 @@ mod permissions;
|
|||||||
|
|
||||||
#[cfg(all(target_os = "linux", feature = "portal"))]
|
#[cfg(all(target_os = "linux", feature = "portal"))]
|
||||||
mod native {
|
mod native {
|
||||||
use std::{ffi::c_void, ptr::NonNull, sync::{Mutex, MutexGuard, TryLockError}};
|
use std::{ffi::c_void, ptr::NonNull, sync::{Arc, Mutex, MutexGuard, TryLockError}};
|
||||||
crate::engine_ffi! { crate::engine_plugin::Engine::Portal;
|
crate::engine_ffi! { crate::engine_plugin::Engine::Portal;
|
||||||
fn uu_portal_open_persist(restore: *const libc::c_char, save: extern "C" fn(*const libc::c_char, *mut c_void), data: *mut c_void, error: *mut i32, width: *mut u32, height: *mut u32) -> *mut c_void;
|
fn uu_portal_open_persist(restore: *const libc::c_char, save: extern "C" fn(*const libc::c_char, *mut c_void), data: *mut c_void, error: *mut i32, width: *mut u32, height: *mut u32) -> *mut c_void;
|
||||||
fn uu_portal_open_virtual(restore: *const libc::c_char, save: extern "C" fn(*const libc::c_char, *mut c_void), data: *mut c_void, error: *mut i32, width: *mut u32, height: *mut u32) -> *mut c_void;
|
fn uu_portal_open_virtual(restore: *const libc::c_char, save: extern "C" fn(*const libc::c_char, *mut c_void), data: *mut c_void, error: *mut i32, width: *mut u32, height: *mut u32) -> *mut c_void;
|
||||||
fn uu_portal_open_persist_cancellable(restore: *const libc::c_char, save: extern "C" fn(*const libc::c_char, *mut c_void), save_data: *mut c_void, cancelled: extern "C" fn(*mut c_void) -> i32, cancel_data: *mut c_void, error: *mut i32, width: *mut u32, height: *mut u32) -> *mut c_void;
|
fn uu_portal_open_persist_cancellable(restore: *const libc::c_char, save: extern "C" fn(*const libc::c_char, *mut c_void), save_data: *mut c_void, cancelled: extern "C" fn(*mut c_void) -> i32, cancel_data: *mut c_void, error: *mut i32, width: *mut u32, height: *mut u32) -> *mut c_void;
|
||||||
fn uu_portal_open_persist_capture(restore: *const libc::c_char, save: extern "C" fn(*const libc::c_char, *mut c_void), save_data: *mut c_void, cancelled: Option<extern "C" fn(*mut c_void) -> i32>, cancel_data: *mut c_void, prefer_dmabuf: i32, error: *mut i32, width: *mut u32, height: *mut u32) -> *mut c_void;
|
fn uu_portal_open_persist_capture(restore: *const libc::c_char, save: extern "C" fn(*const libc::c_char, *mut c_void), save_data: *mut c_void, cancelled: Option<extern "C" fn(*mut c_void) -> i32>, cancel_data: *mut c_void, prefer_dmabuf: i32, error: *mut i32, width: *mut u32, height: *mut u32) -> *mut c_void;
|
||||||
|
fn uu_portal_open_detailed(restore: *const libc::c_char, save: extern "C" fn(*const libc::c_char, *mut c_void, i32, i32, i32), save_data: *mut c_void, cancelled: Option<extern "C" fn(*mut c_void) -> i32>, cancel_data: *mut c_void, prefer_dmabuf: i32, source_types: u32, error: *mut i32, width: *mut u32, height: *mut u32) -> *mut c_void;
|
||||||
|
fn uu_portal_set_cursor_mode(mode: i32);
|
||||||
|
fn uu_portal_cursor_mode(portal: *mut c_void) -> i32;
|
||||||
|
fn uu_portal_cursor_modes(portal: *mut c_void) -> i32;
|
||||||
fn uu_portal_clipboard_supported(portal: *mut c_void) -> i32;
|
fn uu_portal_clipboard_supported(portal: *mut c_void) -> i32;
|
||||||
fn uu_portal_clipboard_ready(portal: *mut c_void) -> i32;
|
fn uu_portal_clipboard_ready(portal: *mut c_void) -> i32;
|
||||||
fn uu_portal_clipboard_set(portal: *mut c_void, text: *const u8, length: usize) -> i32;
|
fn uu_portal_clipboard_set(portal: *mut c_void, text: *const u8, length: usize) -> i32;
|
||||||
|
fn uu_portal_clipboard_copy(from: *mut c_void, to: *mut c_void) -> i32;
|
||||||
fn uu_portal_clipboard_poll(portal: *mut c_void, text: *mut u8, capacity: usize) -> i32;
|
fn uu_portal_clipboard_poll(portal: *mut c_void, text: *mut u8, capacity: usize) -> i32;
|
||||||
fn uu_portal_close(portal: *mut c_void);
|
fn uu_portal_close(portal: *mut c_void);
|
||||||
fn uu_portal_alive(portal: *mut c_void) -> i32;
|
fn uu_portal_alive(portal: *mut c_void) -> i32;
|
||||||
fn uu_portal_capture_alive(portal: *mut c_void) -> i32;
|
fn uu_portal_capture_alive(portal: *mut c_void) -> i32;
|
||||||
|
fn uu_portal_wait_frame(portal: *mut c_void, timeout_us: i64) -> i32;
|
||||||
fn uu_portal_input_dispatch(portal: *mut c_void);
|
fn uu_portal_input_dispatch(portal: *mut c_void);
|
||||||
fn uu_portal_reset_frame(portal: *mut c_void);
|
fn uu_portal_reset_frame(portal: *mut c_void);
|
||||||
fn uu_portal_capture_since(portal: *mut c_void, bgra: *mut u8, length: usize, revision: *mut u64) -> i32;
|
fn uu_portal_capture_since(portal: *mut c_void, bgra: *mut u8, length: usize, revision: *mut u64) -> i32;
|
||||||
@@ -67,15 +73,22 @@ mod native {
|
|||||||
}
|
}
|
||||||
struct Handle(NonNull<c_void>);
|
struct Handle(NonNull<c_void>);
|
||||||
fn pack(width: u32, height: u32) -> u64 { (u64::from(width) << 32) | u64::from(height) }
|
fn pack(width: u32, height: u32) -> u64 { (u64::from(width) << 32) | u64::from(height) }
|
||||||
// The engine owns callback threads; public calls are serialized by Mutex.
|
// Calls are serialized by Session's mutex except wait_frame, whose C-side
|
||||||
|
// condition wait synchronizes with callbacks and input through the engine lock.
|
||||||
unsafe impl Send for Handle {}
|
unsafe impl Send for Handle {}
|
||||||
|
unsafe impl Sync for Handle {}
|
||||||
impl Drop for Handle { fn drop(&mut self) { unsafe { uu_portal_close(self.0.as_ptr()) } } }
|
impl Drop for Handle { fn drop(&mut self) { unsafe { uu_portal_close(self.0.as_ptr()) } } }
|
||||||
|
fn lease_handle<T>(current: &Mutex<Arc<T>>) -> Result<Arc<T>, String> {
|
||||||
|
current.lock().map(|handle| Arc::clone(&handle)).map_err(|_| "Portal session lock poisoned".into())
|
||||||
|
}
|
||||||
fn blank_changed(frame: &mut [u8], version: &mut Option<super::FrameVersion>) -> bool {
|
fn blank_changed(frame: &mut [u8], version: &mut Option<super::FrameVersion>) -> bool {
|
||||||
if *version == Some(super::FrameVersion(0, 0)) { return false; }
|
if *version == Some(super::FrameVersion(0, 0)) { return false; }
|
||||||
super::blank(frame); *version = Some(super::FrameVersion(0, 0)); true
|
super::blank(frame); *version = Some(super::FrameVersion(0, 0)); true
|
||||||
}
|
}
|
||||||
// Portal preparation and native teardown can wait for consent or D-Bus.
|
// Portal preparation and native teardown can wait for consent or D-Bus.
|
||||||
// Only the swap may hold the mutex shared with input and clipboard.
|
// Only the swap may hold the mutex shared with input and clipboard.
|
||||||
|
// Only the unit tests swap a test handle now; production swaps carry the clipboard.
|
||||||
|
#[cfg(test)]
|
||||||
fn replace_handle<T>(current: &Mutex<T>, locked: MutexGuard<'_, T>, prepare: impl FnOnce() -> Result<Option<T>, String>) -> Result<bool, String> {
|
fn replace_handle<T>(current: &Mutex<T>, locked: MutexGuard<'_, T>, prepare: impl FnOnce() -> Result<Option<T>, String>) -> Result<bool, String> {
|
||||||
drop(locked);
|
drop(locked);
|
||||||
let Some(replacement) = prepare()? else { return Ok(false); };
|
let Some(replacement) = prepare()? else { return Ok(false); };
|
||||||
@@ -86,6 +99,24 @@ mod native {
|
|||||||
drop(old);
|
drop(old);
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
/// Like `replace_handle`, but carries the viewer's clipboard text before the old session
|
||||||
|
/// closes. Clipboard writers wait from before the swap until the carry-over finishes.
|
||||||
|
fn replace_handle_carrying(current: &Mutex<Arc<Handle>>, clipboard_write: &Mutex<()>, locked: MutexGuard<'_, Arc<Handle>>, prepare: impl FnOnce() -> Result<Option<Arc<Handle>>, String>) -> Result<bool, String> {
|
||||||
|
drop(locked);
|
||||||
|
let Some(replacement) = prepare()? else { return Ok(false); };
|
||||||
|
let _clipboard = clipboard_write.lock().map_err(|_| "Portal clipboard lock poisoned")?;
|
||||||
|
let _serial = crate::input::lock_portal_held();
|
||||||
|
let (old, installed) = {
|
||||||
|
let mut handle = current.lock().map_err(|_| "Portal session lock poisoned")?;
|
||||||
|
let old = std::mem::replace(&mut *handle, replacement);
|
||||||
|
(old, Arc::clone(&*handle))
|
||||||
|
};
|
||||||
|
unsafe { uu_portal_clipboard_copy(old.0.as_ptr(), installed.0.as_ptr()) };
|
||||||
|
drop(old);
|
||||||
|
// The replaced devices took any held portal input with them.
|
||||||
|
crate::input::portal_session_replaced();
|
||||||
|
Ok(true)
|
||||||
|
}
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
struct Recovery { retry_at: Option<std::time::Instant>, failed_until: Option<std::time::Instant>, denied: bool }
|
struct Recovery { retry_at: Option<std::time::Instant>, failed_until: Option<std::time::Instant>, denied: bool }
|
||||||
impl Recovery {
|
impl Recovery {
|
||||||
@@ -111,7 +142,7 @@ mod native {
|
|||||||
was_locked.store(false, std::sync::atomic::Ordering::Release);
|
was_locked.store(false, std::sync::atomic::Ordering::Release);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub struct Session { handle: Mutex<Handle>, locked: tokio::sync::watch::Receiver<Option<bool>>, was_locked: std::sync::atomic::AtomicBool, recovery: Mutex<Recovery>, size: std::sync::atomic::AtomicU64, monitor: Mutex<Option<String>>, virtual_output: std::sync::atomic::AtomicBool }
|
pub struct Session { handle: Mutex<Arc<Handle>>, locked: tokio::sync::watch::Receiver<Option<bool>>, was_locked: std::sync::atomic::AtomicBool, recovery: Mutex<Recovery>, size: std::sync::atomic::AtomicU64, monitor: Mutex<Option<String>>, virtual_output: std::sync::atomic::AtomicBool, clipboard_write: Mutex<()>, end_generation: Arc<std::sync::atomic::AtomicU64> }
|
||||||
impl Session {
|
impl Session {
|
||||||
fn take_lock_observation(&self) -> Result<bool, String> {
|
fn take_lock_observation(&self) -> Result<bool, String> {
|
||||||
// A recovery in progress must see the lock even if another capture
|
// A recovery in progress must see the lock even if another capture
|
||||||
@@ -132,6 +163,44 @@ mod native {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// Swap `replacement` in, carrying the viewer's clipboard text before the old session
|
||||||
|
/// closes. `expected` rejects a desktop end that raced the open.
|
||||||
|
fn install_replacement(&self, replacement: Self, expected: Option<u64>, defer_held: bool, refresh_privacy: bool) -> Result<(u32, u32), String> {
|
||||||
|
let size = replacement.size();
|
||||||
|
let next = replacement.handle.into_inner().map_err(|_| "Portal session lock poisoned".to_string())?;
|
||||||
|
let clipboard = self.clipboard_write.lock().map_err(|_| "Portal clipboard lock poisoned".to_string())?;
|
||||||
|
// Records made against the new handle must postdate the reset below.
|
||||||
|
let serial = crate::input::lock_portal_held();
|
||||||
|
// Checked under the serial lock: an input recorded after an earlier check would
|
||||||
|
// otherwise be destroyed with the session it was sent to.
|
||||||
|
if defer_held && crate::input::portal_input_held() { return Err("input held during the swap".into()); }
|
||||||
|
let mut handle = self.handle.lock().map_err(|_| "Portal session lock poisoned".to_string())?;
|
||||||
|
if expected.is_some_and(|generation| self.end_generation.load(std::sync::atomic::Ordering::Acquire) != generation) {
|
||||||
|
return Err("desktop session ended during the rebuild".into());
|
||||||
|
}
|
||||||
|
self.size.store(pack(size.0, size.1), std::sync::atomic::Ordering::Release);
|
||||||
|
let previous_handle = std::mem::replace(&mut *handle, next);
|
||||||
|
let installed = Arc::clone(&*handle);
|
||||||
|
drop(handle);
|
||||||
|
if unsafe { uu_portal_clipboard_copy(previous_handle.0.as_ptr(), installed.0.as_ptr()) } < 0 {
|
||||||
|
log::warn!("Portal clipboard ownership could not be carried over");
|
||||||
|
}
|
||||||
|
drop(clipboard);
|
||||||
|
drop(previous_handle);
|
||||||
|
// The replaced devices took any held portal input with them.
|
||||||
|
crate::input::portal_session_replaced();
|
||||||
|
drop(serial);
|
||||||
|
// A replaced virtual output can move in the layout; absolute input needs its new share.
|
||||||
|
if refresh_privacy { crate::privacy_screen::refresh_pointer_region(); }
|
||||||
|
Ok(size)
|
||||||
|
}
|
||||||
|
/// Point the host and the engine at the cursor mode the installed session really has.
|
||||||
|
fn restore_installed_cursor_mode(&self, fallback: bool) {
|
||||||
|
let installed = self.handle.lock().ok().map(|handle| unsafe { uu_portal_cursor_mode(handle.0.as_ptr()) }).unwrap_or(0);
|
||||||
|
let embedded = if installed > 0 { installed == 2 } else { fallback };
|
||||||
|
unsafe { uu_portal_set_cursor_mode(if embedded { 2 } else { 1 }); }
|
||||||
|
super::CURSOR_MODE.store(if embedded { 2 } else { 1 }, std::sync::atomic::Ordering::Release);
|
||||||
|
}
|
||||||
pub fn is_alive(&self) -> bool {
|
pub fn is_alive(&self) -> bool {
|
||||||
self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_alive(handle.0.as_ptr()) != 0 })
|
self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_alive(handle.0.as_ptr()) != 0 })
|
||||||
}
|
}
|
||||||
@@ -153,6 +222,7 @@ mod native {
|
|||||||
let directory = super::permissions::directory();
|
let directory = super::permissions::directory();
|
||||||
let key = super::permissions::desktop_key();
|
let key = super::permissions::desktop_key();
|
||||||
let wanted = if virtual_output { None } else { monitor.map(str::to_owned).or_else(crate::wayland::portal_monitor) };
|
let wanted = if virtual_output { None } else { monitor.map(str::to_owned).or_else(crate::wayland::portal_monitor) };
|
||||||
|
let wanted_key = wanted.as_deref().map(super::permissions::monitor_key);
|
||||||
let virtual_key = format!("{key}-virtual");
|
let virtual_key = format!("{key}-virtual");
|
||||||
// One opener at a time: consent tokens are single-use, and two concurrent openers
|
// One opener at a time: consent tokens are single-use, and two concurrent openers
|
||||||
// (privacy virtual-output switch and closure recovery after a quick reconnect) each
|
// (privacy virtual-output switch and closure recovery after a quick reconnect) each
|
||||||
@@ -163,71 +233,110 @@ mod native {
|
|||||||
let taken = directory.as_deref().filter(|_| !fresh).and_then(|dir| {
|
let taken = directory.as_deref().filter(|_| !fresh).and_then(|dir| {
|
||||||
let take = |k: String| super::permissions::take(dir, &k).map(|v| (k, v));
|
let take = |k: String| super::permissions::take(dir, &k).map(|v| (k, v));
|
||||||
if virtual_output { return take(virtual_key.clone()); }
|
if virtual_output { return take(virtual_key.clone()); }
|
||||||
wanted.as_deref().and_then(|name| take(super::permissions::monitor_key(name))).or_else(|| take(key.to_owned()))
|
wanted_key.as_ref().and_then(|name| take(super::permissions::pending_key(name)).or_else(|| take(name.clone())))
|
||||||
|
.or_else(|| take(super::permissions::pending_key(key))).or_else(|| take(key.to_owned()))
|
||||||
});
|
});
|
||||||
let token = taken.as_ref().and_then(|(_, value)| std::ffi::CString::new(value.as_str()).ok());
|
let token = taken.as_ref().and_then(|(_, value)| std::ffi::CString::new(value.as_str()).ok());
|
||||||
// The new token is saved once the granted monitor is known (after open).
|
let requested_key = if virtual_output { &virtual_key } else { wanted_key.as_deref().unwrap_or(key) };
|
||||||
let mut cache: Option<String> = None;
|
struct TokenCache { rotation: super::permissions::Rotation, virtual_key: Option<String>, fresh: bool }
|
||||||
extern "C" fn save_token(token: *const libc::c_char, data: *mut c_void) {
|
let mut cache = TokenCache {
|
||||||
// Callback is synchronous during open; cache lives through the call.
|
rotation: super::permissions::Rotation::new(directory.clone(), requested_key),
|
||||||
|
virtual_key: virtual_output.then(|| virtual_key.clone()), fresh,
|
||||||
|
};
|
||||||
|
extern "C" fn save_detailed(token: *const libc::c_char, data: *mut c_void, has_position: i32, x: i32, y: i32) {
|
||||||
let result = std::panic::catch_unwind(|| unsafe {
|
let result = std::panic::catch_unwind(|| unsafe {
|
||||||
let cache = &mut *(data as *mut Option<String>);
|
let cache = &mut *(data as *mut TokenCache);
|
||||||
*cache = std::ffi::CStr::from_ptr(token).to_str().ok().map(str::to_owned);
|
if let Ok(token) = std::ffi::CStr::from_ptr(token).to_str() {
|
||||||
|
if cache.fresh { cache.rotation.remember(token); return; }
|
||||||
|
let granted = cache.virtual_key.clone().or_else(||
|
||||||
|
(has_position != 0).then(|| crate::wayland::portal_monitor_at(x, y)).flatten()
|
||||||
|
.map(|name| super::permissions::monitor_key(&name)));
|
||||||
|
if cache.rotation.record(token, granted.as_deref()).is_err() { log::warn!("Portal permission cache could not be saved"); }
|
||||||
|
}
|
||||||
});
|
});
|
||||||
if result.is_err() { log::warn!("Portal permission cache callback failed"); }
|
if result.is_err() { log::warn!("Portal permission cache callback failed"); }
|
||||||
}
|
}
|
||||||
|
// Older plugins lack the position-aware entry point; use the pending slot.
|
||||||
|
extern "C" fn save_token(token: *const libc::c_char, data: *mut c_void) {
|
||||||
|
save_detailed(token, data, 0, 0, 0);
|
||||||
|
}
|
||||||
let restore = token.as_ref().map_or(std::ptr::null(), |value| value.as_ptr());
|
let restore = token.as_ref().map_or(std::ptr::null(), |value| value.as_ptr());
|
||||||
// A failed open must not cost the saved consent: put the token back unless the
|
let failed = |code: i32, cache: &TokenCache| {
|
||||||
// portal handed out a new one. A stale token only makes the next open ask again.
|
if let (Some(dir), Some((k, value)), false) = (directory.as_deref(), taken.as_ref(), cache.rotation.received()) {
|
||||||
let failed = |code: i32, cache: &Option<String>| {
|
|
||||||
if let (Some(dir), Some((k, value)), None) = (directory.as_deref(), taken.as_ref(), cache.as_ref()) {
|
|
||||||
if super::permissions::save(dir, k, value).is_err() { log::warn!("Portal permission cache could not be restored"); }
|
if super::permissions::save(dir, k, value).is_err() { log::warn!("Portal permission cache could not be restored"); }
|
||||||
}
|
}
|
||||||
super::PortalError { code }
|
super::PortalError { code }
|
||||||
};
|
};
|
||||||
|
// Release packages can temporarily have an older libuu-portal.so than the host.
|
||||||
|
#[cfg(feature = "engine-plugins")]
|
||||||
|
let detailed = crate::engine_plugin::symbol(crate::engine_plugin::Engine::Portal, "uu_portal_open_detailed\0") != 0;
|
||||||
|
#[cfg(not(feature = "engine-plugins"))]
|
||||||
|
let detailed = true;
|
||||||
#[allow(unused_mut)]
|
#[allow(unused_mut)]
|
||||||
let mut pointer: *mut c_void = std::ptr::null_mut();
|
let mut prefer_dmabuf = false;
|
||||||
#[cfg(feature = "inproc-av")]
|
#[cfg(feature = "inproc-av")]
|
||||||
if !virtual_output && crate::video::native_engine_eligible(crate::video_select::selection().encoder, crate::video::NativeDisplayKind::Portal)
|
if !virtual_output && crate::video::native_engine_eligible(crate::video_select::selection().encoder, crate::video::NativeDisplayKind::Portal)
|
||||||
&& !std::env::var("UU_PORTAL_DMABUF").is_ok_and(|v| v == "0") {
|
&& !std::env::var("UU_PORTAL_DMABUF").is_ok_and(|v| v == "0") {
|
||||||
let callback = cancelled.map(|_| is_cancelled as extern "C" fn(*mut c_void) -> i32);
|
prefer_dmabuf = true;
|
||||||
let cancel_data = cancelled.map_or(std::ptr::null_mut(), |value| value as *const _ as *mut c_void);
|
|
||||||
pointer = unsafe { uu_portal_open_persist_capture(
|
|
||||||
restore, save_token, &mut cache as *mut _ as *mut c_void, callback, cancel_data, 1,
|
|
||||||
&mut error, &mut width, &mut height,
|
|
||||||
) };
|
|
||||||
if pointer.is_null() && error != 0 { return Err(failed(error, &cache)); }
|
|
||||||
if pointer.is_null() { log::warn!("Portal engine lacks DMA-BUF initialization; falling back to legacy initialization"); }
|
|
||||||
}
|
}
|
||||||
let pointer = if !pointer.is_null() { pointer } else { unsafe {
|
let pointer = if detailed {
|
||||||
if virtual_output {
|
// Virtual shares can wait for consent too; cancel them like monitor opens.
|
||||||
uu_portal_open_virtual(restore, save_token, &mut cache as *mut _ as *mut c_void, &mut error, &mut width, &mut height)
|
let cancel = cancelled;
|
||||||
} else if let Some(cancelled) = cancelled {
|
let callback = cancel.map(|_| is_cancelled as extern "C" fn(*mut c_void) -> i32);
|
||||||
uu_portal_open_persist_cancellable(
|
let cancel_data = cancel.map_or(std::ptr::null_mut(), |value| value as *const _ as *mut c_void);
|
||||||
restore, save_token, &mut cache as *mut _ as *mut c_void,
|
unsafe { uu_portal_open_detailed(
|
||||||
is_cancelled, cancelled as *const _ as *mut c_void,
|
restore, save_detailed, &mut cache as *mut _ as *mut c_void, callback, cancel_data,
|
||||||
|
i32::from(prefer_dmabuf), if virtual_output { 4 } else { 1 },
|
||||||
|
&mut error, &mut width, &mut height,
|
||||||
|
) }
|
||||||
|
} else {
|
||||||
|
#[allow(unused_mut)]
|
||||||
|
let mut pointer: *mut c_void = std::ptr::null_mut();
|
||||||
|
#[cfg(feature = "inproc-av")]
|
||||||
|
if prefer_dmabuf {
|
||||||
|
let callback = cancelled.map(|_| is_cancelled as extern "C" fn(*mut c_void) -> i32);
|
||||||
|
let cancel_data = cancelled.map_or(std::ptr::null_mut(), |value| value as *const _ as *mut c_void);
|
||||||
|
pointer = unsafe { uu_portal_open_persist_capture(
|
||||||
|
restore, save_token, &mut cache as *mut _ as *mut c_void, callback, cancel_data, 1,
|
||||||
&mut error, &mut width, &mut height,
|
&mut error, &mut width, &mut height,
|
||||||
)
|
) };
|
||||||
} else {
|
if pointer.is_null() && error != 0 { return Err(failed(error, &cache)); }
|
||||||
uu_portal_open_persist(restore, save_token, &mut cache as *mut _ as *mut c_void, &mut error, &mut width, &mut height)
|
if pointer.is_null() { log::warn!("Portal engine lacks DMA-BUF initialization; falling back to legacy initialization"); }
|
||||||
}
|
}
|
||||||
} };
|
if !pointer.is_null() { pointer } else { unsafe {
|
||||||
let Some(handle) = NonNull::new(pointer) else { return Err(failed(error, &cache)) };
|
if virtual_output {
|
||||||
|
uu_portal_open_virtual(restore, save_token, &mut cache as *mut _ as *mut c_void, &mut error, &mut width, &mut height)
|
||||||
|
} else if let Some(cancelled) = cancelled {
|
||||||
|
uu_portal_open_persist_cancellable(restore, save_token, &mut cache as *mut _ as *mut c_void,
|
||||||
|
is_cancelled, cancelled as *const _ as *mut c_void, &mut error, &mut width, &mut height)
|
||||||
|
} else {
|
||||||
|
uu_portal_open_persist(restore, save_token, &mut cache as *mut _ as *mut c_void, &mut error, &mut width, &mut height)
|
||||||
|
}
|
||||||
|
} }
|
||||||
|
};
|
||||||
|
let Some(handle) = NonNull::new(pointer) else { return Err(failed(if error == 0 { 15 } else { error }, &cache)) };
|
||||||
let (mut x, mut y) = (0, 0);
|
let (mut x, mut y) = (0, 0);
|
||||||
let granted = (!virtual_output && unsafe { uu_portal_stream_position(handle.as_ptr(), &mut x, &mut y) } == 0)
|
let granted = (!virtual_output && unsafe { uu_portal_stream_position(handle.as_ptr(), &mut x, &mut y) } == 0)
|
||||||
.then(|| crate::wayland::portal_monitor_at(x, y)).flatten();
|
.then(|| crate::wayland::portal_monitor_at(x, y)).flatten();
|
||||||
if let (Some(dir), Some(token)) = (directory.as_deref(), cache.take()) {
|
let saved = match &granted {
|
||||||
let saved = match &granted {
|
_ if virtual_output => virtual_key.clone(),
|
||||||
_ if virtual_output => virtual_key.clone(),
|
Some(name) => super::permissions::monitor_key(name),
|
||||||
Some(name) => super::permissions::monitor_key(name),
|
None => key.to_owned(),
|
||||||
None => key.to_owned(),
|
};
|
||||||
};
|
if cache.rotation.finish(&saved, fresh || virtual_output || granted.is_some()).is_err() {
|
||||||
if super::permissions::save(dir, &saved, &token).is_err() { log::warn!("Portal permission cache could not be saved"); }
|
log::warn!("Portal permission cache could not be saved");
|
||||||
}
|
}
|
||||||
if wanted.is_some() && granted != wanted { log::warn!("Portal granted a different monitor than requested"); }
|
if wanted.is_some() && granted != wanted { log::warn!("Portal granted a different monitor than requested"); }
|
||||||
// Keep a freshly granted compositor frame regardless of lock state. Discarding it
|
// Keep a freshly granted compositor frame regardless of lock state. Discarding it
|
||||||
// before new damage can leave a static desktop permanently blank (#2).
|
// before new damage can leave a static desktop permanently blank (#2).
|
||||||
Ok(Self { handle: Mutex::new(Handle(handle)), locked: crate::session_lock::watch_locked(), was_locked: std::sync::atomic::AtomicBool::new(false), recovery: Mutex::new(Recovery::default()), size: pack(width, height).into(), monitor: Mutex::new(granted), virtual_output: virtual_output.into() })
|
let handle = Arc::new(Handle(handle));
|
||||||
|
// The engine records what it actually requested; a backend can refuse the mode the
|
||||||
|
// environment or a runtime switch asked for.
|
||||||
|
let available = unsafe { uu_portal_cursor_modes(handle.0.as_ptr()) };
|
||||||
|
let applied = unsafe { uu_portal_cursor_mode(handle.0.as_ptr()) };
|
||||||
|
if applied > 0 { super::CURSOR_MODE.store(if applied == 2 { 2 } else { 1 }, std::sync::atomic::Ordering::Release); }
|
||||||
|
if available > 0 { super::CURSOR_EMBED.store(if available & 2 != 0 { 2 } else { 1 }, std::sync::atomic::Ordering::Release); }
|
||||||
|
Ok(Self { handle: Mutex::new(handle), locked: crate::session_lock::watch_locked(), was_locked: std::sync::atomic::AtomicBool::new(false), recovery: Mutex::new(Recovery::default()), size: pack(width, height).into(), monitor: Mutex::new(granted), virtual_output: virtual_output.into(), clipboard_write: Mutex::new(()), end_generation: Arc::new(std::sync::atomic::AtomicU64::new(0)) })
|
||||||
}
|
}
|
||||||
/// Frame pixels of the monitor the stream currently follows.
|
/// Frame pixels of the monitor the stream currently follows.
|
||||||
pub fn size(&self) -> (u32, u32) {
|
pub fn size(&self) -> (u32, u32) {
|
||||||
@@ -237,7 +346,13 @@ mod native {
|
|||||||
/// End the compositor session (screen-share indicator off); the next desktop
|
/// End the compositor session (screen-share indicator off); the next desktop
|
||||||
/// connection reopens it with the saved consent.
|
/// connection reopens it with the saved consent.
|
||||||
pub fn end(&self) {
|
pub fn end(&self) {
|
||||||
|
// Invalidate an open that is still waiting for consent: it must not install a share
|
||||||
|
// after the desktop was ended (viewer disconnect, idle shutdown, capture teardown).
|
||||||
|
self.end_generation.fetch_add(1, std::sync::atomic::Ordering::AcqRel);
|
||||||
if let Ok(handle) = self.handle.lock() { unsafe { uu_portal_end(handle.0.as_ptr()) }; }
|
if let Ok(handle) = self.handle.lock() { unsafe { uu_portal_end(handle.0.as_ptr()) }; }
|
||||||
|
// The ended session's native devices are gone; forget the inputs bound to them.
|
||||||
|
let _serial = crate::input::lock_portal_held();
|
||||||
|
crate::input::portal_session_replaced();
|
||||||
}
|
}
|
||||||
/// Mutter connector of the monitor this session captures, when several are advertised.
|
/// Mutter connector of the monitor this session captures, when several are advertised.
|
||||||
pub fn monitor(&self) -> Option<String> { self.monitor.lock().ok().and_then(|m| m.clone()) }
|
pub fn monitor(&self) -> Option<String> { self.monitor.lock().ok().and_then(|m| m.clone()) }
|
||||||
@@ -245,19 +360,15 @@ mod native {
|
|||||||
/// time GNOME asks on the host) and swap it in, so every holder of this Arc follows.
|
/// time GNOME asks on the host) and swap it in, so every holder of this Arc follows.
|
||||||
pub fn switch_to(&self, connector: &str) -> Result<(), String> {
|
pub fn switch_to(&self, connector: &str) -> Result<(), String> {
|
||||||
if self.monitor().as_deref() == Some(connector) { return Ok(()); }
|
if self.monitor().as_deref() == Some(connector) { return Ok(()); }
|
||||||
|
// Both this and the cursor-mode rebuild replace the handle: serialize them so the
|
||||||
|
// later open cannot install a stale source over the other.
|
||||||
|
let _recovery = self.recovery.lock().map_err(|_| "Portal recovery lock poisoned")?;
|
||||||
let replacement = Self::open_inner(None, Some(connector), false, false).map_err(|error| error.to_string())?;
|
let replacement = Self::open_inner(None, Some(connector), false, false).map_err(|error| error.to_string())?;
|
||||||
if replacement.monitor().as_deref() != Some(connector) {
|
if replacement.monitor().as_deref() != Some(connector) {
|
||||||
return Err("Another monitor was shared; choose this monitor in the host dialog".into());
|
return Err("Another monitor was shared; choose this monitor in the host dialog".into());
|
||||||
}
|
}
|
||||||
let size = replacement.size();
|
self.install_replacement(replacement, None, false, false)?;
|
||||||
let next = replacement.handle.into_inner().map_err(|_| "Portal session lock poisoned")?;
|
|
||||||
let previous = {
|
|
||||||
let mut handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
|
|
||||||
self.size.store(pack(size.0, size.1), std::sync::atomic::Ordering::Release);
|
|
||||||
std::mem::replace(&mut *handle, next)
|
|
||||||
};
|
|
||||||
if let Ok(mut monitor) = self.monitor.lock() { *monitor = Some(connector.to_owned()); }
|
if let Ok(mut monitor) = self.monitor.lock() { *monitor = Some(connector.to_owned()); }
|
||||||
drop(previous);
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
pub fn is_virtual(&self) -> bool { self.virtual_output.load(std::sync::atomic::Ordering::Acquire) }
|
pub fn is_virtual(&self) -> bool { self.virtual_output.load(std::sync::atomic::Ordering::Acquire) }
|
||||||
@@ -272,18 +383,116 @@ mod native {
|
|||||||
// exists (seen live: 3968x1280 = panel + virtual), so end the virtual share first.
|
// exists (seen live: 3968x1280 = panel + virtual), so end the virtual share first.
|
||||||
if !on { self.end(); }
|
if !on { self.end(); }
|
||||||
let replacement = Self::open_inner(None, monitor.as_deref(), false, on).map_err(|error| error.to_string())?;
|
let replacement = Self::open_inner(None, monitor.as_deref(), false, on).map_err(|error| error.to_string())?;
|
||||||
let size = replacement.size();
|
let size = self.install_replacement(replacement, None, false, false)?;
|
||||||
let next = replacement.handle.into_inner().map_err(|_| "Portal session lock poisoned")?;
|
self.virtual_output.store(on, std::sync::atomic::Ordering::Release);
|
||||||
let previous = {
|
|
||||||
let mut handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
|
|
||||||
self.size.store(pack(size.0, size.1), std::sync::atomic::Ordering::Release);
|
|
||||||
self.virtual_output.store(on, std::sync::atomic::Ordering::Release);
|
|
||||||
std::mem::replace(&mut *handle, next)
|
|
||||||
};
|
|
||||||
drop(previous);
|
|
||||||
log::info!("Portal capture source: virtual={on} size={}x{}", size.0, size.1);
|
log::info!("Portal capture source: virtual={on} size={}x{}", size.0, size.1);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
/// Ask the compositor to draw the pointer into the stream (embedded) or keep it out
|
||||||
|
/// (hidden). The portal only reads this when the session is created, so swap in a fresh
|
||||||
|
/// session with the saved consent; every holder of this Arc follows the new handle.
|
||||||
|
/// Ok(true): the mode changed. Ok(false): nothing to do, or the desktop is locked and the
|
||||||
|
/// next unlocked motion retries.
|
||||||
|
pub fn set_cursor_embedded(&self, embedded: bool) -> Result<bool, String> {
|
||||||
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
|
if super::cursor_embedded() == embedded { return Ok(false); }
|
||||||
|
// Sample before waiting for `recovery`: an end that happens while this worker is
|
||||||
|
// queued must invalidate the rebuild below.
|
||||||
|
let generation = self.end_generation.load(Ordering::Acquire);
|
||||||
|
if *self.locked.borrow() != Some(false) { return Ok(false); }
|
||||||
|
// A backend without the embedded cursor mode never applies the request; remember it
|
||||||
|
// so motion does not spawn a rebuild every few events.
|
||||||
|
let modes = self.handle.lock().map(|handle| unsafe { uu_portal_cursor_modes(handle.0.as_ptr()) }).unwrap_or(0);
|
||||||
|
if modes > 0 && modes & 2 == 0 { super::CURSOR_EMBED.store(1, Ordering::Release); return Ok(false); }
|
||||||
|
if modes & 2 != 0 { super::CURSOR_EMBED.store(2, Ordering::Release); }
|
||||||
|
let _recovery = self.recovery.lock().map_err(|_| "Portal recovery lock poisoned")?;
|
||||||
|
if super::cursor_embedded() == embedded { return Ok(false); }
|
||||||
|
if *self.locked.borrow() != Some(false) { return Ok(false); }
|
||||||
|
// The session this rebuild replaces must still be running: a viewer that left or an
|
||||||
|
// idle shutdown ends it, and a replacement opened afterwards would share with nobody.
|
||||||
|
if !self.is_alive() { return Ok(false); }
|
||||||
|
if crate::input::portal_input_held() { return Ok(false); }
|
||||||
|
let previous = super::cursor_embedded();
|
||||||
|
let virtual_output = self.is_virtual();
|
||||||
|
let monitor = self.monitor();
|
||||||
|
// A lock or desktop end during the open must cancel the consent request, not wait
|
||||||
|
// out its timeout.
|
||||||
|
let cancel = Arc::new(AtomicBool::new(false));
|
||||||
|
let stop = Arc::new(AtomicBool::new(false));
|
||||||
|
let watcher = {
|
||||||
|
let locked = self.locked.clone();
|
||||||
|
let end_generation = self.end_generation.clone();
|
||||||
|
let cancel = cancel.clone();
|
||||||
|
let stop = stop.clone();
|
||||||
|
std::thread::Builder::new().name("portal-cursor-lock".into()).spawn(move || {
|
||||||
|
while !stop.load(Ordering::Acquire) {
|
||||||
|
if *locked.borrow() != Some(false) || end_generation.load(Ordering::Acquire) != generation {
|
||||||
|
cancel.store(true, Ordering::Release);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(50));
|
||||||
|
}
|
||||||
|
}).ok()
|
||||||
|
};
|
||||||
|
unsafe { uu_portal_set_cursor_mode(if embedded { 2 } else { 1 }); }
|
||||||
|
let result = (|| -> Result<Option<((u32, u32), i32)>, String> {
|
||||||
|
let replacement = Self::open_inner(Some(&cancel), monitor.as_deref(), false, virtual_output)
|
||||||
|
.map_err(|error| error.to_string())?;
|
||||||
|
if *self.locked.borrow() != Some(false) { return Err("desktop locked during the rebuild".into()); }
|
||||||
|
if self.end_generation.load(Ordering::Acquire) != generation {
|
||||||
|
return Err("desktop session ended during the rebuild".into());
|
||||||
|
}
|
||||||
|
// A source change that finished meanwhile must not be undone by this swap.
|
||||||
|
if self.is_virtual() != virtual_output || (!virtual_output && self.monitor() != monitor) {
|
||||||
|
return Err("capture source changed during the rebuild".into());
|
||||||
|
}
|
||||||
|
// A restored consent must not silently move the share to another monitor.
|
||||||
|
if !virtual_output && monitor.is_some() && replacement.monitor() != monitor {
|
||||||
|
return Err("another monitor was shared; choose this monitor in the host dialog".into());
|
||||||
|
}
|
||||||
|
// KDE does not report the connector, so a size change is the signal that the
|
||||||
|
// replacement follows another output.
|
||||||
|
self.check_geometry(&replacement).map_err(|error| error.to_string())?;
|
||||||
|
// A key or button can go down while the open waits for consent.
|
||||||
|
if crate::input::portal_input_held() { return Ok(None); }
|
||||||
|
let size = match self.install_replacement(replacement, Some(generation), true, virtual_output) {
|
||||||
|
Ok(size) => size,
|
||||||
|
Err(error) if error == "input held during the swap" => return Ok(None),
|
||||||
|
Err(error) => return Err(error),
|
||||||
|
};
|
||||||
|
let applied = self.handle.lock().ok().map(|handle| unsafe { uu_portal_cursor_mode(handle.0.as_ptr()) }).unwrap_or(0);
|
||||||
|
Ok(Some((size, applied)))
|
||||||
|
})();
|
||||||
|
stop.store(true, Ordering::Release);
|
||||||
|
drop(watcher);
|
||||||
|
match result {
|
||||||
|
Ok(Some(((width, height), applied))) => {
|
||||||
|
let applied_embedded = applied == 2;
|
||||||
|
super::CURSOR_MODE.store(if applied_embedded { 2 } else { 1 }, Ordering::Release);
|
||||||
|
if applied_embedded != embedded {
|
||||||
|
// The backend refused the mode (or cannot report support); retrying would
|
||||||
|
// rebuild the session every motion run without changing anything.
|
||||||
|
super::CURSOR_EMBED.store(1, Ordering::Release);
|
||||||
|
unsafe { uu_portal_set_cursor_mode(applied) };
|
||||||
|
log::info!("Portal backend did not apply the embedded cursor");
|
||||||
|
return Ok(false);
|
||||||
|
}
|
||||||
|
log::info!("Portal cursor mode: embedded={embedded} size={width}x{height}");
|
||||||
|
Ok(true)
|
||||||
|
}
|
||||||
|
Ok(None) => {
|
||||||
|
// Deferred (input went down during the open): open_inner published the
|
||||||
|
// replacement's mode, but that session is never installed.
|
||||||
|
self.restore_installed_cursor_mode(previous);
|
||||||
|
Ok(false)
|
||||||
|
}
|
||||||
|
Err(error) => {
|
||||||
|
// Leave the engine on the mode the installed session actually has.
|
||||||
|
self.restore_installed_cursor_mode(previous);
|
||||||
|
Err(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
pub fn open() -> Result<Self, String> {
|
pub fn open() -> Result<Self, String> {
|
||||||
Self::open_inner(None, None, false, false).map_err(|error| error.to_string())
|
Self::open_inner(None, None, false, false).map_err(|error| error.to_string())
|
||||||
}
|
}
|
||||||
@@ -298,6 +507,8 @@ mod native {
|
|||||||
pub fn upgrade_touch(&self) -> Result<bool, String> {
|
pub fn upgrade_touch(&self) -> Result<bool, String> {
|
||||||
let available = self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_touch_available(handle.0.as_ptr()) } != 0);
|
let available = self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_touch_available(handle.0.as_ptr()) } != 0);
|
||||||
if !available || self.touch_supported() { return Ok(false); }
|
if !available || self.touch_supported() { return Ok(false); }
|
||||||
|
// Serialize with recovery and the cursor-mode rebuild: all replace the handle.
|
||||||
|
let _recovery = self.recovery.lock().map_err(|_| "Portal recovery lock poisoned")?;
|
||||||
log::info!("Portal touch consent: asking the host again for the touchscreen");
|
log::info!("Portal touch consent: asking the host again for the touchscreen");
|
||||||
let monitor = self.monitor();
|
let monitor = self.monitor();
|
||||||
let replacement = Self::open_inner(None, monitor.as_deref(), true, self.is_virtual()).map_err(|error| error.to_string())?;
|
let replacement = Self::open_inner(None, monitor.as_deref(), true, self.is_virtual()).map_err(|error| error.to_string())?;
|
||||||
@@ -305,9 +516,7 @@ mod native {
|
|||||||
if replacement.monitor() != monitor { return Err("another monitor was shared".into()); }
|
if replacement.monitor() != monitor { return Err("another monitor was shared".into()); }
|
||||||
if !replacement.touch_supported() { return Err("the touchscreen was not granted".into()); }
|
if !replacement.touch_supported() { return Err("the touchscreen was not granted".into()); }
|
||||||
self.check_geometry(&replacement).map_err(|error| error.to_string())?;
|
self.check_geometry(&replacement).map_err(|error| error.to_string())?;
|
||||||
let next = replacement.handle.into_inner().map_err(|_| "Portal session lock poisoned")?;
|
self.install_replacement(replacement, None, false, self.is_virtual())?;
|
||||||
let previous = std::mem::replace(&mut *self.handle.lock().map_err(|_| "Portal session lock poisoned")?, next);
|
|
||||||
drop(previous);
|
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
pub fn open_cancellable(cancelled: &std::sync::atomic::AtomicBool) -> Result<Self, super::PortalError> {
|
pub fn open_cancellable(cancelled: &std::sync::atomic::AtomicBool) -> Result<Self, super::PortalError> {
|
||||||
@@ -342,9 +551,19 @@ mod native {
|
|||||||
let result = super::open_then_install(cancelled, || Self::open_inner(Some(cancelled), monitor.as_deref(), false, virtual_output), |replacement| {
|
let result = super::open_then_install(cancelled, || Self::open_inner(Some(cancelled), monitor.as_deref(), false, virtual_output), |replacement| {
|
||||||
self.check_geometry(&replacement)?;
|
self.check_geometry(&replacement)?;
|
||||||
let replacement_handle = replacement.handle.into_inner().map_err(|_| super::PortalError { code: 3 })?;
|
let replacement_handle = replacement.handle.into_inner().map_err(|_| super::PortalError { code: 3 })?;
|
||||||
|
let clipboard = self.clipboard_write.lock().map_err(|_| super::PortalError { code: 3 })?;
|
||||||
|
let serial = crate::input::lock_portal_held();
|
||||||
let mut handle = self.handle.lock().map_err(|_| super::PortalError { code: 3 })?;
|
let mut handle = self.handle.lock().map_err(|_| super::PortalError { code: 3 })?;
|
||||||
if cancelled.load(Ordering::Acquire) { return Err(super::PortalError { code: 13 }); }
|
if cancelled.load(Ordering::Acquire) { return Err(super::PortalError { code: 13 }); }
|
||||||
*handle = replacement_handle;
|
let previous_handle = std::mem::replace(&mut *handle, replacement_handle);
|
||||||
|
let installed = Arc::clone(&*handle);
|
||||||
|
drop(handle);
|
||||||
|
unsafe { uu_portal_clipboard_copy(previous_handle.0.as_ptr(), installed.0.as_ptr()) };
|
||||||
|
drop(clipboard);
|
||||||
|
drop(previous_handle);
|
||||||
|
// The replaced devices took any held portal input with them.
|
||||||
|
crate::input::portal_session_replaced();
|
||||||
|
drop(serial);
|
||||||
clear_pause_for_unlocked_replacement(&self.was_locked, *self.locked.borrow());
|
clear_pause_for_unlocked_replacement(&self.was_locked, *self.locked.borrow());
|
||||||
log::info!("Portal capture session restored after closure");
|
log::info!("Portal capture session restored after closure");
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -435,7 +654,7 @@ mod native {
|
|||||||
Err(TryLockError::WouldBlock) => return Ok(blank_changed(frame, version)),
|
Err(TryLockError::WouldBlock) => return Ok(blank_changed(frame, version)),
|
||||||
Err(TryLockError::Poisoned(_)) => return Err("Portal recovery lock poisoned".into()),
|
Err(TryLockError::Poisoned(_)) => return Err("Portal recovery lock poisoned".into()),
|
||||||
};
|
};
|
||||||
if replace_handle(&self.handle, handle, || {
|
if replace_handle_carrying(&self.handle, &self.clipboard_write, handle, || {
|
||||||
{
|
{
|
||||||
let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
|
let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
|
||||||
if unsafe { uu_portal_capture_alive(handle.0.as_ptr()) } != 0 {
|
if unsafe { uu_portal_capture_alive(handle.0.as_ptr()) } != 0 {
|
||||||
@@ -491,11 +710,25 @@ mod native {
|
|||||||
pub fn clipboard_supported(&self) -> bool {
|
pub fn clipboard_supported(&self) -> bool {
|
||||||
self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_clipboard_supported(handle.0.as_ptr()) != 0 })
|
self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_clipboard_supported(handle.0.as_ptr()) != 0 })
|
||||||
}
|
}
|
||||||
|
pub fn wait_frame(&self, timeout: std::time::Duration) -> Result<bool, String> {
|
||||||
|
let handle = lease_handle(&self.handle)?;
|
||||||
|
// Retain sub-millisecond precision across the FFI boundary and clamp to 5s.
|
||||||
|
let us = (timeout.as_micros().min(5_000_000) as i64).max(1);
|
||||||
|
let ret = unsafe { uu_portal_wait_frame(handle.0.as_ptr(), us) };
|
||||||
|
if ret < 0 {
|
||||||
|
Err("Portal stream closed or failed during frame wait".into())
|
||||||
|
} else {
|
||||||
|
Ok(ret > 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
pub fn clipboard_ready(&self) -> bool {
|
pub fn clipboard_ready(&self) -> bool {
|
||||||
self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_clipboard_ready(handle.0.as_ptr()) != 0 })
|
self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_clipboard_ready(handle.0.as_ptr()) != 0 })
|
||||||
}
|
}
|
||||||
pub fn clipboard_set(&self, text: &str) -> Result<(), String> {
|
pub fn clipboard_set(&self, text: &str) -> Result<(), String> {
|
||||||
if text.len()>crate::clipboard::MAX_TEXT || *self.locked.borrow()!=Some(false) { return Err("Portal clipboard unavailable".into()); }
|
if text.len()>crate::clipboard::MAX_TEXT || *self.locked.borrow()!=Some(false) { return Err("Portal clipboard unavailable".into()); }
|
||||||
|
// Serialize with the cursor-session swap: it carries the old text over before
|
||||||
|
// releasing this lock, so a update that arrives during the swap wins afterwards.
|
||||||
|
let _write=self.clipboard_write.lock().map_err(|_| "Portal clipboard lock poisoned")?;
|
||||||
let handle=self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
|
let handle=self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
|
||||||
if unsafe { uu_portal_clipboard_set(handle.0.as_ptr(),text.as_ptr(),text.len()) }==0 {Ok(())} else {Err("Portal clipboard ownership failed".into())}
|
if unsafe { uu_portal_clipboard_set(handle.0.as_ptr(),text.as_ptr(),text.len()) }==0 {Ok(())} else {Err("Portal clipboard ownership failed".into())}
|
||||||
}
|
}
|
||||||
@@ -568,12 +801,14 @@ mod native {
|
|||||||
fn new(physical: (u32, u32)) -> Self {
|
fn new(physical: (u32, u32)) -> Self {
|
||||||
let (_, locked) = tokio::sync::watch::channel(None);
|
let (_, locked) = tokio::sync::watch::channel(None);
|
||||||
Self(ManuallyDrop::new(Session {
|
Self(ManuallyDrop::new(Session {
|
||||||
handle: Mutex::new(Handle(NonNull::dangling())),
|
handle: Mutex::new(Arc::new(Handle(NonNull::dangling()))),
|
||||||
locked,
|
locked,
|
||||||
was_locked: std::sync::atomic::AtomicBool::new(false),
|
was_locked: std::sync::atomic::AtomicBool::new(false),
|
||||||
recovery: Mutex::new(Recovery::default()),
|
recovery: Mutex::new(Recovery::default()),
|
||||||
size: pack(physical.0, physical.1).into(),
|
size: pack(physical.0, physical.1).into(),
|
||||||
monitor: Mutex::new(None), virtual_output: false.into(),
|
monitor: Mutex::new(None), virtual_output: false.into(),
|
||||||
|
clipboard_write: Mutex::new(()),
|
||||||
|
end_generation: Arc::new(std::sync::atomic::AtomicU64::new(0)),
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -607,6 +842,35 @@ mod native {
|
|||||||
button_held: bool,
|
button_held: bool,
|
||||||
retirement: Option<(std::sync::mpsc::Sender<()>, std::sync::mpsc::Receiver<()>)>,
|
retirement: Option<(std::sync::mpsc::Sender<()>, std::sync::mpsc::Receiver<()>)>,
|
||||||
}
|
}
|
||||||
|
#[test]
|
||||||
|
fn frame_wait_lease_keeps_replaced_handle_alive_without_blocking_input() {
|
||||||
|
use std::sync::{atomic::{AtomicBool, Ordering}, mpsc::channel};
|
||||||
|
struct Tracked(Arc<AtomicBool>);
|
||||||
|
impl Drop for Tracked { fn drop(&mut self) { self.0.store(true, Ordering::SeqCst); } }
|
||||||
|
let dropped = Arc::new(AtomicBool::new(false));
|
||||||
|
let current = Arc::new(Mutex::new(Arc::new(Tracked(dropped.clone()))));
|
||||||
|
let (waiting, ready) = channel();
|
||||||
|
let (resume, resumed) = channel();
|
||||||
|
let worker = {
|
||||||
|
let current = current.clone();
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
let lease = lease_handle(¤t).unwrap();
|
||||||
|
waiting.send(()).unwrap();
|
||||||
|
resumed.recv_timeout(std::time::Duration::from_secs(3)).unwrap();
|
||||||
|
assert!(!lease.0.load(Ordering::SeqCst));
|
||||||
|
})
|
||||||
|
};
|
||||||
|
ready.recv_timeout(std::time::Duration::from_secs(3)).unwrap();
|
||||||
|
let old = {
|
||||||
|
let mut guard = current.try_lock().expect("frame wait must not block input");
|
||||||
|
std::mem::replace(&mut *guard, Arc::new(Tracked(Arc::new(AtomicBool::new(false)))))
|
||||||
|
};
|
||||||
|
drop(old);
|
||||||
|
assert!(!dropped.load(Ordering::SeqCst));
|
||||||
|
resume.send(()).unwrap();
|
||||||
|
worker.join().unwrap();
|
||||||
|
assert!(dropped.load(Ordering::SeqCst));
|
||||||
|
}
|
||||||
impl Drop for TestHandle {
|
impl Drop for TestHandle {
|
||||||
fn drop(&mut self) {
|
fn drop(&mut self) {
|
||||||
if let Some((entered, resume)) = self.retirement.take() {
|
if let Some((entered, resume)) = self.retirement.take() {
|
||||||
@@ -841,6 +1105,7 @@ impl PortalSession {
|
|||||||
pub fn end(&self) {}
|
pub fn end(&self) {}
|
||||||
pub fn switch_to(&self, _: &str) -> Result<(), String> { Err(error(15)) }
|
pub fn switch_to(&self, _: &str) -> Result<(), String> { Err(error(15)) }
|
||||||
pub fn set_virtual(&self, _: bool) -> Result<(), String> { Err(error(15)) }
|
pub fn set_virtual(&self, _: bool) -> Result<(), String> { Err(error(15)) }
|
||||||
|
pub fn set_cursor_embedded(&self, _: bool) -> Result<bool, String> { Err(error(15)) }
|
||||||
pub fn is_virtual(&self) -> bool { false }
|
pub fn is_virtual(&self) -> bool { false }
|
||||||
}
|
}
|
||||||
#[cfg(not(all(target_os = "linux", feature = "portal")))]
|
#[cfg(not(all(target_os = "linux", feature = "portal")))]
|
||||||
@@ -863,6 +1128,7 @@ impl PortalSession {
|
|||||||
pub fn capture(&self, _: &mut [u8]) -> Result<(), String> { Err(error(15)) }
|
pub fn capture(&self, _: &mut [u8]) -> Result<(), String> { Err(error(15)) }
|
||||||
pub fn capture_changed(&self, _: &mut [u8], _: &mut Option<FrameVersion>) -> Result<bool, String> { Err(error(15)) }
|
pub fn capture_changed(&self, _: &mut [u8], _: &mut Option<FrameVersion>) -> Result<bool, String> { Err(error(15)) }
|
||||||
pub fn disable_dmabuf(&self) {}
|
pub fn disable_dmabuf(&self) {}
|
||||||
|
pub fn wait_frame(&self, _: std::time::Duration) -> Result<bool, String> { Err(error(15)) }
|
||||||
pub fn with_dmabuf<T>(&self, _: &mut Option<FrameVersion>, _: impl FnOnce(&DmaFrame, bool) -> Result<T, String>) -> Result<DmaCapture<T>, String> {
|
pub fn with_dmabuf<T>(&self, _: &mut Option<FrameVersion>, _: impl FnOnce(&DmaFrame, bool) -> Result<T, String>) -> Result<DmaCapture<T>, String> {
|
||||||
Ok(DmaCapture::Unavailable(-1))
|
Ok(DmaCapture::Unavailable(-1))
|
||||||
}
|
}
|
||||||
@@ -880,6 +1146,7 @@ impl PortalSession {
|
|||||||
static ACTIVE: std::sync::Mutex<Option<std::sync::Weak<PortalSession>>> = std::sync::Mutex::new(None);
|
static ACTIVE: std::sync::Mutex<Option<std::sync::Weak<PortalSession>>> = std::sync::Mutex::new(None);
|
||||||
pub fn permissions_directory() -> Option<std::path::PathBuf> { permissions::directory() }
|
pub fn permissions_directory() -> Option<std::path::PathBuf> { permissions::directory() }
|
||||||
pub fn monitor_key(connector: &str) -> String { permissions::monitor_key(connector) }
|
pub fn monitor_key(connector: &str) -> String { permissions::monitor_key(connector) }
|
||||||
|
pub fn permission_exists(dir: &std::path::Path, key: &str) -> bool { permissions::exists(dir, key) }
|
||||||
pub fn register(session: &Arc<PortalSession>) {
|
pub fn register(session: &Arc<PortalSession>) {
|
||||||
*ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner) = Some(Arc::downgrade(session));
|
*ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner) = Some(Arc::downgrade(session));
|
||||||
}
|
}
|
||||||
@@ -899,6 +1166,128 @@ pub fn switch_active(connector: &str) -> Result<(), String> {
|
|||||||
.ok_or("Portal desktop unavailable")?;
|
.ok_or("Portal desktop unavailable")?;
|
||||||
session.switch_to(connector)
|
session.switch_to(connector)
|
||||||
}
|
}
|
||||||
|
/// Whether the capture stream carries the compositor's pointer. 0 is "not asked yet"; the
|
||||||
|
/// startup answer has to match what the engine reads from UU_PORTAL_CURSOR_MODE.
|
||||||
|
static CURSOR_MODE: std::sync::atomic::AtomicU8 = std::sync::atomic::AtomicU8::new(0);
|
||||||
|
/// Embedded cursor support reported by a session: 0 unknown, 1 unavailable, 2 available.
|
||||||
|
static CURSOR_EMBED: std::sync::atomic::AtomicU8 = std::sync::atomic::AtomicU8::new(0);
|
||||||
|
fn cursor_embedded() -> bool {
|
||||||
|
use std::sync::atomic::Ordering;
|
||||||
|
match CURSOR_MODE.load(Ordering::Acquire) {
|
||||||
|
0 => {
|
||||||
|
let embedded = std::env::var("UU_PORTAL_CURSOR_MODE").is_ok_and(|value| value.eq_ignore_ascii_case("embedded"));
|
||||||
|
CURSOR_MODE.store(if embedded { 2 } else { 1 }, Ordering::Release);
|
||||||
|
embedded
|
||||||
|
}
|
||||||
|
mode => mode == 2,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// Ask the running session for a stream with (or without) the compositor cursor.
|
||||||
|
pub fn set_cursor_embedded(embedded: bool) -> Result<bool, String> {
|
||||||
|
let session = ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref().and_then(std::sync::Weak::upgrade)
|
||||||
|
.ok_or("Portal desktop unavailable")?;
|
||||||
|
session.set_cursor_embedded(embedded)
|
||||||
|
}
|
||||||
|
/// A release package can carry an older libuu-portal.so without the runtime cursor switch;
|
||||||
|
/// rebuilding the session would be wasted work there.
|
||||||
|
fn cursor_switch_available() -> bool {
|
||||||
|
#[cfg(all(target_os = "linux", feature = "portal", feature = "engine-plugins"))]
|
||||||
|
{
|
||||||
|
static AVAILABLE: std::sync::OnceLock<bool> = std::sync::OnceLock::new();
|
||||||
|
*AVAILABLE.get_or_init(|| crate::engine_plugin::symbol(crate::engine_plugin::Engine::Portal, "uu_portal_set_cursor_mode\0") != 0)
|
||||||
|
}
|
||||||
|
#[cfg(not(all(target_os = "linux", feature = "portal", feature = "engine-plugins")))]
|
||||||
|
{ cfg!(all(target_os = "linux", feature = "portal")) }
|
||||||
|
}
|
||||||
|
/// Relative motion has no position the viewer could draw a cursor at, so the stream has to carry
|
||||||
|
/// one. Absolute motion means the viewer draws its own and an embedded copy would trail it. Both
|
||||||
|
/// need a fresh portal session, so wait for a run of the same kind before rebuilding it.
|
||||||
|
struct PointerMode {
|
||||||
|
candidate: Option<bool>,
|
||||||
|
streak: u32,
|
||||||
|
first: Option<std::time::Instant>,
|
||||||
|
switching: bool,
|
||||||
|
blocked_until: Option<std::time::Instant>,
|
||||||
|
}
|
||||||
|
static POINTER_MODE: std::sync::Mutex<PointerMode> = std::sync::Mutex::new(PointerMode {
|
||||||
|
candidate: None, streak: 0, first: None, switching: false, blocked_until: None,
|
||||||
|
});
|
||||||
|
const POINTER_STREAK: u32 = 5;
|
||||||
|
/// A burst at connect must not rebuild the session, so the run has to span time as well.
|
||||||
|
const POINTER_WINDOW: std::time::Duration = std::time::Duration::from_millis(200);
|
||||||
|
/// After a failed rebuild the consent may be gone; do not retry on the next few events.
|
||||||
|
const POINTER_COOLDOWN: std::time::Duration = std::time::Duration::from_secs(5);
|
||||||
|
fn pointer_decision(state: &mut PointerMode, current: bool, relative: bool, now: std::time::Instant) -> Option<bool> {
|
||||||
|
if current == relative {
|
||||||
|
state.candidate = None;
|
||||||
|
state.streak = 0;
|
||||||
|
state.first = None;
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
if state.switching || state.blocked_until.is_some_and(|until| now < until) { return None; }
|
||||||
|
match state.candidate {
|
||||||
|
Some(candidate) if candidate == relative => {
|
||||||
|
state.streak += 1;
|
||||||
|
if state.streak >= POINTER_STREAK
|
||||||
|
&& state.first.is_some_and(|first| now.duration_since(first) >= POINTER_WINDOW) {
|
||||||
|
return Some(relative);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
state.candidate = Some(relative);
|
||||||
|
state.streak = 1;
|
||||||
|
state.first = Some(now);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
pub fn note_pointer_motion(relative: bool) {
|
||||||
|
if !cursor_switch_available() { return; }
|
||||||
|
// The backend does not advertise an embedded cursor: nothing to switch to.
|
||||||
|
if CURSOR_EMBED.load(std::sync::atomic::Ordering::Acquire) == 1 { return; }
|
||||||
|
// A swap closes the portal input devices; do not drop keys or buttons the viewer holds.
|
||||||
|
if crate::input::portal_input_held() { return; }
|
||||||
|
let decision = {
|
||||||
|
let Ok(mut state) = POINTER_MODE.lock() else { return; };
|
||||||
|
let decision = pointer_decision(&mut state, cursor_embedded(), relative, std::time::Instant::now());
|
||||||
|
if decision.is_some() {
|
||||||
|
state.switching = true;
|
||||||
|
state.candidate = None;
|
||||||
|
state.streak = 0;
|
||||||
|
state.first = None;
|
||||||
|
}
|
||||||
|
decision
|
||||||
|
};
|
||||||
|
let Some(target) = decision else { return; };
|
||||||
|
let spawned = std::thread::Builder::new().name("portal-cursor".into()).spawn(move || {
|
||||||
|
let result = set_cursor_embedded(target);
|
||||||
|
let mut state = POINTER_MODE.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
|
||||||
|
state.switching = false;
|
||||||
|
state.candidate = None;
|
||||||
|
state.streak = 0;
|
||||||
|
state.first = None;
|
||||||
|
match result {
|
||||||
|
Ok(true) => {
|
||||||
|
state.blocked_until = None;
|
||||||
|
drop(state);
|
||||||
|
log::info!("Cursor mode follows the pointer: embedded={target}");
|
||||||
|
}
|
||||||
|
Ok(false) => {
|
||||||
|
// Locked, or something else changed the mode first; the next motion retries.
|
||||||
|
state.blocked_until = None;
|
||||||
|
drop(state);
|
||||||
|
}
|
||||||
|
Err(error) => {
|
||||||
|
state.blocked_until = Some(std::time::Instant::now() + POINTER_COOLDOWN);
|
||||||
|
drop(state);
|
||||||
|
log::warn!("Portal cursor switch failed: {error}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if spawned.is_err() {
|
||||||
|
if let Ok(mut state) = POINTER_MODE.lock() { state.switching = false; }
|
||||||
|
}
|
||||||
|
}
|
||||||
pub struct Monitor { pub connector: String, pub width: u32, pub height: u32, pub x: i32, pub y: i32, pub primary: bool }
|
pub struct Monitor { pub connector: String, pub width: u32, pub height: u32, pub x: i32, pub y: i32, pub primary: bool }
|
||||||
#[cfg(all(target_os = "linux", feature = "portal"))]
|
#[cfg(all(target_os = "linux", feature = "portal"))]
|
||||||
pub use native::monitors;
|
pub use native::monitors;
|
||||||
@@ -984,3 +1373,76 @@ mod tests {
|
|||||||
assert_eq!(*handle.lock().unwrap(), 11);
|
assert_eq!(*handle.lock().unwrap(), 11);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod pointer_mode_tests {
|
||||||
|
use super::{pointer_decision, PointerMode, POINTER_COOLDOWN, POINTER_WINDOW};
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
|
fn state() -> PointerMode {
|
||||||
|
PointerMode { candidate: None, streak: 0, first: None, switching: false, blocked_until: None }
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_connect_burst_does_not_rebuild_the_session() {
|
||||||
|
let mut state = state();
|
||||||
|
let start = Instant::now();
|
||||||
|
for step in 0..20 {
|
||||||
|
assert_eq!(pointer_decision(&mut state, true, false, start + Duration::from_millis(step)), None);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_sustained_change_decides_once_the_run_spans_the_window() {
|
||||||
|
let mut state = state();
|
||||||
|
let start = Instant::now();
|
||||||
|
let mut decided = None;
|
||||||
|
for step in 0..40 {
|
||||||
|
let now = start + Duration::from_millis(step * 10);
|
||||||
|
if let Some(value) = pointer_decision(&mut state, true, false, now) {
|
||||||
|
assert!(now.duration_since(start) >= POINTER_WINDOW);
|
||||||
|
decided = Some(value);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assert_eq!(decided, Some(false));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn an_opposite_event_restarts_the_run() {
|
||||||
|
let mut state = state();
|
||||||
|
let start = Instant::now();
|
||||||
|
for step in 0..10 { pointer_decision(&mut state, true, false, start + Duration::from_millis(step)); }
|
||||||
|
pointer_decision(&mut state, true, true, start + Duration::from_millis(10));
|
||||||
|
for step in 11..19 {
|
||||||
|
assert_eq!(pointer_decision(&mut state, true, false, start + Duration::from_millis(step)), None);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_failed_switch_waits_out_the_cooldown() {
|
||||||
|
let mut state = state();
|
||||||
|
let start = Instant::now();
|
||||||
|
state.blocked_until = Some(start + POINTER_COOLDOWN);
|
||||||
|
for step in 0..40 {
|
||||||
|
assert_eq!(pointer_decision(&mut state, true, false, start + Duration::from_millis(step * 10)), None);
|
||||||
|
}
|
||||||
|
let after = start + POINTER_COOLDOWN + Duration::from_millis(1);
|
||||||
|
let mut decided = None;
|
||||||
|
for step in 0..30 {
|
||||||
|
let now = after + Duration::from_millis(step * 10);
|
||||||
|
if let Some(value) = pointer_decision(&mut state, true, false, now) { decided = Some(value); break; }
|
||||||
|
}
|
||||||
|
assert_eq!(decided, Some(false));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_switch_in_flight_ignores_more_events() {
|
||||||
|
let mut state = state();
|
||||||
|
let start = Instant::now();
|
||||||
|
state.switching = true;
|
||||||
|
for step in 0..40 {
|
||||||
|
assert_eq!(pointer_decision(&mut state, true, false, start + Duration::from_millis(step * 10)), None);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,6 +26,58 @@ pub fn desktop_key() -> &'static str {
|
|||||||
/// Consent for one monitor (Mutter connector); connectors are checked to be file-name safe.
|
/// Consent for one monitor (Mutter connector); connectors are checked to be file-name safe.
|
||||||
pub fn monitor_key(connector: &str) -> String { format!("{}@{}", desktop_key(), connector) }
|
pub fn monitor_key(connector: &str) -> String { format!("{}@{}", desktop_key(), connector) }
|
||||||
|
|
||||||
|
/// An unclassified grant is kept separately until its monitor is known.
|
||||||
|
pub fn pending_key(key: &str) -> String { format!("{key}.pending") }
|
||||||
|
|
||||||
|
pub fn exists(dir: &Path, key: &str) -> bool {
|
||||||
|
dir.join(key).exists() || dir.join(pending_key(key)).exists()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct Rotation {
|
||||||
|
directory: Option<PathBuf>,
|
||||||
|
pending: String,
|
||||||
|
saved: Option<String>,
|
||||||
|
token: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Rotation {
|
||||||
|
pub fn new(directory: Option<PathBuf>, requested_key: &str) -> Self {
|
||||||
|
Self { directory, pending: pending_key(requested_key), saved: None, token: None }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn received(&self) -> bool { self.token.is_some() }
|
||||||
|
|
||||||
|
/// A fresh request has not consumed the old grant; keep it until the new session opens.
|
||||||
|
pub fn remember(&mut self, token: &str) { self.token = Some(token.to_owned()); }
|
||||||
|
|
||||||
|
/// Persist before PipeWire starts; `known_key` comes from the actual granted source.
|
||||||
|
pub fn record(&mut self, token: &str, known_key: Option<&str>) -> std::io::Result<()> {
|
||||||
|
self.remember(token);
|
||||||
|
let Some(dir) = self.directory.as_deref() else { return Ok(()); };
|
||||||
|
let destination = known_key.unwrap_or(&self.pending);
|
||||||
|
save(dir, destination, token)?;
|
||||||
|
self.saved = Some(destination.to_owned());
|
||||||
|
if let Some(key) = known_key { let _ = fs::remove_file(dir.join(pending_key(key))); }
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Move, rather than copy, so a single-use token never has two cache entries.
|
||||||
|
pub fn finish(&mut self, destination: &str, replace: bool) -> std::io::Result<()> {
|
||||||
|
let (Some(dir), Some(token)) = (self.directory.as_deref(), self.token.as_deref()) else { return Ok(()); };
|
||||||
|
if self.saved.as_deref() == Some(destination) { return Ok(()); }
|
||||||
|
if !replace && dir.join(destination).exists() { return Ok(()); }
|
||||||
|
if let Some(source) = self.saved.as_deref() {
|
||||||
|
fs::rename(dir.join(source), dir.join(destination))?;
|
||||||
|
fs::File::open(dir)?.sync_all()?;
|
||||||
|
} else {
|
||||||
|
save(dir, destination, token)?;
|
||||||
|
}
|
||||||
|
self.saved = Some(destination.to_owned());
|
||||||
|
let _ = fs::remove_file(dir.join(pending_key(destination)));
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn take(dir: &Path, key: &str) -> Option<String> {
|
pub fn take(dir: &Path, key: &str) -> Option<String> {
|
||||||
let path = dir.join(key);
|
let path = dir.join(key);
|
||||||
let mut file = OpenOptions::new().read(true).custom_flags(libc::O_NOFOLLOW).open(&path).ok()?;
|
let mut file = OpenOptions::new().read(true).custom_flags(libc::O_NOFOLLOW).open(&path).ok()?;
|
||||||
@@ -71,4 +123,61 @@ mod tests {
|
|||||||
assert!(save(&dir, "gnome", &"x".repeat(4097)).is_err());
|
assert!(save(&dir, "gnome", &"x".repeat(4097)).is_err());
|
||||||
fs::remove_dir_all(dir).unwrap();
|
fs::remove_dir_all(dir).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rotated_grant_survives_failure_and_is_moved_after_success() {
|
||||||
|
let dir = std::env::temp_dir().join(format!("uu-rotation-{}", std::process::id()));
|
||||||
|
fs::create_dir_all(&dir).unwrap();
|
||||||
|
save(&dir, "gnome@other", "other-grant").unwrap();
|
||||||
|
let mut rotation = Rotation::new(Some(dir.clone()), "gnome@wanted");
|
||||||
|
rotation.record("new-grant", None).unwrap();
|
||||||
|
// Simulate capture failure: no finish callback runs.
|
||||||
|
assert!(exists(&dir, "gnome@wanted"));
|
||||||
|
assert_eq!(take(&dir, &pending_key("gnome@wanted")).as_deref(), Some("new-grant"));
|
||||||
|
assert!(!exists(&dir, "gnome@wanted"));
|
||||||
|
assert_eq!(take(&dir, "gnome@other").as_deref(), Some("other-grant"));
|
||||||
|
|
||||||
|
let mut rotation = Rotation::new(Some(dir.clone()), "gnome@wanted");
|
||||||
|
rotation.record("newer-grant", None).unwrap();
|
||||||
|
rotation.finish("gnome@actual", true).unwrap();
|
||||||
|
assert!(!dir.join(pending_key("gnome@wanted")).exists());
|
||||||
|
assert_eq!(take(&dir, "gnome@actual").as_deref(), Some("newer-grant"));
|
||||||
|
fs::remove_dir_all(dir).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn known_grants_replace_only_their_monitor_and_unknown_grants_do_not_overwrite() {
|
||||||
|
let dir = std::env::temp_dir().join(format!("uu-rotation-known-{}", std::process::id()));
|
||||||
|
fs::create_dir_all(&dir).unwrap();
|
||||||
|
save(&dir, "gnome", "existing-grant").unwrap();
|
||||||
|
save(&dir, "gnome@other", "other-grant").unwrap();
|
||||||
|
let mut unknown = Rotation::new(Some(dir.clone()), "gnome@wanted");
|
||||||
|
unknown.record("unknown-grant", None).unwrap();
|
||||||
|
unknown.finish("gnome", false).unwrap();
|
||||||
|
assert_eq!(take(&dir, "gnome").as_deref(), Some("existing-grant"));
|
||||||
|
assert_eq!(take(&dir, &pending_key("gnome@wanted")).as_deref(), Some("unknown-grant"));
|
||||||
|
let mut known = Rotation::new(Some(dir.clone()), "gnome@wanted");
|
||||||
|
known.record("known-grant", Some("gnome@actual")).unwrap();
|
||||||
|
assert_eq!(take(&dir, "gnome@actual").as_deref(), Some("known-grant"));
|
||||||
|
assert_eq!(take(&dir, "gnome@other").as_deref(), Some("other-grant"));
|
||||||
|
let mut no_token = Rotation::new(Some(dir.clone()), "gnome");
|
||||||
|
no_token.finish("gnome", true).unwrap();
|
||||||
|
assert!(!no_token.received());
|
||||||
|
assert!(!dir.join("gnome").exists());
|
||||||
|
fs::remove_dir_all(dir).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn fresh_request_keeps_existing_grant_until_open_succeeds() {
|
||||||
|
let dir = std::env::temp_dir().join(format!("uu-rotation-fresh-{}", std::process::id()));
|
||||||
|
fs::create_dir_all(&dir).unwrap();
|
||||||
|
save(&dir, "gnome", "existing-grant").unwrap();
|
||||||
|
let mut fresh = Rotation::new(Some(dir.clone()), "gnome");
|
||||||
|
fresh.remember("fresh-grant");
|
||||||
|
assert_eq!(fs::read_to_string(dir.join("gnome")).unwrap(), "existing-grant");
|
||||||
|
assert!(!dir.join(pending_key("gnome")).exists());
|
||||||
|
fresh.finish("gnome", true).unwrap();
|
||||||
|
assert_eq!(take(&dir, "gnome").as_deref(), Some("fresh-grant"));
|
||||||
|
fs::remove_dir_all(dir).unwrap();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -20,6 +20,9 @@ pub trait Backend: Send + Sync {
|
|||||||
fn enter(&self, mode: Mode, journal: &mut Journal) -> Result<Entered, String>;
|
fn enter(&self, mode: Mode, journal: &mut Journal) -> Result<Entered, String>;
|
||||||
/// Undo `data` from `enter`. Also used for crash recovery, where no desktop stream exists.
|
/// Undo `data` from `enter`. Also used for crash recovery, where no desktop stream exists.
|
||||||
fn leave(&self, data: &serde_json::Value) -> Result<(), String>;
|
fn leave(&self, data: &serde_json::Value) -> Result<(), String>;
|
||||||
|
/// Recompute `Entered::pointer_region` after the virtual output was recreated. None keeps
|
||||||
|
/// the stored region (backends without a virtual output, or a layout not settled yet).
|
||||||
|
fn refresh_pointer_region(&self) -> Option<[f64; 4]> { None }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The backend for this session, if the desktop has one.
|
/// The backend for this session, if the desktop has one.
|
||||||
|
|||||||
+172
-12
@@ -1,24 +1,87 @@
|
|||||||
//! Local input devices through KWin's InputDevice D-Bus interface (sysName `eventN`). KWin saves
|
//! Local input devices through KWin's InputDevice D-Bus interface (sysName `eventN`). KWin saves
|
||||||
//! the enabled flag, which is why the controller runs the guard.
|
//! the enabled flag, which is why the controller runs the guard.
|
||||||
|
//!
|
||||||
|
//! `eventN` comes from udev enumeration and can change between boots, while a recovery record may
|
||||||
|
//! be replayed after a reboot. Records therefore store the name/product/vendor KWin reports next
|
||||||
|
//! to the sysName, and a restore matches the current device by that identity.
|
||||||
use super::super::tool::{gdbus, variant};
|
use super::super::tool::{gdbus, variant};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
fn call(object: &str, method: &str, args: &[&str]) -> Result<String, String> { gdbus("org.kde.KWin", object, method, args) }
|
fn call(object: &str, method: &str, args: &[&str]) -> Result<String, String> { gdbus("org.kde.KWin", object, method, args) }
|
||||||
|
|
||||||
|
/// One blocked device. `Legacy` is a record written before identities were stored.
|
||||||
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||||
|
#[serde(untagged)]
|
||||||
|
pub enum Device {
|
||||||
|
Named { sys: String, name: String, product: u32, vendor: u32 },
|
||||||
|
Legacy(String),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Device {
|
||||||
|
pub fn sys(&self) -> &str {
|
||||||
|
match self { Self::Named { sys, .. } | Self::Legacy(sys) => sys }
|
||||||
|
}
|
||||||
|
fn name(&self) -> &str {
|
||||||
|
match self { Self::Named { name, .. } => name, Self::Legacy(sys) => sys }
|
||||||
|
}
|
||||||
|
fn identity(&self) -> Option<(&str, u32, u32)> {
|
||||||
|
match self { Self::Named { name, product, vendor, .. } => Some((name, *product, *vendor)), Self::Legacy(_) => None }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `'key': <uint32 16500>` carries a type prefix; strings and booleans do not.
|
||||||
|
fn number(text: &str, key: &str) -> Option<u32> { variant(text, key)?.split_whitespace().last()?.parse().ok() }
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Default)]
|
||||||
|
struct Flags { keyboard: bool, pointer: bool, touch: bool, switch: bool, enabled: bool }
|
||||||
|
|
||||||
|
/// Every device KWin lists, blocked or not: restore must find a device that is still disabled.
|
||||||
|
/// The flag says whether a property read failed. A restore re-enables the readable devices, then
|
||||||
|
/// returns the flag as an error so its record and the guard stay for another attempt; blocking
|
||||||
|
/// skips such a device, which is all it can do.
|
||||||
|
fn enumerate() -> Result<(Vec<(Device, Flags)>, bool), String> {
|
||||||
|
let list = call("/org/kde/KWin/InputDevice", "org.freedesktop.DBus.Properties.Get", &["org.kde.KWin.InputDeviceManager", "devicesSysNames"])?;
|
||||||
|
let mut devices = Vec::new();
|
||||||
|
let mut incomplete = false;
|
||||||
|
for sys in list.split('\'').skip(1).step_by(2).filter(|n| n.strip_prefix("event").is_some_and(|d| !d.is_empty() && d.bytes().all(|b| b.is_ascii_digit()))) {
|
||||||
|
let text = match call(&format!("/org/kde/KWin/InputDevice/{sys}"), "org.freedesktop.DBus.Properties.GetAll", &["org.kde.KWin.InputDevice"]) {
|
||||||
|
Ok(text) => text,
|
||||||
|
Err(_) => { incomplete = true; continue; }
|
||||||
|
};
|
||||||
|
let yes = |key| variant(&text, key) == Some("true");
|
||||||
|
devices.push((Device::Named {
|
||||||
|
sys: sys.to_owned(),
|
||||||
|
name: variant(&text, "name").unwrap_or_default().to_owned(),
|
||||||
|
product: number(&text, "product").unwrap_or(0),
|
||||||
|
vendor: number(&text, "vendor").unwrap_or(0),
|
||||||
|
}, Flags { keyboard: yes("keyboard"), pointer: yes("pointer"), touch: yes("touch"), switch: yes("switchDevice"), enabled: yes("enabled") }));
|
||||||
|
}
|
||||||
|
Ok((devices, incomplete))
|
||||||
|
}
|
||||||
|
|
||||||
/// Keyboards, pointers and touch to block: everything except our own uinput devices, the power
|
/// Keyboards, pointers and touch to block: everything except our own uinput devices, the power
|
||||||
/// button and switches (lid). Software devices fed by local hardware (gesture daemons, ydotoold)
|
/// button and switches (lid). Software devices fed by local hardware (gesture daemons, ydotoold)
|
||||||
/// are blocked too.
|
/// are blocked too.
|
||||||
pub fn local() -> Result<Vec<String>, String> {
|
pub fn local() -> Result<Vec<Device>, String> {
|
||||||
let list = call("/org/kde/KWin/InputDevice", "org.freedesktop.DBus.Properties.Get", &["org.kde.KWin.InputDeviceManager", "devicesSysNames"])?;
|
Ok(enumerate()?.0.into_iter().filter(|(d, f)| {
|
||||||
let mut blocked = Vec::new();
|
(f.keyboard || f.pointer || f.touch) && !f.switch && f.enabled
|
||||||
for sys in list.split('\'').skip(1).step_by(2).filter(|n| n.strip_prefix("event").is_some_and(|d| !d.is_empty() && d.bytes().all(|b| b.is_ascii_digit()))) {
|
&& !d.name().starts_with("uu-remote-linux") && d.name() != "Power Button"
|
||||||
let Ok(text) = call(&format!("/org/kde/KWin/InputDevice/{sys}"), "org.freedesktop.DBus.Properties.GetAll", &["org.kde.KWin.InputDevice"]) else { continue };
|
}).map(|(d, _)| d).collect())
|
||||||
let yes = |key| variant(&text, key) == Some("true");
|
|
||||||
let name = variant(&text, "name").unwrap_or_default();
|
|
||||||
if (yes("keyboard") || yes("pointer") || yes("touch")) && !yes("switchDevice") && yes("enabled")
|
|
||||||
&& !name.starts_with("uu-remote-linux") && name != "Power Button" { blocked.push(sys.to_owned()); }
|
|
||||||
}
|
|
||||||
Ok(blocked)
|
|
||||||
}
|
}
|
||||||
pub fn set(devices: &[String], enabled: bool) -> Result<(), String> {
|
|
||||||
|
/// Every current device matching `wanted`: same name/product/vendor, or the exact sysName for a
|
||||||
|
/// legacy record. Several devices can share one identity (two identical keyboards, or one receiver
|
||||||
|
/// exposing several event nodes under the same name), so callers must handle every match.
|
||||||
|
fn matching<'a>(devices: &'a [Device], wanted: &Device) -> impl Iterator<Item = &'a Device> + 'a {
|
||||||
|
let identity = wanted.identity().map(|(name, product, vendor)| (name.to_owned(), product, vendor));
|
||||||
|
let sys = wanted.sys().to_owned();
|
||||||
|
devices.iter().filter(move |d| match (&identity, d.identity()) {
|
||||||
|
(Some((name, product, vendor)), Some((current, p, v))) => current == name && p == *product && v == *vendor,
|
||||||
|
_ => d.sys() == sys,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn set_sys<'a>(devices: impl Iterator<Item = &'a str>, enabled: bool) -> Result<(), String> {
|
||||||
let value = if enabled { "<true>" } else { "<false>" };
|
let value = if enabled { "<true>" } else { "<false>" };
|
||||||
let mut failure = None;
|
let mut failure = None;
|
||||||
for sys in devices {
|
for sys in devices {
|
||||||
@@ -28,3 +91,100 @@ pub fn set(devices: &[String], enabled: bool) -> Result<(), String> {
|
|||||||
}
|
}
|
||||||
failure.map_or(Ok(()), Err)
|
failure.map_or(Ok(()), Err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn set(devices: &[Device], enabled: bool) -> Result<(), String> {
|
||||||
|
set_sys(devices.iter().map(Device::sys), enabled)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Current sysNames to re-enable and how many record entries have no current match.
|
||||||
|
fn restore_targets<'a>(now: &'a [Device], recorded: &[Device]) -> (Vec<&'a str>, usize) {
|
||||||
|
let mut targets: Vec<&str> = Vec::new();
|
||||||
|
let mut gone = 0;
|
||||||
|
for wanted in recorded {
|
||||||
|
let mut found = false;
|
||||||
|
for current in matching(now, wanted) {
|
||||||
|
found = true;
|
||||||
|
if !targets.contains(¤t.sys()) { targets.push(current.sys()); }
|
||||||
|
}
|
||||||
|
if !found { gone += 1; }
|
||||||
|
}
|
||||||
|
(targets, gone)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Re-enables every current device matching a record entry, deduplicated by sysName: two record
|
||||||
|
/// entries can describe the same device, and one identity can cover several devices. A recorded
|
||||||
|
/// device that no longer exists is skipped: its `eventN` may belong to a different device after a
|
||||||
|
/// reboot, and failing the whole restore would keep the recovery record forever. A device that
|
||||||
|
/// exists but cannot be enabled still fails the restore, so the record and the guard stay for the
|
||||||
|
/// next attempt.
|
||||||
|
pub fn restore(devices: &[Device]) -> Result<(), String> {
|
||||||
|
if devices.is_empty() { return Ok(()); }
|
||||||
|
let (found, incomplete) = enumerate()?;
|
||||||
|
let now: Vec<Device> = found.into_iter().map(|(d, _)| d).collect();
|
||||||
|
let (targets, gone) = restore_targets(&now, devices);
|
||||||
|
// Counts only: device names and sysNames are not logged (AGENTS.md).
|
||||||
|
if gone > 0 { log::warn!("Privacy restore: {gone} recorded device(s) are gone; skipping"); }
|
||||||
|
// Re-enable the readable devices first: one unreadable device must not keep every other one
|
||||||
|
// off. The error afterwards keeps the record and the guard for another attempt.
|
||||||
|
set_sys(targets.into_iter(), true)?;
|
||||||
|
if incomplete { return Err("input device properties could not be read; retrying later".into()); }
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn named(sys: &str, name: &str, product: u32, vendor: u32) -> Device {
|
||||||
|
Device::Named { sys: sys.into(), name: name.into(), product, vendor }
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parses_numbered_variants() {
|
||||||
|
let text = "({'name': <'Logitech G304'>, 'product': <uint32 16500>, 'vendor': <uint32 1133>},)";
|
||||||
|
assert_eq!(number(text, "product"), Some(16500));
|
||||||
|
assert_eq!(number(text, "vendor"), Some(1133));
|
||||||
|
assert_eq!(number(text, "missing"), None);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn reads_legacy_and_named_records() {
|
||||||
|
let legacy: Vec<Device> = serde_json::from_str(r#"["event5","event6"]"#).unwrap();
|
||||||
|
assert!(matches!(&legacy[0], Device::Legacy(sys) if sys == "event5"));
|
||||||
|
let named: Device = serde_json::from_str(r#"{"sys":"event12","name":"Logitech G304","product":16500,"vendor":1133}"#).unwrap();
|
||||||
|
assert_eq!(named.identity(), Some(("Logitech G304", 16500, 1133)));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn matches_a_renumbered_device_by_identity() {
|
||||||
|
let mouse = named("event12", "Logitech G304", 16500, 1133);
|
||||||
|
let keyboard = named("event3", "AT Translated Set 2 keyboard", 1, 1);
|
||||||
|
let recorded = [named("event14", "Logitech G304", 16500, 1133)];
|
||||||
|
let now = [keyboard, mouse];
|
||||||
|
assert_eq!(super::restore_targets(&now, &recorded), (vec!["event12"], 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn enables_every_device_sharing_an_identity_once() {
|
||||||
|
let first = named("event12", "Logitech G304", 16500, 1133);
|
||||||
|
let second = named("event15", "Logitech G304", 16500, 1133);
|
||||||
|
let now = [first, second];
|
||||||
|
// Two record entries for one identity, as a receiver exposing several event nodes produces.
|
||||||
|
let recorded = [named("event14", "Logitech G304", 16500, 1133), named("event16", "Logitech G304", 16500, 1133)];
|
||||||
|
assert_eq!(super::restore_targets(&now, &recorded), (vec!["event12", "event15"], 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_missing_device_counts_as_gone() {
|
||||||
|
let recorded = [named("event14", "Logitech G304", 16500, 1133)];
|
||||||
|
let now = [named("event3", "AT Translated Set 2 keyboard", 1, 1)];
|
||||||
|
assert_eq!(super::restore_targets(&now, &recorded), (Vec::new(), 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_legacy_record_matches_the_exact_sysname() {
|
||||||
|
let recorded = [Device::Legacy("event5".into())];
|
||||||
|
let now = [named("event5", "AT Translated Set 2 keyboard", 1, 1)];
|
||||||
|
assert_eq!(super::restore_targets(&now, &recorded), (vec!["event5"], 0));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,12 +1,28 @@
|
|||||||
//! One-shot KWin scripts (org.kde.kwin.Scripting).
|
//! KWin scripts (org.kde.kwin.Scripting): one-shot ones, plus the new-window keeper that picture
|
||||||
|
//! mode leaves loaded for the whole privacy session.
|
||||||
use super::super::tool::gdbus;
|
use super::super::tool::gdbus;
|
||||||
|
|
||||||
|
const ONE_SHOT: &str = "uu-privacy";
|
||||||
|
const KEEP_WINDOWS: &str = "uu-privacy-windows";
|
||||||
|
|
||||||
fn call(object: &str, method: &str, args: &[&str]) -> Result<String, String> { gdbus("org.kde.KWin", object, method, args) }
|
fn call(object: &str, method: &str, args: &[&str]) -> Result<String, String> { gdbus("org.kde.KWin", object, method, args) }
|
||||||
fn script(js: &str) -> Result<(), String> {
|
/// Output names go into a JS string literal.
|
||||||
|
fn escape(output: &str) -> String { output.replace('\\', "\\\\").replace('"', "\\\"") }
|
||||||
|
/// Windows that belong on the captured output. Desktop pets and tool palettes use toolbar/utility
|
||||||
|
/// windows, which `normalWindow` misses; panels, the desktop and transient popups stay where they
|
||||||
|
/// are, so the layout of the physical outputs is unchanged.
|
||||||
|
const MOVABLE: &str = r#"function movable(w) {
|
||||||
|
if (!w || w.desktopWindow || w.dock) return false;
|
||||||
|
if (w.tooltip || w.popupMenu || w.dropdownMenu || w.comboBox || w.dndIcon) return false;
|
||||||
|
return w.normalWindow || w.dialog || w.toolbar || w.utility || w.splash;
|
||||||
|
}"#;
|
||||||
|
/// Loads `js` under `name` and runs it. `keep` leaves it loaded with its signal connections alive;
|
||||||
|
/// otherwise it is unloaded after the run, as the one-shot scripts expect.
|
||||||
|
fn script(js: &str, name: &str, keep: bool) -> Result<(), String> {
|
||||||
let dir = std::env::var_os("XDG_RUNTIME_DIR").map(std::path::PathBuf::from).ok_or("missing runtime directory")?;
|
let dir = std::env::var_os("XDG_RUNTIME_DIR").map(std::path::PathBuf::from).ok_or("missing runtime directory")?;
|
||||||
let file = dir.join(format!("uu-privacy-{}.js", std::process::id()));
|
let file = dir.join(format!("uu-privacy-{name}-{}.js", std::process::id()));
|
||||||
std::fs::write(&file, js).map_err(|e| e.kind().to_string())?;
|
std::fs::write(&file, js).map_err(|e| e.kind().to_string())?;
|
||||||
let name = "uu-privacy";
|
// A script left loaded by a host that died would keep running with a stale target.
|
||||||
let _ = call("/Scripting", "org.kde.kwin.Scripting.unloadScript", &[name]);
|
let _ = call("/Scripting", "org.kde.kwin.Scripting.unloadScript", &[name]);
|
||||||
let result = call("/Scripting", "org.kde.kwin.Scripting.loadScript", &[&file.to_string_lossy(), name]).and_then(|out| {
|
let result = call("/Scripting", "org.kde.kwin.Scripting.loadScript", &[&file.to_string_lossy(), name]).and_then(|out| {
|
||||||
let id: String = out.chars().filter(char::is_ascii_digit).collect();
|
let id: String = out.chars().filter(char::is_ascii_digit).collect();
|
||||||
@@ -14,14 +30,52 @@ fn script(js: &str) -> Result<(), String> {
|
|||||||
call(&format!("/Scripting/Script{id}"), "org.kde.kwin.Script.run", &[])
|
call(&format!("/Scripting/Script{id}"), "org.kde.kwin.Script.run", &[])
|
||||||
});
|
});
|
||||||
std::thread::sleep(std::time::Duration::from_millis(300));
|
std::thread::sleep(std::time::Duration::from_millis(300));
|
||||||
let _ = call("/Scripting", "org.kde.kwin.Scripting.unloadScript", &[name]);
|
// A failed run must not leave a half-started keeper behind.
|
||||||
|
if !keep || result.is_err() { let _ = call("/Scripting", "org.kde.kwin.Scripting.unloadScript", &[name]); }
|
||||||
let _ = std::fs::remove_file(file);
|
let _ = std::fs::remove_file(file);
|
||||||
result.map(|_| ())
|
result.map(|_| ())
|
||||||
}
|
}
|
||||||
/// Sends every normal window and dialog to `output` (a name from kscreen-doctor, file-name safe).
|
/// Sends every movable window to `output` (a name from kscreen-doctor).
|
||||||
pub fn move_windows_to(output: &str) -> Result<(), String> {
|
pub fn move_windows_to(output: &str) -> Result<(), String> {
|
||||||
script(&format!(r#"const v = workspace.screens.find(o => o.name == "{output}");
|
let output = escape(output);
|
||||||
if (v) for (const w of workspace.windowList()) if (w.normalWindow || w.dialog) workspace.sendClientToScreen(w, v);"#))
|
script(&format!(r#"{movable}
|
||||||
|
const v = workspace.screens.find(o => o.name == "{output}");
|
||||||
|
if (v) for (const w of workspace.windowList()) if (movable(w)) workspace.sendClientToScreen(w, v);"#, movable = MOVABLE), ONE_SHOT, false)
|
||||||
|
}
|
||||||
|
/// Keeps windows on `output`. Picture mode turns the physical outputs back on as secondaries, and
|
||||||
|
/// KWin then places a new window on the screen it considers active, which can be one hidden under
|
||||||
|
/// the cover: the viewer would never see it. Every window is checked when it appears and whenever
|
||||||
|
/// its geometry changes, so an application that places itself on a physical output is sent back.
|
||||||
|
/// `frameGeometryChanged` is the trigger because KWin 6.8 does not emit `outputChanged` for
|
||||||
|
/// `sendClientToScreen` moves (verified live). Unloaded by `unload_keep_windows` on restore.
|
||||||
|
pub fn keep_windows_on(output: &str) -> Result<(), String> {
|
||||||
|
let output = escape(output);
|
||||||
|
script(&format!(r#"{movable}
|
||||||
|
function keep(w) {{
|
||||||
|
if (!movable(w)) return;
|
||||||
|
// The cover windows belong on the physical outputs.
|
||||||
|
if (w.resourceClass === "uuremote-server" || (w.caption || "").indexOf("uu-remote-linux privacy") === 0) return;
|
||||||
|
const screen = workspace.screens.find(o => o.name === "{output}");
|
||||||
|
if (!screen || (w.output && w.output.name === "{output}")) return;
|
||||||
|
workspace.sendClientToScreen(w, screen);
|
||||||
|
}}
|
||||||
|
function watch(w) {{
|
||||||
|
if (!w) return;
|
||||||
|
// One window that cannot be moved or observed must not stop the others.
|
||||||
|
try {{
|
||||||
|
keep(w);
|
||||||
|
w.frameGeometryChanged.connect(function () {{ keep(w); }});
|
||||||
|
}} catch (e) {{}}
|
||||||
|
}}
|
||||||
|
// New windows first: a throwing sweep must not leave them unhandled.
|
||||||
|
workspace.windowAdded.connect(watch);
|
||||||
|
workspace.windowList().forEach(watch);
|
||||||
|
"#, movable = MOVABLE), KEEP_WINDOWS, true)
|
||||||
|
}
|
||||||
|
/// Stops following new windows. A name that is not loaded (screen-off mode, a restarted KWin
|
||||||
|
/// session) reports false without an error.
|
||||||
|
pub fn unload_keep_windows() -> Result<(), String> {
|
||||||
|
call("/Scripting", "org.kde.kwin.Scripting.unloadScript", &[KEEP_WINDOWS]).map(|_| ())
|
||||||
}
|
}
|
||||||
/// Hides the cover window from the task manager. GTK's skip-taskbar hint is an X11 hint and KWin
|
/// Hides the cover window from the task manager. GTK's skip-taskbar hint is an X11 hint and KWin
|
||||||
/// ignores it on Wayland, so the cover showed up as an unidentified window with the theme's
|
/// ignores it on Wayland, so the cover showed up as an unidentified window with the theme's
|
||||||
@@ -30,5 +84,14 @@ if (v) for (const w of workspace.windowList()) if (w.normalWindow || w.dialog) w
|
|||||||
/// duplicate captions, so match the title as a prefix.
|
/// duplicate captions, so match the title as a prefix.
|
||||||
pub fn hide_cover_from_taskbar() -> Result<(), String> {
|
pub fn hide_cover_from_taskbar() -> Result<(), String> {
|
||||||
script(r#"for (const w of workspace.windowList())
|
script(r#"for (const w of workspace.windowList())
|
||||||
if (w.resourceClass === "uuremote-server" && w.caption.indexOf("uu-remote-linux privacy") === 0) w.skipTaskbar = true;"#)
|
if (w.resourceClass === "uuremote-server" && w.caption.indexOf("uu-remote-linux privacy") === 0) w.skipTaskbar = true;"#, ONE_SHOT, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
#[test]
|
||||||
|
fn escapes_output_names_for_the_script() {
|
||||||
|
assert_eq!(super::escape("DP-3"), "DP-3");
|
||||||
|
assert_eq!(super::escape(r#"a"b\c"#), r#"a\"b\\c"#);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -5,7 +5,8 @@
|
|||||||
//! physical outputs before the virtual one exists (KWin applies stored configs on creation),
|
//! physical outputs before the virtual one exists (KWin applies stored configs on creation),
|
||||||
//! re-enable them before the virtual output goes away, and never disable the virtual output
|
//! re-enable them before the virtual output goes away, and never disable the virtual output
|
||||||
//! itself (KWin bug 527747 persists that and breaks later virtual shares).
|
//! itself (KWin bug 527747 persists that and breaks later virtual shares).
|
||||||
//! Picture mode then turns the physical outputs back on as secondary ones and covers them.
|
//! Picture mode then turns the physical outputs back on as secondary ones and covers them, and a
|
||||||
|
//! second KWin script keeps windows that appear later on the virtual output too.
|
||||||
mod input;
|
mod input;
|
||||||
mod kwin;
|
mod kwin;
|
||||||
mod outputs;
|
mod outputs;
|
||||||
@@ -16,7 +17,7 @@ pub const NAME: &str = "kde";
|
|||||||
pub struct Kde;
|
pub struct Kde;
|
||||||
|
|
||||||
#[derive(Default, serde::Serialize, serde::Deserialize)]
|
#[derive(Default, serde::Serialize, serde::Deserialize)]
|
||||||
struct Data { outputs: Vec<String>, #[serde(default)] devices: Vec<String> }
|
struct Data { outputs: Vec<String>, #[serde(default)] devices: Vec<input::Device> }
|
||||||
|
|
||||||
impl Kde {
|
impl Kde {
|
||||||
pub fn detected() -> bool {
|
pub fn detected() -> bool {
|
||||||
@@ -39,6 +40,12 @@ fn wallpaper() -> Option<std::path::PathBuf> {
|
|||||||
/// secondary outputs, keep the windows on the virtual one, and cover the physical ones.
|
/// secondary outputs, keep the windows on the virtual one, and cover the physical ones.
|
||||||
fn cover(data: &Data) -> Result<[f64; 4], String> {
|
fn cover(data: &Data) -> Result<[f64; 4], String> {
|
||||||
let virtual_name = outputs::layout()?.into_iter().map(|o| o.name).find(|n| !data.outputs.contains(n)).ok_or("virtual output not found")?;
|
let virtual_name = outputs::layout()?.into_iter().map(|o| o.name).find(|n| !data.outputs.contains(n)).ok_or("virtual output not found")?;
|
||||||
|
// Loaded before the physical outputs come back: from then on KWin places a new window on the
|
||||||
|
// screen it considers active, which may be one that is about to be covered.
|
||||||
|
match kwin::keep_windows_on(&virtual_name) {
|
||||||
|
Ok(()) => log::info!("Privacy new-window keeper: loaded"),
|
||||||
|
Err(e) => log::warn!("Privacy new-window keeper: {e}"),
|
||||||
|
}
|
||||||
outputs::set(&data.outputs, true).map_err(|e| format!("enable outputs: {e}"))?;
|
outputs::set(&data.outputs, true).map_err(|e| format!("enable outputs: {e}"))?;
|
||||||
if let Err(e) = outputs::set_primary(&virtual_name) { log::warn!("Privacy virtual output priority: {e}"); }
|
if let Err(e) = outputs::set_primary(&virtual_name) { log::warn!("Privacy virtual output priority: {e}"); }
|
||||||
kwin::move_windows_to(&virtual_name).map_err(|e| format!("move windows: {e}"))?;
|
kwin::move_windows_to(&virtual_name).map_err(|e| format!("move windows: {e}"))?;
|
||||||
@@ -81,11 +88,22 @@ impl Backend for Kde {
|
|||||||
log::info!("Privacy KDE: outputs={} input_devices={}", data.outputs.len(), data.devices.len());
|
log::info!("Privacy KDE: outputs={} input_devices={}", data.outputs.len(), data.devices.len());
|
||||||
Ok(entered)
|
Ok(entered)
|
||||||
}
|
}
|
||||||
|
fn refresh_pointer_region(&self) -> Option<[f64; 4]> {
|
||||||
|
// The old virtual output disappears with the replaced session; wait for the layout to
|
||||||
|
// settle on the new one before taking its share of the bounding box.
|
||||||
|
let layout = outputs::layout().ok()?;
|
||||||
|
let virtuals: Vec<_> = layout.iter().filter(|o| o.name.starts_with("Virtual")).collect();
|
||||||
|
let target = match virtuals.as_slice() { [only] => *only, _ => return None };
|
||||||
|
outputs::region(&layout, &target.name)
|
||||||
|
}
|
||||||
fn leave(&self, data: &serde_json::Value) -> Result<(), String> {
|
fn leave(&self, data: &serde_json::Value) -> Result<(), String> {
|
||||||
let data: Data = serde_json::from_value(data.clone()).map_err(|_| "invalid KDE recovery data")?;
|
let data: Data = serde_json::from_value(data.clone()).map_err(|_| "invalid KDE recovery data")?;
|
||||||
// KWin persists the device flag: a failure is returned (after restoring the outputs) so the
|
// KWin persists the device flag: a failure is returned (after restoring the outputs) so the
|
||||||
// controller keeps the recovery record and the guard for the next attempt.
|
// controller keeps the recovery record and the guard for the next attempt. A device that
|
||||||
let devices = input::set(&data.devices, true).map_err(|e| format!("enable input devices: {e}"));
|
// no longer exists is skipped, so a record replayed after a reboot cannot wedge recovery.
|
||||||
|
let devices = input::restore(&data.devices).map_err(|e| format!("enable input devices: {e}"));
|
||||||
|
// Stop following new windows before the virtual output goes away.
|
||||||
|
if let Err(e) = kwin::unload_keep_windows() { log::warn!("Privacy new-window keeper: {e}"); }
|
||||||
// Physical outputs first: switching back opens a monitor share, which needs them enabled.
|
// Physical outputs first: switching back opens a monitor share, which needs them enabled.
|
||||||
// The wait also matters: a share opened before KWin applies the mode got the virtual
|
// The wait also matters: a share opened before KWin applies the mode got the virtual
|
||||||
// output's geometry (seen live: 1920x1080 instead of the panel's 3072x1920).
|
// output's geometry (seen live: 1920x1080 instead of the panel's 3072x1920).
|
||||||
|
|||||||
@@ -25,8 +25,18 @@ static POINTER: Mutex<Option<[f64; 4]>> = Mutex::new(None);
|
|||||||
/// ends. An auto-enable never overrides it, including an RPC that arrives after the connection
|
/// ends. An auto-enable never overrides it, including an RPC that arrives after the connection
|
||||||
/// opens but before `session_started` bumps the counter.
|
/// opens but before `session_started` bumps the counter.
|
||||||
static VIEWER_OVERRIDE: AtomicBool = AtomicBool::new(false);
|
static VIEWER_OVERRIDE: AtomicBool = AtomicBool::new(false);
|
||||||
|
/// iOS viewers encode "screen off" as `enable=0, type=3`, and Windows viewers carry every request
|
||||||
|
/// in `type` with `enable=0`; see `protocol::Request::normalize_ios_screen_off` and
|
||||||
|
/// `protocol::Request::normalize_windows`.
|
||||||
|
static VIEWER_IOS: AtomicBool = AtomicBool::new(false);
|
||||||
|
static VIEWER_WINDOWS: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
pub fn supported() -> bool { backend::detect().is_some() }
|
pub fn supported() -> bool { backend::detect().is_some() }
|
||||||
|
/// Record the desktop controller's platform for the RPC 7 encoder quirks.
|
||||||
|
pub fn set_viewer_controller(controller: crate::input::Controller) {
|
||||||
|
VIEWER_IOS.store(controller == crate::input::Controller::Ios, Ordering::Relaxed);
|
||||||
|
VIEWER_WINDOWS.store(controller == crate::input::Controller::Windows, Ordering::Relaxed);
|
||||||
|
}
|
||||||
pub fn active() -> bool { ACTIVE.load(Ordering::Relaxed) }
|
pub fn active() -> bool { ACTIVE.load(Ordering::Relaxed) }
|
||||||
/// The viewer's privacy_type now in effect.
|
/// The viewer's privacy_type now in effect.
|
||||||
pub fn current_type() -> u8 {
|
pub fn current_type() -> u8 {
|
||||||
@@ -38,6 +48,18 @@ pub fn state_message(seq: u64, timestamp: u64) -> Vec<u8> {
|
|||||||
}
|
}
|
||||||
/// See `backend::Entered::pointer_region`.
|
/// See `backend::Entered::pointer_region`.
|
||||||
pub fn pointer_region() -> Option<[f64; 4]> { *POINTER.lock().ok()? }
|
pub fn pointer_region() -> Option<[f64; 4]> { *POINTER.lock().ok()? }
|
||||||
|
/// A session rebuild replaced the virtual output: refresh the region absolute input maps into.
|
||||||
|
pub fn refresh_pointer_region() {
|
||||||
|
if !active() { return; }
|
||||||
|
for _ in 0..10 {
|
||||||
|
if let Some(region) = backend::detect().and_then(backend::Backend::refresh_pointer_region) {
|
||||||
|
if let Ok(mut pointer) = POINTER.lock() { *pointer = Some(region); }
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(50));
|
||||||
|
}
|
||||||
|
log::warn!("Privacy pointer region not refreshed: virtual output layout did not settle");
|
||||||
|
}
|
||||||
|
|
||||||
fn publish(active: Option<&Active>) {
|
fn publish(active: Option<&Active>) {
|
||||||
ACTIVE.store(active.is_some(), Ordering::Relaxed);
|
ACTIVE.store(active.is_some(), Ordering::Relaxed);
|
||||||
@@ -112,7 +134,16 @@ pub struct Accepted { enable: bool, mode: Option<Mode> }
|
|||||||
/// (error 9998 + n in its RPC failure handler) and a switch takes longer. A later failure is
|
/// (error 9998 + n in its RPC failure handler) and a switch takes longer. A later failure is
|
||||||
/// reported as ReportError -7, which the viewer handles by resetting its privacy menu.
|
/// reported as ReportError -7, which the viewer handles by resetting its privacy menu.
|
||||||
pub fn rpc_accept(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Option<Accepted>)> {
|
pub fn rpc_accept(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Option<Accepted>)> {
|
||||||
let (header, request) = protocol::parse(rpc)?;
|
let (header, mut request) = protocol::parse(rpc)?;
|
||||||
|
if request.normalize_ios_screen_off(VIEWER_IOS.load(Ordering::Relaxed)) {
|
||||||
|
// The viewer chose a mode even if the switch is refused below; cancel a pending auto-enable
|
||||||
|
// as an accepted request would.
|
||||||
|
VIEWER_OVERRIDE.store(true, Ordering::Relaxed);
|
||||||
|
log::info!("Privacy request: iOS screen-off encoding normalized (enable=0 type=3)");
|
||||||
|
} else if request.normalize_windows(VIEWER_WINDOWS.load(Ordering::Relaxed)) {
|
||||||
|
VIEWER_OVERRIDE.store(true, Ordering::Relaxed);
|
||||||
|
log::info!("Privacy request: Windows encoding normalized (enable=0 mode={:?})", request.mode);
|
||||||
|
}
|
||||||
if let Some(e) = refuse(request.enable, request.mode) {
|
if let Some(e) = refuse(request.enable, request.mode) {
|
||||||
log::warn!("Privacy request refused: enable={} mode={:?}: {e}", request.enable, request.mode);
|
log::warn!("Privacy request refused: enable={} mode={:?}: {e}", request.enable, request.mode);
|
||||||
return Some((protocol::response(&header, &request, true, current_type()), None));
|
return Some((protocol::response(&header, &request, true, current_type()), None));
|
||||||
|
|||||||
@@ -5,6 +5,30 @@ use super::Mode;
|
|||||||
|
|
||||||
pub struct Request { pub enable: bool, pub mode: Option<Mode>, requested: u64 }
|
pub struct Request { pub enable: bool, pub mode: Option<Mode>, requested: u64 }
|
||||||
|
|
||||||
|
impl Request {
|
||||||
|
/// iOS viewers encode "turn off the display" as `enable=0, privacy_type=3`: their enable bit is
|
||||||
|
/// the picture-mode switch, and the explicit screen-off type carries the intent. iOS "off" is
|
||||||
|
/// `enable=0, type=1` (seen live), so rewrite only this exact combination. Android 4.43.0 was
|
||||||
|
/// verified with the field-1 semantics, so the rewrite is iOS-only.
|
||||||
|
pub fn normalize_ios_screen_off(&mut self, ios: bool) -> bool {
|
||||||
|
if ios && !self.enable && self.mode == Some(Mode::ScreenOff) {
|
||||||
|
self.enable = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
false
|
||||||
|
}
|
||||||
|
/// Windows viewers send every privacy request with `enable=0` and carry the intent in
|
||||||
|
/// `privacy_type`: `0/0` is off, `0/2` picture and `0/3` screen-off (verified live on the
|
||||||
|
/// Windows client). Android 4.43.0 and macOS keep field 1 as the master switch.
|
||||||
|
pub fn normalize_windows(&mut self, windows: bool) -> bool {
|
||||||
|
if windows && !self.enable && self.mode.is_some() {
|
||||||
|
self.enable = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn parse(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Request)> {
|
pub fn parse(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Request)> {
|
||||||
use crate::protocol::{decode_wire, WireValue};
|
use crate::protocol::{decode_wire, WireValue};
|
||||||
let body = |n| rpc.iter().find_map(|f| match &f.value { WireValue::Bytes(b) if f.number == n => Some(*b), _ => None });
|
let body = |n| rpc.iter().find_map(|f| match &f.value { WireValue::Bytes(b) if f.number == n => Some(*b), _ => None });
|
||||||
@@ -71,4 +95,52 @@ mod tests {
|
|||||||
let saver = crate::protocol::decode_wire(&[10, 2, 8, 7, 0xca, 1, 0]).unwrap();
|
let saver = crate::protocol::decode_wire(&[10, 2, 8, 7, 0xca, 1, 0]).unwrap();
|
||||||
assert_eq!(screensaver_response(&saver).unwrap(), [10, 2, 8, 7, 0xaa, 1, 0]);
|
assert_eq!(screensaver_response(&saver).unwrap(), [10, 2, 8, 7, 0xaa, 1, 0]);
|
||||||
}
|
}
|
||||||
|
#[test]
|
||||||
|
fn normalizes_ios_screen_off_only() {
|
||||||
|
let screen_off = crate::protocol::decode_wire(&[10, 2, 8, 42, 58, 4, 8, 0, 16, 3]).unwrap();
|
||||||
|
let (_, mut request) = parse(&screen_off).unwrap();
|
||||||
|
assert!(request.normalize_ios_screen_off(true));
|
||||||
|
assert!(request.enable);
|
||||||
|
assert_eq!(request.mode, Some(Mode::ScreenOff));
|
||||||
|
let (_, mut request) = parse(&screen_off).unwrap();
|
||||||
|
assert!(!request.normalize_ios_screen_off(false));
|
||||||
|
assert!(!request.enable);
|
||||||
|
|
||||||
|
// An iOS "off" (type 1) and a Mac-style enable (1,3) must stay untouched.
|
||||||
|
let off = crate::protocol::decode_wire(&[10, 2, 8, 42, 58, 4, 8, 0, 16, 1]).unwrap();
|
||||||
|
let (_, mut request) = parse(&off).unwrap();
|
||||||
|
assert!(!request.normalize_ios_screen_off(true));
|
||||||
|
assert!(!request.enable);
|
||||||
|
let mac = crate::protocol::decode_wire(&[10, 2, 8, 42, 58, 4, 8, 1, 16, 3]).unwrap();
|
||||||
|
let (_, mut request) = parse(&mac).unwrap();
|
||||||
|
assert!(!request.normalize_ios_screen_off(true));
|
||||||
|
assert!(request.enable);
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn normalizes_windows_encoding_only() {
|
||||||
|
// Windows: enable is always 0, the type carries the intent.
|
||||||
|
for (wire, mode) in [(2u8, Mode::Picture), (3u8, Mode::ScreenOff)] {
|
||||||
|
let bytes = [10, 2, 8, 42, 58, 4, 8, 0, 16, wire];
|
||||||
|
let (_, mut request) = parse(&crate::protocol::decode_wire(&bytes).unwrap()).unwrap();
|
||||||
|
assert!(request.normalize_windows(true));
|
||||||
|
assert!(request.enable);
|
||||||
|
assert_eq!(request.mode, Some(mode));
|
||||||
|
}
|
||||||
|
// Off stays off: type 0 (seen when the Windows switch is turned off) and type 1.
|
||||||
|
for wire in [0u8, 1] {
|
||||||
|
let bytes = [10, 2, 8, 42, 58, 4, 8, 0, 16, wire];
|
||||||
|
let (_, mut request) = parse(&crate::protocol::decode_wire(&bytes).unwrap()).unwrap();
|
||||||
|
assert!(!request.normalize_windows(true));
|
||||||
|
assert!(!request.enable);
|
||||||
|
}
|
||||||
|
// Other platforms and explicit enables are untouched.
|
||||||
|
let picture = crate::protocol::decode_wire(&[10, 2, 8, 42, 58, 4, 8, 0, 16, 2]).unwrap();
|
||||||
|
let (_, mut request) = parse(&picture).unwrap();
|
||||||
|
assert!(!request.normalize_windows(false));
|
||||||
|
assert!(!request.enable);
|
||||||
|
let explicit = crate::protocol::decode_wire(&[10, 2, 8, 42, 58, 4, 8, 1, 16, 2]).unwrap();
|
||||||
|
let (_, mut request) = parse(&explicit).unwrap();
|
||||||
|
assert!(!request.normalize_windows(true));
|
||||||
|
assert!(request.enable);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+306
-21
@@ -9,7 +9,7 @@
|
|||||||
use std::collections::{HashMap, VecDeque};
|
use std::collections::{HashMap, VecDeque};
|
||||||
use std::io::Read;
|
use std::io::Read;
|
||||||
use std::os::fd::{AsRawFd, OwnedFd};
|
use std::os::fd::{AsRawFd, OwnedFd};
|
||||||
use std::sync::atomic::{AtomicU32, Ordering};
|
use std::sync::atomic::{AtomicBool, AtomicU32, AtomicU64, Ordering};
|
||||||
use std::sync::{Arc, Mutex, OnceLock};
|
use std::sync::{Arc, Mutex, OnceLock};
|
||||||
use tokio::sync::mpsc::UnboundedSender;
|
use tokio::sync::mpsc::UnboundedSender;
|
||||||
|
|
||||||
@@ -67,6 +67,7 @@ struct Session {
|
|||||||
id: u32,
|
id: u32,
|
||||||
shell: String,
|
shell: String,
|
||||||
created_ms: u64,
|
created_ms: u64,
|
||||||
|
last_active_ms: AtomicU64,
|
||||||
master: OwnedFd,
|
master: OwnedFd,
|
||||||
pid: i32,
|
pid: i32,
|
||||||
sink: Mutex<Option<UnboundedSender<Vec<u8>>>>,
|
sink: Mutex<Option<UnboundedSender<Vec<u8>>>>,
|
||||||
@@ -75,9 +76,11 @@ struct Session {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Session {
|
impl Session {
|
||||||
|
fn touch(&self) { self.last_active_ms.fetch_max(now_ms(), Ordering::Relaxed); }
|
||||||
/// Lock order sink → scrollback matches OPEN, so a reattach snapshot sees each
|
/// Lock order sink → scrollback matches OPEN, so a reattach snapshot sees each
|
||||||
/// chunk either in the replay or live, never both.
|
/// chunk either in the replay or live, never both.
|
||||||
fn record_output(&self, data: &[u8]) {
|
fn record_output(&self, data: &[u8]) {
|
||||||
|
self.touch();
|
||||||
let mut sink = self.sink.lock().unwrap();
|
let mut sink = self.sink.lock().unwrap();
|
||||||
{
|
{
|
||||||
let mut sb = self.scrollback.lock().unwrap();
|
let mut sb = self.scrollback.lock().unwrap();
|
||||||
@@ -123,6 +126,7 @@ impl Session {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
fn write(&self, data: &[u8]) {
|
fn write(&self, data: &[u8]) {
|
||||||
|
if !data.is_empty() { self.touch(); }
|
||||||
let mut off = 0;
|
let mut off = 0;
|
||||||
while off < data.len() {
|
while off < data.len() {
|
||||||
let n = unsafe { libc::write(self.master.as_raw_fd(), data[off..].as_ptr().cast(), data.len() - off) };
|
let n = unsafe { libc::write(self.master.as_raw_fd(), data[off..].as_ptr().cast(), data.len() - off) };
|
||||||
@@ -131,6 +135,31 @@ impl Session {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
fn signal(&self, sig: i32) { unsafe { libc::kill(-self.pid, sig); } }
|
fn signal(&self, sig: i32) { unsafe { libc::kill(-self.pid, sig); } }
|
||||||
|
fn signal_foreground(&self, sig: i32) {
|
||||||
|
self.touch();
|
||||||
|
// Job-control shells put commands such as top in their own process group.
|
||||||
|
let pgid = unsafe { libc::tcgetpgrp(self.master.as_raw_fd()) };
|
||||||
|
if pgid > 0 { unsafe { libc::kill(-pgid, sig); } } else { self.signal(sig); }
|
||||||
|
}
|
||||||
|
fn terminate(&self) {
|
||||||
|
// Job-control shells give foreground/background jobs separate process groups.
|
||||||
|
// Limit cleanup to this PTY's POSIX session, never other desktop/tool peers.
|
||||||
|
if self.pid <= 0 { return; }
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
if let Ok(entries) = std::fs::read_dir("/proc") {
|
||||||
|
let mut groups = std::collections::HashSet::new();
|
||||||
|
for entry in entries.flatten() {
|
||||||
|
let Some(pid) = entry.file_name().to_str().and_then(|s| s.parse::<i32>().ok()) else { continue; };
|
||||||
|
if unsafe { libc::getsid(pid) } == self.pid {
|
||||||
|
let group = unsafe { libc::getpgid(pid) };
|
||||||
|
if group > 0 && group != self.pid { groups.insert(group); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for group in groups { unsafe { libc::kill(-group, libc::SIGKILL); } }
|
||||||
|
}
|
||||||
|
self.signal_foreground(libc::SIGKILL);
|
||||||
|
self.signal(libc::SIGKILL);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn registry() -> &'static Mutex<HashMap<u32, Arc<Session>>> {
|
fn registry() -> &'static Mutex<HashMap<u32, Arc<Session>>> {
|
||||||
@@ -139,6 +168,28 @@ fn registry() -> &'static Mutex<HashMap<u32, Arc<Session>>> {
|
|||||||
}
|
}
|
||||||
static NEXT_ID: AtomicU32 = AtomicU32::new(1);
|
static NEXT_ID: AtomicU32 = AtomicU32::new(1);
|
||||||
|
|
||||||
|
fn changes() -> &'static tokio::sync::watch::Sender<u64> {
|
||||||
|
static CHANGES: OnceLock<tokio::sync::watch::Sender<u64>> = OnceLock::new();
|
||||||
|
CHANGES.get_or_init(|| tokio::sync::watch::channel(0).0)
|
||||||
|
}
|
||||||
|
fn notify_changes() { changes().send_modify(|revision| *revision = revision.wrapping_add(1)); }
|
||||||
|
pub fn subscribe_changes() -> tokio::sync::watch::Receiver<u64> { changes().subscribe() }
|
||||||
|
pub fn changed_message(sequence: u64, timestamp: u64) -> Vec<u8> {
|
||||||
|
// Official Mac 4.42.0: Message name map 0x100a1eb98 gives field 28;
|
||||||
|
// notifyTerminalListInvalidated (0x1001a341c) sends the empty message on BINARY (channel 3).
|
||||||
|
crate::initialization::envelope(sequence, timestamp, 28, &[])
|
||||||
|
}
|
||||||
|
|
||||||
|
fn remove_session(session: &Arc<Session>) -> bool {
|
||||||
|
let mut sessions = registry().lock().unwrap();
|
||||||
|
// An old reader may finish after OPEN has reused the same requested ID.
|
||||||
|
if sessions.get(&session.id).is_some_and(|current| Arc::ptr_eq(current, session)) {
|
||||||
|
sessions.remove(&session.id);
|
||||||
|
drop(sessions);
|
||||||
|
notify_changes(); true
|
||||||
|
} else { false }
|
||||||
|
}
|
||||||
|
|
||||||
fn now_ms() -> u64 { std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_millis() as u64 }
|
fn now_ms() -> u64 { std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_millis() as u64 }
|
||||||
|
|
||||||
fn spawn(requested_id: u32, cols: u16, rows: u16, shell: Option<&str>) -> Result<Arc<Session>, String> {
|
fn spawn(requested_id: u32, cols: u16, rows: u16, shell: Option<&str>) -> Result<Arc<Session>, String> {
|
||||||
@@ -172,9 +223,11 @@ fn spawn(requested_id: u32, cols: u16, rows: u16, shell: Option<&str>) -> Result
|
|||||||
if id != 0 && !registry().lock().unwrap().contains_key(&id) { break id; }
|
if id != 0 && !registry().lock().unwrap().contains_key(&id) { break id; }
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let session = Arc::new(Session { id, shell: shell.clone(), created_ms: now_ms(), pid: child.id() as i32,
|
let created_ms = now_ms();
|
||||||
|
let session = Arc::new(Session { id, shell: shell.clone(), created_ms, last_active_ms: AtomicU64::new(created_ms), pid: child.id() as i32,
|
||||||
master: pty.master, sink: Mutex::new(None), scrollback: Mutex::new(VecDeque::new()), size: Mutex::new((cols, rows)) });
|
master: pty.master, sink: Mutex::new(None), scrollback: Mutex::new(VecDeque::new()), size: Mutex::new((cols, rows)) });
|
||||||
let mut reader = std::fs::File::from(session.master.try_clone().map_err(|e| format!("pty dup failed: {e}"))?);
|
let mut reader = std::fs::File::from(session.master.try_clone().map_err(|e| format!("pty dup failed: {e}"))?);
|
||||||
|
registry().lock().unwrap().insert(id, session.clone());
|
||||||
let worker = session.clone();
|
let worker = session.clone();
|
||||||
std::thread::Builder::new().name(format!("uu-term-{id}")).spawn(move || {
|
std::thread::Builder::new().name(format!("uu-term-{id}")).spawn(move || {
|
||||||
let mut buf = vec![0u8; OUTPUT_CHUNK];
|
let mut buf = vec![0u8; OUTPUT_CHUNK];
|
||||||
@@ -187,9 +240,10 @@ fn spawn(requested_id: u32, cols: u16, rows: u16, shell: Option<&str>) -> Result
|
|||||||
let code = child.wait().ok().and_then(|s| s.code()).unwrap_or(-1);
|
let code = child.wait().ok().and_then(|s| s.code()).unwrap_or(-1);
|
||||||
log::info!("Terminal session exited: id={} exit_code={}", worker.id, code);
|
log::info!("Terminal session exited: id={} exit_code={}", worker.id, code);
|
||||||
worker.emit(EXIT, serde_json::json!({"exit_code": code}).to_string().as_bytes());
|
worker.emit(EXIT, serde_json::json!({"exit_code": code}).to_string().as_bytes());
|
||||||
registry().lock().unwrap().remove(&worker.id);
|
remove_session(&worker);
|
||||||
}).map_err(|e| format!("reader thread failed: {e}"))?;
|
}).map_err(|e| {
|
||||||
registry().lock().unwrap().insert(id, session.clone());
|
remove_session(&session); session.terminate(); format!("reader thread failed: {e}")
|
||||||
|
})?;
|
||||||
log::info!("Terminal session spawned: id={} cols={} rows={}", id, cols, rows);
|
log::info!("Terminal session spawned: id={} cols={} rows={}", id, cols, rows);
|
||||||
Ok(session)
|
Ok(session)
|
||||||
}
|
}
|
||||||
@@ -201,7 +255,7 @@ pub fn shutdown_all() {
|
|||||||
for s in &sessions { s.signal(libc::SIGHUP); }
|
for s in &sessions { s.signal(libc::SIGHUP); }
|
||||||
if !sessions.is_empty() {
|
if !sessions.is_empty() {
|
||||||
std::thread::sleep(std::time::Duration::from_millis(300));
|
std::thread::sleep(std::time::Duration::from_millis(300));
|
||||||
for s in &sessions { s.signal(libc::SIGKILL); }
|
for s in &sessions { s.terminate(); }
|
||||||
log::info!("Terminal sessions closed on shutdown: count={}", sessions.len());
|
log::info!("Terminal sessions closed on shutdown: count={}", sessions.len());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -226,13 +280,26 @@ fn signal_number(payload: &[u8]) -> i32 {
|
|||||||
fn reply(code: i64, message: &str) -> Vec<u8> { serde_json::json!({"code": code, "message": message}).to_string().into_bytes() }
|
fn reply(code: i64, message: &str) -> Vec<u8> { serde_json::json!({"code": code, "message": message}).to_string().into_bytes() }
|
||||||
|
|
||||||
/// One viewer connection's terminal endpoint; `out` sends complete frames on BINARY_DATA_CHANNEL.
|
/// One viewer connection's terminal endpoint; `out` sends complete frames on BINARY_DATA_CHANNEL.
|
||||||
pub struct TerminalConn { out: UnboundedSender<Vec<u8>> }
|
pub struct TerminalConn { out: UnboundedSender<Vec<u8>>, closed: AtomicBool }
|
||||||
|
|
||||||
impl TerminalConn {
|
impl TerminalConn {
|
||||||
pub fn new(out: UnboundedSender<Vec<u8>>) -> Self { Self { out } }
|
pub fn new(out: UnboundedSender<Vec<u8>>) -> Self { Self { out, closed: AtomicBool::new(false) } }
|
||||||
fn send(&self, kind: u8, session: u32, payload: &[u8]) { let _ = self.out.send(encode(kind, session, payload)); }
|
fn send(&self, kind: u8, session: u32, payload: &[u8]) { let _ = self.out.send(encode(kind, session, payload)); }
|
||||||
|
pub fn disconnect(&self) {
|
||||||
|
self.closed.store(true, Ordering::Release);
|
||||||
|
let sessions: Vec<_> = registry().lock().unwrap().values().cloned().collect();
|
||||||
|
let mut changed = false;
|
||||||
|
for s in sessions {
|
||||||
|
let mut sink = s.sink.lock().unwrap();
|
||||||
|
if sink.as_ref().is_some_and(|tx| tx.same_channel(&self.out)) {
|
||||||
|
*sink = None; s.touch(); changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if changed { notify_changes(); }
|
||||||
|
}
|
||||||
|
|
||||||
pub fn handle(&self, data: &[u8]) {
|
pub fn handle(&self, data: &[u8]) {
|
||||||
|
if self.closed.load(Ordering::Acquire) { return; }
|
||||||
let Some(frame) = decode(data) else { log::warn!("Terminal frame rejected: bytes={}", data.len()); return; };
|
let Some(frame) = decode(data) else { log::warn!("Terminal frame rejected: bytes={}", data.len()); return; };
|
||||||
if frame.kind != STDIN { log::info!("Terminal frame: type={} session={} payload_bytes={}", frame.kind, frame.session, frame.payload.len()); }
|
if frame.kind != STDIN { log::info!("Terminal frame: type={} session={} payload_bytes={}", frame.kind, frame.session, frame.payload.len()); }
|
||||||
let existing = registry().lock().unwrap().get(&frame.session).cloned();
|
let existing = registry().lock().unwrap().get(&frame.session).cloned();
|
||||||
@@ -247,6 +314,7 @@ impl TerminalConn {
|
|||||||
};
|
};
|
||||||
match session {
|
match session {
|
||||||
Ok(s) => {
|
Ok(s) => {
|
||||||
|
s.touch();
|
||||||
// Queue the acknowledgement before the PTY reader can emit live output.
|
// Queue the acknowledgement before the PTY reader can emit live output.
|
||||||
let mut sink = s.sink.lock().unwrap();
|
let mut sink = s.sink.lock().unwrap();
|
||||||
self.send(OPEN_RESP, s.id, &reply(0, "ok"));
|
self.send(OPEN_RESP, s.id, &reply(0, "ok"));
|
||||||
@@ -257,30 +325,55 @@ impl TerminalConn {
|
|||||||
drop(sink);
|
drop(sink);
|
||||||
// The replay tail starts mid-redraw for full-screen programs.
|
// The replay tail starts mid-redraw for full-screen programs.
|
||||||
if reattach { s.force_redraw(); }
|
if reattach { s.force_redraw(); }
|
||||||
|
notify_changes();
|
||||||
}
|
}
|
||||||
Err(e) => { log::warn!("Terminal open failed: {}", e); self.send(OPEN_RESP, frame.session, &reply(1, &e)); }
|
Err(e) => { log::warn!("Terminal open failed: {}", e); self.send(OPEN_RESP, frame.session, &reply(1, &e)); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
STDIN => if let Some(s) = existing { s.write(&frame.payload) },
|
STDIN | RESIZE | SIGNAL | CLOSE | DETACH => if let Some(s) = existing {
|
||||||
RESIZE => if let Some(s) = existing { let (c, r) = dims(&json(&frame.payload)); s.resize(c, r) },
|
let mut sink = s.sink.lock().unwrap();
|
||||||
SIGNAL => if let Some(s) = existing { s.signal(signal_number(&frame.payload)) },
|
// Reattach transfers ownership. Late input/DETACH from the old viewer
|
||||||
CLOSE => if let Some(s) = existing { *s.sink.lock().unwrap() = None; s.signal(libc::SIGHUP); },
|
// must not affect the new attachment or inject a second copy of input.
|
||||||
DETACH => if let Some(s) = existing { *s.sink.lock().unwrap() = None },
|
if !sink.as_ref().is_some_and(|tx| tx.same_channel(&self.out)) { return; }
|
||||||
|
match frame.kind {
|
||||||
|
// PTY writes may block during a large paste. Keep output draining.
|
||||||
|
STDIN => { drop(sink); s.write(&frame.payload); }
|
||||||
|
RESIZE => { let (c, r) = dims(&json(&frame.payload)); s.resize(c, r); }
|
||||||
|
SIGNAL => s.signal_foreground(signal_number(&frame.payload)),
|
||||||
|
CLOSE | DETACH => {
|
||||||
|
*sink = None; s.touch();
|
||||||
|
if frame.kind == CLOSE { s.signal(libc::SIGHUP); }
|
||||||
|
notify_changes();
|
||||||
|
}
|
||||||
|
_ => unreachable!(),
|
||||||
|
}
|
||||||
|
},
|
||||||
KILL_REQ => {
|
KILL_REQ => {
|
||||||
let id = if frame.session != 0 { frame.session } else {
|
// Official Mac 4.42.0 handleKillSessionReq (0x100189ca0, 0x10018be64):
|
||||||
json(&frame.payload).get("session_id").and_then(|x| x.as_u64()).unwrap_or(0) as u32
|
// JSON session_id selects the target; the frame header correlates the reply.
|
||||||
|
let Some(id) = json(&frame.payload).get("session_id").and_then(|x| x.as_u64()).and_then(|id| u32::try_from(id).ok()) else {
|
||||||
|
self.send(KILL_RESP, frame.session, &reply(400, "Invalid payload")); return;
|
||||||
};
|
};
|
||||||
let target = registry().lock().unwrap().get(&id).cloned();
|
let target = registry().lock().unwrap().remove(&id);
|
||||||
match target {
|
match target {
|
||||||
Some(s) => { *s.sink.lock().unwrap() = None; s.signal(libc::SIGHUP); s.signal(libc::SIGKILL); self.send(KILL_RESP, id, &reply(0, "ok")); }
|
Some(s) => {
|
||||||
None => self.send(KILL_RESP, id, &reply(1, "Session not found")),
|
s.terminate();
|
||||||
|
self.send(KILL_RESP, frame.session, &reply(0, "ok"));
|
||||||
|
notify_changes();
|
||||||
|
log::info!("Terminal session terminated: id={} request={}", id, frame.session);
|
||||||
|
}
|
||||||
|
None => self.send(KILL_RESP, frame.session, &reply(404, "Session not found")),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
LIST_REQ => {
|
LIST_REQ => {
|
||||||
let sessions: Vec<serde_json::Value> = registry().lock().unwrap().values().map(|s| {
|
let sessions: Vec<serde_json::Value> = registry().lock().unwrap().values().map(|s| {
|
||||||
let attached = s.sink.lock().unwrap().is_some();
|
let attached = s.sink.lock().unwrap().as_ref().is_some_and(|tx| !tx.is_closed());
|
||||||
serde_json::json!({"session_id": s.id, "name": format!("bash-{}", s.id), "shell": s.shell,
|
let name = std::path::Path::new(&s.shell).file_name().and_then(|n| n.to_str()).unwrap_or("shell");
|
||||||
"state": if attached { "running" } else { "detached" }, "created_at_ms": s.created_ms})
|
// Official Mac 4.42.0 snapshot at 0x1001b82c8–0x1001b8524
|
||||||
|
// includes last_active_ms even when the session is detached.
|
||||||
|
serde_json::json!({"session_id": s.id, "name": format!("{}-{}", name, s.id), "shell": s.shell,
|
||||||
|
"state": if attached { "running" } else { "detached" }, "created_at_ms": s.created_ms,
|
||||||
|
"last_active_ms": s.last_active_ms.load(Ordering::Relaxed)})
|
||||||
}).collect();
|
}).collect();
|
||||||
log::info!("Terminal list sessions: count={}", sessions.len());
|
log::info!("Terminal list sessions: count={}", sessions.len());
|
||||||
// Official Mac 4.42.0 (handleListSessionsReq) sends a bare array with the request's header ID.
|
// Official Mac 4.42.0 (handleListSessionsReq) sends a bare array with the request's header ID.
|
||||||
@@ -323,9 +416,200 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
|
fn kill_uses_payload_id_preserves_request_id_and_updates_list_before_reply() {
|
||||||
|
let victim = spawn(u32::MAX - 5, 80, 24, Some("/bin/sh")).unwrap();
|
||||||
|
let decoy = spawn(u32::MAX - 6, 80, 24, Some("/bin/sh")).unwrap();
|
||||||
|
struct Cleanup(Vec<Arc<Session>>);
|
||||||
|
impl Drop for Cleanup {
|
||||||
|
fn drop(&mut self) { for s in &self.0 { s.signal(libc::SIGHUP); s.signal(libc::SIGKILL); } }
|
||||||
|
}
|
||||||
|
let _cleanup = Cleanup(vec![victim.clone(), decoy.clone()]);
|
||||||
|
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
let conn = TerminalConn::new(tx);
|
||||||
|
let payload = serde_json::json!({"session_id": victim.id}).to_string();
|
||||||
|
// A request ID may happen to equal another live session ID. Never kill it.
|
||||||
|
conn.handle(&encode(KILL_REQ, decoy.id, payload.as_bytes()));
|
||||||
|
let response = decode(&rx.try_recv().unwrap()).unwrap();
|
||||||
|
assert_eq!((response.kind, response.session), (KILL_RESP, decoy.id));
|
||||||
|
assert_eq!(json(&response.payload)["code"], 0);
|
||||||
|
conn.handle(&encode(LIST_REQ, 123, &[]));
|
||||||
|
let response = decode(&rx.try_recv().unwrap()).unwrap();
|
||||||
|
let list = json(&response.payload);
|
||||||
|
assert!(!list.as_array().unwrap().iter().any(|s| s["session_id"] == victim.id), "terminated session must be absent before acknowledgement");
|
||||||
|
assert!(list.as_array().unwrap().iter().any(|s| s["session_id"] == decoy.id), "request correlation must not select a session");
|
||||||
|
assert_eq!(unsafe { libc::kill(decoy.pid, 0) }, 0);
|
||||||
|
conn.handle(&encode(KILL_REQ, 123, payload.as_bytes()));
|
||||||
|
let response = decode(&rx.try_recv().unwrap()).unwrap();
|
||||||
|
assert_eq!(response.session, 123);
|
||||||
|
assert_eq!(json(&response.payload)["code"], 404);
|
||||||
|
for invalid in [b"{}".as_slice(), b"", br#"{"session_id":-1}"#, br#"{"session_id":4294967296}"#] {
|
||||||
|
conn.handle(&encode(KILL_REQ, decoy.id, invalid));
|
||||||
|
let response = decode(&rx.try_recv().unwrap()).unwrap();
|
||||||
|
assert_eq!(response.session, decoy.id);
|
||||||
|
assert_eq!(json(&response.payload)["code"], 400);
|
||||||
|
assert!(registry().lock().unwrap().contains_key(&decoy.id));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn session_changed_matches_official_empty_binary_notification() {
|
||||||
|
use crate::protocol::WireValue;
|
||||||
|
let message = changed_message(17, 1234);
|
||||||
|
let fields = crate::protocol::decode_wire(&message).unwrap();
|
||||||
|
assert_eq!(fields.iter().map(|f| f.number).collect::<Vec<_>>(), vec![1, 2, 28]);
|
||||||
|
assert_eq!(fields[2].value, WireValue::Bytes(&[]));
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
fn kill_ends_foreground_and_background_jobs() {
|
||||||
|
let session = spawn(u32::MAX - 8, 80, 24, Some("/bin/sh")).unwrap();
|
||||||
|
struct Cleanup(Arc<Session>);
|
||||||
|
impl Drop for Cleanup { fn drop(&mut self) { self.0.terminate(); } }
|
||||||
|
let _cleanup = Cleanup(session.clone());
|
||||||
|
session.write(b"sleep 30 & sleep 30\n");
|
||||||
|
let mut jobs = Vec::new();
|
||||||
|
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);
|
||||||
|
while std::time::Instant::now() < deadline {
|
||||||
|
jobs = std::fs::read_to_string(format!("/proc/{}/task/{}/children", session.pid, session.pid)).unwrap_or_default()
|
||||||
|
.split_whitespace().filter_map(|s| s.parse::<i32>().ok())
|
||||||
|
.filter(|pid| std::fs::read_to_string(format!("/proc/{pid}/comm")).is_ok_and(|s| s.trim() == "sleep")).collect();
|
||||||
|
if jobs.len() == 2 { break; }
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(10));
|
||||||
|
}
|
||||||
|
assert_eq!(jobs.len(), 2, "foreground and background jobs must be running");
|
||||||
|
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
TerminalConn::new(tx).handle(&encode(KILL_REQ, 123, serde_json::json!({"session_id":session.id}).to_string().as_bytes()));
|
||||||
|
assert_eq!(json(&decode(&rx.try_recv().unwrap()).unwrap().payload)["code"], 0);
|
||||||
|
jobs.push(session.pid);
|
||||||
|
let alive = |pid| std::fs::read_to_string(format!("/proc/{pid}/stat"))
|
||||||
|
.is_ok_and(|s| s.rsplit_once(") ").is_some_and(|(_, fields)| !fields.starts_with('Z')));
|
||||||
|
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);
|
||||||
|
while std::time::Instant::now() < deadline && jobs.iter().any(|pid| alive(*pid)) {
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(10));
|
||||||
|
}
|
||||||
|
assert!(!jobs.iter().any(|pid| alive(*pid)), "termination must end all job-control groups");
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn reattach_rejects_old_input_and_detach_but_preserves_intentional_repeats() {
|
||||||
|
let pty = nix::pty::openpty(None, None).unwrap();
|
||||||
|
let id = u32::MAX - 7;
|
||||||
|
let mut termios = nix::sys::termios::tcgetattr(&pty.slave).unwrap();
|
||||||
|
nix::sys::termios::cfmakeraw(&mut termios);
|
||||||
|
nix::sys::termios::tcsetattr(&pty.slave, nix::sys::termios::SetArg::TCSANOW, &termios).unwrap();
|
||||||
|
let session = Arc::new(Session { id, shell: "/bin/sh".into(), created_ms: now_ms(), last_active_ms: AtomicU64::new(now_ms()),
|
||||||
|
master: pty.master, pid: 0, sink: Mutex::new(None), scrollback: Mutex::new(VecDeque::new()), size: Mutex::new((80, 24)) });
|
||||||
|
registry().lock().unwrap().insert(id, session.clone());
|
||||||
|
struct Cleanup(Arc<Session>);
|
||||||
|
impl Drop for Cleanup { fn drop(&mut self) { remove_session(&self.0); } }
|
||||||
|
let _cleanup = Cleanup(session.clone());
|
||||||
|
let (old_tx, _old_rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
let old = TerminalConn::new(old_tx);
|
||||||
|
let (new_tx, _new_rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
let new = TerminalConn::new(new_tx);
|
||||||
|
old.handle(&encode(OPEN, id, b"{}"));
|
||||||
|
new.handle(&encode(OPEN, id, b"{}"));
|
||||||
|
old.handle(&encode(STDIN, id, b"stale"));
|
||||||
|
old.handle(&encode(DETACH, id, &[]));
|
||||||
|
old.disconnect();
|
||||||
|
let input = b"\x1b[A";
|
||||||
|
new.handle(&encode(STDIN, id, input));
|
||||||
|
new.handle(&encode(STDIN, id, input));
|
||||||
|
let mut slave = std::fs::File::from(pty.slave);
|
||||||
|
let mut bytes = [0; 6];
|
||||||
|
slave.read_exact(&mut bytes).unwrap();
|
||||||
|
assert!(bytes == input.repeat(2).as_slice(), "only current input should arrive, including intentional repeats");
|
||||||
|
assert!(session.sink.lock().unwrap().as_ref().is_some_and(|tx| tx.same_channel(&new.out)));
|
||||||
|
new.disconnect();
|
||||||
|
assert!(session.sink.lock().unwrap().is_none());
|
||||||
|
new.handle(&encode(OPEN, id, b"{}"));
|
||||||
|
assert!(session.sink.lock().unwrap().is_none(), "a closed connection must not reattach");
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn nonempty_list_matches_official_snapshot_and_survives_reattach() {
|
||||||
|
// Official Mac 4.42.0 TerminalSession snapshot (0x1001b82c8–0x1001b8524):
|
||||||
|
// all six fields exist, including the Int64 last_active_ms timestamp.
|
||||||
|
#[derive(serde::Deserialize)]
|
||||||
|
struct Snapshot { session_id: u32, name: String, shell: String, state: String,
|
||||||
|
created_at_ms: i64, last_active_ms: i64 }
|
||||||
|
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
let mut conn = TerminalConn::new(tx);
|
||||||
|
let id = u32::MAX - 3;
|
||||||
|
conn.handle(&encode(OPEN, id, br#"{"cols":80,"rows":24,"shell":"/bin/sh"}"#));
|
||||||
|
assert_eq!(decode(&rx.blocking_recv().unwrap()).unwrap().kind, OPEN_RESP);
|
||||||
|
struct Cleanup(u32);
|
||||||
|
impl Drop for Cleanup {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
if let Some(s) = registry().lock().unwrap().get(&self.0).cloned() { s.signal(libc::SIGHUP); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let _cleanup = Cleanup(id);
|
||||||
|
let snapshot = |request| {
|
||||||
|
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
TerminalConn::new(tx).handle(&encode(LIST_REQ, request, &[]));
|
||||||
|
let reply = decode(&rx.try_recv().unwrap()).unwrap();
|
||||||
|
assert_eq!((reply.kind, reply.session), (LIST_RESP, request));
|
||||||
|
serde_json::from_slice::<Vec<Snapshot>>(&reply.payload).expect("official nonempty session schema")
|
||||||
|
.into_iter().find(|s| s.session_id == id).unwrap()
|
||||||
|
};
|
||||||
|
let first = snapshot(100);
|
||||||
|
assert_eq!(first.state, "running");
|
||||||
|
assert_eq!(first.shell, "/bin/sh");
|
||||||
|
assert_eq!(first.name, format!("sh-{id}"));
|
||||||
|
assert!(first.created_at_ms > 0 && first.last_active_ms >= first.created_at_ms);
|
||||||
|
for request in [101, 102] {
|
||||||
|
conn.handle(&encode(DETACH, id, &[]));
|
||||||
|
let detached = snapshot(request);
|
||||||
|
assert_eq!(detached.state, "detached");
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(5));
|
||||||
|
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
conn = TerminalConn::new(tx);
|
||||||
|
conn.handle(&encode(OPEN, id, br#"{"cols":80,"rows":24}"#));
|
||||||
|
assert_eq!(decode(&rx.blocking_recv().unwrap()).unwrap().kind, OPEN_RESP);
|
||||||
|
let attached = snapshot(request + 100);
|
||||||
|
assert_eq!(attached.state, "running");
|
||||||
|
assert_eq!(attached.created_at_ms, first.created_at_ms);
|
||||||
|
assert!(attached.last_active_ms > detached.last_active_ms);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
fn interrupt_reaches_foreground_job_without_exiting_shell() {
|
||||||
|
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
|
||||||
|
let conn = TerminalConn::new(tx);
|
||||||
|
let id = u32::MAX - 4;
|
||||||
|
conn.handle(&encode(OPEN, id, br#"{"cols":80,"rows":24,"shell":"/bin/sh"}"#));
|
||||||
|
assert_eq!(decode(&rx.blocking_recv().unwrap()).unwrap().kind, OPEN_RESP);
|
||||||
|
let session = registry().lock().unwrap().get(&id).unwrap().clone();
|
||||||
|
struct Cleanup(Arc<Session>);
|
||||||
|
impl Drop for Cleanup {
|
||||||
|
fn drop(&mut self) { self.0.signal_foreground(libc::SIGKILL); self.0.signal(libc::SIGHUP); }
|
||||||
|
}
|
||||||
|
let _cleanup = Cleanup(session.clone());
|
||||||
|
let foreground = || unsafe { libc::tcgetpgrp(session.master.as_raw_fd()) };
|
||||||
|
// The shell can foreground its child before exec resets inherited signals.
|
||||||
|
let job_ready = || {
|
||||||
|
let pgid = foreground();
|
||||||
|
pgid > 0 && pgid != session.pid &&
|
||||||
|
std::fs::read_to_string(format!("/proc/{pgid}/comm")).is_ok_and(|name| name.trim() == "sleep")
|
||||||
|
};
|
||||||
|
conn.handle(&encode(STDIN, id, b"sleep 30\n"));
|
||||||
|
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);
|
||||||
|
while std::time::Instant::now() < deadline && !job_ready() {
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(10));
|
||||||
|
}
|
||||||
|
assert!(job_ready(), "job must be executing in a separate foreground group");
|
||||||
|
conn.handle(&encode(SIGNAL, id, br#"{"signal":"SIGINT"}"#));
|
||||||
|
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);
|
||||||
|
while std::time::Instant::now() < deadline && foreground() != session.pid {
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(10));
|
||||||
|
}
|
||||||
|
assert_eq!(foreground(), session.pid, "interrupt must return control to the shell");
|
||||||
|
assert_eq!(unsafe { libc::kill(session.pid, 0) }, 0, "shell must stay alive");
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
fn force_redraw_shrinks_then_restores_latest_size() {
|
fn force_redraw_shrinks_then_restores_latest_size() {
|
||||||
let pty = nix::pty::openpty(None, None).unwrap();
|
let pty = nix::pty::openpty(None, None).unwrap();
|
||||||
let session = Arc::new(Session { id: u32::MAX - 2, shell: "/bin/sh".into(), created_ms: now_ms(),
|
let session = Arc::new(Session { id: u32::MAX - 2, shell: "/bin/sh".into(), created_ms: now_ms(),
|
||||||
|
last_active_ms: AtomicU64::new(now_ms()),
|
||||||
master: pty.master, pid: 0, sink: Mutex::new(None),
|
master: pty.master, pid: 0, sink: Mutex::new(None),
|
||||||
scrollback: Mutex::new(VecDeque::new()), size: Mutex::new((80, 24)) });
|
scrollback: Mutex::new(VecDeque::new()), size: Mutex::new((80, 24)) });
|
||||||
let rows = |s: &Session| {
|
let rows = |s: &Session| {
|
||||||
@@ -346,6 +630,7 @@ mod tests {
|
|||||||
let id = u32::MAX - 1;
|
let id = u32::MAX - 1;
|
||||||
let history: Vec<u8> = (0..SCROLLBACK).map(|n| (n % 251) as u8).collect();
|
let history: Vec<u8> = (0..SCROLLBACK).map(|n| (n % 251) as u8).collect();
|
||||||
let session = Arc::new(Session { id, shell: "/bin/sh".into(), created_ms: now_ms(),
|
let session = Arc::new(Session { id, shell: "/bin/sh".into(), created_ms: now_ms(),
|
||||||
|
last_active_ms: AtomicU64::new(now_ms()),
|
||||||
master: pty.master, pid: 0, sink: Mutex::new(None),
|
master: pty.master, pid: 0, sink: Mutex::new(None),
|
||||||
scrollback: Mutex::new(history.iter().copied().collect()), size: Mutex::new((80, 24)) });
|
scrollback: Mutex::new(history.iter().copied().collect()), size: Mutex::new((80, 24)) });
|
||||||
registry().lock().unwrap().insert(id, session.clone());
|
registry().lock().unwrap().insert(id, session.clone());
|
||||||
|
|||||||
+45
-22
@@ -154,8 +154,25 @@ fn is_independent_frame_for(bytes: &[u8], codec: VideoCodec) -> bool {
|
|||||||
match codec {
|
match codec {
|
||||||
VideoCodec::H264 => !nal_offsets_for(bytes, 5, codec).is_empty() && nal_offsets_for(bytes, 1, codec).is_empty(),
|
VideoCodec::H264 => !nal_offsets_for(bytes, 5, codec).is_empty() && nal_offsets_for(bytes, 1, codec).is_empty(),
|
||||||
// BLA/IDR/CRA are IRAP (RFC 7798 §4.1); no leading pictures with our no-B-frame encoder.
|
// BLA/IDR/CRA are IRAP (RFC 7798 §4.1); no leading pictures with our no-B-frame encoder.
|
||||||
VideoCodec::H265 => (16..=21).any(|kind| !nal_offsets_for(bytes, kind, codec).is_empty())
|
VideoCodec::H265 => {
|
||||||
&& !(0..16).any(|kind| !nal_offsets_for(bytes, kind, codec).is_empty()),
|
let mut has_irap = false;
|
||||||
|
let mut has_non_irap_vcl = false;
|
||||||
|
let mut i = 0;
|
||||||
|
while i + 3 < bytes.len() {
|
||||||
|
let prefix = if bytes[i..].starts_with(&[0, 0, 0, 1]) { 4 }
|
||||||
|
else if bytes[i..].starts_with(&[0, 0, 1]) { 3 } else { i += 1; continue };
|
||||||
|
let header = i + prefix;
|
||||||
|
if let Some(kind) = hevc_nal_kind(bytes, header) {
|
||||||
|
if (16..=21).contains(&kind) {
|
||||||
|
has_irap = true;
|
||||||
|
} else if kind < 16 {
|
||||||
|
has_non_irap_vcl = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
i += prefix;
|
||||||
|
}
|
||||||
|
has_irap && !has_non_irap_vcl
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
@@ -169,7 +186,7 @@ struct CompleteFrame {
|
|||||||
codec: VideoCodec,
|
codec: VideoCodec,
|
||||||
sequence: u64,
|
sequence: u64,
|
||||||
completed_at: Instant,
|
completed_at: Instant,
|
||||||
data: Vec<u8>,
|
data: bytes::Bytes,
|
||||||
_permit: Option<OwnedSemaphorePermit>,
|
_permit: Option<OwnedSemaphorePermit>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -769,7 +786,7 @@ async fn read_inprocess(
|
|||||||
let mut gate = DependencyGate::default();
|
let mut gate = DependencyGate::default();
|
||||||
while let Some(unit) = units.recv().await {
|
while let Some(unit) = units.recv().await {
|
||||||
let sequence = sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed) + 1;
|
let sequence = sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed) + 1;
|
||||||
gate.submit(&latest, Arc::new(CompleteFrame { source_generation: source.1, source_id: source.0, codec, sequence, completed_at: unit.completed_at, data: unit.data, _permit: Some(unit.permit) }));
|
gate.submit(&latest, Arc::new(CompleteFrame { source_generation: source.1, source_id: source.0, codec, sequence, completed_at: unit.completed_at, data: unit.data.into(), _permit: Some(unit.permit) }));
|
||||||
if latest.is_closed() { break; }
|
if latest.is_closed() { break; }
|
||||||
}
|
}
|
||||||
// Dropping the receiver also unblocks the encoder if it is waiting to send.
|
// Dropping the receiver also unblocks the encoder if it is waiting to send.
|
||||||
@@ -778,11 +795,11 @@ async fn read_inprocess(
|
|||||||
job.await.map_err(|e| format!("Encoder task: {e}"))?
|
job.await.map_err(|e| format!("Encoder task: {e}"))?
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Rate-control arguments: constant quality capped at 30M (自动), or capped at the viewer's
|
/// VBV buffer in kbit. libx264 and NVENC need room for a whole IDR frame, otherwise large desktops get
|
||||||
/// chosen bitrate. The VBV buffer stays at most 500k so a cap never adds queueing latency.
|
/// keyframes quantized into a blur that sharpens over the GOP (#8 libx264, #103 NVENC). Half a second of
|
||||||
/// VBV buffer in kbit. NVENC ull and VAAPI keep the small low-latency buffer; libx264 needs room for a
|
/// bitrate still starved repeated 0.5 s-GOP keyframes at 3296x2036/2M; one second did not. The 8000 kbit
|
||||||
/// whole IDR frame, otherwise large desktops get near-grey keyframes that sharpen over the GOP (#8).
|
/// cap bounds the keyframe burst: 4K hevc_nvenc CQ18 IDRs measured 0.45 MB (desktop) to 0.76 MB (photo).
|
||||||
/// Half a second of bitrate still starved repeated 0.5 s-GOP keyframes at 3296x2036/2M; one second did not.
|
/// VAAPI keeps the small low-latency buffer unless UU_VAAPI_BUFFER_MS asks for more.
|
||||||
fn buffer_kbits(max_kbps: u32, encoder: Encoder) -> u32 {
|
fn buffer_kbits(max_kbps: u32, encoder: Encoder) -> u32 {
|
||||||
let env = match encoder {
|
let env = match encoder {
|
||||||
Encoder::Cpu => return max_kbps.clamp(500, 8000),
|
Encoder::Cpu => return max_kbps.clamp(500, 8000),
|
||||||
@@ -790,13 +807,14 @@ fn buffer_kbits(max_kbps: u32, encoder: Encoder) -> u32 {
|
|||||||
Encoder::Nvenc => "UU_NVENC_BUFFER_MS",
|
Encoder::Nvenc => "UU_NVENC_BUFFER_MS",
|
||||||
};
|
};
|
||||||
let requested = std::env::var(env).ok();
|
let requested = std::env::var(env).ok();
|
||||||
buffer_ms_kbits(max_kbps, requested.as_deref()).unwrap_or((max_kbps / 8).clamp(100, 500))
|
let default = if encoder == Encoder::Nvenc { max_kbps.clamp(500, 8000) } else { (max_kbps / 8).clamp(100, 500) };
|
||||||
|
buffer_ms_kbits(max_kbps, requested.as_deref()).unwrap_or(default)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Opt-in hardware VBV buffer: `码率上限 × 毫秒 / 1000` for `UU_VAAPI_BUFFER_MS` /
|
/// Hardware VBV buffer override: `码率上限 × 毫秒 / 1000` for `UU_VAAPI_BUFFER_MS` /
|
||||||
/// `UU_NVENC_BUFFER_MS` in 10-1000 ms. With the 100-500 kbit default the encoder quantizes a
|
/// `UU_NVENC_BUFFER_MS` in 10-1000 ms. With VAAPI's 100-500 kbit default the encoder quantizes a
|
||||||
/// whole desktop keyframe, which reads as a blur that sharpens over each GOP (#42 VAAPI, #103 NVENC).
|
/// whole desktop keyframe, which reads as a blur that sharpens over each GOP (#42); a small NVENC value
|
||||||
/// Unset, out of range or unparsable values keep the default buffer.
|
/// brings back the old low-latency buffer. Unset, out of range or unparsable values keep the default buffer.
|
||||||
fn buffer_ms_kbits(max_kbps: u32, value: Option<&str>) -> Option<u32> {
|
fn buffer_ms_kbits(max_kbps: u32, value: Option<&str>) -> Option<u32> {
|
||||||
let ms = value?.trim().parse::<u32>().ok().filter(|ms| (10..=1000).contains(ms))?;
|
let ms = value?.trim().parse::<u32>().ok().filter(|ms| (10..=1000).contains(ms))?;
|
||||||
Some((max_kbps.saturating_mul(ms) / 1000).max(1))
|
Some((max_kbps.saturating_mul(ms) / 1000).max(1))
|
||||||
@@ -808,6 +826,8 @@ fn buffer_for(settings: &VideoSettings, encoder: Encoder) -> u32 {
|
|||||||
} else { buffer_kbits(settings.max_kbps().unwrap_or(30_000), encoder) }
|
} else { buffer_kbits(settings.max_kbps().unwrap_or(30_000), encoder) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Rate-control arguments: constant quality capped at 30M (自动), or capped at the viewer's
|
||||||
|
/// chosen bitrate.
|
||||||
fn rate_args(settings: &VideoSettings, encoder: Encoder) -> (String, String) {
|
fn rate_args(settings: &VideoSettings, encoder: Encoder) -> (String, String) {
|
||||||
let max_kbps = settings.max_kbps().unwrap_or(30_000);
|
let max_kbps = settings.max_kbps().unwrap_or(30_000);
|
||||||
(format!("{max_kbps}k"), format!("{}k", buffer_for(settings, encoder)))
|
(format!("{max_kbps}k"), format!("{}k", buffer_for(settings, encoder)))
|
||||||
@@ -988,7 +1008,7 @@ async fn read_encoder_with(
|
|||||||
if aud.len() < 2 { break; }
|
if aud.len() < 2 { break; }
|
||||||
let next = aud[1];
|
let next = aud[1];
|
||||||
if next > MAX_ACCESS_UNIT { return Err("Encoder access unit exceeds limit".into()); }
|
if next > MAX_ACCESS_UNIT { return Err("Encoder access unit exceeds limit".into()); }
|
||||||
let frame: Vec<u8> = pending.drain(..next).collect();
|
let frame: bytes::Bytes = pending.drain(..next).collect::<Vec<u8>>().into();
|
||||||
let sequence = sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed) + 1;
|
let sequence = sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed) + 1;
|
||||||
let permit=if wayland {Some(permits_rx.recv().await.ok_or("Capture producer stopped")?)} else {None};
|
let permit=if wayland {Some(permits_rx.recv().await.ok_or("Capture producer stopped")?)} else {None};
|
||||||
gate.submit(&latest, Arc::new(CompleteFrame { source_generation: settings.source_generation, source_id: settings.source_id,
|
gate.submit(&latest, Arc::new(CompleteFrame { source_generation: settings.source_generation, source_id: settings.source_id,
|
||||||
@@ -1330,7 +1350,7 @@ pub async fn stream_desktop_at(pc: Arc<RTCPeerConnection>, track: Arc<crate::vid
|
|||||||
max_age_ms = max_age_ms.max(frame.completed_at.elapsed().as_millis());
|
max_age_ms = max_age_ms.max(frame.completed_at.elapsed().as_millis());
|
||||||
// Continue monitoring close even if the network send stalls.
|
// Continue monitoring close even if the network send stalls.
|
||||||
let sample = Sample {
|
let sample = Sample {
|
||||||
data: frame.data.clone().into(), duration, ..Default::default()
|
data: frame.data.clone(), duration, ..Default::default()
|
||||||
};
|
};
|
||||||
let extensions = [crate::rtp_metadata::capture_index(0), crate::rtp_metadata::new_frame()];
|
let extensions = [crate::rtp_metadata::capture_index(0), crate::rtp_metadata::new_frame()];
|
||||||
let sent_before=track.revision();
|
let sent_before=track.revision();
|
||||||
@@ -1480,7 +1500,7 @@ mod tests {
|
|||||||
for sequence in 1..=2 {
|
for sequence in 1..=2 {
|
||||||
let permit=budget.clone().acquire_owned().await.unwrap();
|
let permit=budget.clone().acquire_owned().await.unwrap();
|
||||||
gate.submit(&tx,Arc::new(CompleteFrame { source_generation: 0, source_id: 0,codec:VideoCodec::H264,sequence,completed_at:Instant::now(),
|
gate.submit(&tx,Arc::new(CompleteFrame { source_generation: 0, source_id: 0,codec:VideoCodec::H264,sequence,completed_at:Instant::now(),
|
||||||
data:vec![0,0,1,5,42],_permit:Some(permit)}));
|
data:vec![0,0,1,5,42].into(),_permit:Some(permit)}));
|
||||||
}
|
}
|
||||||
let sending=rx.recv().await.unwrap();
|
let sending=rx.recv().await.unwrap();
|
||||||
assert_eq!(budget.available_permits(),0);
|
assert_eq!(budget.available_permits(),0);
|
||||||
@@ -1596,7 +1616,10 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn x264_buffer_fits_keyframes() {
|
fn x264_buffer_fits_keyframes() {
|
||||||
assert_eq!(buffer_kbits(2000, Encoder::Nvenc), 250);
|
// NVENC follows libx264 (#103): one second of the cap within 500-8000 kbit.
|
||||||
|
assert_eq!(buffer_kbits(2000, Encoder::Nvenc), 2000);
|
||||||
|
assert_eq!(buffer_kbits(300, Encoder::Nvenc), 500);
|
||||||
|
assert_eq!(buffer_kbits(30_000, Encoder::Nvenc), 8000);
|
||||||
assert_eq!(buffer_kbits(2000, Encoder::Vaapi), 250);
|
assert_eq!(buffer_kbits(2000, Encoder::Vaapi), 250);
|
||||||
assert_eq!(buffer_kbits(2000, Encoder::Cpu), 2000);
|
assert_eq!(buffer_kbits(2000, Encoder::Cpu), 2000);
|
||||||
assert_eq!(buffer_kbits(300, Encoder::Cpu), 500);
|
assert_eq!(buffer_kbits(300, Encoder::Cpu), 500);
|
||||||
@@ -1642,7 +1665,7 @@ mod tests {
|
|||||||
let (started_tx, started_rx) = tokio::sync::oneshot::channel();
|
let (started_tx, started_rx) = tokio::sync::oneshot::channel();
|
||||||
let frame = |sequence, idr| Arc::new(CompleteFrame { source_generation: 0, source_id: 0, _permit: None,
|
let frame = |sequence, idr| Arc::new(CompleteFrame { source_generation: 0, source_id: 0, _permit: None,
|
||||||
sequence, codec: VideoCodec::H264, completed_at: Instant::now(),
|
sequence, codec: VideoCodec::H264, completed_at: Instant::now(),
|
||||||
data: vec![0, 0, 1, 9, 240, 0, 0, 1, if idr { 5 } else { 1 }, 42],
|
data: vec![0, 0, 1, 9, 240, 0, 0, 1, if idr { 5 } else { 1 }, 42].into(),
|
||||||
});
|
});
|
||||||
let mut reader = EncoderTask(tokio::spawn(async move {
|
let mut reader = EncoderTask(tokio::spawn(async move {
|
||||||
let _stopped = MarkStopped(old_stopped);
|
let _stopped = MarkStopped(old_stopped);
|
||||||
@@ -1735,7 +1758,7 @@ mod tests {
|
|||||||
async fn bounded_queue_never_sends_broken_prediction_chain_after_overload(){
|
async fn bounded_queue_never_sends_broken_prediction_chain_after_overload(){
|
||||||
let(tx,mut rx)=mpsc::channel(1);
|
let(tx,mut rx)=mpsc::channel(1);
|
||||||
let mut gate=DependencyGate::default();
|
let mut gate=DependencyGate::default();
|
||||||
let frame=|sequence,idr|Arc::new(CompleteFrame{source_generation:0,source_id:0,_permit:None,sequence,codec:VideoCodec::H264,completed_at:Instant::now(),data:vec![0,0,1,9,240,0,0,1,if idr{5}else{1},42]});
|
let frame=|sequence,idr|Arc::new(CompleteFrame{source_generation:0,source_id:0,_permit:None,sequence,codec:VideoCodec::H264,completed_at:Instant::now(),data:vec![0,0,1,9,240,0,0,1,if idr{5}else{1},42].into()});
|
||||||
gate.submit(&tx,frame(1,false));assert!(rx.try_recv().is_err()); // no IDR yet
|
gate.submit(&tx,frame(1,false));assert!(rx.try_recv().is_err()); // no IDR yet
|
||||||
gate.submit(&tx,frame(2,true));
|
gate.submit(&tx,frame(2,true));
|
||||||
gate.submit(&tx,frame(3,false)); // queue full: P3 lost
|
gate.submit(&tx,frame(3,false)); // queue full: P3 lost
|
||||||
@@ -1808,7 +1831,7 @@ mod tests {
|
|||||||
let (tx, mut rx) = mpsc::channel(1);
|
let (tx, mut rx) = mpsc::channel(1);
|
||||||
let mut gate = DependencyGate::default();
|
let mut gate = DependencyGate::default();
|
||||||
let frame = |sequence, irap| Arc::new(CompleteFrame { source_generation: 0, source_id: 0, _permit: None, codec: VideoCodec::H265,
|
let frame = |sequence, irap| Arc::new(CompleteFrame { source_generation: 0, source_id: 0, _permit: None, codec: VideoCodec::H265,
|
||||||
sequence, completed_at: Instant::now(), data: vec![0,0,1,if irap { 38 } else { 2 },1,42] });
|
sequence, completed_at: Instant::now(), data: vec![0,0,1,if irap { 38 } else { 2 },1,42].into() });
|
||||||
gate.submit(&tx, frame(1, false));
|
gate.submit(&tx, frame(1, false));
|
||||||
assert!(rx.try_recv().is_err());
|
assert!(rx.try_recv().is_err());
|
||||||
gate.submit(&tx, frame(2, true));
|
gate.submit(&tx, frame(2, true));
|
||||||
@@ -1855,7 +1878,7 @@ mod screen_frame_tests {
|
|||||||
use super::*;
|
use super::*;
|
||||||
#[test]
|
#[test]
|
||||||
fn source_restart_rejects_queued_frames_even_with_same_screen_and_codec() {
|
fn source_restart_rejects_queued_frames_even_with_same_screen_and_codec() {
|
||||||
let frame=CompleteFrame {source_id:0,source_generation:7,codec:VideoCodec::H264,sequence:1,completed_at:Instant::now(),data:vec![],_permit:None};
|
let frame=CompleteFrame {source_id:0,source_generation:7,codec:VideoCodec::H264,sequence:1,completed_at:Instant::now(),data:vec![].into(),_permit:None};
|
||||||
let mut settings=VideoSettings {source_id:0,source_generation:7,..Default::default()};
|
let mut settings=VideoSettings {source_id:0,source_generation:7,..Default::default()};
|
||||||
assert!(frame.matches(&settings));
|
assert!(frame.matches(&settings));
|
||||||
settings.source_generation=9;assert!(!frame.matches(&settings));
|
settings.source_generation=9;assert!(!frame.matches(&settings));
|
||||||
|
|||||||
+1
-1
@@ -57,7 +57,7 @@ impl VideoTrack {
|
|||||||
// Leave room for the RTP header and negotiated UU extensions below the 1200 byte MTU.
|
// Leave room for the RTP header and negotiated UU extensions below the 1200 byte MTU.
|
||||||
let payloads = match codec {
|
let payloads = match codec {
|
||||||
VideoCodec::H264 => state.h264.payload(1160, &sample.data).map_err(Error::Rtp)?,
|
VideoCodec::H264 => state.h264.payload(1160, &sample.data).map_err(Error::Rtp)?,
|
||||||
VideoCodec::H265 => crate::hevc::payload(1160, &sample.data).map_err(Error::new)?,
|
VideoCodec::H265 => crate::hevc::payload_bytes(1160, &sample.data).map_err(Error::new)?,
|
||||||
};
|
};
|
||||||
let count = payloads.len();
|
let count = payloads.len();
|
||||||
let mut complete = count > 0;
|
let mut complete = count > 0;
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ pub(super) async fn encode(latest: mpsc::Sender<Arc<CompleteFrame>>, settings: V
|
|||||||
let frame = Arc::new(CompleteFrame {
|
let frame = Arc::new(CompleteFrame {
|
||||||
source_generation: settings.source_generation, source_id: settings.source_id,
|
source_generation: settings.source_generation, source_id: settings.source_id,
|
||||||
codec: settings.codec, sequence: sequence.fetch_add(1, Ordering::Relaxed) + 1,
|
codec: settings.codec, sequence: sequence.fetch_add(1, Ordering::Relaxed) + 1,
|
||||||
completed_at: Instant::now(), data: vec![0, 0, 1, 65, 1, 2], _permit: Some(permit),
|
completed_at: Instant::now(), data: vec![0, 0, 1, 65, 1, 2].into(), _permit: Some(permit),
|
||||||
});
|
});
|
||||||
if latest.send(frame).await.is_err() { return Ok(()); }
|
if latest.send(frame).await.is_err() { return Ok(()); }
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -261,7 +261,7 @@ fn portal_outputs()->Vec<Output> {
|
|||||||
let mut outputs:Vec<Output>=monitors.iter().map(|m|Output {name:m.connector.clone(),width:m.width,height:m.height,fps,x:m.x,y:m.y}).collect();
|
let mut outputs:Vec<Output>=monitors.iter().map(|m|Output {name:m.connector.clone(),width:m.width,height:m.height,fps,x:m.x,y:m.y}).collect();
|
||||||
// Screen 0 is the one opened first: the monitor whose consent is already saved, else the primary.
|
// Screen 0 is the one opened first: the monitor whose consent is already saved, else the primary.
|
||||||
let dir=crate::portal::permissions_directory();
|
let dir=crate::portal::permissions_directory();
|
||||||
let granted=|name:&str|dir.as_deref().is_some_and(|d|d.join(crate::portal::monitor_key(name)).exists());
|
let granted=|name:&str|dir.as_deref().is_some_and(|d|crate::portal::permission_exists(d,&crate::portal::monitor_key(name)));
|
||||||
let primary=monitors.iter().find(|m|m.primary).map(|m|m.connector.clone()).unwrap_or_default();
|
let primary=monitors.iter().find(|m|m.primary).map(|m|m.connector.clone()).unwrap_or_default();
|
||||||
outputs.sort_by_key(|o|(!granted(&o.name),o.name!=primary,o.x,o.y));
|
outputs.sort_by_key(|o|(!granted(&o.name),o.name!=primary,o.x,o.y));
|
||||||
outputs.truncate(16);
|
outputs.truncate(16);
|
||||||
|
|||||||
+126
-73
@@ -140,6 +140,8 @@ fn track_session(end_pc: Arc<RTCPeerConnection>, actions: Arc<crate::system_acti
|
|||||||
let closed = matches!(end_pc.connection_state(), State::Closed | State::Failed);
|
let closed = matches!(end_pc.connection_state(), State::Closed | State::Failed);
|
||||||
let ending = actions.clone();
|
let ending = actions.clone();
|
||||||
let _ = tokio::task::spawn_blocking(move || ending.session_ended()).await;
|
let _ = tokio::task::spawn_blocking(move || ending.session_ended()).await;
|
||||||
|
// Strokes belong to the viewer that drew them: never leave them on the host screen.
|
||||||
|
crate::annotation::reset(crate::annotation::owner(&actions));
|
||||||
if closed { return; }
|
if closed { return; }
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -602,14 +604,33 @@ impl WebRtcSession {
|
|||||||
let out_channel = d.clone();
|
let out_channel = d.clone();
|
||||||
let out_label = label.clone();
|
let out_label = label.clone();
|
||||||
let outbound_rx = outbound_rx.clone();
|
let outbound_rx = outbound_rx.clone();
|
||||||
|
let change_sequence = out_sequence.clone();
|
||||||
|
let terminal_changes = crate::terminal::subscribe_changes();
|
||||||
let start_drain = move || {
|
let start_drain = move || {
|
||||||
let out_channel = out_channel.clone();
|
let out_channel = out_channel.clone();
|
||||||
let out_label = out_label.clone();
|
let out_label = out_label.clone();
|
||||||
let outbound_rx = outbound_rx.clone();
|
let outbound_rx = outbound_rx.clone();
|
||||||
|
let change_sequence = change_sequence.clone();
|
||||||
|
let mut terminal_changes = terminal_changes.clone();
|
||||||
Box::pin(async move {
|
Box::pin(async move {
|
||||||
let Some(mut outbound_rx) = take_outbound_once(&outbound_rx).await else { return; };
|
let Some(mut outbound_rx) = take_outbound_once(&outbound_rx).await else { return; };
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
while let Some(message) = outbound_rx.recv().await {
|
let mut health = tokio::time::interval(std::time::Duration::from_millis(200));
|
||||||
|
loop {
|
||||||
|
let message = tokio::select! {
|
||||||
|
message = outbound_rx.recv() => match message { Some(message) => message, None => break },
|
||||||
|
changed = terminal_changes.changed(), if out_label == "BINARY_DATA_CHANNEL" => {
|
||||||
|
if changed.is_err() { break; }
|
||||||
|
if out_channel.ready_state() != webrtc::data_channel::data_channel_state::RTCDataChannelState::Open { continue; }
|
||||||
|
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||||
|
crate::terminal::changed_message(change_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts)
|
||||||
|
},
|
||||||
|
_ = health.tick(), if out_label == "BINARY_DATA_CHANNEL" => {
|
||||||
|
use webrtc::data_channel::data_channel_state::RTCDataChannelState;
|
||||||
|
if matches!(out_channel.ready_state(), RTCDataChannelState::Closing | RTCDataChannelState::Closed) { break; }
|
||||||
|
continue;
|
||||||
|
},
|
||||||
|
};
|
||||||
if let Err(e) = out_channel.send(&bytes::Bytes::from(message)).await {
|
if let Err(e) = out_channel.send(&bytes::Bytes::from(message)).await {
|
||||||
log::warn!("{} send failed: {}", out_label, e); break;
|
log::warn!("{} send failed: {}", out_label, e); break;
|
||||||
}
|
}
|
||||||
@@ -794,6 +815,13 @@ impl WebRtcSession {
|
|||||||
(Outbound::Other(tx), "BINARY_DATA_CHANNEL") => Some(Arc::new(crate::terminal::TerminalConn::new(tx.clone()))),
|
(Outbound::Other(tx), "BINARY_DATA_CHANNEL") => Some(Arc::new(crate::terminal::TerminalConn::new(tx.clone()))),
|
||||||
_ => None,
|
_ => None,
|
||||||
};
|
};
|
||||||
|
if let Some(terminal) = &terminal_conn {
|
||||||
|
let closing = terminal.clone();
|
||||||
|
d.on_close(Box::new(move || {
|
||||||
|
let closing = closing.clone();
|
||||||
|
Box::pin(async move { closing.disconnect(); })
|
||||||
|
}));
|
||||||
|
}
|
||||||
if label == "CONTROL_DATA_CHANNEL" || label == "TEXT_DATA_CHANNEL" {
|
if label == "CONTROL_DATA_CHANNEL" || label == "TEXT_DATA_CHANNEL" {
|
||||||
let channel = d.clone();
|
let channel = d.clone();
|
||||||
let initial_sequence = out_sequence.clone();
|
let initial_sequence = out_sequence.clone();
|
||||||
@@ -1175,7 +1203,8 @@ impl WebRtcSession {
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if let Ok(fields) = crate::protocol::decode_wire(&msg.data) {
|
let proto_fields = crate::protocol::decode_wire(&msg.data).ok();
|
||||||
|
if let Some(fields) = proto_fields.as_deref() {
|
||||||
use crate::protocol::WireValue;
|
use crate::protocol::WireValue;
|
||||||
let rpc = fields.iter().find_map(|f| match (f.number, &f.value) { (21, WireValue::Bytes(b)) => Some(*b), _ => None });
|
let rpc = fields.iter().find_map(|f| match (f.number, &f.value) { (21, WireValue::Bytes(b)) => Some(*b), _ => None });
|
||||||
let rpc_fields = rpc.and_then(|r| crate::protocol::decode_wire(r).ok());
|
let rpc_fields = rpc.and_then(|r| crate::protocol::decode_wire(r).ok());
|
||||||
@@ -1205,23 +1234,33 @@ impl WebRtcSession {
|
|||||||
let _ = text_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
let _ = text_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if let Some((header, body)) = rpc_fields.as_deref().and_then(crate::annotation::draw_request) {
|
||||||
|
// A toggle waits for the X overlay to open: keep it off the async workers.
|
||||||
|
let owner = crate::annotation::owner(&actions);
|
||||||
|
let Ok(response) = tokio::task::spawn_blocking(move || crate::annotation::respond(owner, &header, &body)).await else { return };
|
||||||
|
// draw_req arrives on CONTROL, but a CONTROL reply timed out (9998) on Mac 4.42.0:
|
||||||
|
// answer on TEXT like the privacy RPCs above.
|
||||||
|
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||||
|
let _ = text_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
||||||
|
return;
|
||||||
|
}
|
||||||
if let Some(response) = rpc_fields.as_deref().and_then(|r| crate::system_actions::plugin_response(r).or_else(|| crate::system_actions::session_rpc_response(r))) {
|
if let Some(response) = rpc_fields.as_deref().and_then(|r| crate::system_actions::plugin_response(r).or_else(|| crate::system_actions::session_rpc_response(r))) {
|
||||||
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||||
let _ = rpc_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
let _ = rpc_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if let Some(response) = rpc.and_then(|r| crate::protocol::decode_wire(r).ok()).and_then(|r| crate::terminal::rpc_response(&r)) {
|
if let Some(response) = rpc_fields.as_deref().and_then(crate::terminal::rpc_response) {
|
||||||
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||||
let _ = rpc_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
let _ = rpc_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let Ok(fields) = crate::protocol::decode_wire(&msg.data) {
|
if let Some(fields) = proto_fields.as_deref() {
|
||||||
if mapping.handle(&fields, &channel_name) { return; }
|
if mapping.handle(fields, &channel_name) { return; }
|
||||||
}
|
}
|
||||||
if let Some(files) = &file_worker {
|
if let Some(files) = &file_worker {
|
||||||
if let Ok(fields) = crate::protocol::decode_wire(&msg.data) {
|
if let Some(fields) = proto_fields.as_deref() {
|
||||||
if files.handle(&fields) {
|
if files.handle(fields) {
|
||||||
static ROUTE: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
|
static ROUTE: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
|
||||||
if ROUTE.fetch_add(1, std::sync::atomic::Ordering::Relaxed) < 20 {
|
if ROUTE.fetch_add(1, std::sync::atomic::Ordering::Relaxed) < 20 {
|
||||||
log::info!("File transfer RPC received on {}", channel_name);
|
log::info!("File transfer RPC received on {}", channel_name);
|
||||||
@@ -1247,16 +1286,16 @@ impl WebRtcSession {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
shape(&value,0).to_string()
|
shape(&value,0).to_string()
|
||||||
} else if let Ok(fields) = crate::protocol::decode_wire(&msg.data) {
|
} else if let Some(fields) = proto_fields.as_deref() {
|
||||||
format!("protobuf fields={:?}",fields.iter().map(|f|f.number).collect::<Vec<_>>())
|
format!("protobuf fields={:?}",fields.iter().map(|f|f.number).collect::<Vec<_>>())
|
||||||
} else { "opaque".to_string() };
|
} else { "opaque".to_string() };
|
||||||
log::info!("Clipboard channel schema: channel={} bytes={} schema={}",channel_name,msg.data.len(),shape);
|
log::info!("Clipboard channel schema: channel={} bytes={} schema={}",channel_name,msg.data.len(),shape);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if channel_name == "CONTROL_DATA_CHANNEL" || channel_name == "TEXT_DATA_CHANNEL" {
|
if channel_name == "CONTROL_DATA_CHANNEL" || channel_name == "TEXT_DATA_CHANNEL" {
|
||||||
if let Ok(fields) = crate::protocol::decode_wire(&msg.data) {
|
if let Some(fields) = proto_fields.as_deref() {
|
||||||
use crate::protocol::WireValue;
|
use crate::protocol::WireValue;
|
||||||
for field in &fields {
|
for field in fields {
|
||||||
if let (22,WireValue::Bytes(payload))=(field.number,&field.value) {
|
if let (22,WireValue::Bytes(payload))=(field.number,&field.value) {
|
||||||
let update=rich_incoming.lock().unwrap().response(payload);
|
let update=rich_incoming.lock().unwrap().response(payload);
|
||||||
match update {
|
match update {
|
||||||
@@ -1273,8 +1312,6 @@ impl WebRtcSession {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
for field in &fields {
|
|
||||||
if let (21, WireValue::Bytes(payload)) = (field.number,&field.value) {
|
if let (21, WireValue::Bytes(payload)) = (field.number,&field.value) {
|
||||||
let ids=crate::clipboard_rich::format_ids(payload);
|
let ids=crate::clipboard_rich::format_ids(payload);
|
||||||
if !ids.is_empty(){log::info!("Clipboard offered format IDs: {:?}",ids);}
|
if !ids.is_empty(){log::info!("Clipboard offered format IDs: {:?}",ids);}
|
||||||
@@ -1312,8 +1349,6 @@ impl WebRtcSession {
|
|||||||
Err(reason)=>log::warn!("Clipboard RPC rejected: {}",reason),
|
Err(reason)=>log::warn!("Clipboard RPC rejected: {}",reason),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
for field in &fields {
|
|
||||||
if let (17, WireValue::Bytes(payload)) = (field.number, &field.value) {
|
if let (17, WireValue::Bytes(payload)) = (field.number, &field.value) {
|
||||||
match clipboard_assembly.lock().unwrap().accept(payload) {
|
match clipboard_assembly.lock().unwrap().accept(payload) {
|
||||||
Ok(Some(text)) => {
|
Ok(Some(text)) => {
|
||||||
@@ -1440,69 +1475,87 @@ impl WebRtcSession {
|
|||||||
}
|
}
|
||||||
if let Ok(txt) = std::str::from_utf8(&msg.data) {
|
if let Ok(txt) = std::str::from_utf8(&msg.data) {
|
||||||
log::debug!("DataChannel [{}] received UTF-8 data: {} bytes", channel_name, txt.len());
|
log::debug!("DataChannel [{}] received UTF-8 data: {} bytes", channel_name, txt.len());
|
||||||
if let Ok(val) = serde_json::from_str::<serde_json::Value>(txt) {
|
if channel_name.contains("CONTROL") {
|
||||||
if !channel_name.contains("CONTROL") {
|
match crate::control_protocol::decode_control(&msg.data) {
|
||||||
// Input JSON on another channel (mobile input-method text was missing from CONTROL, #13/#46):
|
Ok(crate::control_protocol::ControlMessage::Input(event)) => {
|
||||||
// record action names only, once per name, and accept text_input wherever it arrives.
|
// A ready compositor source remains controllable on its lock screen.
|
||||||
if let Some(action) = val.get("action").and_then(serde_json::Value::as_str) {
|
if screen.backend == crate::desktop_backend::DesktopBackend::Portal
|
||||||
static SEEN: std::sync::Mutex<Vec<String>> = std::sync::Mutex::new(Vec::new());
|
&& (screen.init_error.is_some() || !desktop_ready) { return; }
|
||||||
let mut seen = SEEN.lock().unwrap();
|
if !crate::wayland::input_ready() {return;}
|
||||||
if seen.len() < 32 && action.len() <= 40 && action.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'_') && !seen.iter().any(|s| s == action) {
|
use crate::control_protocol::ControlInput;
|
||||||
seen.push(action.to_owned());
|
// Separate receipt budgets keep motion floods from hiding clicks.
|
||||||
log::info!("JSON action on {} channel: action={}", if channel_name.contains("STREAMER") {"STREAMER"} else if channel_name.contains("TEXT") {"TEXT"} else {"other"}, action);
|
static RECEIPTS: [std::sync::atomic::AtomicUsize; 3] = [const { std::sync::atomic::AtomicUsize::new(0) }; 3];
|
||||||
|
let (slot, kind) = match &event {
|
||||||
|
ControlInput::MouseButton {..} | ControlInput::MouseClick {..} => (0, "button"),
|
||||||
|
ControlInput::Keyboard {..} | ControlInput::KeyboardClick {..} | ControlInput::TextInput {..} => (1, "keyboard"),
|
||||||
|
_ => (2, "motion"),
|
||||||
|
};
|
||||||
|
if RECEIPTS[slot].fetch_add(1, std::sync::atomic::Ordering::Relaxed) < 16 {
|
||||||
|
log::info!("CONTROL input received: kind={}", kind);
|
||||||
}
|
}
|
||||||
}
|
if let Some(session)=message_input_session.as_ref() {
|
||||||
if let Ok(crate::control_protocol::ControlMessage::Input(crate::control_protocol::ControlInput::TextInput {text})) = crate::control_protocol::decode_control(&msg.data) {
|
if matches!(&event, ControlInput::TextInput {..}) {
|
||||||
if let Some(session)=message_input_session.as_ref() { session.with_input(|| {if crate::wayland::input_ready() {input_worker.text_input(&text);}}); }
|
let (session, input, text) = match &event {
|
||||||
|
ControlInput::TextInput {text} => (session.clone(), input_worker.clone(), text.clone()),
|
||||||
|
_ => unreachable!(),
|
||||||
|
};
|
||||||
|
let _ = tokio::task::spawn_blocking(move || {
|
||||||
|
session.with_input(|| {
|
||||||
|
if crate::wayland::input_ready() { input.text_input(&text); }
|
||||||
|
});
|
||||||
|
}).await;
|
||||||
|
} else {
|
||||||
|
session.with_input(|| {
|
||||||
|
if !crate::wayland::input_ready() {return;}
|
||||||
|
match &event {
|
||||||
|
ControlInput::MouseAbsolute {x,y} => input_worker.mouse_absolute_normalized(*x,*y,crate::wayland::input_size(if live_x11 {crate::capture::x11_last_size().unwrap_or(input_size)} else {input_size})),
|
||||||
|
ControlInput::MouseRelative {dx,dy} => input_worker.mouse_relative(*dx,*dy),
|
||||||
|
ControlInput::MouseScroll {dx,dy} => input_worker.mouse_scroll(*dx,*dy),
|
||||||
|
ControlInput::Keyboard {key, pressed} => input_worker.windows_key_event(*key, *pressed),
|
||||||
|
ControlInput::KeyboardClick {key} => {input_worker.windows_key_event(*key, true);input_worker.windows_key_event(*key, false);},
|
||||||
|
ControlInput::MouseButton {button,pressed} => input_worker.wire_mouse_button(*button,*pressed),
|
||||||
|
ControlInput::MouseClick {button} => {input_worker.wire_mouse_button(*button,true);input_worker.wire_mouse_button(*button,false);},
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
|
Ok(crate::control_protocol::ControlMessage::Unsupported(v)) => {
|
||||||
|
// Action name and key names only, never values (an IME text event would carry typed text).
|
||||||
|
static UNSUPPORTED: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
|
||||||
|
if UNSUPPORTED.fetch_add(1, std::sync::atomic::Ordering::Relaxed) < 16 {
|
||||||
|
let action = v.get("action").and_then(serde_json::Value::as_str)
|
||||||
|
.filter(|a| a.len() <= 40 && a.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'_')).unwrap_or("?");
|
||||||
|
let keys: Vec<&str> = v.as_object().map(|o| o.keys().map(String::as_str).take(12).collect()).unwrap_or_default();
|
||||||
|
log::info!("Unsupported CONTROL input: action={action} keys={keys:?}");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
} else if let Ok(val) = serde_json::from_str::<serde_json::Value>(txt) {
|
||||||
|
// Input JSON on another channel (mobile input-method text was missing from CONTROL, #13/#46):
|
||||||
|
// record action names only, once per name, and accept text_input wherever it arrives.
|
||||||
|
if let Some(action) = val.get("action").and_then(serde_json::Value::as_str) {
|
||||||
|
static SEEN: std::sync::Mutex<Vec<String>> = std::sync::Mutex::new(Vec::new());
|
||||||
|
let mut seen = SEEN.lock().unwrap();
|
||||||
|
if seen.len() < 32 && action.len() <= 40 && action.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'_') && !seen.iter().any(|s| s == action) {
|
||||||
|
seen.push(action.to_owned());
|
||||||
|
log::info!("JSON action on {} channel: action={}", if channel_name.contains("STREAMER") {"STREAMER"} else if channel_name.contains("TEXT") {"TEXT"} else {"other"}, action);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if channel_name.contains("CONTROL") {
|
if let Ok(crate::control_protocol::ControlMessage::Input(crate::control_protocol::ControlInput::TextInput {text})) = crate::control_protocol::decode_control(&msg.data) {
|
||||||
match crate::control_protocol::decode_control(&msg.data) {
|
if let Some(session)=message_input_session.as_ref() {
|
||||||
Ok(crate::control_protocol::ControlMessage::Input(event)) => {
|
let (session, input) = (session.clone(), input_worker.clone());
|
||||||
// A ready compositor source remains controllable on its lock screen.
|
let _ = tokio::task::spawn_blocking(move || {
|
||||||
if screen.backend == crate::desktop_backend::DesktopBackend::Portal
|
session.with_input(|| {
|
||||||
&& (screen.init_error.is_some() || !desktop_ready) { return; }
|
if crate::wayland::input_ready() { input.text_input(&text); }
|
||||||
if !crate::wayland::input_ready() {return;}
|
});
|
||||||
use crate::control_protocol::ControlInput;
|
}).await;
|
||||||
// Separate receipt budgets keep motion floods from hiding clicks.
|
|
||||||
static RECEIPTS: [std::sync::atomic::AtomicUsize; 3] = [const { std::sync::atomic::AtomicUsize::new(0) }; 3];
|
|
||||||
let (slot, kind) = match &event {
|
|
||||||
ControlInput::MouseButton {..} | ControlInput::MouseClick {..} => (0, "button"),
|
|
||||||
ControlInput::Keyboard {..} | ControlInput::KeyboardClick {..} | ControlInput::TextInput {..} => (1, "keyboard"),
|
|
||||||
_ => (2, "motion"),
|
|
||||||
};
|
|
||||||
if RECEIPTS[slot].fetch_add(1, std::sync::atomic::Ordering::Relaxed) < 16 {
|
|
||||||
log::info!("CONTROL input received: kind={}", kind);
|
|
||||||
}
|
|
||||||
if let Some(session)=message_input_session.as_ref() {session.with_input(|| {
|
|
||||||
if !crate::wayland::input_ready() {return;}
|
|
||||||
match &event {
|
|
||||||
ControlInput::MouseAbsolute {x,y} => input_worker.mouse_absolute_normalized(*x,*y,crate::wayland::input_size(if live_x11 {crate::capture::x11_last_size().unwrap_or(input_size)} else {input_size})),
|
|
||||||
ControlInput::MouseRelative {dx,dy} => input_worker.mouse_relative(*dx,*dy),
|
|
||||||
ControlInput::MouseScroll {dx,dy} => input_worker.mouse_scroll(*dx,*dy),
|
|
||||||
ControlInput::Keyboard {key, pressed} => input_worker.windows_key_event(*key, *pressed),
|
|
||||||
ControlInput::TextInput {text} => input_worker.text_input(text),
|
|
||||||
ControlInput::KeyboardClick {key} => {input_worker.windows_key_event(*key, true);input_worker.windows_key_event(*key, false);},
|
|
||||||
ControlInput::MouseButton {button,pressed} => input_worker.wire_mouse_button(*button,*pressed),
|
|
||||||
ControlInput::MouseClick {button} => {input_worker.wire_mouse_button(*button,true);input_worker.wire_mouse_button(*button,false);},
|
|
||||||
_ => {}
|
|
||||||
}
|
|
||||||
});}
|
|
||||||
|
|
||||||
},
|
|
||||||
Ok(crate::control_protocol::ControlMessage::Unsupported(v)) => {
|
|
||||||
// Action name and key names only, never values (an IME text event would carry typed text).
|
|
||||||
static UNSUPPORTED: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
|
|
||||||
if UNSUPPORTED.fetch_add(1, std::sync::atomic::Ordering::Relaxed) < 16 {
|
|
||||||
let action = v.get("action").and_then(serde_json::Value::as_str)
|
|
||||||
.filter(|a| a.len() <= 40 && a.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'_')).unwrap_or("?");
|
|
||||||
let keys: Vec<&str> = v.as_object().map(|o| o.keys().map(String::as_str).take(12).collect()).unwrap_or_default();
|
|
||||||
log::info!("Unsupported CONTROL input: action={action} keys={keys:?}");
|
|
||||||
}
|
|
||||||
},
|
|
||||||
_ => {}
|
|
||||||
}
|
}
|
||||||
} else if channel_name.contains("STREAMER") {
|
}
|
||||||
|
if channel_name.contains("STREAMER") {
|
||||||
log::debug!("STREAMER channel JSON received");
|
log::debug!("STREAMER channel JSON received");
|
||||||
if let Some(event)=val.get("connection_period_stats_event") {
|
if let Some(event)=val.get("connection_period_stats_event") {
|
||||||
let nums=crate::viewer_metrics::collect(event);
|
let nums=crate::viewer_metrics::collect(event);
|
||||||
|
|||||||
@@ -17,6 +17,11 @@ struct Viewer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn connect(desktop: bool, portal: Option<Arc<crate::desktop_session::PortalDesktop>>)
|
async fn connect(desktop: bool, portal: Option<Arc<crate::desktop_session::PortalDesktop>>)
|
||||||
|
-> (WebRtcSession, Viewer) {
|
||||||
|
connect_channels(desktop, portal, &["CONTROL_DATA_CHANNEL"]).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn connect_channels(desktop: bool, portal: Option<Arc<crate::desktop_session::PortalDesktop>>, labels: &[&str])
|
||||||
-> (WebRtcSession, Viewer) {
|
-> (WebRtcSession, Viewer) {
|
||||||
let input = Arc::new(InputInjector::without_desktop());
|
let input = Arc::new(InputInjector::without_desktop());
|
||||||
let (host_setting, viewer_setting, router) = crate::test_network::virtual_network().await;
|
let (host_setting, viewer_setting, router) = crate::test_network::virtual_network().await;
|
||||||
@@ -26,7 +31,7 @@ async fn connect(desktop: bool, portal: Option<Arc<crate::desktop_session::Porta
|
|||||||
let pc = Arc::new(APIBuilder::new().with_setting_engine(viewer_setting).build().new_peer_connection(RTCConfiguration::default()).await.unwrap());
|
let pc = Arc::new(APIBuilder::new().with_setting_engine(viewer_setting).build().new_peer_connection(RTCConfiguration::default()).await.unwrap());
|
||||||
let (tx, messages) = mpsc::unbounded_channel();
|
let (tx, messages) = mpsc::unbounded_channel();
|
||||||
let mut channels = HashMap::new();
|
let mut channels = HashMap::new();
|
||||||
for label in ["CONTROL_DATA_CHANNEL"] {
|
for &label in labels {
|
||||||
let channel = pc.create_data_channel(label, None).await.unwrap();
|
let channel = pc.create_data_channel(label, None).await.unwrap();
|
||||||
let (tx, name) = (tx.clone(), label.to_string());
|
let (tx, name) = (tx.clone(), label.to_string());
|
||||||
channel.on_message(Box::new(move |message| {
|
channel.on_message(Box::new(move |message| {
|
||||||
@@ -227,3 +232,57 @@ async fn tool_peer_applies_capture_settings_without_a_desktop() {
|
|||||||
viewer.router.lock().await.stop().await.unwrap();
|
viewer.router.lock().await.stop().await.unwrap();
|
||||||
}).await.expect("tool capture-setting regression exceeded deadline");
|
}).await.expect("tool capture-setting regression exceeded deadline");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Exercise the locally patched notifications and close handler through real SCTP,
|
||||||
|
/// alongside the upstream CONTROL drain. No cloud or live host session is used.
|
||||||
|
#[tokio::test]
|
||||||
|
async fn terminal_notifications_and_disconnect_preserve_control_channel() {
|
||||||
|
use crate::terminal::{self, TerminalConn};
|
||||||
|
tokio::time::timeout(Duration::from_secs(20), async {
|
||||||
|
let id = u32::MAX - 100;
|
||||||
|
struct Cleanup(u32);
|
||||||
|
impl Drop for Cleanup {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
let (tx, _rx) = mpsc::unbounded_channel();
|
||||||
|
TerminalConn::new(tx).handle(&terminal::encode(terminal::KILL_REQ, 999,
|
||||||
|
serde_json::json!({"session_id": self.0}).to_string().as_bytes()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let _cleanup = Cleanup(id);
|
||||||
|
let (host, mut viewer) = connect_channels(false, None,
|
||||||
|
&["CONTROL_DATA_CHANNEL", "BINARY_DATA_CHANNEL"]).await;
|
||||||
|
viewer.channels["BINARY_DATA_CHANNEL"].send(&terminal::encode(terminal::OPEN, id,
|
||||||
|
br#"{"cols":80,"rows":24,"shell":"/bin/sh"}"#).into()).await.unwrap();
|
||||||
|
tokio::time::timeout(Duration::from_secs(3), async {
|
||||||
|
let (mut opened, mut notified) = (false, false);
|
||||||
|
while !(opened && notified) {
|
||||||
|
let (label, bytes) = viewer.messages.recv().await.expect("terminal channel closed");
|
||||||
|
if label != "BINARY_DATA_CHANNEL" { continue; }
|
||||||
|
if let Some(frame) = terminal::decode(&bytes) {
|
||||||
|
if frame.kind == terminal::OPEN_RESP && frame.session == id {
|
||||||
|
assert_eq!(serde_json::from_slice::<serde_json::Value>(&frame.payload).unwrap()["code"], 0);
|
||||||
|
opened = true;
|
||||||
|
}
|
||||||
|
} else if body(&bytes, 28) == Some(&[][..]) { notified = true; }
|
||||||
|
}
|
||||||
|
}).await.expect("open response and list notification must both reach the viewer");
|
||||||
|
let state = || {
|
||||||
|
let (tx, mut rx) = mpsc::unbounded_channel();
|
||||||
|
TerminalConn::new(tx).handle(&terminal::encode(terminal::LIST_REQ, 998, &[]));
|
||||||
|
let frame = terminal::decode(&rx.try_recv().unwrap()).unwrap();
|
||||||
|
serde_json::from_slice::<Vec<serde_json::Value>>(&frame.payload).unwrap().into_iter()
|
||||||
|
.find(|s| s["session_id"] == id).unwrap()["state"].as_str().unwrap().to_owned()
|
||||||
|
};
|
||||||
|
assert_eq!(state(), "running");
|
||||||
|
viewer.channels["BINARY_DATA_CHANNEL"].close().await.unwrap();
|
||||||
|
tokio::time::timeout(Duration::from_secs(3), async {
|
||||||
|
while state() != "detached" { tokio::time::sleep(Duration::from_millis(20)).await; }
|
||||||
|
}).await.expect("channel closure must detach its terminal session");
|
||||||
|
viewer.channels["CONTROL_DATA_CHANNEL"].send(&echo_request(123).into()).await.unwrap();
|
||||||
|
assert!(receive(&mut viewer.messages, 3, Duration::from_secs(3)).await.is_some(),
|
||||||
|
"terminal closure must leave CONTROL responsive");
|
||||||
|
viewer.pc.close().await.unwrap();
|
||||||
|
host.pc.close().await.unwrap();
|
||||||
|
viewer.router.lock().await.stop().await.unwrap();
|
||||||
|
}).await.expect("terminal lifecycle regression exceeded deadline");
|
||||||
|
}
|
||||||
@@ -419,7 +419,24 @@ static void authorization_still_required(void) {
|
|||||||
g_variant_unref(reply);
|
g_variant_unref(reply);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
static void saved_token_with_position(const char *token, void *data, int has_position, int32_t x, int32_t y) {
|
||||||
|
int *calls = data;
|
||||||
|
assert(!strcmp(token, "synthetic-grant"));
|
||||||
|
assert(has_position && x == 25 && y == 50);
|
||||||
|
(*calls)++;
|
||||||
|
}
|
||||||
|
static void rotated_token_callback(void) {
|
||||||
|
struct uu_portal p = {0};
|
||||||
|
int calls = 0;
|
||||||
|
save_restore_token(&p, NULL, saved_token_with_position, &calls);
|
||||||
|
assert(calls == 0);
|
||||||
|
p.restore_token = "synthetic-grant";
|
||||||
|
p.has_position = 1; p.position_x = 25; p.position_y = 50;
|
||||||
|
save_restore_token(&p, NULL, saved_token_with_position, &calls);
|
||||||
|
assert(calls == 1);
|
||||||
|
}
|
||||||
int main(void) {
|
int main(void) {
|
||||||
|
rotated_token_callback();
|
||||||
portal_renegotiation_timeout();
|
portal_renegotiation_timeout();
|
||||||
portal_renegotiation_recovery();
|
portal_renegotiation_recovery();
|
||||||
portal_renegotiation_event_order_and_healthy_states();
|
portal_renegotiation_event_order_and_healthy_states();
|
||||||
|
|||||||
Reference in new issue
Block a user