mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0b3ac4c78e | ||
|
|
8b6de40605 | ||
|
|
7a0c40af73 | ||
|
|
f67de7cc7d | ||
|
|
b9586f226d | ||
|
|
7b8980771d | ||
|
|
50ff42e8d7 | ||
|
|
ba8f8ada20 | ||
|
|
c461db10a4 | ||
|
|
4c86c7f782 | ||
|
|
81e9ccfa05 | ||
|
|
c0abdeae72 | ||
|
|
1dad755823 | ||
|
|
fcfd2b6717 | ||
|
|
73c503a244 | ||
|
|
3bce605eaa | ||
|
|
ebdd362452 | ||
|
|
26811018e0 |
No files matched your search
@@ -163,6 +163,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 +195,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
+35
-2
@@ -673,6 +673,15 @@ dependencies = [
|
|||||||
"windows-sys 0.61.2",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fdeflate"
|
||||||
|
version = "0.3.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
|
||||||
|
dependencies = [
|
||||||
|
"simd-adler32",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ff"
|
name = "ff"
|
||||||
version = "0.13.1"
|
version = "0.13.1"
|
||||||
@@ -727,7 +736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb"
|
checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crc32fast",
|
"crc32fast",
|
||||||
"miniz_oxide",
|
"miniz_oxide 0.9.1",
|
||||||
"zlib-rs",
|
"zlib-rs",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -1323,6 +1332,16 @@ version = "0.2.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "miniz_oxide"
|
||||||
|
version = "0.8.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
|
||||||
|
dependencies = [
|
||||||
|
"adler2",
|
||||||
|
"simd-adler32",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "miniz_oxide"
|
name = "miniz_oxide"
|
||||||
version = "0.9.1"
|
version = "0.9.1"
|
||||||
@@ -1571,6 +1590,19 @@ version = "0.3.34"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548"
|
checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "png"
|
||||||
|
version = "0.18.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.13.2",
|
||||||
|
"crc32fast",
|
||||||
|
"fdeflate",
|
||||||
|
"flate2",
|
||||||
|
"miniz_oxide 0.8.9",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "polyval"
|
name = "polyval"
|
||||||
version = "0.6.2"
|
version = "0.6.2"
|
||||||
@@ -2772,7 +2804,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.45"
|
version = "0.2.50"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ab_glyph",
|
"ab_glyph",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -2788,6 +2820,7 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"nix 0.29.0",
|
"nix 0.29.0",
|
||||||
|
"png",
|
||||||
"qrcode",
|
"qrcode",
|
||||||
"rand 0.8.8",
|
"rand 0.8.8",
|
||||||
"rcgen",
|
"rcgen",
|
||||||
|
|||||||
+4
-2
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.45"
|
version = "0.2.50"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "uuremote-server"
|
default-run = "uuremote-server"
|
||||||
authors = ["uu-remote-linux contributors"]
|
authors = ["uu-remote-linux contributors"]
|
||||||
@@ -23,7 +23,7 @@ required-features = ["native-viewer"]
|
|||||||
default = []
|
default = []
|
||||||
native-viewer = []
|
native-viewer = []
|
||||||
viewer-ffmpeg = ["native-viewer", "dep:ffmpeg-next"]
|
viewer-ffmpeg = ["native-viewer", "dep:ffmpeg-next"]
|
||||||
viewer-sdl = ["native-viewer", "dep:sdl2", "dep:ab_glyph"]
|
viewer-sdl = ["native-viewer", "dep:sdl2", "dep:ab_glyph", "dep:png"]
|
||||||
wayland = []
|
wayland = []
|
||||||
# Experimental direct linear framebuffer capture; never enabled in release builds.
|
# Experimental direct linear framebuffer capture; never enabled in release builds.
|
||||||
kms = []
|
kms = []
|
||||||
@@ -60,8 +60,10 @@ x11rb = { version = "0.13", features = ["damage", "shm", "allow-unsafe-code"], o
|
|||||||
|
|
||||||
sdl2 = { version = "0.37", optional = true, features = ["use-pkgconfig"] }
|
sdl2 = { version = "0.37", optional = true, features = ["use-pkgconfig"] }
|
||||||
ab_glyph = { version = "0.2", optional = true }
|
ab_glyph = { version = "0.2", 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"] }
|
||||||
|
|||||||
+15
-1
@@ -25,6 +25,14 @@
|
|||||||
|
|
||||||
## Appearance / 外观
|
## Appearance / 外观
|
||||||
|
|
||||||
|
Launcher icons use the system icon theme instead of emoji glyphs, so they do not depend on emoji font coverage.
|
||||||
|
|
||||||
|
Signed-in graphical hosts report the system wallpaper for disconnected device cards in official clients
|
||||||
|
(no desktop-window screenshot). GNOME/Cinnamon, KDE, Xfce and Omarchy on Hyprland are supported (following the current wallpaper); checks run every 60 seconds
|
||||||
|
and unchanged content is not uploaded again. Other desktops can set `UU_WALLPAPER=/absolute/path/image.png`
|
||||||
|
(PNG/JPEG/WebP). Set `UU_WALLPAPER_UPLOAD=0` to disable; guest and headless hosts skip reporting.
|
||||||
|
See [protocol evidence and limitations](docs/wallpaper-protocol.md).
|
||||||
|
|
||||||
Choose **System / Light / Dark** (default: System) in the viewer's **Settings → General → Appearance**, or via the gear settings button in host / tool windows.
|
Choose **System / Light / Dark** (default: System) in the viewer's **Settings → General → Appearance**, or via the gear settings button in host / tool windows.
|
||||||
The choice is saved to `$XDG_CONFIG_HOME/uuremote/theme` (default `~/.config/uuremote/theme`).
|
The choice is saved to `$XDG_CONFIG_HOME/uuremote/theme` (default `~/.config/uuremote/theme`).
|
||||||
|
|
||||||
@@ -69,6 +77,7 @@ 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 |
|
||||||
@@ -151,7 +160,7 @@ On niri, `niri msg --json outputs` enumerates enabled monitors. Normal and 90/18
|
|||||||
| True color (4:4:4) | Supported (v0.1.15): the default FFmpeg pipeline with NVENC / libx264 encodes H.264 High 4:4:4; `inproc-av` native NVENC encodes H.264 High 4:4:4 / HEVC FRExt; VAAPI stays 4:2:0 and reports that to the client |
|
| True color (4:4:4) | Supported (v0.1.15): the default FFmpeg pipeline with NVENC / libx264 encodes H.264 High 4:4:4; `inproc-av` native NVENC encodes H.264 High 4:4:4 / HEVC FRExt; VAAPI stays 4:2:0 and reports that to the client |
|
||||||
| HDR | Not implemented |
|
| HDR | Not implemented |
|
||||||
| Super screen / virtual display | Not implemented |
|
| Super screen / virtual display | Not implemented |
|
||||||
| Privacy screen on the host | Experimental, KDE Plasma Wayland (portal) only; off, picture and screen-off status labels verified with Mac 4.43.0; see [docs/privacy-screen.md](docs/privacy-screen.md) |
|
| Privacy screen on the host | Experimental, KDE Plasma Wayland (portal) only; off, picture and screen-off status labels verified with Mac 4.43.0; `UU_PRIVACY_AUTO=picture` / `screen-off` enables it automatically on desktop connect; see [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||||
| Microphone (viewer audio played on the host) | Not implemented (needs a virtual sound card) |
|
| Microphone (viewer audio played on the host) | Not implemented (needs a virtual sound card) |
|
||||||
| Plugins such as the WoW queue notifier | Not supported; the client is told that no plugins exist |
|
| Plugins such as the WoW queue notifier | Not supported; the client is told that no plugins exist |
|
||||||
| Linux login screen | The system login screen (before anyone logs in to the Linux desktop) cannot be controlled yet; use headless mode or a virtual desktop (see below). This is about the Linux login: **without a UU account** the host can now be used through remote assistance |
|
| Linux login screen | The system login screen (before anyone logs in to the Linux desktop) cannot be controlled yet; use headless mode or a virtual desktop (see below). This is about the Linux login: **without a UU account** the host can now be used through remote assistance |
|
||||||
@@ -458,6 +467,7 @@ flowchart LR
|
|||||||
|
|
||||||
## Security and privacy
|
## Security and privacy
|
||||||
|
|
||||||
|
- By default, signed-in graphical hosts upload the current wallpaper image to UU's file service for device-card backgrounds. Set `UU_WALLPAPER_UPLOAD=0` to disable this upload.
|
||||||
- Logs never contain keystrokes, terminal text, clipboard contents, file contents, passwords or tokens.
|
- Logs never contain keystrokes, terminal text, clipboard contents, file contents, passwords or tokens.
|
||||||
- For auto unlock the password is stored in the **viewer** (the official client). The host only checks it
|
- For auto unlock the password is stored in the **viewer** (the official client). The host only checks it
|
||||||
once with PAM; it is never written to disk or logs.
|
once with PAM; it is never written to disk or logs.
|
||||||
@@ -604,6 +614,10 @@ separate from the host `uuremote-server`; the default host build and behaviour a
|
|||||||
terminal emulator (`TERMINAL` selects one). From source: `sudo apt install libsdl2-dev`, then
|
terminal emulator (`TERMINAL` selects one). From source: `sudo apt install libsdl2-dev`, then
|
||||||
`cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`.
|
`cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`.
|
||||||
|
|
||||||
|
Key combinations use the left/right modifier state attached to each SDL key event. Focus loss releases remote keys; after focus returns, the next non-modifier key restores any still-held Shift/Ctrl/Alt/Win (Command on Mac). This is built in, with no adapter or setting required.
|
||||||
|
|
||||||
|
The viewer mirrors remote PNG pointer shapes (including text and window-resize cursors) with their hotspots. Leaving the remote picture or opening local controls restores the local arrow.
|
||||||
|
|
||||||
SDL clipboard access reuses the desktop window to avoid temporary-window Dock churn on GNOME Wayland (#37).
|
SDL clipboard access reuses the desktop window to avoid temporary-window Dock churn on GNOME Wayland (#37).
|
||||||
On niri, data-control-capable `wl-clipboard` is used instead, so synchronization does not require window focus.
|
On niri, data-control-capable `wl-clipboard` is used instead, so synchronization does not require window focus.
|
||||||
Other SDL backends synchronize only while that window is focused. The 30 KiB text limit applies. Selections without a supported
|
Other SDL backends synchronize only while that window is focused. The 30 KiB text limit applies. Selections without a supported
|
||||||
|
|||||||
@@ -21,6 +21,10 @@
|
|||||||
|
|
||||||
## 外观 / Appearance
|
## 外观 / Appearance
|
||||||
|
|
||||||
|
启动器图标使用系统主题的符号图标,避免缺少 emoji 字体时显示方框。
|
||||||
|
|
||||||
|
已登录的图形主机会上报系统壁纸,供官方客户端的设备卡片在未连接时显示背景图(不是桌面窗口截图)。支持 GNOME/Cinnamon、KDE、Xfce 和 Hyprland 下的 Omarchy(自动跟随当前壁纸);每 60 秒检查一次,内容不变则不重复上传。其他桌面可用 `UU_WALLPAPER=/绝对路径/图片.png` 指定 PNG/JPEG/WebP;`UU_WALLPAPER_UPLOAD=0` 关闭。访客和无桌面模式跳过上报。协议依据与限制见 [设备壁纸上报](docs/wallpaper-protocol.md)。
|
||||||
|
|
||||||
在控制端的 **设置 → 常规 → 外观**,或主机 / 工具窗口的齿轮设置按钮中选择 **跟随系统 / 浅色 / 深色**(默认跟随系统)。
|
在控制端的 **设置 → 常规 → 外观**,或主机 / 工具窗口的齿轮设置按钮中选择 **跟随系统 / 浅色 / 深色**(默认跟随系统)。
|
||||||
选择保存在 `$XDG_CONFIG_HOME/uuremote/theme`(默认 `~/.config/uuremote/theme`)。
|
选择保存在 `$XDG_CONFIG_HOME/uuremote/theme`(默认 `~/.config/uuremote/theme`)。
|
||||||
|
|
||||||
@@ -62,6 +66,7 @@ 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 编码传到控制端 |
|
||||||
| 文件传输 | 上传、下载(含文件夹)、新建文件夹、重命名、删除 |
|
| 文件传输 | 上传、下载(含文件夹)、新建文件夹、重命名、删除 |
|
||||||
@@ -136,7 +141,7 @@ niri 会话通过 `niri msg --json outputs` 枚举已启用的显示器。普通
|
|||||||
| 真彩(4:4:4) | 支持(v0.1.15):NVENC / libx264 的默认 FFmpeg 管线输出 H.264 High 4:4:4;`inproc-av` 原生 NVENC 输出 H.264 High 4:4:4 / HEVC FRExt;VAAPI 管线仍为 4:2:0,并如实回报给客户端 |
|
| 真彩(4:4:4) | 支持(v0.1.15):NVENC / libx264 的默认 FFmpeg 管线输出 H.264 High 4:4:4;`inproc-av` 原生 NVENC 输出 H.264 High 4:4:4 / HEVC FRExt;VAAPI 管线仍为 4:2:0,并如实回报给客户端 |
|
||||||
| HDR | 未实现 |
|
| HDR | 未实现 |
|
||||||
| 超级屏 / 虚拟显示器 | 未实现 |
|
| 超级屏 / 虚拟显示器 | 未实现 |
|
||||||
| 被控端防窥模式 | 实验性,仅 KDE Plasma Wayland(portal);Mac 4.43.0 已验证不启用、隐私屏保、关闭显示屏三种状态回显,见 [docs/privacy-screen.md](docs/privacy-screen.md) |
|
| 被控端防窥模式 | 实验性,仅 KDE Plasma Wayland(portal);Mac 4.43.0 已验证不启用、隐私屏保、关闭显示屏三种状态回显;`UU_PRIVACY_AUTO=picture` / `screen-off` 可在桌面连接时自动开启,见 [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||||
| 麦克风(控制端声音传到被控端) | 未实现(需要虚拟声卡) |
|
| 麦克风(控制端声音传到被控端) | 未实现(需要虚拟声卡) |
|
||||||
| 魔兽世界排队提醒等插件 | 不支持,会明确告诉客户端「无插件」 |
|
| 魔兽世界排队提醒等插件 | 不支持,会明确告诉客户端「无插件」 |
|
||||||
| Linux 系统登录界面 | 还不支持控制开机后的系统登录界面(还没有人登录 Linux 桌面时);这种情况可以用无头模式或虚拟桌面(见下文)。注意:这里说的是 Linux 系统登录,**不登录 UU 账号**现在可以通过「远程协助」使用 |
|
| Linux 系统登录界面 | 还不支持控制开机后的系统登录界面(还没有人登录 Linux 桌面时);这种情况可以用无头模式或虚拟桌面(见下文)。注意:这里说的是 Linux 系统登录,**不登录 UU 账号**现在可以通过「远程协助」使用 |
|
||||||
@@ -402,6 +407,7 @@ flowchart LR
|
|||||||
|
|
||||||
## 安全与隐私
|
## 安全与隐私
|
||||||
|
|
||||||
|
- 已登录的图形主机默认会将当前壁纸图片上传到 UU 的文件服务,供设备卡片显示背景;可用 `UU_WALLPAPER_UPLOAD=0` 关闭上传。
|
||||||
- 日志不记录键盘输入、终端内容、剪贴板内容、文件内容、密码和令牌。
|
- 日志不记录键盘输入、终端内容、剪贴板内容、文件内容、密码和令牌。
|
||||||
- 自动解锁的密码保存在**控制端**(官方客户端)里,被控端只拿来做一次 PAM 校验,不落盘、不写日志。
|
- 自动解锁的密码保存在**控制端**(官方客户端)里,被控端只拿来做一次 PAM 校验,不落盘、不写日志。
|
||||||
- 能连上这台机器的,只有登录了同一个 UU 账号的设备。请保管好你的 UU 账号。
|
- 能连上这台机器的,只有登录了同一个 UU 账号的设备。请保管好你的 UU 账号。
|
||||||
@@ -530,6 +536,10 @@ xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`。
|
|||||||
`ffmpeg` 命令;SDL 桌面窗口直接同步文本剪贴板(Wayland/X11),无需额外剪贴板工具;终端功能需要本机终端程序(可用 `TERMINAL` 指定)。
|
`ffmpeg` 命令;SDL 桌面窗口直接同步文本剪贴板(Wayland/X11),无需额外剪贴板工具;终端功能需要本机终端程序(可用 `TERMINAL` 指定)。
|
||||||
从源码构建:`sudo apt install libsdl2-dev`,然后 `cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`。
|
从源码构建:`sudo apt install libsdl2-dev`,然后 `cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`。
|
||||||
|
|
||||||
|
组合键使用 SDL 按键事件携带的左右修饰键状态;窗口失焦时释放远端按键,重新聚焦后的下一次普通按键会恢复仍按住的 Shift/Ctrl/Alt/Win(Mac 为 Command)。此行为内置,无需适配库或开关。
|
||||||
|
|
||||||
|
控制端会同步远端以 PNG 发送的指针形状(如文本光标和窗口缩放箭头),并保留正确热点。离开远控画面或打开本地菜单时恢复本机箭头。
|
||||||
|
|
||||||
SDL 剪贴板复用桌面窗口,避免 GNOME Wayland 上临时窗口引起的 Dock 跳动(#37)。niri 改用支持 data-control 的
|
SDL 剪贴板复用桌面窗口,避免 GNOME Wayland 上临时窗口引起的 Dock 跳动(#37)。niri 改用支持 data-control 的
|
||||||
`wl-clipboard`,不需要桌面窗口保持焦点;其他 SDL 后端仅在桌面窗口获得焦点时同步。
|
`wl-clipboard`,不需要桌面窗口保持焦点;其他 SDL 后端仅在桌面窗口获得焦点时同步。
|
||||||
保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。
|
保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。
|
||||||
|
|||||||
@@ -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);
|
||||||
|
}
|
||||||
@@ -594,8 +594,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));
|
||||||
@@ -675,7 +681,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 +714,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);
|
||||||
|
|||||||
@@ -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. */
|
||||||
|
|||||||
@@ -73,6 +73,9 @@ int uu_privacy_wallpaper_run(const char *image, const int *rects, int count) {
|
|||||||
shown++;
|
shown++;
|
||||||
}
|
}
|
||||||
if (!shown) return 2;
|
if (!shown) return 2;
|
||||||
|
/* Map the covers before reporting ready: the host marks them skip-taskbar through KWin right
|
||||||
|
after this line, and KWin can only list windows whose surfaces already exist. */
|
||||||
|
while (gtk_events_pending()) gtk_main_iteration_do(FALSE);
|
||||||
/* EOF follows the host process, including crashes, rather than its spawning worker thread. */
|
/* EOF follows the host process, including crashes, rather than its spawning worker thread. */
|
||||||
GIOChannel *host = g_io_channel_unix_new(0);
|
GIOChannel *host = g_io_channel_unix_new(0);
|
||||||
guint watch = g_io_add_watch(host, G_IO_HUP | G_IO_ERR | G_IO_NVAL, host_closed, NULL);
|
guint watch = g_io_add_watch(host, G_IO_HUP | G_IO_ERR | G_IO_NVAL, host_closed, NULL);
|
||||||
|
|||||||
+32
-16
@@ -73,6 +73,14 @@ static GtkWidget *label(const char *text, const char *cls) {
|
|||||||
return l;
|
return l;
|
||||||
}
|
}
|
||||||
static GtkWidget *button(const char *text, const char *cls) { GtkWidget *b = gtk_button_new_with_label(text); if (cls) add_class(b, cls); return b; }
|
static GtkWidget *button(const char *text, const char *cls) { GtkWidget *b = gtk_button_new_with_label(text); if (cls) add_class(b, cls); return b; }
|
||||||
|
static GtkWidget *icon(const char *name, int size) {
|
||||||
|
GtkWidget *image = gtk_image_new_from_icon_name(name, GTK_ICON_SIZE_BUTTON);
|
||||||
|
gtk_image_set_pixel_size(GTK_IMAGE(image), size); return image;
|
||||||
|
}
|
||||||
|
static GtkWidget *icon_button(const char *text, const char *name, const char *cls) {
|
||||||
|
GtkWidget *b = button(text, cls); gtk_button_set_image(GTK_BUTTON(b), icon(name, 17));
|
||||||
|
gtk_button_set_always_show_image(GTK_BUTTON(b), TRUE); return b;
|
||||||
|
}
|
||||||
static GtkWidget *hbox(int spacing) { return gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing); }
|
static GtkWidget *hbox(int spacing) { return gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing); }
|
||||||
static GtkWidget *vbox(int spacing) { return gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing); }
|
static GtkWidget *vbox(int spacing) { return gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing); }
|
||||||
static GtkWidget *platform_icon(int platform, int online) {
|
static GtkWidget *platform_icon(int platform, int online) {
|
||||||
@@ -124,10 +132,12 @@ static void open_more(void) {
|
|||||||
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)), *box = vbox(10);
|
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)), *box = vbox(10);
|
||||||
gtk_container_set_border_width(GTK_CONTAINER(box), 22);
|
gtk_container_set_border_width(GTK_CONTAINER(box), 22);
|
||||||
gtk_box_pack_start(GTK_BOX(box), label(L("更多工具", "More tools"), "h2"), FALSE, FALSE, 6);
|
gtk_box_pack_start(GTK_BOX(box), label(L("更多工具", "More tools"), "h2"), FALSE, FALSE, 6);
|
||||||
const char *names[] = {L("🗂 文件传输", "🗂 File transfer"), L("▶ 观看模式", "▶ Watch mode"), L("⌨ 终端", "⌨ Terminal"), L("⇄ 端口映射", "⇄ Port mapping"), L("⏻ 远程开机", "⏻ Wake on LAN"), L("↻ 重启", "↻ Restart"), L("⏻ 关机", "⏻ Shut down"), L("🗑 删除设备", "🗑 Remove device")};
|
const char *names[] = {L("文件传输", "File transfer"), L("观看模式", "Watch mode"), L("终端", "Terminal"), L("端口映射", "Port mapping"), L("远程开机", "Wake on LAN"), L("重启", "Restart"), L("关机", "Shut down"), L("删除设备", "Remove device")};
|
||||||
|
const char *icons[] = {"folder-symbolic", "media-playback-start-symbolic", "utilities-terminal-symbolic", "network-wired-symbolic", "computer-symbolic", "view-refresh-symbolic", "system-shutdown-symbolic", "user-trash-symbolic"};
|
||||||
const char *kinds[] = {"file", "watch", "terminal", "portmap", "wol", "reboot", "shutdown", "unbind"};
|
const char *kinds[] = {"file", "watch", "terminal", "portmap", "wol", "reboot", "shutdown", "unbind"};
|
||||||
for (int i = 0; i < 8; i++) {
|
for (int i = 0; i < 8; i++) {
|
||||||
GtkWidget *b = gtk_button_new(), *line = hbox(10); add_class(b, "cardbtn");
|
GtkWidget *b = gtk_button_new(), *line = hbox(10); add_class(b, "cardbtn");
|
||||||
|
gtk_box_pack_start(GTK_BOX(line), icon(icons[i], 20), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(line), label(names[i], "devname"), TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(line), label(names[i], "devname"), TRUE, TRUE, 0);
|
||||||
gtk_box_pack_end(GTK_BOX(line), label("›", "hint"), FALSE, FALSE, 0);
|
gtk_box_pack_end(GTK_BOX(line), label("›", "hint"), FALSE, FALSE, 0);
|
||||||
gtk_container_add(GTK_CONTAINER(b), line);
|
gtk_container_add(GTK_CONTAINER(b), line);
|
||||||
@@ -224,7 +234,8 @@ static void on_card(GtkButton *b, gpointer index) { (void)b; show_device(GPOINTE
|
|||||||
|
|
||||||
static GtkWidget *nav_row(const char *icon, const char *text, const char *kind) {
|
static GtkWidget *nav_row(const char *icon, const char *text, const char *kind) {
|
||||||
GtkWidget *row = gtk_list_box_row_new(), *line = hbox(10);
|
GtkWidget *row = gtk_list_box_row_new(), *line = hbox(10);
|
||||||
gtk_box_pack_start(GTK_BOX(line), label(icon, "devname"), FALSE, FALSE, 0);
|
GtkWidget *image = gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_BUTTON);
|
||||||
|
gtk_box_pack_start(GTK_BOX(line), image, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(line), label(text, "devname"), TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(line), label(text, "devname"), TRUE, TRUE, 0);
|
||||||
gtk_container_add(GTK_CONTAINER(row), line);
|
gtk_container_add(GTK_CONTAINER(row), line);
|
||||||
g_object_set_data_full(G_OBJECT(row), "kind", g_strdup(kind), g_free);
|
g_object_set_data_full(G_OBJECT(row), "kind", g_strdup(kind), g_free);
|
||||||
@@ -298,7 +309,7 @@ static gboolean apply_devices(gpointer d) {
|
|||||||
gtk_box_pack_start(GTK_BOX(all_box), card, FALSE, FALSE, 4);
|
gtk_box_pack_start(GTK_BOX(all_box), card, FALSE, FALSE, 4);
|
||||||
}
|
}
|
||||||
pthread_mutex_unlock(&d_lock);
|
pthread_mutex_unlock(&d_lock);
|
||||||
gtk_list_box_insert(GTK_LIST_BOX(device_list), nav_row("◼", L("全部设备", "All devices"), "all"), -1);
|
gtk_list_box_insert(GTK_LIST_BOX(device_list), nav_row("view-grid-symbolic", L("全部设备", "All devices"), "all"), -1);
|
||||||
gtk_widget_show_all(device_list); gtk_widget_show_all(all_box);
|
gtk_widget_show_all(device_list); gtk_widget_show_all(all_box);
|
||||||
return G_SOURCE_REMOVE;
|
return G_SOURCE_REMOVE;
|
||||||
}
|
}
|
||||||
@@ -367,9 +378,10 @@ static GtkWidget *build_device(void) {
|
|||||||
gtk_overlay_add_overlay(GTK_OVERLAY(preview), enter);
|
gtk_overlay_add_overlay(GTK_OVERLAY(preview), enter);
|
||||||
gtk_box_pack_start(GTK_BOX(page), preview, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), preview, FALSE, FALSE, 0);
|
||||||
GtkWidget *tools = hbox(0); add_class(tools, "toolbar");
|
GtkWidget *tools = hbox(0); add_class(tools, "toolbar");
|
||||||
const char *names[] = {L("🗂 文件传输", "🗂 File transfer"), L("▶ 观看模式", "▶ Watch mode"), L("⌨ 终端", "⌨ Terminal"), L("⇄ 端口映射", "⇄ Port mapping"), "▦"}, *kinds[] = {"file", "watch", "terminal", "portmap", "more"};
|
const char *names[] = {L("文件传输", "File transfer"), L("观看模式", "Watch mode"), L("终端", "Terminal"), L("端口映射", "Port mapping"), L("更多", "More")}, *kinds[] = {"file", "watch", "terminal", "portmap", "more"};
|
||||||
|
const char *tool_icons[] = {"folder-symbolic", "media-playback-start-symbolic", "utilities-terminal-symbolic", "network-wired-symbolic", "view-more-symbolic"};
|
||||||
for (int i = 0; i < 5; i++) {
|
for (int i = 0; i < 5; i++) {
|
||||||
GtkWidget *b = button(names[i], "tool");
|
GtkWidget *b = icon_button(names[i], tool_icons[i], "tool");
|
||||||
g_signal_connect(b, "clicked", G_CALLBACK(on_tool), (gpointer)kinds[i]);
|
g_signal_connect(b, "clicked", G_CALLBACK(on_tool), (gpointer)kinds[i]);
|
||||||
gtk_box_pack_start(GTK_BOX(tools), b, i < 4, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(tools), b, i < 4, TRUE, 0);
|
||||||
if (i < 4) gtk_box_pack_start(GTK_BOX(tools), gtk_separator_new(GTK_ORIENTATION_VERTICAL), FALSE, FALSE, 0);
|
if (i < 4) gtk_box_pack_start(GTK_BOX(tools), gtk_separator_new(GTK_ORIENTATION_VERTICAL), FALSE, FALSE, 0);
|
||||||
@@ -581,7 +593,7 @@ static void open_settings(void) {
|
|||||||
GtkWidget *gscroll = gtk_scrolled_window_new(NULL, NULL);
|
GtkWidget *gscroll = gtk_scrolled_window_new(NULL, NULL);
|
||||||
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(gscroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(gscroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
||||||
gtk_container_add(GTK_CONTAINER(gscroll), general);
|
gtk_container_add(GTK_CONTAINER(gscroll), general);
|
||||||
gtk_stack_add_titled(GTK_STACK(tabs), gscroll, "general", L("⚙ 常规", "⚙ General"));
|
gtk_stack_add_titled(GTK_STACK(tabs), gscroll, "general", L("常规", "General"));
|
||||||
// 安全
|
// 安全
|
||||||
GtkWidget *security = settings_page();
|
GtkWidget *security = settings_page();
|
||||||
const char *verify[] = {L("仅使用临时验证码", "Temporary code only"), L("仅使用自定义验证码", "Custom code only"), L("临时与自定义验证码", "Temporary and custom codes")};
|
const char *verify[] = {L("仅使用临时验证码", "Temporary code only"), L("仅使用自定义验证码", "Custom code only"), L("临时与自定义验证码", "Temporary and custom codes")};
|
||||||
@@ -593,7 +605,7 @@ static void open_settings(void) {
|
|||||||
gtk_box_pack_start(GTK_BOX(security), settings_card(s1, 2), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(security), settings_card(s1, 2), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(security), settings_card(s2, 1), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(security), settings_card(s2, 1), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(security), settings_card(s3, 1), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(security), settings_card(s3, 1), FALSE, FALSE, 0);
|
||||||
gtk_stack_add_titled(GTK_STACK(tabs), security, "security", L("🔒 安全", "🔒 Security"));
|
gtk_stack_add_titled(GTK_STACK(tabs), security, "security", L("安全", "Security"));
|
||||||
// 键盘
|
// 键盘
|
||||||
GtkWidget *keys = settings_page();
|
GtkWidget *keys = settings_page();
|
||||||
gtk_box_pack_start(GTK_BOX(keys), label(L("仅控制端响应的快捷键", "Viewer-only shortcuts"), "h2"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(keys), label(L("仅控制端响应的快捷键", "Viewer-only shortcuts"), "h2"), FALSE, FALSE, 0);
|
||||||
@@ -608,13 +620,13 @@ static void open_settings(void) {
|
|||||||
for (int i = 0; i < 8; i++) k2[i] = setting_row(fns[i], NULL, edit_button(fns[i]));
|
for (int i = 0; i < 8; i++) k2[i] = setting_row(fns[i], NULL, edit_button(fns[i]));
|
||||||
gtk_box_pack_start(GTK_BOX(keys), settings_card(k2, 8), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(keys), settings_card(k2, 8), FALSE, FALSE, 0);
|
||||||
GtkWidget *kscroll = gtk_scrolled_window_new(NULL, NULL); gtk_container_add(GTK_CONTAINER(kscroll), keys);
|
GtkWidget *kscroll = gtk_scrolled_window_new(NULL, NULL); gtk_container_add(GTK_CONTAINER(kscroll), keys);
|
||||||
gtk_stack_add_titled(GTK_STACK(tabs), kscroll, "keys", L("⌨ 键盘", "⌨ Keyboard"));
|
gtk_stack_add_titled(GTK_STACK(tabs), kscroll, "keys", L("键盘", "Keyboard"));
|
||||||
// 网络
|
// 网络
|
||||||
GtkWidget *network = settings_page();
|
GtkWidget *network = settings_page();
|
||||||
const char *proxy[] = {L("使用系统环境代理", "Use system proxy"), L("不使用代理", "No proxy")};
|
const char *proxy[] = {L("使用系统环境代理", "Use system proxy"), L("不使用代理", "No proxy")};
|
||||||
GtkWidget *n1[] = { setting_row(L("代理设置", "Proxy"), NULL, combo(proxy, 2)) };
|
GtkWidget *n1[] = { setting_row(L("代理设置", "Proxy"), NULL, combo(proxy, 2)) };
|
||||||
gtk_box_pack_start(GTK_BOX(network), settings_card(n1, 1), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(network), settings_card(n1, 1), FALSE, FALSE, 0);
|
||||||
gtk_stack_add_titled(GTK_STACK(tabs), network, "network", L("🌐 网络", "🌐 Network"));
|
gtk_stack_add_titled(GTK_STACK(tabs), network, "network", L("网络", "Network"));
|
||||||
gtk_box_pack_start(GTK_BOX(root), tabs, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(root), tabs, TRUE, TRUE, 0);
|
||||||
gtk_container_add(GTK_CONTAINER(settings_window), root);
|
gtk_container_add(GTK_CONTAINER(settings_window), root);
|
||||||
gtk_widget_show_all(settings_window);
|
gtk_widget_show_all(settings_window);
|
||||||
@@ -669,18 +681,21 @@ static void *run(void *arg) {
|
|||||||
GtkWidget *side = vbox(0); add_class(side, "sidebar"); gtk_widget_set_size_request(side, 270, -1);
|
GtkWidget *side = vbox(0); add_class(side, "sidebar"); gtk_widget_set_size_request(side, 270, -1);
|
||||||
my_section = vbox(0);
|
my_section = vbox(0);
|
||||||
GtkWidget *mh = hbox(8); gtk_widget_set_margin_start(mh, 18); gtk_widget_set_margin_top(mh, 22); gtk_widget_set_margin_bottom(mh, 6);
|
GtkWidget *mh = hbox(8); gtk_widget_set_margin_start(mh, 18); gtk_widget_set_margin_top(mh, 22); gtk_widget_set_margin_bottom(mh, 6);
|
||||||
gtk_box_pack_start(GTK_BOX(mh), label(L("⧉ 我的设备", "⧉ My devices"), "section"), TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(mh), icon("computer-symbolic", 17), FALSE, FALSE, 0);
|
||||||
|
gtk_box_pack_start(GTK_BOX(mh), label(L("我的设备", "My devices"), "section"), TRUE, TRUE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(my_section), mh, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(my_section), mh, FALSE, FALSE, 0);
|
||||||
device_list = gtk_list_box_new(); g_signal_connect(device_list, "row-activated", G_CALLBACK(on_row), NULL);
|
device_list = gtk_list_box_new(); g_signal_connect(device_list, "row-activated", G_CALLBACK(on_row), NULL);
|
||||||
gtk_box_pack_start(GTK_BOX(my_section), device_list, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(my_section), device_list, FALSE, FALSE, 0);
|
||||||
GtkWidget *scroll = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
GtkWidget *scroll = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
||||||
GtkWidget *side_inner = vbox(0); gtk_box_pack_start(GTK_BOX(side_inner), my_section, FALSE, FALSE, 0);
|
GtkWidget *side_inner = vbox(0); gtk_box_pack_start(GTK_BOX(side_inner), my_section, FALSE, FALSE, 0);
|
||||||
GtkWidget *welcome_nav = gtk_list_box_new(); g_signal_connect(welcome_nav, "row-activated", G_CALLBACK(on_row), NULL);
|
GtkWidget *welcome_nav = gtk_list_box_new(); g_signal_connect(welcome_nav, "row-activated", G_CALLBACK(on_row), NULL);
|
||||||
GtkWidget *ah = label(L("⧉ 远程协助", "⧉ Remote assistance"), "section"); gtk_widget_set_margin_start(ah, 18); gtk_widget_set_margin_top(ah, 16); gtk_widget_set_margin_bottom(ah, 6);
|
GtkWidget *ah = hbox(8); gtk_widget_set_margin_start(ah, 18); gtk_widget_set_margin_top(ah, 16); gtk_widget_set_margin_bottom(ah, 6);
|
||||||
|
gtk_box_pack_start(GTK_BOX(ah), icon("network-workgroup-symbolic", 17), FALSE, FALSE, 0);
|
||||||
|
gtk_box_pack_start(GTK_BOX(ah), label(L("远程协助", "Remote assistance"), "section"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(side_inner), ah, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(side_inner), ah, FALSE, FALSE, 0);
|
||||||
GtkWidget *assist = assist_list = gtk_list_box_new(); g_signal_connect(assist, "row-activated", G_CALLBACK(on_row), NULL);
|
GtkWidget *assist = assist_list = gtk_list_box_new(); g_signal_connect(assist, "row-activated", G_CALLBACK(on_row), NULL);
|
||||||
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("◧", L("开始协助", "Start assistance"), "assist"), -1);
|
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("network-workgroup-symbolic", L("开始协助", "Start assistance"), "assist"), -1);
|
||||||
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("★", L("收藏设备", "Favorites"), "favorite"), -1);
|
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("starred-symbolic", L("收藏设备", "Favorites"), "favorite"), -1);
|
||||||
gtk_box_pack_start(GTK_BOX(side_inner), assist, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(side_inner), assist, FALSE, FALSE, 0);
|
||||||
gtk_list_box_unselect_all(GTK_LIST_BOX(assist));
|
gtk_list_box_unselect_all(GTK_LIST_BOX(assist));
|
||||||
(void)welcome_nav;
|
(void)welcome_nav;
|
||||||
@@ -691,12 +706,13 @@ static void *run(void *arg) {
|
|||||||
GtkWidget *main = vbox(0), *header = hbox(10); add_class(header, "header");
|
GtkWidget *main = vbox(0), *header = hbox(10); add_class(header, "header");
|
||||||
badge = gtk_label_new(""); add_class(badge, "badge");
|
badge = gtk_label_new(""); add_class(badge, "badge");
|
||||||
title_label = label(L("全部设备", "All devices"), "title");
|
title_label = label(L("全部设备", "All devices"), "title");
|
||||||
more_button = button("⋮", "hbtn"); g_signal_connect(more_button, "clicked", G_CALLBACK(on_more), NULL);
|
more_button = icon_button("", "view-more-symbolic", "hbtn"); gtk_widget_set_tooltip_text(more_button, L("设备信息", "Device information")); g_signal_connect(more_button, "clicked", G_CALLBACK(on_more), NULL);
|
||||||
gtk_box_pack_start(GTK_BOX(header), badge, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(header), badge, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(header), title_label, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(header), title_label, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(header), more_button, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(header), more_button, FALSE, FALSE, 0);
|
||||||
const char *icons[] = {"☰", "◉", "🔔"}, *kinds[] = {"menu", "account", "notice"};
|
const char *icons[] = {"open-menu-symbolic", "avatar-default-symbolic", "preferences-system-notifications-symbolic"}, *kinds[] = {"menu", "account", "notice"};
|
||||||
for (int i = 0; i < 3; i++) { GtkWidget *b = button(icons[i], "hbtn"); g_signal_connect(b, "clicked", G_CALLBACK(popup), (gpointer)kinds[i]); gtk_box_pack_end(GTK_BOX(header), b, FALSE, FALSE, 0); }
|
const char *tips[] = {L("菜单", "Menu"), L("账号", "Account"), L("通知", "Notifications")};
|
||||||
|
for (int i = 0; i < 3; i++) { GtkWidget *b = icon_button("", icons[i], "hbtn"); gtk_widget_set_tooltip_text(b, tips[i]); g_signal_connect(b, "clicked", G_CALLBACK(popup), (gpointer)kinds[i]); gtk_box_pack_end(GTK_BOX(header), b, FALSE, FALSE, 0); }
|
||||||
gtk_box_pack_start(GTK_BOX(main), header, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(main), header, FALSE, FALSE, 0);
|
||||||
GtkWidget *overlay = gtk_overlay_new();
|
GtkWidget *overlay = gtk_overlay_new();
|
||||||
stack = gtk_stack_new();
|
stack = gtk_stack_new();
|
||||||
|
|||||||
@@ -44,6 +44,20 @@ is aimed at the virtual output's region. Needs GTK3.
|
|||||||
`UU_PRIVACY_BLOCK_INPUT=0` to keep local input. KWin saves the device flag, so a `privacy-guard`
|
`UU_PRIVACY_BLOCK_INPUT=0` to keep local input. KWin saves the device flag, so a `privacy-guard`
|
||||||
child restores devices and outputs from the record whenever the host ends, including SIGKILL; the
|
child restores devices and outputs from the record whenever the host ends, including SIGKILL; the
|
||||||
next start retries too. Devices plugged in during privacy are not blocked.
|
next start retries too. Devices plugged in during privacy are not blocked.
|
||||||
|
- 自动开启:`UU_PRIVACY_AUTO=picture`(或 `2`)在第一个桌面控制端连上后自动启用隐私屏保,
|
||||||
|
`UU_PRIVACY_AUTO=screen-off`(或 `3`)自动关屏;默认关闭。远程协助(访客)的桌面会话同样适用。
|
||||||
|
控制端自己的请求优先:一次会话里只要客户端发过隐私请求(包括连接刚建立、会话计数还没开始的
|
||||||
|
那一刻),待执行的自动开启就不再触发;断开后照常恢复。主机不支持或依赖缺失时只记日志,不影响连接。
|
||||||
|
自动开启后主机会向控制端推送一次 SystemMetrics 和 SystemStateChange,控制端菜单随之更新。支持的主机上,
|
||||||
|
每次桌面连接也会先推送一次当前状态(关闭时为关闭),这是新增的主动上报。
|
||||||
|
Auto: `UU_PRIVACY_AUTO=picture` (or `2`) enables picture mode when the first desktop controller
|
||||||
|
connects; `screen-off` (or `3`) turns the physical screens off. Off by default. Remote-assistance
|
||||||
|
(guest) desktop sessions are covered too. The viewer's own request wins for that session, including
|
||||||
|
one that arrives right after the connection opens and before the session counter starts: a pending
|
||||||
|
auto-enable then does not run, and a disconnect restores as usual. Unsupported hosts or missing
|
||||||
|
tools only log; the connection is unaffected. After an auto-enable the host pushes SystemMetrics
|
||||||
|
and SystemStateChange once, so the viewer's menu follows; on supported hosts every desktop
|
||||||
|
connection also pushes the current state first (off when it is off), which is new outbound traffic.
|
||||||
- 这是尽力而为的遮挡,不是保密边界。/ This is best-effort obscuring, not a confidentiality boundary.
|
- 这是尽力而为的遮挡,不是保密边界。/ This is best-effort obscuring, not a confidentiality boundary.
|
||||||
- 恢复记录保存在配置文件旁的 `privacy-power.json`(0600);崩溃后下次启动重新启用记录的物理屏。
|
- 恢复记录保存在配置文件旁的 `privacy-power.json`(0600);崩溃后下次启动重新启用记录的物理屏。
|
||||||
若主机无法启动,可在本机终端执行 `kscreen-doctor output.<name>.enable`。
|
若主机无法启动,可在本机终端执行 `kscreen-doctor output.<name>.enable`。
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
Linux 复制的文本可直接粘贴到 Windows 控制端。/ Text copied on Linux now pastes in the Windows viewer.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **Linux → Windows 文本剪贴板无法粘贴(#151,感谢 @afwer1231 的定位)**:主机提供 Unicode 文本格式时,格式名改用官方 Windows 端的 `predefined_13`(id 仍为 13)。此前的 `CF_UNICODETEXT` 名字会让 Windows 控制端注册一个同名的自定义格式,文本虽已到达但普通粘贴读不到。Mac 控制端按 id 13 识别,不受影响。
|
||||||
|
The host now names its Unicode text offer `predefined_13` (id 13), as official Windows peers do. The previous `CF_UNICODETEXT` name made the Windows viewer register a custom format of that name, so the text arrived but normal paste could not read it. The Mac viewer matches by id 13 and is unaffected.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;格式名依据官方 Windows/Mac 程序中的字符串对照(推断)。尚未在 Windows 控制端实机验证。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.46_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.46-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.46`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
官方客户端的设备卡片在未连接时也能显示 Linux 主机的壁纸。/ Device cards in official clients now show the Linux host's wallpaper while disconnected.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **上报系统壁纸(#152/#153,感谢 @ferstar)**:已登录的图形主机按官方 Windows 被控端的流程获取文件令牌、上传当前壁纸并回报地址,每 60 秒检查一次,内容不变不重复上传。支持 GNOME/Cinnamon、KDE(Plasma 5/6,含壁纸包和主题默认壁纸)、Xfce;其他桌面可用 `UU_WALLPAPER=/绝对路径/图片` 指定(PNG/JPEG/WebP)。访客与无桌面模式不上报。
|
||||||
|
Signed-in graphical hosts fetch a file token, upload the current wallpaper and report its URL, following the official Windows host. Checks run every 60 seconds; unchanged content is not re-uploaded. Supports GNOME/Cinnamon, KDE (Plasma 5/6, including wallpaper packages and theme defaults) and Xfce; other desktops can set `UU_WALLPAPER=/absolute/path/image`. Guest and headless hosts skip it.
|
||||||
|
|
||||||
|
### 隐私 / Privacy
|
||||||
|
默认会把当前壁纸图片上传到 UU 的文件服务;设置 `UU_WALLPAPER_UPLOAD=0` 可关闭。日志只记录结果和失败阶段。
|
||||||
|
By default the current wallpaper image is uploaded to UU's file service; set `UU_WALLPAPER_UPLOAD=0` to disable. Logs record only the outcome and failing stage.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;贡献者在 KDE 上实机确认官方客户端显示壁纸。GNOME/Cinnamon、Xfce 尚无实机验收;多屏、动态/XML 壁纸不在本次范围。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.47_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.47-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.47`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
防窥模式可在连接时自动开启,查看端组合键和启动器图标修复,信令失败日志更易诊断。/ Optional auto-enabled privacy screen, viewer modifier and launcher icon fixes, and clearer signaling failure logs.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **连接时自动开启防窥(#161,感谢 @RiverOnVenus)**:设置 `UU_PRIVACY_AUTO=picture`(隐私屏保)或 `screen-off`(关闭显示屏),第一个桌面控制端连上后自动开启;默认关闭。控制端自己的防窥请求优先,不覆盖已保存的偏好;远程协助会话同样适用。仅 KDE Plasma Wayland(portal)。
|
||||||
|
Set `UU_PRIVACY_AUTO=picture` or `screen-off` to enable the privacy screen when the first desktop controller connects (off by default). The viewer's own request wins and the saved preference is not overwritten; remote-assistance sessions are covered too. KDE Plasma Wayland (portal) only.
|
||||||
|
- **Omarchy 壁纸自动发现(#157,感谢 @ferstar)**:Hyprland 下的 Omarchy 自动跟随当前壁纸上报。/ Omarchy on Hyprland reports its current background automatically.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **查看端组合键(#163/#165,感谢 @Zhenqiang-Weng)**:窗口失焦再聚焦后,仍按住的 Shift/Ctrl/Alt/Win(Mac 为 Command)在下一次按键前恢复,不再丢失修饰键。/ The native viewer restores still-held modifiers after a focus change.
|
||||||
|
- **启动器图标(#158,感谢 @Zhenqiang-Weng)**:改用系统主题符号图标,缺少 emoji 字体时不再显示方框。/ Launcher icons use the system icon theme instead of emoji glyphs.
|
||||||
|
- **信令连接失败日志(#166)**:记录脱敏后的失败原因(类别或 HTTP 状态码,不含 token 和地址),区分服务端拒绝与网络问题。/ Signaling connection failures now log a sanitized reason (category or HTTP status).
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;防窥自动开启由贡献者在 KDE Plasma 6 Wayland + iOS 客户端实机验证。查看端修复为合成事件测试,未做 Mac 主机实机验收。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.48_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.48-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.48`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
查看端显示远端光标形状,KDE 防窥遮罩不再出现在任务栏。/ The native viewer mirrors remote cursor shapes, and the KDE privacy cover no longer appears in the task manager.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **查看端远端光标形状(#168,感谢 @Zhenqiang-Weng)**:SDL 查看端使用主机经现有 CONTROL 消息发来的光标图片和热点(文本、调整大小等),指针离开画面、悬停本地控件或失焦时恢复本地箭头。光标 PNG 有大小和尺寸上限,日志只记录数量和尺寸。
|
||||||
|
The SDL viewer applies the host's cursor image and hotspot from the existing CONTROL message, restoring the local arrow outside the picture, over local controls and on focus loss. Cursor PNGs are size-bounded; logs record only counts and dimensions.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **KDE 防窥遮罩不进任务栏(#169,感谢 @RiverOnVenus)**:隐私屏保模式下,遮罩窗口通过 KWin 脚本设为不显示在任务管理器中(含多显示器的每个遮罩)。/ In picture mode, the cover windows (one per monitor) are hidden from the task manager through KWin scripting.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;KDE 遮罩修复由贡献者在 Plasma 6.8 Wayland 单屏实机验证,多屏未实测。光标形状未做官方主机实机验收。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.49_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.49-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.49`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -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,47 @@
|
|||||||
|
# Device-card wallpaper reporting
|
||||||
|
|
||||||
|
The official Windows host publishes the system wallpaper for device cards. This is separate from
|
||||||
|
the Linux viewer's local last-frame cache and does not require capturing desktop windows on disconnect.
|
||||||
|
|
||||||
|
## Static protocol evidence
|
||||||
|
|
||||||
|
Read-only analysis of the locally installed `GameViewerServer.exe` (SHA-256
|
||||||
|
`af3a15c3887e06bfa9506971e01cd8ec58f41efe8ac9eb5831e31dae1fc1cef8`) found:
|
||||||
|
|
||||||
|
- `ApplicationManager::updateWallpaper`, `getWallpaperPath`, `uploadWallpaper`, and log strings
|
||||||
|
`wallpaper check`, `wallpaper is not changed, the same md5`, `wallpaper file upload succeeded`.
|
||||||
|
The source path recorded in the executable is `server_core/business/apps/application_manager.cpp`.
|
||||||
|
- `0x140ade430`: GET `/api/v1/tool/fp/token?filetype=1`. Response parser `0x140ae3410`
|
||||||
|
reads `token`, `req_url`, `ttl`, optional `max_size` from API data.
|
||||||
|
- `0x140aeb8c0`: POST raw file bytes to `req_url`, with `Authorization` set directly to the
|
||||||
|
file token (no Bearer prefix, multipart wrapper, or account credentials).
|
||||||
|
- Upload callback `0x140ad1010` requires HTTP 200; parser `0x140ae1550` reads top-level
|
||||||
|
`fsize`, `url`, `md5`, `mime`. The wallpaper callback `0x1404206c0` uses `url`.
|
||||||
|
- `0x140b48d80`: POST `/api/v1/device/wallpaper`, JSON `{"wallpaper_url":"<uploaded URL>"}`.
|
||||||
|
Device response parsers and the official viewer also contain `wallpaper_url`.
|
||||||
|
|
||||||
|
Addresses are preferred virtual addresses for that executable only. No official binary, assets,
|
||||||
|
account data, upload tokens, desktop pictures, or account URLs are included here.
|
||||||
|
This establishes the wallpaper flow statically; it does not prove that every official client's
|
||||||
|
last-frame display uses this flow or establish the official timer interval.
|
||||||
|
|
||||||
|
## Linux behavior
|
||||||
|
|
||||||
|
Signed-in graphical hosts check the configured wallpaper on startup and every 60 seconds, upload
|
||||||
|
only changed supported image bytes, and retry failures on a later check. Guest and headless hosts skip
|
||||||
|
reporting. Account renewal replaces the reporting task; stopping the host cancels it. Network work
|
||||||
|
does not block signaling or alter peer connections. Images are bounded to 10 MiB and the file service's
|
||||||
|
advertised limit. HTTPS is required and upload redirects are disabled.
|
||||||
|
|
||||||
|
GNOME/Unity/Cinnamon use GSettings (GNOME dark preference included); KDE reads the first image
|
||||||
|
wallpaper containment, including image packages, or the installed look-and-feel's default wallpaper
|
||||||
|
when no explicit wallpaper is configured; Xfce reads the first `last-image`. Multi-monitor selection, slideshow/XML
|
||||||
|
wallpapers and unsupported formats are not inferred.
|
||||||
|
On Hyprland, Omarchy's `omarchy/current/background` link is read from `XDG_STATE_HOME`
|
||||||
|
(default `~/.local/state`), falling back to the older `XDG_CONFIG_HOME` location
|
||||||
|
(default `~/.config`). Wallpaper/theme changes are followed on the next check.
|
||||||
|
Other compositor-specific wallpaper daemons are not inferred.
|
||||||
|
`UU_WALLPAPER=/absolute/path/image.png` selects a file explicitly; `UU_WALLPAPER_UPLOAD=0` disables
|
||||||
|
reporting. PNG, JPEG, and WebP are supported. No desktop screenshot fallback is used.
|
||||||
|
|
||||||
|
Only success/failure is logged. Paths, hashes, URLs, response bodies and credentials stay out of logs.
|
||||||
@@ -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]);
|
||||||
|
}
|
||||||
|
}
|
||||||
+10
-2
@@ -17,6 +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
|
||||||
|
/// `CF_UNICODETEXT` makes the Windows viewer register a custom format instead of id 13 (issue #151).
|
||||||
|
fn offer_name(self)->&'static str{match self{Self::Windows=>WINDOWS_OFFER_NAME,Self::Mac=>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{
|
||||||
@@ -31,6 +34,7 @@ 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>}
|
||||||
@@ -96,7 +100,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.name(),&mut format);nested(1,&format,&mut list);}
|
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);}
|
||||||
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>{
|
||||||
@@ -210,7 +214,11 @@ mod tests{
|
|||||||
let data=bytes(bytes(bytes(&out.messages[1].1,9).unwrap().unwrap(),3).unwrap().unwrap(),3).unwrap().unwrap();
|
let data=bytes(bytes(bytes(&out.messages[1].1,9).unwrap().unwrap(),3).unwrap().unwrap(),3).unwrap().unwrap();
|
||||||
assert_eq!(data,b"hi");
|
assert_eq!(data,b"hi");
|
||||||
// Host-side offers are unchanged: CF_UNICODETEXT only.
|
// Host-side offers are unchanged: CF_UNICODETEXT only.
|
||||||
assert_eq!(format_ids(&State::default().offer(1,"hi".into()).unwrap()),vec![13]);
|
let host_offer=State::default().offer(1,"hi".into()).unwrap();
|
||||||
|
assert_eq!(format_ids(&host_offer),vec![13]);
|
||||||
|
let list=bytes(bytes(&host_offer,9).unwrap().unwrap(),1).unwrap().unwrap();
|
||||||
|
let format=bytes(list,1).unwrap().unwrap();
|
||||||
|
assert_eq!(text_field(format,2),Ok(WINDOWS_OFFER_NAME));
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
fn desktop_clipboard_negotiates_and_buffers_unicode_until_confirmation(){
|
fn desktop_clipboard_negotiates_and_buffers_unicode_until_confirmation(){
|
||||||
|
|||||||
+123
-4
@@ -99,7 +99,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 +135,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 +153,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 +161,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 +169,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 +254,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);
|
||||||
@@ -841,6 +868,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"))]
|
||||||
@@ -1088,7 +1207,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() }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-2
@@ -5,6 +5,7 @@ mod ws_transport;
|
|||||||
mod engine_plugin;
|
mod engine_plugin;
|
||||||
mod doctor;
|
mod doctor;
|
||||||
mod wol;
|
mod wol;
|
||||||
|
mod wallpaper;
|
||||||
mod desktop_backend;
|
mod desktop_backend;
|
||||||
mod desktop_mode;
|
mod desktop_mode;
|
||||||
mod desktop_session;
|
mod desktop_session;
|
||||||
@@ -47,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;
|
||||||
@@ -775,6 +777,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
client
|
client
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let mut wallpaper_task = AbortOnDrop(wallpaper::start(auth.clone()));
|
||||||
// One peer per viewer connection (desktop, file transfer, terminal...), keyed by ice_id.
|
// One peer per viewer connection (desktop, file transfer, terminal...), keyed by ice_id.
|
||||||
let mut next_capture_type: Option<(u64,crate::session_ice::SessionIce)> = None;
|
let mut next_capture_type: Option<(u64,crate::session_ice::SessionIce)> = None;
|
||||||
let mut capture_types: HashMap<String, (u64,crate::session_ice::SessionIce)> = HashMap::new();
|
let mut capture_types: HashMap<String, (u64,crate::session_ice::SessionIce)> = HashMap::new();
|
||||||
@@ -812,6 +815,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
log::error!("UU login is invalid or expired; a new QR login is required");
|
log::error!("UU login is invalid or expired; a new QR login is required");
|
||||||
let stale = config::read_fresh().ok().flatten().and_then(|f| f.get("token").and_then(|t| t.as_str()).map(str::to_owned));
|
let stale = config::read_fresh().ok().flatten().and_then(|f| f.get("token").and_then(|t| t.as_str()).map(str::to_owned));
|
||||||
auth = Arc::new(UUAuthClient::new(login::wait_for_credentials(stale).await));
|
auth = Arc::new(UUAuthClient::new(login::wait_for_credentials(stale).await));
|
||||||
|
wallpaper_task.0.abort();
|
||||||
|
wallpaper_task = AbortOnDrop(wallpaper::start(auth.clone()));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
@@ -851,8 +856,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
Arc::new(cli)
|
Arc::new(cli)
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let _ = e;
|
// ws_transport errors carry only a category or HTTP status, never the token or URL.
|
||||||
log::error!("Failed to connect signaling; retrying in 5s (details omitted)");
|
log::error!("Failed to connect signaling; retrying in 5s: {e}");
|
||||||
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
|
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
+77
-39
@@ -41,6 +41,7 @@ mod native {
|
|||||||
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_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;
|
||||||
@@ -153,6 +154,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,66 +165,97 @@ 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 {
|
let cancel = cancelled.filter(|_| !virtual_output);
|
||||||
uu_portal_open_virtual(restore, save_token, &mut cache as *mut _ as *mut c_void, &mut error, &mut width, &mut height)
|
let callback = cancel.map(|_| is_cancelled as extern "C" fn(*mut c_void) -> i32);
|
||||||
} else if let Some(cancelled) = cancelled {
|
let cancel_data = cancel.map_or(std::ptr::null_mut(), |value| value as *const _ as *mut c_void);
|
||||||
uu_portal_open_persist_cancellable(
|
unsafe { uu_portal_open_detailed(
|
||||||
restore, save_token, &mut cache as *mut _ as *mut c_void,
|
restore, save_detailed, &mut cache as *mut _ as *mut c_void, callback, cancel_data,
|
||||||
is_cancelled, cancelled as *const _ as *mut c_void,
|
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
|
||||||
@@ -880,9 +913,14 @@ 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));
|
||||||
}
|
}
|
||||||
|
/// Whether a desktop capture session is registered for monitor/virtual switching.
|
||||||
|
pub fn available() -> bool {
|
||||||
|
ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref().and_then(std::sync::Weak::upgrade).is_some()
|
||||||
|
}
|
||||||
/// Privacy screen: see `Session::set_virtual`. Restoring without a live session is a no-op;
|
/// Privacy screen: see `Session::set_virtual`. Restoring without a live session is a no-op;
|
||||||
/// failures switching a live session must reach the controller so its recovery record survives.
|
/// failures switching a live session must reach the controller so its recovery record survives.
|
||||||
pub fn set_virtual_active(on: bool) -> Result<(), String> {
|
pub fn set_virtual_active(on: bool) -> Result<(), String> {
|
||||||
|
|||||||
@@ -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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+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));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -23,3 +23,12 @@ pub fn move_windows_to(output: &str) -> Result<(), String> {
|
|||||||
script(&format!(r#"const v = workspace.screens.find(o => o.name == "{output}");
|
script(&format!(r#"const v = workspace.screens.find(o => o.name == "{output}");
|
||||||
if (v) for (const w of workspace.windowList()) if (w.normalWindow || w.dialog) workspace.sendClientToScreen(w, v);"#))
|
if (v) for (const w of workspace.windowList()) if (w.normalWindow || w.dialog) workspace.sendClientToScreen(w, v);"#))
|
||||||
}
|
}
|
||||||
|
/// 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
|
||||||
|
/// generic "wayland" icon. `skipTaskbar` is writable through KWin scripting. Picture mode creates
|
||||||
|
/// one cover per physical monitor with the same title, and KWin appends " <2>" and so on to
|
||||||
|
/// duplicate captions, so match the title as a prefix.
|
||||||
|
pub fn hide_cover_from_taskbar() -> Result<(), String> {
|
||||||
|
script(r#"for (const w of workspace.windowList())
|
||||||
|
if (w.resourceClass === "uuremote-server" && w.caption.indexOf("uu-remote-linux privacy") === 0) w.skipTaskbar = true;"#)
|
||||||
|
}
|
||||||
@@ -16,7 +16,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 {
|
||||||
@@ -47,6 +47,13 @@ fn cover(data: &Data) -> Result<[f64; 4], String> {
|
|||||||
if physical.len() != data.outputs.len() { return Err("physical outputs did not come back".into()); }
|
if physical.len() != data.outputs.len() { return Err("physical outputs did not come back".into()); }
|
||||||
let region = outputs::region(&layout, &virtual_name).ok_or("virtual output geometry")?;
|
let region = outputs::region(&layout, &virtual_name).ok_or("virtual output geometry")?;
|
||||||
super::cover::show(wallpaper().as_deref(), &physical)?;
|
super::cover::show(wallpaper().as_deref(), &physical)?;
|
||||||
|
// The cover is a plain Wayland toplevel: GTK's skip-taskbar hint is X11-only, so without this
|
||||||
|
// the task manager shows it as an unidentified window with the theme's generic "wayland" icon.
|
||||||
|
// KWin lists a freshly mapped window asynchronously, so one more pass catches a late cover.
|
||||||
|
for pass in 0..2 {
|
||||||
|
if let Err(e) = kwin::hide_cover_from_taskbar() { log::warn!("Privacy cover taskbar: {e}"); break; }
|
||||||
|
if pass == 0 { std::thread::sleep(std::time::Duration::from_millis(200)); }
|
||||||
|
}
|
||||||
Ok(region)
|
Ok(region)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,8 +84,9 @@ impl Backend for Kde {
|
|||||||
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}"));
|
||||||
// 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).
|
||||||
|
|||||||
@@ -21,6 +21,10 @@ static STATE: Mutex<State> = Mutex::new(State { sessions: 0, active: None });
|
|||||||
static ACTIVE: AtomicBool = AtomicBool::new(false);
|
static ACTIVE: AtomicBool = AtomicBool::new(false);
|
||||||
static PICTURE: AtomicBool = AtomicBool::new(false);
|
static PICTURE: AtomicBool = AtomicBool::new(false);
|
||||||
static POINTER: Mutex<Option<[f64; 4]>> = Mutex::new(None);
|
static POINTER: Mutex<Option<[f64; 4]>> = Mutex::new(None);
|
||||||
|
/// Set by any viewer RPC 7 during the current desktop sessions and cleared when the last one
|
||||||
|
/// ends. An auto-enable never overrides it, including an RPC that arrives after the connection
|
||||||
|
/// opens but before `session_started` bumps the counter.
|
||||||
|
static VIEWER_OVERRIDE: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
pub fn supported() -> bool { backend::detect().is_some() }
|
pub fn supported() -> bool { backend::detect().is_some() }
|
||||||
pub fn active() -> bool { ACTIVE.load(Ordering::Relaxed) }
|
pub fn active() -> bool { ACTIVE.load(Ordering::Relaxed) }
|
||||||
@@ -80,7 +84,9 @@ fn save_preference(mode: Mode) {
|
|||||||
if let Err(e) = crate::system_actions::merge_save(|s| s.privacy_type = Some(mode.wire_type())) { log::warn!("Privacy mode not saved: {e}"); }
|
if let Err(e) = crate::system_actions::merge_save(|s| s.privacy_type = Some(mode.wire_type())) { log::warn!("Privacy mode not saved: {e}"); }
|
||||||
}
|
}
|
||||||
/// RPC 7: `mode` is None for an unknown privacy_type.
|
/// RPC 7: `mode` is None for an unknown privacy_type.
|
||||||
fn set(enable: bool, mode: Option<Mode>) -> Result<(), String> {
|
fn set(enable: bool, mode: Option<Mode>) -> Result<(), String> { set_inner(enable, mode, true) }
|
||||||
|
/// `save` records the viewer's preference; the auto-enable path must not overwrite it.
|
||||||
|
fn set_inner(enable: bool, mode: Option<Mode>, save: bool) -> Result<(), String> {
|
||||||
let mut state = STATE.lock().map_err(|_| "privacy state poisoned")?;
|
let mut state = STATE.lock().map_err(|_| "privacy state poisoned")?;
|
||||||
if !enable { return leave(&mut state); }
|
if !enable { return leave(&mut state); }
|
||||||
let mode = mode.ok_or("unsupported privacy type")?;
|
let mode = mode.ok_or("unsupported privacy type")?;
|
||||||
@@ -89,7 +95,7 @@ fn set(enable: bool, mode: Option<Mode>) -> Result<(), String> {
|
|||||||
// A failed rollback keeps the record and the guard: the next request, exit or start retries.
|
// A failed rollback keeps the record and the guard: the next request, exit or start retries.
|
||||||
if result.is_err() { if let Err(e) = leave(&mut state) { log::warn!("Privacy rollback failed: {e}"); } }
|
if result.is_err() { if let Err(e) = leave(&mut state) { log::warn!("Privacy rollback failed: {e}"); } }
|
||||||
drop(state);
|
drop(state);
|
||||||
if result.is_ok() { save_preference(mode); }
|
if result.is_ok() && save { save_preference(mode); }
|
||||||
result
|
result
|
||||||
}
|
}
|
||||||
/// Why RPC 7 cannot be served at all; checked before answering.
|
/// Why RPC 7 cannot be served at all; checked before answering.
|
||||||
@@ -119,21 +125,83 @@ pub fn rpc_accept(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Option
|
|||||||
pub const REPORT_ERROR: i32 = -7;
|
pub const REPORT_ERROR: i32 = -7;
|
||||||
impl Accepted {
|
impl Accepted {
|
||||||
pub fn apply(self) -> Result<(), String> {
|
pub fn apply(self) -> Result<(), String> {
|
||||||
|
VIEWER_OVERRIDE.store(true, Ordering::Relaxed);
|
||||||
let result = set(self.enable, self.mode);
|
let result = set(self.enable, self.mode);
|
||||||
if let Err(e) = &result { log::warn!("Privacy request failed: enable={} mode={:?}: {e}", self.enable, self.mode); }
|
if let Err(e) = &result { log::warn!("Privacy request failed: enable={} mode={:?}: {e}", self.enable, self.mode); }
|
||||||
result
|
result
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn session_started() { if let Ok(mut s) = STATE.lock() { s.sessions += 1; } }
|
/// `UU_PRIVACY_AUTO` accepts `picture`/`2` and `screen-off`/`3`; anything else leaves the viewer
|
||||||
|
/// in charge (and so does the viewer's own RPC 7, which cancels a pending auto-enable).
|
||||||
|
fn parse_auto(value: &str) -> Option<Mode> {
|
||||||
|
match value.trim().to_ascii_lowercase().as_str() {
|
||||||
|
"2" | "picture" => Some(Mode::Picture),
|
||||||
|
"3" | "screen-off" | "screen_off" => Some(Mode::ScreenOff),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fn auto_mode() -> Option<Mode> { std::env::var("UU_PRIVACY_AUTO").ok().as_deref().and_then(parse_auto) }
|
||||||
|
/// Enter the auto mode with the viewer-override check inside the STATE lock, so a request that
|
||||||
|
/// lands between the caller's check and this lock still wins. Ok(false): the viewer overrode it.
|
||||||
|
fn auto_set(mode: Mode) -> Result<bool, String> {
|
||||||
|
let mut state = STATE.lock().map_err(|_| "privacy state poisoned")?;
|
||||||
|
if VIEWER_OVERRIDE.load(Ordering::Relaxed) { return Ok(false); }
|
||||||
|
if state.sessions == 0 { return Err("no active desktop session".into()); }
|
||||||
|
let result = enter(&mut state, mode);
|
||||||
|
if result.is_err() { if let Err(e) = leave(&mut state) { log::warn!("Privacy rollback failed: {e}"); } }
|
||||||
|
result.map(|_| true)
|
||||||
|
}
|
||||||
|
/// The capture session and the viewer's CONTROL state need a moment after the peer connects;
|
||||||
|
/// retry while the portal session is still missing, and let the viewer's RPC 7 win if it arrives.
|
||||||
|
fn auto_enable(mode: Mode) {
|
||||||
|
for attempt in 1..=5 {
|
||||||
|
if VIEWER_OVERRIDE.load(Ordering::Relaxed) {
|
||||||
|
log::info!("Privacy auto: skipped, the viewer already chose a mode");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Not a failure yet: the desktop capture opens its portal session a moment after the peer
|
||||||
|
// connects, and entering without it would roll back and log a restore for nothing.
|
||||||
|
if !crate::portal::available() {
|
||||||
|
log::info!("Privacy auto: waiting for the desktop capture (attempt {attempt})");
|
||||||
|
std::thread::sleep(std::time::Duration::from_secs(1));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
match auto_set(mode) {
|
||||||
|
Ok(true) => { log::info!("Privacy auto: enabled mode={mode:?} on attempt {attempt}"); return; }
|
||||||
|
Ok(false) => { log::info!("Privacy auto: skipped, the viewer already chose a mode"); return; }
|
||||||
|
Err(e) if e.contains("no active desktop session") => return,
|
||||||
|
Err(e) if e.contains("Portal desktop unavailable") => {
|
||||||
|
log::info!("Privacy auto: desktop capture not ready (attempt {attempt})");
|
||||||
|
std::thread::sleep(std::time::Duration::from_secs(1));
|
||||||
|
}
|
||||||
|
Err(e) => { log::warn!("Privacy auto failed: {e}"); return; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
log::warn!("Privacy auto: giving up; the viewer can still enable the privacy screen");
|
||||||
|
}
|
||||||
|
pub fn session_started() {
|
||||||
|
let auto = auto_mode();
|
||||||
|
let first = STATE.lock().ok().is_some_and(|mut s| { s.sessions += 1; s.sessions == 1 });
|
||||||
|
let Some(mode) = auto else { return };
|
||||||
|
if !first { return; }
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(1500));
|
||||||
|
auto_enable(mode);
|
||||||
|
});
|
||||||
|
}
|
||||||
pub fn session_ended() {
|
pub fn session_ended() {
|
||||||
if let Ok(mut s) = STATE.lock() {
|
if let Ok(mut s) = STATE.lock() {
|
||||||
s.sessions = s.sessions.saturating_sub(1);
|
s.sessions = s.sessions.saturating_sub(1);
|
||||||
if s.sessions == 0 { if let Err(e) = leave(&mut s) { log::warn!("Privacy restore failed: {e}"); } }
|
if s.sessions == 0 {
|
||||||
|
VIEWER_OVERRIDE.store(false, Ordering::Relaxed);
|
||||||
|
if let Err(e) = leave(&mut s) { log::warn!("Privacy restore failed: {e}"); }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn shutdown() {
|
pub fn shutdown() {
|
||||||
if let Ok(mut s) = STATE.lock() {
|
if let Ok(mut s) = STATE.lock() {
|
||||||
s.sessions = 0;
|
s.sessions = 0;
|
||||||
|
VIEWER_OVERRIDE.store(false, Ordering::Relaxed);
|
||||||
if let Err(e) = leave(&mut s) { log::warn!("Privacy restore failed: {e}"); }
|
if let Err(e) = leave(&mut s) { log::warn!("Privacy restore failed: {e}"); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -167,6 +235,17 @@ pub fn cover_main(args: &[String]) -> i32 { cover::main(args) }
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
|
#[test]
|
||||||
|
fn parses_auto_privacy_modes() {
|
||||||
|
use super::{parse_auto, Mode};
|
||||||
|
assert_eq!(parse_auto("picture"), Some(Mode::Picture));
|
||||||
|
assert_eq!(parse_auto("2"), Some(Mode::Picture));
|
||||||
|
assert_eq!(parse_auto(" screen-off "), Some(Mode::ScreenOff));
|
||||||
|
assert_eq!(parse_auto("3"), Some(Mode::ScreenOff));
|
||||||
|
assert_eq!(parse_auto("0"), None);
|
||||||
|
assert_eq!(parse_auto("off"), None);
|
||||||
|
assert_eq!(parse_auto(""), None);
|
||||||
|
}
|
||||||
#[test]
|
#[test]
|
||||||
fn enabling_without_a_backend_is_refused_and_reports_off() {
|
fn enabling_without_a_backend_is_refused_and_reports_off() {
|
||||||
let bytes = [10, 2, 8, 42, 58, 4, 8, 1, 16, 3];
|
let bytes = [10, 2, 8, 42, 58, 4, 8, 1, 16, 3];
|
||||||
|
|||||||
+1
-1
@@ -248,7 +248,7 @@ impl SignalingClient {
|
|||||||
let mut req = ws_url
|
let mut req = ws_url
|
||||||
.clone()
|
.clone()
|
||||||
.into_client_request()
|
.into_client_request()
|
||||||
.map_err(|e| format!("Invalid WS request: {}", e))?;
|
.map_err(|_| "Invalid WS request".to_string())?;
|
||||||
|
|
||||||
req.headers_mut().insert(
|
req.headers_mut().insert(
|
||||||
"X-NRD-AUTH",
|
"X-NRD-AUTH",
|
||||||
|
|||||||
@@ -0,0 +1,135 @@
|
|||||||
|
//! Session-scoped remote pointer shapes. Wire evidence is documented in src/cursor.rs.
|
||||||
|
use crate::protocol::{decode_wire,WireValue};
|
||||||
|
use std::sync::{Arc,Mutex};
|
||||||
|
const MAX_SIDE:u32=512;
|
||||||
|
const MAX_PNG:usize=1024*1024;
|
||||||
|
#[derive(Clone,Debug,PartialEq)]
|
||||||
|
pub struct Shape {pub width:u32,pub height:u32,pub hot_x:u32,pub hot_y:u32,pub scale_x:f64,pub scale_y:f64,pub png:Vec<u8>}
|
||||||
|
fn blob(data:&[u8],field:u32)->Option<&[u8]>{decode_wire(data).ok()?.into_iter().find_map(|f|match(f.number,f.value){(n,WireValue::Bytes(v))if n==field=>Some(v),_=>None})}
|
||||||
|
fn parse(data:&[u8])->Result<Option<Shape>,()> {
|
||||||
|
if data.len()>MAX_PNG+512{return Err(())}
|
||||||
|
let Some(change)=blob(data,15) else{return Ok(None)};
|
||||||
|
let Some(shape)=blob(change,2) else{return Ok(None)};
|
||||||
|
let fields=decode_wire(shape).map_err(|_|())?;
|
||||||
|
let uint=|n|fields.iter().find_map(|f|match(f.number,&f.value){(i,WireValue::Varint(v))if i==n=>Some(*v),_=>None}).unwrap_or(0);
|
||||||
|
let scale=|n|fields.iter().find_map(|f|match(f.number,&f.value){(i,WireValue::Fixed64(v))if i==n=>Some(f64::from_le_bytes(*v)),_=>None}).unwrap_or(1.);
|
||||||
|
let png=blob(shape,5).unwrap_or_default();
|
||||||
|
// Type-only/unsupported shapes restore the local arrow instead of leaving a stale resize cursor.
|
||||||
|
if png.is_empty(){return Ok(Some(Shape{width:0,height:0,hot_x:0,hot_y:0,scale_x:1.,scale_y:1.,png:Vec::new()}))}
|
||||||
|
let(width,height)=(u32::try_from(uint(3)).map_err(|_|())?,u32::try_from(uint(4)).map_err(|_|())?);
|
||||||
|
let(hot_x,hot_y)=(u32::try_from(uint(1)).map_err(|_|())?,u32::try_from(uint(2)).map_err(|_|())?);
|
||||||
|
let(scale_x,scale_y)=(scale(7),scale(8));
|
||||||
|
if width==0||height==0||width>MAX_SIDE||height>MAX_SIDE||hot_x>=width||hot_y>=height
|
||||||
|
|| ![scale_x,scale_y].iter().all(|v|v.is_finite()&&*v>0.&&*v<=16.) {return Err(())}
|
||||||
|
if png.len()<33||png.len()>MAX_PNG||!png.starts_with(b"\x89PNG\r\n\x1a\n")||&png[12..16]!=b"IHDR"{return Err(())}
|
||||||
|
let pw=u32::from_be_bytes(png[16..20].try_into().unwrap());let ph=u32::from_be_bytes(png[20..24].try_into().unwrap());
|
||||||
|
if pw==0||ph==0||pw>MAX_SIDE||ph>MAX_SIDE{return Err(())}
|
||||||
|
Ok(Some(Shape{width,height,hot_x,hot_y,scale_x,scale_y,png:png.to_vec()}))
|
||||||
|
}
|
||||||
|
#[derive(Default)] struct Latest {last:Option<Arc<Shape>>,pending:Option<Arc<Shape>>,count:u64}
|
||||||
|
#[derive(Clone,Default)] pub struct State(Arc<Mutex<Latest>>);
|
||||||
|
impl State {
|
||||||
|
pub fn receive(&self,data:&[u8]) {
|
||||||
|
let Ok(Some(shape))=parse(data) else{return};let mut state=self.0.lock().unwrap();
|
||||||
|
if state.last.as_deref()==Some(&shape){return}
|
||||||
|
state.count+=1;
|
||||||
|
if state.count<=3 || state.count%100==0 {log::info!("Viewer remote cursor: count={} size={}x{} png_bytes={}",state.count,shape.width,shape.height,shape.png.len());}
|
||||||
|
let shape=Arc::new(shape);state.last=Some(shape.clone());state.pending=Some(shape);
|
||||||
|
}
|
||||||
|
pub fn take(&self)->Option<Arc<Shape>>{self.0.lock().unwrap().pending.take()}
|
||||||
|
}
|
||||||
|
#[cfg(feature="viewer-sdl")]
|
||||||
|
mod display {
|
||||||
|
use super::*;
|
||||||
|
use sdl2::{mouse::{Cursor,SystemCursor},surface::Surface,pixels::PixelFormatEnum};
|
||||||
|
struct Image {shape:Arc<Shape>,width:u32,height:u32,rgba:Vec<u8>}
|
||||||
|
fn decode(shape:Arc<Shape>)->Result<Image,()> {
|
||||||
|
let mut decoder=png::Decoder::new_with_limits(std::io::Cursor::new(&shape.png),png::Limits{bytes:4*MAX_PNG});
|
||||||
|
decoder.set_ignore_text_chunk(true);decoder.set_ignore_iccp_chunk(true);
|
||||||
|
decoder.set_transformations(png::Transformations::EXPAND|png::Transformations::STRIP_16);
|
||||||
|
let mut reader=decoder.read_info().map_err(|_|())?;
|
||||||
|
let size=reader.output_buffer_size().filter(|v|*v<=MAX_SIDE as usize*MAX_SIDE as usize*4).ok_or(())?;
|
||||||
|
let mut data=vec![0;size];let info=reader.next_frame(&mut data).map_err(|_|())?;
|
||||||
|
if info.width==0||info.height==0||info.width>MAX_SIDE||info.height>MAX_SIDE{return Err(())}
|
||||||
|
data.truncate(info.buffer_size());let mut rgba=Vec::with_capacity(info.width as usize*info.height as usize*4);
|
||||||
|
match info.color_type {
|
||||||
|
png::ColorType::Rgba=>rgba=data,
|
||||||
|
png::ColorType::Rgb=>for p in data.chunks_exact(3){rgba.extend_from_slice(&[p[0],p[1],p[2],255]);},
|
||||||
|
png::ColorType::Grayscale=>for p in data {rgba.extend_from_slice(&[p,p,p,255]);},
|
||||||
|
png::ColorType::GrayscaleAlpha=>for p in data.chunks_exact(2){rgba.extend_from_slice(&[p[0],p[0],p[0],p[1]]);},
|
||||||
|
_=>return Err(()),
|
||||||
|
}
|
||||||
|
if rgba.len()!=info.width as usize*info.height as usize*4{return Err(())}
|
||||||
|
Ok(Image{shape,width:info.width,height:info.height,rgba})
|
||||||
|
}
|
||||||
|
fn geometry(s:&Shape)->(u32,u32,i32,i32) {
|
||||||
|
// Cursor width/hotspot are the host's cursor units. Video coordinate
|
||||||
|
// scales belong to pointer position mapping, not the local OS cursor.
|
||||||
|
// Keep the cursor readable when a large remote desktop is fitted down.
|
||||||
|
let w=s.width.clamp(1,256);let h=s.height.clamp(1,256);
|
||||||
|
let x=(s.hot_x as f64*w as f64/s.width as f64).round().clamp(0.,(w-1) as f64) as i32;
|
||||||
|
let y=(s.hot_y as f64*h as f64/s.height as f64).round().clamp(0.,(h-1) as f64) as i32;
|
||||||
|
(w,h,x,y)
|
||||||
|
}
|
||||||
|
pub struct Display {arrow:Option<Cursor>,remote:Option<Cursor>,image:Option<Image>,geometry:Option<(u32,u32,i32,i32)>,active:bool,applied:u64}
|
||||||
|
impl Display {
|
||||||
|
pub fn new()->Self {Self{arrow:Cursor::from_system(SystemCursor::Arrow).ok(),remote:None,image:None,geometry:None,active:false,applied:0}}
|
||||||
|
pub fn reset(&mut self){if let Some(cursor)=&self.arrow{cursor.set();}self.active=false;}
|
||||||
|
pub fn update(&mut self,shape:Option<Arc<Shape>>,active:bool){
|
||||||
|
if let Some(shape)=shape {
|
||||||
|
self.reset();self.remote=None;self.geometry=None;
|
||||||
|
self.image=if shape.png.is_empty(){None}else{match decode(shape){Ok(image)=>Some(image),Err(())=>{log::warn!("Viewer remote cursor PNG rejected");None}}};
|
||||||
|
}
|
||||||
|
if let Some(image)=self.image.as_mut(){
|
||||||
|
let size=geometry(&image.shape);
|
||||||
|
if self.geometry!=Some(size) {
|
||||||
|
let result=(||->Result<Cursor,String>{
|
||||||
|
let mut src=Surface::from_data(&mut image.rgba,image.width,image.height,image.width*4,PixelFormatEnum::RGBA32)?;
|
||||||
|
src.set_blend_mode(sdl2::render::BlendMode::None)?;
|
||||||
|
let mut target=Surface::new(size.0,size.1,PixelFormatEnum::RGBA32)?;
|
||||||
|
src.blit_scaled(None,&mut target,None)?;
|
||||||
|
Cursor::from_surface(&target,size.2,size.3)
|
||||||
|
})();
|
||||||
|
self.reset();self.remote=match result {Ok(cursor)=>{self.applied+=1;if self.applied<=3||self.applied%100==0{log::info!("Viewer cursor applied: count={} size={}x{}",self.applied,size.0,size.1);}Some(cursor)},Err(_)=>{log::warn!("Viewer remote cursor unavailable on this display");None}};self.geometry=Some(size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let active=active&&self.remote.is_some();
|
||||||
|
if active!=self.active {
|
||||||
|
if active {self.remote.as_ref().unwrap().set();self.active=true;}else{self.reset();}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl Drop for Display {fn drop(&mut self){self.reset();}}
|
||||||
|
#[cfg(test)] mod tests {
|
||||||
|
use super::*;
|
||||||
|
#[test] fn png_pixels_and_retina_hotspot_use_stable_cursor_units(){
|
||||||
|
let mut png=Vec::new();{
|
||||||
|
let mut encoder=png::Encoder::new(&mut png,4,4);encoder.set_color(png::ColorType::Rgba);encoder.set_depth(png::BitDepth::Eight);
|
||||||
|
encoder.write_header().unwrap().write_image_data(&[128;64]).unwrap();
|
||||||
|
}
|
||||||
|
let shape=Arc::new(Shape{width:2,height:2,hot_x:1,hot_y:1,scale_x:2.,scale_y:2.,png});
|
||||||
|
let image=decode(shape.clone()).unwrap();assert_eq!(image.rgba,vec![128;64]);
|
||||||
|
assert_eq!(geometry(&shape),(2,2,1,1));
|
||||||
|
let mut changed=(*shape).clone();changed.scale_x=0.25;changed.scale_y=0.25;assert_eq!(geometry(&changed),(2,2,1,1));
|
||||||
|
let mut bad=(*shape).clone();bad.png[40]^=255;assert!(decode(Arc::new(bad)).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[cfg(feature="viewer-sdl")] pub use display::Display;
|
||||||
|
#[cfg(test)] mod tests {
|
||||||
|
use super::*;
|
||||||
|
fn packet(w:u64,hot:u64,scale:f64,png:&[u8])->Vec<u8>{
|
||||||
|
let mut shape=Vec::new();super::super::wire::int(3,w,&mut shape);super::super::wire::int(4,w,&mut shape);super::super::wire::int(1,hot,&mut shape);
|
||||||
|
super::super::wire::bytes(5,png,&mut shape);shape.push(7<<3|1);shape.extend_from_slice(&scale.to_le_bytes());
|
||||||
|
let mut change=Vec::new();super::super::wire::bytes(2,&shape,&mut change);super::super::wire::envelope(1,15,&change)
|
||||||
|
}
|
||||||
|
#[test] fn shape_bounds_and_latest_only_updates(){
|
||||||
|
let png=include_bytes!("../../tests/fixtures/clipboard-test.png");
|
||||||
|
let state=State::default();let valid=packet(16,2,1.,png);state.receive(&valid);state.receive(&valid);
|
||||||
|
assert_eq!(state.take().unwrap().width,16);assert!(state.take().is_none());
|
||||||
|
for bad in [packet(0,0,1.,png),packet(513,0,1.,png),packet(16,16,1.,png),packet(16,0,f64::NAN,png),packet(16,0,0.,png)] {assert!(parse(&bad).is_err());state.receive(&bad);assert!(state.take().is_none());}
|
||||||
|
state.receive(&packet(20,2,1.,png));state.receive(&packet(24,2,1.,png));assert_eq!(state.take().unwrap().width,24);
|
||||||
|
state.receive(&packet(0,0,1.,&[]));assert!(state.take().unwrap().png.is_empty());
|
||||||
|
assert!(parse(&vec![0;MAX_PNG+513]).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -25,6 +25,7 @@ pub mod native_gamepad;
|
|||||||
pub mod native_rumble;
|
pub mod native_rumble;
|
||||||
|
|
||||||
pub mod clipboard;
|
pub mod clipboard;
|
||||||
|
pub mod cursor;
|
||||||
pub mod power;
|
pub mod power;
|
||||||
pub mod secure_input;
|
pub mod secure_input;
|
||||||
pub mod type_ipc;
|
pub mod type_ipc;
|
||||||
|
|||||||
+6
-4
@@ -45,6 +45,7 @@ pub struct Peer {
|
|||||||
clipboard:super::clipboard::Bridge,
|
clipboard:super::clipboard::Bridge,
|
||||||
pub tools:super::tools::Inbox,
|
pub tools:super::tools::Inbox,
|
||||||
pub rumble:super::native_rumble::Feedback,
|
pub rumble:super::native_rumble::Feedback,
|
||||||
|
pub cursor:super::cursor::State,
|
||||||
pub pc:Arc<RTCPeerConnection>,
|
pub pc:Arc<RTCPeerConnection>,
|
||||||
pub channels:Vec<Arc<RTCDataChannel>>,
|
pub channels:Vec<Arc<RTCDataChannel>>,
|
||||||
pub observed:Arc<Observed>,
|
pub observed:Arc<Observed>,
|
||||||
@@ -80,6 +81,7 @@ impl Peer {
|
|||||||
let pc=Arc::new(api.new_peer_connection(config).await.map_err(|e|format!("Peer creation failed: {}",crate::auth::transport_error(&e)))?);
|
let pc=Arc::new(api.new_peer_connection(config).await.map_err(|e|format!("Peer creation failed: {}",crate::auth::transport_error(&e)))?);
|
||||||
let tools:super::tools::Inbox=Arc::new(std::sync::Mutex::new(None));
|
let tools:super::tools::Inbox=Arc::new(std::sync::Mutex::new(None));
|
||||||
let rumble=super::native_rumble::Feedback::default();
|
let rumble=super::native_rumble::Feedback::default();
|
||||||
|
let cursor=super::cursor::State::default();
|
||||||
let inbox=tools.clone();
|
let inbox=tools.clone();
|
||||||
pc.on_peer_connection_state_change(Box::new(move |state|{
|
pc.on_peer_connection_state_change(Box::new(move |state|{
|
||||||
use webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState;
|
use webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState;
|
||||||
@@ -205,11 +207,11 @@ impl Peer {
|
|||||||
if [0,3,4].contains(&index){closed.lock().unwrap().take();}
|
if [0,3,4].contains(&index){closed.lock().unwrap().take();}
|
||||||
})}));
|
})}));
|
||||||
let state=observed.clone();let inbox=tools.clone();let clipboard_tx=clipboard.sender();
|
let state=observed.clone();let inbox=tools.clone();let clipboard_tx=clipboard.sender();
|
||||||
let feedback=rumble.clone();
|
let feedback=rumble.clone();let pointer=cursor.clone();
|
||||||
let control_for_echo=if index==0 {Arc::downgrade(&channel)} else {std::sync::Weak::new()};
|
let control_for_echo=if index==0 {Arc::downgrade(&channel)} else {std::sync::Weak::new()};
|
||||||
channel.on_message(Box::new(move |message| {let state=state.clone();let inbox=inbox.clone();let control_for_echo=control_for_echo.clone();let clipboard_tx=clipboard_tx.clone();let feedback=feedback.clone();Box::pin(async move {
|
channel.on_message(Box::new(move |message| {let state=state.clone();let inbox=inbox.clone();let control_for_echo=control_for_echo.clone();let clipboard_tx=clipboard_tx.clone();let feedback=feedback.clone();let pointer=pointer.clone();Box::pin(async move {
|
||||||
if index==0 {
|
if index==0 {
|
||||||
feedback.receive(&message.data);
|
feedback.receive(&message.data);pointer.receive(&message.data);
|
||||||
let (codecs,chroma)=wire::media_control(&message.data);
|
let (codecs,chroma)=wire::media_control(&message.data);
|
||||||
if let Some(codecs)=codecs {state.encoder_codecs.store(codecs,Ordering::Release);}
|
if let Some(codecs)=codecs {state.encoder_codecs.store(codecs,Ordering::Release);}
|
||||||
if let Some(chroma)=chroma {
|
if let Some(chroma)=chroma {
|
||||||
@@ -257,7 +259,7 @@ impl Peer {
|
|||||||
Ok::<_,String>((channels,tools,clipboard))
|
Ok::<_,String>((channels,tools,clipboard))
|
||||||
}.await;
|
}.await;
|
||||||
match result {
|
match result {
|
||||||
Ok((channels,tools,clipboard))=>Ok(Self{clipboard,tools,rumble,pc,channels,observed,desktop,audio,answered:false,early:Vec::new(),app_id:app_id.into(),ice_id:ice_id.into(),remote_client:remote_client.into()}),
|
Ok((channels,tools,clipboard))=>Ok(Self{clipboard,tools,rumble,cursor,pc,channels,observed,desktop,audio,answered:false,early:Vec::new(),app_id:app_id.into(),ice_id:ice_id.into(),remote_client:remote_client.into()}),
|
||||||
Err(e)=>{let _=pc.close().await;Err(e)},
|
Err(e)=>{let _=pc.close().await;Err(e)},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+96
-3
@@ -1,7 +1,7 @@
|
|||||||
use super::{desktop::{Frame,FrameSink},input::{Input,Viewport},session::Session};
|
use super::{desktop::{Frame,FrameSink},input::{Input,Viewport},session::Session};
|
||||||
use sdl2::{event::{Event,WindowEvent},mouse::MouseButton,pixels::PixelFormatEnum,rect::Rect};
|
use sdl2::{event::{Event,WindowEvent},mouse::MouseButton,pixels::PixelFormatEnum,rect::Rect};
|
||||||
#[derive(Debug)] enum Command { Files, Type }
|
#[derive(Debug)] enum Command { Files, Type }
|
||||||
pub struct Window { canvas:sdl2::render::Canvas<sdl2::video::Window>, events:sdl2::EventPump, _sdl:sdl2::Sdl, frame:(u32,u32), focused:bool, files:bool, mac:bool,
|
pub struct Window {cursor:super::cursor::Display,canvas:sdl2::render::Canvas<sdl2::video::Window>, events:sdl2::EventPump, _sdl:sdl2::Sdl, frame:(u32,u32), focused:bool, files:bool, mac:bool,
|
||||||
clipboard:sdl2::clipboard::ClipboardUtil, clipboard_dirty:bool, clipboard_tx:tokio::sync::mpsc::Sender<super::clipboard::ClipboardRequest>, clipboard_requests:tokio::sync::mpsc::Receiver<super::clipboard::ClipboardRequest>,
|
clipboard:sdl2::clipboard::ClipboardUtil, clipboard_dirty:bool, clipboard_tx:tokio::sync::mpsc::Sender<super::clipboard::ClipboardRequest>, clipboard_requests:tokio::sync::mpsc::Receiver<super::clipboard::ClipboardRequest>,
|
||||||
pub last_frame:Option<Frame>, chrome:Chrome }
|
pub last_frame:Option<Frame>, chrome:Chrome }
|
||||||
/// In-window chrome state (src/viewer/hud.rs): menu, network panel, loading screen.
|
/// In-window chrome state (src/viewer/hud.rs): menu, network panel, loading screen.
|
||||||
@@ -32,10 +32,18 @@ impl Window {
|
|||||||
title:crate::tr!("正在连接 {name}","Connecting to {name}"),stage:crate::i18n::s("正在连接远端设备…","Contacting the remote device…").into(),labels:Default::default(),menu_cache:None};
|
title:crate::tr!("正在连接 {name}","Connecting to {name}"),stage:crate::i18n::s("正在连接远端设备…","Contacting the remote device…").into(),labels:Default::default(),menu_cache:None};
|
||||||
let events=sdl.event_pump()?;let clipboard=video.clipboard();
|
let events=sdl.event_pump()?;let clipboard=video.clipboard();
|
||||||
let(clipboard_tx,clipboard_requests)=tokio::sync::mpsc::channel(16);
|
let(clipboard_tx,clipboard_requests)=tokio::sync::mpsc::channel(16);
|
||||||
Ok(Self{canvas,events,_sdl:sdl,frame:(1920,1080),focused:true,files:false,mac:false,clipboard,clipboard_dirty:true,clipboard_tx,clipboard_requests,last_frame:None,chrome})
|
Ok(Self{cursor:super::cursor::Display::new(),canvas,events,_sdl:sdl,frame:(1920,1080),focused:true,files:false,mac:false,clipboard,clipboard_dirty:true,clipboard_tx,clipboard_requests,last_frame:None,chrome})
|
||||||
}
|
}
|
||||||
pub fn clipboard_bridge(&self)->super::clipboard::Bridge{super::clipboard::Bridge::sdl(self.clipboard_tx.clone())}
|
pub fn clipboard_bridge(&self)->super::clipboard::Bridge{super::clipboard::Bridge::sdl(self.clipboard_tx.clone())}
|
||||||
pub fn set_mac(&mut self,mac:bool){self.mac=mac;}
|
pub fn set_mac(&mut self,mac:bool){self.mac=mac;}
|
||||||
|
fn sync_cursor(&mut self,state:&super::cursor::State){
|
||||||
|
let mouse=self.events.mouse_state();let(x,y)=(mouse.x() as f64,mouse.y() as f64);let v=self.viewport();
|
||||||
|
let tab=hud::tab_rect(self.chrome.font.as_ref(),self.canvas.window().size(),self.chrome.scale);
|
||||||
|
let active=self.focused&&self.canvas.window().has_mouse_focus()&&!self.chrome.menu.open
|
||||||
|
&&x>=v.x&&y>=v.y&&x<v.x+v.width&&y<v.y+v.height
|
||||||
|
&&!(self.tab_visible()&&tab.contains(x as f32,y as f32));
|
||||||
|
self.cursor.update(state.take(),active);
|
||||||
|
}
|
||||||
fn viewport(&self)->Viewport {
|
fn viewport(&self)->Viewport {
|
||||||
let window=self.canvas.window().size();
|
let window=self.canvas.window().size();
|
||||||
if !self.chrome.state.one_to_one {return Viewport::fit(window,self.frame)}
|
if !self.chrome.state.one_to_one {return Viewport::fit(window,self.frame)}
|
||||||
@@ -345,7 +353,13 @@ fn translate_actions(events:impl IntoIterator<Item=Event>,input:&mut Input,viewp
|
|||||||
if !repeat{*files=true;messages.extend(input.release_all());}None
|
if !repeat{*files=true;messages.extend(input.release_all());}None
|
||||||
},
|
},
|
||||||
_ if !*focused || !input.enabled()=>None,
|
_ if !*focused || !input.enabled()=>None,
|
||||||
Event::KeyDown{scancode:Some(s),repeat:false,..}=>input.key(s as i32,true),
|
Event::KeyDown{scancode:Some(s),keymod,repeat:false,..}=>{
|
||||||
|
// FocusLost releases remote keys, while a modifier may remain physically held.
|
||||||
|
// SDL_Keysym.mod is the event-time snapshot: restore it before the next key,
|
||||||
|
// without querying the final state of a whole polled batch or typing text.
|
||||||
|
if !(224..=231).contains(&(s as i32)){messages.extend(sync_modifiers(input,keymod));}
|
||||||
|
input.key(s as i32,true)
|
||||||
|
},
|
||||||
Event::KeyUp{scancode:Some(s),..}=>input.key(s as i32,false),
|
Event::KeyUp{scancode:Some(s),..}=>input.key(s as i32,false),
|
||||||
Event::MouseMotion{x,y,..}=>viewport.motion(x as f64,y as f64),
|
Event::MouseMotion{x,y,..}=>viewport.motion(x as f64,y as f64),
|
||||||
Event::MouseButtonDown{mouse_btn,..}=>button(mouse_btn).and_then(|b|input.button(b,true)),
|
Event::MouseButtonDown{mouse_btn,..}=>button(mouse_btn).and_then(|b|input.button(b,true)),
|
||||||
@@ -366,6 +380,18 @@ fn translate_actions(events:impl IntoIterator<Item=Event>,input:&mut Input,viewp
|
|||||||
} (quit,messages)
|
} (quit,messages)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn sync_modifiers(input:&mut Input,keymod:sdl2::keyboard::Mod)->Vec<serde_json::Value>{
|
||||||
|
use sdl2::keyboard::Mod as M;
|
||||||
|
let modifiers=[(224,M::LCTRLMOD),(225,M::LSHIFTMOD),(226,M::LALTMOD),(227,M::LGUIMOD),
|
||||||
|
(228,M::RCTRLMOD),(229,M::RSHIFTMOD),(230,M::RALTMOD),(231,M::RGUIMOD)];
|
||||||
|
let mut out=Vec::new();
|
||||||
|
// Release stale modifiers before pressing new ones. Input deduplicates transitions.
|
||||||
|
// Caps/Num/Scroll Lock and MODE are not physical held modifiers.
|
||||||
|
for down in [false,true]{for (scan,flag) in modifiers{
|
||||||
|
if keymod.contains(flag)==down{out.extend(input.key(scan,down));}
|
||||||
|
}}out
|
||||||
|
}
|
||||||
|
|
||||||
fn needs_redraw(event:&Event)->bool{
|
fn needs_redraw(event:&Event)->bool{
|
||||||
matches!(event,Event::Window{win_event:WindowEvent::SizeChanged(..)|WindowEvent::Resized(..)|WindowEvent::Exposed|WindowEvent::Maximized|WindowEvent::Restored,..})
|
matches!(event,Event::Window{win_event:WindowEvent::SizeChanged(..)|WindowEvent::Resized(..)|WindowEvent::Exposed|WindowEvent::Maximized|WindowEvent::Restored,..})
|
||||||
}
|
}
|
||||||
@@ -478,6 +504,7 @@ pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super:
|
|||||||
_=tick.tick()=>{
|
_=tick.tick()=>{
|
||||||
if let Some(playback)=audio.as_mut(){if playback.pump().is_err(){log::warn!("Viewer audio playback stopped");audio=None;}}
|
if let Some(playback)=audio.as_mut(){if playback.pump().is_err(){log::warn!("Viewer audio playback stopped");audio=None;}}
|
||||||
let (quit,mut messages)=window.poll(&mut input);
|
let (quit,mut messages)=window.poll(&mut input);
|
||||||
|
window.sync_cursor(&session.peer.cursor);
|
||||||
if !window.has_picture() {window.loading_frame(false);}
|
if !window.has_picture() {window.loading_frame(false);}
|
||||||
if !restored && session.peer.ready(super::rtc::ReadyPolicy::EchoOnly,false) {restored=true;window.restore_remote_settings();}
|
if !restored && session.peer.ready(super::rtc::ReadyPolicy::EchoOnly,false) {restored=true;window.restore_remote_settings();}
|
||||||
for command in window.take_commands() {
|
for command in window.take_commands() {
|
||||||
@@ -709,6 +736,72 @@ async fn pump_type_job(job: &mut TypeJob, session: &mut Session, window: &mut Wi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)] mod modifier_tests {
|
||||||
|
use super::*;
|
||||||
|
use sdl2::keyboard::{Scancode as S,Mod as M};
|
||||||
|
fn key(scan:S,down:bool,mods:M)->Event{
|
||||||
|
if down{Event::KeyDown{timestamp:0,window_id:1,keycode:None,scancode:Some(scan),keymod:mods,repeat:false}}
|
||||||
|
else{Event::KeyUp{timestamp:0,window_id:1,keycode:None,scancode:Some(scan),keymod:mods,repeat:false}}
|
||||||
|
}
|
||||||
|
fn focus(event:WindowEvent)->Event{Event::Window{timestamp:0,window_id:1,win_event:event}}
|
||||||
|
fn send(input:&mut Input,focused:&mut bool,events:impl IntoIterator<Item=Event>)->Vec<serde_json::Value>{
|
||||||
|
translate(events,input,Viewport::fit((800,600),(1920,1080)),focused).1
|
||||||
|
}
|
||||||
|
fn codes(messages:&[serde_json::Value])->Vec<(&str,i64)>{
|
||||||
|
messages.iter().map(|m|(m["action"].as_str().unwrap(),m["key"].as_i64().unwrap())).collect()
|
||||||
|
}
|
||||||
|
#[test] fn held_left_and_right_modifiers_recover_after_focus_return(){
|
||||||
|
for mac in [false,true]{for (scan,flag) in [(S::LCtrl,M::LCTRLMOD),(S::LShift,M::LSHIFTMOD),
|
||||||
|
(S::LAlt,M::LALTMOD),(S::LGui,M::LGUIMOD),(S::RCtrl,M::RCTRLMOD),(S::RShift,M::RSHIFTMOD),
|
||||||
|
(S::RAlt,M::RALTMOD),(S::RGui,M::RGUIMOD)]{
|
||||||
|
let code=|scan:S|i64::from(if mac{super::super::input::mac_keycode(scan as i32)}else{super::super::input::windows_vk(scan as i32)}.unwrap());
|
||||||
|
let mut input=Input::default();input.set_mac(mac);let mut focused=true;
|
||||||
|
let out=send(&mut input,&mut focused,[key(scan,true,flag),focus(WindowEvent::FocusLost)]);
|
||||||
|
assert_eq!(codes(&out),vec![("kbd_press",code(scan)),("kbd_release",code(scan))]);
|
||||||
|
assert!(!focused);
|
||||||
|
let out=send(&mut input,&mut focused,[focus(WindowEvent::FocusGained),key(S::Num2,true,flag),
|
||||||
|
key(S::Num2,false,flag),key(scan,false,M::NOMOD)]);
|
||||||
|
assert_eq!(codes(&out),vec![("kbd_press",code(scan)),("kbd_press",code(S::Num2)),
|
||||||
|
("kbd_release",code(S::Num2)),("kbd_release",code(scan))]);
|
||||||
|
assert!(input.release_all().is_empty());
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
#[test] fn combined_snapshot_releases_stale_modifiers_before_new_chord(){
|
||||||
|
let mut input=Input::default();input.set_mac(true);let mut focused=true;
|
||||||
|
send(&mut input,&mut focused,[key(S::LShift,true,M::LSHIFTMOD),key(S::RGui,true,M::LSHIFTMOD|M::RGUIMOD)]);
|
||||||
|
let mods=M::RSHIFTMOD|M::LCTRLMOD|M::LALTMOD;
|
||||||
|
let out=send(&mut input,&mut focused,[key(S::A,true,mods),key(S::A,false,mods),
|
||||||
|
key(S::B,true,M::NOMOD),key(S::B,false,M::NOMOD)]);
|
||||||
|
assert_eq!(codes(&out),vec![("kbd_release",56),("kbd_release",54),
|
||||||
|
("kbd_press",59),("kbd_press",58),("kbd_press",60),("kbd_press",0),("kbd_release",0),
|
||||||
|
("kbd_release",59),("kbd_release",58),("kbd_release",60),("kbd_press",11),("kbd_release",11)]);
|
||||||
|
assert!(input.release_all().is_empty());
|
||||||
|
}
|
||||||
|
#[test] fn complete_chords_and_overlapping_letters_are_not_duplicated(){
|
||||||
|
let mut input=Input::default();input.set_mac(true);let mut focused=true;
|
||||||
|
let mods=M::LSHIFTMOD|M::RSHIFTMOD;
|
||||||
|
let out=send(&mut input,&mut focused,[key(S::LShift,true,M::LSHIFTMOD),key(S::RShift,true,mods),
|
||||||
|
key(S::A,true,mods),key(S::B,true,mods),key(S::A,false,mods),key(S::LShift,false,M::RSHIFTMOD),
|
||||||
|
key(S::B,false,M::RSHIFTMOD),key(S::RShift,false,M::NOMOD)]);
|
||||||
|
assert_eq!(codes(&out),vec![("kbd_press",56),("kbd_press",60),("kbd_press",0),("kbd_press",11),
|
||||||
|
("kbd_release",0),("kbd_release",56),("kbd_release",11),("kbd_release",60)]);
|
||||||
|
assert!(input.release_all().is_empty());
|
||||||
|
}
|
||||||
|
#[test] fn snapshot_is_event_time_and_does_not_create_lock_or_view_only_keys(){
|
||||||
|
let mut input=Input::default();let mut focused=true;
|
||||||
|
let out=send(&mut input,&mut focused,[key(S::Num2,true,M::LSHIFTMOD|M::CAPSMOD|M::NUMMOD|M::MODEMOD),
|
||||||
|
key(S::Num2,false,M::LSHIFTMOD),key(S::A,true,M::NOMOD),key(S::A,false,M::NOMOD)]);
|
||||||
|
assert_eq!(codes(&out),vec![("kbd_press",0xa0),("kbd_press",0x32),("kbd_release",0x32),
|
||||||
|
("kbd_release",0xa0),("kbd_press",0x41),("kbd_release",0x41)]);
|
||||||
|
for watch in [false,true]{
|
||||||
|
let mut input=Input::new(watch);let mut focused=false;
|
||||||
|
assert!(send(&mut input,&mut focused,[key(S::A,true,M::LSHIFTMOD)]).is_empty());
|
||||||
|
if watch{assert!(send(&mut input,&mut focused,[focus(WindowEvent::FocusGained),key(S::A,true,M::LSHIFTMOD)]).is_empty());}
|
||||||
|
assert!(input.release_all().is_empty());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)] mod tests {
|
#[cfg(test)] mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
#[cfg_attr(target_os="macos",ignore)]
|
#[cfg_attr(target_os="macos",ignore)]
|
||||||
|
|||||||
@@ -0,0 +1,473 @@
|
|||||||
|
//! Official device-card background reporting. Protocol evidence: docs/wallpaper-protocol.md.
|
||||||
|
use std::{path::PathBuf, sync::Arc, time::Duration};
|
||||||
|
use sha2::{Digest, Sha256};
|
||||||
|
use tokio::io::AsyncReadExt;
|
||||||
|
use crate::auth::UUAuthClient;
|
||||||
|
|
||||||
|
const LIMIT: usize = 10 * 1024 * 1024;
|
||||||
|
const TIMEOUT: Duration = Duration::from_secs(20);
|
||||||
|
|
||||||
|
pub fn start(auth: Arc<UUAuthClient>) -> tokio::task::AbortHandle {
|
||||||
|
tokio::spawn(async move {
|
||||||
|
if auth.creds.user_id.is_empty() || crate::desktop_backend::headless()
|
||||||
|
|| std::env::var("UU_WALLPAPER_UPLOAD").as_deref() == Ok("0") { return; }
|
||||||
|
let mut previous = None;
|
||||||
|
loop {
|
||||||
|
if let Some(path) = source().await {
|
||||||
|
match read_image(&path).await {
|
||||||
|
Ok(image) => {
|
||||||
|
let hash = Sha256::digest(&image).to_vec();
|
||||||
|
if previous.as_ref() != Some(&hash) {
|
||||||
|
match publish(&auth, image).await {
|
||||||
|
Ok(()) => { previous = Some(hash); log::info!("Device wallpaper synchronized"); }
|
||||||
|
Err(stage) => log::warn!("Device wallpaper synchronization failed: stage={stage}; will retry"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(()) => log::debug!("Device wallpaper unavailable or unsupported"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tokio::time::sleep(Duration::from_secs(60)).await;
|
||||||
|
}
|
||||||
|
}).abort_handle()
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn command(program: &str, args: &[&str]) -> Option<String> {
|
||||||
|
let output = tokio::time::timeout(Duration::from_secs(3), tokio::process::Command::new(program)
|
||||||
|
.args(args).kill_on_drop(true).output()).await.ok()?.ok()?;
|
||||||
|
output.status.success().then(|| String::from_utf8(output.stdout).ok()).flatten()
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn kde_config(programs: &[&str], args: &[&str]) -> Option<String> {
|
||||||
|
for program in programs {
|
||||||
|
if let Some(value) = command(program, args).await { return Some(value); }
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn source() -> Option<PathBuf> {
|
||||||
|
if let Some(path) = std::env::var_os("UU_WALLPAPER") {
|
||||||
|
let path = PathBuf::from(path); return path.is_absolute().then_some(path);
|
||||||
|
}
|
||||||
|
let desktop = std::env::var("XDG_CURRENT_DESKTOP").unwrap_or_default().to_lowercase();
|
||||||
|
if desktop.split(':').any(|name| name == "hyprland") {
|
||||||
|
let home = std::env::var_os("HOME").map(PathBuf::from);
|
||||||
|
let xdg = |name, fallback| std::env::var_os(name).map(PathBuf::from)
|
||||||
|
.filter(|p| p.is_absolute()).or_else(|| home.as_ref().map(|p| p.join(fallback)));
|
||||||
|
return omarchy_background(xdg("XDG_STATE_HOME", ".local/state").as_deref(),
|
||||||
|
xdg("XDG_CONFIG_HOME", ".config").as_deref()).await;
|
||||||
|
}
|
||||||
|
if desktop.contains("gnome") || desktop.contains("unity") || desktop.contains("cinnamon") {
|
||||||
|
let schema = if desktop.contains("cinnamon") { "org.cinnamon.desktop.background" } else { "org.gnome.desktop.background" };
|
||||||
|
if schema == "org.gnome.desktop.background" && command("gsettings", &["get", "org.gnome.desktop.interface", "color-scheme"])
|
||||||
|
.await.is_some_and(|v| v.contains("prefer-dark")) {
|
||||||
|
if let Some(path) = command("gsettings", &["get", schema, "picture-uri-dark"]).await.and_then(|v| gsettings_path(&v)) { return Some(path); }
|
||||||
|
}
|
||||||
|
return command("gsettings", &["get", schema, "picture-uri"]).await.and_then(|v| gsettings_path(&v));
|
||||||
|
}
|
||||||
|
if desktop.contains("kde") {
|
||||||
|
let config = std::env::var_os("XDG_CONFIG_HOME").map(PathBuf::from)
|
||||||
|
.filter(|p| p.is_absolute()).or_else(|| std::env::var_os("HOME").map(|h| PathBuf::from(h).join(".config")))?;
|
||||||
|
let text = tokio::fs::read_to_string(config.join("plasma-org.kde.plasma.desktop-appletsrc")).await.unwrap_or_default();
|
||||||
|
if let Some(path) = kde_image(&text) { return package_image(path).await; }
|
||||||
|
// Plasma omits Image for the look-and-feel's default wallpaper.
|
||||||
|
if !kde_default_allowed(&text) { return None; }
|
||||||
|
let readers = ["kreadconfig6", "kreadconfig5"];
|
||||||
|
let theme = kde_config(&readers, &["--file", "kdeglobals", "--group", "KDE", "--key", "LookAndFeelPackage"])
|
||||||
|
.await.unwrap_or_default();
|
||||||
|
let theme = if theme.trim().is_empty() { "org.kde.breeze.desktop" } else { theme.trim() };
|
||||||
|
if theme.contains('/') || theme.contains("..") { return None; }
|
||||||
|
let defaults = format!("/usr/share/plasma/look-and-feel/{theme}/contents/defaults");
|
||||||
|
let image = kde_config(&readers, &["--file", &defaults, "--group", "Wallpaper", "--key", "Image"]).await?;
|
||||||
|
let image = image.trim();
|
||||||
|
if image.is_empty() || image.contains('/') || image.contains("..") { return None; }
|
||||||
|
return package_image(PathBuf::from("/usr/share/wallpapers").join(image)).await;
|
||||||
|
}
|
||||||
|
if desktop.contains("xfce") {
|
||||||
|
let text = command("xfconf-query", &["-c", "xfce4-desktop", "-lv"]).await?;
|
||||||
|
for line in text.lines() {
|
||||||
|
if let Some((key, value)) = line.trim().split_once(char::is_whitespace) {
|
||||||
|
if key.ends_with("/last-image") { if let Some(path) = local_path(value) { return Some(path); } }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
// Omarchy maintains this link when changing wallpaper/theme. Prefer its current
|
||||||
|
// XDG state location, while supporting older installations using XDG config.
|
||||||
|
async fn omarchy_background(state: Option<&std::path::Path>, config: Option<&std::path::Path>) -> Option<PathBuf> {
|
||||||
|
for root in [state, config].into_iter().flatten() {
|
||||||
|
let path = root.join("omarchy/current/background");
|
||||||
|
if tokio::fs::metadata(&path).await.is_ok_and(|meta| meta.is_file()) { return Some(path); }
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn package_image(path: PathBuf) -> Option<PathBuf> {
|
||||||
|
if tokio::fs::metadata(&path).await.ok()?.is_file() { return Some(path); }
|
||||||
|
let mut entries = tokio::fs::read_dir(path.join("contents/images")).await.ok()?;
|
||||||
|
let mut candidates = Vec::new();
|
||||||
|
while let Some(entry) = entries.next_entry().await.ok()? {
|
||||||
|
if !tokio::fs::metadata(entry.path()).await.is_ok_and(|meta| meta.is_file()) { continue; }
|
||||||
|
let path = entry.path();
|
||||||
|
let Some((w,h)) = path.file_stem().and_then(|s| s.to_str()).and_then(|s| s.split_once('x'))
|
||||||
|
.and_then(|(w,h)| Some((w.parse::<u32>().ok()?,h.parse::<u32>().ok()?))) else { continue; };
|
||||||
|
candidates.push(((w < h, u64::from(w) * u64::from(h)), path));
|
||||||
|
}
|
||||||
|
candidates.sort_by_key(|(score, _)| *score);
|
||||||
|
candidates.into_iter().next().map(|(_, path)| path)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn kde_image(text: &str) -> Option<PathBuf> {
|
||||||
|
let plugins = kde_plugins(text);
|
||||||
|
let mut image_section = false;
|
||||||
|
for line in text.lines().map(str::trim) {
|
||||||
|
if line.starts_with('[') {
|
||||||
|
image_section = line.strip_prefix("[Containments][").and_then(|s| s.split_once(']'))
|
||||||
|
.is_some_and(|(id, section)| section == "[Wallpaper][org.kde.image][General]"
|
||||||
|
&& plugins.get(id).map_or(true, |plugin| *plugin == KdeWallpaper::Image));
|
||||||
|
}
|
||||||
|
if image_section { if let Some(value) = line.strip_prefix("Image=") { if let Some(path) = local_path(value) { return Some(path); } } }
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, PartialEq, Eq)]
|
||||||
|
enum KdeWallpaper { Image, Unsupported }
|
||||||
|
|
||||||
|
fn kde_plugins(text: &str) -> std::collections::HashMap<&str, KdeWallpaper> {
|
||||||
|
let mut containment = None;
|
||||||
|
let mut plugins = std::collections::HashMap::new();
|
||||||
|
let mut panels = Vec::new();
|
||||||
|
for line in text.lines().map(str::trim) {
|
||||||
|
if line.starts_with('[') {
|
||||||
|
containment = line.strip_prefix("[Containments][").and_then(|s| s.split_once(']'))
|
||||||
|
.filter(|(_, section)| section.is_empty()).map(|(id, _)| id);
|
||||||
|
}
|
||||||
|
if let Some(id) = containment {
|
||||||
|
plugins.entry(id).or_insert(KdeWallpaper::Image);
|
||||||
|
if line.strip_prefix("plugin=").is_some_and(|plugin| plugin.trim() == "org.kde.panel") { panels.push(id); }
|
||||||
|
if let Some(plugin) = line.strip_prefix("wallpaperplugin=") {
|
||||||
|
plugins.insert(id, if plugin.trim() == "org.kde.image" { KdeWallpaper::Image } else { KdeWallpaper::Unsupported });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Panels can keep an image wallpaper setting, but do not supply a desktop background.
|
||||||
|
for id in panels { plugins.insert(id, KdeWallpaper::Unsupported); }
|
||||||
|
plugins
|
||||||
|
}
|
||||||
|
|
||||||
|
fn kde_default_allowed(text: &str) -> bool {
|
||||||
|
let plugins = kde_plugins(text);
|
||||||
|
if !plugins.is_empty() { return plugins.values().any(|plugin| *plugin == KdeWallpaper::Image); }
|
||||||
|
!text.contains("[Wallpaper][") || text.contains("[Wallpaper][org.kde.image]")
|
||||||
|
}
|
||||||
|
|
||||||
|
fn gsettings_path(value: &str) -> Option<PathBuf> {
|
||||||
|
// gsettings prints a GVariant string, with either quote style and C/Unicode escapes.
|
||||||
|
// https://docs.gtk.org/glib/gvariant-text-format.html#strings
|
||||||
|
let mut chars = value.trim().chars();
|
||||||
|
let quote = chars.next()?;
|
||||||
|
if quote != '\'' && quote != '"' { return None; }
|
||||||
|
let mut decoded = String::new();
|
||||||
|
while let Some(ch) = chars.next() {
|
||||||
|
if ch == quote { return chars.as_str().is_empty().then(|| local_path(&decoded)).flatten(); }
|
||||||
|
if ch != '\\' { decoded.push(ch); continue; }
|
||||||
|
let escaped = chars.next()?;
|
||||||
|
decoded.push(match escaped {
|
||||||
|
'a' => '\x07', 'b' => '\x08', 'f' => '\x0c', 'n' => '\n',
|
||||||
|
'r' => '\r', 't' => '\t', 'v' => '\x0b', '\\' => '\\', '\'' => '\'', '"' => '"',
|
||||||
|
'u' | 'U' => {
|
||||||
|
let mut code = 0u32;
|
||||||
|
for _ in 0..if escaped == 'u' { 4 } else { 8 } { code = u32::checked_add(code.checked_mul(16)?, chars.next()?.to_digit(16)?)?; }
|
||||||
|
char::from_u32(code).filter(|c| *c != '\0')?
|
||||||
|
}
|
||||||
|
'\n' => continue,
|
||||||
|
_ => escaped,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
fn local_path(value: &str) -> Option<PathBuf> {
|
||||||
|
let value = value.trim();
|
||||||
|
let path = if value.starts_with("file:") {
|
||||||
|
let url = reqwest::Url::parse(value).ok()?;
|
||||||
|
if url.query().is_some() || url.fragment().is_some() { return None; }
|
||||||
|
url.to_file_path().ok()?
|
||||||
|
} else { PathBuf::from(value) };
|
||||||
|
path.is_absolute().then_some(path)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn read_image(path: &std::path::Path) -> Result<Vec<u8>, ()> {
|
||||||
|
if !tokio::fs::metadata(path).await.map_err(|_| ())?.is_file() { return Err(()); }
|
||||||
|
let file = tokio::fs::File::open(path).await.map_err(|_| ())?;
|
||||||
|
if !file.metadata().await.map_err(|_| ())?.is_file() { return Err(()); }
|
||||||
|
let mut image = Vec::new();
|
||||||
|
file.take((LIMIT + 1) as u64).read_to_end(&mut image).await.map_err(|_| ())?;
|
||||||
|
if image.len() > LIMIT || image_type(&image).is_none() { return Err(()); }
|
||||||
|
Ok(image)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn image_type(image: &[u8]) -> Option<&'static str> {
|
||||||
|
if image.starts_with(b"\x89PNG\r\n\x1a\n") { Some("image/png") }
|
||||||
|
else if image.starts_with(b"\xff\xd8\xff") { Some("image/jpeg") }
|
||||||
|
else if image.starts_with(b"RIFF") && image.get(8..12) == Some(b"WEBP") { Some("image/webp") }
|
||||||
|
else { None }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn api_data(status: u16, body: &serde_json::Value) -> Result<&serde_json::Value, ()> {
|
||||||
|
if status != 200 || body.get("code").and_then(|v| v.as_i64()) != Some(0) { return Err(()); }
|
||||||
|
body.get("data").ok_or(())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn publish(auth: &UUAuthClient, image: Vec<u8>) -> Result<(), &'static str> {
|
||||||
|
let http = crate::auth::http_client_builder().redirect(reqwest::redirect::Policy::none()).build().map_err(|_| "http-client")?;
|
||||||
|
publish_to(auth, image, crate::auth::BASE_URL, &http).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn json(request: reqwest::RequestBuilder) -> Result<(u16, serde_json::Value), ()> {
|
||||||
|
let mut response = request.timeout(TIMEOUT).send().await.map_err(|_| ())?;
|
||||||
|
let status = response.status().as_u16();
|
||||||
|
let mut bytes = Vec::new();
|
||||||
|
while let Some(chunk) = response.chunk().await.map_err(|_| ())? {
|
||||||
|
if bytes.len() + chunk.len() > 65536 { return Err(()); }
|
||||||
|
bytes.extend_from_slice(&chunk);
|
||||||
|
}
|
||||||
|
Ok((status, serde_json::from_slice(&bytes).map_err(|_| ())?))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn publish_to(auth: &UUAuthClient, image: Vec<u8>, base: &str, http: &reqwest::Client) -> Result<(), &'static str> {
|
||||||
|
let path = "/api/v1/tool/fp/token?filetype=1";
|
||||||
|
let result = json(http.get(format!("{base}{path}")).headers(auth.build_headers("GET", path, ""))).await.map_err(|_| "token-request")?;
|
||||||
|
let data = api_data(result.0, &result.1).map_err(|_| "token-response")?;
|
||||||
|
let token = data.get("token").and_then(|v| v.as_str()).filter(|v| !v.is_empty()).ok_or("file-token")?;
|
||||||
|
let url = data.get("req_url").and_then(|v| v.as_str()).ok_or("upload-url")?;
|
||||||
|
let url = https_url(url).map_err(|_| "upload-url")?;
|
||||||
|
let max = data.get("max_size").and_then(|v| v.as_u64()).filter(|n| *n > 0).unwrap_or(LIMIT as u64);
|
||||||
|
if image.len() as u64 > max { return Err("file-size"); }
|
||||||
|
// Filepicker takes raw bytes and its own Authorization value, never account headers.
|
||||||
|
let response = json(http.post(url).header("Authorization", token)
|
||||||
|
.header("Content-Type", image_type(&image).ok_or("file-type")?).body(image)
|
||||||
|
).await.map_err(|_| "file-upload")?;
|
||||||
|
if response.0 != 200 { return Err("file-upload-status"); }
|
||||||
|
let url = response.1.get("url").and_then(|v| v.as_str()).ok_or("file-response")?;
|
||||||
|
https_url(url).map_err(|_| "file-response-url")?;
|
||||||
|
let path = "/api/v1/device/wallpaper";
|
||||||
|
let body = serde_json::json!({"wallpaper_url": url}).to_string();
|
||||||
|
let result = json(http.post(format!("{base}{path}")).headers(auth.build_headers("POST", path, &body)).body(body)).await.map_err(|_| "report-request")?;
|
||||||
|
if result.0 != 200 || result.1.get("code").and_then(|v| v.as_i64()) != Some(0) { return Err("report-response"); }
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn https_url(value: &str) -> Result<reqwest::Url, ()> {
|
||||||
|
let url = reqwest::Url::parse(value).map_err(|_| ())?;
|
||||||
|
if url.scheme() != "https" || url.host_str().is_none() || !url.username().is_empty() || url.password().is_some() { return Err(()); }
|
||||||
|
Ok(url)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use tokio::io::AsyncWriteExt;
|
||||||
|
#[tokio::test]
|
||||||
|
async fn kde_config_uses_plasma5_when_plasma6_reader_is_unavailable() {
|
||||||
|
use std::os::unix::fs::PermissionsExt;
|
||||||
|
let root = std::env::temp_dir().join(format!("uu-kreadconfig-test-{}-{}", std::process::id(), rand::random::<u64>()));
|
||||||
|
std::fs::create_dir(&root).unwrap();
|
||||||
|
let five = root.join("kreadconfig5"); let six = root.join("kreadconfig6");
|
||||||
|
std::fs::write(&five, "#!/bin/sh\ncase \"$*\" in *LookAndFeelPackage*) echo org.kde.breeze.desktop;; *Image*) echo Next;; esac\n").unwrap();
|
||||||
|
std::fs::set_permissions(&five, std::fs::Permissions::from_mode(0o700)).unwrap();
|
||||||
|
let readers = [six.to_str().unwrap(), five.to_str().unwrap()];
|
||||||
|
assert_eq!(kde_config(&readers, &["--key", "LookAndFeelPackage"]).await.as_deref(), Some("org.kde.breeze.desktop\n"));
|
||||||
|
assert_eq!(kde_config(&readers, &["--key", "Image"]).await.as_deref(), Some("Next\n"));
|
||||||
|
std::fs::write(&six, "#!/bin/sh\necho Plasma6\n").unwrap();
|
||||||
|
std::fs::set_permissions(&six, std::fs::Permissions::from_mode(0o700)).unwrap();
|
||||||
|
assert_eq!(kde_config(&readers, &["--key", "Image"]).await.as_deref(), Some("Plasma6\n"));
|
||||||
|
std::fs::remove_dir_all(root).unwrap();
|
||||||
|
}
|
||||||
|
#[tokio::test]
|
||||||
|
async fn omarchy_follows_current_wallpaper_links_and_supports_legacy_location() {
|
||||||
|
use std::os::unix::fs::symlink;
|
||||||
|
let root = std::env::temp_dir().join(format!("uu-omarchy-{}-{}", std::process::id(), rand::random::<u64>()));
|
||||||
|
let state = root.join("custom-state");
|
||||||
|
let config = root.join("custom-config");
|
||||||
|
for dir in [&state, &config] { std::fs::create_dir_all(dir.join("omarchy/current")).unwrap(); }
|
||||||
|
let current = state.join("omarchy/current/background");
|
||||||
|
let legacy = config.join("omarchy/current/background");
|
||||||
|
let first = root.join("first.png");
|
||||||
|
let second = root.join("second.jpg");
|
||||||
|
std::fs::write(&first, b"\x89PNG\r\n\x1a\n").unwrap();
|
||||||
|
std::fs::write(&second, b"\xff\xd8\xff").unwrap();
|
||||||
|
symlink(&second, &legacy).unwrap();
|
||||||
|
let detect = || omarchy_background(Some(&state), Some(&config));
|
||||||
|
assert_eq!(detect().await, Some(legacy.clone()));
|
||||||
|
symlink(&first, ¤t).unwrap();
|
||||||
|
assert_eq!(detect().await, Some(current.clone()));
|
||||||
|
assert_eq!(read_image(&detect().await.unwrap()).await.unwrap(), std::fs::read(&first).unwrap());
|
||||||
|
std::fs::remove_file(¤t).unwrap(); symlink(&second, ¤t).unwrap();
|
||||||
|
assert_eq!(read_image(&detect().await.unwrap()).await.unwrap(), std::fs::read(&second).unwrap());
|
||||||
|
std::fs::remove_file(¤t).unwrap(); symlink(root.join("missing"), ¤t).unwrap();
|
||||||
|
assert_eq!(detect().await, Some(legacy.clone()));
|
||||||
|
std::fs::remove_file(¤t).unwrap(); symlink(&root, ¤t).unwrap();
|
||||||
|
assert_eq!(detect().await, Some(legacy.clone()));
|
||||||
|
std::fs::remove_file(&legacy).unwrap();
|
||||||
|
assert_eq!(detect().await, None);
|
||||||
|
std::fs::remove_dir_all(root).unwrap();
|
||||||
|
}
|
||||||
|
#[tokio::test]
|
||||||
|
async fn kde_packages_select_landscape_and_image_reads_are_bounded() {
|
||||||
|
let root = std::env::temp_dir().join(format!("uu-wallpaper-test-{}-{}", std::process::id(), rand::random::<u64>()));
|
||||||
|
let images = root.join("contents/images");
|
||||||
|
std::fs::create_dir_all(&images).unwrap();
|
||||||
|
for name in ["1440x2960.png", "5120x2880.png", "7680x2160.png"] {
|
||||||
|
std::fs::write(images.join(name), b"\x89PNG\r\n\x1a\n").unwrap();
|
||||||
|
}
|
||||||
|
let image = package_image(root.clone()).await.unwrap();
|
||||||
|
assert_eq!(image.file_name().unwrap(), "5120x2880.png");
|
||||||
|
assert_eq!(package_image(image.clone()).await, Some(image.clone()));
|
||||||
|
assert!(read_image(&image).await.is_ok());
|
||||||
|
std::fs::write(&image, b"private text is not an image").unwrap();
|
||||||
|
assert!(read_image(&image).await.is_err());
|
||||||
|
std::fs::OpenOptions::new().write(true).open(&image).unwrap().set_len((LIMIT + 1) as u64).unwrap();
|
||||||
|
assert!(read_image(&image).await.is_err());
|
||||||
|
assert!(read_image(&root).await.is_err());
|
||||||
|
std::fs::remove_dir_all(root).unwrap();
|
||||||
|
}
|
||||||
|
#[tokio::test]
|
||||||
|
async fn kde_packages_follow_image_symlinks_and_skip_invalid_targets() {
|
||||||
|
use std::os::unix::fs::symlink;
|
||||||
|
let root = std::env::temp_dir().join(format!("uu-wallpaper-links-test-{}-{}", std::process::id(), rand::random::<u64>()));
|
||||||
|
let images = root.join("contents/images");
|
||||||
|
std::fs::create_dir_all(&images).unwrap();
|
||||||
|
let target = root.join("shared.png");
|
||||||
|
std::fs::write(&target, b"\x89PNG\r\n\x1a\n").unwrap();
|
||||||
|
let image = images.join("1920x1080.png");
|
||||||
|
symlink("../../shared.png", &image).unwrap();
|
||||||
|
symlink("../../missing.png", images.join("640x480.png")).unwrap();
|
||||||
|
symlink(&root, images.join("800x600.png")).unwrap();
|
||||||
|
assert_eq!(package_image(root.clone()).await, Some(image.clone()));
|
||||||
|
assert!(read_image(&image).await.is_ok());
|
||||||
|
std::fs::remove_dir_all(root).unwrap();
|
||||||
|
}
|
||||||
|
#[tokio::test]
|
||||||
|
async fn reporting_protocol_keeps_file_token_separate_and_stops_on_failures() {
|
||||||
|
use tokio_rustls::{rustls, TlsAcceptor};
|
||||||
|
use rustls::pki_types::{CertificateDer, PrivateKeyDer, PrivatePkcs8KeyDer};
|
||||||
|
let cert = rcgen::generate_simple_self_signed(vec!["localhost".into()]).unwrap();
|
||||||
|
let der = cert.serialize_der().unwrap();
|
||||||
|
let http = reqwest::Client::builder().no_proxy().redirect(reqwest::redirect::Policy::none())
|
||||||
|
.add_root_certificate(reqwest::Certificate::from_der(&der).unwrap()).build().unwrap();
|
||||||
|
let config = rustls::ServerConfig::builder_with_provider(Arc::new(rustls::crypto::ring::default_provider()))
|
||||||
|
.with_safe_default_protocol_versions().unwrap().with_no_client_auth()
|
||||||
|
.with_single_cert(vec![CertificateDer::from(der)], PrivateKeyDer::Pkcs8(
|
||||||
|
PrivatePkcs8KeyDer::from(cert.serialize_private_key_der()))).unwrap();
|
||||||
|
let acceptor = TlsAcceptor::from(Arc::new(config));
|
||||||
|
let auth = UUAuthClient::new(crate::auth::Credentials {
|
||||||
|
token: "fixture-account-token".into(), csrf: "fixture-csrf".into(),
|
||||||
|
sign_key: "fixture-key".into(), ..Default::default()
|
||||||
|
});
|
||||||
|
for scenario in ["success", "token-failed", "too-large", "upload-failed", "report-failed"] {
|
||||||
|
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||||
|
let base = format!("https://localhost:{}", listener.local_addr().unwrap().port());
|
||||||
|
let server_base = base.clone(); let acceptor = acceptor.clone();
|
||||||
|
let steps = match scenario { "token-failed" | "too-large" => 1, "upload-failed" => 2, _ => 3 };
|
||||||
|
let server = tokio::spawn(async move {
|
||||||
|
for step in 0..steps {
|
||||||
|
let (socket, _) = listener.accept().await.unwrap();
|
||||||
|
let mut tls = acceptor.accept(socket).await.unwrap();
|
||||||
|
let mut bytes = Vec::new(); let mut byte = [0u8; 1];
|
||||||
|
while !bytes.ends_with(b"\r\n\r\n") {
|
||||||
|
tls.read_exact(&mut byte).await.unwrap(); bytes.push(byte[0]); assert!(bytes.len() < 16384);
|
||||||
|
}
|
||||||
|
let headers = String::from_utf8(bytes).unwrap().to_lowercase();
|
||||||
|
let length: usize = headers.lines().find_map(|l| l.strip_prefix("content-length:")
|
||||||
|
.and_then(|s| s.trim().parse().ok())).unwrap_or(0);
|
||||||
|
let mut body = vec![0; length]; tls.read_exact(&mut body).await.unwrap();
|
||||||
|
let (status, reply) = match step {
|
||||||
|
0 => {
|
||||||
|
assert!(headers.starts_with("get /api/v1/tool/fp/token?filetype=1 "));
|
||||||
|
assert!(headers.contains("authorization: bearer fixture-account-token\r\n"));
|
||||||
|
assert!(headers.contains("x-param-sign:")); assert!(body.is_empty());
|
||||||
|
(200, serde_json::json!({"code":if scenario=="token-failed" {1120}else{0},
|
||||||
|
"data":{"token":"fixture-file-token","req_url":format!("{server_base}/upload"),"ttl":60,
|
||||||
|
"max_size":if scenario=="too-large" {1}else{1024}}}))
|
||||||
|
}
|
||||||
|
1 => {
|
||||||
|
assert!(headers.starts_with("post /upload "));
|
||||||
|
assert!(headers.contains("authorization: fixture-file-token\r\n"));
|
||||||
|
for secret in ["fixture-account-token", "fixture-csrf", "cookie:", "x-param-"] { assert!(!headers.contains(secret)); }
|
||||||
|
assert_eq!(body, b"\x89PNG\r\n\x1a\n");
|
||||||
|
(if scenario=="upload-failed" {500}else{200}, serde_json::json!({"url":"https://example.invalid/wallpaper.png","fsize":8,"md5":"fixture","mime":"image/png"}))
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
assert!(headers.starts_with("post /api/v1/device/wallpaper "));
|
||||||
|
assert!(headers.contains("authorization: bearer fixture-account-token\r\n"));
|
||||||
|
assert!(!headers.contains("fixture-file-token"));
|
||||||
|
assert_eq!(serde_json::from_slice::<serde_json::Value>(&body).unwrap(), serde_json::json!({"wallpaper_url":"https://example.invalid/wallpaper.png"}));
|
||||||
|
(200, serde_json::json!({"code":if scenario=="report-failed" {1120}else{0}}))
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let reply = reply.to_string();
|
||||||
|
tls.write_all(format!("HTTP/1.1 {status} Fixture\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{reply}", reply.len()).as_bytes()).await.unwrap();
|
||||||
|
tls.shutdown().await.unwrap();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
let result = tokio::time::timeout(Duration::from_secs(5), publish_to(&auth, b"\x89PNG\r\n\x1a\n".to_vec(), &base, &http)).await.unwrap();
|
||||||
|
assert_eq!(result.is_ok(), scenario == "success", "{scenario}");
|
||||||
|
tokio::time::timeout(Duration::from_secs(5), server).await.unwrap().unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[test] fn wallpaper_sources_are_local_and_scoped() {
|
||||||
|
assert_eq!(gsettings_path("'file:///usr/share/a%20b.png'"), Some(PathBuf::from("/usr/share/a b.png")));
|
||||||
|
for value in ["", "relative.png", "https://example.com/a.png", "file://remote/a.png", "file:///tmp/a.png?token=secret"] { assert!(local_path(value).is_none()); }
|
||||||
|
assert_eq!(kde_image("[Other]\nImage=/wrong.png\n[Containments][2][Wallpaper][org.kde.image][General]\nImage=file:///right.png"), Some(PathBuf::from("/right.png")));
|
||||||
|
}
|
||||||
|
#[test] fn gsettings_decodes_quotes_backslashes_and_unicode() {
|
||||||
|
assert_eq!(gsettings_path("\"file:///tmp/it's.png\""), Some(PathBuf::from("/tmp/it's.png")));
|
||||||
|
assert_eq!(gsettings_path(r#"'file:///tmp/it\'s.png'"#), Some(PathBuf::from("/tmp/it's.png")));
|
||||||
|
assert_eq!(gsettings_path(r#"'/tmp/a\\b\t\u00e9\U0001f600.png'"#), Some(PathBuf::from("/tmp/a\\b\té😀.png")));
|
||||||
|
for value in ["'unterminated", "'/tmp/a' trailing", r#"'/tmp/\uD800'"#, r#"'/tmp/\Uffffffff'"#] { assert!(gsettings_path(value).is_none()); }
|
||||||
|
assert_eq!(gsettings_path(r#"'/tmp/\x41'"#), Some(PathBuf::from("/tmp/x41")));
|
||||||
|
assert_eq!(local_path("/tmp/it's.png"), Some(PathBuf::from("/tmp/it's.png")));
|
||||||
|
}
|
||||||
|
#[test] fn kde_default_survives_saved_image_settings_but_not_other_plugins() {
|
||||||
|
let image = "[Containments][1]\nwallpaperplugin=org.kde.image\n[Containments][1][Wallpaper][org.kde.image][General]\nFillMode=1\n";
|
||||||
|
assert!(kde_image(image).is_none()); assert!(kde_default_allowed(image));
|
||||||
|
assert!(kde_default_allowed("[Containments][1][Wallpaper][org.kde.image][General]\nFillMode=1"));
|
||||||
|
assert!(kde_default_allowed(""));
|
||||||
|
assert!(!kde_default_allowed(&image.replace("wallpaperplugin=org.kde.image", "wallpaperplugin=org.kde.slideshow")));
|
||||||
|
assert!(!kde_default_allowed("[Containments][1][Wallpaper][org.kde.slideshow][General]\nSlidePaths=/tmp"));
|
||||||
|
}
|
||||||
|
#[test] fn kde_stored_images_belong_to_the_same_active_image_containment() {
|
||||||
|
let stale = "[Containments][1]\nwallpaperplugin=org.kde.slideshow\n[Containments][1][Wallpaper][org.kde.image][General]\nImage=/tmp/previous.png\n";
|
||||||
|
assert!(kde_image(stale).is_none());
|
||||||
|
assert!(!kde_default_allowed(stale));
|
||||||
|
let mixed = format!("{stale}[Containments][2]\nwallpaperplugin=org.kde.image\n[Containments][2][Wallpaper][org.kde.image][General]\nImage=/tmp/current.png\n");
|
||||||
|
assert_eq!(kde_image(&mixed), Some(PathBuf::from("/tmp/current.png")));
|
||||||
|
assert_eq!(kde_image(&stale.replace("org.kde.slideshow", "org.kde.image")), Some(PathBuf::from("/tmp/previous.png")));
|
||||||
|
}
|
||||||
|
#[test] fn kde_panels_do_not_enable_default_wallpaper_or_supply_saved_images() {
|
||||||
|
let panel = "[Containments][2]\nwallpaperplugin=org.kde.image\nplugin=org.kde.panel\n[Containments][2][Wallpaper][org.kde.image][General]\nImage=/tmp/panel.png\n";
|
||||||
|
let slideshow = "[Containments][1]\nplugin=org.kde.plasma.folder\nwallpaperplugin=org.kde.slideshow\n";
|
||||||
|
assert!(!kde_default_allowed(slideshow));
|
||||||
|
assert!(!kde_default_allowed(&format!("{slideshow}{panel}")));
|
||||||
|
assert!(kde_image(&format!("{slideshow}{panel}")).is_none());
|
||||||
|
assert!(!kde_default_allowed(panel));
|
||||||
|
let desktop = "[Containments][1]\nplugin=org.kde.plasma.folder\n";
|
||||||
|
assert!(kde_default_allowed(&format!("{desktop}{panel}")));
|
||||||
|
}
|
||||||
|
#[test] fn only_supported_image_files_are_uploaded() {
|
||||||
|
assert_eq!(image_type(b"\x89PNG\r\n\x1a\n"), Some("image/png"));
|
||||||
|
assert_eq!(image_type(b"\xff\xd8\xff"), Some("image/jpeg"));
|
||||||
|
assert_eq!(image_type(b"RIFF1234WEBP"), Some("image/webp"));
|
||||||
|
assert_eq!(image_type(b"<wallpaper>private text</wallpaper>"), None);
|
||||||
|
}
|
||||||
|
#[test] fn failed_api_responses_and_unsafe_upload_urls_are_rejected() {
|
||||||
|
assert!(api_data(200, &serde_json::json!({"code":0,"data":{}})).is_ok());
|
||||||
|
assert!(api_data(422, &serde_json::json!({"code":1120})).is_err());
|
||||||
|
assert!(api_data(200, &serde_json::json!({"data":{}})).is_err());
|
||||||
|
for url in ["http://example.com", "file:///tmp/a", "https://[email protected]"] { assert!(https_url(url).is_err()); }
|
||||||
|
}
|
||||||
|
}
|
||||||
+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);
|
||||||
|
|||||||
+27
-1
@@ -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; }
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -1002,6 +1004,7 @@ impl WebRtcSession {
|
|||||||
// Default file-transfer folder: the desktop user's home directory.
|
// Default file-transfer folder: the desktop user's home directory.
|
||||||
let home = std::env::var("HOME").unwrap_or_else(|_| "/".into());
|
let home = std::env::var("HOME").unwrap_or_else(|_| "/".into());
|
||||||
let (mut desktop, mut promoted, mut lock_reported) = (desktop, false, desktop);
|
let (mut desktop, mut promoted, mut lock_reported) = (desktop, false, desktop);
|
||||||
|
let mut privacy_reported = false;
|
||||||
let mut screen = screen;
|
let mut screen = screen;
|
||||||
loop {
|
loop {
|
||||||
loop {
|
loop {
|
||||||
@@ -1056,11 +1059,20 @@ impl WebRtcSession {
|
|||||||
if !lock_reported {
|
if !lock_reported {
|
||||||
lock_reported = true;
|
lock_reported = true;
|
||||||
tokio::spawn(crate::session_lock::report_states(channel.clone(), sequence.clone(), crate::session_lock::watch_locked()));
|
tokio::spawn(crate::session_lock::report_states(channel.clone(), sequence.clone(), crate::session_lock::watch_locked()));
|
||||||
|
}
|
||||||
|
// The viewer's menu only learns about a mode it did not ask for (an
|
||||||
|
// auto-enable) from this push, so desktop peers need it too, not only a
|
||||||
|
// tool peer promoted to desktop.
|
||||||
|
if !privacy_reported && crate::privacy_screen::supported() {
|
||||||
|
privacy_reported = true;
|
||||||
let (channel, sequence, actions) = (channel.clone(), sequence.clone(), init_actions.clone());
|
let (channel, sequence, actions) = (channel.clone(), sequence.clone(), init_actions.clone());
|
||||||
let portal = portal_desktop.clone();
|
let portal = portal_desktop.clone();
|
||||||
let text_out = text_out.clone();
|
let text_out = text_out.clone();
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
let mut previous = crate::privacy_screen::current_type();
|
// 0 is not a wire type: the first tick must push the effective state.
|
||||||
|
// An auto-enable can land before this task starts, and the viewer
|
||||||
|
// never sent an RPC to learn the mode from a response.
|
||||||
|
let mut previous = 0u8;
|
||||||
let mut tick = tokio::time::interval(std::time::Duration::from_secs(1));
|
let mut tick = tokio::time::interval(std::time::Duration::from_secs(1));
|
||||||
loop {
|
loop {
|
||||||
tick.tick().await;
|
tick.tick().await;
|
||||||
@@ -1068,6 +1080,7 @@ impl WebRtcSession {
|
|||||||
let current = crate::privacy_screen::current_type();
|
let current = crate::privacy_screen::current_type();
|
||||||
if current == previous { continue; }
|
if current == previous { continue; }
|
||||||
previous = current;
|
previous = current;
|
||||||
|
log::info!("Privacy state change pushed: type={current}");
|
||||||
let permission = portal.as_ref().map_or(crate::system_metrics::Permission::Allow, |p| p.snapshot().permission(true));
|
let permission = portal.as_ref().map_or(crate::system_metrics::Permission::Allow, |p| p.snapshot().permission(true));
|
||||||
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 payload = actions.metrics_payload(desktop_sound, permission);
|
let payload = actions.metrics_payload(desktop_sound, permission);
|
||||||
@@ -1075,6 +1088,9 @@ impl WebRtcSession {
|
|||||||
text_out.metrics(message.clone());
|
text_out.metrics(message.clone());
|
||||||
if channel.send(&bytes::Bytes::from(message)).await.is_err() { return; }
|
if channel.send(&bytes::Bytes::from(message)).await.is_err() { return; }
|
||||||
let state = crate::privacy_screen::state_message(sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts);
|
let state = crate::privacy_screen::state_message(sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts);
|
||||||
|
// Android 4.43.0 handles privacy replies on TEXT; CONTROL stays for
|
||||||
|
// viewers that only read the desktop channel.
|
||||||
|
let _ = text_out.send(state.clone());
|
||||||
if channel.send(&bytes::Bytes::from(state)).await.is_err() { return; }
|
if channel.send(&bytes::Bytes::from(state)).await.is_err() { return; }
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -1191,6 +1207,16 @@ 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));
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
|
After Width: | Height: | Size: 68 B |
@@ -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