Compare commits

..
31 Commits
Author SHA1 Message Date
VallierDevandClaude Opus 5.5 7b8980771d release: v0.2.49
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-11-03 23:40:44 +08:00
Mr. Error 50ff42e8d7 Privacy: keep the cover window out of the task manager (#169)
* fix(privacy): keep the cover window out of the task manager

The cover is a plain Wayland toplevel and GTK's skip-taskbar hint is X11
only, so KWin listed it: the task manager showed an unidentified window
(class uuremote-server, caption "uu-remote-linux privacy") with the icon
theme's generic "wayland" icon, a yellow W in Papirus.

Mark the window through KWin scripting after the cover reports ready. The
same one-shot script mechanism already moves windows to the virtual output.
Failure only logs; the cover itself is unaffected.

Verified on KDE Plasma 6.8 Wayland: setting skipTaskbar on the running
cover removes the task manager entry immediately, and the entry returns
when a new cover window is created without the fix. `cargo test --features
wayland,portal`: 320 passed, 10 ignored.

* fix(privacy): match every cover window, not just the first caption

Picture mode creates one cover per physical monitor with the same title,
and KWin appends " <2>" and similar suffixes to duplicate captions, so the
exact match skipped every cover after the first on a multi-monitor host.
Match the title as a prefix instead.

* fix(privacy): report the cover ready only after its windows are mapped

The child wrote "ready" before gtk_main(), so the host marked skip-taskbar
while KWin may not have listed the cover yet; a cover that mapped later
kept the task manager entry. Pump the pending GTK events to map the windows
before the handshake, and run the mark script a second time to catch a
compositor-side delay.
2026-11-03 22:39:08 +08:00
Zhenqiang Weng ba8f8ada20 viewer: mirror remote cursor shapes and hotspots in SDL (#168) 2026-11-03 19:35:53 +08:00
VallierDevandClaude Opus 5.5 c461db10a4 release: v0.2.48
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-11-03 16:34:29 +08:00
Mr. Error 4c86c7f782 Privacy: auto-enable on desktop connect (UU_PRIVACY_AUTO) (#161)
* feat(privacy): auto-enable the privacy screen on desktop connect

`UU_PRIVACY_AUTO=picture` / `screen-off` (or 2 / 3) enables the privacy
screen when the first desktop controller connects. Off by default. The
switch waits for the portal capture session and retries while it is
missing; the viewer's own RPC 7 cancels a pending auto-enable for that
session.

The privacy state poller that pushes SystemMetrics and SystemStateChange
now starts for desktop peers too (it only ran for a tool peer promoted to
desktop), and it pushes once on its first tick. A mode the viewer did not
request, such as an auto-enable, therefore reaches its menu, and the
state message also goes to TEXT, which viewers read for privacy replies.

Verified on KDE Plasma Wayland with an iOS viewer: auto picture and auto
screen-off both engage, the menu reflects the mode after the push, and a
disconnect restores the physical outputs. `cargo test --features
wayland,portal`: 320 passed, 10 ignored.

* fix(privacy): let a viewer request win against auto-enable races

Two paths could still override an explicit choice:

- the override was checked before acquiring STATE, so an RPC 7 applied in
  that window could disable privacy and the auto thread could turn it back
  on; the check now happens inside the same lock that enters the mode
- `session_started` captured the override counter as its baseline, so a
  request that arrived after CONTROL opened but before the session counter
  started was treated as unrelated and auto-enable ran anyway; the counter
  is now a flag set by any RPC 7 and cleared only when the last desktop
  session ends

docs/privacy-screen.md now says remote-assistance (guest) sessions are
covered too, and that supported hosts push the current privacy state once
on every desktop connect.
2026-11-03 16:33:41 +08:00
VallierDevandClaude Opus 5.5 81e9ccfa05 fix(signaling): log the sanitized reason when signaling fails to connect
The WebSocket transport already reduces errors to a category or HTTP status
without the token or endpoint, so log it instead of 'details omitted' to tell
a refused upgrade from a network failure (#166).

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-11-03 15:34:34 +08:00
Zhenqiang Weng c0abdeae72 fix(viewer): restore held modifier combinations after focus changes (#165) 2026-11-03 15:33:13 +08:00
Zhenqiang Weng 1dad755823 fix(viewer): use theme icons in the launcher (#158) 2026-11-03 14:01:02 +08:00
Jeff Zhang fcfd2b6717 feat(wallpaper): discover Omarchy backgrounds automatically (#157)
Read Omarchy's current/background link (XDG_STATE_HOME, falling back to XDG_CONFIG_HOME) on Hyprland; explicit UU_WALLPAPER keeps precedence.
2026-11-03 12:31:33 +08:00
VallierDevandClaude Opus 5.5 73c503a244 release: v0.2.47
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-11-03 01:26:54 +08:00
Jeff ZhangandJeff Zhang 3bce605eaa feat(host): 上报系统壁纸,补齐设备卡片缩略图 (#153)
* feat(host): report system wallpaper for device cards

* fix(host): handle quoted wallpaper paths and KDE defaults

* docs: align wallpaper guidance and disclose default uploads

* fix(host): validate active KDE plugin for stored wallpapers

* fix(host): support Plasma 5 wallpaper config queries

* fix(host): exclude Plasma panels from wallpaper reporting

* fix(host): follow image symlinks in KDE wallpaper packages

---------

Co-authored-by: Jeff Zhang <[email protected]>
2026-11-03 01:25:57 +08:00
VallierDevandClaude Opus 5.5 ebdd362452 release: v0.2.46
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-11-02 18:23:23 +08:00
VallierDevandClaude Opus 5.5 26811018e0 fix(clipboard): name the Unicode text offer predefined_13 for Windows viewers
A CF_UNICODETEXT name made the Windows viewer register a custom
clipboard format instead of using id 13, so Linux text never reached
the standard Unicode format. Fixes #151.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-11-02 18:23:23 +08:00
VallierDevandClaude Opus 5.5 c3959c01e9 release: v0.2.45
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-11-02 13:20:08 +08:00
m ef14f76422 fix(viewer): disable local IME text input in remote desktop window (#150) 2026-11-02 13:18:55 +08:00
VallierDevandClaude Opus 5.5 480819e369 release: v0.2.44
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-11-02 11:18:42 +08:00
Jeff Zhang f4f16aafe4 fix(privacy): synchronize Mac viewer privacy status over TEXT (#148)
* fix(privacy): synchronize Mac viewer privacy status over TEXT

* fix(webrtc): bound pending TEXT replies and coalesce metrics
2026-11-02 11:17:55 +08:00
VallierDevandClaude Opus 5.5 cb6f5b6617 release: v0.2.43
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-11-02 02:14:37 +08:00
Jeff Zhang 8e30371317 feat(host): KDE Wayland privacy screen (RPC 7) (#146)
* feat(host): KDE Wayland 被控端防窥模式(隐私 / 关屏)

viewer RPC 7 打开防窥时,采集和输入切到 KWin 虚拟输出(portal ScreenCast VIRTUAL),
再用 kscreen-doctor 禁用物理屏;隐私模式随后重新启用物理屏并全屏覆盖桌面壁纸。
防窥期间通过 KWin InputDevice 禁用本地键鼠,指针/按键/文字改走 uinput
(KDE 不处理虚拟输出共享上的 portal 输入)。

- privacy_type 实测:1 关闭、2 隐私(壁纸)、3 关屏;SettingMetric 4/7 上报真实状态
- 恢复记录 + privacy-guard 子进程:主机以任何方式结束(含 SIGKILL)都恢复屏幕和输入
- src/privacy_screen/ 分层:控制器/协议/记录/守护/遮挡窗口共享,桌面实现走 Backend trait(kde/)
- portal:Session::set_virtual,闭包恢复按当前源重开;编码器随 portal 尺寸变化重建

Refs #140

* fix(privacy): 按 Mac 客户端协议应答防窥请求,修复授权竞态

- FeatureFlag ff_private_screen=2(ENHANCED_PRIVACY),声明支持关屏
- 先回 RPC 7 应答再切换,避免客户端超时报 9998;切换失败发 ReportError -7
- 应答 RPC 25 update_screen_saver_req(RpcResponse 21),隐私模式不再被中止
- SettingMetric 4/7 上报开关与最近一次模式(host_settings.json privacy_type),状态变化推送 SystemStateChange 5
- portal 会话串行打开,打开失败回填一次性授权:快速重连时防窥切换与闭包恢复并发曾清空保存的授权

字段号与枚举取自官方 Mac 客户端的 SwiftProtobuf name map。
已知限制:Mac 客户端防窥菜单切换后仍显示"不启用",实际模式正确。

Refs #140

* fix(privacy): 处理 #146 评审意见

- 预检 uinput:injector 未打开 uinput(/dev/uinput 不可用或 UU_INPUT_BACKEND=native)时,
  在改动输出和设备之前拒绝防窥(虚拟输出共享上 KDE 忽略 portal 输入)
- leave() 中输入设备恢复失败在恢复输出后向上返回,保留 privacy-power.json 与 guard
- record::ownership() 只缓存成功持锁,guard 轮询和 recover() 可重试
- 遮挡窗口就绪握手:privacy-wallpaper 建好窗口后输出 ready,5 秒内未就绪则报错并回滚
- rebase 到 main(#145):DMA-BUF 打开路径跳过虚拟输出、失败同样回填授权;
  #145 的 uinput 指针路径也按隐私模式的虚拟输出区域换算坐标
- README 表格压缩为一句,细节在 docs/privacy-screen.md

Refs #140

* docs(privacy): 注明 ff_system_metrics=3 对应的枚举

Refs #140

* fix(privacy): resolve lifecycle and restoration review findings
2026-11-02 01:14:10 +08:00
VallierDevandClaude Opus 5.5 0ea37758fb release: v0.2.42
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-11-01 23:13:50 +08:00
Jeff Zhang 73293318b4 feat(portal): VAAPI DMA-BUF zero-copy, in-process Opus audio and lock-screen uinput control (#145)
* feat(audio): capture and encode Opus in process

* feat(portal): encode VAAPI from leased DMA-BUF frames

* fix(input): route Portal controls and committed ASCII through uinput

* docs(portal): shorten setup notes and colocate hardware acceptance guidance

* fix(input): preserve GNOME IME guard for committed uinput text

* build: link pulse/opus after the static C archive (--as-needed)
2026-11-01 22:12:04 +08:00
AZsaber 1bdc0eb910 fix(viewer): prevent compressed-frame queue overflow at high input rates (#143) 2026-11-01 21:11:07 +08:00
Jeff Zhangandferstar 33861082dc build: link inproc-av dependencies after the static engine archive (#105)
GNU ld with --as-needed (Ubuntu default) drops shared libraries listed before
libx11_engine.a, so --features inproc-av failed to link with undefined gbm_*,
xcb_dri3_* and xcb_damage_* on Ubuntu (found on aarch64; Arch is unaffected).

Co-authored-by: ferstar <[email protected]>
2026-11-01 20:11:39 +08:00
m 2422fce673 feat(ui): modernize GTK styling and add appearance settings (#144)
* feat(ui): modernize GTK styling and add appearance settings

* fix(ui): address review and avoid cached Cairo surface in smoke tests
2026-11-01 19:09:39 +08:00
AZsaber 1ff3383de7 feat(viewer): opt-in native gamepad and rumble for Windows hosts (#142)
SDL viewer forwards one mapped controller (gpd_connect/gpd_update/gpd_disconnect) and receives two-motor gpd_vibration over the existing CONTROL channel. Default off (UU_VIEWER_NATIVE_GAMEPAD=1).
2026-11-01 01:04:21 +08:00
tingfeng347 6bf05a6361 修复 niri 主控端控制官方 Windows 时的双向文本剪贴板同步 (#138)
Fixes #139.
2026-10-30 13:43:36 +08:00
VallierDevandClaude Opus 5.5 d9c43897c7 Release v0.2.41
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-10-29 23:46:34 +08:00
9fe1351de1 控制端:重置后关键帧等待接受 I 片/恢复点 SEI 并 1.5 秒超时放行 (#136) (#137)
v0.2.40 在本地重置后只接受 IDR,Mac 被控端对 PLI 不回 IDR 时画面一直空白。
现在 H.264 的 I 片和恢复点 SEI 也算重启点,等待超过 1.5 秒照常解码;
丢弃单元时也取走解码器已完成的画面。

Co-authored-by: VallierDev <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
2026-10-29 23:43:34 +08:00
Its.spixy c0b0ca6afb GNOME Portal:手机控制端拖动滚动、按住选中、短按点击 (#134)
Replayed as touch, a phone drag scrolled in browsers but still selected
text in VTE terminals (Ptyxis, GNOME Terminal), as on a real touchscreen.
By default on the portal backend the host now decides per press: moving
past 12 px within 450 ms scrolls smoothly (NotifyPointerAxis or EIS
scroll, content follows the finger, `finish` on release so clients may
coast), holding still selects with button 1 down, and a short press
clicks. This works in terminals too and needs no touchscreen consent.
UU_TOUCH_INPUT=touch keeps the touchscreen replay (with its one-time
consent upgrade); UU_TOUCH_INPUT=0 keeps plain mouse drags.
2026-10-29 23:34:30 +08:00
Its.spixy 11097b5847 GNOME Portal:手机触控模式拖动按触摸屏重放,输入法 ASCII 直接按键输入 (#131)
* portal: mobile touch-mode drags become touch, consent asks once for it

In touch mode the Android viewer sends a finger as a left-button drag at
absolute positions (observed: press, mouse_move_absolute stream, release),
which on GNOME selects text instead of scrolling. SelectDevices now also
asks for the touchscreen type where AvailableDeviceTypes offers it, and a
drag from an Android/iOS controller (controller_platform 2/3) that follows
absolute motion is replayed as one finger through NotifyTouch* or EIS
touch, so the desktop scrolls and taps as on a touch screen. Relative
motion (the trackpad mode) and every other viewer keep mouse buttons.

A consent saved before this restores keyboard and pointer only. The first
mobile drag then asks the host once per run in the background (GNOME's
share dialog, also visible on the phone; the consent timeout closes it)
and swaps the new session in only when it grants the touchscreen for the
same monitor and size. The saved consent is never removed beforehand.
UU_TOUCH_INPUT=0 keeps mouse drags and never asks.

* input: type mobile IME text as portal keysyms on Latin GNOME layouts

Each mobile text_input was set as the clipboard and pasted with
Shift+Insert, which VTE terminals bind to the PRIMARY selection: text
typed from the phone into a terminal pasted whatever was last selected
(observed: a selected line of box-drawing characters for every letter).
When GNOME's active input source (first of mru-sources) is a Latin xkb
layout, printable ASCII, newline and tab now go through
NotifyKeyboardKeysym, where Mutter picks the key and Shift level of the
active layout. Other text, IBus engines, KDE and EIS sessions keep the
clipboard paste, which no longer replaces the clipboard for plain typing.

* portal test: accept libei before 1.3 rejecting a touch outside one of two regions

libei 1.2 (Ubuntu 24.04, CI) accepts a touch only inside every region of the
device; 1.3.0 checks any region. The harness device also carries a region for
another screen, so the older library rejects the touch with a client-bug
diagnostic. A real one-stream session has one region.
2026-10-29 19:49:15 +08:00
Its.spixy 6a0cd5bda6 控制端:跨会话记住画质、帧率和真彩设置 (#133)
The host starts every session at the official defaults (Auto, 60 fps,
4:2:0), so a choice made for a slow link was lost on reconnect. Save them
in viewer.json with the other preferences and send the ones that differ
once CONTROL answers the echo.
2026-10-29 18:48:30 +08:00
88 changed files with 6072 additions and 331 deletions

No files matched your search

+21 -3
View File
@@ -25,10 +25,19 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install -y build-essential pkg-config \ sudo apt-get install -y build-essential pkg-config \
libx11-dev libxext-dev libxtst-dev libxfixes-dev libgtk-3-dev \ libx11-dev libxext-dev libxtst-dev libxfixes-dev libgtk-3-dev \
libwayland-dev libwayland-bin libxkbcommon-dev libwayland-dev libwayland-bin libxkbcommon-dev xvfb xauth fonts-noto-cjk
- uses: dtolnay/rust-toolchain@stable - uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2
- run: cargo test --locked - run: cargo test --locked
- name: GTK appearance and settings smoke tests
run: xvfb-run -a -s '-screen 0 1600x1200x24' sh tests/gtk-ui-smoke.sh "$RUNNER_TEMP/gtk-ui-previews"
- name: Synthetic GTK previews
if: always()
uses: actions/upload-artifact@v4
with:
name: gtk-ui-previews
path: ${{ runner.temp }}/gtk-ui-previews
if-no-files-found: ignore
# Same as the release job: the wayland plugin is built on 22.04; libei is unavailable here, so # Same as the release job: the wayland plugin is built on 22.04; libei is unavailable here, so
# the portal plugin is skipped with a warning (release builds it on 24.04). # the portal plugin is skipped with a warning (release builds it on 24.04).
- name: Release feature set - name: Release feature set
@@ -97,7 +106,7 @@ jobs:
ASAN_OPTIONS: detect_leaks=1 ASAN_OPTIONS: detect_leaks=1
UBSAN_OPTIONS: halt_on_error=1 UBSAN_OPTIONS: halt_on_error=1
run: | run: |
for source in tests/portal_engine.c tests/portal_input.c tests/portal_eis.c tests/desktop_power.c tests/wayland_transform.c; do for source in tests/portal_engine.c tests/portal_dmabuf.c tests/portal_input.c tests/portal_eis.c tests/desktop_power.c tests/wayland_transform.c; do
target="/tmp/$(basename "$source" .c)" target="/tmp/$(basename "$source" .c)"
cc -O1 -g -fsanitize=address,undefined -fno-omit-frame-pointer \ cc -O1 -g -fsanitize=address,undefined -fno-omit-frame-pointer \
-Wall -Wextra -Wno-unused-parameter "$source" -o "$target" \ -Wall -Wextra -Wno-unused-parameter "$source" -o "$target" \
@@ -114,10 +123,19 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install -y build-essential pkg-config \ sudo apt-get install -y build-essential pkg-config \
libx11-dev libxext-dev libxtst-dev libxfixes-dev libgtk-3-dev \ libx11-dev libxext-dev libxtst-dev libxfixes-dev libgtk-3-dev \
libva-dev libgbm-dev libx11-xcb-dev libxcb-dri3-dev libxcb-damage0-dev libva-dev libgbm-dev libx11-xcb-dev libxcb-dri3-dev libxcb-damage0-dev \
libpulse-dev libopus-dev xvfb xauth \
libwayland-dev libxkbcommon-dev libglib2.0-dev libpipewire-0.3-dev libei-dev
- uses: dtolnay/rust-toolchain@stable - uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2
- name: Read-only uinput text keymap regression
run: |
cc -O1 -g -fsanitize=address,undefined -fno-omit-frame-pointer \
-Wall -Wextra tests/uinput_keymap.c -o /tmp/uu-uinput-keymap-test -lX11
ASAN_OPTIONS=detect_leaks=1 UBSAN_OPTIONS=halt_on_error=1 \
xvfb-run -a /tmp/uu-uinput-keymap-test
- run: cargo test --locked --features inproc-av - run: cargo test --locked --features inproc-av
- run: cargo test --locked --features inproc-av,wayland,portal
test-linux-arm64: test-linux-arm64:
# aarch64 hosts (Ampere A1, arm64 VMs, Apple-silicon VMs) build from source, so keep that # aarch64 hosts (Ampere A1, arm64 VMs, Apple-silicon VMs) build from source, so keep that
+2
View File
@@ -125,6 +125,7 @@ viewer does not reconnect them automatically.
| `UU_X11_MULTISCREEN=1`, `UU_X11_OUTPUT` | X11: advertise each RandR monitor (`xrandr --listmonitors`, read once at start; primary or `UU_X11_OUTPUT` is id 0) through the same screen-switch path as `UU_WAYLAND_MULTISCREEN` (`wayland::outputs`/`select`). x11grab reads `display+x,y` at the monitor size, XTest/uinput absolute input adds the monitor offset, the in-process engine and `desktop_mode` resize are skipped (分辨率 scales). Needs two or more monitors | | `UU_X11_MULTISCREEN=1`, `UU_X11_OUTPUT` | X11: advertise each RandR monitor (`xrandr --listmonitors`, read once at start; primary or `UU_X11_OUTPUT` is id 0) through the same screen-switch path as `UU_WAYLAND_MULTISCREEN` (`wayland::outputs`/`select`). x11grab reads `display+x,y` at the monitor size, XTest/uinput absolute input adds the monitor offset, the in-process engine and `desktop_mode` resize are skipped (分辨率 scales). Needs two or more monitors |
| `UU_DESKTOP_RESIZE=0` | X11: the viewer's 分辨率 choice scales the encoded stream instead of changing the display mode. Default: `src/desktop_mode.rs` switches the primary output via xrandr (adds a CVT-RB mode when missing, re-applies once if mutter resets it), restores the original mode for resolution_type 3 and 2 s after the last desktop stream ends | | `UU_DESKTOP_RESIZE=0` | X11: the viewer's 分辨率 choice scales the encoded stream instead of changing the display mode. Default: `src/desktop_mode.rs` switches the primary output via xrandr (adds a CVT-RB mode when missing, re-applies once if mutter resets it), restores the original mode for resolution_type 3 and 2 s after the last desktop stream ends |
| `UU_NVENC_RGB=0` / `=1` | NVENC 4:2:0 without scaling takes packed BGRA/BGR0 directly (no CPU swscale). Default: on, except when a connected DRM connector belongs to an nvidia-bound card (desktop composited on the encoding GPU; #16 measured 82.6 vs 98 fps at 4K). `0` forces CPU conversion, `1` forces the direct path | | `UU_NVENC_RGB=0` / `=1` | NVENC 4:2:0 without scaling takes packed BGRA/BGR0 directly (no CPU swscale). Default: on, except when a connected DRM connector belongs to an nvidia-bound card (desktop composited on the encoding GPU; #16 measured 82.6 vs 98 fps at 4K). `0` forces CPU conversion, `1` forces the direct path |
| `UU_TOUCH_INPUT` | Android/iOS controllers (connect header `controller_platform` 2/3) send a finger as a left-button drag at absolute positions. Default on the portal backend (gesture): per press, moving past 12 px within 450 ms scrolls (`NotifyPointerAxis` / EIS scroll, content follows the finger, `finish` on release), holding still selects with button 1 down, a short press clicks; needs no touchscreen consent. `touch`: replay as one finger on the portal touchscreen (`NotifyTouch*` / EIS touch; requested where `AvailableDeviceTypes` offers it; consents saved before touch support restore keyboard+pointer only, so the first mobile drag asks once per run in the background via `PortalSession::upgrade_touch`, swapped in only with the touchscreen granted for the same monitor; the saved consent is never removed first). `0`: plain mouse drags |
| `UU_INPUT_BACKEND` | `auto` (uinput on Wayland/portal when `/dev/uinput` is accessible, udev `uaccess` rule in README) / `uinput` / `native`. X11 keeps XTest (held-key autorepeat handling) | | `UU_INPUT_BACKEND` | `auto` (uinput on Wayland/portal when `/dev/uinput` is accessible, udev `uaccess` rule in README) / `uinput` / `native`. X11 keeps XTest (held-key autorepeat handling) |
| Mac viewer Cmd | With 「使用 macOS 快捷键」 off the Mac viewer sends Cmd=VK_LWIN 0x5B, Option=0xA4, Ctrl=0xA2; connect header `controller_platform`=4 is macOS. For Mac controllers Cmd is held back: Cmd+C/V/A/F/X/Z → Ctrl+key (terminal: Cmd+C/V → Ctrl+Shift+C/V), other combos/alone → Super | | Mac viewer Cmd | With 「使用 macOS 快捷键」 off the Mac viewer sends Cmd=VK_LWIN 0x5B, Option=0xA4, Ctrl=0xA2; connect header `controller_platform`=4 is macOS. For Mac controllers Cmd is held back: Cmd+C/V/A/F/X/Z → Ctrl+key (terminal: Cmd+C/V → Ctrl+Shift+C/V), other combos/alone → Super |
| `UU_TERMINAL_SHORTCUTS=0` | disable Ctrl+V → Ctrl+Shift+V in focused X11 terminals (Mac Cmd and Ctrl both arrive as VK_LCONTROL) | | `UU_TERMINAL_SHORTCUTS=0` | disable Ctrl+V → Ctrl+Shift+V in focused X11 terminals (Mac Cmd and Ctrl both arrive as VK_LCONTROL) |
@@ -159,6 +160,7 @@ for a new QR login.
| `src/clipboard*.rs` | text clipboard bridge and protocol | | `src/clipboard*.rs` | text clipboard bridge and protocol |
| `src/file_trans.rs` | FileTransferFtp RPC | | `src/file_trans.rs` | FileTransferFtp RPC |
| `src/terminal.rs` | TERM frames + PTY sessions | | `src/terminal.rs` | TERM frames + PTY sessions |
| `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/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 |
Generated
+35 -2
View File
@@ -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.40" version = "0.2.49"
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",
+3 -2
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "uu-remote-linux" name = "uu-remote-linux"
version = "0.2.40" version = "0.2.49"
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,6 +60,7 @@ 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]
# Synthetic loopback WSS certificates only; both crates already occur in Cargo.lock. # Synthetic loopback WSS certificates only; both crates already occur in Cargo.lock.
+45 -3
View File
@@ -23,6 +23,21 @@
<p align="center"><img src="docs/images/main-window.png" width="620" alt="Host main window: remote assistance and account"></p> <p align="center"><img src="docs/images/main-window.png" width="620" alt="Host main window: remote assistance and account"></p>
<p align="center"><sub>Linux host main window: remote assistance and account (device ID, code and account redacted). The UI is available in Chinese and English (see [Language](#language--语言)).</sub></p> <p align="center"><sub>Linux host main window: remote assistance and account (device ID, code and account redacted). The UI is available in Chinese and English (see [Language](#language--语言)).</sub></p>
## 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.
The choice is saved to `$XDG_CONFIG_HOME/uuremote/theme` (default `~/.config/uuremote/theme`).
<p align="center"><img src="docs/images/appearance-light.png" width="360" alt="Light appearance (synthetic devices)"> <img src="docs/images/appearance-dark.png" width="360" alt="Dark appearance (synthetic devices)"></p>
## Language / 语言 ## Language / 语言
The language is picked once at start, in this order: The language is picked once at start, in this order:
@@ -100,7 +115,9 @@ plugins, permissions and encoders only, no account data, tokens or addresses) an
Wayland limits: captures one screen by default; Hyprland can enable monitor switching as described below. Resolution is fixed. The native Hyprland backend now pipelines two shm screencopy buffers and passes the viewer's requested fps to both capture pacing and the encoder. Actual fps remains limited by the compositor, rendering and readback (the old serial path measured about 16–22 fps at 2560x1600; the pipeline is VM-measured only, not a hardware guarantee). The portal backend does not support dynamic resolution; see below for GNOME wake and lock recovery; the clipboard syncs while the viewer's remote window has focus. On the first connection the desktop asks for "Remote Desktop / Screen Sharing" Wayland limits: captures one screen by default; Hyprland can enable monitor switching as described below. Resolution is fixed. The native Hyprland backend now pipelines two shm screencopy buffers and passes the viewer's requested fps to both capture pacing and the encoder. Actual fps remains limited by the compositor, rendering and readback (the old serial path measured about 16–22 fps at 2560x1600; the pipeline is VM-measured only, not a hardware guarantee). The portal backend does not support dynamic resolution; see below for GNOME wake and lock recovery; the clipboard syncs while the viewer's remote window has focus. On the first connection the desktop asks for "Remote Desktop / Screen Sharing"
permission; the permission is remembered once granted. permission; the permission is remembered once granted.
**Mobile IME typing and clipboard on Wayland**: Mobile IME text (`text_input`) on Wayland is typed through spare keycodes on wlroots compositors. On Portal (GNOME / KDE) or compositors where keycodes are exhausted, it automatically falls back to typing via "system clipboard write + `Shift+Insert` (or `UU_WAYLAND_PASTE_KEY=ctrl_v`)". **Note**: This fallback replaces the host's existing clipboard contents and may echo back to the viewer's clipboard via two-way sync; set `UU_WAYLAND_TEXT=0` to completely disable Wayland mobile text input and clipboard paste fallback. **Touch from mobile viewers (GNOME)**: in touch mode the Android/iOS viewers send a finger as a left-button drag, which on a desktop selects text. On the portal backend the host decides per press: a finger that moves more than a few pixels within 0.45 s scrolls smoothly (`NotifyPointerAxis`; the content follows the finger, also in terminals, and the last event lets clients coast), one held still selects like a mouse drag, and a short press clicks. This needs no touchscreen consent. `UU_TOUCH_INPUT=touch` instead replays drags as one finger on the portal touchscreen, which the host requests where the portal offers it; a consent saved before touch support restores keyboard and pointer only, so the first drag then asks the host once more in the background (the GNOME share dialog, which the phone also sees; it closes after the consent timeout), and an approval for the same monitor switches to touch without reconnecting. The saved consent is never removed beforehand, and the host asks at most once per run. `UU_TOUCH_INPUT=0` keeps mouse drags.
**Mobile IME typing and clipboard on Wayland**: Mobile IME text (`text_input`) on Wayland is typed through spare keycodes on wlroots compositors. On GNOME (Portal) printable ASCII is typed as keysyms when the active input source is a Latin xkb layout (Mutter picks the key and Shift level); other text, KDE and compositors where keycodes are exhausted fall back to "system clipboard write + `Shift+Insert` (or `UU_WAYLAND_PASTE_KEY=ctrl_v`)". VTE terminals paste the PRIMARY selection on `Shift+Insert`, which is why ASCII is typed instead. **Note**: This fallback replaces the host's existing clipboard contents and may echo back to the viewer's clipboard via two-way sync; set `UU_WAYLAND_TEXT=0` to completely disable Wayland mobile text input and clipboard paste fallback.
Scaled GNOME desktops using native Portal input use EIS on the same authorized session when `ConnectToEIS` and a screen `mapping_id` are available. Each axis is mapped using the matched region and actual frame dimensions, with no fixed resolution or scale factor. This avoids scaled-coordinate rejection by `NotifyPointerMotionAbsolute`. Portal builds require libei >= 1.1. Missing EIS support retains the legacy input path and its existing scaling limitations; other initialization failures are reported and trigger session recovery. After a successful EIS connection, all input uses EIS. Capture alone and uinput do not initialize EIS; missing optional logical dimensions do not block capture. Keyboard input uses the existing Windows VK to evdev mapping. Recovery keeps the encoder frame dimensions fixed but accepts logical-size changes after scaling. On GNOME, a display-change notification enables earlier recovery when previously streaming Portal capture remains paused without a valid format for a 200 ms grace after both conditions are present. Healthy renegotiation cancels the early check; repeated notifications do not postpone the same interruption. The five-second fallback remains without a related notification. Static video and valid-format pauses do not trigger recovery. Tested while connected on Ubuntu 26.04, GNOME Wayland, one 3840x2160 display: 200% -> 166.67% -> 200%, with continuously updating video and full-screen pointer control after recovery. Switching briefly freezes and goes black before recovering; five seconds is the fallback threshold, not total recovery time. See [#35](../../pull/35) for timing measurements and validation limits. Lock recovery still needs hardware acceptance testing; multi-monitor support, live resolution changes, and rotation/reflection transforms are outside this fix's scope. Capture settings remain at protocol version 4: advertised resolutions use pixel coordinates and DPR 1; Portal logical dimensions are used only for local input mapping. Scaled GNOME desktops using native Portal input use EIS on the same authorized session when `ConnectToEIS` and a screen `mapping_id` are available. Each axis is mapped using the matched region and actual frame dimensions, with no fixed resolution or scale factor. This avoids scaled-coordinate rejection by `NotifyPointerMotionAbsolute`. Portal builds require libei >= 1.1. Missing EIS support retains the legacy input path and its existing scaling limitations; other initialization failures are reported and trigger session recovery. After a successful EIS connection, all input uses EIS. Capture alone and uinput do not initialize EIS; missing optional logical dimensions do not block capture. Keyboard input uses the existing Windows VK to evdev mapping. Recovery keeps the encoder frame dimensions fixed but accepts logical-size changes after scaling. On GNOME, a display-change notification enables earlier recovery when previously streaming Portal capture remains paused without a valid format for a 200 ms grace after both conditions are present. Healthy renegotiation cancels the early check; repeated notifications do not postpone the same interruption. The five-second fallback remains without a related notification. Static video and valid-format pauses do not trigger recovery. Tested while connected on Ubuntu 26.04, GNOME Wayland, one 3840x2160 display: 200% -> 166.67% -> 200%, with continuously updating video and full-screen pointer control after recovery. Switching briefly freezes and goes black before recovering; five seconds is the fallback threshold, not total recovery time. See [#35](../../pull/35) for timing measurements and validation limits. Lock recovery still needs hardware acceptance testing; multi-monitor support, live resolution changes, and rotation/reflection transforms are outside this fix's scope. Capture settings remain at protocol version 4: advertised resolutions use pixel coordinates and DPR 1; Portal logical dimensions are used only for local input mapping.
@@ -142,7 +159,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 | 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; `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 |
@@ -201,6 +218,8 @@ sudo apt install libwayland-dev libxkbcommon-dev wl-clipboard
sudo apt install libglib2.0-dev libpipewire-0.3-dev libei-dev sudo apt install libglib2.0-dev libpipewire-0.3-dev libei-dev
# optional: headers for the inproc-av VAAPI/DRI3 engines (libva itself is loaded at runtime) # optional: headers for the inproc-av VAAPI/DRI3 engines (libva itself is loaded at runtime)
sudo apt install libva-dev libgbm-dev libx11-xcb-dev libxcb-dri3-dev libxcb-damage0-dev sudo apt install libva-dev libgbm-dev libx11-xcb-dev libxcb-dri3-dev libxcb-damage0-dev
# In-process audio capture and Opus encoding for inproc-av
sudo apt install libpulse-dev libopus-dev
``` ```
- A Rust toolchain is required (<https://rustup.rs>). - A Rust toolchain is required (<https://rustup.rs>).
@@ -219,6 +238,9 @@ cargo build --release --features wayland,portal # + GNOME/KDE on Wayland
The viewer's `viewer-ffmpeg` feature supports **FFmpeg 6.x only** (`pkg-config --modversion libavcodec` = 60.x); FFmpeg 7+ fails inside `ffmpeg-sys-next` with `avfft.h file not found` (#63). The viewer's `viewer-ffmpeg` feature supports **FFmpeg 6.x only** (`pkg-config --modversion libavcodec` = 60.x); FFmpeg 7+ fails inside `ffmpeg-sys-next` with `avfft.h file not found` (#63).
The host's optional `--features inproc-av` encodes with hardware inside the process on X11. It does not link FFmpeg development libraries; it loads the NVIDIA driver libraries (`libcuda.so.1`, `libnvidia-encode.so.1`) at runtime for NVENC (needs a driver with NVENC API 12.1, 530 or newer) and `libva.so.2`/`libva-drm.so.2` for VAAPI. When the capture and encoder sizes match, NVENC reads the XShm buffer directly, saving one host-to-device copy; VAAPI runs in process under the same feature (DRI3 DMA-BUF zero copy, or XShm upload without DRI3, then VPP to NV12 and VCN; H.264/HEVC). CPU encoding and `UU_CAPTURE=grab` keep the FFmpeg process; if the in-process hardware session fails it falls back to the matching FFmpeg process pipeline, then to the CPU. The default build and the release packages need neither feature. The host's optional `--features inproc-av` encodes with hardware inside the process on X11. It does not link FFmpeg development libraries; it loads the NVIDIA driver libraries (`libcuda.so.1`, `libnvidia-encode.so.1`) at runtime for NVENC (needs a driver with NVENC API 12.1, 530 or newer) and `libva.so.2`/`libva-drm.so.2` for VAAPI. When the capture and encoder sizes match, NVENC reads the XShm buffer directly, saving one host-to-device copy; VAAPI runs in process under the same feature (DRI3 DMA-BUF zero copy, or XShm upload without DRI3, then VPP to NV12 and VCN; H.264/HEVC). CPU encoding and `UU_CAPTURE=grab` keep the FFmpeg process; if the in-process hardware session fails it falls back to the matching FFmpeg process pipeline, then to the CPU. The default build and the release packages need neither feature.
On GNOME/KDE Wayland, enable in-process encoding with `cargo build --release --features wayland,portal,inproc-av` and `set-encoder vaapi`; support is limited to Portal + VAAPI.
`UU_PORTAL_DMABUF=0` disables DMA-BUF in favor of in-process host upload; `UU_VIDEO_PIPELINE=process` restores external FFmpeg pipelines.
### 3. Log in ### 3. Log in
Run inside your graphical session: Run inside your graphical session:
@@ -283,6 +305,8 @@ sudo udevadm control --reload && sudo udevadm trigger --name-match=uinput
`uaccess` grants access only to the user sitting at the machine. `UU_INPUT_BACKEND=uinput|native` forces a backend. `uaccess` grants access only to the user sitting at the machine. `UU_INPUT_BACKEND=uinput|native` forces a backend.
X11 keeps XTest by default because it handles held keys correctly on high-latency links. X11 keeps XTest by default because it handles held keys correctly on high-latency links.
ASCII text mapping through uinput requires X11/XWayland XKB; unmappable text keeps the existing text/clipboard path.
## Remote assistance and the main window (experimental) ## Remote assistance and the main window (experimental)
As in the official client, this host shows a **device ID** and a **verification code**; whoever you give them to can As in the official client, this host shows a **device ID** and a **verification code**; whoever you give them to can
@@ -442,6 +466,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.
@@ -577,6 +602,8 @@ No official "no desktop" error code was found for headless desktop offers, so th
## Experimental native viewer (uuremote-viewer) ## Experimental native viewer (uuremote-viewer)
See [SDL viewer video scheduling](docs/viewer-video-scheduling.md).
`uuremote-viewer` is a Linux **viewer/controller**: it connects to and controls other devices on your UU account (official Windows / Mac `uuremote-viewer` is a Linux **viewer/controller**: it connects to and controls other devices on your UU account (official Windows / Mac
hosts or this project's Linux host), and can start remote assistance with someone's device ID and code. It is experimental and hosts or this project's Linux host), and can start remote assistance with someone's device ID and code. It is experimental and
separate from the host `uuremote-server`; the default host build and behaviour are unchanged. separate from the host `uuremote-server`; the default host build and behaviour are unchanged.
@@ -586,8 +613,13 @@ 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).
Synchronization runs only while that window is focused and keeps the 30 KiB text limit. Selections without a supported 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
text format are skipped; empty-text detection depends on the SDL2 backend. Builds without SDL retain the command backend. text format are skipped; empty-text detection depends on the SDL2 backend. Builds without SDL retain the command backend.
SDL2 reads selections synchronously, so a slow selection owner can temporarily block the window; the bridge timeout cannot interrupt it. SDL2 reads selections synchronously, so a slow selection owner can temporarily block the window; the bridge timeout cannot interrupt it.
GNOME-to-official-Mac bidirectional clipboard synchronization is still unverified; this change does not resolve host compatibility. GNOME-to-official-Mac bidirectional clipboard synchronization is still unverified; this change does not resolve host compatibility.
@@ -621,6 +653,8 @@ GNOME-to-official-Mac bidirectional clipboard synchronization is still unverifie
- Frames are decoded at the host's native resolution and scaled to the window with linear filtering; a host resolution - Frames are decoded at the host's native resolution and scaled to the window with linear filtering; a host resolution
change restarts the decoder. `UU_VIEWER_SIZE=WxH` forces a fixed letterboxed canvas instead. change restarts the decoder. `UU_VIEWER_SIZE=WxH` forces a fixed letterboxed canvas instead.
The SDL remote desktop window disables local IME text composition and forwards physical keys; use the remote host’s input method and its language toggle (for example, Shift) to enter Chinese.
Mac targets use native macOS keycodes; Windows / Linux targets retain Windows VK. Keys follow physical positions, without Mac targets use native macOS keycodes; Windows / Linux targets retain Windows VK. Keys follow physical positions, without
automatically translating Ctrl to Command; on a Mac target the PC Super / Windows key acts as Command. Only verified target automatically translating Ctrl to Command; on a Mac target the PC Super / Windows key acts as Command. Only verified target
platform values 1 (Windows / this project's Linux host) and 4 (Mac) are accepted; unknown values fail explicitly. Account platform values 1 (Windows / this project's Linux host) and 4 (Mac) are accepted; unknown values fail explicitly. Account
@@ -645,3 +679,11 @@ assistance and ISO / JIS keyboards have not been tested live.
"—" = not tested yet. Only use reboot/shutdown on machines you can restart. **Not tested live**: H.265 / 4:4:4 with official hosts, multiple monitors. Logs carry field "—" = not tested yet. Only use reboot/shutdown on machines you can restart. **Not tested live**: H.265 / 4:4:4 with official hosts, multiple monitors. Logs carry field
numbers, sizes and states only, never keystrokes, clipboard or file contents, codes or credentials. numbers, sizes and states only, never keystrokes, clipboard or file contents, codes or credentials.
### Native gamepad and rumble (experimental)
The SDL viewer forwards one mapped controller and ordinary two-motor rumble through the existing desktop CONTROL channel to a Windows host.
Default OFF: set `UU_VIEWER_NATIVE_GAMEPAD=1` to enable input; `UU_VIEWER_NATIVE_RUMBLE=0` disables feedback independently.
Guide forwarding, multiple controllers and adaptive triggers are unsupported; suspend, forced exit and network recovery are not comprehensively verified.
One reporting user tested input, phone-hotspot WAN, reconnect and rumble on one Windows/Steam Deck pair.
See [protocol evidence, design and limits](docs/deckpad-native-gamepad.md).
+41 -3
View File
@@ -19,6 +19,17 @@
<p align="center"><img src="docs/images/main-window.png" width="620" alt="Linux 主机主窗口:远程协助与账号"></p> <p align="center"><img src="docs/images/main-window.png" width="620" alt="Linux 主机主窗口:远程协助与账号"></p>
<p align="center"><sub>Linux 被控端主窗口:远程协助与账号(设备 ID、验证码和账号已打码)</sub></p> <p align="center"><sub>Linux 被控端主窗口:远程协助与账号(设备 ID、验证码和账号已打码)</sub></p>
## 外观 / 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`)。
<p align="center"><img src="docs/images/appearance-light.png" width="360" alt="浅色界面(虚构设备)"> <img src="docs/images/appearance-dark.png" width="360" alt="深色界面(虚构设备)"></p>
## 语言 / Language ## 语言 / Language
启动时按以下顺序确定界面语言: 启动时按以下顺序确定界面语言:
@@ -90,7 +101,9 @@ GNOME Wayland 的 Portal/EIS 路径已在 Ubuntu 26.04、GNOME 50、单屏 4K/20
Wayland 下的限制:默认采集单屏,Hyprland 可按上文启用切屏;分辨率固定;Hyprland 原生后端默认使用双缓冲流水线 shm screencopy,控制端帧率设置会同步到采集节拍和编码器,但实际帧率仍受合成器、渲染和读回速度限制(旧串行路径在 2560x1600 曾测得约 16~22 帧;流水线只在虚拟机里测量过,不代表实机保证);portal 后端暂不支持动态分辨率;GNOME 的屏幕唤醒与锁屏恢复见下;剪贴板只在控制端的远控窗口处于前台时同步。 Wayland 下的限制:默认采集单屏,Hyprland 可按上文启用切屏;分辨率固定;Hyprland 原生后端默认使用双缓冲流水线 shm screencopy,控制端帧率设置会同步到采集节拍和编码器,但实际帧率仍受合成器、渲染和读回速度限制(旧串行路径在 2560x1600 曾测得约 16~22 帧;流水线只在虚拟机里测量过,不代表实机保证);portal 后端暂不支持动态分辨率;GNOME 的屏幕唤醒与锁屏恢复见下;剪贴板只在控制端的远控窗口处于前台时同步。
**Wayland 手机输入法打字与剪贴板**:Wayland 下手机端输入法提交的文字(`text_input`)优先通过虚拟键盘空闲键码上屏;在 Portal(GNOME / KDE)或键码耗尽的环境下,自动通过「写系统剪贴板 + 触发 `Shift+Insert`(或 `UU_WAYLAND_PASTE_KEY=ctrl_v`)」兜底粘贴。**注意**:此兜底过程会覆盖被控端原有的剪贴板内容,且会被双向同步回传到控制端剪贴板;设置 `UU_WAYLAND_TEXT=0` 可完全关闭 Wayland 文字输入及该粘贴兜底。 **手机控制端触控(GNOME)**:Android/iOS 控制端在触控模式下把手指当作左键拖动发送,在桌面上会选中文字。Portal 后端下被控端按每次按下判断:0.45 秒内移动超过几个像素即平滑滚动(`NotifyPointerAxis`,内容跟随手指,终端里同样有效,最后一个事件让客户端可以惯性滑动);按住不动则像鼠标拖动一样选中;短按为点击。此模式无需触摸屏授权。`UU_TOUCH_INPUT=touch` 改为把拖动按单指触控在 Portal 触摸屏上重放,门户提供触摸屏设备类型时被控端会一并申请;此前保存的授权只恢复键盘和指针,因此第一次拖动时会在后台再申请一次(GNOME 共享对话框,手机画面中也能看到,授权超时后自动关闭),同意同一显示器后无需重连即切换为触控。不会预先删除已保存的授权,每次运行最多申请一次。`UU_TOUCH_INPUT=0` 保持鼠标拖动。
**Wayland 手机输入法打字与剪贴板**:Wayland 下手机端输入法提交的文字(`text_input`)优先通过虚拟键盘空闲键码上屏;GNOME(Portal)下,当前输入源为拉丁 xkb 布局时,可打印 ASCII 直接以 keysym 输入(由 Mutter 选择按键和 Shift 层级);其他文字、KDE 以及键码耗尽的环境自动通过「写系统剪贴板 + 触发 `Shift+Insert`(或 `UU_WAYLAND_PASTE_KEY=ctrl_v`)」兜底粘贴。VTE 终端的 `Shift+Insert` 粘贴的是 PRIMARY 选区,因此 ASCII 改为直接输入。**注意**:此兜底过程会覆盖被控端原有的剪贴板内容,且会被双向同步回传到控制端剪贴板;设置 `UU_WAYLAND_TEXT=0` 可完全关闭 Wayland 文字输入及该粘贴兜底。
GNOME 缩放桌面在使用 Portal 原生键鼠时,若支持 `ConnectToEIS` 和屏幕 `mapping_id`,通过同一授权会话的 EIS 接口注入输入,按匹配的区域与实际帧尺寸分别映射横纵坐标,没有固定分辨率或缩放倍率,可避免 `NotifyPointerMotionAbsolute` 在缩放时拒绝坐标。Portal 构建需要 libei ≥ 1.1。缺少 EIS 支持时保留旧输入路径及其既有缩放限制;其他初始化错误会明确报告并触发会话恢复。EIS 连接成功后全部输入统一使用 EIS。只采集画面或使用 uinput 时不会初始化 EIS;缺少可选的逻辑尺寸也不阻断采集。键盘沿用项目现有的 Windows VK → evdev 映射。恢复时保持编码器的采集帧尺寸不变,允许缩放后的逻辑尺寸变化。GNOME 显示配置变化后,已推流的 Portal 采集若持续「暂停且无有效格式」,会在关联通知后的 200 毫秒宽限结束后提前进入现有恢复流程;正常重协商恢复会取消提前判定,连续通知不会推迟同次异常的判定。未收到相关通知时保留五秒兜底;静态画面或有效格式下的暂停不会触发恢复。Ubuntu 26.04、GNOME Wayland 单屏 3840×2160 已实测保持连接切换 200%→166.67%→200%,恢复后画面持续更新且鼠标可控制全屏;切换期间会短暂停顿、黑屏后恢复,五秒是兜底判定阈值,并非总恢复时间。提前恢复的测量结果和验证范围见 [#35](../../pull/35)。此路径仍需实机验证锁屏恢复;多屏、连接中改变分辨率及旋转/镜像变换不属于本次修复范围。 捕获设置协议仍为版本 4:对客户端上报的分辨率统一使用像素坐标、DPR 为 1;Portal 逻辑尺寸仅用于本地输入映射。 GNOME 缩放桌面在使用 Portal 原生键鼠时,若支持 `ConnectToEIS` 和屏幕 `mapping_id`,通过同一授权会话的 EIS 接口注入输入,按匹配的区域与实际帧尺寸分别映射横纵坐标,没有固定分辨率或缩放倍率,可避免 `NotifyPointerMotionAbsolute` 在缩放时拒绝坐标。Portal 构建需要 libei ≥ 1.1。缺少 EIS 支持时保留旧输入路径及其既有缩放限制;其他初始化错误会明确报告并触发会话恢复。EIS 连接成功后全部输入统一使用 EIS。只采集画面或使用 uinput 时不会初始化 EIS;缺少可选的逻辑尺寸也不阻断采集。键盘沿用项目现有的 Windows VK → evdev 映射。恢复时保持编码器的采集帧尺寸不变,允许缩放后的逻辑尺寸变化。GNOME 显示配置变化后,已推流的 Portal 采集若持续「暂停且无有效格式」,会在关联通知后的 200 毫秒宽限结束后提前进入现有恢复流程;正常重协商恢复会取消提前判定,连续通知不会推迟同次异常的判定。未收到相关通知时保留五秒兜底;静态画面或有效格式下的暂停不会触发恢复。Ubuntu 26.04、GNOME Wayland 单屏 3840×2160 已实测保持连接切换 200%→166.67%→200%,恢复后画面持续更新且鼠标可控制全屏;切换期间会短暂停顿、黑屏后恢复,五秒是兜底判定阈值,并非总恢复时间。提前恢复的测量结果和验证范围见 [#35](../../pull/35)。此路径仍需实机验证锁屏恢复;多屏、连接中改变分辨率及旋转/镜像变换不属于本次修复范围。 捕获设置协议仍为版本 4:对客户端上报的分辨率统一使用像素坐标、DPR 为 1;Portal 逻辑尺寸仅用于本地输入映射。
@@ -127,7 +140,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 已验证不启用、隐私屏保、关闭显示屏三种状态回显;`UU_PRIVACY_AUTO=picture` / `screen-off` 可在桌面连接时自动开启,见 [docs/privacy-screen.md](docs/privacy-screen.md) |
| 麦克风(控制端声音传到被控端) | 未实现(需要虚拟声卡) | | 麦克风(控制端声音传到被控端) | 未实现(需要虚拟声卡) |
| 魔兽世界排队提醒等插件 | 不支持,会明确告诉客户端「无插件」 | | 魔兽世界排队提醒等插件 | 不支持,会明确告诉客户端「无插件」 |
| Linux 系统登录界面 | 还不支持控制开机后的系统登录界面(还没有人登录 Linux 桌面时);这种情况可以用无头模式或虚拟桌面(见下文)。注意:这里说的是 Linux 系统登录,**不登录 UU 账号**现在可以通过「远程协助」使用 | | Linux 系统登录界面 | 还不支持控制开机后的系统登录界面(还没有人登录 Linux 桌面时);这种情况可以用无头模式或虚拟桌面(见下文)。注意:这里说的是 Linux 系统登录,**不登录 UU 账号**现在可以通过「远程协助」使用 |
@@ -184,6 +197,8 @@ sudo apt install libwayland-dev libxkbcommon-dev wl-clipboard
sudo apt install libglib2.0-dev libpipewire-0.3-dev libei-dev sudo apt install libglib2.0-dev libpipewire-0.3-dev libei-dev
# 可选:inproc-av 的 VAAPI/DRI3 引擎编译所需(libva 本体运行时加载) # 可选:inproc-av 的 VAAPI/DRI3 引擎编译所需(libva 本体运行时加载)
sudo apt install libva-dev libgbm-dev libx11-xcb-dev libxcb-dri3-dev libxcb-damage0-dev sudo apt install libva-dev libgbm-dev libx11-xcb-dev libxcb-dri3-dev libxcb-damage0-dev
# inproc-av 的进程内音频采集与 Opus 编码
sudo apt install libpulse-dev libopus-dev
``` ```
- 需要 Rust 工具链(<https://rustup.rs>)。 - 需要 Rust 工具链(<https://rustup.rs>)。
@@ -201,6 +216,9 @@ cargo build --release --features wayland,portal # + GNOME/KDE Wayland
控制端的 `viewer-ffmpeg` 只支持 **FFmpeg 6.x**(`pkg-config --modversion libavcodec` 为 60.x);FFmpeg 7 及以上会在依赖 `ffmpeg-sys-next` 里报 `avfft.h file not found`(#63)。 控制端的 `viewer-ffmpeg` 只支持 **FFmpeg 6.x**(`pkg-config --modversion libavcodec` 为 60.x);FFmpeg 7 及以上会在依赖 `ffmpeg-sys-next` 里报 `avfft.h file not found`(#63)。
服务端可选的 `--features inproc-av` 是 X11 下的进程内硬件编码:不链接 FFmpeg 开发库,NVENC 运行时加载 NVIDIA 驱动库(`libcuda.so.1`、`libnvidia-encode.so.1`,需要支持 NVENC API 12.1 的驱动,530 及以上),VAAPI 运行时加载 `libva.so.2`/`libva-drm.so.2`。截屏与编码尺寸一致时 NVENC 直接读取 XShm 缓冲,省去一次主机到显存的拷贝;VAAPI 在同一特性下也进程内运行(DRI3 DMA-BUF 零拷贝,无 DRI3 时 XShm 上传,VPP 转 NV12 后送 VCN,支持 H.264/H.265)。CPU 编码或 `UU_CAPTURE=grab` 仍走外部 FFmpeg 进程;进程内硬件编码启动失败时先回退到对应的 FFmpeg 进程管线,再回退到 CPU。默认构建和预编译包都不需要该特性。 服务端可选的 `--features inproc-av` 是 X11 下的进程内硬件编码:不链接 FFmpeg 开发库,NVENC 运行时加载 NVIDIA 驱动库(`libcuda.so.1`、`libnvidia-encode.so.1`,需要支持 NVENC API 12.1 的驱动,530 及以上),VAAPI 运行时加载 `libva.so.2`/`libva-drm.so.2`。截屏与编码尺寸一致时 NVENC 直接读取 XShm 缓冲,省去一次主机到显存的拷贝;VAAPI 在同一特性下也进程内运行(DRI3 DMA-BUF 零拷贝,无 DRI3 时 XShm 上传,VPP 转 NV12 后送 VCN,支持 H.264/H.265)。CPU 编码或 `UU_CAPTURE=grab` 仍走外部 FFmpeg 进程;进程内硬件编码启动失败时先回退到对应的 FFmpeg 进程管线,再回退到 CPU。默认构建和预编译包都不需要该特性。
GNOME/KDE Wayland 的进程内编码用 `cargo build --release --features wayland,portal,inproc-av` 配合 `set-encoder vaapi` 启用,目前仅支持 Portal + VAAPI。
`UU_PORTAL_DMABUF=0` 禁用 DMA-BUF、改用进程内上传;`UU_VIDEO_PIPELINE=process` 恢复外部 FFmpeg 管线。
### 3. 登录 ### 3. 登录
在图形桌面里运行: 在图形桌面里运行:
@@ -263,6 +281,8 @@ sudo udevadm control --reload && sudo udevadm trigger --name-match=uinput
`uaccess` 只把权限给当前坐在这台机器前的登录用户。`UU_INPUT_BACKEND=uinput|native` 可以强制指定后端。 `uaccess` 只把权限给当前坐在这台机器前的登录用户。`UU_INPUT_BACKEND=uinput|native` 可以强制指定后端。
X11 默认继续用 XTest,因为它能正确处理网络延迟下按住不放的按键。 X11 默认继续用 XTest,因为它能正确处理网络延迟下按住不放的按键。
uinput 的 ASCII 文本映射依赖 X11/XWayland XKB;不可映射的文字保留原有文字输入/剪贴板路径。
## 远程协助与主窗口(实验性) ## 远程协助与主窗口(实验性)
和官方客户端的「远程协助」一样:本机显示**设备 ID** 和**验证码**,把它们发给信任的人,对方在 UU 远程的「开始协助」里输入即可控制本机。 和官方客户端的「远程协助」一样:本机显示**设备 ID** 和**验证码**,把它们发给信任的人,对方在 UU 远程的「开始协助」里输入即可控制本机。
@@ -386,6 +406,7 @@ flowchart LR
## 安全与隐私 ## 安全与隐私
- 已登录的图形主机默认会将当前壁纸图片上传到 UU 的文件服务,供设备卡片显示背景;可用 `UU_WALLPAPER_UPLOAD=0` 关闭上传。
- 日志不记录键盘输入、终端内容、剪贴板内容、文件内容、密码和令牌。 - 日志不记录键盘输入、终端内容、剪贴板内容、文件内容、密码和令牌。
- 自动解锁的密码保存在**控制端**(官方客户端)里,被控端只拿来做一次 PAM 校验,不落盘、不写日志。 - 自动解锁的密码保存在**控制端**(官方客户端)里,被控端只拿来做一次 PAM 校验,不落盘、不写日志。
- 能连上这台机器的,只有登录了同一个 UU 账号的设备。请保管好你的 UU 账号。 - 能连上这台机器的,只有登录了同一个 UU 账号的设备。请保管好你的 UU 账号。
@@ -505,6 +526,8 @@ xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`。
## 实验性原生控制端(uuremote-viewer) ## 实验性原生控制端(uuremote-viewer)
[SDL 控制端视频调度说明](docs/viewer-video-scheduling.md)。
`uuremote-viewer` 是 Linux 上的**控制端**:用你的 UU 账号连接并控制其他设备(官方 Windows / Mac 被控端,或本项目的 Linux 主机), `uuremote-viewer` 是 Linux 上的**控制端**:用你的 UU 账号连接并控制其他设备(官方 Windows / Mac 被控端,或本项目的 Linux 主机),
也可以凭对方的设备 ID 和验证码发起远程协助。它是实验性功能,与主机 `uuremote-server` 相互独立,默认主机构建和行为不变。 也可以凭对方的设备 ID 和验证码发起远程协助。它是实验性功能,与主机 `uuremote-server` 相互独立,默认主机构建和行为不变。
@@ -512,7 +535,12 @@ 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 剪贴板复用桌面窗口,避免 GNOME Wayland 上临时窗口引起的 Dock 跳动(#37)。仅在桌面窗口获得焦点时同步, 组合键使用 SDL 按键事件携带的左右修饰键状态;窗口失焦时释放远端按键,重新聚焦后的下一次普通按键会恢复仍按住的 Shift/Ctrl/Alt/Win(Mac 为 Command)。此行为内置,无需适配库或开关。
控制端会同步远端以 PNG 发送的指针形状(如文本光标和窗口缩放箭头),并保留正确热点。离开远控画面或打开本地菜单时恢复本机箭头。
SDL 剪贴板复用桌面窗口,避免 GNOME Wayland 上临时窗口引起的 Dock 跳动(#37)。niri 改用支持 data-control 的
`wl-clipboard`,不需要桌面窗口保持焦点;其他 SDL 后端仅在桌面窗口获得焦点时同步。
保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。 保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。
SDL2 同步读取选择内容,慢速的剪贴板提供者可能暂时阻塞窗口,桥接超时无法中断该原生调用。 SDL2 同步读取选择内容,慢速的剪贴板提供者可能暂时阻塞窗口,桥接超时无法中断该原生调用。
GNOME 与官方 Mac 被控端的双向剪贴板尚未验证通过;此修改不解决被控端兼容问题。 GNOME 与官方 Mac 被控端的双向剪贴板尚未验证通过;此修改不解决被控端兼容问题。
@@ -544,6 +572,8 @@ GNOME 与官方 Mac 被控端的双向剪贴板尚未验证通过;此修改不
以 CaptureSettingSync 回报为准。两种色度均由 FFmpeg 转为 RGB24 显示。 以 CaptureSettingSync 回报为准。两种色度均由 FFmpeg 转为 RGB24 显示。
- 按被控端原始分辨率解码,窗口缩放使用线性过滤;被控端分辨率变化时自动重启解码器。`UU_VIEWER_SIZE=WxH` 可改为固定的留黑边画布。 - 按被控端原始分辨率解码,窗口缩放使用线性过滤;被控端分辨率变化时自动重启解码器。`UU_VIEWER_SIZE=WxH` 可改为固定的留黑边画布。
SDL 远程画面窗口关闭本地输入法的文本组合,按物理键转发;输入中文时请使用被控端的输入法及其中英切换键(例如 Shift)。
Mac 目标使用 macOS 原生键码,Windows / Linux 目标保留 Windows VK。键盘按物理键位置转发,不自动把 Ctrl 改成 Command; Mac 目标使用 macOS 原生键码,Windows / Linux 目标保留 Windows VK。键盘按物理键位置转发,不自动把 Ctrl 改成 Command;
控制 Mac 时,PC 键盘的 Super / Win 键对应 Command。仅接受已验证的目标平台值 1(Windows / 本项目 Linux 主机)和 4(Mac), 控制 Mac 时,PC 键盘的 Super / Win 键对应 Command。仅接受已验证的目标平台值 1(Windows / 本项目 Linux 主机)和 4(Mac),
未知值会报错,不猜测键码。账号连接缺少平台字段时查询目标设备;远程协助必须由连接响应提供平台。只看模式不需要此识别。 未知值会报错,不猜测键码。账号连接缺少平台字段时查询目标设备;远程协助必须由连接响应提供平台。只看模式不需要此识别。
@@ -565,3 +595,11 @@ Mac 目标使用 macOS 原生键码,Windows / Linux 目标保留 Windows VK。
| Wayland 下的桌面窗口与剪贴板 | — | — | ✅ Hyprland、KDE;GNOME 窗口正常,剪贴板已于 v0.2.3 改为 SDL 直连(#37,最终版本未重新实机验收) | | Wayland 下的桌面窗口与剪贴板 | — | — | ✅ Hyprland、KDE;GNOME 窗口正常,剪贴板已于 v0.2.3 改为 SDL 直连(#37,最终版本未重新实机验收) |
「—」表示尚未测试。重启/关机只应在可以重启的机器上使用。**未实测**:官方被控端的 H.265 / 4:4:4、多显示器。日志只记录字段号、大小和状态,不记录键盘、剪贴板、文件内容、验证码或凭据。 「—」表示尚未测试。重启/关机只应在可以重启的机器上使用。**未实测**:官方被控端的 H.265 / 4:4:4、多显示器。日志只记录字段号、大小和状态,不记录键盘、剪贴板、文件内容、验证码或凭据。
### 原生手柄与震动(实验性)
SDL 控制端可通过现有桌面 CONTROL 通道向 Windows 被控端转发一个映射手柄,并接收普通双路震动。
默认关闭:`UU_VIEWER_NATIVE_GAMEPAD=1` 启用手柄,`UU_VIEWER_NATIVE_RUMBLE=0` 可独立关闭震动。
不支持 Guide 键、多手柄和自适应扳机;休眠、强制退出及断网恢复尚未全面验证。
一名报告用户在一组 Windows + Steam Deck 上测试了输入、手机热点、重连与震动。
详见[协议证据、设计与限制](docs/deckpad-native-gamepad.md)。
+24 -4
View File
@@ -1,15 +1,21 @@
fn main() { fn main() {
println!("cargo:rerun-if-changed=c_engine/dmabuf_frame.h");
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/uinput_keymap.c");
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");
println!("cargo:rerun-if-changed=c_engine/nvenc_engine.h"); println!("cargo:rerun-if-changed=c_engine/nvenc_engine.h");
println!("cargo:rerun-if-changed=vendor/ffnvcodec/ffnvcodec/dynlink_cuda.h"); println!("cargo:rerun-if-changed=vendor/ffnvcodec/ffnvcodec/dynlink_cuda.h");
println!("cargo:rerun-if-changed=vendor/ffnvcodec/ffnvcodec/nvEncodeAPI.h"); println!("cargo:rerun-if-changed=vendor/ffnvcodec/ffnvcodec/nvEncodeAPI.h");
println!("cargo:rerun-if-changed=c_engine/clipboard.c"); println!("cargo:rerun-if-changed=c_engine/clipboard.c");
println!("cargo:rerun-if-changed=c_engine/assist_window.c"); println!("cargo:rerun-if-changed=c_engine/assist_window.c");
println!("cargo:rerun-if-changed=c_engine/privacy_wallpaper.c");
println!("cargo:rerun-if-changed=c_engine/viewer_window.c"); println!("cargo:rerun-if-changed=c_engine/viewer_window.c");
println!("cargo:rerun-if-changed=c_engine/viewer_tools.c"); println!("cargo:rerun-if-changed=c_engine/viewer_tools.c");
println!("cargo:rerun-if-changed=c_engine/ui_theme.c");
println!("cargo:rerun-if-changed=c_engine/ui_theme.h");
println!("cargo:rerun-if-changed=c_engine/pam_check.c"); println!("cargo:rerun-if-changed=c_engine/pam_check.c");
println!("cargo:rerun-if-env-changed=UU_NO_GTK"); println!("cargo:rerun-if-env-changed=UU_NO_GTK");
println!("cargo:rustc-check-cfg=cfg(uu_gtk)"); println!("cargo:rustc-check-cfg=cfg(uu_gtk)");
@@ -28,9 +34,16 @@ 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/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");
if std::env::var_os("CARGO_FEATURE_INPROC_AV").is_some() { if std::env::var_os("CARGO_FEATURE_INPROC_AV").is_some() {
println!("cargo:rerun-if-changed=c_engine/audio_engine.c");
x11_build.file("c_engine/audio_engine.c");
let audio_flags = std::process::Command::new("pkg-config").args(["--cflags", "libpulse", "opus"])
.output().expect("inproc-av requires libpulse and opus development libraries");
assert!(audio_flags.status.success(), "inproc-av requires libpulse-dev and libopus-dev");
for flag in String::from_utf8_lossy(&audio_flags.stdout).split_whitespace() { x11_build.flag(flag); }
x11_build.file("c_engine/nvenc_engine.c"); x11_build.file("c_engine/nvenc_engine.c");
x11_build.file("c_engine/vaapi_engine.c"); x11_build.file("c_engine/vaapi_engine.c");
x11_build.file("c_engine/dri3_capture.c"); x11_build.file("c_engine/dri3_capture.c");
@@ -38,15 +51,22 @@ fn main() {
println!("cargo:rerun-if-changed={f}"); println!("cargo:rerun-if-changed={f}");
} }
x11_build.include("vendor/ffnvcodec"); x11_build.include("vendor/ffnvcodec");
// libva/libva-drm are dlopen'ed at runtime (like NVENC's libcuda); these are }
// link-time-only deps of the DRI3/VAAPI engines and must stay out of default builds. x11_build.compile("x11_engine");
// libva/libva-drm are dlopen'ed at runtime (like NVENC's libcuda); these are
// link-time-only deps of the DRI3/VAAPI engines and must stay out of default builds.
if std::env::var_os("CARGO_FEATURE_INPROC_AV").is_some() {
// Emit them after the static C archive: GNU ld --as-needed would otherwise
// discard the shared libraries before libx11_engine.a references their symbols.
println!("cargo:rustc-link-lib=pulse");
println!("cargo:rustc-link-lib=opus");
println!("cargo:rustc-link-lib=gbm"); println!("cargo:rustc-link-lib=gbm");
println!("cargo:rustc-link-lib=X11-xcb"); println!("cargo:rustc-link-lib=X11-xcb");
println!("cargo:rustc-link-lib=xcb"); println!("cargo:rustc-link-lib=xcb");
println!("cargo:rustc-link-lib=xcb-dri3"); println!("cargo:rustc-link-lib=xcb-dri3");
println!("cargo:rustc-link-lib=xcb-damage"); println!("cargo:rustc-link-lib=xcb-damage");
} }
x11_build.compile("x11_engine");
println!("cargo:rustc-link-lib=X11"); println!("cargo:rustc-link-lib=X11");
println!("cargo:rustc-link-lib=Xext"); println!("cargo:rustc-link-lib=Xext");
@@ -59,7 +79,7 @@ fn main() {
match (std::env::var_os("UU_NO_GTK").is_none()).then(|| gtk("--cflags").zip(gtk("--libs"))).flatten() { match (std::env::var_os("UU_NO_GTK").is_none()).then(|| gtk("--cflags").zip(gtk("--libs"))).flatten() {
Some((cflags, libs)) => { Some((cflags, libs)) => {
let mut build = cc::Build::new(); let mut build = cc::Build::new();
build.file("c_engine/assist_window.c").file("c_engine/viewer_window.c").file("c_engine/viewer_tools.c").flag_if_supported("-Wno-deprecated-declarations"); build.file("c_engine/assist_window.c").file("c_engine/privacy_wallpaper.c").file("c_engine/viewer_window.c").file("c_engine/viewer_tools.c").file("c_engine/ui_theme.c").flag_if_supported("-Wno-deprecated-declarations");
for flag in cflags.split_whitespace() { build.flag(flag); } for flag in cflags.split_whitespace() { build.flag(flag); }
build.compile("uu_login_window"); build.compile("uu_login_window");
for flag in libs.split_whitespace() { for flag in libs.split_whitespace() {
+3 -26
View File
@@ -9,27 +9,9 @@
#include <string.h> #include <string.h>
#include <dlfcn.h> #include <dlfcn.h>
#include "i18n.h" #include "i18n.h"
#include "ui_theme.h"
static void on_language(GtkComboBox *c, gpointer note); static void on_language(GtkComboBox *c, gpointer note);
static const char *CSS =
"window { background-color: #f5f6f8; }\n"
"* { font-family: 'Noto Sans CJK SC', 'Noto Sans SC', sans-serif; }\n"
".card { background-color: #ffffff; border-radius: 10px; border: 1px solid #e5e7eb; }\n"
".heading { font-size: 20px; font-weight: 700; color: #1d1d1f; }\n"
".key { font-size: 14px; color: #4b5563; }\n"
".big { font-size: 32px; font-weight: 800; color: #111111; }\n"
".note { font-size: 13px; color: #9ca3af; }\n"
".hint { font-size: 13px; color: #6b7280; }\n"
".footer { font-size: 12px; color: #9ca3af; }\n"
"button.flat { padding: 4px 8px; }\n"
"button.share { background-image: none; background-color: #ffffff; border: 1px solid #d1d5db;"
" border-radius: 6px; padding: 6px 14px; font-size: 14px; }\n"
"separator { background-color: #e5e7eb; min-height: 1px; }\n"
".user { font-size: 22px; font-weight: 700; color: #111111; }\n"
".status { font-size: 13px; color: #2f6bff; }\n"
".status.ok { color: #16a34a; }\n"
".status.error { color: #dc2626; }\n";
enum { CMD_NONE = 0, CMD_ALLOW = 1, CMD_DENY = 2, CMD_RESET = 3, CMD_STOP = 4, CMD_VERIFY = 5, CMD_REFRESH = 6, CMD_CUSTOM = 7, CMD_LOGOUT = 8, CMD_QUIT = 9 }; enum { CMD_NONE = 0, CMD_ALLOW = 1, CMD_DENY = 2, CMD_RESET = 3, CMD_STOP = 4, CMD_VERIFY = 5, CMD_REFRESH = 6, CMD_CUSTOM = 7, CMD_LOGOUT = 8, CMD_QUIT = 9 };
enum { VERIFY_TEMPORARY = 0, VERIFY_CUSTOM = 1, VERIFY_BOTH = 2 }; enum { VERIFY_TEMPORARY = 0, VERIFY_CUSTOM = 1, VERIFY_BOTH = 2 };
@@ -387,11 +369,7 @@ static void build_tray(void) {
} }
static void build_window(void) { static void build_window(void) {
GtkCssProvider *css = gtk_css_provider_new(); uu_theme_init();
gtk_css_provider_load_from_data(css, CSS, -1, NULL);
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), GTK_STYLE_PROVIDER(css),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
g_object_unref(css);
gtk_window_set_default_icon_name("uu-remote-linux"); // contrib/desktop icon, when installed gtk_window_set_default_icon_name("uu-remote-linux"); // contrib/desktop icon, when installed
window = gtk_window_new(GTK_WINDOW_TOPLEVEL); window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -522,6 +500,7 @@ static void build_window(void) {
gtk_box_pack_start(GTK_BOX(lang_row), lang, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(lang_row), lang, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(lang_row), lang_note, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(lang_row), lang_note, FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(root), lang_row, FALSE, FALSE, 6); gtk_box_pack_end(GTK_BOX(root), lang_row, FALSE, FALSE, 6);
gtk_box_pack_end(GTK_BOX(lang_row), uu_theme_settings_button(GTK_WINDOW(window)), FALSE, FALSE, 0);
if (close_hides) gtk_label_set_text(GTK_LABEL(footer_label), L("开源 Linux 被控端 · 非网易官方客户端 · 关闭窗口后远程协助仍在后台运行", "Open-source Linux host · not an official NetEase client · remote assistance keeps running after the window closes")); if (close_hides) gtk_label_set_text(GTK_LABEL(footer_label), L("开源 Linux 被控端 · 非网易官方客户端 · 关闭窗口后远程协助仍在后台运行", "Open-source Linux host · not an official NetEase client · remote assistance keeps running after the window closes"));
render_code(); render_code();
if (close_hides) build_tray(); if (close_hides) build_tray();
@@ -544,8 +523,6 @@ static void on_language(GtkComboBox *c, gpointer note) {
static void *ui_main(void *arg) { static void *ui_main(void *arg) {
(void)arg; (void)arg;
int ok = gtk_init_check(NULL, NULL); int ok = gtk_init_check(NULL, NULL);
// The CSS hard-codes a light palette; a dark system theme would turn unstyled text white on white (#43).
if (ok) g_object_set(gtk_settings_get_default(), "gtk-theme-name", "Adwaita", "gtk-application-prefer-dark-theme", FALSE, NULL);
if (ok) build_window(); if (ok) build_window();
pthread_mutex_lock(&init_lock); pthread_mutex_lock(&init_lock);
init_state = ok ? 1 : -1; init_state = ok ? 1 : -1;
+124
View File
@@ -0,0 +1,124 @@
#include <pulse/pulseaudio.h>
#include <opus/opus.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include "i18n.h"
typedef struct {
pa_mainloop *loop;
pa_context *context;
pa_stream *stream;
OpusEncoder *encoder;
char *source;
int failed, connecting;
int16_t pcm[960 * 2];
size_t filled, offset;
} UuAudio;
void uu_audio_close(UuAudio *audio) {
if (!audio) return;
if (audio->stream) {
pa_stream_disconnect(audio->stream);
pa_stream_unref(audio->stream);
}
if (audio->context) {
pa_context_disconnect(audio->context);
pa_context_unref(audio->context);
}
if (audio->loop) pa_mainloop_free(audio->loop);
if (audio->encoder) opus_encoder_destroy(audio->encoder);
free(audio->source);
free(audio);
}
static void connect_source(UuAudio *audio, const char *source) {
if (!source || !*source) { audio->failed = 1; return; }
pa_sample_spec spec = { PA_SAMPLE_S16NE, 48000, 2 };
audio->stream = pa_stream_new(audio->context, L("UU 远程音频", "UU Remote audio"), &spec, NULL);
pa_buffer_attr attr = { (uint32_t)-1, (uint32_t)-1, (uint32_t)-1, (uint32_t)-1, sizeof(audio->pcm) };
if (!audio->stream || pa_stream_connect_record(audio->stream, source, &attr,
PA_STREAM_ADJUST_LATENCY | PA_STREAM_DONT_MOVE) < 0) audio->failed = 1;
}
static void source_info(pa_context *context, const pa_source_info *info, int end, void *data) {
(void)context;
UuAudio *audio = data;
if (info && !audio->stream) connect_source(audio, info->name);
if (end && !audio->stream) audio->failed = 1;
}
static void sink_info(pa_context *context, const pa_sink_info *info, int end, void *data) {
(void)context;
UuAudio *audio = data;
if (info && !audio->stream) connect_source(audio, info->monitor_source_name);
if (end && !audio->stream) audio->failed = 1;
}
static void server_info(pa_context *context, const pa_server_info *info, void *data) {
UuAudio *audio = data;
if (!info || !info->default_sink_name) { audio->failed = 1; return; }
pa_operation *op = pa_context_get_sink_info_by_name(context, info->default_sink_name, sink_info, audio);
if (op) pa_operation_unref(op);
else audio->failed = 1;
}
UuAudio *uu_audio_open(const char *source) {
UuAudio *audio = calloc(1, sizeof(*audio));
if (!audio) return NULL;
int error;
audio->source = strdup(source);
audio->encoder = opus_encoder_create(48000, 2, OPUS_APPLICATION_RESTRICTED_LOWDELAY, &error);
audio->loop = pa_mainloop_new();
if (!audio->source || !audio->encoder || !audio->loop) goto fail;
if (opus_encoder_ctl(audio->encoder, OPUS_SET_BITRATE(128000)) != OPUS_OK) goto fail;
audio->context = pa_context_new(pa_mainloop_get_api(audio->loop), "UU Remote");
if (!audio->context || pa_context_connect(audio->context, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL) < 0) goto fail;
return audio;
fail:
uu_audio_close(audio);
return NULL;
}
/* Nonblocking: the Rust worker checks cancellation between calls, including on a suspended sink. */
int uu_audio_packet(UuAudio *audio, uint8_t *packet, int capacity) {
int result;
if (pa_mainloop_iterate(audio->loop, 0, &result) < 0) return -1;
pa_context_state_t state = pa_context_get_state(audio->context);
if (!PA_CONTEXT_IS_GOOD(state) || audio->failed) return -2;
if (state != PA_CONTEXT_READY) return 0;
if (!audio->connecting) {
audio->connecting = 1;
if (strcmp(audio->source, "@DEFAULT_MONITOR@") == 0) {
pa_operation *op = pa_context_get_server_info(audio->context, server_info, audio);
if (op) pa_operation_unref(op);
else return -3;
} else {
pa_operation *op = pa_context_get_source_info_by_name(audio->context, audio->source, source_info, audio);
if (op) pa_operation_unref(op);
else return -3;
}
}
if (!audio->stream) return 0;
pa_stream_state_t stream_state = pa_stream_get_state(audio->stream);
if (!PA_STREAM_IS_GOOD(stream_state)) return -4;
if (stream_state != PA_STREAM_READY) return 0;
const void *buffer;
size_t length;
if (pa_stream_peek(audio->stream, &buffer, &length) < 0) return -5;
if (!length) return 0;
if (audio->offset > length) return -6;
size_t copy = sizeof(audio->pcm) - audio->filled;
if (copy > length - audio->offset) copy = length - audio->offset;
if (buffer) memcpy((uint8_t *)audio->pcm + audio->filled, (const uint8_t *)buffer + audio->offset, copy);
else memset((uint8_t *)audio->pcm + audio->filled, 0, copy);
audio->filled += copy;
audio->offset += copy;
if (audio->offset == length) {
if (pa_stream_drop(audio->stream) < 0) return -7;
audio->offset = 0;
}
if (audio->filled < sizeof(audio->pcm)) return 0;
audio->filled = 0;
return opus_encode(audio->encoder, audio->pcm, 960, packet, capacity);
}
+10
View File
@@ -0,0 +1,10 @@
#ifndef UU_DMABUF_FRAME_H
#define UU_DMABUF_FRAME_H
#include <stdint.h>
/* Borrowed single-plane RGB buffer. The producer retains ownership until the lease ends. */
typedef struct {
int32_t fd;
uint32_t fourcc, width, height, stride, offset, size;
uint64_t modifier;
} UuDmaFrame;
#endif
+39 -3
View File
@@ -17,7 +17,7 @@ static int portal_eis_dispatch(struct uu_portal *p) {
case EI_EVENT_SEAT_ADDED: case EI_EVENT_SEAT_ADDED:
ei_seat_bind_capabilities(ei_event_get_seat(event), ei_seat_bind_capabilities(ei_event_get_seat(event),
EI_DEVICE_CAP_POINTER, EI_DEVICE_CAP_POINTER_ABSOLUTE, EI_DEVICE_CAP_POINTER, EI_DEVICE_CAP_POINTER_ABSOLUTE,
EI_DEVICE_CAP_BUTTON, EI_DEVICE_CAP_SCROLL, EI_DEVICE_CAP_KEYBOARD, NULL); EI_DEVICE_CAP_BUTTON, EI_DEVICE_CAP_SCROLL, EI_DEVICE_CAP_KEYBOARD, EI_DEVICE_CAP_TOUCH, NULL);
break; break;
case EI_EVENT_DEVICE_RESUMED: case EI_EVENT_DEVICE_RESUMED:
if (!g_list_find(p->ei_devices, device)) { if (!g_list_find(p->ei_devices, device)) {
@@ -55,15 +55,19 @@ static struct ei_region *portal_eis_region(struct uu_portal *p, struct ei_device
ei_region_get_width(region) && ei_region_get_height(region)) return region; ei_region_get_width(region) && ei_region_get_height(region)) return region;
} }
} }
static struct ei_device *portal_eis_absolute(struct uu_portal *p, struct ei_region **region) { static struct ei_device *portal_eis_mapped(struct uu_portal *p, enum ei_device_capability capability, struct ei_region **region) {
for (GList *item = p->ei_devices; item; item = item->next) { for (GList *item = p->ei_devices; item; item = item->next) {
struct ei_device *device = item->data; struct ei_device *device = item->data;
if (ei_device_has_capability(device, EI_DEVICE_CAP_POINTER_ABSOLUTE) && if (ei_device_has_capability(device, capability) &&
(*region = portal_eis_region(p, device))) return device; (*region = portal_eis_region(p, device))) return device;
} }
return NULL; return NULL;
} }
static struct ei_device *portal_eis_absolute(struct uu_portal *p, struct ei_region **region) {
return portal_eis_mapped(p, EI_DEVICE_CAP_POINTER_ABSOLUTE, region);
}
static void portal_eis_close(struct uu_portal *p) { static void portal_eis_close(struct uu_portal *p) {
if (p->ei_touch) p->ei_touch = ei_touch_unref(p->ei_touch);
for (GList *item = p->ei_devices; item; item = item->next) ei_device_unref(item->data); for (GList *item = p->ei_devices; item; item = item->next) ei_device_unref(item->data);
g_list_free(p->ei_devices); p->ei_devices = NULL; g_list_free(p->ei_devices); p->ei_devices = NULL;
if (p->ei) p->ei = ei_unref(p->ei); if (p->ei) p->ei = ei_unref(p->ei);
@@ -157,6 +161,38 @@ static int portal_eis_button(struct uu_portal *p, int button, int pressed) {
ei_device_button_button(device, code, !!pressed); ei_device_button_button(device, code, !!pressed);
return portal_eis_frame(p, device); return portal_eis_frame(p, device);
} }
static int portal_eis_scroll(struct uu_portal *p, double dx, double dy, int finish) {
if (portal_eis_available(p)) return 9;
struct ei_device *device = portal_eis_device(p, EI_DEVICE_CAP_SCROLL);
if (!device) return 9;
if (dx != 0 || dy != 0) ei_device_scroll_delta(device, dx, dy);
if (finish) ei_device_scroll_stop(device, true, true);
return portal_eis_frame(p, device);
}
static int portal_eis_touch(struct uu_portal *p, int phase, double x, double y) {
if (portal_eis_available(p)) return 9;
if (phase == 2) {
if (!p->ei_touch) return 0;
struct ei_device *device = ei_touch_get_device(p->ei_touch);
ei_touch_up(p->ei_touch);
p->ei_touch = ei_touch_unref(p->ei_touch);
return portal_eis_frame(p, device);
}
struct ei_region *region = NULL;
struct ei_device *device = portal_eis_mapped(p, EI_DEVICE_CAP_TOUCH, &region);
if (!device) return 9;
double target_x = ei_region_get_x(region) + x * ei_region_get_width(region) / p->width;
double target_y = ei_region_get_y(region) + y * ei_region_get_height(region) / p->height;
if (phase == 0) {
if (p->ei_touch) { ei_touch_up(p->ei_touch); p->ei_touch = ei_touch_unref(p->ei_touch); }
if (!(p->ei_touch = ei_device_touch_new(device))) return 9;
ei_touch_down(p->ei_touch, target_x, target_y);
} else {
if (!p->ei_touch) return 11;
ei_touch_motion(p->ei_touch, target_x, target_y);
}
return portal_eis_frame(p, device);
}
static int portal_eis_key(struct uu_portal *p, int code, int pressed) { static int portal_eis_key(struct uu_portal *p, int code, int pressed) {
if (code < 0 || code > 0x2ff) return 11; if (code < 0 || code > 0x2ff) return 11;
if (portal_eis_available(p)) return 9; if (portal_eis_available(p)) return 9;
+285 -30
View File
@@ -16,6 +16,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <limits.h>
#define DEST "org.freedesktop.portal.Desktop" #define DEST "org.freedesktop.portal.Desktop"
#define PATH "/org/freedesktop/portal/desktop" #define PATH "/org/freedesktop/portal/desktop"
@@ -58,8 +59,10 @@ struct uu_portal {
uint32_t node, width, height; uint32_t node, width, height;
int logical_width, logical_height, position_x, position_y, has_position; int logical_width, logical_height, position_x, position_y, has_position;
int absolute_stream_pixels; int absolute_stream_pixels;
uint32_t devices, available;
struct ei *ei; struct ei *ei;
GList *ei_devices; GList *ei_devices;
struct ei_touch *ei_touch;
char *mapping_id; char *mapping_id;
uint32_t ei_sequence; uint32_t ei_sequence;
atomic_int ei_failed; atomic_int ei_failed;
@@ -69,6 +72,11 @@ struct uu_portal {
size_t frame_length; size_t frame_length;
uint64_t sequence; uint64_t sequence;
uint64_t revision; uint64_t revision;
uint32_t buffers_seen, last_buffer_type;
int dma_requested, dma_negotiated, dma_format, dma_bad, dma_blocked, dma_neutral, dma_seen;
uint64_t modifier;
gint64 dma_requested_at;
struct pw_buffer *dma_pending, *dma_current;
}; };
#include "portal_clipboard.inc" #include "portal_clipboard.inc"
@@ -81,6 +89,19 @@ static int open_cancelled(struct uu_portal *p) {
} }
static int wait_for_first_frame(struct uu_portal *p); static int wait_for_first_frame(struct uu_portal *p);
#include "portal_eis.inc" #include "portal_eis.inc"
/* A uint32 RemoteDesktop property (version, AvailableDeviceTypes); 0 when unreadable. */
static guint remote_property(struct uu_portal *p, const char *name) {
GVariant *reply = g_dbus_connection_call_sync(p->bus, DEST, PATH,
"org.freedesktop.DBus.Properties", "Get", g_variant_new("(ss)", REMOTE, name),
G_VARIANT_TYPE("(v)"), G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
guint result = 0;
if (reply) {
GVariant *value; g_variant_get(reply, "(v)", &value);
if (g_variant_is_of_type(value, G_VARIANT_TYPE_UINT32)) result = g_variant_get_uint32(value);
g_variant_unref(value); g_variant_unref(reply);
}
return result;
}
static void fail(struct uu_portal *p, int error) { static void fail(struct uu_portal *p, int error) {
pthread_mutex_lock(&p->lock); pthread_mutex_lock(&p->lock);
if (!p->error) p->error = error; if (!p->error) p->error = error;
@@ -208,11 +229,17 @@ static void stream_state(void *data, enum pw_stream_state old, enum pw_stream_st
pthread_mutex_unlock(&p->lock); pthread_mutex_unlock(&p->lock);
if (state == PW_STREAM_STATE_ERROR || state == PW_STREAM_STATE_UNCONNECTED) fail(data, 9); if (state == PW_STREAM_STATE_ERROR || state == PW_STREAM_STATE_UNCONNECTED) fail(data, 9);
} }
static void return_dma_buffer(struct uu_portal *p, struct pw_buffer **buffer);
static void stream_format(void *data, uint32_t id, const struct spa_pod *param) { static void stream_format(void *data, uint32_t id, const struct spa_pod *param) {
struct uu_portal *p = data; struct uu_portal *p = data;
if (id != SPA_PARAM_Format) return; if (id != SPA_PARAM_Format) return;
if (!param) { if (!param) {
pthread_mutex_lock(&p->lock); pthread_mutex_lock(&p->lock);
if (p->dma_format) {
return_dma_buffer(p, &p->dma_pending);
return_dma_buffer(p, &p->dma_current);
p->sequence = 0;
}
p->format_valid = 0; p->format_valid = 0;
update_interruption(p); update_interruption(p);
pthread_mutex_unlock(&p->lock); pthread_mutex_unlock(&p->lock);
@@ -224,6 +251,11 @@ static void stream_format(void *data, uint32_t id, const struct spa_pod *param)
(info.format != SPA_VIDEO_FORMAT_BGRA && info.format != SPA_VIDEO_FORMAT_BGRx && (info.format != SPA_VIDEO_FORMAT_BGRA && info.format != SPA_VIDEO_FORMAT_BGRx &&
info.format != SPA_VIDEO_FORMAT_RGBA && info.format != SPA_VIDEO_FORMAT_RGBx)) { fail(p, 8); return; } info.format != SPA_VIDEO_FORMAT_RGBA && info.format != SPA_VIDEO_FORMAT_RGBx)) { fail(p, 8); return; }
pthread_mutex_lock(&p->lock); pthread_mutex_lock(&p->lock);
if (p->dma_format) {
return_dma_buffer(p, &p->dma_pending);
return_dma_buffer(p, &p->dma_current);
p->sequence = 0;
}
if (p->width && (p->width != info.size.width || p->height != info.size.height)) { if (p->width && (p->width != info.size.width || p->height != info.size.height)) {
p->error = 8; pthread_cond_broadcast(&p->changed); pthread_mutex_unlock(&p->lock); return; p->error = 8; pthread_cond_broadcast(&p->changed); pthread_mutex_unlock(&p->lock); return;
} }
@@ -231,12 +263,70 @@ static void stream_format(void *data, uint32_t id, const struct spa_pod *param)
if (!p->frame) p->frame = malloc(length); if (!p->frame) p->frame = malloc(length);
if (!p->frame) { p->error = 8; pthread_mutex_unlock(&p->lock); return; } if (!p->frame) { p->error = 8; pthread_mutex_unlock(&p->lock); return; }
p->width = info.size.width; p->height = info.size.height; p->format = info.format; p->width = info.size.width; p->height = info.size.height; p->format = info.format;
p->dma_format = spa_pod_find_prop(param, NULL, SPA_FORMAT_VIDEO_modifier) != NULL;
p->modifier = info.modifier;
p->dma_negotiated = p->dma_requested;
p->buffers_seen = 0;
p->frame_length = length; p->frame_length = length;
p->format_valid = 1; p->format_valid = 1;
p->display_changed_at = 0; p->display_changed_at = 0;
update_interruption(p); update_interruption(p);
pthread_cond_broadcast(&p->changed); pthread_cond_broadcast(&p->changed);
pthread_mutex_unlock(&p->lock); pthread_mutex_unlock(&p->lock);
fprintf(stderr, "Portal capture format: format=%u size=%ux%u dma_buf=%d dma_requested=%d modifier=%llu\n",
info.format, info.size.width, info.size.height, p->dma_format, p->dma_requested, (unsigned long long)info.modifier);
/* PipeWire DMA-BUF sharing: modifier formats require DMA buffers exclusively.
* Keep a current and a pending frame; at least four buffers prevent producer starvation. */
if (p->stream) {
uint8_t storage[256];
struct spa_pod_builder builder = SPA_POD_BUILDER_INIT(storage, sizeof(storage));
const struct spa_pod *buffers = spa_pod_builder_add_object(&builder, SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(4, 4, 8),
SPA_PARAM_BUFFERS_dataType, SPA_POD_CHOICE_FLAGS_Int(p->dma_format ?
(1 << SPA_DATA_DmaBuf) : ((1 << SPA_DATA_MemPtr) | (1 << SPA_DATA_MemFd))));
pw_stream_update_params(p->stream, &buffers, 1);
}
}
/* All pending/current buffer changes run under the PipeWire loop lock, then p->lock. */
static void return_dma_buffer(struct uu_portal *p, struct pw_buffer **buffer) {
if (*buffer && p->stream) pw_stream_queue_buffer(p->stream, *buffer);
*buffer = NULL;
}
static int describe_dma_buffer(struct uu_portal *p, struct spa_buffer *spa, UuDmaFrame *frame) {
if (p->error || atomic_load(&p->closed)) return 10;
if (p->modifier != 0) return 19;
if (!p->format_valid || !p->width || !p->height || spa->n_datas != 1) return 14;
struct spa_data *d = &spa->datas[0];
struct spa_meta_header *header = spa_buffer_find_meta_data(spa, SPA_META_Header, sizeof(*header));
if (!d->chunk || (d->chunk->flags & SPA_CHUNK_FLAG_CORRUPTED) ||
(header && (header->flags & SPA_META_HEADER_FLAG_CORRUPTED))) return 10;
if (d->chunk->flags & SPA_CHUNK_FLAG_EMPTY) return 15;
struct spa_meta_region *crop = spa_buffer_find_meta_data(spa, SPA_META_VideoCrop, sizeof(*crop));
if (crop && spa_meta_region_is_valid(crop) && (crop->region.position.x || crop->region.position.y ||
crop->region.size.width != p->width || crop->region.size.height != p->height)) return 14;
/* Explicit sync is not advertised; require implicit DMA-BUF fences understood by VAAPI. */
#if PW_CHECK_VERSION(1, 2, 0)
if (spa_buffer_find_meta(spa, SPA_META_SyncTimeline)) return 18;
#endif
if (d->type != SPA_DATA_DmaBuf || d->fd < 0 || d->fd > INT_MAX || d->chunk->stride < (int64_t)p->width * 4)
return 14;
uint64_t offset = (uint64_t)d->mapoffset + d->chunk->offset;
uint64_t size = (uint64_t)d->mapoffset + d->maxsize;
uint64_t required = offset + (uint64_t)(p->height - 1) * d->chunk->stride + (uint64_t)p->width * 4;
if (required > size || size > UINT32_MAX) return 14;
if (required - offset > d->chunk->size) return 10;
uint32_t fourcc;
switch (p->format) {
case SPA_VIDEO_FORMAT_BGRx: fourcc=0x34325258; break;
case SPA_VIDEO_FORMAT_BGRA: fourcc=0x34325241; break;
case SPA_VIDEO_FORMAT_RGBx: fourcc=0x34324258; break;
case SPA_VIDEO_FORMAT_RGBA: fourcc=0x34324241; break;
default: return 14;
}
*frame = (UuDmaFrame){ .fd=d->fd, .fourcc=fourcc, .width=p->width, .height=p->height,
.stride=d->chunk->stride, .offset=offset, .size=size, .modifier=p->modifier };
return 0;
} }
/* Called with the frame mutex held. Invalid transient chunks are discarded; /* Called with the frame mutex held. Invalid transient chunks are discarded;
* allocation capacity is not evidence that valid pixels have been supplied. */ * allocation capacity is not evidence that valid pixels have been supplied. */
@@ -286,14 +376,131 @@ static void stream_process(void *data) {
} }
if (!newest) return; if (!newest) return;
pthread_mutex_lock(&p->lock); pthread_mutex_lock(&p->lock);
copy_video_buffer(p, newest->buffer); p->buffers_seen++;
p->last_buffer_type = newest->buffer->n_datas ? newest->buffer->datas[0].type : 0;
if (p->dma_format) {
UuDmaFrame frame;
int result = describe_dma_buffer(p, newest->buffer, &frame);
if (result == 0 && p->dma_requested && !p->dma_blocked) {
return_dma_buffer(p, &p->dma_pending);
p->dma_pending = newest;
newest = NULL;
p->dma_seen = 1;
p->sequence++; p->revision++; p->dma_neutral = 0;
} else if (result == 15) {
return_dma_buffer(p, &p->dma_pending);
return_dma_buffer(p, &p->dma_current);
p->dma_neutral = 1; p->sequence++; p->revision++;
} else if (result != 10) p->dma_bad = result;
} else copy_video_buffer(p, newest->buffer);
pthread_cond_broadcast(&p->changed); pthread_cond_broadcast(&p->changed);
pthread_mutex_unlock(&p->lock); pthread_mutex_unlock(&p->lock);
pw_stream_queue_buffer(p->stream, newest); if (newest) pw_stream_queue_buffer(p->stream, newest);
}
static void stream_remove_buffer(void *data, struct pw_buffer *buffer) {
struct uu_portal *p = data;
pthread_mutex_lock(&p->lock);
if (p->dma_pending == buffer) p->dma_pending = NULL;
if (p->dma_current == buffer) p->dma_current = NULL;
pthread_mutex_unlock(&p->lock);
} }
static const struct pw_stream_events stream_events = { static const struct pw_stream_events stream_events = {
PW_VERSION_STREAM_EVENTS, .state_changed = stream_state, .param_changed = stream_format, .process = stream_process PW_VERSION_STREAM_EVENTS, .state_changed = stream_state, .param_changed = stream_format, .process = stream_process,
.remove_buffer = stream_remove_buffer
}; };
static unsigned capture_formats(struct uu_portal *p, struct spa_pod_builder *b, const struct spa_pod **params, int dma) {
unsigned count = 0;
/* Only advertise linear RGB: arbitrary tiling/compression cannot be inferred from an FD.
* PipeWire page_dma_buf: put the modifier format before the shared-memory fallback. */
for (int with_modifier = dma; with_modifier >= 0; with_modifier--) {
struct spa_pod_frame frame;
spa_pod_builder_push_object(b, &frame, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
spa_pod_builder_add(b,
SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video),
SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
SPA_FORMAT_VIDEO_format, SPA_POD_CHOICE_ENUM_Id(4, SPA_VIDEO_FORMAT_BGRA, SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_RGBA, SPA_VIDEO_FORMAT_RGBx),
0);
if (p->width && p->height) spa_pod_builder_add(b,
SPA_FORMAT_VIDEO_size, SPA_POD_Rectangle(&SPA_RECTANGLE(p->width,p->height)), 0);
else spa_pod_builder_add(b, SPA_FORMAT_VIDEO_size,
SPA_POD_CHOICE_RANGE_Rectangle(&SPA_RECTANGLE(1920,1080), &SPA_RECTANGLE(1,1), &SPA_RECTANGLE(8192,8192)), 0);
spa_pod_builder_add(b,
SPA_FORMAT_VIDEO_framerate, SPA_POD_CHOICE_RANGE_Fraction(&SPA_FRACTION(60,1), &SPA_FRACTION(0,1), &SPA_FRACTION(60,1)), 0);
if (with_modifier) {
spa_pod_builder_prop(b, SPA_FORMAT_VIDEO_modifier, SPA_POD_PROP_FLAG_MANDATORY);
spa_pod_builder_long(b, 0); /* DRM_FORMAT_MOD_LINEAR */
}
params[count++] = spa_pod_builder_pop(b, &frame);
}
params[count++] = spa_pod_builder_add_object(b, SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(4, 4, 8),
SPA_PARAM_BUFFERS_dataType, SPA_POD_CHOICE_FLAGS_Int((1 << SPA_DATA_MemPtr) | (1 << SPA_DATA_MemFd) |
(dma ? (1 << SPA_DATA_DmaBuf) : 0)));
return count;
}
static int request_capture_formats(struct uu_portal *p, int dma) {
uint8_t storage[2048];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(storage, sizeof(storage));
const struct spa_pod *params[3];
unsigned count = capture_formats(p, &b, params, dma);
return pw_stream_update_params(p->stream, params, count);
}
int uu_portal_dmabuf_acquire(struct uu_portal *p, UuDmaFrame *frame, uint64_t *revision) {
if (!p || !p->pw_loop || !p->stream || !frame || !revision) return 14;
pw_thread_loop_lock(p->pw_loop);
pthread_mutex_lock(&p->lock);
int result = 10;
if (atomic_load(&p->closed) || p->error || p->dma_blocked) result = 14;
else if (p->dma_bad) result = p->dma_bad;
else if (!p->dma_requested) {
p->dma_requested = 1; p->dma_negotiated = 0; p->dma_seen = 0;
p->dma_requested_at = g_get_monotonic_time();
pthread_mutex_unlock(&p->lock);
int status = request_capture_formats(p, 1);
pw_thread_loop_unlock(p->pw_loop);
return status < 0 ? 14 : 10;
} else if (p->dma_negotiated && !p->dma_format) result = 16;
else if (!p->dma_seen && !p->dma_neutral &&
g_get_monotonic_time() - p->dma_requested_at > 2 * G_TIME_SPAN_SECOND) result = 17;
else if (p->dma_neutral) result = 15;
else if (p->dma_format && p->format_valid) {
if (p->dma_pending) {
return_dma_buffer(p, &p->dma_current);
p->dma_current = p->dma_pending; p->dma_pending = NULL;
}
if (p->dma_current) {
result = describe_dma_buffer(p, p->dma_current->buffer, frame);
if (!result) {
result = *revision == p->revision ? 12 : 0;
*revision = p->revision;
}
}
}
pthread_mutex_unlock(&p->lock);
/* A lease pins both the pw_buffer and its format across VAAPI's completion fence.
* No producer buffer may be returned, removed or renegotiated while the GPU reads it. */
if (result != 0 && result != 12) pw_thread_loop_unlock(p->pw_loop);
return result;
}
void uu_portal_dmabuf_release(struct uu_portal *p) {
pw_thread_loop_unlock(p->pw_loop);
}
void uu_portal_dmabuf_disable(struct uu_portal *p) {
if (!p || !p->pw_loop || !p->stream) return;
pw_thread_loop_lock(p->pw_loop);
pthread_mutex_lock(&p->lock);
int requested = p->dma_requested;
if (requested) {
p->dma_requested = 0; p->dma_blocked = 1; p->dma_neutral = 0;
return_dma_buffer(p, &p->dma_pending); return_dma_buffer(p, &p->dma_current);
if (p->dma_format) { p->sequence = 0; p->revision++; }
}
pthread_mutex_unlock(&p->lock);
if (requested) request_capture_formats(p, 0);
pw_thread_loop_unlock(p->pw_loop);
}
static int connect_pipewire(struct uu_portal *p) { static int connect_pipewire(struct uu_portal *p) {
if (open_cancelled(p)) return 13; if (open_cancelled(p)) return 13;
GUnixFDList *fds = NULL; GUnixFDList *fds = NULL;
@@ -322,27 +529,33 @@ static int connect_pipewire(struct uu_portal *p) {
PW_KEY_MEDIA_TYPE, "Video", PW_KEY_MEDIA_CATEGORY, "Capture", PW_KEY_MEDIA_ROLE, "Screen", NULL)); PW_KEY_MEDIA_TYPE, "Video", PW_KEY_MEDIA_CATEGORY, "Capture", PW_KEY_MEDIA_ROLE, "Screen", NULL));
if (!p->stream) return 7; if (!p->stream) return 7;
pw_stream_add_listener(p->stream, &p->stream_listener, &stream_events, p); pw_stream_add_listener(p->stream, &p->stream_listener, &stream_events, p);
uint8_t storage[1024]; struct spa_pod_builder builder = SPA_POD_BUILDER_INIT(storage, sizeof(storage)); uint8_t storage[2048]; struct spa_pod_builder builder = SPA_POD_BUILDER_INIT(storage, sizeof(storage));
const struct spa_pod *params[2]; const struct spa_pod *params[3];
params[0] = spa_pod_builder_add_object(&builder, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, unsigned param_count = capture_formats(p, &builder, params, p->dma_requested);
SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video), SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), p->dma_requested_at = g_get_monotonic_time();
SPA_FORMAT_VIDEO_format, SPA_POD_CHOICE_ENUM_Id(4, SPA_VIDEO_FORMAT_BGRA, SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_RGBA, SPA_VIDEO_FORMAT_RGBx),
SPA_FORMAT_VIDEO_size, SPA_POD_CHOICE_RANGE_Rectangle(&SPA_RECTANGLE(1920,1080), &SPA_RECTANGLE(1,1), &SPA_RECTANGLE(8192,8192)),
SPA_FORMAT_VIDEO_framerate, SPA_POD_CHOICE_RANGE_Fraction(&SPA_FRACTION(60,1), &SPA_FRACTION(0,1), &SPA_FRACTION(60,1)));
params[1] = spa_pod_builder_add_object(&builder, SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
SPA_PARAM_BUFFERS_dataType, SPA_POD_CHOICE_FLAGS_Int((1 << SPA_DATA_MemPtr) | (1 << SPA_DATA_MemFd)));
/* Node ID belongs to this portal's restricted remote. Do not put it into /* Node ID belongs to this portal's restricted remote. Do not put it into
* target.object, whose numeric value means object.serial on modern PW. */ * target.object, whose numeric value means object.serial on modern PW. */
if (pw_stream_connect(p->stream, PW_DIRECTION_INPUT, p->node, if (pw_stream_connect(p->stream, PW_DIRECTION_INPUT, p->node,
PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_MAP_BUFFERS, params, 2) < 0) return 7; PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_MAP_BUFFERS, params, param_count) < 0) return 7;
if (pw_thread_loop_start(p->pw_loop) < 0) return 7; if (pw_thread_loop_start(p->pw_loop) < 0) return 7;
return wait_for_first_frame(p); int result = wait_for_first_frame(p);
pthread_mutex_lock(&p->lock);
int fallback = (result == 10 || result == 14) && p->dma_requested && !p->error &&
!atomic_load(&p->closed) && !open_cancelled(p);
int dma_status = p->dma_bad;
pthread_mutex_unlock(&p->lock);
if (fallback) {
fprintf(stderr, "Portal initial DMA-BUF unavailable: status=%d; falling back to shared-memory capture\n", dma_status);
uu_portal_dmabuf_disable(p);
result = wait_for_first_frame(p);
}
return result;
} }
static int wait_for_first_frame(struct uu_portal *p) { static int wait_for_first_frame(struct uu_portal *p) {
struct timespec until; struct timespec until;
gint64 deadline = g_get_monotonic_time() + 10 * G_TIME_SPAN_SECOND; gint64 deadline = g_get_monotonic_time() + 10 * G_TIME_SPAN_SECOND;
pthread_mutex_lock(&p->lock); pthread_mutex_lock(&p->lock);
while (!p->sequence && !p->error && !open_cancelled(p)) { while (!p->sequence && !p->error && !open_cancelled(p) && !(p->dma_requested && p->dma_bad)) {
gint64 remaining = deadline - g_get_monotonic_time(); gint64 remaining = deadline - g_get_monotonic_time();
if (remaining <= 0) break; if (remaining <= 0) break;
clock_gettime(CLOCK_REALTIME, &until); clock_gettime(CLOCK_REALTIME, &until);
@@ -351,7 +564,10 @@ static int wait_for_first_frame(struct uu_portal *p) {
if (until.tv_nsec >= 1000000000) { until.tv_sec++; until.tv_nsec -= 1000000000; } if (until.tv_nsec >= 1000000000) { until.tv_sec++; until.tv_nsec -= 1000000000; }
pthread_cond_timedwait(&p->changed, &p->lock, &until); pthread_cond_timedwait(&p->changed, &p->lock, &until);
} }
int result = p->error ? p->error : open_cancelled(p) ? 13 : p->sequence ? 0 : 10; int result = p->error ? p->error : open_cancelled(p) ? 13 : p->sequence ? 0 :
p->dma_requested && p->dma_bad ? 14 : 10;
if (result == 10) fprintf(stderr, "Portal first-frame timeout: format_valid=%d dma_buf=%d dma_requested=%d buffers=%u last_type=%u dma_status=%d\n",
p->format_valid, p->dma_format, p->dma_requested, p->buffers_seen, p->last_buffer_type, p->dma_bad);
pthread_mutex_unlock(&p->lock); pthread_mutex_unlock(&p->lock);
return result; return result;
} }
@@ -365,6 +581,7 @@ static int read_stream_result(struct uu_portal *p, GVariant *results) {
if (!has_devices || (devices & 3) != 3 || !streams || g_variant_n_children(streams) != 1) { if (!has_devices || (devices & 3) != 3 || !streams || g_variant_n_children(streams) != 1) {
error = 6; error = 6;
} else { } else {
p->devices = devices;
GVariant *entry = g_variant_get_child_value(streams, 0), *properties; GVariant *entry = g_variant_get_child_value(streams, 0), *properties;
g_variant_get(entry, "(u@a{sv})", &p->node, &properties); g_variant_get(entry, "(u@a{sv})", &p->node, &properties);
/* Optional 'size' is compositor logical coordinates, not frame pixels. */ /* Optional 'size' is compositor logical coordinates, not frame pixels. */
@@ -379,12 +596,13 @@ static int read_stream_result(struct uu_portal *p, GVariant *results) {
} }
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, void *save_data, uu_portal_cancelled_fn cancelled, void *cancel_data,
int *error, uint32_t *width, uint32_t *height) { 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));
if (!p) { *error = 8; return NULL; } if (!p) { *error = 8; return NULL; }
p->cancelled = cancelled; p->cancelled = cancelled;
p->cancel_data = cancel_data; p->cancel_data = cancel_data;
p->dma_requested = !!prefer_dmabuf;
/* GNOME forwards NotifyPointerMotionAbsolute into Mutter's stream-to-stage /* GNOME forwards NotifyPointerMotionAbsolute into Mutter's stream-to-stage
* transform. It expects stream pixels, unlike the compositor-sized KDE path. * transform. It expects stream pixels, unlike the compositor-sized KDE path.
* Do not apply the compositor scale twice on fractional-scale displays. */ * Do not apply the compositor scale twice on fractional-scale displays. */
@@ -413,16 +631,10 @@ static struct uu_portal *open_persist(const char *restore, void (*save_token)(co
p->closed_subscription = g_dbus_connection_signal_subscribe(p->bus, DEST, SESSION, "Closed", p->session, p->closed_subscription = g_dbus_connection_signal_subscribe(p->bus, DEST, SESSION, "Closed", p->session,
NULL, G_DBUS_SIGNAL_FLAGS_NONE, session_closed, p, NULL); NULL, G_DBUS_SIGNAL_FLAGS_NONE, session_closed, p, NULL);
g_variant_builder_init(&options, G_VARIANT_TYPE_VARDICT); g_variant_builder_init(&options, G_VARIANT_TYPE_VARDICT);
g_variant_builder_add(&options, "{sv}", "types", g_variant_new_uint32(3)); /* Keyboard and pointer, plus the touchscreen (4) where the portal offers one (mobile viewers). */
GVariant *version_reply = g_dbus_connection_call_sync(p->bus, DEST, PATH, p->available = remote_property(p, "AvailableDeviceTypes");
"org.freedesktop.DBus.Properties", "Get", g_variant_new("(ss)", REMOTE, "version"), g_variant_builder_add(&options, "{sv}", "types", g_variant_new_uint32(3 | (p->available & 4)));
G_VARIANT_TYPE("(v)"), G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL); guint version = remote_property(p, "version");
guint version = 0;
if (version_reply) {
GVariant *value; g_variant_get(version_reply, "(v)", &value);
if (g_variant_is_of_type(value, G_VARIANT_TYPE_UINT32)) version = g_variant_get_uint32(value);
g_variant_unref(value); g_variant_unref(version_reply);
}
if (version >= 2) { if (version >= 2) {
g_variant_builder_add(&options, "{sv}", "persist_mode", g_variant_new_uint32(2)); g_variant_builder_add(&options, "{sv}", "persist_mode", g_variant_new_uint32(2));
if (restore && *restore) g_variant_builder_add(&options, "{sv}", "restore_token", g_variant_new_string(restore)); if (restore && *restore) g_variant_builder_add(&options, "{sv}", "restore_token", g_variant_new_string(restore));
@@ -432,7 +644,8 @@ static struct uu_portal *open_persist(const char *restore, void (*save_token)(co
if (!results) goto done; if (!results) goto done;
g_variant_unref(results); g_variant_unref(results);
g_variant_builder_init(&options, G_VARIANT_TYPE_VARDICT); g_variant_builder_init(&options, G_VARIANT_TYPE_VARDICT);
g_variant_builder_add(&options, "{sv}", "types", g_variant_new_uint32(1)); /* 1 monitor; 4 virtual (KDE creates a KWin virtual output for the stream). */
g_variant_builder_add(&options, "{sv}", "types", g_variant_new_uint32(source_types));
g_variant_builder_add(&options, "{sv}", "multiple", g_variant_new_boolean(FALSE)); g_variant_builder_add(&options, "{sv}", "multiple", g_variant_new_boolean(FALSE));
/* Hidden cursor avoids duplicate pointer; supported since ScreenCast v1. */ /* Hidden cursor avoids duplicate pointer; supported since ScreenCast v1. */
results = request(p, SCREEN, "SelectSources", &options, 1, error); results = request(p, SCREEN, "SelectSources", &options, 1, error);
@@ -495,11 +708,21 @@ 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, error, width, height); return open_persist(restore, save_token, save_data, cancelled, cancel_data, 0, error, width, height, 1);
}
struct uu_portal *uu_portal_open_persist_capture(const char *restore,
void (*save_token)(const char *, void *), void *save_data,
uu_portal_cancelled_fn cancelled, void *cancel_data, int prefer_dmabuf,
int *error, uint32_t *width, uint32_t *height) {
return open_persist(restore, save_token, 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, error, width, height); return open_persist(restore, save_token, data, NULL, NULL, 0, error, width, height, 1);
}
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) {
return open_persist(restore, save_token, data, NULL, NULL, 0, error, width, height, 4);
} }
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);
@@ -546,11 +769,15 @@ void uu_portal_close(struct uu_portal *p) {
} }
void uu_portal_reset_frame(struct uu_portal *p) { void uu_portal_reset_frame(struct uu_portal *p) {
if (!p) return; if (!p) return;
if (p->pw_loop) pw_thread_loop_lock(p->pw_loop);
pthread_mutex_lock(&p->lock); pthread_mutex_lock(&p->lock);
return_dma_buffer(p, &p->dma_pending); return_dma_buffer(p, &p->dma_current);
p->dma_neutral = 0;
p->sequence = 0; p->sequence = 0;
p->revision++; p->revision++;
if (p->frame) memset(p->frame, 0, p->frame_length); if (p->frame) memset(p->frame, 0, p->frame_length);
pthread_mutex_unlock(&p->lock); pthread_mutex_unlock(&p->lock);
if (p->pw_loop) pw_thread_loop_unlock(p->pw_loop);
} }
int uu_portal_capture(struct uu_portal *p, uint8_t *frame, size_t length) { int uu_portal_capture(struct uu_portal *p, uint8_t *frame, size_t length) {
return uu_portal_capture_since(p, frame, length, NULL); return uu_portal_capture_since(p, frame, length, NULL);
@@ -567,6 +794,7 @@ static int stream_stalled(struct uu_portal *p) {
} }
int uu_portal_capture_since(struct uu_portal *p, uint8_t *frame, size_t length, uint64_t *revision) { int uu_portal_capture_since(struct uu_portal *p, uint8_t *frame, size_t length, uint64_t *revision) {
if (!p || !frame) return 11; if (!p || !frame) return 11;
uu_portal_dmabuf_disable(p);
pthread_mutex_lock(&p->lock); pthread_mutex_lock(&p->lock);
int result = atomic_load(&p->closed) ? 9 : p->error ? p->error : stream_stalled(p) ? 9 : int result = atomic_load(&p->closed) ? 9 : p->error ? p->error : stream_stalled(p) ? 9 :
!p->sequence ? 10 : length != p->frame_length ? 11 : 0; !p->sequence ? 10 : length != p->frame_length ? 11 : 0;
@@ -670,6 +898,33 @@ int uu_portal_button(struct uu_portal *p, int button, int pressed) {
if (!code) return 11; if (!code) return 11;
return notify(p, "NotifyPointerButton", g_variant_new("(o@a{sv}iu)", p->session, empty_options(), code, (guint)!!pressed)); return notify(p, "NotifyPointerButton", g_variant_new("(o@a{sv}iu)", p->session, empty_options(), code, (guint)!!pressed));
} }
/* Smooth scroll in stream pixels (positive scrolls down/right, like a touchpad); `finish` ends the
* gesture so clients may coast. */
int uu_portal_scroll(struct uu_portal *p, double dx, double dy, int finish) {
if (!p || !isfinite(dx) || !isfinite(dy)) return 11;
if (p->logical_width <= 0 || p->logical_height <= 0 || !p->width || !p->height) return 11;
int result = prepare_input(p); if (result) return result;
double lx = dx * p->logical_width / p->width, ly = dy * p->logical_height / p->height;
if (p->ei) return portal_eis_scroll(p, lx, ly, finish);
GVariantBuilder options; g_variant_builder_init(&options, G_VARIANT_TYPE_VARDICT);
if (finish) g_variant_builder_add(&options, "{sv}", "finish", g_variant_new_boolean(TRUE));
return notify(p, "NotifyPointerAxis", g_variant_new("(oa{sv}dd)", p->session, &options, lx, ly));
}
/* One finger (slot 0) in stream pixels: phase 0 down, 1 motion, 2 up. */
int uu_portal_touch_supported(struct uu_portal *p) { return p && (p->devices & 4); }
/* The portal offers a touchscreen this session's consent did not grant (restored from before touch). */
int uu_portal_touch_available(struct uu_portal *p) { return p && (p->available & 4); }
int uu_portal_touch(struct uu_portal *p, int phase, double x, double y) {
if (!uu_portal_touch_supported(p) || phase < 0 || phase > 2) return 11;
if (phase != 2 && (!isfinite(x) || !isfinite(y) || p->logical_width <= 0 || p->logical_height <= 0 ||
!p->width || !p->height || x < 0 || y < 0 || x >= p->width || y >= p->height)) return 11;
int result = prepare_input(p); if (result) return result;
if (p->ei) return portal_eis_touch(p, phase, x, y);
if (phase == 2) return notify(p, "NotifyTouchUp", g_variant_new("(o@a{sv}u)", p->session, empty_options(), 0u));
return notify(p, phase ? "NotifyTouchMotion" : "NotifyTouchDown", g_variant_new("(o@a{sv}uudd)", p->session, empty_options(), p->node, 0u,
p->absolute_stream_pixels ? x : x * p->logical_width / p->width,
p->absolute_stream_pixels ? y : y * p->logical_height / p->height));
}
int uu_portal_key(struct uu_portal *p, uint32_t symbol, int keycode, int pressed) { int uu_portal_key(struct uu_portal *p, uint32_t symbol, int keycode, int pressed) {
if (!p || !symbol || symbol > INT32_MAX) return 11; if (!p || !symbol || symbol > INT32_MAX) return 11;
int result = prepare_input(p); if (result) return result; int result = prepare_input(p); if (result) return result;
+14
View File
@@ -2,14 +2,18 @@
#define UU_PORTAL_ENGINE_H #define UU_PORTAL_ENGINE_H
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.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);
/* 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. */
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);
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); 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);
/* The cancellation callback and data are used only until this call returns. */ /* The cancellation callback and data are used only until this call returns. */
struct uu_portal *uu_portal_open_persist_cancellable(const char *restore, void (*save_token)(const char *, void *), void *save_data, uu_portal_cancelled_fn cancelled, void *cancel_data, int *error, uint32_t *width, uint32_t *height); struct uu_portal *uu_portal_open_persist_cancellable(const char *restore, void (*save_token)(const char *, void *), void *save_data, uu_portal_cancelled_fn cancelled, void *cancel_data, int *error, uint32_t *width, uint32_t *height);
/* Select the capture transport before connecting, including on same-process recovery. */
struct uu_portal *uu_portal_open_persist_capture(const char *restore, void (*save_token)(const char *, void *), void *save_data, uu_portal_cancelled_fn cancelled, void *cancel_data, int prefer_dmabuf, int *error, uint32_t *width, uint32_t *height);
struct uu_portal *uu_portal_open_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);
const char *uu_portal_restore_token(struct uu_portal *portal); const char *uu_portal_restore_token(struct uu_portal *portal);
void uu_portal_close(struct uu_portal *portal); void uu_portal_close(struct uu_portal *portal);
@@ -23,8 +27,18 @@ void uu_portal_logical_size(struct uu_portal *portal, uint32_t *width, uint32_t
void uu_portal_reset_frame(struct uu_portal *portal); void uu_portal_reset_frame(struct uu_portal *portal);
int uu_portal_capture(struct uu_portal *portal, uint8_t *bgra, size_t length); int uu_portal_capture(struct uu_portal *portal, uint8_t *bgra, size_t length);
int uu_portal_capture_since(struct uu_portal *portal, uint8_t *bgra, size_t length, uint64_t *revision); int uu_portal_capture_since(struct uu_portal *portal, uint8_t *bgra, size_t length, uint64_t *revision);
/* acquire holds the PipeWire loop until release, including GPU completion.
* 0/12 = leased new/unchanged frame, 10 = pending, 15 = neutral black.
* CPU fallback: 14 layout/disabled, 16 shared memory, 17 timeout, 18 explicit sync, 19 modifier. */
int uu_portal_dmabuf_acquire(struct uu_portal *portal, UuDmaFrame *frame, uint64_t *revision);
void uu_portal_dmabuf_release(struct uu_portal *portal);
void uu_portal_dmabuf_disable(struct uu_portal *portal);
int uu_portal_move(struct uu_portal *portal, double x, double y, int relative); int uu_portal_move(struct uu_portal *portal, double x, double y, int relative);
int uu_portal_button(struct uu_portal *portal, int button, int pressed); int uu_portal_button(struct uu_portal *portal, int button, int pressed);
int uu_portal_scroll(struct uu_portal *portal, double dx, double dy, int finish);
int uu_portal_touch_supported(struct uu_portal *portal);
int uu_portal_touch_available(struct uu_portal *portal);
int uu_portal_touch(struct uu_portal *portal, int phase, double x, double y);
int uu_portal_key(struct uu_portal *portal, uint32_t keysym, int keycode, int pressed); int uu_portal_key(struct uu_portal *portal, uint32_t keysym, int keycode, int pressed);
int uu_portal_stream_position(struct uu_portal *portal, int32_t *x, int32_t *y); int uu_portal_stream_position(struct uu_portal *portal, int32_t *x, int32_t *y);
int uu_portal_monitors(char *out, size_t length); int uu_portal_monitors(char *out, size_t length);
+88
View File
@@ -0,0 +1,88 @@
// Privacy screen, wallpaper mode: a fullscreen keep-above window on each physical monitor showing
// a picture and a notice, while the remote session works on a KWin virtual output. Runs in its own
// process (`uuremote-server privacy-wallpaper`), which the host kills on restore.
#include <gtk/gtk.h>
#include <stdio.h>
#include <stdlib.h>
#include "i18n.h"
typedef struct { int x, y, w, h; } Rect;
static GdkPixbuf *picture;
static gboolean host_closed(GIOChannel *channel, GIOCondition condition, gpointer data) {
(void)channel; (void)condition; (void)data;
gtk_main_quit();
return G_SOURCE_REMOVE;
}
static gboolean draw(GtkWidget *widget, cairo_t *cr, gpointer data) {
(void)data;
int w = gtk_widget_get_allocated_width(widget), h = gtk_widget_get_allocated_height(widget);
cairo_set_source_rgb(cr, 0, 0, 0); cairo_paint(cr);
if (picture) {
// Cover: scale to fill, crop the overflow, keep the aspect ratio.
double pw = gdk_pixbuf_get_width(picture), ph = gdk_pixbuf_get_height(picture);
double s = w / pw > h / ph ? w / pw : h / ph;
cairo_save(cr);
cairo_translate(cr, (w - pw * s) / 2, (h - ph * s) / 2);
cairo_scale(cr, s, s);
gdk_cairo_set_source_pixbuf(cr, picture, 0, 0);
cairo_paint(cr);
cairo_restore(cr);
}
PangoLayout *layout = gtk_widget_create_pango_layout(widget, L("此设备正在被远程控制", "This device is being remotely controlled"));
PangoFontDescription *font = pango_font_description_from_string("Sans 20");
pango_layout_set_font_description(layout, font);
int tw, th; pango_layout_get_pixel_size(layout, &tw, &th);
cairo_set_source_rgba(cr, 0, 0, 0, 0.45);
cairo_rectangle(cr, (w - tw) / 2.0 - 24, h - th - 96, tw + 48, th + 32); cairo_fill(cr);
cairo_set_source_rgb(cr, 1, 1, 1);
cairo_move_to(cr, (w - tw) / 2.0, h - th - 80);
pango_cairo_show_layout(cr, layout);
pango_font_description_free(font); g_object_unref(layout);
return TRUE;
}
/* `rects` are the physical outputs in logical coordinates; monitors elsewhere (the virtual output)
* stay uncovered. Returns when every window is closed or the process is killed. */
int uu_privacy_wallpaper_run(const char *image, const int *rects, int count) {
if (!gtk_init_check(NULL, NULL)) return 1;
if (image && *image) picture = gdk_pixbuf_new_from_file(image, NULL);
GdkDisplay *display = gdk_display_get_default();
int shown = 0;
for (int i = 0; i < gdk_display_get_n_monitors(display); i++) {
GdkMonitor *monitor = gdk_display_get_monitor(display, i);
GdkRectangle g; gdk_monitor_get_geometry(monitor, &g);
int physical = 0;
for (int r = 0; r < count; r++) {
const int *c = rects + r * 4;
if (c[0] == g.x && c[1] == g.y && c[2] == g.width && c[3] == g.height) physical = 1;
}
if (!physical) continue;
GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), "uu-remote-linux privacy");
gtk_window_set_decorated(GTK_WINDOW(window), FALSE);
gtk_window_set_keep_above(GTK_WINDOW(window), TRUE);
gtk_window_set_skip_taskbar_hint(GTK_WINDOW(window), TRUE);
gtk_window_set_skip_pager_hint(GTK_WINDOW(window), TRUE);
gtk_window_set_default_size(GTK_WINDOW(window), g.width, g.height);
g_signal_connect(window, "draw", G_CALLBACK(draw), NULL);
g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
gtk_window_fullscreen_on_monitor(GTK_WINDOW(window), gtk_widget_get_screen(window), i);
gtk_widget_show_all(window);
shown++;
}
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. */
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);
/* Readiness handshake: the host treats picture mode as on only after this line. */
fputs("ready\n", stdout); fflush(stdout);
gtk_main();
if (g_main_context_find_source_by_id(NULL, watch)) g_source_remove(watch);
g_io_channel_unref(host);
return 0;
}
+141
View File
@@ -0,0 +1,141 @@
// One palette for all GTK windows. Named GTK colors also follow live system theme changes.
#include "ui_theme.h"
#include "i18n.h"
#include <glib/gstdio.h>
#include <string.h>
static int initialized, mode;
static const char *modes[] = {"system", "light", "dark"};
static const char *CSS =
"* { font-family: 'Noto Sans CJK SC', 'Noto Sans SC', sans-serif; }\n"
"@define-color uu_bg mix(@theme_bg_color, @theme_base_color, 0.5);\n"
"@define-color uu_surface @theme_base_color;\n"
"@define-color uu_fg @theme_fg_color;\n"
"@define-color uu_muted mix(@theme_fg_color, @theme_bg_color, 0.25);\n"
"@define-color uu_border mix(@theme_bg_color, @theme_fg_color, 0.18);\n"
"@define-color uu_accent @theme_selected_bg_color;\n"
"@define-color uu_accent_fg @theme_selected_fg_color;\n"
"@define-color uu_tint mix(@theme_base_color, @theme_selected_bg_color, 0.12);\n"
"@define-color uu_success mix(@theme_fg_color, #16a34a, 0.55);\n"
"@define-color uu_error mix(@theme_fg_color, #dc2626, 0.65);\n"
"window { background-color: @uu_bg; color: @uu_fg; }\n"
"headerbar { background-image: none; background-color: @uu_bg; box-shadow: none; border-bottom: 1px solid @uu_border; }\n"
"button { background-image: none; background-color: @uu_surface; color: @uu_fg; border: 1px solid @uu_border; border-radius: 8px; box-shadow: none; text-shadow: none; padding: 7px 12px; }\n"
"button:hover { background-color: @uu_tint; border-color: @uu_accent; }\n"
"button:active, button:checked { background-color: @uu_tint; border-color: @uu_accent; }\n"
"button:disabled { color: mix(@uu_fg, @uu_surface, 0.55); background-color: @uu_bg; border-color: @uu_border; }\n"
"button:focus, entry:focus { border-color: @uu_accent; outline-color: @uu_accent; outline-style: solid; outline-width: 2px; outline-offset: 2px; }\n"
"entry { background-image: none; background-color: @uu_surface; color: @uu_fg; border: 1px solid @uu_border; border-radius: 8px; box-shadow: none; padding: 7px 10px; }\n"
"entry:disabled { color: @uu_muted; background-color: @uu_bg; }\n"
"separator { background-color: @uu_border; min-height: 1px; min-width: 1px; }\n"
".card, .cardbtn, .banner { background-color: @uu_surface; border: 1px solid @uu_border; border-radius: 12px; }\n"
".heading, .title, .h2, .user { font-size: 22px; font-weight: 700; color: @uu_fg; }\n"
".section, .group { font-size: 16px; font-weight: 600; color: @uu_fg; }\n"
".big { font-size: 32px; font-weight: 700; color: @uu_fg; }\n"
".key, .hint, .empty { font-size: 14px; color: @uu_muted; }\n"
".note, .footer { font-size: 13px; color: @uu_muted; }\n"
".status { font-size: 13px; color: @uu_muted; }\n"
".status.ok, .online, .dot { color: @uu_success; }\n"
".status.error { color: @uu_error; }\n"
".tag { background-color: @uu_tint; color: @uu_fg; border-radius: 6px; padding: 3px 8px; font-size: 12px; }\n"
".tag.remote { color: @uu_success; }\n"
"button.primary, button.enter { background-color: @uu_accent; color: @uu_accent_fg; border-color: transparent; font-weight: 600; padding: 9px 24px; }\n"
"button.primary:hover, button.enter:hover { background-color: shade(@uu_accent, 0.9); }\n"
"button.primary:active, button.enter:active { background-color: shade(@uu_accent, 0.8); }\n"
"button.primary:disabled, button.enter:disabled { background-color: @uu_bg; color: @uu_muted; border-color: @uu_border; }\n"
"button.flat, button.hbtn, button.tool { background-color: transparent; border-color: transparent; }\n"
"button.flat:hover, button.hbtn:hover, button.tool:hover, button.cardbtn:hover { background-color: @uu_tint; border-color: @uu_border; }\n"
".toast { background-color: @uu_fg; color: @uu_surface; border-radius: 10px; padding: 12px 18px; font-size: 14px; }\n"
".qrbox { background-color: white; border: 1px solid @uu_border; border-radius: 12px; padding: 14px; }\n";
void uu_theme_load_css(const char *css) {
GtkCssProvider *provider = gtk_css_provider_new();
GError *error = NULL;
if (gtk_css_provider_load_from_data(provider, css, -1, &error))
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
else { g_warning("Could not load UI stylesheet"); g_clear_error(&error); }
g_object_unref(provider);
}
static char *theme_path(void) {
return g_build_filename(g_get_user_config_dir(), "uuremote", "theme", NULL);
}
static void apply_mode(void) {
GtkSettings *settings = gtk_settings_get_default();
if (!mode) {
// Reset the application override, so subsequent desktop changes still propagate.
gtk_settings_reset_property(settings, "gtk-theme-name");
gtk_settings_reset_property(settings, "gtk-application-prefer-dark-theme");
} else {
g_object_set(settings, "gtk-theme-name", "Adwaita", "gtk-application-prefer-dark-theme", mode == 2, NULL);
}
}
void uu_theme_init(void) {
if (initialized) return;
initialized = 1;
char *path = theme_path(), *value = NULL;
if (g_file_get_contents(path, &value, NULL, NULL)) {
g_strstrip(value);
for (int i = 0; i < 3; i++) if (!strcmp(value, modes[i])) mode = i;
}
g_free(value); g_free(path);
apply_mode();
uu_theme_load_css(CSS);
}
static void on_theme(GtkComboBox *combo, gpointer note) {
int selected = gtk_combo_box_get_active(combo);
if (selected < 0 || selected > 2) return;
mode = selected;
apply_mode();
char *path = theme_path(), *dir = g_path_get_dirname(path);
gboolean saved = g_mkdir_with_parents(dir, 0700) == 0 && g_file_set_contents(path, modes[mode], -1, NULL);
gtk_label_set_text(GTK_LABEL(note), saved ? "" : L("无法保存外观设置", "Could not save appearance"));
gtk_widget_set_visible(GTK_WIDGET(note), !saved);
g_free(dir); g_free(path);
}
GtkWidget *uu_theme_selector(void) {
GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6), *row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
GtkWidget *label = gtk_label_new(L("外观", "Appearance")), *combo = gtk_combo_box_text_new(), *note = gtk_label_new("");
gtk_style_context_add_class(gtk_widget_get_style_context(label), "key");
gtk_style_context_add_class(gtk_widget_get_style_context(note), "status");
gtk_style_context_add_class(gtk_widget_get_style_context(note), "error");
gtk_label_set_line_wrap(GTK_LABEL(note), TRUE);
gtk_widget_set_no_show_all(note, TRUE);
gtk_widget_set_halign(note, GTK_ALIGN_START);
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), L("跟随系统", "System"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), L("浅色", "Light"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), L("深色", "Dark"));
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), mode);
atk_object_set_name(gtk_widget_get_accessible(combo), L("外观", "Appearance"));
g_signal_connect(combo, "changed", G_CALLBACK(on_theme), note);
gtk_box_pack_start(GTK_BOX(row), label, FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(row), combo, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(box), row, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(box), note, FALSE, FALSE, 0);
return box;
}
static void open_settings(GtkButton *button, gpointer parent) {
(void)button;
GtkWidget *dialog = gtk_dialog_new_with_buttons(L("设置", "Settings"), GTK_WINDOW(parent),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, L("关闭", "Close"), GTK_RESPONSE_CLOSE, NULL);
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
gtk_window_set_default_size(GTK_WINDOW(dialog), 360, -1);
gtk_container_set_border_width(GTK_CONTAINER(area), 24);
gtk_box_pack_start(GTK_BOX(area), uu_theme_selector(), FALSE, FALSE, 0);
g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog);
gtk_widget_show_all(dialog);
}
GtkWidget *uu_theme_settings_button(GtkWindow *parent) {
GtkWidget *button = gtk_button_new_from_icon_name("preferences-system-symbolic", GTK_ICON_SIZE_BUTTON);
gtk_style_context_add_class(gtk_widget_get_style_context(button), "flat");
gtk_widget_set_tooltip_text(button, L("设置", "Settings"));
atk_object_set_name(gtk_widget_get_accessible(button), L("设置", "Settings"));
g_signal_connect(button, "clicked", G_CALLBACK(open_settings), parent);
return button;
}
+10
View File
@@ -0,0 +1,10 @@
#ifndef UU_UI_THEME_H
#define UU_UI_THEME_H
#include <gtk/gtk.h>
// Call on the GTK thread, after gtk_init_check. Shared by the host and viewer tools.
void uu_theme_init(void);
GtkWidget *uu_theme_selector(void);
GtkWidget *uu_theme_settings_button(GtkWindow *parent);
void uu_theme_load_css(const char *css);
#endif
+58
View File
@@ -0,0 +1,58 @@
#include "uinput_keymap.h"
#include <X11/Xlib.h>
#include <X11/XKBlib.h>
#include <X11/keysym.h>
#include <string.h>
static size_t text_plan(XkbDescPtr map, const XkbStateRec *state,
const uint8_t *text, size_t length, UuTextKey *plan, size_t capacity) {
if (!map || !map->map || !map->map->modmap || !state || state->base_mods || state->latched_mods) return 0;
/* Prove the XKB -> evdev offset from physical key names rather than assuming a US layout. */
if (!map->names || !map->names->keys || map->min_key_code > 10 || map->max_key_code < 50 ||
memcmp(map->names->keys[10].name,"AE01",4) ||
memcmp(map->names->keys[38].name,"AC01",4) ||
memcmp(map->names->keys[50].name,"LFSH",4)) return 0;
uint16_t shift_code=0;
for (unsigned code=9; code<=map->max_key_code; code++) {
if (code>=map->min_key_code && code-8<=248 && (map->map->modmap[code] & ShiftMask)) {
shift_code=code-8; break;
}
}
UuTextKey lookup[128]={0};
for (unsigned shift=0; shift<2; shift++) {
if (shift && !shift_code) continue;
for (unsigned code=9; code<=map->max_key_code; code++) {
if (code<map->min_key_code || code-8>248) continue;
KeySym symbol=NoSymbol;
unsigned consumed=0;
unsigned modifiers=XkbBuildCoreState(state->locked_mods | (shift ? ShiftMask : 0),state->group);
if (!XkbTranslateKeyCode(map,code,modifiers,&consumed,&symbol)) continue;
UuTextKey key={.code=code-8,.shift=shift ? shift_code : 0};
if (symbol>=0x20 && symbol<=0x7e && !lookup[symbol].code) lookup[symbol]=key;
else if (symbol==XK_Return && !lookup['\n'].code) lookup['\n']=lookup['\r']=key;
else if (symbol==XK_Tab && !lookup['\t'].code) lookup['\t']=key;
}
}
size_t count=0;
while (count<length && count<capacity && text[count]<128 && lookup[text[count]].code) {
plan[count]=lookup[text[count]];
count++;
}
return count;
}
size_t uu_uinput_text_plan(const uint8_t *text, size_t length, UuTextKey *plan, size_t capacity) {
if (!text || !length || !plan || !capacity || text[0]>=128) return 0;
XInitThreads();
Display *display=XOpenDisplay(NULL);
if (!display) return 0;
XkbDescPtr map=XkbGetMap(display,XkbAllClientInfoMask,XkbUseCoreKbd);
XkbStateRec state;
size_t count=0;
if (map && XkbGetState(display,XkbUseCoreKbd,&state)==Success &&
XkbGetNames(display,XkbKeyNamesMask,map)==Success)
count=text_plan(map,&state,text,length,plan,capacity);
if (map) XkbFreeKeyboard(map,XkbAllComponentsMask,True);
XCloseDisplay(display);
return count;
}
+9
View File
@@ -0,0 +1,9 @@
#ifndef UU_UINPUT_KEYMAP_H
#define UU_UINPUT_KEYMAP_H
#include <stddef.h>
#include <stdint.h>
typedef struct { uint16_t code, shift; } UuTextKey;
/* Read-only XKB lookup; emits no input and never changes the keymap or clipboard.
* Return the number of initial ASCII characters representable by physical keys. */
size_t uu_uinput_text_plan(const uint8_t *text, size_t length, UuTextKey *plan, size_t capacity);
#endif
+39 -13
View File
@@ -268,33 +268,57 @@ VaapiEngine* vaapi_create(const VaapiConfig* config) {
} }
int vaapi_import_dma_buffer(VaapiEngine* engine, int dma_fd, uint32_t stride) { int vaapi_import_dma_buffer(VaapiEngine* engine, int dma_fd, uint32_t stride) {
if (!engine || dma_fd < 0) return -1; if (!engine) return -1;
UuDmaFrame frame = {
.fd=dma_fd, .fourcc=0x34325258, .width=engine->cap_width, .height=engine->cap_height,
.stride=stride, .size=stride * engine->cap_height, .modifier=0
};
return vaapi_import_frame(engine, &frame);
}
if (engine->in_rgb_surf != VA_INVALID_ID) { static void vaapi_clear_input(VaapiEngine *engine) {
RT.vaDestroySurfaces(engine->va_dpy, &engine->in_rgb_surf, 1);
engine->in_rgb_surf = VA_INVALID_ID;
}
if (engine->vpp_buf != VA_INVALID_ID) { if (engine->vpp_buf != VA_INVALID_ID) {
RT.vaDestroyBuffer(engine->va_dpy, engine->vpp_buf); RT.vaDestroyBuffer(engine->va_dpy, engine->vpp_buf);
engine->vpp_buf = VA_INVALID_ID; engine->vpp_buf = VA_INVALID_ID;
} }
if (engine->in_rgb_surf != VA_INVALID_ID) {
RT.vaDestroySurfaces(engine->va_dpy, &engine->in_rgb_surf, 1);
engine->in_rgb_surf = VA_INVALID_ID;
}
engine->dma_fd = -1;
}
engine->dma_fd = dma_fd; int vaapi_import_frame(VaapiEngine *engine, const UuDmaFrame *frame) {
engine->stride = stride; if (!engine || !frame || frame->fd < 0 || frame->width != engine->cap_width ||
frame->height != engine->cap_height || !frame->height || frame->stride < (uint64_t)frame->width * 4 ||
(uint64_t)frame->offset + (uint64_t)(frame->height - 1) * frame->stride + (uint64_t)frame->width * 4 > frame->size)
return -1;
uint32_t va_fourcc;
switch (frame->fourcc) {
case 0x34325258: va_fourcc=VA_FOURCC_BGRX; break; /* DRM_FORMAT_XRGB8888 */
case 0x34325241: va_fourcc=VA_FOURCC_BGRA; break; /* DRM_FORMAT_ARGB8888 */
case 0x34324258: va_fourcc=VA_FOURCC_RGBX; break; /* DRM_FORMAT_XBGR8888 */
case 0x34324241: va_fourcc=VA_FOURCC_RGBA; break; /* DRM_FORMAT_ABGR8888 */
default: return -1;
}
vaapi_clear_input(engine);
engine->dma_fd = frame->fd;
engine->stride = frame->stride;
VADRMPRIMESurfaceDescriptor prime_desc; VADRMPRIMESurfaceDescriptor prime_desc;
memset(&prime_desc, 0, sizeof(prime_desc)); memset(&prime_desc, 0, sizeof(prime_desc));
prime_desc.fourcc = VA_FOURCC_BGRX; prime_desc.fourcc = va_fourcc;
prime_desc.width = engine->cap_width; prime_desc.width = engine->cap_width;
prime_desc.height = engine->cap_height; prime_desc.height = engine->cap_height;
prime_desc.num_objects = 1; prime_desc.num_objects = 1;
prime_desc.objects[0].fd = dma_fd; prime_desc.objects[0].fd = frame->fd;
prime_desc.objects[0].size = stride * engine->cap_height; prime_desc.objects[0].size = frame->size;
prime_desc.objects[0].drm_format_modifier = 0; prime_desc.objects[0].drm_format_modifier = frame->modifier;
prime_desc.num_layers = 1; prime_desc.num_layers = 1;
prime_desc.layers[0].drm_format = 0x34325258; // DRM_FORMAT_XRGB8888 prime_desc.layers[0].drm_format = frame->fourcc;
prime_desc.layers[0].num_planes = 1; prime_desc.layers[0].num_planes = 1;
prime_desc.layers[0].pitch[0] = stride; prime_desc.layers[0].pitch[0] = frame->stride;
prime_desc.layers[0].offset[0] = frame->offset;
VASurfaceAttrib attribs[2]; VASurfaceAttrib attribs[2];
attribs[0].type = VASurfaceAttribMemoryType; attribs[0].type = VASurfaceAttribMemoryType;
@@ -322,6 +346,8 @@ int vaapi_import_dma_buffer(VaapiEngine* engine, int dma_fd, uint32_t stride) {
int vaapi_upload_host_buffer(VaapiEngine* engine, const uint8_t* host_ptr, uint32_t pitch) { int vaapi_upload_host_buffer(VaapiEngine* engine, const uint8_t* host_ptr, uint32_t pitch) {
if (!engine || !host_ptr) return -1; if (!engine || !host_ptr) return -1;
/* Never write a fallback image into the compositor's imported buffer. */
if (engine->dma_fd >= 0) vaapi_clear_input(engine);
if (engine->in_rgb_surf == VA_INVALID_ID) { if (engine->in_rgb_surf == VA_INVALID_ID) {
VAStatus st = RT.vaCreateSurfaces(engine->va_dpy, VA_RT_FORMAT_RGB32, engine->cap_width, engine->cap_height, &engine->in_rgb_surf, 1, NULL, 0); VAStatus st = RT.vaCreateSurfaces(engine->va_dpy, VA_RT_FORMAT_RGB32, engine->cap_width, engine->cap_height, &engine->in_rgb_surf, 1, NULL, 0);
+2
View File
@@ -3,6 +3,7 @@
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include "dmabuf_frame.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -28,6 +29,7 @@ VaapiEngine* vaapi_create(const VaapiConfig* config);
// Import a DRI3 / GBM DMA-BUF fd as the zero-copy input surface // Import a DRI3 / GBM DMA-BUF fd as the zero-copy input surface
int vaapi_import_dma_buffer(VaapiEngine* engine, int dma_fd, uint32_t stride); int vaapi_import_dma_buffer(VaapiEngine* engine, int dma_fd, uint32_t stride);
int vaapi_import_frame(VaapiEngine* engine, const UuDmaFrame *frame);
// Host fallback: upload ARGB host memory if DMA-BUF is unavailable // Host fallback: upload ARGB host memory if DMA-BUF is unavailable
int vaapi_upload_host_buffer(VaapiEngine* engine, const uint8_t* host_ptr, uint32_t pitch); int vaapi_upload_host_buffer(VaapiEngine* engine, const uint8_t* host_ptr, uint32_t pitch);
+6 -16
View File
@@ -10,6 +10,7 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include "i18n.h" #include "i18n.h"
#include "ui_theme.h"
#define QSIZE 64 #define QSIZE 64
static char queue[QSIZE][4096]; static char queue[QSIZE][4096];
@@ -46,26 +47,17 @@ static gboolean toast_idle(gpointer d) { show_toast(d); g_free(d); return G_SOUR
void uu_tools_ui_toast(const char *text) { g_idle_add(toast_idle, g_strdup(text)); } void uu_tools_ui_toast(const char *text) { g_idle_add(toast_idle, g_strdup(text)); }
static gboolean on_delete(GtkWidget *w, GdkEvent *e, gpointer d) { (void)e; (void)d; gtk_widget_hide(w); atomic_store(&closed, 1); return TRUE; } static gboolean on_delete(GtkWidget *w, GdkEvent *e, gpointer d) { (void)e; (void)d; gtk_widget_hide(w); atomic_store(&closed, 1); return TRUE; }
static const char *css =
"window { background: #f5f6f8; }\n"
".title { font-size: 22px; font-weight: bold; color: #111827; }\n"
".tag { background: #e5e7eb; color: #4b5563; border-radius: 6px; padding: 2px 8px; }\n"
".tag.remote { background: #d1fae5; color: #047857; }\n"
".card { background: white; border: 1px solid #e5e7eb; border-radius: 10px; padding: 8px; }\n"
".section { font-size: 17px; font-weight: bold; }\n"
".toast { background: rgba(17,24,39,0.88); color: white; border-radius: 8px; padding: 10px 18px; }\n"
".primary { background-image: none; background-color: #10b981; color: white; border: none; }\n"
".empty { color: #6b7280; font-size: 15px; }\n"
".online { color: #10b981; }\n";
static GtkWidget *frame(const char *title, GtkWidget **content) { static GtkWidget *frame(const char *title, GtkWidget **content) {
GtkCssProvider *p = gtk_css_provider_new(); gtk_css_provider_load_from_data(p, css, -1, NULL); uu_theme_init();
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), GTK_STYLE_PROVIDER(p), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); uu_theme_load_css(".card { padding: 12px; } treeview.view { padding: 6px; }");
window = gtk_window_new(GTK_WINDOW_TOPLEVEL); window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), title); gtk_window_set_title(GTK_WINDOW(window), title);
g_signal_connect(window, "delete-event", G_CALLBACK(on_delete), NULL); g_signal_connect(window, "delete-event", G_CALLBACK(on_delete), NULL);
GtkWidget *overlay = gtk_overlay_new(); *content = vbox(14); GtkWidget *overlay = gtk_overlay_new(); *content = vbox(14);
gtk_container_set_border_width(GTK_CONTAINER(*content), 22); gtk_container_set_border_width(GTK_CONTAINER(*content), 22);
GtkWidget *appearance = uu_theme_settings_button(GTK_WINDOW(window));
gtk_widget_set_halign(appearance, GTK_ALIGN_END);
gtk_box_pack_start(GTK_BOX(*content), appearance, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(overlay), *content); gtk_container_add(GTK_CONTAINER(overlay), *content);
toast = label("", "toast"); gtk_widget_set_halign(toast, GTK_ALIGN_CENTER); gtk_widget_set_valign(toast, GTK_ALIGN_END); toast = label("", "toast"); gtk_widget_set_halign(toast, GTK_ALIGN_CENTER); gtk_widget_set_valign(toast, GTK_ALIGN_END);
gtk_widget_set_margin_bottom(toast, 30); gtk_widget_set_no_show_all(toast, TRUE); gtk_widget_set_margin_bottom(toast, 30); gtk_widget_set_no_show_all(toast, TRUE);
@@ -476,8 +468,6 @@ static void *ui_thread(void *d) {
(void)d; (void)d;
if (!gtk_init_check(NULL, NULL)) { pthread_mutex_lock(&init_lock); init_state = -1; pthread_cond_signal(&init_cond); pthread_mutex_unlock(&init_lock); return NULL; } if (!gtk_init_check(NULL, NULL)) { pthread_mutex_lock(&init_lock); init_state = -1; pthread_cond_signal(&init_cond); pthread_mutex_unlock(&init_lock); return NULL; }
gtk_window_set_default_icon_name("uu-remote-linux"); // same taskbar icon as the host (#13) gtk_window_set_default_icon_name("uu-remote-linux"); // same taskbar icon as the host (#13)
// Light palette in CSS; keep a dark system theme from making unstyled text white on white (#43).
g_object_set(gtk_settings_get_default(), "gtk-theme-name", "Adwaita", "gtk-application-prefer-dark-theme", FALSE, NULL);
show_window(NULL); gtk_main(); return NULL; show_window(NULL); gtk_main(); return NULL;
} }
/* Hidden windows retain their widgets so queued idle callbacks stay valid. */ /* Hidden windows retain their widgets so queued idle callbacks stay valid. */
+64 -61
View File
@@ -11,45 +11,32 @@
#include <time.h> #include <time.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "i18n.h" #include "i18n.h"
#include "ui_theme.h"
static const char *CSS = static const char *CSS =
"window { background-color: #ffffff; }\n" ".sidebar { background-color: @theme_bg_color; border-right: 1px solid @uu_border; }\n"
"* { font-family: 'Noto Sans CJK SC', 'Noto Sans SC', sans-serif; }\n"
".sidebar { background-color: #e9e9ec; }\n"
".section { font-size: 16px; font-weight: 600; color: #1d1d1f; }\n"
".sidebar list, .sidebar row { background-color: transparent; }\n" ".sidebar list, .sidebar row { background-color: transparent; }\n"
".sidebar row { border-radius: 8px; margin: 1px 10px; padding: 8px 10px; }\n" ".sidebar row { border-radius: 8px; margin: 3px 12px; padding: 10px 12px; }\n"
".sidebar row:selected { background-color: #d4d4d9; color: #1d1d1f; }\n" ".sidebar row:hover { background-color: @uu_tint; }\n"
".devname { font-size: 15px; color: #1d1d1f; }\n" ".sidebar row:selected { background-color: @uu_tint; color: @uu_fg; }\n"
".offline { color: #9ca3af; }\n" ".devname { font-size: 15px; color: @uu_fg; }\n"
".dot { color: #22c55e; font-size: 10px; }\n" ".offline { color: @uu_muted; }\n"
".dot { font-size: 10px; }\n"
".dot.off { color: transparent; }\n" ".dot.off { color: transparent; }\n"
".icon { background-color: #2f7bff; color: #ffffff; border-radius: 6px; font-size: 11px; font-weight: 700; padding: 2px 5px; }\n" ".icon { background-color: @uu_accent; color: @uu_accent_fg; border-radius: 6px; font-size: 11px; font-weight: 700; padding: 3px 6px; }\n"
".icon.off { background-color: #c4c7cf; }\n" ".icon.off { background-color: @uu_border; color: @uu_muted; }\n"
".tag { background-color: #e8f0ff; color: #2f6bff; border-radius: 4px; font-size: 12px; padding: 1px 6px; }\n" ".header { border-bottom: 1px solid @uu_border; padding: 16px 24px; }\n"
".title { font-size: 20px; font-weight: 700; color: #1d1d1f; }\n" ".badge { background-color: @uu_tint; color: @uu_success; border-radius: 8px; padding: 4px 10px; font-size: 13px; }\n"
".header { border-bottom: 1px solid #e5e7eb; padding: 12px 22px; background-color: #f7f7f8; }\n" ".badge.off { background-color: @theme_bg_color; color: @uu_muted; }\n"
".badge { background-color: #1d1d1f; color: #ffffff; border-radius: 12px; padding: 3px 12px; font-size: 13px; }\n" ".hbtn { font-size: 17px; padding: 6px 10px; }\n"
".badge.off { background-color: #9ca3af; }\n" ".preview { background-image: none; background-color: @uu_tint; border-radius: 12px 12px 0 0; }\n"
".hbtn { background-image: none; background-color: transparent; border: none; font-size: 17px; color: #4b5563; padding: 4px 10px; }\n" ".enter { font-size: 18px; }\n"
".preview { background-image: linear-gradient(135deg, #a8c0ff 0%, #e2c2f2 50%, #f6c8a8 100%); border-radius: 12px 12px 0 0; }\n" ".toolbar { background-color: @uu_surface; border: 1px solid @uu_border; border-top: none; border-radius: 0 0 12px 12px; padding: 6px; }\n"
".enter { background-image: none; background-color: rgba(0,0,0,0.18); color: #ffffff; border: none; font-size: 19px; padding: 8px 20px; border-radius: 8px; }\n" ".tool { font-size: 15px; padding: 10px; }\n"
".toolbar { border: 1px solid #e5e7eb; border-top: none; border-radius: 0 0 12px 12px; padding: 4px; }\n" ".dashed { border: 1px dashed @uu_border; border-radius: 12px; padding: 36px; }\n"
".tool { background-image: none; background-color: transparent; border: none; font-size: 15px; color: #374151; padding: 10px; }\n" ".round { background-color: @uu_tint; border: none; border-radius: 16px; font-size: 26px; min-width: 64px; min-height: 64px; }\n"
".dashed { border: 1px dashed #d1d5db; border-radius: 12px; padding: 36px; }\n" ".card, .banner { padding: 18px 20px; }\n"
".round { background-image: none; background-color: #f3f4f6; border: none; border-radius: 40px; font-size: 26px; min-width: 64px; min-height: 64px; }\n" ".cardbtn { padding: 14px 18px; }\n";
".card { background-color: #fafafa; border: 1px solid #e5e7eb; border-radius: 10px; padding: 14px 18px; }\n"
".cardbtn { background-image: none; background-color: #fafafa; border: 1px solid #e5e7eb; border-radius: 10px; padding: 12px 16px; }\n"
".banner { background-color: #f7f8fa; border: 1px solid #e5e7eb; border-radius: 10px; padding: 14px 18px; }\n"
".group { font-size: 16px; font-weight: 600; color: #1d1d1f; }\n"
".h2 { font-size: 19px; font-weight: 700; color: #1d1d1f; }\n"
".big { font-size: 30px; font-weight: 800; color: #111111; }\n"
".hint { font-size: 14px; color: #6b7280; }\n"
".primary { background-image: none; background-color: #3b82f6; color: #ffffff; border: none; border-radius: 8px; font-size: 16px; padding: 8px 26px; }\n"
".secondary { background-image: none; background-color: #ffffff; border: 1px solid #d1d5db; border-radius: 8px; padding: 6px 16px; }\n"
".qrbox { background-color: #ffffff; border-radius: 12px; border: 1px solid #e5e7eb; padding: 14px; }\n"
".status { font-size: 13px; color: #2f6bff; }\n"
".toast { background-color: #ffffff; border: 1px solid #e5e7eb; border-radius: 10px; padding: 10px 18px; font-size: 15px; }\n";
typedef struct { char id[64]; char name[128]; int platform, online, current; char thumb[512]; } Device; typedef struct { char id[64]; char name[128]; int platform, online, current; char thumb[512]; } Device;
static Device devices[64]; static Device devices[64];
@@ -86,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) {
@@ -137,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);
@@ -217,7 +214,7 @@ static void show_device(int index) {
pthread_mutex_unlock(&d_lock); pthread_mutex_unlock(&d_lock);
load_thumb(thumb); load_thumb(thumb);
set_header(name, 1); set_header(name, 1);
gtk_label_set_markup(GTK_LABEL(badge), online ? L("<span foreground='#22c55e'>●</span> 在线", "<span foreground='#22c55e'>●</span> Online") : L("离线", "Offline")); gtk_label_set_text(GTK_LABEL(badge), online ? L("● 在线", "● Online") : L("离线", "Offline"));
GtkStyleContext *ctx = gtk_widget_get_style_context(badge); GtkStyleContext *ctx = gtk_widget_get_style_context(badge);
if (online) gtk_style_context_remove_class(ctx, "off"); else gtk_style_context_add_class(ctx, "off"); if (online) gtk_style_context_remove_class(ctx, "off"); else gtk_style_context_add_class(ctx, "off");
gtk_stack_set_visible_child_name(GTK_STACK(stack), "device"); gtk_stack_set_visible_child_name(GTK_STACK(stack), "device");
@@ -237,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);
@@ -311,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;
} }
@@ -380,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);
@@ -574,6 +573,10 @@ static void open_settings(void) {
GtkWidget *g0[] = { acct }; GtkWidget *g0[] = { acct };
gtk_box_pack_start(GTK_BOX(general), settings_card(g0, 1), FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(general), settings_card(g0, 1), FALSE, FALSE, 0);
refresh_account(); refresh_account();
const char *languages[] = {"中文", "English"}; GtkWidget *language = combo(languages, 2);
gtk_combo_box_set_active(GTK_COMBO_BOX(language), uu_i18n_english()); g_signal_connect(language, "changed", G_CALLBACK(on_language), NULL);
GtkWidget *g4[] = { setting_row("语言 / Language", NULL, language), uu_theme_selector() };
gtk_box_pack_start(GTK_BOX(general), settings_card(g4, 2), FALSE, FALSE, 0);
const char *wake[] = {L("永不", "Never"), L("接通电源时", "When plugged in"), L("始终", "Always")}, *close_opts[] = {L("最小化", "Minimize"), L("退出程序", "Quit")}; const char *wake[] = {L("永不", "Never"), L("接通电源时", "When plugged in"), L("始终", "Always")}, *close_opts[] = {L("最小化", "Minimize"), L("退出程序", "Quit")};
GtkWidget *g1[] = { setting_row(L("开机自启动", "Start at login"), NULL, gtk_switch_new()), GtkWidget *g1[] = { setting_row(L("开机自启动", "Start at login"), NULL, gtk_switch_new()),
setting_row(L("保持唤醒状态", "Stay awake"), L("防止电脑进入睡眠状态,导致无法远程访问。", "Keep the computer from sleeping so it stays reachable."), combo(wake, 3)), setting_row(L("保持唤醒状态", "Stay awake"), L("防止电脑进入睡眠状态,导致无法远程访问。", "Keep the computer from sleeping so it stays reachable."), combo(wake, 3)),
@@ -587,11 +590,10 @@ static void open_settings(void) {
GtkWidget *real = button(L("在手机 App 中查看", "View in the mobile app"), "secondary"); gtk_widget_set_sensitive(real, FALSE); GtkWidget *real = button(L("在手机 App 中查看", "View in the mobile app"), "secondary"); gtk_widget_set_sensitive(real, FALSE);
GtkWidget *g3[] = { setting_row(L("实名认证", "Identity verification"), NULL, real) }; GtkWidget *g3[] = { setting_row(L("实名认证", "Identity verification"), NULL, real) };
gtk_box_pack_start(GTK_BOX(general), settings_card(g3, 1), FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(general), settings_card(g3, 1), FALSE, FALSE, 0);
const char *languages[] = {"中文", "English"}; GtkWidget *language = combo(languages, 2); GtkWidget *gscroll = gtk_scrolled_window_new(NULL, NULL);
gtk_combo_box_set_active(GTK_COMBO_BOX(language), uu_i18n_english()); g_signal_connect(language, "changed", G_CALLBACK(on_language), NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(gscroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
GtkWidget *g4[] = { setting_row("语言 / Language", NULL, language) }; gtk_container_add(GTK_CONTAINER(gscroll), general);
gtk_box_pack_start(GTK_BOX(general), settings_card(g4, 1), FALSE, FALSE, 0); gtk_stack_add_titled(GTK_STACK(tabs), gscroll, "general", L("常规", "General"));
gtk_stack_add_titled(GTK_STACK(tabs), general, "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")};
@@ -603,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);
@@ -618,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);
@@ -666,12 +668,9 @@ static void *run(void *arg) {
(void)arg; (void)arg;
int ok = gtk_init_check(NULL, NULL); int ok = gtk_init_check(NULL, NULL);
if (ok) { gtk_window_set_default_icon_name("uu-remote-linux"); } // same taskbar icon as the host (#13) if (ok) { gtk_window_set_default_icon_name("uu-remote-linux"); } // same taskbar icon as the host (#13)
// The CSS hard-codes a light palette; a dark system theme would turn unstyled text white on white (#43).
if (ok) g_object_set(gtk_settings_get_default(), "gtk-theme-name", "Adwaita", "gtk-application-prefer-dark-theme", FALSE, NULL);
if (ok) { if (ok) {
GtkCssProvider *css = gtk_css_provider_new(); uu_theme_init();
gtk_css_provider_load_from_data(css, CSS, -1, NULL); uu_theme_load_css(CSS);
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), GTK_STYLE_PROVIDER(css), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
window = gtk_window_new(GTK_WINDOW_TOPLEVEL); window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), L("UU 远程 Linux 控制端(非官方)", "UU Remote Linux viewer (unofficial)")); gtk_window_set_title(GTK_WINDOW(window), L("UU 远程 Linux 控制端(非官方)", "UU Remote Linux viewer (unofficial)"));
gtk_window_set_default_size(GTK_WINDOW(window), 1180, 780); gtk_window_set_default_size(GTK_WINDOW(window), 1180, 780);
@@ -682,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;
@@ -704,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();
+103
View File
@@ -0,0 +1,103 @@
# UU native gamepad experiment / 原生手柄实验
Status: experimental and default OFF; opt in with `UU_VIEWER_NATIVE_GAMEPAD=1`.
One reporting user tested input, phone-hotspot WAN, reconnect and rumble on one
Windows/Steam Deck pair; the upstream maintainer has not independently tested it.
This does not establish compatibility with every official UU version.
## Evidence (2026-10-31)
Official Windows installer 4.45.0.4318, obtained from NetEase's release endpoint
`https://api.nrd.nie.163.com/api/v1/release/dl/1?channel=gwqd`.
Only inspected locally; no NetEase binaries/assets are included in this project or deliverable.
- `GameViewerServer.exe` SHA256 `af3a15c3887e06bfa9506971e01cd8ec58f41efe8ac9eb5831e31dae1fc1cef8`
- `GameViewer.exe` SHA256 `ef7112e173cdc6d74735c50292cf9750082ce351cdea60dc068fc2b60f3aa92e`
- All addresses below are RVAs, not absolute process addresses. Image base is 0x140000000.
- Lead: https://github.com/djkcyl/uu-enhance/blob/main/src/hooks.cpp identifies older
GamepadManager Connect/Disconnect/Update log strings. Its server.cpp identifies corresponding
GamepadManagerServer handlers. No hook code or DLL injection is used here.
Receiver static inspection:
| RVA | Observation |
| --- | --- |
| 0x5dea50 | Raw JSON handler skips heartbeat messages, reads `action`, routes prefix `gpd_` to dispatcher through thunk 0x657d0. |
| 0x5dde60 | Dispatcher recognizes `gpd_update`, `gpd_connect`, `gpd_disconnect`. Connect/disconnect read `index` as a byte. |
| 0x5ddb30 | State decoder requires `index`, `buttons`, `left_trigger`, `right_trigger`, `left_thumb_x`, `left_thumb_y`, `right_thumb_x`, `right_thumb_y`. |
| 0x5dfba0 | ViGEm output: low 16 bits of buttons, two 8-bit triggers and four 16-bit stick values copied into an XUSB report; target selected by index. Missing target attempts auto-connect; missing driver drops updates. |
| 0x5df5d0 | Vibration JSON builder: `action: gpd_vibration`, `index`, `left_motor`, `right_motor`; all three numeric values read as bytes. |
| 0x5dfe80 | ViGEm feedback callback constructs index/left/right byte record, calls vibration serializer, then 0x5df580 (via thunk 0x1c1e3) to forward JSON through its session interface. |
Official viewer corroboration:
- 0x10369d0 builds JSON object with `action: gpd_connect`, numeric `index`.
- 0x1036d20 builds disconnect object.
- 0x1037070 builds update object using exactly the receiver fields above, unsigned numeric
buttons/index/triggers and signed thumb values.
- Viewer 0xc1c630 dispatches raw JSON action `gpd_vibration` alongside cursor notifications.
Viewer 0x10331a0 parses index/left_motor/right_motor into three bytes.
This supports sending JSON through the existing binary CONTROL input path (`Peer::send_input`),
with input reported working by the reporting user on their Windows/Deck pair.
No guessed new protobuf feature flags are advertised. Existing desktop negotiation is retained.
## Implementation and limits
`src/viewer/native_gamepad.rs` reads a single SDL GameController inside the desktop viewer.
It maps SDL buttons to XInput and reverses Y axes (including -32768 saturation), converts triggers
0..32767 to 0..255, uses slot 0, sends changes and a 100 ms state refresh. Guide button is omitted.
More than one mapped controller at discovery is deliberately ambiguous and none is opened.
Focus loss, local control menu, view-only, unplug or normal shutdown: send neutral then disconnect.
On entry/re-entry, require released buttons/triggers/sticks before arming. Back+Start toggles pause.
Normal cleanup uses bounded send attempts. Host behavior after SIGKILL/network loss remains
unverified; no host-side input watchdog interval has been established.
Very short taps entirely between SDL samples can be missed. Multi-controller is not implemented.
Logged markers describe local activity only; CONNECT_QUEUED is not an ACK.
## Rumble / 震动回传
`native_rumble.rs` parses the verified flat JSON `{action:"gpd_vibration",index:0,left_motor:0..255,right_motor:0..255}`
on the existing peer's CONTROL channel. It rejects malformed/duplicate fields, wrong types/ranges,
nonzero slot and messages over 512 bytes. The exact shape is backed by static inspection; receipt
on the CONTROL hook must still be verified on other Windows/Deck configurations; the reporting user has reported successful rumble on their pair.
Only the current focused, armed SDL controller enables its peer-local inbox; a single latest-value slot
prevents a backlog from replaying after a pause. Feedback for inactive sessions is discarded.
Motor strength scales by 257 into SDL's 0..65535 range. SDL `set_rumble` receives left/low-frequency
and right/high-frequency values. Normal zero feedback stops immediately. Sustained rumble refreshes
every 250 ms with a finite 1000 ms hardware effect, because the host may send only state changes.
An active viewer keeps the last desired state until a new message or focus/connection/pause change;
there is no unsupported assumption that a quiet host must periodically repeat feedback.
Pending nonzero commands older than 500 ms are discarded; stop commands are always honored.
Pause, focus loss, view-only, unplug, detected peer disconnection and normal exit stop rumble and
discard the queue. A blocked/crashed viewer cannot keep renewing the 1000 ms SDL effect. Physical
network loss detection still depends on WebRTC; this is not a one-second network watchdog.
Output failure disables rumble until controller rediscovery/restart while preserving input.
SDL API reference: https://wiki.libsdl.org/SDL2/SDL_GameControllerRumble . A successful SDL call
does not prove the hardware moved. Steam Input/SteamOS rumble configuration and physical Deck
feedback remain dependent on each installation. This implements ordinary two-motor rumble, not adaptive
triggers or arbitrary touchpad haptic waveforms. `UU_VIEWER_NATIVE_RUMBLE=0` disables feedback.
Markers (no payload values): RUMBLE_SUPPORTED/UNAVAILABLE describe SDL capabilities;
RUMBLE_RECEIVED means a valid active-session message arrived; RUMBLE_APPLIED means SDL returned
success for a nonzero effect; RUMBLE_OUTPUT_FAILED means the output API failed. All have DECKPAD_ prefix.
## Validation / 验证
Use the CI checks on the current PR head as the automated validation record.
The tests cover protocol fields and ranges, activation/release gating, bounded
feedback delivery, finite rumble effects and shared CONTROL delivery alongside
file operations. Automated tests do not exercise physical controller feedback
or establish official-host compatibility.
自动验证以当前 PR 提交的 CI 结果为准;实机结果来自报告用户,不能视为上游维护者
已验收,也不涵盖全部主机版本、休眠、强制退出和断网恢复场景。
## Attribution / AI assistance
The native gamepad and rumble implementation, regression tests and this evidence document were
prepared with OpenAI Codex assistance. The user supplied requirements and reported the hardware
acceptance results. Existing project design, code and attribution belong to the upstream contributors.
Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

+166
View File
@@ -0,0 +1,166 @@
# 实验性防窥 / Experimental privacy screen
仅支持 KDE Plasma Wayland(portal 后端)。开启后,采集和输入切换到 KWin 虚拟输出
(portal ScreenCast 的 VIRTUAL 源),再用 `kscreen-doctor` 禁用物理屏;远程操作不会点亮
本机屏幕。关闭、最后一个桌面连接断开或正常退出时,先重新启用物理屏,再结束虚拟输出、切回物理屏采集。
顺序参考 KRdp 虚拟显示器的 replace 策略和 Sunshine 的 KDE 方案:创建虚拟输出前记录物理屏,
从不禁用虚拟输出本身(KWin bug 527747)。GNOME、其他 Wayland 桌面和 X11 不支持。
壁纸模式:窗口随物理屏禁用迁到虚拟输出后,重新启用物理屏,把虚拟输出设为主屏、用 KWin 脚本把窗口
留在虚拟输出上,再由 `privacy-wallpaper` 子进程在每块物理屏上全屏置顶显示 Plasma 当前桌面壁纸和
“此设备正在被远程控制”。物理屏开着时 uinput 绝对坐标覆盖整个布局,主机按虚拟输出在布局中的位置换算。
需要 GTK3。
KDE Plasma Wayland only (portal backend). Enabling moves capture and input to a KWin virtual
output (portal ScreenCast VIRTUAL source) and disables the physical outputs with `kscreen-doctor`,
so remote input cannot wake them. Disabling, the last desktop disconnect or a normal exit re-enables
the physical outputs first, then ends the virtual share and returns to the monitor. Physical outputs
are recorded before the virtual one exists; the virtual output itself is never disabled (KWin bug
527747). GNOME, other Wayland desktops and X11 are unsupported.
Wallpaper mode: after the windows have moved to the virtual output, the physical outputs are turned
back on as secondary outputs, a KWin script keeps the windows on the virtual one, and the
`privacy-wallpaper` child process covers each physical output with Plasma's desktop wallpaper and a
notice (fullscreen, keep-above). uinput's absolute axes then span the whole layout, so pointer input
is aimed at the virtual output's region. Needs GTK3.
注意 / Notes:
- 虚拟屏分辨率由 KDE 决定(默认 1920x1080,首次可能在本机弹窗选择,之后沿用保存的授权
`portal-permissions/kde-virtual`)。窗口会被 KWin 移到虚拟屏,恢复后位置可能变化。
The virtual size is KDE's (1920x1080 by default; the first share may ask on the host, later ones
reuse `portal-permissions/kde-virtual`). KWin moves windows to it; positions may change on restore.
- KDE 不处理虚拟输出共享上的 portal 输入,防窥期间指针、按键和文字改走 uinput(需要 `/dev/uinput`
权限,见 README);手机拖动手势在此期间按普通鼠标拖动处理。
KDE ignores portal input on a virtual-output share, so pointer, keys and text use uinput while the
privacy screen is on (`/dev/uinput` access required); mobile drag gestures act as plain mouse drags.
- 开启期间通过 KWin 的 InputDevice 接口禁用本地键盘、鼠标、触摸板和触摸屏(含手势守护进程、ydotoold
等由本机驱动的虚拟设备),保留电源键、合盖开关和主机自己的 uinput 设备;`UU_PRIVACY_BLOCK_INPUT=0` 关闭此项。
KWin 会保存设备开关,所以主机另起 `privacy-guard` 子进程:主机以任何方式结束(包括 SIGKILL)都会按恢复记录
重新启用设备和物理屏;下次启动也会重试。防窥期间新插入的设备不会被禁用。
While on, local keyboards, pointers, touchpads and touchscreens are disabled through KWin's
InputDevice interface (including software devices fed by local hardware such as gesture daemons and
ydotoold); the power button, lid switch and the host's own uinput devices stay. Set
`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
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.
- 恢复记录保存在配置文件旁的 `privacy-power.json`(0600);崩溃后下次启动重新启用记录的物理屏。
若主机无法启动,可在本机终端执行 `kscreen-doctor output.<name>.enable`。
The recovery record `privacy-power.json` (0600) re-enables the recorded outputs at the next start
after a crash; manually: `kscreen-doctor output.<name>.enable`.
- 需要 coreutils `timeout`、`gdbus` 和可用的 uinput(`/dev/uinput` 可写,且未设 `UU_INPUT_BACKEND=native`);
缺少时请求在改动屏幕和设备之前被拒绝。隐私模式的遮挡窗口建好后才算开启,失败即回滚。
Requires coreutils `timeout`, `gdbus` and working uinput (`/dev/uinput` writable, not
`UU_INPUT_BACKEND=native`); otherwise the request is refused before outputs or devices change.
Picture mode counts as on only after the cover window reports ready; a failure rolls back.
## 协议 / Protocol
字段号来自官方 Mac 客户端的 SwiftProtobuf name map / Field numbers from the Mac UURemote name maps:
- RPC 7 `PrivateScreenSettingRequest {1 enable, 2 privacy_type, 3 setting_source}` → RpcResponse 3
`{1 error_code, 2 req_privacy_type, 3 cur_privacy_type}`;PrivateScreenType 2 隐私/picture, 3 关屏/screen off。
主机先应答再切换(客户端约数秒超时,报 9998);切换失败发 ReportError -7。
The host answers before switching (the viewer times out with 9998); a failed switch sends ReportError -7.
成功不发送 ReportError;Mac 4.43.0 的 -9 是系统会话变化提示,不是防窥成功通知。
Success does not send ReportError; -9 in Mac 4.43.0 reports a system session change, not privacy success.
- RPC 25 `update_screen_saver_req` → RpcResponse 21:开启隐私模式前发送,主机回空成功应答,画面仍用本机壁纸。
Sent before picture mode; answered empty (success), the host keeps its own wallpaper.
- FeatureFlag 4 `ff_private_screen` = 2 (ENHANCED_PRIVACY);SettingMetric 4 `private_screen`、7 `private_screen_type`
上报当前实际模式(1 关闭、2 屏保、3 关屏),不使用 host_settings.json 中的历史选项;SystemStateChange 5
`PrivateScreenState` 在状态变化时推送。
SettingMetric 4/7 report the effective mode (1 off, 2 picture, 3 screen off), not the saved preference;
SystemStateChange 5 is sent after a switch.
Mac 4.43.0 从 CONTROL 发送请求,但只在 TEXT 接收分支处理上述 RPC 应答与 SystemMetrics。
防窥与屏保应答走 TEXT;SystemMetrics 同步发送到 TEXT,并保留 CONTROL 上报以兼容其他客户端。
每个 peer 独立排队,TEXT 打开后才发送;待发 SystemMetrics 只保留最新一条,其他应答最多 64 条,
按入队顺序发送。满队列时丢弃新增应答并记录一次警告,不阻塞 CONTROL 请求处理。
SystemMetrics 优先读取非零的 field 7,仅在其为 0 时回退
到 field 4。SystemMetrics field 1 `metrics` 必须列出本次报告的类型(general=1、setting=2),
否则客户端直接忽略消息内容。已用原签名 Mac 4.43.0 客户端验证三种模式的安全浮层回显,
关屏后断开恢复物理屏与输入设备,再次连接回显“不启用”。
Mac 4.43.0 sends requests on CONTROL, but handles these RPC responses and SystemMetrics only on TEXT.
Privacy/screensaver replies use TEXT; SystemMetrics are also sent on TEXT, retaining CONTROL for other
viewers. Each peer queues messages until its TEXT channel opens, retaining only the latest pending
SystemMetrics and up to 64 other replies in FIFO order. Excess replies are dropped with one warning
per peer, without blocking CONTROL request handling. Nonzero field 7 takes precedence over
field 4. SystemMetrics field 1 `metrics` must list the reported sections (general=1, setting=2), or the
viewer ignores the payload. The original signed Mac 4.43.0 viewer was verified for all three labels,
physical-screen/input restoration on disconnect, and an off label after reconnecting.
官方主机侧依据:原签名 Mac `UURemoteServer` 4.43.0(626),arm64 UUID
`7E10CB24-F516-3728-8375-BA5EC124A2C5`。`SystemMetricsHandler.handleSystemMetrics`(`0x10000a96c`)
按请求填充各节,general 分支在 `0x10000abe8` 追加 `1`,setting helper(`0x10000a230`)
在 `0x10000a64c` 追加 `2`;`GvPb_SystemMetrics.traverse`(`0x100423840`)将列表按 packed enum
写入 field 1。发送链 `0x10000b11c → 0x10018e948 → ControlledSendTextData:data:` 使用 TEXT。
这是静态主机代码依据:请求 general 和 setting 时得到 `[1,2]`,不是抓包,也不表示每条响应都固定
包含两节或证明官方 CONTROL 报文。本实现总是报告两节,因此列出 `[1,2]`。
Official host evidence: the original signed Mac `UURemoteServer` 4.43.0 (626), arm64 UUID
`7E10CB24-F516-3728-8375-BA5EC124A2C5`. `SystemMetricsHandler.handleSystemMetrics` (`0x10000a96c`)
fills the requested sections, appending GENERAL=1 at `0x10000abe8` and SETTING=2 at `0x10000a64c`
in helper `0x10000a230`. `GvPb_SystemMetrics.traverse` (`0x100423840`) encodes that list as packed
field 1. The send chain `0x10000b11c → 0x10018e948 → ControlledSendTextData:data:` uses TEXT.
This is static host-code evidence: requesting both sections produces `[1,2]`; it is not a packet
capture or proof that every response includes both sections or that the official host sends it on
CONTROL. Our payload always reports both sections, so it lists `[1,2]`.
Android 4.43.0 已确认打开 TEXT;主机日志和手机端人工验收确认,关屏、隐私屏保、取消三种操作的
实际模式与菜单选中状态均正确。Windows/iOS 未在本轮验收。
Android 4.43.0 opens TEXT; host logs and manual phone-side acceptance confirmed that screen-off,
picture and off operations update both the effective mode and the selected menu item.
Windows/iOS were not tested in this round.
## 本机诊断 / Local diagnostic
禁用物理屏 5 秒后恢复,不登录、不启动第二个主机;先停止使用同一配置目录的主机。
Disables the physical outputs for five seconds, then restores them. Stop the host first.
```sh
cargo build --locked --features wayland,portal --bin uuremote-server
target/debug/uuremote-server privacy-screen-probe
UU_PRIVACY_PROBE_WALLPAPER=1 target/debug/uuremote-server privacy-screen-probe # 壁纸模式 / wallpaper mode
```
## 代码结构 / Code layout
`src/privacy_screen/` 分两层:与桌面无关的控制器和共享部件,以及每种桌面一个后端。
The module has a desktop-independent controller with shared parts, and one backend per desktop.
| 文件 / File | 职责 / Responsibility |
|---|---|
| `mod.rs` | 控制器:桌面会话计数、模式切换(先恢复再进入)、失败回滚、崩溃恢复、probe / controller: sessions, mode switch (leave, then enter), rollback, crash recovery, probe |
| `mode.rs` | `Mode { Picture, ScreenOff }` ↔ 协议 `privacy_type` 1 关 / 2 隐私 / 3 关屏 |
| `protocol.rs` | RPC 7 请求解析与 RpcResponse 3 编码 / request parsing and response encoding |
| `backend.rs` | `Backend` trait 与按桌面选择后端 / the trait and backend selection |
| `record.rs` | 恢复记录 `{backend, mode, data}`、进程锁、`Journal` / recovery record, process lock, journal |
| `guard.rs` | `privacy-guard` 子进程:主机以任何方式结束都按记录恢复 / restores from the record however the host ends |
| `cover.rs` | `privacy-wallpaper` 子进程:GTK 全屏遮挡窗口 / GTK cover window process |
| `tool.rs` | 带超时的外部命令、gdbus、等待生效 / bounded tool calls, gdbus, wait-until |
| `kde/` | KDE 后端:`outputs.rs` kscreen-doctor 布局,`input.rs` KWin 输入设备,`kwin.rs` KWin 脚本,`mod.rs` 编排 |
新增桌面(X11、GNOME…)只需实现 `Backend` 并在 `backend::detect` / `backend::named` 登记:
`enter` 在每一步改动之前通过 `Journal::save` 写入足以撤销它的数据;`leave` 只依据这些数据撤销,
因为崩溃恢复时(守护进程或下次启动)没有桌面视频流。Picture 模式可复用 `cover::show`;
若物理屏保持开启而 uinput 坐标覆盖整个布局,返回 `Entered::pointer_region`。
To add a desktop (X11, GNOME, ...), implement `Backend` and register it in `backend::detect` and
`backend::named`. `enter` saves, through `Journal::save`, what undoes each step before making it;
`leave` must undo from that data alone, because crash recovery (guard or next start) has no
desktop stream. Picture mode can reuse `cover::show`; when physical outputs stay on and uinput's
axes span the whole layout, return `Entered::pointer_region`.
+18
View File
@@ -0,0 +1,18 @@
修复原生控制端连 Mac 无画面,GNOME 手机控制端新增手势滚动,控制端记住画质设置。/ Fixes the native viewer showing no picture from Mac hosts, adds gesture scrolling for phone viewers on GNOME, and remembers viewer quality settings.
### 修复 / Fixed
- **原生控制端连 Mac 被控端一直“连接中”、无画面(#136,感谢 @coolxll 二分定位)**:v0.2.40 在本地重置后只等 IDR,Mac 对 PLI 不回 IDR 时会一直丢帧。现在 H.264 I 片和恢复点 SEI 也可作为重启点,最多等待 1.5 秒后照常解码。
Native viewer: after a local reset it accepted only IDR frames, so a Mac host that answers PLI without one stayed blank. I slices and recovery-point SEI now count, and the wait is capped at 1.5 s.
### 新增 / Added
- **GNOME(Portal)手机控制端手势(#134、#131,感谢 @spixyy7)**:触控模式下拖动即平滑滚动(终端里也能滚),按住 0.45 秒后拖动为选中,短按为点击;默认不再需要触摸屏授权。`UU_TOUCH_INPUT=touch` 改用真触控,`=0` 保持鼠标拖动。输入法 ASCII 直接按键输入。
GNOME Portal phone viewers: drag scrolls smoothly (also in terminals), hold-then-drag selects, tap clicks, with no touchscreen consent by default; `UU_TOUCH_INPUT=touch` / `=0` select real touch or mouse drags.
- **控制端跨会话记住画质、帧率和真彩设置(#133,感谢 @spixyy7)**。/ The viewer remembers quality, frame rate and true-color choices.
### 验证范围 / Validation
单元测试与 CI。手机手势由贡献者在 Fedora 44 / GNOME 50.6 + 官方 Android 控制端实机验证;#136 的修复尚未连真实 Mac 被控端验证。
### 下载 / Download
`uu-remote-linux_0.2.41_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.41-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.41`(x86_64)。
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
+25
View File
@@ -0,0 +1,25 @@
控制端新增可选手柄/震动与外观设置,修复 niri 剪贴板与高帧率丢帧;源码构建的 Portal 进程内 VAAPI/音频。/ Opt-in gamepad and appearance settings for the viewer, niri clipboard and high-frame-rate fixes, and in-process Portal VAAPI/audio for source builds.
### 修复 / Fixed
- **niri 主控端与官方 Windows 被控端的双向文本剪贴板(#139、#138,感谢 @tingfeng347)**:niri + Wayland 下检测到 `wl-paste`/`wl-copy` 时改用 wl-clipboard,同步不再依赖窗口焦点;缺少时回退 SDL,其他桌面不变。
niri viewer: two-way text clipboard with official Windows hosts now uses wl-clipboard when available, falling back to SDL.
- **控制端高帧率(如 144 FPS)下压缩帧队列溢出、反复请求关键帧(#143,感谢 @azuredreamblu-design)**:每轮最多解码 8 个单元(4 ms 软预算),只呈现最新画面,队列 3→8。
Viewer: compressed frames are decoded in bounded batches so sustained 144 FPS no longer overflows the queue.
- **`inproc-av` 在 GNU ld `--as-needed` 下链接失败(#105,感谢 @ferstar)**:依赖库改到静态引擎库之后链接(仅影响源码构建)。
Source builds: `inproc-av` link order fixed for `--as-needed`.
### 新增 / Added
- **控制端可选原生手柄与震动(连官方 Windows 被控端,#142,感谢 @azuredreamblu-design)**:`UU_VIEWER_NATIVE_GAMEPAD=1` 启用转发,`UU_VIEWER_NATIVE_RUMBLE=0` 单独关闭震动;默认关闭。
Viewer: opt-in controller forwarding and rumble for Windows hosts (`UU_VIEWER_NATIVE_GAMEPAD=1`).
- **GTK 界面统一扁平样式,新增 跟随系统 / 浅色 / 深色 外观选项(#144,感谢 @xfjm136)**。
GTK windows: refreshed styling with System / Light / Dark appearance.
- **源码构建 `wayland,portal,inproc-av` + 显式 VAAPI:Portal DMA-BUF 零拷贝编码、进程内 Opus 音频、锁屏下控制经 uinput(#145,感谢 @ferstar)**;失败时回退原 FFmpeg 管线。预编译包不含该特性。
Source builds with `wayland,portal,inproc-av`: zero-copy VAAPI from Portal DMA-BUF, in-process Opus audio and lock-screen input via uinput. Not in prebuilt packages.
### 验证范围 / Validation
单元测试与 CI(含 GTK 冒烟测试、`inproc-av`/Portal 特性构建)。手柄、高帧率解码、niri 剪贴板和 Portal VAAPI 由各贡献者在各自环境实机验证;维护者尚未用官方客户端复测。
### 下载 / Download
`uu-remote-linux_0.2.42_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.42-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.42`(x86_64)。
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
+15
View File
@@ -0,0 +1,15 @@
KDE Wayland 被控端新增实验性防窥模式。/ Experimental privacy screen for KDE Wayland hosts.
### 新增 / Added
- **KDE Wayland 被控端防窥模式(隐私 / 关屏,#146,感谢 @ferstar,对应 #140)**:控制端开启防窥后,采集与输入切到 KWin 虚拟输出,物理屏关闭或以壁纸遮挡,本地键鼠暂停;主机进程以任何方式退出都会恢复屏幕和输入。需要 `kscreen-doctor` 与 uinput 权限。
KDE Wayland hosts: privacy screen (privacy / screen-off) switches capture and input to a KWin virtual output and blanks or covers the physical display; local input is paused and restored on any host exit. Requires `kscreen-doctor` and uinput access.
- 已知限制:Mac 控制端的防窥菜单切换后仍显示“不启用”,实际模式正确;X11 与其他 Wayland 桌面暂不支持。
Known limitation: the Mac viewer menu still shows "off" after switching; X11 and other Wayland desktops are not supported yet.
### 验证范围 / Validation
单元测试与 CI。防窥模式由贡献者在 KDE Wayland 实机验证;维护者尚未用官方客户端复测。
### 下载 / Download
`uu-remote-linux_0.2.43_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.43-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.43`(x86_64)。
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
+13
View File
@@ -0,0 +1,13 @@
Mac 控制端防窥菜单正确显示当前模式。/ The Mac viewer privacy menu now shows the active mode.
### 修复 / Fixed
- **Mac 控制端防窥状态回显(#147、#148,感谢 @ferstar)**:防窥切换应答与 SystemMetrics 改经 TEXT 通道发送(TEXT 打开前排队,metrics 只保留最新一份),SystemMetrics 带上报告的分节列表并报告当前防窥模式,修复 v0.2.43 中菜单切换后仍显示“不启用”的问题。
Privacy replies and SystemMetrics are now also delivered over the TEXT channel (queued until it opens, keeping only the latest metrics); SystemMetrics lists its reported sections and the current privacy mode, so the Mac viewer menu no longer shows "off" after switching.
### 验证范围 / Validation
单元测试与 CI。贡献者在 KDE Wayland + Mac 控制端实机验证;维护者尚未用 Windows/iOS/Android 控制端复测。
### 下载 / Download
`uu-remote-linux_0.2.44_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.44-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.44`(x86_64)。
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
+13
View File
@@ -0,0 +1,13 @@
控制端远程窗口不再被本地输入法截获按键。/ The viewer's remote window no longer lets the local IME swallow keys.
### 修复 / Fixed
- **控制端本地输入法截获按键(#149、#150,感谢 @xfjm136)**:SDL 远程桌面窗口创建后关闭本地文本输入,按键只按物理键转发,由被控端输入法处理;修复本地与远端都用 Shift 切换中英文时,Shift 等按键被本地输入法吞掉的问题。不修改系统输入法设置,GTK 启动器不受影响。
The SDL remote desktop window now disables local text input after creation, so keys are forwarded as physical keys and the remote IME handles composition; Shift and similar keys are no longer swallowed by the local IME. System IME settings and the GTK launcher are unchanged.
### 验证范围 / Validation
单元测试(含 SDL dummy 子进程测试)与 CI。贡献者在 KDE Wayland + Fcitx5 连接 Windows 实机验证;其他桌面/输入法后端未复测。
### 下载 / Download
`uu-remote-linux_0.2.45_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.45-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.45`(x86_64)。
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
+13
View File
@@ -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.**
+17
View File
@@ -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.**
+19
View File
@@ -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.**
+16
View File
@@ -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.**
+51
View File
@@ -0,0 +1,51 @@
# SDL viewer video scheduling
## Problem and cause
The SDL viewer previously consumed at most one compressed access unit per 8 ms
tick: approximately 125 units/s. With one unit per picture, sustained 144 FPS
input can overflow its bounded queue even when decoding keeps up. Lost compressed
units can break reference-frame dependencies, causing repeated decoder resets
and keyframe recovery. Increasing queue capacity alone only delays the overflow.
## Implementation
Each tick feeds queued compressed units to the existing decoder in FIFO order,
up to 8 units. A 4 ms elapsed-work budget is checked between calls. The viewer
then presents only the newest completed picture, avoiding redundant presentation
of older decoded pictures. It also polls asynchronous decoder output on idle ticks.
The compressed queue holds 8 units instead of 3 to absorb short presentation
stalls; processing starts immediately without waiting for a full batch. Actual
compressed-unit loss still resets the decoder and uses the existing keyframe
gate and PLI requests. Decoder interfaces, counters and opt-in diagnostic dumps
remain available; the presentation counter counts pictures actually presented.
There are no new settings or protocol fields.
## Verification
The desktop regression tests simulate 8 seconds of 144 units/s input and 125
processing ticks/s. The old one-unit policy drops 150 units with capacity 3 and
145 with capacity 8. Bounded batching delivers all 1,152 units to a mock decoder
in order without compressed-unit loss or resets, presenting at most once per tick.
Other tests cover newest-picture selection, idle asynchronous output, recovery
after real queue overflow, and count/time budgets leaving work for the next tick.
Budget tests inject elapsed time internally rather than depending on CI timing.
Run the full viewer checks without test filters or skips:
```sh
cargo test --locked --features native-viewer,viewer-sdl --bin uuremote-viewer
cargo build --locked --features native-viewer,viewer-sdl --bin uuremote-viewer
```
## Limits and scope
The 4 ms budget cannot interrupt an already-blocked decoder call and does not
bound the subsequent presentation call. Slow decoding or rendering can still
overflow the queue. This adds no hardware decoding and guarantees neither stable
144 FPS nor 144 distinct displayed pictures on a 90 Hz screen.
Startup timeout, stream-profile synchronization, gamepad/rumble and installation
changes are outside this patch.
Implementation and regression tests were prepared with Codex assistance.
+47
View File
@@ -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.
+100 -1
View File
@@ -1,6 +1,6 @@
//! Desktop sound for the viewer's 声音 menu: the default output's monitor (PulseAudio or //! Desktop sound for the viewer's 声音 menu: the default output's monitor (PulseAudio or
//! PipeWire-pulse) is encoded to Opus and sent on the negotiated audio m-line. //! PipeWire-pulse) is encoded to Opus and sent on the negotiated audio m-line.
//! An FFmpeg child process does the encoding. //! inproc-av uses libpulse/libopus directly; other builds and native failures use FFmpeg.
//! PipeWire monitors ignore the sink's mute by default, so 被控端静音运行 keeps the stream audible. //! PipeWire monitors ignore the sink's mute by default, so 被控端静音运行 keeps the stream audible.
//! `UU_AUDIO=0` disables it; `UU_AUDIO_SOURCE` picks another Pulse source. //! `UU_AUDIO=0` disables it; `UU_AUDIO_SOURCE` picks another Pulse source.
@@ -56,12 +56,78 @@ fn read_packets(stdout: impl Read, tx: &tokio::sync::mpsc::Sender<bytes::Bytes>)
fn start(source: &str, tx: tokio::sync::mpsc::Sender<bytes::Bytes>) fn start(source: &str, tx: tokio::sync::mpsc::Sender<bytes::Bytes>)
-> Result<(Stopper, tokio::task::JoinHandle<Result<(), String>>), String> { -> Result<(Stopper, tokio::task::JoinHandle<Result<(), String>>), String> {
let stop = Arc::new(AtomicBool::new(false)); let stop = Arc::new(AtomicBool::new(false));
#[cfg(all(target_os = "linux", feature = "inproc-av"))]
if !crate::inproc_encoder::disabled() {
let source = std::ffi::CString::new(source).map_err(|_| "Audio source contains NUL")?;
let worker_stop = stop.clone();
let job = tokio::task::spawn_blocking(move || {
match native_packets(&source, &tx, &worker_stop) {
Ok(()) => Ok(()),
Err(error) if !worker_stop.load(Ordering::Relaxed) && !tx.is_closed() => {
log::warn!("In-process audio unavailable: {error}; falling back to FFmpeg Opus");
let mut child = spawn_encoder(source.to_str().map_err(|_| "Invalid audio source")?)?;
let stdout = child.stdout.take().ok_or("Encoder stdout missing")?;
// Supervise the process separately so cancellation also interrupts a blocked read.
let (done_tx, done_rx) = std::sync::mpsc::channel();
let reader_tx = tx.clone();
let reader = std::thread::spawn(move || {
let result = read_packets(stdout, &reader_tx);
let _ = done_tx.send(result);
});
let result = loop {
match done_rx.recv_timeout(Duration::from_millis(20)) {
Ok(result) => break result,
Err(std::sync::mpsc::RecvTimeoutError::Disconnected) => break Err("Audio reader ended".into()),
Err(_) => if worker_stop.load(Ordering::Relaxed) || tx.is_closed() { break Ok(()); },
}
};
let _ = child.kill();
let _ = child.wait();
let _ = reader.join();
result
},
Err(_) => Ok(()),
}
});
return Ok((Stopper { stop, child: None }, job));
}
let mut child = spawn_encoder(source)?; let mut child = spawn_encoder(source)?;
let stdout = child.stdout.take().ok_or("Encoder stdout missing")?; let stdout = child.stdout.take().ok_or("Encoder stdout missing")?;
let job = tokio::task::spawn_blocking(move || read_packets(stdout, &tx)); let job = tokio::task::spawn_blocking(move || read_packets(stdout, &tx));
Ok((Stopper { stop, child: Some(child) }, job)) Ok((Stopper { stop, child: Some(child) }, job))
} }
#[cfg(all(target_os = "linux", feature = "inproc-av"))]
fn native_packets(source: &std::ffi::CStr, tx: &tokio::sync::mpsc::Sender<bytes::Bytes>, stop: &AtomicBool) -> Result<(), String> {
extern "C" {
fn uu_audio_open(source: *const libc::c_char) -> *mut libc::c_void;
fn uu_audio_packet(audio: *mut libc::c_void, packet: *mut u8, capacity: libc::c_int) -> libc::c_int;
fn uu_audio_close(audio: *mut libc::c_void);
}
struct Capture(*mut libc::c_void);
impl Drop for Capture {
fn drop(&mut self) { unsafe { uu_audio_close(self.0) }; }
}
let capture = Capture(unsafe { uu_audio_open(source.as_ptr()) });
if capture.0.is_null() { return Err("Native audio initialization failed".into()); }
let mut packet = [0; 4000];
let mut last_packet = std::time::Instant::now();
let mut announced = false;
while !stop.load(Ordering::Relaxed) && !tx.is_closed() {
let size = unsafe { uu_audio_packet(capture.0, packet.as_mut_ptr(), packet.len() as libc::c_int) };
if size < 0 { return Err(format!("Native audio capture/encode failed: {size}")); }
if size == 0 {
if last_packet.elapsed() >= Duration::from_secs(5) { return Err("Native audio capture timed out".into()); }
std::thread::sleep(Duration::from_millis(2));
continue;
}
if !announced { log::info!("Desktop audio pipeline=in-process opus 48k stereo"); announced = true; }
last_packet = std::time::Instant::now();
if tx.blocking_send(bytes::Bytes::copy_from_slice(&packet[..size as usize])).is_err() { break; }
}
Ok(())
}
fn closed(pc: &RTCPeerConnection) -> bool { fn closed(pc: &RTCPeerConnection) -> bool {
matches!(pc.connection_state(), RTCPeerConnectionState::Closed | RTCPeerConnectionState::Failed) matches!(pc.connection_state(), RTCPeerConnectionState::Closed | RTCPeerConnectionState::Failed)
} }
@@ -140,3 +206,36 @@ pub async fn probe(seconds: u64) -> Result<(), String> {
let result = job.await.map_err(|e| e.to_string())?; let result = job.await.map_err(|e| e.to_string())?;
if packets == 0 { result } else { Ok(()) } if packets == 0 { result } else { Ok(()) }
} }
#[cfg(all(test, target_os = "linux", feature = "inproc-av"))]
mod native_tests {
use super::*;
#[tokio::test]
#[ignore = "requires a running PulseAudio or PipeWire-pulse server"]
async fn native_opus_packets_decode_and_capture_stops_promptly() {
extern "C" {
fn opus_decoder_create(rate: i32, channels: i32, error: *mut i32) -> *mut libc::c_void;
fn opus_decode(decoder: *mut libc::c_void, data: *const u8, length: i32, pcm: *mut i16, size: i32, fec: i32) -> i32;
fn opus_decoder_destroy(decoder: *mut libc::c_void);
}
let source = std::ffi::CString::new("@DEFAULT_MONITOR@").unwrap();
let (tx, mut rx) = tokio::sync::mpsc::channel(2);
let stop = Arc::new(AtomicBool::new(false));
let worker_stop = stop.clone();
let job = tokio::task::spawn_blocking(move || native_packets(&source, &tx, &worker_stop));
let stopper = Stopper { stop, child: None };
let packet = tokio::time::timeout(Duration::from_secs(6), rx.recv()).await.unwrap().unwrap();
let mut error = 0;
let decoder = unsafe { opus_decoder_create(48000, 2, &mut error) };
assert_eq!(error, 0);
assert!(!decoder.is_null());
let mut pcm = [0; 960 * 2];
let samples = unsafe { opus_decode(decoder, packet.as_ptr(), packet.len() as i32, pcm.as_mut_ptr(), 960, 0) };
unsafe { opus_decoder_destroy(decoder) };
assert_eq!(samples, 960);
drop(rx);
drop(stopper);
tokio::time::timeout(Duration::from_secs(1), job).await.unwrap().unwrap().unwrap();
}
}
+1
View File
@@ -181,6 +181,7 @@ impl Drop for ScreenCapture {
/// Keep the display visible only while a peer is streaming; never unlock it. /// Keep the display visible only while a peer is streaming; never unlock it.
pub fn keep_display_awake() -> Result<(), String> { pub fn keep_display_awake() -> Result<(), String> {
if crate::privacy_screen::active() { return Ok(()); }
if crate::desktop_backend::detect()? == crate::desktop_backend::DesktopBackend::Kms { return Ok(()); } if crate::desktop_backend::detect()? == crate::desktop_backend::DesktopBackend::Kms { return Ok(()); }
if crate::desktop_backend::detect()? == crate::desktop_backend::DesktopBackend::Portal { if crate::desktop_backend::detect()? == crate::desktop_backend::DesktopBackend::Portal {
return crate::desktop_power::wake(); return crate::desktop_power::wake();
+10 -2
View File
@@ -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(){
+4
View File
@@ -182,6 +182,10 @@ pub fn encode_echo_response_with_clipboard(seq: u64, timestamp: u64, request_seq
// 6 ff_file_transfer_ftp = LIST_COMPRESS (zlib dir_data), 8 ff_clipboard = SUPPORT_TEXT_CHANGE. // 6 ff_file_transfer_ftp = LIST_COMPRESS (zlib dir_data), 8 ff_clipboard = SUPPORT_TEXT_CHANGE.
let mut flags = vec![8, crate::capture_setting::FEATURE_VERSION as u8, let mut flags = vec![8, crate::capture_setting::FEATURE_VERSION as u8,
16, crate::system_actions::FF_SIMPLE_ACTION, 24, crate::system_actions::FF_SYSTEM_METRICS, 48, 2]; 16, crate::system_actions::FF_SIMPLE_ACTION, 24, crate::system_actions::FF_SYSTEM_METRICS, 48, 2];
// Privacy screen (Mac UURemote name maps): 3 ff_system_metrics = FF_SYSTEM_METRICS_SETTING_PRIVATE_SCREEN
// (3, after AUTO_LOCK 2; the viewer then reads SettingMetric 4/7), 4 ff_private_screen =
// FF_PRIVATE_SCREEN_ENHANCED_PRIVACY (2): screen off besides the picture mode.
if crate::privacy_screen::supported() { flags[5] = 3; flags.extend([32, 2]); }
if clipboard { flags.extend_from_slice(&[64, 3]); } if clipboard { flags.extend_from_slice(&[64, 3]); }
action.push(34); action.push(34);
action.push(flags.len() as u8); action.push(flags.len() as u8);
+101
View File
@@ -79,6 +79,107 @@ fn mapping(kind: u8, payload: &[u8]) -> Vec<u8> {
crate::initialization::envelope(1, 0, 27, &frame) crate::initialization::envelope(1, 0, 27, &frame)
} }
#[tokio::test]
async fn privacy_replies_wait_for_each_peers_text_channel() {
tokio::time::timeout(Duration::from_secs(25), async {
let mut peers = Vec::new();
for request_id in [41, 51] {
let (host, mut viewer) = connect(Arc::new(InputInjector::without_desktop()), false, None,
&["CONTROL_DATA_CHANNEL"]).await;
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 13).await;
for (id, case, payload) in [(request_id, 25, &[][..]), (request_id + 1, 7, &[8, 1, 16, 3][..])] {
let mut rpc = bytes(1, &[8, id]);
rpc.extend(bytes(case, payload));
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(1, 0, 21, &rpc)).await;
}
// A synthetic host rejects privacy without touching a physical desktop.
// Echo is a dispatch barrier: both replies are queued before TEXT exists.
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(2, 0, 3, &[8, 0])).await;
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 3).await;
peers.push((request_id, host, viewer));
}
for (request_id, host, mut viewer) in peers {
let text = viewer.pc.create_data_channel("TEXT_DATA_CHANNEL", None).await.unwrap();
let (tx, messages) = mpsc::unbounded_channel();
text.on_message(Box::new(move |message| {
let _ = tx.send(("TEXT_DATA_CHANNEL".into(), message.data.to_vec()));
Box::pin(async {})
}));
viewer.messages = messages;
let mut replies = Vec::new();
let mut metrics_seen = false;
while replies.len() < 2 || !metrics_seen {
let (channel, message) = tokio::time::timeout(Duration::from_secs(5), viewer.messages.recv()).await
.expect("late TEXT delivery timed out").expect("peer stopped responding");
assert_eq!(channel, "TEXT_DATA_CHANNEL");
if let Some(metrics) = body(&message, 13) {
assert_eq!(body(metrics, 1), Some([1, 2].as_slice()));
metrics_seen = true;
}
if body(&message, 22).is_some() { replies.push(message); }
}
for ((id, case), message) in [(request_id, 21), (request_id + 1, 3)].into_iter().zip(replies) {
let rpc = body(&message, 22).unwrap();
assert_eq!(body(rpc, 1), Some([8, id].as_slice()));
let response = body(rpc, case).expect("wrong RPC response case");
if case == 3 {
assert!(decode_wire(response).unwrap().iter().any(|f| f.number == 1 && f.value == WireValue::Varint(1)));
}
}
host.pc.close().await.unwrap();
viewer.pc.close().await.unwrap();
viewer.router.lock().await.stop().await.unwrap();
}
}).await.expect("privacy TEXT routing regression exceeded deadline");
}
#[tokio::test]
async fn ready_portal_control_input_is_forwarded_while_locked() {
tokio::time::timeout(Duration::from_secs(20), async {
let input = Arc::new(InputInjector::without_desktop());
let mut screen = ScreenCapture::unavailable("synthetic ready desktop".into());
screen.backend = crate::desktop_backend::DesktopBackend::Portal;
screen.init_error = None;
let (lock, locked) = tokio::sync::watch::channel(Some(true));
let portal = Arc::new(crate::desktop_session::PortalDesktop::with_lock_state(Arc::new(screen), locked));
let (host, mut viewer) = connect(input.clone(), true, Some(portal.clone()), &["CONTROL_DATA_CHANNEL"]).await;
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 13).await;
for (index, state) in [Some(true), None].into_iter().enumerate() {
lock.send(state).unwrap();
let before = input.portal_input_counts_for_test();
for message in [
br#"{"action":"kbd_press","key":65}"#.as_slice(),
br#"{"action":"kbd_release","key":65}"#.as_slice(),
br#"{"action":"mouse_press","button":1}"#.as_slice(),
br#"{"action":"mouse_release","button":1}"#.as_slice(),
] {
send(&viewer, "CONTROL_DATA_CHANNEL", message.to_vec()).await;
}
let sequence = 310 + index as u64;
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(sequence, 0, 3, &[8, 0])).await;
loop {
let response = receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 3).await;
let args: serde_json::Value = serde_json::from_slice(body(body(&response, 3).unwrap(), 2).unwrap()).unwrap();
if args["seq"] == sequence { break; }
}
let after = input.portal_input_counts_for_test();
assert_eq!(after[2] - before[2], 2, "keyboard dropped for lock state {state:?}");
assert_eq!(after[1] - before[1], 2, "mouse buttons dropped for lock state {state:?}");
}
let before = input.portal_input_counts_for_test();
let mut unavailable = ScreenCapture::unavailable("synthetic closed source".into());
unavailable.backend = crate::desktop_backend::DesktopBackend::Portal;
portal.publish_test_screen(Arc::new(unavailable));
send(&viewer, "CONTROL_DATA_CHANNEL", br#"{"action":"kbd_click","key":65}"#.to_vec()).await;
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(320, 0, 3, &[8, 0])).await;
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 3).await;
assert_eq!(input.portal_input_counts_for_test(), before, "unavailable source accepted input");
host.pc.close().await.unwrap();
viewer.pc.close().await.unwrap();
viewer.router.lock().await.stop().await.unwrap();
}).await.expect("locked CONTROL input regression exceeded deadline");
}
#[tokio::test] #[tokio::test]
async fn closing_unnegotiated_peers_releases_callback_state() { async fn closing_unnegotiated_peers_releases_callback_state() {
for desktop in [false, true] { for desktop in [false, true] {
+1
View File
@@ -38,6 +38,7 @@ mod native {
/// Set GNOME's display power-save mode to on. This does not unlock the session or change /// Set GNOME's display power-save mode to on. This does not unlock the session or change
/// lock-screen policy. Session-bus setup and each method call are bounded to three seconds. /// lock-screen policy. Session-bus setup and each method call are bounded to three seconds.
pub fn wake() -> Result<(), String> { pub fn wake() -> Result<(), String> {
if crate::privacy_screen::active() { return Ok(()); }
if !gnome_portal_active() { if !gnome_portal_active() {
return Ok(()); return Ok(());
} }
+390
View File
@@ -2,6 +2,7 @@
//! With UU_VIDEO_ENCODER=vaapi, H.264 / HEVC go through VAAPI instead: a DRI3 DMA-BUF of the root window is //! With UU_VIDEO_ENCODER=vaapi, H.264 / HEVC go through VAAPI instead: a DRI3 DMA-BUF of the root window is
//! imported as a VA surface and converted/scaled by VPP, so the CPU never touches the pixels (XShm upload //! imported as a VA surface and converted/scaled by VPP, so the CPU never touches the pixels (XShm upload
//! when DRI3 is unavailable). //! when DRI3 is unavailable).
//! Portal sessions can instead upload their existing BGRA frames, sharing the same GPU VPP and encoder.
//! When capture and encoder sizes match, the XShm buffer is registered as CUDA pinned memory and //! When capture and encoder sizes match, the XShm buffer is registered as CUDA pinned memory and
//! NVENC reads it by DMA, so there is no host-to-device copy (the X server still writes XShm). //! NVENC reads it by DMA, so there is no host-to-device copy (the X server still writes XShm).
@@ -77,6 +78,7 @@ extern "C" {
fn vaapi_create(config: *const VaapiConfigFFI) -> *mut VaapiEngineOpaque; fn vaapi_create(config: *const VaapiConfigFFI) -> *mut VaapiEngineOpaque;
fn vaapi_import_dma_buffer(engine: *mut VaapiEngineOpaque, dma_fd: libc::c_int, stride: u32) -> libc::c_int; fn vaapi_import_dma_buffer(engine: *mut VaapiEngineOpaque, dma_fd: libc::c_int, stride: u32) -> libc::c_int;
fn vaapi_import_frame(engine: *mut VaapiEngineOpaque, frame: *const crate::portal::DmaFrame) -> libc::c_int;
fn vaapi_upload_host_buffer(engine: *mut VaapiEngineOpaque, host_ptr: *const u8, pitch: u32) -> libc::c_int; fn vaapi_upload_host_buffer(engine: *mut VaapiEngineOpaque, host_ptr: *const u8, pitch: u32) -> libc::c_int;
fn vaapi_encode_frame( fn vaapi_encode_frame(
engine: *mut VaapiEngineOpaque, engine: *mut VaapiEngineOpaque,
@@ -130,6 +132,7 @@ impl Drop for SafeDri3Capture {
} }
pub struct Config { pub struct Config {
pub portal: Option<Arc<crate::portal::PortalSession>>,
pub display: String, pub display: String,
pub input: (u32, u32), pub input: (u32, u32),
pub output: Option<(u32, u32)>, pub output: Option<(u32, u32)>,
@@ -218,6 +221,28 @@ pub fn run(
} }
} }
pub fn black_frame(codec: crate::capture_setting::VideoCodec) -> Result<bytes::Bytes, String> {
let device = CString::new(crate::video::vaapi_device()).map_err(|_| "Invalid VAAPI device")?;
let config = VaapiConfigFFI {
width: 1280, height: 720, cap_width: 1280, cap_height: 720, fps: 1, gop: 1,
target_bps: 1_000_000, max_bps: 2_000_000, buffer_bits: 500_000,
is_hevc: libc::c_int::from(codec == crate::capture_setting::VideoCodec::H265),
device: device.as_ptr(),
};
let engine = SafeVaapiEngine(unsafe { vaapi_create(&config) });
if engine.0.is_null() { return Err("Locked video VAAPI initialization failed".into()); }
let pixels = vec![0; 1280 * 720 * 4];
if unsafe { vaapi_upload_host_buffer(engine.0, pixels.as_ptr(), 1280 * 4) } != 0 {
return Err("Locked video VAAPI upload failed".into());
}
let mut data = std::ptr::null();
let mut length = 0;
if unsafe { vaapi_encode_frame(engine.0, 1, &mut data, &mut length) } != 0 || data.is_null() || length == 0 {
return Err("Locked video VAAPI encode failed".into());
}
Ok(bytes::Bytes::copy_from_slice(unsafe { std::slice::from_raw_parts(data, length as usize) }))
}
fn run_vaapi( fn run_vaapi(
config: Config, config: Config,
units: mpsc::Sender<EncodedUnit>, units: mpsc::Sender<EncodedUnit>,
@@ -257,6 +282,9 @@ fn run_vaapi(
return Err("Failed to create native VAAPI engine".into()); return Err("Failed to create native VAAPI engine".into());
} }
let engine = SafeVaapiEngine(raw_engine); let engine = SafeVaapiEngine(raw_engine);
if let Some(portal) = config.portal.as_ref() {
return run_portal_vaapi(&config, portal, &engine, units, stop, idr, budget);
}
// Capture stays at the full input size; VPP scales (or pads) to the encoder size. // Capture stays at the full input size; VPP scales (or pads) to the encoder size.
let display = CString::new(config.display.as_str()).map_err(|_| "DISPLAY contains NUL".to_string())?; let display = CString::new(config.display.as_str()).map_err(|_| "DISPLAY contains NUL".to_string())?;
@@ -392,6 +420,115 @@ fn run_vaapi(
keepalive = random_keepalive(&mut seed); keepalive = random_keepalive(&mut seed);
} }
} }
fn vaapi_packet(engine: &SafeVaapiEngine, idr: &AtomicBool) -> Result<Vec<u8>, String> {
let mut data = std::ptr::null();
let mut length = 0;
let force_idr = libc::c_int::from(idr.swap(false, Ordering::AcqRel));
let result = unsafe { vaapi_encode_frame(engine.0, force_idr, &mut data, &mut length) };
if result != 0 { return Err(format!("VAAPI encode failed: {result}")); }
if data.is_null() || length == 0 { return Ok(Vec::new()); }
Ok(unsafe { std::slice::from_raw_parts(data, length as usize) }.to_vec())
}
fn run_portal_vaapi(
config: &Config, portal: &crate::portal::PortalSession, engine: &SafeVaapiEngine,
units: mpsc::Sender<EncodedUnit>, stop: Arc<AtomicBool>, idr: Arc<AtomicBool>, budget: Arc<Semaphore>,
) -> Result<(), String> {
use crate::portal::DmaCapture;
let interval = Duration::from_nanos(1_000_000_000 / u64::from(config.fps));
let mut next_poll = Instant::now();
let mut last_send = Instant::now();
let mut seed = 1;
let mut keepalive = random_keepalive(&mut seed);
let mut dma_version = None;
let mut cpu_version = None;
let mut cpu_frame = Vec::new();
let mut uploaded = false;
let mut input_dma = false;
let mut blank_frame = false;
let mut dma_disabled = std::env::var("UU_PORTAL_DMABUF").is_ok_and(|v| v == "0");
if dma_disabled { log::info!("Portal VAAPI DMA-BUF disabled by setting; pipeline=host-upload"); }
loop {
if stop.load(Ordering::Relaxed) || units.is_closed() { return Ok(()); }
std::thread::sleep(next_poll.saturating_duration_since(Instant::now()).min(Duration::from_millis(20)));
let now = Instant::now();
if now < next_poll { continue; }
next_poll = (next_poll + interval).max(now);
if portal.size() != config.input { return Err("Portal size changed; restart encoder".into()); }
let Some(permit) = acquire(&budget, &units) else { return Ok(()); };
if stop.load(Ordering::Relaxed) { return Ok(()); }
let due = last_send.elapsed() >= keepalive || idr.load(Ordering::Acquire);
let captured = if dma_disabled { Ok(DmaCapture::Cpu) } else {
portal.with_dmabuf(&mut dma_version, |frame, changed| {
if !changed && input_dma && !due { return Ok(None); }
if changed || !input_dma {
let result = unsafe { vaapi_import_frame(engine.0, frame) };
if result != 0 { return Err(format!("VAAPI DMA-BUF import failed: {result}")); }
}
// vaapi_encode_frame waits for VA completion before the PipeWire lease is released.
let packet = vaapi_packet(engine, &idr)?;
if !input_dma {
log::info!("Portal VAAPI capture pipeline=dma-buf zero_cpu_copy=true source={}x{} fourcc={} modifier={}",
frame.width, frame.height, frame.fourcc, frame.modifier);
}
input_dma = true;
blank_frame = false;
uploaded = true;
Ok(Some(packet))
})
};
let captured = match captured {
Ok(DmaCapture::Unavailable(code)) => {
let reason = match code {
14 => "buffer layout unsupported or DMA-BUF disabled for this session",
16 => "compositor selected shared memory",
17 => "DMA-BUF negotiation or first frame timed out",
18 => "explicit synchronization unsupported",
19 => "nonlinear modifier unsupported",
_ => "DMA-BUF interface unavailable",
};
log::warn!("Portal DMA-BUF unavailable: {reason} (code={code}); falling back to native VAAPI host upload");
dma_disabled = true; portal.disable_dmabuf();
DmaCapture::Cpu
},
Err(error) => {
log::warn!("Portal DMA-BUF unavailable: {error}; falling back to native VAAPI host upload");
dma_disabled = true; portal.disable_dmabuf();
DmaCapture::Cpu
},
Ok(value) => value,
};
let data = match captured {
DmaCapture::Frame(Some(packet)) => packet,
DmaCapture::Frame(None) | DmaCapture::Pending => continue,
state @ (DmaCapture::Cpu | DmaCapture::Blank) => {
cpu_frame.resize(config.input.0 as usize * config.input.1 as usize * 4, 0);
let changed = if matches!(state, DmaCapture::Blank) {
let changed = !blank_frame;
if changed { cpu_frame.fill(0); }
blank_frame = true;
changed
} else {
blank_frame = false;
portal.capture_changed(&mut cpu_frame, &mut cpu_version)?
};
if !changed && !input_dma && uploaded && !due { continue; }
if changed || input_dma || !uploaded {
let result = unsafe { vaapi_upload_host_buffer(engine.0, cpu_frame.as_ptr(), config.input.0 * 4) };
if result != 0 { return Err(format!("Portal VAAPI upload failed: {result}")); }
input_dma = false; uploaded = true;
}
vaapi_packet(engine, &idr)?
},
DmaCapture::Unavailable(_) => unreachable!(),
};
if data.is_empty() { continue; }
if units.blocking_send(EncodedUnit { data, permit, completed_at: Instant::now() }).is_err() { return Ok(()); }
last_send = Instant::now();
keepalive = random_keepalive(&mut seed);
}
}
fn vaapi_wait(dri3: &Option<SafeDri3Capture>, capture: &mut Option<DamageCapture>, timeout: Duration) -> Result<bool, String> { fn vaapi_wait(dri3: &Option<SafeDri3Capture>, capture: &mut Option<DamageCapture>, timeout: Duration) -> Result<bool, String> {
match (dri3, capture) { match (dri3, capture) {
(Some(c), _) => match unsafe { dri3_capture_wait_damage(c.0, timeout.as_millis().min(1000) as i32) } { (Some(c), _) => match unsafe { dri3_capture_wait_damage(c.0, timeout.as_millis().min(1000) as i32) } {
@@ -664,6 +801,24 @@ fn pad_argb32(src: &[u8], src_w: u32, src_h: u32, dst: &mut [u8], dst_w: u32, ds
#[cfg(test)] #[cfg(test)]
mod budget_tests { mod budget_tests {
use super::*; use super::*;
#[test]
#[ignore = "requires a VAAPI render node and FFmpeg for independent decode verification"]
fn vaapi_locked_frames_decode_as_black_in_both_codecs() {
use std::io::Write;
use std::process::{Command, Stdio};
for codec in [crate::capture_setting::VideoCodec::H264, crate::capture_setting::VideoCodec::H265] {
let frame = black_frame(codec).unwrap();
let mut decoder = Command::new("ffmpeg").args(["-hide_banner", "-loglevel", "error", "-i", "pipe:0",
"-frames:v", "1", "-vf", "scale=1:1", "-pix_fmt", "rgb24", "-f", "rawvideo", "pipe:1"])
.stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::piped()).spawn().unwrap();
decoder.stdin.take().unwrap().write_all(&frame).unwrap();
let decoded = decoder.wait_with_output().unwrap();
assert!(decoded.status.success(), "decode failed for {codec:?}");
assert_eq!(decoded.stdout.len(), 3);
assert!(decoded.stdout.iter().all(|&value| value <= 3), "frame is not black for {codec:?}");
}
}
#[tokio::test] #[tokio::test]
async fn closing_encoder_output_wakes_a_blocked_capture() { async fn closing_encoder_output_wakes_a_blocked_capture() {
let budget = Arc::new(Semaphore::new(0)); let budget = Arc::new(Semaphore::new(0));
@@ -726,3 +881,238 @@ mod frame_tests {
} }
} }
} }
#[cfg(all(test, target_os = "linux", feature = "portal"))]
mod portal_hardware_tests {
// Run on an unlocked desktop with saved Portal consent and VAAPI selected.
// FFmpeg is used only for independent decode verification; desktop contents
// are neither saved nor printed. These tests do not lock the real desktop
// or replace system lock-screen acceptance in an isolated VM.
use super::*;
use crate::capture_setting::VideoCodec;
struct Runner {
stop: Arc<AtomicBool>,
idr: Arc<AtomicBool>,
rx: mpsc::Receiver<EncodedUnit>,
job: Option<tokio::task::JoinHandle<Result<(), String>>>,
}
impl Drop for Runner {
fn drop(&mut self) { self.stop.store(true, Ordering::Release); self.rx.close(); }
}
impl Runner {
fn start(portal: Arc<crate::portal::PortalSession>, codec: VideoCodec) -> Self {
let config = Config {
input: portal.size(), portal: Some(portal), display: "wayland:portal".into(),
output: None, fps: 60, gop: 120, cq: 18, target_bps: 16_000_000,
max_bps: 30_000_000, buffer_bits: 500_000, codec,
chroma: crate::capture_setting::CHROMA_420, vaapi: true,
};
let (tx, rx) = mpsc::channel(4);
let stop = Arc::new(AtomicBool::new(false));
let idr = Arc::new(AtomicBool::new(false));
let worker_stop = stop.clone();
let worker_idr = idr.clone();
let job = tokio::task::spawn_blocking(move || run(config, tx, worker_stop, worker_idr, Arc::new(Semaphore::new(4))));
Self { stop, idr, rx, job: Some(job) }
}
async fn frame(&mut self) -> Vec<u8> {
tokio::time::timeout(Duration::from_secs(10), self.rx.recv()).await.unwrap()
.expect("native capture stopped").data
}
async fn hevc_idr(&mut self) -> Vec<u8> {
tokio::time::timeout(Duration::from_secs(10), async {
loop {
let frame = self.frame().await;
let nals = crate::hevc::payload(usize::MAX, &frame).unwrap();
if nals.iter().any(|nal| (16..=21).contains(&((nal[0] >> 1) & 63))) { return frame; }
}
}).await.expect("requested HEVC IDR did not arrive")
}
async fn finish(mut self) {
self.stop.store(true, Ordering::Release);
self.rx.close();
tokio::time::timeout(Duration::from_secs(2), self.job.take().unwrap()).await
.expect("native encoder did not stop").unwrap().unwrap();
}
}
fn decoded_is_black(data: &[u8], codec: VideoCodec) -> bool {
use std::io::Write;
use std::process::{Command, Stdio};
let format = if codec == VideoCodec::H265 { "hevc" } else { "h264" };
let mut decoder = Command::new("ffmpeg").args(["-hide_banner", "-loglevel", "error", "-f", format,
"-i", "pipe:0", "-frames:v", "1", "-pix_fmt", "rgb24", "-f", "rawvideo", "pipe:1"])
.stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::piped()).spawn().unwrap();
// Concurrent writing avoids filling stdin while the decoder is blocked on raw RGB output.
let mut input = decoder.stdin.take().unwrap();
let encoded = data.to_vec();
let writer = std::thread::spawn(move || input.write_all(&encoded));
let decoded = decoder.wait_with_output().unwrap();
writer.join().unwrap().unwrap();
assert!(decoded.status.success() && !decoded.stdout.is_empty(), "native frame decode failed");
decoded.stdout.iter().all(|&value| value <= 8)
}
fn resources() -> (usize, u64) {
let fds = std::fs::read_dir("/proc/self/fd").unwrap().count();
let rss = std::fs::read_to_string("/proc/self/status").unwrap().lines()
.find(|line| line.starts_with("VmRSS:")).unwrap().split_whitespace().nth(1).unwrap().parse().unwrap();
(fds, rss)
}
async fn reopen(portal: Arc<crate::portal::PortalSession>) {
tokio::task::spawn_blocking(move || {
portal.end();
assert!(portal.recover(&AtomicBool::new(false)).unwrap());
}).await.unwrap();
}
#[tokio::test]
#[ignore = "requires an unlocked Portal desktop and saved consent"]
async fn portal_snapshot_after_dma_initialization() {
let _ = env_logger::builder().is_test(true).try_init();
tokio::task::spawn_blocking(|| {
let mut portal = crate::portal::PortalSession::open().unwrap();
let (locked, watch) = tokio::sync::watch::channel(Some(false));
portal.test_lock_watch(watch);
assert!(matches!(portal.with_dmabuf(&mut None, |_, _| Ok(())).unwrap(), crate::portal::DmaCapture::Frame(())));
let (width, height) = portal.size();
let mut pixels = vec![0; width as usize * height as usize * 4];
for state in [Some(true), None, Some(false)] {
locked.send(state).unwrap();
portal.pause();
portal.capture(&mut pixels).unwrap();
assert!(pixels.chunks_exact(4).any(|p| p[..3].iter().any(|&v| v > 8)),
"healthy snapshot was blanked for lock state {state:?}");
println!("snapshot_lock_state={state:?} valid_frame=true");
}
}).await.unwrap();
}
// RUST_LOG=info cargo test --release --locked --features wayland,portal,inproc-av portal_five_minute_endurance_with_full_decode -- --ignored --nocapture
// Run for five minutes, independently decode every output frame, require equal
// encoded/decoded counts and no decode errors, and report CPU, RSS and FDs.
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
#[ignore = "five-minute real Portal/VAAPI run; FFmpeg is used only as an independent decoder"]
async fn portal_five_minute_endurance_with_full_decode() {
use std::process::Stdio;
use tokio::io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader};
let _ = env_logger::builder().is_test(true).try_init();
let session = tokio::task::spawn_blocking(crate::portal::PortalSession::open).await.unwrap().unwrap();
let mut runner = Runner::start(Arc::new(session), VideoCodec::H265);
let mut decoder = tokio::process::Command::new("ffmpeg").args([
"-hide_banner", "-loglevel", "error", "-nostats", "-threads", "2", "-f", "hevc", "-i", "pipe:0",
"-progress", "pipe:1", "-fps_mode", "passthrough", "-f", "null", "/dev/null",
]).stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::piped()).kill_on_drop(true).spawn().unwrap();
let mut input = decoder.stdin.take().unwrap();
let mut errors = decoder.stderr.take().unwrap();
let error_reader = tokio::spawn(async move {
let mut total = 0usize;
let mut buffer = [0; 2048];
loop {
let count = errors.read(&mut buffer).await.unwrap();
if count == 0 { return total; }
total += count;
}
});
let output = decoder.stdout.take().unwrap();
let progress_reader = tokio::spawn(async move {
let mut lines = BufReader::new(output).lines();
let mut frames = 0u64;
while let Some(line) = lines.next_line().await.unwrap() {
if let Some(count) = line.strip_prefix("frame=") { frames = count.trim().parse().unwrap(); }
}
frames
});
let ticks = || {
let stat = std::fs::read_to_string("/proc/self/stat").unwrap();
let fields: Vec<_> = stat.split_once(") ").unwrap().1.split_whitespace().collect();
fields[11].parse::<u64>().unwrap() + fields[12].parse::<u64>().unwrap()
};
let hz = unsafe { libc::sysconf(libc::_SC_CLK_TCK) } as f64;
let started = Instant::now();
let mut last_report = started;
let mut last_ticks = ticks();
let mut frames = 0u64;
while started.elapsed() < Duration::from_secs(300) {
let data = runner.frame().await;
tokio::time::timeout(Duration::from_secs(5), input.write_all(&data)).await
.expect("verification decoder stopped consuming").unwrap();
frames += 1;
if last_report.elapsed() >= Duration::from_secs(30) {
let now_ticks = ticks();
let cpu = (now_ticks - last_ticks) as f64 / hz / last_report.elapsed().as_secs_f64() * 100.0;
let (fds, rss_kb) = resources();
println!("endurance elapsed_s={} encoded_frames={} cpu_percent={cpu:.2} fds={fds} rss_kb={rss_kb}",
started.elapsed().as_secs(), frames);
last_ticks = now_ticks; last_report = Instant::now();
}
}
runner.finish().await;
drop(input);
assert!(tokio::time::timeout(Duration::from_secs(15), decoder.wait()).await.unwrap().unwrap().success());
assert_eq!(error_reader.await.unwrap(), 0, "verification decoder reported errors");
let decoded = progress_reader.await.unwrap();
assert_eq!(decoded, frames, "decoder lost encoded frames");
println!("portal_endurance_passed duration_s={:.2} encoded_frames={} decoded_frames={} decode_errors=0",
started.elapsed().as_secs_f64(), frames, decoded);
}
// RUST_LOG=info cargo test --release --locked --features wayland,portal,inproc-av portal_restart_resources_and_injected_lock_recovery -- --ignored --nocapture
// Recreate the Portal session 20 times, check resource growth, then inject
// locked/unknown/unlocked observations to check healthy-frame passthrough.
// Actually close/restore the source to check placeholder black and recovery.
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
#[ignore = "requires an unlocked Portal desktop, saved consent, VAAPI and FFmpeg decode verification"]
async fn portal_restart_resources_and_injected_lock_recovery() {
let _ = env_logger::builder().is_test(true).try_init();
let mut session = tokio::task::spawn_blocking(crate::portal::PortalSession::open).await.unwrap().unwrap();
// Inject only the lock observation; actual session closure/recovery and GPU encoding remain real.
// This does not lock the user's desktop or bypass the isolated-VM acceptance guard.
let (locked, watch) = tokio::sync::watch::channel(Some(false));
session.test_lock_watch(watch);
let portal = Arc::new(session);
let mut snapshots = Vec::new();
for cycle in 0..20 {
let codec = if cycle % 2 == 0 { VideoCodec::H264 } else { VideoCodec::H265 };
let mut runner = Runner::start(portal.clone(), codec);
let frame = runner.frame().await;
assert!(!decoded_is_black(&frame, codec), "restarted stream stayed black");
runner.finish().await;
reopen(portal.clone()).await;
let (fds, rss_kb) = resources();
snapshots.push((fds, rss_kb));
println!("restart_cycle={} fds={} rss_kb={}", cycle + 1, fds, rss_kb);
}
let warm = snapshots[3];
let last = *snapshots.last().unwrap();
assert!(last.0 <= warm.0 + 2, "file descriptors grew across reconnects");
assert!(last.1 <= warm.1 + 32 * 1024, "resident memory grew across reconnects");
let mut runner = Runner::start(portal.clone(), VideoCodec::H265);
assert!(!decoded_is_black(&runner.hevc_idr().await, VideoCodec::H265));
for state in [Some(true), None, Some(false)] {
locked.send(state).unwrap();
portal.pause();
runner.idr.store(true, Ordering::Release);
assert!(!decoded_is_black(&runner.hevc_idr().await, VideoCodec::H265),
"healthy DMA source was blanked for lock state {state:?}");
assert!(matches!(portal.with_dmabuf(&mut None, |_, _| Ok(())).unwrap(), crate::portal::DmaCapture::Frame(())));
println!("dma_lock_state={state:?} valid_frame=true");
}
for cycle in 0..3 {
locked.send(Some(true)).unwrap();
portal.end();
runner.idr.store(true, Ordering::Release);
assert!(decoded_is_black(&runner.hevc_idr().await, VideoCodec::H265), "closed Portal source did not produce placeholder frame");
assert!(matches!(portal.with_dmabuf(&mut None, |_, _| Ok(())).unwrap(), crate::portal::DmaCapture::Cpu));
locked.send(Some(false)).unwrap();
let session = portal.clone();
tokio::task::spawn_blocking(move || { session.recover(&AtomicBool::new(false)).unwrap(); }).await.unwrap();
runner.idr.store(true, Ordering::Release);
assert!(!decoded_is_black(&runner.hevc_idr().await, VideoCodec::H265), "desktop did not recover after unlock observation");
println!("injected_lock_cycle={} source_closed=true placeholder_black=true same_arc_recovered=true", cycle + 1);
}
runner.finish().await;
println!("portal_restart_resources_passed cycles=20 fd_growth={} rss_growth_kb={} injected_lock_cycles=3",
last.0 as i64 - warm.0 as i64, last.1 as i64 - warm.1 as i64);
}
}
+570 -14
View File
@@ -46,12 +46,80 @@ struct HeldInput { buttons: std::collections::BTreeSet<i32>, keys: std::collecti
/// Held modifier VKs (bit 0 Ctrl, 1 Shift, 2 Alt, 3 Win) and keys that got a synthetic Shift. /// Held modifier VKs (bit 0 Ctrl, 1 Shift, 2 Alt, 3 Win) and keys that got a synthetic Shift.
#[derive(Default)] #[derive(Default)]
struct Shortcuts { modifiers: u8, shifted: std::collections::BTreeSet<i32> } struct Shortcuts { modifiers: u8, shifted: std::collections::BTreeSet<i32> }
/// Mobile viewers in touch mode send a finger as a left-button drag at absolute positions (observed:
/// Android sends press, a stream of mouse_move_absolute, release), which on a desktop selects text
/// instead of scrolling. By default (`Gesture`) the host decides per press: moving past `SLOP` before
/// `HOLD` scrolls smoothly (content follows the finger, also in terminals), holding still selects
/// like a mouse drag, and a short press is a click. `UU_TOUCH_INPUT=touch` replays drags as one finger
/// on the portal touchscreen instead; `=0` keeps mouse buttons. `at` is the last absolute position;
/// relative motion (the viewers' trackpad mode) clears it and keeps mouse buttons.
#[derive(Default)]
struct TouchDrag { mode: TouchMode, at: Option<(i32,i32)>, down: bool, finger: Finger }
#[derive(Clone, Copy, Debug, Default, PartialEq)]
enum TouchMode { #[default] Mouse, Gesture, Touch }
/// A mobile left press in gesture mode: not decided yet, scrolling, or selecting with button 1 down.
#[derive(Clone, Copy, Debug, Default, PartialEq)]
enum Finger { #[default] Up, Pending { start: (i32,i32), at: std::time::Instant }, Scroll { last: (i32,i32) }, Select }
/// Pixels a finger may wander before a press becomes a scroll, and how long it holds still to select.
const SLOP: i32 = 12;
const HOLD: std::time::Duration = std::time::Duration::from_millis(450);
/// What an absolute position does to the finger: the next state and a scroll from→to or a pointer move.
#[derive(Debug, PartialEq)]
enum FingerStep { Scroll((i32,i32),(i32,i32)), Move(i32,i32), Stay }
fn finger_motion(finger: Finger, to: (i32,i32)) -> (Finger, FingerStep) {
match finger {
Finger::Pending { start, .. } if (to.0-start.0).abs().max((to.1-start.1).abs()) > SLOP => (Finger::Scroll { last: to }, FingerStep::Scroll(start, to)),
Finger::Pending { .. } => (finger, FingerStep::Stay),
Finger::Scroll { last } => (Finger::Scroll { last: to }, FingerStep::Scroll(last, to)),
Finger::Select | Finger::Up => (finger, FingerStep::Move(to.0, to.1)),
}
}
/// A pending press held still for `HOLD`: where the selection starts.
fn finger_held(finger: Finger, now: std::time::Instant) -> Option<(i32,i32)> {
match finger { Finger::Pending { start, at } if now.duration_since(at) >= HOLD => Some(start), _ => None }
}
/// Viewer platform from the connect header `controller_platform` (website enum: 1 windows, 2 android,
/// 3 ios, 4 macos, 5 tv).
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
pub enum Controller { #[default] Other, Mac, Mobile }
impl Controller {
pub fn from_platform(platform: Option<&serde_json::Value>) -> Self {
let Some(v) = platform else { return Self::Other };
let text = v.as_str().map(str::to_ascii_lowercase);
match v.as_i64().or_else(|| text.as_deref().and_then(|s| s.parse().ok())) {
Some(4) => Self::Mac,
Some(2 | 3) => Self::Mobile,
_ if text.is_some_and(|s| s.contains("mac") || s.contains("darwin")) => Self::Mac,
_ => Self::Other,
}
}
}
/// Mac viewer with 「使用 macOS 快捷键」 off sends Cmd as VK_LWIN (verified: Cmd 0x5B, Option 0xA4, /// Mac viewer with 「使用 macOS 快捷键」 off sends Cmd as VK_LWIN (verified: Cmd 0x5B, Option 0xA4,
/// Ctrl 0xA2). Cmd is held back until we know whether it starts a Mac shortcut. /// Ctrl 0xA2). Cmd is held back until we know whether it starts a Mac shortcut.
#[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>, 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> } 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> }
fn active_output_count(json: &[u8]) -> Option<usize> {
let data: serde_json::Value = serde_json::from_slice(json).ok()?;
Some(data.get("outputs")?.as_array()?.iter()
.filter(|o| o["enabled"] == true && o["connected"] == true).count())
}
fn single_portal_output() -> bool {
if cfg!(test) { return false; }
let monitors = crate::portal::monitors();
if !monitors.is_empty() { return monitors.len() == 1; }
// KDE has no Mutter monitor API. Query once at injector creation, never during input.
std::process::Command::new("timeout").args(["2s", "kscreen-doctor", "-j"]).output().ok()
.filter(|output| output.status.success())
.and_then(|output| active_output_count(&output.stdout)) == Some(1)
}
/// The desktop injector opened uinput devices. The privacy screen needs them: KDE ignores portal
/// input on its virtual-output share, so without uinput nobody could operate the desktop.
static UINPUT_READY: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
pub fn uinput_ready() -> bool { UINPUT_READY.load(std::sync::atomic::Ordering::Acquire) }
impl InputInjector { impl InputInjector {
pub fn new() -> Self { pub fn new() -> Self {
@@ -62,7 +130,12 @@ impl InputInjector {
Err(e) => { log::warn!("uinput unavailable ({}); using the desktop input path. See README for the udev rule.", e.kind()); None } Err(e) => { log::warn!("uinput unavailable ({}); using the desktop input path. See README for the udev rule.", e.kind()); None }
} }
} else { None }; } else { None };
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, 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:crate::desktop_backend::detect().unwrap_or(crate::desktop_backend::DesktopBackend::X11), pending: std::sync::Mutex::new(PendingPointer::default()), held:std::sync::Mutex::new(HeldInput::default()) } if uinput.is_some() { UINPUT_READY.store(true, std::sync::atomic::Ordering::Release); }
let uinput_pointer = uinput.is_some() && (std::env::var("UU_INPUT_BACKEND").as_deref() == Ok("uinput")
|| (backend == crate::desktop_backend::DesktopBackend::Portal && single_portal_output()));
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)"); }
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()) }
} }
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>>) {
@@ -114,8 +187,29 @@ impl InputInjector {
let mut pending = self.pending.lock().unwrap(); let mut pending = self.pending.lock().unwrap();
let motion = std::mem::take(&mut *pending); let motion = std::mem::take(&mut *pending);
pending.scroll = (motion.scroll.0 % 120, motion.scroll.1 % 120); pending.scroll = (motion.scroll.0 % 120, motion.scroll.1 % 120);
if let Some((x,y)) = motion.absolute { self.inject_move(x,y,false); } let mut touch = self.touch.lock().unwrap();
if motion.relative != (0,0) { self.inject_move(motion.relative.0 as i32,motion.relative.1 as i32,true); } if let Some((x,y)) = motion.absolute {
if touch.down { self.inject_touch(1,x,y); } else {
let (finger, step) = finger_motion(touch.finger, (x,y));
touch.finger = finger;
match step {
FingerStep::Scroll(from,to) => { self.inject_scroll(from,to,false); },
FingerStep::Move(x,y) => { self.inject_move(x,y,false); },
FingerStep::Stay => {},
}
}
touch.at = Some((x,y));
}
// Held still: select from where the finger went down, like a mouse drag.
if let Some((x,y)) = finger_held(touch.finger, std::time::Instant::now()) {
self.inject_move(x,y,false);
touch.finger = if self.inject_button(1,true) == 0 { Finger::Select } else { Finger::Up };
}
drop(touch);
if motion.relative != (0,0) {
self.touch.lock().unwrap().at = None;
self.inject_move(motion.relative.0 as i32,motion.relative.1 as i32,true);
}
for (value, positive, negative) in [(motion.scroll.1,4,5),(motion.scroll.0,7,6)] { for (value, positive, negative) in [(motion.scroll.1,4,5),(motion.scroll.0,7,6)] {
let count = value / 120; let count = value / 120;
let button = if count > 0 { positive } else { negative }; let button = if count > 0 { positive } else { negative };
@@ -136,6 +230,7 @@ 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();
self.flush_pointer_locked(); self.flush_pointer_locked();
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);
if result == 0 { if result == 0 {
let mut held = self.held.lock().unwrap(); let mut held = self.held.lock().unwrap();
@@ -174,10 +269,93 @@ impl InputInjector {
shift shift
} }
/// The current desktop controller is the macOS viewer (connect header controller_platform). /// The current desktop controller's platform (connect header controller_platform).
pub fn set_mac_controller(&self, mac: bool) { /// Mobile drags follow `UU_TOUCH_INPUT`: unset = gesture, `touch` = portal touchscreen, `0` = mouse.
self.mac_controller.store(mac, std::sync::atomic::Ordering::Relaxed); pub fn set_controller(&self, controller: Controller) {
self.mac_controller.store(controller == Controller::Mac, std::sync::atomic::Ordering::Relaxed);
*self.cmd.lock().unwrap() = CmdState::default(); *self.cmd.lock().unwrap() = CmdState::default();
let mut touch = self.touch.lock().unwrap();
self.lift_finger(&mut touch);
let mode = if controller != Controller::Mobile || self.uinput_pointer { TouchMode::Mouse } else {
match std::env::var("UU_TOUCH_INPUT").as_deref() { Ok("0") => TouchMode::Mouse, Ok("touch") => TouchMode::Touch, _ => TouchMode::Gesture }
};
*touch = TouchDrag { mode, ..TouchDrag::default() };
}
/// Ends whatever a finger holds: the touch point, a selection's button, a scroll gesture.
fn lift_finger(&self, touch: &mut TouchDrag) {
if std::mem::take(&mut touch.down) { self.inject_touch(2,0,0); }
match std::mem::take(&mut touch.finger) {
Finger::Select => { self.inject_button(1,false); },
Finger::Scroll { last } => { self.inject_scroll(last,last,true); },
Finger::Pending { .. } | Finger::Up => {},
}
}
/// Left button of a mobile controller: a finger down at the last absolute position, or up.
/// False leaves the button to the mouse path (no touchscreen, trackpad mode, other viewers).
fn touch_button(&self, pressed: bool) -> bool {
let mut touch = self.touch.lock().unwrap();
if touch.mode == TouchMode::Gesture { return self.gesture_button(&mut touch, pressed) }
if !pressed {
if !touch.down { return false; }
touch.down = false;
self.inject_touch(2,0,0);
return true;
}
if touch.down { return true; }
let Some((x,y)) = touch.at.filter(|_| touch.mode == TouchMode::Touch) else { return false };
let supported = self.backend == crate::desktop_backend::DesktopBackend::Portal
&& self.portal.lock().unwrap().as_ref().is_some_and(|portal| portal.touch_supported());
static REPORTED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
if !REPORTED.swap(true, std::sync::atomic::Ordering::Relaxed) {
log::info!("Mobile controller drag input: touchscreen={supported}");
}
if !supported { self.offer_touch_consent(); }
touch.down = supported && self.inject_touch(0,x,y) == 0;
touch.down
}
/// Gesture mode (portal only, for its smooth scroll): a press waits for `finger_motion`/`finger_held`
/// to decide; releasing an undecided press is a click.
fn gesture_button(&self, touch: &mut TouchDrag, pressed: bool) -> bool {
if !pressed {
return match std::mem::take(&mut touch.finger) {
Finger::Up => false,
Finger::Pending { start, .. } => {
self.inject_move(start.0,start.1,false);
if self.inject_button(1,true) == 0 { self.inject_button(1,false); }
true
},
finger => { touch.finger = finger; self.lift_finger(touch); true },
};
}
if touch.finger != Finger::Up { return true }
// Gesture scrolling is portal-only; on the privacy screen's virtual share drags stay mouse drags.
let bound = self.backend == crate::desktop_backend::DesktopBackend::Portal && self.portal.lock().unwrap().is_some() && !self.virtual_uinput();
let Some(start) = touch.at.filter(|_| bound) else { return false };
static REPORTED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
if !REPORTED.swap(true, std::sync::atomic::Ordering::Relaxed) { log::info!("Mobile controller drag input: gesture (drag scrolls, hold selects)"); }
touch.finger = Finger::Pending { start, at: std::time::Instant::now() };
true
}
/// Content follows the finger: moving it up scrolls down.
fn inject_scroll(&self, from: (i32,i32), to: (i32,i32), finish: bool) -> i32 {
let Some(portal) = self.portal.lock().unwrap().clone() else { return -1 };
self.portal_result("scroll", portal.scroll(f64::from(from.0 - to.0), f64::from(from.1 - to.1), finish))
}
/// The portal offers a touchscreen the restored consent lacks: ask the host once per run, in the
/// background (GNOME's share dialog, visible to the phone too); drags stay mouse drags meanwhile.
fn offer_touch_consent(&self) {
static ASKED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
let Some(portal) = self.portal.lock().unwrap().clone() else { return };
if ASKED.swap(true, std::sync::atomic::Ordering::Relaxed) { return }
std::thread::spawn(move || match portal.upgrade_touch() {
Ok(true) => log::info!("Touch consent upgraded: mobile drags are touch from now on"),
Ok(false) => log::info!("Touch consent upgrade not needed or not offered by the portal"),
Err(reason) => log::info!("Touch consent upgrade not granted: {reason}"),
});
}
fn inject_touch(&self, phase: i32, x: i32, y: i32) -> i32 {
let Some(portal) = self.portal.lock().unwrap().clone() else { return -1 };
self.portal_result("touch", portal.touch(phase, f64::from(x), f64::from(y)))
} }
fn terminal_focused(&self) -> bool { fn terminal_focused(&self) -> bool {
@@ -269,6 +447,7 @@ impl InputInjector {
pub fn release_held(&self) { pub fn release_held(&self) {
let _serial=self.serial.lock().unwrap(); let _serial=self.serial.lock().unwrap();
self.discard_pointer(); self.discard_pointer();
{ let mut touch=self.touch.lock().unwrap(); self.lift_finger(&mut touch); }
let mut held=self.held.lock().unwrap(); let mut held=self.held.lock().unwrap();
if let Some(uinput)=&self.uinput { if let Some(uinput)=&self.uinput {
Self::uinput_result(uinput.release_all()); Self::uinput_result(uinput.release_all());
@@ -325,6 +504,21 @@ impl InputInjector {
} }
} }
fn inject_move(&self,x:i32,y:i32,relative:bool)->i32 { fn inject_move(&self,x:i32,y:i32,relative:bool)->i32 {
if self.uinput_pointer && self.backend != crate::desktop_backend::DesktopBackend::X11 {
if let Some(uinput) = &self.uinput {
if relative { return Self::uinput_result(uinput.move_relative(x,y)); }
let (w,h) = *self.screen.lock().unwrap();
if w > 1 && h > 1 {
let (ax, ay) = self.privacy_absolute(x, y, (w, h)).unwrap_or_else(|| {
let scale = |v: i32, extent: u32| (i64::from(v).clamp(0, i64::from(extent - 1))
* i64::from(crate::uinput::ABS_MAX) / i64::from(extent - 1)) as i32;
(scale(x, w), scale(y, h))
});
return Self::uinput_result(uinput.move_absolute(ax, ay));
}
return -1;
}
}
// uinput ABS axes span the compositor's whole desktop. A captured output // uinput ABS axes span the compositor's whole desktop. A captured output
// uses its own pixel space; bind absolute motion to that Wayland output, // uses its own pixel space; bind absolute motion to that Wayland output,
// including when uinput remains in use for keyboard/buttons/relative input. // including when uinput remains in use for keyboard/buttons/relative input.
@@ -337,7 +531,12 @@ impl InputInjector {
// Portal (GNOME/KDE): absolute motion is addressed to the shared stream, i.e. the captured // Portal (GNOME/KDE): absolute motion is addressed to the shared stream, i.e. the captured
// monitor; a uinput tablet would stretch the point across every monitor of the desktop. // monitor; a uinput tablet would stretch the point across every monitor of the desktop.
if !relative && self.backend==crate::desktop_backend::DesktopBackend::Portal { if !relative && self.backend==crate::desktop_backend::DesktopBackend::Portal {
if let Some(portal)=self.portal.lock().unwrap().as_ref() { return self.portal_result("motion", portal.move_pointer(f64::from(x),f64::from(y),false)); } // Privacy screen: KDE accepts absolute motion for a virtual-output stream but does not
// move the pointer. The physical outputs are disabled then, so the uinput tablet's
// desktop-wide axes cover exactly the virtual output.
if !self.virtual_uinput() {
if let Some(portal)=self.portal.lock().unwrap().as_ref() { return self.portal_result("motion", portal.move_pointer(f64::from(x),f64::from(y),false)); }
}
} }
// X11 multi-screen: the point is inside the selected monitor; XTest and uinput span the root. // X11 multi-screen: the point is inside the selected monitor; XTest and uinput span the root.
let placement=if relative || self.backend!=crate::desktop_backend::DesktopBackend::X11 {None} else {crate::wayland::x11_placement()}; let placement=if relative || self.backend!=crate::desktop_backend::DesktopBackend::X11 {None} else {crate::wayland::x11_placement()};
@@ -347,6 +546,7 @@ impl InputInjector {
let (w,h)=placement.and_then(|_|crate::capture::x11_last_size()).unwrap_or(*self.screen.lock().unwrap()); let (w,h)=placement.and_then(|_|crate::capture::x11_last_size()).unwrap_or(*self.screen.lock().unwrap());
if w > 1 && h > 1 { if w > 1 && h > 1 {
let scale = |v: i32, extent: u32| (i64::from(v) * i64::from(crate::uinput::ABS_MAX) / i64::from(extent - 1)) as i32; let scale = |v: i32, extent: u32| (i64::from(v) * i64::from(crate::uinput::ABS_MAX) / i64::from(extent - 1)) as i32;
if let Some((ax, ay)) = self.privacy_absolute(x, y, (w, h)) { return Self::uinput_result(uinput.move_absolute(ax, ay)); }
return Self::uinput_result(uinput.move_absolute(scale(x,w),scale(y,h))); return Self::uinput_result(uinput.move_absolute(scale(x,w),scale(y,h)));
} }
} }
@@ -356,10 +556,23 @@ impl InputInjector {
if self.backend==crate::desktop_backend::DesktopBackend::Wayland { crate::wayland::move_pointer(x,y,relative) } if self.backend==crate::desktop_backend::DesktopBackend::Wayland { crate::wayland::move_pointer(x,y,relative) }
else if relative { unsafe { x11_mouse_relative(x,y) } } else { unsafe { x11_mouse_move(x,y) } } else if relative { unsafe { x11_mouse_relative(x,y) } } else { unsafe { x11_mouse_move(x,y) } }
} }
/// Privacy picture mode keeps the physical outputs on, so uinput's axes span them too: aim the
/// stream point inside the virtual output's region of the layout.
fn privacy_absolute(&self, x: i32, y: i32, (w, h): (u32, u32)) -> Option<(i32, i32)> {
let [rx, ry, rw, rh] = crate::privacy_screen::pointer_region().filter(|_| self.virtual_uinput())?;
let abs = |v: i32, extent: u32, o: f64, span: f64| ((o + f64::from(v.clamp(0, extent as i32 - 1)) / f64::from(extent - 1) * span)
* f64::from(crate::uinput::ABS_MAX)).round() as i32;
Some((abs(x, w, rx, rw), abs(y, h, ry, rh)))
}
/// Privacy screen: KDE ignores portal pointer events (motion and buttons) on a virtual-output
/// share, so the pointer uses uinput, whose axes then span just the virtual output.
fn virtual_uinput(&self)->bool {
self.uinput.is_some() && self.portal.lock().unwrap().as_ref().is_some_and(|p| p.is_virtual())
}
fn inject_button(&self,button:i32,pressed:bool)->i32 { fn inject_button(&self,button:i32,pressed:bool)->i32 {
// Portal: clicks follow absolute motion on the same session, so a tap cannot land // Portal: clicks follow absolute motion on the same session, so a tap cannot land
// before the compositor has moved the pointer there (uinput is a separate queue). // before the compositor has moved the pointer there (uinput is a separate queue).
if self.backend==crate::desktop_backend::DesktopBackend::Portal { if !self.uinput_pointer && self.backend==crate::desktop_backend::DesktopBackend::Portal && !self.virtual_uinput() {
if let Some(portal)=self.portal.lock().unwrap().as_ref() { return self.portal_result("button", portal.button(button,pressed)); } if let Some(portal)=self.portal.lock().unwrap().as_ref() { return self.portal_result("button", portal.button(button,pressed)); }
} }
if let Some(uinput)=&self.uinput { if let Some(uinput)=&self.uinput {
@@ -466,11 +679,60 @@ impl InputInjector {
true true
} }
/// Mobile input-method text (`text_input`). X11 types it directly; Wayland re-maps a spare fn emit_uinput_text(&self, plan: &[crate::uinput::TextKey]) -> usize {
let Some(devices) = self.uinput.as_ref() else { return 0 };
let (mut typed, mut shift) = (0, 0);
for key in plan {
if key.code == 0 || key.code > 248 || key.shift > 248 { break; }
if shift != key.shift {
if shift != 0 {
if Self::uinput_result(devices.key(shift, false)) != 0 { break; }
shift = 0;
}
if key.shift != 0 {
if Self::uinput_result(devices.key(key.shift, true)) != 0 { break; }
shift = key.shift;
}
}
let pressed = Self::uinput_result(devices.key(key.code, true)) == 0;
let released = Self::uinput_result(devices.key(key.code, false)) == 0;
if pressed { typed += 1; }
if !pressed || !released { break; }
}
if shift != 0 { Self::uinput_result(devices.key(shift, false)); }
typed
}
fn type_uinput_text(&self, text: &str) -> usize {
self.type_uinput_text_when(text, || {
uinput_layout_types_ascii(&std::env::var("XDG_CURRENT_DESKTOP").unwrap_or_default(), gnome_layout_types_ascii)
})
}
fn type_uinput_text_when(&self, text: &str, layout_allowed: impl FnOnce() -> bool) -> usize {
if self.uinput.is_none() || !self.held.lock().unwrap().keys.is_empty() { return 0; }
// XKB can still report US while IBus consumes physical keys for composition.
// Leave committed text intact for the existing native/clipboard fallback.
if !layout_allowed() { return 0; }
self.emit_uinput_text(&crate::uinput::text_plan(text))
}
/// Mobile input-method text (`text_input`). uinput types the layout-mappable ASCII prefix
/// without clipboard access. X11 types directly; native Wayland re-maps a spare
/// keycode in the virtual keyboard's keymap. Portal and other Wayland environments inject /// keycode in the virtual keyboard's keymap. Portal and other Wayland environments inject
/// via clipboard paste (Shift+Insert). Set UU_WAYLAND_TEXT=0 to disable Wayland text injection. /// via clipboard paste (Shift+Insert). Set UU_WAYLAND_TEXT=0 to disable Wayland text injection.
pub fn text_input(&self, text: &str) { pub fn text_input(&self, text: &str) {
let _serial=self.serial.lock().unwrap(); let _serial=self.serial.lock().unwrap();
if self.backend != crate::desktop_backend::DesktopBackend::X11 {
if std::env::var("UU_WAYLAND_TEXT").is_ok_and(|v| v == "0") { return; }
let typed = self.type_uinput_text(text);
if typed > 0 { log::info!("Desktop text input (uinput): chars={typed}"); }
if typed == text.len() { return; }
// The uinput planner consumes ASCII only, so the character count is also a byte offset.
let rest = &text[typed..];
return self.desktop_text_input(rest);
}
self.desktop_text_input(text);
}
fn desktop_text_input(&self, text: &str) {
let Ok(c_text)=std::ffi::CString::new(text.replace('\0',"")) else { return }; let Ok(c_text)=std::ffi::CString::new(text.replace('\0',"")) else { return };
if self.backend==crate::desktop_backend::DesktopBackend::X11 { if self.backend==crate::desktop_backend::DesktopBackend::X11 {
let typed=unsafe { x11_type_utf8(c_text.as_ptr()) }; let typed=unsafe { x11_type_utf8(c_text.as_ptr()) };
@@ -494,8 +756,16 @@ impl InputInjector {
} }
} else if self.backend==crate::desktop_backend::DesktopBackend::Portal { } else if self.backend==crate::desktop_backend::DesktopBackend::Portal {
if std::env::var("UU_WAYLAND_TEXT").is_ok_and(|v|v=="0") { return; } if std::env::var("UU_WAYLAND_TEXT").is_ok_and(|v|v=="0") { return; }
if self.paste_text_via_clipboard(text) { // Shift+Insert pastes the PRIMARY selection in VTE terminals, not the clipboard just set:
log::info!("Desktop text input (Portal clipboard paste): chars={} result=ok", text.chars().count()); // type what the active layout has as keys and paste only the rest.
let typed=self.type_portal_keysyms(text);
if typed==text.chars().count() {
log::info!("Desktop text input (Portal keysyms): chars={typed}");
return;
}
let rest:String=text.chars().skip(typed).collect();
if self.paste_text_via_clipboard(&rest) {
log::info!("Desktop text input (Portal clipboard paste): chars={} typed={typed} result=ok", text.chars().count());
return; return;
} }
static WARNED:std::sync::atomic::AtomicBool=std::sync::atomic::AtomicBool::new(false); static WARNED:std::sync::atomic::AtomicBool=std::sync::atomic::AtomicBool::new(false);
@@ -509,6 +779,32 @@ impl InputInjector {
} }
} }
} }
/// Types `text` as portal keysyms when it is all printable ASCII (or newline/tab) and GNOME's
/// active input source is a Latin xkb layout; returns how many characters were typed.
fn type_portal_keysyms(&self, text: &str) -> usize {
let Some(symbols)=ascii_keysyms(text) else { return 0 };
if !gnome_layout_types_ascii() { return 0; }
if self.virtual_uinput() { return self.type_uinput_ascii(&symbols); }
let Some(portal)=self.portal.lock().unwrap().clone() else { return 0 };
symbols.iter().take_while(|&&symbol| portal.type_keysym(symbol).is_ok()).count()
}
/// Privacy screen: KDE ignores portal keysyms on a virtual-output share. Type through uinput
/// on the US layout the keysym path already requires, adding Shift for shifted characters.
fn type_uinput_ascii(&self, symbols: &[u32]) -> usize {
const SHIFTED: &str = "~!@#$%^&*()_+{}|:\"<>?";
const BASE: &str = "`1234567890-=[]\\;',./";
symbols.iter().take_while(|&&symbol| {
let c=char::from_u32(symbol).unwrap_or('\0');
let (base, shift)=if c.is_ascii_uppercase() { (c.to_ascii_lowercase() as u64, true) }
else if let Some(i)=SHIFTED.find(c) { (BASE.as_bytes()[i] as u64, true) }
else { (u64::from(symbol), false) };
if crate::uinput::keysym_to_evdev(base).is_none() { return false; }
if shift && self.inject_key(0xffe1, true)!=0 { return false; }
let ok=self.inject_key(base, true)==0 && self.inject_key(base, false)==0;
if shift { self.inject_key(0xffe1, false); }
ok
}).count()
}
pub fn key_event(&self, keycode: i32, is_press: bool) { pub fn key_event(&self, keycode: i32, is_press: bool) {
let _serial=self.serial.lock().unwrap(); let _serial=self.serial.lock().unwrap();
if self.backend!=crate::desktop_backend::DesktopBackend::X11 { return; } if self.backend!=crate::desktop_backend::DesktopBackend::X11 { return; }
@@ -547,6 +843,149 @@ mod motion_tests {
} }
} }
#[cfg(all(test, target_os = "linux"))]
mod kernel_pointer_tests {
use super::*;
#[test]
fn committed_text_with_gnome_ime_emits_no_uinput_keys() {
for source in ["[('ibus', 'libpinyin'), ('xkb', 'us')]", "@a(ss) []"] {
let (devices, mut keyboard, _) = crate::uinput::Devices::recording_for_test();
let mut input = InputInjector::without_desktop(); input.uinput = Some(devices);
let checked = std::cell::Cell::new(false);
let text = "fixture";
let typed = input.type_uinput_text_when(text, || {
checked.set(true);
uinput_layout_types_ascii("GNOME", || first_source_types_ascii(source))
});
assert!(checked.get());
assert_eq!(typed, 0);
assert!(crate::uinput::Devices::recorded_events_for_test(&mut keyboard).is_empty());
}
}
#[test]
fn text_plan_emits_balanced_modifiers_without_portal_or_clipboard() {
let (devices, mut keyboard, _) = crate::uinput::Devices::recording_for_test();
let mut input = InputInjector::without_desktop(); input.uinput = Some(devices);
let plan = [
crate::uinput::TextKey { code:30, shift:42 },
crate::uinput::TextKey { code:48, shift:42 },
crate::uinput::TextKey { code:2, shift:0 },
];
assert_eq!(input.emit_uinput_text(&plan), 3);
let keys: Vec<_> = crate::uinput::Devices::recorded_events_for_test(&mut keyboard).into_iter()
.filter(|event| event.0 == 1).collect();
assert_eq!(keys, [(1,42,1),(1,30,1),(1,30,0),(1,48,1),(1,48,0),(1,42,0),(1,2,1),(1,2,0)]);
assert_eq!(input.portal_input_counts_for_test(), [0; 3]);
}
#[test]
fn partial_text_plan_releases_shift_and_does_not_disturb_held_keys() {
let (devices, mut keyboard, _) = crate::uinput::Devices::recording_for_test();
let mut input = InputInjector::without_desktop(); input.uinput = Some(devices);
assert_eq!(input.emit_uinput_text(&[
crate::uinput::TextKey { code:30, shift:42 },
crate::uinput::TextKey { code:0, shift:0 },
]), 1);
let keys: Vec<_> = crate::uinput::Devices::recorded_events_for_test(&mut keyboard).into_iter()
.filter(|event| event.0 == 1).collect();
assert_eq!(keys, [(1,42,1),(1,30,1),(1,30,0),(1,42,0)]);
input.held.lock().unwrap().keys.insert(0xffe3);
assert_eq!(input.type_uinput_text("fixture"), 0);
assert_eq!(input.held.lock().unwrap().keys.len(), 1);
}
#[test]
#[ignore = "requires the current X11/XWayland layout; records events without desktop injection"]
fn committed_ascii_text_bypasses_portal_with_live_keymap() {
let fixture = "aAzZ09!@#$%^&*()_+-=[]{};:'\",.<>/?\\|`~\t\n";
assert_eq!(crate::uinput::text_plan(fixture).len(), fixture.len(), "fixture not available in idle host keymap");
let (devices, mut keyboard, _) = crate::uinput::Devices::recording_for_test();
let mut input = InputInjector::without_desktop(); input.uinput = Some(devices);
let input = std::sync::Arc::new(input);
let binding = input.portal.lock().unwrap();
let worker_input = input.clone();
let (done, received) = std::sync::mpsc::channel();
let worker = std::thread::spawn(move || { worker_input.text_input(fixture); let _ = done.send(()); });
// On failure panic with the binding held: poisoning prevents a fallback from touching the clipboard.
assert!(received.recv_timeout(std::time::Duration::from_secs(2)).is_ok(), "text path waited for Portal/clipboard");
drop(binding);
worker.join().unwrap();
let keys = crate::uinput::Devices::recorded_events_for_test(&mut keyboard);
let down = keys.iter().filter(|e| e.0 == 1 && e.2 == 1).count();
let up = keys.iter().filter(|e| e.0 == 1 && e.2 == 0).count();
assert!(down >= fixture.len());
assert_eq!(down, up);
assert_eq!(input.portal_input_counts_for_test(), [0; 3]);
}
#[test]
fn full_uinput_bypasses_portal_binding_and_preserves_move_click_order() {
for controller in [Controller::Other, Controller::Mobile] {
let (devices, mut keyboard, mut pointer) = crate::uinput::Devices::recording_for_test();
let mut input = InputInjector::without_desktop();
input.uinput = Some(devices);
input.uinput_pointer = true;
let input = std::sync::Arc::new(input);
// A blocked Portal must not stall any kernel-routed input. The recording
// files exercise the real event writer without typing or clicking on the desktop.
let binding = input.portal.lock().unwrap();
let worker_input = input.clone();
let (done, received) = std::sync::mpsc::channel();
let worker = std::thread::spawn(move || {
worker_input.set_controller(controller);
assert_eq!(worker_input.touch.lock().unwrap().mode, TouchMode::Mouse);
worker_input.windows_key_event(65, true);
worker_input.windows_key_event(65, false);
worker_input.mouse_absolute_normalized(1.0, 0.0, (3072, 1920));
worker_input.wire_mouse_button(1, true);
worker_input.wire_mouse_button(1, false);
worker_input.mouse_scroll(120, 240);
worker_input.flush_pointer();
let _ = done.send(());
});
let completed = received.recv_timeout(std::time::Duration::from_secs(1));
drop(binding);
worker.join().unwrap();
assert!(completed.is_ok(), "kernel input waited for a Portal binding");
assert_eq!(input.portal_input_counts_for_test(), [0; 3]);
let keys = crate::uinput::Devices::recorded_events_for_test(&mut keyboard);
assert_eq!(keys, [(1, 30, 1), (0, 0, 0), (1, 30, 0), (0, 0, 0)]);
let mouse = crate::uinput::Devices::recorded_events_for_test(&mut pointer);
assert_eq!(&mouse[..7], &[
(3, 0, 65535), (3, 1, 0), (0, 0, 0),
(1, 0x110, 1), (0, 0, 0), (1, 0x110, 0), (0, 0, 0),
]);
assert_eq!(mouse.iter().filter(|e| e.0 == 2 && e.1 == 8).map(|e| e.2).sum::<i32>(), 2);
assert_eq!(mouse.iter().filter(|e| e.0 == 2 && e.1 == 6).map(|e| e.2).sum::<i32>(), 1);
}
}
#[test]
fn full_uinput_clamps_coordinates_and_keeps_relative_motion_on_kernel() {
let (devices, mut keyboard, mut pointer) = crate::uinput::Devices::recording_for_test();
let mut input = InputInjector::without_desktop();
input.uinput = Some(devices); input.uinput_pointer = true;
*input.screen.lock().unwrap() = (3072, 1920);
assert_eq!(input.inject_move(-5, 4000, false), 0);
assert_eq!(crate::uinput::Devices::recorded_events_for_test(&mut pointer),
[(3, 0, 0), (3, 1, 65535), (0, 0, 0)]);
assert_eq!(input.inject_move(4, -3, true), 0);
assert_eq!(crate::uinput::Devices::recorded_events_for_test(&mut keyboard),
[(2, 0, 4), (2, 1, -3), (0, 0, 0)]);
assert_eq!(input.portal_input_counts_for_test(), [0; 3]);
}
#[test]
fn kde_output_count_ignores_disabled_and_disconnected_outputs() {
assert_eq!(active_output_count(br#"{"outputs":[{"enabled":true,"connected":true},{"enabled":false,"connected":true}]}"#), Some(1));
assert_eq!(active_output_count(br#"{"outputs":[{"enabled":true,"connected":true},{"enabled":true,"connected":true}]}"#), Some(2));
assert_eq!(active_output_count(br#"{"outputs":[{"enabled":true,"connected":false}]}"#), Some(0));
assert_eq!(active_output_count(br#"{}"#), None);
assert_eq!(active_output_count(b"invalid"), None);
}
}
#[cfg(test)] #[cfg(test)]
mod shortcut_tests { mod shortcut_tests {
use super::*; use super::*;
@@ -638,14 +1077,131 @@ impl Drop for DesktopInputSession {fn drop(&mut self) {self.disconnected();}}
#[cfg(test)] #[cfg(test)]
impl InputInjector { impl InputInjector {
pub fn portal_input_counts_for_test(&self) -> [usize; 3] {
std::array::from_fn(|i| self.portal_outcomes[i].load(std::sync::atomic::Ordering::Relaxed))
}
pub fn without_desktop() -> Self { pub fn without_desktop() -> Self {
Self { mac_controller:std::sync::atomic::AtomicBool::new(false), Self { mac_controller:std::sync::atomic::AtomicBool::new(false),
cmd:std::sync::Mutex::new(CmdState::default()), serial:std::sync::Mutex::new(()), 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()), owner:std::sync::Mutex::new(DesktopOwner::default()), shortcuts:std::sync::Mutex::new(Shortcuts::default()),
uinput:None, screen:std::sync::Mutex::new((0,0)), portal_failures:std::sync::atomic::AtomicUsize::new(0), uinput:None, uinput_pointer:false, 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_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()) }
}
}
/// Keysyms for mobile IME text: printable ASCII is its own keysym, newline is Return, tab is Tab.
fn ascii_keysyms(text: &str) -> Option<Vec<u32>> {
text.chars().map(|c| match c { '\n' => Some(0xff0d), '\t' => Some(0xff09), ' '..='~' => Some(c as u32), _ => None }).collect()
}
/// Whether an `org.gnome.desktop.input-sources` source list starts with an xkb layout that has
/// printable ASCII in its first group. Mutter drops keysyms the active layout lacks, and an IBus
/// engine (pinyin, ...) would compose the keys instead.
fn first_source_types_ascii(sources: &str) -> bool {
let Some(start)=sources.find('(') else { return false };
let Some(end)=sources[start..].find(')') else { return false };
let fields:Vec<&str>=sources[start+1..start+end].split(',').map(|f| f.trim().trim_matches('\'')).collect();
let [kind, layout]=fields[..] else { return false };
let (base, variant)=layout.split_once('+').unwrap_or((layout, ""));
const NON_LATIN: &[&str]=&["af","am","ara","bd","bg","bt","by","eg","et","ge","gr","il","in","iq","ir","kg","kh","kz","la","lk","mk","mm","mn","mv","np","ru","sy","th","tj","ua"];
kind=="xkb" && !NON_LATIN.contains(&base) && !variant.contains("cyrillic") && (base!="rs" || variant.contains("latin"))
}
fn uinput_layout_types_ascii(desktop: &str, gnome_layout: impl FnOnce() -> bool) -> bool {
!desktop.split(':').any(|name| name.eq_ignore_ascii_case("gnome")) || gnome_layout()
}
/// GNOME's active input source is the first of `mru-sources` (else of `sources`). Cached for 2 s.
fn gnome_layout_types_ascii() -> bool {
#[cfg(test)]
{ false }
#[cfg(not(test))]
{
static CACHE: std::sync::Mutex<Option<(std::time::Instant,bool)>> = std::sync::Mutex::new(None);
let mut cache=CACHE.lock().unwrap();
if let Some((at,value))=*cache { if at.elapsed()<std::time::Duration::from_secs(2) { return value; } }
let read=|key: &str| std::process::Command::new("gsettings").args(["get","org.gnome.desktop.input-sources",key])
.stderr(std::process::Stdio::null()).output().ok().filter(|o| o.status.success())
.map(|o| String::from_utf8_lossy(&o.stdout).into_owned()).filter(|s| s.contains('('));
let value=read("mru-sources").or_else(|| read("sources")).is_some_and(|s| first_source_types_ascii(&s));
*cache=Some((std::time::Instant::now(),value));
value
}
}
#[cfg(test)]
mod text_keysym_tests {
use super::*;
#[test]
fn uinput_preserves_gnome_input_source_guard_without_gating_other_desktops() {
for desktop in ["GNOME", "ubuntu:GNOME", "gnome:GNOME-Classic"] {
assert!(!uinput_layout_types_ascii(desktop, || first_source_types_ascii("[('ibus', 'libpinyin'), ('xkb', 'us')]")));
assert!(!uinput_layout_types_ascii(desktop, || false));
assert!(uinput_layout_types_ascii(desktop, || first_source_types_ascii("[('xkb', 'us'), ('ibus', 'libpinyin')]")));
}
for desktop in ["KDE", "Hyprland", ""] {
assert!(uinput_layout_types_ascii(desktop, || panic!("GNOME input-source state must not gate another desktop")));
}
}
#[test]
fn ascii_text_becomes_keysyms_and_other_text_does_not() {
assert_eq!(ascii_keysyms("Hi!\n\t~"), Some(vec![0x48,0x69,0x21,0xff0d,0xff09,0x7e]));
assert_eq!(ascii_keysyms("čaj"), None);
assert_eq!(ascii_keysyms("测试"), None);
}
#[test]
fn only_latin_xkb_layouts_type_ascii() {
assert!(first_source_types_ascii("[('xkb', 'us'), ('ibus', 'libpinyin'), ('xkb', 'rs+latin')]"));
assert!(first_source_types_ascii("[('xkb', 'rs+latin')]"));
assert!(first_source_types_ascii("[('xkb', 'de+nodeadkeys')]"));
assert!(!first_source_types_ascii("[('ibus', 'libpinyin'), ('xkb', 'us')]"));
assert!(!first_source_types_ascii("[('xkb', 'rs')]"));
assert!(!first_source_types_ascii("[('xkb', 'ru')]"));
assert!(first_source_types_ascii("[('xkb', 'ba+unicodeus')]"));
assert!(!first_source_types_ascii("[('xkb', 'me+cyrillic')]"));
assert!(!first_source_types_ascii("@a(ss) []"));
}
}
#[cfg(test)]
mod touch_tests {
use super::*;
#[test]
fn controller_from_platform_numbers_and_mac_strings() {
use serde_json::json;
assert_eq!(Controller::from_platform(Some(&json!(2))), Controller::Mobile);
assert_eq!(Controller::from_platform(Some(&json!("3"))), Controller::Mobile);
assert_eq!(Controller::from_platform(Some(&json!(4))), Controller::Mac);
assert_eq!(Controller::from_platform(Some(&json!("MacOS"))), Controller::Mac);
assert_eq!(Controller::from_platform(Some(&json!(1))), Controller::Other);
assert_eq!(Controller::from_platform(None), Controller::Other);
}
#[test]
fn a_press_scrolls_past_the_slop_and_selects_when_held() {
let t0=std::time::Instant::now();
let pending=Finger::Pending{start:(100,100),at:t0};
// Small wander stays undecided; past SLOP the content follows the finger from the start.
assert_eq!(finger_motion(pending,(105,110)),(pending,FingerStep::Stay));
assert_eq!(finger_motion(pending,(100,100+SLOP+1)),(Finger::Scroll{last:(100,113)},FingerStep::Scroll((100,100),(100,113))));
assert_eq!(finger_motion(Finger::Scroll{last:(100,113)},(100,90)),(Finger::Scroll{last:(100,90)},FingerStep::Scroll((100,113),(100,90))));
assert_eq!(finger_motion(Finger::Select,(7,8)),(Finger::Select,FingerStep::Move(7,8)));
assert_eq!(finger_motion(Finger::Up,(7,8)),(Finger::Up,FingerStep::Move(7,8)));
assert_eq!(finger_held(pending,t0+HOLD-std::time::Duration::from_millis(1)),None);
assert_eq!(finger_held(pending,t0+HOLD),Some((100,100)));
assert_eq!(finger_held(Finger::Scroll{last:(1,1)},t0+HOLD*4),None);
}
#[test]
fn mobile_drag_without_touchscreen_stays_a_mouse_button() {
let input=InputInjector::without_desktop();
input.set_controller(Controller::Mobile);
input.mouse_absolute_normalized(0.5,0.5,(100,100)); input.flush_pointer();
assert!(input.touch.lock().unwrap().at.is_some());
assert!(!input.touch_button(true) && !input.touch.lock().unwrap().down);
assert!(!input.touch_button(false));
input.mouse_relative(1,1); input.flush_pointer();
assert!(input.touch.lock().unwrap().at.is_none());
input.set_controller(Controller::Other);
assert_eq!(input.touch.lock().unwrap().mode,TouchMode::Mouse);
} }
} }
+8
View File
@@ -5,6 +5,14 @@ use webrtc::{media::Sample, peer_connection::{RTCPeerConnection, peer_connection
use crate::{capture_setting::VideoCodec, desktop_session::PortalDesktop, video_track::VideoTrack}; use crate::{capture_setting::VideoCodec, desktop_session::PortalDesktop, video_track::VideoTrack};
async fn black_frame(codec: VideoCodec) -> Result<Bytes, String> { async fn black_frame(codec: VideoCodec) -> Result<Bytes, String> {
#[cfg(feature = "inproc-av")]
if crate::video::native_engine_eligible(crate::video_select::selection().encoder, crate::video::NativeDisplayKind::Portal) {
match tokio::task::spawn_blocking(move || crate::inproc_encoder::black_frame(codec)).await {
Ok(Ok(frame)) => return Ok(frame),
Ok(Err(error)) => log::warn!("Locked video in-process VAAPI unavailable: {error}; falling back to FFmpeg"),
Err(_) => log::warn!("Locked video in-process worker failed; falling back to FFmpeg"),
}
}
let mut command = crate::video::ffmpeg_command(); let mut command = crate::video::ffmpeg_command();
command.args(["-hide_banner", "-loglevel", "error", "-nostdin", command.args(["-hide_banner", "-loglevel", "error", "-nostdin",
"-f", "lavfi", "-i", "color=c=black:s=1280x720:r=1", "-frames:v", "1", "-f", "lavfi", "-i", "color=c=black:s=1280x720:r=1", "-frames:v", "1",
+34 -15
View File
@@ -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;
@@ -45,6 +46,7 @@ mod inproc_encoder;
mod capture_setting; mod capture_setting;
mod audio; mod audio;
mod virtual_audio; mod virtual_audio;
mod privacy_screen;
mod system_actions; mod system_actions;
mod capability; mod capability;
mod protocol; mod protocol;
@@ -208,7 +210,7 @@ pub(crate) fn cli_pref_ok(which: &str, value: &str) -> bool {
} }
} }
const SUBCOMMANDS: [&str; 17] = ["doctor", "show", "assist", "set-encoder", "set-codec", "desktop-input-probe", "virtual-audio-probe", "login", "unlock-check", "desktop-probe", "desktop-video-probe", "desktop-audio-probe", "wayland-capture", const SUBCOMMANDS: [&str; 20] = ["privacy-guard", "privacy-wallpaper", "privacy-screen-probe", "doctor", "show", "assist", "set-encoder", "set-codec", "desktop-input-probe", "virtual-audio-probe", "login", "unlock-check", "desktop-probe", "desktop-video-probe", "desktop-audio-probe", "wayland-capture",
"wayland-input-probe", "wayland-text-probe", "clipboard-acceptance", "portal-acceptance"]; "wayland-input-probe", "wayland-text-probe", "clipboard-acceptance", "portal-acceptance"];
/// Unknown arguments and illegal set-encoder / set-codec values exit 2 (never start a second host). /// Unknown arguments and illegal set-encoder / set-codec values exit 2 (never start a second host).
@@ -630,6 +632,20 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
if login::run(gui).await.is_err() { std::process::exit(1); } // error already shown if login::run(gui).await.is_err() { std::process::exit(1); } // error already shown
return Ok(()); return Ok(());
} }
if std::env::args().nth(1).as_deref() == Some("privacy-guard") { std::process::exit(privacy_screen::guard_main()); }
if std::env::args().nth(1).as_deref() == Some("privacy-wallpaper") {
std::process::exit(privacy_screen::cover_main(&std::env::args().skip(2).collect::<Vec<_>>()));
}
if std::env::args().nth(1).as_deref() == Some("privacy-screen-probe") {
let screen = ScreenCapture::new()?;
if screen.portal.is_none() { return Err(std::io::Error::other("privacy screen needs the portal backend").into()); }
let _input = input::InputInjector::new(); // the privacy screen requires its uinput devices
let mode = if std::env::var("UU_PRIVACY_PROBE_WALLPAPER").as_deref() == Ok("1") { privacy_screen::Mode::Picture } else { privacy_screen::Mode::ScreenOff };
tokio::task::spawn_blocking(move || privacy_screen::probe(mode)).await?.map_err(std::io::Error::other)?;
drop(screen);
return Ok(());
}
privacy_screen::recover();
virtual_audio::init(); virtual_audio::init();
let _audio_cleanup=virtual_audio::Cleanup; let _audio_cleanup=virtual_audio::Cleanup;
log::info!("Starting uu-remote-linux host v{}...", env!("CARGO_PKG_VERSION")); log::info!("Starting uu-remote-linux host v{}...", env!("CARGO_PKG_VERSION"));
@@ -668,7 +684,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
} }
#[cfg(not(target_os="linux"))] #[cfg(not(target_os="linux"))]
let _ = tokio::signal::ctrl_c().await; let _ = tokio::signal::ctrl_c().await;
if !assist_enabled { shutdown_input.shutdown(); virtual_audio::disable(); terminal::shutdown_all(); std::process::exit(0); } if !assist_enabled { privacy_screen::shutdown(); shutdown_input.shutdown(); virtual_audio::disable(); terminal::shutdown_all(); std::process::exit(0); }
let _ = signal_tx.send(true); let _ = signal_tx.send(true);
}); });
let mut assist = if assist_enabled { Some(assist::Assist::start(&mut shutdown, unified).await?) } else { None }; let mut assist = if assist_enabled { Some(assist::Assist::start(&mut shutdown, unified).await?) } else { None };
@@ -699,7 +715,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
// One exit path for commands, signals, transport failures and UI failures. // One exit path for commands, signals, transport failures and UI failures.
if let Some(session) = assist.as_mut() { session.allowed = false; } if let Some(session) = assist.as_mut() { session.allowed = false; }
for (_, old) in webrtc_sessions.lock().await.drain() { close_peer(&old.pc).await; } for (_, old) in webrtc_sessions.lock().await.drain() { close_peer(&old.pc).await; }
virtual_audio::disable(); input.shutdown(); terminal::shutdown_all(); privacy_screen::shutdown(); virtual_audio::disable(); input.shutdown(); terminal::shutdown_all();
// Switching identity (signed in / out) restarts at once and the new identity republishes the same // Switching identity (signed in / out) restarts at once and the new identity republishes the same
// device share: logout already withdrew it, and after a QR login the cloud moved it to the account // device share: logout already withdrew it, and after a QR login the cloud moved it to the account
// (a guest cancel then fails). Only a real stop withdraws here. // (a guest cancel then fails). Only a real stop withdraws here.
@@ -760,11 +776,12 @@ 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();
let mut mac_by_ice: HashMap<String, bool> = HashMap::new(); let mut controller_by_ice: HashMap<String, crate::input::Controller> = HashMap::new();
let mut next_mac = false; let mut next_controller = crate::input::Controller::Other;
// Tool peers ask here to become the desktop (capture_desktop on an existing connection, #99). // Tool peers ask here to become the desktop (capture_desktop on an existing connection, #99).
let (desktop_requests, mut desktop_requested) = mpsc::unbounded_channel::<String>(); let (desktop_requests, mut desktop_requested) = mpsc::unbounded_channel::<String>();
@@ -797,6 +814,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) => {
@@ -836,8 +855,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;
} }
@@ -951,9 +970,9 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
.and_then(|s| s.as_str()) .and_then(|s| s.as_str())
); );
} }
SignalingEvent::ConnectRequest { capture_type, ice_id, transport, controller_mac } => { SignalingEvent::ConnectRequest { capture_type, ice_id, transport, controller } => {
if mac_by_ice.len()>=32 { mac_by_ice.clear(); } if controller_by_ice.len()>=32 { controller_by_ice.clear(); }
match ice_id.clone() { Some(id) => { mac_by_ice.insert(id, controller_mac); } None => next_mac = controller_mac } match ice_id.clone() { Some(id) => { controller_by_ice.insert(id, controller); } None => next_controller = controller }
// Pending cloud credentials live only within this room; cap // Pending cloud credentials live only within this room; cap
// requests that never receive an offer rather than retain them. // requests that never receive an offer rather than retain them.
if capture_types.len()>=32 { capture_types.clear(); } if capture_types.len()>=32 { capture_types.clear(); }
@@ -984,8 +1003,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
let (capture_type,transport) = capture_types.remove(&ice).or_else(|| next_capture_type.take()).unwrap_or((1,crate::session_ice::SessionIce::default())); let (capture_type,transport) = capture_types.remove(&ice).or_else(|| next_capture_type.take()).unwrap_or((1,crate::session_ice::SessionIce::default()));
// CaptureType: 0 unknown, 1 desktop, 2 window; 5 file transfer, 8 terminal, 9 port mapping. // CaptureType: 0 unknown, 1 desktop, 2 window; 5 file transfer, 8 terminal, 9 port mapping.
let desktop = capture_type <= 2; let desktop = capture_type <= 2;
let controller_mac = mac_by_ice.remove(&ice).unwrap_or(next_mac); let controller = controller_by_ice.remove(&ice).unwrap_or(next_controller);
if desktop { input.set_mac_controller(controller_mac); } if desktop { input.set_controller(controller); }
log::info!("Offer for connection: capture_type={} desktop={} active_peers={}", capture_type, desktop, sessions.len()); log::info!("Offer for connection: capture_type={} desktop={} active_peers={}", capture_type, desktop, sessions.len());
// An expired NVENC failure is re-probed in the background. This offer keeps the cached encoder. // An expired NVENC failure is re-probed in the background. This offer keeps the cached encoder.
if desktop { video::warm_auto_probe(); video::check_ffmpeg_usable(); } if desktop { video::warm_auto_probe(); video::check_ffmpeg_usable(); }
@@ -1017,7 +1036,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
match WebRtcSession::new(session_capture, input.clone(), signaling_client.clone(), desktop, transport, match WebRtcSession::new(session_capture, input.clone(), signaling_client.clone(), desktop, transport,
if desktop { portal_desktop.clone() } else { None }).await { if desktop { portal_desktop.clone() } else { None }).await {
Ok(mut sess) => { Ok(mut sess) => {
sess.controller_mac = controller_mac; sess.controller = controller;
if !desktop { if !desktop {
let (requests, peer) = (desktop_requests.clone(), ice.clone()); let (requests, peer) = (desktop_requests.clone(), ice.clone());
sess.on_desktop_request(move || { let _ = requests.send(peer.clone()); }); sess.on_desktop_request(move || { let _ = requests.send(peer.clone()); });
@@ -1084,7 +1103,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
log::info!("Desktop request on a tool connection not supported with the Portal backend; open the desktop before port mapping"); log::info!("Desktop request on a tool connection not supported with the Portal backend; open the desktop before port mapping");
continue; continue;
} }
let controller_mac = peer.controller_mac; let controller = peer.controller;
let current = peer.desktop_capture(); let current = peer.desktop_capture();
// Same recovery as a desktop offer: the display may have come up or been resized after this peer. // Same recovery as a desktop offer: the display may have come up or been resized after this peer.
let resized = current.init_error.is_none() && current.backend == desktop_backend::DesktopBackend::X11 let resized = current.init_error.is_none() && current.backend == desktop_backend::DesktopBackend::X11
@@ -1098,7 +1117,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
} }
} else { None }; } else { None };
video::warm_auto_probe(); video::check_ffmpeg_usable(); video::warm_auto_probe(); video::check_ffmpeg_usable();
input.set_mac_controller(controller_mac); input.set_controller(controller);
input.bind_portal(screen.as_ref().map_or_else(|| sessions[&ice].capture.portal.clone(), |screen| screen.portal.clone())); input.bind_portal(screen.as_ref().map_or_else(|| sessions[&ice].capture.portal.clone(), |screen| screen.portal.clone()));
// One desktop at a time, as for a new desktop offer. Peers offered as desktops // One desktop at a time, as for a new desktop offer. Peers offered as desktops
// close; a promoted tool peer only stops its desktop and keeps its tools. // close; a promoted tool peer only stops its desktop and keeps its tools.
+231 -35
View File
@@ -15,6 +15,20 @@ impl std::error::Error for PortalError {}
#[derive(Clone, Copy, PartialEq, Eq)] #[derive(Clone, Copy, PartialEq, Eq)]
pub struct FrameVersion(usize, u64); pub struct FrameVersion(usize, u64);
#[repr(C)]
#[derive(Default)]
pub struct DmaFrame {
pub fd: i32,
pub fourcc: u32,
pub width: u32,
pub height: u32,
pub stride: u32,
pub offset: u32,
pub size: u32,
pub modifier: u64,
}
pub enum DmaCapture<T> { Frame(T), Pending, Cpu, Blank, Unavailable(i32) }
#[cfg(unix)] #[cfg(unix)]
#[path = "portal_permissions.rs"] #[path = "portal_permissions.rs"]
mod permissions; mod permissions;
@@ -24,7 +38,9 @@ mod native {
use std::{ffi::c_void, ptr::NonNull, sync::{Mutex, MutexGuard, TryLockError}}; use std::{ffi::c_void, ptr::NonNull, sync::{Mutex, MutexGuard, TryLockError}};
crate::engine_ffi! { crate::engine_plugin::Engine::Portal; crate::engine_ffi! { crate::engine_plugin::Engine::Portal;
fn uu_portal_open_persist(restore: *const libc::c_char, save: extern "C" fn(*const libc::c_char, *mut c_void), data: *mut c_void, error: *mut i32, width: *mut u32, height: *mut u32) -> *mut c_void; fn uu_portal_open_persist(restore: *const libc::c_char, save: extern "C" fn(*const libc::c_char, *mut c_void), data: *mut c_void, error: *mut i32, width: *mut u32, height: *mut u32) -> *mut c_void;
fn uu_portal_open_virtual(restore: *const libc::c_char, save: extern "C" fn(*const libc::c_char, *mut c_void), data: *mut c_void, error: *mut i32, width: *mut u32, height: *mut u32) -> *mut c_void;
fn uu_portal_open_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_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;
@@ -35,9 +51,16 @@ mod native {
fn uu_portal_input_dispatch(portal: *mut c_void); fn uu_portal_input_dispatch(portal: *mut c_void);
fn uu_portal_reset_frame(portal: *mut c_void); fn uu_portal_reset_frame(portal: *mut c_void);
fn uu_portal_capture_since(portal: *mut c_void, bgra: *mut u8, length: usize, revision: *mut u64) -> i32; fn uu_portal_capture_since(portal: *mut c_void, bgra: *mut u8, length: usize, revision: *mut u64) -> i32;
fn uu_portal_dmabuf_acquire(portal: *mut c_void, frame: *mut super::DmaFrame, revision: *mut u64) -> i32;
fn uu_portal_dmabuf_release(portal: *mut c_void);
fn uu_portal_dmabuf_disable(portal: *mut c_void);
fn uu_portal_move(portal: *mut c_void, x: f64, y: f64, relative: i32) -> i32; fn uu_portal_move(portal: *mut c_void, x: f64, y: f64, relative: i32) -> i32;
fn uu_portal_button(portal: *mut c_void, button: i32, pressed: i32) -> i32; fn uu_portal_button(portal: *mut c_void, button: i32, pressed: i32) -> i32;
fn uu_portal_key(portal: *mut c_void, keysym: u32, keycode: i32, pressed: i32) -> i32; fn uu_portal_key(portal: *mut c_void, keysym: u32, keycode: i32, pressed: i32) -> i32;
fn uu_portal_scroll(portal: *mut c_void, dx: f64, dy: f64, finish: i32) -> i32;
fn uu_portal_touch_supported(portal: *mut c_void) -> i32;
fn uu_portal_touch_available(portal: *mut c_void) -> i32;
fn uu_portal_touch(portal: *mut c_void, phase: i32, x: f64, y: f64) -> i32;
fn uu_portal_stream_position(portal: *mut c_void, x: *mut i32, y: *mut i32) -> i32; fn uu_portal_stream_position(portal: *mut c_void, x: *mut i32, y: *mut i32) -> i32;
fn uu_portal_monitors(out: *mut libc::c_char, length: usize) -> i32; fn uu_portal_monitors(out: *mut libc::c_char, length: usize) -> i32;
fn uu_portal_end(portal: *mut c_void); fn uu_portal_end(portal: *mut c_void);
@@ -88,7 +111,7 @@ mod native {
was_locked.store(false, std::sync::atomic::Ordering::Release); was_locked.store(false, std::sync::atomic::Ordering::Release);
} }
} }
pub struct Session { handle: Mutex<Handle>, locked: tokio::sync::watch::Receiver<Option<bool>>, was_locked: std::sync::atomic::AtomicBool, recovery: Mutex<Recovery>, size: std::sync::atomic::AtomicU64, monitor: Mutex<Option<String>> } pub struct Session { handle: Mutex<Handle>, locked: tokio::sync::watch::Receiver<Option<bool>>, was_locked: std::sync::atomic::AtomicBool, recovery: Mutex<Recovery>, size: std::sync::atomic::AtomicU64, monitor: Mutex<Option<String>>, virtual_output: std::sync::atomic::AtomicBool }
impl Session { impl Session {
fn take_lock_observation(&self) -> Result<bool, String> { fn take_lock_observation(&self) -> Result<bool, String> {
// A recovery in progress must see the lock even if another capture // A recovery in progress must see the lock even if another capture
@@ -114,7 +137,9 @@ mod native {
} }
/// Opens a session for `monitor` (a Mutter connector) with that monitor's saved consent; /// Opens a session for `monitor` (a Mutter connector) with that monitor's saved consent;
/// None means the screen currently selected, or the only monitor. /// None means the screen currently selected, or the only monitor.
fn open_inner(cancelled: Option<&std::sync::atomic::AtomicBool>, monitor: Option<&str>) -> Result<Self, super::PortalError> { /// `fresh` asks the host again instead of restoring the saved consent (which stays saved).
/// `virtual_output` shares a KWin virtual output instead (privacy screen) with its own consent.
fn open_inner(cancelled: Option<&std::sync::atomic::AtomicBool>, monitor: Option<&str>, fresh: bool, virtual_output: bool) -> Result<Self, super::PortalError> {
extern "C" fn is_cancelled(data: *mut c_void) -> i32 { extern "C" fn is_cancelled(data: *mut c_void) -> i32 {
let cancelled = unsafe { &*(data as *const std::sync::atomic::AtomicBool) }; let cancelled = unsafe { &*(data as *const std::sync::atomic::AtomicBool) };
i32::from(cancelled.load(std::sync::atomic::Ordering::Acquire)) i32::from(cancelled.load(std::sync::atomic::Ordering::Acquire))
@@ -127,12 +152,20 @@ mod native {
let (mut error, mut width, mut height) = (0, 0, 0); let (mut error, mut width, mut height) = (0, 0, 0);
let directory = super::permissions::directory(); let directory = super::permissions::directory();
let key = super::permissions::desktop_key(); let key = super::permissions::desktop_key();
let wanted = 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 virtual_key = format!("{key}-virtual");
// 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
// consumed one and both failed, leaving no saved consent (seen live, KDE).
static OPENING: Mutex<()> = Mutex::new(());
let _opening = OPENING.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
// Each monitor has its own consent; the desktop-wide key is the single-monitor one. // Each monitor has its own consent; the desktop-wide key is the single-monitor one.
let token = directory.as_deref().and_then(|dir| { let taken = directory.as_deref().filter(|_| !fresh).and_then(|dir| {
wanted.as_deref().and_then(|name| super::permissions::take(dir, &super::permissions::monitor_key(name))) let take = |k: String| super::permissions::take(dir, &k).map(|v| (k, v));
.or_else(|| super::permissions::take(dir, key)) if virtual_output { return take(virtual_key.clone()); }
}).and_then(|value| std::ffi::CString::new(value).ok()); wanted.as_deref().and_then(|name| take(super::permissions::monitor_key(name))).or_else(|| take(key.to_owned()))
});
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). // The new token is saved once the granted monitor is known (after open).
let mut cache: Option<String> = None; let mut cache: Option<String> = None;
extern "C" fn save_token(token: *const libc::c_char, data: *mut c_void) { extern "C" fn save_token(token: *const libc::c_char, data: *mut c_void) {
@@ -144,8 +177,32 @@ mod native {
if result.is_err() { log::warn!("Portal permission cache callback failed"); } if result.is_err() { log::warn!("Portal permission cache callback failed"); }
} }
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());
let pointer = unsafe { // A failed open must not cost the saved consent: put the token back unless the
if let Some(cancelled) = cancelled { // portal handed out a new one. A stale token only makes the next open ask again.
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"); }
}
super::PortalError { code }
};
#[allow(unused_mut)]
let mut pointer: *mut c_void = std::ptr::null_mut();
#[cfg(feature = "inproc-av")]
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") {
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,
) };
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 {
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( uu_portal_open_persist_cancellable(
restore, save_token, &mut cache as *mut _ as *mut c_void, restore, save_token, &mut cache as *mut _ as *mut c_void,
is_cancelled, cancelled as *const _ as *mut c_void, is_cancelled, cancelled as *const _ as *mut c_void,
@@ -154,23 +211,23 @@ mod native {
} else { } else {
uu_portal_open_persist(restore, save_token, &mut cache as *mut _ as *mut c_void, &mut error, &mut width, &mut height) uu_portal_open_persist(restore, save_token, &mut cache as *mut _ as *mut c_void, &mut error, &mut width, &mut height)
} }
}; } };
let handle = NonNull::new(pointer).ok_or(super::PortalError { code: error })?; let Some(handle) = NonNull::new(pointer) else { return Err(failed(error, &cache)) };
let (mut x, mut y) = (0, 0); let (mut x, mut y) = (0, 0);
let granted = (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()) { 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(),
Some(name) => super::permissions::monitor_key(name), Some(name) => super::permissions::monitor_key(name),
None => key.to_owned(), None => key.to_owned(),
}; };
if super::permissions::save(dir, &saved, &token).is_err() { log::warn!("Portal permission cache could not be saved"); } if super::permissions::save(dir, &saved, &token).is_err() { 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"); }
// A freshly opened session holds no lock-screen frame: only an observed lock (or a // Keep a freshly granted compositor frame regardless of lock state. Discarding it
// closed stream) must discard the cached frame. Starting "locked" cleared the first // before new damage can leave a static desktop permanently blank (#2).
// valid frame, and a static desktop sends no new one, so the viewer stayed black (#2). Ok(Self { handle: Mutex::new(Handle(handle)), locked: crate::session_lock::watch_locked(), was_locked: std::sync::atomic::AtomicBool::new(false), recovery: Mutex::new(Recovery::default()), size: pack(width, height).into(), monitor: Mutex::new(granted), virtual_output: virtual_output.into() })
Ok(Self { handle: Mutex::new(Handle(handle)), locked: crate::session_lock::watch_locked(), was_locked: std::sync::atomic::AtomicBool::new(false), recovery: Mutex::new(Recovery::default()), size: pack(width, height).into(), monitor: Mutex::new(granted) })
} }
/// Frame pixels of the monitor the stream currently follows. /// Frame pixels of the monitor the stream currently follows.
pub fn size(&self) -> (u32, u32) { pub fn size(&self) -> (u32, u32) {
@@ -188,7 +245,7 @@ mod native {
/// time GNOME asks on the host) and swap it in, so every holder of this Arc follows. /// time GNOME asks on the host) and swap it in, so every holder of this Arc follows.
pub fn switch_to(&self, connector: &str) -> Result<(), String> { pub fn switch_to(&self, connector: &str) -> Result<(), String> {
if self.monitor().as_deref() == Some(connector) { return Ok(()); } if self.monitor().as_deref() == Some(connector) { return Ok(()); }
let replacement = Self::open_inner(None, Some(connector)).map_err(|error| error.to_string())?; let replacement = Self::open_inner(None, Some(connector), false, false).map_err(|error| error.to_string())?;
if replacement.monitor().as_deref() != Some(connector) { if replacement.monitor().as_deref() != Some(connector) {
return Err("Another monitor was shared; choose this monitor in the host dialog".into()); return Err("Another monitor was shared; choose this monitor in the host dialog".into());
} }
@@ -203,11 +260,58 @@ mod native {
drop(previous); drop(previous);
Ok(()) Ok(())
} }
pub fn is_virtual(&self) -> bool { self.virtual_output.load(std::sync::atomic::Ordering::Acquire) }
/// Privacy screen: capture and input move to a KWin virtual output (on) or back to the
/// physical monitor (off). The caller enables physical outputs before switching back.
pub fn set_virtual(&self, on: bool) -> Result<(), String> {
if self.is_virtual() == on { return Ok(()); }
// Closure recovery would otherwise see the replaced share end and reopen the wrong source.
let _recovery = self.recovery.lock().map_err(|_| "Portal recovery lock poisoned")?;
let monitor = self.monitor();
// KDE restores a monitor share against the whole workspace while the virtual output
// exists (seen live: 3968x1280 = panel + virtual), so end the virtual share first.
if !on { self.end(); }
let replacement = Self::open_inner(None, monitor.as_deref(), false, on).map_err(|error| error.to_string())?;
let size = replacement.size();
let next = replacement.handle.into_inner().map_err(|_| "Portal session lock poisoned")?;
let previous = {
let mut handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
self.size.store(pack(size.0, size.1), std::sync::atomic::Ordering::Release);
self.virtual_output.store(on, std::sync::atomic::Ordering::Release);
std::mem::replace(&mut *handle, next)
};
drop(previous);
log::info!("Portal capture source: virtual={on} size={}x{}", size.0, size.1);
Ok(())
}
pub fn open() -> Result<Self, String> { pub fn open() -> Result<Self, String> {
Self::open_inner(None, None).map_err(|error| error.to_string()) Self::open_inner(None, None, false, false).map_err(|error| error.to_string())
}
#[cfg(test)]
pub(crate) fn test_lock_watch(&mut self, locked: tokio::sync::watch::Receiver<Option<bool>>) {
self.locked = locked;
}
/// A consent saved before touch support restores keyboard and pointer only. Ask the host once
/// more (GNOME shows its share dialog; the consent timeout closes it) and swap the new session
/// in when it grants the touchscreen for this monitor at this size; until then, and on any
/// refusal, this session and its saved consent stay as they are. Ok(false): nothing to do.
pub fn upgrade_touch(&self) -> Result<bool, String> {
let available = self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_touch_available(handle.0.as_ptr()) } != 0);
if !available || self.touch_supported() { return Ok(false); }
log::info!("Portal touch consent: asking the host again for the touchscreen");
let monitor = self.monitor();
let replacement = Self::open_inner(None, monitor.as_deref(), true, self.is_virtual()).map_err(|error| error.to_string())?;
// The new consent is saved for whichever monitor was granted, so a later connection uses it.
if replacement.monitor() != monitor { return Err("another monitor was shared".into()); }
if !replacement.touch_supported() { return Err("the touchscreen was not granted".into()); }
self.check_geometry(&replacement).map_err(|error| error.to_string())?;
let next = replacement.handle.into_inner().map_err(|_| "Portal session lock poisoned")?;
let previous = std::mem::replace(&mut *self.handle.lock().map_err(|_| "Portal session lock poisoned")?, next);
drop(previous);
Ok(true)
} }
pub fn open_cancellable(cancelled: &std::sync::atomic::AtomicBool) -> Result<Self, super::PortalError> { pub fn open_cancellable(cancelled: &std::sync::atomic::AtomicBool) -> Result<Self, super::PortalError> {
Self::open_inner(Some(cancelled), None) Self::open_inner(Some(cancelled), None, false, false)
} }
pub fn recover(&self, cancelled: &std::sync::atomic::AtomicBool) -> Result<bool, super::PortalError> { pub fn recover(&self, cancelled: &std::sync::atomic::AtomicBool) -> Result<bool, super::PortalError> {
use std::sync::atomic::Ordering; use std::sync::atomic::Ordering;
@@ -232,7 +336,10 @@ mod native {
}; };
if alive { return Ok(false); } if alive { return Ok(false); }
let result = super::open_then_install(cancelled, || Self::open_cancellable(cancelled), |replacement| { // The privacy screen's virtual share is reopened as itself, not as the monitor.
let virtual_output = self.is_virtual();
let monitor = self.monitor();
let result = super::open_then_install(cancelled, || Self::open_inner(Some(cancelled), monitor.as_deref(), false, virtual_output), |replacement| {
self.check_geometry(&replacement)?; self.check_geometry(&replacement)?;
let replacement_handle = replacement.handle.into_inner().map_err(|_| super::PortalError { code: 3 })?; let replacement_handle = replacement.handle.into_inner().map_err(|_| super::PortalError { code: 3 })?;
let mut handle = self.handle.lock().map_err(|_| super::PortalError { code: 3 })?; let mut handle = self.handle.lock().map_err(|_| super::PortalError { code: 3 })?;
@@ -252,6 +359,7 @@ mod native {
} }
pub fn pause(&self) { pub fn pause(&self) {
if let Ok(handle) = self.handle.lock() { if let Ok(handle) = self.handle.lock() {
if unsafe { uu_portal_capture_alive(handle.0.as_ptr()) } != 0 { return; }
unsafe { uu_portal_reset_frame(handle.0.as_ptr()) }; unsafe { uu_portal_reset_frame(handle.0.as_ptr()) };
self.was_locked.store(true, std::sync::atomic::Ordering::Release); self.was_locked.store(true, std::sync::atomic::Ordering::Release);
} else { } else {
@@ -259,7 +367,46 @@ mod native {
} }
} }
pub fn capture(&self, frame: &mut [u8]) -> Result<(), String> { pub fn capture(&self, frame: &mut [u8]) -> Result<(), String> {
self.capture_changed(frame, &mut None).map(|_| ()) let mut version = None;
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(1);
loop {
self.capture_changed(frame, &mut version)?;
// A one-shot snapshot must wait for SHM renegotiation after DMA initialization.
// Release the handle between attempts so input and recovery remain responsive.
if version != Some(super::FrameVersion(0, 0)) || std::time::Instant::now() >= deadline { return Ok(()); }
std::thread::sleep(std::time::Duration::from_millis(10));
}
}
pub fn disable_dmabuf(&self) {
if let Ok(handle) = self.handle.lock() { unsafe { uu_portal_dmabuf_disable(handle.0.as_ptr()) }; }
}
pub fn with_dmabuf<T>(&self, version: &mut Option<super::FrameVersion>,
encode: impl FnOnce(&super::DmaFrame, bool) -> Result<T, String>,
) -> Result<super::DmaCapture<T>, String> {
let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
unsafe { uu_portal_input_dispatch(handle.0.as_ptr()) };
// Hold the handle guard through GPU completion, so monitor swaps cannot invalidate a lease.
if unsafe { uu_portal_capture_alive(handle.0.as_ptr()) } == 0 {
return Ok(super::DmaCapture::Cpu);
}
let identity = handle.0.as_ptr() as usize;
let mut revision = version.filter(|v| v.0 == identity).map_or(0, |v| v.1);
let mut frame = super::DmaFrame::default();
match unsafe { uu_portal_dmabuf_acquire(handle.0.as_ptr(), &mut frame, &mut revision) } {
code @ (0 | 12) => {
struct Lease(*mut c_void);
impl Drop for Lease {
fn drop(&mut self) { unsafe { uu_portal_dmabuf_release(self.0) }; }
}
let _lease = Lease(handle.0.as_ptr());
let encoded = encode(&frame, code == 0)?;
*version = Some(super::FrameVersion(identity, revision));
Ok(super::DmaCapture::Frame(encoded))
},
10 => Ok(super::DmaCapture::Pending),
15 => Ok(super::DmaCapture::Blank),
code => Ok(super::DmaCapture::Unavailable(code)),
}
} }
pub fn capture_changed(&self, frame: &mut [u8], version: &mut Option<super::FrameVersion>) -> Result<bool, String> { pub fn capture_changed(&self, frame: &mut [u8], version: &mut Option<super::FrameVersion>) -> Result<bool, String> {
let (width, height) = self.size(); let (width, height) = self.size();
@@ -269,21 +416,18 @@ mod native {
// Drain EIS even on a static desktop so pause/disconnect and sync // Drain EIS even on a static desktop so pause/disconnect and sync
// events are processed without waiting for remote input. // events are processed without waiting for remote input.
unsafe { uu_portal_input_dispatch(handle.0.as_ptr()) }; unsafe { uu_portal_input_dispatch(handle.0.as_ptr()) };
let state = *self.locked.borrow(); if unsafe { uu_portal_capture_alive(handle.0.as_ptr()) } == 0 {
if state != Some(false) { // A healthy source is forwarded regardless of lock state. Only an unavailable
// Unknown state (watcher not reported yet): show nothing but keep the cached frame. // source is blanked; wait for unlock before reopening a compositor-closed session.
if state == Some(true) { if *self.locked.borrow() != Some(false) {
unsafe { uu_portal_reset_frame(handle.0.as_ptr()) }; unsafe { uu_portal_reset_frame(handle.0.as_ptr()) };
self.was_locked.store(true, std::sync::atomic::Ordering::Release); self.was_locked.store(true, std::sync::atomic::Ordering::Release);
return Ok(blank_changed(frame, version));
}
if self.was_locked.load(std::sync::atomic::Ordering::Acquire) {
if self.take_lock_observation()? { unsafe { uu_portal_reset_frame(handle.0.as_ptr()) }; }
return Ok(blank_changed(frame, version));
} }
return Ok(blank_changed(frame, version));
}
if self.was_locked.load(std::sync::atomic::Ordering::Acquire) {
// First unlocked capture after a real lock: drop frames captured while locked.
if self.take_lock_observation()? { unsafe { uu_portal_reset_frame(handle.0.as_ptr()) }; }
return Ok(blank_changed(frame, version));
}
if unsafe { uu_portal_capture_alive(handle.0.as_ptr()) } == 0 {
// Serialize recovery without making another capture worker hold // Serialize recovery without making another capture worker hold
// the input mutex while waiting for this worker's Portal calls. // the input mutex while waiting for this worker's Portal calls.
let mut recovery = match self.recovery.try_lock() { let mut recovery = match self.recovery.try_lock() {
@@ -305,7 +449,7 @@ mod native {
self.was_locked.store(true, std::sync::atomic::Ordering::Release); self.was_locked.store(true, std::sync::atomic::Ordering::Release);
false false
}) { return Ok(None); } }) { return Ok(None); }
let replacement = match Self::open_inner(None, self.monitor().as_deref()) { let replacement = match Self::open_inner(None, self.monitor().as_deref(), false, self.is_virtual()) {
Ok(value) => value, Ok(value) => value,
Err(error) => { Err(error) => {
log::warn!("Portal capture recovery deferred: {error}"); log::warn!("Portal capture recovery deferred: {error}");
@@ -327,6 +471,7 @@ mod native {
// Recheck lock state on the next capture before showing the new session. // Recheck lock state on the next capture before showing the new session.
return Ok(blank_changed(frame, version)); return Ok(blank_changed(frame, version));
} else { } else {
self.was_locked.store(false, std::sync::atomic::Ordering::Release);
match self.recovery.try_lock() { match self.recovery.try_lock() {
Ok(mut recovery) => recovery.retry_at = None, Ok(mut recovery) => recovery.retry_at = None,
Err(TryLockError::WouldBlock) => (), Err(TryLockError::WouldBlock) => (),
@@ -372,6 +517,30 @@ mod native {
let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?; let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
super::check(unsafe { uu_portal_button(handle.0.as_ptr(), button, i32::from(pressed)) }) super::check(unsafe { uu_portal_button(handle.0.as_ptr(), button, i32::from(pressed)) })
} }
/// Press and release a keysym through Notify*: the compositor picks the key and level of
/// the active layout. Under EIS (keycodes only) it fails before typing anything.
pub fn type_keysym(&self, symbol: u32) -> Result<(), String> {
if *self.locked.borrow() != Some(false) { return Err("Portal input blocked while locked".into()); }
let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
super::check(unsafe { uu_portal_key(handle.0.as_ptr(), symbol, -1, 1) })?;
super::check(unsafe { uu_portal_key(handle.0.as_ptr(), symbol, -1, 0) })
}
/// Smooth scroll in stream pixels (positive scrolls down/right); `finish` ends the gesture.
pub fn scroll(&self, dx: f64, dy: f64, finish: bool) -> Result<(), String> {
if *self.locked.borrow() != Some(false) { return Err("Portal input blocked while locked".into()); }
let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
super::check(unsafe { uu_portal_scroll(handle.0.as_ptr(), dx, dy, i32::from(finish)) })
}
/// The portal granted the touchscreen device type (requested where available).
pub fn touch_supported(&self) -> bool {
self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_touch_supported(handle.0.as_ptr()) } != 0)
}
/// One finger in stream pixels: phase 0 down, 1 motion, 2 up.
pub fn touch(&self, phase: i32, x: f64, y: f64) -> Result<(), String> {
if phase != 2 && *self.locked.borrow() != Some(false) { return Err("Portal input blocked while locked".into()); }
let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
super::check(unsafe { uu_portal_touch(handle.0.as_ptr(), phase, x, y) })
}
pub fn key(&self, symbol: u64, pressed: bool) -> Result<(), String> { pub fn key(&self, symbol: u64, pressed: bool) -> Result<(), String> {
if pressed && *self.locked.borrow() != Some(false) { return Err("Portal input blocked while locked".into()); } if pressed && *self.locked.borrow() != Some(false) { return Err("Portal input blocked while locked".into()); }
let symbol = u32::try_from(symbol).map_err(|_| "Invalid Portal keysym")?; let symbol = u32::try_from(symbol).map_err(|_| "Invalid Portal keysym")?;
@@ -404,7 +573,7 @@ mod native {
was_locked: std::sync::atomic::AtomicBool::new(false), was_locked: std::sync::atomic::AtomicBool::new(false),
recovery: Mutex::new(Recovery::default()), recovery: Mutex::new(Recovery::default()),
size: pack(physical.0, physical.1).into(), size: pack(physical.0, physical.1).into(),
monitor: Mutex::new(None), monitor: Mutex::new(None), virtual_output: false.into(),
})) }))
} }
@@ -671,6 +840,8 @@ impl PortalSession {
pub fn monitor(&self) -> Option<String> { None } pub fn monitor(&self) -> Option<String> { None }
pub fn end(&self) {} pub fn end(&self) {}
pub fn switch_to(&self, _: &str) -> Result<(), String> { Err(error(15)) } pub fn switch_to(&self, _: &str) -> Result<(), String> { Err(error(15)) }
pub fn set_virtual(&self, _: bool) -> Result<(), String> { Err(error(15)) }
pub fn is_virtual(&self) -> bool { false }
} }
#[cfg(not(all(target_os = "linux", feature = "portal")))] #[cfg(not(all(target_os = "linux", feature = "portal")))]
impl PortalSession { impl PortalSession {
@@ -691,8 +862,17 @@ impl PortalSession {
pub fn pause(&self) {} pub fn pause(&self) {}
pub fn capture(&self, _: &mut [u8]) -> Result<(), String> { Err(error(15)) } pub fn capture(&self, _: &mut [u8]) -> Result<(), String> { Err(error(15)) }
pub fn capture_changed(&self, _: &mut [u8], _: &mut Option<FrameVersion>) -> Result<bool, String> { Err(error(15)) } pub fn capture_changed(&self, _: &mut [u8], _: &mut Option<FrameVersion>) -> Result<bool, String> { Err(error(15)) }
pub fn disable_dmabuf(&self) {}
pub fn with_dmabuf<T>(&self, _: &mut Option<FrameVersion>, _: impl FnOnce(&DmaFrame, bool) -> Result<T, String>) -> Result<DmaCapture<T>, String> {
Ok(DmaCapture::Unavailable(-1))
}
pub fn move_pointer(&self, _: f64, _: f64, _: bool) -> Result<(), String> { Err(error(15)) } pub fn move_pointer(&self, _: f64, _: f64, _: bool) -> Result<(), String> { Err(error(15)) }
pub fn button(&self, _: i32, _: bool) -> Result<(), String> { Err(error(15)) } pub fn button(&self, _: i32, _: bool) -> Result<(), String> { Err(error(15)) }
pub fn touch_supported(&self) -> bool { false }
pub fn scroll(&self, _: f64, _: f64, _: bool) -> Result<(), String> { Err(error(15)) }
pub fn upgrade_touch(&self) -> Result<bool, String> { Err(error(15)) }
pub fn type_keysym(&self, _: u32) -> Result<(), String> { Err(error(15)) }
pub fn touch(&self, _: i32, _: f64, _: f64) -> Result<(), String> { Err(error(15)) }
pub fn key(&self, _: u64, _: bool) -> Result<(), String> { Err(error(15)) } pub fn key(&self, _: u64, _: bool) -> Result<(), String> { Err(error(15)) }
} }
@@ -703,6 +883,17 @@ pub fn monitor_key(connector: &str) -> String { permissions::monitor_key(connect
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;
/// failures switching a live session must reach the controller so its recovery record survives.
pub fn set_virtual_active(on: bool) -> Result<(), String> {
let session = ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref().and_then(std::sync::Weak::upgrade);
let Some(session) = session else { return if on { Err("Portal desktop unavailable".into()) } else { Ok(()) }; };
session.set_virtual(on)
}
pub fn switch_active(connector: &str) -> Result<(), String> { pub fn switch_active(connector: &str) -> Result<(), String> {
let session = ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref().and_then(std::sync::Weak::upgrade) let session = ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref().and_then(std::sync::Weak::upgrade)
.ok_or("Portal desktop unavailable")?; .ok_or("Portal desktop unavailable")?;
@@ -743,6 +934,11 @@ pub fn write_frames(session: Arc<PortalSession>, mut output: impl std::io::Write
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
#[test]
fn privacy_restore_without_a_desktop_is_a_noop_but_enable_fails() {
assert!(super::set_virtual_active(false).is_ok());
assert_eq!(super::set_virtual_active(true).unwrap_err(), "Portal desktop unavailable");
}
#[test] #[test]
fn monitor_lines_parse_and_reject_unsafe_connectors() { fn monitor_lines_parse_and_reject_unsafe_connectors() {
let m = super::parse_monitors("eDP-1\t2880\t1800\t0\t0\t1\nHDMI-1\t2560\t1440\t1920\t0\t0\n../x\t1\t1\t0\t0\t0\n"); let m = super::parse_monitors("eDP-1\t2880\t1800\t0\t0\t1\nHDMI-1\t2560\t1440\t1920\t0\t0\n../x\t1\t1\t0\t0\t0\n");
+33
View File
@@ -0,0 +1,33 @@
//! One implementation per desktop. The controller (mod.rs) owns sessions, mode switching, the
//! recovery record and the guard; a backend only changes and restores its desktop.
use super::{record::Journal, Mode};
/// What the controller keeps while privacy is on.
#[derive(Default)]
pub struct Entered {
/// Picture mode keeps physical outputs on, so uinput's absolute axes span them too: the
/// captured (virtual) output as fractions (x, y, w, h) of the layout's bounding box.
pub pointer_region: Option<[f64; 4]>,
}
pub trait Backend: Send + Sync {
/// Stored in the recovery record to pick the same backend for recovery.
fn name(&self) -> &'static str;
/// Why `mode` cannot be served on this desktop.
fn unavailable(&self, mode: Mode) -> Option<String>;
/// Hide the local screen and block local input. Save what undoes each step through `journal`
/// before making it; on an error the controller calls `leave` with the last saved data.
fn enter(&self, mode: Mode, journal: &mut Journal) -> Result<Entered, String>;
/// Undo `data` from `enter`. Also used for crash recovery, where no desktop stream exists.
fn leave(&self, data: &serde_json::Value) -> Result<(), String>;
}
/// The backend for this session, if the desktop has one.
pub fn detect() -> Option<&'static dyn Backend> {
if cfg!(test) { return None; }
if super::kde::Kde::detected() { return Some(&super::kde::Kde); }
None
}
pub fn named(name: &str) -> Option<&'static dyn Backend> {
match name { super::kde::NAME => Some(&super::kde::Kde), _ => None }
}
+45
View File
@@ -0,0 +1,45 @@
//! Picture mode's cover: a fullscreen keep-above window per physical monitor (GTK, in its own
//! process so it cannot disturb the host's UI thread), killed on restore and with the host.
use std::{process::{Child, Command, Stdio}, sync::Mutex};
static COVER: Mutex<Option<Child>> = Mutex::new(None);
pub fn supported() -> bool { cfg!(uu_gtk) }
/// `rects` are the monitors to cover in the desktop's logical coordinates (x, y, w, h).
pub fn show(image: Option<&std::path::Path>, rects: &[[f64; 4]]) -> Result<(), String> {
hide();
let exe = std::env::current_exe().map_err(|e| e.kind().to_string())?;
let mut command = Command::new(exe);
command.arg("privacy-wallpaper").arg(image.map(|p| p.as_os_str().to_owned()).unwrap_or_default());
for rect in rects { command.arg(rect.iter().map(|v| (v.round() as i64).to_string()).collect::<Vec<_>>().join(",")); }
// Keep the pipe writer in Child for the host's lifetime, independently of its spawning thread.
let mut child = command.stdin(Stdio::piped()).stdout(Stdio::piped()).spawn().map_err(|e| format!("cover window: {}", e.kind()))?;
// A spawned child is not a shown cover: GTK init or monitor matching can still fail (exit 1/2).
let stdout = child.stdout.take().ok_or("cover window: no stdout")?;
let (tx, rx) = std::sync::mpsc::channel();
std::thread::spawn(move || {
use std::io::BufRead;
let mut line = String::new();
let _ = tx.send(std::io::BufReader::new(stdout).read_line(&mut line).is_ok() && line.trim() == "ready");
});
if rx.recv_timeout(std::time::Duration::from_secs(5)) != Ok(true) {
let _ = child.kill();
let status = child.wait().ok().and_then(|s| s.code());
return Err(format!("cover window not shown (exit {status:?})"));
}
*COVER.lock().map_err(|_| "cover state poisoned")? = Some(child);
Ok(())
}
pub fn hide() {
if let Some(mut child) = COVER.lock().ok().and_then(|mut c| c.take()) { let _ = child.kill(); let _ = child.wait(); }
}
/// `privacy-wallpaper <image> <x,y,w,h>...`: the cover window process.
pub fn main(args: &[String]) -> i32 {
let rects: Vec<i32> = args.iter().skip(1).flat_map(|r| r.split(',').map(|v| v.parse().unwrap_or(-1))).collect();
#[cfg(uu_gtk)] {
extern "C" { fn uu_privacy_wallpaper_run(image: *const libc::c_char, rects: *const i32, count: i32) -> i32; }
let image = std::ffi::CString::new(args.first().cloned().unwrap_or_default()).unwrap_or_default();
unsafe { uu_privacy_wallpaper_run(image.as_ptr(), rects.as_ptr(), (rects.len() / 4) as i32) }
}
#[cfg(not(uu_gtk))] { let _ = rects; 1 }
}
+31
View File
@@ -0,0 +1,31 @@
//! Desktops may persist what a backend changes (KWin saves input-device flags), so a killed host
//! could leave local input or screens off for good. This child recovers from the record when the
//! host's end of its stdin pipe closes, however the host ends; after a normal restore the record is
//! gone and it just exits.
use std::{process::{Child, Command, Stdio}, sync::Mutex};
static GUARD: Mutex<Option<Child>> = Mutex::new(None);
pub fn start() -> Result<(), String> {
let mut guard = GUARD.lock().map_err(|_| "guard state poisoned")?;
if guard.is_some() { return Ok(()); }
let exe = std::env::current_exe().map_err(|e| e.kind().to_string())?;
let child = Command::new(exe).arg("privacy-guard").stdin(Stdio::piped()).stdout(Stdio::null()).spawn()
.map_err(|e| format!("privacy guard: {}", e.kind()))?;
*guard = Some(child);
Ok(())
}
pub fn stop() {
if let Some(mut child) = GUARD.lock().ok().and_then(|mut g| g.take()) { drop(child.stdin.take()); let _ = child.wait(); }
}
/// `privacy-guard`: waits for the host to go away, then recovers.
pub fn main() -> i32 {
use std::io::Read;
let _ = std::io::stdin().read_to_end(&mut Vec::new());
// A normal restore removes the record before closing the pipe.
if !super::record::pending() { return 0; }
// The host's flock is released with its last descriptor; give a dying host a moment.
super::tool::wait_until(|| super::record::ownership().is_ok());
if super::record::pending() { log::warn!("Privacy guard: host ended without restoring; recovering"); super::recover(); }
0
}
+30
View File
@@ -0,0 +1,30 @@
//! 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.
use super::super::tool::{gdbus, variant};
fn call(object: &str, method: &str, args: &[&str]) -> Result<String, String> { gdbus("org.kde.KWin", object, method, args) }
/// 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)
/// are blocked too.
pub fn local() -> Result<Vec<String>, String> {
let list = call("/org/kde/KWin/InputDevice", "org.freedesktop.DBus.Properties.Get", &["org.kde.KWin.InputDeviceManager", "devicesSysNames"])?;
let mut blocked = Vec::new();
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 Ok(text) = call(&format!("/org/kde/KWin/InputDevice/{sys}"), "org.freedesktop.DBus.Properties.GetAll", &["org.kde.KWin.InputDevice"]) else { continue };
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> {
let value = if enabled { "<true>" } else { "<false>" };
let mut failure = None;
for sys in devices {
if let Err(e) = call(&format!("/org/kde/KWin/InputDevice/{sys}"), "org.freedesktop.DBus.Properties.Set", &["org.kde.KWin.InputDevice", "enabled", value]) {
failure = Some(e);
}
}
failure.map_or(Ok(()), Err)
}
+34
View File
@@ -0,0 +1,34 @@
//! One-shot KWin scripts (org.kde.kwin.Scripting).
use super::super::tool::gdbus;
fn call(object: &str, method: &str, args: &[&str]) -> Result<String, String> { gdbus("org.kde.KWin", object, method, args) }
fn script(js: &str) -> Result<(), String> {
let dir = std::env::var_os("XDG_RUNTIME_DIR").map(std::path::PathBuf::from).ok_or("missing runtime directory")?;
let file = dir.join(format!("uu-privacy-{}.js", std::process::id()));
std::fs::write(&file, js).map_err(|e| e.kind().to_string())?;
let name = "uu-privacy";
let _ = call("/Scripting", "org.kde.kwin.Scripting.unloadScript", &[name]);
let result = call("/Scripting", "org.kde.kwin.Scripting.loadScript", &[&file.to_string_lossy(), name]).and_then(|out| {
let id: String = out.chars().filter(char::is_ascii_digit).collect();
if id.is_empty() { return Err("script not loaded".into()); }
call(&format!("/Scripting/Script{id}"), "org.kde.kwin.Script.run", &[])
});
std::thread::sleep(std::time::Duration::from_millis(300));
let _ = call("/Scripting", "org.kde.kwin.Scripting.unloadScript", &[name]);
let _ = std::fs::remove_file(file);
result.map(|_| ())
}
/// Sends every normal window and dialog to `output` (a name from kscreen-doctor, file-name safe).
pub fn move_windows_to(output: &str) -> Result<(), String> {
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);"#))
}
/// 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;"#)
}
+101
View File
@@ -0,0 +1,101 @@
//! KDE Plasma Wayland: capture and input move to a KWin virtual output through the portal
//! (ScreenCast source type VIRTUAL), then the physical outputs are disabled with kscreen-doctor,
//! so remote input cannot wake them (KWin treats injected input as user activity and undoes DPMS).
//! Same order as KRdp's virtual-monitor "replace" policy and Sunshine's KDE setup: snapshot the
//! physical outputs before the virtual one exists (KWin applies stored configs on creation),
//! re-enable them before the virtual output goes away, and never disable the virtual output
//! itself (KWin bug 527747 persists that and breaks later virtual shares).
//! Picture mode then turns the physical outputs back on as secondary ones and covers them.
mod input;
mod kwin;
mod outputs;
use super::{backend::{Backend, Entered}, record::Journal, tool, Mode};
pub const NAME: &str = "kde";
pub struct Kde;
#[derive(Default, serde::Serialize, serde::Deserialize)]
struct Data { outputs: Vec<String>, #[serde(default)] devices: Vec<String> }
impl Kde {
pub fn detected() -> bool {
let kde = std::env::var_os("WAYLAND_DISPLAY").is_some()
&& std::env::var("XDG_CURRENT_DESKTOP").unwrap_or_default().split(':').any(|s| s.eq_ignore_ascii_case("KDE"));
cfg!(feature = "portal") && kde && tool::available("timeout") && tool::available("kscreen-doctor")
&& crate::desktop_backend::detect().ok() == Some(crate::desktop_backend::DesktopBackend::Portal)
}
}
fn block_input() -> bool { std::env::var("UU_PRIVACY_BLOCK_INPUT").as_deref() != Ok("0") }
/// Plasma's desktop wallpaper image, if it is a plain file.
fn wallpaper() -> Option<std::path::PathBuf> {
let home = std::env::var_os("HOME").map(std::path::PathBuf::from)?;
let config = std::env::var_os("XDG_CONFIG_HOME").map(std::path::PathBuf::from).unwrap_or(home.join(".config"));
let text = std::fs::read_to_string(config.join("plasma-org.kde.plasma.desktop-appletsrc")).ok()?;
text.lines().find_map(|l| l.strip_prefix("Image=")).map(|v| std::path::PathBuf::from(v.trim().trim_start_matches("file://")))
.filter(|p| p.is_file())
}
/// Windows moved to the virtual output when the physical outputs went away. Turn those back on as
/// secondary outputs, keep the windows on the virtual one, and cover the physical ones.
fn cover(data: &Data) -> Result<[f64; 4], String> {
let virtual_name = outputs::layout()?.into_iter().map(|o| o.name).find(|n| !data.outputs.contains(n)).ok_or("virtual output not found")?;
outputs::set(&data.outputs, true).map_err(|e| format!("enable outputs: {e}"))?;
if let Err(e) = outputs::set_primary(&virtual_name) { log::warn!("Privacy virtual output priority: {e}"); }
kwin::move_windows_to(&virtual_name).map_err(|e| format!("move windows: {e}"))?;
let layout = outputs::layout()?;
let physical: Vec<[f64; 4]> = layout.iter().filter(|o| data.outputs.contains(&o.name)).map(|o| o.rect).collect();
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")?;
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)
}
impl Backend for Kde {
fn name(&self) -> &'static str { NAME }
fn unavailable(&self, mode: Mode) -> Option<String> {
if !tool::available("gdbus") { return Some("privacy screen needs gdbus".into()); }
// Checked before any output or device changes: on the virtual share KDE drops portal input,
// and local devices get blocked, so without uinput neither side could operate.
if !crate::input::uinput_ready() { return Some("privacy screen needs uinput input (UU_INPUT_BACKEND=native or /dev/uinput unavailable)".into()); }
(mode == Mode::Picture && !super::cover::supported()).then(|| "picture mode needs GTK".into())
}
fn enter(&self, mode: Mode, journal: &mut Journal) -> Result<Entered, String> {
let mut data = Data { outputs: outputs::physical()?, devices: Vec::new() };
journal.save(&data)?;
crate::portal::set_virtual_active(true).map_err(|e| format!("virtual output: {e}"))?;
outputs::set(&data.outputs, false).map_err(|e| format!("disable outputs: {e}"))?;
let mut entered = Entered::default();
if mode == Mode::Picture { entered.pointer_region = Some(cover(&data)?); }
if block_input() {
data.devices = input::local().map_err(|e| format!("input devices: {e}"))?;
journal.save(&data)?;
input::set(&data.devices, false).map_err(|e| format!("block input: {e}"))?;
}
log::info!("Privacy KDE: outputs={} input_devices={}", data.outputs.len(), data.devices.len());
Ok(entered)
}
fn leave(&self, data: &serde_json::Value) -> Result<(), String> {
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
// controller keeps the recovery record and the guard for the next attempt.
let devices = input::set(&data.devices, true).map_err(|e| format!("enable input devices: {e}"));
// 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
// output's geometry (seen live: 1920x1080 instead of the panel's 3072x1920).
if let Err(e) = outputs::set(&data.outputs, true) {
if !outputs::physical().is_ok_and(|now| data.outputs.iter().all(|o| now.contains(o))) { return Err(format!("enable outputs: {e}")); }
}
std::thread::sleep(std::time::Duration::from_millis(500));
crate::portal::set_virtual_active(false).map_err(|e| format!("restore capture source: {e}"))?;
devices?;
log::info!("Privacy KDE restored: outputs={} input_devices={}", data.outputs.len(), data.devices.len());
Ok(())
}
}
+76
View File
@@ -0,0 +1,76 @@
//! KWin output layout through libkscreen's `kscreen-doctor`.
use super::super::tool::{run, wait_until};
#[derive(Debug, PartialEq)]
pub struct Output { pub name: String, pub rect: [f64; 4] }
fn json() -> Result<String, String> { run("kscreen-doctor", &["-j".into()]) }
/// Enabled, connected outputs that KWin did not create for a screencast.
fn physical_in(text: &str) -> Result<Vec<String>, String> {
let json: serde_json::Value = serde_json::from_str(text).map_err(|_| "invalid output configuration")?;
let outputs = json["outputs"].as_array().ok_or("missing outputs")?;
let names: Vec<String> = outputs.iter()
.filter(|o| o["enabled"] == true && o["connected"] == true)
.filter_map(|o| o["name"].as_str())
.filter(|name| !name.starts_with("Virtual") && name.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-' || b == b'_'))
.map(str::to_owned).collect();
if names.is_empty() { return Err("no active physical outputs".into()); }
Ok(names)
}
pub fn physical() -> Result<Vec<String>, String> { physical_in(&json()?) }
/// Enabled outputs in KWin's logical coordinates (mode size / scale, rotated).
fn layout_in(text: &str) -> Result<Vec<Output>, String> {
let json: serde_json::Value = serde_json::from_str(text).map_err(|_| "invalid output configuration")?;
let outputs = json["outputs"].as_array().ok_or("missing outputs")?;
// KWin's screencast virtual output has no "enabled" field (seen live, Plasma 6).
Ok(outputs.iter().filter(|o| o["enabled"] != false).filter_map(|o| {
let mode = o["modes"].as_array()?.iter().find(|m| m["id"] == o["currentModeId"])?;
let (mut w, mut h) = (mode["size"]["width"].as_f64()?, mode["size"]["height"].as_f64()?);
if matches!(o["rotation"].as_u64(), Some(2 | 8)) { std::mem::swap(&mut w, &mut h); }
let scale = o["scale"].as_f64().filter(|s| *s > 0.0).unwrap_or(1.0);
Some(Output { name: o["name"].as_str()?.into(), rect: [o["pos"]["x"].as_f64()?, o["pos"]["y"].as_f64()?, w / scale, h / scale] })
}).collect())
}
pub fn layout() -> Result<Vec<Output>, String> { layout_in(&json()?) }
/// `name` as fractions (x, y, w, h) of the layout's bounding box.
pub fn region(layout: &[Output], name: &str) -> Option<[f64; 4]> {
let target = layout.iter().find(|o| o.name == name)?.rect;
let (x0, y0) = layout.iter().fold((f64::MAX, f64::MAX), |(x, y), o| (x.min(o.rect[0]), y.min(o.rect[1])));
let (x1, y1) = layout.iter().fold((f64::MIN, f64::MIN), |(x, y), o| (x.max(o.rect[0] + o.rect[2]), y.max(o.rect[1] + o.rect[3])));
let (w, h) = (x1 - x0, y1 - y0);
(w > 0.0 && h > 0.0).then(|| [(target[0] - x0) / w, (target[1] - y0) / h, target[2] / w, target[3] / h])
}
/// Enables or disables `outputs` and waits until KWin has applied it.
pub fn set(outputs: &[String], enable: bool) -> Result<(), String> {
let action = if enable { "enable" } else { "disable" };
run("kscreen-doctor", &outputs.iter().map(|o| format!("output.{o}.{action}")).collect::<Vec<_>>())?;
let applied = wait_until(|| {
let now = physical().unwrap_or_default();
outputs.iter().all(|o| now.contains(o) == enable)
});
if applied { Ok(()) } else { Err(format!("outputs not {action}d")) }
}
pub fn set_primary(name: &str) -> Result<(), String> { run("kscreen-doctor", &[format!("output.{name}.priority.1")]).map(|_| ()) }
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn snapshot_keeps_enabled_physical_outputs_only() {
let names = physical_in(r#"{"outputs":[{"name":"eDP-1","enabled":true,"connected":true},
{"name":"DP-1","enabled":false,"connected":true},{"name":"Virtual-uu","enabled":true,"connected":true},
{"name":"HDMI-A-1","enabled":true,"connected":false}]}"#).unwrap();
assert_eq!(names, ["eDP-1"]);
assert!(physical_in(r#"{"outputs":[{"name":"Virtual-x","enabled":true,"connected":true}]}"#).is_err());
}
#[test]
fn pointer_region_is_the_virtual_output_in_the_layout() {
let all = layout_in(r#"{"outputs":[
{"name":"eDP-1","enabled":true,"currentModeId":"2","modes":[{"id":"2","size":{"width":3072,"height":1920}}],"pos":{"x":0,"y":0},"scale":1.5,"rotation":1},
{"name":"Virtual-1","currentModeId":"1","modes":[{"id":"1","size":{"width":1920,"height":1080}}],"pos":{"x":2048,"y":0},"scale":1,"rotation":1},
{"name":"DP-1","enabled":false,"currentModeId":"1","modes":[{"id":"1","size":{"width":1,"height":1}}],"pos":{"x":0,"y":0}}]}"#).unwrap();
assert_eq!(all.len(), 2);
assert_eq!(all[0].rect, [0.0, 0.0, 2048.0, 1280.0]);
assert_eq!(region(&all, "Virtual-1").unwrap(), [2048.0 / 3968.0, 0.0, 1920.0 / 3968.0, 1080.0 / 1280.0]);
}
}
+256
View File
@@ -0,0 +1,256 @@
//! Host privacy screen (防窥): the viewer's RPC 7 hides the local screen and blocks local input
//! while it controls the desktop. This module is the desktop-independent controller: it counts
//! desktop sessions, switches modes, rolls back failures, keeps the recovery record and the guard,
//! and serves the protocol. Desktop work lives behind `backend::Backend` (only `kde` so far).
mod backend;
mod cover;
mod guard;
mod kde;
mod mode;
mod protocol;
mod record;
mod tool;
pub use mode::Mode;
use std::sync::{atomic::{AtomicBool, Ordering}, Mutex};
struct Active { mode: Mode, record: Option<record::Record> }
struct State { sessions: usize, active: Option<Active> }
static STATE: Mutex<State> = Mutex::new(State { sessions: 0, active: None });
/// Lock-free view of `STATE.active` for capture/input paths.
static ACTIVE: AtomicBool = AtomicBool::new(false);
static PICTURE: AtomicBool = AtomicBool::new(false);
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 active() -> bool { ACTIVE.load(Ordering::Relaxed) }
/// The viewer's privacy_type now in effect.
pub fn current_type() -> u8 {
if !active() { mode::TYPE_OFF } else if PICTURE.load(Ordering::Relaxed) { Mode::Picture.wire_type() } else { Mode::ScreenOff.wire_type() }
}
/// Message 15 SystemStateChange { 5 PrivateScreenState } for the state now in effect.
pub fn state_message(seq: u64, timestamp: u64) -> Vec<u8> {
crate::initialization::envelope(seq, timestamp, 15, &protocol::state_change(current_type()))
}
/// See `backend::Entered::pointer_region`.
pub fn pointer_region() -> Option<[f64; 4]> { *POINTER.lock().ok()? }
fn publish(active: Option<&Active>) {
ACTIVE.store(active.is_some(), Ordering::Relaxed);
PICTURE.store(active.is_some_and(|a| a.mode == Mode::Picture), Ordering::Relaxed);
}
fn leave(state: &mut State) -> Result<(), String> {
let Some(active) = state.active.as_ref() else { return Ok(()) };
cover::hide();
if let Ok(mut p) = POINTER.lock() { *p = None; }
if let Some(record) = &active.record {
let backend = backend::named(&record.backend).ok_or("unknown privacy backend in the recovery record")?;
backend.leave(&record.data)?;
}
record::remove()?;
state.active = None;
publish(None);
guard::stop();
log::info!("Privacy screen restored");
Ok(())
}
fn enter(state: &mut State, mode: Mode) -> Result<(), String> {
record::ownership()?;
if state.active.as_ref().is_some_and(|a| a.mode == mode) { return Ok(()); }
// Switching mode: start over from the restored desktop.
leave(state)?;
let backend = backend::detect().ok_or("privacy screen is not supported on this desktop")?;
if let Some(reason) = backend.unavailable(mode) { return Err(reason); }
// A pending recovery must never be overwritten by a new snapshot.
if record::pending() { return Err("previous output recovery is pending".into()); }
guard::start()?;
// Published before the backend runs: capture keep-awake paths must not undo its changes.
state.active = Some(Active { mode, record: None });
publish(state.active.as_ref());
let mut journal = record::Journal::new(backend.name(), mode);
let result = backend.enter(mode, &mut journal);
if let Some(active) = state.active.as_mut() { active.record = journal.into_record(); }
let entered = result?;
*POINTER.lock().map_err(|_| "pointer state poisoned")? = entered.pointer_region;
log::info!("Privacy screen enabled: backend={} mode={mode:?}", backend.name());
Ok(())
}
fn save_preference(mode: Mode) {
// Session lifecycle takes the settings lock before STATE; never take it while holding STATE.
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.
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")?;
if !enable { return leave(&mut state); }
let mode = mode.ok_or("unsupported privacy type")?;
if state.sessions == 0 { return Err("no active desktop session".into()); }
let result = enter(&mut state, mode);
// 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}"); } }
drop(state);
if result.is_ok() && save { save_preference(mode); }
result
}
/// Why RPC 7 cannot be served at all; checked before answering.
fn refuse(enable: bool, mode: Option<Mode>) -> Option<String> {
if !enable { return None; }
let Some(mode) = mode else { return Some("unsupported privacy type".into()) };
if STATE.lock().map_or(true, |s| s.sessions == 0) { return Some("no active desktop session".into()); }
let Some(backend) = backend::detect() else { return Some("privacy screen is not supported on this desktop".into()) };
backend.unavailable(mode)
}
/// A switch the RPC accepted; run it with `Accepted::apply` after sending the response.
pub struct Accepted { enable: bool, mode: Option<Mode> }
/// RPC 7 answer, sent before the switch: the Mac viewer gives up on the RPC after a few seconds
/// (error 9998 + n in its RPC failure handler) and a switch takes longer. A later failure is
/// reported as ReportError -7, which the viewer handles by resetting its privacy menu.
pub fn rpc_accept(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Option<Accepted>)> {
let (header, request) = protocol::parse(rpc)?;
if let Some(e) = refuse(request.enable, request.mode) {
log::warn!("Privacy request refused: enable={} mode={:?}: {e}", request.enable, request.mode);
return Some((protocol::response(&header, &request, true, current_type()), None));
}
let expected = if request.enable { request.mode.map_or(mode::TYPE_OFF, Mode::wire_type) } else { mode::TYPE_OFF };
Some((protocol::response(&header, &request, false, expected), Some(Accepted { enable: request.enable, mode: request.mode })))
}
/// Mac 4.43.0 handleForReportError: -7 resets privacy to off; -9 reports an RDP session change,
/// not privacy success. Success is carried by RpcResponse 3 and SystemMetrics.setting 7.
pub const REPORT_ERROR: i32 = -7;
impl Accepted {
pub fn apply(self) -> Result<(), String> {
VIEWER_OVERRIDE.store(true, Ordering::Relaxed);
let result = set(self.enable, self.mode);
if let Err(e) = &result { log::warn!("Privacy request failed: enable={} mode={:?}: {e}", self.enable, self.mode); }
result
}
}
/// `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() {
if let Ok(mut s) = STATE.lock() {
s.sessions = s.sessions.saturating_sub(1);
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() {
if let Ok(mut s) = STATE.lock() {
s.sessions = 0;
VIEWER_OVERRIDE.store(false, Ordering::Relaxed);
if let Err(e) = leave(&mut s) { log::warn!("Privacy restore failed: {e}"); }
}
}
/// Undo a record left by a crash (host start, guard). Failure keeps the record for the next try.
pub fn recover() {
if let Err(e) = record::ownership() { log::warn!("Privacy control unavailable: {e}"); return; }
let Some(saved) = record::load() else { return };
if let Ok(mut state) = STATE.lock() {
state.active = Some(Active { mode: saved.mode, record: Some(saved) });
if let Err(e) = leave(&mut state) { log::warn!("Privacy recovery failed: {e}"); }
}
}
/// Local diagnostic: needs an existing portal session (registered by the caller).
pub fn probe(mode: Mode) -> Result<(), String> {
recover();
let result = {
let mut state = STATE.lock().map_err(|_| "privacy state poisoned")?;
state.sessions = 1;
enter(&mut state, mode)
};
if result.is_ok() { save_preference(mode); }
if result.is_ok() { std::thread::sleep(std::time::Duration::from_secs(5)); }
let mut state = STATE.lock().map_err(|_| "privacy state poisoned")?;
let restored = leave(&mut state);
if restored.is_err() { log::warn!("Privacy probe restore failed; the next start retries"); }
result.and(restored)
}
pub use protocol::screensaver_response;
pub fn guard_main() -> i32 { guard::main() }
pub fn cover_main(args: &[String]) -> i32 { cover::main(args) }
#[cfg(test)]
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]
fn enabling_without_a_backend_is_refused_and_reports_off() {
let bytes = [10, 2, 8, 42, 58, 4, 8, 1, 16, 3];
let (response, accepted) = super::rpc_accept(&crate::protocol::decode_wire(&bytes).unwrap()).unwrap();
assert_eq!(response, [10, 2, 8, 42, 26, 6, 8, 1, 16, 3, 24, 1]);
assert!(accepted.is_none());
}
}
+29
View File
@@ -0,0 +1,29 @@
/// What the viewer asks the local screen to show while it controls the desktop.
#[derive(Clone, Copy, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum Mode {
/// A picture covers the physical screens (the official viewer's privacy/wallpaper mode).
Picture,
/// The physical screens are off.
ScreenOff,
}
/// `privacy_type` as the official viewer numbers it (seen live): 1 off, 2 picture, 3 screen off.
pub const TYPE_OFF: u8 = 1;
impl Mode {
pub fn from_type(value: u64) -> Option<Self> {
match value { 2 => Some(Self::Picture), 3 => Some(Self::ScreenOff), _ => None }
}
pub fn wire_type(self) -> u8 { match self { Self::Picture => 2, Self::ScreenOff => 3 } }
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn wire_types_round_trip() {
for mode in [Mode::Picture, Mode::ScreenOff] { assert_eq!(Mode::from_type(mode.wire_type().into()), Some(mode)); }
assert_eq!(Mode::from_type(1), None);
assert_eq!(Mode::from_type(0), None);
}
}
+74
View File
@@ -0,0 +1,74 @@
//! Official protobuf maps: RpcRequest 7 {1 enable, 2 privacy_type, 3 setting_source};
//! RpcResponse 3 {1 error_code, 2 req_privacy_type, 3 cur_privacy_type}. Types: see `Mode`.
//! Field numbers and enums verified against the Mac UURemote SwiftProtobuf name maps.
use super::Mode;
pub struct Request { pub enable: bool, pub mode: Option<Mode>, requested: u64 }
pub fn parse(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Request)> {
use crate::protocol::{decode_wire, WireValue};
let body = |n| rpc.iter().find_map(|f| match &f.value { WireValue::Bytes(b) if f.number == n => Some(*b), _ => None });
let header = body(1)?.to_vec();
let req = decode_wire(body(7)?).ok()?;
let value = |n| req.iter().find_map(|f| match f.value { WireValue::Varint(v) if f.number == n => Some(v), _ => None }).unwrap_or(0);
log::info!("Privacy request: enable_value={} requested_type={} source={}", value(1), value(2), value(3));
Some((header, Request { enable: value(1) != 0, mode: Mode::from_type(value(2)), requested: value(2) }))
}
/// RpcResponse with the request's header, error_code 1 on failure, and the type now in effect.
pub fn response(header: &[u8], request: &Request, failed: bool, current: u8) -> Vec<u8> {
let mut payload = Vec::new();
if failed { payload.extend([8, 1]); }
if request.requested != 0 { payload.push(16); varint(request.requested, &mut payload); }
payload.extend([24, current]);
let mut out = vec![10];
varint(header.len() as u64, &mut out);
out.extend(header);
out.push(26);
varint(payload.len() as u64, &mut out);
out.extend(payload);
out
}
/// RpcRequest 25 update_screen_saver_req → RpcResponse 21 update_screen_saver_rsp (Mac UURemote
/// name maps). The viewer sends it before enabling picture mode (notifyScreensaverUpdate) and aborts
/// with error 9998 when it times out. The picture itself is the host's: answer an empty (success) one.
pub fn screensaver_response(rpc: &[crate::protocol::WireField]) -> Option<Vec<u8>> {
use crate::protocol::WireValue;
if !rpc.iter().any(|f| f.number == 25) { return None; }
let header = rpc.iter().find_map(|f| match &f.value { WireValue::Bytes(b) if f.number == 1 => Some(*b), _ => None })?;
let mut out = vec![10];
varint(header.len() as u64, &mut out);
out.extend(header);
out.extend([0xaa, 1, 0]); // field 21, length-delimited, empty
log::info!("Privacy screensaver update answered");
Some(out)
}
/// SystemStateChange { 5 PrivateScreenState { 1 error_code, 2 req_privacy_type, 3 cur_privacy_type } }
/// (field numbers from the Mac UURemote name map); the host pushes it when the state changes.
pub fn state_change(current: u8) -> Vec<u8> {
let state = [16, current, 24, current];
let mut out = vec![42, state.len() as u8];
out.extend(state);
out
}
fn varint(mut n: u64, out: &mut Vec<u8>) {
while n >= 128 { out.push((n as u8 & 127) | 128); n >>= 7; }
out.push(n as u8);
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn parses_request_and_echoes_header() {
let bytes = [10, 2, 8, 42, 58, 4, 8, 1, 16, 3];
let (header, request) = parse(&crate::protocol::decode_wire(&bytes).unwrap()).unwrap();
assert!(request.enable);
assert_eq!(request.mode, Some(Mode::ScreenOff));
assert_eq!(response(&header, &request, true, 1), [10, 2, 8, 42, 26, 6, 8, 1, 16, 3, 24, 1]);
assert_eq!(response(&header, &request, false, 3), [10, 2, 8, 42, 26, 4, 16, 3, 24, 3]);
assert_eq!(state_change(2), [42, 4, 16, 2, 24, 2]);
let saver = crate::protocol::decode_wire(&[10, 2, 8, 7, 0xca, 1, 0]).unwrap();
assert_eq!(screensaver_response(&saver).unwrap(), [10, 2, 8, 7, 0xaa, 1, 0]);
}
}
+61
View File
@@ -0,0 +1,61 @@
//! Recovery record beside the config (`privacy-power.json`, 0600) and the process lock.
use super::Mode;
/// What a backend changed, so the guard or the next start can undo it after a crash.
/// `data` belongs to the backend named in `backend`.
#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
pub struct Record { pub backend: String, pub mode: Mode, pub data: serde_json::Value }
pub fn path() -> std::path::PathBuf { crate::config::path().with_file_name("privacy-power.json") }
pub fn pending() -> bool { path().exists() }
/// One process controls the outputs of a config directory (host, probe, guard). Only success is
/// kept: a lock still held by a dying host must be retried (the guard polls this).
pub fn ownership() -> Result<(), String> {
use std::os::{fd::AsRawFd, unix::fs::OpenOptionsExt};
static LOCK: std::sync::Mutex<Option<std::fs::File>> = std::sync::Mutex::new(None);
let mut held = LOCK.lock().map_err(|_| "privacy lock state poisoned")?;
if held.is_some() { return Ok(()); }
let path = path().with_extension("lock");
std::fs::create_dir_all(path.parent().ok_or("missing config directory")?).map_err(|e| e.kind().to_string())?;
let file = std::fs::OpenOptions::new().read(true).write(true).create(true).mode(0o600)
.open(path).map_err(|e| e.kind().to_string())?;
if unsafe { libc::flock(file.as_raw_fd(), libc::LOCK_EX | libc::LOCK_NB) } != 0 {
return Err("output control is owned by another process".into());
}
*held = Some(file);
Ok(())
}
pub fn load() -> Option<Record> { serde_json::from_slice(&std::fs::read(path()).ok()?).ok() }
fn store(record: &Record) -> Result<(), String> {
use std::{io::Write, os::unix::fs::OpenOptionsExt};
let path = path();
std::fs::create_dir_all(path.parent().ok_or("missing config directory")?).map_err(|e| e.kind().to_string())?;
let tmp = path.with_extension("tmp");
let mut file = std::fs::OpenOptions::new().write(true).create(true).truncate(true).mode(0o600)
.open(&tmp).map_err(|e| e.kind().to_string())?;
file.write_all(&serde_json::to_vec(record).map_err(|_| "invalid saved state")?).map_err(|e| e.kind().to_string())?;
file.sync_all().map_err(|e| e.kind().to_string())?;
std::fs::rename(tmp, path).map_err(|e| e.kind().to_string())
}
pub fn remove() -> Result<(), String> {
std::fs::remove_file(path()).or_else(|e| if e.kind() == std::io::ErrorKind::NotFound { Ok(()) } else { Err(e) })
.map_err(|e| format!("remove recovery record: {}", e.kind()))
}
/// Handed to `Backend::enter`: save what undoes a step before making it.
pub struct Journal { record: Record, saved: bool }
impl Journal {
pub fn new(backend: &str, mode: Mode) -> Self {
Self { record: Record { backend: backend.into(), mode, data: serde_json::Value::Null }, saved: false }
}
pub fn save<T: serde::Serialize>(&mut self, data: &T) -> Result<(), String> {
self.record.data = serde_json::to_value(data).map_err(|_| "invalid saved state")?;
store(&self.record)?;
self.saved = true;
Ok(())
}
/// The last saved record; None when the backend changed nothing.
pub fn into_record(self) -> Option<Record> { self.saved.then_some(self.record) }
}
+50
View File
@@ -0,0 +1,50 @@
//! External desktop tools shared by the backends.
use std::process::{Command, Stdio};
// timeout bounds desktop tools even when their compositor/D-Bus service stops responding.
pub fn run(tool: &str, args: &[String]) -> Result<String, String> {
let out = Command::new("timeout").args(["--kill-after=1", "5", tool]).args(args)
.env("LC_ALL", "C").stdin(Stdio::null()).stderr(Stdio::null()).output()
.map_err(|e| format!("{tool} unavailable: {}", e.kind()))?;
if !out.status.success() { return Err(format!("{tool} failed: {}", out.status)); }
String::from_utf8(out.stdout).map_err(|_| "invalid display tool output".into())
}
pub fn available(tool: &str) -> bool {
use std::os::unix::fs::PermissionsExt;
std::env::var_os("PATH").is_some_and(|paths| std::env::split_paths(&paths).any(|p|
p.join(tool).metadata().is_ok_and(|m| m.is_file() && m.permissions().mode() & 0o111 != 0)))
}
/// One session-bus method call through gdbus; returns its GVariant text.
pub fn gdbus(destination: &str, object: &str, method: &str, args: &[&str]) -> Result<String, String> {
let mut all: Vec<String> = ["call", "--session", "-d", destination, "-o", object, "-m", method].map(String::from).into();
all.extend(args.iter().map(|a| a.to_string()));
run("gdbus", &all)
}
/// `'key': <value>` from gdbus's text for an a{sv} (strings unquoted).
pub fn variant<'a>(text: &'a str, key: &str) -> Option<&'a str> {
let start = text.find(&format!("'{key}': <"))? + key.len() + 5;
let rest = &text[start..];
if let Some(quoted) = rest.strip_prefix('\'') { return quoted.split('\'').next(); }
rest.split('>').next()
}
/// Polls `done` for up to three seconds: desktop tools return before the compositor applies a change.
pub fn wait_until(mut done: impl FnMut() -> bool) -> bool {
for _ in 0..30 {
if done() { return true; }
std::thread::sleep(std::time::Duration::from_millis(100));
}
false
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn reads_properties_from_gdbus_text() {
let text = "({'alphaNumericKeyboard': <true>, 'enabled': <true>, 'name': <'AT Translated Set 2 keyboard'>, 'pointer': <false>},)";
assert_eq!(variant(text, "name"), Some("AT Translated Set 2 keyboard"));
assert_eq!(variant(text, "enabled"), Some("true"));
assert_eq!(variant(text, "pointer"), Some("false"));
assert_eq!(variant(text, "touch"), None);
}
}
+1 -2
View File
@@ -92,8 +92,7 @@ pub fn watch_locked() -> watch::Receiver<Option<bool>> {
if locked.is_none() { session = None; } // session ended or changed: look it up again if locked.is_none() { session = None; } // session ended or changed: look it up again
sender.send_if_modified(|current| if *current != locked { sender.send_if_modified(|current| if *current != locked {
log::info!("Desktop lock state: {}", match locked { Some(true) => "locked", Some(false) => "unlocked", None => "unknown" }); log::info!("Desktop lock state: {}", match locked { Some(true) => "locked", Some(false) => "unlocked", None => "unknown" });
// The viewer only sees black frames while locked and gives no hint (#61). if locked == Some(true) { log::info!("Desktop is locked; capture continues while the compositor supplies frames"); }
if locked == Some(true) { log::info!("Desktop is locked: viewers see a black screen until it is unlocked (viewer 自动解锁被控端, or `loginctl unlock-session` on the host)"); }
*current = locked; true *current = locked; true
} else { false }); } else { false });
std::thread::sleep(Duration::from_secs(1)); std::thread::sleep(Duration::from_secs(1));
+5 -6
View File
@@ -51,7 +51,7 @@ pub enum SignalingEvent {
BeControlled(Value), BeControlled(Value),
/// be-controlled with its binary app_data (ConnectOptions): capture type and the /// be-controlled with its binary app_data (ConnectOptions): capture type and the
/// ice_id it announces, when present. /// ice_id it announces, when present.
ConnectRequest { capture_type: u64, ice_id: Option<String>, transport:crate::session_ice::SessionIce, controller_mac: bool }, ConnectRequest { capture_type: u64, ice_id: Option<String>, transport:crate::session_ice::SessionIce, controller: crate::input::Controller },
Soac(SoacMessage), Soac(SoacMessage),
Released(Value), Released(Value),
Left(Value), Left(Value),
@@ -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",
@@ -513,10 +513,9 @@ impl SignalingClient {
if !caps.is_empty() { log::info!("Viewer decoder caps (fps,codec,w,h,chroma fields): {:?}", caps); } if !caps.is_empty() { log::info!("Viewer decoder caps (fps,codec,w,h,chroma fields): {:?}", caps); }
// Viewer platform (website enum: 1 windows, 2 android, 3 ios, 4 macos, 5 tv). // Viewer platform (website enum: 1 windows, 2 android, 3 ios, 4 macos, 5 tv).
let platform = header.get("controller_platform").or_else(|| header.get("data").and_then(|d| d.get("controller_platform"))); let platform = header.get("controller_platform").or_else(|| header.get("data").and_then(|d| d.get("controller_platform")));
let controller_mac = platform.is_some_and(|v| v.as_i64() == Some(4) let controller = crate::input::Controller::from_platform(platform);
|| v.as_str().is_some_and(|s| s == "4" || s.to_ascii_lowercase().contains("mac") || s.to_ascii_lowercase().contains("darwin"))); log::info!("Controller platform: {} controller={:?}", platform.map(|v| v.to_string()).unwrap_or_default().chars().take(24).collect::<String>(), controller);
log::info!("Controller platform: {} mac={}", platform.map(|v| v.to_string()).unwrap_or_default().chars().take(24).collect::<String>(), controller_mac); if !send_event(&event_sender, SignalingEvent::ConnectRequest { capture_type, ice_id, transport:crate::session_ice::SessionIce::from_header(&header), controller }).await { break; }
if !send_event(&event_sender, SignalingEvent::ConnectRequest { capture_type, ice_id, transport:crate::session_ice::SessionIce::from_header(&header), controller_mac }).await { break; }
} }
} }
} }
+5
View File
@@ -36,6 +36,8 @@ pub(crate) struct Settings {
/// video field cannot drop auto_lock / mute when the document is loaded. /// video field cannot drop auto_lock / mute when the document is loaded.
#[serde(default, deserialize_with = "lenient_string")] pub(crate) video_encoder: Option<String>, #[serde(default, deserialize_with = "lenient_string")] pub(crate) video_encoder: Option<String>,
#[serde(default, deserialize_with = "lenient_string")] pub(crate) video_codec: Option<String>, #[serde(default, deserialize_with = "lenient_string")] pub(crate) video_codec: Option<String>,
/// Last privacy_type the viewer enabled (2 picture, 3 screen off), not the current live state.
#[serde(default)] pub(crate) privacy_type: Option<u8>,
} }
fn lenient_string<'de, D: serde::Deserializer<'de>>(deserializer: D) -> Result<Option<String>, D::Error> { fn lenient_string<'de, D: serde::Deserializer<'de>>(deserializer: D) -> Result<Option<String>, D::Error> {
@@ -260,6 +262,7 @@ impl PeerActions {
if self.started.swap(true, Ordering::Relaxed) { return; } if self.started.swap(true, Ordering::Relaxed) { return; }
let mut state = state().lock().unwrap(); let mut state = state().lock().unwrap();
state.desktop_sessions += 1; state.desktop_sessions += 1;
crate::privacy_screen::session_started();
if state.desktop_sessions == 1 && state.settings.keep_mute { if state.desktop_sessions == 1 && state.settings.keep_mute {
mute_for_session(&mut state); mute_for_session(&mut state);
log::info!("Host muted for remote session (静音运行)"); log::info!("Host muted for remote session (静音运行)");
@@ -272,6 +275,7 @@ impl PeerActions {
if !self.started.swap(false, Ordering::Relaxed) { return; } if !self.started.swap(false, Ordering::Relaxed) { return; }
let mut state = state().lock().unwrap(); let mut state = state().lock().unwrap();
state.desktop_sessions = state.desktop_sessions.saturating_sub(1); state.desktop_sessions = state.desktop_sessions.saturating_sub(1);
crate::privacy_screen::session_ended();
if state.desktop_sessions > 0 { return; } if state.desktop_sessions > 0 { return; }
crate::virtual_audio::disable(); crate::virtual_audio::disable();
if !state.settings.mute_permanent { restore_mute(&mut state); } if !state.settings.mute_permanent { restore_mute(&mut state); }
@@ -287,6 +291,7 @@ impl PeerActions {
let current = state().lock().unwrap().settings.clone(); let current = state().lock().unwrap().settings.clone();
payload_with_settings(desktop, desktop, desktop, &home, &crate::system_metrics::Settings { payload_with_settings(desktop, desktop, desktop, &home, &crate::system_metrics::Settings {
sound, keep_mute: current.keep_mute, mute_permanent: current.mute_permanent, auto_lock: current.auto_lock, sound, keep_mute: current.keep_mute, mute_permanent: current.mute_permanent, auto_lock: current.auto_lock,
private_screen: crate::privacy_screen::supported().then(crate::privacy_screen::current_type),
}) })
} }
} }
+36 -12
View File
@@ -27,10 +27,15 @@ pub fn payload_with_location(capture: Permission, operation: Permission, control
/// Optional host settings the viewer shows in 声音 / 安全 (SettingMetric 1 keep_mute, /// Optional host settings the viewer shows in 声音 / 安全 (SettingMetric 1 keep_mute,
/// 2 mute_permanent, 3 auto_lock; GeneralMetric 2 system_sound_support). /// 2 mute_permanent, 3 auto_lock; GeneralMetric 2 system_sound_support).
#[derive(Debug, Default, Clone, Copy)] #[derive(Debug, Default, Clone, Copy)]
pub struct Settings { pub sound: bool, pub keep_mute: bool, pub mute_permanent: bool, pub auto_lock: bool } pub struct Settings { pub sound: bool, pub keep_mute: bool, pub mute_permanent: bool, pub auto_lock: bool, pub private_screen: Option<u8> }
pub fn payload_with_settings(capture: Permission, operation: Permission, control: Permission, location: &str, settings: &Settings) -> Vec<u8> { pub fn payload_with_settings(capture: Permission, operation: Permission, control: Permission, location: &str, settings: &Settings) -> Vec<u8> {
let mut setting = Vec::new(); let mut setting = Vec::new();
// Mac 4.43.0 callBackSystemMetrics reads field 7 first, falling back to field 4 only when 7=0.
// Report the effective mode (1 off, 2 picture, 3 screen off), not the saved preference.
if let Some(kind) = settings.private_screen {
setting.extend([4 << 3, u8::from(kind != 1), 7 << 3, kind]);
}
for (field, on) in [(1u8, settings.keep_mute), (2, settings.mute_permanent), (3, settings.auto_lock)] { for (field, on) in [(1u8, settings.keep_mute), (2, settings.mute_permanent), (3, settings.auto_lock)] {
if on { setting.push(field << 3); setting.push(1); } if on { setting.push(field << 3); setting.push(1); }
} }
@@ -47,7 +52,13 @@ pub fn payload_with_settings(capture: Permission, operation: Permission, control
} }
// SystemMetrics.general: system_sound_support = SS_SUPPORT (2) when desktop audio is streamed // SystemMetrics.general: system_sound_support = SS_SUPPORT (2) when desktop audio is streamed
// (GvPb_SystemSoundSupport: 0 unknown, 1 nonsupport, 2 support). // (GvPb_SystemSoundSupport: 0 unknown, 1 nonsupport, 2 support).
let mut out = if settings.sound { vec![26, 2, 16, 2] } else { vec![26, 0] }; // Official Mac host 4.43.0 (626), arm64: SystemMetricsHandler (0x10000a96c)
// appends GENERAL=1 (0x10000abe8) and SETTING=2 (helper 0x10000a230, write
// 0x10000a64c) as it fills those sections; traverse (0x100423840) packs field 1.
// We always report both sections. The Mac viewer ignores an empty list
// (callBackSystemMetrics, 0x1003b4584). Host evidence: docs/privacy-screen.md.
let mut out = vec![10, 2, 1, 2];
out.extend(if settings.sound { &[26, 2, 16, 2][..] } else { &[26, 0][..] });
// No support_touch, sound capability, win_os_ver, private-screen, virtual // No support_touch, sound capability, win_os_ver, private-screen, virtual
// mouse, auto-lock, file path or optional feature claims are fabricated. // mouse, auto-lock, file path or optional feature claims are fabricated.
out.push(34); // SystemMetrics.setting field 4 out.push(34); // SystemMetrics.setting field 4
@@ -81,27 +92,29 @@ mod tests {
fn measured_allow_capabilities_use_official_enum_values() { fn measured_allow_capabilities_use_official_enum_values() {
let p = payload(Permission::Allow, Permission::Allow, Permission::Allow); let p = payload(Permission::Allow, Permission::Allow, Permission::Allow);
let fields = decode_wire(&p).unwrap(); let fields = decode_wire(&p).unwrap();
assert_eq!(fields.len(), 2); assert_eq!(fields.len(), 3);
assert_eq!(fields[0].number, 3); assert_eq!(fields[0].number, 1);
assert_eq!(fields[0].value, WireValue::Bytes(&[])); assert_eq!(fields[0].value, WireValue::Bytes(&[1, 2]));
let WireValue::Bytes(setting) = fields[1].value else { panic!("setting not a message") }; assert_eq!(fields[1].number, 3);
assert_eq!(fields[1].number, 4); assert_eq!(fields[1].value, WireValue::Bytes(&[]));
let WireValue::Bytes(setting) = fields[2].value else { panic!("setting not a message") };
assert_eq!(fields[2].number, 4);
let s = decode_wire(setting).unwrap(); let s = decode_wire(setting).unwrap();
assert_eq!(s.iter().map(|f| f.number).collect::<Vec<_>>(), vec![8, 9, 10]); assert_eq!(s.iter().map(|f| f.number).collect::<Vec<_>>(), vec![8, 9, 10]);
assert!(s.iter().all(|f| f.value == WireValue::Varint(2))); assert!(s.iter().all(|f| f.value == WireValue::Varint(2)));
} }
#[test] #[test]
fn rejected_and_unknown_observations_are_not_promoted_to_allow() { fn rejected_and_unknown_observations_are_not_promoted_to_allow() {
assert_eq!(payload(Permission::Unknown, Permission::Unknown, Permission::Unknown), vec![26, 0, 34, 0]); assert_eq!(payload(Permission::Unknown, Permission::Unknown, Permission::Unknown), vec![10, 2, 1, 2, 26, 0, 34, 0]);
assert_eq!(payload(Permission::Allow, Permission::Reject, Permission::Reject), vec![26, 0, 34, 6, 64, 2, 72, 1, 80, 1]); assert_eq!(payload(Permission::Allow, Permission::Reject, Permission::Reject), vec![10, 2, 1, 2, 26, 0, 34, 6, 64, 2, 72, 1, 80, 1]);
} }
#[test] #[test]
fn emits_no_audio_touch_windows_or_auto_unlock_capability() { fn emits_no_audio_touch_windows_or_auto_unlock_capability() {
let p = payload(Permission::Allow, Permission::Allow, Permission::Allow); let p = payload(Permission::Allow, Permission::Allow, Permission::Allow);
let fields = decode_wire(&p).unwrap(); let fields = decode_wire(&p).unwrap();
let WireValue::Bytes(general) = fields[0].value else { panic!() }; let WireValue::Bytes(general) = fields[1].value else { panic!() };
assert!(general.is_empty()); assert!(general.is_empty());
let WireValue::Bytes(setting) = fields[1].value else { panic!() }; let WireValue::Bytes(setting) = fields[2].value else { panic!() };
assert!(decode_wire(setting).unwrap().iter().all(|f| (8..=10).contains(&f.number))); assert!(decode_wire(setting).unwrap().iter().all(|f| (8..=10).contains(&f.number)));
} }
#[test] #[test]
@@ -109,10 +122,21 @@ mod tests {
let home = "/home/user/".repeat(12); let home = "/home/user/".repeat(12);
let p = payload_with_location(Permission::Allow, Permission::Allow, Permission::Allow, &home); let p = payload_with_location(Permission::Allow, Permission::Allow, Permission::Allow, &home);
let fields = decode_wire(&p).unwrap(); let fields = decode_wire(&p).unwrap();
let WireValue::Bytes(setting) = fields[1].value else { panic!() }; let WireValue::Bytes(setting) = fields[2].value else { panic!() };
let s = decode_wire(setting).unwrap(); let s = decode_wire(setting).unwrap();
assert_eq!(s[0].number, 5); assert_eq!(s[0].number, 5);
assert_eq!(s[0].value, WireValue::Bytes(home.as_bytes())); assert_eq!(s[0].value, WireValue::Bytes(home.as_bytes()));
assert_eq!(decode_wire(&remote_download_path("/home/x")).unwrap()[0].value, WireValue::Bytes(b"/home/x")); assert_eq!(decode_wire(&remote_download_path("/home/x")).unwrap()[0].value, WireValue::Bytes(b"/home/x"));
} }
#[test]
fn privacy_modes_report_matching_flag_and_current_type() {
for (kind, expected) in [(1, [32, 0, 56, 1]), (2, [32, 1, 56, 2]), (3, [32, 1, 56, 3])] {
let settings = Settings { private_screen: Some(kind), ..Settings::default() };
let p = payload_with_settings(Permission::Unknown, Permission::Unknown, Permission::Unknown, "", &settings);
let fields = decode_wire(&p).unwrap();
assert_eq!(fields[0].number, 1);
assert_eq!(fields[0].value, WireValue::Bytes(&[1, 2]));
assert_eq!(fields.iter().find(|f| f.number == 4).unwrap().value, WireValue::Bytes(&expected));
}
}
} }
+92
View File
@@ -0,0 +1,92 @@
//! Per-peer TEXT backlog: one current metrics snapshot and bounded ordered replies.
use std::sync::{Arc, atomic::{AtomicBool, Ordering}};
use tokio::sync::{mpsc, watch};
const REPLY_CAPACITY: usize = 64;
#[derive(Clone)]
pub(super) struct Sender {
replies: mpsc::Sender<Vec<u8>>,
metrics: watch::Sender<Option<Vec<u8>>>,
overflow_reported: Arc<AtomicBool>,
}
pub(super) struct Receiver {
replies: mpsc::Receiver<Vec<u8>>,
metrics: watch::Receiver<Option<Vec<u8>>>,
metrics_open: bool,
replies_open: bool,
}
pub(super) fn channel() -> (Sender, Receiver) {
let (replies, rx) = mpsc::channel(REPLY_CAPACITY);
let (metrics, latest) = watch::channel(None);
(Sender { replies, metrics, overflow_reported: Arc::new(AtomicBool::new(false)) },
Receiver { replies: rx, metrics: latest, metrics_open: true, replies_open: true })
}
impl Sender {
pub(super) fn send(&self, message: Vec<u8>) -> Result<(), mpsc::error::SendError<Vec<u8>>> {
self.replies.try_send(message).map_err(|error| {
// Never wait for TEXT inside CONTROL's request handler: some viewers never open it.
if matches!(error, mpsc::error::TrySendError::Full(_))
&& !self.overflow_reported.swap(true, Ordering::Relaxed) {
log::warn!("TEXT reply queue full; dropping excess replies");
}
mpsc::error::SendError(error.into_inner())
})
}
pub(super) fn metrics(&self, message: Vec<u8>) {
let _ = self.metrics.send(Some(message));
}
}
impl Receiver {
pub(super) async fn recv(&mut self) -> Option<Vec<u8>> {
loop {
if !self.metrics_open && !self.replies_open { return None; }
tokio::select! {
changed = self.metrics.changed(), if self.metrics_open => {
if changed.is_err() { self.metrics_open = false; continue; }
if let Some(message) = self.metrics.borrow_and_update().clone() { return Some(message); }
}
message = self.replies.recv(), if self.replies_open => match message {
Some(message) => return Some(message),
None => self.replies_open = false,
},
}
}
}
}
#[cfg(test)]
mod tests {
use super::*;
#[tokio::test]
async fn unopened_text_keeps_latest_metrics_and_bounded_fifo_replies() {
let (tx, mut rx) = channel();
for i in 0..10_000u32 { tx.metrics(i.to_le_bytes().to_vec()); }
for i in 0..REPLY_CAPACITY { tx.send(vec![i as u8]).unwrap(); }
assert_eq!(tx.send(vec![255]).unwrap_err().0, vec![255]);
let mut replies = Vec::new();
let mut metrics = Vec::new();
for _ in 0..REPLY_CAPACITY + 1 {
let message = rx.recv().await.unwrap();
if message.len() == 4 { metrics.push(message); } else { replies.push(message[0]); }
}
assert_eq!(metrics, vec![9_999u32.to_le_bytes().to_vec()]);
assert_eq!(replies, (0..REPLY_CAPACITY as u8).collect::<Vec<_>>());
assert!(tokio::time::timeout(std::time::Duration::from_millis(20), rx.recv()).await.is_err());
tx.send(vec![100]).unwrap();
assert_eq!(rx.recv().await, Some(vec![100]));
drop(tx);
assert_eq!(rx.recv().await, None);
}
#[tokio::test]
async fn closed_text_rejects_replies() {
let (tx, rx) = channel();
tx.metrics(vec![13]);
tx.send(vec![22]).unwrap();
drop(rx);
assert!(tx.send(vec![23]).is_err());
tx.metrics(vec![14]);
}
}
+48
View File
@@ -10,6 +10,29 @@
//! buttons and wheels, like a QEMU tablet). Mixing relative and absolute axes in one device //! buttons and wheels, like a QEMU tablet). Mixing relative and absolute axes in one device
//! confuses libinput. //! confuses libinput.
#[repr(C)]
#[derive(Clone, Copy, Default)]
pub struct TextKey { pub code: u16, pub shift: u16 }
/// Resolve an ASCII prefix against the host's current XKB layout and locked modifiers.
/// X11/XWayland is queried read-only; the returned events are emitted through uinput.
pub fn text_plan(text: &str) -> Vec<TextKey> {
#[cfg(target_os = "linux")]
{
extern "C" {
fn uu_uinput_text_plan(text: *const u8, length: usize, plan: *mut TextKey, capacity: usize) -> usize;
}
let capacity = text.bytes().take_while(u8::is_ascii).count();
if capacity == 0 { return Vec::new(); }
let mut plan = vec![TextKey::default(); capacity];
let count = unsafe { uu_uinput_text_plan(text.as_ptr(), text.len(), plan.as_mut_ptr(), plan.len()) };
plan.truncate(count);
plan
}
#[cfg(not(target_os = "linux"))]
{ let _ = text; Vec::new() }
}
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
mod imp { mod imp {
use std::fs::{File, OpenOptions}; use std::fs::{File, OpenOptions};
@@ -95,6 +118,31 @@ mod imp {
pub struct Devices { keyboard: Mutex<Device>, pointer: Mutex<Device> } pub struct Devices { keyboard: Mutex<Device>, pointer: Mutex<Device> }
impl Devices { impl Devices {
#[cfg(test)]
pub fn recording_for_test() -> (Self, File, File) {
let recording = || {
let path = std::env::temp_dir().join(format!("uu-uinput-test-{}-{}", std::process::id(), rand::random::<u64>()));
let file = OpenOptions::new().read(true).write(true).create_new(true).mode(0o600).open(&path).unwrap();
std::fs::remove_file(path).unwrap();
let reader = file.try_clone().unwrap();
(Mutex::new(Device(file)), reader)
};
let (keyboard, keys) = recording();
let (pointer, mouse) = recording();
(Self { keyboard, pointer }, keys, mouse)
}
#[cfg(test)]
pub fn recorded_events_for_test(file: &mut File) -> Vec<(u16, u16, i32)> {
use std::io::{Read, Seek, SeekFrom};
file.seek(SeekFrom::Start(0)).unwrap();
let mut data = Vec::new();
file.read_to_end(&mut data).unwrap();
assert_eq!(data.len() % std::mem::size_of::<InputEvent>(), 0);
data.chunks_exact(std::mem::size_of::<InputEvent>()).map(|chunk| {
let event = unsafe { std::ptr::read_unaligned(chunk.as_ptr().cast::<InputEvent>()) };
(event.kind, event.code, event.value)
}).collect()
}
pub fn open() -> std::io::Result<Self> { pub fn open() -> std::io::Result<Self> {
let keyboard = Device::create("uu-remote-linux keyboard", 1, |d| { let keyboard = Device::create("uu-remote-linux keyboard", 1, |d| {
d.ioctl(UI_SET_EVBIT, EV_KEY.into())?; d.ioctl(UI_SET_EVBIT, EV_KEY.into())?;
+40 -9
View File
@@ -374,6 +374,9 @@ pub async fn ffmpeg_encoders() -> Option<Vec<&'static str>> {
/// Installing FFmpeg clears the window line on the next check; no restart is needed. /// Installing FFmpeg clears the window line on the next check; no restart is needed.
pub fn check_ffmpeg_usable() { pub fn check_ffmpeg_usable() {
if crate::desktop_backend::headless() { return; } if crate::desktop_backend::headless() { return; }
#[cfg(feature = "inproc-av")]
if native_engine_eligible(crate::video_select::selection().encoder, NativeDisplayKind::Portal)
&& native_display_kind() == NativeDisplayKind::Portal { return; }
tokio::spawn(async { tokio::spawn(async {
static LAST_NOTICE: std::sync::Mutex<Option<Instant>> = std::sync::Mutex::new(None); static LAST_NOTICE: std::sync::Mutex<Option<Instant>> = std::sync::Mutex::new(None);
let summary = crate::i18n::s("无法传输远程画面","Cannot stream the remote desktop"); let summary = crate::i18n::s("无法传输远程画面","Cannot stream the remote desktop");
@@ -515,7 +518,7 @@ pub(crate) async fn probe_encoder_idr(encoder: Encoder) -> crate::video_select::
} }
/// True when `read_encoder_with` would open the in-process engine for this candidate /// True when `read_encoder_with` would open the in-process engine for this candidate
/// on the selected desktop backend (X11 only; not Wayland, portal, KMS, or headless). /// on the selected backend (X11 hardware encoders, or Portal VAAPI).
fn native_engine_would_run(encoder: Encoder) -> bool { fn native_engine_would_run(encoder: Encoder) -> bool {
native_engine_eligible(encoder, native_display_kind()) native_engine_eligible(encoder, native_display_kind())
} }
@@ -695,7 +698,7 @@ async fn read_encoder(
if encoder == Encoder::Cpu { return read_encoder_with(size,display,portal,latest,Encoder::Cpu,true,sequence,settings,idr,budget,selection).await; } if encoder == Encoder::Cpu { return read_encoder_with(size,display,portal,latest,Encoder::Cpu,true,sequence,settings,idr,budget,selection).await; }
#[cfg_attr(not(feature = "inproc-av"), allow(unused_mut))] #[cfg_attr(not(feature = "inproc-av"), allow(unused_mut))]
let mut result = read_encoder_with(size,display.clone(),portal.clone(),latest.clone(),encoder,true,sequence.clone(),settings,idr.clone(),budget.clone(),selection).await; let mut result = read_encoder_with(size,display.clone(),portal.clone(),latest.clone(),encoder,true,sequence.clone(),settings,idr.clone(),budget.clone(),selection).await;
// A failed native NVENC session (old driver, unsupported mode) still leaves FFmpeg's NVENC process pipeline. // A failed native session still leaves the matching FFmpeg hardware pipeline.
#[cfg(feature = "inproc-av")] #[cfg(feature = "inproc-av")]
if let Err(error) = &result { if let Err(error) = &result {
if !latest.is_closed() && native_inproc(&display, portal.is_some(), encoder) && x11_resized(&display, portal.is_some(), size).is_none() { if !latest.is_closed() && native_inproc(&display, portal.is_some(), encoder) && x11_resized(&display, portal.is_some(), size).is_none() {
@@ -720,18 +723,19 @@ fn x11_resized(display: &str, portal: bool, size: (u32, u32)) -> Option<(u32, u3
crate::capture::x11_size().filter(|current| *current != size) crate::capture::x11_size().filter(|current| *current != size)
} }
/// Same predicate `native_inproc` uses: X11 only, and the in-process engine is selected. /// Same predicate `native_inproc` uses for backend/encoder eligibility.
#[derive(Clone, Copy, Debug, PartialEq, Eq)] #[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub(crate) enum NativeDisplayKind { X11, Wayland, Portal, Kms, None } pub(crate) enum NativeDisplayKind { X11, Wayland, Portal, Kms, None }
pub(crate) fn native_engine_eligible(encoder: Encoder, kind: NativeDisplayKind) -> bool { pub(crate) fn native_engine_eligible(encoder: Encoder, kind: NativeDisplayKind) -> bool {
#[cfg(feature = "inproc-av")] #[cfg(feature = "inproc-av")]
{ kind == NativeDisplayKind::X11 && crate::inproc_encoder::selected(encoder) } { (kind == NativeDisplayKind::X11 || (kind == NativeDisplayKind::Portal && encoder == Encoder::Vaapi))
&& crate::inproc_encoder::selected(encoder) }
#[cfg(not(feature = "inproc-av"))] #[cfg(not(feature = "inproc-av"))]
{ let _ = (encoder, kind); false } { let _ = (encoder, kind); false }
} }
/// The native in-process NVENC path serves X11 only (not Wayland/KMS capture or a portal session). /// NVENC serves X11; VAAPI also accepts frames from the existing Portal session.
#[cfg(feature = "inproc-av")] #[cfg(feature = "inproc-av")]
fn native_inproc(display: &str, portal: bool, encoder: Encoder) -> bool { fn native_inproc(display: &str, portal: bool, encoder: Encoder) -> bool {
native_engine_eligible(encoder, display_kind(display, portal)) native_engine_eligible(encoder, display_kind(display, portal))
@@ -749,7 +753,7 @@ fn display_kind(display: &str, portal: bool) -> NativeDisplayKind {
#[cfg(feature = "inproc-av")] #[cfg(feature = "inproc-av")]
async fn read_inprocess( async fn read_inprocess(
config: crate::inproc_encoder::Config, latest: mpsc::Sender<Arc<CompleteFrame>>, config: crate::inproc_encoder::Config, latest: mpsc::Sender<Arc<CompleteFrame>>,
sequence: Arc<std::sync::atomic::AtomicU64>, idr: Arc<AtomicBool>, budget: Arc<Semaphore>, sequence: Arc<std::sync::atomic::AtomicU64>, idr: Arc<AtomicBool>, budget: Arc<Semaphore>, source: (usize, u64),
) -> Result<(), String> { ) -> Result<(), String> {
let codec = config.codec; let codec = config.codec;
let (units_tx, mut units) = mpsc::channel::<crate::inproc_encoder::EncodedUnit>(4); let (units_tx, mut units) = mpsc::channel::<crate::inproc_encoder::EncodedUnit>(4);
@@ -765,7 +769,7 @@ async fn read_inprocess(
let mut gate = DependencyGate::default(); let mut gate = DependencyGate::default();
while let Some(unit) = units.recv().await { while let Some(unit) = units.recv().await {
let sequence = sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed) + 1; let sequence = sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed) + 1;
gate.submit(&latest, Arc::new(CompleteFrame { source_generation: 0, source_id: 0, codec, sequence, completed_at: unit.completed_at, data: unit.data, _permit: Some(unit.permit) })); gate.submit(&latest, Arc::new(CompleteFrame { source_generation: source.1, source_id: source.0, codec, sequence, completed_at: unit.completed_at, data: unit.data, _permit: Some(unit.permit) }));
if latest.is_closed() { break; } if latest.is_closed() { break; }
} }
// Dropping the receiver also unblocks the encoder if it is waiting to send. // Dropping the receiver also unblocks the encoder if it is waiting to send.
@@ -832,6 +836,7 @@ async fn read_encoder_with(
if allow_inproc && x11_region.is_none() && native_inproc(&display, portal.is_some(), encoder) { if allow_inproc && x11_region.is_none() && native_inproc(&display, portal.is_some(), encoder) {
let max_kbps = settings.max_kbps().unwrap_or(30_000) as i64; let max_kbps = settings.max_kbps().unwrap_or(30_000) as i64;
let config = crate::inproc_encoder::Config { let config = crate::inproc_encoder::Config {
portal: portal.clone(),
display: display.clone(), input: size, output: settings.output, fps: u32::from(settings.fps), display: display.clone(), input: size, output: settings.output, fps: u32::from(settings.fps),
gop: gop_frames(settings.fps, true) as u32, cq: settings.cq() as u32, gop: gop_frames(settings.fps, true) as u32, cq: settings.cq() as u32,
target_bps: settings.max_kbps().map_or(16_000, |k| i64::from(k) * 3 / 4) * 1000, target_bps: settings.max_kbps().map_or(16_000, |k| i64::from(k) * 3 / 4) * 1000,
@@ -841,7 +846,7 @@ async fn read_encoder_with(
log::info!("Desktop encoder: display={} source={}x{} output={:?} fps={} cq={} maxrate={}k encoder={} source={} pipeline=in-process", log::info!("Desktop encoder: display={} source={}x{} output={:?} fps={} cq={} maxrate={}k encoder={} source={} pipeline=in-process",
display,size.0,size.1,settings.output,settings.fps,config.cq,max_kbps,encoder.name_for(settings.codec), display,size.0,size.1,settings.output,settings.fps,config.cq,max_kbps,encoder.name_for(settings.codec),
crate::video_select::encoder_source_label(selection.encoder_source)); crate::video_select::encoder_source_label(selection.encoder_source));
return read_inprocess(config, latest, sequence, idr, budget).await; return read_inprocess(config, latest, sequence, idr, budget, (settings.source_id, settings.source_generation)).await;
} }
let source_size = size; let source_size = size;
let size = format!("{}x{}", size.0, size.1); let size = format!("{}x{}", size.0, size.1);
@@ -1196,6 +1201,8 @@ pub async fn stream_desktop_at(pc: Arc<RTCPeerConnection>, track: Arc<crate::vid
} }
}; };
let mut reader = EncoderTask(tokio::spawn(open(size, live_selection, current))); let mut reader = EncoderTask(tokio::spawn(open(size, live_selection, current)));
// The privacy screen swaps the portal stream to a virtual output that can have another size.
let mut portal_size = portal.as_ref().map(|p| p.size());
let mut previous = None; let mut previous = None;
let mut timeline = RtpTimeline { fps: u64::from(current.fps), ..Default::default() }; let mut timeline = RtpTimeline { fps: u64::from(current.fps), ..Default::default() };
let mut settings_open = true; let mut settings_open = true;
@@ -1297,7 +1304,19 @@ pub async fn stream_desktop_at(pc: Arc<RTCPeerConnection>, track: Arc<crate::vid
} }
return result; return result;
}, },
_ = health.tick() => { if transport_closed(&pc) { return Ok(()); } }, _ = health.tick() => {
if transport_closed(&pc) { return Ok(()); }
let now = portal.as_ref().map(|p| p.size());
if now != portal_size {
log::info!("Portal stream size changed; restarting capture");
portal_size = now;
reader.0.abort();
let _ = (&mut reader.0).await;
while receiver.try_recv().is_ok() {}
idr.store(true, std::sync::atomic::Ordering::Relaxed);
reader.0 = tokio::spawn(open(size, live_selection, current));
}
},
changed = settings.changed(), if settings_open => { changed = settings.changed(), if settings_open => {
if changed.is_err() { settings_open = false; } if changed.is_err() { settings_open = false; }
continue; continue;
@@ -1514,6 +1533,18 @@ mod tests {
} }
} }
#[test]
fn portal_native_pipeline_only_accepts_vaapi() {
assert!(!native_engine_eligible(Encoder::Cpu, NativeDisplayKind::Portal));
assert!(!native_engine_eligible(Encoder::Nvenc, NativeDisplayKind::Portal));
#[cfg(feature = "inproc-av")]
assert_eq!(native_engine_eligible(Encoder::Vaapi, NativeDisplayKind::Portal),
crate::inproc_encoder::selected(Encoder::Vaapi));
for kind in [NativeDisplayKind::Wayland, NativeDisplayKind::Kms, NativeDisplayKind::None] {
assert!(!native_engine_eligible(Encoder::Vaapi, kind));
}
}
#[test] #[test]
fn timing_probe_failure_keeps_modern_args() { fn timing_probe_failure_keeps_modern_args() {
let modern = b" -fps_mode mode\n -enc_time_base ratio\n"; let modern = b" -fps_mode mode\n -enc_time_base ratio\n";
+22 -1
View File
@@ -156,6 +156,16 @@ async fn send(channel:&RTCDataChannel,message:Vec<u8>)->Result<(),()>{
tokio::time::timeout(Duration::from_secs(2),channel.send(&bytes::Bytes::from(message))).await.map_err(|_|())?.map_err(|_|())?;Ok(()) tokio::time::timeout(Duration::from_secs(2),channel.send(&bytes::Bytes::from(message))).await.map_err(|_|())?.map_err(|_|())?;Ok(())
} }
pub struct Bridge {backend:Option<Backend>,pub enabled:bool,tx:Option<mpsc::Sender<Vec<u8>>>,task:Option<tokio::task::JoinHandle<()>>,target_mac:Option<bool>} pub struct Bridge {backend:Option<Backend>,pub enabled:bool,tx:Option<mpsc::Sender<Vec<u8>>>,task:Option<tokio::task::JoinHandle<()>>,target_mac:Option<bool>}
#[cfg(feature="viewer-sdl")]
fn sdl_backend(wayland:bool,niri:bool,tx:mpsc::Sender<ClipboardRequest>,find:impl Fn(&str)->Option<PathBuf>)->Option<Backend>{
if wayland && niri {
// SDL3 only retains a Wayland selection offer associated with its seat;
// niri's regular clipboard is not exposed through that seat state.
// Unlike GNOME, niri supports data-control, so polling wl-clipboard
// neither requires a focused toplevel nor creates transient windows.
CommandBackend::select(true,find).map(Backend::Command).or(Some(Backend::Sdl(tx)))
}else{Some(Backend::Sdl(tx))}
}
impl Bridge { impl Bridge {
pub fn new(desktop:bool)->Self{ pub fn new(desktop:bool)->Self{
let backend=if desktop{Backend::detect()}else{None};let enabled=backend.is_some(); let backend=if desktop{Backend::detect()}else{None};let enabled=backend.is_some();
@@ -163,7 +173,9 @@ impl Bridge {
} }
#[cfg(feature="viewer-sdl")] #[cfg(feature="viewer-sdl")]
pub fn sdl(tx:mpsc::Sender<ClipboardRequest>)->Self{ pub fn sdl(tx:mpsc::Sender<ClipboardRequest>)->Self{
let backend=(std::env::var("UU_VIEWER_CLIPBOARD").as_deref()!=Ok("0")).then_some(Backend::Sdl(tx)); let wayland=std::env::var_os("WAYLAND_DISPLAY").is_some_and(|v|!v.is_empty());
let backend=(std::env::var("UU_VIEWER_CLIPBOARD").as_deref()!=Ok("0"))
.then(||sdl_backend(wayland,std::env::var_os("NIRI_SOCKET").is_some(),tx,executable)).flatten();
Self{enabled:backend.is_some(),backend,tx:None,task:None,target_mac:None} Self{enabled:backend.is_some(),backend,tx:None,task:None,target_mac:None}
} }
pub fn set_target_mac(&mut self,mac:Option<bool>){self.target_mac=mac;} pub fn set_target_mac(&mut self,mac:Option<bool>){self.target_mac=mac;}
@@ -249,6 +261,15 @@ impl Drop for Bridge{fn drop(&mut self){self.stop();}}
assert!(select(true,&[]).is_none()); assert!(select(true,&[]).is_none());
} }
#[cfg(feature="viewer-sdl")] #[cfg(feature="viewer-sdl")]
#[test] fn niri_command_backend_avoids_sdl_seat_selection(){
let(tx,_rx)=mpsc::channel(1);
let find=|n:&str|n.starts_with("wl-").then(||PathBuf::from(n));
assert!(matches!(sdl_backend(true,true,tx.clone(),find),Some(Backend::Command(_))));
assert!(matches!(sdl_backend(true,true,tx.clone(),|_|None),Some(Backend::Sdl(_))));
assert!(matches!(sdl_backend(true,false,tx.clone(),find),Some(Backend::Sdl(_))));
assert!(matches!(sdl_backend(false,true,tx,find),Some(Backend::Sdl(_))));
}
#[cfg(feature="viewer-sdl")]
#[tokio::test] async fn unfocused_write_does_not_mark_remote_text_as_applied(){ #[tokio::test] async fn unfocused_write_does_not_mark_remote_text_as_applied(){
let(tx,mut rx)=mpsc::channel(8);let backend=Backend::Sdl(tx); let(tx,mut rx)=mpsc::channel(8);let backend=Backend::Sdl(tx);
let ui=tokio::spawn(async move{ let ui=tokio::spawn(async move{
+135
View File
@@ -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());
}
}
+180 -17
View File
@@ -3,7 +3,7 @@ use std::sync::{Arc, atomic::{AtomicBool,AtomicU32,Ordering}};
#[derive(Clone)] #[derive(Clone)]
pub struct Desktop { pub units:Latest<super::media::AccessUnit>, pub pli:Arc<AtomicBool>, pub reset:Arc<AtomicBool>, pub ssrc:Arc<AtomicU32> } pub struct Desktop { pub units:Latest<super::media::AccessUnit>, pub pli:Arc<AtomicBool>, pub reset:Arc<AtomicBool>, pub ssrc:Arc<AtomicU32> }
impl Default for Desktop { impl Default for Desktop {
fn default()->Self {Self{units:Latest::new(3),pli:Arc::new(AtomicBool::new(false)),reset:Arc::new(AtomicBool::new(false)),ssrc:Arc::new(AtomicU32::new(0))}} fn default()->Self {Self{units:Latest::new(8),pli:Arc::new(AtomicBool::new(false)),reset:Arc::new(AtomicBool::new(false)),ssrc:Arc::new(AtomicU32::new(0))}}
} }
/// `content` is the source picture size inside the (possibly padded) RGB canvas; None = full frame. /// `content` is the source picture size inside the (possibly padded) RGB canvas; None = full frame.
pub struct Frame { pub width:u32, pub height:u32, pub rgb:Vec<u8>, pub content:Option<(u32,u32)> } pub struct Frame { pub width:u32, pub height:u32, pub rgb:Vec<u8>, pub content:Option<(u32,u32)> }
@@ -15,19 +15,51 @@ pub trait FrameSink { fn present(&mut self,frame:&Frame)->Result<(),String>; }
/// Counts only (access units, presented frames, decode errors) for the periodic stats line. /// Counts only (access units, presented frames, decode errors) for the periodic stats line.
pub static STATS:[std::sync::atomic::AtomicU64;3]=[std::sync::atomic::AtomicU64::new(0),std::sync::atomic::AtomicU64::new(0),std::sync::atomic::AtomicU64::new(0)]; pub static STATS:[std::sync::atomic::AtomicU64;3]=[std::sync::atomic::AtomicU64::new(0),std::sync::atomic::AtomicU64::new(0),std::sync::atomic::AtomicU64::new(0)];
fn wants_key_frame(units:u64,presented:u64)->bool {presented==0 && units%30==0} fn wants_key_frame(units:u64,presented:u64)->bool {presented==0 && units%30==0}
/// True when an Annex-B access unit carries an IDR/IRAP slice the decoder can restart from. /// True when an Annex-B access unit carries a picture the decoder can restart from: an IDR/IRAP,
/// an H.264 recovery-point SEI or an H.264 I slice (some hosts answer PLI without an IDR, #136).
pub fn is_key_frame(codec:super::media::Codec,au:&[u8])->bool { pub fn is_key_frame(codec:super::media::Codec,au:&[u8])->bool {
au.windows(4).enumerate().filter(|(_,w)|w[..3]==[0,0,1]).any(|(_,w)|match codec { au.windows(4).enumerate().filter(|(_,w)|w[..3]==[0,0,1]).any(|(i,w)|match codec {
super::media::Codec::H264=>w[3]&0x1f==5, super::media::Codec::H264=>match w[3]&0x1f {5=>true,6=>au.get(i+4)==Some(&6),1=>h264_i_slice(&au[i+4..]),_=>false},
super::media::Codec::H265=>(16..=21).contains(&((w[3]>>1)&0x3f)), super::media::Codec::H265=>(16..=21).contains(&((w[3]>>1)&0x3f)),
}) })
} }
/// Shows the newest frame a decoder finished between access units. /// Reads first_mb_in_slice and slice_type (both ue(v)) from a slice header; I = 2 or 7.
pub fn drain(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink)->Result<(),String> { fn h264_i_slice(rbsp:&[u8])->bool {
if let Some(frame)=decoder.poll().pop() {STATS[1].fetch_add(1,Ordering::Relaxed);sink.present(&frame)?;} let mut bit=0usize;
let mut ue=||->Option<u32>{
let mut zeros=0;
while (rbsp.get(bit/8)?>>(7-bit%8))&1==0 {zeros+=1;bit+=1;if zeros>31 {return None}}
bit+=1;let mut v=0u32;
for _ in 0..zeros {v=(v<<1)|u32::from((rbsp.get(bit/8)?>>(7-bit%8))&1);bit+=1;}
Some((1u32<<zeros)-1+v)
};
ue().is_some() && matches!(ue(),Some(2|7))
}
/// After a local reset, holds back pictures until a restart point arrives, but never longer
/// than `limit`: a host that ignores PLI must not leave the window blank (#136).
pub struct KeyGate { since:Option<std::time::Instant>, limit:std::time::Duration }
impl KeyGate {
pub fn new()->Self {Self{since:None,limit:std::time::Duration::from_millis(1500)}}
pub fn arm(&mut self) {self.since.get_or_insert_with(std::time::Instant::now);}
/// False = drop this unit and keep asking for a key frame.
pub fn admit(&mut self,codec:super::media::Codec,au:&[u8])->bool {
let Some(since)=self.since else {return true};
let timed_out=since.elapsed()>=self.limit;
if timed_out || is_key_frame(codec,au) {
if timed_out {log::debug!("Viewer desktop: no key frame within {:?} after reset; decoding on",self.limit);}
self.since=None;true
} else {false}
}
}
fn present(sink:&mut dyn FrameSink,frame:&Frame)->Result<(),String> {
sink.present(frame)?;
// Local acceptance aid: UU_VIEWER_DUMP_FRAME=path writes the 5th frame as PPM (owner's own screen).
if STATS[1].fetch_add(1,Ordering::Relaxed)==std::env::var("UU_VIEWER_DUMP_FRAME_INDEX").ok().and_then(|v|v.parse().ok()).unwrap_or(4u64) { if let Some(path)=std::env::var_os("UU_VIEWER_DUMP_FRAME") {
let mut ppm=format!("P6\n{} {}\n255\n",frame.width,frame.height).into_bytes();ppm.extend_from_slice(&frame.rgb);let _=std::fs::write(path,ppm);
}}
Ok(()) Ok(())
} }
pub fn display(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink,au:&[u8],codec:super::media::Codec,pli:&AtomicBool)->Result<(),String> { fn decode(decoder:&mut dyn Decoder,au:&[u8],codec:super::media::Codec,pli:&AtomicBool)->Vec<Frame> {
let units=STATS[0].fetch_add(1,Ordering::Relaxed)+1; let units=STATS[0].fetch_add(1,Ordering::Relaxed)+1;
// A later session can join a clean stream with no IDR in flight (#124): keep asking until a frame shows. // A later session can join a clean stream with no IDR in flight (#124): keep asking until a frame shows.
if wants_key_frame(units,STATS[1].load(Ordering::Relaxed)) { if wants_key_frame(units,STATS[1].load(Ordering::Relaxed)) {
@@ -39,16 +71,33 @@ pub fn display(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink,au:&[u8],codec:s
use std::io::Write; if let Ok(mut f)=std::fs::OpenOptions::new().create(true).append(true).open(path){let _=f.write_all(au);} use std::io::Write; if let Ok(mut f)=std::fs::OpenOptions::new().create(true).append(true).open(path){let _=f.write_all(au);}
}} }}
match decoder.decode(au) { match decoder.decode(au) {
Ok(frames)=>{for frame in frames { Ok(frames)=>frames,
sink.present(&frame)?; Err(_)=>{STATS[2].fetch_add(1,Ordering::Relaxed);decoder.reset();pli.store(true,Ordering::Release);Vec::new()},
// Local acceptance aid: UU_VIEWER_DUMP_FRAME=path writes the 5th frame as PPM (owner's own screen).
if STATS[1].fetch_add(1,Ordering::Relaxed)==std::env::var("UU_VIEWER_DUMP_FRAME_INDEX").ok().and_then(|v|v.parse().ok()).unwrap_or(4u64) { if let Some(path)=std::env::var_os("UU_VIEWER_DUMP_FRAME") {
let mut ppm=format!("P6\n{} {}\n255\n",frame.width,frame.height).into_bytes();ppm.extend_from_slice(&frame.rgb);let _=std::fs::write(path,ppm);
}}
}Ok(())},
Err(_)=>{STATS[2].fetch_add(1,Ordering::Relaxed);decoder.reset();pli.store(true,Ordering::Release);Ok(())},
} }
} }
/// Feed reference-dependent units in FIFO order, but present only the newest decoded picture.
pub fn pump(desktop:&Desktop,decoder:&mut dyn Decoder,sink:&mut dyn FrameSink,gate:&mut KeyGate)->Result<Option<super::media::Codec>,String> {
let started=std::time::Instant::now();
pump_with_elapsed(desktop,decoder,sink,gate,||started.elapsed())
}
fn pump_with_elapsed(desktop:&Desktop,decoder:&mut dyn Decoder,sink:&mut dyn FrameSink,gate:&mut KeyGate,mut elapsed:impl FnMut()->std::time::Duration)->Result<Option<super::media::Codec>,String> {
let mut newest=None;let mut codec=None;
for _ in 0..8 {
let Some(au)=desktop.units.pop() else {break};
if desktop.reset.swap(false,Ordering::AcqRel) {decoder.reset();gate.arm();}
if !gate.admit(au.codec,&au.data) {desktop.pli.store(true,Ordering::Release);}
else {
decoder.set_codec(au.codec)?;codec=Some(au.codec);
if let Some(frame)=decode(decoder,&au.data,au.codec,&desktop.pli).pop() {newest=Some(frame);}
}
// A soft budget between calls: an in-progress decoder call cannot be interrupted.
if elapsed()>=std::time::Duration::from_millis(4) {break}
}
// Asynchronous decoders may finish a picture even when no new input has arrived.
if let Some(frame)=decoder.poll().pop() {newest=Some(frame);}
if let Some(frame)=newest {present(sink,&frame)?;}
Ok(codec)
}
#[cfg(test)] mod tests { #[cfg(test)] mod tests {
#[test] fn key_frames_by_nal_type(){ #[test] fn key_frames_by_nal_type(){
use crate::viewer::media::Codec; use crate::viewer::media::Codec;
@@ -56,6 +105,19 @@ pub fn display(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink,au:&[u8],codec:s
assert!(!super::is_key_frame(Codec::H264,&[0,0,0,1,0x61,1])); assert!(!super::is_key_frame(Codec::H264,&[0,0,0,1,0x61,1]));
assert!(super::is_key_frame(Codec::H265,&[0,0,0,1,0x40,1,0,0,1,0x26,1,3])); assert!(super::is_key_frame(Codec::H265,&[0,0,0,1,0x40,1,0,0,1,0x26,1,3]));
assert!(!super::is_key_frame(Codec::H265,&[0,0,0,1,0x02,1])); assert!(!super::is_key_frame(Codec::H265,&[0,0,0,1,0x02,1]));
// I slice (first_mb=0 '1', slice_type=7 '0001000') and P slice (slice_type=5 '00110').
assert!(super::is_key_frame(Codec::H264,&[0,0,0,1,0x41,0b1000_1000,0]));
assert!(!super::is_key_frame(Codec::H264,&[0,0,0,1,0x41,0b1001_1000]));
// Recovery-point SEI (payload type 6).
assert!(super::is_key_frame(Codec::H264,&[0,0,0,1,0x06,0x06,1,0x80]));
}
#[test] fn key_gate_waits_then_gives_up(){
use crate::viewer::media::Codec;
let mut g=super::KeyGate::new();let p=[0,0,0,1,0x41,0b1001_1000];
assert!(g.admit(Codec::H264,&p));
g.arm();assert!(!g.admit(Codec::H264,&p));
assert!(g.admit(Codec::H264,&[0,0,0,1,0x65,0x88]));assert!(g.admit(Codec::H264,&p));
g.limit=std::time::Duration::ZERO;g.arm();assert!(g.admit(Codec::H264,&p));
} }
use super::*; use super::*;
struct Mock(bool);impl Decoder for Mock {fn set_codec(&mut self,_:crate::viewer::media::Codec)->Result<(),String>{Ok(())} fn decode(&mut self,_:&[u8])->Result<Vec<Frame>,String>{if self.0{Err("synthetic".into())}else{Ok(vec![Frame{width:1,height:1,rgb:vec![0;3],content:None}])}} fn reset(&mut self){self.0=false;}} struct Mock(bool);impl Decoder for Mock {fn set_codec(&mut self,_:crate::viewer::media::Codec)->Result<(),String>{Ok(())} fn decode(&mut self,_:&[u8])->Result<Vec<Frame>,String>{if self.0{Err("synthetic".into())}else{Ok(vec![Frame{width:1,height:1,rgb:vec![0;3],content:None}])}} fn reset(&mut self){self.0=false;}}
@@ -64,5 +126,106 @@ pub fn display(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink,au:&[u8],codec:s
assert_eq!((1..=90).filter(|&n|wants_key_frame(n,0)).count(),3); assert_eq!((1..=90).filter(|&n|wants_key_frame(n,0)).count(),3);
assert!(!(1..=90).any(|n|wants_key_frame(n,1))); assert!(!(1..=90).any(|n|wants_key_frame(n,1)));
} }
#[test] fn decode_error_requests_pli_and_recovers(){let mut d=Mock(true);let mut s=Sink(0);let p=AtomicBool::new(false);display(&mut d,&mut s,&[],crate::viewer::media::Codec::H264,&p).unwrap();assert!(p.load(Ordering::Acquire));display(&mut d,&mut s,&[],crate::viewer::media::Codec::H264,&p).unwrap();assert_eq!(s.0,1);} #[test] fn decode_error_requests_pli_and_recovers(){
let desktop=Desktop::default();let mut d=Mock(true);let mut s=Sink(0);let mut gate=KeyGate::new();
enqueue(&desktop,unit(0,false));
pump_with_elapsed(&desktop,&mut d,&mut s,&mut gate,||Duration::ZERO).unwrap();assert!(desktop.pli.load(Ordering::Acquire));assert_eq!(s.0,0);
enqueue(&desktop,unit(1,false));
pump_with_elapsed(&desktop,&mut d,&mut s,&mut gate,||Duration::ZERO).unwrap();assert_eq!(s.0,1);
}
use crate::viewer::media::{AccessUnit,Codec};
use std::time::Duration;
fn unit(id:u32,key:bool)->AccessUnit {
let mut data=vec![0,0,0,1,if key {0x65}else{0x41},0b1001_1000];
data.extend_from_slice(&id.to_le_bytes());AccessUnit{codec:Codec::H264,data}
}
fn picture(id:u32)->Frame {Frame{width:1,height:1,rgb:id.to_le_bytes()[..3].to_vec(),content:None}}
#[derive(Default)]
struct BatchDecoder {seen:Vec<u32>,resets:usize,pending:Vec<Frame>,extra_picture:bool}
impl Decoder for BatchDecoder {
fn set_codec(&mut self,_:Codec)->Result<(),String>{Ok(())}
fn decode(&mut self,au:&[u8])->Result<Vec<Frame>,String>{
let id=u32::from_le_bytes(au[6..].try_into().unwrap());self.seen.push(id);
let mut frames=vec![picture(id)];if self.extra_picture {frames.push(picture(id+100));}Ok(frames)
}
fn reset(&mut self){self.resets+=1;self.pending.clear();}
fn poll(&mut self)->Vec<Frame>{std::mem::take(&mut self.pending)}
}
#[derive(Default)]
struct Pictures(Vec<u32>);
impl FrameSink for Pictures {
fn present(&mut self,frame:&Frame)->Result<(),String>{assert_eq!(frame.rgb.len(),3);self.0.push(u32::from_le_bytes([frame.rgb[0],frame.rgb[1],frame.rgb[2],0]));Ok(())}
}
// Match the RTP reader's overflow signal without a network or wall-clock sleeps.
fn enqueue(desktop:&Desktop,au:AccessUnit)->bool {
let dropped=desktop.units.push(au);
if dropped {desktop.reset.store(true,Ordering::Release);desktop.pli.store(true,Ordering::Release);}
dropped
}
#[test] fn one_unit_per_tick_overflows_even_with_a_larger_queue(){
for capacity in [3,8] {
let q=Latest::new(capacity);let mut arrived=0;let mut dropped=0;
// 1,000 ticks at 125 Hz = 8 seconds; exactly 1,152 units arrive at 144 Hz.
for tick in 1..=1000 {
let due=tick*144/125;
while arrived<due {dropped+=usize::from(q.push(arrived));arrived+=1;}
assert!(q.pop().is_some());
}
assert_eq!(arrived,1152);assert_eq!(dropped,152-(capacity-1));
}
}
#[test] fn batches_keep_up_with_144_units_per_second_in_fifo_order(){
let desktop=Desktop::default();let mut d=BatchDecoder::default();let mut s=Pictures::default();let mut gate=KeyGate::new();let mut arrived=0;
for tick in 1..=1000 {
let due=tick*144/125;
while arrived<due {assert!(!enqueue(&desktop,unit(arrived,false)));arrived+=1;}
let before=s.0.len();
assert_eq!(pump_with_elapsed(&desktop,&mut d,&mut s,&mut gate,||Duration::ZERO).unwrap(),Some(Codec::H264));
assert_eq!(s.0.len(),before+1);assert_eq!(s.0.last(),Some(&(due-1)));
}
assert_eq!(arrived,1152);assert_eq!(d.seen,(0..1152).collect::<Vec<_>>());
assert_eq!(d.resets,0);assert!(desktop.units.pop().is_none());assert!(!desktop.reset.load(Ordering::Acquire));
}
#[test] fn batch_presents_only_the_latest_picture_and_polls_when_idle(){
let desktop=Desktop::default();let mut d=BatchDecoder{extra_picture:true,..Default::default()};let mut s=Pictures::default();let mut gate=KeyGate::new();
for id in 0..3 {assert!(!enqueue(&desktop,unit(id,false)));}
pump_with_elapsed(&desktop,&mut d,&mut s,&mut gate,||Duration::ZERO).unwrap();
assert_eq!(d.seen,vec![0,1,2]);assert_eq!(s.0,vec![102]);
d.pending=vec![picture(103),picture(104)];
assert_eq!(pump_with_elapsed(&desktop,&mut d,&mut s,&mut gate,||Duration::ZERO).unwrap(),None);
assert_eq!(s.0,vec![102,104]);
pump_with_elapsed(&desktop,&mut d,&mut s,&mut gate,||Duration::ZERO).unwrap();assert_eq!(s.0,vec![102,104]);
enqueue(&desktop,unit(105,false));d.pending=vec![picture(206)];
pump_with_elapsed(&desktop,&mut d,&mut s,&mut gate,||Duration::ZERO).unwrap();assert_eq!(s.0,vec![102,104,206]);
}
#[test] fn actual_queue_loss_still_resets_and_waits_for_a_key_frame(){
let desktop=Desktop::default();let mut d=BatchDecoder::default();let mut s=Pictures::default();let mut gate=KeyGate::new();
for id in 0..8 {assert!(!enqueue(&desktop,unit(id,false)));}
assert!(enqueue(&desktop,unit(8,false)));
pump_with_elapsed(&desktop,&mut d,&mut s,&mut gate,||Duration::ZERO).unwrap();
assert_eq!(d.resets,1);assert!(d.seen.is_empty());assert!(s.0.is_empty());assert!(desktop.pli.load(Ordering::Acquire));
enqueue(&desktop,unit(9,false));enqueue(&desktop,unit(10,true));enqueue(&desktop,unit(11,false));
pump_with_elapsed(&desktop,&mut d,&mut s,&mut gate,||Duration::ZERO).unwrap();
assert_eq!(d.resets,1);assert_eq!(d.seen,vec![10,11]);assert_eq!(s.0,vec![11]);
}
#[test] fn batch_count_limit_leaves_remaining_units_for_the_next_tick(){
let desktop=Desktop{units:Latest::new(12),..Default::default()};let mut d=BatchDecoder::default();let mut s=Pictures::default();let mut gate=KeyGate::new();
for id in 0..12 {assert!(!enqueue(&desktop,unit(id,false)));}
pump_with_elapsed(&desktop,&mut d,&mut s,&mut gate,||Duration::ZERO).unwrap();
assert_eq!(d.seen,(0..8).collect::<Vec<_>>());assert_eq!(s.0,vec![7]);
pump_with_elapsed(&desktop,&mut d,&mut s,&mut gate,||Duration::ZERO).unwrap();
assert_eq!(d.seen,(0..12).collect::<Vec<_>>());assert_eq!(s.0,vec![7,11]);
}
#[test] fn elapsed_budget_is_checked_between_calls_and_preserves_the_queue(){
let desktop=Desktop::default();let mut d=BatchDecoder::default();let mut s=Pictures::default();let mut gate=KeyGate::new();
for id in 0..4 {enqueue(&desktop,unit(id,false));}
let mut times=[Duration::from_millis(3),Duration::from_millis(4)].into_iter();
pump_with_elapsed(&desktop,&mut d,&mut s,&mut gate,||times.next().unwrap()).unwrap();
assert_eq!(d.seen,vec![0,1]);assert_eq!(s.0,vec![1]);
pump_with_elapsed(&desktop,&mut d,&mut s,&mut gate,||Duration::from_millis(20)).unwrap();
assert_eq!(d.seen,vec![0,1,2]);assert_eq!(s.0,vec![1,2]);
pump_with_elapsed(&desktop,&mut d,&mut s,&mut gate,||Duration::ZERO).unwrap();
assert_eq!(d.seen,vec![0,1,2,3]);assert_eq!(s.0,vec![1,2,3]);
}
} }
+7 -3
View File
@@ -137,8 +137,8 @@ pub enum Command {
Quality(u64), Fps(u32), Chroma(u32), FollowRemote(bool), OneToOne(bool), Volume(u8), Quality(u64), Fps(u32), Chroma(u32), FollowRemote(bool), OneToOne(bool), Volume(u8),
AutoLock(bool), HostMute(bool), GrabKeys(bool), Files, Watch(bool), Stats(bool), HideTab(bool), Fullscreen, Disconnect, AutoLock(bool), HostMute(bool), GrabKeys(bool), Files, Watch(bool), Stats(bool), HideTab(bool), Fullscreen, Disconnect,
} }
/// What the menu shows as selected. Remote settings start at the official viewer's defaults and /// What the menu shows as selected. The host does not report remote settings back; quality, frame
/// reflect only this session's choices; the host does not report them back. /// rate and color are saved and sent again when the next session's CONTROL is ready.
#[derive(Clone, PartialEq)] #[derive(Clone, PartialEq)]
pub struct State { pub struct State {
pub quality: u64, pub fps: u32, pub chroma: u32, pub follow_remote: bool, pub one_to_one: bool, pub volume: u8, pub quality: u64, pub fps: u32, pub chroma: u32, pub follow_remote: bool, pub one_to_one: bool, pub volume: u8,
@@ -328,11 +328,15 @@ pub fn load_prefs(st: &mut State) {
if let Some(b) = v["hide_tab_fullscreen"].as_bool() { st.hide_tab = b; } if let Some(b) = v["hide_tab_fullscreen"].as_bool() { st.hide_tab = b; }
if let Some(b) = v["one_to_one"].as_bool() { st.one_to_one = b; } if let Some(b) = v["one_to_one"].as_bool() { st.one_to_one = b; }
if let Some(n) = v["volume"].as_u64() { st.volume = n.min(100) as u8; } if let Some(n) = v["volume"].as_u64() { st.volume = n.min(100) as u8; }
if let Some(q) = v["quality"].as_u64().filter(|q| (2..=5).contains(q)) { st.quality = q; }
if let Some(f) = v["fps"].as_u64().filter(|f| [30, 60, 90, 144].contains(f)) { st.fps = f as u32; }
if let Some(c) = v["chroma"].as_u64().filter(|c| [1, 3].contains(c)) { st.chroma = c as u32; }
} }
pub fn save_prefs(st: &State) { pub fn save_prefs(st: &State) {
let path = prefs_path(); let path = prefs_path();
if let Some(dir) = path.parent() { let _ = std::fs::create_dir_all(dir); } if let Some(dir) = path.parent() { let _ = std::fs::create_dir_all(dir); }
let v = serde_json::json!({"stats": st.stats, "hide_tab_fullscreen": st.hide_tab, "one_to_one": st.one_to_one, "volume": st.volume}); let v = serde_json::json!({"stats": st.stats, "hide_tab_fullscreen": st.hide_tab, "one_to_one": st.one_to_one, "volume": st.volume,
"quality": st.quality, "fps": st.fps, "chroma": st.chroma});
let _ = std::fs::write(path, v.to_string()); let _ = std::fs::write(path, v.to_string());
} }
fn prefs_path() -> std::path::PathBuf { crate::config::path().parent().map_or_else(|| "viewer.json".into(), |d| d.join("viewer.json")) } fn prefs_path() -> std::path::PathBuf { crate::config::path().parent().map_or_else(|| "viewer.json".into(), |d| d.join("viewer.json")) }
+3
View File
@@ -21,8 +21,11 @@ pub mod thumbs;
#[cfg(uu_gtk)] pub mod host; #[cfg(uu_gtk)] pub mod host;
pub mod tools; pub mod tools;
pub mod native_gamepad;
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;
+141
View File
@@ -0,0 +1,141 @@
//! Opt-in official UU gamepad JSON, recovered from Windows 4.45.0.4318.
//! Evidence/RVAs and limits: docs/deckpad-native-gamepad.md. No port mapping or helper.
use serde_json::{json,Value};
use std::time::{Duration,Instant};
#[derive(Clone,Copy,Debug,Default,PartialEq,Eq)]
pub struct State {pub buttons:u16,pub lx:i16,pub ly:i16,pub rx:i16,pub ry:i16,pub lt:u8,pub rt:u8}
impl State {
pub fn json(self)->Value{json!({"action":"gpd_update","index":0,"buttons":self.buttons,
"left_trigger":self.lt,"right_trigger":self.rt,"left_thumb_x":self.lx,
"left_thumb_y":self.ly,"right_thumb_x":self.rx,"right_thumb_y":self.ry})}
fn released(self)->bool{self.buttons==0 && self.lt<8 && self.rt<8 &&
[self.lx,self.ly,self.rx,self.ry].iter().all(|v|i32::from(*v).abs()<5000)}
}
pub fn enabled()->bool{std::env::var("UU_VIEWER_NATIVE_GAMEPAD").as_deref()==Ok("1")}
pub fn connect()->Value{json!({"action":"gpd_connect","index":0})}
pub fn disconnect()->Value{json!({"action":"gpd_disconnect","index":0})}
fn y_axis(v:i16)->i16{(-i32::from(v)).clamp(-32768,32767) as i16}
fn trigger(v:i16)->u8{((i32::from(v).max(0)*255+16383)/32767) as u8}
/// Local state machine: focus loss sends neutral then detach; re-entry requires release.
/// The caller stops the session on any send failure rather than queueing old states.
#[derive(Default)]
struct Gate {connected:bool,armed:bool,last:Option<(State,Instant)>}
impl Gate {
fn close(&mut self)->Vec<Value>{
let out=if self.connected{vec![State::default().json(),disconnect()]}else{vec![]};
*self=Self::default();out
}
fn step(&mut self,state:Option<State>,active:bool,now:Instant)->Vec<Value>{
let Some(state)=state.filter(|_|active) else{return self.close()};
let mut out=Vec::new();
if !self.connected{out.push(connect());out.push(State::default().json());self.connected=true;}
if !self.armed {if state.released(){self.armed=true;}else{return out}}
if self.last.is_none_or(|(s,t)|s!=state||now.duration_since(t)>=Duration::from_millis(100)){
out.push(state.json());self.last=Some((state,now));
}
out
}
}
#[cfg(feature="viewer-sdl")]
pub struct NativeGamepad {sub:sdl2::GameControllerSubsystem,pad:Option<sdl2::controller::GameController>,gate:Gate,next_scan:Instant,paused:bool,chord:bool,
feedback:super::native_rumble::Feedback,rumble:super::native_rumble::Playback,rumble_enabled:bool,rumble_failed:bool,received_once:bool,applied_once:bool}
#[cfg(feature="viewer-sdl")]
impl NativeGamepad {
pub fn new(sdl:&sdl2::Sdl,feedback:super::native_rumble::Feedback)->Result<Self,String>{
let sub=sdl.game_controller()?;
eprintln!("DECKPAD_NATIVE_ENABLED");
let rumble_enabled=std::env::var("UU_VIEWER_NATIVE_RUMBLE").as_deref()!=Ok("0");
if rumble_enabled {eprintln!("DECKPAD_RUMBLE_ENABLED");}
Ok(Self{sub,pad:None,gate:Gate::default(),next_scan:Instant::now(),paused:false,chord:false,
feedback,rumble:Default::default(),rumble_enabled,rumble_failed:false,received_once:false,applied_once:false})
}
pub fn poll(&mut self,active:bool)->Vec<Value>{
use sdl2::controller::{Axis as A,Button as B};
let now=Instant::now();
if self.pad.as_ref().is_some_and(|p|!p.attached()) {
self.stop_feedback();
self.pad=None;self.chord=false;
// Detach before discovery, even if a replacement is already available.
return self.gate.close();
}
if self.pad.is_none() && now>=self.next_scan {
self.next_scan=now+Duration::from_secs(1);
if let Ok(n)=self.sub.num_joysticks(){
let ids:Vec<_>=(0..n).filter(|&i|self.sub.is_game_controller(i)).collect();
if ids.len()==1 {self.pad=self.sub.open(ids[0]).ok();if let Some(pad)=self.pad.as_ref(){
self.rumble_failed=false;self.received_once=false;self.applied_once=false;
eprintln!("DECKPAD_NATIVE_CONTROLLER_OPEN");
if self.rumble_enabled {eprintln!("{}",if pad.has_rumble(){"DECKPAD_RUMBLE_SUPPORTED"}else{"DECKPAD_RUMBLE_UNAVAILABLE"});}
}}
}
}
let state=self.pad.as_ref().map(|p|{
let mut buttons=0;
for (b,mask) in [(B::A,0x1000),(B::B,0x2000),(B::X,0x4000),(B::Y,0x8000),
(B::Back,0x20),(B::Start,0x10),(B::LeftStick,0x40),(B::RightStick,0x80),
(B::LeftShoulder,0x100),(B::RightShoulder,0x200),(B::DPadUp,1),(B::DPadDown,2),(B::DPadLeft,4),(B::DPadRight,8)] {
if p.button(b){buttons|=mask;}
}
State{buttons,lx:p.axis(A::LeftX),ly:y_axis(p.axis(A::LeftY)),rx:p.axis(A::RightX),ry:y_axis(p.axis(A::RightY)),lt:trigger(p.axis(A::TriggerLeft)),rt:trigger(p.axis(A::TriggerRight))}
});
let chord=state.is_some_and(|s|s.buttons&0x30==0x30);
if active && chord && !self.chord {self.paused=!self.paused;eprintln!("{}",if self.paused{"DECKPAD_NATIVE_PAUSED"}else{"DECKPAD_NATIVE_RESUMING"});}
self.chord=chord;
let connected=self.gate.connected;
let out=self.gate.step(state,active&&!self.paused&&!chord,now);
if self.gate.connected&&!connected {eprintln!("DECKPAD_NATIVE_CONNECT_QUEUED");}
if !self.gate.connected&&connected {eprintln!("DECKPAD_NATIVE_RELEASE_QUEUED");}
let feedback_active=self.gate.connected&&self.gate.armed&&self.rumble_enabled&&!self.rumble_failed;
self.feedback.set_active(feedback_active);
let incoming=self.feedback.take();
if incoming.is_some()&&!self.received_once {self.received_once=true;eprintln!("DECKPAD_RUMBLE_RECEIVED");}
if let Some(m)=self.rumble.step(incoming,feedback_active,now){
if let Some(pad)=self.pad.as_mut(){
if pad.set_rumble(m.left,m.right,super::native_rumble::EFFECT_MS).is_err(){
self.rumble_failed=true;self.feedback.set_active(false);self.rumble.stop();
let _=pad.set_rumble(0,0,0);eprintln!("DECKPAD_RUMBLE_OUTPUT_FAILED");
}else if m!=super::native_rumble::Motors::default()&&!self.applied_once{
self.applied_once=true;eprintln!("DECKPAD_RUMBLE_APPLIED");
}
}
}
out
}
fn stop_feedback(&mut self){
self.feedback.set_active(false);self.rumble.stop();
if let Some(pad)=self.pad.as_mut(){let _=pad.set_rumble(0,0,0);}
}
pub fn close(&mut self)->Vec<Value>{self.stop_feedback();self.gate.close()}
}
#[cfg(feature="viewer-sdl")]
impl Drop for NativeGamepad {fn drop(&mut self){self.stop_feedback();}}
#[cfg(test)] mod tests{
use super::*;
#[test] fn official_shape_and_axis_boundaries(){
assert_eq!(connect(),json!({"action":"gpd_connect","index":0}));
let s=State{buttons:0x1000,lx:-32768,ly:32767,rx:100,ry:-100,lt:128,rt:255}.json();
assert_eq!(s,json!({"action":"gpd_update","index":0,"buttons":4096,"left_trigger":128,"right_trigger":255,"left_thumb_x":-32768,"left_thumb_y":32767,"right_thumb_x":100,"right_thumb_y":-100}));
assert_eq!((y_axis(-32768),y_axis(32767)),(32767,-32767));
assert_eq!([trigger(-32768),trigger(0),trigger(16384),trigger(32767)],[0,0,128,255]);
}
#[test] fn held_on_entry_waits_for_release_then_focus_loss_detaches(){
let mut g=Gate::default();let t=Instant::now();let held=State{buttons:0x1000,..Default::default()};
assert_eq!(g.step(Some(held),true,t),vec![connect(),State::default().json()]);
assert!(g.step(Some(held),true,t).is_empty());
assert_eq!(g.step(Some(State::default()),true,t),vec![State::default().json()]);
assert_eq!(g.step(Some(held),true,t),vec![held.json()]);
assert_eq!(g.step(Some(held),false,t),vec![State::default().json(),disconnect()]);
assert!(g.close().is_empty());
assert_eq!(g.step(Some(held),true,t),vec![connect(),State::default().json()]);
}
#[test] fn unplug_neutral_and_idle_refresh(){
let mut g=Gate::default();let t=Instant::now();let z=State::default();g.step(Some(z),true,t);
assert!(g.step(Some(z),true,t+Duration::from_millis(50)).is_empty());
assert_eq!(g.step(Some(z),true,t+Duration::from_millis(100)),vec![z.json()]);
assert_eq!(g.step(None,true,t+Duration::from_millis(101)),vec![z.json(),disconnect()]);
}
}
+97
View File
@@ -0,0 +1,97 @@
//! Official Windows 4.45: gpd_vibration {index:u8,left_motor:u8,right_motor:u8}.
//! Server RVAs 0x5df5d0/0x5dfe80; viewer 0x10331a0. See protocol evidence doc.
use serde::Deserialize;
use std::{sync::{Arc,Mutex},time::{Duration,Instant}};
#[derive(Clone,Copy,Debug,Default,PartialEq,Eq)]
pub struct Motors {pub left:u16,pub right:u16}
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
struct Message {action:String,index:u8,left_motor:u8,right_motor:u8}
pub fn decode(data:&[u8])->Option<Motors>{
if data.len()>512 {return None}
let m:Message=serde_json::from_slice(data).ok()?;
if m.action!="gpd_vibration" || m.index!=0 {return None}
Some(Motors{left:u16::from(m.left_motor)*257,right:u16::from(m.right_motor)*257})
}
#[derive(Default)]
struct Slot {active:bool,latest:Option<(Motors,Instant)>}
/// One slot per peer: bounded memory, latest update wins (including zero/stop).
/// Disabled while unfocused/unarmed; never replay feedback accumulated during pause.
#[derive(Clone,Default)]
pub struct Feedback(Arc<Mutex<Slot>>);
impl Feedback {
pub fn set_active(&self,active:bool){
let mut slot=self.0.lock().unwrap();
if slot.active!=active {slot.latest=None;slot.active=active;}
}
pub fn receive(&self,data:&[u8]){
let mut slot=self.0.lock().unwrap();
if slot.active {if let Some(m)=decode(data){slot.latest=Some((m,Instant::now()));}}
}
pub fn take(&self)->Option<(Motors,Instant)>{self.0.lock().unwrap().latest.take()}
}
/// Renew finite SDL effects while active; if the process stalls/dies, the hardware
/// effect expires. UU sends state changes, so a quiet network is NOT a stop message.
pub const EFFECT_MS:u32=1000;
const REFRESH:Duration=Duration::from_millis(250);
#[derive(Default)]
pub struct Playback {desired:Motors,next:Option<Instant>}
impl Playback {
pub fn step(&mut self,incoming:Option<(Motors,Instant)>,active:bool,now:Instant)->Option<Motors>{
if !active {return self.stop()}
let previous=self.desired;
if let Some((m,received))=incoming {
// Do not play a pulse left pending while decoding or scheduling stalled.
if m==Motors::default() || now.saturating_duration_since(received)<=Duration::from_millis(500){self.desired=m;}
}
let running=self.desired!=Motors::default();
if previous!=self.desired || (running&&self.next.is_none_or(|t|now>=t)) {
self.next=running.then_some(now+REFRESH);return Some(self.desired)
}
None
}
pub fn stop(&mut self)->Option<Motors>{
let running=self.desired!=Motors::default();*self=Self::default();
running.then_some(Motors::default())
}
}
#[cfg(test)] mod tests {
use super::*;
fn data(left:u8,right:u8)->Vec<u8>{format!(r#"{{"action":"gpd_vibration","index":0,"left_motor":{left},"right_motor":{right}}}"#).into_bytes()}
#[test] fn official_bytes_scale_to_full_sdl_range(){
assert_eq!(decode(&data(255,128)),Some(Motors{left:65535,right:32896}));
assert_eq!(decode(&data(0,0)),Some(Motors::default()));
}
#[test] fn reject_other_slots_malformed_ranges_duplicates_and_other_actions(){
let good=String::from_utf8(data(1,2)).unwrap();
for bad in [good.replace("\"index\":0","\"index\":1"),good.replace("vibration","update"),
good.replace("\"left_motor\":1","\"left_motor\":256"),good.replace("\"left_motor\":1","\"left_motor\":-1"),
good.replace("\"left_motor\":1","\"left_motor\":1.5"),good.replace("\"index\":0","\"index\":0,\"index\":0"),
good.replace(",\"right_motor\":2",""),"{}".into()," ".repeat(513)] {assert_eq!(decode(bad.as_bytes()),None);}
}
#[test] fn peer_isolation_pause_and_latest_stop_wins(){
let a=Feedback::default();let b=Feedback::default();
a.receive(&data(255,0));assert!(a.take().is_none());
a.set_active(true);b.set_active(true);
for _ in 0..1000 {a.receive(&data(255,255));}a.receive(&data(0,0));
assert_eq!(a.take().unwrap().0,Motors::default());assert!(b.take().is_none());
a.receive(&data(255,0));a.set_active(false);a.set_active(true);assert!(a.take().is_none());
}
#[test] fn sustained_effect_refresh_stop_focus_loss_and_stale_pulse(){
let t=Instant::now();let mut p=Playback::default();let m=Motors{left:100,right:200};
assert_eq!(p.step(Some((m,t)),true,t),Some(m));
assert_eq!(p.step(None,true,t+Duration::from_millis(249)),None);
assert_eq!(p.step(None,true,t+REFRESH),Some(m));
assert_eq!(p.step(Some((Motors::default(),t)),true,t+REFRESH),Some(Motors::default()));
assert_eq!(p.step(Some((m,t)),true,t),Some(m));
assert_eq!(p.step(None,false,t),Some(Motors::default()));
assert_eq!(p.step(None,true,t),None);
assert_eq!(p.step(Some((m,t)),true,t+Duration::from_millis(501)),None);
p.step(Some((m,t)),true,t);
assert_eq!(p.step(Some((Motors::default(),t)),true,t+Duration::from_secs(5)),Some(Motors::default()));
}
}
+12 -6
View File
@@ -44,6 +44,8 @@ pub struct Observed {
pub struct Peer { 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 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>,
@@ -78,6 +80,8 @@ impl Peer {
let api=APIBuilder::new().with_media_engine(engine).with_setting_engine(settings).with_interceptor_registry(registry).build(); let api=APIBuilder::new().with_media_engine(engine).with_setting_engine(settings).with_interceptor_registry(registry).build();
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 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;
@@ -197,15 +201,17 @@ impl Peer {
} }
}))); })));
} }
let closed=tools.clone();let state=observed.clone(); let closed=tools.clone();let state=observed.clone();let rumble_closed=rumble.clone();
channel.on_close(Box::new(move ||{let closed=closed.clone();let state=state.clone();Box::pin(async move { channel.on_close(Box::new(move ||{let closed=closed.clone();let state=state.clone();let rumble_closed=rumble_closed.clone();Box::pin(async move {
if index==0 {state.control_open.store(false,Ordering::Release);} if index==0 {state.control_open.store(false,Ordering::Release);rumble_closed.set_active(false);}
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 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();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);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 {
@@ -253,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,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)},
} }
} }
@@ -329,7 +335,7 @@ impl Peer {
let rtt=(pair.current_round_trip_time>0.).then(||(pair.current_round_trip_time*1000.).round() as u32); let rtt=(pair.current_round_trip_time>0.).then(||(pair.current_round_trip_time*1000.).round() as u32);
(rtt,format!("{} · {}",if tcp{"TCP"}else{"UDP"},if relay{"relay"}else{"direct"})) (rtt,format!("{} · {}",if tcp{"TCP"}else{"UDP"},if relay{"relay"}else{"direct"}))
} }
pub async fn close(&self) {self.clipboard.stop();self.tools.lock().unwrap().take();let _=self.pc.close().await;} pub async fn close(&self) {self.rumble.set_active(false);self.clipboard.stop();self.tools.lock().unwrap().take();let _=self.pc.close().await;}
} }
fn answer_sdp(body:&Value)->Result<String,String> { fn answer_sdp(body:&Value)->Result<String,String> {
if let Some(s)=body.get("sdp").and_then(Value::as_str) {if s.len()<=1024*1024{return Ok(s.into())}} if let Some(s)=body.get("sdp").and_then(Value::as_str) {if s.len()<=1024*1024{return Ok(s.into())}}
+155 -19
View File
@@ -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.
@@ -19,6 +19,9 @@ impl Window {
let name=super::device_label(std::env::var("UU_VIEWER_DEVICE_NAME").ok().as_deref()).to_owned(); let name=super::device_label(std::env::var("UU_VIEWER_DEVICE_NAME").ok().as_deref()).to_owned();
let window=video.window(&format!("{name} · {}",crate::i18n::s("UU 远程 Linux 控制端","UU Remote Linux viewer")),1280,720).position_centered().resizable().build().map_err(|_|"Window creation failed")?; let window=video.window(&format!("{name} · {}",crate::i18n::s("UU 远程 Linux 控制端","UU Remote Linux viewer")),1280,720).position_centered().resizable().build().map_err(|_|"Window creation failed")?;
let mut canvas=window.into_canvas().build().map_err(|_|"Renderer creation failed")?; let mut canvas=window.into_canvas().build().map_err(|_|"Renderer creation failed")?;
// This window forwards scancodes, not SDL_TEXTINPUT. SDL enables text input by
// default; its X11 IME path can consume keys before KeyDown/KeyUp (#149).
video.text_input().stop();
// Wayland maps a toplevel only after its first buffer; without this the window stays // Wayland maps a toplevel only after its first buffer; without this the window stays
// invisible until the first decoded frame, which a stalled stream never delivers. // invisible until the first decoded frame, which a stalled stream never delivers.
canvas.set_draw_color(LOADING_BG);canvas.clear();canvas.present(); canvas.set_draw_color(LOADING_BG);canvas.clear();canvas.present();
@@ -29,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)}
@@ -139,7 +150,8 @@ impl Window {
fn command(&mut self,command:hud::Command){ fn command(&mut self,command:hud::Command){
let st=&mut self.chrome.state; let st=&mut self.chrome.state;
match command { match command {
hud::Command::Quality(q)=>st.quality=q, hud::Command::Fps(f)=>st.fps=f, hud::Command::Chroma(c)=>st.chroma=c, hud::Command::Quality(q)=>{st.quality=q;hud::save_prefs(st)}, hud::Command::Fps(f)=>{st.fps=f;hud::save_prefs(st)},
hud::Command::Chroma(c)=>{st.chroma=c;hud::save_prefs(st)},
hud::Command::FollowRemote(b)=>st.follow_remote=b, hud::Command::Volume(v)=>st.volume=v, hud::Command::FollowRemote(b)=>st.follow_remote=b, hud::Command::Volume(v)=>st.volume=v,
hud::Command::AutoLock(b)=>st.auto_lock=b, hud::Command::HostMute(b)=>st.host_mute=b, hud::Command::Watch(b)=>st.watch=b, hud::Command::AutoLock(b)=>st.auto_lock=b, hud::Command::HostMute(b)=>st.host_mute=b, hud::Command::Watch(b)=>st.watch=b,
hud::Command::OneToOne(b)=>{st.one_to_one=b;hud::save_prefs(st)}, hud::Command::OneToOne(b)=>{st.one_to_one=b;hud::save_prefs(st)},
@@ -156,6 +168,13 @@ impl Window {
self.chrome.commands.push(command); self.chrome.commands.push(command);
} }
pub fn take_commands(&mut self)->Vec<hud::Command>{std::mem::take(&mut self.chrome.commands)} pub fn take_commands(&mut self)->Vec<hud::Command>{std::mem::take(&mut self.chrome.commands)}
/// The host starts every session at the official defaults; repeat the saved choices that differ.
pub fn restore_remote_settings(&mut self){
let(st,d)=(&self.chrome.state,hud::State::default());let c=&mut self.chrome.commands;
if st.quality!=d.quality {c.push(hud::Command::Quality(st.quality));}
if st.fps!=d.fps {c.push(hud::Command::Fps(st.fps));}
if st.chroma!=d.chroma {c.push(hud::Command::Chroma(st.chroma));}
}
pub fn state(&self)->&hud::State{&self.chrome.state} pub fn state(&self)->&hud::State{&self.chrome.state}
pub fn sync_chroma(&mut self,chroma:u32){if chroma!=0 {self.chrome.state.chroma=chroma;}} pub fn sync_chroma(&mut self,chroma:u32){if chroma!=0 {self.chrome.state.chroma=chroma;}}
pub fn set_stage(&mut self,stage:&str){self.chrome.stage=stage.into();} pub fn set_stage(&mut self,stage:&str){self.chrome.stage=stage.into();}
@@ -334,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)),
@@ -355,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,..})
} }
@@ -391,7 +428,11 @@ pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super:
} }
Err(e)=>{ log::warn!("Type IPC not started: {e}"); None } Err(e)=>{ log::warn!("Type IPC not started: {e}"); None }
}; };
let mut command_open=true;let mut requested=false;let mut type_requested=false; let mut native_gamepad=if super::native_gamepad::enabled(){
if window.mac{return Err(crate::i18n::s("原生手柄实验仅支持 Windows 被控端","Native gamepad experiment requires a Windows host").into())}
Some(super::native_gamepad::NativeGamepad::new(&window._sdl,session.peer.rumble.clone())?)
}else{None};
let mut command_open=true;let mut requested=false;let mut type_requested=false;let mut restored=false;
let mut type_job:Option<TypeJob>=None; let mut type_job:Option<TypeJob>=None;
let mut terminate=tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate()).map_err(|_|"Cannot watch termination")?; let mut terminate=tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate()).map_err(|_|"Cannot watch termination")?;
let mut audio=super::audio::Playback::new(&window._sdl,session.peer.audio.clone()); let mut audio=super::audio::Playback::new(&window._sdl,session.peer.audio.clone());
@@ -405,7 +446,7 @@ pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super:
let mut last=(0u64,0u64,0u64,0u64,std::time::Instant::now()); let mut last=(0u64,0u64,0u64,0u64,std::time::Instant::now());
let mut codec_name="--"; let mut codec_name="--";
// After a local drop the decoder has no reference picture; P-frames would only smear blocks. // After a local drop the decoder has no reference picture; P-frames would only smear blocks.
let mut await_key=false; let mut key_gate=super::desktop::KeyGate::new();
let mut next_thumb=std::time::Instant::now()+std::time::Duration::from_secs(5); let mut next_thumb=std::time::Instant::now()+std::time::Duration::from_secs(5);
let result=async { let result=async {
loop {tokio::select!{ loop {tokio::select!{
@@ -463,7 +504,9 @@ 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();}
for command in window.take_commands() { for command in window.take_commands() {
seq+=1; seq+=1;
let control=match command { let control=match command {
@@ -528,28 +571,28 @@ pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super:
type_job=None; type_job=None;
} }
} }
if let Some(pad)=native_gamepad.as_mut(){
let active=!quit&&window.focused&&input.enabled()&&!window.chrome.menu.open&&type_job.is_none()
&&session.peer.ready(super::rtc::ReadyPolicy::EchoOnly,false)
&&session.peer.observed.control_open.load(std::sync::atomic::Ordering::Acquire)
&&session.peer.pc.connection_state()==webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Connected;
messages.extend(pad.poll(active));
}
if session.peer.ready(super::rtc::ReadyPolicy::EchoOnly,false){for m in messages{session.peer.send_input(&m).await?;}} if session.peer.ready(super::rtc::ReadyPolicy::EchoOnly,false){for m in messages{session.peer.send_input(&m).await?;}}
else {input.release_all();} else {input.release_all();}
if quit{return Ok(())} if quit{return Ok(())}
// At most one AU per iteration keeps local event polling responsive. if let Some(codec)=super::desktop::pump(&session.peer.desktop,decoder,window,&mut key_gate)? {
if let Some(au)=session.peer.desktop.units.pop(){ codec_name=if codec==super::media::Codec::H265 {"H.265"} else {"H.264"};
if session.peer.desktop.reset.swap(false,std::sync::atomic::Ordering::AcqRel){decoder.reset();await_key=true;} }
if await_key && !super::desktop::is_key_frame(au.codec,&au.data) {session.peer.desktop.pli.store(true,std::sync::atomic::Ordering::Release);}
else {
await_key=false;
decoder.set_codec(au.codec)?;
codec_name=if au.codec==super::media::Codec::H265 {"H.265"} else {"H.264"};
super::desktop::display(decoder,window,&au.data,au.codec,&session.peer.desktop.pli)?;
}}
// A picture can finish after its access unit was written; show it without waiting
// for the next one (a single keystroke may change the remote screen only once).
else {super::desktop::drain(decoder,window)?;}
} }
}} }}
}.await; }.await;
if let Some(frame)=window.last_frame.as_ref() {if let Err(e)=super::thumbs::save(device,frame){log::debug!("Viewer thumbnail not saved: {e}");}} if let Some(frame)=window.last_frame.as_ref() {if let Err(e)=super::thumbs::save(device,frame){log::debug!("Viewer thumbnail not saved: {e}");}}
#[cfg(uu_gtk)] if let Some(f)=files {f.abort();let _=f.await;super::tools_ui::hide();session.peer.tools.lock().unwrap().take();} #[cfg(uu_gtk)] if let Some(f)=files {f.abort();let _=f.await;super::tools_ui::hide();session.peer.tools.lock().unwrap().take();}
if let Some(t)=type_ipc {t.abort();let _=t.await;} if let Some(t)=type_ipc {t.abort();let _=t.await;}
if let Some(pad)=native_gamepad.as_mut(){for m in pad.close(){
let _=tokio::time::timeout(std::time::Duration::from_millis(300),session.peer.send_input(&m)).await;
}}
for m in input.release_all(){let _=session.peer.send_input(&m).await;} for m in input.release_all(){let _=session.peer.send_input(&m).await;}
result result
} }
@@ -693,8 +736,101 @@ 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)]
#[test] fn remote_window_disables_local_text_input_and_forwards_shift(){
if std::env::var_os("UU_VIEWER_IME_TEST_CHILD").is_none(){
let output=std::process::Command::new(std::env::current_exe().unwrap())
.args(["--exact","viewer::sdl::tests::remote_window_disables_local_text_input_and_forwards_shift","--test-threads=1"])
.env("SDL_VIDEODRIVER","dummy").env("UU_VIEWER_IME_TEST_CHILD","1").output().unwrap();
assert!(output.status.success(),"{}{}",String::from_utf8_lossy(&output.stdout),String::from_utf8_lossy(&output.stderr));return
}
let mut window=Window::new().unwrap();
assert!(!window.canvas.window().subsystem().text_input().is_active());
let id=window.canvas.window().id();
let key=|down,scan|if down {
Event::KeyDown{timestamp:0,window_id:id,keycode:None,scancode:Some(scan),keymod:sdl2::keyboard::Mod::NOMOD,repeat:false}
}else{
Event::KeyUp{timestamp:0,window_id:id,keycode:None,scancode:Some(scan),keymod:sdl2::keyboard::Mod::NOMOD,repeat:false}
};
let push=|event|window._sdl.event().unwrap().push_event(event).unwrap();
use sdl2::keyboard::Scancode as S;
for event in [key(true,S::LShift),key(false,S::LShift),key(true,S::A),key(false,S::A),
key(true,S::RShift),Event::Window{timestamp:0,window_id:id,win_event:WindowEvent::FocusLost},
Event::Window{timestamp:0,window_id:id,win_event:WindowEvent::FocusGained}] {push(event);}
let (_,messages)=window.poll(&mut Input::new(false));
let keys:Vec<_>=messages.iter().filter_map(|m|Some((m.get("action")?.as_str()?,m.get("key")?.as_i64()?))).collect();
assert_eq!(keys,vec![("kbd_press",0xa0),("kbd_release",0xa0),("kbd_press",0x41),("kbd_release",0x41),
("kbd_press",0xa1),("kbd_release",0xa1)]);
assert!(!window.canvas.window().subsystem().text_input().is_active());
}
// macOS: SDL video must start on the main thread, which the test harness does not use; CI runs it on Linux. // macOS: SDL video must start on the main thread, which the test harness does not use; CI runs it on Linux.
#[cfg_attr(target_os="macos",ignore)] #[cfg_attr(target_os="macos",ignore)]
#[tokio::test] async fn clipboard_requests_use_existing_window(){ #[tokio::test] async fn clipboard_requests_use_existing_window(){
+20 -2
View File
@@ -250,12 +250,14 @@ async fn desktop_file_window_reattaches_without_replacing_peer(){
let mut engine=MediaEngine::default();engine.register_default_codecs().unwrap(); let mut engine=MediaEngine::default();engine.register_default_codecs().unwrap();
let host=Arc::new(APIBuilder::new().with_media_engine(engine).with_setting_engine(host_settings).build().new_peer_connection(RTCConfiguration::default()).await.unwrap()); let host=Arc::new(APIBuilder::new().with_media_engine(engine).with_setting_engine(host_settings).build().new_peer_connection(RTCConfiguration::default()).await.unwrap());
let file:Arc<std::sync::Mutex<Option<Arc<webrtc::data_channel::RTCDataChannel>>>>=Default::default(); let file:Arc<std::sync::Mutex<Option<Arc<webrtc::data_channel::RTCDataChannel>>>>=Default::default();
let control:Arc<std::sync::Mutex<Option<Arc<webrtc::data_channel::RTCDataChannel>>>>=Default::default();
let control_out=control.clone();
let(tx,mut received)=mpsc::channel(32); let(tx,mut received)=mpsc::channel(32);
let opened=Arc::new(AtomicUsize::new(0));let count=opened.clone(); let opened=Arc::new(AtomicUsize::new(0));let count=opened.clone();
host.on_data_channel(Box::new(move|channel|{let(tx,file,count)=(tx.clone(),file.clone(),count.clone());Box::pin(async move{ host.on_data_channel(Box::new(move|channel|{let(tx,file,count,control)=(tx.clone(),file.clone(),count.clone(),control.clone());Box::pin(async move{
count.fetch_add(1,Ordering::Relaxed); count.fetch_add(1,Ordering::Relaxed);
if channel.label()==wire::CHANNELS[tools::FILE]{*file.lock().unwrap()=Some(channel.clone());} if channel.label()==wire::CHANNELS[tools::FILE]{*file.lock().unwrap()=Some(channel.clone());}
if channel.label()==wire::CHANNELS[tools::CONTROL]{channel.on_message(Box::new(move|m|{ if channel.label()==wire::CHANNELS[tools::CONTROL]{*control.lock().unwrap()=Some(channel.clone());channel.on_message(Box::new(move|m|{
let(tx,file)=(tx.clone(),file.clone());Box::pin(async move{ let(tx,file)=(tx.clone(),file.clone());Box::pin(async move{
if let Some(r)=tools::blob(&m.data,21){ if let Some(r)=tools::blob(&m.data,21){
if tools::blob(r,8).and_then(|b|tools::blob(b,10)).is_some(){ if tools::blob(r,8).and_then(|b|tools::blob(b,10)).is_some(){
@@ -277,6 +279,7 @@ async fn desktop_file_window_reattaches_without_replacing_peer(){
peer.pc.set_remote_description(host.local_description().await.unwrap()).await.unwrap(); peer.pc.set_remote_description(host.local_description().await.unwrap()).await.unwrap();
while opened.load(Ordering::Relaxed)!=5 || peer.channels.iter().any(|c|c.ready_state()!=webrtc::data_channel::data_channel_state::RTCDataChannelState::Open){tokio::time::sleep(Duration::from_millis(10)).await;} while opened.load(Ordering::Relaxed)!=5 || peer.channels.iter().any(|c|c.ready_state()!=webrtc::data_channel::data_channel_state::RTCDataChannelState::Open){tokio::time::sleep(Duration::from_millis(10)).await;}
let pc=peer.pc.clone(); let pc=peer.pc.clone();
peer.rumble.set_active(true);
for _ in 0..2{ for _ in 0..2{
let(io,rx)=tools::attach(&peer).unwrap();assert!(tools::attach(&peer).is_err()); let(io,rx)=tools::attach(&peer).unwrap();assert!(tools::attach(&peer).is_err());
let(f,_)=Files::new(io,rx);assert!(f.list_dir(":/").await.unwrap().is_empty());drop(f); let(f,_)=Files::new(io,rx);assert!(f.list_dir(":/").await.unwrap().is_empty());drop(f);
@@ -284,6 +287,21 @@ async fn desktop_file_window_reattaches_without_replacing_peer(){
assert!(Arc::ptr_eq(&pc,&peer.pc)); assert!(Arc::ptr_eq(&pc,&peer.pc));
let heartbeat=super::input::Input::heartbeat();peer.send_input(&heartbeat).await.unwrap(); let heartbeat=super::input::Input::heartbeat();peer.send_input(&heartbeat).await.unwrap();
loop{if serde_json::from_slice::<Value>(&received.recv().await.unwrap()).ok()==Some(heartbeat.clone()){break}} loop{if serde_json::from_slice::<Value>(&received.recv().await.unwrap()).ok()==Some(heartbeat.clone()){break}}
// Native gamepad shares CONTROL and must not open a new channel/peer.
use super::native_gamepad::{self,State};
for message in [native_gamepad::connect(),State{buttons:0x1000,..Default::default()}.json(),
State::default().json(),native_gamepad::disconnect()] {
peer.send_input(&message).await.unwrap();
loop {if serde_json::from_slice::<Value>(&received.recv().await.unwrap()).ok()==Some(message.clone()){break}}
}
// Host feedback shares the same peer/channel; file detach must not steal it.
let control=control_out.lock().unwrap().clone().unwrap();
for (left,right) in [(255u8,128u8),(0,0)] {
let feedback=json!({"action":"gpd_vibration","index":0,"left_motor":left,"right_motor":right});
control.send(&bytes::Bytes::from(feedback.to_string())).await.unwrap();
let received=loop {if let Some((m,_))=peer.rumble.take(){break m}tokio::time::sleep(Duration::from_millis(5)).await;};
assert_eq!(received,super::native_rumble::Motors{left:u16::from(left)*257,right:u16::from(right)*257});
}
} }
assert_eq!(opened.load(Ordering::Relaxed),5); assert_eq!(opened.load(Ordering::Relaxed),5);
peer.close().await;host.close().await.unwrap();router.lock().await.stop().await.unwrap(); peer.close().await;host.close().await.unwrap();router.lock().await.stop().await.unwrap();
+1 -1
View File
@@ -32,7 +32,7 @@ fn watch_session(mut child: tokio::process::Child, mut cancel: tokio::sync::ones
} }
status = child.wait() => break status, status = child.wait() => break status,
line = async { match lines.as_mut() { Some(l) => l.next_line().await, None => std::future::pending().await } } => match line { line = async { match lines.as_mut() { Some(l) => l.next_line().await, None => std::future::pending().await } } => match line {
Ok(Some(l)) => { if !l.starts_with('[') && !l.trim().is_empty() { last = l.chars().take(160).collect(); } } Ok(Some(l)) => { if l.starts_with("DECKPAD_"){eprintln!("{l}");} else if !l.starts_with('[') && !l.trim().is_empty() { last = l.chars().take(160).collect(); } }
_ => lines = None, _ => lines = None,
}, },
} }
+473
View File
@@ -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, &current).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(&current).unwrap(); symlink(&second, &current).unwrap();
assert_eq!(read_image(&detect().await.unwrap()).await.unwrap(), std::fs::read(&second).unwrap());
std::fs::remove_file(&current).unwrap(); symlink(root.join("missing"), &current).unwrap();
assert_eq!(detect().await, Some(legacy.clone()));
std::fs::remove_file(&current).unwrap(); symlink(&root, &current).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()); }
}
}
+124 -17
View File
@@ -4,6 +4,9 @@ use crate::capture::ScreenCapture;
use crate::input::InputInjector; use crate::input::InputInjector;
use crate::signaling::SoacMessage; use crate::signaling::SoacMessage;
#[path = "text_outbox.rs"]
mod text_outbox;
use base64::Engine; use base64::Engine;
use flate2::read::GzDecoder; use flate2::read::GzDecoder;
use std::io::Read; use std::io::Read;
@@ -111,7 +114,7 @@ pub struct WebRtcSession {
/// The role this peer was offered with; `role` also covers a later capture_desktop. /// The role this peer was offered with; `role` also covers a later capture_desktop.
pub desktop: bool, pub desktop: bool,
pub role: Arc<DesktopRole>, pub role: Arc<DesktopRole>,
pub controller_mac: bool, pub controller: crate::input::Controller,
pub context: Arc<Mutex<SessionContext>>, pub context: Arc<Mutex<SessionContext>>,
actions: Arc<crate::system_actions::PeerActions>, actions: Arc<crate::system_actions::PeerActions>,
} }
@@ -489,6 +492,11 @@ impl WebRtcSession {
let file_channel: Arc<std::sync::Mutex<Option<Arc<RTCDataChannel>>>> = Arc::new(std::sync::Mutex::new(None)); let file_channel: Arc<std::sync::Mutex<Option<Arc<RTCDataChannel>>>> = Arc::new(std::sync::Mutex::new(None));
let (file_tx, mut file_rx) = tokio::sync::mpsc::unbounded_channel::<Vec<u8>>(); let (file_tx, mut file_rx) = tokio::sync::mpsc::unbounded_channel::<Vec<u8>>();
let peer_files = crate::file_trans::FileSession::new(file_tx, control_sequence.clone()); let peer_files = crate::file_trans::FileSession::new(file_tx, control_sequence.clone());
// Mac 4.43: streamerDidReceiveTextData (0x1001f56b4, arm64) reaches
// the metrics/RPC dispatcher at 0x1003a8560; CONTROL does not.
// Keep CONTROL metrics for other viewers; privacy replies use TEXT.
let (text_tx, text_rx) = text_outbox::channel();
let text_rx = Arc::new(tokio::sync::Mutex::new(Some(OutboundReceiver::Text(text_rx))));
// 端口映射 frames (Message 27) also travel on FILE_DATA_CHANNEL; one session per peer. // 端口映射 frames (Message 27) also travel on FILE_DATA_CHANNEL; one session per peer.
let port_mapping = crate::port_mapping::Session::new(file_channel.clone(), control_sequence.clone()); let port_mapping = crate::port_mapping::Session::new(file_channel.clone(), control_sequence.clone());
{ {
@@ -537,6 +545,8 @@ impl WebRtcSession {
let echo_seen = echo_seen.clone(); let echo_seen = echo_seen.clone();
let channel_lock_state = channel_lock_state.clone(); let channel_lock_state = channel_lock_state.clone();
let peer_files = peer_files.clone(); let peer_files = peer_files.clone();
let text_out = text_tx.clone();
let text_rx = text_rx.clone();
let peer_port_mapping = port_mapping.clone(); let peer_port_mapping = port_mapping.clone();
let peer_video_settings = video_settings.clone(); let peer_video_settings = video_settings.clone();
let peer_video_track = control_video_track.clone(); let peer_video_track = control_video_track.clone();
@@ -565,12 +575,16 @@ impl WebRtcSession {
} }
// Ordered outbound queue for protocol replies produced outside this callback. // Ordered outbound queue for protocol replies produced outside this callback.
// webrtc-rs announces the channel before handle_open (ready_state Connecting); // webrtc-rs announces the channel before handle_open (ready_state Connecting);
// send() returns ErrClosedPipe until Open. Draining CONTROL here would drop // send() returns ErrClosedPipe until Open. Draining CONTROL/TEXT here would
// Message 25 and every later reply. Start CONTROL from the on_open below // drop initial state and replies. Start them from the on_open below
// (one handler; a second on_open replaces it). Receiver taken once. // (one handler; a second on_open replaces it). Receiver taken once.
let mut control_drain: Option<Box<dyn (FnOnce() -> std::pin::Pin<Box<dyn std::future::Future<Output = ()> + Send>>) + Send + Sync>> = None; let mut open_drain: Option<Box<dyn (FnOnce() -> std::pin::Pin<Box<dyn std::future::Future<Output = ()> + Send>>) + Send + Sync>> = None;
let (outbound, outbound_rx) = tokio::sync::mpsc::unbounded_channel::<Vec<u8>>(); let (outbound, outbound_rx) = if label == "TEXT_DATA_CHANNEL" {
let outbound_rx = Arc::new(tokio::sync::Mutex::new(Some(outbound_rx))); (Outbound::Text(text_out.clone()), text_rx)
} else {
let (tx, rx) = tokio::sync::mpsc::unbounded_channel::<Vec<u8>>();
(Outbound::Other(tx), Arc::new(tokio::sync::Mutex::new(Some(OutboundReceiver::Other(rx)))))
};
if label == "CONTROL_DATA_CHANNEL" { if label == "CONTROL_DATA_CHANNEL" {
if let Some(mut chroma_sync_rx) = chroma_sync_rx.lock().unwrap().take() { if let Some(mut chroma_sync_rx) = chroma_sync_rx.lock().unwrap().take() {
let sync_out = outbound.clone(); let sync_out = outbound.clone();
@@ -603,8 +617,8 @@ impl WebRtcSession {
}); });
}) as std::pin::Pin<Box<dyn std::future::Future<Output = ()> + Send>> }) as std::pin::Pin<Box<dyn std::future::Future<Output = ()> + Send>>
}; };
if label != "CONTROL_DATA_CHANNEL" { tokio::spawn(start_drain()); } if !matches!(label.as_str(), "CONTROL_DATA_CHANNEL" | "TEXT_DATA_CHANNEL") { tokio::spawn(start_drain()); }
else { control_drain = Some(Box::new(start_drain)); } else { open_drain = Some(Box::new(start_drain)); }
} }
let (capture_tx, mut capture_rx) = tokio::sync::mpsc::channel::<Vec<u8>>(16); let (capture_tx, mut capture_rx) = tokio::sync::mpsc::channel::<Vec<u8>>(16);
if matches!(label.as_str(),"CONTROL_DATA_CHANNEL"|"TEXT_DATA_CHANNEL") { if matches!(label.as_str(),"CONTROL_DATA_CHANNEL"|"TEXT_DATA_CHANNEL") {
@@ -686,7 +700,7 @@ impl WebRtcSession {
}; };
let Some(active_screen) = active_screen else { continue; }; let Some(active_screen) = active_screen else { continue; };
let input_size = if active_screen.init_error.is_none() { let input_size = if active_screen.init_error.is_none() {
(active_screen.width, active_screen.height) active_screen.portal.as_ref().map_or((active_screen.width, active_screen.height), |p| p.size())
} else { (1920, 1080) }; } else { (1920, 1080) };
let input_size=crate::wayland::input_size(input_size); let input_size=crate::wayland::input_size(input_size);
let source_changed=source_before!=crate::wayland::selected(); let source_changed=source_before!=crate::wayland::selected();
@@ -776,9 +790,10 @@ impl WebRtcSession {
Some(peer_files.clone()) Some(peer_files.clone())
} else { None }; } else { None };
// CT_TERMINAL: TERM frames and terminal RPCs (check_env/rename) on BINARY. // CT_TERMINAL: TERM frames and terminal RPCs (check_env/rename) on BINARY.
let terminal_conn = if label == "BINARY_DATA_CHANNEL" { let terminal_conn = match (&outbound, label.as_str()) {
Some(Arc::new(crate::terminal::TerminalConn::new(outbound.clone()))) (Outbound::Other(tx), "BINARY_DATA_CHANNEL") => Some(Arc::new(crate::terminal::TerminalConn::new(tx.clone()))),
} else { None }; _ => None,
};
if label == "CONTROL_DATA_CHANNEL" || label == "TEXT_DATA_CHANNEL" { if label == "CONTROL_DATA_CHANNEL" || label == "TEXT_DATA_CHANNEL" {
let channel = d.clone(); let channel = d.clone();
let initial_sequence = out_sequence.clone(); let initial_sequence = out_sequence.clone();
@@ -795,8 +810,9 @@ impl WebRtcSession {
let open_role = channel_role.clone(); let open_role = channel_role.clone();
let open_screen = screen.clone(); let open_screen = screen.clone();
let open_selection = peer_selection; let open_selection = peer_selection;
let open_text_out = text_out.clone();
d.on_open(Box::new(move || { d.on_open(Box::new(move || {
if let Some(start_drain) = control_drain { tokio::spawn(start_drain()); } if let Some(start_drain) = open_drain { tokio::spawn(start_drain()); }
let init_actions = open_actions.clone(); let init_actions = open_actions.clone();
let init_video = open_video.clone(); let init_video = open_video.clone();
let init_track = open_track.clone(); let init_track = open_track.clone();
@@ -810,6 +826,7 @@ impl WebRtcSession {
let owner = open_owner.clone(); let owner = open_owner.clone();
let role = open_role.clone(); let role = open_role.clone();
let pc = desktop_pc.upgrade(); let pc = desktop_pc.upgrade();
let text_out = open_text_out.clone();
Box::pin(async move { Box::pin(async move {
// Permission dialogs and first-frame waits must not occupy the // Permission dialogs and first-frame waits must not occupy the
// channel-open callback or delay CONTROL message dispatch. // channel-open callback or delay CONTROL message dispatch.
@@ -962,6 +979,7 @@ impl WebRtcSession {
let message = crate::initialization::envelope( let message = crate::initialization::envelope(
sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 13, sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 13,
&init_actions.metrics_payload(desktop_sound, snapshot.permission(true))); &init_actions.metrics_payload(desktop_sound, snapshot.permission(true)));
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 mut updates = portal.subscribe(); let mut updates = portal.subscribe();
match crate::desktop_session::wait_ready(&mut updates, &channel).await { match crate::desktop_session::wait_ready(&mut updates, &channel).await {
@@ -972,6 +990,7 @@ impl WebRtcSession {
let message = crate::initialization::envelope( let message = crate::initialization::envelope(
sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 13, sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 13,
&init_actions.metrics_payload(desktop_sound, crate::system_metrics::Permission::Reject)); &init_actions.metrics_payload(desktop_sound, crate::system_metrics::Permission::Reject));
text_out.metrics(message.clone());
let _ = channel.send(&bytes::Bytes::from(message)).await; let _ = channel.send(&bytes::Bytes::from(message)).await;
} }
return; return;
@@ -983,6 +1002,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 {
@@ -1019,6 +1039,7 @@ impl WebRtcSession {
Ok(message) => message, Ok(message) => message,
Err(e) => { log::error!("CONTROL initialization encode failed: {}", e); return; } Err(e) => { log::error!("CONTROL initialization encode failed: {}", e); return; }
}; };
if field == 13 { text_out.metrics(message.clone()); }
if let Err(e) = channel.send(&bytes::Bytes::from(message)).await { if let Err(e) = channel.send(&bytes::Bytes::from(message)).await {
log::error!("CONTROL initialization field {} failed: {}", field, e); log::error!("CONTROL initialization field {} failed: {}", field, e);
return; return;
@@ -1037,6 +1058,41 @@ impl WebRtcSession {
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 portal = portal_desktop.clone();
let text_out = text_out.clone();
tokio::spawn(async move {
// 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));
loop {
tick.tick().await;
if channel.ready_state() != webrtc::data_channel::data_channel_state::RTCDataChannelState::Open { return; }
let current = crate::privacy_screen::current_type();
if current == previous { continue; }
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 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 message = crate::initialization::envelope(sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 13, &payload);
text_out.metrics(message.clone());
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);
// 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; }
}
});
}
// Mirror the Linux pointer shape; the video itself carries no pointer. // Mirror the Linux pointer shape; the video itself carries no pointer.
let mut shapes = crate::cursor::monitor(&screen.display); let mut shapes = crate::cursor::monitor(&screen.display);
let mut health = tokio::time::interval(std::time::Duration::from_millis(200)); let mut health = tokio::time::interval(std::time::Duration::from_millis(200));
@@ -1087,6 +1143,7 @@ impl WebRtcSession {
let message_role=channel_role.clone(); let message_role=channel_role.clone();
let terminal_worker = terminal_conn.clone(); let terminal_worker = terminal_conn.clone();
let rpc_out = outbound.clone(); let rpc_out = outbound.clone();
let text_out = text_out.clone();
let reply_chan = d_reply.clone(); let reply_chan = d_reply.clone();
let out_sequence = reply_sequence.clone(); let out_sequence = reply_sequence.clone();
let clipboard_sink = clipboard_input.clone(); let clipboard_sink = clipboard_input.clone();
@@ -1103,7 +1160,8 @@ impl WebRtcSession {
let capture_requests = capture_tx.clone(); let capture_requests = capture_tx.clone();
Box::pin(async move { Box::pin(async move {
let input_size = crate::wayland::input_size((screen.width, screen.height)); // The privacy screen can swap the portal stream to a virtual output of another size.
let input_size = crate::wayland::input_size(screen.portal.as_ref().map_or((screen.width, screen.height), |p| p.size()));
// After a RandR resize the stream restarts capture at the new size; map the pointer to it. // After a RandR resize the stream restarts capture at the new size; map the pointer to it.
let live_x11 = screen.init_error.is_none() && screen.portal.is_none() && screen.backend == crate::desktop_backend::DesktopBackend::X11; let live_x11 = screen.init_error.is_none() && screen.portal.is_none() && screen.backend == crate::desktop_backend::DesktopBackend::X11;
if let Some(term) = &terminal_worker { if let Some(term) = &terminal_worker {
@@ -1121,6 +1179,32 @@ impl WebRtcSession {
use crate::protocol::WireValue; use crate::protocol::WireValue;
let rpc = fields.iter().find_map(|f| match (f.number, &f.value) { (21, WireValue::Bytes(b)) => Some(*b), _ => None }); let rpc = fields.iter().find_map(|f| match (f.number, &f.value) { (21, WireValue::Bytes(b)) => Some(*b), _ => None });
let rpc_fields = rpc.and_then(|r| crate::protocol::decode_wire(r).ok()); let rpc_fields = rpc.and_then(|r| crate::protocol::decode_wire(r).ok());
if let Some(request) = rpc.filter(|_| rpc_fields.as_ref().is_some_and(|r| r.iter().any(|f| f.number == 7))) {
let Some((response, accepted)) = rpc_fields.as_deref().and_then(crate::privacy_screen::rpc_accept) else { return };
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));
let Some(accepted) = accepted else { return };
let failed = tokio::task::spawn_blocking(move || accepted.apply().is_err()).await.unwrap_or(true);
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
let next = || out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
if failed {
let report = crate::initialization::encode_report_error(next(), ts, crate::privacy_screen::REPORT_ERROR, "privacy screen failed");
let _ = reply_chan.send(&bytes::Bytes::from(report)).await;
}
let permission = portal_for_message.as_ref().map_or(crate::system_metrics::Permission::Allow, |p| p.snapshot().permission(desktop));
let metrics = actions.metrics_payload(desktop_sound, permission);
text_out.metrics(crate::initialization::envelope(next(), ts, 13, &metrics));
let _ = reply_chan.send(&bytes::Bytes::from(crate::initialization::envelope(next(), ts, 13, &metrics))).await;
let state = crate::privacy_screen::state_message(next(), ts);
let _ = reply_chan.send(&bytes::Bytes::from(state)).await;
log::info!("Privacy switch done: failed={failed} type={}", crate::privacy_screen::current_type());
return;
}
if let Some(response) = rpc_fields.as_deref().and_then(crate::privacy_screen::screensaver_response) {
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));
@@ -1302,6 +1386,7 @@ impl WebRtcSession {
crate::control_protocol::simple_action_name(action).unwrap_or("?"), value, sa::args_shape(&args)); crate::control_protocol::simple_action_name(action).unwrap_or("?"), value, sa::args_shape(&args));
let (actions, input, chan, seq_out) = (actions.clone(), input_worker.clone(), reply_chan.clone(), out_sequence.clone()); let (actions, input, chan, seq_out) = (actions.clone(), input_worker.clone(), reply_chan.clone(), out_sequence.clone());
let settings_portal = portal_for_message.clone(); let settings_portal = portal_for_message.clone();
let text_out = text_out.clone();
tokio::spawn(async move { tokio::spawn(async move {
let worker = actions.clone(); let worker = actions.clone();
let report = tokio::task::spawn_blocking(move || worker.handle(action, value, &args, || { let report = tokio::task::spawn_blocking(move || worker.handle(action, value, &args, || {
@@ -1315,6 +1400,7 @@ impl WebRtcSession {
crate::system_metrics::Permission::Allow, crate::system_metrics::Permission::Allow,
|manager| manager.snapshot().permission(desktop)); |manager| manager.snapshot().permission(desktop));
let message = crate::initialization::envelope(seq_out.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 13, &actions.metrics_payload(desktop_sound, permission)); let message = crate::initialization::envelope(seq_out.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 13, &actions.metrics_payload(desktop_sound, permission));
text_out.metrics(message.clone());
if let Err(e) = chan.send(&bytes::Bytes::from(message)).await { log::warn!("Settings report failed: {}", e); } if let Err(e) = chan.send(&bytes::Bytes::from(message)).await { log::warn!("Settings report failed: {}", e); }
} }
}); });
@@ -1373,8 +1459,9 @@ impl WebRtcSession {
if channel_name.contains("CONTROL") { if channel_name.contains("CONTROL") {
match crate::control_protocol::decode_control(&msg.data) { match crate::control_protocol::decode_control(&msg.data) {
Ok(crate::control_protocol::ControlMessage::Input(event)) => { Ok(crate::control_protocol::ControlMessage::Input(event)) => {
// A ready compositor source remains controllable on its lock screen.
if screen.backend == crate::desktop_backend::DesktopBackend::Portal if screen.backend == crate::desktop_backend::DesktopBackend::Portal
&& (screen.init_error.is_some() || !desktop_ready || *lock_for_message.borrow() != Some(false)) { return; } && (screen.init_error.is_some() || !desktop_ready) { return; }
if !crate::wayland::input_ready() {return;} if !crate::wayland::input_ready() {return;}
use crate::control_protocol::ControlInput; use crate::control_protocol::ControlInput;
// Separate receipt budgets keep motion floods from hiding clicks. // Separate receipt budgets keep motion floods from hiding clicks.
@@ -1454,7 +1541,7 @@ impl WebRtcSession {
input, input,
desktop, desktop,
role, role,
controller_mac: false, controller: crate::input::Controller::Other,
context, context,
actions: session_actions, actions: session_actions,
}) })
@@ -1668,8 +1755,28 @@ fn negotiated_bundle_media(sdp: &str) -> Option<(String, u16)> {
None None
} }
#[derive(Clone)]
enum Outbound {
Text(text_outbox::Sender),
Other(tokio::sync::mpsc::UnboundedSender<Vec<u8>>),
}
impl Outbound {
fn send(&self, message: Vec<u8>) -> Result<(), tokio::sync::mpsc::error::SendError<Vec<u8>>> {
match self { Self::Text(tx) => tx.send(message), Self::Other(tx) => tx.send(message) }
}
}
enum OutboundReceiver {
Text(text_outbox::Receiver),
Other(tokio::sync::mpsc::UnboundedReceiver<Vec<u8>>),
}
impl OutboundReceiver {
async fn recv(&mut self) -> Option<Vec<u8>> {
match self { Self::Text(rx) => rx.recv().await, Self::Other(rx) => rx.recv().await }
}
}
/// First drain owns the outbound receiver; a later open must not start another. /// First drain owns the outbound receiver; a later open must not start another.
async fn take_outbound_once<T>(slot: &tokio::sync::Mutex<Option<tokio::sync::mpsc::UnboundedReceiver<T>>>) -> Option<tokio::sync::mpsc::UnboundedReceiver<T>> { async fn take_outbound_once<T>(slot: &tokio::sync::Mutex<Option<T>>) -> Option<T> {
slot.lock().await.take() slot.lock().await.take()
} }
Binary file not shown.

After

Width:  |  Height:  |  Size: 68 B

+37
View File
@@ -0,0 +1,37 @@
#!/bin/sh
# Requires a C compiler, GTK3/X11 development headers, Xvfb and xauth.
# Run: xvfb-run -a -s '-screen 0 1600x1200x24' sh tests/gtk-ui-smoke.sh /tmp/gtk-ui-previews
# Optional output directory retains synthetic main/settings screenshots; no account or QR is used.
# Checks 5 window types in Chinese/English with System/Light/Dark and settings persistence.
set -eu
cd "$(dirname "$0")/.."
work=$(mktemp -d)
trap 'rm -rf "$work"' EXIT HUP INT TERM
out=${1:-"$work/previews"}
mkdir -p "$out" "$work/config/gtk-3.0" "$work/config/uuremote" "$work/home/Documents"
export HOME="$work/home"
export XDG_CONFIG_HOME="$work/config"
export GSETTINGS_BACKEND=memory
export G_DEBUG=fatal-warnings
export GDK_BACKEND=x11
export GDK_SCALE=1
export GDK_DPI_SCALE=1
export NO_AT_BRIDGE=1
unset GTK_THEME
printf '[Settings]\ngtk-theme-name=Adwaita\ngtk-application-prefer-dark-theme=false\n' > "$XDG_CONFIG_HOME/gtk-3.0/settings.ini"
for ui in HOST VIEWER TOOLS; do
# pkg-config output is intentionally split into compiler arguments.
cc -std=gnu11 -Wall -Wextra -Werror -Wno-deprecated-declarations \
-D"UI_$ui" tests/gtk_ui_smoke.c c_engine/ui_theme.c \
$(pkg-config --cflags --libs gtk+-3.0) -ldl -lpthread -o "$work/$ui"
for lang in en zh; do
for theme in light dark system; do
case $theme in light) mode=1;; dark) mode=2;; system) mode=0;; esac
for kind in $(if [ "$ui" = TOOLS ]; then printf 'files portmap terminal'; else printf 'main'; fi); do
printf '%s' "$theme" > "$XDG_CONFIG_HOME/uuremote/theme"
UU_LANG=$lang "$work/$ui" "$out/$ui-$kind-$lang-$theme.png" "$mode" "$kind"
done
done
done
done
printf 'GTK UI smoke checks passed (host, viewer, files, port mapping, terminal; English/Chinese; light/dark/system).\n'
+177
View File
@@ -0,0 +1,177 @@
// Offline fixtures only: no account, QR, cloud, or desktop capture is used.
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
#include <cairo-xlib.h>
#include <string.h>
#include <stdlib.h>
int uu_i18n_english(void) { return g_strcmp0(g_getenv("UU_LANG"), "zh") != 0; }
int uu_i18n_save(int english) { (void)english; return 1; }
#if defined(UI_HOST)
#include "../c_engine/assist_window.c"
#elif defined(UI_VIEWER)
#include "../c_engine/viewer_window.c"
#else
#include <unistd.h>
static int fixture_hostname(char *name, size_t len) { g_strlcpy(name, "Local workstation", len); return 0; }
#define gethostname fixture_hostname
#include "../c_engine/viewer_tools.c"
#endif
static GtkWidget *appearance_combo(GtkWidget *w) {
if (GTK_IS_COMBO_BOX(w) && !g_strcmp0(atk_object_get_name(gtk_widget_get_accessible(w)), L("外观", "Appearance"))) return w;
if (!GTK_IS_CONTAINER(w)) return NULL;
GList *children = gtk_container_get_children(GTK_CONTAINER(w));
GtkWidget *found = NULL;
for (GList *c = children; c && !found; c = c->next) found = appearance_combo(c->data);
g_list_free(children);
return found;
}
#if !defined(UI_VIEWER)
static GtkWidget *settings_button(GtkWidget *w) {
if (GTK_IS_BUTTON(w) && !g_strcmp0(atk_object_get_name(gtk_widget_get_accessible(w)), L("设置", "Settings"))) return w;
if (!GTK_IS_CONTAINER(w)) return NULL;
GList *children = gtk_container_get_children(GTK_CONTAINER(w));
GtkWidget *found = NULL;
for (GList *c = children; c && !found; c = c->next) found = settings_button(c->data);
g_list_free(children);
return found;
}
#endif
static gboolean snapshot(GtkWidget *w, const char *path) {
static int attempts;
int width = gtk_widget_get_allocated_width(w), height = gtk_widget_get_allocated_height(w);
GdkWindow *native = gtk_widget_get_window(w);
int x, y;
gdk_window_get_origin(native, &x, &y);
g_assert_cmpint(x + width, <=, gdk_screen_width());
g_assert_cmpint(y + height, <=, gdk_screen_height());
gdk_window_process_updates(native, TRUE);
gdk_display_sync(gtk_widget_get_display(w));
// GTK 3.24.33's get_from_window marks its cached surface dirty without flushing;
// Cairo 1.16 can abort on attached MIME data. Read through a fresh X11 surface.
cairo_surface_t *surface = cairo_xlib_surface_create(GDK_WINDOW_XDISPLAY(native),
GDK_WINDOW_XID(native), GDK_VISUAL_XVISUAL(gdk_window_get_visual(native)), width, height);
g_assert_cmpint(cairo_surface_status(surface), ==, CAIRO_STATUS_SUCCESS);
GdkPixbuf *shot = gdk_pixbuf_get_from_surface(surface, 0, 0, width, height);
cairo_surface_destroy(surface);
g_assert_nonnull(shot);
const guchar *pixels = gdk_pixbuf_read_pixels(shot);
int low = 255, high = 0;
for (int row = 0; row < height; row++) {
for (int col = 0; col < width; col++) {
int v = pixels[row * gdk_pixbuf_get_rowstride(shot) + col * gdk_pixbuf_get_n_channels(shot)];
low = MIN(low, v); high = MAX(high, v);
}
}
if (high - low <= 80) {
// A loaded CI runner may not have painted yet; retry through the main loop, with a bound.
g_object_unref(shot);
g_assert_cmpint(++attempts, <, 10);
return FALSE;
}
attempts = 0;
g_assert_true(gdk_pixbuf_save(shot, path, "png", NULL, NULL));
g_object_unref(shot);
return TRUE;
}
static const char *output;
static int expected_mode, stage;
#if defined(UI_VIEWER)
static void verify_badge(void) {
for (int i = 0; i < 2; i++) {
show_device(i); // Fixture 0 is online, fixture 1 is offline.
GtkStyleContext *ctx = gtk_widget_get_style_context(badge);
GdkRGBA actual, expected;
g_assert_cmpint(gtk_style_context_has_class(ctx, "off"), ==, i == 1);
g_assert_true(gtk_style_context_lookup_color(ctx, i ? "uu_muted" : "uu_success", &expected));
gtk_style_context_get_color(ctx, GTK_STATE_FLAG_NORMAL, &actual);
g_assert_cmpfloat_with_epsilon(actual.red, expected.red, 0.005);
g_assert_cmpfloat_with_epsilon(actual.green, expected.green, 0.005);
g_assert_cmpfloat_with_epsilon(actual.blue, expected.blue, 0.005);
}
}
#endif
static gboolean verify(gpointer unused) {
(void)unused;
if (!stage) {
g_assert_null(appearance_combo(window)); // Appearance belongs in Settings.
if (!snapshot(window, output)) return G_SOURCE_CONTINUE;
#if defined(UI_VIEWER)
open_settings();
#else
GtkWidget *button = settings_button(window);
g_assert_nonnull(button);
gtk_button_clicked(GTK_BUTTON(button));
#endif
stage++;
return G_SOURCE_CONTINUE;
}
GList *windows = gtk_window_list_toplevels();
GtkWidget *combo = NULL, *settings = NULL;
for (GList *w = windows; w && !combo; w = w->next) {
combo = appearance_combo(w->data);
if (combo) settings = w->data;
}
g_list_free(windows);
g_assert_nonnull(combo);
g_assert_cmpint(gtk_combo_box_get_active(GTK_COMBO_BOX(combo)), ==, expected_mode);
if (stage == 1) {
char *path = g_strconcat(output, ".settings.png", NULL);
gboolean painted = snapshot(settings, path); g_free(path);
if (!painted) return G_SOURCE_CONTINUE;
#if defined(UI_VIEWER)
verify_badge();
#endif
expected_mode = expected_mode == 2 ? 1 : 2;
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), expected_mode);
stage++;
return G_SOURCE_CONTINUE;
}
gboolean dark = FALSE;
g_object_get(gtk_settings_get_default(), "gtk-application-prefer-dark-theme", &dark, NULL);
g_assert_cmpint(dark, ==, expected_mode == 2);
#if defined(UI_VIEWER)
verify_badge();
#endif
char *path = g_build_filename(g_get_user_config_dir(), "uuremote", "theme", NULL), *saved = NULL;
g_assert_true(g_file_get_contents(path, &saved, NULL, NULL));
g_assert_cmpstr(saved, ==, expected_mode == 2 ? "dark" : "light");
g_free(path); g_free(saved);
// System must release the application override and restore the test desktop's light default.
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
g_object_get(gtk_settings_get_default(), "gtk-application-prefer-dark-theme", &dark, NULL);
g_assert_false(dark);
gtk_main_quit();
return G_SOURCE_REMOVE;
}
int main(int argc, char **argv) {
g_assert_cmpint(argc, >=, 3);
output = argv[1]; expected_mode = atoi(argv[2]);
gtk_init(NULL, NULL);
g_object_set(gtk_settings_get_default(), "gtk-enable-animations", FALSE, NULL);
g_timeout_add(400, verify, NULL);
#if defined(UI_HOST)
show_account = 1;
build_window();
gtk_main();
#elif defined(UI_VIEWER)
uu_viewer_ui_set_devices("demo-workstation\tWorkstation\t1\t1\t0\ndemo-laptop\tLaptop\t4\t0\t0\n");
logged_in = 1;
g_idle_add(apply_devices, NULL);
g_idle_add(apply_login, NULL);
run(NULL);
#else
g_strlcpy(remote_name, "Workstation", sizeof remote_name);
if (argc > 3 && !strcmp(argv[3], "terminal")) build_terminal();
else if (argc > 3 && !strcmp(argv[3], "portmap")) build_portmap();
else build_files();
gtk_widget_show_all(window);
gtk_main();
#endif
return 0;
}
+189
View File
@@ -0,0 +1,189 @@
#define _GNU_SOURCE
#include <assert.h>
#include <pipewire/pipewire.h>
#include <spa/param/video/format-utils.h>
static struct pw_buffer *incoming[8], *returned[32];
static unsigned input_count, input_next, return_count, loop_depth, updates;
static int requested_dma;
static struct pw_buffer *test_dequeue(struct pw_stream *stream) {
(void)stream;
assert(loop_depth == 1);
return input_next < input_count ? incoming[input_next++] : NULL;
}
static int test_queue(struct pw_stream *stream, struct pw_buffer *buffer) {
(void)stream;
assert(loop_depth == 1 && return_count < 32);
returned[return_count++] = buffer;
return 0;
}
static void test_loop_lock(struct pw_thread_loop *loop) { (void)loop; assert(loop_depth++ == 0); }
static void test_loop_unlock(struct pw_thread_loop *loop) { (void)loop; assert(loop_depth-- == 1); }
static int test_update(struct pw_stream *stream, const struct spa_pod **params, uint32_t count) {
(void)stream;
assert(loop_depth == 1);
if (count == 1) { updates++; return 0; } /* Negotiated buffer requirements. */
assert(count == 2 || count == 3);
requested_dma = count == 3;
assert(!!spa_pod_find_prop(params[0], NULL, SPA_FORMAT_VIDEO_modifier) == requested_dma);
if (requested_dma) assert(!spa_pod_find_prop(params[1], NULL, SPA_FORMAT_VIDEO_modifier));
updates++;
return 0;
}
#define pw_stream_dequeue_buffer test_dequeue
#define pw_stream_queue_buffer test_queue
#define pw_stream_update_params test_update
#define pw_thread_loop_lock test_loop_lock
#define pw_thread_loop_unlock test_loop_unlock
#include "../c_engine/portal_engine.c"
static struct uu_portal *make_portal(void) {
struct uu_portal *p = calloc(1, sizeof(*p));
assert(p);
pthread_mutex_init(&p->lock, NULL);
pthread_cond_init(&p->changed, NULL);
p->width=2; p->height=2; p->format=SPA_VIDEO_FORMAT_BGRA; p->format_valid=1;
p->frame_length=16; p->frame=malloc(16); assert(p->frame); memset(p->frame, 99, 16);
p->pw_loop=(struct pw_thread_loop *)1; p->stream=(struct pw_stream *)1;
input_count=input_next=return_count=updates=loop_depth=0;
return p;
}
static void close_portal(struct uu_portal *p) {
assert(!loop_depth);
p->stream=NULL; p->pw_loop=NULL;
uu_portal_close(p);
}
static void process(struct uu_portal *p, struct pw_buffer *buffer) {
input_count=1; input_next=0; incoming[0]=buffer;
test_loop_lock(p->pw_loop); stream_process(p); test_loop_unlock(p->pw_loop);
}
static void descriptor_bounds(void) {
struct uu_portal *p=make_portal();
struct spa_chunk chunk={.offset=8, .size=24, .stride=16};
struct spa_data data={.type=SPA_DATA_DmaBuf, .fd=5, .mapoffset=4, .maxsize=64, .chunk=&chunk};
struct spa_buffer buffer={.n_datas=1, .datas=&data};
UuDmaFrame frame;
assert(describe_dma_buffer(p,&buffer,&frame)==0);
assert(frame.offset==12 && frame.size==68 && frame.stride==16 && frame.fourcc==0x34325241);
chunk.size=23; assert(describe_dma_buffer(p,&buffer,&frame)==10); chunk.size=24;
data.maxsize=31; assert(describe_dma_buffer(p,&buffer,&frame)==14); data.maxsize=64;
data.mapoffset=UINT32_MAX; assert(describe_dma_buffer(p,&buffer,&frame)==14); data.mapoffset=4;
chunk.stride=7; assert(describe_dma_buffer(p,&buffer,&frame)==14); chunk.stride=16;
data.fd=-1; assert(describe_dma_buffer(p,&buffer,&frame)==14); data.fd=5;
data.type=SPA_DATA_MemFd; assert(describe_dma_buffer(p,&buffer,&frame)==14); data.type=SPA_DATA_DmaBuf;
buffer.n_datas=2; assert(describe_dma_buffer(p,&buffer,&frame)==14); buffer.n_datas=1;
p->modifier=1; assert(describe_dma_buffer(p,&buffer,&frame)==19); p->modifier=0;
chunk.flags=SPA_CHUNK_FLAG_CORRUPTED; assert(describe_dma_buffer(p,&buffer,&frame)==10);
chunk.flags=SPA_CHUNK_FLAG_EMPTY; assert(describe_dma_buffer(p,&buffer,&frame)==15); chunk.flags=0;
struct spa_meta_header header={.flags=SPA_META_HEADER_FLAG_CORRUPTED};
struct spa_meta meta={.type=SPA_META_Header,.size=sizeof(header),.data=&header};
buffer.n_metas=1; buffer.metas=&meta; assert(describe_dma_buffer(p,&buffer,&frame)==10);
struct spa_meta_region crop={.region=SPA_REGION(1,0,2,2)};
meta=(struct spa_meta){.type=SPA_META_VideoCrop,.size=sizeof(crop),.data=&crop};
assert(describe_dma_buffer(p,&buffer,&frame)==14);
#if PW_CHECK_VERSION(1, 2, 0)
struct spa_meta_sync_timeline sync={0};
meta=(struct spa_meta){.type=SPA_META_SyncTimeline,.size=sizeof(sync),.data=&sync};
assert(describe_dma_buffer(p,&buffer,&frame)==18);
#endif
close_portal(p);
}
static void ownership_and_reset(void) {
struct uu_portal *p=make_portal();
p->dma_requested=p->dma_negotiated=p->dma_format=1;
struct spa_chunk chunk={.size=16,.stride=8};
/* Invalid CPU address: the DMA path must never dereference or copy pixels. */
struct spa_data data={.type=SPA_DATA_DmaBuf,.fd=5,.maxsize=16,.data=(void *)1,.chunk=&chunk};
struct spa_buffer spa={.n_datas=1,.datas=&data};
struct pw_buffer a={.buffer=&spa}, b={.buffer=&spa}, c={.buffer=&spa};
UuDmaFrame frame; uint64_t revision=0;
process(p,&a);
assert(p->dma_pending==&a && !return_count && p->frame[0]==99);
assert(uu_portal_dmabuf_acquire(p,&frame,&revision)==0 && loop_depth==1);
assert(p->dma_current==&a && !p->dma_pending && !return_count);
uu_portal_dmabuf_release(p); assert(!loop_depth && !return_count);
process(p,&b); process(p,&c);
assert(return_count==1 && returned[0]==&b && p->dma_current==&a && p->dma_pending==&c);
assert(uu_portal_dmabuf_acquire(p,&frame,&revision)==0);
assert(return_count==2 && returned[1]==&a && p->dma_current==&c);
uu_portal_dmabuf_release(p);
assert(uu_portal_dmabuf_acquire(p,&frame,&revision)==12);
uu_portal_dmabuf_release(p);
assert(return_count==2);
uu_portal_reset_frame(p);
assert(return_count==3 && returned[2]==&c && !p->dma_current && !p->dma_pending && !p->sequence);
for (unsigned i=0;i<16;i++) assert(!p->frame[i]);
process(p,&a);
stream_remove_buffer(p,&a);
assert(!p->dma_pending);
process(p,&b);
uu_portal_dmabuf_disable(p);
assert(p->dma_blocked && !requested_dma && !p->dma_pending && !p->dma_current);
assert(return_count==4 && returned[3]==&b);
assert(uu_portal_dmabuf_acquire(p,&frame,&revision)==14 && !loop_depth);
close_portal(p);
}
static void negotiation_and_black(void) {
struct uu_portal *p=make_portal();
UuDmaFrame frame; uint64_t revision=0;
assert(uu_portal_dmabuf_acquire(p,&frame,&revision)==10 && !loop_depth);
assert(requested_dma && updates==1);
p->dma_negotiated=1; p->dma_format=1;
p->dma_requested_at=g_get_monotonic_time()-3*G_TIME_SPAN_SECOND;
assert(uu_portal_dmabuf_acquire(p,&frame,&revision)==17 && !loop_depth);
struct spa_chunk chunk={.flags=SPA_CHUNK_FLAG_EMPTY};
struct spa_data data={.type=SPA_DATA_DmaBuf,.fd=5,.chunk=&chunk};
struct spa_buffer spa={.n_datas=1,.datas=&data};
struct pw_buffer buffer={.buffer=&spa};
process(p,&buffer);
assert(uu_portal_dmabuf_acquire(p,&frame,&revision)==15 && !loop_depth);
p->dma_neutral=0; p->dma_format=0;
assert(uu_portal_dmabuf_acquire(p,&frame,&revision)==16 && !loop_depth);
uu_portal_dmabuf_disable(p);
assert(!requested_dma && updates==2);
close_portal(p);
}
static void initial_dma_transport(void) {
struct uu_portal *p=make_portal();
uint8_t storage[2048];
const struct spa_pod *params[3];
struct spa_pod_builder builder=SPA_POD_BUILDER_INIT(storage,sizeof(storage));
p->width=p->height=0;
assert(capture_formats(p,&builder,params,0)==2);
assert(!spa_pod_find_prop(params[0],NULL,SPA_FORMAT_VIDEO_modifier));
builder=(struct spa_pod_builder)SPA_POD_BUILDER_INIT(storage,sizeof(storage));
assert(capture_formats(p,&builder,params,1)==3);
assert(spa_pod_find_prop(params[0],NULL,SPA_FORMAT_VIDEO_modifier));
assert(!spa_pod_find_prop(params[1],NULL,SPA_FORMAT_VIDEO_modifier));
/* Recovery must request DMA before the first buffer: opening in CPU mode and
* switching later drops a compositor's already-negotiated DMA first frame. */
p->dma_requested=1;
p->dma_bad=18;
assert(wait_for_first_frame(p)==14); /* Reject unsupported startup buffers without a 10 s stall. */
p->dma_bad=0;
builder=(struct spa_pod_builder)SPA_POD_BUILDER_INIT(storage,sizeof(storage));
const struct spa_pod *format=spa_format_video_raw_build(&builder,SPA_PARAM_Format,
&SPA_VIDEO_INFO_RAW_INIT(.format=SPA_VIDEO_FORMAT_BGRA,.size=SPA_RECTANGLE(2,2),
.flags=SPA_VIDEO_FLAG_MODIFIER,.modifier=0,.framerate=SPA_FRACTION(60,1)));
test_loop_lock(p->pw_loop);
stream_format(p,SPA_PARAM_Format,format);
test_loop_unlock(p->pw_loop);
struct spa_chunk chunk={.size=16,.stride=8};
struct spa_data data={.type=SPA_DATA_DmaBuf,.fd=5,.maxsize=16,.data=(void *)1,.chunk=&chunk};
struct spa_buffer spa={.n_datas=1,.datas=&data};
struct pw_buffer buffer={.buffer=&spa};
process(p,&buffer);
assert(wait_for_first_frame(p)==0 && p->dma_pending==&buffer && p->frame[0]==99);
UuDmaFrame frame; uint64_t revision=0;
assert(uu_portal_dmabuf_acquire(p,&frame,&revision)==0);
uu_portal_dmabuf_release(p);
uu_portal_reset_frame(p);
close_portal(p);
}
int main(void) {
descriptor_bounds();
ownership_and_reset();
negotiation_and_black();
initial_dma_transport();
return 0;
}
+63 -2
View File
@@ -23,7 +23,7 @@ static GVariant *test_call_with_unix_fd_list_sync(GDBusConnection *connection,
#define CAP_MASK (EI_DEVICE_CAP_POINTER | EI_DEVICE_CAP_POINTER_ABSOLUTE | \ #define CAP_MASK (EI_DEVICE_CAP_POINTER | EI_DEVICE_CAP_POINTER_ABSOLUTE | \
EI_DEVICE_CAP_BUTTON | EI_DEVICE_CAP_SCROLL | EI_DEVICE_CAP_KEYBOARD) EI_DEVICE_CAP_BUTTON | EI_DEVICE_CAP_SCROLL | EI_DEVICE_CAP_KEYBOARD)
#define EVENT_CAP_MASK (EIS_DEVICE_CAP_POINTER | EIS_DEVICE_CAP_POINTER_ABSOLUTE | \ #define EVENT_CAP_MASK (EIS_DEVICE_CAP_POINTER | EIS_DEVICE_CAP_POINTER_ABSOLUTE | \
EIS_DEVICE_CAP_BUTTON | EIS_DEVICE_CAP_SCROLL | EIS_DEVICE_CAP_KEYBOARD) EIS_DEVICE_CAP_BUTTON | EIS_DEVICE_CAP_SCROLL | EIS_DEVICE_CAP_KEYBOARD | EIS_DEVICE_CAP_TOUCH)
static const unsigned capabilities[] = { static const unsigned capabilities[] = {
EIS_DEVICE_CAP_POINTER, EIS_DEVICE_CAP_POINTER,
@@ -31,6 +31,7 @@ static const unsigned capabilities[] = {
EIS_DEVICE_CAP_BUTTON, EIS_DEVICE_CAP_BUTTON,
EIS_DEVICE_CAP_SCROLL, EIS_DEVICE_CAP_SCROLL,
EIS_DEVICE_CAP_KEYBOARD, EIS_DEVICE_CAP_KEYBOARD,
EIS_DEVICE_CAP_TOUCH,
}; };
struct received { struct received {
@@ -166,7 +167,9 @@ static void handle_server_events(struct harness *h) {
h->stops++; h->stops++;
} else if (type == EIS_EVENT_POINTER_MOTION || type == EIS_EVENT_POINTER_MOTION_ABSOLUTE || } else if (type == EIS_EVENT_POINTER_MOTION || type == EIS_EVENT_POINTER_MOTION_ABSOLUTE ||
type == EIS_EVENT_BUTTON_BUTTON || type == EIS_EVENT_SCROLL_DISCRETE || type == EIS_EVENT_BUTTON_BUTTON || type == EIS_EVENT_SCROLL_DISCRETE ||
type == EIS_EVENT_KEYBOARD_KEY) { type == EIS_EVENT_KEYBOARD_KEY || type == EIS_EVENT_TOUCH_DOWN ||
type == EIS_EVENT_TOUCH_MOTION || type == EIS_EVENT_TOUCH_UP ||
type == EIS_EVENT_SCROLL_DELTA || type == EIS_EVENT_SCROLL_STOP) {
assert(h->n_events < sizeof(h->events) / sizeof(h->events[0])); assert(h->n_events < sizeof(h->events) / sizeof(h->events[0]));
struct received *got = &h->events[h->n_events++]; struct received *got = &h->events[h->n_events++];
got->type = type; got->type = type;
@@ -187,6 +190,15 @@ static void handle_server_events(struct harness *h) {
got->dx = eis_event_scroll_get_discrete_dx(event); got->dx = eis_event_scroll_get_discrete_dx(event);
got->dy = eis_event_scroll_get_discrete_dy(event); got->dy = eis_event_scroll_get_discrete_dy(event);
break; break;
case EIS_EVENT_SCROLL_DELTA:
got->x = eis_event_scroll_get_dx(event);
got->y = eis_event_scroll_get_dy(event);
break;
case EIS_EVENT_TOUCH_DOWN:
case EIS_EVENT_TOUCH_MOTION:
got->x = eis_event_touch_get_x(event);
got->y = eis_event_touch_get_y(event);
break;
case EIS_EVENT_KEYBOARD_KEY: case EIS_EVENT_KEYBOARD_KEY:
got->code = eis_event_keyboard_get_key(event); got->code = eis_event_keyboard_get_key(event);
got->pressed = eis_event_keyboard_get_key_is_press(event); got->pressed = eis_event_keyboard_get_key_is_press(event);
@@ -255,6 +267,15 @@ static void wait_for_input(struct harness *h) {
assert(h->frames > 0); assert(h->frames > 0);
} }
static int input_within(struct harness *h, gint64 microseconds) {
gint64 deadline = g_get_monotonic_time() + microseconds;
while (!h->n_events && g_get_monotonic_time() < deadline) {
pump(h);
g_usleep(1000);
}
return h->n_events > 0;
}
static void pause_resume(struct harness *h) { static void pause_resume(struct harness *h) {
/* libeis 1.5 pauses only a resumed device; pause while emulating is a /* libeis 1.5 pauses only a resumed device; pause while emulating is a
* no-op. End the client transaction before exercising pause/resume. */ * no-op. End the client transaction before exercising pause/resume. */
@@ -295,6 +316,7 @@ static void run_geometry(const struct geometry *geometry) {
h.portal->mapping_id = g_strdup("synthetic-screen"); h.portal->mapping_id = g_strdup("synthetic-screen");
h.portal->session = strdup("/synthetic/session"); h.portal->session = strdup("/synthetic/session");
h.portal->absolute_stream_pixels = 1; h.portal->absolute_stream_pixels = 1;
h.portal->devices = 7;
h.server = eis_new(NULL); h.server = eis_new(NULL);
assert(h.server && eis_setup_backend_fd(h.server) == 0); assert(h.server && eis_setup_backend_fd(h.server) == 0);
@@ -380,6 +402,45 @@ static void run_geometry(const struct geometry *geometry) {
assert(h.events[0].type == EIS_EVENT_SCROLL_DISCRETE); assert(h.events[0].type == EIS_EVENT_SCROLL_DISCRETE);
assert(h.events[0].dx == 0 && h.events[0].dy == -120); assert(h.events[0].dx == 0 && h.events[0].dy == -120);
/* Smooth scroll maps like relative motion; finish ends the gesture with a scroll stop. */
clear_events(&h);
assert(uu_portal_scroll(h.portal, geometry->width / 8.0, -(double)geometry->height / 8.0, 1) == 0);
wait_for_input(&h);
assert(h.events[0].type == EIS_EVENT_SCROLL_DELTA);
assert(fabs(h.events[0].x - geometry->logical_width / 8.0) < 0.001 && fabs(h.events[0].y + geometry->logical_height / 8.0) < 0.001);
for (gint64 until = g_get_monotonic_time() + 300000; h.n_events < 2 && g_get_monotonic_time() < until; g_usleep(1000)) pump(&h);
assert(h.n_events == 2 && h.events[1].type == EIS_EVENT_SCROLL_STOP);
/* A touch drag lands in the stream's region; motion without a finger down is refused. */
assert(uu_portal_touch(h.portal, 1, 1, 1) == 11);
clear_events(&h);
unsigned diagnostics = h.diagnostics;
assert(uu_portal_touch(h.portal, 0, geometry->width / 2.0, geometry->height / 2.0) == 0);
if (!input_within(&h, 300000)) {
/* libei before 1.3.0 accepts a touch only inside every region of the device (later:
* any region). This device also has a region for another screen, so an older library
* rejects the point with a client-bug diagnostic; a real one-stream session has one region. */
assert(h.diagnostics > diagnostics);
assert(uu_portal_touch(h.portal, 2, 0, 0) == 0 && !h.portal->ei_touch);
h.diagnostics = diagnostics; /* expected: the rejected touch and its release */
goto touched;
}
assert(h.events[0].type == EIS_EVENT_TOUCH_DOWN);
assert(h.events[0].x == geometry->x + geometry->logical_width / 2.0);
assert(h.events[0].y == geometry->y + geometry->logical_height / 2.0);
clear_events(&h);
assert(uu_portal_touch(h.portal, 1, 0, 0) == 0);
wait_for_input(&h);
assert(h.events[0].type == EIS_EVENT_TOUCH_MOTION);
assert(h.events[0].x == geometry->x && h.events[0].y == geometry->y);
assert(uu_portal_touch(h.portal, 1, geometry->width, 0) == 11);
clear_events(&h);
assert(uu_portal_touch(h.portal, 2, 0, 0) == 0);
wait_for_input(&h);
assert(h.events[0].type == EIS_EVENT_TOUCH_UP && !h.portal->ei_touch);
assert(uu_portal_touch(h.portal, 2, 0, 0) == 0);
touched:;
uint8_t storage[256]; uint8_t storage[256];
struct spa_pod_builder builder = SPA_POD_BUILDER_INIT(storage, sizeof(storage)); struct spa_pod_builder builder = SPA_POD_BUILDER_INIT(storage, sizeof(storage));
const struct spa_pod *format = spa_format_video_raw_build(&builder, SPA_PARAM_Format, const struct spa_pod *format = spa_format_video_raw_build(&builder, SPA_PARAM_Format,
+45 -1
View File
@@ -18,6 +18,7 @@ enum response_mode { UNKNOWN_METHOD, NOT_SUPPORTED, TEMPORARY_FAILURE, NO_FDS, B
static enum response_mode mode; static enum response_mode mode;
static unsigned connects, legacy_calls; static unsigned connects, legacy_calls;
static double last_x, last_y; static double last_x, last_y;
static int last_finish;
static GVariant *test_call(GDBusConnection *bus, const gchar *dest, const gchar *path, static GVariant *test_call(GDBusConnection *bus, const gchar *dest, const gchar *path,
const gchar *interface, const gchar *method, GVariant *parameters, const gchar *interface, const gchar *method, GVariant *parameters,
@@ -26,7 +27,24 @@ static GVariant *test_call(GDBusConnection *bus, const gchar *dest, const gchar
assert(!strcmp(interface, REMOTE)); assert(!strcmp(interface, REMOTE));
assert(!strcmp(method, "NotifyKeyboardKeysym") || !strcmp(method, "NotifyPointerButton") || assert(!strcmp(method, "NotifyKeyboardKeysym") || !strcmp(method, "NotifyPointerButton") ||
!strcmp(method, "NotifyPointerAxisDiscrete") || !strcmp(method, "NotifyPointerMotion") || !strcmp(method, "NotifyPointerAxisDiscrete") || !strcmp(method, "NotifyPointerMotion") ||
!strcmp(method, "NotifyPointerMotionAbsolute")); !strcmp(method, "NotifyPointerMotionAbsolute") || !strcmp(method, "NotifyTouchDown") ||
!strcmp(method, "NotifyTouchMotion") || !strcmp(method, "NotifyTouchUp") || !strcmp(method, "NotifyPointerAxis"));
if (!strcmp(method, "NotifyPointerAxis")) {
assert(g_variant_is_of_type(parameters, G_VARIANT_TYPE("(oa{sv}dd)")));
GVariant *options = g_variant_get_child_value(parameters, 1);
GVariant *x = g_variant_get_child_value(parameters, 2), *y = g_variant_get_child_value(parameters, 3);
last_x = g_variant_get_double(x); last_y = g_variant_get_double(y);
gboolean finish = FALSE; last_finish = g_variant_lookup(options, "finish", "b", &finish) && finish;
g_variant_unref(options); g_variant_unref(x); g_variant_unref(y);
}
if (!strcmp(method, "NotifyTouchDown") || !strcmp(method, "NotifyTouchMotion")) {
assert(g_variant_is_of_type(parameters, G_VARIANT_TYPE("(oa{sv}uudd)")));
GVariant *x = g_variant_get_child_value(parameters, 4);
GVariant *y = g_variant_get_child_value(parameters, 5);
last_x = g_variant_get_double(x); last_y = g_variant_get_double(y);
g_variant_unref(x); g_variant_unref(y);
}
if (!strcmp(method, "NotifyTouchUp")) assert(g_variant_is_of_type(parameters, G_VARIANT_TYPE("(oa{sv}u)")));
if (!strcmp(method, "NotifyPointerMotion") || !strcmp(method, "NotifyPointerMotionAbsolute")) { if (!strcmp(method, "NotifyPointerMotion") || !strcmp(method, "NotifyPointerMotionAbsolute")) {
unsigned offset = !strcmp(method, "NotifyPointerMotion") ? 2 : 3; unsigned offset = !strcmp(method, "NotifyPointerMotion") ? 2 : 3;
GVariant *x = g_variant_get_child_value(parameters, offset); GVariant *x = g_variant_get_child_value(parameters, offset);
@@ -93,6 +111,28 @@ static void legacy_input(struct uu_portal *p) {
assert(legacy_calls == 7 && uu_portal_alive(p) && !p->ei); assert(legacy_calls == 7 && uu_portal_alive(p) && !p->ei);
} }
/* Smooth scroll maps like relative motion; only the last event of a gesture carries "finish". */
static void legacy_scroll(struct uu_portal *p) {
unsigned before = legacy_calls;
assert(uu_portal_scroll(p, 20, -40, 0) == 0);
assert(last_x == 20. * p->logical_width / p->width && last_y == -40. * p->logical_height / p->height && !last_finish);
assert(uu_portal_scroll(p, 0, 0, 1) == 0 && last_finish && last_x == 0 && last_y == 0);
assert(uu_portal_scroll(p, NAN, 0, 0) == 11 && legacy_calls == before + 2);
}
/* Touch needs the granted touchscreen type and uses the same stream mapping as absolute motion. */
static void legacy_touch(struct uu_portal *p) {
p->devices = 3;
assert(uu_portal_touch(p, 0, 10, 10) == 11 && legacy_calls == 7);
p->devices = 7;
assert(uu_portal_touch(p, 0, 1920, 1080) == 0);
assert(last_x == (p->absolute_stream_pixels ? 1920 : 960));
assert(last_y == (p->absolute_stream_pixels ? 1080 : 540));
assert(uu_portal_touch(p, 1, 3840, 0) == 11);
assert(uu_portal_touch(p, 1, 0, 0) == 0 && last_x == 0 && last_y == 0);
assert(uu_portal_touch(p, 2, 0, 0) == 0);
assert(legacy_calls == 10 && !p->ei);
}
int main(void) { int main(void) {
struct uu_portal *p = session(1, 1, 0); struct uu_portal *p = session(1, 1, 0);
legacy_input(p); legacy_input(p);
@@ -107,10 +147,14 @@ int main(void) {
} }
p = session(0, 1, 1); /* Unscaled GNOME keeps Notify*. */ p = session(0, 1, 1); /* Unscaled GNOME keeps Notify*. */
legacy_input(p); legacy_input(p);
legacy_touch(p);
legacy_scroll(p);
assert(!connects); assert(!connects);
uu_portal_close(p); uu_portal_close(p);
p = session(1, 0, 1); /* KDE keeps its compositor-logical mapping. */ p = session(1, 0, 1); /* KDE keeps its compositor-logical mapping. */
legacy_input(p); legacy_input(p);
legacy_touch(p);
legacy_scroll(p);
assert(!connects); assert(!connects);
uu_portal_close(p); uu_portal_close(p);
+48
View File
@@ -0,0 +1,48 @@
/* Read-only live-keymap regression: cc tests/uinput_keymap.c -o /tmp/uu-keymap-test -lX11
* Requires DISPLAY (X11 or XWayland). Never injects keys or changes the server keymap. */
#include <assert.h>
#include <stdio.h>
#include "../c_engine/uinput_keymap.c"
int main(void) {
Display *display=XOpenDisplay(NULL);
assert(display);
XkbDescPtr map=XkbGetMap(display,XkbAllClientInfoMask,XkbUseCoreKbd);
assert(map && XkbGetNames(display,XkbKeyNamesMask,map)==Success);
XkbStateRec state={0};
XkbStateRec actual;
assert(XkbGetState(display,XkbUseCoreKbd,&actual)==Success);
state.group=actual.group;
uint8_t characters[97];
for (unsigned i=0;i<95;i++) characters[i]=0x20+i;
characters[95]='\t'; characters[96]='\n';
UuTextKey plan[97];
for (unsigned locks=0;locks<3;locks++) {
state.locked_mods=locks==0 ? 0 : locks==1 ? LockMask : Mod2Mask;
assert(text_plan(map,&state,characters,sizeof(characters),plan,97)==97);
for (unsigned i=0;i<97;i++) {
KeySym symbol=NoSymbol; unsigned consumed=0;
unsigned modifiers=XkbBuildCoreState(state.locked_mods | (plan[i].shift ? ShiftMask : 0),state.group);
assert(XkbTranslateKeyCode(map,plan[i].code+8,modifiers,&consumed,&symbol));
assert(symbol==(characters[i]=='\n' ? XK_Return : characters[i]=='\t' ? XK_Tab : characters[i]));
assert(plan[i].code>=1 && plan[i].code<=248 && plan[i].shift<=248);
}
}
state.locked_mods=0;
const uint8_t mixed[]={'a','b',0xc3,0xa9};
assert(text_plan(map,&state,mixed,sizeof(mixed),plan,97)==2);
assert(text_plan(map,&state,characters,sizeof(characters),plan,2)==2);
state.base_mods=ControlMask;
assert(text_plan(map,&state,characters,sizeof(characters),plan,97)==0);
state.base_mods=0; state.latched_mods=ShiftMask;
assert(text_plan(map,&state,characters,sizeof(characters),plan,97)==0);
state.latched_mods=0;
XkbKeyNameRec previous=map->names->keys[38];
memcpy(map->names->keys[38].name,"NONE",4);
assert(text_plan(map,&state,characters,sizeof(characters),plan,97)==0);
map->names->keys[38]=previous;
XkbFreeKeyboard(map,XkbAllComponentsMask,True);
XCloseDisplay(display);
puts("PASS: ASCII, shift/lock modifiers, partial prefixes and keycode validation");
return 0;
}
+67
View File
@@ -0,0 +1,67 @@
/* Hardware regression: cc tests/vaapi_dmabuf.c -o /tmp/vaapi-dma -lgbm -ldl
* Requires a VAAPI render node. stdout is synthetic H.264: red DMA-BUF, then black host upload.
* No desktop capture or account credentials are used. */
#include <assert.h>
#include <gbm.h>
#include <fcntl.h>
#include <linux/dma-buf.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include "../c_engine/vaapi_engine.c"
static void assert_color(struct gbm_bo *bo, int write_red) {
uint32_t stride=gbm_bo_get_stride(bo);
int fd=gbm_bo_get_fd(bo);
assert(fd>=0);
size_t size=(size_t)stride*720;
uint8_t *pixels=mmap(NULL,size,PROT_READ | PROT_WRITE,MAP_SHARED,fd,0);
assert(pixels!=MAP_FAILED);
struct dma_buf_sync sync={.flags=DMA_BUF_SYNC_START | DMA_BUF_SYNC_RW};
assert(ioctl(fd,DMA_BUF_IOCTL_SYNC,&sync)==0);
for (unsigned y=0; y<720; y++) {
for (unsigned x=0; x<1280; x++) {
uint8_t *pixel=pixels+y*stride+x*4;
if (write_red) { pixel[0]=0; pixel[1]=0; pixel[2]=255; pixel[3]=255; }
else assert(pixel[0]==0 && pixel[1]==0 && pixel[2]==255 && pixel[3]==255);
}
}
sync.flags=DMA_BUF_SYNC_END | DMA_BUF_SYNC_RW;
assert(ioctl(fd,DMA_BUF_IOCTL_SYNC,&sync)==0);
munmap(pixels,size); close(fd);
}
static void encode(VaapiEngine *engine) {
const uint8_t *data=NULL;
uint32_t size=0;
assert(vaapi_encode_frame(engine, 1, &data, &size)==0 && data && size);
assert(fwrite(data, 1, size, stdout)==size);
}
int main(void) {
const char *device=getenv("UU_VAAPI_DEVICE");
if (!device) device="/dev/dri/renderD128";
int fd=open(device, O_RDWR | O_CLOEXEC);
assert(fd>=0);
struct gbm_device *gbm=gbm_create_device(fd);
assert(gbm);
const uint64_t modifier=0;
struct gbm_bo *bo=gbm_bo_create_with_modifiers2(gbm,1280,720,GBM_FORMAT_ARGB8888,&modifier,1,GBM_BO_USE_RENDERING);
assert(bo && gbm_bo_get_modifier(bo)==0);
assert_color(bo,1);
int dma=gbm_bo_get_fd(bo);
assert(dma>=0);
UuDmaFrame frame={.fd=dma,.fourcc=GBM_FORMAT_ARGB8888,.width=1280,.height=720,
.stride=gbm_bo_get_stride(bo),.size=gbm_bo_get_stride(bo)*720,.modifier=0};
VaapiConfig config={.width=1280,.height=720,.cap_width=1280,.cap_height=720,.fps=30,.gop=30,
.target_bps=1000000,.max_bps=2000000,.buffer_bits=500000,.device=device};
VaapiEngine *engine=vaapi_create(&config);
assert(engine && vaapi_import_frame(engine,&frame)==0);
encode(engine);
uint8_t *black=calloc(1280*720,4);
assert(black && vaapi_upload_host_buffer(engine,black,1280*4)==0);
encode(engine);
/* Host fallback must allocate its own surface, never overwrite the leased compositor buffer. */
assert_color(bo,0);
free(black);
vaapi_destroy(engine);
close(dma); gbm_bo_destroy(bo); gbm_device_destroy(gbm); close(fd);
return 0;
}