mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cb6f5b6617 | ||
|
|
8e30371317 | ||
|
|
0ea37758fb | ||
|
|
73293318b4 | ||
|
|
1bdc0eb910 | ||
|
|
33861082dc | ||
|
|
2422fce673 | ||
|
|
1ff3383de7 | ||
|
|
6bf05a6361 | ||
|
|
d9c43897c7 | ||
|
|
9fe1351de1 | ||
|
|
c0b0ca6afb | ||
|
|
11097b5847 | ||
|
|
6a0cd5bda6 | ||
|
|
4cfdd563f7 | ||
|
|
0cbfc5b4f1 | ||
|
|
47c7728822 | ||
|
|
e503041dac | ||
|
|
835bfa2319 | ||
|
|
482c01a85d | ||
|
|
7f6cf6e092 | ||
|
|
c0c04a2c98 | ||
|
|
b636f1b278 | ||
|
|
64d2ffbdd3 | ||
|
|
5656f33d86 | ||
|
|
6a633e1bc4 |
No files matched your search
@@ -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; 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
|
||||||
|
|||||||
@@ -29,7 +29,10 @@ This file is written for large language model agents (Claude Code, Codex, Cursor
|
|||||||
the config file / environment. The only built-in default is the public client signing key in `src/auth.rs`.
|
the config file / environment. The only built-in default is the public client signing key in `src/auth.rs`.
|
||||||
6. **Don't break other tools.** The desktop, file-transfer, terminal and port-mapping tools each open their own
|
6. **Don't break other tools.** The desktop, file-transfer, terminal and port-mapping tools each open their own
|
||||||
peer connection; a new offer must never close other peers.
|
peer connection; a new offer must never close other peers.
|
||||||
7. Keep changes small and tested; match the surrounding code style (dense, comment only the non-obvious).
|
7. **UI text is bilingual.** Every user-facing string has Chinese and English: `L("中文", "English")` in C
|
||||||
|
(`c_engine/i18n.h`), `crate::i18n::s(..)` / `crate::tr!(..)` in Rust (`src/i18n.rs`; `UU_LANG`, saved choice, locale).
|
||||||
|
Logs stay English.
|
||||||
|
8. Keep changes small and tested; match the surrounding code style (dense, comment only the non-obvious).
|
||||||
|
|
||||||
## 3. Build and test
|
## 3. Build and test
|
||||||
|
|
||||||
@@ -122,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) |
|
||||||
@@ -133,7 +137,7 @@ viewer does not reconnect them automatically.
|
|||||||
| `UU_LOGIN_WINDOW=0` | don't auto-open the login window |
|
| `UU_LOGIN_WINDOW=0` | don't auto-open the login window |
|
||||||
| `UU_ENGINE_DIR` | directory holding `libuu-wayland.so` / `libuu-portal.so` (`--features engine-plugins`, used by release packages: engines are dlopen'ed only on Wayland sessions; also searched next to the binary, `../lib/uu-remote-linux`, `~/.local/lib/uu-remote-linux`, `/usr/lib/uu-remote-linux`) |
|
| `UU_ENGINE_DIR` | directory holding `libuu-wayland.so` / `libuu-portal.so` (`--features engine-plugins`, used by release packages: engines are dlopen'ed only on Wayland sessions; also searched next to the binary, `../lib/uu-remote-linux`, `~/.local/lib/uu-remote-linux`, `/usr/lib/uu-remote-linux`) |
|
||||||
| `UU_WOL_HELPER=1` | experimental: report LAN info (`api-ipv4…/api/v1/device/wake_on_lan/info` {mac, ip, subnet_mask}) after sign-in and answer `wake_on_lan` pushes (`target_device` {mac, ip, subnet_mask}) with a magic packet, like the official Windows host (field names from its log strings; not verified end to end). `wake_on_lan` push key names are always logged |
|
| `UU_WOL_HELPER=1` | experimental: report LAN info (`api-ipv4…/api/v1/device/wake_on_lan/info` {mac, ip, subnet_mask}) after sign-in and answer `wake_on_lan` pushes (`target_device` {mac, ip, subnet_mask}) with a magic packet, like the official Windows host (field names from its log strings; not verified end to end). `wake_on_lan` push key names are always logged |
|
||||||
| `UU_USE_PROXY=1` | honor HTTP/HTTPS proxy env vars for REST and WebSocket signaling (not ICE/media); clients bypass env proxies by default |
|
| `UU_USE_PROXY=1` | honor HTTP/HTTPS proxy env vars for REST and WebSocket signaling, and also gather TURN relays over TCP/TLS through that proxy (`vendor/webrtc-ice/PATCHES.md`; chain-verified, name mismatch tolerated for IP TURN URLs); clients bypass env proxies by default |
|
||||||
| `UU_REMOTE_ASSIST=0`, `UU_ASSIST_ALLOW=1`, `UU_ASSIST_UI=tty`, `UU_ASSIST_DEBUG=1` | disable assistance / allow at start / terminal UI for `assist` / include the server's short error message in assist errors |
|
| `UU_REMOTE_ASSIST=0`, `UU_ASSIST_ALLOW=1`, `UU_ASSIST_UI=tty`, `UU_ASSIST_DEBUG=1` | disable assistance / allow at start / terminal UI for `assist` / include the server's short error message in assist errors |
|
||||||
|
|
||||||
Token has no expiry field; API code 1120 (HTTP 422) means invalid/expired → re-login. `config.json` is parsed once
|
Token has no expiry field; API code 1120 (HTTP 422) means invalid/expired → re-login. `config.json` is parsed once
|
||||||
@@ -156,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 |
|
||||||
@@ -168,6 +173,8 @@ for a new QR login.
|
|||||||
| `src/assist.rs`, `c_engine/assist_window.c` | remote assistance (guest + account) and the unified GTK main window (assist + account/QR card) |
|
| `src/assist.rs`, `c_engine/assist_window.c` | remote assistance (guest + account) and the unified GTK main window (assist + account/QR card) |
|
||||||
| `src/viewer_main.rs`, `src/viewer/` | experimental viewer (`--features native-viewer,viewer-sdl`): cloud join, WebRTC offer side, SDL desktop window (ffmpeg CLI decode), files/terminal/portmap/power/assist tools, device removal (`POST /api/v1/device/{id}/unbind`, verified live; shared devices use `/api/v1/device/share/{id}/unbind`, strings only), GTK launcher |
|
| `src/viewer_main.rs`, `src/viewer/` | experimental viewer (`--features native-viewer,viewer-sdl`): cloud join, WebRTC offer side, SDL desktop window (ffmpeg CLI decode), files/terminal/portmap/power/assist tools, device removal (`POST /api/v1/device/{id}/unbind`, verified live; shared devices use `/api/v1/device/share/{id}/unbind`, strings only), GTK launcher |
|
||||||
| `c_engine/viewer_window.c`, `c_engine/viewer_tools.c` | viewer GTK launcher and tool windows (files, port mapping, terminal list) |
|
| `c_engine/viewer_window.c`, `c_engine/viewer_tools.c` | viewer GTK launcher and tool windows (files, port mapping, terminal list) |
|
||||||
|
| `src/viewer/hud.rs` | in-window chrome drawn on the SDL canvas: loading screen, control center (Ctrl+Alt+M; capture settings RPC 2 and SimpleActions 14/16/18/19 as the official viewer sends them), network-status panel (Ctrl+Alt+G); fontconfig font via ab_glyph |
|
||||||
|
| `src/viewer/thumbs.rs`, `src/viewer/host.rs` | launcher device previews (last picture, local 0600 cache); viewer sign-in keeps the local host user service running so the machine joins the account's device list |
|
||||||
|
|
||||||
Diagnostic subcommands: `doctor` (paste-safe report: session, selected backend, engine plugins, uinput, encoder and codec with source, sign-in/service state; booleans and names only), `set-encoder auto|cpu|vaapi|nvenc` and `set-codec auto|h264|h265` (both notify a running host with SIGUSR2; live encoder switch, negotiated codec unchanged, codec preference on the next desktop stream; illegal values exit 2), `login [--no-gui]`, `unlock-check` (password on stdin, prints only accepted/rejected),
|
Diagnostic subcommands: `doctor` (paste-safe report: session, selected backend, engine plugins, uinput, encoder and codec with source, sign-in/service state; booleans and names only), `set-encoder auto|cpu|vaapi|nvenc` and `set-codec auto|h264|h265` (both notify a running host with SIGUSR2; live encoder switch, negotiated codec unchanged, codec preference on the next desktop stream; illegal values exit 2), `login [--no-gui]`, `unlock-check` (password on stdin, prints only accepted/rejected),
|
||||||
`desktop-probe [new.png]`, `desktop-video-probe` (`UU_PROBE_FPS`, `UU_PROBE_FRAMES`, `UU_PROBE_QUALITY` 1-5 = viewer bitrate preset, 5 auto; `UU_PROBE_CHROMA=444` 真彩; `UU_PROBE_INPUT` fixed video/image sequence, `UU_PROBE_LOOP=1` repeats), `wayland-input-probe`, `clipboard-acceptance`,
|
`desktop-probe [new.png]`, `desktop-video-probe` (`UU_PROBE_FPS`, `UU_PROBE_FRAMES`, `UU_PROBE_QUALITY` 1-5 = viewer bitrate preset, 5 auto; `UU_PROBE_CHROMA=444` 真彩; `UU_PROBE_INPUT` fixed video/image sequence, `UU_PROBE_LOOP=1` repeats), `wayland-input-probe`, `clipboard-acceptance`,
|
||||||
|
|||||||
Generated
+36
-3
@@ -2,6 +2,22 @@
|
|||||||
# It is not intended for manual editing.
|
# It is not intended for manual editing.
|
||||||
version = 4
|
version = 4
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ab_glyph"
|
||||||
|
version = "0.2.32"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2"
|
||||||
|
dependencies = [
|
||||||
|
"ab_glyph_rasterizer",
|
||||||
|
"owned_ttf_parser",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ab_glyph_rasterizer"
|
||||||
|
version = "0.1.10"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "adler2"
|
name = "adler2"
|
||||||
version = "2.0.1"
|
version = "2.0.1"
|
||||||
@@ -1440,6 +1456,15 @@ 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 = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
|
checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "owned_ttf_parser"
|
||||||
|
version = "0.25.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b"
|
||||||
|
dependencies = [
|
||||||
|
"ttf-parser",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "p256"
|
name = "p256"
|
||||||
version = "0.13.2"
|
version = "0.13.2"
|
||||||
@@ -2629,6 +2654,12 @@ version = "0.2.5"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
|
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ttf-parser"
|
||||||
|
version = "0.25.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tungstenite"
|
name = "tungstenite"
|
||||||
version = "0.23.0"
|
version = "0.23.0"
|
||||||
@@ -2741,8 +2772,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.36"
|
version = "0.2.43"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"ab_glyph",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"bytes",
|
"bytes",
|
||||||
@@ -3010,23 +3042,24 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "webrtc-ice"
|
name = "webrtc-ice"
|
||||||
version = "0.10.1"
|
version = "0.10.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a1bbd6b3dea22cc6e961e22b012e843d8869e2ac8e76b96e54d4a25e311857ad"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"crc",
|
"crc",
|
||||||
"log",
|
"log",
|
||||||
"rand 0.8.8",
|
"rand 0.8.8",
|
||||||
|
"rustls-native-certs",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"stun",
|
"stun",
|
||||||
"thiserror 1.0.69",
|
"thiserror 1.0.69",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"tokio-rustls",
|
||||||
"turn",
|
"turn",
|
||||||
"url",
|
"url",
|
||||||
"uuid",
|
"uuid",
|
||||||
"waitgroup",
|
"waitgroup",
|
||||||
|
"webpki-roots 1.0.9",
|
||||||
"webrtc-mdns",
|
"webrtc-mdns",
|
||||||
"webrtc-util",
|
"webrtc-util",
|
||||||
]
|
]
|
||||||
|
|||||||
+5
-2
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.36"
|
version = "0.2.43"
|
||||||
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"]
|
viewer-sdl = ["native-viewer", "dep:sdl2", "dep:ab_glyph"]
|
||||||
wayland = []
|
wayland = []
|
||||||
# Experimental direct linear framebuffer capture; never enabled in release builds.
|
# Experimental direct linear framebuffer capture; never enabled in release builds.
|
||||||
kms = []
|
kms = []
|
||||||
@@ -59,6 +59,7 @@ ffmpeg-next = { version = "6.1", optional = true, default-features = false, feat
|
|||||||
x11rb = { version = "0.13", features = ["damage", "shm", "allow-unsafe-code"], optional = true }
|
x11rb = { version = "0.13", features = ["damage", "shm", "allow-unsafe-code"], optional = true }
|
||||||
|
|
||||||
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 }
|
||||||
|
|
||||||
[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.
|
||||||
@@ -74,6 +75,8 @@ webrtc-srtp = { path = "vendor/webrtc-srtp" }
|
|||||||
webrtc-dtls = { path = "vendor/webrtc-dtls" }
|
webrtc-dtls = { path = "vendor/webrtc-dtls" }
|
||||||
# Larger data-channel receive buffer (see vendor/webrtc/src/data_channel/mod.rs).
|
# Larger data-channel receive buffer (see vendor/webrtc/src/data_channel/mod.rs).
|
||||||
webrtc = { path = "vendor/webrtc" }
|
webrtc = { path = "vendor/webrtc" }
|
||||||
|
# TURN over TCP/TLS through an HTTP CONNECT proxy (vendor/webrtc-ice/PATCHES.md).
|
||||||
|
webrtc-ice = { path = "vendor/webrtc-ice" }
|
||||||
|
|
||||||
[[bench]]
|
[[bench]]
|
||||||
name = "nvenc_pipeline_bench"
|
name = "nvenc_pipeline_bench"
|
||||||
|
|||||||
+54
-7
@@ -21,7 +21,30 @@
|
|||||||
<p align="center"><sub>Linux viewer: device list (device names redacted)</sub></p>
|
<p align="center"><sub>Linux viewer: device list (device names redacted)</sub></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"><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 in Chinese, like the official app.</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 / 外观
|
||||||
|
|
||||||
|
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 / 语言
|
||||||
|
|
||||||
|
The language is picked once at start, in this order:
|
||||||
|
|
||||||
|
1. `UU_LANG=en` or `UU_LANG=zh`;
|
||||||
|
2. the choice saved in the viewer's **Settings → General → 语言 / Language**
|
||||||
|
or the host main window's 语言 / Language row; stored as `~/.config/uuremote/language`, applies after a restart);
|
||||||
|
3. the locale: `LC_ALL` / `LC_MESSAGES` / `LANG` starting with `zh` → Chinese, anything else → English.
|
||||||
|
|
||||||
|
```sh
|
||||||
|
UU_LANG=en uuremote-viewer ui
|
||||||
|
UU_LANG=zh uuremote-server
|
||||||
|
```
|
||||||
|
|
||||||
|
Protocol strings and messages that come from the UU servers are shown as the server sends them.
|
||||||
|
|
||||||
<!-- Screenshot placeholder: the Linux desktop controlled from the official client. Take your own
|
<!-- Screenshot placeholder: the Linux desktop controlled from the official client. Take your own
|
||||||
screenshot, remove account/device details and NetEase logos, save it as docs/images/remote-desktop.png
|
screenshot, remove account/device details and NetEase logos, save it as docs/images/remote-desktop.png
|
||||||
@@ -73,7 +96,7 @@ authorized session. Independent file/terminal tool peers do not reset input.
|
|||||||
| Xfce | X11 | ✅ Tested in a VM | default |
|
| Xfce | X11 | ✅ Tested in a VM | default |
|
||||||
| Cinnamon / MATE | X11 | ✅ Tested in a VM | default |
|
| Cinnamon / MATE | X11 | ✅ Tested in a VM | default |
|
||||||
| Hyprland | Wayland (native wlroots protocols) | 🧪 Experimental, tested in a VM (some features limited, see below) | `--features wayland` |
|
| Hyprland | Wayland (native wlroots protocols) | 🧪 Experimental, tested in a VM (some features limited, see below) | `--features wayland` |
|
||||||
| niri | Wayland (native wlroots protocols) | 🧪 Experimental; protocol support confirmed from niri sources, not yet tested on hardware (#55) | `--features wayland` |
|
| niri | Wayland (native wlroots protocols) | 🧪 Experimental; capture, text input and portrait switching hardware-tested; other features pending (#55) | `--features wayland` |
|
||||||
| GNOME / KDE Plasma | Wayland (xdg-desktop-portal) | 🧪 Experimental; validation scope and limits below | `--features wayland,portal` |
|
| GNOME / KDE Plasma | Wayland (xdg-desktop-portal) | 🧪 Experimental; validation scope and limits below | `--features wayland,portal` |
|
||||||
|
|
||||||
The GNOME Wayland Portal/EIS path has been checked for video and mouse/keyboard input on Ubuntu 26.04, GNOME 50, with one 4K screen at 200% scale; auto unlock after a cold locked connection is verified with the official Mac and iPhone 4.42.0 viewers, while other lock recovery and reconnection still need hardware acceptance testing. Apart from that path and GNOME on X11, desktop testing has primarily used virtual machines. If something goes wrong on
|
The GNOME Wayland Portal/EIS path has been checked for video and mouse/keyboard input on Ubuntu 26.04, GNOME 50, with one 4K screen at 200% scale; auto unlock after a cold locked connection is verified with the official Mac and iPhone 4.42.0 viewers, while other lock recovery and reconnection still need hardware acceptance testing. Apart from that path and GNOME on X11, desktop testing has primarily used virtual machines. If something goes wrong on
|
||||||
@@ -84,7 +107,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.
|
||||||
|
|
||||||
@@ -116,15 +141,17 @@ X11 sessions send all monitors as one combined picture by default. With `UU_X11_
|
|||||||
|
|
||||||
Switching reuses one video track and pauses input until the new source sends a frame. Capture/encoder failure or a first-frame timeout requests restoration of the previous source. The inventory uses `hyprctl` and supports unrotated outputs; restart the host after monitor hotplug or layout changes. Phone-side switching and clicks were tested on Omarchy / Hyprland with 2560×1440 at 125% and 1920×1080 at 133.33%.
|
Switching reuses one video track and pauses input until the new source sends a frame. Capture/encoder failure or a first-frame timeout requests restoration of the previous source. The inventory uses `hyprctl` and supports unrotated outputs; restart the host after monitor hotplug or layout changes. Phone-side switching and clicks were tested on Omarchy / Hyprland with 2560×1440 at 125% and 1920×1080 at 133.33%.
|
||||||
|
|
||||||
|
On niri, `niri msg --json outputs` enumerates enabled monitors. Normal and 90/180/270-degree capture and pointer transforms are enabled only with `NIRI_SOCKET`; reflected transforms are excluded. Three-output switching, 90-degree portrait capture/click alignment, and mobile Chinese input into Codex were hardware-tested on CachyOS + niri. Other compositors retain their existing text path and reject rotated outputs. Restart after layout changes. The temporary printable-key text keyboard is niri-only; the Hyprland fast path and pristine-keymap restoration are unchanged.
|
||||||
|
|
||||||
## Not implemented / not supported
|
## Not implemented / not supported
|
||||||
|
|
||||||
| Feature | Status |
|
| Feature | Status |
|
||||||
|---|---|
|
|---|---|
|
||||||
| Switching between multiple monitors | Experimental on native Hyprland Wayland and on X11 (`UU_X11_MULTISCREEN=1`); see above |
|
| Switching between multiple monitors | Experimental on native niri / Hyprland Wayland and on X11 (`UU_X11_MULTISCREEN=1`); see above |
|
||||||
| 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; 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 |
|
||||||
@@ -183,6 +210,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>).
|
||||||
@@ -201,6 +230,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:
|
||||||
@@ -265,6 +297,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
|
||||||
@@ -367,7 +401,7 @@ Common environment variables:
|
|||||||
|
|
||||||
`UU_USE_PROXY=1` uses only proxy settings already available to the current process. `HTTP_PROXY` / `HTTPS_PROXY` / `ALL_PROXY` (and lowercase forms) and `NO_PROXY` follow reqwest's standard selection, with uppercase taking precedence. Signaling rejects invalid/unsupported values in the selected variables (HTTP/HTTPS only, not SOCKS), proxy URLs with paths/queries/fragments, and CGI environments that would ignore proxies; this validation is intentionally stricter than silently ignoring bad values. No matching proxy or a `NO_PROXY` match still means direct access; a selected proxy failing does not trigger direct fallback. Certificate verification remains enabled and redirects are not followed, so room authentication is not forwarded to a redirect target.
|
`UU_USE_PROXY=1` uses only proxy settings already available to the current process. `HTTP_PROXY` / `HTTPS_PROXY` / `ALL_PROXY` (and lowercase forms) and `NO_PROXY` follow reqwest's standard selection, with uppercase taking precedence. Signaling rejects invalid/unsupported values in the selected variables (HTTP/HTTPS only, not SOCKS), proxy URLs with paths/queries/fragments, and CGI environments that would ignore proxies; this validation is intentionally stricter than silently ignoring bad values. No matching proxy or a `NO_PROXY` match still means direct access; a selected proxy failing does not trigger direct fallback. Certificate verification remains enabled and redirects are not followed, so room authentication is not forwarded to a redirect target.
|
||||||
|
|
||||||
**This covers HTTP/WebSocket compatibility only: it does not proxy ICE/WebRTC media, add TURN TCP/TLS, or create network access.** Login, signaling and media each need an allowed network path. Connector errors expose only fixed categories/HTTP status; do not enable dependency TRACE logs that may record URLs or authentication information.
|
With it the host also reaches the cloud TURN relays over TCP/TLS (CONNECT through the unauthenticated `http://` proxy in `HTTPS_PROXY`/`ALL_PROXY`, or directly without one), for hosts whose UDP cannot reach the TURN servers but whose TCP/proxy can. TURN certificates are chain-verified; a name mismatch is tolerated only when the cloud-supplied TURN address is an IP (media itself is end-to-end DTLS-SRTP). Without the setting only UDP relays are used, as before. **This creates no new network access**: login, signaling and media each still need an allowed network path. Connector errors expose only fixed categories/HTTP status; do not enable dependency TRACE logs that may record URLs or authentication information.
|
||||||
|
|
||||||
Host settings such as "lock after remote session" and "mute host" are stored in
|
Host settings such as "lock after remote session" and "mute host" are stored in
|
||||||
`~/.config/uuremote/host_settings.json`. The same file stores `video_encoder`
|
`~/.config/uuremote/host_settings.json`. The same file stores `video_encoder`
|
||||||
@@ -559,6 +593,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.
|
||||||
@@ -569,7 +605,8 @@ terminal emulator (`TERMINAL` selects one). From source: `sudo apt install libsd
|
|||||||
`cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`.
|
`cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`.
|
||||||
|
|
||||||
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.
|
||||||
@@ -600,6 +637,8 @@ GNOME-to-official-Mac bidirectional clipboard synchronization is still unverifie
|
|||||||
- Desktop offers H.264 / H.265; the host chooses the codec. `UU_VIEWER_CODEC=h264` limits both SDP and decoder capabilities to H.264.
|
- Desktop offers H.264 / H.265; the host chooses the codec. `UU_VIEWER_CODEC=h264` limits both SDP and decoder capabilities to H.264.
|
||||||
The default request stays 4:2:0; `UU_VIEWER_CHROMA=444` requests true color (4:4:4) after CONTROL opens. The host may fall back to
|
The default request stays 4:2:0; `UU_VIEWER_CHROMA=444` requests true color (4:4:4) after CONTROL opens. The host may fall back to
|
||||||
4:2:0, as reported by CaptureSettingSync. FFmpeg converts either chroma format to RGB24 for display.
|
4:2:0, as reported by CaptureSettingSync. FFmpeg converts either chroma format to RGB24 for display.
|
||||||
|
- 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.
|
||||||
|
|
||||||
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
|
||||||
@@ -625,3 +664,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).
|
||||||
@@ -19,6 +19,28 @@
|
|||||||
<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
|
||||||
|
|
||||||
|
在控制端的 **设置 → 常规 → 外观**,或主机 / 工具窗口的齿轮设置按钮中选择 **跟随系统 / 浅色 / 深色**(默认跟随系统)。
|
||||||
|
选择保存在 `$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
|
||||||
|
|
||||||
|
启动时按以下顺序确定界面语言:
|
||||||
|
|
||||||
|
1. `UU_LANG=zh` 或 `UU_LANG=en`;
|
||||||
|
2. 控制端 **设置 → 常规 → 语言 / Language** 或主机主窗口底部「语言 / Language」中保存的选择(保存在 `~/.config/uuremote/language`,重启后生效);
|
||||||
|
3. 系统区域设置:`LC_ALL` / `LC_MESSAGES` / `LANG` 以 `zh` 开头为中文,其余为英文。
|
||||||
|
|
||||||
|
```sh
|
||||||
|
UU_LANG=zh uuremote-viewer ui
|
||||||
|
UU_LANG=en uuremote-server
|
||||||
|
```
|
||||||
|
|
||||||
|
协议字段以及 UU 服务器返回的提示按服务器原文显示。
|
||||||
|
|
||||||
<!-- 截图占位:在官方客户端里远控 Linux 桌面的效果图。请自行截图并去掉账号、设备名等信息后放到
|
<!-- 截图占位:在官方客户端里远控 Linux 桌面的效果图。请自行截图并去掉账号、设备名等信息后放到
|
||||||
docs/images/remote-desktop.png,再取消下面这行的注释。注意不要截入网易的图标和品牌素材。 -->
|
docs/images/remote-desktop.png,再取消下面这行的注释。注意不要截入网易的图标和品牌素材。 -->
|
||||||
<!-- <p align="center"><img src="docs/images/remote-desktop.png" width="720" alt="用官方 Mac 客户端远控 Linux 桌面"></p> -->
|
<!-- <p align="center"><img src="docs/images/remote-desktop.png" width="720" alt="用官方 Mac 客户端远控 Linux 桌面"></p> -->
|
||||||
@@ -65,7 +87,7 @@ Portal 仅作用于本服务获授权的会话。文件传输、终端等独立
|
|||||||
| Xfce | X11 | ✅ 虚拟机测试通过 | 默认 |
|
| Xfce | X11 | ✅ 虚拟机测试通过 | 默认 |
|
||||||
| Cinnamon / MATE | X11 | ✅ 虚拟机测试通过 | 默认 |
|
| Cinnamon / MATE | X11 | ✅ 虚拟机测试通过 | 默认 |
|
||||||
| Hyprland | Wayland(wlroots 原生协议) | 🧪 实验性,虚拟机测试(部分功能受限,见下) | `--features wayland` |
|
| Hyprland | Wayland(wlroots 原生协议) | 🧪 实验性,虚拟机测试(部分功能受限,见下) | `--features wayland` |
|
||||||
| niri | Wayland(wlroots 原生协议) | 🧪 实验性,协议支持已按 niri 源码确认,尚未实机验收(#55) | `--features wayland` |
|
| niri | Wayland(wlroots 原生协议) | 🧪 实验性,采集、文字输入及竖屏切换已实机验收,其余待验证(#55) | `--features wayland` |
|
||||||
| GNOME / KDE Plasma | Wayland(xdg-desktop-portal) | 🧪 实验性,验证范围与限制见下 | `--features wayland,portal` |
|
| GNOME / KDE Plasma | Wayland(xdg-desktop-portal) | 🧪 实验性,验证范围与限制见下 | `--features wayland,portal` |
|
||||||
|
|
||||||
最后一列是源码编译方式;Release 预编译包已包含全部后端,直接使用即可(见[安装](#0-直接用-release-预编译包推荐x86_64))。
|
最后一列是源码编译方式;Release 预编译包已包含全部后端,直接使用即可(见[安装](#0-直接用-release-预编译包推荐x86_64))。
|
||||||
@@ -75,7 +97,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 逻辑尺寸仅用于本地输入映射。
|
||||||
|
|
||||||
@@ -100,17 +124,19 @@ GNOME Portal 的控制通道不再等待授权窗口或第一帧画面:先通
|
|||||||
|
|
||||||
X11 会话默认把所有显示器拼成一张画面。设置 `UU_X11_MULTISCREEN=1` 后,主机按 `xrandr --listmonitors` 列出各个显示器,控制端可选择其中一块,只采集该区域,绝对鼠标坐标加上该屏幕在桌面中的偏移;默认屏幕为主显示器,`UU_X11_OUTPUT` 可指定其他屏幕(如 `HDMI-1`)。显示器布局在主机启动时读取,改动后需重启服务。此模式下控制端的「分辨率」改为缩放画面,不再修改显示模式。实验性:目前只有单元测试与 Xvfb 虚拟显示器实测,尚未经官方客户端实机验收。
|
X11 会话默认把所有显示器拼成一张画面。设置 `UU_X11_MULTISCREEN=1` 后,主机按 `xrandr --listmonitors` 列出各个显示器,控制端可选择其中一块,只采集该区域,绝对鼠标坐标加上该屏幕在桌面中的偏移;默认屏幕为主显示器,`UU_X11_OUTPUT` 可指定其他屏幕(如 `HDMI-1`)。显示器布局在主机启动时读取,改动后需重启服务。此模式下控制端的「分辨率」改为缩放画面,不再修改显示模式。实验性:目前只有单元测试与 Xvfb 虚拟显示器实测,尚未经官方客户端实机验收。
|
||||||
|
|
||||||
切屏复用同一条视频轨道,过渡期间暂停输入,发送新屏首帧后恢复;采集或编码失败、等待首帧超时会请求恢复原屏。当前通过 `hyprctl` 枚举未旋转的显示器,显示器插拔或布局变化后需重启服务。已在 Omarchy / Hyprland 上用官方手机客户端实测 2560×1440(125%)与 1920×1080(133.33%)双屏切换及点击。
|
切屏复用同一条视频轨道,过渡期间暂停输入,发送新屏首帧后恢复;采集或编码失败、等待首帧超时会请求恢复原屏。Hyprland 通过 `hyprctl` 枚举未旋转的显示器,显示器插拔或布局变化后需重启服务。已在 Omarchy / Hyprland 上用官方手机客户端实测 2560×1440(125%)与 1920×1080(133.33%)双屏切换及点击。
|
||||||
|
|
||||||
|
niri 会话通过 `niri msg --json outputs` 枚举已启用的显示器。普通及 90°/180°/270° 旋转输出仅在 `NIRI_SOCKET` 存在时启用;镜像变换暂不支持。三屏切换、90° 竖屏画面与点击,以及手机向 Codex 输入中文已在 CachyOS + niri 实测。其他合成器继续拒绝旋转输出,保留原有文本输入路径。显示器布局变化后需重启服务。
|
||||||
|
|
||||||
## 尚未实现 / 不支持
|
## 尚未实现 / 不支持
|
||||||
|
|
||||||
| 功能 | 状态 |
|
| 功能 | 状态 |
|
||||||
|---|---|
|
|---|---|
|
||||||
| 多显示器切换 | Hyprland 原生 Wayland 后端与 X11(`UU_X11_MULTISCREEN=1`)实验性支持,见上文 |
|
| 多显示器切换 | niri / Hyprland 原生 Wayland 后端与 X11(`UU_X11_MULTISCREEN=1`)实验性支持,见上文 |
|
||||||
| 真彩(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),见 [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||||
| 麦克风(控制端声音传到被控端) | 未实现(需要虚拟声卡) |
|
| 麦克风(控制端声音传到被控端) | 未实现(需要虚拟声卡) |
|
||||||
| 魔兽世界排队提醒等插件 | 不支持,会明确告诉客户端「无插件」 |
|
| 魔兽世界排队提醒等插件 | 不支持,会明确告诉客户端「无插件」 |
|
||||||
| Linux 系统登录界面 | 还不支持控制开机后的系统登录界面(还没有人登录 Linux 桌面时);这种情况可以用无头模式或虚拟桌面(见下文)。注意:这里说的是 Linux 系统登录,**不登录 UU 账号**现在可以通过「远程协助」使用 |
|
| Linux 系统登录界面 | 还不支持控制开机后的系统登录界面(还没有人登录 Linux 桌面时);这种情况可以用无头模式或虚拟桌面(见下文)。注意:这里说的是 Linux 系统登录,**不登录 UU 账号**现在可以通过「远程协助」使用 |
|
||||||
@@ -167,6 +193,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>)。
|
||||||
@@ -184,6 +212,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. 登录
|
||||||
|
|
||||||
在图形桌面里运行:
|
在图形桌面里运行:
|
||||||
@@ -246,6 +277,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 远程的「开始协助」里输入即可控制本机。
|
||||||
@@ -313,7 +346,7 @@ systemctl --user restart uuremote-native.service
|
|||||||
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms`(实验性特性) / `none`(无头模式) |
|
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms`(实验性特性) / `none`(无头模式) |
|
||||||
| `UU_DESKTOP_RESIZE=0` | X11 下控制端切换分辨率时不改桌面分辨率,只缩放编码画面 |
|
| `UU_DESKTOP_RESIZE=0` | X11 下控制端切换分辨率时不改桌面分辨率,只缩放编码画面 |
|
||||||
| `UU_NVENC_RGB=0` / `=1` | NVENC 直接编码 BGRA(省 CPU)。显示器接在 NVIDIA 卡上时默认关闭(同卡合成时直吃反而更慢),`0` 强制关,`1` 强制开 |
|
| `UU_NVENC_RGB=0` / `=1` | NVENC 直接编码 BGRA(省 CPU)。显示器接在 NVIDIA 卡上时默认关闭(同卡合成时直吃反而更慢),`0` 强制关,`1` 强制开 |
|
||||||
| `UU_WAYLAND_MULTISCREEN=1` | 启用 Hyprland 物理显示器切换(默认关闭) |
|
| `UU_WAYLAND_MULTISCREEN=1` | 启用 Hyprland / niri 物理显示器切换(默认关闭) |
|
||||||
| `UU_WAYLAND_OUTPUT` | 原生 Wayland 默认采集输出名称,例如 `HDMI-A-1` |
|
| `UU_WAYLAND_OUTPUT` | 原生 Wayland 默认采集输出名称,例如 `HDMI-A-1` |
|
||||||
| `UU_X11_MULTISCREEN=1` | X11 下按显示器分别选择和采集(实验性,默认关闭,需要 `xrandr`) |
|
| `UU_X11_MULTISCREEN=1` | X11 下按显示器分别选择和采集(实验性,默认关闭,需要 `xrandr`) |
|
||||||
| `UU_X11_OUTPUT` | X11 默认采集的显示器名称(`xrandr --listmonitors`),默认主显示器 |
|
| `UU_X11_OUTPUT` | X11 默认采集的显示器名称(`xrandr --listmonitors`),默认主显示器 |
|
||||||
@@ -335,7 +368,7 @@ systemctl --user restart uuremote-native.service
|
|||||||
|
|
||||||
`UU_USE_PROXY=1` 仅使用当前进程已有的代理配置;`HTTP_PROXY` / `HTTPS_PROXY` / `ALL_PROXY`(及小写形式)和 `NO_PROXY` 按 reqwest 的标准规则选择,大写优先。信令拒绝选定变量中的无效/不支持的代理 URL(仅 HTTP/HTTPS;不支持 SOCKS)、带路径/查询/片段的代理 URL,以及会忽略代理的 CGI 环境;此校验比 reqwest 默默忽略坏值更严格。未配置匹配代理或命中 `NO_PROXY` 时仍正常直连,选中代理后连接失败不会改为直连。信令保留 TLS 证书校验,不跟随重定向,也不转发认证头到重定向目标。
|
`UU_USE_PROXY=1` 仅使用当前进程已有的代理配置;`HTTP_PROXY` / `HTTPS_PROXY` / `ALL_PROXY`(及小写形式)和 `NO_PROXY` 按 reqwest 的标准规则选择,大写优先。信令拒绝选定变量中的无效/不支持的代理 URL(仅 HTTP/HTTPS;不支持 SOCKS)、带路径/查询/片段的代理 URL,以及会忽略代理的 CGI 环境;此校验比 reqwest 默默忽略坏值更严格。未配置匹配代理或命中 `NO_PROXY` 时仍正常直连,选中代理后连接失败不会改为直连。信令保留 TLS 证书校验,不跟随重定向,也不转发认证头到重定向目标。
|
||||||
|
|
||||||
**这只解决 HTTP 与 WebSocket 的代理兼容性,不代理 ICE/WebRTC 媒体,也不提供 TURN TCP/TLS 或任何新的网络出口。** 登录、信令和媒体必须分别有允许使用的网络路径。连接器只返回固定错误类别/HTTP 状态;不要为诊断开启会记录 URL/认证信息的依赖库 TRACE 日志。
|
开启后主机还会经 TCP/TLS 连接云端 TURN 中继(使用 `HTTPS_PROXY`/`ALL_PROXY` 里的无认证 `http://` 代理做 CONNECT,没有代理则直连),适用于 UDP 到不了 TURN 服务器、只有 TCP/代理能出网的主机;TURN 证书按 CA 链校验,云端下发的 TURN 地址是 IP 时容忍名称不匹配(媒体本身由 DTLS-SRTP 端到端加密)。默认(不开代理)只用 UDP 中继,行为不变。**这不创建任何新的网络出口**:登录、信令和媒体仍需各自有允许使用的网络路径。连接器只返回固定错误类别/HTTP 状态;不要为诊断开启会记录 URL/认证信息的依赖库 TRACE 日志。
|
||||||
|
|
||||||
「远程结束后自动锁屏」「静音运行」等设置保存在 `~/.config/uuremote/host_settings.json`。同一文件里的 `video_encoder`(`auto`/`cpu`/`vaapi`/`nvenc`)和 `video_codec`(`auto`/`h264`/`h265`)用 `uuremote-server set-encoder`、`uuremote-server set-codec` 写入(非法参数退出码 2)。非 `auto` 的值优先于 `UU_VIDEO_ENCODER` / `UU_VIDEO_CODEC`;`auto` 或留空则落到环境变量,再落到 auto(有 NVIDIA 时 NVENC 优先,失败再 CPU;没有 NVIDIA 时就是 CPU,不探测;codec 仍是硬件优先 H.265、CPU 用 H.264)。探测在启动时后台进行,不挡住第一路出图。成功结果缓存到进程退出,但 NVIDIA 是否存在(`/proc/driver/nvidia/version` 或 `/dev/nvidia0`)与报告不一致时,下一次桌面连接会在后台再探测一次(`warm_auto_probe`),这一路仍用缓存的编码器,直到新结果写入。NVENC 失败只缓存 10 分钟,到期后的桌面连接同样在后台再探测一次,这一路仍用当前结果。`set-encoder` 和 `set-codec` 写完后若 `host.pid` 指向正在运行的本程序,都会发 `SIGUSR2`:编码器变化时进行中的桌面流立刻换编码器(不断开,沿用本会话已协商的 codec;新编码器起不来时按进程内 → FFmpeg 进程 → CPU 回退)。手改文件后可 `kill -USR2 $(cat ~/.config/uuremote/host.pid)`。`SIGUSR2` 不重新探测。codec 偏好仍在下次建立桌面连接时生效(运行中的 host 只记日志,不重开编码)。显式 `vaapi` 请求真彩时仍用 VAAPI、编码 4:2:0,并在 CaptureSettingSync 的 field 3 回报 4:2:0。所选编码器在本机不可用时,建流回退 CPU 并记 warning。VAAPI 进入 auto 要等 #33。
|
「远程结束后自动锁屏」「静音运行」等设置保存在 `~/.config/uuremote/host_settings.json`。同一文件里的 `video_encoder`(`auto`/`cpu`/`vaapi`/`nvenc`)和 `video_codec`(`auto`/`h264`/`h265`)用 `uuremote-server set-encoder`、`uuremote-server set-codec` 写入(非法参数退出码 2)。非 `auto` 的值优先于 `UU_VIDEO_ENCODER` / `UU_VIDEO_CODEC`;`auto` 或留空则落到环境变量,再落到 auto(有 NVIDIA 时 NVENC 优先,失败再 CPU;没有 NVIDIA 时就是 CPU,不探测;codec 仍是硬件优先 H.265、CPU 用 H.264)。探测在启动时后台进行,不挡住第一路出图。成功结果缓存到进程退出,但 NVIDIA 是否存在(`/proc/driver/nvidia/version` 或 `/dev/nvidia0`)与报告不一致时,下一次桌面连接会在后台再探测一次(`warm_auto_probe`),这一路仍用缓存的编码器,直到新结果写入。NVENC 失败只缓存 10 分钟,到期后的桌面连接同样在后台再探测一次,这一路仍用当前结果。`set-encoder` 和 `set-codec` 写完后若 `host.pid` 指向正在运行的本程序,都会发 `SIGUSR2`:编码器变化时进行中的桌面流立刻换编码器(不断开,沿用本会话已协商的 codec;新编码器起不来时按进程内 → FFmpeg 进程 → CPU 回退)。手改文件后可 `kill -USR2 $(cat ~/.config/uuremote/host.pid)`。`SIGUSR2` 不重新探测。codec 偏好仍在下次建立桌面连接时生效(运行中的 host 只记日志,不重开编码)。显式 `vaapi` 请求真彩时仍用 VAAPI、编码 4:2:0,并在 CaptureSettingSync 的 field 3 回报 4:2:0。所选编码器在本机不可用时,建流回退 CPU 并记 warning。VAAPI 进入 auto 要等 #33。
|
||||||
|
|
||||||
@@ -488,6 +521,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` 相互独立,默认主机构建和行为不变。
|
||||||
|
|
||||||
@@ -495,7 +530,8 @@ 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 剪贴板复用桌面窗口,避免 GNOME Wayland 上临时窗口引起的 Dock 跳动(#37)。niri 改用支持 data-control 的
|
||||||
|
`wl-clipboard`,不需要桌面窗口保持焦点;其他 SDL 后端仅在桌面窗口获得焦点时同步。
|
||||||
保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。
|
保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。
|
||||||
SDL2 同步读取选择内容,慢速的剪贴板提供者可能暂时阻塞窗口,桥接超时无法中断该原生调用。
|
SDL2 同步读取选择内容,慢速的剪贴板提供者可能暂时阻塞窗口,桥接超时无法中断该原生调用。
|
||||||
GNOME 与官方 Mac 被控端的双向剪贴板尚未验证通过;此修改不解决被控端兼容问题。
|
GNOME 与官方 Mac 被控端的双向剪贴板尚未验证通过;此修改不解决被控端兼容问题。
|
||||||
@@ -525,6 +561,7 @@ GNOME 与官方 Mac 被控端的双向剪贴板尚未验证通过;此修改不
|
|||||||
- 桌面同时提供 H.264 / H.265,由主机协商选择;`UU_VIEWER_CODEC=h264` 将 SDP 和解码能力限制为 H.264。
|
- 桌面同时提供 H.264 / H.265,由主机协商选择;`UU_VIEWER_CODEC=h264` 将 SDP 和解码能力限制为 H.264。
|
||||||
默认请求 4:2:0;`UU_VIEWER_CHROMA=444` 在 CONTROL 打开后请求真彩(4:4:4)。主机可能回落到 4:2:0,
|
默认请求 4:2:0;`UU_VIEWER_CHROMA=444` 在 CONTROL 打开后请求真彩(4:4:4)。主机可能回落到 4:2:0,
|
||||||
以 CaptureSettingSync 回报为准。两种色度均由 FFmpeg 转为 RGB24 显示。
|
以 CaptureSettingSync 回报为准。两种色度均由 FFmpeg 转为 RGB24 显示。
|
||||||
|
- 按被控端原始分辨率解码,窗口缩放使用线性过滤;被控端分辨率变化时自动重启解码器。`UU_VIEWER_SIZE=WxH` 可改为固定的留黑边画布。
|
||||||
|
|
||||||
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),
|
||||||
@@ -547,3 +584,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)。
|
||||||
@@ -1,14 +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/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)");
|
||||||
@@ -27,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");
|
||||||
@@ -37,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");
|
||||||
@@ -58,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() {
|
||||||
|
|||||||
+74
-81
@@ -8,25 +8,9 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
|
#include "i18n.h"
|
||||||
static const char *CSS =
|
#include "ui_theme.h"
|
||||||
"window { background-color: #f5f6f8; }\n"
|
static void on_language(GtkComboBox *c, gpointer note);
|
||||||
"* { 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 };
|
||||||
@@ -96,9 +80,9 @@ static void on_custom_changed(GtkEditable *e, gpointer ok) {
|
|||||||
|
|
||||||
// Returns 1 when a new custom code was entered and posted.
|
// Returns 1 when a new custom code was entered and posted.
|
||||||
static int ask_custom_code(void) {
|
static int ask_custom_code(void) {
|
||||||
GtkWidget *d = gtk_dialog_new_with_buttons("设置自定义验证码", GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
|
GtkWidget *d = gtk_dialog_new_with_buttons(L("设置自定义验证码", "Set custom code"), GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
"取消", GTK_RESPONSE_CANCEL, NULL);
|
L("取消", "Cancel"), GTK_RESPONSE_CANCEL, NULL);
|
||||||
GtkWidget *ok = gtk_dialog_add_button(GTK_DIALOG(d), "确定", GTK_RESPONSE_OK);
|
GtkWidget *ok = gtk_dialog_add_button(GTK_DIALOG(d), L("确定", "OK"), GTK_RESPONSE_OK);
|
||||||
gtk_widget_set_sensitive(ok, FALSE);
|
gtk_widget_set_sensitive(ok, FALSE);
|
||||||
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(d));
|
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(d));
|
||||||
gtk_container_set_border_width(GTK_CONTAINER(area), 16);
|
gtk_container_set_border_width(GTK_CONTAINER(area), 16);
|
||||||
@@ -106,10 +90,10 @@ static int ask_custom_code(void) {
|
|||||||
GtkWidget *entry = gtk_entry_new();
|
GtkWidget *entry = gtk_entry_new();
|
||||||
gtk_entry_set_max_length(GTK_ENTRY(entry), 16);
|
gtk_entry_set_max_length(GTK_ENTRY(entry), 16);
|
||||||
gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
|
gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
|
||||||
gtk_entry_set_placeholder_text(GTK_ENTRY(entry), "请输入自定义验证码");
|
gtk_entry_set_placeholder_text(GTK_ENTRY(entry), L("请输入自定义验证码", "Enter custom code"));
|
||||||
g_signal_connect(entry, "changed", G_CALLBACK(on_custom_changed), ok);
|
g_signal_connect(entry, "changed", G_CALLBACK(on_custom_changed), ok);
|
||||||
gtk_box_pack_start(GTK_BOX(area), entry, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(area), entry, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(area), label("8-16 位,需同时包含字母和数字;不会自动刷新,请妥善保管", "note"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(area), label(L("8-16 位,需同时包含字母和数字;不会自动刷新,请妥善保管", "8-16 characters with both letters and digits; never refreshed automatically, keep it safe"), "note"), FALSE, FALSE, 0);
|
||||||
gtk_widget_show_all(d);
|
gtk_widget_show_all(d);
|
||||||
int done = 0;
|
int done = 0;
|
||||||
if (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK) {
|
if (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK) {
|
||||||
@@ -140,12 +124,12 @@ static void on_refresh_item(GtkCheckMenuItem *item, gpointer data) {
|
|||||||
}
|
}
|
||||||
static void on_refresh_now(GtkMenuItem *i, gpointer d) { (void)i; (void)d; post(CMD_RESET); }
|
static void on_refresh_now(GtkMenuItem *i, gpointer d) { (void)i; (void)d; post(CMD_RESET); }
|
||||||
|
|
||||||
static const char *REFRESH_NOTES[5] = { "每次远控结束刷新", "每小时自动刷新", "每 12 小时自动刷新", "每 24 小时自动刷新", "不自动刷新" };
|
static const char *refresh_note(int i) { const char *notes[5] = { L("每次远控结束刷新", "Refreshed after every remote session"), L("每小时自动刷新", "Refreshed every hour"), L("每 12 小时自动刷新", "Refreshed every 12 hours"), L("每 24 小时自动刷新", "Refreshed every 24 hours"), L("不自动刷新", "Never refreshed automatically") }; return notes[i >= 0 && i < 5 ? i : 0]; }
|
||||||
|
|
||||||
static void render_code(void) {
|
static void render_code(void) {
|
||||||
if (!code_label) return;
|
if (!code_label) return;
|
||||||
gtk_label_set_text(GTK_LABEL(code_label), current_code[0] ? (code_visible ? current_code : "********") : "--------");
|
gtk_label_set_text(GTK_LABEL(code_label), current_code[0] ? (code_visible ? current_code : "********") : "--------");
|
||||||
gtk_button_set_label(GTK_BUTTON(eye_button), code_visible ? "隐藏" : "显示");
|
gtk_button_set_label(GTK_BUTTON(eye_button), code_visible ? L("隐藏", "Hide") : L("显示", "Show"));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void copy_text(const char *text, const char *hint) {
|
static void copy_text(const char *text, const char *hint) {
|
||||||
@@ -159,19 +143,19 @@ static void on_copy_id(GtkButton *b, gpointer d) {
|
|||||||
char digits[64]; size_t n = 0;
|
char digits[64]; size_t n = 0;
|
||||||
for (const char *p = current_id; *p && n + 1 < sizeof digits; p++) if (*p != ' ') digits[n++] = *p;
|
for (const char *p = current_id; *p && n + 1 < sizeof digits; p++) if (*p != ' ') digits[n++] = *p;
|
||||||
digits[n] = 0;
|
digits[n] = 0;
|
||||||
copy_text(digits, "已复制设备 ID");
|
copy_text(digits, L("已复制设备 ID", "Device ID copied"));
|
||||||
}
|
}
|
||||||
static void on_copy_code(GtkButton *b, gpointer d) { (void)b; (void)d; copy_text(current_code, "已复制验证码,请只发给信任的人"); }
|
static void on_copy_code(GtkButton *b, gpointer d) { (void)b; (void)d; copy_text(current_code, L("已复制验证码,请只发给信任的人", "Code copied. Only share it with people you trust")); }
|
||||||
|
|
||||||
static void on_eye(GtkButton *b, gpointer d) { (void)b; (void)d; code_visible = !code_visible; render_code(); }
|
static void on_eye(GtkButton *b, gpointer d) { (void)b; (void)d; code_visible = !code_visible; render_code(); }
|
||||||
|
|
||||||
static void on_share(GtkButton *b, gpointer d) {
|
static void on_share(GtkButton *b, gpointer d) {
|
||||||
(void)b; (void)d;
|
(void)b; (void)d;
|
||||||
if (!current_id[0] || !current_code[0]) return;
|
if (!current_id[0] || !current_code[0]) return;
|
||||||
char *text = g_strdup_printf("UU 远程协助\n设备 ID:%s\n验证码:%s", current_id, current_code);
|
char *text = g_strdup_printf(L("UU 远程协助\n设备 ID:%s\n验证码:%s", "UU Remote assistance\nDevice ID: %s\nCode: %s"), current_id, current_code);
|
||||||
gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), text, -1);
|
gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), text, -1);
|
||||||
g_free(text);
|
g_free(text);
|
||||||
gtk_label_set_text(GTK_LABEL(hint_label), "已复制设备 ID 和验证码,请只发给信任的人");
|
gtk_label_set_text(GTK_LABEL(hint_label), L("已复制设备 ID 和验证码,请只发给信任的人", "Device ID and code copied. Only share them with people you trust"));
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean on_switch(GtkSwitch *s, gboolean state, gpointer d) {
|
static gboolean on_switch(GtkSwitch *s, gboolean state, gpointer d) {
|
||||||
@@ -213,10 +197,10 @@ static gboolean draw_avatar(GtkWidget *w, cairo_t *cr, gpointer d) {
|
|||||||
static void on_logout(GtkButton *b, gpointer d) {
|
static void on_logout(GtkButton *b, gpointer d) {
|
||||||
(void)b; (void)d;
|
(void)b; (void)d;
|
||||||
GtkWidget *dlg = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL,
|
GtkWidget *dlg = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL,
|
||||||
"退出登录后,本机将从你的设备列表中下线,远程协助会改用访客身份。确定退出吗?");
|
L("退出登录后,本机将从你的设备列表中下线,远程协助会改用访客身份。确定退出吗?", "After signing out this computer leaves your device list and assistance switches to guest mode. Sign out?"));
|
||||||
if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK) {
|
if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK) {
|
||||||
post(CMD_LOGOUT);
|
post(CMD_LOGOUT);
|
||||||
gtk_label_set_text(GTK_LABEL(user_label), "正在退出登录…");
|
gtk_label_set_text(GTK_LABEL(user_label), L("正在退出登录…", "Signing out…"));
|
||||||
}
|
}
|
||||||
gtk_widget_destroy(dlg);
|
gtk_widget_destroy(dlg);
|
||||||
}
|
}
|
||||||
@@ -226,7 +210,7 @@ static GtkWidget *build_account_card(void) {
|
|||||||
gtk_style_context_add_class(gtk_widget_get_style_context(card), "card");
|
gtk_style_context_add_class(gtk_widget_get_style_context(card), "card");
|
||||||
GtkWidget *header = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
|
GtkWidget *header = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
|
||||||
gtk_container_set_border_width(GTK_CONTAINER(header), 20);
|
gtk_container_set_border_width(GTK_CONTAINER(header), 20);
|
||||||
gtk_box_pack_start(GTK_BOX(header), label("账号", "heading"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(header), label(L("账号", "Account"), "heading"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(card), header, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(card), header, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(card), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(card), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
|
||||||
account_stack = gtk_stack_new();
|
account_stack = gtk_stack_new();
|
||||||
@@ -243,21 +227,21 @@ static GtkWidget *build_account_card(void) {
|
|||||||
GtkWidget *spinner = gtk_spinner_new();
|
GtkWidget *spinner = gtk_spinner_new();
|
||||||
gtk_spinner_start(GTK_SPINNER(spinner));
|
gtk_spinner_start(GTK_SPINNER(spinner));
|
||||||
gtk_box_pack_start(GTK_BOX(loading), spinner, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(loading), spinner, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(loading), label("正在获取二维码…", "note"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(loading), label(L("正在获取二维码…", "Loading QR code…"), "note"), FALSE, FALSE, 0);
|
||||||
gtk_stack_add_named(GTK_STACK(qr_stack), loading, "loading");
|
gtk_stack_add_named(GTK_STACK(qr_stack), loading, "loading");
|
||||||
qr_image = gtk_image_new();
|
qr_image = gtk_image_new();
|
||||||
gtk_stack_add_named(GTK_STACK(qr_stack), qr_image, "qr");
|
gtk_stack_add_named(GTK_STACK(qr_stack), qr_image, "qr");
|
||||||
gtk_box_pack_start(GTK_BOX(qr_page), qr_stack, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(qr_page), qr_stack, FALSE, FALSE, 0);
|
||||||
GtkWidget *qr_text = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
GtkWidget *qr_text = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
||||||
gtk_widget_set_valign(qr_text, GTK_ALIGN_CENTER);
|
gtk_widget_set_valign(qr_text, GTK_ALIGN_CENTER);
|
||||||
gtk_box_pack_start(GTK_BOX(qr_text), label("扫码登录", "heading"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(qr_text), label(L("扫码登录", "Scan to sign in"), "heading"), FALSE, FALSE, 0);
|
||||||
GtkWidget *cap = label("请使用网易 UU 远程 App 扫一扫登录。\n登录后本机会出现在你的设备列表中,可直接远程控制;\n远程协助在登录前后都可以使用。", "hint");
|
GtkWidget *cap = label(L("请使用网易 UU 远程 App 扫一扫登录。\n登录后本机会出现在你的设备列表中,可直接远程控制;\n远程协助在登录前后都可以使用。", "Scan with the NetEase UU Remote app to sign in.\nAfter sign-in this computer appears in your device list and can be controlled directly;\nremote assistance works whether you are signed in or not."), "hint");
|
||||||
gtk_label_set_xalign(GTK_LABEL(cap), 0);
|
gtk_label_set_xalign(GTK_LABEL(cap), 0);
|
||||||
gtk_box_pack_start(GTK_BOX(qr_text), cap, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(qr_text), cap, FALSE, FALSE, 0);
|
||||||
login_status = label("", "status");
|
login_status = label("", "status");
|
||||||
gtk_label_set_line_wrap(GTK_LABEL(login_status), TRUE);
|
gtk_label_set_line_wrap(GTK_LABEL(login_status), TRUE);
|
||||||
gtk_box_pack_start(GTK_BOX(qr_text), login_status, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(qr_text), login_status, FALSE, FALSE, 0);
|
||||||
qr_refresh = gtk_button_new_with_label("刷新二维码");
|
qr_refresh = gtk_button_new_with_label(L("刷新二维码", "Refresh QR code"));
|
||||||
gtk_widget_set_halign(qr_refresh, GTK_ALIGN_START);
|
gtk_widget_set_halign(qr_refresh, GTK_ALIGN_START);
|
||||||
gtk_widget_set_no_show_all(qr_refresh, TRUE);
|
gtk_widget_set_no_show_all(qr_refresh, TRUE);
|
||||||
g_signal_connect(qr_refresh, "clicked", G_CALLBACK(on_qr_refresh), NULL);
|
g_signal_connect(qr_refresh, "clicked", G_CALLBACK(on_qr_refresh), NULL);
|
||||||
@@ -277,9 +261,9 @@ static GtkWidget *build_account_card(void) {
|
|||||||
gtk_widget_set_valign(user_text, GTK_ALIGN_CENTER);
|
gtk_widget_set_valign(user_text, GTK_ALIGN_CENTER);
|
||||||
user_label = label("", "user");
|
user_label = label("", "user");
|
||||||
gtk_box_pack_start(GTK_BOX(user_text), user_label, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(user_text), user_label, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(user_text), label("已登录 · 本机已出现在你的设备列表中", "hint"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(user_text), label(L("已登录 · 本机已出现在你的设备列表中", "Signed in · this computer is in your device list"), "hint"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(user_page), user_text, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(user_page), user_text, TRUE, TRUE, 0);
|
||||||
GtkWidget *logout = gtk_button_new_with_label("退出登录");
|
GtkWidget *logout = gtk_button_new_with_label(L("退出登录", "Sign out"));
|
||||||
gtk_style_context_add_class(gtk_widget_get_style_context(logout), "share");
|
gtk_style_context_add_class(gtk_widget_get_style_context(logout), "share");
|
||||||
gtk_widget_set_valign(logout, GTK_ALIGN_CENTER);
|
gtk_widget_set_valign(logout, GTK_ALIGN_CENTER);
|
||||||
g_signal_connect(logout, "clicked", G_CALLBACK(on_logout), NULL);
|
g_signal_connect(logout, "clicked", G_CALLBACK(on_logout), NULL);
|
||||||
@@ -299,8 +283,8 @@ static void on_tray_allow(GtkCheckMenuItem *i, gpointer d) {
|
|||||||
static void on_tray_quit(GtkMenuItem *i, gpointer d) {
|
static void on_tray_quit(GtkMenuItem *i, gpointer d) {
|
||||||
(void)i; (void)d;
|
(void)i; (void)d;
|
||||||
GtkWidget *dlg = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL,
|
GtkWidget *dlg = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL,
|
||||||
"退出后本机将下线:设备列表和远程协助都无法连接,直到再次启动。确定退出吗?");
|
L("退出后本机将下线:设备列表和远程协助都无法连接,直到再次启动。确定退出吗?", "Quitting takes this computer offline: neither the device list nor remote assistance can connect until it starts again. Quit?"));
|
||||||
gtk_window_set_title(GTK_WINDOW(dlg), "UU 远程 Linux 主机");
|
gtk_window_set_title(GTK_WINDOW(dlg), L("UU 远程 Linux 主机", "UU Remote Linux host"));
|
||||||
if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK) post(CMD_QUIT);
|
if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK) post(CMD_QUIT);
|
||||||
gtk_widget_destroy(dlg);
|
gtk_widget_destroy(dlg);
|
||||||
}
|
}
|
||||||
@@ -337,11 +321,11 @@ static gchar *write_tray_icon(void) {
|
|||||||
}
|
}
|
||||||
static void build_tray(void) {
|
static void build_tray(void) {
|
||||||
tray_menu = gtk_menu_new();
|
tray_menu = gtk_menu_new();
|
||||||
GtkWidget *open = gtk_menu_item_new_with_label("打开主窗口");
|
GtkWidget *open = gtk_menu_item_new_with_label(L("打开主窗口", "Open main window"));
|
||||||
g_signal_connect(open, "activate", G_CALLBACK(on_tray_open), NULL);
|
g_signal_connect(open, "activate", G_CALLBACK(on_tray_open), NULL);
|
||||||
tray_allow = gtk_check_menu_item_new_with_label("允许他人远程协助");
|
tray_allow = gtk_check_menu_item_new_with_label(L("允许他人远程协助", "Allow remote assistance"));
|
||||||
g_signal_connect(tray_allow, "toggled", G_CALLBACK(on_tray_allow), NULL);
|
g_signal_connect(tray_allow, "toggled", G_CALLBACK(on_tray_allow), NULL);
|
||||||
GtkWidget *quit = gtk_menu_item_new_with_label("退出");
|
GtkWidget *quit = gtk_menu_item_new_with_label(L("退出", "Quit"));
|
||||||
g_signal_connect(quit, "activate", G_CALLBACK(on_tray_quit), NULL);
|
g_signal_connect(quit, "activate", G_CALLBACK(on_tray_quit), NULL);
|
||||||
gtk_menu_shell_append(GTK_MENU_SHELL(tray_menu), open);
|
gtk_menu_shell_append(GTK_MENU_SHELL(tray_menu), open);
|
||||||
gtk_menu_shell_append(GTK_MENU_SHELL(tray_menu), tray_allow);
|
gtk_menu_shell_append(GTK_MENU_SHELL(tray_menu), tray_allow);
|
||||||
@@ -367,7 +351,7 @@ static void build_tray(void) {
|
|||||||
// Without a theme path the panel cannot find the cached icon; keep the installed one.
|
// Without a theme path the panel cannot find the cached icon; keep the installed one.
|
||||||
void *ind = ind_new("uu-remote-linux", set_theme_path ? icon : fallback, 0 /* APPLICATION_STATUS */);
|
void *ind = ind_new("uu-remote-linux", set_theme_path ? icon : fallback, 0 /* APPLICATION_STATUS */);
|
||||||
if (icon_path && set_theme_path) set_theme_path(ind, icon_path);
|
if (icon_path && set_theme_path) set_theme_path(ind, icon_path);
|
||||||
if (set_title) set_title(ind, "UU 远程 Linux 主机");
|
if (set_title) set_title(ind, L("UU 远程 Linux 主机", "UU Remote Linux host"));
|
||||||
set_menu(ind, GTK_MENU(tray_menu));
|
set_menu(ind, GTK_MENU(tray_menu));
|
||||||
set_status(ind, 1 /* ACTIVE */);
|
set_status(ind, 1 /* ACTIVE */);
|
||||||
return; // keep the library loaded for the indicator's lifetime
|
return; // keep the library loaded for the indicator's lifetime
|
||||||
@@ -377,23 +361,19 @@ static void build_tray(void) {
|
|||||||
// XEmbed system tray (Xfce, Cinnamon, MATE...).
|
// XEmbed system tray (Xfce, Cinnamon, MATE...).
|
||||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||||
GtkStatusIcon *status = gtk_status_icon_new_from_icon_name(icon);
|
GtkStatusIcon *status = gtk_status_icon_new_from_icon_name(icon);
|
||||||
gtk_status_icon_set_tooltip_text(status, "UU 远程 Linux 主机");
|
gtk_status_icon_set_tooltip_text(status, L("UU 远程 Linux 主机", "UU Remote Linux host"));
|
||||||
gtk_status_icon_set_title(status, "UU 远程 Linux 主机");
|
gtk_status_icon_set_title(status, L("UU 远程 Linux 主机", "UU Remote Linux host"));
|
||||||
g_signal_connect(status, "activate", G_CALLBACK(on_status_activate), NULL);
|
g_signal_connect(status, "activate", G_CALLBACK(on_status_activate), NULL);
|
||||||
g_signal_connect(status, "popup-menu", G_CALLBACK(on_status_menu), NULL);
|
g_signal_connect(status, "popup-menu", G_CALLBACK(on_status_menu), NULL);
|
||||||
G_GNUC_END_IGNORE_DEPRECATIONS
|
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||||
}
|
}
|
||||||
|
|
||||||
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);
|
||||||
gtk_window_set_title(GTK_WINDOW(window), "UU 远程 Linux 主机(非官方)");
|
gtk_window_set_title(GTK_WINDOW(window), L("UU 远程 Linux 主机(非官方)", "UU Remote Linux host (unofficial)"));
|
||||||
gtk_window_set_default_size(GTK_WINDOW(window), 760, -1);
|
gtk_window_set_default_size(GTK_WINDOW(window), 760, -1);
|
||||||
gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
|
gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
|
||||||
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
|
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
|
||||||
@@ -417,12 +397,12 @@ static void build_window(void) {
|
|||||||
// Header: 本设备 ... 允许他人远程协助 [switch]
|
// Header: 本设备 ... 允许他人远程协助 [switch]
|
||||||
GtkWidget *header = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
|
GtkWidget *header = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
|
||||||
gtk_container_set_border_width(GTK_CONTAINER(header), 20);
|
gtk_container_set_border_width(GTK_CONTAINER(header), 20);
|
||||||
gtk_box_pack_start(GTK_BOX(header), label("本设备", "heading"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(header), label(L("本设备", "This device"), "heading"), FALSE, FALSE, 0);
|
||||||
allow_switch = gtk_switch_new();
|
allow_switch = gtk_switch_new();
|
||||||
gtk_widget_set_valign(allow_switch, GTK_ALIGN_CENTER);
|
gtk_widget_set_valign(allow_switch, GTK_ALIGN_CENTER);
|
||||||
g_signal_connect(allow_switch, "state-set", G_CALLBACK(on_switch), NULL);
|
g_signal_connect(allow_switch, "state-set", G_CALLBACK(on_switch), NULL);
|
||||||
gtk_box_pack_end(GTK_BOX(header), allow_switch, FALSE, FALSE, 0);
|
gtk_box_pack_end(GTK_BOX(header), allow_switch, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_end(GTK_BOX(header), label("允许他人远程协助", "key"), FALSE, FALSE, 0);
|
gtk_box_pack_end(GTK_BOX(header), label(L("允许他人远程协助", "Allow remote assistance"), "key"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(card), header, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(card), header, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(card), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(card), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
|
||||||
|
|
||||||
@@ -431,12 +411,12 @@ static void build_window(void) {
|
|||||||
gtk_container_set_border_width(GTK_CONTAINER(body), 20);
|
gtk_container_set_border_width(GTK_CONTAINER(body), 20);
|
||||||
gtk_grid_set_column_spacing(GTK_GRID(body), 48);
|
gtk_grid_set_column_spacing(GTK_GRID(body), 48);
|
||||||
gtk_grid_set_row_spacing(GTK_GRID(body), 6);
|
gtk_grid_set_row_spacing(GTK_GRID(body), 6);
|
||||||
gtk_grid_attach(GTK_GRID(body), label("本设备 ID", "key"), 0, 0, 1, 1);
|
gtk_grid_attach(GTK_GRID(body), label(L("本设备 ID", "This device's ID"), "key"), 0, 0, 1, 1);
|
||||||
GtkWidget *id_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
|
GtkWidget *id_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
|
||||||
id_label = label("获取中…", "big");
|
id_label = label(L("获取中…", "Loading…"), "big");
|
||||||
gtk_label_set_selectable(GTK_LABEL(id_label), TRUE);
|
gtk_label_set_selectable(GTK_LABEL(id_label), TRUE);
|
||||||
gtk_box_pack_start(GTK_BOX(id_row), id_label, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(id_row), id_label, FALSE, FALSE, 0);
|
||||||
GtkWidget *copy_id = gtk_button_new_with_label("复制");
|
GtkWidget *copy_id = gtk_button_new_with_label(L("复制", "Copy"));
|
||||||
gtk_style_context_add_class(gtk_widget_get_style_context(copy_id), "flat");
|
gtk_style_context_add_class(gtk_widget_get_style_context(copy_id), "flat");
|
||||||
gtk_widget_set_valign(copy_id, GTK_ALIGN_CENTER);
|
gtk_widget_set_valign(copy_id, GTK_ALIGN_CENTER);
|
||||||
g_signal_connect(copy_id, "clicked", G_CALLBACK(on_copy_id), NULL);
|
g_signal_connect(copy_id, "clicked", G_CALLBACK(on_copy_id), NULL);
|
||||||
@@ -444,11 +424,11 @@ static void build_window(void) {
|
|||||||
gtk_grid_attach(GTK_GRID(body), id_row, 0, 1, 1, 1);
|
gtk_grid_attach(GTK_GRID(body), id_row, 0, 1, 1, 1);
|
||||||
|
|
||||||
GtkWidget *verify_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
|
GtkWidget *verify_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
|
||||||
gtk_box_pack_start(GTK_BOX(verify_row), label("验证方式:", "key"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(verify_row), label(L("验证方式:", "Verification:"), "key"), FALSE, FALSE, 0);
|
||||||
verify_combo = gtk_combo_box_text_new();
|
verify_combo = gtk_combo_box_text_new();
|
||||||
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(verify_combo), "仅使用临时验证码");
|
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(verify_combo), L("仅使用临时验证码", "Temporary code only"));
|
||||||
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(verify_combo), "仅使用自定义验证码");
|
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(verify_combo), L("仅使用自定义验证码", "Custom code only"));
|
||||||
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(verify_combo), "同时使用两种验证码");
|
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(verify_combo), L("同时使用两种验证码", "Use both codes"));
|
||||||
gtk_combo_box_set_active(GTK_COMBO_BOX(verify_combo), 0);
|
gtk_combo_box_set_active(GTK_COMBO_BOX(verify_combo), 0);
|
||||||
g_signal_connect(verify_combo, "changed", G_CALLBACK(on_verify_changed), NULL);
|
g_signal_connect(verify_combo, "changed", G_CALLBACK(on_verify_changed), NULL);
|
||||||
gtk_box_pack_start(GTK_BOX(verify_row), verify_combo, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(verify_row), verify_combo, FALSE, FALSE, 0);
|
||||||
@@ -456,17 +436,17 @@ static void build_window(void) {
|
|||||||
GtkWidget *code_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
|
GtkWidget *code_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
|
||||||
code_label = label("--------", "big");
|
code_label = label("--------", "big");
|
||||||
gtk_box_pack_start(GTK_BOX(code_row), code_label, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(code_row), code_label, FALSE, FALSE, 0);
|
||||||
eye_button = gtk_button_new_with_label("隐藏");
|
eye_button = gtk_button_new_with_label(L("隐藏", "Hide"));
|
||||||
gtk_style_context_add_class(gtk_widget_get_style_context(eye_button), "flat");
|
gtk_style_context_add_class(gtk_widget_get_style_context(eye_button), "flat");
|
||||||
g_signal_connect(eye_button, "clicked", G_CALLBACK(on_eye), NULL);
|
g_signal_connect(eye_button, "clicked", G_CALLBACK(on_eye), NULL);
|
||||||
// Gear menu: 立即刷新 / 自动刷新 ▸ (每次远控结束, 每小时, 每 12 小时, 每 24 小时, 关闭) / 设置自定义验证码
|
// Gear menu: 立即刷新 / 自动刷新 ▸ (每次远控结束, 每小时, 每 12 小时, 每 24 小时, 关闭) / 设置自定义验证码
|
||||||
GtkWidget *menu = gtk_menu_new();
|
GtkWidget *menu = gtk_menu_new();
|
||||||
GtkWidget *now = gtk_menu_item_new_with_label("立即刷新");
|
GtkWidget *now = gtk_menu_item_new_with_label(L("立即刷新", "Refresh now"));
|
||||||
g_signal_connect(now, "activate", G_CALLBACK(on_refresh_now), NULL);
|
g_signal_connect(now, "activate", G_CALLBACK(on_refresh_now), NULL);
|
||||||
gtk_menu_shell_append(GTK_MENU_SHELL(menu), now);
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu), now);
|
||||||
GtkWidget *auto_item = gtk_menu_item_new_with_label("自动刷新");
|
GtkWidget *auto_item = gtk_menu_item_new_with_label(L("自动刷新", "Auto refresh"));
|
||||||
GtkWidget *sub = gtk_menu_new();
|
GtkWidget *sub = gtk_menu_new();
|
||||||
const char *names[5] = { "每次远控结束", "每小时", "每 12 小时", "每 24 小时", "关闭" };
|
const char *names[5] = { L("每次远控结束", "After every remote session"), L("每小时", "Every hour"), L("每 12 小时", "Every 12 hours"), L("每 24 小时", "Every 24 hours"), L("关闭", "Close") };
|
||||||
GSList *group = NULL;
|
GSList *group = NULL;
|
||||||
for (int i = 0; i < 5; i++) {
|
for (int i = 0; i < 5; i++) {
|
||||||
refresh_items[i] = gtk_radio_menu_item_new_with_label(group, names[i]);
|
refresh_items[i] = gtk_radio_menu_item_new_with_label(group, names[i]);
|
||||||
@@ -476,15 +456,15 @@ static void build_window(void) {
|
|||||||
}
|
}
|
||||||
gtk_menu_item_set_submenu(GTK_MENU_ITEM(auto_item), sub);
|
gtk_menu_item_set_submenu(GTK_MENU_ITEM(auto_item), sub);
|
||||||
gtk_menu_shell_append(GTK_MENU_SHELL(menu), auto_item);
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu), auto_item);
|
||||||
GtkWidget *custom_item = gtk_menu_item_new_with_label("设置自定义验证码…");
|
GtkWidget *custom_item = gtk_menu_item_new_with_label(L("设置自定义验证码…", "Set custom code…"));
|
||||||
g_signal_connect(custom_item, "activate", G_CALLBACK(on_set_custom), NULL);
|
g_signal_connect(custom_item, "activate", G_CALLBACK(on_set_custom), NULL);
|
||||||
gtk_menu_shell_append(GTK_MENU_SHELL(menu), custom_item);
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu), custom_item);
|
||||||
gtk_widget_show_all(menu);
|
gtk_widget_show_all(menu);
|
||||||
GtkWidget *gear = gtk_menu_button_new();
|
GtkWidget *gear = gtk_menu_button_new();
|
||||||
gtk_button_set_image(GTK_BUTTON(gear), gtk_image_new_from_icon_name("emblem-system-symbolic", GTK_ICON_SIZE_BUTTON));
|
gtk_button_set_image(GTK_BUTTON(gear), gtk_image_new_from_icon_name("emblem-system-symbolic", GTK_ICON_SIZE_BUTTON));
|
||||||
gtk_widget_set_tooltip_text(gear, "刷新设置");
|
gtk_widget_set_tooltip_text(gear, L("刷新设置", "Refresh settings"));
|
||||||
gtk_menu_button_set_popup(GTK_MENU_BUTTON(gear), menu);
|
gtk_menu_button_set_popup(GTK_MENU_BUTTON(gear), menu);
|
||||||
GtkWidget *copy_code = gtk_button_new_with_label("复制");
|
GtkWidget *copy_code = gtk_button_new_with_label(L("复制", "Copy"));
|
||||||
gtk_style_context_add_class(gtk_widget_get_style_context(copy_code), "flat");
|
gtk_style_context_add_class(gtk_widget_get_style_context(copy_code), "flat");
|
||||||
gtk_widget_set_valign(copy_code, GTK_ALIGN_CENTER);
|
gtk_widget_set_valign(copy_code, GTK_ALIGN_CENTER);
|
||||||
g_signal_connect(copy_code, "clicked", G_CALLBACK(on_copy_code), NULL);
|
g_signal_connect(copy_code, "clicked", G_CALLBACK(on_copy_code), NULL);
|
||||||
@@ -494,10 +474,10 @@ static void build_window(void) {
|
|||||||
gtk_box_pack_start(GTK_BOX(code_row), eye_button, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(code_row), eye_button, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(code_row), gear, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(code_row), gear, FALSE, FALSE, 0);
|
||||||
gtk_grid_attach(GTK_GRID(body), code_row, 1, 1, 1, 1);
|
gtk_grid_attach(GTK_GRID(body), code_row, 1, 1, 1, 1);
|
||||||
note_label = label(REFRESH_NOTES[0], "note");
|
note_label = label(refresh_note(0), "note");
|
||||||
gtk_grid_attach(GTK_GRID(body), note_label, 1, 2, 1, 1);
|
gtk_grid_attach(GTK_GRID(body), note_label, 1, 2, 1, 1);
|
||||||
|
|
||||||
share_button = gtk_button_new_with_label("复制并分享");
|
share_button = gtk_button_new_with_label(L("复制并分享", "Copy and share"));
|
||||||
gtk_style_context_add_class(gtk_widget_get_style_context(share_button), "share");
|
gtk_style_context_add_class(gtk_widget_get_style_context(share_button), "share");
|
||||||
gtk_widget_set_valign(share_button, GTK_ALIGN_CENTER);
|
gtk_widget_set_valign(share_button, GTK_ALIGN_CENTER);
|
||||||
g_signal_connect(share_button, "clicked", G_CALLBACK(on_share), NULL);
|
g_signal_connect(share_button, "clicked", G_CALLBACK(on_share), NULL);
|
||||||
@@ -509,9 +489,19 @@ static void build_window(void) {
|
|||||||
account_card = build_account_card();
|
account_card = build_account_card();
|
||||||
gtk_widget_set_margin_top(account_card, 6);
|
gtk_widget_set_margin_top(account_card, 6);
|
||||||
gtk_box_pack_start(GTK_BOX(root), account_card, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(root), account_card, FALSE, FALSE, 0);
|
||||||
footer_label = label("开源 Linux 被控端 · 非网易官方客户端 · 关闭窗口即停止远程协助", "footer");
|
footer_label = label(L("开源 Linux 被控端 · 非网易官方客户端 · 关闭窗口即停止远程协助", "Open-source Linux host · not an official NetEase client · closing the window stops remote assistance"), "footer");
|
||||||
gtk_box_pack_end(GTK_BOX(root), footer_label, FALSE, FALSE, 0);
|
gtk_box_pack_end(GTK_BOX(root), footer_label, FALSE, FALSE, 0);
|
||||||
if (close_hides) gtk_label_set_text(GTK_LABEL(footer_label), "开源 Linux 被控端 · 非网易官方客户端 · 关闭窗口后远程协助仍在后台运行");
|
GtkWidget *lang_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8), *lang_note = label("", "note");
|
||||||
|
GtkWidget *lang = gtk_combo_box_text_new();
|
||||||
|
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(lang), "中文"); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(lang), "English");
|
||||||
|
gtk_combo_box_set_active(GTK_COMBO_BOX(lang), uu_i18n_english());
|
||||||
|
g_signal_connect(lang, "changed", G_CALLBACK(on_language), lang_note);
|
||||||
|
gtk_box_pack_start(GTK_BOX(lang_row), label("语言 / Language", "key"), 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_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"));
|
||||||
render_code();
|
render_code();
|
||||||
if (close_hides) build_tray();
|
if (close_hides) build_tray();
|
||||||
gtk_widget_show_all(gtk_bin_get_child(GTK_BIN(window)));
|
gtk_widget_show_all(gtk_bin_get_child(GTK_BIN(window)));
|
||||||
@@ -525,11 +515,14 @@ static void build_window(void) {
|
|||||||
if (!start_hidden) gtk_widget_show(window);
|
if (!start_hidden) gtk_widget_show(window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void on_language(GtkComboBox *c, gpointer note) {
|
||||||
|
int english = gtk_combo_box_get_active(c) == 1;
|
||||||
|
gtk_label_set_text(GTK_LABEL(note), english == uu_i18n_english() ? "" : !uu_i18n_save(english) ? L("无法保存语言设置", "Could not save the language")
|
||||||
|
: english ? "Restart uuremote-server to switch to English" : "重新启动 uuremote-server 后切换为中文");
|
||||||
|
}
|
||||||
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;
|
||||||
@@ -582,7 +575,7 @@ static gboolean apply_state(gpointer data) {
|
|||||||
if (window) {
|
if (window) {
|
||||||
g_strlcpy(current_id, s->id, sizeof current_id);
|
g_strlcpy(current_id, s->id, sizeof current_id);
|
||||||
g_strlcpy(current_code, s->code, sizeof current_code);
|
g_strlcpy(current_code, s->code, sizeof current_code);
|
||||||
gtk_label_set_text(GTK_LABEL(id_label), current_id[0] ? current_id : "获取中…");
|
gtk_label_set_text(GTK_LABEL(id_label), current_id[0] ? current_id : L("获取中…", "Loading…"));
|
||||||
render_code();
|
render_code();
|
||||||
suppress_switch = 1;
|
suppress_switch = 1;
|
||||||
gtk_switch_set_active(GTK_SWITCH(allow_switch), s->allowed);
|
gtk_switch_set_active(GTK_SWITCH(allow_switch), s->allowed);
|
||||||
@@ -593,12 +586,12 @@ static gboolean apply_state(gpointer data) {
|
|||||||
if (s->refresh >= 0 && s->refresh < 5) {
|
if (s->refresh >= 0 && s->refresh < 5) {
|
||||||
suppress_refresh = 1; gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(refresh_items[s->refresh]), TRUE); suppress_refresh = 0;
|
suppress_refresh = 1; gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(refresh_items[s->refresh]), TRUE); suppress_refresh = 0;
|
||||||
}
|
}
|
||||||
gtk_label_set_text(GTK_LABEL(note_label), s->verify == VERIFY_CUSTOM ? "自定义验证码不会自动刷新"
|
gtk_label_set_text(GTK_LABEL(note_label), s->verify == VERIFY_CUSTOM ? L("自定义验证码不会自动刷新", "Custom code is never refreshed automatically")
|
||||||
: s->verify == VERIFY_BOTH ? "也可使用自定义验证码连接" : REFRESH_NOTES[s->refresh >= 0 && s->refresh < 5 ? s->refresh : 0]);
|
: s->verify == VERIFY_BOTH ? L("也可使用自定义验证码连接", "The custom code also works") : refresh_note(s->refresh));
|
||||||
gtk_widget_set_sensitive(share_button, current_id[0] && current_code[0]);
|
gtk_widget_set_sensitive(share_button, current_id[0] && current_code[0]);
|
||||||
gtk_label_set_text(GTK_LABEL(hint_label), s->allowed
|
gtk_label_set_text(GTK_LABEL(hint_label), s->allowed
|
||||||
? "对方在 UU 远程「开始协助」中输入设备 ID 和验证码即可连接"
|
? L("对方在 UU 远程「开始协助」中输入设备 ID 和验证码即可连接", "Your partner enters the device ID and code under \"Start assistance\" in UU Remote to connect")
|
||||||
: "已关闭:他人暂时无法远程协助本机,打开右上角开关后才能连接");
|
: L("已关闭:他人暂时无法远程协助本机,打开右上角开关后才能连接", "Off: nobody can assist this computer until you turn on the switch at the top right"));
|
||||||
}
|
}
|
||||||
g_free(s->id); g_free(s->code); g_free(s);
|
g_free(s->id); g_free(s->code); g_free(s);
|
||||||
return G_SOURCE_REMOVE;
|
return G_SOURCE_REMOVE;
|
||||||
@@ -725,7 +718,7 @@ static int notify_desktop(const char *summary, const char *body) {
|
|||||||
g_variant_builder_add(&hints, "{sv}", "urgency", g_variant_new_byte(2)); // critical: stays until dismissed
|
g_variant_builder_add(&hints, "{sv}", "urgency", g_variant_new_byte(2)); // critical: stays until dismissed
|
||||||
GVariant *reply = g_dbus_connection_call_sync(bus, "org.freedesktop.Notifications", "/org/freedesktop/Notifications",
|
GVariant *reply = g_dbus_connection_call_sync(bus, "org.freedesktop.Notifications", "/org/freedesktop/Notifications",
|
||||||
"org.freedesktop.Notifications", "Notify",
|
"org.freedesktop.Notifications", "Notify",
|
||||||
g_variant_new("(susssasa{sv}i)", "UU 远程 Linux 主机", 0u, "uu-remote-linux", summary, body, &actions, &hints, -1),
|
g_variant_new("(susssasa{sv}i)", L("UU 远程 Linux 主机", "UU Remote Linux host"), 0u, "uu-remote-linux", summary, body, &actions, &hints, -1),
|
||||||
G_VARIANT_TYPE("(u)"), G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
|
G_VARIANT_TYPE("(u)"), G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
|
||||||
g_object_unref(bus);
|
g_object_unref(bus);
|
||||||
if (!reply) return -1;
|
if (!reply) return -1;
|
||||||
|
|||||||
@@ -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);
|
||||||
|
}
|
||||||
@@ -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
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
// Chinese / English UI text. The language is decided once on the Rust side (src/i18n.rs: UU_LANG, the
|
||||||
|
// choice saved in settings, then the locale) so the GTK windows and Rust messages always agree.
|
||||||
|
#ifndef UU_I18N_H
|
||||||
|
#define UU_I18N_H
|
||||||
|
int uu_i18n_english(void);
|
||||||
|
int uu_i18n_save(int english);
|
||||||
|
#define L(zh, en) (uu_i18n_english() ? (en) : (zh))
|
||||||
|
#endif
|
||||||
+39
-3
@@ -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, ®ion);
|
||||||
|
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;
|
||||||
|
|||||||
+347
-31
@@ -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"
|
||||||
@@ -56,10 +57,12 @@ struct uu_portal {
|
|||||||
int format_valid, stream_started;
|
int format_valid, stream_started;
|
||||||
gint64 interrupted_at, display_changed_at;
|
gint64 interrupted_at, display_changed_at;
|
||||||
uint32_t node, width, height;
|
uint32_t node, width, height;
|
||||||
int logical_width, logical_height;
|
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,10 +581,12 @@ 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. */
|
||||||
g_variant_lookup(properties, "size", "(ii)", &p->logical_width, &p->logical_height);
|
g_variant_lookup(properties, "size", "(ii)", &p->logical_width, &p->logical_height);
|
||||||
|
p->has_position = g_variant_lookup(properties, "position", "(ii)", &p->position_x, &p->position_y);
|
||||||
const char *mapping_id = NULL;
|
const char *mapping_id = NULL;
|
||||||
if (g_variant_lookup(properties, "mapping_id", "&s", &mapping_id)) p->mapping_id = g_strdup(mapping_id);
|
if (g_variant_lookup(properties, "mapping_id", "&s", &mapping_id)) p->mapping_id = g_strdup(mapping_id);
|
||||||
g_variant_unref(properties); g_variant_unref(entry);
|
g_variant_unref(properties); g_variant_unref(entry);
|
||||||
@@ -378,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. */
|
||||||
@@ -412,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));
|
||||||
@@ -431,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);
|
||||||
@@ -494,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);
|
||||||
@@ -545,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);
|
||||||
@@ -566,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;
|
||||||
@@ -669,9 +898,96 @@ 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;
|
||||||
if (p->ei) return portal_eis_key(p, keycode, pressed);
|
if (p->ei) return portal_eis_key(p, keycode, pressed);
|
||||||
return notify(p, "NotifyKeyboardKeysym", g_variant_new("(o@a{sv}iu)", p->session, empty_options(), (gint)symbol, (guint)!!pressed));
|
return notify(p, "NotifyKeyboardKeysym", g_variant_new("(o@a{sv}iu)", p->session, empty_options(), (gint)symbol, (guint)!!pressed));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Logical position of the granted monitor: matches a Mutter logical monitor. */
|
||||||
|
int uu_portal_stream_position(struct uu_portal *p, int32_t *x, int32_t *y) {
|
||||||
|
if (!p || !p->has_position) return 11;
|
||||||
|
*x = p->position_x; *y = p->position_y;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
/* Mutter's monitors as "connector\twidth\theight\tx\ty\tprimary\n" lines: current mode in
|
||||||
|
* pixels, logical position. Returns the count, or -1 without Mutter (KDE, no session bus). */
|
||||||
|
int uu_portal_monitors(char *out, size_t length) {
|
||||||
|
if (!out || !length) return -1;
|
||||||
|
out[0] = 0;
|
||||||
|
GDBusConnection *bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
|
||||||
|
if (!bus) return -1;
|
||||||
|
GVariant *reply = g_dbus_connection_call_sync(bus, MUTTER_DISPLAY, MUTTER_DISPLAY_PATH, MUTTER_DISPLAY,
|
||||||
|
"GetCurrentState", NULL, G_VARIANT_TYPE("(ua((ssss)a(siiddada{sv})a{sv})a(iiduba(ssss)a{sv})a{sv})"),
|
||||||
|
G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
|
||||||
|
g_object_unref(bus);
|
||||||
|
if (!reply) return -1;
|
||||||
|
GVariant *monitors = g_variant_get_child_value(reply, 1), *logical = g_variant_get_child_value(reply, 2);
|
||||||
|
int count = 0; size_t used = 0;
|
||||||
|
for (gsize i = 0; i < g_variant_n_children(logical); i++) {
|
||||||
|
gint32 x, y; gdouble scale; guint32 transform; gboolean primary; GVariant *specs, *props;
|
||||||
|
g_variant_get_child(logical, i, "(iidub@a(ssss)@a{sv})", &x, &y, &scale, &transform, &primary, &specs, &props);
|
||||||
|
const gchar *connector = NULL;
|
||||||
|
if (g_variant_n_children(specs)) g_variant_get_child(specs, 0, "(&s&s&s&s)", &connector, NULL, NULL, NULL);
|
||||||
|
gint32 width = 0, height = 0;
|
||||||
|
for (gsize m = 0; connector && m < g_variant_n_children(monitors); m++) {
|
||||||
|
GVariant *monitor = g_variant_get_child_value(monitors, m), *spec = g_variant_get_child_value(monitor, 0),
|
||||||
|
*modes = g_variant_get_child_value(monitor, 1);
|
||||||
|
const gchar *name = NULL; g_variant_get_child(spec, 0, "&s", &name);
|
||||||
|
for (gsize k = 0; name && !strcmp(name, connector) && k < g_variant_n_children(modes); k++) {
|
||||||
|
GVariant *mode = g_variant_get_child_value(modes, k), *mode_props = g_variant_get_child_value(mode, 6);
|
||||||
|
gboolean current = FALSE;
|
||||||
|
if (g_variant_lookup(mode_props, "is-current", "b", ¤t) && current)
|
||||||
|
g_variant_get_child(mode, 1, "i", &width), g_variant_get_child(mode, 2, "i", &height);
|
||||||
|
g_variant_unref(mode_props); g_variant_unref(mode);
|
||||||
|
}
|
||||||
|
g_variant_unref(modes); g_variant_unref(spec); g_variant_unref(monitor);
|
||||||
|
}
|
||||||
|
if (transform % 2) { gint32 t = width; width = height; height = t; } /* 90/270, flipped or not */
|
||||||
|
if (connector && width > 0 && height > 0) {
|
||||||
|
int n = snprintf(out + used, length - used, "%s\t%d\t%d\t%d\t%d\t%d\n", connector, width, height, x, y, primary ? 1 : 0);
|
||||||
|
if (n > 0 && (size_t)n < length - used) { used += (size_t)n; count++; }
|
||||||
|
}
|
||||||
|
g_variant_unref(specs); g_variant_unref(props);
|
||||||
|
}
|
||||||
|
g_variant_unref(monitors); g_variant_unref(logical); g_variant_unref(reply);
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
/* End the compositor session now (screen-share indicator off) while the handle stays valid;
|
||||||
|
* captures then report a closed stream until the handle is replaced. */
|
||||||
|
void uu_portal_end(struct uu_portal *p) {
|
||||||
|
if (!p || atomic_exchange(&p->closed, 1)) return;
|
||||||
|
if (p->bus && p->session) {
|
||||||
|
GVariant *reply = g_dbus_connection_call_sync(p->bus, DEST, p->session, SESSION, "Close",
|
||||||
|
NULL, NULL, G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
|
||||||
|
if (reply) g_variant_unref(reply);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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,7 +27,20 @@ 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_monitors(char *out, size_t length);
|
||||||
|
void uu_portal_end(struct uu_portal *portal);
|
||||||
#endif
|
#endif
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
// 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;
|
||||||
|
/* 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;
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
@@ -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
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
@@ -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
@@ -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);
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
+56
-65
@@ -9,6 +9,8 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include "i18n.h"
|
||||||
|
#include "ui_theme.h"
|
||||||
|
|
||||||
#define QSIZE 64
|
#define QSIZE 64
|
||||||
static char queue[QSIZE][4096];
|
static char queue[QSIZE][4096];
|
||||||
@@ -45,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);
|
||||||
@@ -97,9 +90,9 @@ static void format_size(guint64 size, int kind, char *out, size_t len) {
|
|||||||
static void format_time(guint64 secs, char *out, size_t len) {
|
static void format_time(guint64 secs, char *out, size_t len) {
|
||||||
if (!secs) { snprintf(out, len, "--"); return; }
|
if (!secs) { snprintf(out, len, "--"); return; }
|
||||||
time_t t = (time_t)secs; struct tm tm; localtime_r(&t, &tm);
|
time_t t = (time_t)secs; struct tm tm; localtime_r(&t, &tm);
|
||||||
strftime(out, len, "%Y年%m月%d日", &tm);
|
strftime(out, len, L("%Y年%m月%d日", "%Y-%m-%d"), &tm);
|
||||||
}
|
}
|
||||||
static const char *kind_name(int kind) { return kind == 4 ? "文件" : kind == 3 ? "磁盘" : "文件夹"; }
|
static const char *kind_name(int kind) { return kind == 4 ? L("文件", "File") : kind == 3 ? L("磁盘", "Disk") : L("文件夹", "Folder"); }
|
||||||
|
|
||||||
/* ---------------- file transfer ---------------- */
|
/* ---------------- file transfer ---------------- */
|
||||||
enum { C_NAME, C_TIME, C_TYPE, C_SIZE, C_PATH, C_KIND, C_N };
|
enum { C_NAME, C_TIME, C_TYPE, C_SIZE, C_PATH, C_KIND, C_N };
|
||||||
@@ -111,7 +104,7 @@ static char local_dir[2048] = "", remote_dir[2048] = ":/";
|
|||||||
static void load_local(const char *path) {
|
static void load_local(const char *path) {
|
||||||
char *dir = g_strdup(path); /* path may alias local_dir */
|
char *dir = g_strdup(path); /* path may alias local_dir */
|
||||||
GDir *d = g_dir_open(dir, 0, NULL);
|
GDir *d = g_dir_open(dir, 0, NULL);
|
||||||
if (!d) { show_toast("无法打开本机目录"); g_free(dir); return; }
|
if (!d) { show_toast(L("无法打开本机目录", "Cannot open local folder")); g_free(dir); return; }
|
||||||
snprintf(local_dir, sizeof local_dir, "%s", dir); g_free(dir);
|
snprintf(local_dir, sizeof local_dir, "%s", dir); g_free(dir);
|
||||||
gtk_entry_set_text(GTK_ENTRY(local_path), local_dir);
|
gtk_entry_set_text(GTK_ENTRY(local_path), local_dir);
|
||||||
gtk_list_store_clear(local_store);
|
gtk_list_store_clear(local_store);
|
||||||
@@ -150,7 +143,7 @@ static void on_row_activated(GtkTreeView *view, GtkTreePath *path, GtkTreeViewCo
|
|||||||
g_free(full);
|
g_free(full);
|
||||||
}
|
}
|
||||||
static char *ask_name(const char *title) {
|
static char *ask_name(const char *title) {
|
||||||
GtkWidget *dlg = gtk_dialog_new_with_buttons(title, GTK_WINDOW(window), GTK_DIALOG_MODAL, "取消", GTK_RESPONSE_CANCEL, "确定", GTK_RESPONSE_OK, NULL);
|
GtkWidget *dlg = gtk_dialog_new_with_buttons(title, GTK_WINDOW(window), GTK_DIALOG_MODAL, L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("确定", "OK"), GTK_RESPONSE_OK, NULL);
|
||||||
GtkWidget *entry = gtk_entry_new(); gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
|
GtkWidget *entry = gtk_entry_new(); gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
|
||||||
gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_OK);
|
gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_OK);
|
||||||
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dlg)); gtk_container_set_border_width(GTK_CONTAINER(area), 16);
|
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dlg)); gtk_container_set_border_width(GTK_CONTAINER(area), 16);
|
||||||
@@ -158,21 +151,21 @@ static char *ask_name(const char *title) {
|
|||||||
char *name = NULL;
|
char *name = NULL;
|
||||||
if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK) {
|
if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK) {
|
||||||
const char *t = gtk_entry_get_text(GTK_ENTRY(entry));
|
const char *t = gtk_entry_get_text(GTK_ENTRY(entry));
|
||||||
if (*t && !strchr(t, '/') && strcmp(t, ".") && strcmp(t, "..")) name = g_strdup(t); else if (*t) show_toast("名称无效");
|
if (*t && !strchr(t, '/') && strcmp(t, ".") && strcmp(t, "..")) name = g_strdup(t); else if (*t) show_toast(L("名称无效", "Invalid name"));
|
||||||
}
|
}
|
||||||
gtk_widget_destroy(dlg);
|
gtk_widget_destroy(dlg);
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
static void on_local_mkdir(GtkButton *b, gpointer d) {
|
static void on_local_mkdir(GtkButton *b, gpointer d) {
|
||||||
(void)b; (void)d; char *name = ask_name("新建文件夹"); if (!name) return;
|
(void)b; (void)d; char *name = ask_name(L("新建文件夹", "New folder")); if (!name) return;
|
||||||
char *full = g_build_filename(local_dir, name, NULL);
|
char *full = g_build_filename(local_dir, name, NULL);
|
||||||
if (mkdir(full, 0755) != 0) show_toast("无法创建文件夹"); else load_local(local_dir);
|
if (mkdir(full, 0755) != 0) show_toast(L("无法创建文件夹", "Cannot create folder")); else load_local(local_dir);
|
||||||
g_free(full); g_free(name);
|
g_free(full); g_free(name);
|
||||||
}
|
}
|
||||||
static void on_remote_mkdir(GtkButton *b, gpointer d) {
|
static void on_remote_mkdir(GtkButton *b, gpointer d) {
|
||||||
(void)b; (void)d;
|
(void)b; (void)d;
|
||||||
if (!strcmp(remote_dir, ":/")) { show_toast("请先进入一个文件夹"); return; }
|
if (!strcmp(remote_dir, ":/")) { show_toast(L("请先进入一个文件夹", "Open a folder first")); return; }
|
||||||
char *name = ask_name("新建文件夹"); if (!name) return;
|
char *name = ask_name(L("新建文件夹", "New folder")); if (!name) return;
|
||||||
char *full = g_build_filename(remote_dir, name, NULL); char cmd[2200];
|
char *full = g_build_filename(remote_dir, name, NULL); char cmd[2200];
|
||||||
snprintf(cmd, sizeof cmd, "mkdir\t%s", full); push(cmd); g_free(full); g_free(name);
|
snprintf(cmd, sizeof cmd, "mkdir\t%s", full); push(cmd); g_free(full); g_free(name);
|
||||||
}
|
}
|
||||||
@@ -181,8 +174,8 @@ static void on_remote_mkdir(GtkButton *b, gpointer d) {
|
|||||||
static void on_send(GtkButton *b, gpointer upload) {
|
static void on_send(GtkButton *b, gpointer upload) {
|
||||||
(void)b; GtkTreeView *view = GTK_TREE_VIEW(upload ? local_view : remote_view);
|
(void)b; GtkTreeView *view = GTK_TREE_VIEW(upload ? local_view : remote_view);
|
||||||
GtkTreeModel *m; GList *rows = gtk_tree_selection_get_selected_rows(gtk_tree_view_get_selection(view), &m);
|
GtkTreeModel *m; GList *rows = gtk_tree_selection_get_selected_rows(gtk_tree_view_get_selection(view), &m);
|
||||||
if (!rows) { show_toast("请先选择要发送的文件"); return; }
|
if (!rows) { show_toast(L("请先选择要发送的文件", "Select the files to send first")); return; }
|
||||||
if (upload && !strcmp(remote_dir, ":/")) { show_toast("请先在远端进入目标文件夹"); g_list_free_full(rows, (GDestroyNotify)gtk_tree_path_free); return; }
|
if (upload && !strcmp(remote_dir, ":/")) { show_toast(L("请先在远端进入目标文件夹", "Open the destination folder on the remote side first")); g_list_free_full(rows, (GDestroyNotify)gtk_tree_path_free); return; }
|
||||||
int skipped = 0;
|
int skipped = 0;
|
||||||
for (GList *r = rows; r; r = r->next) {
|
for (GList *r = rows; r; r = r->next) {
|
||||||
GtkTreeIter it; char *full, *name; int kind;
|
GtkTreeIter it; char *full, *name; int kind;
|
||||||
@@ -199,7 +192,7 @@ static void on_send(GtkButton *b, gpointer upload) {
|
|||||||
g_free(full); g_free(name);
|
g_free(full); g_free(name);
|
||||||
}
|
}
|
||||||
g_list_free_full(rows, (GDestroyNotify)gtk_tree_path_free);
|
g_list_free_full(rows, (GDestroyNotify)gtk_tree_path_free);
|
||||||
if (skipped) show_toast(upload ? "暂不支持上传文件夹,已跳过" : "不能下载整个磁盘,已跳过");
|
if (skipped) show_toast(upload ? L("暂不支持上传文件夹,已跳过", "Uploading folders is not supported yet; skipped") : L("不能下载整个磁盘,已跳过", "Cannot download a whole disk; skipped"));
|
||||||
}
|
}
|
||||||
static void on_cancel_all(GtkButton *b, gpointer d) { (void)b; (void)d; push("cancel"); }
|
static void on_cancel_all(GtkButton *b, gpointer d) { (void)b; (void)d; push("cancel"); }
|
||||||
static void on_clear_done(GtkButton *b, gpointer d) {
|
static void on_clear_done(GtkButton *b, gpointer d) {
|
||||||
@@ -209,13 +202,13 @@ static void on_clear_done(GtkButton *b, gpointer d) {
|
|||||||
}
|
}
|
||||||
static GtkWidget *pane(int remote) {
|
static GtkWidget *pane(int remote) {
|
||||||
GtkWidget *card = vbox(6); add_class(card, "card");
|
GtkWidget *card = vbox(6); add_class(card, "card");
|
||||||
GtkWidget *bar = hbox(6), *up = button("↑", NULL), *refresh = button("刷新", NULL), *mk = button("新建文件夹", NULL), *path = gtk_entry_new();
|
GtkWidget *bar = hbox(6), *up = button("↑", NULL), *refresh = button(L("刷新", "Refresh"), NULL), *mk = button(L("新建文件夹", "New folder"), NULL), *path = gtk_entry_new();
|
||||||
gtk_widget_set_tooltip_text(up, "上一级"); gtk_widget_set_tooltip_text(refresh, "刷新");
|
gtk_widget_set_tooltip_text(up, L("上一级", "Up")); gtk_widget_set_tooltip_text(refresh, L("刷新", "Refresh"));
|
||||||
gtk_box_pack_start(GTK_BOX(bar), up, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(bar), refresh, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(bar), up, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(bar), refresh, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(bar), mk, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(bar), path, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(bar), mk, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(bar), path, TRUE, TRUE, 0);
|
||||||
GtkListStore *store = gtk_list_store_new(C_N, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
|
GtkListStore *store = gtk_list_store_new(C_N, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
|
||||||
GtkWidget *view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
|
GtkWidget *view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
|
||||||
add_column(view, "名称", C_NAME, 1); add_column(view, "修改日期", C_TIME, 0); add_column(view, "类型", C_TYPE, 0); add_column(view, "大小", C_SIZE, 0);
|
add_column(view, L("名称", "Name"), C_NAME, 1); add_column(view, L("修改日期", "Date modified"), C_TIME, 0); add_column(view, L("类型", "Type"), C_TYPE, 0); add_column(view, L("大小", "Size"), C_SIZE, 0);
|
||||||
gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)), GTK_SELECTION_MULTIPLE);
|
gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)), GTK_SELECTION_MULTIPLE);
|
||||||
g_signal_connect(view, "row-activated", G_CALLBACK(on_row_activated), GINT_TO_POINTER(remote));
|
g_signal_connect(view, "row-activated", G_CALLBACK(on_row_activated), GINT_TO_POINTER(remote));
|
||||||
g_signal_connect(up, "clicked", G_CALLBACK(remote ? on_remote_up : on_local_up), NULL);
|
g_signal_connect(up, "clicked", G_CALLBACK(remote ? on_remote_up : on_local_up), NULL);
|
||||||
@@ -229,13 +222,13 @@ static GtkWidget *pane(int remote) {
|
|||||||
return card;
|
return card;
|
||||||
}
|
}
|
||||||
static void build_files(void) {
|
static void build_files(void) {
|
||||||
GtkWidget *content; frame("文件传输", &content);
|
GtkWidget *content; frame(L("文件传输", "File transfer"), &content);
|
||||||
gtk_window_set_default_size(GTK_WINDOW(window), 1100, 760);
|
gtk_window_set_default_size(GTK_WINDOW(window), 1100, 760);
|
||||||
GtkWidget *head = gtk_grid_new(); gtk_grid_set_column_homogeneous(GTK_GRID(head), TRUE); gtk_grid_set_column_spacing(GTK_GRID(head), 24);
|
GtkWidget *head = gtk_grid_new(); gtk_grid_set_column_homogeneous(GTK_GRID(head), TRUE); gtk_grid_set_column_spacing(GTK_GRID(head), 24);
|
||||||
GtkWidget *left = hbox(10), *right = hbox(10);
|
GtkWidget *left = hbox(10), *right = hbox(10);
|
||||||
char host[256]; if (gethostname(host, sizeof host) != 0) snprintf(host, sizeof host, "本机"); host[sizeof host - 1] = 0;
|
char host[256]; if (gethostname(host, sizeof host) != 0) snprintf(host, sizeof host, L("本机", "This device")); host[sizeof host - 1] = 0;
|
||||||
GtkWidget *tag_l = label("本机", "tag"), *tag_r = label("远端", "tag"); add_class(tag_r, "remote");
|
GtkWidget *tag_l = label(L("本机", "This device"), "tag"), *tag_r = label(L("远端", "Remote"), "tag"); add_class(tag_r, "remote");
|
||||||
GtkWidget *send_r = button("发送 →", NULL), *send_l = button("← 发送", NULL);
|
GtkWidget *send_r = button(L("发送 →", "Send →"), NULL), *send_l = button(L("← 发送", "← Send"), NULL);
|
||||||
g_signal_connect(send_r, "clicked", G_CALLBACK(on_send), GINT_TO_POINTER(1));
|
g_signal_connect(send_r, "clicked", G_CALLBACK(on_send), GINT_TO_POINTER(1));
|
||||||
g_signal_connect(send_l, "clicked", G_CALLBACK(on_send), NULL);
|
g_signal_connect(send_l, "clicked", G_CALLBACK(on_send), NULL);
|
||||||
gtk_box_pack_start(GTK_BOX(left), label(host, "title"), FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(left), tag_l, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(left), label(host, "title"), FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(left), tag_l, FALSE, FALSE, 0);
|
||||||
@@ -247,25 +240,25 @@ static void build_files(void) {
|
|||||||
gtk_grid_set_row_spacing(GTK_GRID(head), 14);
|
gtk_grid_set_row_spacing(GTK_GRID(head), 14);
|
||||||
gtk_box_pack_start(GTK_BOX(content), head, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(content), head, TRUE, TRUE, 0);
|
||||||
GtkWidget *tasks = vbox(8); add_class(tasks, "card");
|
GtkWidget *tasks = vbox(8); add_class(tasks, "card");
|
||||||
GtkWidget *tbar = hbox(8), *cancel = button("全部取消", NULL), *clear = button("清除完结任务", NULL);
|
GtkWidget *tbar = hbox(8), *cancel = button(L("全部取消", "Cancel all"), NULL), *clear = button(L("清除完结任务", "Clear finished"), NULL);
|
||||||
g_signal_connect(cancel, "clicked", G_CALLBACK(on_cancel_all), NULL); g_signal_connect(clear, "clicked", G_CALLBACK(on_clear_done), NULL);
|
g_signal_connect(cancel, "clicked", G_CALLBACK(on_cancel_all), NULL); g_signal_connect(clear, "clicked", G_CALLBACK(on_clear_done), NULL);
|
||||||
gtk_box_pack_start(GTK_BOX(tbar), label("传输列表", "section"), FALSE, FALSE, 4);
|
gtk_box_pack_start(GTK_BOX(tbar), label(L("传输列表", "Transfers"), "section"), FALSE, FALSE, 4);
|
||||||
gtk_box_pack_end(GTK_BOX(tbar), clear, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(tbar), cancel, FALSE, FALSE, 0);
|
gtk_box_pack_end(GTK_BOX(tbar), clear, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(tbar), cancel, FALSE, FALSE, 0);
|
||||||
task_store = gtk_list_store_new(T_N, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
|
task_store = gtk_list_store_new(T_N, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
|
||||||
GtkWidget *tview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(task_store));
|
GtkWidget *tview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(task_store));
|
||||||
add_column(tview, "名称", T_NAME, 1); add_column(tview, "状态", T_STATUS, 0); add_column(tview, "大小", T_SIZE, 0);
|
add_column(tview, L("名称", "Name"), T_NAME, 1); add_column(tview, L("状态", "Status"), T_STATUS, 0); add_column(tview, L("大小", "Size"), T_SIZE, 0);
|
||||||
add_column(tview, "发送路径", T_FROM, 1); add_column(tview, "接收路径", T_TO, 1);
|
add_column(tview, L("发送路径", "From"), T_FROM, 1); add_column(tview, L("接收路径", "To"), T_TO, 1);
|
||||||
gtk_box_pack_start(GTK_BOX(tasks), tbar, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(tasks), scrolled(tview, 180), TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(tasks), tbar, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(tasks), scrolled(tview, 180), TRUE, TRUE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(content), tasks, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(content), tasks, TRUE, TRUE, 0);
|
||||||
const char *home = g_get_home_dir(); load_local(home ? home : "/");
|
const char *home = g_get_home_dir(); load_local(home ? home : "/");
|
||||||
gtk_entry_set_text(GTK_ENTRY(remote_path), "此电脑");
|
gtk_entry_set_text(GTK_ENTRY(remote_path), L("此电脑", "This PC"));
|
||||||
}
|
}
|
||||||
|
|
||||||
struct listing { char *path; char *rows; };
|
struct listing { char *path; char *rows; };
|
||||||
static gboolean remote_idle(gpointer d) {
|
static gboolean remote_idle(gpointer d) {
|
||||||
struct listing *l = d;
|
struct listing *l = d;
|
||||||
snprintf(remote_dir, sizeof remote_dir, "%s", l->path);
|
snprintf(remote_dir, sizeof remote_dir, "%s", l->path);
|
||||||
gtk_entry_set_text(GTK_ENTRY(remote_path), strcmp(remote_dir, ":/") ? remote_dir : "此电脑");
|
gtk_entry_set_text(GTK_ENTRY(remote_path), strcmp(remote_dir, ":/") ? remote_dir : L("此电脑", "This PC"));
|
||||||
gtk_list_store_clear(remote_store);
|
gtk_list_store_clear(remote_store);
|
||||||
char **lines = g_strsplit(l->rows, "\n", -1);
|
char **lines = g_strsplit(l->rows, "\n", -1);
|
||||||
for (char **line = lines; *line; line++) {
|
for (char **line = lines; *line; line++) {
|
||||||
@@ -312,10 +305,10 @@ static GtkListStore *rule_store;
|
|||||||
static GtkWidget *rule_stack;
|
static GtkWidget *rule_stack;
|
||||||
static void on_add_rule(GtkButton *b, gpointer d) {
|
static void on_add_rule(GtkButton *b, gpointer d) {
|
||||||
(void)b; (void)d;
|
(void)b; (void)d;
|
||||||
GtkWidget *dlg = gtk_dialog_new_with_buttons("添加映射规则", GTK_WINDOW(window), GTK_DIALOG_MODAL, "取消", GTK_RESPONSE_CANCEL, "保存后立即启用", GTK_RESPONSE_OK, NULL);
|
GtkWidget *dlg = gtk_dialog_new_with_buttons(L("添加映射规则", "Add mapping rule"), GTK_WINDOW(window), GTK_DIALOG_MODAL, L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("保存后立即启用", "Save and enable"), GTK_RESPONSE_OK, NULL);
|
||||||
GtkWidget *grid = gtk_grid_new(); gtk_grid_set_row_spacing(GTK_GRID(grid), 12); gtk_grid_set_column_spacing(GTK_GRID(grid), 24);
|
GtkWidget *grid = gtk_grid_new(); gtk_grid_set_row_spacing(GTK_GRID(grid), 12); gtk_grid_set_column_spacing(GTK_GRID(grid), 24);
|
||||||
gtk_container_set_border_width(GTK_CONTAINER(grid), 20);
|
gtk_container_set_border_width(GTK_CONTAINER(grid), 20);
|
||||||
const char *labels[] = {"名称", "本地端口", "目标地址", "目标端口"}, *hints[] = {"名称", "请输入端口", "", "请输入端口"};
|
const char *labels[] = {L("名称", "Name"), L("本地端口", "Local port"), L("目标地址", "Target address"), L("目标端口", "Target port")}, *hints[] = {L("名称", "Name"), L("请输入端口", "Enter port"), "", L("请输入端口", "Enter port")};
|
||||||
GtkWidget *entries[4];
|
GtkWidget *entries[4];
|
||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 4; i++) {
|
||||||
entries[i] = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(entries[i]), hints[i]); gtk_widget_set_hexpand(entries[i], TRUE);
|
entries[i] = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(entries[i]), hints[i]); gtk_widget_set_hexpand(entries[i], TRUE);
|
||||||
@@ -328,7 +321,7 @@ static void on_add_rule(GtkButton *b, gpointer d) {
|
|||||||
const char *name = gtk_entry_get_text(GTK_ENTRY(entries[0])), *host = gtk_entry_get_text(GTK_ENTRY(entries[2]));
|
const char *name = gtk_entry_get_text(GTK_ENTRY(entries[0])), *host = gtk_entry_get_text(GTK_ENTRY(entries[2]));
|
||||||
char *end; long local = strtol(gtk_entry_get_text(GTK_ENTRY(entries[1])), &end, 10); int bad_local = *end || local < 0 || local > 65535;
|
char *end; long local = strtol(gtk_entry_get_text(GTK_ENTRY(entries[1])), &end, 10); int bad_local = *end || local < 0 || local > 65535;
|
||||||
long port = strtol(gtk_entry_get_text(GTK_ENTRY(entries[3])), &end, 10); int bad_port = *end || port < 1 || port > 65535;
|
long port = strtol(gtk_entry_get_text(GTK_ENTRY(entries[3])), &end, 10); int bad_port = *end || port < 1 || port > 65535;
|
||||||
if (!*name || strchr(name, '\t') || !*host || strchr(host, '\t') || bad_local || bad_port) { show_toast("请填写名称、有效端口和目标地址"); continue; }
|
if (!*name || strchr(name, '\t') || !*host || strchr(host, '\t') || bad_local || bad_port) { show_toast(L("请填写名称、有效端口和目标地址", "Enter a name, valid ports and a target address")); continue; }
|
||||||
char cmd[1024]; snprintf(cmd, sizeof cmd, "add\t%s\t%ld\t%s\t%ld", name, local, host, port); push(cmd);
|
char cmd[1024]; snprintf(cmd, sizeof cmd, "add\t%s\t%ld\t%s\t%ld", name, local, host, port); push(cmd);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -336,27 +329,27 @@ static void on_add_rule(GtkButton *b, gpointer d) {
|
|||||||
}
|
}
|
||||||
static void on_remove_rule(GtkButton *b, gpointer view) {
|
static void on_remove_rule(GtkButton *b, gpointer view) {
|
||||||
(void)b; GtkTreeModel *m; GtkTreeIter it;
|
(void)b; GtkTreeModel *m; GtkTreeIter it;
|
||||||
if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(view), &m, &it)) { show_toast("请先选择一条规则"); return; }
|
if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(view), &m, &it)) { show_toast(L("请先选择一条规则", "Select a rule first")); return; }
|
||||||
int id; gtk_tree_model_get(m, &it, P_ID, &id, -1); char cmd[64]; snprintf(cmd, sizeof cmd, "remove\t%d", id); push(cmd);
|
int id; gtk_tree_model_get(m, &it, P_ID, &id, -1); char cmd[64]; snprintf(cmd, sizeof cmd, "remove\t%d", id); push(cmd);
|
||||||
}
|
}
|
||||||
static void build_portmap(void) {
|
static void build_portmap(void) {
|
||||||
GtkWidget *content; frame("端口映射", &content);
|
GtkWidget *content; frame(L("端口映射", "Port mapping"), &content);
|
||||||
gtk_window_set_default_size(GTK_WINDOW(window), 820, 560);
|
gtk_window_set_default_size(GTK_WINDOW(window), 820, 560);
|
||||||
GtkWidget *head = hbox(12), *add = button("添加规则", "primary"), *del = button("删除", NULL);
|
GtkWidget *head = hbox(12), *add = button(L("添加规则", "Add rule"), "primary"), *del = button(L("删除", "Remove"), NULL);
|
||||||
GtkWidget *dot = label("● 已连接", "online");
|
GtkWidget *dot = label(L("● 已连接", "● Connected"), "online");
|
||||||
gtk_box_pack_start(GTK_BOX(head), label(remote_name, "title"), FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(head), dot, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(head), label(remote_name, "title"), FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(head), dot, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_end(GTK_BOX(head), add, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(head), del, FALSE, FALSE, 0);
|
gtk_box_pack_end(GTK_BOX(head), add, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(head), del, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(content), head, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(content), head, FALSE, FALSE, 0);
|
||||||
rule_store = gtk_list_store_new(P_N, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
|
rule_store = gtk_list_store_new(P_N, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
|
||||||
GtkWidget *view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(rule_store));
|
GtkWidget *view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(rule_store));
|
||||||
add_column(view, "名称", P_NAME, 1); add_column(view, "本地地址", P_LOCAL, 0); add_column(view, "目标地址", P_TARGET, 1); add_column(view, "状态", P_STATUS, 0);
|
add_column(view, L("名称", "Name"), P_NAME, 1); add_column(view, L("本地地址", "Local address"), P_LOCAL, 0); add_column(view, L("目标地址", "Target address"), P_TARGET, 1); add_column(view, L("状态", "Status"), P_STATUS, 0);
|
||||||
rule_stack = gtk_stack_new();
|
rule_stack = gtk_stack_new();
|
||||||
GtkWidget *empty = label("当前没有端口映射规则,点击「添加规则」把远端端口映射到本机", "empty"); gtk_widget_set_halign(empty, GTK_ALIGN_CENTER);
|
GtkWidget *empty = label(L("当前没有端口映射规则,点击「添加规则」把远端端口映射到本机", "No port mapping rules. Click \"Add rule\" to map a remote port to this computer"), "empty"); gtk_widget_set_halign(empty, GTK_ALIGN_CENTER);
|
||||||
gtk_stack_add_named(GTK_STACK(rule_stack), empty, "empty");
|
gtk_stack_add_named(GTK_STACK(rule_stack), empty, "empty");
|
||||||
gtk_stack_add_named(GTK_STACK(rule_stack), scrolled(view, 360), "list");
|
gtk_stack_add_named(GTK_STACK(rule_stack), scrolled(view, 360), "list");
|
||||||
GtkWidget *card = vbox(0); add_class(card, "card"); gtk_box_pack_start(GTK_BOX(card), rule_stack, TRUE, TRUE, 0);
|
GtkWidget *card = vbox(0); add_class(card, "card"); gtk_box_pack_start(GTK_BOX(card), rule_stack, TRUE, TRUE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(content), card, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(content), card, TRUE, TRUE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(content), label("本地端口只监听 127.0.0.1;本地端口填 0 时自动分配。", "empty"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(content), label(L("本地端口只监听 127.0.0.1;本地端口填 0 时自动分配。", "Local ports listen on 127.0.0.1 only; enter 0 to pick a free port."), "empty"), FALSE, FALSE, 0);
|
||||||
g_signal_connect(add, "clicked", G_CALLBACK(on_add_rule), NULL);
|
g_signal_connect(add, "clicked", G_CALLBACK(on_add_rule), NULL);
|
||||||
g_signal_connect(del, "clicked", G_CALLBACK(on_remove_rule), view);
|
g_signal_connect(del, "clicked", G_CALLBACK(on_remove_rule), view);
|
||||||
}
|
}
|
||||||
@@ -394,36 +387,36 @@ static void on_open_session(GtkTreeView *v, GtkTreePath *path, GtkTreeViewColumn
|
|||||||
}
|
}
|
||||||
static void on_kill_session(GtkButton *b, gpointer d) {
|
static void on_kill_session(GtkButton *b, gpointer d) {
|
||||||
(void)b; (void)d; guint id = selected_session();
|
(void)b; (void)d; guint id = selected_session();
|
||||||
if (!id) { show_toast("请先选择一个会话"); return; }
|
if (!id) { show_toast(L("请先选择一个会话", "Select a session first")); return; }
|
||||||
GtkWidget *dlg = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
|
GtkWidget *dlg = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "确定结束会话 %u?", id);
|
GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, L("确定结束会话 %u?", "End session %u?"), id);
|
||||||
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dlg), "会话内正在运行的程序将被终止。");
|
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dlg), L("会话内正在运行的程序将被终止。", "Programs running in the session will be terminated."));
|
||||||
gtk_dialog_add_buttons(GTK_DIALOG(dlg), "取消", GTK_RESPONSE_CANCEL, "结束会话", GTK_RESPONSE_OK, NULL);
|
gtk_dialog_add_buttons(GTK_DIALOG(dlg), L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("结束会话", "End session"), GTK_RESPONSE_OK, NULL);
|
||||||
gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_CANCEL);
|
gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_CANCEL);
|
||||||
if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK) { char cmd[64]; snprintf(cmd, sizeof cmd, "kill\t%u", id); push(cmd); }
|
if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK) { char cmd[64]; snprintf(cmd, sizeof cmd, "kill\t%u", id); push(cmd); }
|
||||||
gtk_widget_destroy(dlg);
|
gtk_widget_destroy(dlg);
|
||||||
}
|
}
|
||||||
static void build_terminal(void) {
|
static void build_terminal(void) {
|
||||||
GtkWidget *content; frame("终端远控", &content); gtk_window_set_default_size(GTK_WINDOW(window), 820, 560);
|
GtkWidget *content; frame(L("终端远控", "Remote terminal"), &content); gtk_window_set_default_size(GTK_WINDOW(window), 820, 560);
|
||||||
GtkWidget *head = hbox(12); session_dot = label("● 正在读取会话", "online");
|
GtkWidget *head = hbox(12); session_dot = label(L("● 正在读取会话", "● Loading sessions"), "online");
|
||||||
session_create = button("创建会话", "primary"); session_kill = button("结束会话", NULL);
|
session_create = button(L("创建会话", "New session"), "primary"); session_kill = button(L("结束会话", "End session"), NULL);
|
||||||
gtk_box_pack_start(GTK_BOX(head), label(remote_name, "title"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(head), label(remote_name, "title"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(head), session_dot, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(head), session_dot, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_end(GTK_BOX(head), session_create, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(head), session_kill, FALSE, FALSE, 0);
|
gtk_box_pack_end(GTK_BOX(head), session_create, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(head), session_kill, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(content), head, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(content), head, FALSE, FALSE, 0);
|
||||||
session_store = gtk_list_store_new(S_N, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
|
session_store = gtk_list_store_new(S_N, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
|
||||||
session_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(session_store));
|
session_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(session_store));
|
||||||
add_column(session_view, "会话 ID", S_ID, 0); add_column(session_view, "Shell", S_SHELL, 1);
|
add_column(session_view, L("会话 ID", "Session ID"), S_ID, 0); add_column(session_view, "Shell", S_SHELL, 1);
|
||||||
add_column(session_view, "创建时间", S_TIME, 0); add_column(session_view, "状态", S_STATE, 0);
|
add_column(session_view, L("创建时间", "Created"), S_TIME, 0); add_column(session_view, L("状态", "Status"), S_STATE, 0);
|
||||||
session_stack = gtk_stack_new();
|
session_stack = gtk_stack_new();
|
||||||
GtkWidget *empty = label("当前无正在运行的终端会话", "empty"); gtk_widget_set_halign(empty, GTK_ALIGN_CENTER);
|
GtkWidget *empty = label(L("当前无正在运行的终端会话", "No running terminal sessions"), "empty"); gtk_widget_set_halign(empty, GTK_ALIGN_CENTER);
|
||||||
gtk_stack_add_named(GTK_STACK(session_stack), empty, "empty");
|
gtk_stack_add_named(GTK_STACK(session_stack), empty, "empty");
|
||||||
gtk_stack_add_named(GTK_STACK(session_stack), label("正在读取会话…", "empty"), "loading");
|
gtk_stack_add_named(GTK_STACK(session_stack), label(L("正在读取会话…", "Loading sessions…"), "empty"), "loading");
|
||||||
gtk_stack_add_named(GTK_STACK(session_stack), label("连接已断开,请关闭窗口后重试", "empty"), "offline");
|
gtk_stack_add_named(GTK_STACK(session_stack), label(L("连接已断开,请关闭窗口后重试", "Disconnected. Close the window and try again"), "empty"), "offline");
|
||||||
gtk_stack_add_named(GTK_STACK(session_stack), scrolled(session_view, 360), "list");
|
gtk_stack_add_named(GTK_STACK(session_stack), scrolled(session_view, 360), "list");
|
||||||
gtk_stack_set_visible_child_name(GTK_STACK(session_stack), "loading");
|
gtk_stack_set_visible_child_name(GTK_STACK(session_stack), "loading");
|
||||||
gtk_box_pack_start(GTK_BOX(content), session_stack, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(content), session_stack, TRUE, TRUE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(content), label("双击接回会话;创建会话将在本机终端程序中打开。", "empty"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(content), label(L("双击接回会话;创建会话将在本机终端程序中打开。", "Double-click to reattach; new sessions open in a local terminal."), "empty"), FALSE, FALSE, 0);
|
||||||
gtk_widget_set_sensitive(session_create, FALSE); gtk_widget_set_sensitive(session_kill, FALSE);
|
gtk_widget_set_sensitive(session_create, FALSE); gtk_widget_set_sensitive(session_kill, FALSE);
|
||||||
g_signal_connect(session_create, "clicked", G_CALLBACK(on_create_session), NULL);
|
g_signal_connect(session_create, "clicked", G_CALLBACK(on_create_session), NULL);
|
||||||
g_signal_connect(session_kill, "clicked", G_CALLBACK(on_kill_session), NULL);
|
g_signal_connect(session_kill, "clicked", G_CALLBACK(on_kill_session), NULL);
|
||||||
@@ -449,7 +442,7 @@ static gboolean sessions_idle(gpointer d) {
|
|||||||
g_strfreev(f);
|
g_strfreev(f);
|
||||||
}
|
}
|
||||||
g_strfreev(lines);
|
g_strfreev(lines);
|
||||||
gtk_label_set_text(GTK_LABEL(session_dot), s->connected ? "● 已连接" : "● 已断开");
|
gtk_label_set_text(GTK_LABEL(session_dot), s->connected ? L("● 已连接", "● Connected") : L("● 已断开", "● Disconnected"));
|
||||||
gtk_widget_set_sensitive(session_create, s->connected); gtk_widget_set_sensitive(session_kill, s->connected);
|
gtk_widget_set_sensitive(session_create, s->connected); gtk_widget_set_sensitive(session_kill, s->connected);
|
||||||
gtk_widget_set_sensitive(session_view, s->connected);
|
gtk_widget_set_sensitive(session_view, s->connected);
|
||||||
gtk_stack_set_visible_child_name(GTK_STACK(session_stack), s->connected ? (n ? "list" : "empty") : "offline");
|
gtk_stack_set_visible_child_name(GTK_STACK(session_stack), s->connected ? (n ? "list" : "empty") : "offline");
|
||||||
@@ -475,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. */
|
||||||
|
|||||||
+223
-160
@@ -9,47 +9,36 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
#include <sys/stat.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; } 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];
|
||||||
static int device_count;
|
static int device_count;
|
||||||
static char queue[16][200];
|
static char queue[16][200];
|
||||||
@@ -93,7 +82,7 @@ static GtkWidget *platform_icon(int platform, int online) {
|
|||||||
}
|
}
|
||||||
static gboolean hide_toast(gpointer d) { (void)d; gtk_widget_hide(toast); return G_SOURCE_REMOVE; }
|
static gboolean hide_toast(gpointer d) { (void)d; gtk_widget_hide(toast); return G_SOURCE_REMOVE; }
|
||||||
static void show_toast(const char *text) { gtk_label_set_text(GTK_LABEL(toast), text); gtk_widget_show(toast); g_timeout_add(3500, hide_toast, NULL); }
|
static void show_toast(const char *text) { gtk_label_set_text(GTK_LABEL(toast), text); gtk_widget_show(toast); g_timeout_add(3500, hide_toast, NULL); }
|
||||||
static void unsupported(GtkButton *b, gpointer what) { (void)b; char t[128]; snprintf(t, sizeof t, "%s:暂未支持", (const char *)what); show_toast(t); }
|
static void unsupported(GtkButton *b, gpointer what) { (void)b; char t[128]; snprintf(t, sizeof t, L("%s:暂未支持", "%s: not supported yet"), (const char *)what); show_toast(t); }
|
||||||
|
|
||||||
static void connect_kind(const char *kind) {
|
static void connect_kind(const char *kind) {
|
||||||
if (selected < 0) return;
|
if (selected < 0) return;
|
||||||
@@ -102,7 +91,7 @@ static void connect_kind(const char *kind) {
|
|||||||
snprintf(cmd, sizeof cmd, "connect\t%s\t%s", devices[selected].id, kind);
|
snprintf(cmd, sizeof cmd, "connect\t%s\t%s", devices[selected].id, kind);
|
||||||
pthread_mutex_unlock(&d_lock);
|
pthread_mutex_unlock(&d_lock);
|
||||||
push(cmd);
|
push(cmd);
|
||||||
if (!strcmp(kind, "desktop") || !strcmp(kind, "watch")) show_toast("正在连接…");
|
if (!strcmp(kind, "desktop") || !strcmp(kind, "watch")) show_toast(L("正在连接…", "Connecting…"));
|
||||||
}
|
}
|
||||||
static void on_tool(GtkButton *b, gpointer kind);
|
static void on_tool(GtkButton *b, gpointer kind);
|
||||||
static void more_item(GtkButton *b, gpointer kind) {
|
static void more_item(GtkButton *b, gpointer kind) {
|
||||||
@@ -110,32 +99,32 @@ static void more_item(GtkButton *b, gpointer kind) {
|
|||||||
const char *k = kind;
|
const char *k = kind;
|
||||||
if (!strcmp(k, "reboot") || !strcmp(k, "shutdown")) {
|
if (!strcmp(k, "reboot") || !strcmp(k, "shutdown")) {
|
||||||
GtkWidget *d = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
|
GtkWidget *d = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
|
||||||
!strcmp(k, "reboot") ? "确定要重启被控电脑吗?" : "确定要关闭被控电脑吗?");
|
!strcmp(k, "reboot") ? L("确定要重启被控电脑吗?", "Restart the remote computer?") : L("确定要关闭被控电脑吗?", "Shut down the remote computer?"));
|
||||||
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), "远程会话会断开。");
|
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), L("远程会话会断开。", "The remote session will be disconnected."));
|
||||||
gtk_dialog_add_buttons(GTK_DIALOG(d), "取消", GTK_RESPONSE_CANCEL, "确认", GTK_RESPONSE_OK, NULL);
|
gtk_dialog_add_buttons(GTK_DIALOG(d), L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("确认", "Confirm"), GTK_RESPONSE_OK, NULL);
|
||||||
int ok = gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK; gtk_widget_destroy(d);
|
int ok = gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK; gtk_widget_destroy(d);
|
||||||
if (ok) { connect_kind(k); show_toast("正在发送电源指令…"); }
|
if (ok) { connect_kind(k); show_toast(L("正在发送电源指令…", "Sending power command…")); }
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!strcmp(k, "unbind")) {
|
if (!strcmp(k, "unbind")) {
|
||||||
GtkWidget *d = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
|
GtkWidget *d = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
|
||||||
"确定要从账号中删除该设备吗?");
|
L("确定要从账号中删除该设备吗?", "Remove this device from your account?"));
|
||||||
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), "删除后需要在该设备上重新登录才能再次远控。");
|
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), L("删除后需要在该设备上重新登录才能再次远控。", "After removal you must sign in on that device again before you can control it."));
|
||||||
gtk_dialog_add_buttons(GTK_DIALOG(d), "取消", GTK_RESPONSE_CANCEL, "删除", GTK_RESPONSE_OK, NULL);
|
gtk_dialog_add_buttons(GTK_DIALOG(d), L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("删除", "Remove"), GTK_RESPONSE_OK, NULL);
|
||||||
int ok = gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK; gtk_widget_destroy(d);
|
int ok = gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK; gtk_widget_destroy(d);
|
||||||
if (ok) { gtk_widget_destroy(dialog); connect_kind(k); show_toast("正在删除设备…"); }
|
if (ok) { gtk_widget_destroy(dialog); connect_kind(k); show_toast(L("正在删除设备…", "Removing device…")); }
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
gtk_widget_destroy(dialog);
|
gtk_widget_destroy(dialog);
|
||||||
on_tool(NULL, kind);
|
on_tool(NULL, kind);
|
||||||
}
|
}
|
||||||
static void open_more(void) {
|
static void open_more(void) {
|
||||||
GtkWidget *dialog = gtk_dialog_new_with_buttons("更多工具", GTK_WINDOW(window), GTK_DIALOG_MODAL, NULL, NULL);
|
GtkWidget *dialog = gtk_dialog_new_with_buttons(L("更多工具", "More tools"), GTK_WINDOW(window), GTK_DIALOG_MODAL, NULL, NULL);
|
||||||
gtk_window_set_default_size(GTK_WINDOW(dialog), 520, -1);
|
gtk_window_set_default_size(GTK_WINDOW(dialog), 520, -1);
|
||||||
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("更多工具", "h2"), FALSE, FALSE, 6);
|
gtk_box_pack_start(GTK_BOX(box), label(L("更多工具", "More tools"), "h2"), FALSE, FALSE, 6);
|
||||||
const char *names[] = {"🗂 文件传输", "▶ 观看模式", "⌨ 终端", "⇄ 端口映射", "⏻ 远程开机", "↻ 重启", "⏻ 关机", "🗑 删除设备"};
|
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 *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");
|
||||||
@@ -146,8 +135,8 @@ static void open_more(void) {
|
|||||||
else g_signal_connect(b, "clicked", G_CALLBACK(more_item), (gpointer)kinds[i]);
|
else g_signal_connect(b, "clicked", G_CALLBACK(more_item), (gpointer)kinds[i]);
|
||||||
gtk_box_pack_start(GTK_BOX(box), b, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(box), b, FALSE, FALSE, 0);
|
||||||
}
|
}
|
||||||
GtkWidget *foot = hbox(10), *order = button("调整顺序", "secondary"), *close = button("关闭", "secondary");
|
GtkWidget *foot = hbox(10), *order = button(L("调整顺序", "Reorder"), "secondary"), *close = button(L("关闭", "Close"), "secondary");
|
||||||
g_signal_connect(order, "clicked", G_CALLBACK(unsupported), "调整顺序");
|
g_signal_connect(order, "clicked", G_CALLBACK(unsupported), L("调整顺序", "Reorder"));
|
||||||
g_signal_connect_swapped(close, "clicked", G_CALLBACK(gtk_widget_destroy), dialog);
|
g_signal_connect_swapped(close, "clicked", G_CALLBACK(gtk_widget_destroy), dialog);
|
||||||
gtk_box_pack_start(GTK_BOX(foot), order, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(foot), close, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(foot), order, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(foot), close, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(box), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 8);
|
gtk_box_pack_start(GTK_BOX(box), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 8);
|
||||||
@@ -159,10 +148,10 @@ static void on_tool(GtkButton *b, gpointer kind) {
|
|||||||
(void)b;
|
(void)b;
|
||||||
if (!strcmp(kind, "more")) open_more();
|
if (!strcmp(kind, "more")) open_more();
|
||||||
else if (!strcmp(kind, "wol") || !strcmp(kind, "reboot") || !strcmp(kind, "shutdown"))
|
else if (!strcmp(kind, "wol") || !strcmp(kind, "reboot") || !strcmp(kind, "shutdown"))
|
||||||
unsupported(NULL, (gpointer)(!strcmp(kind, "wol") ? "远程开机" : !strcmp(kind, "reboot") ? "重启" : "关机"));
|
unsupported(NULL, (gpointer)(!strcmp(kind, "wol") ? L("远程开机", "Wake on LAN") : !strcmp(kind, "reboot") ? L("重启", "Restart") : L("关机", "Shut down")));
|
||||||
else connect_kind(kind);
|
else connect_kind(kind);
|
||||||
}
|
}
|
||||||
static void on_login(GtkButton *b, gpointer d) { (void)b; (void)d; push("login"); gtk_stack_set_visible_child_name(GTK_STACK(stack), "login"); gtk_label_set_text(GTK_LABEL(title_label), "登录"); }
|
static void on_login(GtkButton *b, gpointer d) { (void)b; (void)d; push("login"); gtk_stack_set_visible_child_name(GTK_STACK(stack), "login"); gtk_label_set_text(GTK_LABEL(title_label), L("登录", "Sign in")); }
|
||||||
|
|
||||||
static void set_header(const char *title, int device_page) {
|
static void set_header(const char *title, int device_page) {
|
||||||
gtk_label_set_text(GTK_LABEL(title_label), title);
|
gtk_label_set_text(GTK_LABEL(title_label), title);
|
||||||
@@ -170,19 +159,52 @@ static void set_header(const char *title, int device_page) {
|
|||||||
}
|
}
|
||||||
static void show_page(const char *name, const char *title) {
|
static void show_page(const char *name, const char *title) {
|
||||||
int need_login = strcmp(name, "assist") && strcmp(name, "login");
|
int need_login = strcmp(name, "assist") && strcmp(name, "login");
|
||||||
if (!logged_in && need_login) { set_header("全部设备", 0); gtk_stack_set_visible_child_name(GTK_STACK(stack), "welcome"); return; }
|
if (!logged_in && need_login) { set_header(L("全部设备", "All devices"), 0); gtk_stack_set_visible_child_name(GTK_STACK(stack), "welcome"); return; }
|
||||||
set_header(title, 0);
|
set_header(title, 0);
|
||||||
gtk_stack_set_visible_child_name(GTK_STACK(stack), name);
|
gtk_stack_set_visible_child_name(GTK_STACK(stack), name);
|
||||||
}
|
}
|
||||||
|
// ---- device preview: the last remote picture saved by the desktop window (src/viewer/thumbs.rs) ----
|
||||||
|
static GtkWidget *preview_bg;
|
||||||
|
static GdkPixbuf *thumb_pixbuf;
|
||||||
|
static char thumb_loaded[512];
|
||||||
|
static gint64 thumb_mtime;
|
||||||
|
static void load_thumb(const char *path) {
|
||||||
|
struct stat st; gint64 mtime = path[0] && stat(path, &st) == 0 ? (gint64)st.st_mtime : 0;
|
||||||
|
if (!strcmp(path, thumb_loaded) && mtime == thumb_mtime) return;
|
||||||
|
if (thumb_pixbuf) { g_object_unref(thumb_pixbuf); thumb_pixbuf = NULL; }
|
||||||
|
snprintf(thumb_loaded, sizeof thumb_loaded, "%s", path); thumb_mtime = mtime;
|
||||||
|
if (mtime) thumb_pixbuf = gdk_pixbuf_new_from_file(path, NULL);
|
||||||
|
if (preview_bg) gtk_widget_queue_draw(preview_bg);
|
||||||
|
}
|
||||||
|
static gboolean draw_preview(GtkWidget *w, cairo_t *cr, gpointer d) {
|
||||||
|
(void)d; if (!thumb_pixbuf) return FALSE;
|
||||||
|
double W = gtk_widget_get_allocated_width(w), H = gtk_widget_get_allocated_height(w), r = 12;
|
||||||
|
double pw = gdk_pixbuf_get_width(thumb_pixbuf), ph = gdk_pixbuf_get_height(thumb_pixbuf);
|
||||||
|
double scale = W / pw > H / ph ? W / pw : H / ph; // cover, centered
|
||||||
|
cairo_save(cr);
|
||||||
|
cairo_new_path(cr); cairo_arc(cr, r, r, r, G_PI, 1.5 * G_PI); cairo_arc(cr, W - r, r, r, 1.5 * G_PI, 2 * G_PI);
|
||||||
|
cairo_line_to(cr, W, H); cairo_line_to(cr, 0, H); cairo_close_path(cr); cairo_clip(cr);
|
||||||
|
cairo_translate(cr, (W - pw * scale) / 2, (H - ph * scale) / 2); cairo_scale(cr, scale, scale);
|
||||||
|
gdk_cairo_set_source_pixbuf(cr, thumb_pixbuf, 0, 0);
|
||||||
|
cairo_pattern_set_filter(cairo_get_source(cr), CAIRO_FILTER_GOOD); cairo_paint(cr);
|
||||||
|
cairo_restore(cr);
|
||||||
|
// Soft shade at the bottom keeps the "Open desktop" button readable on bright desktops.
|
||||||
|
cairo_pattern_t *g = cairo_pattern_create_linear(0, H * 0.55, 0, H);
|
||||||
|
cairo_pattern_add_color_stop_rgba(g, 0, 0, 0, 0, 0); cairo_pattern_add_color_stop_rgba(g, 1, 0, 0, 0, 0.35);
|
||||||
|
cairo_rectangle(cr, 0, 0, W, H); cairo_set_source(cr, g); cairo_fill(cr); cairo_pattern_destroy(g);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
static void show_device(int index) {
|
static void show_device(int index) {
|
||||||
pthread_mutex_lock(&d_lock);
|
pthread_mutex_lock(&d_lock);
|
||||||
if (index < 0 || index >= device_count) { pthread_mutex_unlock(&d_lock); return; }
|
if (index < 0 || index >= device_count) { pthread_mutex_unlock(&d_lock); return; }
|
||||||
selected = index;
|
selected = index;
|
||||||
char name[128]; snprintf(name, sizeof name, "%s", devices[index].name);
|
char name[128]; snprintf(name, sizeof name, "%s", devices[index].name);
|
||||||
int online = devices[index].online;
|
int online = devices[index].online;
|
||||||
|
char thumb[512]; snprintf(thumb, sizeof thumb, "%s", devices[index].thumb);
|
||||||
pthread_mutex_unlock(&d_lock);
|
pthread_mutex_unlock(&d_lock);
|
||||||
|
load_thumb(thumb);
|
||||||
set_header(name, 1);
|
set_header(name, 1);
|
||||||
gtk_label_set_markup(GTK_LABEL(badge), online ? "<span foreground='#22c55e'>●</span> 在线" : "离线");
|
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");
|
||||||
@@ -194,9 +216,9 @@ static void on_row(GtkListBox *box, GtkListBoxRow *row, gpointer d) {
|
|||||||
gtk_list_box_unselect_all(GTK_LIST_BOX(box == GTK_LIST_BOX(device_list) ? assist_list : device_list));
|
gtk_list_box_unselect_all(GTK_LIST_BOX(box == GTK_LIST_BOX(device_list) ? assist_list : device_list));
|
||||||
const char *kind = g_object_get_data(G_OBJECT(row), "kind");
|
const char *kind = g_object_get_data(G_OBJECT(row), "kind");
|
||||||
if (!kind) { show_device(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(row), "index"))); return; }
|
if (!kind) { show_device(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(row), "index"))); return; }
|
||||||
if (!strcmp(kind, "all")) show_page("all", "全部设备");
|
if (!strcmp(kind, "all")) show_page("all", L("全部设备", "All devices"));
|
||||||
else if (!strcmp(kind, "assist")) show_page("assist", "远程协助");
|
else if (!strcmp(kind, "assist")) show_page("assist", L("远程协助", "Remote assistance"));
|
||||||
else if (!strcmp(kind, "favorite")) show_page("favorite", "收藏设备");
|
else if (!strcmp(kind, "favorite")) show_page("favorite", L("收藏设备", "Favorites"));
|
||||||
}
|
}
|
||||||
static void on_card(GtkButton *b, gpointer index) { (void)b; show_device(GPOINTER_TO_INT(index)); }
|
static void on_card(GtkButton *b, gpointer index) { (void)b; show_device(GPOINTER_TO_INT(index)); }
|
||||||
|
|
||||||
@@ -220,18 +242,18 @@ static void on_info(GtkButton *b, gpointer index) {
|
|||||||
int i = GPOINTER_TO_INT(index);
|
int i = GPOINTER_TO_INT(index);
|
||||||
char name[128] = "";
|
char name[128] = "";
|
||||||
pthread_mutex_lock(&d_lock); if (i >= 0 && i < device_count) snprintf(name, sizeof name, "%s", devices[i].name); pthread_mutex_unlock(&d_lock);
|
pthread_mutex_lock(&d_lock); if (i >= 0 && i < device_count) snprintf(name, sizeof name, "%s", devices[i].name); pthread_mutex_unlock(&d_lock);
|
||||||
GtkWidget *dialog = gtk_dialog_new_with_buttons("设备信息", GTK_WINDOW(window), GTK_DIALOG_MODAL, "完成", GTK_RESPONSE_OK, NULL);
|
GtkWidget *dialog = gtk_dialog_new_with_buttons(L("设备信息", "Device info"), GTK_WINDOW(window), GTK_DIALOG_MODAL, L("完成", "Done"), GTK_RESPONSE_OK, NULL);
|
||||||
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)), *box = vbox(12);
|
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)), *box = vbox(12);
|
||||||
gtk_container_set_border_width(GTK_CONTAINER(box), 20);
|
gtk_container_set_border_width(GTK_CONTAINER(box), 20);
|
||||||
GtkWidget *c1 = vbox(8); add_class(c1, "card");
|
GtkWidget *c1 = vbox(8); add_class(c1, "card");
|
||||||
GtkWidget *r = hbox(8); gtk_box_pack_start(GTK_BOX(r), label("名称", "devname"), TRUE, TRUE, 0); gtk_box_pack_end(GTK_BOX(r), label(name, "hint"), FALSE, FALSE, 0);
|
GtkWidget *r = hbox(8); gtk_box_pack_start(GTK_BOX(r), label(L("名称", "Name"), "devname"), TRUE, TRUE, 0); gtk_box_pack_end(GTK_BOX(r), label(name, "hint"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(c1), r, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(c1), r, FALSE, FALSE, 0);
|
||||||
GtkWidget *rename = button("重命名", "secondary"); gtk_widget_set_halign(rename, GTK_ALIGN_END);
|
GtkWidget *rename = button(L("重命名", "Rename"), "secondary"); gtk_widget_set_halign(rename, GTK_ALIGN_END);
|
||||||
g_signal_connect(rename, "clicked", G_CALLBACK(unsupported), "重命名");
|
g_signal_connect(rename, "clicked", G_CALLBACK(unsupported), L("重命名", "Rename"));
|
||||||
gtk_box_pack_start(GTK_BOX(c1), rename, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(c1), rename, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(box), c1, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(box), c1, FALSE, FALSE, 0);
|
||||||
GtkWidget *c2 = vbox(10); add_class(c2, "card");
|
GtkWidget *c2 = vbox(10); add_class(c2, "card");
|
||||||
const char *rows[] = {"处理器", "网卡", "总内存", "系统版本", "显卡"};
|
const char *rows[] = {L("处理器", "Processor"), L("网卡", "Network adapter"), L("总内存", "Total memory"), L("系统版本", "OS version"), L("显卡", "Graphics")};
|
||||||
for (int k = 0; k < 5; k++) {
|
for (int k = 0; k < 5; k++) {
|
||||||
GtkWidget *line = hbox(8);
|
GtkWidget *line = hbox(8);
|
||||||
gtk_box_pack_start(GTK_BOX(line), label(rows[k], "devname"), TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(line), label(rows[k], "devname"), TRUE, TRUE, 0);
|
||||||
@@ -239,7 +261,7 @@ static void on_info(GtkButton *b, gpointer index) {
|
|||||||
gtk_box_pack_start(GTK_BOX(c2), line, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(c2), line, FALSE, FALSE, 0);
|
||||||
}
|
}
|
||||||
gtk_box_pack_start(GTK_BOX(box), c2, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(box), c2, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(box), label("硬件信息暂未获取。", "hint"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(box), label(L("硬件信息暂未获取。", "Hardware info not available yet."), "hint"), FALSE, FALSE, 0);
|
||||||
gtk_container_add(GTK_CONTAINER(area), box);
|
gtk_container_add(GTK_CONTAINER(area), box);
|
||||||
gtk_widget_show_all(dialog); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog);
|
gtk_widget_show_all(dialog); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog);
|
||||||
}
|
}
|
||||||
@@ -249,8 +271,9 @@ static gboolean apply_devices(gpointer d) {
|
|||||||
(void)d;
|
(void)d;
|
||||||
clear(device_list); clear(all_box);
|
clear(device_list); clear(all_box);
|
||||||
pthread_mutex_lock(&d_lock);
|
pthread_mutex_lock(&d_lock);
|
||||||
|
if (selected >= 0 && selected < device_count) load_thumb(devices[selected].thumb);
|
||||||
if (!banner_closed) gtk_widget_show_all(banner);
|
if (!banner_closed) gtk_widget_show_all(banner);
|
||||||
char group[64]; snprintf(group, sizeof group, "⌄ 电脑 %d", device_count);
|
char group[64]; snprintf(group, sizeof group, L("⌄ 电脑 %d", "⌄ Computers %d"), device_count);
|
||||||
gtk_box_pack_start(GTK_BOX(all_box), label(group, "group"), FALSE, FALSE, 8);
|
gtk_box_pack_start(GTK_BOX(all_box), label(group, "group"), FALSE, FALSE, 8);
|
||||||
for (int i = 0; i < device_count; i++) {
|
for (int i = 0; i < device_count; i++) {
|
||||||
GtkWidget *row = gtk_list_box_row_new(), *line = hbox(8);
|
GtkWidget *row = gtk_list_box_row_new(), *line = hbox(8);
|
||||||
@@ -266,7 +289,7 @@ static gboolean apply_devices(gpointer d) {
|
|||||||
GtkWidget *card = hbox(12); add_class(card, "card");
|
GtkWidget *card = hbox(12); add_class(card, "card");
|
||||||
gtk_box_pack_start(GTK_BOX(card), platform_icon(devices[i].platform, 1), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(card), platform_icon(devices[i].platform, 1), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(card), label(devices[i].name, "devname"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(card), label(devices[i].name, "devname"), FALSE, FALSE, 0);
|
||||||
if (devices[i].current) gtk_box_pack_start(GTK_BOX(card), label("本机", "tag"), FALSE, FALSE, 0);
|
if (devices[i].current) gtk_box_pack_start(GTK_BOX(card), label(L("本机", "This device"), "tag"), FALSE, FALSE, 0);
|
||||||
GtkWidget *open = button("›", "hbtn"), *info = button("ⓘ", "hbtn");
|
GtkWidget *open = button("›", "hbtn"), *info = button("ⓘ", "hbtn");
|
||||||
g_signal_connect(info, "clicked", G_CALLBACK(on_info), GINT_TO_POINTER(i));
|
g_signal_connect(info, "clicked", G_CALLBACK(on_info), GINT_TO_POINTER(i));
|
||||||
if (!devices[i].current) { g_signal_connect(open, "clicked", G_CALLBACK(on_card), GINT_TO_POINTER(i)); gtk_box_pack_end(GTK_BOX(card), open, FALSE, FALSE, 0); }
|
if (!devices[i].current) { g_signal_connect(open, "clicked", G_CALLBACK(on_card), GINT_TO_POINTER(i)); gtk_box_pack_end(GTK_BOX(card), open, FALSE, FALSE, 0); }
|
||||||
@@ -275,12 +298,20 @@ 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("◼", "全部设备", "all"), -1);
|
gtk_list_box_insert(GTK_LIST_BOX(device_list), nav_row("◼", 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;
|
||||||
}
|
}
|
||||||
|
static GtkWidget *account_who, *account_out;
|
||||||
|
/* The settings window is built once and kept; refresh its account card on every login change. */
|
||||||
|
static void refresh_account(void) {
|
||||||
|
if (!account_who) return;
|
||||||
|
gtk_label_set_text(GTK_LABEL(account_who), logged_in ? (user_text[0] ? user_text : L("已登录", "Signed in")) : L("未登录", "Not signed in"));
|
||||||
|
gtk_widget_set_sensitive(account_out, logged_in);
|
||||||
|
}
|
||||||
static gboolean apply_login(gpointer d) {
|
static gboolean apply_login(gpointer d) {
|
||||||
(void)d;
|
(void)d;
|
||||||
|
refresh_account();
|
||||||
gtk_label_set_text(GTK_LABEL(status_label), status_text);
|
gtk_label_set_text(GTK_LABEL(status_label), status_text);
|
||||||
if (qr_path[0]) {
|
if (qr_path[0]) {
|
||||||
GdkPixbuf *pix = gdk_pixbuf_new_from_file_at_size(qr_path, 240, 240, NULL);
|
GdkPixbuf *pix = gdk_pixbuf_new_from_file_at_size(qr_path, 240, 240, NULL);
|
||||||
@@ -288,9 +319,9 @@ static gboolean apply_login(gpointer d) {
|
|||||||
} else gtk_image_clear(GTK_IMAGE(qr_image));
|
} else gtk_image_clear(GTK_IMAGE(qr_image));
|
||||||
gtk_widget_set_visible(my_section, logged_in);
|
gtk_widget_set_visible(my_section, logged_in);
|
||||||
const char *page = gtk_stack_get_visible_child_name(GTK_STACK(stack));
|
const char *page = gtk_stack_get_visible_child_name(GTK_STACK(stack));
|
||||||
if (logged_in && (!strcmp(page, "login") || !strcmp(page, "welcome"))) show_page("all", "全部设备");
|
if (logged_in && (!strcmp(page, "login") || !strcmp(page, "welcome"))) show_page("all", L("全部设备", "All devices"));
|
||||||
if (!logged_in && strcmp(page, "login") && strcmp(page, "assist")) show_page("welcome", "全部设备");
|
if (!logged_in && strcmp(page, "login") && strcmp(page, "assist")) show_page("welcome", L("全部设备", "All devices"));
|
||||||
if (!logged_in && qr_path[0]) { gtk_stack_set_visible_child_name(GTK_STACK(stack), "login"); set_header("登录", 0); }
|
if (!logged_in && qr_path[0]) { gtk_stack_set_visible_child_name(GTK_STACK(stack), "login"); set_header(L("登录", "Sign in"), 0); }
|
||||||
return G_SOURCE_REMOVE;
|
return G_SOURCE_REMOVE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -299,28 +330,28 @@ static GtkWidget *build_welcome(void) {
|
|||||||
GtkWidget *page = vbox(22); gtk_widget_set_valign(page, GTK_ALIGN_CENTER); gtk_widget_set_halign(page, GTK_ALIGN_CENTER);
|
GtkWidget *page = vbox(22); gtk_widget_set_valign(page, GTK_ALIGN_CENTER); gtk_widget_set_halign(page, GTK_ALIGN_CENTER);
|
||||||
GtkWidget *art = gtk_event_box_new(); add_class(art, "preview"); gtk_widget_set_size_request(art, 520, 300);
|
GtkWidget *art = gtk_event_box_new(); add_class(art, "preview"); gtk_widget_set_size_request(art, 520, 300);
|
||||||
gtk_box_pack_start(GTK_BOX(page), art, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), art, FALSE, FALSE, 0);
|
||||||
GtkWidget *t = label("随时访问个人设备,可用于办公、游戏、文件传输。", "h2"); gtk_widget_set_halign(t, GTK_ALIGN_CENTER);
|
GtkWidget *t = label(L("随时访问个人设备,可用于办公、游戏、文件传输。", "Access your devices anytime for work, gaming and file transfer."), "h2"); gtk_widget_set_halign(t, GTK_ALIGN_CENTER);
|
||||||
gtk_box_pack_start(GTK_BOX(page), t, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), t, FALSE, FALSE, 0);
|
||||||
GtkWidget *b = button("立即登录", "primary"); gtk_widget_set_halign(b, GTK_ALIGN_CENTER);
|
GtkWidget *b = button(L("立即登录", "Sign in now"), "primary"); gtk_widget_set_halign(b, GTK_ALIGN_CENTER);
|
||||||
g_signal_connect(b, "clicked", G_CALLBACK(on_login), NULL);
|
g_signal_connect(b, "clicked", G_CALLBACK(on_login), NULL);
|
||||||
gtk_box_pack_start(GTK_BOX(page), b, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), b, FALSE, FALSE, 0);
|
||||||
return page;
|
return page;
|
||||||
}
|
}
|
||||||
static GtkWidget *build_login(void) {
|
static GtkWidget *build_login(void) {
|
||||||
GtkWidget *page = vbox(16); gtk_widget_set_valign(page, GTK_ALIGN_CENTER); gtk_widget_set_halign(page, GTK_ALIGN_CENTER);
|
GtkWidget *page = vbox(16); gtk_widget_set_valign(page, GTK_ALIGN_CENTER); gtk_widget_set_halign(page, GTK_ALIGN_CENTER);
|
||||||
GtkWidget *brand = label("UU 远程 Linux 控制端(非官方)", "h2"); gtk_widget_set_halign(brand, GTK_ALIGN_CENTER);
|
GtkWidget *brand = label(L("UU 远程 Linux 控制端(非官方)", "UU Remote Linux viewer (unofficial)"), "h2"); gtk_widget_set_halign(brand, GTK_ALIGN_CENTER);
|
||||||
GtkWidget *t = label("扫码登录", "group"); gtk_widget_set_halign(t, GTK_ALIGN_CENTER);
|
GtkWidget *t = label(L("扫码登录", "Scan to sign in"), "group"); gtk_widget_set_halign(t, GTK_ALIGN_CENTER);
|
||||||
gtk_box_pack_start(GTK_BOX(page), brand, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), brand, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(page), t, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), t, FALSE, FALSE, 0);
|
||||||
GtkWidget *box = vbox(0); add_class(box, "qrbox"); gtk_widget_set_halign(box, GTK_ALIGN_CENTER);
|
GtkWidget *box = vbox(0); add_class(box, "qrbox"); gtk_widget_set_halign(box, GTK_ALIGN_CENTER);
|
||||||
qr_image = gtk_image_new(); gtk_widget_set_size_request(qr_image, 240, 240);
|
qr_image = gtk_image_new(); gtk_widget_set_size_request(qr_image, 240, 240);
|
||||||
gtk_container_add(GTK_CONTAINER(box), qr_image);
|
gtk_container_add(GTK_CONTAINER(box), qr_image);
|
||||||
gtk_box_pack_start(GTK_BOX(page), box, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), box, FALSE, FALSE, 0);
|
||||||
GtkWidget *h = label("请使用网易 UU 远程 App 扫一扫\n可快速登录", "hint"); gtk_label_set_justify(GTK_LABEL(h), GTK_JUSTIFY_CENTER); gtk_widget_set_halign(h, GTK_ALIGN_CENTER);
|
GtkWidget *h = label(L("请使用网易 UU 远程 App 扫一扫\n可快速登录", "Scan with the NetEase UU Remote app\nto sign in quickly"), "hint"); gtk_label_set_justify(GTK_LABEL(h), GTK_JUSTIFY_CENTER); gtk_widget_set_halign(h, GTK_ALIGN_CENTER);
|
||||||
gtk_box_pack_start(GTK_BOX(page), h, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), h, FALSE, FALSE, 0);
|
||||||
status_label = label("", "status"); gtk_widget_set_halign(status_label, GTK_ALIGN_CENTER);
|
status_label = label("", "status"); gtk_widget_set_halign(status_label, GTK_ALIGN_CENTER);
|
||||||
gtk_box_pack_start(GTK_BOX(page), status_label, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), status_label, FALSE, FALSE, 0);
|
||||||
GtkWidget *again = button("刷新二维码", "secondary"); gtk_widget_set_halign(again, GTK_ALIGN_CENTER);
|
GtkWidget *again = button(L("刷新二维码", "Refresh QR code"), "secondary"); gtk_widget_set_halign(again, GTK_ALIGN_CENTER);
|
||||||
g_signal_connect(again, "clicked", G_CALLBACK(on_login), NULL);
|
g_signal_connect(again, "clicked", G_CALLBACK(on_login), NULL);
|
||||||
gtk_box_pack_start(GTK_BOX(page), again, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), again, FALSE, FALSE, 0);
|
||||||
return page;
|
return page;
|
||||||
@@ -328,14 +359,15 @@ static GtkWidget *build_login(void) {
|
|||||||
static GtkWidget *build_device(void) {
|
static GtkWidget *build_device(void) {
|
||||||
GtkWidget *page = vbox(0); gtk_container_set_border_width(GTK_CONTAINER(page), 26);
|
GtkWidget *page = vbox(0); gtk_container_set_border_width(GTK_CONTAINER(page), 26);
|
||||||
GtkWidget *preview = gtk_overlay_new(), *bg = gtk_event_box_new(); add_class(bg, "preview"); gtk_widget_set_size_request(bg, -1, 320);
|
GtkWidget *preview = gtk_overlay_new(), *bg = gtk_event_box_new(); add_class(bg, "preview"); gtk_widget_set_size_request(bg, -1, 320);
|
||||||
|
preview_bg = bg; g_signal_connect_after(bg, "draw", G_CALLBACK(draw_preview), NULL);
|
||||||
gtk_container_add(GTK_CONTAINER(preview), bg);
|
gtk_container_add(GTK_CONTAINER(preview), bg);
|
||||||
GtkWidget *enter = button("进入桌面 →", "enter");
|
GtkWidget *enter = button(L("进入桌面 →", "Open desktop →"), "enter");
|
||||||
gtk_widget_set_halign(enter, GTK_ALIGN_CENTER); gtk_widget_set_valign(enter, GTK_ALIGN_END); gtk_widget_set_margin_bottom(enter, 26);
|
gtk_widget_set_halign(enter, GTK_ALIGN_CENTER); gtk_widget_set_valign(enter, GTK_ALIGN_END); gtk_widget_set_margin_bottom(enter, 26);
|
||||||
g_signal_connect(enter, "clicked", G_CALLBACK(on_tool), "desktop");
|
g_signal_connect(enter, "clicked", G_CALLBACK(on_tool), "desktop");
|
||||||
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[] = {"🗂 文件传输", "▶ 观看模式", "⌨ 终端", "⇄ 端口映射", "▦"}, *kinds[] = {"file", "watch", "terminal", "portmap", "more"};
|
const char *names[] = {L("🗂 文件传输", "🗂 File transfer"), L("▶ 观看模式", "▶ Watch mode"), L("⌨ 终端", "⌨ Terminal"), L("⇄ 端口映射", "⇄ Port mapping"), "▦"}, *kinds[] = {"file", "watch", "terminal", "portmap", "more"};
|
||||||
for (int i = 0; i < 5; i++) {
|
for (int i = 0; i < 5; i++) {
|
||||||
GtkWidget *b = button(names[i], "tool");
|
GtkWidget *b = button(names[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]);
|
||||||
@@ -343,11 +375,11 @@ static GtkWidget *build_device(void) {
|
|||||||
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);
|
||||||
}
|
}
|
||||||
gtk_box_pack_start(GTK_BOX(page), tools, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), tools, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(page), label("快速启动", "h2"), FALSE, FALSE, 22);
|
gtk_box_pack_start(GTK_BOX(page), label(L("快速启动", "Quick launch"), "h2"), FALSE, FALSE, 22);
|
||||||
GtkWidget *quick = vbox(10); add_class(quick, "dashed");
|
GtkWidget *quick = vbox(10); add_class(quick, "dashed");
|
||||||
GtkWidget *add = button("+", "round"); gtk_widget_set_halign(add, GTK_ALIGN_CENTER);
|
GtkWidget *add = button("+", "round"); gtk_widget_set_halign(add, GTK_ALIGN_CENTER);
|
||||||
g_signal_connect(add, "clicked", G_CALLBACK(unsupported), "快速启动");
|
g_signal_connect(add, "clicked", G_CALLBACK(unsupported), L("快速启动", "Quick launch"));
|
||||||
GtkWidget *al = label("添加", "hint"); gtk_widget_set_halign(al, GTK_ALIGN_CENTER);
|
GtkWidget *al = label(L("添加", "Add"), "hint"); gtk_widget_set_halign(al, GTK_ALIGN_CENTER);
|
||||||
gtk_box_pack_start(GTK_BOX(quick), add, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(quick), al, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(quick), add, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(quick), al, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(page), quick, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), quick, FALSE, FALSE, 0);
|
||||||
return page;
|
return page;
|
||||||
@@ -357,8 +389,8 @@ static GtkWidget *build_all(void) {
|
|||||||
GtkWidget *page = vbox(8); gtk_container_set_border_width(GTK_CONTAINER(page), 26);
|
GtkWidget *page = vbox(8); gtk_container_set_border_width(GTK_CONTAINER(page), 26);
|
||||||
banner = hbox(10); add_class(banner, "banner");
|
banner = hbox(10); add_class(banner, "banner");
|
||||||
GtkWidget *text = vbox(4);
|
GtkWidget *text = vbox(4);
|
||||||
gtk_box_pack_start(GTK_BOX(text), label("ⓘ 添加你的其他设备", "group"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(text), label(L("ⓘ 添加你的其他设备", "ⓘ Add your other devices"), "group"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(text), label("在其他电脑上安装 UU 远程官方客户端或本项目主机端,登录同一账号后即可在这里远程访问。", "hint"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(text), label(L("在其他电脑上安装 UU 远程官方客户端或本项目主机端,登录同一账号后即可在这里远程访问。", "Install the official UU Remote client or this project's host on another computer and sign in with the same account to access it here."), "hint"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(banner), text, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(banner), text, TRUE, TRUE, 0);
|
||||||
GtkWidget *x = button("×", "hbtn"); gtk_widget_set_valign(x, GTK_ALIGN_START);
|
GtkWidget *x = button("×", "hbtn"); gtk_widget_set_valign(x, GTK_ALIGN_START);
|
||||||
g_signal_connect(x, "clicked", G_CALLBACK(close_banner), NULL);
|
g_signal_connect(x, "clicked", G_CALLBACK(close_banner), NULL);
|
||||||
@@ -372,51 +404,51 @@ static GtkWidget *build_all(void) {
|
|||||||
static void on_assist_connect(GtkButton *b, gpointer entry) {
|
static void on_assist_connect(GtkButton *b, gpointer entry) {
|
||||||
(void)b;
|
(void)b;
|
||||||
const char *id = gtk_entry_get_text(GTK_ENTRY(entry));
|
const char *id = gtk_entry_get_text(GTK_ENTRY(entry));
|
||||||
if (!id[0]) { show_toast("请输入伙伴的设备 ID"); return; }
|
if (!id[0]) { show_toast(L("请输入伙伴的设备 ID", "Enter your partner's device ID")); return; }
|
||||||
GtkWidget *code_entry = g_object_get_data(G_OBJECT(entry), "assist-code");
|
GtkWidget *code_entry = g_object_get_data(G_OBJECT(entry), "assist-code");
|
||||||
const char *code = gtk_entry_get_text(GTK_ENTRY(code_entry));
|
const char *code = gtk_entry_get_text(GTK_ENTRY(code_entry));
|
||||||
if (!code[0]) { show_toast("请输入伙伴的设备验证码"); return; }
|
if (!code[0]) { show_toast(L("请输入伙伴的设备验证码", "Enter your partner's verification code")); return; }
|
||||||
if (strpbrk(id, "\t\r\n") || strpbrk(code, "\t\r\n")) { show_toast("设备 ID 和验证码不能包含换行或制表符"); return; }
|
if (strpbrk(id, "\t\r\n") || strpbrk(code, "\t\r\n")) { show_toast(L("设备 ID 和验证码不能包含换行或制表符", "Device ID and code cannot contain line breaks or tabs")); return; }
|
||||||
char cmd[200];
|
char cmd[200];
|
||||||
int n = snprintf(cmd, sizeof cmd, "assist\t%s\t%s", id, code);
|
int n = snprintf(cmd, sizeof cmd, "assist\t%s\t%s", id, code);
|
||||||
if (n < 0 || (size_t)n >= sizeof cmd) { show_toast("设备 ID 或验证码过长"); return; }
|
if (n < 0 || (size_t)n >= sizeof cmd) { show_toast(L("设备 ID 或验证码过长", "Device ID or code is too long")); return; }
|
||||||
int accepted = push(cmd);
|
int accepted = push(cmd);
|
||||||
memset(cmd, 0, sizeof cmd);
|
memset(cmd, 0, sizeof cmd);
|
||||||
if (!accepted) { show_toast("连接请求过多,请稍后重试"); return; }
|
if (!accepted) { show_toast(L("连接请求过多,请稍后重试", "Too many connection requests, try again later")); return; }
|
||||||
gtk_entry_set_text(GTK_ENTRY(code_entry), "");
|
gtk_entry_set_text(GTK_ENTRY(code_entry), "");
|
||||||
show_toast("正在连接…");
|
show_toast(L("正在连接…", "Connecting…"));
|
||||||
}
|
}
|
||||||
static GtkWidget *build_assist(void) {
|
static GtkWidget *build_assist(void) {
|
||||||
GtkWidget *page = vbox(20); gtk_container_set_border_width(GTK_CONTAINER(page), 26);
|
GtkWidget *page = vbox(20); gtk_container_set_border_width(GTK_CONTAINER(page), 26);
|
||||||
GtkWidget *mine = vbox(14); add_class(mine, "card");
|
GtkWidget *mine = vbox(14); add_class(mine, "card");
|
||||||
GtkWidget *top = hbox(10); gtk_box_pack_start(GTK_BOX(top), label("本设备", "h2"), TRUE, TRUE, 0);
|
GtkWidget *top = hbox(10); gtk_box_pack_start(GTK_BOX(top), label(L("本设备", "This device"), "h2"), TRUE, TRUE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(top), label("允许他人远程协助", "devname"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(top), label(L("允许他人远程协助", "Allow remote assistance"), "devname"), FALSE, FALSE, 0);
|
||||||
GtkWidget *sw = gtk_switch_new(); gtk_widget_set_sensitive(sw, FALSE); gtk_box_pack_start(GTK_BOX(top), sw, FALSE, FALSE, 0);
|
GtkWidget *sw = gtk_switch_new(); gtk_widget_set_sensitive(sw, FALSE); gtk_box_pack_start(GTK_BOX(top), sw, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(mine), top, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(mine), top, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(mine), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(mine), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
|
||||||
GtkWidget *grid = hbox(40), *c1 = vbox(6), *c2 = vbox(6);
|
GtkWidget *grid = hbox(40), *c1 = vbox(6), *c2 = vbox(6);
|
||||||
gtk_box_pack_start(GTK_BOX(c1), label("本设备 ID", "devname"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(c1), label(L("本设备 ID", "This device's ID"), "devname"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(c1), label("— — —", "big"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(c1), label("— — —", "big"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(c2), label("验证方式:仅使用临时验证码", "devname"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(c2), label(L("验证方式:仅使用临时验证码", "Verification: temporary code only"), "devname"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(c2), label("—", "big"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(c2), label("—", "big"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(c2), label("每次远控结束刷新", "hint"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(c2), label(L("每次远控结束刷新", "Refreshed after every remote session"), "hint"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(grid), c1, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(grid), c2, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(grid), c1, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(grid), c2, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(mine), grid, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(mine), grid, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(mine), label("本机被协助由 uuremote-server 主机端提供(uuremote-server assist)。", "hint"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(mine), label(L("本机被协助由 uuremote-server 主机端提供(uuremote-server assist)。", "Assistance for this computer is provided by the uuremote-server host (uuremote-server assist)."), "hint"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(page), mine, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), mine, FALSE, FALSE, 0);
|
||||||
GtkWidget *peer = vbox(12); add_class(peer, "card");
|
GtkWidget *peer = vbox(12); add_class(peer, "card");
|
||||||
gtk_box_pack_start(GTK_BOX(peer), label("远控伙伴设备", "h2"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(peer), label(L("远控伙伴设备", "Control a partner's device"), "h2"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(peer), label("通过其他设备的【设备 ID】及【设备验证码】启动远程控制", "hint"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(peer), label(L("通过其他设备的【设备 ID】及【设备验证码】启动远程控制", "Start remote control with another device's [Device ID] and [Verification code]"), "hint"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(peer), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(peer), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(peer), label("伙伴的设备 ID", "devname"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(peer), label(L("伙伴的设备 ID", "Partner's device ID"), "devname"), FALSE, FALSE, 0);
|
||||||
GtkWidget *row = hbox(20), *entry = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(entry), "请输入设备 ID"); gtk_widget_set_size_request(entry, 320, -1);
|
GtkWidget *row = hbox(20), *entry = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(entry), L("请输入设备 ID", "Enter device ID")); gtk_widget_set_size_request(entry, 320, -1);
|
||||||
GtkWidget *code = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(code), "请输入设备验证码");
|
GtkWidget *code = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(code), L("请输入设备验证码", "Enter verification code"));
|
||||||
gtk_entry_set_visibility(GTK_ENTRY(code), FALSE);
|
gtk_entry_set_visibility(GTK_ENTRY(code), FALSE);
|
||||||
gtk_entry_set_input_purpose(GTK_ENTRY(code), GTK_INPUT_PURPOSE_PASSWORD);
|
gtk_entry_set_input_purpose(GTK_ENTRY(code), GTK_INPUT_PURPOSE_PASSWORD);
|
||||||
gtk_entry_set_max_length(GTK_ENTRY(entry), 64); gtk_entry_set_max_length(GTK_ENTRY(code), 64);
|
gtk_entry_set_max_length(GTK_ENTRY(entry), 64); gtk_entry_set_max_length(GTK_ENTRY(code), 64);
|
||||||
g_object_set_data(G_OBJECT(entry), "assist-code", code);
|
g_object_set_data(G_OBJECT(entry), "assist-code", code);
|
||||||
g_signal_connect(code, "activate", G_CALLBACK(on_assist_connect), entry);
|
g_signal_connect(code, "activate", G_CALLBACK(on_assist_connect), entry);
|
||||||
GtkWidget *go = button("连接", "primary"); g_signal_connect(go, "clicked", G_CALLBACK(on_assist_connect), entry);
|
GtkWidget *go = button(L("连接", "Connect"), "primary"); g_signal_connect(go, "clicked", G_CALLBACK(on_assist_connect), entry);
|
||||||
gtk_box_pack_start(GTK_BOX(row), entry, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(row), code, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(row), go, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(row), entry, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(row), code, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(row), go, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(peer), row, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(peer), row, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(page), peer, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), peer, FALSE, FALSE, 0);
|
||||||
@@ -424,10 +456,10 @@ static GtkWidget *build_assist(void) {
|
|||||||
}
|
}
|
||||||
static void on_add_favorite(GtkButton *b, gpointer d) {
|
static void on_add_favorite(GtkButton *b, gpointer d) {
|
||||||
(void)b; (void)d;
|
(void)b; (void)d;
|
||||||
GtkWidget *dialog = gtk_dialog_new_with_buttons("添加收藏设备", GTK_WINDOW(window), GTK_DIALOG_MODAL, "取消", GTK_RESPONSE_CANCEL, "添加", GTK_RESPONSE_OK, NULL);
|
GtkWidget *dialog = gtk_dialog_new_with_buttons(L("添加收藏设备", "Add favorite device"), GTK_WINDOW(window), GTK_DIALOG_MODAL, L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("添加", "Add"), GTK_RESPONSE_OK, NULL);
|
||||||
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)), *card = vbox(12); add_class(card, "card");
|
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)), *card = vbox(12); add_class(card, "card");
|
||||||
gtk_container_set_border_width(GTK_CONTAINER(area), 16);
|
gtk_container_set_border_width(GTK_CONTAINER(area), 16);
|
||||||
const char *names[] = {"伙伴的设备 ID", "设备验证码(可选)", "备注名称(可选)"}, *hints[] = {"请输入设备 ID", "请输入设备验证码", "请输入名称"};
|
const char *names[] = {L("伙伴的设备 ID", "Partner's device ID"), L("设备验证码(可选)", "Verification code (optional)"), L("备注名称(可选)", "Nickname (optional)")}, *hints[] = {L("请输入设备 ID", "Enter device ID"), L("请输入设备验证码", "Enter verification code"), L("请输入名称", "Enter a name")};
|
||||||
GtkWidget *first = NULL;
|
GtkWidget *first = NULL;
|
||||||
for (int i = 0; i < 3; i++) {
|
for (int i = 0; i < 3; i++) {
|
||||||
GtkWidget *line = hbox(20), *e = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(e), hints[i]); gtk_widget_set_size_request(e, 280, -1);
|
GtkWidget *line = hbox(20), *e = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(e), hints[i]); gtk_widget_set_size_request(e, 280, -1);
|
||||||
@@ -440,17 +472,17 @@ static void on_add_favorite(GtkButton *b, gpointer d) {
|
|||||||
int response = gtk_dialog_run(GTK_DIALOG(dialog));
|
int response = gtk_dialog_run(GTK_DIALOG(dialog));
|
||||||
int has_id = first && gtk_entry_get_text(GTK_ENTRY(first))[0];
|
int has_id = first && gtk_entry_get_text(GTK_ENTRY(first))[0];
|
||||||
gtk_widget_destroy(dialog);
|
gtk_widget_destroy(dialog);
|
||||||
if (response == GTK_RESPONSE_OK) show_toast(has_id ? "收藏设备:暂未支持" : "请输入伙伴的设备 ID");
|
if (response == GTK_RESPONSE_OK) show_toast(has_id ? L("收藏设备:暂未支持", "Favorite devices: not supported yet") : L("请输入伙伴的设备 ID", "Enter your partner's device ID"));
|
||||||
}
|
}
|
||||||
static GtkWidget *build_favorite(void) {
|
static GtkWidget *build_favorite(void) {
|
||||||
GtkWidget *page = vbox(10); gtk_container_set_border_width(GTK_CONTAINER(page), 26);
|
GtkWidget *page = vbox(10); gtk_container_set_border_width(GTK_CONTAINER(page), 26);
|
||||||
GtkWidget *add = button("添加收藏设备", "secondary"); gtk_widget_set_halign(add, GTK_ALIGN_END);
|
GtkWidget *add = button(L("添加收藏设备", "Add favorite device"), "secondary"); gtk_widget_set_halign(add, GTK_ALIGN_END);
|
||||||
g_signal_connect(add, "clicked", G_CALLBACK(on_add_favorite), NULL);
|
g_signal_connect(add, "clicked", G_CALLBACK(on_add_favorite), NULL);
|
||||||
gtk_box_pack_start(GTK_BOX(page), add, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(page), add, FALSE, FALSE, 0);
|
||||||
fav_stack = gtk_stack_new();
|
fav_stack = gtk_stack_new();
|
||||||
GtkWidget *empty = vbox(10); gtk_widget_set_valign(empty, GTK_ALIGN_CENTER);
|
GtkWidget *empty = vbox(10); gtk_widget_set_valign(empty, GTK_ALIGN_CENTER);
|
||||||
GtkWidget *box = label("📦", "big"); gtk_widget_set_halign(box, GTK_ALIGN_CENTER);
|
GtkWidget *box = label("📦", "big"); gtk_widget_set_halign(box, GTK_ALIGN_CENTER);
|
||||||
GtkWidget *t = label("暂无收藏", "devname"); gtk_widget_set_halign(t, GTK_ALIGN_CENTER);
|
GtkWidget *t = label(L("暂无收藏", "No favorites yet"), "devname"); gtk_widget_set_halign(t, GTK_ALIGN_CENTER);
|
||||||
gtk_box_pack_start(GTK_BOX(empty), box, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(empty), t, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(empty), box, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(empty), t, FALSE, FALSE, 0);
|
||||||
gtk_stack_add_named(GTK_STACK(fav_stack), empty, "empty");
|
gtk_stack_add_named(GTK_STACK(fav_stack), empty, "empty");
|
||||||
gtk_box_pack_start(GTK_BOX(page), fav_stack, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(page), fav_stack, TRUE, TRUE, 0);
|
||||||
@@ -478,7 +510,7 @@ static GtkWidget *settings_card(GtkWidget **rows, int n) {
|
|||||||
return card;
|
return card;
|
||||||
}
|
}
|
||||||
static GtkWidget *settings_page(void) { GtkWidget *p = vbox(14); gtk_container_set_border_width(GTK_CONTAINER(p), 22); return p; }
|
static GtkWidget *settings_page(void) { GtkWidget *p = vbox(14); gtk_container_set_border_width(GTK_CONTAINER(p), 22); return p; }
|
||||||
static GtkWidget *edit_button(const char *what) { GtkWidget *b = button("编辑", "secondary"); g_signal_connect(b, "clicked", G_CALLBACK(unsupported), (gpointer)what); return b; }
|
static GtkWidget *edit_button(const char *what) { GtkWidget *b = button(L("编辑", "Edit"), "secondary"); g_signal_connect(b, "clicked", G_CALLBACK(unsupported), (gpointer)what); return b; }
|
||||||
static gboolean settings_hidden(GtkWidget *w, GdkEvent *e, gpointer d) { (void)e; (void)d; gtk_widget_hide(w); return TRUE; }
|
static gboolean settings_hidden(GtkWidget *w, GdkEvent *e, gpointer d) { (void)e; (void)d; gtk_widget_hide(w); return TRUE; }
|
||||||
static gboolean settings_key(GtkWidget *w, GdkEventKey *e, gpointer d) { (void)d; if (e->keyval == GDK_KEY_Escape) { gtk_widget_hide(w); return TRUE; } return FALSE; }
|
static gboolean settings_key(GtkWidget *w, GdkEventKey *e, gpointer d) { (void)d; if (e->keyval == GDK_KEY_Escape) { gtk_widget_hide(w); return TRUE; } return FALSE; }
|
||||||
// Compositors such as Hyprland draw no title bar, so windows carry their own (with a close button).
|
// Compositors such as Hyprland draw no title bar, so windows carry their own (with a close button).
|
||||||
@@ -488,15 +520,31 @@ static void own_titlebar(GtkWidget *w, const char *title) {
|
|||||||
gtk_header_bar_set_show_close_button(GTK_HEADER_BAR(bar), TRUE);
|
gtk_header_bar_set_show_close_button(GTK_HEADER_BAR(bar), TRUE);
|
||||||
gtk_window_set_titlebar(GTK_WINDOW(w), bar);
|
gtk_window_set_titlebar(GTK_WINDOW(w), bar);
|
||||||
}
|
}
|
||||||
|
static atomic_int host_active;
|
||||||
|
static GtkWidget *host_switch;
|
||||||
|
static gboolean host_idle(gpointer d) { (void)d; if (host_switch) gtk_switch_set_active(GTK_SWITCH(host_switch), atomic_load(&host_active)); return G_SOURCE_REMOVE; }
|
||||||
|
void uu_viewer_ui_set_host(int active) { atomic_store(&host_active, active != 0); g_idle_add(host_idle, NULL); }
|
||||||
|
static void on_host(GObject *o, GParamSpec *p, gpointer d) {
|
||||||
|
(void)p; (void)d; int on = gtk_switch_get_active(GTK_SWITCH(o));
|
||||||
|
if (on != atomic_load(&host_active)) { atomic_store(&host_active, on); push(on ? "host\ton" : "host\toff"); }
|
||||||
|
}
|
||||||
|
static void on_language(GtkComboBox *c, gpointer d) {
|
||||||
|
(void)d; int english = gtk_combo_box_get_active(c) == 1;
|
||||||
|
if (english == uu_i18n_english()) return;
|
||||||
|
if (!uu_i18n_save(english)) show_toast(L("无法保存语言设置", "Could not save the language"));
|
||||||
|
else push("relaunch");
|
||||||
|
}
|
||||||
|
static void confirm_logout(void);
|
||||||
|
static void on_sign_out(GtkButton *b, gpointer d) { (void)b; (void)d; if (logged_in) confirm_logout(); }
|
||||||
static void open_settings(void) {
|
static void open_settings(void) {
|
||||||
if (settings_window) { gtk_window_present(GTK_WINDOW(settings_window)); return; }
|
if (settings_window) { refresh_account(); gtk_window_present(GTK_WINDOW(settings_window)); return; }
|
||||||
settings_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
settings_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
||||||
gtk_window_set_title(GTK_WINDOW(settings_window), "设置");
|
gtk_window_set_title(GTK_WINDOW(settings_window), L("设置", "Settings"));
|
||||||
gtk_window_set_transient_for(GTK_WINDOW(settings_window), GTK_WINDOW(window));
|
gtk_window_set_transient_for(GTK_WINDOW(settings_window), GTK_WINDOW(window));
|
||||||
gtk_window_set_default_size(GTK_WINDOW(settings_window), 680, 600);
|
gtk_window_set_default_size(GTK_WINDOW(settings_window), 680, 600);
|
||||||
g_signal_connect(settings_window, "delete-event", G_CALLBACK(settings_hidden), NULL);
|
g_signal_connect(settings_window, "delete-event", G_CALLBACK(settings_hidden), NULL);
|
||||||
g_signal_connect(settings_window, "key-press-event", G_CALLBACK(settings_key), NULL);
|
g_signal_connect(settings_window, "key-press-event", G_CALLBACK(settings_key), NULL);
|
||||||
own_titlebar(settings_window, "设置");
|
own_titlebar(settings_window, L("设置", "Settings"));
|
||||||
GtkWidget *root = vbox(0), *tabs = gtk_stack_new(), *switcher = gtk_stack_switcher_new();
|
GtkWidget *root = vbox(0), *tabs = gtk_stack_new(), *switcher = gtk_stack_switcher_new();
|
||||||
gtk_stack_switcher_set_stack(GTK_STACK_SWITCHER(switcher), GTK_STACK(tabs));
|
gtk_stack_switcher_set_stack(GTK_STACK_SWITCHER(switcher), GTK_STACK(tabs));
|
||||||
gtk_widget_set_halign(switcher, GTK_ALIGN_CENTER); gtk_widget_set_margin_top(switcher, 10); gtk_widget_set_margin_bottom(switcher, 6);
|
gtk_widget_set_halign(switcher, GTK_ALIGN_CENTER); gtk_widget_set_margin_top(switcher, 10); gtk_widget_set_margin_bottom(switcher, 6);
|
||||||
@@ -504,60 +552,77 @@ static void open_settings(void) {
|
|||||||
gtk_box_pack_start(GTK_BOX(root), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(root), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
|
||||||
// 常规
|
// 常规
|
||||||
GtkWidget *general = settings_page();
|
GtkWidget *general = settings_page();
|
||||||
const char *wake[] = {"永不", "接通电源时", "始终"}, *close_opts[] = {"最小化", "退出程序"};
|
GtkWidget *acct = hbox(12), *acct_text = vbox(2);
|
||||||
GtkWidget *g1[] = { setting_row("开机自启动", NULL, gtk_switch_new()),
|
gtk_box_pack_start(GTK_BOX(acct_text), label(L("账号", "Account"), "devname"), FALSE, FALSE, 0);
|
||||||
setting_row("保持唤醒状态", "防止电脑进入睡眠状态,导致无法远程访问。", combo(wake, 3)),
|
account_who = label("", "hint"); gtk_box_pack_start(GTK_BOX(acct_text), account_who, FALSE, FALSE, 0);
|
||||||
setting_row("关闭窗口时", NULL, combo(close_opts, 2)) };
|
gtk_box_pack_start(GTK_BOX(acct), acct_text, TRUE, TRUE, 0);
|
||||||
|
account_out = button(L("退出登录", "Sign out"), "secondary"); gtk_widget_set_valign(account_out, GTK_ALIGN_CENTER);
|
||||||
|
g_signal_connect(account_out, "clicked", G_CALLBACK(on_sign_out), NULL); gtk_box_pack_end(GTK_BOX(acct), account_out, FALSE, FALSE, 0);
|
||||||
|
GtkWidget *g0[] = { acct };
|
||||||
|
gtk_box_pack_start(GTK_BOX(general), settings_card(g0, 1), FALSE, FALSE, 0);
|
||||||
|
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")};
|
||||||
|
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("关闭窗口时", "When closing the window"), NULL, combo(close_opts, 2)) };
|
||||||
gtk_box_pack_start(GTK_BOX(general), settings_card(g1, 3), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(general), settings_card(g1, 3), FALSE, FALSE, 0);
|
||||||
GtkWidget *path = hbox(8); GtkWidget *change = button("修改路径", "secondary"), *open = button("打开文件夹", "secondary");
|
GtkWidget *path = hbox(8); GtkWidget *change = button(L("修改路径", "Change path"), "secondary"), *open = button(L("打开文件夹", "Open folder"), "secondary");
|
||||||
g_signal_connect(change, "clicked", G_CALLBACK(unsupported), "修改路径"); g_signal_connect(open, "clicked", G_CALLBACK(unsupported), "打开文件夹");
|
g_signal_connect(change, "clicked", G_CALLBACK(unsupported), L("修改路径", "Change path")); g_signal_connect(open, "clicked", G_CALLBACK(unsupported), L("打开文件夹", "Open folder"));
|
||||||
gtk_box_pack_end(GTK_BOX(path), open, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(path), change, FALSE, FALSE, 0);
|
gtk_box_pack_end(GTK_BOX(path), open, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(path), change, FALSE, FALSE, 0);
|
||||||
GtkWidget *g2[] = { setting_row("传输文件存储路径", "~/Downloads", path) };
|
GtkWidget *g2[] = { setting_row(L("传输文件存储路径", "Received files folder"), "~/Downloads", path) };
|
||||||
gtk_box_pack_start(GTK_BOX(general), settings_card(g2, 1), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(general), settings_card(g2, 1), FALSE, FALSE, 0);
|
||||||
GtkWidget *real = button("在手机 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("实名认证", 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);
|
||||||
gtk_stack_add_titled(GTK_STACK(tabs), general, "general", "⚙ 常规");
|
GtkWidget *gscroll = gtk_scrolled_window_new(NULL, NULL);
|
||||||
|
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(gscroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
||||||
|
gtk_container_add(GTK_CONTAINER(gscroll), general);
|
||||||
|
gtk_stack_add_titled(GTK_STACK(tabs), gscroll, "general", L("⚙ 常规", "⚙ General"));
|
||||||
// 安全
|
// 安全
|
||||||
GtkWidget *security = settings_page();
|
GtkWidget *security = settings_page();
|
||||||
const char *verify[] = {"仅使用临时验证码", "仅使用自定义验证码", "临时与自定义验证码"};
|
const char *verify[] = {L("仅使用临时验证码", "Temporary code only"), L("仅使用自定义验证码", "Custom code only"), L("临时与自定义验证码", "Temporary and custom codes")};
|
||||||
GtkWidget *s1[] = { setting_row("允许同账号控制本设备", NULL, gtk_switch_new()), setting_row("允许他人远程协助", NULL, gtk_switch_new()) };
|
host_switch = gtk_switch_new(); gtk_switch_set_active(GTK_SWITCH(host_switch), atomic_load(&host_active));
|
||||||
GtkWidget *s2[] = { setting_row("远程协助连接本设备的验证方式", NULL, combo(verify, 3)) };
|
g_signal_connect(host_switch, "notify::active", G_CALLBACK(on_host), NULL);
|
||||||
GtkWidget *s3[] = { setting_row("客户端锁定", "防止客户端设置被修改,保障数据与使用安全。", gtk_switch_new()) };
|
GtkWidget *s1[] = { setting_row(L("允许同账号控制本设备", "Allow the same account to control this device"), L("默认关闭。开启后本机会出现在你的设备列表中,可被远程控制(uuremote-server 用户服务)", "Off by default. When on, this computer appears in your device list and can be controlled (uuremote-server user service)"), host_switch), setting_row(L("允许他人远程协助", "Allow remote assistance"), NULL, gtk_switch_new()) };
|
||||||
|
GtkWidget *s2[] = { setting_row(L("远程协助连接本设备的验证方式", "Verification for remote assistance"), NULL, combo(verify, 3)) };
|
||||||
|
GtkWidget *s3[] = { setting_row(L("客户端锁定", "Lock client"), L("防止客户端设置被修改,保障数据与使用安全。", "Prevents client settings from being changed, keeping data and usage safe."), gtk_switch_new()) };
|
||||||
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_box_pack_start(GTK_BOX(security), label("本机被控相关设置由 uuremote-server 主机端提供。", "hint"), FALSE, FALSE, 0);
|
gtk_stack_add_titled(GTK_STACK(tabs), security, "security", L("🔒 安全", "🔒 Security"));
|
||||||
gtk_stack_add_titled(GTK_STACK(tabs), security, "security", "🔒 安全");
|
|
||||||
// 键盘
|
// 键盘
|
||||||
GtkWidget *keys = settings_page();
|
GtkWidget *keys = settings_page();
|
||||||
gtk_box_pack_start(GTK_BOX(keys), label("仅控制端响应的快捷键", "h2"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(keys), label(L("仅控制端响应的快捷键", "Viewer-only shortcuts"), "h2"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(keys), label("远控时按下以下快捷键,仅在控制端本地响应,不会发送到被控端。", "hint"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(keys), label(L("远控时按下以下快捷键,仅在控制端本地响应,不会发送到被控端。", "These shortcuts are handled locally on the viewer and are not sent to the remote device."), "hint"), FALSE, FALSE, 0);
|
||||||
GtkWidget *addk = button("添加控制端快捷键", "secondary"); g_signal_connect(addk, "clicked", G_CALLBACK(unsupported), "添加快捷键");
|
GtkWidget *addk = button(L("添加控制端快捷键", "Add viewer shortcut"), "secondary"); g_signal_connect(addk, "clicked", G_CALLBACK(unsupported), L("添加快捷键", "Add shortcut"));
|
||||||
GtkWidget *k1[] = { setting_row("当前暂无设置", NULL, NULL), setting_row("", NULL, addk) };
|
GtkWidget *k1[] = { setting_row(L("当前暂无设置", "Nothing set yet"), NULL, NULL), setting_row("", NULL, addk) };
|
||||||
gtk_box_pack_start(GTK_BOX(keys), settings_card(k1, 2), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(keys), settings_card(k1, 2), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(keys), label("功能快捷键", "h2"), FALSE, FALSE, 6);
|
gtk_box_pack_start(GTK_BOX(keys), label(L("功能快捷键", "Function shortcuts"), "h2"), FALSE, FALSE, 6);
|
||||||
gtk_box_pack_start(GTK_BOX(keys), label("按下以下快捷键时,仅在本地触发对应功能,不会发送到被控端。", "hint"), FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(keys), label(L("按下以下快捷键时,仅在本地触发对应功能,不会发送到被控端。", "These shortcuts trigger local functions only and are not sent to the remote device."), "hint"), FALSE, FALSE, 0);
|
||||||
const char *fns[] = {"使用被控端鼠标/解锁鼠标", "被控时解除防窥模式", "切换上一个屏幕", "切换下一个屏幕", "显示/隐藏悬浮球", "静音/取消静音", "老板键(隐藏/显示所有客户端窗口)", "发送 Ctrl+Alt+Delete 组合键"};
|
const char *fns[] = {L("使用被控端鼠标/解锁鼠标", "Use remote mouse / release mouse"), L("被控时解除防窥模式", "Turn off privacy screen while controlled"), L("切换上一个屏幕", "Previous screen"), L("切换下一个屏幕", "Next screen"), L("显示/隐藏悬浮球", "Show/hide floating ball"), L("静音/取消静音", "Mute/unmute"), L("老板键(隐藏/显示所有客户端窗口)", "Boss key (hide/show all client windows)"), L("发送 Ctrl+Alt+Delete 组合键", "Send Ctrl+Alt+Delete")};
|
||||||
GtkWidget *k2[8];
|
GtkWidget *k2[8];
|
||||||
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", "⌨ 键盘");
|
gtk_stack_add_titled(GTK_STACK(tabs), kscroll, "keys", L("⌨ 键盘", "⌨ Keyboard"));
|
||||||
// 网络
|
// 网络
|
||||||
GtkWidget *network = settings_page();
|
GtkWidget *network = settings_page();
|
||||||
const char *proxy[] = {"使用系统环境代理", "不使用代理"};
|
const char *proxy[] = {L("使用系统环境代理", "Use system proxy"), L("不使用代理", "No proxy")};
|
||||||
GtkWidget *n1[] = { setting_row("代理设置", 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", "🌐 网络");
|
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);
|
||||||
}
|
}
|
||||||
static void confirm_logout(void) {
|
static void confirm_logout(void) {
|
||||||
GtkWidget *d = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "确定要退出登录吗?");
|
GtkWidget *d = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, L("确定要退出登录吗?", "Sign out?"));
|
||||||
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), "退出登录会中断正在进行中的连接,你的设备也将从本账户删除。请谨慎操作!");
|
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), L("退出登录会中断正在进行中的连接,你的设备也将从本账户删除。请谨慎操作!", "Signing out ends active connections and removes your device from this account. Be careful!"));
|
||||||
gtk_dialog_add_buttons(GTK_DIALOG(d), "取消", GTK_RESPONSE_CANCEL, "确认", GTK_RESPONSE_OK, NULL);
|
gtk_dialog_add_buttons(GTK_DIALOG(d), L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("确认", "Confirm"), GTK_RESPONSE_OK, NULL);
|
||||||
if (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK) push("logout");
|
if (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK) push("logout");
|
||||||
gtk_widget_destroy(d);
|
gtk_widget_destroy(d);
|
||||||
}
|
}
|
||||||
@@ -571,15 +636,15 @@ static void on_menu(GtkMenuItem *item, gpointer what) {
|
|||||||
static void popup(GtkButton *b, gpointer kind) {
|
static void popup(GtkButton *b, gpointer kind) {
|
||||||
GtkWidget *menu = gtk_menu_new();
|
GtkWidget *menu = gtk_menu_new();
|
||||||
if (!strcmp(kind, "account")) {
|
if (!strcmp(kind, "account")) {
|
||||||
GtkWidget *who = gtk_menu_item_new_with_label(logged_in ? (user_text[0] ? user_text : "已登录") : "未登录"); gtk_widget_set_sensitive(who, FALSE);
|
GtkWidget *who = gtk_menu_item_new_with_label(logged_in ? (user_text[0] ? user_text : L("已登录", "Signed in")) : L("未登录", "Not signed in")); gtk_widget_set_sensitive(who, FALSE);
|
||||||
gtk_menu_shell_append(GTK_MENU_SHELL(menu), who);
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu), who);
|
||||||
GtkWidget *out = gtk_menu_item_new_with_label("退出登录"); g_signal_connect(out, "activate", G_CALLBACK(on_menu), "logout");
|
GtkWidget *out = gtk_menu_item_new_with_label(L("退出登录", "Sign out")); g_signal_connect(out, "activate", G_CALLBACK(on_menu), "logout");
|
||||||
gtk_widget_set_sensitive(out, logged_in); gtk_menu_shell_append(GTK_MENU_SHELL(menu), out);
|
gtk_widget_set_sensitive(out, logged_in); gtk_menu_shell_append(GTK_MENU_SHELL(menu), out);
|
||||||
} else if (!strcmp(kind, "notice")) {
|
} else if (!strcmp(kind, "notice")) {
|
||||||
GtkWidget *none = gtk_menu_item_new_with_label("暂无通知"); gtk_widget_set_sensitive(none, FALSE);
|
GtkWidget *none = gtk_menu_item_new_with_label(L("暂无通知", "No notifications")); gtk_widget_set_sensitive(none, FALSE);
|
||||||
gtk_menu_shell_append(GTK_MENU_SHELL(menu), none);
|
gtk_menu_shell_append(GTK_MENU_SHELL(menu), none);
|
||||||
} else {
|
} else {
|
||||||
const char *labels[] = {"刷新设备列表", "设置", "退出程序"}, *whats[] = {"refresh", "settings", "quit"};
|
const char *labels[] = {L("刷新设备列表", "Refresh device list"), L("设置", "Settings"), L("退出程序", "Quit")}, *whats[] = {"refresh", "settings", "quit"};
|
||||||
for (int i = 0; i < 3; i++) { GtkWidget *it = gtk_menu_item_new_with_label(labels[i]); g_signal_connect(it, "activate", G_CALLBACK(on_menu), (gpointer)whats[i]); gtk_menu_shell_append(GTK_MENU_SHELL(menu), it); }
|
for (int i = 0; i < 3; i++) { GtkWidget *it = gtk_menu_item_new_with_label(labels[i]); g_signal_connect(it, "activate", G_CALLBACK(on_menu), (gpointer)whats[i]); gtk_menu_shell_append(GTK_MENU_SHELL(menu), it); }
|
||||||
}
|
}
|
||||||
gtk_widget_show_all(menu);
|
gtk_widget_show_all(menu);
|
||||||
@@ -591,34 +656,31 @@ 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), "UU 远程 Linux 控制端(非官方)");
|
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);
|
||||||
g_signal_connect(window, "delete-event", G_CALLBACK(on_delete), NULL);
|
g_signal_connect(window, "delete-event", G_CALLBACK(on_delete), NULL);
|
||||||
own_titlebar(window, "UU 远程 Linux 控制端(非官方)");
|
own_titlebar(window, L("UU 远程 Linux 控制端(非官方)", "UU Remote Linux viewer (unofficial)"));
|
||||||
GtkWidget *root = hbox(0);
|
GtkWidget *root = hbox(0);
|
||||||
// Sidebar
|
// Sidebar
|
||||||
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("⧉ 我的设备", "section"), TRUE, TRUE, 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("⧉ 远程协助", "section"); gtk_widget_set_margin_start(ah, 18); gtk_widget_set_margin_top(ah, 16); gtk_widget_set_margin_bottom(ah, 6);
|
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);
|
||||||
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("◧", "开始协助", "assist"), -1);
|
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("★", "收藏设备", "favorite"), -1);
|
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("★", 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;
|
||||||
@@ -628,7 +690,7 @@ static void *run(void *arg) {
|
|||||||
// Main area
|
// Main area
|
||||||
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("全部设备", "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 = button("⋮", "hbtn"); 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);
|
||||||
@@ -676,12 +738,13 @@ void uu_viewer_ui_set_devices(const char *tsv) {
|
|||||||
device_count = 0;
|
device_count = 0;
|
||||||
char *copy = strdup(tsv ? tsv : ""), *save = NULL;
|
char *copy = strdup(tsv ? tsv : ""), *save = NULL;
|
||||||
for (char *line = strtok_r(copy, "\n", &save); line && device_count < 64; line = strtok_r(NULL, "\n", &save)) {
|
for (char *line = strtok_r(copy, "\n", &save); line && device_count < 64; line = strtok_r(NULL, "\n", &save)) {
|
||||||
char *f[5] = {0}, *s2 = NULL; int n = 0;
|
char *f[6] = {0}, *s2 = NULL; int n = 0;
|
||||||
for (char *p = strtok_r(line, "\t", &s2); p && n < 5; p = strtok_r(NULL, "\t", &s2)) f[n++] = p;
|
for (char *p = strtok_r(line, "\t", &s2); p && n < 6; p = strtok_r(NULL, "\t", &s2)) f[n++] = p;
|
||||||
if (n < 5) continue;
|
if (n < 5) continue;
|
||||||
Device *d = &devices[device_count++];
|
Device *d = &devices[device_count++];
|
||||||
snprintf(d->id, sizeof d->id, "%s", f[0]); snprintf(d->name, sizeof d->name, "%s", f[1]);
|
snprintf(d->id, sizeof d->id, "%s", f[0]); snprintf(d->name, sizeof d->name, "%s", f[1]);
|
||||||
d->platform = atoi(f[2]); d->online = atoi(f[3]); d->current = atoi(f[4]);
|
d->platform = atoi(f[2]); d->online = atoi(f[3]); d->current = atoi(f[4]);
|
||||||
|
snprintf(d->thumb, sizeof d->thumb, "%s", n > 5 && f[5][0] == '/' ? f[5] : "");
|
||||||
}
|
}
|
||||||
free(copy);
|
free(copy);
|
||||||
selected = -1;
|
selected = -1;
|
||||||
@@ -715,8 +778,8 @@ static int replace_result;
|
|||||||
static gboolean confirm_replace(gpointer d) {
|
static gboolean confirm_replace(gpointer d) {
|
||||||
(void)d;
|
(void)d;
|
||||||
GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
|
GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "打开后将断开当前与该设备的连接,继续吗?");
|
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, L("打开后将断开当前与该设备的连接,继续吗?", "Opening this disconnects your current connection to this device. Continue?"));
|
||||||
gtk_dialog_add_buttons(GTK_DIALOG(dialog), "取消", GTK_RESPONSE_CANCEL, "继续", GTK_RESPONSE_OK, NULL);
|
gtk_dialog_add_buttons(GTK_DIALOG(dialog), L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("继续", "Continue"), GTK_RESPONSE_OK, NULL);
|
||||||
int accepted = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK;
|
int accepted = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK;
|
||||||
gtk_widget_destroy(dialog);
|
gtk_widget_destroy(dialog);
|
||||||
pthread_mutex_lock(&init_lock); replace_result = accepted; pthread_cond_signal(&init_cond); pthread_mutex_unlock(&init_lock);
|
pthread_mutex_lock(&init_lock); replace_result = accepted; pthread_cond_signal(&init_cond); pthread_mutex_unlock(&init_lock);
|
||||||
|
|||||||
+57
-16
@@ -1,5 +1,6 @@
|
|||||||
/* Native Hyprland/wlroots desktop bridge. Protocol XMLs retain upstream licenses. */
|
/* Native Hyprland/wlroots desktop bridge. Protocol XMLs retain upstream licenses. */
|
||||||
#define _GNU_SOURCE
|
#define _GNU_SOURCE
|
||||||
|
#include "wayland_transform.h"
|
||||||
#include <wayland-client.h>
|
#include <wayland-client.h>
|
||||||
#include <xkbcommon/xkbcommon.h>
|
#include <xkbcommon/xkbcommon.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
@@ -60,7 +61,7 @@ static struct xkb_state *key_state;
|
|||||||
static unsigned char held_keys[768];
|
static unsigned char held_keys[768];
|
||||||
/* Mobile input-method text (#13/#46). The protocol has no per-key remap request, but
|
/* Mobile input-method text (#13/#46). The protocol has no per-key remap request, but
|
||||||
zwp_virtual_keyboard_v1_keymap may be re-sent at any time, so the pristine keymap text is kept
|
zwp_virtual_keyboard_v1_keymap may be re-sent at any time, so the pristine keymap text is kept
|
||||||
and a spare keycode is pointed at one character's keysym at a time. Never logs the text. */
|
and printable codes on a separate text keyboard carry each batch. Never logs the text. */
|
||||||
#define UU_TEXT_SPARE 32
|
#define UU_TEXT_SPARE 32
|
||||||
static char *keymap_text;
|
static char *keymap_text;
|
||||||
static size_t keymap_text_len, keymap_insert;
|
static size_t keymap_text_len, keymap_insert;
|
||||||
@@ -187,6 +188,14 @@ static xkb_keycode_t existing_keycode(xkb_keysym_t symbol) {
|
|||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
static unsigned find_niri_text_codes(xkb_keycode_t *out,unsigned limit) {
|
||||||
|
/* Printable physical keys work in Chromium; reserved evdev codes can be discarded. */
|
||||||
|
static const xkb_keycode_t text_codes[]={24,25,26,27,28,29,30,31,32,33,38,39,40,41,42,43,44,45,46,52,53,54,55,56,57,58};
|
||||||
|
unsigned count=0;
|
||||||
|
for(unsigned i=0;i<sizeof(text_codes)/sizeof(text_codes[0]) && count<limit;i++)
|
||||||
|
if(xkb_keymap_key_get_name(keymap,text_codes[i])) out[count++]=text_codes[i];
|
||||||
|
return count;
|
||||||
|
}
|
||||||
static void press_keycode(xkb_keycode_t code) {
|
static void press_keycode(xkb_keycode_t code) {
|
||||||
zwp_virtual_keyboard_v1_key(keyboard,timestamp(),code-8,WL_KEYBOARD_KEY_STATE_PRESSED);
|
zwp_virtual_keyboard_v1_key(keyboard,timestamp(),code-8,WL_KEYBOARD_KEY_STATE_PRESSED);
|
||||||
zwp_virtual_keyboard_v1_key(keyboard,timestamp(),code-8,WL_KEYBOARD_KEY_STATE_RELEASED);
|
zwp_virtual_keyboard_v1_key(keyboard,timestamp(),code-8,WL_KEYBOARD_KEY_STATE_RELEASED);
|
||||||
@@ -207,7 +216,8 @@ static void release_held_keys_locked(void) {
|
|||||||
key_state and held_keys: pressed and released here. */
|
key_state and held_keys: pressed and released here. */
|
||||||
static int flush_batch(char *buffer,size_t capacity,const char names[][64],const xkb_keycode_t *codes,unsigned count,int *typed) {
|
static int flush_batch(char *buffer,size_t capacity,const char names[][64],const xkb_keycode_t *codes,unsigned count,int *typed) {
|
||||||
release_held_keys_locked();
|
release_held_keys_locked();
|
||||||
if(rekey_keyboard()!=0) return -1;
|
if(getenv("NIRI_SOCKET")) {if(sync_display()!=0) return -1;usleep(8000);}
|
||||||
|
else if(rekey_keyboard()!=0) return -1;
|
||||||
size_t at=keymap_insert;
|
size_t at=keymap_insert;
|
||||||
memcpy(buffer,keymap_text,at);
|
memcpy(buffer,keymap_text,at);
|
||||||
for(unsigned i=0;i<count;i++) {
|
for(unsigned i=0;i<count;i++) {
|
||||||
@@ -217,8 +227,11 @@ static int flush_batch(char *buffer,size_t capacity,const char names[][64],const
|
|||||||
}
|
}
|
||||||
memcpy(buffer+at,keymap_text+keymap_insert,keymap_text_len-keymap_insert);
|
memcpy(buffer+at,keymap_text+keymap_insert,keymap_text_len-keymap_insert);
|
||||||
if(upload_keymap(buffer,at+(keymap_text_len-keymap_insert))!=0) return -1;
|
if(upload_keymap(buffer,at+(keymap_text_len-keymap_insert))!=0) return -1;
|
||||||
|
if(getenv("NIRI_SOCKET")) zwp_virtual_keyboard_v1_modifiers(keyboard,0,0,0,0);
|
||||||
if(sync_display()!=0) return -1;
|
if(sync_display()!=0) return -1;
|
||||||
|
if(getenv("NIRI_SOCKET")) usleep(8000);
|
||||||
for(unsigned i=0;i<count;i++) { press_keycode(codes[i]); (*typed)++; }
|
for(unsigned i=0;i<count;i++) { press_keycode(codes[i]); (*typed)++; }
|
||||||
|
if(getenv("NIRI_SOCKET")) {if(sync_display()!=0) return -1;usleep(8000);}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
/* Type UTF-8 like xdotool type does on X11, but on Wayland: characters the session keymap already
|
/* Type UTF-8 like xdotool type does on X11, but on Wayland: characters the session keymap already
|
||||||
@@ -247,14 +260,14 @@ static int type_utf8_locked(const char *text) {
|
|||||||
else if(cp<0x20 || cp==0x7f || (cp>=0x80 && cp<0xa0)) continue; /* controls carry no text */
|
else if(cp<0x20 || cp==0x7f || (cp>=0x80 && cp<0xa0)) continue; /* controls carry no text */
|
||||||
else if(cp<0x100) sym=cp; /* Latin-1 keysyms equal the code point */
|
else if(cp<0x100) sym=cp; /* Latin-1 keysyms equal the code point */
|
||||||
else sym=(xkb_keysym_t)(0x1000000|cp); /* Unicode keysym */
|
else sym=(xkb_keysym_t)(0x1000000|cp); /* Unicode keysym */
|
||||||
xkb_keycode_t existing=existing_keycode(sym);
|
xkb_keycode_t existing=getenv("NIRI_SOCKET")?0:existing_keycode(sym);
|
||||||
if(existing) {
|
if(existing) {
|
||||||
if(count && flush_batch(buffer,capacity,names,codes,count,&typed)!=0) { failed=1; break; }
|
if(count && flush_batch(buffer,capacity,names,codes,count,&typed)!=0) { failed=1; break; }
|
||||||
count=0;
|
count=0;
|
||||||
press_keycode(existing); typed++;
|
press_keycode(existing); typed++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if(count==UU_TEXT_SPARE) {
|
if(count==(getenv("NIRI_SOCKET")?spare_count:UU_TEXT_SPARE)) {
|
||||||
if(flush_batch(buffer,capacity,names,codes,count,&typed)!=0) { failed=1; break; }
|
if(flush_batch(buffer,capacity,names,codes,count,&typed)!=0) { failed=1; break; }
|
||||||
count=0;
|
count=0;
|
||||||
}
|
}
|
||||||
@@ -266,13 +279,23 @@ static int type_utf8_locked(const char *text) {
|
|||||||
if(!failed && count) failed=flush_batch(buffer,capacity,names,codes,count,&typed)!=0;
|
if(!failed && count) failed=flush_batch(buffer,capacity,names,codes,count,&typed)!=0;
|
||||||
free(buffer);
|
free(buffer);
|
||||||
/* Restore the pristine keymap whatever happened above, so uu_wl_key keeps its own symbol map. */
|
/* Restore the pristine keymap whatever happened above, so uu_wl_key keeps its own symbol map. */
|
||||||
if(upload_keymap(keymap_text,keymap_text_len)!=0) return -1;
|
if(getenv("NIRI_SOCKET")) {if(sync_display()!=0) return -1;usleep(8000);}
|
||||||
|
else if(upload_keymap(keymap_text,keymap_text_len)!=0) return -1;
|
||||||
return failed && !typed?-1:typed;
|
return failed && !typed?-1:typed;
|
||||||
}
|
}
|
||||||
int uu_wl_type_utf8(const char *text) {
|
int uu_wl_type_utf8(const char *text) {
|
||||||
pthread_mutex_lock(&lock);
|
pthread_mutex_lock(&lock);
|
||||||
int typed=-1;
|
int typed=-1;
|
||||||
if(initialized && text && keymap_text && keymap_insert && spare_count) typed=type_utf8_locked(text);
|
if(initialized && text && keymap_text && keymap_insert && spare_count) {
|
||||||
|
if(getenv("NIRI_SOCKET")) {
|
||||||
|
/* Only niri uses printable codes on a separate text device; preserve the Hyprland path. */
|
||||||
|
release_held_keys_locked();
|
||||||
|
struct zwp_virtual_keyboard_v1 *saved=keyboard;
|
||||||
|
keyboard=zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(keyboard_manager,seat);
|
||||||
|
if(keyboard) {typed=type_utf8_locked(text);sync_display();usleep(8000);if(keyboard) zwp_virtual_keyboard_v1_destroy(keyboard);}
|
||||||
|
keyboard=saved;
|
||||||
|
} else typed=type_utf8_locked(text);
|
||||||
|
}
|
||||||
if(typed>=0 && wl_display_flush(display)<0) typed=-1;
|
if(typed>=0 && wl_display_flush(display)<0) typed=-1;
|
||||||
pthread_mutex_unlock(&lock); return typed;
|
pthread_mutex_unlock(&lock); return typed;
|
||||||
}
|
}
|
||||||
@@ -544,9 +567,9 @@ int uu_wl_init(int32_t *w,int32_t *h) {
|
|||||||
for(selected=0;selected<output_count;selected++) if(!strcmp(outputs[selected].name,name)) break;
|
for(selected=0;selected<output_count;selected++) if(!strcmp(outputs[selected].name,name)) break;
|
||||||
if(selected==output_count) goto end;
|
if(selected==output_count) goto end;
|
||||||
}
|
}
|
||||||
/* Rotated output coordinate mapping needs separate acceptance. */
|
if(!uu_output_transform_supported(outputs[selected].transform,getenv("NIRI_SOCKET")!=NULL)) goto end;
|
||||||
if(outputs[selected].transform!=WL_OUTPUT_TRANSFORM_NORMAL) goto end;
|
|
||||||
width=outputs[selected].width; height=outputs[selected].height;
|
width=outputs[selected].width; height=outputs[selected].height;
|
||||||
|
if(outputs[selected].transform&1) {uint32_t t=width;width=height;height=t;}
|
||||||
if(!width || !height || width>16384 || height>16384 || (uint64_t)width*height*4>256*1024*1024) goto end;
|
if(!width || !height || width>16384 || height>16384 || (uint64_t)width*height*4>256*1024*1024) goto end;
|
||||||
if(power_manager) {
|
if(power_manager) {
|
||||||
power=zwlr_output_power_manager_v1_get_output_power(power_manager,outputs[selected].handle);
|
power=zwlr_output_power_manager_v1_get_output_power(power_manager,outputs[selected].handle);
|
||||||
@@ -574,7 +597,7 @@ int uu_wl_init(int32_t *w,int32_t *h) {
|
|||||||
/* Text typing needs unmapped keycodes and a place to declare them. A keymap without either
|
/* Text typing needs unmapped keycodes and a place to declare them. A keymap without either
|
||||||
only costs that path - uu_wl_type_utf8 refuses and the caller keeps its own fallback. */
|
only costs that path - uu_wl_type_utf8 refuses and the caller keeps its own fallback. */
|
||||||
keymap_insert=symbols_close(keymap_text);
|
keymap_insert=symbols_close(keymap_text);
|
||||||
spare_count=find_spare_codes(spare_codes,sizeof(spare_codes)/sizeof(spare_codes[0]));
|
spare_count=getenv("NIRI_SOCKET")?find_niri_text_codes(spare_codes,UU_TEXT_SPARE):find_spare_codes(spare_codes,UU_TEXT_SPARE);
|
||||||
}
|
}
|
||||||
initialized=1; *w=width; *h=height; result=0;
|
initialized=1; *w=width; *h=height; result=0;
|
||||||
end:
|
end:
|
||||||
@@ -588,8 +611,9 @@ int uu_wl_select_output(const char *name,uint32_t expected_w,uint32_t expected_h
|
|||||||
if(!initialized || !name || sync_display()!=0) goto end;
|
if(!initialized || !name || sync_display()!=0) goto end;
|
||||||
unsigned target;
|
unsigned target;
|
||||||
for(target=0;target<output_count;target++) if(!strcmp(outputs[target].name,name)) break;
|
for(target=0;target<output_count;target++) if(!strcmp(outputs[target].name,name)) break;
|
||||||
if(target==output_count || outputs[target].transform!=WL_OUTPUT_TRANSFORM_NORMAL) goto end;
|
if(target==output_count || !uu_output_transform_supported(outputs[target].transform,getenv("NIRI_SOCKET")!=NULL)) goto end;
|
||||||
uint32_t w=outputs[target].width,h=outputs[target].height;
|
uint32_t w=outputs[target].width,h=outputs[target].height;
|
||||||
|
if(outputs[target].transform&1) {uint32_t t=w;w=h;h=t;}
|
||||||
if(w!=expected_w || h!=expected_h || !w || !h || w>16384 || h>16384 || (uint64_t)w*h*4>256*1024*1024) goto end;
|
if(w!=expected_w || h!=expected_h || !w || !h || w>16384 || h>16384 || (uint64_t)w*h*4>256*1024*1024) goto end;
|
||||||
struct zwlr_virtual_pointer_v1 *next=NULL;
|
struct zwlr_virtual_pointer_v1 *next=NULL;
|
||||||
if(pointer_manager) {
|
if(pointer_manager) {
|
||||||
@@ -640,7 +664,7 @@ retry:;
|
|||||||
for(unsigned i=0;i<2;i++) { frame_clear(&frames[i]); dma_clear(&frames[i]); }
|
for(unsigned i=0;i<2;i++) { frame_clear(&frames[i]); dma_clear(&frames[i]); }
|
||||||
pending=0; goto retry;
|
pending=0; goto retry;
|
||||||
}
|
}
|
||||||
if(frame->failed || !frame->pixels || frame->width!=width || frame->height!=height) goto end;
|
if(frame->failed || !frame->pixels || frame->width!=outputs[selected].width || frame->height!=outputs[selected].height) goto end;
|
||||||
zwlr_screencopy_frame_v1_destroy(frame->handle); frame->handle=NULL;
|
zwlr_screencopy_frame_v1_destroy(frame->handle); frame->handle=NULL;
|
||||||
const char *pipeline=getenv("UU_WAYLAND_PIPELINE");
|
const char *pipeline=getenv("UU_WAYLAND_PIPELINE");
|
||||||
if(!pipeline || strcmp(pipeline,"0")) {
|
if(!pipeline || strcmp(pipeline,"0")) {
|
||||||
@@ -651,11 +675,22 @@ retry:;
|
|||||||
}
|
}
|
||||||
{
|
{
|
||||||
for(uint32_t y=0;y<height;y++) {
|
for(uint32_t y=0;y<height;y++) {
|
||||||
uint32_t source=(frame->flags&ZWLR_SCREENCOPY_FRAME_V1_FLAGS_Y_INVERT)?height-y-1:y;
|
|
||||||
uint8_t *row=out+(size_t)y*width*4;
|
uint8_t *row=out+(size_t)y*width*4;
|
||||||
memcpy(row,(uint8_t*)frame->pixels+(size_t)source*frame->stride,width*4);
|
if(outputs[selected].transform==WL_OUTPUT_TRANSFORM_NORMAL &&
|
||||||
if(frame->format==WL_SHM_FORMAT_XBGR8888 || frame->format==WL_SHM_FORMAT_ABGR8888) {
|
frame->format!=WL_SHM_FORMAT_XBGR8888 && frame->format!=WL_SHM_FORMAT_ABGR8888) {
|
||||||
for(uint32_t x=0;x<width;x++) { uint8_t red=row[x*4]; row[x*4]=row[x*4+2]; row[x*4+2]=red; }
|
uint32_t sy=(frame->flags&ZWLR_SCREENCOPY_FRAME_V1_FLAGS_Y_INVERT)?height-1-y:y;
|
||||||
|
memcpy(row,(uint8_t*)frame->pixels+(size_t)sy*frame->stride,width*4);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
for(uint32_t x=0;x<width;x++) {
|
||||||
|
uint32_t sx=x,sy=y,sw=frame->width,sh=frame->height;
|
||||||
|
uu_source_pixel(outputs[selected].transform,sw,sh,x,y,&sx,&sy);
|
||||||
|
if(frame->flags&ZWLR_SCREENCOPY_FRAME_V1_FLAGS_Y_INVERT) sy=sh-1-sy;
|
||||||
|
const uint8_t *pixel=(uint8_t*)frame->pixels+(size_t)sy*frame->stride+sx*4;
|
||||||
|
memcpy(row+x*4,pixel,4);
|
||||||
|
if(frame->format==WL_SHM_FORMAT_XBGR8888 || frame->format==WL_SHM_FORMAT_ABGR8888) {
|
||||||
|
row[x*4]=pixel[2];row[x*4+2]=pixel[0];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
result=0;
|
result=0;
|
||||||
@@ -675,7 +710,13 @@ int uu_wl_move(int32_t x,int32_t y,int relative) {
|
|||||||
double scale=outputs[selected].scale;
|
double scale=outputs[selected].scale;
|
||||||
zwlr_virtual_pointer_v1_motion(pointer,timestamp(),wl_fixed_from_double(x/scale),wl_fixed_from_double(y/scale));
|
zwlr_virtual_pointer_v1_motion(pointer,timestamp(),wl_fixed_from_double(x/scale),wl_fixed_from_double(y/scale));
|
||||||
}
|
}
|
||||||
else if(x>=0 && y>=0 && x<(int32_t)width && y<(int32_t)height) zwlr_virtual_pointer_v1_motion_absolute(pointer,timestamp(),x,y,width,height);
|
else if(x>=0 && y>=0 && x<(int32_t)width && y<(int32_t)height) {
|
||||||
|
uint32_t sx,sy,sw=outputs[selected].width,sh=outputs[selected].height;
|
||||||
|
/* niri/Smithay applies the output transform to absolute device coordinates. */
|
||||||
|
if(getenv("NIRI_SOCKET")) uu_source_pixel(outputs[selected].transform,sw,sh,x,y,&sx,&sy);
|
||||||
|
else {sx=x;sy=y;sw=width;sh=height;}
|
||||||
|
zwlr_virtual_pointer_v1_motion_absolute(pointer,timestamp(),sx,sy,sw,sh);
|
||||||
|
}
|
||||||
else goto end;
|
else goto end;
|
||||||
zwlr_virtual_pointer_v1_frame(pointer); result=wl_display_flush(display)<0?-1:0;
|
zwlr_virtual_pointer_v1_frame(pointer); result=wl_display_flush(display)<0?-1:0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
#include <stdint.h>
|
||||||
|
/* Map upright output pixels to untransformed capture/device coordinates (Smithay Transform). */
|
||||||
|
static inline void uu_source_pixel(int transform,uint32_t w,uint32_t h,uint32_t x,uint32_t y,uint32_t *sx,uint32_t *sy) {
|
||||||
|
*sx=x;*sy=y;
|
||||||
|
switch(transform) {
|
||||||
|
case 1:*sx=y;*sy=h-1-x;break;
|
||||||
|
case 2:*sx=w-1-x;*sy=h-1-y;break;
|
||||||
|
case 3:*sx=w-1-y;*sy=x;break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* Rotated capture and pointer mapping have hardware acceptance only on niri. */
|
||||||
|
static inline int uu_output_transform_supported(int transform,int niri) {
|
||||||
|
return transform==0 || (niri && transform>=1 && transform<=3);
|
||||||
|
}
|
||||||
@@ -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 |
@@ -0,0 +1,111 @@
|
|||||||
|
# 实验性防窥 / 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.
|
||||||
|
- 这是尽力而为的遮挡,不是保密边界。/ 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.
|
||||||
|
- 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`
|
||||||
|
(最近一次开启的模式,存于 host_settings.json `privacy_type`);SystemStateChange 5 `PrivateScreenState` 在状态变化时推送。
|
||||||
|
|
||||||
|
已知限制:官方 Mac 客户端的防窥菜单在切换后仍回显"不启用",实际模式正确;客户端未回读上述状态。
|
||||||
|
Known limitation: the official Mac viewer's menu still shows "off" after switching although the mode applies.
|
||||||
|
|
||||||
|
## 本机诊断 / 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`.
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
`UU_USE_PROXY=1` 时经 TCP/TLS(可走 HTTP 代理)连接 TURN 中继,供 UDP 到不了中继服务器的主机使用。/ With `UU_USE_PROXY=1`, TURN relays are also reached over TCP/TLS (optionally through the HTTP proxy) for hosts whose UDP cannot reach the relay servers.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **TURN over TCP/TLS**:云端在强制中继的会话里也会下发 `turns:<IP>:<端口>?transport=tcp`,原来使用的 webrtc-ice 只支持 UDP 中继,UDP 被限制、只能经 HTTP 代理出网的主机因此拿不到任何中继候选,控制端一直"正在尝试重连"。现在开启 `UU_USE_PROXY=1` 后,主机会经 `HTTPS_PROXY`/`ALL_PROXY` 中的无认证 `http://` 代理(没有则直连)建立 TCP/TLS 中继连接。TURN 证书按 CA 链校验,仅在云端下发的地址为 IP 时容忍名称不匹配;媒体仍由 DTLS-SRTP 端到端加密。未开启时只用 UDP 中继,行为不变(`vendor/webrtc-ice/PATCHES.md`)。
|
||||||
|
With `UU_USE_PROXY=1` the host also opens TURN relays over TCP/TLS through the unauthenticated `http://` proxy (or directly), chain-verifying certificates and tolerating a name mismatch only for IP TURN URLs. The default stays UDP-only.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试(经模拟代理的 CONNECT 与 STUN/ChannelData 分帧)与 CI;与真实 TURN 服务器的 TCP/TLS 分配尚待在报告环境实机确认。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.37_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.37-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.37`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
TURN over TLS 改为同时信任系统证书库。/ TURN over TLS now also trusts the system certificate store.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **TURN over TLS 报 UnknownIssuer**:v0.2.37 的 TCP/TLS 中继只信任内置的 Mozilla 根证书;在会检查 TLS 的 HTTP 代理后面,中继证书由主机管理员装在系统证书库里的 CA 重新签发,OpenSSL 能通过、我们却报 `UnknownIssuer`。现在同时信任系统证书库(与 OpenSSL 一致)和内置根证书。仅影响 `UU_USE_PROXY=1` 时的 TCP/TLS 中继。
|
||||||
|
TCP/TLS relays (only with `UU_USE_PROXY=1`) now trust the system certificate store as well as the bundled Mozilla roots, so CAs added for TLS-inspecting proxies are honoured.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;报告环境实机验证进行中。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.38_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.38-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.38`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
Linux 控制端像官方控制端一样请求桌面视频轨道,修复第二个会话永久黑屏。/ The Linux viewer now requests the desktop video track like the official viewer, fixing a permanently black second session.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **第二个会话黑屏(#124,感谢 @shao-zhijie 的码流取证)**:被控端已在给别的控制端推流时,Linux 控制端只会接上那条流的中段,没有 SPS/PPS/IDR,永远无法解码;官方主机也不响应 RTCP PLI。官方 iPhone 控制端在 CONTROL 通道打开后会立即发 RPC 15 `SendVideoTrackReq`(无字段);Linux 控制端现在桌面会话里也发这一条。
|
||||||
|
Desktop sessions now send RpcRequest case 15 `SendVideoTrackReq` (no fields) right after CONTROL opens, as the official iPhone viewer does, so the host starts a track for this session instead of the viewer joining another session's stream mid-GOP.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;官方 iPhone 控制端发送该 RPC 的行为来自本项目主机日志(`response_field=11 value=None`)。与官方 macOS 主机的第二会话场景尚待报告者实测。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.39_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.39-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.39`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
GNOME 多显示器与精确触控、niri 适配、控制端控制中心与中英文界面,以及登录设备注册修复。/ GNOME multi-monitor and precise touch, niri support, a viewer control center with Chinese/English UI, and a login device-registration fix.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **GNOME(Wayland / Portal)多显示器切换(#128,感谢 @spixyy7)**:逐块显示器公布并各自保存 Portal 授权,首次在主机上授权一次,之后静默恢复;最后一个控制端断开后立即停止屏幕共享。
|
||||||
|
GNOME Portal: per-monitor sources with per-monitor saved grants (asked once, restored silently); screen sharing stops when the last viewer leaves.
|
||||||
|
- **niri 支持(#71,感谢 @WALKERKILLER)**:`UU_WAYLAND_MULTISCREEN=1` 下的显示器枚举与切换、旋转输出的正向采集与指针映射、手机端中文输入。其他合成器行为不变。
|
||||||
|
niri: output enumeration/switching, upright capture and pointer mapping for rotated outputs, and mobile text input; other compositors unchanged.
|
||||||
|
- **原生控制端(#129,感谢 @spixyy7)**:按被控端原始分辨率解码、中英文界面(`UU_LANG` 或设置)、控制中心(`Ctrl+Alt+M`)、网络状态面板(`Ctrl+Alt+G`,显示实测 RTT)、连接加载画面。控制端登录不会开启本机被控服务(默认关闭)。
|
||||||
|
Native viewer: native-resolution decode, Chinese/English UI, control center, network panel with measured RTT, connection screen. Viewer login does not enable the local host service (off by default).
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **GNOME 触控偏移(#128)**:绝对移动与点击改走当前 Portal 流,不再映射到整个多屏桌面。/ Absolute pointer goes through the current Portal stream.
|
||||||
|
- **账号下出现永远离线的“幽灵”设备(#127,感谢 @spixyy7)**:主机与控制端同时登录时,设备注册在配置文件锁下串行进行并复用已注册的设备。/ Device registration is serialized under a config lock.
|
||||||
|
- **控制端**:控制中心卡顿与随后的花屏、Wayland 下关闭文件传输窗口崩溃(#129)。/ Viewer menu stalls and resulting corruption; crash closing the file-transfer window on Wayland.
|
||||||
|
- **TURN over TCP/TLS 经检查型代理**:代理返回 HTTP 时给出明确错误(代理在检查 TLS 内容,TURN 无法通过),不再报含糊的解析错误。/ A clear error when an inspecting proxy answers with HTTP inside the relay stream.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI。GNOME 多显示器/触控由贡献者在 Fedora 44 / GNOME 50.6 双屏实机验证;niri 与控制端改动由各自贡献者实机验证(控制端 RTT 补丁实测仅覆盖 Android 控制端场景)。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.40_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.40-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.40`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -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.**
|
||||||
@@ -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.**
|
||||||
@@ -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.**
|
||||||
@@ -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.
|
||||||
+100
-1
@@ -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();
|
||||||
|
}
|
||||||
|
}
|
||||||
+4
-1
@@ -82,8 +82,10 @@ pub struct ScreenCapture {
|
|||||||
impl ScreenCapture {
|
impl ScreenCapture {
|
||||||
pub fn open_portal(cancelled: &std::sync::atomic::AtomicBool) -> Result<Self, crate::portal::PortalError> {
|
pub fn open_portal(cancelled: &std::sync::atomic::AtomicBool) -> Result<Self, crate::portal::PortalError> {
|
||||||
let session = std::sync::Arc::new(crate::portal::PortalSession::open_cancellable(cancelled)?);
|
let session = std::sync::Arc::new(crate::portal::PortalSession::open_cancellable(cancelled)?);
|
||||||
|
crate::portal::register(&session);
|
||||||
|
let (width, height) = session.size();
|
||||||
Ok(Self { backend: crate::desktop_backend::DesktopBackend::Portal, init_error: None,
|
Ok(Self { backend: crate::desktop_backend::DesktopBackend::Portal, init_error: None,
|
||||||
display: "wayland:portal".into(), width: session.width, height: session.height,
|
display: "wayland:portal".into(), width, height,
|
||||||
portal: Some(session), kms: None, buffer: Mutex::new(Vec::new()) })
|
portal: Some(session), kms: None, buffer: Mutex::new(Vec::new()) })
|
||||||
}
|
}
|
||||||
pub fn new() -> Result<Self, String> {
|
pub fn new() -> Result<Self, String> {
|
||||||
@@ -179,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();
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -79,6 +79,53 @@ 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 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] {
|
||||||
|
|||||||
@@ -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(());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -123,6 +123,14 @@ impl PortalDesktop {
|
|||||||
|| state.screen.portal.as_ref().is_some_and(|portal| !portal.is_alive()));
|
|| state.screen.portal.as_ref().is_some_and(|portal| !portal.is_alive()));
|
||||||
}
|
}
|
||||||
pub fn snapshot(&self) -> State { self.state.borrow().clone() }
|
pub fn snapshot(&self) -> State { self.state.borrow().clone() }
|
||||||
|
/// No desktop controller left: stop sharing the screen. begin() then sees the dead
|
||||||
|
/// session and the next controller's maintain() reopens it with the saved consent.
|
||||||
|
pub fn end_idle(&self) {
|
||||||
|
if let Some(portal) = self.snapshot().screen.portal.as_ref().filter(|portal| portal.is_alive()) {
|
||||||
|
portal.end();
|
||||||
|
log::info!("Portal screen sharing ended: no desktop controller");
|
||||||
|
}
|
||||||
|
}
|
||||||
pub fn subscribe(&self) -> watch::Receiver<State> { self.state.subscribe() }
|
pub fn subscribe(&self) -> watch::Receiver<State> { self.state.subscribe() }
|
||||||
pub fn lock_state(&self) -> watch::Receiver<Option<bool>> { self.locked.clone() }
|
pub fn lock_state(&self) -> watch::Receiver<Option<bool>> { self.locked.clone() }
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
|||||||
@@ -87,6 +87,7 @@ pub use native::symbol;
|
|||||||
pub trait Missing { fn missing() -> Self; }
|
pub trait Missing { fn missing() -> Self; }
|
||||||
impl Missing for () { fn missing() -> Self {} }
|
impl Missing for () { fn missing() -> Self {} }
|
||||||
impl Missing for i32 { fn missing() -> Self { -1 } }
|
impl Missing for i32 { fn missing() -> Self { -1 } }
|
||||||
|
impl Missing for usize { fn missing() -> Self { 0 } }
|
||||||
impl<T> Missing for *mut T { fn missing() -> Self { std::ptr::null_mut() } }
|
impl<T> Missing for *mut T { fn missing() -> Self { std::ptr::null_mut() } }
|
||||||
|
|
||||||
/// Declares engine C functions: an `extern "C"` block when linked statically, or dlsym-resolved
|
/// Declares engine C functions: an `extern "C"` block when linked statically, or dlsym-resolved
|
||||||
|
|||||||
+57
@@ -0,0 +1,57 @@
|
|||||||
|
//! UI language: Chinese (the official clients' wording) or English.
|
||||||
|
//! `UU_LANG=zh|en`, else the choice saved from the settings window (`language` next to config.json),
|
||||||
|
//! else the locale (`LC_ALL` / `LC_MESSAGES` / `LANG` starting with `zh` → Chinese, anything else → English).
|
||||||
|
use std::sync::OnceLock;
|
||||||
|
|
||||||
|
static ENGLISH: OnceLock<bool> = OnceLock::new();
|
||||||
|
|
||||||
|
fn parse(value: &str) -> Option<bool> {
|
||||||
|
let value = value.trim().to_ascii_lowercase();
|
||||||
|
if value.starts_with("zh") { Some(false) } else if value.starts_with("en") { Some(true) } else { None }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn saved_path() -> std::path::PathBuf {
|
||||||
|
crate::config::path().parent().map_or_else(|| "language".into(), |dir| dir.join("language"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn detect() -> bool {
|
||||||
|
if let Some(english) = std::env::var("UU_LANG").ok().as_deref().and_then(parse) { return english; }
|
||||||
|
if let Some(english) = std::fs::read_to_string(saved_path()).ok().as_deref().and_then(parse) { return english; }
|
||||||
|
let locale = ["LC_ALL", "LC_MESSAGES", "LANG"].iter()
|
||||||
|
.find_map(|name| std::env::var(name).ok().filter(|v| !v.is_empty()));
|
||||||
|
!locale.is_some_and(|v| v.to_ascii_lowercase().starts_with("zh"))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn english() -> bool { *ENGLISH.get_or_init(detect) }
|
||||||
|
|
||||||
|
/// Pick the text for the current language.
|
||||||
|
pub fn s(zh: &'static str, en: &'static str) -> &'static str { if english() { en } else { zh } }
|
||||||
|
|
||||||
|
/// Saves the settings-window choice; it applies on the next start.
|
||||||
|
pub fn save(english: bool) -> std::io::Result<()> {
|
||||||
|
let path = saved_path();
|
||||||
|
if let Some(dir) = path.parent() { std::fs::create_dir_all(dir)?; }
|
||||||
|
std::fs::write(path, if english { "en\n" } else { "zh\n" })
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `tr!("连接失败:{e}", "Connection failed: {e}")` formats the string for the current language.
|
||||||
|
#[macro_export]
|
||||||
|
macro_rules! tr {
|
||||||
|
($zh:literal, $en:literal $(, $arg:expr)* $(,)?) => {
|
||||||
|
if $crate::i18n::english() { format!($en $(, $arg)*) } else { format!($zh $(, $arg)*) }
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// The GTK windows (c_engine/i18n.h) ask the same question so both halves always agree.
|
||||||
|
#[no_mangle] pub extern "C" fn uu_i18n_english() -> std::os::raw::c_int { english().into() }
|
||||||
|
#[no_mangle] pub extern "C" fn uu_i18n_save(english: std::os::raw::c_int) -> std::os::raw::c_int {
|
||||||
|
save(english != 0).is_ok().into()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)] mod tests {
|
||||||
|
#[test] fn language_values_are_parsed(){
|
||||||
|
assert_eq!(super::parse("zh_CN.UTF-8"),Some(false));
|
||||||
|
assert_eq!(super::parse("EN\n"),Some(true));
|
||||||
|
assert_eq!(super::parse("sr_RS"),None);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
+578
-12
@@ -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.
|
||||||
@@ -334,6 +528,16 @@ impl InputInjector {
|
|||||||
let result=crate::wayland::move_pointer(x,y,false);
|
let result=crate::wayland::move_pointer(x,y,false);
|
||||||
if result!=-2 { return result; }
|
if result!=-2 { return result; }
|
||||||
}
|
}
|
||||||
|
// 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.
|
||||||
|
if !relative && self.backend==crate::desktop_backend::DesktopBackend::Portal {
|
||||||
|
// 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()};
|
||||||
let (x,y)=placement.map_or((x,y),|(ox,oy)|(x+ox,y+oy));
|
let (x,y)=placement.map_or((x,y),|(ox,oy)|(x+ox,y+oy));
|
||||||
@@ -342,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)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -351,7 +556,25 @@ 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
|
||||||
|
// before the compositor has moved the pointer there (uinput is a separate queue).
|
||||||
|
if !self.uinput_pointer && self.backend==crate::desktop_backend::DesktopBackend::Portal && !self.virtual_uinput() {
|
||||||
|
if 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 {
|
||||||
if let Some((v,h))=crate::uinput::wheel_step(button) { return if pressed { Self::uinput_result(uinput.wheel(v,h)) } else { 0 }; }
|
if let Some((v,h))=crate::uinput::wheel_step(button) { return if pressed { Self::uinput_result(uinput.wheel(v,h)) } else { 0 }; }
|
||||||
if let Some(code)=crate::uinput::button_code(button) { return Self::uinput_result(uinput.button(code,pressed)); }
|
if let Some(code)=crate::uinput::button_code(button) { return Self::uinput_result(uinput.button(code,pressed)); }
|
||||||
@@ -456,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()) };
|
||||||
@@ -484,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);
|
||||||
@@ -499,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; }
|
||||||
@@ -537,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::*;
|
||||||
@@ -628,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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",
|
||||||
|
|||||||
+40
-21
@@ -140,10 +140,10 @@ enum QrPollAction { Wait(i64), Scanned, Confirmed, Refresh(Duration), Failed(&'s
|
|||||||
/// Preserve the official refresh policy; a failed query says nothing about QR expiry.
|
/// Preserve the official refresh policy; a failed query says nothing about QR expiry.
|
||||||
fn qr_poll_action(last_status: i64, http_status: u16, body: &Value) -> QrPollAction {
|
fn qr_poll_action(last_status: i64, http_status: u16, body: &Value) -> QrPollAction {
|
||||||
if body.get("code").and_then(Value::as_i64) == Some(QR_EXPIRED) {
|
if body.get("code").and_then(Value::as_i64) == Some(QR_EXPIRED) {
|
||||||
return QrPollAction::Failed("二维码已失效");
|
return QrPollAction::Failed(crate::i18n::s("二维码已失效","QR code expired"));
|
||||||
}
|
}
|
||||||
let Ok(data) = qr_data("qrcode status", http_status, body) else {
|
let Ok(data) = qr_data("qrcode status", http_status, body) else {
|
||||||
return QrPollAction::Failed("二维码状态查询失败");
|
return QrPollAction::Failed(crate::i18n::s("二维码状态查询失败","QR status check failed"));
|
||||||
};
|
};
|
||||||
match data.get("status").and_then(Value::as_i64) {
|
match data.get("status").and_then(Value::as_i64) {
|
||||||
Some(1) => QrPollAction::Wait(1),
|
Some(1) => QrPollAction::Wait(1),
|
||||||
@@ -152,7 +152,7 @@ fn qr_poll_action(last_status: i64, http_status: u16, body: &Value) -> QrPollAct
|
|||||||
Some(0) => QrPollAction::Refresh(Duration::from_millis(350)),
|
Some(0) => QrPollAction::Refresh(Duration::from_millis(350)),
|
||||||
Some(3) => QrPollAction::Refresh(Duration::ZERO),
|
Some(3) => QrPollAction::Refresh(Duration::ZERO),
|
||||||
Some(4) => QrPollAction::Confirmed,
|
Some(4) => QrPollAction::Confirmed,
|
||||||
_ => QrPollAction::Failed("二维码状态响应异常"),
|
_ => QrPollAction::Failed(crate::i18n::s("二维码状态响应异常","Unexpected QR status response")),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -247,10 +247,10 @@ pub async fn run(gui: bool) -> Result<(), String> {
|
|||||||
};
|
};
|
||||||
match &result {
|
match &result {
|
||||||
Ok(name) => {
|
Ok(name) => {
|
||||||
ui.done(&format!("登录成功\n{name}"));
|
ui.done(&crate::tr!("登录成功\n{name}","Signed in\n{name}"));
|
||||||
ui.status("登录信息已保存到本机配置,可以关闭此窗口", Tone::Ok);
|
ui.status(crate::i18n::s("登录信息已保存到本机配置,可以关闭此窗口","Sign-in saved to the local config; you can close this window"), Tone::Ok);
|
||||||
}
|
}
|
||||||
Err(e) => { eprintln!("login failed: {e}"); ui.status(&format!("登录失败:{e}"), Tone::Error); }
|
Err(e) => { eprintln!("login failed: {e}"); ui.status(&crate::tr!("登录失败:{e}","Sign-in failed: {e}"), Tone::Error); }
|
||||||
}
|
}
|
||||||
if ui.shown() { ui.wait_closed().await; }
|
if ui.shown() { ui.wait_closed().await; }
|
||||||
result.map(|_| ())
|
result.map(|_| ())
|
||||||
@@ -272,7 +272,26 @@ pub fn prepare_identity() -> Result<(Value, Credentials), String> {
|
|||||||
Ok((cfg, creds))
|
Ok((cfg, creds))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Holds an exclusive lock beside config.json while a device identity is created: the host's own QR
|
||||||
|
/// window and the viewer's sign-in can run at once, and two `device/windows/init` calls would leave the
|
||||||
|
/// account bound to one device while config.json keeps the other (the host then shows as offline).
|
||||||
|
struct IdentityLock(std::fs::File);
|
||||||
|
impl IdentityLock {
|
||||||
|
fn acquire() -> Result<Self, String> {
|
||||||
|
use std::os::unix::io::AsRawFd;
|
||||||
|
let path = crate::config::path().with_extension("lock");
|
||||||
|
if let Some(dir) = path.parent() { let _ = std::fs::create_dir_all(dir); }
|
||||||
|
let file = std::fs::OpenOptions::new().create(true).truncate(false).write(true).open(&path).map_err(|_| "Cannot open the identity lock")?;
|
||||||
|
if unsafe { libc::flock(file.as_raw_fd(), libc::LOCK_EX) } != 0 { return Err("Cannot lock the device identity".into()) }
|
||||||
|
Ok(Self(file))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl Drop for IdentityLock { fn drop(&mut self) { use std::os::unix::io::AsRawFd; unsafe { libc::flock(self.0.as_raw_fd(), libc::LOCK_UN); } } }
|
||||||
|
|
||||||
pub async fn prepare_device() -> Result<(Value, Credentials), String> {
|
pub async fn prepare_device() -> Result<(Value, Credentials), String> {
|
||||||
|
// Read the configuration only after taking the lock, so a waiting process sees the device the
|
||||||
|
// first one registered instead of creating its own.
|
||||||
|
let _lock = tokio::task::spawn_blocking(IdentityLock::acquire).await.map_err(|_| "Identity lock task failed")??;
|
||||||
let (mut cfg, mut creds) = prepare_identity()?;
|
let (mut cfg, mut creds) = prepare_identity()?;
|
||||||
let get = |cfg: &Value, k: &str| std::env::var(format!("UU_{}", k.to_uppercase())).ok().filter(|v| !v.is_empty())
|
let get = |cfg: &Value, k: &str| std::env::var(format!("UU_{}", k.to_uppercase())).ok().filter(|v| !v.is_empty())
|
||||||
.or_else(|| cfg.get(k).and_then(|v| v.as_str()).map(str::to_owned)).unwrap_or_default();
|
.or_else(|| cfg.get(k).and_then(|v| v.as_str()).map(str::to_owned)).unwrap_or_default();
|
||||||
@@ -309,14 +328,14 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
|||||||
Ok(r) => r,
|
Ok(r) => r,
|
||||||
Err(e) if e.response_received() => {
|
Err(e) if e.response_received() => {
|
||||||
eprintln!("QR generation response failed: {e}");
|
eprintln!("QR generation response failed: {e}");
|
||||||
wait_for_refresh(ui, "二维码加载失败").await;
|
wait_for_refresh(ui, crate::i18n::s("二维码加载失败","QR code failed to load")).await;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
Err(e) => return Err(format!("QR generation failed: {e}")),
|
Err(e) => return Err(format!("QR generation failed: {e}")),
|
||||||
};
|
};
|
||||||
let d = match qr_data("qrcode gen", status, &resp) {
|
let d = match qr_data("qrcode gen", status, &resp) {
|
||||||
Ok(d) => d.clone(),
|
Ok(d) => d.clone(),
|
||||||
Err(e) => { println!("QR code could not be loaded ({e})"); wait_for_refresh(ui, "二维码加载失败").await; continue; }
|
Err(e) => { println!("QR code could not be loaded ({e})"); wait_for_refresh(ui, crate::i18n::s("二维码加载失败","QR code failed to load")).await; continue; }
|
||||||
};
|
};
|
||||||
let url = d.get("qrcode_jump_url").and_then(|v| v.as_str()).ok_or("qrcode gen returned no qrcode_jump_url")?.to_string();
|
let url = d.get("qrcode_jump_url").and_then(|v| v.as_str()).ok_or("qrcode gen returned no qrcode_jump_url")?.to_string();
|
||||||
let ticket = qr_ticket(&d).ok_or("qrcode gen returned no status ticket")?.to_string();
|
let ticket = qr_ticket(&d).ok_or("qrcode gen returned no status ticket")?.to_string();
|
||||||
@@ -325,7 +344,7 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
|||||||
let modules = qrcode::QrCode::new(url.as_bytes()).map_err(|e| e.to_string())?.width() + 2;
|
let modules = qrcode::QrCode::new(url.as_bytes()).map_err(|e| e.to_string())?.width() + 2;
|
||||||
let (rgba, edge) = qr_rgba(&url, (224 / modules).max(2), 1)?;
|
let (rgba, edge) = qr_rgba(&url, (224 / modules).max(2), 1)?;
|
||||||
ui.qr(&rgba, edge);
|
ui.qr(&rgba, edge);
|
||||||
ui.status("等待扫码…", Tone::Info);
|
ui.status(crate::i18n::s("等待扫码…","Waiting for scan…"), Tone::Info);
|
||||||
}
|
}
|
||||||
if let Some(path)=std::env::var_os("UU_LOGIN_QR_PNG") {
|
if let Some(path)=std::env::var_os("UU_LOGIN_QR_PNG") {
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
@@ -343,20 +362,20 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
|||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("QR status query failed: {e}; last_status={login_status}");
|
eprintln!("QR status query failed: {e}; last_status={login_status}");
|
||||||
break match e.kind {
|
break match e.kind {
|
||||||
QrRequestErrorKind::Timeout => "二维码状态查询超时(不代表二维码已失效)",
|
QrRequestErrorKind::Timeout => crate::i18n::s("二维码状态查询超时(不代表二维码已失效)","QR status check timed out (the QR code may still be valid)"),
|
||||||
_ => "二维码状态查询失败(不代表二维码已失效)",
|
_ => crate::i18n::s("二维码状态查询失败(不代表二维码已失效)","QR status check failed (the QR code may still be valid)"),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
match qr_poll_action(login_status, status, &resp) {
|
match qr_poll_action(login_status, status, &resp) {
|
||||||
QrPollAction::Wait(st) => {
|
QrPollAction::Wait(st) => {
|
||||||
if st == 1 && login_status != 1 { ui.status("等待扫码…", Tone::Info); }
|
if st == 1 && login_status != 1 { ui.status(crate::i18n::s("等待扫码…","Waiting for scan…"), Tone::Info); }
|
||||||
login_status = st;
|
login_status = st;
|
||||||
}
|
}
|
||||||
QrPollAction::Scanned => {
|
QrPollAction::Scanned => {
|
||||||
login_status = 2;
|
login_status = 2;
|
||||||
println!("已扫码,请在手机上确认 (scanned, confirm on the phone)");
|
println!("已扫码,请在手机上确认 (scanned, confirm on the phone)");
|
||||||
ui.status("已扫码,请在手机上确认登录", Tone::Ok);
|
ui.status(crate::i18n::s("已扫码,请在手机上确认登录","Scanned, confirm the sign-in on your phone"), Tone::Ok);
|
||||||
}
|
}
|
||||||
QrPollAction::Refresh(delay) => {
|
QrPollAction::Refresh(delay) => {
|
||||||
if delay.is_zero() { println!("QR code expired; generating a new one"); }
|
if delay.is_zero() { println!("QR code expired; generating a new one"); }
|
||||||
@@ -365,19 +384,19 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
|||||||
}
|
}
|
||||||
QrPollAction::Confirmed => {
|
QrPollAction::Confirmed => {
|
||||||
println!("已确认,正在完成登录 (confirmed, completing login)");
|
println!("已确认,正在完成登录 (confirmed, completing login)");
|
||||||
ui.status("已确认,正在完成登录…", Tone::Info);
|
ui.status(crate::i18n::s("已确认,正在完成登录…","Confirmed, finishing sign-in…"), Tone::Info);
|
||||||
let body = json!({"token": ticket, "qrcode_jump_url": url});
|
let body = json!({"token": ticket, "qrcode_jump_url": url});
|
||||||
let (status, resp) = match client.post_with_timeout("/api/v1/login/by_qrcode", Some(&body), timeout).await {
|
let (status, resp) = match client.post_with_timeout("/api/v1/login/by_qrcode", Some(&body), timeout).await {
|
||||||
Ok(r) => r,
|
Ok(r) => r,
|
||||||
Err(e) if e.response_received() => {
|
Err(e) if e.response_received() => {
|
||||||
eprintln!("QR login exchange response failed: {e}");
|
eprintln!("QR login exchange response failed: {e}");
|
||||||
break "登录失败";
|
break crate::i18n::s("登录失败","Sign-in failed");
|
||||||
}
|
}
|
||||||
Err(e) => return Err(format!("QR login exchange failed: {e}")),
|
Err(e) => return Err(format!("QR login exchange failed: {e}")),
|
||||||
};
|
};
|
||||||
let d = match qr_data("qrcode login", status, &resp) {
|
let d = match qr_data("qrcode login", status, &resp) {
|
||||||
Ok(d) => d,
|
Ok(d) => d,
|
||||||
Err(e) => { println!("QR login not granted ({e})"); break "登录失败"; }
|
Err(e) => { println!("QR login not granted ({e})"); break crate::i18n::s("登录失败","Sign-in failed"); }
|
||||||
};
|
};
|
||||||
let token = d.get("token").and_then(|v| v.as_str()).ok_or("login returned no token")?;
|
let token = d.get("token").and_then(|v| v.as_str()).ok_or("login returned no token")?;
|
||||||
let user = d.get("user_id").and_then(|v| v.as_str()).ok_or("login returned no user_id")?;
|
let user = d.get("user_id").and_then(|v| v.as_str()).ok_or("login returned no user_id")?;
|
||||||
@@ -415,7 +434,7 @@ fn qr_ticket(gen: &Value) -> Option<&str> {
|
|||||||
/// or (no window and no terminal, e.g. a service) one minute.
|
/// or (no window and no terminal, e.g. a service) one minute.
|
||||||
async fn wait_for_refresh(ui: &LoginUi, reason: &str) {
|
async fn wait_for_refresh(ui: &LoginUi, reason: &str) {
|
||||||
use std::io::IsTerminal;
|
use std::io::IsTerminal;
|
||||||
ui.status(&format!("{reason},请点击「刷新二维码」"), Tone::Error);
|
ui.status(&crate::tr!("{reason},请点击「刷新二维码」","{reason}. Click \"Refresh QR code\"."), Tone::Error);
|
||||||
ui.offer_refresh(true);
|
ui.offer_refresh(true);
|
||||||
let terminal = !ui.quiet() && std::io::stdin().is_terminal();
|
let terminal = !ui.quiet() && std::io::stdin().is_terminal();
|
||||||
if terminal { println!("{reason}. Press Enter to show a new QR code (按回车刷新二维码)"); }
|
if terminal { println!("{reason}. Press Enter to show a new QR code (按回车刷新二维码)"); }
|
||||||
@@ -443,18 +462,18 @@ mod tests {
|
|||||||
assert_eq!(qr_poll_action(2, 200, &reply(4)), QrPollAction::Confirmed);
|
assert_eq!(qr_poll_action(2, 200, &reply(4)), QrPollAction::Confirmed);
|
||||||
assert_eq!(qr_poll_action(1, 200, &reply(0)), QrPollAction::Refresh(Duration::from_millis(350)));
|
assert_eq!(qr_poll_action(1, 200, &reply(0)), QrPollAction::Refresh(Duration::from_millis(350)));
|
||||||
assert_eq!(qr_poll_action(2, 200, &reply(3)), QrPollAction::Refresh(Duration::ZERO));
|
assert_eq!(qr_poll_action(2, 200, &reply(3)), QrPollAction::Refresh(Duration::ZERO));
|
||||||
assert_eq!(qr_poll_action(2, 400, &json!({"code": 1190})), QrPollAction::Failed("二维码已失效"));
|
assert_eq!(qr_poll_action(2, 400, &json!({"code": 1190})), QrPollAction::Failed(crate::i18n::s("二维码已失效","QR code expired")));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn qr_poll_failures_do_not_imply_expiry_or_confirmation() {
|
fn qr_poll_failures_do_not_imply_expiry_or_confirmation() {
|
||||||
for last in [1, 2] {
|
for last in [1, 2] {
|
||||||
for body in [json!(null), json!({"code": 1}), json!({"code": 0, "data": {"status": 4}})] {
|
for body in [json!(null), json!({"code": 1}), json!({"code": 0, "data": {"status": 4}})] {
|
||||||
assert_eq!(qr_poll_action(last, 503, &body), QrPollAction::Failed("二维码状态查询失败"));
|
assert_eq!(qr_poll_action(last, 503, &body), QrPollAction::Failed(crate::i18n::s("二维码状态查询失败","QR status check failed")));
|
||||||
}
|
}
|
||||||
assert_eq!(qr_poll_action(last, 200, &json!({"code": 1})), QrPollAction::Failed("二维码状态查询失败"));
|
assert_eq!(qr_poll_action(last, 200, &json!({"code": 1})), QrPollAction::Failed(crate::i18n::s("二维码状态查询失败","QR status check failed")));
|
||||||
for data in [json!(null), json!({}), json!({"status": "4"}), json!({"status": 99}), json!({"status": -1})] {
|
for data in [json!(null), json!({}), json!({"status": "4"}), json!({"status": 99}), json!({"status": -1})] {
|
||||||
assert_eq!(qr_poll_action(last, 200, &json!({"code": 0, "data": data})), QrPollAction::Failed("二维码状态响应异常"));
|
assert_eq!(qr_poll_action(last, 200, &json!({"code": 0, "data": data})), QrPollAction::Failed(crate::i18n::s("二维码状态响应异常","Unexpected QR status response")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+49
-13
@@ -16,6 +16,7 @@ mod wayland;
|
|||||||
mod auth;
|
mod auth;
|
||||||
mod assist;
|
mod assist;
|
||||||
mod config;
|
mod config;
|
||||||
|
mod i18n;
|
||||||
mod login;
|
mod login;
|
||||||
mod login_ui;
|
mod login_ui;
|
||||||
mod session_lock;
|
mod session_lock;
|
||||||
@@ -44,6 +45,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;
|
||||||
@@ -70,6 +72,8 @@ use webrtc::WebRtcSession;
|
|||||||
/// Set before a normal return when the host must come back in the other mode (signed in / out).
|
/// Set before a normal return when the host must come back in the other mode (signed in / out).
|
||||||
static RESTART: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
|
static RESTART: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
|
||||||
|
|
||||||
|
struct AbortOnDrop(tokio::task::AbortHandle);
|
||||||
|
impl Drop for AbortOnDrop { fn drop(&mut self) { self.0.abort(); } }
|
||||||
fn superseded_peer_ids(sessions: &HashMap<String, WebRtcSession>, ice: &str, desktop: bool) -> Vec<String> {
|
fn superseded_peer_ids(sessions: &HashMap<String, WebRtcSession>, ice: &str, desktop: bool) -> Vec<String> {
|
||||||
sessions.iter().filter(|(id, peer)| id.as_str() == ice || (desktop && peer.desktop))
|
sessions.iter().filter(|(id, peer)| id.as_str() == ice || (desktop && peer.desktop))
|
||||||
.map(|(id, _)| id.clone()).collect()
|
.map(|(id, _)| id.clone()).collect()
|
||||||
@@ -205,7 +209,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).
|
||||||
@@ -627,9 +631,24 @@ 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"));
|
||||||
|
session_ice::configure_relay_transport();
|
||||||
// Before host.pid, and before assist: a missing or failed assist session must still handle SIGUSR2.
|
// Before host.pid, and before assist: a missing or failed assist session must still handle SIGUSR2.
|
||||||
let _ = install_host_signals(None);
|
let _ = install_host_signals(None);
|
||||||
video::warm_auto_probe();
|
video::warm_auto_probe();
|
||||||
@@ -664,7 +683,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 };
|
||||||
@@ -695,7 +714,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.
|
||||||
@@ -712,6 +731,21 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
assist: &mut Option<assist::Assist>, commands: &mut mpsc::Receiver<assist::Command>, webrtc_sessions: Arc<Mutex<HashMap<String, WebRtcSession>>>) -> Result<(), Box<dyn std::error::Error>> {
|
assist: &mut Option<assist::Assist>, commands: &mut mpsc::Receiver<assist::Command>, webrtc_sessions: Arc<Mutex<HashMap<String, WebRtcSession>>>) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
let portal_desktop = (capture.backend == desktop_backend::DesktopBackend::Portal && !desktop_backend::headless())
|
let portal_desktop = (capture.backend == desktop_backend::DesktopBackend::Portal && !desktop_backend::headless())
|
||||||
.then(|| Arc::new(desktop_session::PortalDesktop::new(capture.clone())));
|
.then(|| Arc::new(desktop_session::PortalDesktop::new(capture.clone())));
|
||||||
|
// Stop sharing the screen once no desktop controller is left. Viewers send stop_capture
|
||||||
|
// before leaving and phones reconnect within seconds, so require two idle checks in a row.
|
||||||
|
let idle_watch = portal_desktop.clone().map(|portal| {
|
||||||
|
let sessions = webrtc_sessions.clone();
|
||||||
|
tokio::spawn(async move {
|
||||||
|
let mut idle = 0u8;
|
||||||
|
loop {
|
||||||
|
tokio::time::sleep(std::time::Duration::from_secs(2)).await;
|
||||||
|
if sessions.lock().await.values().any(|s| s.role.is_desktop()) { idle = 0; continue; }
|
||||||
|
idle = idle.saturating_add(1);
|
||||||
|
if idle >= 2 { portal.end_idle(); }
|
||||||
|
}
|
||||||
|
})
|
||||||
|
});
|
||||||
|
let _idle_watch = idle_watch.map(|task| AbortOnDrop(task.abort_handle()));
|
||||||
let mut auth = if let Some(session) = assist.as_ref() { session.client.clone() } else {
|
let mut auth = if let Some(session) = assist.as_ref() { session.client.clone() } else {
|
||||||
let creds = match config::file().and_then(Credentials::load) {
|
let creds = match config::file().and_then(Credentials::load) {
|
||||||
Ok(creds) => creds,
|
Ok(creds) => creds,
|
||||||
@@ -744,8 +778,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
// 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>();
|
||||||
|
|
||||||
@@ -869,6 +903,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
let mut desktop_ended = false;
|
let mut desktop_ended = false;
|
||||||
for id in ended { if let Some(s) = sessions.remove(&id) { desktop_ended |= s.role.is_desktop(); close_peer(&s.pc).await; } }
|
for id in ended { if let Some(s) = sessions.remove(&id) { desktop_ended |= s.role.is_desktop(); close_peer(&s.pc).await; } }
|
||||||
if desktop_ended && !sessions.values().any(|s| s.role.is_desktop()) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
|
if desktop_ended && !sessions.values().any(|s| s.role.is_desktop()) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
|
||||||
|
// The controller left: stop sharing now; reconnecting reopens silently with the saved consent.
|
||||||
|
if !sessions.values().any(|s| s.role.is_desktop()) { if let Some(portal) = &portal_desktop { portal.end_idle(); } }
|
||||||
if let Some(s) = assist.as_mut() { s.tick()?; }
|
if let Some(s) = assist.as_mut() { s.tick()?; }
|
||||||
}
|
}
|
||||||
SignalingEvent::Connected => {
|
SignalingEvent::Connected => {
|
||||||
@@ -930,9 +966,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(); }
|
||||||
@@ -963,8 +999,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(); }
|
||||||
@@ -996,7 +1032,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()); });
|
||||||
@@ -1063,7 +1099,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
|
||||||
@@ -1077,7 +1113,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.
|
||||||
|
|||||||
+337
-39
@@ -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,11 +51,22 @@ 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_monitors(out: *mut libc::c_char, length: usize) -> i32;
|
||||||
|
fn uu_portal_end(portal: *mut c_void);
|
||||||
}
|
}
|
||||||
struct Handle(NonNull<c_void>);
|
struct Handle(NonNull<c_void>);
|
||||||
|
fn pack(width: u32, height: u32) -> u64 { (u64::from(width) << 32) | u64::from(height) }
|
||||||
// The engine owns callback threads; public calls are serialized by Mutex.
|
// The engine owns callback threads; public calls are serialized by Mutex.
|
||||||
unsafe impl Send for Handle {}
|
unsafe impl Send for Handle {}
|
||||||
impl Drop for Handle { fn drop(&mut self) { unsafe { uu_portal_close(self.0.as_ptr()) } } }
|
impl Drop for Handle { fn drop(&mut self) { unsafe { uu_portal_close(self.0.as_ptr()) } } }
|
||||||
@@ -84,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>, pub width: u32, pub height: u32 }
|
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
|
||||||
@@ -99,7 +126,7 @@ mod native {
|
|||||||
fn check_geometry(&self, replacement: &Self) -> Result<(), super::PortalError> {
|
fn check_geometry(&self, replacement: &Self) -> Result<(), super::PortalError> {
|
||||||
// Encoder buffers use frame pixels. Logical geometry and EIS regions
|
// Encoder buffers use frame pixels. Logical geometry and EIS regions
|
||||||
// belong to the replacement handle and may change with scaling (#25).
|
// belong to the replacement handle and may change with scaling (#25).
|
||||||
if (self.width, self.height) != (replacement.width, replacement.height) {
|
if self.size() != replacement.size() {
|
||||||
Err(super::PortalError { code: 14 })
|
Err(super::PortalError { code: 14 })
|
||||||
} else {
|
} else {
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -108,7 +135,11 @@ mod native {
|
|||||||
pub fn is_alive(&self) -> bool {
|
pub fn is_alive(&self) -> bool {
|
||||||
self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_alive(handle.0.as_ptr()) != 0 })
|
self.handle.lock().is_ok_and(|handle| unsafe { uu_portal_alive(handle.0.as_ptr()) != 0 })
|
||||||
}
|
}
|
||||||
fn open_inner(cancelled: Option<&std::sync::atomic::AtomicBool>) -> Result<Self, super::PortalError> {
|
/// Opens a session for `monitor` (a Mutter connector) with that monitor's saved consent;
|
||||||
|
/// None means the screen currently selected, or the only monitor.
|
||||||
|
/// `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))
|
||||||
@@ -121,22 +152,57 @@ 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 token = directory.as_deref().and_then(|dir| super::permissions::take(dir, key))
|
let wanted = if virtual_output { None } else { monitor.map(str::to_owned).or_else(crate::wayland::portal_monitor) };
|
||||||
.and_then(|value| std::ffi::CString::new(value).ok());
|
let virtual_key = format!("{key}-virtual");
|
||||||
let mut cache = (directory, key);
|
// 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.
|
||||||
|
let taken = directory.as_deref().filter(|_| !fresh).and_then(|dir| {
|
||||||
|
let take = |k: String| super::permissions::take(dir, &k).map(|v| (k, v));
|
||||||
|
if virtual_output { return take(virtual_key.clone()); }
|
||||||
|
wanted.as_deref().and_then(|name| take(super::permissions::monitor_key(name))).or_else(|| take(key.to_owned()))
|
||||||
|
});
|
||||||
|
let token = taken.as_ref().and_then(|(_, value)| std::ffi::CString::new(value.as_str()).ok());
|
||||||
|
// The new token is saved once the granted monitor is known (after open).
|
||||||
|
let 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) {
|
||||||
// Callback is synchronous during open; cache lives through the call.
|
// Callback is synchronous during open; cache lives through the call.
|
||||||
let result = std::panic::catch_unwind(|| unsafe {
|
let result = std::panic::catch_unwind(|| unsafe {
|
||||||
let cache = &*(data as *const (Option<std::path::PathBuf>, &'static str));
|
let cache = &mut *(data as *mut Option<String>);
|
||||||
if let (Some(dir), Ok(value)) = (cache.0.as_deref(), std::ffi::CStr::from_ptr(token).to_str()) {
|
*cache = std::ffi::CStr::from_ptr(token).to_str().ok().map(str::to_owned);
|
||||||
if super::permissions::save(dir, cache.1, value).is_err() { log::warn!("Portal permission cache could not be saved"); }
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
if result.is_err() { log::warn!("Portal permission cache callback failed"); }
|
if result.is_err() { log::warn!("Portal permission cache callback failed"); }
|
||||||
}
|
}
|
||||||
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,
|
||||||
@@ -145,18 +211,107 @@ 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 Some(handle) = NonNull::new(pointer) else { return Err(failed(error, &cache)) };
|
||||||
|
let (mut x, mut y) = (0, 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();
|
||||||
|
if let (Some(dir), Some(token)) = (directory.as_deref(), cache.take()) {
|
||||||
|
let saved = match &granted {
|
||||||
|
_ if virtual_output => virtual_key.clone(),
|
||||||
|
Some(name) => super::permissions::monitor_key(name),
|
||||||
|
None => key.to_owned(),
|
||||||
|
};
|
||||||
|
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"); }
|
||||||
|
// Keep a freshly granted compositor frame regardless of lock state. Discarding it
|
||||||
|
// before new damage can leave a static desktop permanently blank (#2).
|
||||||
|
Ok(Self { handle: Mutex::new(Handle(handle)), locked: crate::session_lock::watch_locked(), was_locked: std::sync::atomic::AtomicBool::new(false), recovery: Mutex::new(Recovery::default()), size: pack(width, height).into(), monitor: Mutex::new(granted), virtual_output: virtual_output.into() })
|
||||||
|
}
|
||||||
|
/// Frame pixels of the monitor the stream currently follows.
|
||||||
|
pub fn size(&self) -> (u32, u32) {
|
||||||
|
let packed = self.size.load(std::sync::atomic::Ordering::Acquire);
|
||||||
|
((packed >> 32) as u32, packed as u32)
|
||||||
|
}
|
||||||
|
/// End the compositor session (screen-share indicator off); the next desktop
|
||||||
|
/// connection reopens it with the saved consent.
|
||||||
|
pub fn end(&self) {
|
||||||
|
if let Ok(handle) = self.handle.lock() { unsafe { uu_portal_end(handle.0.as_ptr()) }; }
|
||||||
|
}
|
||||||
|
/// Mutter connector of the monitor this session captures, when several are advertised.
|
||||||
|
pub fn monitor(&self) -> Option<String> { self.monitor.lock().ok().and_then(|m| m.clone()) }
|
||||||
|
/// Capture another monitor: open its own session (silently with saved consent; the first
|
||||||
|
/// 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> {
|
||||||
|
if self.monitor().as_deref() == Some(connector) { return Ok(()); }
|
||||||
|
let replacement = Self::open_inner(None, Some(connector), false, false).map_err(|error| error.to_string())?;
|
||||||
|
if replacement.monitor().as_deref() != Some(connector) {
|
||||||
|
return Err("Another monitor was shared; choose this monitor in the host dialog".into());
|
||||||
|
}
|
||||||
|
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);
|
||||||
|
std::mem::replace(&mut *handle, next)
|
||||||
};
|
};
|
||||||
let handle = NonNull::new(pointer).ok_or(super::PortalError { code: error })?;
|
if let Ok(mut monitor) = self.monitor.lock() { *monitor = Some(connector.to_owned()); }
|
||||||
// A freshly opened session holds no lock-screen frame: only an observed lock (or a
|
drop(previous);
|
||||||
// closed stream) must discard the cached frame. Starting "locked" cleared the first
|
Ok(())
|
||||||
// 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()), width, height })
|
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).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))
|
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;
|
||||||
@@ -181,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 })?;
|
||||||
@@ -201,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 {
|
||||||
@@ -208,29 +367,67 @@ 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> {
|
||||||
if frame.len() != self.width as usize * self.height as usize * 4 { return Err(super::error(11)); }
|
let (width, height) = self.size();
|
||||||
|
// A buffer sized for the previous monitor belongs to an encoder that a switch is replacing.
|
||||||
|
if frame.len() != width as usize * height as usize * 4 { return Ok(blank_changed(frame, version)); }
|
||||||
let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
|
let handle = self.handle.lock().map_err(|_| "Portal session lock poisoned")?;
|
||||||
// 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() {
|
||||||
@@ -252,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) {
|
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}");
|
||||||
@@ -274,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) => (),
|
||||||
@@ -319,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")?;
|
||||||
@@ -328,6 +550,14 @@ mod native {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Mutter's monitors (GNOME); empty elsewhere.
|
||||||
|
pub fn monitors() -> Vec<super::Monitor> {
|
||||||
|
if crate::engine_plugin::load(crate::engine_plugin::Engine::Portal).is_err() { return Vec::new(); }
|
||||||
|
let mut text = vec![0u8; 8192];
|
||||||
|
if unsafe { uu_portal_monitors(text.as_mut_ptr() as *mut libc::c_char, text.len()) } <= 0 { return Vec::new(); }
|
||||||
|
let end = text.iter().position(|&b| b == 0).unwrap_or(text.len());
|
||||||
|
super::parse_monitors(&String::from_utf8_lossy(&text[..end]))
|
||||||
|
}
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
@@ -342,8 +572,8 @@ mod native {
|
|||||||
locked,
|
locked,
|
||||||
was_locked: std::sync::atomic::AtomicBool::new(false),
|
was_locked: std::sync::atomic::AtomicBool::new(false),
|
||||||
recovery: Mutex::new(Recovery::default()),
|
recovery: Mutex::new(Recovery::default()),
|
||||||
width: physical.0,
|
size: pack(physical.0, physical.1).into(),
|
||||||
height: physical.1,
|
monitor: Mutex::new(None), virtual_output: false.into(),
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -605,6 +835,15 @@ pub use native::Session as PortalSession;
|
|||||||
#[cfg(not(all(target_os = "linux", feature = "portal")))]
|
#[cfg(not(all(target_os = "linux", feature = "portal")))]
|
||||||
pub struct PortalSession { pub width: u32, pub height: u32 }
|
pub struct PortalSession { pub width: u32, pub height: u32 }
|
||||||
#[cfg(not(all(target_os = "linux", feature = "portal")))]
|
#[cfg(not(all(target_os = "linux", feature = "portal")))]
|
||||||
|
impl PortalSession {
|
||||||
|
pub fn size(&self) -> (u32, u32) { (self.width, self.height) }
|
||||||
|
pub fn monitor(&self) -> Option<String> { None }
|
||||||
|
pub fn end(&self) {}
|
||||||
|
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")))]
|
||||||
impl PortalSession {
|
impl PortalSession {
|
||||||
pub fn clipboard_supported(&self) -> bool { false }
|
pub fn clipboard_supported(&self) -> bool { false }
|
||||||
pub fn clipboard_ready(&self) -> bool { false }
|
pub fn clipboard_ready(&self) -> bool { false }
|
||||||
@@ -623,15 +862,61 @@ 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)) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The portal session that monitor switches act on: one per host, reused by reconnects.
|
||||||
|
static ACTIVE: std::sync::Mutex<Option<std::sync::Weak<PortalSession>>> = std::sync::Mutex::new(None);
|
||||||
|
pub fn permissions_directory() -> Option<std::path::PathBuf> { permissions::directory() }
|
||||||
|
pub fn monitor_key(connector: &str) -> String { permissions::monitor_key(connector) }
|
||||||
|
pub fn register(session: &Arc<PortalSession>) {
|
||||||
|
*ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner) = Some(Arc::downgrade(session));
|
||||||
|
}
|
||||||
|
/// 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> {
|
||||||
|
let session = ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref().and_then(std::sync::Weak::upgrade)
|
||||||
|
.ok_or("Portal desktop unavailable")?;
|
||||||
|
session.switch_to(connector)
|
||||||
|
}
|
||||||
|
pub struct Monitor { pub connector: String, pub width: u32, pub height: u32, pub x: i32, pub y: i32, pub primary: bool }
|
||||||
|
#[cfg(all(target_os = "linux", feature = "portal"))]
|
||||||
|
pub use native::monitors;
|
||||||
|
#[cfg(not(all(target_os = "linux", feature = "portal")))]
|
||||||
|
pub fn monitors() -> Vec<Monitor> { Vec::new() }
|
||||||
|
/// `connector\twidth\theight\tx\ty\tprimary` lines from the engine.
|
||||||
|
fn parse_monitors(text: &str) -> Vec<Monitor> {
|
||||||
|
text.lines().filter_map(|line| {
|
||||||
|
let mut f = line.split('\t');
|
||||||
|
let connector = f.next()?.to_owned();
|
||||||
|
let (width, height) = (f.next()?.parse().ok()?, f.next()?.parse().ok()?);
|
||||||
|
let (x, y, primary) = (f.next()?.parse().ok()?, f.next()?.parse().ok()?, f.next()? == "1");
|
||||||
|
(!connector.is_empty() && connector.len() <= 64 && connector.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-' || b == b'_'))
|
||||||
|
.then_some(Monitor { connector, width, height, x, y, primary })
|
||||||
|
}).collect()
|
||||||
|
}
|
||||||
|
|
||||||
/// Forward frames in-process into encoder stdin. Cancellation drops the Arc;
|
/// Forward frames in-process into encoder stdin. Cancellation drops the Arc;
|
||||||
/// the caller keeps one owning Arc for all subsequent desktop reconnects.
|
/// the caller keeps one owning Arc for all subsequent desktop reconnects.
|
||||||
pub fn write_frames(session: Arc<PortalSession>, mut output: impl std::io::Write, cancelled: &std::sync::atomic::AtomicBool) -> Result<(), String> {
|
pub fn write_frames(session: Arc<PortalSession>, mut output: impl std::io::Write, cancelled: &std::sync::atomic::AtomicBool) -> Result<(), String> {
|
||||||
let length = (session.width as usize).checked_mul(session.height as usize).and_then(|n| n.checked_mul(4)).ok_or("Portal frame too large")?;
|
let (width, height) = session.size();
|
||||||
|
let length = (width as usize).checked_mul(height as usize).and_then(|n| n.checked_mul(4)).ok_or("Portal frame too large")?;
|
||||||
let mut frame = vec![0; length];
|
let mut frame = vec![0; length];
|
||||||
let interval = std::time::Duration::from_nanos(1_000_000_000 / crate::video::FPS);
|
let interval = std::time::Duration::from_nanos(1_000_000_000 / crate::video::FPS);
|
||||||
while !cancelled.load(std::sync::atomic::Ordering::Acquire) {
|
while !cancelled.load(std::sync::atomic::Ordering::Acquire) {
|
||||||
@@ -645,13 +930,26 @@ 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]
|
||||||
|
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");
|
||||||
|
assert_eq!(m.len(), 2);
|
||||||
|
assert!(m[0].primary && m[0].connector == "eDP-1" && (m[1].width, m[1].x) == (2560, 1920));
|
||||||
|
}
|
||||||
#[test]
|
#[test]
|
||||||
fn locked_frames_hide_old_content() { let mut frame = [42; 8]; super::blank(&mut frame); assert_eq!(frame, [0,0,0,255,0,0,0,255]); }
|
fn locked_frames_hide_old_content() { let mut frame = [42; 8]; super::blank(&mut frame); assert_eq!(frame, [0,0,0,255,0,0,0,255]); }
|
||||||
#[test]
|
#[test]
|
||||||
fn errors_never_include_remote_messages_or_identifiers() {
|
fn errors_never_include_remote_messages_or_identifiers() {
|
||||||
assert!(super::check(4).unwrap_err().contains("cancelled or denied"));
|
assert!(super::check(4).unwrap_err().contains("cancelled or denied"));
|
||||||
assert!(super::check(9).unwrap_err().contains("closed or stream lost"));
|
assert!(super::check(9).unwrap_err().contains("closed or stream lost"));
|
||||||
assert!(super::check(15).unwrap_err().contains("--features wayland,portal"));
|
// Portal builds name the missing runtime engine; other builds say how to get one.
|
||||||
|
let unavailable = super::check(15).unwrap_err();
|
||||||
|
assert!(unavailable.contains("--features wayland,portal") || (cfg!(feature = "portal") && unavailable.contains("engine unavailable")));
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
fn portal_error_display_is_fixed_and_sanitized() {
|
fn portal_error_display_is_fixed_and_sanitized() {
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ pub fn desktop_key() -> &'static str {
|
|||||||
if desktop.split(':').any(|v| v == "kde") { "kde" } else { "gnome" }
|
if desktop.split(':').any(|v| v == "kde") { "kde" } else { "gnome" }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Consent for one monitor (Mutter connector); connectors are checked to be file-name safe.
|
||||||
|
pub fn monitor_key(connector: &str) -> String { format!("{}@{}", desktop_key(), connector) }
|
||||||
|
|
||||||
pub fn take(dir: &Path, key: &str) -> Option<String> {
|
pub fn take(dir: &Path, key: &str) -> Option<String> {
|
||||||
let path = dir.join(key);
|
let path = dir.join(key);
|
||||||
let mut file = OpenOptions::new().read(true).custom_flags(libc::O_NOFOLLOW).open(&path).ok()?;
|
let mut file = OpenOptions::new().read(true).custom_flags(libc::O_NOFOLLOW).open(&path).ok()?;
|
||||||
|
|||||||
@@ -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 }
|
||||||
|
}
|
||||||
@@ -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 }
|
||||||
|
}
|
||||||
@@ -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
|
||||||
|
}
|
||||||
@@ -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)
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
//! 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);"#))
|
||||||
|
}
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
//! 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)?;
|
||||||
|
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(())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,180 @@
|
|||||||
|
//! 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);
|
||||||
|
|
||||||
|
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() }
|
||||||
|
}
|
||||||
|
/// The mode last enabled (kept in host_settings.json), 1 (PS_NOT_SET) before any.
|
||||||
|
pub fn preferred_type() -> u8 {
|
||||||
|
crate::system_actions::load_settings().privacy_type.filter(|t| matches!(t, 2 | 3)).unwrap_or(mode::TYPE_OFF)
|
||||||
|
}
|
||||||
|
/// 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> {
|
||||||
|
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_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 })))
|
||||||
|
}
|
||||||
|
/// ReportError.error_code the Mac viewer treats as a privacy-screen failure (handleForReportError).
|
||||||
|
pub const REPORT_ERROR: i32 = -7;
|
||||||
|
impl Accepted {
|
||||||
|
pub fn apply(self) -> Result<(), String> {
|
||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn session_started() { if let Ok(mut s) = STATE.lock() { s.sessions += 1; } }
|
||||||
|
pub fn session_ended() {
|
||||||
|
if let Ok(mut s) = STATE.lock() {
|
||||||
|
s.sessions = s.sessions.saturating_sub(1);
|
||||||
|
if s.sessions == 0 { 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;
|
||||||
|
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 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());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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) }
|
||||||
|
}
|
||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -56,6 +56,31 @@ impl SessionIce {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// With `UU_USE_PROXY=1`, also gather TURN relays over TCP/TLS (through the HTTP proxy when
|
||||||
|
/// one is configured); hosts whose UDP cannot reach the TURN servers then still get a relay.
|
||||||
|
pub fn configure_relay_transport() {
|
||||||
|
if !crate::auth::proxy_enabled() { return; }
|
||||||
|
let value = ["HTTPS_PROXY", "https_proxy", "ALL_PROXY", "all_proxy"].iter().find_map(|name| std::env::var(name).ok()).filter(|v| !v.is_empty());
|
||||||
|
let proxy = match value.as_deref().map(relay_proxy) {
|
||||||
|
Some(Ok(proxy)) => Some(proxy),
|
||||||
|
Some(Err(reason)) => { log::warn!("TURN over TCP/TLS disabled: {reason}"); return; }
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
|
log::info!("TURN over TCP/TLS enabled: via_http_proxy={}", proxy.is_some());
|
||||||
|
webrtc::ice::agent::turn_tcp::set_relay_transport(webrtc::ice::agent::turn_tcp::RelayTransport { http_proxy: proxy });
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `host:port` of an unauthenticated HTTP proxy URL; never echoes the value.
|
||||||
|
fn relay_proxy(value: &str) -> Result<String, &'static str> {
|
||||||
|
let url = reqwest::Url::parse(&if value.contains("://") { value.to_owned() } else { format!("http://{value}") })
|
||||||
|
.map_err(|_| "invalid proxy URL")?;
|
||||||
|
if url.scheme() != "http" { return Err("only http:// proxies are supported for TURN"); }
|
||||||
|
if !url.username().is_empty() || url.password().is_some() { return Err("proxy authentication is not supported for TURN"); }
|
||||||
|
let host = url.host_str().ok_or("invalid proxy URL")?;
|
||||||
|
let port = url.port_or_known_default().ok_or("invalid proxy URL")?;
|
||||||
|
Ok(format!("{host}:{port}")) // host_str() keeps IPv6 brackets
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
@@ -74,4 +99,56 @@ mod tests {
|
|||||||
assert_eq!(config.ice_servers.len(),1);
|
assert_eq!(config.ice_servers.len(),1);
|
||||||
assert!(config.ice_servers[0].urls.iter().all(|s|s.starts_with("stun:")));
|
assert!(config.ice_servers[0].urls.iter().all(|s|s.starts_with("stun:")));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn relay_proxy_accepts_plain_http_only() {
|
||||||
|
assert_eq!(super::relay_proxy("http://proxy.invalid:8889").unwrap(), "proxy.invalid:8889");
|
||||||
|
assert_eq!(super::relay_proxy("proxy.invalid:8889/").unwrap(), "proxy.invalid:8889");
|
||||||
|
assert_eq!(super::relay_proxy("http://[::1]:3128").unwrap(), "[::1]:3128");
|
||||||
|
for bad in ["socks5://proxy.invalid:1080", "https://proxy.invalid:443", "http://user:[email protected]:8889", "::"] {
|
||||||
|
assert!(super::relay_proxy(bad).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn turn_tcp_frames_stun_and_padded_channel_data() {
|
||||||
|
use webrtc::ice::agent::turn_tcp::frame_len;
|
||||||
|
assert_eq!(frame_len([0x01, 0x01, 0x00, 0x08]), Some(28));
|
||||||
|
assert_eq!(frame_len([0x40, 0x00, 0x00, 0x05]), Some(12));
|
||||||
|
assert_eq!(frame_len([0x40, 0x00, 0x00, 0x08]), Some(12));
|
||||||
|
assert_eq!(frame_len([0x80, 0x00, 0x00, 0x00]), None);
|
||||||
|
assert!(webrtc::ice::agent::turn_tcp::is_http_reply(*b"HTTP"));
|
||||||
|
assert!(!webrtc::ice::agent::turn_tcp::is_http_reply([0x40, 0x00, 0x00, 0x05]));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn turn_tcp_connects_through_the_proxy_and_frames_the_stream() {
|
||||||
|
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
||||||
|
use webrtc::ice::agent::turn_tcp::{dial, set_relay_transport, RelayTransport};
|
||||||
|
use webrtc::util::Conn;
|
||||||
|
let proxy = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||||
|
let proxy_addr = proxy.local_addr().unwrap();
|
||||||
|
let server = tokio::spawn(async move {
|
||||||
|
let (mut socket, _) = proxy.accept().await.unwrap();
|
||||||
|
let mut head = Vec::new();
|
||||||
|
while !head.ends_with(b"\r\n\r\n") { let mut b = [0u8; 1]; socket.read_exact(&mut b).await.unwrap(); head.push(b[0]); }
|
||||||
|
assert!(String::from_utf8_lossy(&head).starts_with("CONNECT 192.0.2.1:2483 HTTP/1.1\r\n"));
|
||||||
|
socket.write_all(b"HTTP/1.1 200 Connection established\r\n\r\n").await.unwrap();
|
||||||
|
let mut frames = [0u8; 20 + 12];
|
||||||
|
socket.read_exact(&mut frames).await.unwrap();
|
||||||
|
socket.write_all(&frames).await.unwrap();
|
||||||
|
});
|
||||||
|
set_relay_transport(RelayTransport { http_proxy: Some(proxy_addr.to_string()) });
|
||||||
|
let target: std::net::SocketAddr = "192.0.2.1:2483".parse().unwrap();
|
||||||
|
let conn = dial("192.0.2.1", 2483, target, false).await.unwrap();
|
||||||
|
let mut stun = [0u8; 20]; stun[1] = 0x01;
|
||||||
|
let channel = [0x40, 0x00, 0x00, 0x05, 1, 2, 3, 4, 5, 0, 0, 0];
|
||||||
|
conn.send_to(&stun, target).await.unwrap();
|
||||||
|
conn.send_to(&channel, target).await.unwrap();
|
||||||
|
let mut buf = [0u8; 64];
|
||||||
|
assert_eq!(conn.recv_from(&mut buf).await.unwrap(), (20, target));
|
||||||
|
assert_eq!(conn.recv_from(&mut buf).await.unwrap(), (12, target));
|
||||||
|
assert_eq!(&buf[..12], &channel);
|
||||||
|
server.await.unwrap();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+1
-2
@@ -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));
|
||||||
|
|||||||
+4
-5
@@ -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),
|
||||||
@@ -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; }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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), reported as SettingMetric 7.
|
||||||
|
#[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::active(), crate::privacy_screen::preferred_type())),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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<(bool, 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 UURemote name map: SettingMetric 4 private_screen (on), 7 private_screen_type
|
||||||
|
// (PrivateScreenType 2 normal/picture, 3 enhanced/screen off): the chosen mode, also while off.
|
||||||
|
if let Some((on, kind)) = settings.private_screen {
|
||||||
|
setting.extend([4 << 3, u8::from(on), 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); }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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())?;
|
||||||
|
|||||||
+48
-15
@@ -374,13 +374,16 @@ 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);
|
||||||
const SUMMARY: &str = "无法传输远程画面";
|
let summary = crate::i18n::s("无法传输远程画面","Cannot stream the remote desktop");
|
||||||
match ffmpeg_encoders().await {
|
match ffmpeg_encoders().await {
|
||||||
None => {
|
None => {
|
||||||
log::error!("FFmpeg is not runnable: desktop video cannot start and viewers stay on 正在传输画面. Install ffmpeg (Debian/Ubuntu: sudo apt install ffmpeg; Arch: sudo pacman -S ffmpeg; Fedora: ffmpeg from RPM Fusion), or set ffmpeg_root, then check `uuremote-server doctor`");
|
log::error!("FFmpeg is not runnable: desktop video cannot start and viewers stay on 正在传输画面. Install ffmpeg (Debian/Ubuntu: sudo apt install ffmpeg; Arch: sudo pacman -S ffmpeg; Fedora: ffmpeg from RPM Fusion), or set ffmpeg_root, then check `uuremote-server doctor`");
|
||||||
let text = "未找到可运行的 FFmpeg,客户端会一直停在「正在传输画面」。\n请安装后重新连接:sudo apt install ffmpeg(Arch:sudo pacman -S ffmpeg;Fedora 需先启用 RPM Fusion)";
|
let text = crate::i18n::s("未找到可运行的 FFmpeg,客户端会一直停在「正在传输画面」。\n请安装后重新连接:sudo apt install ffmpeg(Arch:sudo pacman -S ffmpeg;Fedora 需先启用 RPM Fusion)","No runnable FFmpeg found; viewers stay on the loading screen.\nInstall it and reconnect: sudo apt install ffmpeg (Arch: sudo pacman -S ffmpeg; Fedora: enable RPM Fusion first)");
|
||||||
let previous = {
|
let previous = {
|
||||||
let mut last = LAST_NOTICE.lock().unwrap_or_else(|e| e.into_inner());
|
let mut last = LAST_NOTICE.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
let previous = *last;
|
let previous = *last;
|
||||||
@@ -389,7 +392,7 @@ pub fn check_ffmpeg_usable() {
|
|||||||
due.then_some(previous)
|
due.then_some(previous)
|
||||||
};
|
};
|
||||||
// The notification is a blocking D-Bus call (bounded to 3 s).
|
// The notification is a blocking D-Bus call (bounded to 3 s).
|
||||||
let told = tokio::task::spawn_blocking(move || crate::assist::show_problem(SUMMARY, Some(text), previous.is_some())).await.unwrap_or(false);
|
let told = tokio::task::spawn_blocking(move || crate::assist::show_problem(summary, Some(text), previous.is_some())).await.unwrap_or(false);
|
||||||
// Only a notice that reached the person starts the 5-minute quiet period.
|
// Only a notice that reached the person starts the 5-minute quiet period.
|
||||||
if let (Some(previous), false) = (previous, told) {
|
if let (Some(previous), false) = (previous, told) {
|
||||||
*LAST_NOTICE.lock().unwrap_or_else(|e| e.into_inner()) = previous;
|
*LAST_NOTICE.lock().unwrap_or_else(|e| e.into_inner()) = previous;
|
||||||
@@ -398,7 +401,7 @@ pub fn check_ffmpeg_usable() {
|
|||||||
}
|
}
|
||||||
Some(found) => {
|
Some(found) => {
|
||||||
if !found.contains(&"libx264") { log::warn!("FFmpeg has no libx264: CPU encoding and the fallback after a hardware encoder failure are unavailable. Install a full ffmpeg build"); }
|
if !found.contains(&"libx264") { log::warn!("FFmpeg has no libx264: CPU encoding and the fallback after a hardware encoder failure are unavailable. Install a full ffmpeg build"); }
|
||||||
tokio::task::spawn_blocking(|| crate::assist::show_problem(SUMMARY, None, false));
|
tokio::task::spawn_blocking(move || crate::assist::show_problem(summary, None, false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -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.
|
||||||
@@ -816,7 +820,8 @@ async fn read_encoder_with(
|
|||||||
selection: crate::video_select::Selection,
|
selection: crate::video_select::Selection,
|
||||||
)->Result<(),String>{
|
)->Result<(),String>{
|
||||||
let selected_output=crate::wayland::capture_source(&display,portal.is_some(),settings.source_id);
|
let selected_output=crate::wayland::capture_source(&display,portal.is_some(),settings.source_id);
|
||||||
let size=selected_output.map_or(size,|s|(s.width,s.height));
|
// Portal frames come from the session's current monitor, whatever the advertised mode says.
|
||||||
|
let size=portal.as_ref().map(|p|p.size()).or(selected_output.map(|s|(s.width,s.height))).unwrap_or(size);
|
||||||
let kms=display.starts_with("kms:");
|
let kms=display.starts_with("kms:");
|
||||||
let wayland=kms || display.starts_with("wayland:");
|
let wayland=kms || display.starts_with("wayland:");
|
||||||
// X11 multi-screen: x11grab reads only the selected monitor's region of the root.
|
// X11 multi-screen: x11grab reads only the selected monitor's region of the root.
|
||||||
@@ -831,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,
|
||||||
@@ -840,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);
|
||||||
@@ -929,7 +935,8 @@ async fn read_encoder_with(
|
|||||||
let interval=Duration::from_nanos(1_000_000_000/u64::from(settings.fps));
|
let interval=Duration::from_nanos(1_000_000_000/u64::from(settings.fps));
|
||||||
let mut tick=tokio::time::interval(interval);
|
let mut tick=tokio::time::interval(interval);
|
||||||
tick.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
|
tick.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
|
||||||
let mut frame=vec![0;(session.width as usize)*(session.height as usize)*4];
|
let (width,height)=session.size();
|
||||||
|
let mut frame=vec![0;(width as usize)*(height as usize)*4];
|
||||||
let mut version=None;
|
let mut version=None;
|
||||||
loop {
|
loop {
|
||||||
tick.tick().await;
|
tick.tick().await;
|
||||||
@@ -1194,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;
|
||||||
@@ -1295,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;
|
||||||
@@ -1512,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";
|
||||||
|
|||||||
+27
-10
@@ -22,20 +22,35 @@ fn device_platform(data:&Value,device:&str)->Option<i64>{
|
|||||||
.find(|d|d.get("device_id").and_then(Value::as_str)==Some(device))
|
.find(|d|d.get("device_id").and_then(Value::as_str)==Some(device))
|
||||||
.and_then(|d|d.get("platform")).and_then(Value::as_i64)
|
.and_then(|d|d.get("platform")).and_then(Value::as_i64)
|
||||||
}
|
}
|
||||||
|
/// English for server messages observed in assistance and connection replies.
|
||||||
|
fn english_message(msg: &str) -> Option<&'static str> {
|
||||||
|
Some(match msg {
|
||||||
|
"验证码错误" => "Wrong verification code",
|
||||||
|
"对方未开启协助" => "The partner has not turned on remote assistance",
|
||||||
|
"无法对同账号的设备发起远程协助" => "Remote assistance between devices of the same account is not possible",
|
||||||
|
"被控端正在被远控中,无法发起连接" => "This computer is already being controlled from another device",
|
||||||
|
_ => return None,
|
||||||
|
})
|
||||||
|
}
|
||||||
#[derive(Debug, PartialEq, Eq)]
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
pub enum Error { AuthenticationExpired, Api(i32, String), InvalidResponse, Transport, MissingRoom, InvalidDevice, InvalidAssist, UnknownKeyboardPlatform }
|
pub enum Error { AuthenticationExpired, Api(i32, String), InvalidResponse, Transport, MissingRoom, InvalidDevice, InvalidAssist, UnknownKeyboardPlatform }
|
||||||
impl std::fmt::Display for Error {
|
impl std::fmt::Display for Error {
|
||||||
// The server's short message is user-facing (e.g. 2002 「被控端正在被远控中,无法发起连接」).
|
// The server's short message is user-facing (e.g. 2002 「被控端正在被远控中,无法发起连接」).
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
match self {
|
match self {
|
||||||
Error::Api(code, msg) if !msg.is_empty() => write!(f, "{msg} (code {code})"),
|
// Observed 2002: the target already has a controller (another viewer, a phone).
|
||||||
Error::AuthenticationExpired => write!(f, "登录已过期,请重新登录"),
|
Error::Api(2002, _) => f.write_str(crate::i18n::s("被控端正在被远控中,无法发起连接(错误码 2002)",
|
||||||
Error::Transport => write!(f, "网络连接失败"),
|
"This computer is already being controlled from another device; disconnect there and try again (error 2002)")),
|
||||||
Error::InvalidAssist => write!(f, "请输入对方的设备 ID 和有效验证码"),
|
// Server messages are Chinese only: the English UI translates the known ones.
|
||||||
Error::InvalidResponse => write!(f, "服务器响应格式无效"),
|
Error::Api(code, msg) if !msg.is_empty() && !crate::i18n::english() => write!(f, "{msg} (code {code})"),
|
||||||
Error::MissingRoom => write!(f, "服务器未返回可用的房间或信令信息"),
|
Error::Api(code, msg) if english_message(msg).is_some() => write!(f, "{} (code {code})", english_message(msg).unwrap_or_default()),
|
||||||
Error::UnknownKeyboardPlatform => write!(f, "无法确定目标键盘平台,不能启用控制"),
|
Error::AuthenticationExpired => f.write_str(crate::i18n::s("登录已过期,请重新登录","Sign-in expired, please sign in again")),
|
||||||
Error::Api(code, _) => write!(f, "连接请求失败(错误码 {code})"),
|
Error::Transport => f.write_str(crate::i18n::s("网络连接失败","Network connection failed")),
|
||||||
|
Error::InvalidAssist => f.write_str(crate::i18n::s("请输入对方的设备 ID 和有效验证码","Enter the partner's device ID and a valid code")),
|
||||||
|
Error::InvalidResponse => f.write_str(crate::i18n::s("服务器响应格式无效","Invalid server response")),
|
||||||
|
Error::MissingRoom => f.write_str(crate::i18n::s("服务器未返回可用的房间或信令信息","The server returned no usable room or signaling info")),
|
||||||
|
Error::UnknownKeyboardPlatform => f.write_str(crate::i18n::s("无法确定目标键盘平台,不能启用控制","Unknown remote keyboard platform; control is disabled")),
|
||||||
|
Error::Api(code, _) => f.write_str(&crate::tr!("连接请求失败(错误码 {code})","Connection request failed (error {code})")),
|
||||||
_ => write!(f, "viewer API: {self:?}"),
|
_ => write!(f, "viewer API: {self:?}"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -237,7 +252,8 @@ mod tests {
|
|||||||
assert_eq!(parse_share(200,v,&[]).err().unwrap(),Error::MissingRoom);
|
assert_eq!(parse_share(200,v,&[]).err().unwrap(),Error::MissingRoom);
|
||||||
}
|
}
|
||||||
for msg in ["验证码错误","对方未开启协助","无法对同账号的设备发起远程协助"] {
|
for msg in ["验证码错误","对方未开启协助","无法对同账号的设备发起远程协助"] {
|
||||||
assert_eq!(parse_share(422,json!({"code":9876,"msg":msg}),&[]).err().unwrap().to_string(),format!("{msg} (code 9876)"));
|
let shown=if crate::i18n::english() {english_message(msg).unwrap()} else {msg};
|
||||||
|
assert_eq!(parse_share(422,json!({"code":9876,"msg":msg}),&[]).err().unwrap().to_string(),format!("{shown} (code 9876)"));
|
||||||
}
|
}
|
||||||
assert_eq!(parse_share(422,json!({"code":9876,"msg":"fixture-code\nfixture-token"}),&["fixture-code","fixture-token",""]).err().unwrap(),Error::Api(9876,"[已隐藏][已隐藏]".into()));
|
assert_eq!(parse_share(422,json!({"code":9876,"msg":"fixture-code\nfixture-token"}),&["fixture-code","fixture-token",""]).err().unwrap(),Error::Api(9876,"[已隐藏][已隐藏]".into()));
|
||||||
assert_eq!(parse_share(422,json!({"code":1120,"msg":"expired"}),&[]).err().unwrap(),Error::AuthenticationExpired);
|
assert_eq!(parse_share(422,json!({"code":1120,"msg":"expired"}),&[]).err().unwrap(),Error::AuthenticationExpired);
|
||||||
@@ -405,7 +421,8 @@ mod http_tests {
|
|||||||
for msg in ["验证码错误","对方未开启协助","无法对同账号的设备发起远程协助"] {
|
for msg in ["验证码错误","对方未开启协助","无法对同账号的设备发起远程协助"] {
|
||||||
let(url,job)=server(vec![(422,json!({"code":9876,"msg":msg}))]).await;
|
let(url,job)=server(vec![(422,json!({"code":9876,"msg":msg}))]).await;
|
||||||
let error=Api::new(signer(),&url).join_share("synthetic-id","synthetic-code").await.err().unwrap();
|
let error=Api::new(signer(),&url).join_share("synthetic-id","synthetic-code").await.err().unwrap();
|
||||||
assert_eq!(error.to_string(),format!("{msg} (code 9876)"));assert_eq!(job.await.unwrap().len(),1);
|
let shown=if crate::i18n::english() {english_message(msg).unwrap()} else {msg};
|
||||||
|
assert_eq!(error.to_string(),format!("{shown} (code 9876)"));assert_eq!(job.await.unwrap().len(),1);
|
||||||
}
|
}
|
||||||
for (status,body,expected) in [
|
for (status,body,expected) in [
|
||||||
(200,json!({"code":405,"msg":"业务拒绝"}),Error::Api(405,"业务拒绝".into())),
|
(200,json!({"code":405,"msg":"业务拒绝"}),Error::Api(405,"业务拒绝".into())),
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ use tokio::{io::AsyncWriteExt,process::{Child,Command}};
|
|||||||
|
|
||||||
pub fn read_code(input: impl BufRead) -> Result<String,String> {
|
pub fn read_code(input: impl BufRead) -> Result<String,String> {
|
||||||
let mut code=String::new();
|
let mut code=String::new();
|
||||||
input.take(1025).read_line(&mut code).map_err(|_|"无法从 stdin 读取验证码")?;
|
input.take(1025).read_line(&mut code).map_err(|_|crate::i18n::s("无法从 stdin 读取验证码","Cannot read the code from stdin"))?;
|
||||||
if code.len()>1024 {return Err("验证码过长".into())}
|
if code.len()>1024 {return Err(crate::i18n::s("验证码过长","Code is too long").into())}
|
||||||
if code.ends_with('\n') {code.pop();if code.ends_with('\r'){code.pop();}}
|
if code.ends_with('\n') {code.pop();if code.ends_with('\r'){code.pop();}}
|
||||||
if code.trim().is_empty() || code.chars().any(char::is_control) {return Err("请输入有效验证码".into())}
|
if code.trim().is_empty() || code.chars().any(char::is_control) {return Err(crate::i18n::s("请输入有效验证码","Enter a valid code").into())}
|
||||||
Ok(code)
|
Ok(code)
|
||||||
}
|
}
|
||||||
pub fn command(exe:&Path,id:&str)->Command {
|
pub fn command(exe:&Path,id:&str)->Command {
|
||||||
@@ -17,10 +17,10 @@ pub fn command(exe:&Path,id:&str)->Command {
|
|||||||
}
|
}
|
||||||
pub async fn send_code(child:&mut Child,code:&str)->Result<(),String> {
|
pub async fn send_code(child:&mut Child,code:&str)->Result<(),String> {
|
||||||
let result=async {
|
let result=async {
|
||||||
let mut stdin=child.stdin.take().ok_or("无法打开会话输入管道")?;
|
let mut stdin=child.stdin.take().ok_or(crate::i18n::s("无法打开会话输入管道","Cannot open the session input pipe"))?;
|
||||||
stdin.write_all(code.as_bytes()).await.map_err(|_|"无法向会话传递验证码")?;
|
stdin.write_all(code.as_bytes()).await.map_err(|_|crate::i18n::s("无法向会话传递验证码","Cannot pass the code to the session"))?;
|
||||||
stdin.write_all(b"\n").await.map_err(|_|"无法向会话传递验证码")?;
|
stdin.write_all(b"\n").await.map_err(|_|crate::i18n::s("无法向会话传递验证码","Cannot pass the code to the session"))?;
|
||||||
stdin.shutdown().await.map_err(|_|"无法关闭会话输入管道")
|
stdin.shutdown().await.map_err(|_|crate::i18n::s("无法关闭会话输入管道","Cannot close the session input pipe"))
|
||||||
}.await;
|
}.await;
|
||||||
if result.is_err() {let _=child.kill().await;}
|
if result.is_err() {let _=child.kill().await;}
|
||||||
result.map_err(str::to_owned)
|
result.map_err(str::to_owned)
|
||||||
|
|||||||
+4
-3
@@ -93,20 +93,21 @@ mod playback {
|
|||||||
if let Some(mut child)=self.child.take() {let _=child.start_kill();tokio::spawn(async move {let _=child.wait().await;});}
|
if let Some(mut child)=self.child.take() {let _=child.start_kill();tokio::spawn(async move {let _=child.wait().await;});}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub struct Playback { queue:sdl2::audio::AudioQueue<i16>, decoder:Decoder }
|
pub struct Playback { queue:sdl2::audio::AudioQueue<i16>, decoder:Decoder, pub volume:u8 }
|
||||||
impl Playback {
|
impl Playback {
|
||||||
pub fn new(sdl:&sdl2::Sdl,audio:Audio)->Option<Self> {
|
pub fn new(sdl:&sdl2::Sdl,audio:Audio)->Option<Self> {
|
||||||
if !audio.enabled {return None}
|
if !audio.enabled {return None}
|
||||||
let result=(|| {
|
let result=(|| {
|
||||||
let subsystem=sdl.audio()?;
|
let subsystem=sdl.audio()?;
|
||||||
let queue=subsystem.open_queue::<i16,_>(None,&sdl2::audio::AudioSpecDesired{freq:Some(48000),channels:Some(2),samples:Some(960)})?;
|
let queue=subsystem.open_queue::<i16,_>(None,&sdl2::audio::AudioSpecDesired{freq:Some(48000),channels:Some(2),samples:Some(960)})?;
|
||||||
let decoder=Decoder::new(audio)?;queue.resume();Ok::<_,String>(Self{queue,decoder})
|
let decoder=Decoder::new(audio)?;queue.resume();Ok::<_,String>(Self{queue,decoder,volume:100})
|
||||||
})();
|
})();
|
||||||
match result {Ok(p)=>Some(p),Err(_)=>{log::warn!("Viewer audio playback unavailable");None}}
|
match result {Ok(p)=>Some(p),Err(_)=>{log::warn!("Viewer audio playback unavailable");None}}
|
||||||
}
|
}
|
||||||
pub fn pump(&mut self)->Result<(),String> {
|
pub fn pump(&mut self)->Result<(),String> {
|
||||||
if !self.decoder.alive() {return Err("Audio decoder stopped".into())}
|
if !self.decoder.alive() {return Err("Audio decoder stopped".into())}
|
||||||
while let Some(samples)=self.decoder.pcm.pop() {
|
while let Some(mut samples)=self.decoder.pcm.pop() {
|
||||||
|
if self.volume<100 {let v=i32::from(self.volume);for s in samples.iter_mut(){*s=(i32::from(*s)*v/100) as i16;}}
|
||||||
if self.queue.size()+samples.len() as u32*2>SDL_BYTES {self.queue.clear();}
|
if self.queue.size()+samples.len() as u32*2>SDL_BYTES {self.queue.clear();}
|
||||||
self.queue.queue_audio(&samples).map_err(|_|"Audio queue failed")?;
|
self.queue.queue_audio(&samples).map_err(|_|"Audio queue failed")?;
|
||||||
}Ok(())
|
}Ok(())
|
||||||
|
|||||||
+22
-1
@@ -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{
|
||||||
|
|||||||
+82
-29
@@ -1,34 +1,35 @@
|
|||||||
//! H.264/H.265 decoding through an external `ffmpeg` process, like the host's encoder pipeline.
|
//! H.264/H.265 decoding through an external `ffmpeg` process, like the host's encoder pipeline.
|
||||||
//! Needs only the ffmpeg CLI, not FFmpeg development libraries.
|
//! Needs only the ffmpeg CLI, not FFmpeg development libraries.
|
||||||
//! Output is scaled into a fixed letterboxed canvas so every frame has a known byte length; the
|
//! Frames are decoded at the host's native size (resampling the picture blurs text); ffmpeg's verbose
|
||||||
//! source size from ffmpeg's stream line tells the window which sub-rectangle is picture content.
|
//! scaler line gives the size before the first frame. `UU_VIEWER_SIZE` keeps the old fixed letterboxed
|
||||||
|
//! canvas, where the stream line tells the window which sub-rectangle is picture content.
|
||||||
use super::desktop::{Decoder,Frame};
|
use super::desktop::{Decoder,Frame};
|
||||||
use super::media::Codec;
|
use super::media::Codec;
|
||||||
use std::io::{BufRead,Read,Write};
|
use std::io::{BufRead,Read,Write};
|
||||||
use std::process::{Child,ChildStdin,Command,Stdio};
|
use std::process::{Child,ChildStdin,Command,Stdio};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::sync::atomic::{AtomicU64,Ordering};
|
use std::sync::atomic::{AtomicBool,AtomicU64,Ordering};
|
||||||
use std::sync::mpsc::{Receiver,TryRecvError};
|
use std::sync::mpsc::{Receiver,TryRecvError};
|
||||||
|
|
||||||
pub struct Cli { child:Child, input:Option<ChildStdin>, codec:Codec, frames:Receiver<Vec<u8>>, width:u32, height:u32, source:Arc<AtomicU64> }
|
pub struct Cli { child:Child, input:Option<ChildStdin>, codec:Codec, frames:Receiver<(u32,u32,Vec<u8>)>, fixed:Option<(u32,u32)>, source:Arc<AtomicU64>, resized:Arc<AtomicBool> }
|
||||||
|
|
||||||
impl Cli {
|
impl Cli {
|
||||||
/// `UU_VIEWER_SIZE=WxH` picks the decoded size (default 1920x1080); `UU_VIEWER_FFMPEG` the binary.
|
/// `UU_VIEWER_SIZE=WxH` scales into a fixed canvas (default: native size); `UU_VIEWER_FFMPEG` the binary.
|
||||||
pub fn new()->Result<Self,String> {
|
pub fn new()->Result<Self,String> {
|
||||||
let (width,height)=std::env::var("UU_VIEWER_SIZE").ok()
|
let fixed=std::env::var("UU_VIEWER_SIZE").ok()
|
||||||
.and_then(|v|{let (w,h)=v.split_once('x')?;Some((w.parse().ok()?,h.parse().ok()?))})
|
.and_then(|v|{let (w,h)=v.split_once('x')?;Some((w.parse().ok()?,h.parse().ok()?))})
|
||||||
.filter(|&(w,h):&(u32,u32)|(16..=8192).contains(&w)&&(16..=8192).contains(&h)&&w%2==0&&h%2==0)
|
.filter(|&(w,h):&(u32,u32)|(16..=8192).contains(&w)&&(16..=8192).contains(&h)&&w%2==0&&h%2==0);
|
||||||
.unwrap_or((1920,1080));
|
Self::with_codec(Codec::H264,fixed)
|
||||||
Self::with_codec(Codec::H264,width,height)
|
|
||||||
}
|
}
|
||||||
fn with_codec(codec:Codec,width:u32,height:u32)->Result<Self,String> {
|
fn with_codec(codec:Codec,fixed:Option<(u32,u32)>)->Result<Self,String> {
|
||||||
let ffmpeg=std::env::var("UU_VIEWER_FFMPEG").unwrap_or_else(|_|"ffmpeg".into());
|
let ffmpeg=std::env::var("UU_VIEWER_FFMPEG").unwrap_or_else(|_|"ffmpeg".into());
|
||||||
let filter=format!("scale={width}:{height}:force_original_aspect_ratio=decrease,pad={width}:{height}:(ow-iw)/2:(oh-ih)/2");
|
let filter=fixed.map(|(width,height)|format!("scale={width}:{height}:force_original_aspect_ratio=decrease:flags=lanczos,pad={width}:{height}:(ow-iw)/2:(oh-ih)/2"));
|
||||||
let passthrough=passthrough_args(&ffmpeg);
|
let passthrough=passthrough_args(&ffmpeg);
|
||||||
let mut child=Command::new(&ffmpeg)
|
let mut command=Command::new(&ffmpeg);
|
||||||
.args(["-hide_banner","-loglevel","info","-nostats","-nostdin","-threads","1","-probesize","32","-analyzeduration","0",
|
command.args(["-hide_banner","-loglevel","verbose","-nostats","-nostdin","-threads","1","-probesize","32","-analyzeduration","0",
|
||||||
"-fflags","nobuffer","-flags","low_delay","-f",codec.demuxer(),"-i","pipe:0","-an","-vf",&filter,
|
"-fflags","nobuffer","-flags","low_delay","-f",codec.demuxer(),"-i","pipe:0","-an"]);
|
||||||
"-pix_fmt","rgb24",
|
if let Some(filter)=&filter {command.args(["-vf",filter]);}
|
||||||
|
let mut child=command.args(["-pix_fmt","rgb24",
|
||||||
// Raw H.264/H.265 carries no timestamps; constant-rate output dropped almost every frame of
|
// Raw H.264/H.265 carries no timestamps; constant-rate output dropped almost every frame of
|
||||||
// the official Mac host's stream (270 → 2). Pass frames through unchanged.
|
// the official Mac host's stream (270 → 2). Pass frames through unchanged.
|
||||||
passthrough.0,passthrough.1,"-f","rawvideo","pipe:1"])
|
passthrough.0,passthrough.1,"-f","rawvideo","pipe:1"])
|
||||||
@@ -37,30 +38,58 @@ impl Cli {
|
|||||||
let input=child.stdin.take().ok_or("ffmpeg stdin missing")?;
|
let input=child.stdin.take().ok_or("ffmpeg stdin missing")?;
|
||||||
let mut output=child.stdout.take().ok_or("ffmpeg stdout missing")?;
|
let mut output=child.stdout.take().ok_or("ffmpeg stdout missing")?;
|
||||||
// Source picture size from the one-time stream line; 0 until parsed. Only the numbers are kept.
|
// Source picture size from the one-time stream line; 0 until parsed. Only the numbers are kept.
|
||||||
let source=Arc::new(AtomicU64::new(0));
|
let source=Arc::new(AtomicU64::new(0));let resized=Arc::new(AtomicBool::new(false));
|
||||||
|
let (size_tx,size_rx)=std::sync::mpsc::sync_channel::<(u32,u32)>(1);
|
||||||
|
if let Some((w,h))=fixed {let _=size_tx.send((w,h));}
|
||||||
if let Some(stderr)=child.stderr.take() {
|
if let Some(stderr)=child.stderr.take() {
|
||||||
let source=source.clone();
|
let (source,resized)=(source.clone(),resized.clone());
|
||||||
let _=std::thread::Builder::new().name("uu-viewer-ffmpeg-info".into()).spawn(move||{
|
let _=std::thread::Builder::new().name("uu-viewer-ffmpeg-info".into()).spawn(move||{
|
||||||
|
let mut native=None;
|
||||||
for line in std::io::BufReader::new(stderr).lines().map_while(Result::ok) {
|
for line in std::io::BufReader::new(stderr).lines().map_while(Result::ok) {
|
||||||
if source.load(Ordering::Relaxed)!=0 {continue}
|
if fixed.is_some() {
|
||||||
if let Some((w,h))=parse_video_size(&line) {source.store((u64::from(w)<<32)|u64::from(h),Ordering::Relaxed);}
|
if source.load(Ordering::Relaxed)!=0 {continue}
|
||||||
|
if let Some((w,h))=parse_video_size(&line) {source.store((u64::from(w)<<32)|u64::from(h),Ordering::Relaxed);}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Native: the first scaler line fixes the output size; ffmpeg auto-scales a later
|
||||||
|
// resolution change to it, so a different input size means the decoder must restart.
|
||||||
|
let Some((input,out))=parse_scaler_sizes(&line) else {continue};
|
||||||
|
match native {
|
||||||
|
None=>{native=Some(out);let _=size_tx.send(out);},
|
||||||
|
Some(size) if input!=size=>resized.store(true,Ordering::Release),
|
||||||
|
Some(_)=>{},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
let size=width as usize*height as usize*3;
|
|
||||||
// Bounded: a slow window drops decoded frames instead of growing memory.
|
// Bounded: a slow window drops decoded frames instead of growing memory.
|
||||||
let (tx,frames)=std::sync::mpsc::sync_channel(2);
|
let (tx,frames)=std::sync::mpsc::sync_channel(2);
|
||||||
std::thread::Builder::new().name("uu-viewer-decode".into()).spawn(move||{
|
std::thread::Builder::new().name("uu-viewer-decode".into()).spawn(move||{
|
||||||
|
let Ok((width,height))=size_rx.recv() else {return};
|
||||||
|
let size=width as usize*height as usize*3;
|
||||||
loop {
|
loop {
|
||||||
let mut frame=vec![0;size];
|
let mut frame=vec![0;size];
|
||||||
if output.read_exact(&mut frame).is_err() {break;}
|
if output.read_exact(&mut frame).is_err() {break;}
|
||||||
match tx.try_send(frame) { Ok(())|Err(std::sync::mpsc::TrySendError::Full(_))=>{}, Err(_)=>break }
|
match tx.try_send((width,height,frame)) { Ok(())|Err(std::sync::mpsc::TrySendError::Full(_))=>{}, Err(_)=>break }
|
||||||
}
|
}
|
||||||
}).map_err(|e|format!("Decoder reader: {e}"))?;
|
}).map_err(|e|format!("Decoder reader: {e}"))?;
|
||||||
Ok(Self{child,input:Some(input),codec,frames,width,height,source})
|
Ok(Self{child,input:Some(input),codec,frames,fixed,source,resized})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Verbose swscale setup line: `[auto_scale_0 @ 0x..] w:3024 h:1964 fmt:yuv420p ... -> w:3024 h:1964 fmt:rgb24 ...`.
|
||||||
|
fn parse_scaler_sizes(line:&str)->Option<((u32,u32),(u32,u32))> {
|
||||||
|
let (input,out)=line.split_once(" -> ")?;
|
||||||
|
if !out.contains(" fmt:") {return None}
|
||||||
|
fn size(part:&str)->Option<(u32,u32)> {
|
||||||
|
let mut words=part.split_whitespace();
|
||||||
|
let w=words.find_map(|t|t.strip_prefix("w:"))?.parse().ok()?;
|
||||||
|
let h=words.next()?.strip_prefix("h:")?.parse().ok()?;
|
||||||
|
((16..=16384).contains(&w)&&(16..=16384).contains(&h)).then_some((w,h))
|
||||||
|
}
|
||||||
|
Some((size(input.rsplit_once("] ").map_or(input,|(_,rest)|rest))?,size(out)?))
|
||||||
|
}
|
||||||
|
|
||||||
/// `30000/1001`-style or display strings are irrelevant here: the first WxH on a `Video:` line is the
|
/// `30000/1001`-style or display strings are irrelevant here: the first WxH on a `Video:` line is the
|
||||||
/// coded picture size, which is the aspect the scale+pad filter letterboxes into the canvas.
|
/// coded picture size, which is the aspect the scale+pad filter letterboxes into the canvas.
|
||||||
fn parse_video_size(line:&str)->Option<(u32,u32)> {
|
fn parse_video_size(line:&str)->Option<(u32,u32)> {
|
||||||
@@ -93,19 +122,33 @@ fn passthrough_args(ffmpeg:&str)->(&'static str,&'static str) {
|
|||||||
|
|
||||||
impl Decoder for Cli {
|
impl Decoder for Cli {
|
||||||
fn set_codec(&mut self,codec:Codec)->Result<(),String>{
|
fn set_codec(&mut self,codec:Codec)->Result<(),String>{
|
||||||
if self.codec!=codec {*self=Self::with_codec(codec,self.width,self.height)?;}Ok(())
|
if self.codec!=codec {*self=Self::with_codec(codec,self.fixed)?;}Ok(())
|
||||||
}
|
}
|
||||||
fn reset(&mut self) {}
|
fn reset(&mut self) {}
|
||||||
fn decode(&mut self,au:&[u8])->Result<Vec<Frame>,String> {
|
fn decode(&mut self,au:&[u8])->Result<Vec<Frame>,String> {
|
||||||
|
if self.resized.load(Ordering::Acquire) {
|
||||||
|
// The caller resets and asks for a key frame; the new process sizes itself from it.
|
||||||
|
*self=Self::with_codec(self.codec,self.fixed)?;
|
||||||
|
return Err("remote resolution changed".into());
|
||||||
|
}
|
||||||
let input=self.input.as_mut().ok_or("ffmpeg input closed")?;
|
let input=self.input.as_mut().ok_or("ffmpeg input closed")?;
|
||||||
input.write_all(au).and_then(|_|input.flush()).map_err(|_|"ffmpeg decoder exited")?;
|
// The raw-stream parser ends an access unit only when the next one starts; an access unit
|
||||||
|
// delimiter right after it releases the picture now instead of one remote frame later.
|
||||||
|
let delimiter:&[u8]=match self.codec {Codec::H264=>&[0,0,0,1,0x09,0xf0],Codec::H265=>&[0,0,0,1,0x46,0x01,0x50]};
|
||||||
|
input.write_all(au).and_then(|_|input.write_all(delimiter)).and_then(|_|input.flush()).map_err(|_|"ffmpeg decoder exited")?;
|
||||||
|
self.take_frames()
|
||||||
|
}
|
||||||
|
fn poll(&mut self)->Vec<Frame> {self.take_frames().unwrap_or_default()}
|
||||||
|
}
|
||||||
|
impl Cli {
|
||||||
|
fn take_frames(&mut self)->Result<Vec<Frame>,String> {
|
||||||
let mut out=Vec::new();
|
let mut out=Vec::new();
|
||||||
loop {
|
loop {
|
||||||
match self.frames.try_recv() {
|
match self.frames.try_recv() {
|
||||||
Ok(rgb)=>{
|
Ok((width,height,rgb))=>{
|
||||||
let source=self.source.load(Ordering::Relaxed);
|
let source=self.source.load(Ordering::Relaxed);
|
||||||
let content=(source!=0).then(||((source>>32) as u32,source as u32));
|
let content=(self.fixed.is_some()&&source!=0).then(||((source>>32) as u32,source as u32));
|
||||||
out.push(Frame{width:self.width,height:self.height,rgb,content})
|
out.push(Frame{width,height,rgb,content})
|
||||||
},
|
},
|
||||||
Err(TryRecvError::Empty)=>break,
|
Err(TryRecvError::Empty)=>break,
|
||||||
Err(TryRecvError::Disconnected)=>return Err("ffmpeg decoder exited".into()),
|
Err(TryRecvError::Disconnected)=>return Err("ffmpeg decoder exited".into()),
|
||||||
@@ -135,7 +178,9 @@ impl Drop for Cli { fn drop(&mut self) { let _=self.child.kill(); let _=self.chi
|
|||||||
Err(e) if e.kind()==std::io::ErrorKind::NotFound=>{eprintln!("skip: ffmpeg is not on PATH");return},
|
Err(e) if e.kind()==std::io::ErrorKind::NotFound=>{eprintln!("skip: ffmpeg is not on PATH");return},
|
||||||
result=>assert!(result.expect("ffmpeg availability").success()),
|
result=>assert!(result.expect("ffmpeg availability").success()),
|
||||||
}
|
}
|
||||||
let mut cli=Cli::with_codec(Codec::H265,32,32).unwrap();
|
// Native size and the fixed UU_VIEWER_SIZE canvas.
|
||||||
|
for fixed in [None,Some((32,32))] {
|
||||||
|
let mut cli=Cli::with_codec(Codec::H265,fixed).unwrap();
|
||||||
for (codec,data) in [
|
for (codec,data) in [
|
||||||
(Codec::H264,&include_bytes!("../../tests/fixtures/viewer/red-420.h264")[..]),
|
(Codec::H264,&include_bytes!("../../tests/fixtures/viewer/red-420.h264")[..]),
|
||||||
(Codec::H265,&include_bytes!("../../tests/fixtures/viewer/red-420.hevc")[..]),
|
(Codec::H265,&include_bytes!("../../tests/fixtures/viewer/red-420.hevc")[..]),
|
||||||
@@ -146,7 +191,7 @@ impl Drop for Cli { fn drop(&mut self) { let _=self.child.kill(); let _=self.chi
|
|||||||
// Exercise the same streaming process and RGB conversion as SDL, then drain at EOF.
|
// Exercise the same streaming process and RGB conversion as SDL, then drain at EOF.
|
||||||
let mut frames=cli.decode(data).unwrap();drop(cli.input.take());
|
let mut frames=cli.decode(data).unwrap();drop(cli.input.take());
|
||||||
loop {match cli.frames.recv_timeout(std::time::Duration::from_secs(5)) {
|
loop {match cli.frames.recv_timeout(std::time::Duration::from_secs(5)) {
|
||||||
Ok(rgb)=>frames.push(Frame{width:32,height:32,rgb,content:None}),
|
Ok((width,height,rgb))=>frames.push(Frame{width,height,rgb,content:None}),
|
||||||
Err(std::sync::mpsc::RecvTimeoutError::Disconnected)=>break,
|
Err(std::sync::mpsc::RecvTimeoutError::Disconnected)=>break,
|
||||||
Err(e)=>panic!("{codec:?} decoder did not finish: {e}"),
|
Err(e)=>panic!("{codec:?} decoder did not finish: {e}"),
|
||||||
}}
|
}}
|
||||||
@@ -155,9 +200,17 @@ impl Drop for Cli { fn drop(&mut self) { let _=self.child.kill(); let _=self.chi
|
|||||||
assert!(!frames.is_empty(),"{codec:?}: no RGB frames");
|
assert!(!frames.is_empty(),"{codec:?}: no RGB frames");
|
||||||
for frame in frames {
|
for frame in frames {
|
||||||
assert_eq!(frame.rgb.len(),32*32*3);
|
assert_eq!(frame.rgb.len(),32*32*3);
|
||||||
|
assert_eq!((frame.width,frame.height),(32,32));
|
||||||
assert!(frame.rgb.chunks_exact(3).all(|p|p[0]>220 && p[1]<30 && p[2]<30),"{codec:?}: RGB conversion");
|
assert!(frame.rgb.chunks_exact(3).all(|p|p[0]>220 && p[1]<30 && p[2]<30),"{codec:?}: RGB conversion");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[test] fn native_size_is_read_from_the_scaler_line(){
|
||||||
|
assert_eq!(super::parse_scaler_sizes("[auto_scale_0 @ 0x7f55ac005f40] w:3024 h:1964 fmt:yuv420p csp:unknown range:unknown sar:1/1 -> w:3024 h:1964 fmt:rgb24 csp:gbr range:pc sar:1/1 flags:0x00000004"),Some(((3024,1964),(3024,1964))));
|
||||||
|
assert_eq!(super::parse_scaler_sizes("[auto_scaler_0 @ 0x55d] w:2560 h:1440 fmt:yuv444p sar:1/1 -> w:1920 h:1080 fmt:rgb24 sar:1/1 flags:0x4"),Some(((2560,1440),(1920,1080))));
|
||||||
|
assert_eq!(super::parse_scaler_sizes("[Parsed_pad_1 @ 0x7f00] w:32 h:32 -> w:64 h:32 x:16 y:0 color:0x000000FF"),None);
|
||||||
|
assert_eq!(super::parse_scaler_sizes(" Stream #0:0 -> #0:0 (h264 (native) -> rawvideo (native))"),None);
|
||||||
}
|
}
|
||||||
#[test] fn source_size_is_read_from_the_ffmpeg_stream_line(){
|
#[test] fn source_size_is_read_from_the_ffmpeg_stream_line(){
|
||||||
assert_eq!(super::parse_video_size(" Stream #0:0: Video: h264 (High), yuv420p(progressive), 3024x1964, 25 fps"),Some((3024,1964)));
|
assert_eq!(super::parse_video_size(" Stream #0:0: Video: h264 (High), yuv420p(progressive), 3024x1964, 25 fps"),Some((3024,1964)));
|
||||||
|
|||||||
+197
-12
@@ -3,16 +3,63 @@ 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)> }
|
||||||
pub trait Decoder { fn set_codec(&mut self,codec:super::media::Codec)->Result<(),String>; fn decode(&mut self, au:&[u8])->Result<Vec<Frame>,String>; fn reset(&mut self); }
|
pub trait Decoder { fn set_codec(&mut self,codec:super::media::Codec)->Result<(),String>; fn decode(&mut self, au:&[u8])->Result<Vec<Frame>,String>; fn reset(&mut self);
|
||||||
|
/// Frames finished since the last call, without new input; an asynchronous decoder
|
||||||
|
/// returns a picture here instead of holding it until the next access unit arrives.
|
||||||
|
fn poll(&mut self)->Vec<Frame> {Vec::new()} }
|
||||||
pub trait FrameSink { fn present(&mut self,frame:&Frame)->Result<(),String>; }
|
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}
|
||||||
pub fn display(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink,au:&[u8],codec:super::media::Codec,pli:&AtomicBool)->Result<(),String> {
|
/// 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 {
|
||||||
|
au.windows(4).enumerate().filter(|(_,w)|w[..3]==[0,0,1]).any(|(i,w)|match codec {
|
||||||
|
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)),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/// Reads first_mb_in_slice and slice_type (both ue(v)) from a slice header; I = 2 or 7.
|
||||||
|
fn h264_i_slice(rbsp:&[u8])->bool {
|
||||||
|
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(())
|
||||||
|
}
|
||||||
|
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)) {
|
||||||
@@ -24,17 +71,54 @@ 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(){
|
||||||
|
use crate::viewer::media::Codec;
|
||||||
|
assert!(super::is_key_frame(Codec::H264,&[0,0,0,1,0x67,1,0,0,0,1,0x68,2,0,0,0,1,0x65,3]));
|
||||||
|
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,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;}}
|
||||||
struct Sink(usize);impl FrameSink for Sink{fn present(&mut self,f:&Frame)->Result<(),String>{assert_eq!(f.rgb.len(),3);self.0+=1;Ok(())}}
|
struct Sink(usize);impl FrameSink for Sink{fn present(&mut self,f:&Frame)->Result<(),String>{assert_eq!(f.rgb.len(),3);self.0+=1;Ok(())}}
|
||||||
@@ -42,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]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
//! "Allow the same account to control this device": the Settings switch runs this computer's own
|
||||||
|
//! host (`uuremote-server`, the sibling binary) as the systemd user service, so the Linux machine
|
||||||
|
//! shows up in every client of that account. Hosting is opt-in: the viewer never enables the
|
||||||
|
//! service by itself, and the unit's enabled state is the saved choice. The host reads the shared
|
||||||
|
//! config.json, so a running host only needs a restart to go online with a new account.
|
||||||
|
use std::process::{Command, Stdio};
|
||||||
|
|
||||||
|
const UNIT: &str = "uuremote-native.service";
|
||||||
|
/// `UU_VIEWER_HOST=0` leaves the host service alone.
|
||||||
|
pub fn managed() -> bool { std::env::var("UU_VIEWER_HOST").as_deref() != Ok("0") }
|
||||||
|
fn systemctl(args: &[&str]) -> bool {
|
||||||
|
Command::new("systemctl").arg("--user").args(args).stdin(Stdio::null()).stdout(Stdio::null()).stderr(Stdio::null())
|
||||||
|
.status().is_ok_and(|s| s.success())
|
||||||
|
}
|
||||||
|
pub fn active() -> bool { systemctl(&["is-active", "--quiet", UNIT]) }
|
||||||
|
fn installed() -> bool { systemctl(&["cat", UNIT]) }
|
||||||
|
|
||||||
|
/// Same unit as packaging/deb and README (graphical-session.target imports DISPLAY / WAYLAND_DISPLAY).
|
||||||
|
fn unit_text(server: &std::path::Path) -> String {
|
||||||
|
format!("[Unit]\nDescription=UU Remote Linux host (unofficial)\nAfter=graphical-session.target\nPartOf=graphical-session.target\n\n\
|
||||||
|
[Service]\nEnvironment=RUST_LOG=info\nExecStart={}\nRestart=always\nRestartSec=5\n\n[Install]\nWantedBy=graphical-session.target\n", server.display())
|
||||||
|
}
|
||||||
|
fn install(server: &std::path::Path) -> Result<(), String> {
|
||||||
|
let base = std::env::var_os("XDG_CONFIG_HOME").map(std::path::PathBuf::from).filter(|p| p.is_absolute())
|
||||||
|
.or_else(|| std::env::var_os("HOME").map(|h| std::path::PathBuf::from(h).join(".config"))).ok_or("No config directory")?;
|
||||||
|
let dir = base.join("systemd/user");
|
||||||
|
std::fs::create_dir_all(&dir).map_err(|_| "Cannot create the systemd user directory")?;
|
||||||
|
std::fs::write(dir.join(UNIT), unit_text(server)).map_err(|_| "Cannot write the host service")?;
|
||||||
|
if systemctl(&["daemon-reload"]) { Ok(()) } else { Err("systemctl --user daemon-reload failed".into()) }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Starts the host and keeps it enabled (installing the user unit next to the viewer's binary if
|
||||||
|
/// there is none). Only the Settings switch calls this.
|
||||||
|
pub fn enable(viewer: &std::path::Path) -> Result<(), String> {
|
||||||
|
if !installed() {
|
||||||
|
let server = viewer.with_file_name("uuremote-server");
|
||||||
|
if !server.is_file() { return Err("uuremote-server is not installed next to the viewer".into()) }
|
||||||
|
install(&server)?;
|
||||||
|
}
|
||||||
|
if systemctl(&["enable", "--now", UNIT]) { log::info!("Host service enabled"); Ok(()) } else { Err("Cannot start the host service".into()) }
|
||||||
|
}
|
||||||
|
/// The account changed: a running host reloads its credentials. A stopped host stays stopped.
|
||||||
|
pub fn restart() -> Result<(), String> {
|
||||||
|
if systemctl(&["try-restart", UNIT]) { log::info!("Host service restarted"); Ok(()) } else { Err("Cannot restart the host service".into()) }
|
||||||
|
}
|
||||||
|
pub fn disable() -> Result<(), String> {
|
||||||
|
if systemctl(&["disable", "--now", UNIT]) { log::info!("Host service disabled"); Ok(()) } else { Err("Cannot stop the host service".into()) }
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)] mod tests {
|
||||||
|
#[test] fn unit_runs_the_given_server(){
|
||||||
|
let text=super::unit_text(std::path::Path::new("/opt/uu/uuremote-server"));
|
||||||
|
assert!(text.contains("ExecStart=/opt/uu/uuremote-server\n"));assert!(text.contains("WantedBy=graphical-session.target"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,378 @@
|
|||||||
|
//! In-window viewer chrome drawn over the remote picture, like the official client's: the loading
|
||||||
|
//! screen, the network-status panel (Ctrl+Alt+G), the control-center tab and its menu (Ctrl+Alt+M).
|
||||||
|
//! Shapes and text are rasterized on the CPU into small RGBA layers (anti-aliased); text uses a system
|
||||||
|
//! font found with fc-match (CJK capable). Without a font only shapes are drawn.
|
||||||
|
use ab_glyph::{Font, FontVec, PxScale, ScaleFont};
|
||||||
|
use crate::i18n::s;
|
||||||
|
|
||||||
|
pub type Rgba = [u8; 4];
|
||||||
|
const PANEL: Rgba = [32, 34, 40, 255];
|
||||||
|
const HOVER: Rgba = [255, 255, 255, 16];
|
||||||
|
const TEXT: Rgba = [240, 242, 245, 255];
|
||||||
|
const DIM: Rgba = [160, 166, 176, 255];
|
||||||
|
const ACCENT: Rgba = [59, 130, 246, 255];
|
||||||
|
const DANGER: Rgba = [248, 113, 113, 255];
|
||||||
|
|
||||||
|
/// Straight-alpha RGBA pixels, uploaded as SDL_PIXELFORMAT_RGBA32 with alpha blending.
|
||||||
|
pub struct Layer { pub w: u32, pub h: u32, pub px: Vec<u8> }
|
||||||
|
impl Layer {
|
||||||
|
pub fn new(w: u32, h: u32) -> Self { Self { w: w.max(1), h: h.max(1), px: vec![0; w.max(1) as usize * h.max(1) as usize * 4] } }
|
||||||
|
fn blend(&mut self, x: i32, y: i32, c: Rgba, coverage: f32) {
|
||||||
|
if x < 0 || y < 0 || x >= self.w as i32 || y >= self.h as i32 || coverage <= 0. { return }
|
||||||
|
let i = (y as usize * self.w as usize + x as usize) * 4;
|
||||||
|
let sa = c[3] as f32 / 255. * coverage.min(1.);
|
||||||
|
let da = self.px[i + 3] as f32 / 255.;
|
||||||
|
let oa = sa + da * (1. - sa);
|
||||||
|
if oa <= 0. { return }
|
||||||
|
for k in 0..3 { self.px[i + k] = ((c[k] as f32 * sa + self.px[i + k] as f32 * da * (1. - sa)) / oa).round() as u8; }
|
||||||
|
self.px[i + 3] = (oa * 255.).round() as u8;
|
||||||
|
}
|
||||||
|
/// Anti-aliased rounded rectangle; coverage from the signed distance to the rounded edge.
|
||||||
|
pub fn round_rect(&mut self, x: f32, y: f32, w: f32, h: f32, r: f32, c: Rgba) {
|
||||||
|
let r = r.min(w / 2.).min(h / 2.);
|
||||||
|
for py in y.floor() as i32..(y + h).ceil() as i32 { for px in x.floor() as i32..(x + w).ceil() as i32 {
|
||||||
|
let (fx, fy) = (px as f32 + 0.5, py as f32 + 0.5);
|
||||||
|
let qx = (fx - (x + w / 2.)).abs() - (w / 2. - r);
|
||||||
|
let qy = (fy - (y + h / 2.)).abs() - (h / 2. - r);
|
||||||
|
let d = (qx.max(0.).hypot(qy.max(0.))) + qx.max(qy).min(0.) - r;
|
||||||
|
self.blend(px, py, c, 0.5 - d);
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
pub fn circle(&mut self, cx: f32, cy: f32, r: f32, c: Rgba) { self.round_rect(cx - r, cy - r, r * 2., r * 2., r, c); }
|
||||||
|
/// Text with its top-left at (x, y); returns the advance width.
|
||||||
|
pub fn text(&mut self, font: Option<&FontVec>, x: f32, y: f32, text: &str, size: f32, c: Rgba) -> f32 {
|
||||||
|
let Some(font) = font else { return 0. };
|
||||||
|
let scaled = font.as_scaled(PxScale::from(size));
|
||||||
|
let mut caret = x;
|
||||||
|
for ch in text.chars() {
|
||||||
|
let id = scaled.glyph_id(ch);
|
||||||
|
let glyph = id.with_scale_and_position(PxScale::from(size), ab_glyph::point(caret, y + scaled.ascent()));
|
||||||
|
caret += scaled.h_advance(id);
|
||||||
|
if let Some(outline) = font.outline_glyph(glyph) {
|
||||||
|
let b = outline.px_bounds();
|
||||||
|
outline.draw(|gx, gy, v| self.blend(b.min.x.floor() as i32 + gx as i32, b.min.y.floor() as i32 + gy as i32, c, v));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
caret - x
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn measure(font: Option<&FontVec>, text: &str, size: f32) -> f32 {
|
||||||
|
let Some(font) = font else { return text.chars().count() as f32 * size * 0.55 };
|
||||||
|
let scaled = font.as_scaled(PxScale::from(size));
|
||||||
|
text.chars().map(|ch| scaled.h_advance(scaled.glyph_id(ch))).sum()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The UI font: `UU_VIEWER_FONT` (a .ttf/.otf/.ttc path), else fontconfig's CJK-capable sans-serif.
|
||||||
|
pub fn load_font() -> Option<FontVec> {
|
||||||
|
let (path, index) = match std::env::var("UU_VIEWER_FONT") {
|
||||||
|
Ok(p) if !p.is_empty() => (p, 0),
|
||||||
|
_ => {
|
||||||
|
let out = std::process::Command::new("fc-match").args(["-f", "%{file}\t%{index}", "sans-serif:lang=zh-cn"]).output().ok()?;
|
||||||
|
let line = String::from_utf8(out.stdout).ok()?;
|
||||||
|
let (file, index) = line.split_once('\t').unwrap_or((line.as_str(), "0"));
|
||||||
|
// fontconfig puts the variable-font named instance in the upper 16 bits; the face is below.
|
||||||
|
(file.to_owned(), index.trim().parse::<u32>().unwrap_or(0) & 0xffff)
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let data = std::fs::read(&path).ok()?;
|
||||||
|
let mut font = FontVec::try_from_vec_and_index(data, index).ok()?;
|
||||||
|
// Variable CJK fonts default to their lightest master; use a regular UI weight.
|
||||||
|
use ab_glyph::VariableFont;
|
||||||
|
font.set_variation(b"wght", 450.);
|
||||||
|
Some(font)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------- loading screen
|
||||||
|
|
||||||
|
pub fn spinner(t: f32, size: u32) -> Layer {
|
||||||
|
let mut l = Layer::new(size, size);
|
||||||
|
let c = size as f32 / 2.;
|
||||||
|
let head = (t * 1.1).fract() * std::f32::consts::TAU;
|
||||||
|
for i in 0..12 {
|
||||||
|
let a = i as f32 / 12. * std::f32::consts::TAU;
|
||||||
|
// Brightness falls off smoothly behind the rotating head.
|
||||||
|
let behind = (head - a).rem_euclid(std::f32::consts::TAU) / std::f32::consts::TAU;
|
||||||
|
let alpha = (255. * (1. - behind).powf(1.6)).max(40.) as u8;
|
||||||
|
l.circle(c + a.sin() * c * 0.72, c - a.cos() * c * 0.72, size as f32 * 0.07, [255, 255, 255, alpha]);
|
||||||
|
}
|
||||||
|
l
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn label_layer(font: Option<&FontVec>, text: &str, size: f32, c: Rgba) -> Layer {
|
||||||
|
let mut l = Layer::new(measure(font, text, size).ceil() as u32 + 4, (size * 1.4).ceil() as u32);
|
||||||
|
l.text(font, 2., 0., text, size, c);
|
||||||
|
l
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------- network status
|
||||||
|
|
||||||
|
#[derive(Default, Clone, PartialEq)]
|
||||||
|
pub struct NetStats { pub elapsed: u64, pub route: String, pub fps: u32, pub kbps: f64, pub rtt_ms: Option<u32>, pub loss: f64, pub size: (u32, u32), pub codec: &'static str, pub chroma: u32 }
|
||||||
|
pub fn stats_lines(n: &NetStats) -> Vec<String> {
|
||||||
|
let rate = if n.kbps >= 1000. { format!("{:.1} Mbps", n.kbps / 1000.) } else { format!("{:.0} Kbps", n.kbps) };
|
||||||
|
vec![
|
||||||
|
format!("{:02}:{:02}:{:02}", n.elapsed / 3600, n.elapsed / 60 % 60, n.elapsed % 60),
|
||||||
|
if n.route.is_empty() { "--".into() } else { n.route.clone() },
|
||||||
|
format!("{} fps · {}", n.fps, n.codec),
|
||||||
|
rate,
|
||||||
|
n.rtt_ms.map_or_else(|| "RTT --".into(), |r| format!("RTT {r} ms")),
|
||||||
|
format!("{} {:.1}%", s("丢包", "Loss"), n.loss),
|
||||||
|
format!("{}×{} · {}", n.size.0, n.size.1, if n.chroma == 3 { "4:4:4" } else { "4:2:0" }),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
pub fn stats_layer(font: Option<&FontVec>, lines: &[String], scale: f32) -> Layer {
|
||||||
|
let size = 13. * scale;
|
||||||
|
let w = lines.iter().map(|l| measure(font, l, size)).fold(0., f32::max) + 24. * scale;
|
||||||
|
let h = lines.len() as f32 * size * 1.45 + 16. * scale;
|
||||||
|
let mut l = Layer::new(w.ceil() as u32, h.ceil() as u32);
|
||||||
|
l.round_rect(0., 0., w, h, 8. * scale, [0, 0, 0, 150]);
|
||||||
|
for (i, line) in lines.iter().enumerate() { l.text(font, 12. * scale, 8. * scale + i as f32 * size * 1.45, line, size, TEXT); }
|
||||||
|
l
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------- control center
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, PartialEq, Debug)]
|
||||||
|
pub enum Command {
|
||||||
|
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,
|
||||||
|
}
|
||||||
|
/// What the menu shows as selected. The host does not report remote settings back; quality, frame
|
||||||
|
/// rate and color are saved and sent again when the next session's CONTROL is ready.
|
||||||
|
#[derive(Clone, PartialEq)]
|
||||||
|
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 auto_lock: bool, pub host_mute: bool, pub grab_keys: bool, pub watch: bool, pub stats: bool, pub hide_tab: bool, pub fullscreen: bool,
|
||||||
|
}
|
||||||
|
impl Default for State {
|
||||||
|
fn default() -> Self { Self { quality: 5, fps: 60, chroma: 1, follow_remote: true, one_to_one: false, volume: 100, auto_lock: false,
|
||||||
|
host_mute: false, grab_keys: false, watch: false, stats: false, hide_tab: false, fullscreen: false } }
|
||||||
|
}
|
||||||
|
|
||||||
|
enum Opt { Header(&'static str), Radio(&'static str, bool, Command), Check(&'static str, bool, Command), Action(&'static str, Command, &'static str), Slider }
|
||||||
|
fn categories() -> [&'static str; 10] {
|
||||||
|
[s("显示屏", "Display"), s("画质", "Quality"), s("窗口", "Window"), s("声音", "Sound"), s("安全", "Security"),
|
||||||
|
s("外设", "Peripherals"), s("工具", "Tools"), s("更多", "More"), s("全屏", "Full screen"), s("退出远控", "Disconnect")]
|
||||||
|
}
|
||||||
|
fn options(cat: usize, st: &State) -> Vec<Opt> {
|
||||||
|
use Opt::*;
|
||||||
|
match cat {
|
||||||
|
0 => vec![Header(s("分辨率", "Resolution")), Radio(s("跟随被控端", "Follow the remote"), st.follow_remote, Command::FollowRemote(true)),
|
||||||
|
Radio(s("跟随当前窗口", "Match this window"), !st.follow_remote, Command::FollowRemote(false))],
|
||||||
|
1 => vec![Radio(s("自动", "Auto"), st.quality == 5, Command::Quality(5)), Radio(s("原画 20M", "Original 20M"), st.quality == 4, Command::Quality(4)),
|
||||||
|
Radio(s("超清 8M", "Ultra HD 8M"), st.quality == 3, Command::Quality(3)), Radio(s("高清 2M", "HD 2M"), st.quality == 2, Command::Quality(2)),
|
||||||
|
Header(s("帧率", "Frame rate")), Radio(s("144 帧", "144 fps"), st.fps == 144, Command::Fps(144)), Radio(s("90 帧", "90 fps"), st.fps == 90, Command::Fps(90)),
|
||||||
|
Radio(s("60 帧", "60 fps"), st.fps == 60, Command::Fps(60)), Radio(s("30 帧", "30 fps"), st.fps == 30, Command::Fps(30)),
|
||||||
|
Header(s("色彩", "Color")), Radio(s("真彩 4:4:4", "True color 4:4:4"), st.chroma == 3, Command::Chroma(3)),
|
||||||
|
Radio(s("常规色彩", "Standard color"), st.chroma != 3, Command::Chroma(1))],
|
||||||
|
2 => vec![Radio(s("自适应", "Fit to window"), !st.one_to_one, Command::OneToOne(false)), Radio(s("实际大小 1:1", "Actual size 1:1"), st.one_to_one, Command::OneToOne(true))],
|
||||||
|
3 => vec![Slider],
|
||||||
|
4 => vec![Check(s("远程结束后,被控端自动锁屏", "Lock the remote when the session ends"), st.auto_lock, Command::AutoLock(!st.auto_lock)),
|
||||||
|
Check(s("被控端静音运行", "Mute the remote while connected"), st.host_mute, Command::HostMute(!st.host_mute))],
|
||||||
|
5 => vec![Header(s("键盘", "Keyboard")), Check(s("发送系统快捷键到被控端", "Send system shortcuts (Alt+Tab)"), st.grab_keys, Command::GrabKeys(!st.grab_keys))],
|
||||||
|
6 => vec![Action(s("文件传输", "File transfer"), Command::Files, "Ctrl+Alt+F"), Check(s("观看模式", "Watch mode"), st.watch, Command::Watch(!st.watch))],
|
||||||
|
7 => vec![Check(s("显示网络状态", "Show network status"), st.stats, Command::Stats(!st.stats)),
|
||||||
|
Check(s("全屏状态隐藏控制按钮", "Hide the control tab in full screen"), st.hide_tab, Command::HideTab(!st.hide_tab))],
|
||||||
|
_ => vec![],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, PartialEq)]
|
||||||
|
pub enum Hit { Tab, Category(usize), Option(usize, usize), Slider(f32, f32), Panel }
|
||||||
|
#[derive(Clone, PartialEq)]
|
||||||
|
pub struct Menu { pub open: bool, pub category: usize, pub hover: Option<Hit>, pub dragging: bool }
|
||||||
|
impl Default for Menu { fn default() -> Self { Self { open: false, category: 1, hover: None, dragging: false } } }
|
||||||
|
|
||||||
|
pub struct Rect { pub x: f32, pub y: f32, pub w: f32, pub h: f32 }
|
||||||
|
impl Rect { pub fn contains(&self, x: f32, y: f32) -> bool { x >= self.x && y >= self.y && x < self.x + self.w && y < self.y + self.h } }
|
||||||
|
|
||||||
|
pub const TAB_H: f32 = 30.;
|
||||||
|
pub fn tab_text() -> &'static str { s("控制中心", "Control center") }
|
||||||
|
/// Width of the drawn menu icon plus its gap; fonts without U+2630 would show a box.
|
||||||
|
const ICON_W: f32 = 18.;
|
||||||
|
pub fn tab_rect(font: Option<&FontVec>, window: (u32, u32), scale: f32) -> Rect {
|
||||||
|
let w = measure(font, tab_text(), 13. * scale) + (28. + ICON_W) * scale;
|
||||||
|
Rect { x: (window.0 as f32 - w) / 2., y: 0., w, h: TAB_H * scale }
|
||||||
|
}
|
||||||
|
pub fn tab_layer(font: Option<&FontVec>, scale: f32, hover: bool) -> Layer {
|
||||||
|
let r = tab_rect(font, (0, 0), scale);
|
||||||
|
let mut l = Layer::new(r.w.ceil() as u32, r.h.ceil() as u32);
|
||||||
|
// Flat top edge: the pill hangs from the window border.
|
||||||
|
l.round_rect(0., -12. * scale, r.w, r.h + 12. * scale, 12. * scale, if hover { [40, 44, 52, 235] } else { [24, 26, 31, 205] });
|
||||||
|
for i in 0..3 { l.round_rect(14. * scale, r.h / 2. + (i as f32 * 4. - 5.) * scale, 11. * scale, 1.6 * scale, 0.8 * scale, TEXT); }
|
||||||
|
l.text(font, (14. + ICON_W) * scale, (r.h - 13. * scale * 1.25) / 2., tab_text(), 13. * scale, TEXT);
|
||||||
|
l
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Menu geometry relative to its own layer; the same list drives drawing and hit testing.
|
||||||
|
/// Cascading like the official client: a narrow category list and, beside the hovered row,
|
||||||
|
/// a card sized to the selected category's options.
|
||||||
|
pub struct Layout { pub w: f32, pub h: f32, pub items: Vec<(Rect, Hit)>, pub panels: Vec<Rect> }
|
||||||
|
const ROW: f32 = 30.; const HEADER: f32 = 22.; const SLIDER: f32 = 36.; const PAD: f32 = 6.; const SHADOW: f32 = 14.;
|
||||||
|
const MAIN_W: f32 = 150.; const GAP: f32 = 6.; const TEXT_SIZE: f32 = 13.;
|
||||||
|
fn option_height(opt: &Opt) -> f32 { match opt { Opt::Header(_) => HEADER, Opt::Slider => SLIDER, _ => ROW } }
|
||||||
|
fn option_width(font: Option<&FontVec>, opt: &Opt, scale: f32) -> f32 {
|
||||||
|
let text = |t: &str, size: f32| measure(font, t, size * scale);
|
||||||
|
match opt {
|
||||||
|
Opt::Header(t) => text(t, 11.) + 28. * scale,
|
||||||
|
Opt::Radio(t, ..) | Opt::Check(t, ..) => text(t, TEXT_SIZE) + 52. * scale,
|
||||||
|
Opt::Action(t, _, key) => text(t, TEXT_SIZE) + text(key, 11.) + 72. * scale,
|
||||||
|
Opt::Slider => 210. * scale,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn layout(font: Option<&FontVec>, st: &State, menu: &Menu, scale: f32) -> Layout {
|
||||||
|
let k = |v: f32| v * scale;
|
||||||
|
let cats = categories().len();
|
||||||
|
let main = Rect { x: k(SHADOW), y: k(SHADOW), w: k(MAIN_W), h: k(PAD * 2. + ROW * cats as f32) };
|
||||||
|
let mut items: Vec<(Rect, Hit)> = (0..cats).map(|i| (Rect { x: main.x + k(PAD), y: main.y + k(PAD + ROW * i as f32), w: main.w - k(PAD * 2.), h: k(ROW) }, Hit::Category(i))).collect();
|
||||||
|
let mut panels = vec![Rect { x: main.x, y: main.y, w: main.w, h: main.h }];
|
||||||
|
let opts = options(menu.category, st);
|
||||||
|
let (mut w, mut h) = (main.x + main.w + k(SHADOW), main.y + main.h + k(SHADOW));
|
||||||
|
if !opts.is_empty() {
|
||||||
|
let sub_w = opts.iter().map(|o| option_width(font, o, scale)).fold(k(180.), f32::max);
|
||||||
|
let sub_h = k(PAD * 2.) + opts.iter().map(|o| k(option_height(o))).sum::<f32>();
|
||||||
|
// Aligned with the selected category row, kept inside the main panel's height when possible.
|
||||||
|
let row_y = main.y + k(PAD + ROW * menu.category as f32) - k(PAD);
|
||||||
|
let sub = Rect { x: main.x + main.w + k(GAP), y: row_y.min((main.y + main.h - sub_h).max(main.y)), w: sub_w, h: sub_h };
|
||||||
|
let mut y = sub.y + k(PAD);
|
||||||
|
for (i, opt) in opts.iter().enumerate() {
|
||||||
|
let r = Rect { x: sub.x + k(PAD), y, w: sub.w - k(PAD * 2.), h: k(option_height(opt)) };
|
||||||
|
match opt {
|
||||||
|
Opt::Header(_) => {}
|
||||||
|
Opt::Slider => items.push((r, Hit::Slider(sub.x + k(18.), sub.w - k(70.)))),
|
||||||
|
_ => items.push((r, Hit::Option(menu.category, i))),
|
||||||
|
}
|
||||||
|
y += k(option_height(opt));
|
||||||
|
}
|
||||||
|
w = sub.x + sub.w + k(SHADOW); h = h.max(sub.y + sub.h + k(SHADOW));
|
||||||
|
panels.push(sub);
|
||||||
|
}
|
||||||
|
Layout { w, h, items, panels }
|
||||||
|
}
|
||||||
|
fn card(l: &mut Layer, r: &Rect, scale: f32) {
|
||||||
|
// Soft drop shadow, then an opaque card with a hairline border.
|
||||||
|
for i in (1..=6).rev() {
|
||||||
|
let e = i as f32 * 2. * scale;
|
||||||
|
l.round_rect(r.x - e / 2., r.y - e / 2. + 3. * scale, r.w + e, r.h + e, 10. * scale + e / 2., [0, 0, 0, 9]);
|
||||||
|
}
|
||||||
|
l.round_rect(r.x - 1., r.y - 1., r.w + 2., r.h + 2., 10. * scale + 1., [255, 255, 255, 26]);
|
||||||
|
l.round_rect(r.x, r.y, r.w, r.h, 10. * scale, PANEL);
|
||||||
|
}
|
||||||
|
pub fn menu_layer(font: Option<&FontVec>, st: &State, menu: &Menu, scale: f32) -> (Layer, Layout) {
|
||||||
|
let lay = layout(font, st, menu, scale);
|
||||||
|
let k = |v: f32| v * scale;
|
||||||
|
let mut l = Layer::new(lay.w.ceil() as u32, lay.h.ceil() as u32);
|
||||||
|
for p in &lay.panels { card(&mut l, p, scale); }
|
||||||
|
let size = k(TEXT_SIZE);
|
||||||
|
let mid = |r: &Rect, size: f32| r.y + (r.h - size * 1.25) / 2.;
|
||||||
|
let opts = options(menu.category, st);
|
||||||
|
for (i, name) in categories().iter().enumerate() {
|
||||||
|
let r = &lay.items[i].0;
|
||||||
|
let selected = menu.category == i && !opts.is_empty();
|
||||||
|
if selected { l.round_rect(r.x, r.y + 1., r.w, r.h - 2., k(6.), [255, 255, 255, 30]); }
|
||||||
|
else if menu.hover == Some(Hit::Category(i)) { l.round_rect(r.x, r.y + 1., r.w, r.h - 2., k(6.), HOVER); }
|
||||||
|
if i == 9 { l.round_rect(r.x + k(4.), r.y - k(1.), r.w - k(8.), 1., 0., [255, 255, 255, 22]); }
|
||||||
|
l.text(font, r.x + k(10.), mid(r, size), name, size, if i == 9 { DANGER } else { TEXT });
|
||||||
|
if !options(i, st).is_empty() { l.text(font, r.x + r.w - k(14.), mid(r, size), "›", size, if selected { TEXT } else { DIM }); }
|
||||||
|
}
|
||||||
|
if let Some(sub) = lay.panels.get(1) {
|
||||||
|
let mut y = sub.y + k(PAD);
|
||||||
|
for (i, opt) in opts.iter().enumerate() {
|
||||||
|
let r = Rect { x: sub.x + k(PAD), y, w: sub.w - k(PAD * 2.), h: k(option_height(opt)) };
|
||||||
|
if menu.hover == Some(Hit::Option(menu.category, i)) { l.round_rect(r.x, r.y + 1., r.w, r.h - 2., k(6.), HOVER); }
|
||||||
|
match opt {
|
||||||
|
Opt::Header(t) => { l.text(font, r.x + k(10.), r.y + k(6.), t, k(11.), DIM); }
|
||||||
|
Opt::Radio(t, on, _) => {
|
||||||
|
if *on { l.circle(r.x + k(16.), r.y + r.h / 2., k(3.), ACCENT); }
|
||||||
|
l.text(font, r.x + k(30.), mid(&r, size), t, size, if *on { TEXT } else { [214, 218, 224, 255] });
|
||||||
|
}
|
||||||
|
Opt::Check(t, on, _) => {
|
||||||
|
// Drawn check mark: fonts without U+2713 would show a box.
|
||||||
|
if *on { let (cx, cy) = (r.x + k(16.), r.y + r.h / 2.);
|
||||||
|
for j in 0..8 { let f = j as f32 / 7.; l.circle(cx - k(4.) + f * k(3.), cy + f * k(3.), k(1.1), ACCENT); l.circle(cx - k(1.) + f * k(6.), cy + k(3.) - f * k(7.), k(1.1), ACCENT); } }
|
||||||
|
l.text(font, r.x + k(30.), mid(&r, size), t, size, if *on { TEXT } else { [214, 218, 224, 255] });
|
||||||
|
}
|
||||||
|
Opt::Action(t, _, key) => {
|
||||||
|
l.text(font, r.x + k(30.), mid(&r, size), t, size, TEXT);
|
||||||
|
let kw = measure(font, key, k(11.));
|
||||||
|
l.text(font, r.x + r.w - kw - k(10.), mid(&r, k(11.)), key, k(11.), DIM);
|
||||||
|
}
|
||||||
|
Opt::Slider => {
|
||||||
|
let (a, len) = (sub.x + k(18.), sub.w - k(70.));
|
||||||
|
let v = st.volume as f32 / 100.; let cy = r.y + r.h / 2.;
|
||||||
|
l.round_rect(a, cy - k(2.), len, k(4.), k(2.), [255, 255, 255, 40]);
|
||||||
|
l.round_rect(a, cy - k(2.), (len * v).max(k(4.)), k(4.), k(2.), ACCENT);
|
||||||
|
l.circle(a + len * v, cy, k(7.), [0, 0, 0, 60]);
|
||||||
|
l.circle(a + len * v, cy, k(6.), [255, 255, 255, 255]);
|
||||||
|
let label = format!("{}%", st.volume);
|
||||||
|
l.text(font, sub.x + sub.w - k(14.) - measure(font, &label, k(12.)), mid(&r, k(12.)), &label, k(12.), DIM);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
y += r.h;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
(l, lay)
|
||||||
|
}
|
||||||
|
/// The command for a click on an option row.
|
||||||
|
pub fn option_command(st: &State, cat: usize, index: usize) -> Option<Command> {
|
||||||
|
match options(cat, st).get(index)? { Opt::Radio(_, _, c) | Opt::Check(_, _, c) | Opt::Action(_, c, _) => Some(*c), _ => None }
|
||||||
|
}
|
||||||
|
pub fn category_command(cat: usize) -> Option<Command> { match cat { 8 => Some(Command::Fullscreen), 9 => Some(Command::Disconnect), _ => None } }
|
||||||
|
pub fn slider_value(x: f32, a: f32, len: f32) -> u8 { (((x - a) / len).clamp(0., 1.) * 100.).round() as u8 }
|
||||||
|
|
||||||
|
/// Viewer preferences that outlive a session (`viewer.json` next to config.json).
|
||||||
|
pub fn load_prefs(st: &mut State) {
|
||||||
|
let Ok(text) = std::fs::read_to_string(prefs_path()) else { return };
|
||||||
|
let Ok(v) = serde_json::from_str::<serde_json::Value>(&text) else { return };
|
||||||
|
if let Some(b) = v["stats"].as_bool() { st.stats = 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(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) {
|
||||||
|
let path = prefs_path();
|
||||||
|
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,
|
||||||
|
"quality": st.quality, "fps": st.fps, "chroma": st.chroma});
|
||||||
|
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")) }
|
||||||
|
|
||||||
|
#[cfg(test)] mod tests {
|
||||||
|
use super::*;
|
||||||
|
#[test] fn layers_blend_inside_bounds_only(){
|
||||||
|
let mut l=Layer::new(8,8);l.round_rect(-4.,-4.,20.,20.,3.,[255,0,0,255]);l.circle(100.,100.,5.,[0,0,0,255]);
|
||||||
|
assert!(l.px.chunks_exact(4).all(|p|p==[255,0,0,255]));
|
||||||
|
let mut l=Layer::new(4,4);l.round_rect(0.,0.,4.,4.,0.,[0,0,255,128]);assert_eq!(&l.px[..4],&[0,0,255,128]);
|
||||||
|
}
|
||||||
|
#[test] fn every_option_row_has_a_command_and_categories_map_actions(){
|
||||||
|
let st=State::default();
|
||||||
|
for cat in 0..10 { let lay=layout(None,&st,&Menu{category:cat,..Default::default()},1.);
|
||||||
|
for (_,hit) in &lay.items { if let Hit::Option(c,i)=hit { assert!(option_command(&st,*c,*i).is_some()); } } }
|
||||||
|
assert_eq!(category_command(9),Some(Command::Disconnect));assert_eq!(category_command(1),None);
|
||||||
|
assert_eq!(slider_value(150.,100.,100.),50);assert_eq!(slider_value(0.,100.,100.),0);
|
||||||
|
}
|
||||||
|
/// `UU_HUD_PREVIEW=dir cargo test render_preview -- --ignored` writes the chrome as PNGs (visual check).
|
||||||
|
#[test] #[ignore] fn render_preview(){
|
||||||
|
let Some(dir)=std::env::var_os("UU_HUD_PREVIEW") else {return};let dir=std::path::PathBuf::from(dir);
|
||||||
|
let font=load_font();let font=font.as_ref();
|
||||||
|
let save=|name:&str,l:&Layer,bg:[u8;3]|{
|
||||||
|
let rgb:Vec<u8>=l.px.chunks_exact(4).flat_map(|p|{let a=p[3] as u32;(0..3).map(move|k|((p[k] as u32*a+bg[k] as u32*(255-a))/255) as u8)}).collect();
|
||||||
|
crate::viewer::type_ipc::write_png_rgb(&dir.join(name),l.w,l.h,&rgb,false).unwrap();
|
||||||
|
};
|
||||||
|
let st=State{stats:true,..State::default()};
|
||||||
|
for cat in [1usize,3,4] {let (l,_)=menu_layer(font,&st,&Menu{open:true,category:cat,hover:Some(Hit::Option(cat,1)),dragging:false},1.);save(&format!("menu{cat}.png"),&l,[200,200,210]);}
|
||||||
|
save("tab.png",&tab_layer(font,1.,false),[230,230,230]);
|
||||||
|
let n=NetStats{elapsed:57,route:"UDP · relay".into(),fps:60,kbps:8420.,rtt_ms:Some(36),loss:0.,size:(1920,1080),codec:"H.265",chroma:1};
|
||||||
|
save("stats.png",&stats_layer(font,&stats_lines(&n),1.),[230,230,230]);
|
||||||
|
save("spinner.png",&spinner(0.3,56),[17,19,24]);
|
||||||
|
save("title.png",&label_layer(font,"Connecting to PUNOSEVAC",20.,[240,242,245,255]),[17,19,24]);
|
||||||
|
}
|
||||||
|
#[test] fn stats_lines_format_numbers(){
|
||||||
|
let n=NetStats{elapsed:3723,route:"UDP · relay".into(),fps:60,kbps:8420.,rtt_ms:Some(36),loss:0.25,size:(1920,1080),codec:"H.265",chroma:3};
|
||||||
|
let l=stats_lines(&n);assert_eq!(l[0],"01:02:03");assert_eq!(l[3],"8.4 Mbps");assert_eq!(l[4],"RTT 36 ms");assert!(l[6].ends_with("4:4:4"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -66,6 +66,7 @@ impl Input {
|
|||||||
pub fn new(view_only:bool)->Self {Self{view_only,..Default::default()}}
|
pub fn new(view_only:bool)->Self {Self{view_only,..Default::default()}}
|
||||||
pub fn set_mac(&mut self,mac:bool){self.mac=mac;}
|
pub fn set_mac(&mut self,mac:bool){self.mac=mac;}
|
||||||
pub fn enabled(&self)->bool {!self.view_only}
|
pub fn enabled(&self)->bool {!self.view_only}
|
||||||
|
pub fn set_view_only(&mut self,view_only:bool){self.view_only=view_only;}
|
||||||
pub fn key(&mut self,scan:i32,down:bool)->Option<Value> {
|
pub fn key(&mut self,scan:i32,down:bool)->Option<Value> {
|
||||||
if self.view_only {return None}
|
if self.view_only {return None}
|
||||||
let vk=if self.mac{mac_keycode(scan)}else{windows_vk(scan)}?;
|
let vk=if self.mac{mac_keycode(scan)}else{windows_vk(scan)}?;
|
||||||
|
|||||||
+8
-3
@@ -16,8 +16,13 @@ pub mod desktop;
|
|||||||
#[cfg(uu_gtk)] pub mod ui;
|
#[cfg(uu_gtk)] pub mod ui;
|
||||||
#[cfg(uu_gtk)] pub mod tools_ui;
|
#[cfg(uu_gtk)] pub mod tools_ui;
|
||||||
#[cfg(feature="viewer-sdl")] pub mod sdl;
|
#[cfg(feature="viewer-sdl")] pub mod sdl;
|
||||||
|
#[cfg(feature="viewer-sdl")] pub mod hud;
|
||||||
|
pub mod thumbs;
|
||||||
|
#[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 power;
|
pub mod power;
|
||||||
@@ -25,7 +30,7 @@ pub mod secure_input;
|
|||||||
pub mod type_ipc;
|
pub mod type_ipc;
|
||||||
|
|
||||||
fn device_label(name:Option<&str>)->&str{
|
fn device_label(name:Option<&str>)->&str{
|
||||||
name.filter(|name|!name.is_empty()).unwrap_or("远端设备")
|
name.filter(|name|!name.is_empty()).unwrap_or_else(||crate::i18n::s("远端设备","Remote device"))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
@@ -33,7 +38,7 @@ mod device_label_tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn device_name_or_fallback(){
|
fn device_name_or_fallback(){
|
||||||
assert_eq!(super::device_label(Some("测试电脑")),"测试电脑");
|
assert_eq!(super::device_label(Some("测试电脑")),"测试电脑");
|
||||||
assert_eq!(super::device_label(None),"远端设备");
|
assert_eq!(super::device_label(None),crate::i18n::s("远端设备","Remote device"));
|
||||||
assert_eq!(super::device_label(Some("")),"远端设备");
|
assert_eq!(super::device_label(Some("")),crate::i18n::s("远端设备","Remote device"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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()]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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()));
|
||||||
|
}
|
||||||
|
}
|
||||||
+46
-6
@@ -36,10 +36,15 @@ pub struct Observed {
|
|||||||
pub media_packets:AtomicU64,
|
pub media_packets:AtomicU64,
|
||||||
pub encoder_codecs:AtomicU32,
|
pub encoder_codecs:AtomicU32,
|
||||||
pub chroma:AtomicU32,
|
pub chroma:AtomicU32,
|
||||||
|
/// Received RTP payload bytes and video packets vs. sequence span, for the network-status panel.
|
||||||
|
pub media_bytes:AtomicU64,
|
||||||
|
pub video_received:AtomicU64,
|
||||||
|
pub video_expected:AtomicU64,
|
||||||
}
|
}
|
||||||
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 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>,
|
||||||
@@ -74,6 +79,7 @@ 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 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;
|
||||||
@@ -115,11 +121,22 @@ impl Peer {
|
|||||||
let mut receiver=super::media::Receiver::new(super::media::Codec::from_mime(&track.codec().capability.mime_type).unwrap_or_default());
|
let mut receiver=super::media::Receiver::new(super::media::Codec::from_mime(&track.codec().capability.mime_type).unwrap_or_default());
|
||||||
let mut tick=tokio::time::interval(std::time::Duration::from_millis(40));
|
let mut tick=tokio::time::interval(std::time::Duration::from_millis(40));
|
||||||
let mut last_pli=std::time::Instant::now()-std::time::Duration::from_secs(1);
|
let mut last_pli=std::time::Instant::now()-std::time::Duration::from_secs(1);
|
||||||
|
let mut span:Option<(u16,u64)>=None;
|
||||||
loop {
|
loop {
|
||||||
let output=tokio::select! {
|
let output=tokio::select! {
|
||||||
packet=track.read_rtp()=>match packet {
|
packet=track.read_rtp()=>match packet {
|
||||||
Ok((p,_))=>{
|
Ok((p,_))=>{
|
||||||
counters.media_packets.fetch_add(1,Ordering::Relaxed);
|
counters.media_packets.fetch_add(1,Ordering::Relaxed);
|
||||||
|
counters.media_bytes.fetch_add(p.payload.len() as u64+12,Ordering::Relaxed);
|
||||||
|
if video {
|
||||||
|
// Extended sequence span: forward steps add, reordered/old packets do not.
|
||||||
|
let seq=p.header.sequence_number;
|
||||||
|
let (last,expected)=span.unwrap_or((seq.wrapping_sub(1),0));
|
||||||
|
let step=seq.wrapping_sub(last);
|
||||||
|
span=Some(if step!=0 && step<32768 {(seq,expected+u64::from(step))} else {(last,expected)});
|
||||||
|
counters.video_expected.store(span.map_or(0,|s|s.1),Ordering::Relaxed);
|
||||||
|
counters.video_received.fetch_add(1,Ordering::Relaxed);
|
||||||
|
}
|
||||||
if !video {if opus {audio.push(p.header.sequence_number,&p.payload);}continue}
|
if !video {if opus {audio.push(p.header.sequence_number,&p.payload);}continue}
|
||||||
// TrackRemote updates codec from the negotiated payload type on each read.
|
// TrackRemote updates codec from the negotiated payload type on each read.
|
||||||
let Some(codec)=super::media::Codec::from_mime(&track.codec().capability.mime_type) else{continue};
|
let Some(codec)=super::media::Codec::from_mime(&track.codec().capability.mime_type) else{continue};
|
||||||
@@ -172,23 +189,27 @@ impl Peer {
|
|||||||
if index==0 {
|
if index==0 {
|
||||||
let weak=Arc::downgrade(&channel);let state=observed.clone();
|
let weak=Arc::downgrade(&channel);let state=observed.clone();
|
||||||
let chroma444=shape.capture_type==1 && std::env::var("UU_VIEWER_CHROMA").is_ok_and(|v|v=="444");
|
let chroma444=shape.capture_type==1 && std::env::var("UU_VIEWER_CHROMA").is_ok_and(|v|v=="444");
|
||||||
|
let desktop_track=shape.capture_type==1;
|
||||||
channel.on_open(Box::new(move ||Box::pin(async move {
|
channel.on_open(Box::new(move ||Box::pin(async move {
|
||||||
state.control_open.store(true,Ordering::Release);
|
state.control_open.store(true,Ordering::Release);
|
||||||
if let Some(channel)=weak.upgrade(){
|
if let Some(channel)=weak.upgrade(){
|
||||||
let _=channel.send(&bytes::Bytes::from(wire::echo_request_with_clipboard(1,clipboard_enabled))).await;
|
let _=channel.send(&bytes::Bytes::from(wire::echo_request_with_clipboard(1,clipboard_enabled))).await;
|
||||||
|
if desktop_track {let _=channel.send(&bytes::Bytes::from(wire::request_video_track())).await;}
|
||||||
if chroma444 {let _=channel.send(&bytes::Bytes::from(wire::request_chroma444())).await;}
|
if chroma444 {let _=channel.send(&bytes::Bytes::from(wire::request_chroma444())).await;}
|
||||||
}
|
}
|
||||||
})));
|
})));
|
||||||
}
|
}
|
||||||
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 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();Box::pin(async move {
|
||||||
if index==0 {
|
if index==0 {
|
||||||
|
feedback.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 {
|
||||||
@@ -236,7 +257,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,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)},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -293,7 +314,26 @@ impl Peer {
|
|||||||
if channel.ready_state()!=webrtc::data_channel::data_channel_state::RTCDataChannelState::Open {return Err("CONTROL is not open".into())}
|
if channel.ready_state()!=webrtc::data_channel::data_channel_state::RTCDataChannelState::Open {return Err("CONTROL is not open".into())}
|
||||||
channel.send(&bytes::Bytes::from(value.to_string())).await.map_err(|_|"CONTROL input send failed")?;Ok(())
|
channel.send(&bytes::Bytes::from(value.to_string())).await.map_err(|_|"CONTROL input send failed")?;Ok(())
|
||||||
}
|
}
|
||||||
pub async fn close(&self) {self.clipboard.stop();self.tools.lock().unwrap().take();let _=self.pc.close().await;}
|
/// Binary CONTROL message (protobuf envelope), e.g. capture settings and SimpleActions.
|
||||||
|
pub async fn send_control(&self,data:Vec<u8>)->Result<(),String> {
|
||||||
|
let channel=&self.channels[0];
|
||||||
|
if channel.ready_state()!=webrtc::data_channel::data_channel_state::RTCDataChannelState::Open {return Err("CONTROL is not open".into())}
|
||||||
|
channel.send(&bytes::Bytes::from(data)).await.map_err(|_|"CONTROL send failed")?;Ok(())
|
||||||
|
}
|
||||||
|
/// Selected ICE pair: (round-trip ms, "UDP · direct" / "TCP · relay" ...). Addresses are not kept.
|
||||||
|
pub async fn route(&self)->(Option<u32>,String) {
|
||||||
|
use webrtc::stats::StatsReportType as T;
|
||||||
|
let report=self.pc.get_stats().await;
|
||||||
|
let pair=report.reports.values().filter_map(|r|match r{T::CandidatePair(p) if p.nominated=>Some(p),_=>None}).max_by_key(|p|p.bytes_received);
|
||||||
|
let Some(pair)=pair else {return (None,String::new())};
|
||||||
|
let local=report.reports.get(&pair.local_candidate_id).and_then(|r|match r{T::LocalCandidate(c)=>Some(c),_=>None});
|
||||||
|
let remote=report.reports.get(&pair.remote_candidate_id).and_then(|r|match r{T::RemoteCandidate(c)=>Some(c),_=>None});
|
||||||
|
let relay=[local,remote].iter().flatten().any(|c|c.candidate_type==webrtc::ice::candidate::CandidateType::Relay);
|
||||||
|
let tcp=local.is_some_and(|c|c.network_type.to_string().to_ascii_lowercase().contains("tcp") || c.relay_protocol.eq_ignore_ascii_case("tcp"));
|
||||||
|
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"}))
|
||||||
|
}
|
||||||
|
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())}}
|
||||||
|
|||||||
+349
-21
@@ -3,22 +3,42 @@ use sdl2::{event::{Event,WindowEvent},mouse::MouseButton,pixels::PixelFormatEnum
|
|||||||
#[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 { 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> }
|
pub last_frame:Option<Frame>, chrome:Chrome }
|
||||||
|
/// In-window chrome state (src/viewer/hud.rs): menu, network panel, loading screen.
|
||||||
|
struct Chrome { font:Option<ab_glyph::FontVec>, scale:f32, pub state:hud::State, menu:hud::Menu, net:Option<hud::NetStats>, tab_hover:bool, tab_down:bool,
|
||||||
|
commands:Vec<hud::Command>, started:std::time::Instant, last_loading:std::time::Instant, title:String, stage:String, labels:std::collections::HashMap<(String,u32,u32),hud::Layer>,
|
||||||
|
menu_cache:Option<(hud::State,hud::Menu,f32,hud::Layer)> }
|
||||||
|
use super::hud;
|
||||||
impl Window {
|
impl Window {
|
||||||
pub fn new()->Result<Self,String>{
|
pub fn new()->Result<Self,String>{
|
||||||
|
// SDL's default nearest-neighbour scaling makes remote text uneven whenever the window size
|
||||||
|
// differs from the stream; filter instead. Set before the renderer/textures exist.
|
||||||
|
sdl2::hint::set_with_priority("SDL_RENDER_SCALE_QUALITY","linear",&sdl2::hint::Hint::Default);
|
||||||
|
#[cfg(uu_gtk)] cairo_decorations();
|
||||||
let sdl=sdl2::init()?;let video=sdl.video()?;
|
let sdl=sdl2::init()?;let video=sdl.video()?;
|
||||||
let window=video.window("Native viewer (experimental)",1280,720).position_centered().resizable().build().map_err(|_|"Window creation failed")?;
|
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 mut canvas=window.into_canvas().build().map_err(|_|"Renderer creation failed")?;
|
let mut canvas=window.into_canvas().build().map_err(|_|"Renderer creation failed")?;
|
||||||
// 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(sdl2::pixels::Color::BLACK);canvas.clear();canvas.present();
|
canvas.set_draw_color(LOADING_BG);canvas.clear();canvas.present();
|
||||||
|
let scale=std::env::var("UU_VIEWER_UI_SCALE").ok().and_then(|v|v.parse::<f32>().ok()).filter(|v|(0.5..=4.).contains(v)).unwrap_or(1.);
|
||||||
|
let mut state=hud::State::default();hud::load_prefs(&mut state);
|
||||||
|
let now=std::time::Instant::now();
|
||||||
|
let chrome=Chrome{font:hud::load_font(),scale,state,menu:hud::Menu::default(),net:None,tab_hover:false,tab_down:false,commands:Vec::new(),started:now,last_loading:now-std::time::Duration::from_secs(1),
|
||||||
|
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})
|
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})
|
||||||
}
|
}
|
||||||
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 viewport(&self)->Viewport {Viewport::fit(self.canvas.window().size(),self.frame)}
|
fn viewport(&self)->Viewport {
|
||||||
|
let window=self.canvas.window().size();
|
||||||
|
if !self.chrome.state.one_to_one {return Viewport::fit(window,self.frame)}
|
||||||
|
let (w,h)=(self.frame.0 as f64,self.frame.1 as f64);
|
||||||
|
Viewport{x:((window.0 as f64-w)/2.).round(),y:((window.1 as f64-h)/2.).round(),width:w,height:h}
|
||||||
|
}
|
||||||
fn poll_clipboard(&mut self){
|
fn poll_clipboard(&mut self){
|
||||||
// Use the existing SDL window; wl-paste creates a transient toplevel on GNOME every poll.
|
// Use the existing SDL window; wl-paste creates a transient toplevel on GNOME every poll.
|
||||||
while let Ok(request)=self.clipboard_requests.try_recv(){
|
while let Ok(request)=self.clipboard_requests.try_recv(){
|
||||||
@@ -41,21 +61,191 @@ impl Window {
|
|||||||
}
|
}
|
||||||
pub fn poll(&mut self,input:&mut Input)->(bool,Vec<serde_json::Value>){
|
pub fn poll(&mut self,input:&mut Input)->(bool,Vec<serde_json::Value>){
|
||||||
let viewport=self.viewport();
|
let viewport=self.viewport();
|
||||||
let dirty=&mut self.clipboard_dirty;let mut redraw=false;
|
let mut redraw=false;
|
||||||
let events=self.events.poll_iter().inspect(|event|{
|
let events=poll_events(&mut self.events);
|
||||||
if matches!(event,Event::ClipboardUpdate{..}|Event::Window{win_event:WindowEvent::FocusGained,..}){*dirty=true;}
|
let mut forward=Vec::with_capacity(events.len());
|
||||||
redraw|=needs_redraw(event);
|
for event in events {
|
||||||
});
|
if matches!(event,Event::ClipboardUpdate{..}|Event::Window{win_event:WindowEvent::FocusGained,..}){self.clipboard_dirty=true;}
|
||||||
let result=translate_actions(events,input,viewport,&mut self.focused,&mut self.files);
|
redraw|=needs_redraw(&event);
|
||||||
|
let (consumed,changed)=self.chrome_event(&event);redraw|=changed;
|
||||||
|
if !consumed {forward.push(event);}
|
||||||
|
}
|
||||||
|
let result=translate_actions(forward,input,viewport,&mut self.focused,&mut self.files);
|
||||||
// A compositor resize (tiling, maximize) leaves the surface without a buffer of the new size
|
// A compositor resize (tiling, maximize) leaves the surface without a buffer of the new size
|
||||||
// until the next frame; a static remote desktop sends none, so repaint the last frame now.
|
// until the next frame; a static remote desktop sends none, so repaint the last frame now.
|
||||||
if redraw {if let Some(frame)=self.last_frame.take(){
|
if redraw {if let Some(frame)=self.last_frame.take(){
|
||||||
log::debug!("Viewer window resized: {:?}",self.canvas.window().size());
|
log::debug!("Viewer window resized: {:?}",self.canvas.window().size());
|
||||||
if let Err(e)=self.draw(&frame){log::warn!("Viewer redraw failed: {e}");}
|
if let Err(e)=self.draw(&frame){log::warn!("Viewer redraw failed: {e}");}
|
||||||
self.last_frame=Some(frame);
|
self.last_frame=Some(frame);
|
||||||
}else{self.canvas.set_draw_color(sdl2::pixels::Color::BLACK);self.canvas.clear();self.canvas.present();}}
|
}else{self.loading_frame(true);}}
|
||||||
result
|
result
|
||||||
}
|
}
|
||||||
|
/// Menu, hotkeys and the control tab. Returns (consumed, needs redraw).
|
||||||
|
fn chrome_event(&mut self,event:&Event)->(bool,bool){
|
||||||
|
use sdl2::keyboard::{Mod,Scancode};
|
||||||
|
let size=self.canvas.window().size();let scale=self.chrome.scale;
|
||||||
|
let tab=hud::tab_rect(self.chrome.font.as_ref(),size,scale);
|
||||||
|
let tab_visible=self.tab_visible();
|
||||||
|
if let Event::KeyDown{scancode:Some(code),keymod,repeat,..}=event {
|
||||||
|
let chord=keymod.intersects(Mod::LCTRLMOD|Mod::RCTRLMOD)&&keymod.intersects(Mod::LALTMOD|Mod::RALTMOD);
|
||||||
|
let command=match code {Scancode::M=>Some(None),Scancode::G=>Some(Some(hud::Command::Stats(!self.chrome.state.stats))),Scancode::Return=>Some(Some(hud::Command::Fullscreen)),_=>None};
|
||||||
|
if chord { if let Some(command)=command {
|
||||||
|
if !repeat { match command {None=>self.chrome.menu.open^=true,Some(c)=>self.command(c)} }
|
||||||
|
return (true,true)
|
||||||
|
}}
|
||||||
|
if self.chrome.menu.open { if *code==Scancode::Escape {self.chrome.menu.open=false;} return (true,true) }
|
||||||
|
}
|
||||||
|
if !self.chrome.menu.open {
|
||||||
|
return match *event {
|
||||||
|
Event::MouseMotion{x,y,..}=>{let h=tab_visible&&tab.contains(x as f32,y as f32);let changed=h!=self.chrome.tab_hover;self.chrome.tab_hover=h;(false,changed)},
|
||||||
|
Event::MouseButtonDown{x,y,mouse_btn:MouseButton::Left,..} if tab_visible&&tab.contains(x as f32,y as f32)=>{self.chrome.menu.open=true;self.chrome.tab_down=true;(true,true)},
|
||||||
|
Event::MouseButtonUp{mouse_btn:MouseButton::Left,..} if self.chrome.tab_down=>{self.chrome.tab_down=false;(true,false)},
|
||||||
|
_=>(false,false),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let lay=hud::layout(self.chrome.font.as_ref(),&self.chrome.state,&self.chrome.menu,scale);let origin=self.menu_origin(&lay);
|
||||||
|
let hit=|x:i32,y:i32|->Option<hud::Hit>{
|
||||||
|
let (lx,ly)=(x as f32-origin.0,y as f32-origin.1);
|
||||||
|
if tab.contains(x as f32,y as f32) {return Some(hud::Hit::Tab)}
|
||||||
|
if !lay.panels.iter().any(|p|p.contains(lx,ly)) {return None}
|
||||||
|
Some(lay.items.iter().find(|(r,_)|r.contains(lx,ly)).map_or(hud::Hit::Panel,|(_,h)|*h))
|
||||||
|
};
|
||||||
|
match *event {
|
||||||
|
Event::MouseMotion{x,y,..}=>{
|
||||||
|
if self.chrome.menu.dragging { if let Some((a,len))=slider(&lay) {self.command(hud::Command::Volume(hud::slider_value(x as f32-origin.0,a,len)));} return (true,true) }
|
||||||
|
let h=hit(x,y);
|
||||||
|
if let Some(hud::Hit::Category(i))=h { if hud::category_command(i).is_none() {self.chrome.menu.category=i;} }
|
||||||
|
let changed=h!=self.chrome.menu.hover;self.chrome.menu.hover=h;(true,changed)
|
||||||
|
},
|
||||||
|
Event::MouseButtonDown{x,y,mouse_btn:MouseButton::Left,..}=>{
|
||||||
|
match hit(x,y) {
|
||||||
|
None|Some(hud::Hit::Tab)=>{self.chrome.menu.open=false;self.chrome.tab_down=true},
|
||||||
|
Some(hud::Hit::Category(i))=>match hud::category_command(i) {Some(c)=>{self.chrome.menu.open=false;self.command(c)},None=>self.chrome.menu.category=i},
|
||||||
|
Some(hud::Hit::Option(c,i))=>if let Some(command)=hud::option_command(&self.chrome.state,c,i) {
|
||||||
|
if command==hud::Command::Files {self.chrome.menu.open=false;}
|
||||||
|
self.command(command);
|
||||||
|
},
|
||||||
|
Some(hud::Hit::Slider(a,len))=>{self.chrome.menu.dragging=true;self.command(hud::Command::Volume(hud::slider_value(x as f32-origin.0,a,len)))},
|
||||||
|
Some(hud::Hit::Panel)=>{},
|
||||||
|
}
|
||||||
|
(true,true)
|
||||||
|
},
|
||||||
|
Event::MouseButtonUp{..}=>{self.chrome.tab_down=false;if std::mem::take(&mut self.chrome.menu.dragging){hud::save_prefs(&self.chrome.state);}(true,true)},
|
||||||
|
Event::MouseButtonDown{..}|Event::MouseWheel{..}|Event::KeyUp{..}|Event::TextInput{..}=>(true,false),
|
||||||
|
_=>(false,false),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// Local effects happen here; remote ones are drained by `run` through `take_commands`.
|
||||||
|
fn command(&mut self,command:hud::Command){
|
||||||
|
let st=&mut self.chrome.state;
|
||||||
|
match command {
|
||||||
|
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::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::Stats(b)=>{st.stats=b;hud::save_prefs(st)},
|
||||||
|
hud::Command::HideTab(b)=>{st.hide_tab=b;hud::save_prefs(st)},
|
||||||
|
hud::Command::GrabKeys(b)=>{st.grab_keys=b;self.canvas.window_mut().set_keyboard_grab(b)},
|
||||||
|
hud::Command::Fullscreen=>{
|
||||||
|
st.fullscreen^=true;let mode=if st.fullscreen{sdl2::video::FullscreenType::Desktop}else{sdl2::video::FullscreenType::Off};
|
||||||
|
let _=self.canvas.window_mut().set_fullscreen(mode);
|
||||||
|
},
|
||||||
|
hud::Command::Files=>self.files=true,
|
||||||
|
hud::Command::Disconnect=>{},
|
||||||
|
}
|
||||||
|
self.chrome.commands.push(command);
|
||||||
|
}
|
||||||
|
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 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 window_size(&self)->(u32,u32){self.canvas.window().size()}
|
||||||
|
pub fn has_picture(&self)->bool{self.last_frame.is_some()}
|
||||||
|
pub fn set_net(&mut self,net:hud::NetStats){
|
||||||
|
let show=self.chrome.state.stats;let changed=self.chrome.net.as_ref()!=Some(&net);
|
||||||
|
self.chrome.net=Some(net);
|
||||||
|
if show && changed {self.redraw();}
|
||||||
|
}
|
||||||
|
fn tab_visible(&self)->bool{!(self.chrome.state.fullscreen&&self.chrome.state.hide_tab)||self.chrome.menu.open}
|
||||||
|
fn menu_layout(&self)->(hud::Layer,hud::Layout){hud::menu_layer(self.chrome.font.as_ref(),&self.chrome.state,&self.chrome.menu,self.chrome.scale)}
|
||||||
|
fn menu_origin(&self,lay:&hud::Layout)->(f32,f32){
|
||||||
|
let size=self.canvas.window().size();
|
||||||
|
// The category list sits centered under the tab; the cascade card grows to its right.
|
||||||
|
let shadow=14.*self.chrome.scale;let main=lay.panels.first().map_or(lay.w,|p|p.w);
|
||||||
|
(((size.0 as f32-main)/2.-shadow).max(-shadow).min(size.0 as f32-lay.w+shadow).round(),(hud::TAB_H*self.chrome.scale+4.-shadow).round())
|
||||||
|
}
|
||||||
|
pub fn redraw(&mut self){
|
||||||
|
if let Some(frame)=self.last_frame.take(){if let Err(e)=self.draw(&frame){log::warn!("Viewer redraw failed: {e}");}self.last_frame=Some(frame);}
|
||||||
|
else {self.loading_frame(true);}
|
||||||
|
}
|
||||||
|
fn blit(&mut self,layer:&hud::Layer,x:i32,y:i32)->Result<(),String>{
|
||||||
|
let creator=self.canvas.texture_creator();
|
||||||
|
let mut t=creator.create_texture_streaming(PixelFormatEnum::RGBA32,layer.w,layer.h).map_err(|_|"Texture creation failed")?;
|
||||||
|
t.set_blend_mode(sdl2::render::BlendMode::Blend);
|
||||||
|
t.update(None,&layer.px,layer.w as usize*4).map_err(|_|"Texture update failed")?;
|
||||||
|
self.canvas.copy(&t,None,Some(Rect::new(x,y,layer.w,layer.h)))
|
||||||
|
}
|
||||||
|
fn label(&mut self,text:&str,size:f32,color:hud::Rgba)->hud::Layer{
|
||||||
|
let key=(text.to_owned(),size.to_bits(),u32::from_le_bytes(color));
|
||||||
|
if self.chrome.labels.len()>64 {self.chrome.labels.clear();}
|
||||||
|
let font=self.chrome.font.as_ref();
|
||||||
|
let layer=self.chrome.labels.entry(key).or_insert_with(||hud::label_layer(font,text,size,color));
|
||||||
|
hud::Layer{w:layer.w,h:layer.h,px:layer.px.clone()}
|
||||||
|
}
|
||||||
|
/// Network panel, control tab and menu over the picture.
|
||||||
|
fn draw_chrome(&mut self)->Result<(),String>{
|
||||||
|
let size=self.canvas.window().size();let scale=self.chrome.scale;
|
||||||
|
if self.chrome.state.stats { if let Some(net)=self.chrome.net.clone() {
|
||||||
|
let layer=hud::stats_layer(self.chrome.font.as_ref(),&hud::stats_lines(&net),scale);
|
||||||
|
self.blit(&layer,size.0 as i32-layer.w as i32-(12.*scale) as i32,size.1 as i32-layer.h as i32-(12.*scale) as i32)?;
|
||||||
|
}}
|
||||||
|
if self.tab_visible() {
|
||||||
|
let r=hud::tab_rect(self.chrome.font.as_ref(),size,scale);
|
||||||
|
let layer=hud::tab_layer(self.chrome.font.as_ref(),scale,self.chrome.tab_hover||self.chrome.menu.open);
|
||||||
|
self.blit(&layer,r.x.round() as i32,0)?;
|
||||||
|
}
|
||||||
|
if self.chrome.menu.open {
|
||||||
|
// Rasterizing the menu is costly; reuse it until what it shows changes.
|
||||||
|
let c=&self.chrome;
|
||||||
|
let cached=matches!(&c.menu_cache,Some((st,m,sc,_)) if *st==c.state&&*m==c.menu&&*sc==c.scale);
|
||||||
|
if !cached {let (layer,_)=self.menu_layout();self.chrome.menu_cache=Some((self.chrome.state.clone(),self.chrome.menu.clone(),scale,layer));}
|
||||||
|
let lay=hud::layout(self.chrome.font.as_ref(),&self.chrome.state,&self.chrome.menu,scale);let o=self.menu_origin(&lay);
|
||||||
|
let (st,m,sc,layer)=self.chrome.menu_cache.take().expect("menu cached above");
|
||||||
|
let r=self.blit(&layer,o.0 as i32,o.1 as i32);
|
||||||
|
self.chrome.menu_cache=Some((st,m,sc,layer));r?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
/// Animated "connecting" screen until the first remote picture; throttled to ~60 fps.
|
||||||
|
pub fn loading_frame(&mut self,force:bool){
|
||||||
|
let now=std::time::Instant::now();
|
||||||
|
if !force && now.duration_since(self.chrome.last_loading)<std::time::Duration::from_millis(16) {return}
|
||||||
|
self.chrome.last_loading=now;
|
||||||
|
let size=self.canvas.window().size();let scale=self.chrome.scale;
|
||||||
|
self.canvas.set_draw_color(LOADING_BG);self.canvas.clear();
|
||||||
|
let t=now.duration_since(self.chrome.started).as_secs_f32();
|
||||||
|
let spin=hud::spinner(t,(56.*scale) as u32);
|
||||||
|
let cy=size.1 as i32/2-(40.*scale) as i32;
|
||||||
|
let _=self.blit(&spin,(size.0 as i32-spin.w as i32)/2,cy-spin.h as i32/2);
|
||||||
|
let (title,stage)=(self.chrome.title.clone(),self.chrome.stage.clone());
|
||||||
|
let a=self.label(&title,20.*scale,[240,242,245,255]);
|
||||||
|
let _=self.blit(&a,(size.0 as i32-a.w as i32)/2,cy+(48.*scale) as i32);
|
||||||
|
// The stage line breathes gently so a long wait still looks alive.
|
||||||
|
let alpha=(170.+60.*(t*2.2).sin()) as u8;
|
||||||
|
let b=self.label(&stage,14.*scale,[160,166,176,255]);
|
||||||
|
let mut b2=b;for p in b2.px.chunks_exact_mut(4){p[3]=(u16::from(p[3])*u16::from(alpha)/255) as u8;}
|
||||||
|
let _=self.blit(&b2,(size.0 as i32-b2.w as i32)/2,cy+(84.*scale) as i32);
|
||||||
|
if self.chrome.menu.open||self.tab_visible() {let _=self.draw_chrome();}
|
||||||
|
self.canvas.present();
|
||||||
|
}
|
||||||
fn draw(&mut self,frame:&Frame)->Result<(),String>{
|
fn draw(&mut self,frame:&Frame)->Result<(),String>{
|
||||||
// Pad bars belong to the decoded canvas, not the remote picture: viewport and input use the
|
// Pad bars belong to the decoded canvas, not the remote picture: viewport and input use the
|
||||||
// content aspect, and only the content sub-rectangle of the texture is drawn.
|
// content aspect, and only the content sub-rectangle of the texture is drawn.
|
||||||
@@ -66,9 +256,61 @@ impl Window {
|
|||||||
self.canvas.set_draw_color(sdl2::pixels::Color::BLACK);self.canvas.clear();
|
self.canvas.set_draw_color(sdl2::pixels::Color::BLACK);self.canvas.clear();
|
||||||
let src=super::input::content_rect((frame.width,frame.height),content)
|
let src=super::input::content_rect((frame.width,frame.height),content)
|
||||||
.map(|(x,y,w,h)|Rect::new(x.round() as i32,y.round() as i32,w.round().max(1.) as u32,h.round().max(1.) as u32));
|
.map(|(x,y,w,h)|Rect::new(x.round() as i32,y.round() as i32,w.round().max(1.) as u32,h.round().max(1.) as u32));
|
||||||
self.canvas.copy(&texture,src,Some(Rect::new(v.x.round() as i32,v.y.round() as i32,v.width.round().max(1.) as u32,v.height.round().max(1.) as u32)))?;self.canvas.present();Ok(())
|
self.canvas.copy(&texture,src,Some(Rect::new(v.x.round() as i32,v.y.round() as i32,v.width.round().max(1.) as u32,v.height.round().max(1.) as u32)))?;
|
||||||
|
drop(texture);self.draw_chrome()?;self.canvas.present();Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// On Wayland SDL draws its title bar through libdecor; the GTK plugin calls GTK3 from SDL's thread
|
||||||
|
/// while the tool windows run gtk_main on theirs, and the two crash in GTK's style code (SIGSEGV on
|
||||||
|
/// closing the file window). Offer libdecor only its cairo plugin unless the user chose a directory.
|
||||||
|
#[cfg(uu_gtk)]
|
||||||
|
fn cairo_decorations(){
|
||||||
|
if std::env::var_os("LIBDECOR_PLUGIN_DIR").is_some() {return}
|
||||||
|
let Some(cairo)=["/usr/lib64/libdecor/plugins-1","/usr/lib/x86_64-linux-gnu/libdecor/plugins-1","/usr/lib/libdecor/plugins-1"]
|
||||||
|
.iter().map(|d|std::path::Path::new(d).join("libdecor-cairo.so")).find(|p|p.exists()) else {return};
|
||||||
|
let dir=std::env::var_os("XDG_RUNTIME_DIR").map_or_else(std::env::temp_dir,std::path::PathBuf::from).join("uuremote-libdecor");
|
||||||
|
let link=dir.join("libdecor-cairo.so");
|
||||||
|
if std::fs::create_dir_all(&dir).is_ok() && (link.exists() || std::os::unix::fs::symlink(&cairo,&link).is_ok()) {
|
||||||
|
std::env::set_var("LIBDECOR_PLUGIN_DIR",&dir);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const LOADING_BG:sdl2::pixels::Color=sdl2::pixels::Color::RGB(17,19,24);
|
||||||
|
/// sdl2 0.37 transmutes every event type into its `SDL_EventType` enum, which is undefined
|
||||||
|
/// behaviour for a type SDL 2 does not define (an abort with debug checks). sdl2-compat on SDL3
|
||||||
|
/// delivers such types (e.g. 0x207), so drop them before the crate converts the event.
|
||||||
|
fn poll_events(_pump:&mut sdl2::EventPump)->Vec<Event>{
|
||||||
|
let mut events=Vec::new();
|
||||||
|
loop{
|
||||||
|
let mut raw=std::mem::MaybeUninit::<sdl2::sys::SDL_Event>::uninit();
|
||||||
|
// SAFETY: the pump proves SDL events are initialised on this thread; SDL_PollEvent fills the event when it returns 1.
|
||||||
|
if unsafe{sdl2::sys::SDL_PollEvent(raw.as_mut_ptr())}!=1 {return events}
|
||||||
|
let raw=unsafe{raw.assume_init()};
|
||||||
|
if sdl2_event_type(unsafe{raw.type_}) {events.push(Event::from_ll(raw));}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// The values of sdl2-sys 0.37 `SDL_EventType`.
|
||||||
|
fn sdl2_event_type(t:u32)->bool{
|
||||||
|
matches!(t,0|0x100..=0x107|0x150|0x200|0x201|0x300..=0x305|0x400..=0x403|0x600..=0x607|0x650..=0x659|0x700..=0x702
|
||||||
|
|0x800..=0x802|0x900|0x1000..=0x1003|0x1100|0x1101|0x1200|0x2000|0x2001|0x7F00|0x8000|0xFFFF)
|
||||||
|
}
|
||||||
|
fn slider(lay:&hud::Layout)->Option<(f32,f32)>{lay.items.iter().find_map(|(_,h)|match h{hud::Hit::Slider(a,len)=>Some((*a,*len)),_=>None})}
|
||||||
|
/// Runs `fut` while the window shows the loading animation; closing the window cancels it.
|
||||||
|
pub async fn loading<T>(window:Option<&mut Window>,stage:&str,fut:impl std::future::Future<Output=T>)->Result<T,String>{
|
||||||
|
let Some(window)=window else {return Ok(fut.await)};
|
||||||
|
window.set_stage(stage);
|
||||||
|
tokio::pin!(fut);
|
||||||
|
let mut tick=tokio::time::interval(std::time::Duration::from_millis(16));
|
||||||
|
loop {tokio::select!{
|
||||||
|
value=&mut fut=>return Ok(value),
|
||||||
|
_=tick.tick()=>{
|
||||||
|
for event in poll_events(&mut window.events) {
|
||||||
|
if matches!(event,Event::Quit{..}|Event::Window{win_event:WindowEvent::Close,..}) {return Err("Viewer window closed".into())}
|
||||||
|
let _=window.chrome_event(&event);
|
||||||
|
}
|
||||||
|
window.loading_frame(false);
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
}
|
||||||
fn clipboard_text(bytes:&[u8])->Option<String>{
|
fn clipboard_text(bytes:&[u8])->Option<String>{
|
||||||
if bytes.len()>super::clipboard::MAX_TEXT{return None}
|
if bytes.len()>super::clipboard::MAX_TEXT{return None}
|
||||||
std::str::from_utf8(bytes).ok().map(str::to_owned)
|
std::str::from_utf8(bytes).ok().map(str::to_owned)
|
||||||
@@ -111,7 +353,13 @@ fn translate_actions(events:impl IntoIterator<Item=Event>,input:&mut Input,viewp
|
|||||||
input.scroll(dx,dy)
|
input.scroll(dx,dy)
|
||||||
},
|
},
|
||||||
_=>None,
|
_=>None,
|
||||||
};if let Some(m)=message{messages.push(m);}
|
};if let Some(m)=message{
|
||||||
|
// Several motions in one poll: only the newest position matters. Sending each one
|
||||||
|
// queues a drag behind itself on a slow (relayed) path; clicks keep their order.
|
||||||
|
let motion=|m:&serde_json::Value|m.get("action").and_then(serde_json::Value::as_str)==Some("mouse_move_absolute");
|
||||||
|
if motion(&m) && messages.last().is_some_and(motion) {messages.pop();}
|
||||||
|
messages.push(m);
|
||||||
|
}
|
||||||
} (quit,messages)
|
} (quit,messages)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -151,13 +399,26 @@ 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());
|
||||||
let mut input=Input::new(view_only);input.set_mac(window.mac);let mut tick=tokio::time::interval(std::time::Duration::from_millis(8));
|
let mut input=Input::new(view_only);input.set_mac(window.mac);let mut tick=tokio::time::interval(std::time::Duration::from_millis(8));
|
||||||
let mut heartbeat=tokio::time::interval(std::time::Duration::from_secs(1));
|
let mut heartbeat=tokio::time::interval(std::time::Duration::from_secs(1));
|
||||||
let deadline=tokio::time::sleep(std::time::Duration::from_secs(30));tokio::pin!(deadline);
|
let deadline=tokio::time::sleep(std::time::Duration::from_secs(30));tokio::pin!(deadline);
|
||||||
|
window.set_stage(crate::i18n::s("正在传输画面…","Waiting for the remote picture…"));
|
||||||
|
if let Some(playback)=audio.as_mut(){playback.volume=window.state().volume;}
|
||||||
|
if window.state().grab_keys {window.canvas.window_mut().set_keyboard_grab(true);}
|
||||||
|
let started=std::time::Instant::now();let mut seq=3_000_000u64;
|
||||||
|
let mut last=(0u64,0u64,0u64,0u64,std::time::Instant::now());
|
||||||
|
let mut codec_name="--";
|
||||||
|
// After a local drop the decoder has no reference picture; P-frames would only smear blocks.
|
||||||
|
let mut key_gate=super::desktop::KeyGate::new();
|
||||||
|
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!{
|
||||||
command=commands.recv(),if command_open=>{
|
command=commands.recv(),if command_open=>{
|
||||||
@@ -195,10 +456,48 @@ pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super:
|
|||||||
let o=&session.peer.observed;let s=&super::desktop::STATS;let r=std::sync::atomic::Ordering::Relaxed;
|
let o=&session.peer.observed;let s=&super::desktop::STATS;let r=std::sync::atomic::Ordering::Relaxed;
|
||||||
log::info!("Viewer desktop stats: control_open={} echo={} media_packets={} access_units={} presented={} decode_errors={}",
|
log::info!("Viewer desktop stats: control_open={} echo={} media_packets={} access_units={} presented={} decode_errors={}",
|
||||||
o.control_open.load(r),o.echo_received.load(r),o.media_packets.load(r),s[0].load(r),s[1].load(r),s[2].load(r));
|
o.control_open.load(r),o.echo_received.load(r),o.media_packets.load(r),s[0].load(r),s[1].load(r),s[2].load(r));
|
||||||
|
// Network-status panel: per-second deltas of local counters plus the selected ICE pair.
|
||||||
|
let now=(s[1].load(r),o.media_bytes.load(r),o.video_received.load(r),o.video_expected.load(r),std::time::Instant::now());
|
||||||
|
let secs=now.4.duration_since(last.4).as_secs_f64().max(0.2);
|
||||||
|
let expected=now.3.saturating_sub(last.3);let lost=expected.saturating_sub(now.2.saturating_sub(last.2));
|
||||||
|
let (rtt_ms,route)=session.peer.route().await;
|
||||||
|
window.sync_chroma(o.chroma.load(r));
|
||||||
|
let size=window.last_frame.as_ref().map_or((0,0),|f|f.content.unwrap_or((f.width,f.height)));
|
||||||
|
window.set_net(hud::NetStats{elapsed:started.elapsed().as_secs(),route,fps:((now.0-last.0) as f64/secs).round() as u32,
|
||||||
|
kbps:(now.1-last.1) as f64*8./1000./secs,rtt_ms,loss:if expected>0 {lost as f64*100./expected as f64} else {0.},size,
|
||||||
|
codec:codec_name,chroma:window.state().chroma});
|
||||||
|
last=now;
|
||||||
|
if std::time::Instant::now()>=next_thumb { 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}");}
|
||||||
|
next_thumb=std::time::Instant::now()+std::time::Duration::from_secs(30);
|
||||||
|
}}
|
||||||
},
|
},
|
||||||
_=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,messages)=window.poll(&mut input);
|
let (quit,mut messages)=window.poll(&mut input);
|
||||||
|
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() {
|
||||||
|
seq+=1;
|
||||||
|
let control=match command {
|
||||||
|
hud::Command::Quality(q)=>Some(super::wire::capture_setting(seq,&[(2,q)])),
|
||||||
|
hud::Command::Fps(f)=>Some(super::wire::capture_setting(seq,&[(1,match f{30=>1,60=>2,90=>3,_=>4}),(18,u64::from(f))])),
|
||||||
|
hud::Command::Chroma(c)=>Some(super::wire::capture_setting(seq,&[(7,u64::from(c))])),
|
||||||
|
hud::Command::FollowRemote(true)=>Some(super::wire::capture_setting(seq,&[(10,3)])),
|
||||||
|
hud::Command::FollowRemote(false)=>{let (w,h)=window.window_size();let (w,h)=(u64::from(w&!1),u64::from(h&!1));
|
||||||
|
Some(super::wire::capture_setting(seq,&[(5,w),(6,h),(16,w),(17,h)]))},
|
||||||
|
// 远程结束后自动锁屏: SimpleAction 19, value 2 = on, 1 = off.
|
||||||
|
hud::Command::AutoLock(on)=>Some(super::wire::simple_action(seq,19,Some(if on {2} else {1}))),
|
||||||
|
// 静音运行: on = SimpleAction 14 then 18, off = 16 (src/system_actions.rs).
|
||||||
|
hud::Command::HostMute(true)=>{let _=session.peer.send_control(super::wire::simple_action(seq,14,None)).await;seq+=1;Some(super::wire::simple_action(seq,18,None))},
|
||||||
|
hud::Command::HostMute(false)=>Some(super::wire::simple_action(seq,16,None)),
|
||||||
|
hud::Command::Volume(v)=>{if let Some(playback)=audio.as_mut(){playback.volume=v;}None},
|
||||||
|
hud::Command::Watch(on)=>{messages.extend(input.release_all());input.set_view_only(on||view_only);None},
|
||||||
|
hud::Command::Disconnect=>return Ok(()),
|
||||||
|
_=>None,
|
||||||
|
};
|
||||||
|
if let Some(data)=control { if let Err(e)=session.peer.send_control(data).await {log::warn!("Viewer control command not sent: {e}");} }
|
||||||
|
}
|
||||||
window.poll_clipboard();
|
window.poll_clipboard();
|
||||||
requested|=std::mem::take(&mut window.files);
|
requested|=std::mem::take(&mut window.files);
|
||||||
#[cfg(uu_gtk)] {
|
#[cfg(uu_gtk)] {
|
||||||
@@ -242,19 +541,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();}
|
}
|
||||||
decoder.set_codec(au.codec)?;
|
|
||||||
super::desktop::display(decoder,window,&au.data,au.codec,&session.peer.desktop.pli)?;}
|
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
}.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}");}}
|
||||||
#[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
|
||||||
}
|
}
|
||||||
@@ -442,6 +750,15 @@ async fn pump_type_job(job: &mut TypeJob, session: &mut Session, window: &mut Wi
|
|||||||
assert!(tx.is_closed());drop(bridge);
|
assert!(tx.is_closed());drop(bridge);
|
||||||
let window=Window::new().unwrap();assert!(window.clipboard_bridge().enabled);
|
let window=Window::new().unwrap();assert!(window.clipboard_bridge().enabled);
|
||||||
}
|
}
|
||||||
|
#[test] fn only_event_types_sdl2_defines_reach_the_crate(){
|
||||||
|
use sdl2::sys::SDL_EventType as T;
|
||||||
|
for t in [T::SDL_QUIT,T::SDL_LOCALECHANGED,T::SDL_DISPLAYEVENT,T::SDL_WINDOWEVENT,T::SDL_TEXTEDITING_EXT,T::SDL_MOUSEWHEEL,
|
||||||
|
T::SDL_JOYBATTERYUPDATED,T::SDL_CONTROLLERSENSORUPDATE,T::SDL_FINGERMOTION,T::SDL_MULTIGESTURE,T::SDL_CLIPBOARDUPDATE,
|
||||||
|
T::SDL_DROPCOMPLETE,T::SDL_AUDIODEVICEREMOVED,T::SDL_SENSORUPDATE,T::SDL_RENDER_DEVICE_RESET,T::SDL_POLLSENTINEL,T::SDL_USEREVENT]{
|
||||||
|
assert!(sdl2_event_type(t as u32),"{:#x}",t as u32);
|
||||||
|
}
|
||||||
|
for t in [0x151,0x202,0x207,0x306,0x404,0x608,0x65A,0x703,0x901,0x1004,0x1102,0x1201,0x2002,0x8001]{assert!(!sdl2_event_type(t),"{t:#x}");}
|
||||||
|
}
|
||||||
#[test] fn clipboard_text_rejects_invalid_or_large_data_and_keeps_empty_text(){
|
#[test] fn clipboard_text_rejects_invalid_or_large_data_and_keeps_empty_text(){
|
||||||
assert_eq!(clipboard_text(b""),Some(String::new()));
|
assert_eq!(clipboard_text(b""),Some(String::new()));
|
||||||
assert_eq!(clipboard_text(b"text\n"),Some("text\n".into()));
|
assert_eq!(clipboard_text(b"text\n"),Some("text\n".into()));
|
||||||
@@ -497,6 +814,17 @@ async fn pump_type_job(job: &mut TypeJob, session: &mut Session, window: &mut Wi
|
|||||||
let (quit,out)=translate(events,&mut input,Viewport::fit((800,600),(1920,1080)),&mut focused);
|
let (quit,out)=translate(events,&mut input,Viewport::fit((800,600),(1920,1080)),&mut focused);
|
||||||
assert!(quit);assert!(out.is_empty());assert!(input.release_all().is_empty());
|
assert!(quit);assert!(out.is_empty());assert!(input.release_all().is_empty());
|
||||||
}
|
}
|
||||||
|
#[test] fn motions_in_one_poll_send_only_the_newest_and_keep_click_order(){
|
||||||
|
let mut input=Input::default();let mut focused=true;
|
||||||
|
let motion=|x,y|Event::MouseMotion{timestamp:0,window_id:1,which:0,mousestate:sdl2::mouse::MouseState::from_sdl_state(0),x,y,xrel:1,yrel:1};
|
||||||
|
let down=Event::MouseButtonDown{timestamp:0,window_id:1,which:0,mouse_btn:MouseButton::Left,clicks:1,x:0,y:0};
|
||||||
|
let v=Viewport::fit((800,600),(800,600));
|
||||||
|
let (_,out)=translate([motion(10,10),motion(20,20),down,motion(30,30),motion(40,40)],&mut input,v,&mut focused);
|
||||||
|
let actions:Vec<&str>=out.iter().map(|m|m["action"].as_str().unwrap()).collect();
|
||||||
|
assert_eq!(actions.len(),3,"{out:?}");
|
||||||
|
assert_eq!(actions[0],"mouse_move_absolute");assert_eq!(actions[2],"mouse_move_absolute");assert_ne!(actions[1],"mouse_move_absolute");
|
||||||
|
assert!((out[0]["abs_x"].as_f64().unwrap()-20./800.).abs()<0.01 && (out[2]["abs_x"].as_f64().unwrap()-40./800.).abs()<0.01,"{out:?}");
|
||||||
|
}
|
||||||
#[test] fn focus_event_releases_and_suppresses_input_until_focus_returns(){
|
#[test] fn focus_event_releases_and_suppresses_input_until_focus_returns(){
|
||||||
let mut input=Input::default();input.key(4,true);input.button(1,true);let mut focused=true;
|
let mut input=Input::default();input.key(4,true);input.button(1,true);let mut focused=true;
|
||||||
let focus=|win_event|Event::Window{timestamp:0,window_id:1,win_event};
|
let focus=|win_event|Event::Window{timestamp:0,window_id:1,win_event};
|
||||||
|
|||||||
+22
-2
@@ -82,6 +82,8 @@ async fn complete_session_uses_loopback_signaling_and_virtual_rtc_through_echo()
|
|||||||
for (action,number) in [(super::power::Action::Reboot,9),(super::power::Action::Shutdown,12)] {
|
for (action,number) in [(super::power::Action::Reboot,9),(super::power::Action::Shutdown,12)] {
|
||||||
if message.data.as_ref()==action.message(2).as_slice(){input_tx.send(json!({"power":number})).await.unwrap();return}
|
if message.data.as_ref()==action.message(2).as_slice(){input_tx.send(json!({"power":number})).await.unwrap();return}
|
||||||
}
|
}
|
||||||
|
// Desktop sessions also request the video track (RPC 15), like the official viewer.
|
||||||
|
if message.data.as_ref()==wire::request_video_track().as_slice() {return}
|
||||||
assert_eq!(&message.data[..],&wire::echo_request(1));
|
assert_eq!(&message.data[..],&wire::echo_request(1));
|
||||||
let mut action=Vec::new();wire::int(1,1,&mut action);wire::bytes(2,br#"{"seq":1}"#,&mut action);
|
let mut action=Vec::new();wire::int(1,1,&mut action);wire::bytes(2,br#"{"seq":1}"#,&mut action);
|
||||||
if let Some(channel)=weak.upgrade(){channel.send(&bytes::Bytes::from(wire::envelope(100,3,&action))).await.unwrap();}
|
if let Some(channel)=weak.upgrade(){channel.send(&bytes::Bytes::from(wire::envelope(100,3,&action))).await.unwrap();}
|
||||||
@@ -248,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(){
|
||||||
@@ -275,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);
|
||||||
@@ -282,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();
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
//! Device preview pictures for the launcher, like the official client's device card: the desktop
|
||||||
|
//! window saves a small PNG of the last remote picture. Local only (`$XDG_CACHE_HOME/uuremote/thumbs`,
|
||||||
|
//! 0700 directory, 0600 files); `UU_VIEWER_THUMBNAILS=0` turns it off.
|
||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
pub fn enabled() -> bool { std::env::var("UU_VIEWER_THUMBNAILS").as_deref() != Ok("0") }
|
||||||
|
fn dir() -> Option<PathBuf> {
|
||||||
|
let base = std::env::var_os("XDG_CACHE_HOME").map(PathBuf::from).filter(|p| p.is_absolute())
|
||||||
|
.or_else(|| std::env::var_os("HOME").map(|h| PathBuf::from(h).join(".cache")))?;
|
||||||
|
Some(base.join("uuremote").join("thumbs"))
|
||||||
|
}
|
||||||
|
pub fn path(device: &str) -> Option<PathBuf> { Some(dir()?.join(format!("{}.png", &super::type_ipc::device_key(device)[..32]))) }
|
||||||
|
pub fn existing(device: &str) -> Option<PathBuf> { enabled().then(|| path(device)).flatten().filter(|p| p.is_file()) }
|
||||||
|
|
||||||
|
/// Box-filtered downscale of the content rectangle to at most `max_w` pixels wide.
|
||||||
|
pub fn downscale(width: u32, height: u32, rgb: &[u8], content: (u32, u32, u32, u32), max_w: u32) -> (u32, u32, Vec<u8>) {
|
||||||
|
let (cx, cy, cw, ch) = content;
|
||||||
|
let ratio = (cw as f64 / max_w as f64).max(1.);
|
||||||
|
let (w, h) = (((cw as f64 / ratio).round() as u32).max(1), ((ch as f64 / ratio).round() as u32).max(1));
|
||||||
|
let mut out = Vec::with_capacity(w as usize * h as usize * 3);
|
||||||
|
for y in 0..h { for x in 0..w {
|
||||||
|
let (x0, x1) = (cx + (x as f64 * ratio) as u32, (cx + ((x + 1) as f64 * ratio) as u32).max(cx + (x as f64 * ratio) as u32 + 1).min(cx + cw).min(width));
|
||||||
|
let (y0, y1) = (cy + (y as f64 * ratio) as u32, (cy + ((y + 1) as f64 * ratio) as u32).max(cy + (y as f64 * ratio) as u32 + 1).min(cy + ch).min(height));
|
||||||
|
let mut sum = [0u64; 3]; let mut n = 0u64;
|
||||||
|
for sy in y0..y1 { for sx in x0..x1 {
|
||||||
|
let i = (sy as usize * width as usize + sx as usize) * 3;
|
||||||
|
for k in 0..3 { sum[k] += u64::from(rgb[i + k]); } n += 1;
|
||||||
|
}}
|
||||||
|
for k in 0..3 { out.push((sum[k] / n.max(1)) as u8); }
|
||||||
|
}}
|
||||||
|
(w, h, out)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn save(device: &str, frame: &super::desktop::Frame) -> Result<(), String> {
|
||||||
|
if !enabled() { return Ok(()) }
|
||||||
|
let path = path(device).ok_or("No cache directory")?;
|
||||||
|
let dir = path.parent().ok_or("No cache directory")?;
|
||||||
|
use std::os::unix::fs::{DirBuilderExt, PermissionsExt};
|
||||||
|
std::fs::DirBuilder::new().recursive(true).mode(0o700).create(dir).map_err(|_| "Cannot create the thumbnail directory")?;
|
||||||
|
let _ = std::fs::set_permissions(dir, std::fs::Permissions::from_mode(0o700));
|
||||||
|
let content = super::input::content_rect((frame.width, frame.height), frame.content.unwrap_or((frame.width, frame.height)))
|
||||||
|
.map_or((0, 0, frame.width, frame.height), |(x, y, w, h)| (x as u32, y as u32, w as u32, h as u32));
|
||||||
|
let (w, h, rgb) = downscale(frame.width, frame.height, &frame.rgb, content, 640);
|
||||||
|
// Write then rename, so the launcher never reads a half-written file.
|
||||||
|
let tmp = path.with_extension("tmp");
|
||||||
|
let _ = std::fs::remove_file(&tmp);
|
||||||
|
super::type_ipc::write_png_rgb(&tmp, w, h, &rgb, true)?;
|
||||||
|
std::fs::rename(&tmp, &path).map_err(|_| "Cannot store the thumbnail".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)] mod tests {
|
||||||
|
#[test] fn downscale_averages_and_keeps_aspect(){
|
||||||
|
let rgb:Vec<u8>=(0..4*2).flat_map(|i|if i%2==0{[0,0,0]}else{[200,100,50]}).collect();
|
||||||
|
let (w,h,out)=super::downscale(4,2,&rgb,(0,0,4,2),2);
|
||||||
|
assert_eq!((w,h),(2,1));assert_eq!(&out[..3],&[100,50,25]);
|
||||||
|
assert_eq!(super::downscale(4,2,&rgb,(0,0,4,2),640).0,4);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -161,7 +161,7 @@ pub fn session_rows(sessions:&[Value])->String{
|
|||||||
let mut rows:Vec<_>=sessions.iter().filter_map(|s|{
|
let mut rows:Vec<_>=sessions.iter().filter_map(|s|{
|
||||||
let id=u32::try_from(s["session_id"].as_u64()?).ok().filter(|n|*n!=0)?;
|
let id=u32::try_from(s["session_id"].as_u64()?).ok().filter(|n|*n!=0)?;
|
||||||
let shell=s["shell"].as_str().unwrap_or("--").chars().take(256).collect::<String>().replace(['\t','\n','\r','\0']," ");
|
let shell=s["shell"].as_str().unwrap_or("--").chars().take(256).collect::<String>().replace(['\t','\n','\r','\0']," ");
|
||||||
let state=match s["state"].as_str(){Some("running")=>"运行中",Some("detached")=>"已分离",_=>"--"};
|
let state=match s["state"].as_str(){Some("running")=>crate::i18n::s("运行中","Running"),Some("detached")=>crate::i18n::s("已分离","Detached"),_=>"--"};
|
||||||
Some((id,format!("{id}\t{shell}\t{}\t{state}\n",s["created_at_ms"].as_u64().unwrap_or(0))))
|
Some((id,format!("{id}\t{shell}\t{}\t{state}\n",s["created_at_ms"].as_u64().unwrap_or(0))))
|
||||||
}).collect();rows.sort_by_key(|r|r.0);rows.into_iter().map(|r|r.1).collect()
|
}).collect();rows.sort_by_key(|r|r.0);rows.into_iter().map(|r|r.1).collect()
|
||||||
}
|
}
|
||||||
@@ -156,7 +156,7 @@ fn terminal_metadata_is_allowlisted_and_sorted(){
|
|||||||
serde_json::json!({"session_id":2,"shell":"/bin/bash","state":"running"}),
|
serde_json::json!({"session_id":2,"shell":"/bin/bash","state":"running"}),
|
||||||
serde_json::json!({"session_id":0}),serde_json::json!({"session_id":4294967296u64}),
|
serde_json::json!({"session_id":0}),serde_json::json!({"session_id":4294967296u64}),
|
||||||
]);
|
]);
|
||||||
assert_eq!(rows,"2\t/bin/bash\t0\t运行中\n9\t/bin/sh X Y \t123\t已分离\n");
|
assert_eq!(rows,format!("2\t/bin/bash\t0\t{}\n9\t/bin/sh X Y \t123\t{}\n",crate::i18n::s("运行中","Running"),crate::i18n::s("已分离","Detached")));
|
||||||
assert!(!rows.contains("PRIVATE"));assert!(terminal::session_rows(&[]).is_empty());
|
assert!(!rows.contains("PRIVATE"));assert!(terminal::session_rows(&[]).is_empty());
|
||||||
}
|
}
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
|
|||||||
+18
-18
@@ -54,7 +54,7 @@ fn task(id:i32,name:&str,status:&str,done:u64,total:u64,from:&str,to:&str,state:
|
|||||||
let(n,s,f,t)=(c(name),c(status),c(from),c(to));
|
let(n,s,f,t)=(c(name),c(status),c(from),c(to));
|
||||||
unsafe{uu_files_ui_task(id,n.as_ptr(),s.as_ptr(),done,total,f.as_ptr(),t.as_ptr(),state)}
|
unsafe{uu_files_ui_task(id,n.as_ptr(),s.as_ptr(),done,total,f.as_ptr(),t.as_ptr(),state)}
|
||||||
}
|
}
|
||||||
fn reason(error:&str)->String{if error.contains("canceled"){"已取消".into()}else{format!("失败:{error}")}}
|
fn reason(error:&str)->String{if error.contains("canceled"){crate::i18n::s("已取消","Canceled").into()}else{crate::tr!("失败:{error}","Failed: {error}")}}
|
||||||
|
|
||||||
pub async fn files(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(),String>{
|
pub async fn files(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(),String>{
|
||||||
start("files",name)?;
|
start("files",name)?;
|
||||||
@@ -67,7 +67,7 @@ pub async fn files(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(),
|
|||||||
let mut guard=shown.lock().unwrap();let Some(a)=guard.as_mut() else{continue};
|
let mut guard=shown.lock().unwrap();let Some(a)=guard.as_mut() else{continue};
|
||||||
if a.last.elapsed()<Duration::from_millis(200) && p.transferred<p.total{continue}a.last=Instant::now();
|
if a.last.elapsed()<Duration::from_millis(200) && p.transferred<p.total{continue}a.last=Instant::now();
|
||||||
let percent=if p.total>0{p.transferred*100/p.total}else{0};
|
let percent=if p.total>0{p.transferred*100/p.total}else{0};
|
||||||
task(a.id,&a.name,&format!("传输中 {percent}%"),p.transferred,p.total,&a.from,&a.to,0);
|
task(a.id,&a.name,&crate::tr!("传输中 {percent}%","Transferring {percent}%"),p.transferred,p.total,&a.from,&a.to,0);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
let _reporter=super::tools::Cancel(reporter.abort_handle());
|
let _reporter=super::tools::Cancel(reporter.abort_handle());
|
||||||
@@ -79,24 +79,24 @@ pub async fn files(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(),
|
|||||||
while let Some(job)=queue.recv().await{if worker_closing.load(Ordering::Acquire){break}match job{
|
while let Some(job)=queue.recv().await{if worker_closing.load(Ordering::Acquire){break}match job{
|
||||||
Job::List(path)=>match worker_f.list_dir(&path).await{
|
Job::List(path)=>match worker_f.list_dir(&path).await{
|
||||||
Ok(entries)=>{remote=path.clone();let(p,r)=(c(&path),c(&entry_rows(&entries)));unsafe{uu_files_ui_set_remote(p.as_ptr(),r.as_ptr())}}
|
Ok(entries)=>{remote=path.clone();let(p,r)=(c(&path),c(&entry_rows(&entries)));unsafe{uu_files_ui_set_remote(p.as_ptr(),r.as_ptr())}}
|
||||||
Err(e)=>toast(&format!("无法读取远端目录:{e}")),
|
Err(e)=>toast(&crate::tr!("无法读取远端目录:{e}","Cannot read remote folder: {e}")),
|
||||||
},
|
},
|
||||||
Job::Mkdir(path,parent)=>match worker_f.mkdir(&path).await{
|
Job::Mkdir(path,parent)=>match worker_f.mkdir(&path).await{
|
||||||
Ok(())=>if parent==remote{if let Ok(entries)=worker_f.list_dir(&remote).await{let(p,r)=(c(&remote),c(&entry_rows(&entries)));unsafe{uu_files_ui_set_remote(p.as_ptr(),r.as_ptr())}}},
|
Ok(())=>if parent==remote{if let Ok(entries)=worker_f.list_dir(&remote).await{let(p,r)=(c(&remote),c(&entry_rows(&entries)));unsafe{uu_files_ui_set_remote(p.as_ptr(),r.as_ptr())}}},
|
||||||
Err(e)=>toast(&format!("无法创建远端文件夹:{e}")),
|
Err(e)=>toast(&crate::tr!("无法创建远端文件夹:{e}","Cannot create remote folder: {e}")),
|
||||||
},
|
},
|
||||||
Job::Transfer{id,upload,from,dir,generation}=>{
|
Job::Transfer{id,upload,from,dir,generation}=>{
|
||||||
let name=base_name(&from).to_owned();
|
let name=base_name(&from).to_owned();
|
||||||
let to=if upload{remote_join(&dir,&name)}else{free_local(std::path::Path::new(&dir),&name).to_string_lossy().into_owned()};
|
let to=if upload{remote_join(&dir,&name)}else{free_local(std::path::Path::new(&dir),&name).to_string_lossy().into_owned()};
|
||||||
if generation!=worker_gen.load(Ordering::Acquire){task(id,&name,"已取消",0,0,&from,&to,2);continue}
|
if generation!=worker_gen.load(Ordering::Acquire){task(id,&name,crate::i18n::s("已取消","Canceled"),0,0,&from,&to,2);continue}
|
||||||
*worker_active.lock().unwrap()=Some(Active{id,name:name.clone(),from:from.clone(),to:to.clone(),last:Instant::now()});
|
*worker_active.lock().unwrap()=Some(Active{id,name:name.clone(),from:from.clone(),to:to.clone(),last:Instant::now()});
|
||||||
task(id,&name,"传输中",0,0,&from,&to,0);
|
task(id,&name,crate::i18n::s("传输中","Transferring"),0,0,&from,&to,0);
|
||||||
let result=if upload{worker_f.upload(&from,&to).await}else{worker_f.download(&from,&to).await};
|
let result=if upload{worker_f.upload(&from,&to).await}else{worker_f.download(&from,&to).await};
|
||||||
*worker_active.lock().unwrap()=None;
|
*worker_active.lock().unwrap()=None;
|
||||||
match result{
|
match result{
|
||||||
Ok(())=>{
|
Ok(())=>{
|
||||||
let size=std::fs::metadata(if upload{&from}else{&to}).map(|m|if m.is_file(){m.len()}else{0}).unwrap_or(0);
|
let size=std::fs::metadata(if upload{&from}else{&to}).map(|m|if m.is_file(){m.len()}else{0}).unwrap_or(0);
|
||||||
task(id,&name,"已完成",size,size,&from,&to,1);
|
task(id,&name,crate::i18n::s("已完成","Done"),size,size,&from,&to,1);
|
||||||
if upload{if dir==remote{if let Ok(entries)=worker_f.list_dir(&remote).await{let(p,r)=(c(&remote),c(&entry_rows(&entries)));unsafe{uu_files_ui_set_remote(p.as_ptr(),r.as_ptr())}}}}
|
if upload{if dir==remote{if let Ok(entries)=worker_f.list_dir(&remote).await{let(p,r)=(c(&remote),c(&entry_rows(&entries)));unsafe{uu_files_ui_set_remote(p.as_ptr(),r.as_ptr())}}}}
|
||||||
else{unsafe{uu_files_ui_refresh_local()}}
|
else{unsafe{uu_files_ui_refresh_local()}}
|
||||||
}
|
}
|
||||||
@@ -118,7 +118,7 @@ pub async fn files(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(),
|
|||||||
["mkdir",path]=>{let parent=path.rfind(['/','\\']).map(|i|path[..i.max(1)].to_owned()).unwrap_or_default();let _=jobs.send(Job::Mkdir((*path).into(),parent));}
|
["mkdir",path]=>{let parent=path.rfind(['/','\\']).map(|i|path[..i.max(1)].to_owned()).unwrap_or_default();let _=jobs.send(Job::Mkdir((*path).into(),parent));}
|
||||||
[kind@("put"|"get"),from,dir]=>{
|
[kind@("put"|"get"),from,dir]=>{
|
||||||
let(id,upload)=(NEXT_TASK.fetch_add(1,Ordering::Relaxed),*kind=="put");
|
let(id,upload)=(NEXT_TASK.fetch_add(1,Ordering::Relaxed),*kind=="put");
|
||||||
let name=base_name(from);task(id,name,"等待中",0,0,from,dir,0);
|
let name=base_name(from);task(id,name,crate::i18n::s("等待中","Waiting"),0,0,from,dir,0);
|
||||||
let _=jobs.send(Job::Transfer{id,upload,from:(*from).into(),dir:(*dir).into(),generation:generation.load(Ordering::Acquire)});
|
let _=jobs.send(Job::Transfer{id,upload,from:(*from).into(),dir:(*dir).into(),generation:generation.load(Ordering::Acquire)});
|
||||||
}
|
}
|
||||||
["cancel"]=>{generation.fetch_add(1,Ordering::AcqRel);f.cancel();}
|
["cancel"]=>{generation.fetch_add(1,Ordering::AcqRel);f.cancel();}
|
||||||
@@ -147,12 +147,12 @@ pub async fn portmap(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(
|
|||||||
["add",rule,local,host,port]=>match(local.parse::<u16>(),port.parse::<u16>()){
|
["add",rule,local,host,port]=>match(local.parse::<u16>(),port.parse::<u16>()){
|
||||||
(Ok(local),Ok(port))=>match p.add_rule(*rule,local,*host,port).await{
|
(Ok(local),Ok(port))=>match p.add_rule(*rule,local,*host,port).await{
|
||||||
Ok(id)=>{targets.insert(id,format!("{host}:{port}"));}
|
Ok(id)=>{targets.insert(id,format!("{host}:{port}"));}
|
||||||
Err(e)=>toast(&format!("添加失败:{}",if e.contains("bind"){"本地端口已被占用".to_owned()}else{e})),
|
Err(e)=>toast(&crate::tr!("添加失败:{}","Add failed: {}",if e.contains("bind"){crate::i18n::s("本地端口已被占用","Local port is already in use").to_owned()}else{e})),
|
||||||
},
|
},
|
||||||
_=>toast("端口无效"),
|
_=>toast(crate::i18n::s("端口无效","Invalid port")),
|
||||||
},
|
},
|
||||||
["remove",id]=>if let Ok(id)=id.parse::<u64>(){
|
["remove",id]=>if let Ok(id)=id.parse::<u64>(){
|
||||||
if let Err(e)=p.remove_rule(id).await{toast(&format!("删除失败:{e}"))}targets.remove(&id);
|
if let Err(e)=p.remove_rule(id).await{toast(&crate::tr!("删除失败:{e}","Remove failed: {e}"))}targets.remove(&id);
|
||||||
},
|
},
|
||||||
_=>{}
|
_=>{}
|
||||||
}
|
}
|
||||||
@@ -160,9 +160,9 @@ pub async fn portmap(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(
|
|||||||
let mut status=p.status();status.sort_by_key(|s|s.id);
|
let mut status=p.status();status.sort_by_key(|s|s.id);
|
||||||
let rows:String=status.iter().map(|s|format!("{}\t{}\t127.0.0.1:{}\t{}\t{}\n",s.id,s.name.replace(['\t','\n']," "),s.local_port,
|
let rows:String=status.iter().map(|s|format!("{}\t{}\t127.0.0.1:{}\t{}\t{}\n",s.id,s.name.replace(['\t','\n']," "),s.local_port,
|
||||||
targets.get(&s.id).map(String::as_str).unwrap_or("-"),
|
targets.get(&s.id).map(String::as_str).unwrap_or("-"),
|
||||||
if s.failures>0{format!("已启用 · {} 个连接 · {} 次失败",s.streams,s.failures)}else{format!("已启用 · {} 个连接",s.streams)})).collect();
|
if s.failures>0{crate::tr!("已启用 · {} 个连接 · {} 次失败","On · {} connections · {} failures",s.streams,s.failures)}else{crate::tr!("已启用 · {} 个连接","On · {} connections",s.streams)})).collect();
|
||||||
if rows!=last{let r=c(&rows);unsafe{uu_portmap_ui_set_rules(r.as_ptr())};last=rows;}
|
if rows!=last{let r=c(&rows);unsafe{uu_portmap_ui_set_rules(r.as_ptr())};last=rows;}
|
||||||
tokio::select!{_=&mut closed_transport=>{toast("连接已断开");tokio::time::sleep(Duration::from_secs(3)).await;break Err("Forwarding transport closed".into())},_=tokio::time::sleep(Duration::from_millis(200))=>{}}
|
tokio::select!{_=&mut closed_transport=>{toast(crate::i18n::s("连接已断开","Disconnected"));tokio::time::sleep(Duration::from_secs(3)).await;break Err("Forwarding transport closed".into())},_=tokio::time::sleep(Duration::from_millis(200))=>{}}
|
||||||
};
|
};
|
||||||
let ids:Vec<u64>=p.status().iter().map(|s|s.id).collect();for id in ids{let _=p.remove_rule(id).await;}
|
let ids:Vec<u64>=p.status().iter().map(|s|s.id).collect();for id in ids{let _=p.remove_rule(id).await;}
|
||||||
result
|
result
|
||||||
@@ -190,14 +190,14 @@ pub async fn terminal(io:Transport,rx:mpsc::Receiver<Packet>,_device:&str,name:&
|
|||||||
unsafe{uu_terminal_ui_set(rows.as_ptr(),1)}
|
unsafe{uu_terminal_ui_set(rows.as_ptr(),1)}
|
||||||
},
|
},
|
||||||
id=queue.recv()=>match id{
|
id=queue.recv()=>match id{
|
||||||
Some(id)=>{if t.kill(id).await.is_err(){toast("结束会话失败,会话可能已退出")}
|
Some(id)=>{if t.kill(id).await.is_err(){toast(crate::i18n::s("结束会话失败,会话可能已退出","Could not end the session; it may have exited"))}
|
||||||
let rows=c(&session_rows(&t.list_sessions().await?));unsafe{uu_terminal_ui_set(rows.as_ptr(),1)}},
|
let rows=c(&session_rows(&t.list_sessions().await?));unsafe{uu_terminal_ui_set(rows.as_ptr(),1)}},
|
||||||
None=>return Ok::<(),String>(()),
|
None=>return Ok::<(),String>(()),
|
||||||
},
|
},
|
||||||
_=tokio::time::sleep(Duration::from_millis(100)),if relay.0.is_finished()=>return Err("Terminal channel closed".into()),
|
_=tokio::time::sleep(Duration::from_millis(100)),if relay.0.is_finished()=>return Err("Terminal channel closed".into()),
|
||||||
}}
|
}}
|
||||||
}.await;
|
}.await;
|
||||||
if operation.is_err(){unsafe{uu_terminal_ui_set(c("").as_ptr(),0)};toast("终端连接已断开,请关闭窗口后重试")}
|
if operation.is_err(){unsafe{uu_terminal_ui_set(c("").as_ptr(),0)};toast(crate::i18n::s("终端连接已断开,请关闭窗口后重试","Terminal disconnected. Close the window and try again"))}
|
||||||
});
|
});
|
||||||
let _worker=super::tools::Cancel(worker.abort_handle());
|
let _worker=super::tools::Cancel(worker.abort_handle());
|
||||||
let mut children:Vec<std::process::Child>=Vec::new();
|
let mut children:Vec<std::process::Child>=Vec::new();
|
||||||
@@ -205,7 +205,7 @@ pub async fn terminal(io:Transport,rx:mpsc::Receiver<Packet>,_device:&str,name:&
|
|||||||
if worker.is_finished(){ipc.0.abort();}
|
if worker.is_finished(){ipc.0.abort();}
|
||||||
children.retain_mut(|child|matches!(child.try_wait(),Ok(None)));
|
children.retain_mut(|child|matches!(child.try_wait(),Ok(None)));
|
||||||
while let Some(cmd)=take(){
|
while let Some(cmd)=take(){
|
||||||
if worker.is_finished(){toast("连接已断开");continue}
|
if worker.is_finished(){toast(crate::i18n::s("连接已断开","Disconnected"));continue}
|
||||||
let parts:Vec<_>=cmd.split('\t').collect();
|
let parts:Vec<_>=cmd.split('\t').collect();
|
||||||
let session=match parts.as_slice(){
|
let session=match parts.as_slice(){
|
||||||
["create"]=>None,
|
["create"]=>None,
|
||||||
@@ -214,8 +214,8 @@ pub async fn terminal(io:Transport,rx:mpsc::Receiver<Packet>,_device:&str,name:&
|
|||||||
_=>continue,
|
_=>continue,
|
||||||
};
|
};
|
||||||
match local_terminal_command(&exe,&path,session){
|
match local_terminal_command(&exe,&path,session){
|
||||||
Some(mut command)=>match command.spawn(){Ok(child)=>children.push(child),Err(_)=>toast("无法启动本机终端程序")},
|
Some(mut command)=>match command.spawn(){Ok(child)=>children.push(child),Err(_)=>toast(crate::i18n::s("无法启动本机终端程序","Cannot start a local terminal"))},
|
||||||
None=>toast("没有找到本机终端程序(可设置 TERMINAL 环境变量)"),
|
None=>toast(crate::i18n::s("没有找到本机终端程序(可设置 TERMINAL 环境变量)","No local terminal found (set the TERMINAL environment variable)")),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
tokio::time::sleep(Duration::from_millis(100)).await;
|
tokio::time::sleep(Duration::from_millis(100)).await;
|
||||||
|
|||||||
@@ -392,7 +392,10 @@ mod tests {
|
|||||||
|
|
||||||
fn tempfile_dir() -> PathBuf {
|
fn tempfile_dir() -> PathBuf {
|
||||||
use std::os::unix::fs::DirBuilderExt;
|
use std::os::unix::fs::DirBuilderExt;
|
||||||
let dir = std::env::temp_dir().join(format!("uu-type-ipc-test-{}", std::process::id()));
|
// One directory per call: tests run in parallel and must not remove each other's files.
|
||||||
|
static NEXT: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
|
||||||
|
let dir = std::env::temp_dir().join(format!("uu-type-ipc-test-{}-{}", std::process::id(),
|
||||||
|
NEXT.fetch_add(1, std::sync::atomic::Ordering::Relaxed)));
|
||||||
let _ = std::fs::remove_dir_all(&dir);
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
std::fs::DirBuilder::new()
|
std::fs::DirBuilder::new()
|
||||||
.mode(0o700)
|
.mode(0o700)
|
||||||
@@ -404,6 +407,8 @@ mod tests {
|
|||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn server_client_roundtrip_and_uid_gate() {
|
async fn server_client_roundtrip_and_uid_gate() {
|
||||||
let device = format!("ipc-test-{}", uuidish());
|
let device = format!("ipc-test-{}", uuidish());
|
||||||
|
// XDG_RUNTIME_DIR is process-wide; another test points it at a planted directory.
|
||||||
|
let _env = crate::viewer::secure_input::ENV_LOCK.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
|
||||||
let server = Server::bind(&device).await.unwrap();
|
let server = Server::bind(&device).await.unwrap();
|
||||||
let path = server.path.clone();
|
let path = server.path.clone();
|
||||||
let (tx, mut rx) = mpsc::channel::<PendingType>(4);
|
let (tx, mut rx) = mpsc::channel::<PendingType>(4);
|
||||||
@@ -463,6 +468,8 @@ mod tests {
|
|||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn oversized_frame_rejected() {
|
async fn oversized_frame_rejected() {
|
||||||
let device = format!("oversize-{}", uuidish());
|
let device = format!("oversize-{}", uuidish());
|
||||||
|
// XDG_RUNTIME_DIR is process-wide; another test points it at a planted directory.
|
||||||
|
let _env = crate::viewer::secure_input::ENV_LOCK.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
|
||||||
let server = Server::bind(&device).await.unwrap();
|
let server = Server::bind(&device).await.unwrap();
|
||||||
let path = server.path.clone();
|
let path = server.path.clone();
|
||||||
let (tx, mut rx) = mpsc::channel::<PendingType>(1);
|
let (tx, mut rx) = mpsc::channel::<PendingType>(1);
|
||||||
|
|||||||
+55
-24
@@ -13,6 +13,7 @@ extern "C" {
|
|||||||
fn uu_viewer_ui_closed() -> c_int;
|
fn uu_viewer_ui_closed() -> c_int;
|
||||||
fn uu_viewer_ui_confirm_replace() -> c_int;
|
fn uu_viewer_ui_confirm_replace() -> c_int;
|
||||||
fn uu_viewer_ui_toast(text: *const c_char);
|
fn uu_viewer_ui_toast(text: *const c_char);
|
||||||
|
fn uu_viewer_ui_set_host(active: c_int);
|
||||||
}
|
}
|
||||||
fn toast(text: &str) { let t = c(text); unsafe { uu_viewer_ui_toast(t.as_ptr()) } }
|
fn toast(text: &str) { let t = c(text); unsafe { uu_viewer_ui_toast(t.as_ptr()) } }
|
||||||
|
|
||||||
@@ -31,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,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@@ -46,12 +47,12 @@ fn watch_session(mut child: tokio::process::Child, mut cancel: tokio::sync::ones
|
|||||||
}).await;
|
}).await;
|
||||||
if !status.is_ok_and(|s| s.success()) {
|
if !status.is_ok_and(|s| s.success()) {
|
||||||
let reason = match last.as_str() {
|
let reason = match last.as_str() {
|
||||||
"" => "连接已断开".to_owned(),
|
"" => crate::i18n::s("连接已断开","Disconnected").to_owned(),
|
||||||
"CONTROL echo timed out" => "连接超时:被控端没有响应(官方主机互通尚未完成)".to_owned(),
|
"CONTROL echo timed out" => crate::i18n::s("连接超时:被控端没有响应(官方主机互通尚未完成)","Timed out: the remote device did not answer (official host interop is not finished)").to_owned(),
|
||||||
"Remote session released" => "被控端结束了本次连接".to_owned(),
|
"Remote session released" => crate::i18n::s("被控端结束了本次连接","The remote device ended the connection").to_owned(),
|
||||||
other => other.to_owned(),
|
other => other.to_owned(),
|
||||||
};
|
};
|
||||||
toast(&format!("连接失败:{reason}"));
|
toast(&crate::tr!("连接失败:{reason}","Connection failed: {reason}"));
|
||||||
} else if let Some(message) = success { toast(message); }
|
} else if let Some(message) = success { toast(message); }
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -81,7 +82,8 @@ pub fn device_rows(devices: &[Value], current: Option<&str>) -> String {
|
|||||||
let name = d.get("alias").and_then(Value::as_str).unwrap_or(id);
|
let name = d.get("alias").and_then(Value::as_str).unwrap_or(id);
|
||||||
let platform = d.get("platform").and_then(Value::as_i64).unwrap_or(0);
|
let platform = d.get("platform").and_then(Value::as_i64).unwrap_or(0);
|
||||||
let online = d.get("status").and_then(Value::as_str) == Some("CONNECTED");
|
let online = d.get("status").and_then(Value::as_str) == Some("CONNECTED");
|
||||||
Some(format!("{}\t{}\t{}\t{}\t{}\n", clean(id), clean(name), platform, online as u8, (current == Some(id)) as u8))
|
let thumb = super::thumbs::existing(id).map(|p| clean(&p.to_string_lossy())).unwrap_or_default();
|
||||||
|
Some(format!("{}\t{}\t{}\t{}\t{}\t{}\n", clean(id), clean(name), platform, online as u8, (current == Some(id)) as u8, thumb))
|
||||||
}).collect()
|
}).collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -94,6 +96,10 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
|||||||
let mut next_refresh = Instant::now();
|
let mut next_refresh = Instant::now();
|
||||||
let mut sessions:std::collections::HashMap<String,Running>=Default::default();
|
let mut sessions:std::collections::HashMap<String,Running>=Default::default();
|
||||||
let mut names: std::collections::HashMap<String, String> = Default::default();
|
let mut names: std::collections::HashMap<String, String> = Default::default();
|
||||||
|
// Account token seen last; a new sign-in restarts a host the user turned on.
|
||||||
|
let mut host_token: Option<String> = None;
|
||||||
|
let mut just_logged_in = false;
|
||||||
|
unsafe { uu_viewer_ui_set_host(super::host::active().into()) }
|
||||||
let refresh = |creds: &crate::auth::Credentials| {
|
let refresh = |creds: &crate::auth::Credentials| {
|
||||||
let api = super::api::Api::new(crate::auth::UUAuthClient::new(creds.clone()), crate::auth::BASE_URL);
|
let api = super::api::Api::new(crate::auth::UUAuthClient::new(creds.clone()), crate::auth::BASE_URL);
|
||||||
async move { api.device_list().await }
|
async move { api.device_list().await }
|
||||||
@@ -103,27 +109,40 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
|||||||
sessions.retain(|_,s| !s.task.is_finished());
|
sessions.retain(|_,s| !s.task.is_finished());
|
||||||
if let Some(child) = login.as_mut() {
|
if let Some(child) = login.as_mut() {
|
||||||
if let Ok(meta) = std::fs::metadata(&qr) {
|
if let Ok(meta) = std::fs::metadata(&qr) {
|
||||||
if meta.modified().ok() != qr_seen { qr_seen = meta.modified().ok(); set_login(false, &qr.to_string_lossy(), "请用手机扫码并确认", ""); }
|
if meta.modified().ok() != qr_seen { qr_seen = meta.modified().ok(); set_login(false, &qr.to_string_lossy(), crate::i18n::s("请用手机扫码并确认","Scan with your phone and confirm"), ""); }
|
||||||
}
|
}
|
||||||
if let Ok(Some(_)) = child.try_wait() { login = None; let _ = std::fs::remove_file(&qr); next_refresh = Instant::now(); }
|
if let Ok(Some(_)) = child.try_wait() { login = None; let _ = std::fs::remove_file(&qr); next_refresh = Instant::now(); just_logged_in = true; }
|
||||||
} else if Instant::now() >= next_refresh {
|
} else if Instant::now() >= next_refresh {
|
||||||
next_refresh = Instant::now() + Duration::from_secs(30);
|
next_refresh = Instant::now() + Duration::from_secs(30);
|
||||||
match credentials() {
|
match credentials() {
|
||||||
Ok(creds) => {
|
Ok(creds) => {
|
||||||
set_login(true, "", "", "已登录");
|
set_login(true, "", "", crate::i18n::s("已登录","Signed in"));
|
||||||
|
// Hosting is opt-in (Settings switch): signing in never starts the host, but a
|
||||||
|
// host the user turned on goes online with the new account.
|
||||||
|
if host_token.as_deref() != Some(creds.token.as_str()) {
|
||||||
|
let changed = host_token.is_some() || std::mem::take(&mut just_logged_in);
|
||||||
|
if changed && super::host::managed() && super::host::active() {
|
||||||
|
match super::host::restart() {
|
||||||
|
Ok(()) => toast(crate::i18n::s("本机已上线,可在你的其他设备上远程控制","This computer is online; control it from your other devices")),
|
||||||
|
Err(e) => log::warn!("Host service not restarted: {e}"),
|
||||||
|
}
|
||||||
|
unsafe { uu_viewer_ui_set_host(super::host::active().into()) }
|
||||||
|
}
|
||||||
|
host_token = Some(creds.token.clone());
|
||||||
|
}
|
||||||
match refresh(&creds).await {
|
match refresh(&creds).await {
|
||||||
Ok(data) => {
|
Ok(data) => {
|
||||||
let list = data.get("my_binded_devices").and_then(Value::as_array).cloned().unwrap_or_default();
|
let list = data.get("my_binded_devices").and_then(Value::as_array).cloned().unwrap_or_default();
|
||||||
let current = data.pointer("/current_device/device_id").and_then(Value::as_str);
|
let current = data.pointer("/current_device/device_id").and_then(Value::as_str);
|
||||||
names = list.iter().filter_map(|d| Some((d.get("device_id")?.as_str()?.to_owned(),
|
names = list.iter().filter_map(|d| Some((d.get("device_id")?.as_str()?.to_owned(),
|
||||||
d.get("alias").and_then(Value::as_str).unwrap_or("远端设备").to_owned()))).collect();
|
d.get("alias").and_then(Value::as_str).unwrap_or_else(|| crate::i18n::s("远端设备","Remote device")).to_owned()))).collect();
|
||||||
let rows = c(&device_rows(&list, current)); unsafe { uu_viewer_ui_set_devices(rows.as_ptr()) }
|
let rows = c(&device_rows(&list, current)); unsafe { uu_viewer_ui_set_devices(rows.as_ptr()) }
|
||||||
}
|
}
|
||||||
Err(super::api::Error::AuthenticationExpired) => set_login(false, "", "登录已过期,请重新登录", ""),
|
Err(super::api::Error::AuthenticationExpired) => set_login(false, "", crate::i18n::s("登录已过期,请重新登录","Sign-in expired, please sign in again"), ""),
|
||||||
Err(_) => {}
|
Err(_) => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(_) => set_login(false, "", "尚未登录", ""),
|
Err(_) => set_login(false, "", crate::i18n::s("尚未登录","Not signed in"), ""),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
while let Some(cmd) = take() {
|
while let Some(cmd) = take() {
|
||||||
@@ -131,6 +150,18 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
|||||||
match parts.as_slice() {
|
match parts.as_slice() {
|
||||||
["quit"] => break,
|
["quit"] => break,
|
||||||
["refresh"] => next_refresh = Instant::now(),
|
["refresh"] => next_refresh = Instant::now(),
|
||||||
|
["relaunch"] => {
|
||||||
|
// Language is read once at start: restart the launcher in place. Open
|
||||||
|
// sessions are separate processes and keep running.
|
||||||
|
use std::os::unix::process::CommandExt;
|
||||||
|
let _ = std::process::Command::new(&exe).args(std::env::args_os().skip(1)).exec();
|
||||||
|
toast(crate::i18n::s("请重新启动控制端以切换语言","Restart the viewer to switch the language"));
|
||||||
|
}
|
||||||
|
["host", state] => {
|
||||||
|
let result = if *state == "on" { super::host::enable(&exe) } else { super::host::disable() };
|
||||||
|
if let Err(e) = result { toast(&crate::tr!("本机被控设置失败:{e}","Could not change hosting: {e}")); }
|
||||||
|
unsafe { uu_viewer_ui_set_host(super::host::active().into()) }
|
||||||
|
}
|
||||||
["logout"] => {
|
["logout"] => {
|
||||||
// Sign out locally: drop the account token, keep the device identity.
|
// Sign out locally: drop the account token, keep the device identity.
|
||||||
let path = crate::config::path();
|
let path = crate::config::path();
|
||||||
@@ -140,7 +171,7 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
|||||||
}
|
}
|
||||||
for (_,s) in sessions.drain() { s.stop().await; }
|
for (_,s) in sessions.drain() { s.stop().await; }
|
||||||
unsafe { uu_viewer_ui_set_devices(c("").as_ptr()) }
|
unsafe { uu_viewer_ui_set_devices(c("").as_ptr()) }
|
||||||
set_login(false, "", "已退出登录", "");
|
set_login(false, "", crate::i18n::s("已退出登录","Signed out"), "");
|
||||||
next_refresh = Instant::now() + Duration::from_secs(3600);
|
next_refresh = Instant::now() + Duration::from_secs(3600);
|
||||||
}
|
}
|
||||||
["login"] if login.is_none() => {
|
["login"] if login.is_none() => {
|
||||||
@@ -149,7 +180,7 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
|||||||
.env("UU_LOGIN_QR_PNG", &qr).stdin(std::process::Stdio::null())
|
.env("UU_LOGIN_QR_PNG", &qr).stdin(std::process::Stdio::null())
|
||||||
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null())
|
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null())
|
||||||
.kill_on_drop(true).spawn().ok();
|
.kill_on_drop(true).spawn().ok();
|
||||||
if login.is_none() { set_login(false, "", "找不到配套的 uuremote-server", ""); }
|
if login.is_none() { set_login(false, "", crate::i18n::s("找不到配套的 uuremote-server","The matching uuremote-server was not found"), ""); }
|
||||||
}
|
}
|
||||||
["connect", id, kind] if matches!(*kind, "desktop" | "watch") => {
|
["connect", id, kind] if matches!(*kind, "desktop" | "watch") => {
|
||||||
if !replace(&mut sessions,id).await{continue}
|
if !replace(&mut sessions,id).await{continue}
|
||||||
@@ -161,38 +192,38 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
|||||||
match command.env("UU_VIEWER_COMMANDS","1").stdin(std::process::Stdio::piped())
|
match command.env("UU_VIEWER_COMMANDS","1").stdin(std::process::Stdio::piped())
|
||||||
.stderr(std::process::Stdio::piped()).kill_on_drop(true).spawn() {
|
.stderr(std::process::Stdio::piped()).kill_on_drop(true).spawn() {
|
||||||
Ok(mut child) => { let input=child.stdin.take();let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,None);sessions.insert((*id).into(),Running{cancel,task,input}); }
|
Ok(mut child) => { let input=child.stdin.take();let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,None);sessions.insert((*id).into(),Running{cancel,task,input}); }
|
||||||
Err(_) => toast("连接失败:无法启动会话进程"),
|
Err(_) => toast(crate::i18n::s("连接失败:无法启动会话进程","Connection failed: cannot start the session process")),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
["assist", id, code] => {
|
["assist", id, code] => {
|
||||||
match super::assist::command(&exe, id).spawn() {
|
match super::assist::command(&exe, id).spawn() {
|
||||||
Ok(mut child) => match super::assist::send_code(&mut child, code).await {
|
Ok(mut child) => match super::assist::send_code(&mut child, code).await {
|
||||||
Ok(()) => { let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,None);sessions.insert(format!("assist:{id}"),Running{cancel,task,input:None}); }
|
Ok(()) => { let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,None);sessions.insert(format!("assist:{id}"),Running{cancel,task,input:None}); }
|
||||||
Err(reason) => toast(&format!("连接失败:{reason}")),
|
Err(reason) => toast(&crate::tr!("连接失败:{reason}","Connection failed: {reason}")),
|
||||||
},
|
},
|
||||||
Err(_) => toast("连接失败:无法启动协助会话进程"),
|
Err(_) => toast(crate::i18n::s("连接失败:无法启动协助会话进程","Connection failed: cannot start the assistance session")),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
["connect", id, kind @ ("file" | "portmap" | "terminal")] => {
|
["connect", id, kind @ ("file" | "portmap" | "terminal")] => {
|
||||||
if *kind=="file" {if let Some(s)=sessions.get_mut(*id){if let Some(input)=s.input.as_mut(){
|
if *kind=="file" {if let Some(s)=sessions.get_mut(*id){if let Some(input)=s.input.as_mut(){
|
||||||
use tokio::io::AsyncWriteExt;
|
use tokio::io::AsyncWriteExt;
|
||||||
if input.write_all(b"files\n").await.is_err(){toast("桌面会话命令发送失败,请重试")}continue
|
if input.write_all(b"files\n").await.is_err(){toast(crate::i18n::s("桌面会话命令发送失败,请重试","Could not send the command to the desktop session, try again"))}continue
|
||||||
}}}
|
}}}
|
||||||
if !replace(&mut sessions,id).await{continue}
|
if !replace(&mut sessions,id).await{continue}
|
||||||
let name = names.get(*id).cloned().unwrap_or_else(|| "远端设备".into());
|
let name = names.get(*id).cloned().unwrap_or_else(|| crate::i18n::s("远端设备","Remote device").into());
|
||||||
let tool = if *kind == "file" { "files-ui" } else if *kind == "terminal" { "terminal-ui" } else { "portmap-ui" };
|
let tool = if *kind == "file" { "files-ui" } else if *kind == "terminal" { "terminal-ui" } else { "portmap-ui" };
|
||||||
match tokio::process::Command::new(&exe).args([tool, id, &name])
|
match tokio::process::Command::new(&exe).args([tool, id, &name])
|
||||||
.stderr(std::process::Stdio::piped()).kill_on_drop(true).spawn() {
|
.stderr(std::process::Stdio::piped()).kill_on_drop(true).spawn() {
|
||||||
Ok(child) => { let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,None);sessions.insert((*id).into(),Running{cancel,task,input:None}); }
|
Ok(child) => { let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,None);sessions.insert((*id).into(),Running{cancel,task,input:None}); }
|
||||||
Err(_) => toast("连接失败:无法启动工具进程"),
|
Err(_) => toast(crate::i18n::s("连接失败:无法启动工具进程","Connection failed: cannot start the tool process")),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
["connect", id, kind @ ("reboot" | "shutdown")] => {
|
["connect", id, kind @ ("reboot" | "shutdown")] => {
|
||||||
if !replace(&mut sessions,id).await{continue}
|
if !replace(&mut sessions,id).await{continue}
|
||||||
match tokio::process::Command::new(&exe).args(["power", id, kind])
|
match tokio::process::Command::new(&exe).args(["power", id, kind])
|
||||||
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::piped()).kill_on_drop(true).spawn() {
|
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::piped()).kill_on_drop(true).spawn() {
|
||||||
Ok(child) => { let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,Some("电源指令已发送,未确认远端执行结果"));sessions.insert((*id).into(),Running{cancel,task,input:None}); }
|
Ok(child) => { let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,Some(crate::i18n::s("电源指令已发送,未确认远端执行结果","Power command sent; the result on the remote device is not confirmed")));sessions.insert((*id).into(),Running{cancel,task,input:None}); }
|
||||||
Err(_) => toast("电源指令失败:无法启动会话进程"),
|
Err(_) => toast(crate::i18n::s("电源指令失败:无法启动会话进程","Power command failed: cannot start the session process")),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
["connect", id, "unbind"] => {
|
["connect", id, "unbind"] => {
|
||||||
@@ -201,7 +232,7 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
|||||||
Ok(creds)=>super::api::Api::new(crate::auth::UUAuthClient::new(creds),crate::auth::BASE_URL).unbind(id,false).await.map_err(|e|e.to_string()),
|
Ok(creds)=>super::api::Api::new(crate::auth::UUAuthClient::new(creds),crate::auth::BASE_URL).unbind(id,false).await.map_err(|e|e.to_string()),
|
||||||
Err(e)=>Err(e),
|
Err(e)=>Err(e),
|
||||||
};
|
};
|
||||||
match result {Ok(())=>toast("设备已从账号删除"),Err(e)=>toast(&format!("删除设备失败:{e}"))}
|
match result {Ok(())=>toast(crate::i18n::s("设备已从账号删除","Device removed from the account")),Err(e)=>toast(&crate::tr!("删除设备失败:{e}","Removing the device failed: {e}"))}
|
||||||
next_refresh=Instant::now();
|
next_refresh=Instant::now();
|
||||||
}
|
}
|
||||||
["connect", _, kind] => log::info!("Viewer UI: {kind} is not supported yet"),
|
["connect", _, kind] => log::info!("Viewer UI: {kind} is not supported yet"),
|
||||||
@@ -221,6 +252,6 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
|||||||
serde_json::json!({"device_id":"d2","platform":1,"status":"DISCONNECTED"}),
|
serde_json::json!({"device_id":"d2","platform":1,"status":"DISCONNECTED"}),
|
||||||
serde_json::json!({"alias":"no id"}),
|
serde_json::json!({"alias":"no id"}),
|
||||||
], Some("d2"));
|
], Some("d2"));
|
||||||
assert_eq!(rows, "d1\ta b\t4\t1\t0\nd2\td2\t1\t0\t1\n");
|
assert_eq!(rows, "d1\ta b\t4\t1\t0\t\nd2\td2\t1\t0\t1\t\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -198,6 +198,14 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// RpcRequest case 15 SendVideoTrackReq with no fields (track 0), sent by the official iPhone
|
||||||
|
/// viewer right after CONTROL opens (host logs: response_field=11 value=None). Without it a
|
||||||
|
/// second session only joins the stream already encoded for another viewer: no SPS/PPS/IDR (#124).
|
||||||
|
pub fn request_video_track()->Vec<u8>{
|
||||||
|
let mut header=Vec::new();int(1,2_000_001,&mut header);
|
||||||
|
let mut rpc=Vec::new();bytes(1,&header,&mut rpc);bytes(15,&[],&mut rpc);
|
||||||
|
envelope(2_000_001,21,&rpc)
|
||||||
|
}
|
||||||
/// CaptureSettingRequest field 7 = ChromaFormat 3, wrapped in RPC 21/case 2.
|
/// CaptureSettingRequest field 7 = ChromaFormat 3, wrapped in RPC 21/case 2.
|
||||||
pub fn request_chroma444()->Vec<u8>{
|
pub fn request_chroma444()->Vec<u8>{
|
||||||
let mut header=Vec::new();int(1,2_000_000,&mut header);
|
let mut header=Vec::new();int(1,2_000_000,&mut header);
|
||||||
@@ -205,6 +213,19 @@ pub fn request_chroma444()->Vec<u8>{
|
|||||||
let mut rpc=Vec::new();bytes(1,&header,&mut rpc);bytes(2,&setting,&mut rpc);
|
let mut rpc=Vec::new();bytes(1,&header,&mut rpc);bytes(2,&setting,&mut rpc);
|
||||||
envelope(2_000_000,21,&rpc)
|
envelope(2_000_000,21,&rpc)
|
||||||
}
|
}
|
||||||
|
/// RpcRequest case 2 CaptureSettingRequest with the given (field, value) pairs: 1 fps option
|
||||||
|
/// index, 18 fpsCount, 2 quality, 7 chroma, 10 resolution_type, 16/17 pixel size (src/capture_setting.rs).
|
||||||
|
pub fn capture_setting(seq:u64,fields:&[(u32,u64)])->Vec<u8>{
|
||||||
|
let mut header=Vec::new();int(1,seq,&mut header);
|
||||||
|
let mut setting=Vec::new();for &(f,v) in fields {int(f,v,&mut setting);}
|
||||||
|
let mut rpc=Vec::new();bytes(1,&header,&mut rpc);bytes(2,&setting,&mut rpc);
|
||||||
|
envelope(seq,21,&rpc)
|
||||||
|
}
|
||||||
|
/// Message 3 SimpleAction {1 action, 5 value} as the official 安全 menu sends it.
|
||||||
|
pub fn simple_action(seq:u64,action:u64,value:Option<u64>)->Vec<u8>{
|
||||||
|
let mut body=Vec::new();int(1,action,&mut body);if let Some(v)=value {int(5,v,&mut body);}
|
||||||
|
envelope(seq,3,&body)
|
||||||
|
}
|
||||||
/// Message 18 is an encoder capability LIST, not the chosen codec; RTP's negotiated PT is authoritative.
|
/// Message 18 is an encoder capability LIST, not the chosen codec; RTP's negotiated PT is authoritative.
|
||||||
/// Message 25 reports actual encoded chroma, which may fall back to 4:2:0.
|
/// Message 25 reports actual encoded chroma, which may fall back to 4:2:0.
|
||||||
pub fn media_control(data:&[u8])->(Option<u32>,Option<u32>){
|
pub fn media_control(data:&[u8])->(Option<u32>,Option<u32>){
|
||||||
@@ -237,6 +258,15 @@ pub fn media_control(data:&[u8])->(Option<u32>,Option<u32>){
|
|||||||
assert!(s.video_preferences(force).connect_options("synthetic-device",false).unwrap()==options);
|
assert!(s.video_preferences(force).connect_options("synthetic-device",false).unwrap()==options);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#[test] fn video_track_request_is_an_empty_rpc_15(){
|
||||||
|
let message=request_video_track();
|
||||||
|
let fields=decode_wire(&message).unwrap();
|
||||||
|
assert!(fields.iter().any(|f|f.number==1));
|
||||||
|
let rpc=fields.iter().find_map(|f|match (f.number,&f.value){(21,WireValue::Bytes(b))=>Some(*b),_=>None}).unwrap();
|
||||||
|
let rpc=decode_wire(rpc).unwrap();
|
||||||
|
assert!(rpc.iter().any(|f|f.number==1));
|
||||||
|
assert!(rpc.iter().any(|f|matches!((f.number,&f.value),(15,WireValue::Bytes(b)) if b.is_empty())));
|
||||||
|
}
|
||||||
#[test] fn chroma_request_and_actual_sync_are_independent_of_encoder_list(){
|
#[test] fn chroma_request_and_actual_sync_are_independent_of_encoder_list(){
|
||||||
let request=request_chroma444();let rpc=super::super::tools::blob(&request,21).unwrap();
|
let request=request_chroma444();let rpc=super::super::tools::blob(&request,21).unwrap();
|
||||||
let setting=super::super::tools::blob(rpc,2).unwrap();assert_eq!(super::super::tools::uint(setting,7),3);
|
let setting=super::super::tools::blob(rpc,2).unwrap();assert_eq!(super::super::tools::uint(setting,7),3);
|
||||||
|
|||||||
+17
-11
@@ -2,6 +2,7 @@
|
|||||||
#![allow(dead_code)]
|
#![allow(dead_code)]
|
||||||
#[path = "auth.rs"] mod auth;
|
#[path = "auth.rs"] mod auth;
|
||||||
#[path = "config.rs"] mod config;
|
#[path = "config.rs"] mod config;
|
||||||
|
#[path = "i18n.rs"] mod i18n;
|
||||||
#[path = "protocol.rs"] mod protocol;
|
#[path = "protocol.rs"] mod protocol;
|
||||||
mod ws_transport;
|
mod ws_transport;
|
||||||
mod viewer;
|
mod viewer;
|
||||||
@@ -14,7 +15,7 @@ use viewer::clipboard;
|
|||||||
#[cfg(test)] #[path="initialization.rs"] mod initialization;
|
#[cfg(test)] #[path="initialization.rs"] mod initialization;
|
||||||
use viewer::{api::Api,rtc::ReadyPolicy,session::{Options,Session},wire::Shape};
|
use viewer::{api::Api,rtc::ReadyPolicy,session::{Options,Session},wire::Shape};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
const HELP:&str="Experimental native viewer.\n uuremote-viewer ui (GTK window: sign-in, devices, sessions) Desktop UI requires viewer-sdl (decodes with the ffmpeg CLI, or FFmpeg 6.x libraries with viewer-ffmpeg).\n uuremote-viewer power DEVICE reboot|shutdown\n uuremote-viewer type DEVICE [options] (secret from UU_INPUT_ENV or stdin; reuses running viewer)\n options: --delay-ms MS --omit-last N --snapshot PATH --dry-run --new-session\n uuremote-viewer unbind DEVICE [--shared] (从账号删除设备 / remove a device from the account)\n uuremote-viewer terminal DEVICE [SESSION]\n uuremote-viewer files DEVICE ls PATH | get REMOTE LOCAL | put LOCAL REMOTE\n uuremote-viewer portmap DEVICE LOCAL_PORT HOST PORT\n uuremote-viewer files-ui|portmap-ui|terminal-ui DEVICE NAME (GTK tool windows)\n uuremote-viewer login [--no-gui]\n uuremote-viewer devices METHOD ARRAY_POINTER ID_POINTER NAME_POINTER\n uuremote-viewer assist CONNECT_ID (验证码从 stdin 读取一行)\n uuremote-viewer connect DEVICE true|false SHAPE_JSON echo|manual raw|legacy [--view-only]\nVideo: UU_VIEWER_CODEC=h264 forces H.264; UU_VIEWER_CHROMA=444 requests true color (default 4:2:0).\nAudio: UU_VIEWER_AUDIO=0 disables playback. UU_VIEWER_VIEW_ONLY=1 disables desktop input.\nDevice-list method/JSON pointers and compatibility shape require verified operator configuration.\nQR login reuses the sibling uuremote-server login command. Never run login in a captured log.\nEcho readiness is transport observation only; no sendVideoTrack RPC is emitted.";
|
const HELP:&str="Experimental native viewer.\n uuremote-viewer ui (GTK window: sign-in, devices, sessions) Desktop UI requires viewer-sdl (decodes with the ffmpeg CLI, or FFmpeg 6.x libraries with viewer-ffmpeg).\n uuremote-viewer power DEVICE reboot|shutdown\n uuremote-viewer type DEVICE [options] (secret from UU_INPUT_ENV or stdin; reuses running viewer)\n options: --delay-ms MS --omit-last N --snapshot PATH --dry-run --new-session\n uuremote-viewer unbind DEVICE [--shared] (从账号删除设备 / remove a device from the account)\n uuremote-viewer terminal DEVICE [SESSION]\n uuremote-viewer files DEVICE ls PATH | get REMOTE LOCAL | put LOCAL REMOTE\n uuremote-viewer portmap DEVICE LOCAL_PORT HOST PORT\n uuremote-viewer files-ui|portmap-ui|terminal-ui DEVICE NAME (GTK tool windows)\n uuremote-viewer login [--no-gui]\n uuremote-viewer devices METHOD ARRAY_POINTER ID_POINTER NAME_POINTER\n uuremote-viewer assist CONNECT_ID (验证码从 stdin 读取一行)\n uuremote-viewer connect DEVICE true|false SHAPE_JSON echo|manual raw|legacy [--view-only]\nVideo: UU_VIEWER_CODEC=h264 forces H.264; UU_VIEWER_CHROMA=444 requests true color (default 4:2:0).\nAudio: UU_VIEWER_AUDIO=0 disables playback. UU_VIEWER_VIEW_ONLY=1 disables desktop input.\nDevice-list method/JSON pointers and compatibility shape require verified operator configuration.\nQR login reuses the sibling uuremote-server login command. Never run login in a captured log.\nEcho readiness is transport observation only; desktop sessions send one sendVideoTrack RPC (like the official iPhone viewer).";
|
||||||
const DEFAULT_SHAPE:&str=r#"{"capture_type":1,"platform":3,"client_version":"4.42.0","width":1920,"height":1080,"fps":60,"chroma":1,
|
const DEFAULT_SHAPE:&str=r#"{"capture_type":1,"platform":3,"client_version":"4.42.0","width":1920,"height":1080,"fps":60,"chroma":1,
|
||||||
"decoders":[{"fps":60,"codec":1,"width":3840,"height":2160,"chroma":1}],"display_modes":[[1920,1080,60]],
|
"decoders":[{"fps":60,"codec":1,"width":3840,"height":2160,"chroma":1}],"display_modes":[[1920,1080,60]],
|
||||||
"displays":[{"id":1,"fps":60,"type":0,"hdr":0}],
|
"displays":[{"id":1,"fps":60,"type":0,"hdr":0}],
|
||||||
@@ -57,8 +58,8 @@ async fn run(args:&[String])->Result<(),String> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
Some("unbind") if (args.len()==2 || (args.len()==3 && args[2]=="--shared")) && !args[1].is_empty() => {
|
Some("unbind") if (args.len()==2 || (args.len()==3 && args[2]=="--shared")) && !args[1].is_empty() => {
|
||||||
api()?.unbind(&args[1],args.len()==3).await.map_err(|e|format!("删除设备失败:{e}"))?;
|
api()?.unbind(&args[1],args.len()==3).await.map_err(|e|crate::tr!("删除设备失败:{e}","Removing the device failed: {e}"))?;
|
||||||
println!("已从账号删除设备");Ok(())
|
println!("{}",crate::i18n::s("已从账号删除设备","Device removed from the account"));Ok(())
|
||||||
}
|
}
|
||||||
Some("power")=>power_command(args).await,
|
Some("power")=>power_command(args).await,
|
||||||
Some("type")=>type_command(args).await,
|
Some("type")=>type_command(args).await,
|
||||||
@@ -69,7 +70,7 @@ async fn run(args:&[String])->Result<(),String> {
|
|||||||
Some("terminal"|"files"|"portmap"|"files-ui"|"portmap-ui"|"terminal-ui")=>tool_command(args).await,
|
Some("terminal"|"files"|"portmap"|"files-ui"|"portmap-ui"|"terminal-ui")=>tool_command(args).await,
|
||||||
Some("assist") if args.len()==2=> {
|
Some("assist") if args.len()==2=> {
|
||||||
let code=viewer::assist::read_code(std::io::stdin().lock())?;
|
let code=viewer::assist::read_code(std::io::stdin().lock())?;
|
||||||
desktop_command(&["connect".into(),args[1].clone(),"false".into(),"-".into(),"echo".into(),"legacy".into()],Some(code)).await.map_err(|e|format!("协助连接失败:{e}"))
|
desktop_command(&["connect".into(),args[1].clone(),"false".into(),"-".into(),"echo".into(),"legacy".into()],Some(code)).await.map_err(|e|crate::tr!("协助连接失败:{e}","Assistance connection failed: {e}"))
|
||||||
}
|
}
|
||||||
Some("connect") if args.len()==6 || args.len()==7=> desktop_command(args,None).await,
|
Some("connect") if args.len()==6 || args.len()==7=> desktop_command(args,None).await,
|
||||||
_=>Err(HELP.into()),
|
_=>Err(HELP.into()),
|
||||||
@@ -96,11 +97,16 @@ async fn desktop_command(args:&[String],code:Option<String>)->Result<(),String>
|
|||||||
let creds=credentials()?;
|
let creds=credentials()?;
|
||||||
let api=Api::new(auth::UUAuthClient::new(creds.clone()),auth::BASE_URL);
|
let api=Api::new(auth::UUAuthClient::new(creds.clone()),auth::BASE_URL);
|
||||||
let account_connection=code.is_none();
|
let account_connection=code.is_none();
|
||||||
let room=match code {
|
#[cfg(feature="viewer-sdl")]
|
||||||
|
macro_rules! wait {($stage:expr,$fut:expr)=>{viewer::sdl::loading(desktop.as_mut().map(|d|&mut d.0),$stage,$fut).await?}}
|
||||||
|
#[cfg(not(feature="viewer-sdl"))]
|
||||||
|
macro_rules! wait {($stage:expr,$fut:expr)=>{{let _=$stage;$fut.await}}}
|
||||||
|
let contacting=i18n::s("正在连接远端设备…","Contacting the remote device…");
|
||||||
|
let room=wait!(contacting,async{match code {
|
||||||
Some(code)=>api.join_share(&args[1],&code).await,
|
Some(code)=>api.join_share(&args[1],&code).await,
|
||||||
None=>api.join(&args[1],force,true).await,
|
None=>api.join(&args[1],force,true).await,
|
||||||
}.map_err(|e|e.to_string())?;
|
}}).map_err(|e|e.to_string())?;
|
||||||
let target_mac=if shape.capture_type==1 {api.target_is_mac(&room,account_connection.then_some(args[1].as_str())).await} else {Err(viewer::api::Error::UnknownKeyboardPlatform)};
|
let target_mac=if shape.capture_type==1 {wait!(contacting,api.target_is_mac(&room,account_connection.then_some(args[1].as_str())))} else {Err(viewer::api::Error::UnknownKeyboardPlatform)};
|
||||||
#[cfg(feature="viewer-sdl")]
|
#[cfg(feature="viewer-sdl")]
|
||||||
if let Some((window,_))=desktop.as_mut().filter(|_|!view_only){
|
if let Some((window,_))=desktop.as_mut().filter(|_|!view_only){
|
||||||
window.set_mac(*target_mac.as_ref().map_err(|e|e.to_string())?);
|
window.set_mac(*target_mac.as_ref().map_err(|e|e.to_string())?);
|
||||||
@@ -111,7 +117,7 @@ async fn desktop_command(args:&[String],code:Option<String>)->Result<(),String>
|
|||||||
let mut clipboard=clipboard::Bridge::new(shape.capture_type==1);
|
let mut clipboard=clipboard::Bridge::new(shape.capture_type==1);
|
||||||
clipboard.set_target_mac(target_mac.ok());
|
clipboard.set_target_mac(target_mac.ok());
|
||||||
let options=Options{timeout:Duration::from_secs(12),legacy_prefix:legacy,ready_policy:policy,clipboard};
|
let options=Options{timeout:Duration::from_secs(12),legacy_prefix:legacy,ready_policy:policy,clipboard};
|
||||||
let mut session=Session::open(&room,&shape,&creds.device_id,&creds.client_id,options,Default::default()).await?;
|
let mut session=wait!(i18n::s("正在建立安全连接…","Establishing a secure connection…"),Session::open(&room,&shape,&creds.device_id,&creds.client_id,options,Default::default()))?;
|
||||||
#[cfg(feature="viewer-sdl")]
|
#[cfg(feature="viewer-sdl")]
|
||||||
let result=if let Some((window,decoder))=desktop.as_mut(){viewer::sdl::run(&mut session,window,decoder.as_mut(),view_only,&args[1]).await}else{session.run().await};
|
let result=if let Some((window,decoder))=desktop.as_mut(){viewer::sdl::run(&mut session,window,decoder.as_mut(),view_only,&args[1]).await}else{session.run().await};
|
||||||
#[cfg(not(feature="viewer-sdl"))]
|
#[cfg(not(feature="viewer-sdl"))]
|
||||||
@@ -169,7 +175,7 @@ async fn type_command(args:&[String])->Result<(),String>{
|
|||||||
if !response.ok {
|
if !response.ok {
|
||||||
return Err(response.error.unwrap_or_else(||"Secure input failed on running viewer".into()));
|
return Err(response.error.unwrap_or_else(||"Secure input failed on running viewer".into()));
|
||||||
}
|
}
|
||||||
println!("安全输入已发送({} 个按键事件,{} 字符)。", response.events, response.chars);
|
println!("{}",crate::tr!("安全输入已发送({} 个按键事件,{} 字符)。","Secure input sent ({} key events, {} characters).", response.events, response.chars));
|
||||||
if let Some(path)=response.snapshot {
|
if let Some(path)=response.snapshot {
|
||||||
println!("snapshot={path}");
|
println!("snapshot={path}");
|
||||||
log::info!("Secure input snapshot: {path}");
|
log::info!("Secure input snapshot: {path}");
|
||||||
@@ -196,7 +202,7 @@ async fn type_command(args:&[String])->Result<(),String>{
|
|||||||
let mut session=Session::open(&room,&shape,&creds.device_id,&creds.client_id,options,Default::default()).await?;
|
let mut session=Session::open(&room,&shape,&creds.device_id,&creds.client_id,options,Default::default()).await?;
|
||||||
let result=viewer::secure_input::run_session(&mut session,actions.as_slice(),delay).await;
|
let result=viewer::secure_input::run_session(&mut session,actions.as_slice(),delay).await;
|
||||||
session.close().await;
|
session.close().await;
|
||||||
if result.is_ok(){println!("安全输入已发送({event_count} 个按键事件);新会话路径无截图。");}
|
if result.is_ok(){println!("{}",crate::tr!("安全输入已发送({event_count} 个按键事件);新会话路径无截图。","Secure input sent ({event_count} key events); no snapshot on the new-session path."));}
|
||||||
result
|
result
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -295,6 +301,6 @@ async fn power_command(args:&[String])->Result<(),String>{
|
|||||||
let mut session=Session::open(&room,&shape,&creds.device_id,&creds.client_id,options,Default::default()).await?;
|
let mut session=Session::open(&room,&shape,&creds.device_id,&creds.client_id,options,Default::default()).await?;
|
||||||
let result=viewer::power::run(&mut session,action).await;
|
let result=viewer::power::run(&mut session,action).await;
|
||||||
session.close().await;
|
session.close().await;
|
||||||
if result.is_ok(){println!("电源指令已发送;未确认远端执行结果。");}
|
if result.is_ok(){println!("{}",crate::i18n::s("电源指令已发送;未确认远端执行结果。","Power command sent; the result on the remote device is not confirmed."));}
|
||||||
result
|
result
|
||||||
}
|
}
|
||||||
+85
-8
@@ -199,6 +199,7 @@ pub fn text_probe()->Result<(),String> {
|
|||||||
typed+=one;
|
typed+=one;
|
||||||
}
|
}
|
||||||
if typed<0 { return Err(format!("Wayland text typing failed ({typed})")); }
|
if typed<0 { return Err(format!("Wayland text typing failed ({typed})")); }
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(100));
|
||||||
println!("Typed {typed} of {} characters in {} calls; check that they match.",
|
println!("Typed {typed} of {} characters in {} calls; check that they match.",
|
||||||
sequence.chars().filter(|character|*character!='|').count(),sequence.split('|').count());
|
sequence.chars().filter(|character|*character!='|').count(),sequence.split('|').count());
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -209,7 +210,7 @@ pub fn text_probe()->Result<(),String> {
|
|||||||
// root to the selected monitor. No compositor layout or user credentials are modified.
|
// root to the selected monitor. No compositor layout or user credentials are modified.
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
pub struct Output { pub name:String, pub width:u32, pub height:u32, pub fps:i32, pub x:i32, pub y:i32 }
|
pub struct Output { pub name:String, pub width:u32, pub height:u32, pub fps:i32, pub x:i32, pub y:i32 }
|
||||||
struct Inventory { outputs:Vec<Output>, x11:bool }
|
struct Inventory { outputs:Vec<Output>, x11:bool, portal:bool }
|
||||||
static OUTPUTS: std::sync::OnceLock<Inventory> = std::sync::OnceLock::new();
|
static OUTPUTS: std::sync::OnceLock<Inventory> = std::sync::OnceLock::new();
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
struct Selection { id:usize, generation:u64, presented:Option<u64>, failed:bool }
|
struct Selection { id:usize, generation:u64, presented:Option<u64>, failed:bool }
|
||||||
@@ -229,21 +230,54 @@ fn inventory() -> &'static Inventory {
|
|||||||
if backend==Some(crate::desktop_backend::DesktopBackend::X11) && !crate::desktop_backend::headless()
|
if backend==Some(crate::desktop_backend::DesktopBackend::X11) && !crate::desktop_backend::headless()
|
||||||
&& std::env::var("UU_X11_MULTISCREEN").ok().as_deref()==Some("1") {
|
&& std::env::var("UU_X11_MULTISCREEN").ok().as_deref()==Some("1") {
|
||||||
let outputs=x11_outputs();
|
let outputs=x11_outputs();
|
||||||
return Inventory {x11:!outputs.is_empty(),outputs};
|
return Inventory {x11:!outputs.is_empty(),outputs,portal:false};
|
||||||
|
}
|
||||||
|
if backend==Some(crate::desktop_backend::DesktopBackend::Portal) && !crate::desktop_backend::headless() {
|
||||||
|
let outputs=portal_outputs();
|
||||||
|
return Inventory {portal:!outputs.is_empty(),outputs,x11:false};
|
||||||
}
|
}
|
||||||
if !cfg!(all(target_os="linux",feature="wayland"))
|
if !cfg!(all(target_os="linux",feature="wayland"))
|
||||||
|| std::env::var("UU_WAYLAND_MULTISCREEN").ok().as_deref()!=Some("1")
|
|| std::env::var("UU_WAYLAND_MULTISCREEN").ok().as_deref()!=Some("1")
|
||||||
|| backend!=Some(crate::desktop_backend::DesktopBackend::Wayland) {return Inventory {outputs:Vec::new(),x11:false};}
|
|| backend!=Some(crate::desktop_backend::DesktopBackend::Wayland) {return Inventory {outputs:Vec::new(),x11:false,portal:false};}
|
||||||
let output=std::process::Command::new("hyprctl").args(["monitors","-j"]).output();
|
let niri=std::env::var_os("NIRI_SOCKET").is_some();
|
||||||
let result=output.map_err(|_|"hyprctl unavailable").and_then(|output| {
|
let output=if niri {std::process::Command::new("niri").args(["msg","--json","outputs"]).output()}
|
||||||
if !output.status.success() {return Err("hyprctl failed");}
|
else {std::process::Command::new("hyprctl").args(["monitors","-j"]).output()};
|
||||||
parse_outputs(&output.stdout,&std::env::var("UU_WAYLAND_OUTPUT").unwrap_or_default())
|
let result=output.map_err(|_|"monitor command unavailable").and_then(|output| {
|
||||||
|
if !output.status.success() {return Err("monitor command failed");}
|
||||||
|
let preferred=std::env::var("UU_WAYLAND_OUTPUT").unwrap_or_default();
|
||||||
|
if niri {parse_niri_outputs(&output.stdout,&preferred)} else {parse_outputs(&output.stdout,&preferred)}
|
||||||
});
|
});
|
||||||
let outputs=match result {Ok(outputs)=>outputs,Err(reason)=>{log::warn!("Wayland multi-screen disabled: {}",reason);Vec::new()}};
|
let outputs=match result {Ok(outputs)=>outputs,Err(reason)=>{log::warn!("Wayland multi-screen disabled: {}",reason);Vec::new()}};
|
||||||
Inventory {outputs,x11:false}
|
Inventory {outputs,x11:false,portal:false}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
pub fn outputs() -> &'static [Output] {&inventory().outputs}
|
pub fn outputs() -> &'static [Output] {&inventory().outputs}
|
||||||
|
/// GNOME portal grants one monitor per consent (multi-select is refused), so each monitor
|
||||||
|
/// gets its own saved consent and a switch opens that monitor's session. Read once.
|
||||||
|
fn portal_outputs()->Vec<Output> {
|
||||||
|
let monitors=crate::portal::monitors();
|
||||||
|
if monitors.len()<2 {return Vec::new();}
|
||||||
|
let fps=crate::video::display_fps() as i32;
|
||||||
|
let mut outputs:Vec<Output>=monitors.iter().map(|m|Output {name:m.connector.clone(),width:m.width,height:m.height,fps,x:m.x,y:m.y}).collect();
|
||||||
|
// Screen 0 is the one opened first: the monitor whose consent is already saved, else the primary.
|
||||||
|
let dir=crate::portal::permissions_directory();
|
||||||
|
let granted=|name:&str|dir.as_deref().is_some_and(|d|d.join(crate::portal::monitor_key(name)).exists());
|
||||||
|
let primary=monitors.iter().find(|m|m.primary).map(|m|m.connector.clone()).unwrap_or_default();
|
||||||
|
outputs.sort_by_key(|o|(!granted(&o.name),o.name!=primary,o.x,o.y));
|
||||||
|
outputs.truncate(16);
|
||||||
|
log::info!("Portal multi-screen: {} monitors",outputs.len());
|
||||||
|
outputs
|
||||||
|
}
|
||||||
|
/// Connector of the selected screen when the portal advertises several monitors.
|
||||||
|
pub fn portal_monitor()->Option<String> {
|
||||||
|
if !inventory().portal {return None;}
|
||||||
|
source(selected()).map(|o|o.name.clone())
|
||||||
|
}
|
||||||
|
/// Monitor at a portal stream's logical position (Mutter logical layout).
|
||||||
|
pub fn portal_monitor_at(x:i32,y:i32)->Option<String> {
|
||||||
|
if !inventory().portal {return None;}
|
||||||
|
outputs().iter().find(|o|(o.x,o.y)==(x,y)).map(|o|o.name.clone())
|
||||||
|
}
|
||||||
/// X11 monitors are advertised: the stream captures the selected monitor's region of the root.
|
/// X11 monitors are advertised: the stream captures the selected monitor's region of the root.
|
||||||
pub fn x11_multiscreen()->bool {inventory().x11}
|
pub fn x11_multiscreen()->bool {inventory().x11}
|
||||||
/// Read once, like the Hyprland inventory: a changed monitor layout needs a host restart.
|
/// Read once, like the Hyprland inventory: a changed monitor layout needs a host restart.
|
||||||
@@ -294,6 +328,20 @@ fn parse_x11_monitors(text:&str,preferred:&str,fps:i32)->Result<Vec<Output>,&'st
|
|||||||
if outputs.is_empty() || (!preferred.is_empty() && outputs[0].name!=preferred) {return Err("No capturable preferred output");}
|
if outputs.is_empty() || (!preferred.is_empty() && outputs[0].name!=preferred) {return Err("No capturable preferred output");}
|
||||||
Ok(outputs)
|
Ok(outputs)
|
||||||
}
|
}
|
||||||
|
fn parse_niri_outputs(json:&[u8],preferred:&str)->Result<Vec<Output>,&'static str> {
|
||||||
|
let inventory=serde_json::from_slice::<serde_json::Map<String,serde_json::Value>>(json).map_err(|_|"Invalid niri inventory")?;
|
||||||
|
let monitors:Vec<_>=inventory.values().filter_map(|m| {
|
||||||
|
let logical=m["logical"].as_object()?;
|
||||||
|
let mode=m["modes"].as_array()?.get(usize::try_from(m["current_mode"].as_u64()?).ok()?)?;
|
||||||
|
let transform=logical.get("transform")?.as_str()?;
|
||||||
|
if !matches!(transform,"Normal"|"90"|"180"|"270") {return None;}
|
||||||
|
let (w,h)=(mode["width"].as_u64()?,mode["height"].as_u64()?);
|
||||||
|
let (w,h)=if matches!(transform,"90"|"270") {(h,w)} else {(w,h)};
|
||||||
|
Some(serde_json::json!({"name":m["name"],"width":w,"height":h,"transform":0,
|
||||||
|
"refreshRate":mode["refresh_rate"].as_f64()?/1000.0}))
|
||||||
|
}).collect();
|
||||||
|
parse_outputs(&serde_json::to_vec(&monitors).map_err(|_|"Invalid niri inventory")?,preferred)
|
||||||
|
}
|
||||||
fn parse_outputs(json:&[u8],preferred:&str)->Result<Vec<Output>,&'static str> {
|
fn parse_outputs(json:&[u8],preferred:&str)->Result<Vec<Output>,&'static str> {
|
||||||
let monitors=serde_json::from_slice::<Vec<serde_json::Value>>(json).map_err(|_|"Invalid monitor inventory")?;
|
let monitors=serde_json::from_slice::<Vec<serde_json::Value>>(json).map_err(|_|"Invalid monitor inventory")?;
|
||||||
let mut seen=std::collections::HashSet::new();
|
let mut seen=std::collections::HashSet::new();
|
||||||
@@ -353,6 +401,13 @@ pub fn failed(id:usize,generation:u64) {
|
|||||||
}
|
}
|
||||||
pub fn select(id:usize)->Result<(),String> {
|
pub fn select(id:usize)->Result<(),String> {
|
||||||
let output=source(id).ok_or("Unknown screen")?;
|
let output=source(id).ok_or("Unknown screen")?;
|
||||||
|
if inventory().portal {
|
||||||
|
let mut state=SELECTION.lock().unwrap();
|
||||||
|
crate::portal::switch_active(&output.name)?;
|
||||||
|
state.begin(id);
|
||||||
|
log::info!("Portal screen selected: id={} source={}x{}",id,output.width,output.height);
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
if x11_multiscreen() {
|
if x11_multiscreen() {
|
||||||
SELECTION.lock().unwrap().begin(id);
|
SELECTION.lock().unwrap().begin(id);
|
||||||
log::info!("X11 screen selected: id={} source={}x{}+{}+{}",id,output.width,output.height,output.x,output.y);
|
log::info!("X11 screen selected: id={} source={}x{}+{}+{}",id,output.width,output.height,output.x,output.y);
|
||||||
@@ -429,6 +484,28 @@ mod selection_regressions {
|
|||||||
s.sent(0,current);assert!(s.ready());
|
s.sent(0,current);assert!(s.ready());
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
|
#[ignore = "requires an unlocked Wayland session and UU_WAYLAND_MULTISCREEN=1"]
|
||||||
|
fn live_monitor_switch_captures_each_output() {
|
||||||
|
assert!(outputs().len()>1);
|
||||||
|
init().unwrap();
|
||||||
|
for (id,output) in outputs().iter().enumerate() {
|
||||||
|
select(id).unwrap();
|
||||||
|
let mut frame=vec![0;(output.width as usize)*(output.height as usize)*4];
|
||||||
|
capture(&mut frame).unwrap();
|
||||||
|
assert_eq!(selected(),id);
|
||||||
|
}
|
||||||
|
select(0).unwrap();
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn niri_inventory_uses_active_mode_and_rotated_pixel_size() {
|
||||||
|
let json=br#"{"one":{"name":"DP-1","modes":[{"width":2240,"height":1400,"refresh_rate":60000}],"current_mode":0,"logical":{"transform":"90"}},
|
||||||
|
"off":{"name":"off","modes":[],"current_mode":null,"logical":null}}"#;
|
||||||
|
let outputs=parse_niri_outputs(json,"").unwrap();
|
||||||
|
assert_eq!((outputs.len(),outputs[0].width,outputs[0].height,outputs[0].fps),(1,1400,2240,60));
|
||||||
|
assert!(parse_niri_outputs(json,"off").is_err());
|
||||||
|
assert!(parse_niri_outputs(b"[]","").is_err());
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
fn mixed_scale_inventory_preserves_pixel_sizes_and_preferred_output() {
|
fn mixed_scale_inventory_preserves_pixel_sizes_and_preferred_output() {
|
||||||
let json=br#"[{"name":"eDP-1","width":1920,"height":1080,"scale":1.3333334,"transform":0,"refreshRate":144},
|
let json=br#"[{"name":"eDP-1","width":1920,"height":1080,"scale":1.3333334,"transform":0,"refreshRate":144},
|
||||||
{"name":"HDMI-A-1","width":2560,"height":1440,"scale":1.25,"transform":0,"refreshRate":75}]"#;
|
{"name":"HDMI-A-1","width":2560,"height":1440,"scale":1.25,"transform":0,"refreshRate":75}]"#;
|
||||||
|
|||||||
+48
-6
@@ -111,7 +111,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>,
|
||||||
}
|
}
|
||||||
@@ -686,7 +686,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();
|
||||||
@@ -1036,6 +1036,26 @@ impl WebRtcSession {
|
|||||||
if !lock_reported {
|
if !lock_reported {
|
||||||
lock_reported = true;
|
lock_reported = true;
|
||||||
tokio::spawn(crate::session_lock::report_states(channel.clone(), sequence.clone(), crate::session_lock::watch_locked()));
|
tokio::spawn(crate::session_lock::report_states(channel.clone(), sequence.clone(), crate::session_lock::watch_locked()));
|
||||||
|
let (channel, sequence, actions) = (channel.clone(), sequence.clone(), init_actions.clone());
|
||||||
|
let portal = portal_desktop.clone();
|
||||||
|
tokio::spawn(async move {
|
||||||
|
let mut previous = crate::privacy_screen::current_type();
|
||||||
|
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;
|
||||||
|
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);
|
||||||
|
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);
|
||||||
|
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);
|
||||||
@@ -1103,7 +1123,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,7 +1142,27 @@ 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(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(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 _ = rpc_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);
|
||||||
|
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(|r| crate::privacy_screen::screensaver_response(r).or_else(|| crate::system_actions::plugin_response(r)).or_else(|| crate::system_actions::session_rpc_response(r))) {
|
||||||
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||||
let _ = rpc_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
let _ = rpc_out.send(crate::initialization::envelope(out_sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts, 22, &response));
|
||||||
return;
|
return;
|
||||||
@@ -1373,8 +1414,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 +1496,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,
|
||||||
})
|
})
|
||||||
|
|||||||
Vendored
+34
@@ -0,0 +1,34 @@
|
|||||||
|
# Requires an unlocked niri session; opens a fullscreen test window and moves the pointer.
|
||||||
|
# UU_TEST_OUTPUT selects the output. UU_TEST_ENGINE is the built libuu-wayland.so.
|
||||||
|
import os,json,subprocess,ctypes,gi
|
||||||
|
os.environ['UU_WAYLAND_OUTPUT']=os.environ['UU_TEST_OUTPUT']
|
||||||
|
gi.require_version('Gtk','3.0');from gi.repository import Gtk,Gdk,GLib
|
||||||
|
inv=json.loads(subprocess.check_output(['niri','msg','-j','outputs']))
|
||||||
|
out=next(o for o in inv.values() if o['name']==os.environ['UU_TEST_OUTPUT']);geo=out['logical'];d=Gdk.Display.get_default()
|
||||||
|
monitor=next(i for i in range(d.get_n_monitors()) if (d.get_monitor(i).get_geometry().x,d.get_monitor(i).get_geometry().y)==(geo['x'],geo['y']))
|
||||||
|
w=Gtk.Window(title='UU pointer acceptance');box=Gtk.EventBox();box.set_above_child(True);grid=Gtk.Grid();grid.set_row_homogeneous(True);grid.set_column_homogeneous(True)
|
||||||
|
for i,color in enumerate(['red','lime','blue','yellow']):
|
||||||
|
cell=Gtk.EventBox();rgba=Gdk.RGBA();rgba.parse(color);cell.override_background_color(Gtk.StateFlags.NORMAL,rgba);grid.attach(cell,i%2,i//2,1,1)
|
||||||
|
box.add(grid);w.add(box);box.add_events(Gdk.EventMask.POINTER_MOTION_MASK | Gdk.EventMask.ENTER_NOTIFY_MASK)
|
||||||
|
positions=[];box.connect('motion-notify-event',lambda widget,e:positions.append((e.x,e.y)) or False)
|
||||||
|
box.connect('enter-notify-event',lambda widget,e:positions.append((e.x,e.y)) or False)
|
||||||
|
w.fullscreen_on_monitor(w.get_screen(),monitor);w.show_all()
|
||||||
|
lib=ctypes.CDLL(os.environ['UU_TEST_ENGINE']);width=ctypes.c_int();height=ctypes.c_int();points=iter([(0.2,0.2),(0.8,0.2),(0.8,0.8),(0.2,0.8),(0.5,0.5)]);passed=[];image_matches=0
|
||||||
|
def step():
|
||||||
|
try:x,y=next(points)
|
||||||
|
except StopIteration:print('pointer_points_passed=',sum(passed),'total=',len(passed),'points=',passed,flush=True);Gtk.main_quit();return False
|
||||||
|
positions.clear();assert lib.uu_wl_move(int(x*width.value),int(y*height.value),0)==0
|
||||||
|
def check():
|
||||||
|
size=box.get_allocation();matched=any(abs(px-x*size.width)<4 and abs(py-y*size.height)<4 for px,py in positions);passed.append(matched);GLib.timeout_add(100,step);return False
|
||||||
|
GLib.timeout_add(150,check);return False
|
||||||
|
def start():
|
||||||
|
global image_matches
|
||||||
|
assert lib.uu_wl_init(ctypes.byref(width),ctypes.byref(height))==0
|
||||||
|
frame=(ctypes.c_ubyte*(width.value*height.value*4))();assert lib.uu_wl_capture(frame,len(frame))==0
|
||||||
|
for (x,y),(r,g,b) in zip([(0.25,0.25),(0.75,0.25),(0.25,0.75),(0.75,0.75)],[(255,0,0),(0,255,0),(0,0,255),(255,255,0)]):
|
||||||
|
at=(int(y*height.value)*width.value+int(x*width.value))*4
|
||||||
|
image_matches+=abs(frame[at]-b)<10 and abs(frame[at+1]-g)<10 and abs(frame[at+2]-r)<10
|
||||||
|
print('rotation_color_checks=',image_matches,'of=4',flush=True)
|
||||||
|
step();return False
|
||||||
|
GLib.timeout_add(1500,start);GLib.timeout_add(10000,lambda:(Gtk.main_quit(),False)[1]);Gtk.main()
|
||||||
|
raise SystemExit(0 if len(passed)==5 and all(passed) and image_matches==4 else 1)
|
||||||
Vendored
+25
@@ -0,0 +1,25 @@
|
|||||||
|
# Run with /usr/bin/python, UU_TEST_BIN set to the test binary, and GDK_BACKEND=x11 or wayland.
|
||||||
|
# Opens and focuses a dedicated entry; only the built-in sample is injected.
|
||||||
|
import os
|
||||||
|
os.environ["GTK_IM_MODULE"]="gtk-im-context-simple"
|
||||||
|
import gi,subprocess,threading
|
||||||
|
gi.require_version('Gtk','3.0')
|
||||||
|
from gi.repository import Gtk,GLib
|
||||||
|
events=[]
|
||||||
|
passed=False
|
||||||
|
expected=os.environ.get("UU_PROBE_SEQUENCE","abc你好XYZ").replace("|","")
|
||||||
|
w=Gtk.Window(title='UU input acceptance'); e=Gtk.Entry();w.add(e);w.show_all();e.grab_focus();w.present();e.connect("key-press-event",lambda widget,event:events.append(event.keyval) and False)
|
||||||
|
def start():
|
||||||
|
if "UU input acceptance" not in subprocess.check_output(["niri","msg","-j","focused-window"],text=True):
|
||||||
|
Gtk.main_quit();return False
|
||||||
|
def run():
|
||||||
|
r=subprocess.run([os.environ.get('UU_TEST_BIN',os.path.expanduser('~/.local/bin/uuremote-server')),'wayland-text-probe'],env={**os.environ,'UU_PROBE_TEXT':'abc你好XYZ'},stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL)
|
||||||
|
GLib.timeout_add(1000,finish,r.returncode)
|
||||||
|
threading.Thread(target=run).start();return False
|
||||||
|
def finish(code):
|
||||||
|
global passed
|
||||||
|
passed=code==0 and e.get_text()==expected
|
||||||
|
print('probe_exit=',code,'matches=',e.get_text()==expected,'received_chars=',len(e.get_text()),'key_events=',len(events),flush=True);Gtk.main_quit();return False
|
||||||
|
GLib.timeout_add(1500,start);GLib.timeout_add(15000,lambda:(Gtk.main_quit(),False)[1]);Gtk.main()
|
||||||
|
|
||||||
|
raise SystemExit(0 if passed else 1)
|
||||||
@@ -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'
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
Loaded 100 of 169 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user