mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a22f576005 | ||
|
|
212e4943f9 | ||
|
|
0b3ac4c78e | ||
|
|
8b6de40605 | ||
|
|
7a0c40af73 | ||
|
|
f67de7cc7d | ||
|
|
b9586f226d | ||
|
|
7b8980771d | ||
|
|
50ff42e8d7 | ||
|
|
ba8f8ada20 | ||
|
|
c461db10a4 | ||
|
|
4c86c7f782 | ||
|
|
81e9ccfa05 | ||
|
|
c0abdeae72 | ||
|
|
1dad755823 | ||
|
|
fcfd2b6717 | ||
|
|
73c503a244 | ||
|
|
3bce605eaa | ||
|
|
ebdd362452 | ||
|
|
26811018e0 | ||
|
|
c3959c01e9 | ||
|
|
ef14f76422 | ||
|
|
480819e369 | ||
|
|
f4f16aafe4 | ||
|
|
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 | ||
|
|
ab137a1b20 | ||
|
|
092ea713f8 | ||
|
|
53d5f0e144 | ||
|
|
6b5216df35 | ||
|
|
d66937a01c | ||
|
|
825f964f7d | ||
|
|
3f2da6f587 | ||
|
|
027abba44d | ||
|
|
ef86019b39 | ||
|
|
003da254a6 | ||
|
|
7a86fab340 | ||
|
|
d631849f1d | ||
|
|
d04d241411 | ||
|
|
2eece30287 | ||
|
|
1e94175414 | ||
|
|
cfe9601874 | ||
|
|
ab5d0a656b | ||
|
|
dcc67ed550 | ||
|
|
bf7bd50062 | ||
|
|
287b21a622 | ||
|
|
bcde9f967c | ||
|
|
df9429495f | ||
|
|
ba82bc432a | ||
|
|
648eeca03d | ||
|
|
f97370782f | ||
|
|
8792fb4eca | ||
|
|
c041160d6d | ||
|
|
69aecf0269 | ||
|
|
979b62d271 | ||
|
|
6a3da14961 | ||
|
|
792408e6f5 | ||
|
|
61c3f91e9e | ||
|
|
1bb43a9426 | ||
|
|
9d3b3da3f5 | ||
|
|
1009bdeaf2 | ||
|
|
fa7606894f | ||
|
|
963875516a | ||
|
|
b6703b19df | ||
|
|
76a225a235 | ||
|
|
da99c1ceb4 | ||
|
|
0fe9b979e5 | ||
|
|
cb4850d296 | ||
|
|
16ded48a99 | ||
|
|
d95053d490 | ||
|
|
50ed54d77a | ||
|
|
d6752e77c8 | ||
|
|
9906dd4767 | ||
|
|
9e2198b03d | ||
|
|
21c01d2e18 | ||
|
|
059a3b1bb8 | ||
|
|
76941459cc | ||
|
|
1fa346fd1f | ||
|
|
e09778cc94 | ||
|
|
b1da297e42 | ||
|
|
c739036301 | ||
|
|
25893cd4ab | ||
|
|
5089c0343c | ||
|
|
5fdb98b0f5 | ||
|
|
89abae2369 | ||
|
|
0afc602e66 | ||
|
|
762cfccc44 | ||
|
|
9520b69730 | ||
|
|
c45e4749b5 | ||
|
|
c1b8bfe1b3 |
No files matched your search
@@ -32,8 +32,8 @@ body:
|
|||||||
attributes:
|
attributes:
|
||||||
label: 诊断信息 / Diagnostics
|
label: 诊断信息 / Diagnostics
|
||||||
description: |
|
description: |
|
||||||
先复现一次问题,然后在被控的 Linux 上运行下面的命令,把输出粘贴到这里(IP 会被自动抹掉,不包含密码、令牌或剪贴板内容)。
|
先复现一次问题,然后在被控 Linux 的**图形桌面里打开的终端**中运行下面的命令(SSH 或 tty 里缺少桌面环境变量,doctor 结果不准),把输出粘贴到这里(IPv4/IPv6/MAC 地址会被自动抹掉,不包含密码、令牌或剪贴板内容)。
|
||||||
Reproduce the problem, then run this on the Linux host and paste the output (IPs are masked; no passwords, tokens or clipboard data).
|
Reproduce the problem, then run this in a terminal **inside the Linux graphical session** (SSH/tty lacks the desktop environment, so doctor would be misleading) and paste the output (IPv4/IPv6/MAC addresses are masked; no passwords, tokens or clipboard data).
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
{
|
{
|
||||||
@@ -45,8 +45,9 @@ body:
|
|||||||
echo "== 显卡"; lspci 2>/dev/null | grep -iE 'vga|3d'
|
echo "== 显卡"; lspci 2>/dev/null | grep -iE 'vga|3d'
|
||||||
echo "== FFmpeg"; ffmpeg -hide_banner -encoders 2>/dev/null | grep -E 'h264_nvenc|libx264'
|
echo "== FFmpeg"; ffmpeg -hide_banner -encoders 2>/dev/null | grep -E 'h264_nvenc|libx264'
|
||||||
echo "== 日志"; journalctl --user -u uuremote-native.service --since "-30min" --no-pager -o cat \
|
echo "== 日志"; journalctl --user -u uuremote-native.service --since "-30min" --no-pager -o cat \
|
||||||
| grep -E 'Starting|backend|Selected capture|Desktop encoder|Capture setting request|Desktop video settings|Offer for connection|WARN|ERROR' | tail -n 80
|
| grep -E 'Starting|backend|Selected capture|Desktop encoder|Capture setting request|Desktop video settings|Offer for connection|PeerConnection State|Remote controller disconnected|ICE path|Port mapping|WARN|ERROR' \
|
||||||
} 2>&1 | sed -E 's/[0-9]{1,3}(\.[0-9]{1,3}){3}/x.x.x.x/g'
|
| grep -vE 'webrtc_ice|webrtc_dtls|webrtc::mux' | tail -n 120
|
||||||
|
} 2>&1 | sed -E 's/[0-9]{1,3}(\.[0-9]{1,3}){3}/x.x.x.x/g; s/([0-9a-fA-F]{1,4}:){4,7}[0-9a-fA-F]{1,4}|[0-9a-fA-F]{0,4}::[0-9a-fA-F:]*[0-9a-fA-F]/x:x::x/g'
|
||||||
```
|
```
|
||||||
render: text
|
render: text
|
||||||
validations:
|
validations:
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -43,6 +52,21 @@ jobs:
|
|||||||
uuremote-server --help | head -1
|
uuremote-server --help | head -1
|
||||||
test -f /usr/lib/uu-remote-linux/libuu-wayland.so
|
test -f /usr/lib/uu-remote-linux/libuu-wayland.so
|
||||||
systemd-analyze verify /usr/lib/systemd/user/uuremote-native.service
|
systemd-analyze verify /usr/lib/systemd/user/uuremote-native.service
|
||||||
|
# The tarball installer must bring FFmpeg back on a machine without it (no FFmpeg = no picture).
|
||||||
|
- name: Tarball install script
|
||||||
|
run: |
|
||||||
|
shellcheck packaging/tarball/install.sh
|
||||||
|
sudo apt-get remove -y ffmpeg || true
|
||||||
|
if command -v ffmpeg; then echo "ffmpeg still present"; exit 1; fi
|
||||||
|
pkg=$(mktemp -d)
|
||||||
|
cp target/debug/uuremote-server target/debug/libuu-wayland.so packaging/tarball/install.sh "$pkg/"
|
||||||
|
cp -r contrib "$pkg/"
|
||||||
|
home=$(mktemp -d)
|
||||||
|
HOME=$home XDG_CONFIG_HOME=$home/.config "$pkg/install.sh" --yes
|
||||||
|
ffmpeg -hide_banner -encoders | grep -qw libx264
|
||||||
|
test -x "$home/.local/bin/uuremote-server" && test -f "$home/.local/lib/uu-remote-linux/libuu-wayland.so"
|
||||||
|
grep -q '^ExecStart=%h/.local/bin/uuremote-server$' "$home/.config/systemd/user/uuremote-native.service"
|
||||||
|
HOME=$home XDG_CONFIG_HOME=$home/.config "$pkg/install.sh" --yes | grep -q 'Kept existing'
|
||||||
|
|
||||||
test-viewer:
|
test-viewer:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
@@ -82,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" \
|
||||||
@@ -94,15 +118,24 @@ jobs:
|
|||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Install build dependencies (X11 + FFmpeg 6 for the inproc-av feature)
|
- name: Install build dependencies (X11; inproc-av vendors the NVENC headers; the VAAPI/DRI3 engines need libva/gbm/xcb-dri3 headers, libva itself is dlopen'ed at runtime)
|
||||||
run: |
|
run: |
|
||||||
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 \
|
||||||
libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libclang-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
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ jobs:
|
|||||||
name=uu-remote-linux-${GITHUB_REF_NAME}-${{ matrix.arch }}-linux
|
name=uu-remote-linux-${GITHUB_REF_NAME}-${{ matrix.arch }}-linux
|
||||||
mkdir -p "$name"
|
mkdir -p "$name"
|
||||||
cp target/release/uuremote-server target/release/uuremote-viewer target/release/libuu-wayland.so target/release/libuu-portal.so \
|
cp target/release/uuremote-server target/release/uuremote-viewer target/release/libuu-wayland.so target/release/libuu-portal.so \
|
||||||
LICENSE README.md README.en.md config.example.json "$name/"
|
packaging/tarball/install.sh LICENSE README.md README.en.md config.example.json "$name/"
|
||||||
cp -r contrib "$name/"
|
cp -r contrib "$name/"
|
||||||
tar czf "$name.tar.gz" "$name"
|
tar czf "$name.tar.gz" "$name"
|
||||||
sha256sum "$name.tar.gz" > "$name.tar.gz.sha256"
|
sha256sum "$name.tar.gz" > "$name.tar.gz.sha256"
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
@@ -38,8 +41,13 @@ Dependencies (Ubuntu/Debian):
|
|||||||
```sh
|
```sh
|
||||||
sudo apt install build-essential pkg-config \
|
sudo apt install build-essential pkg-config \
|
||||||
libx11-dev libxext-dev libxtst-dev libxfixes-dev libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libclang-dev libgtk-3-dev ffmpeg
|
libx11-dev libxext-dev libxtst-dev libxfixes-dev libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libclang-dev libgtk-3-dev ffmpeg
|
||||||
# --features inproc-av: libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libclang-dev
|
# --features inproc-av: X11 in-process capture + native NVENC/VAAPI. NVENC headers are vendored and
|
||||||
# (FFmpeg 6.x; in-process capture/encoding, Ubuntu 24.04 ships it)
|
# libcuda/libnvidia-encode dlopen'ed at runtime (NVENC API 12.1, driver >= 530).
|
||||||
|
# The VAAPI/DRI3 engines compile against
|
||||||
|
# libva-dev libgbm-dev libx11-xcb-dev libxcb-dri3-dev libxcb-damage-dev;
|
||||||
|
# libva/libva-drm themselves are dlopen'ed at runtime (no hard libva dependency)
|
||||||
|
# --features viewer-ffmpeg: libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libclang-dev
|
||||||
|
# (FFmpeg 6.x only. FFmpeg >= 7 fails in ffmpeg-sys-next with "avfft.h file not found")
|
||||||
# --features wayland: libwayland-dev libxkbcommon-dev wl-clipboard
|
# --features wayland: libwayland-dev libxkbcommon-dev wl-clipboard
|
||||||
# --features wayland,portal: + libglib2.0-dev libpipewire-0.3-dev libei-dev (libei >= 1.1)
|
# --features wayland,portal: + libglib2.0-dev libpipewire-0.3-dev libei-dev (libei >= 1.1)
|
||||||
```
|
```
|
||||||
@@ -68,6 +76,9 @@ cargo build --release --features native-viewer,viewer-sdl --bin uuremote-viewer
|
|||||||
X11 → default build. Hyprland → `--features wayland`. GNOME/KDE on Wayland → `--features wayland,portal`
|
X11 → default build. Hyprland → `--features wayland`. GNOME/KDE on Wayland → `--features wayland,portal`
|
||||||
(or advise the user to pick the "on Xorg" session at the login screen, which is the best-supported path).
|
(or advise the user to pick the "on Xorg" session at the login screen, which is the best-supported path).
|
||||||
2. Install dependencies and build (section 3). Copy the binary: `install -Dm755 target/release/uuremote-server ~/.local/bin/uuremote-server`.
|
2. Install dependencies and build (section 3). Copy the binary: `install -Dm755 target/release/uuremote-server ~/.local/bin/uuremote-server`.
|
||||||
|
From a release tarball run its `./install.sh` as the desktop user instead: it installs into `~/.local`, writes the user unit
|
||||||
|
(keeps an existing one) and installs FFmpeg with libx264 via sudo apt/pacman when missing (Fedora/openSUSE: prints the command).
|
||||||
|
The .deb depends on `ffmpeg`. Without FFmpeg the viewer waits on 正在传输画面; the host checks at startup and on each desktop offer, logs an error and tells the desktop user (freedesktop notification, else opens its window with a red line; `assist::show_problem`).
|
||||||
3. **Login (needs the human).** Run `uuremote-server login` inside the graphical session. A GTK window shows a QR
|
3. **Login (needs the human).** Run `uuremote-server login` inside the graphical session. A GTK window shows a QR
|
||||||
code; the user scans it with the UU Remote mobile app and confirms. Without a display use
|
code; the user scans it with the UU Remote mobile app and confirms. Without a display use
|
||||||
`uuremote-server login --no-gui` (terminal QR). Credentials are written to `~/.config/uuremote/config.json`
|
`uuremote-server login --no-gui` (terminal QR). Credentials are written to `~/.config/uuremote/config.json`
|
||||||
@@ -78,17 +89,21 @@ cargo build --release --features native-viewer,viewer-sdl --bin uuremote-viewer
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=UU Remote Linux host (unofficial)
|
Description=UU Remote Linux host (unofficial)
|
||||||
After=graphical-session.target
|
After=graphical-session.target
|
||||||
|
PartOf=graphical-session.target
|
||||||
[Service]
|
[Service]
|
||||||
Environment=RUST_LOG=info
|
Environment=RUST_LOG=info
|
||||||
Environment=DISPLAY=:0
|
|
||||||
# GNOME on Xorg usually needs: Environment=XAUTHORITY=/run/user/<uid>/gdm/Xauthority
|
|
||||||
ExecStart=%h/.local/bin/uuremote-server
|
ExecStart=%h/.local/bin/uuremote-server
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=5
|
RestartSec=5
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=default.target
|
WantedBy=graphical-session.target
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Same as packaging/deb. GNOME/KDE import DISPLAY / WAYLAND_DISPLAY and start graphical-session.target; do not hard-code
|
||||||
|
DISPLAY there (it overrides the session's real one, XWayland is often :1); under default.target the unit can
|
||||||
|
start before WAYLAND_DISPLAY is imported and fall back to X11. Desktops without that target (Xfce, i3) and the Xvfb
|
||||||
|
virtual desktop need `WantedBy=default.target` plus an explicit `Environment=DISPLAY=...`; headless
|
||||||
|
(`UU_DESKTOP_BACKEND=none` + linger) needs `WantedBy=default.target` only (GNOME on Xorg outside the session: `XAUTHORITY=/run/user/<uid>/gdm/Xauthority`).
|
||||||
Find the real display/Xauthority with `loginctl show-session <id> -p Display` / `ps -o args -C Xorg`.
|
Find the real display/Xauthority with `loginctl show-session <id> -p Display` / `ps -o args -C Xorg`.
|
||||||
5. `systemctl --user daemon-reload && systemctl --user enable --now uuremote-native.service`
|
5. `systemctl --user daemon-reload && systemctl --user enable --now uuremote-native.service`
|
||||||
6. Verify: `journalctl --user -u uuremote-native.service -f` must show
|
6. Verify: `journalctl --user -u uuremote-native.service -f` must show
|
||||||
@@ -105,24 +120,29 @@ viewer does not reconnect them automatically.
|
|||||||
| Item | Meaning |
|
| Item | Meaning |
|
||||||
|---|---|
|
|---|---|
|
||||||
| `~/.config/uuremote/config.json` | user_id, device_id, client_id, system_id, machine_guid, token, csrf; optional `sign_key`, `ffmpeg_root`. `$UU_CONFIG` overrides the path |
|
| `~/.config/uuremote/config.json` | user_id, device_id, client_id, system_id, machine_guid, token, csrf; optional `sign_key`, `ffmpeg_root`. `$UU_CONFIG` overrides the path |
|
||||||
| `~/.config/uuremote/host_settings.json` | persisted 安全 settings: auto_lock, keep_mute, mute_permanent |
|
| `~/.config/uuremote/host_settings.json` | persisted 安全 settings: auto_lock, keep_mute, mute_permanent; optional `video_encoder` (`auto`/`cpu`/`vaapi`/`nvenc`) and `video_codec` (`auto`/`h264`/`h265`), written by `set-encoder` / `set-codec` (0600, merge write). Non-`auto` beats `UU_VIDEO_ENCODER` / `UU_VIDEO_CODEC`. `set-encoder` and `set-codec` both send `SIGUSR2` to the pid in `host.pid` (same binary). Live desktop streams restart the encoder (`EncoderTask::restart`, sequence kept, first frame IDR) without dropping the peer. Codec preference is logged and applies on the next desktop stream. `SIGUSR2` does not re-probe. Hand edits: `kill -USR2 $(cat ~/.config/uuremote/host.pid)` |
|
||||||
| `UU_DESKTOP_BACKEND` | `auto` (default) / `x11` / `wayland` / `portal` / `kms` (experimental feature) / `none` (headless: no display; desktop offers ignored; tool peers get a nominal 1920x1080 screen + Allow permissions, which the port-mapping viewer requires) |
|
| `UU_DESKTOP_BACKEND` | `auto` (default) / `x11` / `wayland` / `portal` / `kms` (experimental feature) / `none` (headless: no display; desktop offers ignored; tool peers get a nominal 1920x1080 screen + Allow permissions, which the port-mapping viewer requires) |
|
||||||
|
| `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_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) |
|
||||||
| `contrib/virtual-desktop/` | Xvfb + session (`UU_VIRTUAL_SESSION`, `UU_VIRTUAL_BUS=user|private`) for monitorless hosts; serve it with `DISPLAY=:99` |
|
| `contrib/virtual-desktop/` | Xvfb + session (`UU_VIRTUAL_SESSION`, `UU_VIRTUAL_BUS=user|private`) for monitorless hosts; serve it with `DISPLAY=:99` |
|
||||||
| `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: explicit Intel/AMD; `nvenc`: force; unset: NVENC→CPU only if `/proc/driver/nvidia/version` or `/dev/nvidia0` exists, else CPU (#10) |
|
| `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: explicit Intel/AMD; `nvenc`: force; unset/`auto`: background probe, one synthetic IDR per candidate, 3 s each. While #33 is open, auto is NVENC then CPU when `/proc/driver/nvidia/version` or `/dev/nvidia0` exists; with no NVIDIA the only candidate is CPU and the probe is skipped. A session that starts before the probe finishes uses the legacy rule (NVENC if NVIDIA is present, else CPU). On `--features inproc-av`, a process-only failure of NVENC when the native engine would try it first on X11 is `native_unprobed` and keeps that legacy NVENC choice (Wayland, portal, and KMS fall back to CPU). The skipped CPU-only probe is logged `not probed (only candidate)`. A successful probe and that CPU-only skip stay cached while NVIDIA presence (`/proc/driver/nvidia/version` or `/dev/nvidia0`) matches the report. A later desktop connection whose presence differs treats the report as stale and starts one background re-probe (`warm_auto_probe`, non-blocking, one at a time) and still uses the cached encoder. A hardware-candidate failure (NVENC failed, chosen CPU) is cached for 10 minutes (`PROBE_FAILURE_TTL`); the next desktop connection after that starts the same re-probe and still uses the cached encoder. Explicit `cpu` / `vaapi` / `nvenc` (setting file or `UU_VIDEO_ENCODER`) does not start the probe. A later success selects NVENC again; another failure restarts the 10 minutes. `native_unprobed` is not a failure cache. Ignored when `host_settings.json` `video_encoder` is not `auto`. Explicit `vaapi` with 真彩 encodes 4:2:0 and reports that in CaptureSettingSync (field 3). VAAPI is not an auto candidate until #33 |
|
||||||
| `UU_VIDEO_CODEC=h264` | force H.264 even when the viewer negotiated H.265 (default: H.265 when both sides support it) |
|
| `UU_VIDEO_CODEC=h264` | force H.264 even when the viewer negotiated H.265 (default: H.265 when both sides support it and the encoder is hardware). Same precedence as the encoder: setting file, then this variable, then auto |
|
||||||
| `UU_FFMPEG_ROOT` | FFmpeg prefix (`bin/ffmpeg`, libs in `lib/x86_64-linux-gnu`) |
|
| `UU_FFMPEG_ROOT` | FFmpeg prefix (`bin/ffmpeg`, libs in `lib/x86_64-linux-gnu`) |
|
||||||
| `UU_AUDIO=0`, `UU_AUDIO_SOURCE` | disable sound / choose the Pulse source (default `@DEFAULT_MONITOR@`) |
|
| `UU_AUDIO=0`, `UU_AUDIO_SOURCE` | disable sound / choose the Pulse source (default `@DEFAULT_MONITOR@`) |
|
||||||
| `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/SOCKS proxy env vars; cloud API 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. The config is re-read
|
Token has no expiry field; API code 1120 (HTTP 422) means invalid/expired → re-login. `config.json` is parsed once
|
||||||
every 60 s.
|
(`config::file()`); only a `LoginExpired` room answer re-reads it from disk (`config::read_fresh()`) before waiting
|
||||||
|
for a new QR login.
|
||||||
|
|
||||||
## 6. Code map
|
## 6. Code map
|
||||||
|
|
||||||
@@ -140,8 +160,10 @@ every 60 s.
|
|||||||
| `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/annotation.rs`, `c_engine/annotation_overlay.c` | viewer annotation (RPC 27 `draw_req` → RpcResponse 23): click-through X11 ARGB overlay, needs a compositing manager |
|
||||||
| `src/initialization.rs`, `src/control_protocol.rs`, `src/protocol.rs` | protobuf encoders/decoders for CONTROL |
|
| `src/initialization.rs`, `src/control_protocol.rs`, `src/protocol.rs` | protobuf encoders/decoders for CONTROL |
|
||||||
| `src/session_ice.rs`, `src/network_diagnostics.rs` | cloud ICE servers, address-free path diagnostics |
|
| `src/session_ice.rs`, `src/network_diagnostics.rs` | cloud ICE servers, address-free path diagnostics |
|
||||||
| `src/desktop_backend.rs`, `src/wayland.rs`, `src/portal*.rs` | backend selection, Hyprland, GNOME/KDE portal |
|
| `src/desktop_backend.rs`, `src/wayland.rs`, `src/portal*.rs` | backend selection, Hyprland, GNOME/KDE portal |
|
||||||
@@ -152,10 +174,11 @@ every 60 s.
|
|||||||
| `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, encoders,
|
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),
|
||||||
default codec, sign-in/service state; booleans and names only), `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_INPUT` fixed video/image sequence, `UU_PROBE_LOOP=1` repeats), `wayland-input-probe`, `clipboard-acceptance`,
|
|
||||||
`portal-acceptance`, `help`. Unknown arguments exit with code 2. Builds up to v0.1.0 did **not** reject them and
|
`portal-acceptance`, `help`. Unknown arguments exit with code 2. Builds up to v0.1.0 did **not** reject them and
|
||||||
started a second full host server instead, so check that a subcommand exists in the binary you run.
|
started a second full host server instead, so check that a subcommand exists in the binary you run.
|
||||||
|
|
||||||
@@ -172,13 +195,13 @@ started a second full host server instead, so check that a subcommand exists in
|
|||||||
- RPC = Message 21 `RpcRequest {1 header{1 request_id}, <case>}`, answered with Message 22
|
- RPC = Message 21 `RpcRequest {1 header{1 request_id}, <case>}`, answered with Message 22
|
||||||
`RpcResponse {1 header (same id), <case>}`. Cases used: 2 capture_setting, 3 fps, 4 video_quality,
|
`RpcResponse {1 header (same id), <case>}`. Cases used: 2 capture_setting, 3 fps, 4 video_quality,
|
||||||
6 resolution, 8 file transfer, 9 clipboard, 15 send_video_track, 16–20 plugins, 21 virtual audio policy,
|
6 resolution, 8 file transfer, 9 clipboard, 15 send_video_track, 16–20 plugins, 21 virtual audio policy,
|
||||||
28/29 terminal.
|
27 draw (annotation; answered on TEXT, a CONTROL reply times out with 9998), 28/29 terminal.
|
||||||
- CaptureSettingRequest: field 1 is an **fps option index** (1=30, 2=60, 3=90); the real frame rate is
|
- CaptureSettingRequest: field 1 is an **fps option index** (1=30, 2=60, 3=90); the real frame rate is
|
||||||
field 18 `fpsCount`. Field 2 quality: 1 Fast, 2 General (高清 2M), 3 HD (超清 8M), 4 Bluray (原画 20M),
|
field 18 `fpsCount`. Field 2 quality: 1 Fast, 2 General (高清 2M), 3 HD (超清 8M), 4 Bluray (原画 20M),
|
||||||
5 Auto, 6 Custom. Resolution: 16/17 pixel size or 5/6, 10 resolution_type (3 = follow remote).
|
5 Auto, 6 Custom. Resolution: 16/17 pixel size or 5/6, 10 resolution_type (3 = follow remote).
|
||||||
Field 7 `chorma_format` (ChromaFormat 1 = 4:2:0, 3 = 4:4:4) is sent when 真彩 is toggled; ff_capture_setting versions
|
Field 7 `chorma_format` (ChromaFormat 1 = 4:2:0, 3 = 4:4:4) is sent when 真彩 is toggled; ff_capture_setting versions
|
||||||
are cumulative (3 CHROMA_SAMPLING, 4 CUSTOM_BITRATE, 5 DPI_SCALE, 6 HDR). 4:4:4 = NVENC `high444p` / x264 `high444`
|
are cumulative (3 CHROMA_SAMPLING, 4 CUSTOM_BITRATE, 5 DPI_SCALE, 6 HDR). 4:4:4 = NVENC `high444p` / x264 `high444`
|
||||||
with `yuv444p`; VAAPI and inproc stay 4:2:0.
|
with `yuv444p`; the in-process NVENC engine uses High 4:4:4 / HEVC FRExt (AQ off); VAAPI stays 4:2:0.
|
||||||
Reply `RpcResponse{2 CaptureSettingResponse{}}` (no errors = applied) and send Message 25 CaptureSettingSync
|
Reply `RpcResponse{2 CaptureSettingResponse{}}` (no errors = applied) and send Message 25 CaptureSettingSync
|
||||||
(field 3 = the chroma actually encoded).
|
(field 3 = the chroma actually encoded).
|
||||||
- ConnectOptions field 4 `decoder_cap_list` = DecoderCap {1 fps, 2 codec_type (1 H264, 2 H265), 3 width, 4 height,
|
- ConnectOptions field 4 `decoder_cap_list` = DecoderCap {1 fps, 2 codec_type (1 H264, 2 H265), 3 width, 4 height,
|
||||||
@@ -266,16 +289,25 @@ started a second full host server instead, so check that a subcommand exists in
|
|||||||
- Update README.md / README.en.md when user-visible features or limitations change, and add
|
- Update README.md / README.en.md when user-visible features or limitations change, and add
|
||||||
`docs/release-notes/<tag>.md` before tagging a release.
|
`docs/release-notes/<tag>.md` before tagging a release.
|
||||||
|
|
||||||
### VAAPI (opt-in / 显式启用)
|
### VAAPI
|
||||||
|
|
||||||
`UU_VIDEO_ENCODER=vaapi` selects Intel/AMD H.264 VAAPI; `UU_VAAPI_DEVICE` defaults to
|
`UU_VIDEO_ENCODER=vaapi` or `set-encoder vaapi` selects Intel/AMD H.264 VAAPI explicitly.
|
||||||
`/dev/dri/renderD128` (render-node permissions required). No automatic VAAPI selection.
|
`UU_VAAPI_DEVICE` defaults to `/dev/dri/renderD128` (render-node permissions required).
|
||||||
Both FFmpeg process and `--features inproc-av` upload NV12 frames to a VAAPI frame pool.
|
Auto is NVENC then CPU when an NVIDIA driver is present, otherwise CPU. VAAPI is not an
|
||||||
|
auto candidate until #33.
|
||||||
|
The FFmpeg process pipeline uploads NV12 frames to a VAAPI frame pool. With `--features inproc-av` on X11, VAAPI
|
||||||
|
H.264/HEVC Main runs in process: a DRI3 DMA-BUF of the root (XShm upload without DRI3) goes through VPP to NV12
|
||||||
|
and VCN, with SPS/PPS(/VPS) and slice headers packed by the host as radeonsi (Mesa 26) needs; parameters follow
|
||||||
|
FFmpeg's hevc_vaapi/h264_vaapi on that driver. Accepted on AMD HawkPoint1 (Mesa 26.2.3) and Cezanne
|
||||||
|
(Mesa 26.2.5; XShm-upload and DRI3 zero-copy probes plus a full HEVC Mac-viewer session) with the official
|
||||||
|
Mac viewer (presets, fps, scaling); Intel iHD is not verified. Measured on Cezanne + RTX 3050 Ti
|
||||||
|
(1920x1200, desktop-video-probe, 300 frames): in-process VAAPI ~1.5 ms CPU/frame vs in-process NVENC
|
||||||
|
~7.1 ms vs libx264 process pipeline ~19 ms.
|
||||||
VBR uses the viewer bitrate preset and CQ-derived minimum QP, no B-frames, async depth 1,
|
VBR uses the viewer bitrate preset and CQ-derived minimum QP, no B-frames, async depth 1,
|
||||||
AUD and the existing GOP/VFR timing. Unsupported device/driver/initialization falls back to libx264
|
AUD and the existing GOP/VFR timing. Unsupported device/driver/initialization falls back to libx264
|
||||||
with a warning. Accepted on Intel UHD 770 (iHD) with the default FFmpeg process pipeline and the official Mac
|
with a warning. Accepted on Intel UHD 770 (iHD) with the default FFmpeg process pipeline and the official Mac
|
||||||
viewer (presets, fps, scaling, reconnect; no fallback, ~40% less CPU than libx264). AMD and the `inproc-av`
|
viewer (presets, fps, scaling, reconnect; no fallback, ~40% less CPU than libx264). The process pipeline on
|
||||||
VAAPI path are not hardware-verified.
|
AMD is not separately verified (AMD acceptance is the in-process engine above).
|
||||||
|
|
||||||
### Virtual audio / 虚拟声卡
|
### Virtual audio / 虚拟声卡
|
||||||
|
|
||||||
@@ -316,8 +348,8 @@ This permission can inject into the whole seat, including lock/greeter screens.
|
|||||||
Optional VAAPI: `intel-media-driver` (modern Intel) or `libva-mesa-driver` (AMD), `libva-utils`
|
Optional VAAPI: `intel-media-driver` (modern Intel) or `libva-mesa-driver` (AMD), `libva-utils`
|
||||||
for `vainfo`. Optional KMS: `libdrm`. Virtual Xfce: `xorg-server-xvfb xorg-xauth xorg-xdpyinfo
|
for `vainfo`. Optional KMS: `libdrm`. Virtual Xfce: `xorg-server-xvfb xorg-xauth xorg-xdpyinfo
|
||||||
xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`.
|
xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`.
|
||||||
Rolling Arch FFmpeg may be newer than supported `inproc-av` (FFmpeg 6.x); use the default process
|
Rolling Arch FFmpeg may be newer than supported `viewer-ffmpeg` (FFmpeg 6.x); build it against a separate
|
||||||
pipeline or build against a separate FFmpeg 6 prefix. Do not downgrade the system FFmpeg.
|
FFmpeg 6 prefix. Do not downgrade the system FFmpeg. The host's `inproc-av` does not link FFmpeg.
|
||||||
User-bus headless setup and the official Mac checklist: [virtual desktop acceptance](contrib/virtual-desktop/ACCEPTANCE.md).
|
User-bus headless setup and the official Mac checklist: [virtual desktop acceptance](contrib/virtual-desktop/ACCEPTANCE.md).
|
||||||
|
|
||||||
### Experimental KMS / 实验后端
|
### Experimental KMS / 实验后端
|
||||||
|
|||||||
Generated
+72
-6
@@ -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"
|
||||||
@@ -657,6 +673,15 @@ dependencies = [
|
|||||||
"windows-sys 0.61.2",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fdeflate"
|
||||||
|
version = "0.3.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
|
||||||
|
dependencies = [
|
||||||
|
"simd-adler32",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ff"
|
name = "ff"
|
||||||
version = "0.13.1"
|
version = "0.13.1"
|
||||||
@@ -711,7 +736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb"
|
checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crc32fast",
|
"crc32fast",
|
||||||
"miniz_oxide",
|
"miniz_oxide 0.9.1",
|
||||||
"zlib-rs",
|
"zlib-rs",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -1307,6 +1332,16 @@ version = "0.2.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "miniz_oxide"
|
||||||
|
version = "0.8.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
|
||||||
|
dependencies = [
|
||||||
|
"adler2",
|
||||||
|
"simd-adler32",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "miniz_oxide"
|
name = "miniz_oxide"
|
||||||
version = "0.9.1"
|
version = "0.9.1"
|
||||||
@@ -1440,6 +1475,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"
|
||||||
@@ -1546,6 +1590,19 @@ version = "0.3.34"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548"
|
checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "png"
|
||||||
|
version = "0.18.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.13.2",
|
||||||
|
"crc32fast",
|
||||||
|
"fdeflate",
|
||||||
|
"flate2",
|
||||||
|
"miniz_oxide 0.8.9",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "polyval"
|
name = "polyval"
|
||||||
version = "0.6.2"
|
version = "0.6.2"
|
||||||
@@ -2629,6 +2686,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 +2804,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.18"
|
version = "0.2.51"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"ab_glyph",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"bytes",
|
"bytes",
|
||||||
@@ -2756,14 +2820,17 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"nix 0.29.0",
|
"nix 0.29.0",
|
||||||
|
"png",
|
||||||
"qrcode",
|
"qrcode",
|
||||||
"rand 0.8.8",
|
"rand 0.8.8",
|
||||||
|
"rcgen",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"sdl2",
|
"sdl2",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"sha2",
|
"sha2",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"tokio-rustls",
|
||||||
"tokio-tungstenite",
|
"tokio-tungstenite",
|
||||||
"webrtc",
|
"webrtc",
|
||||||
"x11rb",
|
"x11rb",
|
||||||
@@ -3008,23 +3075,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",
|
||||||
]
|
]
|
||||||
@@ -3075,8 +3143,6 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "webrtc-srtp"
|
name = "webrtc-srtp"
|
||||||
version = "0.12.0"
|
version = "0.12.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "383b0f0f73ee6cce396bdbc4d54ec661861a59eae9fc988914c1a8d82c5ac272"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aead",
|
"aead",
|
||||||
"aes",
|
"aes",
|
||||||
|
|||||||
+22
-5
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.18"
|
version = "0.2.51"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "uuremote-server"
|
default-run = "uuremote-server"
|
||||||
authors = ["uu-remote-linux contributors"]
|
authors = ["uu-remote-linux contributors"]
|
||||||
@@ -23,16 +23,16 @@ 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", "dep:png"]
|
||||||
wayland = []
|
wayland = []
|
||||||
# Experimental direct linear framebuffer capture; never enabled in release builds.
|
# Experimental direct linear framebuffer capture; never enabled in release builds.
|
||||||
kms = []
|
kms = []
|
||||||
portal = []
|
portal = []
|
||||||
# Build the wayland/portal engines as runtime-loaded libuu-wayland.so / libuu-portal.so (release packages).
|
# Build the wayland/portal engines as runtime-loaded libuu-wayland.so / libuu-portal.so (release packages).
|
||||||
engine-plugins = []
|
engine-plugins = []
|
||||||
# In-process capture and encoding through FFmpeg 6 libraries (libavcodec/libavdevice dev packages).
|
# In-process X11 capture and NVENC encoding: vendored NVENC headers, NVIDIA driver libraries loaded at runtime.
|
||||||
# Off by default so release binaries do not link the build machine's libav.
|
# Other encoders keep the FFmpeg process pipeline. Off by default.
|
||||||
inproc-av = ["dep:ffmpeg-next", "dep:x11rb"]
|
inproc-av = ["dep:x11rb"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tokio = { version = "1", features = ["full"] }
|
tokio = { version = "1", features = ["full"] }
|
||||||
@@ -59,11 +59,28 @@ 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 }
|
||||||
|
png = { version = "0.18", optional = true }
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
tokio = { version = "1", features = ["test-util"] }
|
||||||
|
# Synthetic loopback WSS certificates only; both crates already occur in Cargo.lock.
|
||||||
|
rcgen = "0.11.3"
|
||||||
|
tokio-rustls = { version = "0.26.6", default-features = false, features = ["ring", "tls12"] }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
cc = "1.0"
|
cc = "1.0"
|
||||||
|
|
||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
|
# RTP rollover counter survives delayed NACK retransmissions (vendor/webrtc-srtp/PATCHES.md).
|
||||||
|
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]]
|
||||||
|
name = "nvenc_pipeline_bench"
|
||||||
|
harness = false
|
||||||
|
required-features = ["inproc-av"]
|
||||||
+170
-29
@@ -21,7 +21,38 @@
|
|||||||
<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 / 外观
|
||||||
|
|
||||||
|
Launcher icons use the system icon theme instead of emoji glyphs, so they do not depend on emoji font coverage.
|
||||||
|
|
||||||
|
Signed-in graphical hosts report the system wallpaper for disconnected device cards in official clients
|
||||||
|
(no desktop-window screenshot). GNOME/Cinnamon, KDE, Xfce and Omarchy on Hyprland are supported (following the current wallpaper); checks run every 60 seconds
|
||||||
|
and unchanged content is not uploaded again. Other desktops can set `UU_WALLPAPER=/absolute/path/image.png`
|
||||||
|
(PNG/JPEG/WebP). Set `UU_WALLPAPER_UPLOAD=0` to disable; guest and headless hosts skip reporting.
|
||||||
|
See [protocol evidence and limitations](docs/wallpaper-protocol.md).
|
||||||
|
|
||||||
|
Choose **System / Light / Dark** (default: System) in the viewer's **Settings → General → Appearance**, or via the gear settings button in host / tool windows.
|
||||||
|
The choice is saved to `$XDG_CONFIG_HOME/uuremote/theme` (default `~/.config/uuremote/theme`).
|
||||||
|
|
||||||
|
<p align="center"><img src="docs/images/appearance-light.png" width="360" alt="Light appearance (synthetic devices)"> <img src="docs/images/appearance-dark.png" width="360" alt="Dark appearance (synthetic devices)"></p>
|
||||||
|
|
||||||
|
## Language / 语言
|
||||||
|
|
||||||
|
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
|
||||||
@@ -45,8 +76,9 @@
|
|||||||
| Mouse / keyboard | Absolute and relative motion, clicks, wheel, keys; no spurious key repeat on high-latency links; optional uinput virtual devices on Wayland (layout independent, see below) |
|
| Mouse / keyboard | Absolute and relative motion, clicks, wheel, keys; no spurious key repeat on high-latency links; optional uinput virtual devices on Wayland (layout independent, see below) |
|
||||||
| Mac shortcuts | **Recommended**: turn off 「使用 macOS 快捷键」 (use macOS shortcuts) in the Mac viewer's remote-window menu; then Cmd+C/V/A/F/X/Z work as on a Mac (Cmd+C/V become Ctrl+Shift+C/V in terminals) and Ctrl+C always interrupts. With the option on, the viewer sends Cmd as Ctrl: in a terminal Ctrl+V / Cmd+V paste, Ctrl+C interrupts, copy is Cmd+Shift+C (X11) |
|
| Mac shortcuts | **Recommended**: turn off 「使用 macOS 快捷键」 (use macOS shortcuts) in the Mac viewer's remote-window menu; then Cmd+C/V/A/F/X/Z work as on a Mac (Cmd+C/V become Ctrl+Shift+C/V in terminals) and Ctrl+C always interrupts. With the option on, the viewer sends Cmd as Ctrl: in a terminal Ctrl+V / Cmd+V paste, Ctrl+C interrupts, copy is Cmd+Shift+C (X11) |
|
||||||
| Pointer shape | Remote cursor shape is mirrored to the viewer (X11) |
|
| Pointer shape | Remote cursor shape is mirrored to the viewer (X11) |
|
||||||
| Clipboard | Two-way text sync |
|
| Clipboard | Two-way text sync; Wayland mobile IME text inputs use clipboard paste fallback (see below) |
|
||||||
| Quality / frame rate / resolution | Auto, Original 20M, Ultra 8M, HD 2M, custom; 30/60/90/144 fps; "other resolutions" are scaled by the encoder, the host monitor is left untouched |
|
| Viewer annotation | Strokes drawn with 「批注」 (annotate) in the viewer's watch mode appear on the Linux screen and stream back to the viewer (X11, needs a compositing manager; the overlay lets clicks through); cleared when annotation is turned off or the viewer disconnects. Verified with the Mac viewer 4.42.0; mobile viewers untested |
|
||||||
|
| Quality / frame rate / resolution | Auto, Original 20M, Ultra 8M, HD 2M, custom; 30/60/90/144 fps; on X11 a resolution choice changes the desktop resolution itself like the official Windows host (xrandr, adding the mode when missing; restored for "original" or on disconnect), `UU_DESKTOP_RESIZE=0` scales in the encoder instead; Wayland scales in the encoder |
|
||||||
| Sound | System audio captured from PulseAudio / PipeWire and sent as Opus |
|
| Sound | System audio captured from PulseAudio / PipeWire and sent as Opus |
|
||||||
| File transfer | Upload, download (including folders), create folder, rename, delete |
|
| File transfer | Upload, download (including folders), create folder, rename, delete |
|
||||||
| Terminal | The official "Terminal" tool, PTY sessions, multiple sessions, rename |
|
| Terminal | The official "Terminal" tool, PTY sessions, multiple sessions, rename |
|
||||||
@@ -73,7 +105,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,6 +116,10 @@ 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.
|
||||||
|
|
||||||
|
**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.
|
||||||
|
|
||||||
GNOME Portal CONTROL no longer waits for a consent dialog or the first video frame. It announces the selected desktop before reporting secure-desktop state and receiving the official viewer's “auto unlock host” request. The official Android viewer requires this desktop selection before entering its auto-unlock flow, so the notification must precede capture readiness; actual screen dimensions, codec information and capture permissions still follow their real readiness state. Enable auto unlock in the viewer and use the current Linux user's login password. The host verifies it with PAM, unlocks the existing GNOME session, requests display wake, and restores capture, input and clipboard through the shared Portal session. Initial consent or revoked permissions still require local approval. Reconnect if physical or logical dimensions change.
|
GNOME Portal CONTROL no longer waits for a consent dialog or the first video frame. It announces the selected desktop before reporting secure-desktop state and receiving the official viewer's “auto unlock host” request. The official Android viewer requires this desktop selection before entering its auto-unlock flow, so the notification must precede capture readiness; actual screen dimensions, codec information and capture permissions still follow their real readiness state. Enable auto unlock in the viewer and use the current Linux user's login password. The host verifies it with PAM, unlocks the existing GNOME session, requests display wake, and restores capture, input and clipboard through the shared Portal session. Initial consent or revoked permissions still require local approval. Reconnect if physical or logical dimensions change.
|
||||||
@@ -94,7 +130,7 @@ Existing screen-off and lock settings remain unchanged. Only capture recovery in
|
|||||||
|
|
||||||
Locked black video requires FFmpeg's libx264/libx265 encoder for the negotiated H.264/H.265 codec; hardware encoding support alone does not satisfy this dependency. Encoder failures are logged explicitly. Synthetic video does not change capture permissions or advertised monitor dimensions. It pauses on unlock or unknown lock state, ends when capture is ready/rejected or the connection closes, and then hands the same video track to real capture. See [#29](../../issues/29) and [#34](../../pull/34) for the controlled experiment and validation scope.
|
Locked black video requires FFmpeg's libx264/libx265 encoder for the negotiated H.264/H.265 codec; hardware encoding support alone does not satisfy this dependency. Encoder failures are logged explicitly. Synthetic video does not change capture permissions or advertised monitor dimensions. It pauses on unlock or unknown lock state, ends when capture is ready/rejected or the connection closes, and then hands the same video track to real capture. See [#29](../../issues/29) and [#34](../../pull/34) for the controlled experiment and validation scope.
|
||||||
|
|
||||||
The native Wayland backend needs `wlr-output-power-management` from the compositor to wake a turned-off screen; without it only wake is unavailable — capture and encoding are unaffected.
|
The native Wayland backend needs `wlr-output-power-management` from the compositor to wake a turned-off screen; without it only wake is unavailable — capture and encoding are unaffected. Display-wake failures at video startup or during streaming are logged and retried at the next interval without ending the video stream; capture, encoder and send errors retain their existing handling.
|
||||||
|
|
||||||
Native Wayland experiments: `UU_WAYLAND_PIPELINE=0` disables pipelining for comparison.
|
Native Wayland experiments: `UU_WAYLAND_PIPELINE=0` disables pipelining for comparison.
|
||||||
`UU_WAYLAND_DMABUF=1` explicitly tries dma-buf → GBM CPU mapping (off by default;
|
`UU_WAYLAND_DMABUF=1` explicitly tries dma-buf → GBM CPU mapping (off by default;
|
||||||
@@ -104,23 +140,27 @@ failure falls back to SHM. The virgl VM verified fallback only: successful impor
|
|||||||
mapping and hardware acceleration remain unverified. This is not zero-copy VAAPI;
|
mapping and hardware acceleration remain unverified. This is not zero-copy VAAPI;
|
||||||
`UU_VIDEO_ENCODER=vaapi` still uploads CPU frames through FFmpeg.
|
`UU_VIDEO_ENCODER=vaapi` still uploads CPU frames through FFmpeg.
|
||||||
|
|
||||||
### Hyprland monitor switching (experimental)
|
### Monitor switching (experimental)
|
||||||
|
|
||||||
Native Wayland absolute pointer motion now targets the captured output by default, fixing multi-monitor click offsets. uinput may still handle keyboard, buttons and relative motion.
|
Native Wayland absolute pointer motion now targets the captured output by default, fixing multi-monitor click offsets. uinput may still handle keyboard, buttons and relative motion.
|
||||||
|
|
||||||
Set `UU_WAYLAND_MULTISCREEN=1` to select physical monitors from the phone client. `UU_WAYLAND_OUTPUT` chooses the initial output. Capture and absolute pointer targeting switch together across different resolutions, scales and desktop positions.
|
Set `UU_WAYLAND_MULTISCREEN=1` to select physical monitors from the phone client. `UU_WAYLAND_OUTPUT` chooses the initial output. Capture and absolute pointer targeting switch together across different resolutions, scales and desktop positions.
|
||||||
|
|
||||||
|
X11 sessions send all monitors as one combined picture by default. With `UU_X11_MULTISCREEN=1` the host lists the monitors from `xrandr --listmonitors`; the viewer selects one, only that region is captured, and absolute pointer positions are offset to that monitor. The primary monitor is the default; `UU_X11_OUTPUT` picks another (e.g. `HDMI-1`). The layout is read when the host starts; restart the service after changing it. In this mode the viewer's resolution setting scales the stream instead of changing the display mode. Experimental: unit tests and Xvfb virtual monitors only, not yet accepted with the official clients.
|
||||||
|
|
||||||
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; 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; VAAPI and `inproc-av` stay 4:2:0 and report that to the client |
|
| True color (4:4:4) | Supported (v0.1.15): the default FFmpeg pipeline with NVENC / libx264 encodes H.264 High 4:4:4; `inproc-av` native NVENC encodes H.264 High 4:4:4 / HEVC FRExt; VAAPI stays 4:2:0 and reports that to the client |
|
||||||
| HDR | Not implemented |
|
| HDR | Not implemented |
|
||||||
| Super screen / virtual display | Not implemented |
|
| Super screen / virtual display | Not implemented |
|
||||||
| Privacy screen on the host | Not implemented |
|
| Privacy screen on the host | Experimental, KDE Plasma Wayland (portal) only; off, picture and screen-off status labels verified with Mac 4.43.0; `UU_PRIVACY_AUTO=picture` / `screen-off` enables it automatically on desktop connect; see [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||||
| Microphone (viewer audio played on the host) | Not implemented (needs a virtual sound card) |
|
| Microphone (viewer audio played on the host) | Not implemented (needs a virtual sound card) |
|
||||||
| Plugins such as the WoW queue notifier | Not supported; the client is told that no plugins exist |
|
| Plugins such as the WoW queue notifier | Not supported; the client is told that no plugins exist |
|
||||||
| Linux login screen | The system login screen (before anyone logs in to the Linux desktop) cannot be controlled yet; use headless mode or a virtual desktop (see below). This is about the Linux login: **without a UU account** the host can now be used through remote assistance |
|
| Linux login screen | The system login screen (before anyone logs in to the Linux desktop) cannot be controlled yet; use headless mode or a virtual desktop (see below). This is about the Linux login: **without a UU account** the host can now be used through remote assistance |
|
||||||
@@ -139,16 +179,21 @@ uuremote-server login # scan the QR code with
|
|||||||
systemctl --user enable --now uuremote-native.service # start with the graphical session
|
systemctl --user enable --now uuremote-native.service # start with the graphical session
|
||||||
```
|
```
|
||||||
|
|
||||||
The deb installs the binaries, plugins, a systemd user unit and menu entries; uinput access stays opt-in (step 5).
|
The deb installs the binaries, plugins, a systemd user unit and menu entries, and pulls in FFmpeg as a dependency; uinput access stays opt-in (step 5).
|
||||||
GNOME and KDE pass the display environment to the unit; on desktops that don't (e.g. Xfce) add `DISPLAY` as in step 4.
|
GNOME and KDE pass the display environment to the unit; on desktops that don't (e.g. Xfce) add `DISPLAY` as in step 4.
|
||||||
|
|
||||||
**Other distributions**: download `uu-remote-linux-<version>-x86_64-linux.tar.gz` (ARM64: `aarch64-linux`) from [Releases](../../releases/latest), extract it, then:
|
**Other distributions**: download `uu-remote-linux-<version>-x86_64-linux.tar.gz` (ARM64: `aarch64-linux`) from [Releases](../../releases/latest), extract it, then run as your desktop user (not root):
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
install -Dm755 uuremote-server ~/.local/bin/uuremote-server
|
cd uu-remote-linux-<version>-x86_64-linux
|
||||||
install -Dm644 libuu-wayland.so libuu-portal.so -t ~/.local/lib/uu-remote-linux/
|
./install.sh # --yes: don't ask; --no-ffmpeg: check only
|
||||||
```
|
```
|
||||||
|
|
||||||
|
The script installs the binaries and plugins under `~/.local`, writes the systemd user unit (an existing one is kept) and checks
|
||||||
|
FFmpeg with libx264 (without it the viewer stays on 正在传输画面). A missing FFmpeg is installed through sudo with apt or pacman;
|
||||||
|
Fedora needs RPM Fusion and openSUSE needs Packman first, and the script only prints the command instead of adding third-party repositories.
|
||||||
|
The host also checks FFmpeg at startup and on every desktop connection: when it is not runnable it logs an error and shows a desktop notification (without a notification daemon it opens its window with a red hint), at most every 5 minutes. Install it and reconnect; no restart is needed.
|
||||||
|
|
||||||
One package covers X11, wlroots compositors (Hyprland, Sway, niri) and GNOME/KDE Wayland: the backend is chosen from the
|
One package covers X11, wlroots compositors (Hyprland, Sway, niri) and GNOME/KDE Wayland: the backend is chosen from the
|
||||||
running session at startup, and the matching `libuu-*.so` is loaded only on Wayland, so X11 hosts need no Wayland libraries.
|
running session at startup, and the matching `libuu-*.so` is loaded only on Wayland, so X11 hosts need no Wayland libraries.
|
||||||
|
|
||||||
@@ -172,6 +217,10 @@ sudo apt install build-essential pkg-config \
|
|||||||
sudo apt install libwayland-dev libxkbcommon-dev wl-clipboard
|
sudo apt install libwayland-dev libxkbcommon-dev wl-clipboard
|
||||||
# optional: GNOME/KDE portal backend
|
# optional: GNOME/KDE portal backend
|
||||||
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)
|
||||||
|
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>).
|
||||||
@@ -187,6 +236,12 @@ cargo build --release --features wayland # + Hyprland
|
|||||||
cargo build --release --features wayland,portal # + GNOME/KDE on Wayland
|
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 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:
|
||||||
@@ -198,6 +253,10 @@ Run inside your graphical session:
|
|||||||
Scan the code with the **NetEase UU Remote mobile app** and confirm. Credentials are stored only on this
|
Scan the code with the **NetEase UU Remote mobile app** and confirm. Credentials are stored only on this
|
||||||
machine, in `~/.config/uuremote/config.json` (mode 0600).
|
machine, in `~/.config/uuremote/config.json` (mode 0600).
|
||||||
|
|
||||||
|
A failed status query or the 60-second request timeout does not prove that the QR expired or that the phone confirmed login. The official-client refresh policy is unchanged: after a query error, click Refresh QR (Enter in a terminal; refresh after 60 seconds with neither a window nor a terminal). QR request diagnostics contain only the request phase, error category, elapsed time, HTTP/API status and last known scan state—not tickets, URLs or response content. A `connect` category alone does not identify a DNS, TLS or proxy cause.
|
||||||
|
|
||||||
|
The same file holds this machine's device identity (`device_id`, `client_id`, `system_id`), which reinstalls and new QR logins keep. **Do not copy `config.json` between machines or clone a second host from a snapshot/disk that includes the home directory**: two host instances with one identity, on the same or different machines, kick each other out of the room. The log then shows `Cloud room leave without peer identifier` every few seconds with reconnects, and viewers disconnect right after connecting. On a cloned or copied machine, stop the service, remove those three keys plus `token`, `csrf` and `user_id`, and run `uuremote-server login` to register a new device. A leftover instance on the same machine (for example an old `~/.local/bin/uuremote-server` started by hand) has the same effect; `uuremote-server doctor` warns when more than one host instance is running.
|
||||||
|
|
||||||
### 4. Run as a user service
|
### 4. Run as a user service
|
||||||
|
|
||||||
`~/.config/systemd/user/uuremote-native.service`:
|
`~/.config/systemd/user/uuremote-native.service`:
|
||||||
@@ -206,17 +265,17 @@ machine, in `~/.config/uuremote/config.json` (mode 0600).
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=UU Remote Linux host (unofficial)
|
Description=UU Remote Linux host (unofficial)
|
||||||
After=graphical-session.target
|
After=graphical-session.target
|
||||||
|
PartOf=graphical-session.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Environment=RUST_LOG=info
|
Environment=RUST_LOG=info
|
||||||
# X11 desktops need the display; on GNOME, XAUTHORITY is usually /run/user/<uid>/gdm/Xauthority
|
# GNOME/KDE import DISPLAY / WAYLAND_DISPLAY into the user manager and start graphical-session.target
|
||||||
Environment=DISPLAY=:0
|
|
||||||
ExecStart=%h/.local/bin/uuremote-server
|
ExecStart=%h/.local/bin/uuremote-server
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=5
|
RestartSec=5
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=default.target
|
WantedBy=graphical-session.target
|
||||||
```
|
```
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
@@ -228,6 +287,10 @@ journalctl --user -u uuremote-native.service -f # online once you see availabi
|
|||||||
|
|
||||||
If you have not logged in yet, the service opens the QR login window on your desktop.
|
If you have not logged in yet, the service opens the QR login window on your desktop.
|
||||||
|
|
||||||
|
Desktops that never start `graphical-session.target` (e.g. Xfce, i3) will not autostart this unit: change `[Install]` to
|
||||||
|
`WantedBy=default.target`, add `Environment=DISPLAY=:0` (your actual display) and `enable` again. Headless mode and the
|
||||||
|
virtual desktop below also need `default.target`.
|
||||||
|
|
||||||
### 5. uinput virtual keyboard/mouse on Wayland (recommended)
|
### 5. uinput virtual keyboard/mouse on Wayland (recommended)
|
||||||
|
|
||||||
On Wayland (especially GNOME/KDE via the portal) the default input path needs portal consent and some keyboard layouts
|
On Wayland (especially GNOME/KDE via the portal) the default input path needs portal consent and some keyboard layouts
|
||||||
@@ -243,6 +306,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
|
||||||
@@ -278,7 +343,7 @@ the same account cannot assist each other, an official restriction).
|
|||||||
## Servers without a monitor
|
## Servers without a monitor
|
||||||
|
|
||||||
**Headless mode** (terminal, file transfer and port mapping only): add `Environment=UU_DESKTOP_BACKEND=none` to the
|
**Headless mode** (terminal, file transfer and port mapping only): add `Environment=UU_DESKTOP_BACKEND=none` to the
|
||||||
service and run `loginctl enable-linger $USER`, so the systemd user manager (with `XDG_RUNTIME_DIR` and the user D-Bus)
|
service, change `[Install]` to `WantedBy=default.target` (`graphical-session.target` never starts without a login), and run `loginctl enable-linger $USER`, so the systemd user manager (with `XDG_RUNTIME_DIR` and the user D-Bus)
|
||||||
starts at boot without a login. The viewer's remote desktop keeps showing "connecting" in this mode; that is expected.
|
starts at boot without a login. The viewer's remote desktop keeps showing "connecting" in this mode; that is expected.
|
||||||
Log in once with `uuremote-server login --no-gui` (QR in the terminal).
|
Log in once with `uuremote-server login --no-gui` (QR in the terminal).
|
||||||
|
|
||||||
@@ -321,12 +386,18 @@ Common environment variables:
|
|||||||
|---|---|
|
|---|---|
|
||||||
| `UU_CONFIG` | Config file path (default `~/.config/uuremote/config.json`) |
|
| `UU_CONFIG` | Config file path (default `~/.config/uuremote/config.json`) |
|
||||||
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms` (experimental feature) / `none` (headless) |
|
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms` (experimental feature) / `none` (headless) |
|
||||||
|
| `UU_DESKTOP_RESIZE=0` | on X11, keep the desktop resolution and only scale the encoded stream when the viewer picks a resolution |
|
||||||
|
| `UU_NVENC_RGB=0` / `=1` | NVENC encodes BGRA directly (saves CPU). Off by default when a monitor is connected to the NVIDIA card (slower when the desktop is composited on the same GPU); `0` forces off, `1` forces on |
|
||||||
| `UU_WAYLAND_MULTISCREEN=1` | Enable Hyprland physical monitor switching (off by default) |
|
| `UU_WAYLAND_MULTISCREEN=1` | Enable Hyprland physical monitor switching (off by default) |
|
||||||
| `UU_WAYLAND_OUTPUT` | Initial native Wayland output name, e.g. `HDMI-A-1` |
|
| `UU_WAYLAND_OUTPUT` | Initial native Wayland output name, e.g. `HDMI-A-1` |
|
||||||
|
| `UU_X11_MULTISCREEN=1` | Select and capture X11 monitors separately (experimental, off by default, needs `xrandr`) |
|
||||||
|
| `UU_X11_OUTPUT` | Initial X11 monitor name (`xrandr --listmonitors`); default: the primary |
|
||||||
|
| `UU_WAYLAND_NO_VIRTUAL_KEYBOARD=1` | Native Wayland skips the virtual keyboard (e.g. Denial reserves it for its input method); keys go through uinput. Without wlr-virtual-pointer the pointer also uses uinput (#72) |
|
||||||
| `UU_INPUT_BACKEND` | `auto` (default: uinput on Wayland when accessible) / `uinput` / `native` |
|
| `UU_INPUT_BACKEND` | `auto` (default: uinput on Wayland when accessible) / `uinput` / `native` |
|
||||||
| `UU_TERMINAL_SHORTCUTS=0` | Disable the Ctrl+V paste rewrite in terminal windows |
|
| `UU_TERMINAL_SHORTCUTS=0` | Disable the Ctrl+V paste rewrite in terminal windows |
|
||||||
| `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: opt-in Intel/AMD; `nvenc`: force NVENC; unset: NVENC only when an NVIDIA driver is loaded, else CPU |
|
| `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: opt-in Intel/AMD; `nvenc`: force NVENC; unset or `auto`: a background probe (one synthetic IDR per candidate, 3 s each). With an NVIDIA driver the order is NVENC then CPU; without one the only candidate is CPU and the probe is skipped. A session that starts before the probe finishes uses the previous rule (NVENC if NVIDIA is present, else CPU). On a self-built `--features inproc-av` binary, a process-only failure of NVENC when the in-process engine would try it first on X11 is logged `native_unprobed` and keeps the previous NVENC choice (Wayland, portal, and KMS fall back to CPU). The skipped CPU-only probe is logged `not probed (only candidate)`. A successful probe and that CPU-only skip stay cached while NVIDIA presence matches the report. A later desktop connection whose presence differs starts one background re-probe and still uses the cached encoder until the new result is stored. A hardware-candidate failure (NVENC failed, CPU chosen) is kept for 10 minutes; the next desktop connection after that starts the same re-probe and still uses the cached encoder until the new result is stored. Explicit `cpu` / `vaapi` / `nvenc` does not start the probe. Another failure restarts the 10 minutes. `native_unprobed` is not a temporary failure. A non-`auto` `video_encoder` in `host_settings.json` wins. VAAPI stays out of auto until #33 |
|
||||||
| `UU_VAAPI_BUFFER_MS` | VAAPI VBV buffer in ms (10-1000, VAAPI only); raise it when keyframes are squeezed into a blur at high resolution |
|
| `UU_VAAPI_BUFFER_MS` | VAAPI VBV buffer in ms (10-1000, VAAPI only); raise it when keyframes are squeezed into a blur at high resolution |
|
||||||
|
| `UU_NVENC_BUFFER_MS` | NVENC VBV buffer in ms (10-1000, NVENC only, including the in-process engine); the default is 100-500 kbit, set `1000` when high-resolution keyframes blur and flicker once per GOP (#103) |
|
||||||
| `UU_FFMPEG_ROOT` | Use FFmpeg from this prefix |
|
| `UU_FFMPEG_ROOT` | Use FFmpeg from this prefix |
|
||||||
| `UU_AUDIO=0` | Disable sound; `UU_AUDIO_SOURCE` picks the PulseAudio source |
|
| `UU_AUDIO=0` | Disable sound; `UU_AUDIO_SOURCE` picks the PulseAudio source |
|
||||||
| `UU_REMOTE_ASSIST=0` | Disable remote assistance (no guest assistance before sign-in either) |
|
| `UU_REMOTE_ASSIST=0` | Disable remote assistance (no guest assistance before sign-in either) |
|
||||||
@@ -334,10 +405,37 @@ Common environment variables:
|
|||||||
| `UU_LOGIN_WINDOW=0` | Do not open the login window automatically when credentials are missing |
|
| `UU_LOGIN_WINDOW=0` | Do not open the login window automatically when credentials are missing |
|
||||||
| `UU_PORT_MAPPING=0` | Disable port mapping (the official host's controlled-side switch) |
|
| `UU_PORT_MAPPING=0` | Disable port mapping (the official host's controlled-side switch) |
|
||||||
| `UU_WOL_HELPER=1` | Experimental: act as a remote-boot helper like the official Windows host — report this host's LAN info after sign-in and send a magic packet to the LAN when the cloud asks to wake a PC (not verified end to end) |
|
| `UU_WOL_HELPER=1` | Experimental: act as a remote-boot helper like the official Windows host — report this host's LAN info after sign-in and send a magic packet to the LAN when the cloud asks to wake a PC (not verified end to end) |
|
||||||
| `UU_USE_PROXY=1` | Honor HTTP/SOCKS proxy environment variables; by default proxies are ignored and NetEase servers are reached directly |
|
| `UU_USE_PROXY=1` | Share environment HTTP/HTTPS proxy policy between REST and host/viewer WebSocket signaling; proxies are ignored by default |
|
||||||
|
|
||||||
|
|
||||||
|
`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.
|
||||||
|
|
||||||
|
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`.
|
`~/.config/uuremote/host_settings.json`. The same file stores `video_encoder`
|
||||||
|
(`auto`/`cpu`/`vaapi`/`nvenc`) and `video_codec` (`auto`/`h264`/`h265`), written by
|
||||||
|
`uuremote-server set-encoder` and `uuremote-server set-codec` (illegal arguments exit 2).
|
||||||
|
A value other than `auto` beats `UU_VIDEO_ENCODER` / `UU_VIDEO_CODEC`; `auto` or a missing
|
||||||
|
field falls through to the environment, then to auto (NVENC then CPU when an NVIDIA driver
|
||||||
|
is loaded; CPU with no probe when it is not; codec stays H.265 on hardware and H.264 on CPU).
|
||||||
|
The probe runs in the background at startup and does not delay the first picture. A success
|
||||||
|
stays cached until the process exits, except when NVIDIA presence (`/proc/driver/nvidia/version`
|
||||||
|
or `/dev/nvidia0`) no longer matches the report: the next desktop connection then starts one
|
||||||
|
background re-probe (`warm_auto_probe`) and still uses the cached encoder until the new result
|
||||||
|
is stored. An NVENC failure is kept for 10 minutes, and the next desktop connection after that
|
||||||
|
starts the same background re-probe while still using the cached encoder. `set-encoder` and
|
||||||
|
`set-codec` both send `SIGUSR2` to the host in `host.pid` when that process is this program.
|
||||||
|
An encoder change switches each live desktop stream without disconnecting and keeps the codec
|
||||||
|
negotiated for that session. A failed start follows the existing fallback (in-process, then the
|
||||||
|
FFmpeg process, then CPU). After a hand edit, `kill -USR2 $(cat ~/.config/uuremote/host.pid)`
|
||||||
|
does the same. `SIGUSR2` does not re-probe. A codec change takes effect the next time a desktop
|
||||||
|
connection starts; the running host only logs it. Explicit `vaapi` with 真彩 stays on VAAPI,
|
||||||
|
encodes 4:2:0, and reports chroma 4:2:0 in CaptureSettingSync field 3. If the chosen encoder
|
||||||
|
cannot start, the stream falls back to CPU and logs a warning. VAAPI is not an auto candidate
|
||||||
|
until #33.
|
||||||
|
|
||||||
|
Custom bitrate follows the Mbps value selected in the client; for example, 1 Mbps sets an encoder cap of 1000 kbit/s.
|
||||||
|
|
||||||
With external FFmpeg CPU encoding, the bitrate presets (Original / Ultra / HD / custom) use average bitrate (ABR) to avoid gray keyframes at 4K and low bitrates; Auto keeps constant rate factor (CRF).
|
With external FFmpeg CPU encoding, the bitrate presets (Original / Ultra / HD / custom) use average bitrate (ABR) to avoid gray keyframes at 4K and low bitrates; Auto keeps constant rate factor (CRF).
|
||||||
|
|
||||||
@@ -369,6 +467,7 @@ flowchart LR
|
|||||||
|
|
||||||
## Security and privacy
|
## Security and privacy
|
||||||
|
|
||||||
|
- By default, signed-in graphical hosts upload the current wallpaper image to UU's file service for device-card backgrounds. Set `UU_WALLPAPER_UPLOAD=0` to disable this upload.
|
||||||
- Logs never contain keystrokes, terminal text, clipboard contents, file contents, passwords or tokens.
|
- Logs never contain keystrokes, terminal text, clipboard contents, file contents, passwords or tokens.
|
||||||
- For auto unlock the password is stored in the **viewer** (the official client). The host only checks it
|
- For auto unlock the password is stored in the **viewer** (the official client). The host only checks it
|
||||||
once with PAM; it is never written to disk or logs.
|
once with PAM; it is never written to disk or logs.
|
||||||
@@ -413,16 +512,27 @@ AUD only at IRAPs and drops every other picture from the bitstream, so an AUD-ba
|
|||||||
one "frame" and the IRAP gate then rejects all of them: the connection stalls at "transferring" while the host
|
one "frame" and the IRAP gate then rejects all of them: the connection stalls at "transferring" while the host
|
||||||
sends about 12 kbit/s. `UU_VIDEO_CODEC=h265` selects H.265 explicitly for A/B diagnosis.
|
sends about 12 kbit/s. `UU_VIDEO_CODEC=h265` selects H.265 explicitly for A/B diagnosis.
|
||||||
|
|
||||||
### VAAPI (opt-in / 显式启用)
|
### VAAPI
|
||||||
|
|
||||||
`UU_VIDEO_ENCODER=vaapi` selects Intel/AMD H.264 VAAPI; `UU_VAAPI_DEVICE` defaults to
|
`UU_VIDEO_ENCODER=vaapi` or `set-encoder vaapi` selects Intel/AMD H.264 VAAPI explicitly.
|
||||||
`/dev/dri/renderD128` (render-node permissions required). No automatic VAAPI selection.
|
`UU_VAAPI_DEVICE` defaults to `/dev/dri/renderD128` (render-node permissions required).
|
||||||
Both FFmpeg process and `--features inproc-av` upload NV12 frames to a VAAPI frame pool.
|
`auto` is NVENC then CPU when an NVIDIA driver is present, and CPU otherwise. VAAPI is
|
||||||
|
selected only explicitly; putting it in auto waits on #33.
|
||||||
|
The FFmpeg process uploads NV12 frames to a VAAPI frame pool; a self-built `--features inproc-av`
|
||||||
|
binary instead runs VAAPI in process on X11 (a DRI3 DMA-BUF of the root window zero-copy, or XShm
|
||||||
|
upload without DRI3, then VPP to NV12 and VCN; H.264/HEVC).
|
||||||
VBR uses the viewer bitrate preset and CQ-derived minimum QP, no B-frames, async depth 1,
|
VBR uses the viewer bitrate preset and CQ-derived minimum QP, no B-frames, async depth 1,
|
||||||
AUD and the existing GOP/VFR timing. Unsupported device/driver/initialization falls back to libx264
|
AUD and the existing GOP/VFR timing. Unsupported device/driver/initialization falls back to libx264
|
||||||
with a warning. Accepted on Intel UHD 770 (iHD) with the default FFmpeg process pipeline and the official Mac
|
with a warning. Accepted on Intel UHD 770 (iHD) with the default FFmpeg process pipeline and the official Mac
|
||||||
viewer (presets, fps, scaling, reconnect; no fallback, ~40% less CPU than libx264). AMD and the `inproc-av`
|
viewer (presets, fps, scaling, reconnect; no fallback, ~40% less CPU than libx264 — a figure from the
|
||||||
VAAPI path are not hardware-verified.
|
FFmpeg-process-pipeline era). AMD iGPUs are verified on
|
||||||
|
the **in-process engine** (`--features inproc-av`): end-to-end sessions with the official Mac viewer passed
|
||||||
|
acceptance on HawkPoint (Mesa 26.2.3) and Cezanne (Mesa 26.2.5) — HEVC, presets, fps, scaling; on Cezanne,
|
||||||
|
H.264 and both capture paths were additionally probe-verified: the XShm upload (decodable bitstream, correct
|
||||||
|
picture) and the DRI3 zero-copy import. Measured on one machine (1920x1200@60, Cezanne iGPU + RTX 3050 Ti):
|
||||||
|
in-process VAAPI costs about **1/12** of the per-frame encode CPU of libx264 (FFmpeg pipeline, superfast)
|
||||||
|
and about **1/5** of in-process NVENC. The FFmpeg process pipeline (what the release packages use) is not
|
||||||
|
separately verified on AMD.
|
||||||
|
|
||||||
The default VAAPI VBV buffer (100-500 kbit) squeezes keyframes hard at high resolution: on a 2560x1440
|
The default VAAPI VBV buffer (100-500 kbit) squeezes keyframes hard at high resolution: on a 2560x1440
|
||||||
H.264 VAAPI stream capped at 30 Mbit/s the first IDR measured 59,910 bytes and the picture blurred at
|
H.264 VAAPI stream capped at 30 Mbit/s the first IDR measured 59,910 bytes and the picture blurred at
|
||||||
@@ -478,8 +588,7 @@ Keep the unit name `uuremote-native.service` (not a template `[email protected]
|
|||||||
Optional VAAPI: `intel-media-driver` (modern Intel) or `libva-mesa-driver` (AMD), `libva-utils`
|
Optional VAAPI: `intel-media-driver` (modern Intel) or `libva-mesa-driver` (AMD), `libva-utils`
|
||||||
for `vainfo`. Optional KMS: `libdrm`. Virtual Xfce: `xorg-server-xvfb xorg-xauth xorg-xdpyinfo
|
for `vainfo`. Optional KMS: `libdrm`. Virtual Xfce: `xorg-server-xvfb xorg-xauth xorg-xdpyinfo
|
||||||
xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`.
|
xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`.
|
||||||
Rolling Arch FFmpeg may be newer than supported `inproc-av` (FFmpeg 6.x); use the default process
|
If building `viewer-ffmpeg`, rolling Arch FFmpeg may be newer than supported 6.x; use a separate FFmpeg 6 prefix rather than downgrading system FFmpeg (`inproc-av` native NVENC on the host does not depend on FFmpeg).
|
||||||
pipeline or build against a separate FFmpeg 6 prefix. Do not downgrade the system FFmpeg.
|
|
||||||
User-bus headless setup and the official Mac checklist: [virtual desktop acceptance](contrib/virtual-desktop/ACCEPTANCE.md).
|
User-bus headless setup and the official Mac checklist: [virtual desktop acceptance](contrib/virtual-desktop/ACCEPTANCE.md).
|
||||||
|
|
||||||
### Experimental KMS / 实验后端
|
### Experimental KMS / 实验后端
|
||||||
@@ -494,6 +603,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.
|
||||||
@@ -503,8 +614,13 @@ separate from the host `uuremote-server`; the default host build and behaviour a
|
|||||||
terminal emulator (`TERMINAL` selects one). From source: `sudo apt install libsdl2-dev`, then
|
terminal emulator (`TERMINAL` selects one). From source: `sudo apt install libsdl2-dev`, then
|
||||||
`cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`.
|
`cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`.
|
||||||
|
|
||||||
|
Key combinations use the left/right modifier state attached to each SDL key event. Focus loss releases remote keys; after focus returns, the next non-modifier key restores any still-held Shift/Ctrl/Alt/Win (Command on Mac). This is built in, with no adapter or setting required.
|
||||||
|
|
||||||
|
The viewer mirrors remote PNG pointer shapes (including text and window-resize cursors) with their hotspots. Leaving the remote picture or opening local controls restores the local arrow.
|
||||||
|
|
||||||
SDL clipboard access reuses the desktop window to avoid temporary-window Dock churn on GNOME Wayland (#37).
|
SDL clipboard access reuses the desktop window to avoid temporary-window Dock churn on GNOME Wayland (#37).
|
||||||
Synchronization runs only while that window is focused and keeps the 30 KiB text limit. Selections without a supported
|
On niri, data-control-capable `wl-clipboard` is used instead, so synchronization does not require window focus.
|
||||||
|
Other SDL backends synchronize only while that window is focused. The 30 KiB text limit applies. Selections without a supported
|
||||||
text format are skipped; empty-text detection depends on the SDL2 backend. Builds without SDL retain the command backend.
|
text format are skipped; empty-text detection depends on the SDL2 backend. Builds without SDL retain the command backend.
|
||||||
SDL2 reads selections synchronously, so a slow selection owner can temporarily block the window; the bridge timeout cannot interrupt it.
|
SDL2 reads selections synchronously, so a slow selection owner can temporarily block the window; the bridge timeout cannot interrupt it.
|
||||||
GNOME-to-official-Mac bidirectional clipboard synchronization is still unverified; this change does not resolve host compatibility.
|
GNOME-to-official-Mac bidirectional clipboard synchronization is still unverified; this change does not resolve host compatibility.
|
||||||
@@ -517,11 +633,28 @@ GNOME-to-official-Mac bidirectional clipboard synchronization is still unverifie
|
|||||||
- CLI: `connect DEVICE false - echo legacy [--view-only]` (desktop), `files DEVICE ls|get|put …`, `terminal DEVICE [SESSION]`,
|
- CLI: `connect DEVICE false - echo legacy [--view-only]` (desktop), `files DEVICE ls|get|put …`, `terminal DEVICE [SESSION]`,
|
||||||
`terminal-ui DEVICE NAME`, `portmap DEVICE LOCAL_PORT HOST PORT` (listens on 127.0.0.1 only), `power DEVICE reboot|shutdown`, `unbind DEVICE` (remove a device from the account; also under "More tools" in the launcher),
|
`terminal-ui DEVICE NAME`, `portmap DEVICE LOCAL_PORT HOST PORT` (listens on 127.0.0.1 only), `power DEVICE reboot|shutdown`, `unbind DEVICE` (remove a device from the account; also under "More tools" in the launcher),
|
||||||
`assist CONNECT_ID` (the code is read from one stdin line, never an argument). See `uuremote-viewer --help`.
|
`assist CONNECT_ID` (the code is read from one stdin line, never an argument). See `uuremote-viewer --help`.
|
||||||
|
- **Secure `type` input** (inject keystrokes into an open desktop session — lock-screen PIN/password; never put secrets on argv):
|
||||||
|
```sh
|
||||||
|
# Preferred: open desktop via ui/connect first, then type (reuses the session; does not kick the live view)
|
||||||
|
UU_INPUT_ENV=UU_SECRET UU_SECRET='…' \
|
||||||
|
uuremote-viewer type DEVICE [--delay-ms 40] [--omit-last 1] [--snapshot /path/out.png]
|
||||||
|
# Or: printf '%s' '…' | uuremote-viewer type DEVICE
|
||||||
|
# Validate only, no network: uuremote-viewer type DEVICE --dry-run
|
||||||
|
# If no desktop viewer is running you must pass --new-session (opens a new peer and replaces any already-open desktop window; upstream #30)
|
||||||
|
```
|
||||||
|
Brace tokens: `{Enter}` `{Tab}` `{Esc}` `{Backspace}` `{Ctrl+Alt+Del}` …; `{{` is a literal `{`.
|
||||||
|
**Layout**: characters are mapped for **US QWERTY** only (non-US layouts may mistype symbols/letters).
|
||||||
|
**Windows numeric PIN**: Windows often submits automatically once enough digits are entered — usually no `{Enter}` needed. Use `--omit-last N` to omit the last N characters when you want to fill without signing in.
|
||||||
|
Logs and `--dry-run` report lengths/event counts only. When reusing a session, about one second after sending, a PNG frame is saved (default under `$XDG_RUNTIME_DIR/uu-viewer-type/`, mode 0600); the path is logged and printed as `snapshot=…`.
|
||||||
- Ctrl+Alt+F in the desktop window opens the files window on the same connection. `UU_VIEWER_AUDIO=0` disables sound,
|
- Ctrl+Alt+F in the desktop window opens the files window on the same connection. `UU_VIEWER_AUDIO=0` disables sound,
|
||||||
`UU_VIEWER_CLIPBOARD=0` the clipboard, `UU_VIEWER_VIEW_ONLY=1` input; `UU_VIEWER_FFMPEG` selects the ffmpeg binary.
|
`UU_VIEWER_CLIPBOARD=0` the clipboard, `UU_VIEWER_VIEW_ONLY=1` input; `UU_VIEWER_FFMPEG` selects the ffmpeg binary.
|
||||||
- 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.
|
||||||
|
|
||||||
|
The SDL remote desktop window disables local IME text composition and forwards physical keys; use the remote host’s input method and its language toggle (for example, Shift) to enter Chinese.
|
||||||
|
|
||||||
Mac targets use native macOS keycodes; Windows / Linux targets retain Windows VK. Keys follow physical positions, without
|
Mac targets use native macOS keycodes; Windows / Linux targets retain Windows VK. Keys follow physical positions, without
|
||||||
automatically translating Ctrl to Command; on a Mac target the PC Super / Windows key acts as Command. Only verified target
|
automatically translating Ctrl to Command; on a Mac target the PC Super / Windows key acts as Command. Only verified target
|
||||||
@@ -547,3 +680,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,32 @@
|
|||||||
<p align="center"><img src="docs/images/main-window.png" width="620" alt="Linux 主机主窗口:远程协助与账号"></p>
|
<p align="center"><img src="docs/images/main-window.png" width="620" alt="Linux 主机主窗口:远程协助与账号"></p>
|
||||||
<p align="center"><sub>Linux 被控端主窗口:远程协助与账号(设备 ID、验证码和账号已打码)</sub></p>
|
<p align="center"><sub>Linux 被控端主窗口:远程协助与账号(设备 ID、验证码和账号已打码)</sub></p>
|
||||||
|
|
||||||
|
## 外观 / Appearance
|
||||||
|
|
||||||
|
启动器图标使用系统主题的符号图标,避免缺少 emoji 字体时显示方框。
|
||||||
|
|
||||||
|
已登录的图形主机会上报系统壁纸,供官方客户端的设备卡片在未连接时显示背景图(不是桌面窗口截图)。支持 GNOME/Cinnamon、KDE、Xfce 和 Hyprland 下的 Omarchy(自动跟随当前壁纸);每 60 秒检查一次,内容不变则不重复上传。其他桌面可用 `UU_WALLPAPER=/绝对路径/图片.png` 指定 PNG/JPEG/WebP;`UU_WALLPAPER_UPLOAD=0` 关闭。访客和无桌面模式跳过上报。协议依据与限制见 [设备壁纸上报](docs/wallpaper-protocol.md)。
|
||||||
|
|
||||||
|
在控制端的 **设置 → 常规 → 外观**,或主机 / 工具窗口的齿轮设置按钮中选择 **跟随系统 / 浅色 / 深色**(默认跟随系统)。
|
||||||
|
选择保存在 `$XDG_CONFIG_HOME/uuremote/theme`(默认 `~/.config/uuremote/theme`)。
|
||||||
|
|
||||||
|
<p align="center"><img src="docs/images/appearance-light.png" width="360" alt="浅色界面(虚构设备)"> <img src="docs/images/appearance-dark.png" width="360" alt="深色界面(虚构设备)"></p>
|
||||||
|
|
||||||
|
## 语言 / Language
|
||||||
|
|
||||||
|
启动时按以下顺序确定界面语言:
|
||||||
|
|
||||||
|
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> -->
|
||||||
@@ -39,8 +65,9 @@
|
|||||||
| 鼠标 / 键盘 | 绝对/相对移动、点击、滚轮、按键;修复了网络延迟导致的按键连发;Wayland 下可用 uinput 虚拟键鼠(不依赖键盘布局,见下文) |
|
| 鼠标 / 键盘 | 绝对/相对移动、点击、滚轮、按键;修复了网络延迟导致的按键连发;Wayland 下可用 uinput 虚拟键鼠(不依赖键盘布局,见下文) |
|
||||||
| Mac 快捷键 | **推荐**:在 Mac 远控窗口菜单里关闭「使用 macOS 快捷键」,之后和在 Mac 上一样:Cmd+C/V/A/F/X/Z 是复制、粘贴、全选、查找、剪切、撤销(终端里 Cmd+C/V 自动变成 Ctrl+Shift+C/V),Ctrl+C 在终端里始终是中断。保持开启时,客户端会把 Cmd 和 Ctrl 都当成 Ctrl 发送:终端里 Ctrl+V / Cmd+V 自动转成粘贴,Ctrl+C 是中断,复制用 Cmd+Shift+C(X11) |
|
| Mac 快捷键 | **推荐**:在 Mac 远控窗口菜单里关闭「使用 macOS 快捷键」,之后和在 Mac 上一样:Cmd+C/V/A/F/X/Z 是复制、粘贴、全选、查找、剪切、撤销(终端里 Cmd+C/V 自动变成 Ctrl+Shift+C/V),Ctrl+C 在终端里始终是中断。保持开启时,客户端会把 Cmd 和 Ctrl 都当成 Ctrl 发送:终端里 Ctrl+V / Cmd+V 自动转成粘贴,Ctrl+C 是中断,复制用 Cmd+Shift+C(X11) |
|
||||||
| 鼠标指针样式 | 远端指针形状实时同步(X11) |
|
| 鼠标指针样式 | 远端指针形状实时同步(X11) |
|
||||||
| 剪贴板 | 双向文本同步 |
|
| 剪贴板 | 双向文本同步;Wayland 手机输入法输入通过剪贴板兜底粘贴,见下文 |
|
||||||
| 画质 / 帧率 / 分辨率 | 自动、原画 20M、超清 8M、高清 2M、自定义;30/60/90/144 帧;「其他分辨率」由编码器缩放,不改动主机显示器 |
|
| 观看模式批注 | 控制端观看模式下开启「批注」后画的笔迹显示在 Linux 屏幕上,并随画面传回控制端(X11,需要合成器;覆盖层不拦截鼠标);关闭批注或断开连接时清除。已用 Mac 控制端 4.42.0 实测,手机控制端未测 |
|
||||||
|
| 画质 / 帧率 / 分辨率 | 自动、原画 20M、超清 8M、高清 2M、自定义;30/60/90/144 帧;X11 下切换分辨率会像官方 Windows 被控端一样真正修改桌面分辨率(xrandr,缺少该模式时自动添加;选「原始」或断开后恢复),`UU_DESKTOP_RESIZE=0` 改为仅由编码器缩放;Wayland 仍由编码器缩放 |
|
||||||
| 声音 | 采集系统声音(PulseAudio / PipeWire),Opus 编码传到控制端 |
|
| 声音 | 采集系统声音(PulseAudio / PipeWire),Opus 编码传到控制端 |
|
||||||
| 文件传输 | 上传、下载(含文件夹)、新建文件夹、重命名、删除 |
|
| 文件传输 | 上传、下载(含文件夹)、新建文件夹、重命名、删除 |
|
||||||
| 终端 | 官方「终端」工具,PTY 会话,支持多会话和重命名 |
|
| 终端 | 官方「终端」工具,PTY 会话,支持多会话和重命名 |
|
||||||
@@ -65,7 +92,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,6 +102,10 @@ 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 的屏幕唤醒与锁屏恢复见下;剪贴板只在控制端的远控窗口处于前台时同步。
|
||||||
|
|
||||||
|
**手机控制端触控(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 逻辑尺寸仅用于本地输入映射。
|
||||||
|
|
||||||
GNOME Portal 的控制通道不再等待授权窗口或第一帧画面:先通知客户端当前选择桌面,再上报锁屏状态、接收官方客户端的「自动解锁被控端」请求。官方 Android 客户端需要桌面目标通知才会进入自动解锁流程,因此该通知不能等待采集就绪;真实屏幕尺寸、编码信息及采集权限仍按实际就绪状态上报。请在客户端启用自动解锁,使用当前 Linux 用户的登录密码;主机通过 PAM 验证后解锁当前 GNOME 会话、请求点亮屏幕,并恢复同一 Portal 会话中的画面、键鼠和剪贴板。首次授权或权限被撤销时仍需本机确认。物理或逻辑分辨率变化后需要重连。
|
GNOME Portal 的控制通道不再等待授权窗口或第一帧画面:先通知客户端当前选择桌面,再上报锁屏状态、接收官方客户端的「自动解锁被控端」请求。官方 Android 客户端需要桌面目标通知才会进入自动解锁流程,因此该通知不能等待采集就绪;真实屏幕尺寸、编码信息及采集权限仍按实际就绪状态上报。请在客户端启用自动解锁,使用当前 Linux 用户的登录密码;主机通过 PAM 验证后解锁当前 GNOME 会话、请求点亮屏幕,并恢复同一 Portal 会话中的画面、键鼠和剪贴板。首次授权或权限被撤销时仍需本机确认。物理或逻辑分辨率变化后需要重连。
|
||||||
@@ -85,28 +116,32 @@ GNOME Portal 的控制通道不再等待授权窗口或第一帧画面:先通
|
|||||||
|
|
||||||
锁屏黑帧使用 FFmpeg 的 libx264/libx265 编码器(按已协商的 H.264/H.265 选择),硬件编码器可用并不代表这些软件编码器已安装。编码失败会明确记录日志。黑帧不改变采集权限或上报的真实屏幕尺寸;解锁或锁状态未知时暂停,采集就绪、拒绝或连接关闭时结束,再由真实视频接续同一条视频轨。对照实验与验证范围见 [#29](../../issues/29)、[#34](../../pull/34)。
|
锁屏黑帧使用 FFmpeg 的 libx264/libx265 编码器(按已协商的 H.264/H.265 选择),硬件编码器可用并不代表这些软件编码器已安装。编码失败会明确记录日志。黑帧不改变采集权限或上报的真实屏幕尺寸;解锁或锁状态未知时暂停,采集就绪、拒绝或连接关闭时结束,再由真实视频接续同一条视频轨。对照实验与验证范围见 [#29](../../issues/29)、[#34](../../pull/34)。
|
||||||
|
|
||||||
原生 Wayland 后端需要合成器提供 `wlr-output-power-management` 才能唤醒已关闭的屏幕;缺少该协议不影响采集和编码。
|
原生 Wayland 后端需要合成器提供 `wlr-output-power-management` 才能唤醒已关闭的屏幕;缺少该协议不影响采集和编码。视频启动及运行期间,屏幕保活失败仅记录警告并在下轮重试,不终止视频;实际采集、编码或发送错误仍按原逻辑处理。
|
||||||
|
|
||||||
原生 Wayland 实验选项:`UU_WAYLAND_PIPELINE=0` 可关闭流水线做对照。`UU_WAYLAND_DMABUF=1` 显式尝试 dma-buf→GBM CPU 映射(默认关闭,需要运行时 libgbm;可用 `UU_WAYLAND_DMABUF_DEVICE` 指定 render node,默认 `/dev/dri/renderD128`)。仅支持显式线性修饰符、单平面 8-bit RGB,失败回退 SHM;virgl VM 中只验证了回退,成功导入/映射和硬件加速均未验证。这不是零拷贝 VAAPI 路径;选择 `UU_VIDEO_ENCODER=vaapi` 时仍由 FFmpeg 上传 CPU 帧。
|
原生 Wayland 实验选项:`UU_WAYLAND_PIPELINE=0` 可关闭流水线做对照。`UU_WAYLAND_DMABUF=1` 显式尝试 dma-buf→GBM CPU 映射(默认关闭,需要运行时 libgbm;可用 `UU_WAYLAND_DMABUF_DEVICE` 指定 render node,默认 `/dev/dri/renderD128`)。仅支持显式线性修饰符、单平面 8-bit RGB,失败回退 SHM;virgl VM 中只验证了回退,成功导入/映射和硬件加速均未验证。这不是零拷贝 VAAPI 路径;选择 `UU_VIDEO_ENCODER=vaapi` 时仍由 FFmpeg 上传 CPU 帧。
|
||||||
首次连接时,桌面会弹窗请求「远程桌面 / 屏幕共享」授权,同意后会记住授权。
|
首次连接时,桌面会弹窗请求「远程桌面 / 屏幕共享」授权,同意后会记住授权。
|
||||||
|
|
||||||
### Hyprland 多显示器切换(实验性)
|
### 多显示器切换(实验性)
|
||||||
|
|
||||||
原生 Wayland 的绝对鼠标定位默认绑定正在采集的输出,修复双屏桌面下的点击偏移。uinput 可继续用于键盘、按键和相对移动。
|
原生 Wayland 的绝对鼠标定位默认绑定正在采集的输出,修复双屏桌面下的点击偏移。uinput 可继续用于键盘、按键和相对移动。
|
||||||
|
|
||||||
设置 `UU_WAYLAND_MULTISCREEN=1` 后,手机端可选择并切换物理显示器;`UU_WAYLAND_OUTPUT` 指定默认屏幕。画面与绝对鼠标定位同步切换,支持不同分辨率、缩放和桌面位置。
|
设置 `UU_WAYLAND_MULTISCREEN=1` 后,手机端可选择并切换物理显示器;`UU_WAYLAND_OUTPUT` 指定默认屏幕。画面与绝对鼠标定位同步切换,支持不同分辨率、缩放和桌面位置。
|
||||||
|
|
||||||
切屏复用同一条视频轨道,过渡期间暂停输入,发送新屏首帧后恢复;采集或编码失败、等待首帧超时会请求恢复原屏。当前通过 `hyprctl` 枚举未旋转的显示器,显示器插拔或布局变化后需重启服务。已在 Omarchy / Hyprland 上用官方手机客户端实测 2560×1440(125%)与 1920×1080(133.33%)双屏切换及点击。
|
X11 会话默认把所有显示器拼成一张画面。设置 `UU_X11_MULTISCREEN=1` 后,主机按 `xrandr --listmonitors` 列出各个显示器,控制端可选择其中一块,只采集该区域,绝对鼠标坐标加上该屏幕在桌面中的偏移;默认屏幕为主显示器,`UU_X11_OUTPUT` 可指定其他屏幕(如 `HDMI-1`)。显示器布局在主机启动时读取,改动后需重启服务。此模式下控制端的「分辨率」改为缩放画面,不再修改显示模式。实验性:目前只有单元测试与 Xvfb 虚拟显示器实测,尚未经官方客户端实机验收。
|
||||||
|
|
||||||
|
切屏复用同一条视频轨道,过渡期间暂停输入,发送新屏首帧后恢复;采集或编码失败、等待首帧超时会请求恢复原屏。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 后端实验性支持,见上文 |
|
| 多显示器切换 | niri / Hyprland 原生 Wayland 后端与 X11(`UU_X11_MULTISCREEN=1`)实验性支持,见上文 |
|
||||||
| 真彩(4:4:4) | 支持(v0.1.15):NVENC / libx264 的默认 FFmpeg 管线输出 H.264 High 4:4:4;VAAPI 和 `inproc-av` 管线仍为 4:2:0,并如实回报给客户端 |
|
| 真彩(4:4:4) | 支持(v0.1.15):NVENC / libx264 的默认 FFmpeg 管线输出 H.264 High 4:4:4;`inproc-av` 原生 NVENC 输出 H.264 High 4:4:4 / HEVC FRExt;VAAPI 管线仍为 4:2:0,并如实回报给客户端 |
|
||||||
| HDR | 未实现 |
|
| HDR | 未实现 |
|
||||||
| 超级屏 / 虚拟显示器 | 未实现 |
|
| 超级屏 / 虚拟显示器 | 未实现 |
|
||||||
| 被控端防窥模式 | 未实现 |
|
| 被控端防窥模式 | 实验性,仅 KDE Plasma Wayland(portal);Mac 4.43.0 已验证不启用、隐私屏保、关闭显示屏三种状态回显;`UU_PRIVACY_AUTO=picture` / `screen-off` 可在桌面连接时自动开启,见 [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||||
| 麦克风(控制端声音传到被控端) | 未实现(需要虚拟声卡) |
|
| 麦克风(控制端声音传到被控端) | 未实现(需要虚拟声卡) |
|
||||||
| 魔兽世界排队提醒等插件 | 不支持,会明确告诉客户端「无插件」 |
|
| 魔兽世界排队提醒等插件 | 不支持,会明确告诉客户端「无插件」 |
|
||||||
| Linux 系统登录界面 | 还不支持控制开机后的系统登录界面(还没有人登录 Linux 桌面时);这种情况可以用无头模式或虚拟桌面(见下文)。注意:这里说的是 Linux 系统登录,**不登录 UU 账号**现在可以通过「远程协助」使用 |
|
| Linux 系统登录界面 | 还不支持控制开机后的系统登录界面(还没有人登录 Linux 桌面时);这种情况可以用无头模式或虚拟桌面(见下文)。注意:这里说的是 Linux 系统登录,**不登录 UU 账号**现在可以通过「远程协助」使用 |
|
||||||
@@ -125,16 +160,20 @@ uuremote-server login # 用 UU 远程 App 扫
|
|||||||
systemctl --user enable --now uuremote-native.service # 随图形会话启动
|
systemctl --user enable --now uuremote-native.service # 随图形会话启动
|
||||||
```
|
```
|
||||||
|
|
||||||
deb 会安装程序、插件、用户级 systemd 服务和应用菜单图标;uinput 权限不会自动开启(见第 5 步)。
|
deb 会安装程序、插件、用户级 systemd 服务和应用菜单图标,并通过依赖自动装上 FFmpeg;uinput 权限不会自动开启(见第 5 步)。
|
||||||
GNOME / KDE 会把显示环境自动传给服务;Xfce 等不传的桌面需按第 4 步补 `DISPLAY`。
|
GNOME / KDE 会把显示环境自动传给服务;Xfce 等不传的桌面需按第 4 步补 `DISPLAY`。
|
||||||
|
|
||||||
**其他发行版**:从 [Releases](../../releases/latest) 下载 `uu-remote-linux-<版本>-x86_64-linux.tar.gz`(ARM64 选 `aarch64-linux`),解压后:
|
**其他发行版**:从 [Releases](../../releases/latest) 下载 `uu-remote-linux-<版本>-x86_64-linux.tar.gz`(ARM64 选 `aarch64-linux`),解压后用普通桌面用户(不要 root)运行:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
install -Dm755 uuremote-server ~/.local/bin/uuremote-server
|
cd uu-remote-linux-<版本>-x86_64-linux
|
||||||
install -Dm644 libuu-wayland.so libuu-portal.so -t ~/.local/lib/uu-remote-linux/
|
./install.sh # 加 --yes 不询问;--no-ffmpeg 只检查不安装
|
||||||
```
|
```
|
||||||
|
|
||||||
|
脚本把程序和插件装到 `~/.local`,写入用户级 systemd 服务(已有则保留),并检查 FFmpeg(需带 libx264,否则客户端会一直停在「正在传输画面」)。
|
||||||
|
缺 FFmpeg 时经 sudo 用 apt / pacman 安装;Fedora 需先启用 RPM Fusion,openSUSE 需 Packman 源,脚本只提示命令、不替你添加第三方源。
|
||||||
|
服务启动时和每次有人连接桌面时都会检查 FFmpeg:不可用就记 error,并弹桌面通知(没有通知服务时打开主窗口,顶部红字提示安装方法,最多每 5 分钟一次);装好后重新连接即可,不用重启服务。
|
||||||
|
|
||||||
同一个包支持 X11、Hyprland 等 wlroots 合成器和 GNOME/KDE Wayland:程序启动时按当前会话自动选择后端,只在 Wayland 会话里
|
同一个包支持 X11、Hyprland 等 wlroots 合成器和 GNOME/KDE Wayland:程序启动时按当前会话自动选择后端,只在 Wayland 会话里
|
||||||
才加载对应的 `libuu-*.so`,X11 用户不需要任何 Wayland 库。系统要求:
|
才加载对应的 `libuu-*.so`,X11 用户不需要任何 Wayland 库。系统要求:
|
||||||
|
|
||||||
@@ -157,6 +196,10 @@ sudo apt install build-essential pkg-config \
|
|||||||
sudo apt install libwayland-dev libxkbcommon-dev wl-clipboard
|
sudo apt install libwayland-dev libxkbcommon-dev wl-clipboard
|
||||||
# 可选:GNOME/KDE portal 后端
|
# 可选:GNOME/KDE portal 后端
|
||||||
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 本体运行时加载)
|
||||||
|
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>)。
|
||||||
@@ -171,6 +214,12 @@ cargo build --release --features wayland # + Hyprland
|
|||||||
cargo build --release --features wayland,portal # + GNOME/KDE Wayland
|
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)。
|
||||||
|
服务端可选的 `--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. 登录
|
||||||
|
|
||||||
在图形桌面里运行:
|
在图形桌面里运行:
|
||||||
@@ -182,6 +231,10 @@ cargo build --release --features wayland,portal # + GNOME/KDE Wayland
|
|||||||
用手机上的 **网易 UU 远程 App** 扫码并确认即可。登录信息只保存在本机的
|
用手机上的 **网易 UU 远程 App** 扫码并确认即可。登录信息只保存在本机的
|
||||||
`~/.config/uuremote/config.json`(权限 0600)里。
|
`~/.config/uuremote/config.json`(权限 0600)里。
|
||||||
|
|
||||||
|
登录状态查询失败或达到 60 秒请求超时不代表二维码已过期,也不代表手机已经确认。程序保留官方客户端的刷新策略:查询出错后点击「刷新二维码」(终端按回车;无窗口且无终端时 60 秒后刷新)。二维码请求诊断只包含请求阶段、错误类别、耗时、HTTP/API 状态及最后已知扫码状态,不输出票据、URL 或响应内容;`connect` 类别本身不能确定是 DNS、TLS 还是代理问题。
|
||||||
|
|
||||||
|
这个文件里还有本机的设备身份(`device_id`、`client_id`、`system_id`),重装软件和重新扫码登录都会沿用它。**不要在机器之间拷贝 `config.json`,也不要从带着家目录的快照/数据盘克隆出第二台主机**:同一身份的两个主机实例(不论在同一台还是不同机器上)会互相把对方踢出房间,日志表现为每隔几秒出现 `Cloud room leave without peer identifier` 并反复重连,控制端一连就断。克隆或拷贝出来的机器先停掉服务,删掉配置里这三个键和 `token`、`csrf`、`user_id`,再运行 `uuremote-server login` 注册为新设备。同一台机器上残留的旧实例(例如以前手动启动的 `~/.local/bin/uuremote-server`)也会这样,`uuremote-server doctor` 发现多个主机实例时会提示。
|
||||||
|
|
||||||
### 4. 作为用户服务常驻
|
### 4. 作为用户服务常驻
|
||||||
|
|
||||||
`~/.config/systemd/user/uuremote-native.service`:
|
`~/.config/systemd/user/uuremote-native.service`:
|
||||||
@@ -190,17 +243,17 @@ cargo build --release --features wayland,portal # + GNOME/KDE Wayland
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=UU Remote Linux host (unofficial)
|
Description=UU Remote Linux host (unofficial)
|
||||||
After=graphical-session.target
|
After=graphical-session.target
|
||||||
|
PartOf=graphical-session.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Environment=RUST_LOG=info
|
Environment=RUST_LOG=info
|
||||||
# X11 桌面需要指明显示器;GNOME 的 XAUTHORITY 一般在 /run/user/<uid>/gdm/Xauthority
|
# GNOME/KDE 等桌面会把 DISPLAY / WAYLAND_DISPLAY 导入用户管理器,并启动 graphical-session.target
|
||||||
Environment=DISPLAY=:0
|
|
||||||
ExecStart=%h/.local/bin/uuremote-server
|
ExecStart=%h/.local/bin/uuremote-server
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=5
|
RestartSec=5
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=default.target
|
WantedBy=graphical-session.target
|
||||||
```
|
```
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
@@ -212,6 +265,9 @@ journalctl --user -u uuremote-native.service -f # 看到 availability=Some("re
|
|||||||
|
|
||||||
如果还没有登录,服务会自动在桌面上弹出扫码窗口。
|
如果还没有登录,服务会自动在桌面上弹出扫码窗口。
|
||||||
|
|
||||||
|
Xfce、i3 等不启动 `graphical-session.target` 的桌面,按上面的写法开机不会自启:把 `[Install]` 改成 `WantedBy=default.target`,
|
||||||
|
并加上 `Environment=DISPLAY=:0`(按实际显示器填写),再重新 `enable`。下文的无头模式、虚拟桌面也要用 `default.target`。
|
||||||
|
|
||||||
### 5. Wayland 下使用 uinput 虚拟键鼠(推荐)
|
### 5. Wayland 下使用 uinput 虚拟键鼠(推荐)
|
||||||
|
|
||||||
Wayland(尤其是 GNOME/KDE portal)下,默认的键鼠注入要经过 portal 授权,部分键盘布局下还会丢符号(比如下划线)。
|
Wayland(尤其是 GNOME/KDE portal)下,默认的键鼠注入要经过 portal 授权,部分键盘布局下还会丢符号(比如下划线)。
|
||||||
@@ -226,6 +282,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 远程的「开始协助」里输入即可控制本机。
|
||||||
@@ -251,7 +309,7 @@ install -Dm644 contrib/desktop/uu-remote-linux-viewer.desktop ~/.local/share/app
|
|||||||
## 没有显示器的服务器
|
## 没有显示器的服务器
|
||||||
|
|
||||||
**无头模式**:只要终端、文件传输和端口映射,不需要图形界面。在服务里加 `Environment=UU_DESKTOP_BACKEND=none`,
|
**无头模式**:只要终端、文件传输和端口映射,不需要图形界面。在服务里加 `Environment=UU_DESKTOP_BACKEND=none`,
|
||||||
再执行 `loginctl enable-linger $USER`,这样开机后不用登录,systemd 用户服务(以及 `XDG_RUNTIME_DIR`、用户 D-Bus)也会自动启动。
|
把 `[Install]` 改成 `WantedBy=default.target`(无人登录时 `graphical-session.target` 不会启动),再执行 `loginctl enable-linger $USER`,这样开机后不用登录,systemd 用户服务(以及 `XDG_RUNTIME_DIR`、用户 D-Bus)也会自动启动。
|
||||||
无头模式下控制端点「远程桌面」会一直显示正在连接,这是正常的。首次登录用 `uuremote-server login --no-gui` 在终端里扫码。
|
无头模式下控制端点「远程桌面」会一直显示正在连接,这是正常的。首次登录用 `uuremote-server login --no-gui` 在终端里扫码。
|
||||||
|
|
||||||
**群晖 / NAS(Docker)**:没有桌面的 NAS 可以用容器运行无头模式(文件传输、终端、端口映射)。
|
**群晖 / NAS(Docker)**:没有桌面的 NAS 可以用容器运行无头模式(文件传输、终端、端口映射)。
|
||||||
@@ -291,12 +349,18 @@ systemctl --user restart uuremote-native.service
|
|||||||
|---|---|
|
|---|---|
|
||||||
| `UU_CONFIG` | 配置文件路径(默认 `~/.config/uuremote/config.json`) |
|
| `UU_CONFIG` | 配置文件路径(默认 `~/.config/uuremote/config.json`) |
|
||||||
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms`(实验性特性) / `none`(无头模式) |
|
| `UU_DESKTOP_BACKEND` | `auto` / `x11` / `wayland` / `portal` / `kms`(实验性特性) / `none`(无头模式) |
|
||||||
| `UU_WAYLAND_MULTISCREEN=1` | 启用 Hyprland 物理显示器切换(默认关闭) |
|
| `UU_DESKTOP_RESIZE=0` | X11 下控制端切换分辨率时不改桌面分辨率,只缩放编码画面 |
|
||||||
|
| `UU_NVENC_RGB=0` / `=1` | NVENC 直接编码 BGRA(省 CPU)。显示器接在 NVIDIA 卡上时默认关闭(同卡合成时直吃反而更慢),`0` 强制关,`1` 强制开 |
|
||||||
|
| `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_OUTPUT` | X11 默认采集的显示器名称(`xrandr --listmonitors`),默认主显示器 |
|
||||||
|
| `UU_WAYLAND_NO_VIRTUAL_KEYBOARD=1` | 原生 Wayland 不创建虚拟键盘(如 Denial 只把它给自己的输入法),键盘改走 uinput。合成器没有 wlr-virtual-pointer 时鼠标也自动改走 uinput(#72) |
|
||||||
| `UU_INPUT_BACKEND` | `auto`(默认,Wayland 下可用时用 uinput)/ `uinput` / `native` |
|
| `UU_INPUT_BACKEND` | `auto`(默认,Wayland 下可用时用 uinput)/ `uinput` / `native` |
|
||||||
| `UU_TERMINAL_SHORTCUTS=0` | 关闭终端窗口里的 Ctrl+V 粘贴转换 |
|
| `UU_TERMINAL_SHORTCUTS=0` | 关闭终端窗口里的 Ctrl+V 粘贴转换 |
|
||||||
| `UU_VIDEO_ENCODER` | `cpu` 强制 CPU;`vaapi` 显式启用 Intel/AMD 硬编;`nvenc` 强制 NVENC;未设置时检测到 NVIDIA 驱动才用 NVENC,否则用 CPU |
|
| `UU_VIDEO_ENCODER` | `cpu` 强制 CPU;`vaapi` 显式启用 Intel/AMD 硬编;`nvenc` 强制 NVENC;未设置或 `auto` 时后台探测(每个候选编码一帧,限时 3 秒)。有 NVIDIA 驱动时顺序是 NVENC → CPU;没有 NVIDIA 时只有 CPU,不探测。探测未完成就建流则沿用旧规则(有 NVIDIA 用 NVENC,否则 CPU)。自行编译的 `--features inproc-av` 上,仅 X11 会先走进程内引擎:外部 FFmpeg 探测失败时记为 `native_unprobed`,沿用旧规则(NVENC);Wayland、portal、KMS 回退 CPU。只有 CPU 时跳过探测,记为 `not probed (only candidate)`。探测成功和这种只含 CPU 的跳过会缓存到 NVIDIA 是否存在发生变化为止(`/proc/driver/nvidia/version` 或 `/dev/nvidia0`)。之后的桌面连接在后台再探测一次(不挡住这一路,仍用缓存的编码器)。NVENC 探测失败、选用 CPU 时只缓存 10 分钟;到期后下一次桌面连接同样在后台再探测一次,再次失败则重新计 10 分钟。显式 `cpu` / `vaapi` / `nvenc` 不启动探测。`native_unprobed` 不算失败缓存。优先级低于 `host_settings.json` 里非 `auto` 的 `video_encoder`。VAAPI 要等 #33 解决后才会进入 auto |
|
||||||
| `UU_VAAPI_BUFFER_MS` | VAAPI 的 VBV 缓冲(10–1000 ms,仅 `UU_VIDEO_ENCODER=vaapi` 时生效);高分辨率下关键帧被压糊时用它换稳定画质 |
|
| `UU_VAAPI_BUFFER_MS` | VAAPI 的 VBV 缓冲(10–1000 ms,仅 `UU_VIDEO_ENCODER=vaapi` 时生效);高分辨率下关键帧被压糊时用它换稳定画质 |
|
||||||
|
| `UU_NVENC_BUFFER_MS` | NVENC 的 VBV 缓冲(10–1000 ms,仅 NVENC 生效,含进程内引擎);默认 100–500 kbit,1440p 等高分辨率下关键帧被压糊、按 GOP 周期闪烁时设 `1000`(#103) |
|
||||||
| `UU_FFMPEG_ROOT` | 使用指定目录下的 FFmpeg |
|
| `UU_FFMPEG_ROOT` | 使用指定目录下的 FFmpeg |
|
||||||
| `UU_AUDIO=0` | 关闭声音转发;`UU_AUDIO_SOURCE` 指定 PulseAudio 采集源 |
|
| `UU_AUDIO=0` | 关闭声音转发;`UU_AUDIO_SOURCE` 指定 PulseAudio 采集源 |
|
||||||
| `UU_LOGIN_WINDOW=0` | 凭证缺失时不自动弹出登录窗口 |
|
| `UU_LOGIN_WINDOW=0` | 凭证缺失时不自动弹出登录窗口 |
|
||||||
@@ -304,9 +368,16 @@ systemctl --user restart uuremote-native.service
|
|||||||
| `UU_ASSIST_ALLOW=1` | 启动时就允许他人远程协助(覆盖窗口里保存的开关状态) |
|
| `UU_ASSIST_ALLOW=1` | 启动时就允许他人远程协助(覆盖窗口里保存的开关状态) |
|
||||||
| `UU_PORT_MAPPING=0` | 关闭端口映射(对应官方被控端的开关) |
|
| `UU_PORT_MAPPING=0` | 关闭端口映射(对应官方被控端的开关) |
|
||||||
| `UU_WOL_HELPER=1` | 实验性:让这台主机像官方 Windows 被控端一样充当「远程开机」辅助设备——登录后向网易上报本机局域网信息,收到云端唤醒请求时向同一局域网发送唤醒包(未经端到端验证) |
|
| `UU_WOL_HELPER=1` | 实验性:让这台主机像官方 Windows 被控端一样充当「远程开机」辅助设备——登录后向网易上报本机局域网信息,收到云端唤醒请求时向同一局域网发送唤醒包(未经端到端验证) |
|
||||||
| `UU_USE_PROXY=1` | 使用环境变量里的 HTTP/SOCKS 代理;默认忽略代理、直连网易服务器 |
|
| `UU_USE_PROXY=1` | REST API 与 host/viewer WebSocket 信令共用环境 HTTP/HTTPS 代理策略;默认忽略代理、直连 |
|
||||||
|
|
||||||
「远程结束后自动锁屏」「静音运行」等设置保存在 `~/.config/uuremote/host_settings.json`。
|
|
||||||
|
`UU_USE_PROXY=1` 仅使用当前进程已有的代理配置;`HTTP_PROXY` / `HTTPS_PROXY` / `ALL_PROXY`(及小写形式)和 `NO_PROXY` 按 reqwest 的标准规则选择,大写优先。信令拒绝选定变量中的无效/不支持的代理 URL(仅 HTTP/HTTPS;不支持 SOCKS)、带路径/查询/片段的代理 URL,以及会忽略代理的 CGI 环境;此校验比 reqwest 默默忽略坏值更严格。未配置匹配代理或命中 `NO_PROXY` 时仍正常直连,选中代理后连接失败不会改为直连。信令保留 TLS 证书校验,不跟随重定向,也不转发认证头到重定向目标。
|
||||||
|
|
||||||
|
开启后主机还会经 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。
|
||||||
|
|
||||||
|
自定义码率按客户端选择的 Mbps 生效,例如 1 Mbps 对应 1000 kbit/s 的编码上限。
|
||||||
|
|
||||||
选择码率档(原画 / 超清 / 高清 / 自定义)时,外部 FFmpeg 的 CPU 编码以平均码率(ABR)为目标,避免 4K 低码率下关键帧发灰;「自动」档仍使用恒定质量(CRF)。
|
选择码率档(原画 / 超清 / 高清 / 自定义)时,外部 FFmpeg 的 CPU 编码以平均码率(ABR)为目标,避免 4K 低码率下关键帧发灰;「自动」档仍使用恒定质量(CRF)。
|
||||||
|
|
||||||
@@ -336,6 +407,7 @@ flowchart LR
|
|||||||
|
|
||||||
## 安全与隐私
|
## 安全与隐私
|
||||||
|
|
||||||
|
- 已登录的图形主机默认会将当前壁纸图片上传到 UU 的文件服务,供设备卡片显示背景;可用 `UU_WALLPAPER_UPLOAD=0` 关闭上传。
|
||||||
- 日志不记录键盘输入、终端内容、剪贴板内容、文件内容、密码和令牌。
|
- 日志不记录键盘输入、终端内容、剪贴板内容、文件内容、密码和令牌。
|
||||||
- 自动解锁的密码保存在**控制端**(官方客户端)里,被控端只拿来做一次 PAM 校验,不落盘、不写日志。
|
- 自动解锁的密码保存在**控制端**(官方客户端)里,被控端只拿来做一次 PAM 校验,不落盘、不写日志。
|
||||||
- 能连上这台机器的,只有登录了同一个 UU 账号的设备。请保管好你的 UU 账号。
|
- 能连上这台机器的,只有登录了同一个 UU 账号的设备。请保管好你的 UU 账号。
|
||||||
@@ -370,13 +442,14 @@ HEVC 的访问单元按 RFC 7798 的图片边界切分,不依赖 AUD:`hevc_v
|
|||||||
画面从码流里丢掉,读取端按 AUD 切分就会把整个 GOP 当成一帧,再被 IRAP 门控全部拒绝——对外表现为连接停在
|
画面从码流里丢掉,读取端按 AUD 切分就会把整个 GOP 当成一帧,再被 IRAP 门控全部拒绝——对外表现为连接停在
|
||||||
「正在传输画面」,而主机侧只有约 12 kbit/s。`UU_VIDEO_CODEC=h265` 可显式选中 H.265,便于对照排查。
|
「正在传输画面」,而主机侧只有约 12 kbit/s。`UU_VIDEO_CODEC=h265` 可显式选中 H.265,便于对照排查。
|
||||||
|
|
||||||
### VAAPI 硬件编码(显式启用)
|
### VAAPI 硬件编码
|
||||||
|
|
||||||
设置 `UU_VIDEO_ENCODER=vaapi` 使用 Intel/AMD H.264 VAAPI;`UU_VAAPI_DEVICE` 默认
|
`UU_VIDEO_ENCODER=vaapi` 或 `set-encoder vaapi` 显式选择 Intel/AMD H.264 VAAPI。
|
||||||
`/dev/dri/renderD128`,运行用户需要 render 节点权限。不会自动选择 VAAPI;设备或驱动初始化
|
`UU_VAAPI_DEVICE` 默认 `/dev/dri/renderD128`,运行用户需要 render 节点权限。
|
||||||
失败会明确警告并回退 libx264。外部 FFmpeg 和 `--features inproc-av` 均先转 NV12 再上传硬件帧。
|
`auto` 有 NVIDIA 驱动时是 NVENC → CPU,没有 NVIDIA 时是 CPU。VAAPI 只通过显式选择启用,进入 auto 要等 #33。
|
||||||
|
设备或驱动初始化失败会明确警告并回退 libx264。外部 FFmpeg 先转 NV12 再上传硬件帧。
|
||||||
VBR 使用控制端码率预设及 CQ 对应的最小 QP,无 B 帧、async depth=1,并保留现有 GOP/VFR 规则。
|
VBR 使用控制端码率预设及 CQ 对应的最小 QP,无 B 帧、async depth=1,并保留现有 GOP/VFR 规则。
|
||||||
Intel 核显(UHD 770,iHD 驱动)已实机验收:默认的外部 FFmpeg 管线用官方 Mac 控制端测试了各档画质、帧率、缩放和重连,全程硬件编码、无回退,CPU 占用比 libx264 低约 40%。**AMD 显卡和 `--features inproc-av` 管线的 VAAPI 尚未实机验证。**
|
Intel 核显(UHD 770,iHD 驱动)已实机验收:默认的外部 FFmpeg 管线用官方 Mac 控制端测试了各档画质、帧率、缩放和重连,全程硬件编码、无回退,CPU 占用比 libx264 低约 40%(该数字为 FFmpeg 进程管线时代的测量)。AMD 核显已在**进程内原生引擎**上实机验收(`--features inproc-av`):官方 Mac 客户端的端到端会话在 HawkPoint(Mesa 26.2.3)与 Cezanne(Mesa 26.2.5)上通过验收(HEVC,含画质档、帧率、缩放);Cezanne 上另以探测验证了 H.264 与两条采集路径——XShm 上传(码流可解码、画面正确)与 DRI3 DMA-BUF 零拷贝导入。同机实测(1920×1200@60,Cezanne iGPU + RTX 3050 Ti 双显卡):进程内 VAAPI 每帧编码 CPU 约为 libx264(FFmpeg 管线 superfast)的 **1/12**、进程内 NVENC 的 **1/5**;外部 FFmpeg 进程管线(预编译包使用)在 AMD 上未单独验证。
|
||||||
|
|
||||||
高分辨率下 VAAPI 的默认 VBV 缓冲(100–500 kbit)会把关键帧压得过狠:2560×1440 H.264 VAAPI、30M
|
高分辨率下 VAAPI 的默认 VBV 缓冲(100–500 kbit)会把关键帧压得过狠:2560×1440 H.264 VAAPI、30M
|
||||||
上限、静止画面上实测首个 IDR 只有 59,910 字节,画面每隔一个 GOP 糊一下再慢慢恢复。设
|
上限、静止画面上实测首个 IDR 只有 59,910 字节,画面每隔一个 GOP 糊一下再慢慢恢复。设
|
||||||
@@ -441,8 +514,7 @@ WantedBy=graphical-session.target
|
|||||||
VAAPI 可选包:Intel 新显卡用 `intel-media-driver`,AMD 用 `libva-mesa-driver`,`libva-utils` 提供
|
VAAPI 可选包:Intel 新显卡用 `intel-media-driver`,AMD 用 `libva-mesa-driver`,`libva-utils` 提供
|
||||||
`vainfo`。KMS 依赖 `libdrm`。虚拟 Xfce 依赖 `xorg-server-xvfb xorg-xauth xorg-xdpyinfo
|
`vainfo`。KMS 依赖 `libdrm`。虚拟 Xfce 依赖 `xorg-server-xvfb xorg-xauth xorg-xdpyinfo
|
||||||
xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`。
|
xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`。
|
||||||
滚动 Arch 的 FFmpeg 可能超出 `inproc-av` 支持的 6.x;请使用默认进程方案或独立的 FFmpeg 6 前缀,
|
若编译包含 `viewer-ffmpeg`,滚动 Arch 的 FFmpeg 可能超出其支持的 6.x;请使用独立的 FFmpeg 6 前缀,不要降级系统 FFmpeg(服务端的 `--features inproc-av` 原生 NVENC 不依赖 FFmpeg)。
|
||||||
不要降级系统 FFmpeg。
|
|
||||||
|
|
||||||
### 实验性 KMS 截屏
|
### 实验性 KMS 截屏
|
||||||
|
|
||||||
@@ -455,6 +527,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` 相互独立,默认主机构建和行为不变。
|
||||||
|
|
||||||
@@ -462,7 +536,12 @@ xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`。
|
|||||||
`ffmpeg` 命令;SDL 桌面窗口直接同步文本剪贴板(Wayland/X11),无需额外剪贴板工具;终端功能需要本机终端程序(可用 `TERMINAL` 指定)。
|
`ffmpeg` 命令;SDL 桌面窗口直接同步文本剪贴板(Wayland/X11),无需额外剪贴板工具;终端功能需要本机终端程序(可用 `TERMINAL` 指定)。
|
||||||
从源码构建:`sudo apt install libsdl2-dev`,然后 `cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`。
|
从源码构建:`sudo apt install libsdl2-dev`,然后 `cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`。
|
||||||
|
|
||||||
SDL 剪贴板复用桌面窗口,避免 GNOME Wayland 上临时窗口引起的 Dock 跳动(#37)。仅在桌面窗口获得焦点时同步,
|
组合键使用 SDL 按键事件携带的左右修饰键状态;窗口失焦时释放远端按键,重新聚焦后的下一次普通按键会恢复仍按住的 Shift/Ctrl/Alt/Win(Mac 为 Command)。此行为内置,无需适配库或开关。
|
||||||
|
|
||||||
|
控制端会同步远端以 PNG 发送的指针形状(如文本光标和窗口缩放箭头),并保留正确热点。离开远控画面或打开本地菜单时恢复本机箭头。
|
||||||
|
|
||||||
|
SDL 剪贴板复用桌面窗口,避免 GNOME Wayland 上临时窗口引起的 Dock 跳动(#37)。niri 改用支持 data-control 的
|
||||||
|
`wl-clipboard`,不需要桌面窗口保持焦点;其他 SDL 后端仅在桌面窗口获得焦点时同步。
|
||||||
保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。
|
保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。
|
||||||
SDL2 同步读取选择内容,慢速的剪贴板提供者可能暂时阻塞窗口,桥接超时无法中断该原生调用。
|
SDL2 同步读取选择内容,慢速的剪贴板提供者可能暂时阻塞窗口,桥接超时无法中断该原生调用。
|
||||||
GNOME 与官方 Mac 被控端的双向剪贴板尚未验证通过;此修改不解决被控端兼容问题。
|
GNOME 与官方 Mac 被控端的双向剪贴板尚未验证通过;此修改不解决被控端兼容问题。
|
||||||
@@ -474,11 +553,27 @@ GNOME 与官方 Mac 被控端的双向剪贴板尚未验证通过;此修改不
|
|||||||
- 命令行:`connect DEVICE false - echo legacy [--view-only]`(桌面)、`files DEVICE ls|get|put …`、`terminal DEVICE [SESSION]`、
|
- 命令行:`connect DEVICE false - echo legacy [--view-only]`(桌面)、`files DEVICE ls|get|put …`、`terminal DEVICE [SESSION]`、
|
||||||
`terminal-ui DEVICE NAME`、`portmap DEVICE LOCAL_PORT HOST PORT`(只监听 127.0.0.1)、`power DEVICE reboot|shutdown`、`unbind DEVICE`(从账号删除设备,启动窗口「更多工具」里也有)、
|
`terminal-ui DEVICE NAME`、`portmap DEVICE LOCAL_PORT HOST PORT`(只监听 127.0.0.1)、`power DEVICE reboot|shutdown`、`unbind DEVICE`(从账号删除设备,启动窗口「更多工具」里也有)、
|
||||||
`assist CONNECT_ID`(验证码从 stdin 读取一行,不能作为参数传入)。`uuremote-viewer --help` 查看全部参数。
|
`assist CONNECT_ID`(验证码从 stdin 读取一行,不能作为参数传入)。`uuremote-viewer --help` 查看全部参数。
|
||||||
|
- **安全输入 `type`**(向已打开的桌面会话注入键盘,适合锁屏 PIN / 密码;文本永不进 argv):
|
||||||
|
```sh
|
||||||
|
# 推荐:先 ui/connect 打开桌面,再 type(复用会话,不顶掉当前画面)
|
||||||
|
UU_INPUT_ENV=UU_SECRET UU_SECRET='……' \
|
||||||
|
uuremote-viewer type DEVICE [--delay-ms 40] [--omit-last 1] [--snapshot /path/out.png]
|
||||||
|
# 或:printf '%s' '……' | uuremote-viewer type DEVICE
|
||||||
|
# 只检查、不连网:uuremote-viewer type DEVICE --dry-run
|
||||||
|
# 没有正在运行的桌面会话时必须显式:--new-session(会新开连接,并顶掉已打开的桌面窗口,见上游 #30)
|
||||||
|
```
|
||||||
|
特殊键用花括号:`{Enter}` `{Tab}` `{Esc}` `{Backspace}` `{Ctrl+Alt+Del}` 等;`{{` 表示字面 `{`。
|
||||||
|
**布局**:字符按 **US QWERTY** 物理键位映射(非美式布局的符号/字母可能对不上)。
|
||||||
|
**Windows 数字 PIN**:输满位数后系统常会自动提交,一般不必再发 `{Enter}`;若只想填入、不登录,用 `--omit-last N` 省略最后 N 个字符。
|
||||||
|
日志与 `--dry-run` 输出只含长度/事件数,不含明文。复用会话时,发送约 1 秒后会保存一帧 PNG(默认写在 `$XDG_RUNTIME_DIR/uu-viewer-type/`,权限 0600),路径打在日志并打印 `snapshot=…`。
|
||||||
- 桌面窗口中按 Ctrl+Alt+F 打开文件窗口(复用同一连接)。`UU_VIEWER_AUDIO=0` 关闭声音,`UU_VIEWER_CLIPBOARD=0` 关闭剪贴板,
|
- 桌面窗口中按 Ctrl+Alt+F 打开文件窗口(复用同一连接)。`UU_VIEWER_AUDIO=0` 关闭声音,`UU_VIEWER_CLIPBOARD=0` 关闭剪贴板,
|
||||||
`UU_VIEWER_VIEW_ONLY=1` 只看不控,`UU_VIEWER_FFMPEG` 指定 ffmpeg 路径。
|
`UU_VIEWER_VIEW_ONLY=1` 只看不控,`UU_VIEWER_FFMPEG` 指定 ffmpeg 路径。
|
||||||
- 桌面同时提供 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` 可改为固定的留黑边画布。
|
||||||
|
|
||||||
|
SDL 远程画面窗口关闭本地输入法的文本组合,按物理键转发;输入中文时请使用被控端的输入法及其中英切换键(例如 Shift)。
|
||||||
|
|
||||||
Mac 目标使用 macOS 原生键码,Windows / Linux 目标保留 Windows VK。键盘按物理键位置转发,不自动把 Ctrl 改成 Command;
|
Mac 目标使用 macOS 原生键码,Windows / Linux 目标保留 Windows VK。键盘按物理键位置转发,不自动把 Ctrl 改成 Command;
|
||||||
控制 Mac 时,PC 键盘的 Super / Win 键对应 Command。仅接受已验证的目标平台值 1(Windows / 本项目 Linux 主机)和 4(Mac),
|
控制 Mac 时,PC 键盘的 Super / Win 键对应 Command。仅接受已验证的目标平台值 1(Windows / 本项目 Linux 主机)和 4(Mac),
|
||||||
@@ -501,3 +596,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)。
|
||||||
@@ -0,0 +1,133 @@
|
|||||||
|
//! Standalone benchmark tool measuring:
|
||||||
|
//! 1. Host Memory Copy Bandwidth & CPU Cost (What FFmpeg/Sway CPU swizzling does)
|
||||||
|
//! 2. NVENC H.265 Hardware Throughput & Latency (1920x1200 @ ultra-low-latency)
|
||||||
|
//! 3. NVENC reading a registered (pinned) host buffer
|
||||||
|
|
||||||
|
use std::time::Instant;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
println!("=========================================================");
|
||||||
|
println!(" UU Remote Linux: Encoder Pipeline Benchmark Suite ");
|
||||||
|
println!("=========================================================");
|
||||||
|
println!();
|
||||||
|
|
||||||
|
let width: u32 = 1920;
|
||||||
|
let height: u32 = 1200;
|
||||||
|
let frames: usize = 300; // 5 seconds of 60fps video
|
||||||
|
let frame_bytes: usize = (width * height * 4) as usize;
|
||||||
|
|
||||||
|
println!("Test Configuration:");
|
||||||
|
println!(" Resolution : {}x{}", width, height);
|
||||||
|
println!(" Frame Size : {:.2} MB (ARGB32)", frame_bytes as f64 / 1024.0 / 1024.0);
|
||||||
|
println!(" Iterations : {} frames (Equivalent to 5.0s @ 60 FPS)", frames);
|
||||||
|
println!();
|
||||||
|
|
||||||
|
// Simulating XShm framebuffer
|
||||||
|
let mut host_pixels = vec![0x55u8; frame_bytes];
|
||||||
|
|
||||||
|
// Benchmark 1: CPU Memcpy (External FFmpeg stdin / Sway wlr-screencopy CPU copy baseline)
|
||||||
|
println!("[1] Baseline: CPU Frame Memcpy Overhead (IPC / Process Pipe Cost)");
|
||||||
|
let mut sink = vec![0u8; frame_bytes];
|
||||||
|
let start_memcpy = Instant::now();
|
||||||
|
for _ in 0..frames {
|
||||||
|
sink.copy_from_slice(&host_pixels);
|
||||||
|
std::hint::black_box(&sink);
|
||||||
|
}
|
||||||
|
let duration_memcpy = start_memcpy.elapsed();
|
||||||
|
let memcpy_per_frame = duration_memcpy.as_secs_f64() * 1000.0 / frames as f64;
|
||||||
|
let memcpy_gbps = (frame_bytes * frames) as f64 / duration_memcpy.as_secs_f64() / 1e9;
|
||||||
|
let cpu_load_60fps = (memcpy_per_frame / (1000.0 / 60.0)) * 100.0;
|
||||||
|
println!(" -> Total CPU copy time : {:.2?}", duration_memcpy);
|
||||||
|
println!(" -> Per-frame copy time : {:.3} ms", memcpy_per_frame);
|
||||||
|
println!(" -> Memory Bus Bandwidth : {:.2} GB/s", memcpy_gbps);
|
||||||
|
println!(" -> CPU Core Saturation : {:.1}% of 1 core consumed solely by memcpy at 60 FPS", cpu_load_60fps);
|
||||||
|
println!();
|
||||||
|
|
||||||
|
// Benchmark 2: in-process NVENC reading a registered host buffer (device copy when registration fails)
|
||||||
|
#[cfg(feature = "inproc-av")]
|
||||||
|
{
|
||||||
|
extern "C" {
|
||||||
|
fn nvenc_create(config: *const NvencConfigFFI) -> *mut std::ffi::c_void;
|
||||||
|
fn nvenc_register_host_buffer(
|
||||||
|
engine: *mut std::ffi::c_void,
|
||||||
|
host_ptr: *mut std::ffi::c_void,
|
||||||
|
size: usize,
|
||||||
|
) -> i32;
|
||||||
|
fn nvenc_encode_frame(
|
||||||
|
engine: *mut std::ffi::c_void,
|
||||||
|
input_argb: *const u8,
|
||||||
|
pitch: u32,
|
||||||
|
force_idr: i32,
|
||||||
|
out_data: *mut *const u8,
|
||||||
|
out_len: *mut u32,
|
||||||
|
) -> i32;
|
||||||
|
fn nvenc_destroy(engine: *mut std::ffi::c_void);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Must match NvencConfig in c_engine/nvenc_engine.h.
|
||||||
|
#[repr(C)]
|
||||||
|
struct NvencConfigFFI {
|
||||||
|
width: u32,
|
||||||
|
height: u32,
|
||||||
|
fps: u32,
|
||||||
|
gop: u32,
|
||||||
|
cq: u32,
|
||||||
|
target_bps: i64,
|
||||||
|
max_bps: i64,
|
||||||
|
buffer_bits: i64,
|
||||||
|
is_hevc: i32,
|
||||||
|
chroma_444: i32,
|
||||||
|
}
|
||||||
|
|
||||||
|
let cfg = NvencConfigFFI {
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
fps: 60,
|
||||||
|
gop: 120,
|
||||||
|
cq: 18,
|
||||||
|
target_bps: 16_000_000,
|
||||||
|
max_bps: 30_000_000,
|
||||||
|
buffer_bits: 500_000,
|
||||||
|
is_hevc: 1, // H.265 / HEVC
|
||||||
|
chroma_444: i32::from(std::env::var("UU_BENCH_CHROMA").as_deref() == Ok("444")),
|
||||||
|
};
|
||||||
|
|
||||||
|
println!("[2] In-process NVENC H.265 encoding");
|
||||||
|
unsafe {
|
||||||
|
let engine = nvenc_create(&cfg);
|
||||||
|
if engine.is_null() {
|
||||||
|
println!(" [SKIP] NVENC driver not available on this system.");
|
||||||
|
} else {
|
||||||
|
let registered = nvenc_register_host_buffer(engine, host_pixels.as_mut_ptr() as *mut _, frame_bytes) == 0;
|
||||||
|
println!(" -> Input path : {}", if registered { "registered host buffer (DMA)" } else { "cuMemcpyHtoD copy" });
|
||||||
|
let input = if registered { std::ptr::null() } else { host_pixels.as_ptr() };
|
||||||
|
let mut out_data: *const u8 = std::ptr::null();
|
||||||
|
let mut out_len: u32 = 0;
|
||||||
|
// Warmup
|
||||||
|
let _ = nvenc_encode_frame(engine, input, width * 4, 1, &mut out_data, &mut out_len);
|
||||||
|
|
||||||
|
let start = Instant::now();
|
||||||
|
let (mut encoded_bytes, mut encoded_frames) = (0u64, 0usize);
|
||||||
|
for i in 0..frames {
|
||||||
|
if nvenc_encode_frame(engine, input, width * 4, i32::from(i == 0), &mut out_data, &mut out_len) == 0 {
|
||||||
|
encoded_bytes += u64::from(out_len);
|
||||||
|
encoded_frames += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let elapsed = start.elapsed();
|
||||||
|
if encoded_frames == 0 {
|
||||||
|
println!(" [FAIL] no frame was encoded");
|
||||||
|
} else {
|
||||||
|
let per_frame = elapsed.as_secs_f64() * 1000.0 / encoded_frames as f64;
|
||||||
|
println!(" -> Encoded frames : {encoded_frames}/{frames} in {elapsed:.2?}");
|
||||||
|
println!(" -> Per-frame latency : {per_frame:.3} ms ({:.1} FPS max)", 1000.0 / per_frame);
|
||||||
|
println!(" -> Output bitrate : {:.2} Mbps average", encoded_bytes as f64 * 8.0 / elapsed.as_secs_f64() / 1e6);
|
||||||
|
if registered {
|
||||||
|
println!(" -> Host-to-device copy : none ({:.0} MB/s at 60 fps avoided)", frame_bytes as f64 * 60.0 / 1024.0 / 1024.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
nvenc_destroy(engine);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,10 +1,22 @@
|
|||||||
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/annotation_overlay.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.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=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)");
|
||||||
@@ -21,11 +33,42 @@ fn main() {
|
|||||||
build.compile("uu_kms_engine");
|
build.compile("uu_kms_engine");
|
||||||
println!("cargo:rustc-link-lib=drm");
|
println!("cargo:rustc-link-lib=drm");
|
||||||
}
|
}
|
||||||
cc::Build::new()
|
let mut x11_build = cc::Build::new();
|
||||||
.file("c_engine/x11_engine.c")
|
x11_build.file("c_engine/x11_engine.c")
|
||||||
|
.file("c_engine/annotation_overlay.c")
|
||||||
|
.file("c_engine/uinput_keymap.c")
|
||||||
.file("c_engine/clipboard.c")
|
.file("c_engine/clipboard.c")
|
||||||
.file("c_engine/pam_check.c")
|
.file("c_engine/pam_check.c");
|
||||||
.compile("x11_engine");
|
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/vaapi_engine.c");
|
||||||
|
x11_build.file("c_engine/dri3_capture.c");
|
||||||
|
for f in ["c_engine/vaapi_engine.c", "c_engine/vaapi_engine.h", "c_engine/dri3_capture.c", "c_engine/dri3_capture.h"] {
|
||||||
|
println!("cargo:rerun-if-changed={f}");
|
||||||
|
}
|
||||||
|
x11_build.include("vendor/ffnvcodec");
|
||||||
|
}
|
||||||
|
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=X11-xcb");
|
||||||
|
println!("cargo:rustc-link-lib=xcb");
|
||||||
|
println!("cargo:rustc-link-lib=xcb-dri3");
|
||||||
|
println!("cargo:rustc-link-lib=xcb-damage");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
println!("cargo:rustc-link-lib=X11");
|
println!("cargo:rustc-link-lib=X11");
|
||||||
println!("cargo:rustc-link-lib=Xext");
|
println!("cargo:rustc-link-lib=Xext");
|
||||||
@@ -38,7 +81,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() {
|
||||||
|
|||||||
@@ -0,0 +1,137 @@
|
|||||||
|
// Viewer annotation (观看模式「批注」) overlay for X11 desktops.
|
||||||
|
//
|
||||||
|
// A full-screen, override-redirect ARGB window with an empty input shape: strokes from the
|
||||||
|
// viewer are drawn on it, the compositor blends it over the desktop (so the capture shows the
|
||||||
|
// strokes), and every pointer event passes through to the windows below. The window only
|
||||||
|
// exists while the viewer keeps annotation enabled. One thread owns each handle (Xlib is not
|
||||||
|
// initialized for threads here).
|
||||||
|
#include <X11/Xlib.h>
|
||||||
|
#include <X11/Xatom.h>
|
||||||
|
#include <X11/Xutil.h>
|
||||||
|
#include <X11/extensions/shape.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
Display *dpy;
|
||||||
|
Window win, root;
|
||||||
|
Colormap cmap;
|
||||||
|
GC gc;
|
||||||
|
int x, y, width, height;
|
||||||
|
int root_width, root_height;
|
||||||
|
} uu_annotation;
|
||||||
|
|
||||||
|
static int has_compositor(Display *dpy, int screen) {
|
||||||
|
char name[32];
|
||||||
|
snprintf(name, sizeof name, "_NET_WM_CM_S%d", screen);
|
||||||
|
Atom selection = XInternAtom(dpy, name, False);
|
||||||
|
return XGetSelectionOwner(dpy, selection) != None;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Opens the overlay over the root region (x, y, width, height); width/height <= 0 = whole root.
|
||||||
|
// error: 1 display, 2 no compositing manager (an ARGB window would be opaque), 3 no 32-bit visual.
|
||||||
|
void *uu_annotation_open(const char *display, int x, int y, int width, int height, int *error) {
|
||||||
|
*error = 0;
|
||||||
|
Display *dpy = XOpenDisplay(display && *display ? display : NULL);
|
||||||
|
if (!dpy) { *error = 1; return NULL; }
|
||||||
|
int screen = DefaultScreen(dpy);
|
||||||
|
Window root = RootWindow(dpy, screen);
|
||||||
|
if (!has_compositor(dpy, screen)) { XCloseDisplay(dpy); *error = 2; return NULL; }
|
||||||
|
XVisualInfo info;
|
||||||
|
if (!XMatchVisualInfo(dpy, screen, 32, TrueColor, &info)) { XCloseDisplay(dpy); *error = 3; return NULL; }
|
||||||
|
if (width <= 0 || height <= 0) {
|
||||||
|
x = 0; y = 0;
|
||||||
|
width = DisplayWidth(dpy, screen);
|
||||||
|
height = DisplayHeight(dpy, screen);
|
||||||
|
}
|
||||||
|
Colormap cmap = XCreateColormap(dpy, root, info.visual, AllocNone);
|
||||||
|
XSetWindowAttributes attrs;
|
||||||
|
memset(&attrs, 0, sizeof attrs);
|
||||||
|
attrs.override_redirect = True;
|
||||||
|
attrs.background_pixel = 0;
|
||||||
|
attrs.border_pixel = 0;
|
||||||
|
attrs.colormap = cmap;
|
||||||
|
attrs.event_mask = ExposureMask | StructureNotifyMask;
|
||||||
|
Window win = XCreateWindow(dpy, root, x, y, (unsigned)width, (unsigned)height, 0, 32, InputOutput, info.visual,
|
||||||
|
CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWColormap | CWEventMask, &attrs);
|
||||||
|
// Empty input region: clicks, scrolls and hovers reach the windows below.
|
||||||
|
XShapeCombineRectangles(dpy, win, ShapeInput, 0, 0, NULL, 0, ShapeSet, Unsorted);
|
||||||
|
XStoreName(dpy, win, "uu-remote-linux annotation");
|
||||||
|
XClassHint hint = { "uu-remote-annotation", "uu-remote-linux" };
|
||||||
|
XSetClassHint(dpy, win, &hint);
|
||||||
|
// Keep the overlay composited (2 = never unredirect).
|
||||||
|
long bypass = 2;
|
||||||
|
XChangeProperty(dpy, win, XInternAtom(dpy, "_NET_WM_BYPASS_COMPOSITOR", False), XA_CARDINAL, 32,
|
||||||
|
PropModeReplace, (unsigned char *)&bypass, 1);
|
||||||
|
XMapRaised(dpy, win);
|
||||||
|
// Root ConfigureNotify reports RandR resizes, so the caller can rebuild at the new geometry.
|
||||||
|
XSelectInput(dpy, root, StructureNotifyMask);
|
||||||
|
GC gc = XCreateGC(dpy, win, 0, NULL);
|
||||||
|
XFlush(dpy);
|
||||||
|
uu_annotation *a = calloc(1, sizeof *a);
|
||||||
|
if (!a) { XFreeGC(dpy, gc); XDestroyWindow(dpy, win); XFreeColormap(dpy, cmap); XCloseDisplay(dpy); *error = 1; return NULL; }
|
||||||
|
a->dpy = dpy; a->win = win; a->root = root; a->cmap = cmap; a->gc = gc;
|
||||||
|
a->x = x; a->y = y; a->width = width; a->height = height;
|
||||||
|
a->root_width = DisplayWidth(dpy, screen); a->root_height = DisplayHeight(dpy, screen);
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
|
||||||
|
void uu_annotation_size(void *handle, int *width, int *height) {
|
||||||
|
uu_annotation *a = handle;
|
||||||
|
*width = a->width; *height = a->height;
|
||||||
|
}
|
||||||
|
|
||||||
|
// argb: premultiplied 0xAARRGGBB for the 32-bit visual. points: x0,y0,x1,y1,... in window pixels.
|
||||||
|
void uu_annotation_polyline(void *handle, const short *points, int count, unsigned int argb, int line_width) {
|
||||||
|
uu_annotation *a = handle;
|
||||||
|
if (count <= 0) return;
|
||||||
|
XSetForeground(a->dpy, a->gc, argb);
|
||||||
|
XSetLineAttributes(a->dpy, a->gc, line_width < 1 ? 1 : (unsigned)line_width, LineSolid, CapRound, JoinRound);
|
||||||
|
if (count == 1) {
|
||||||
|
int r = line_width / 2;
|
||||||
|
XFillArc(a->dpy, a->win, a->gc, points[0] - r, points[1] - r, (unsigned)line_width, (unsigned)line_width, 0, 360 * 64);
|
||||||
|
} else {
|
||||||
|
XDrawLines(a->dpy, a->win, a->gc, (XPoint *)points, count, CoordModeOrigin);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void uu_annotation_clear(void *handle) {
|
||||||
|
uu_annotation *a = handle;
|
||||||
|
XClearWindow(a->dpy, a->win);
|
||||||
|
}
|
||||||
|
|
||||||
|
void uu_annotation_flush(void *handle) {
|
||||||
|
uu_annotation *a = handle;
|
||||||
|
XRaiseWindow(a->dpy, a->win);
|
||||||
|
XFlush(a->dpy);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Drains pending events: 2 when the root was resized (reopen the overlay), 1 when the window needs
|
||||||
|
// a full repaint (exposed or remapped), else 0.
|
||||||
|
int uu_annotation_poll(void *handle) {
|
||||||
|
uu_annotation *a = handle;
|
||||||
|
int result = 0;
|
||||||
|
while (XPending(a->dpy)) {
|
||||||
|
XEvent event;
|
||||||
|
XNextEvent(a->dpy, &event);
|
||||||
|
if (event.type == ConfigureNotify && event.xconfigure.window == a->root
|
||||||
|
&& (event.xconfigure.width != a->root_width || event.xconfigure.height != a->root_height)) {
|
||||||
|
a->root_width = event.xconfigure.width; a->root_height = event.xconfigure.height;
|
||||||
|
result = 2;
|
||||||
|
} else if (result == 0 && ((event.type == Expose && event.xexpose.count == 0) || event.type == MapNotify)) {
|
||||||
|
result = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
void uu_annotation_close(void *handle) {
|
||||||
|
uu_annotation *a = handle;
|
||||||
|
if (!a) return;
|
||||||
|
XFreeGC(a->dpy, a->gc);
|
||||||
|
XDestroyWindow(a->dpy, a->win);
|
||||||
|
XFreeColormap(a->dpy, a->cmap);
|
||||||
|
XCloseDisplay(a->dpy);
|
||||||
|
free(a);
|
||||||
|
}
|
||||||
+182
-82
@@ -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 };
|
||||||
@@ -46,7 +30,10 @@ static pthread_cond_t init_cond = PTHREAD_COND_INITIALIZER;
|
|||||||
static GtkWidget *window, *allow_switch, *id_label, *code_label, *eye_button, *share_button, *hint_label, *verify_combo, *note_label;
|
static GtkWidget *window, *allow_switch, *id_label, *code_label, *eye_button, *share_button, *hint_label, *verify_combo, *note_label;
|
||||||
static GtkWidget *refresh_items[5], *footer_label;
|
static GtkWidget *refresh_items[5], *footer_label;
|
||||||
// Account card: QR login before sign-in, user info (+ logout) after.
|
// Account card: QR login before sign-in, user info (+ logout) after.
|
||||||
static GtkWidget *assist_card, *account_card, *account_stack, *qr_stack, *qr_image, *login_status, *user_label;
|
static GtkWidget *assist_card, *account_card, *account_stack, *qr_stack, *qr_image, *login_status, *user_label, *qr_refresh;
|
||||||
|
/* Like the official client, a failed or timed-out QR stays until the user asks for a new one. */
|
||||||
|
static atomic_int qr_refresh_requested;
|
||||||
|
static void on_qr_refresh(GtkButton *b, gpointer d) { (void)b; (void)d; atomic_store(&qr_refresh_requested, 1); gtk_widget_hide(qr_refresh); }
|
||||||
static int show_assist = 1, show_account;
|
static int show_assist = 1, show_account;
|
||||||
// Tray (host service only): AppIndicator via dlopen (no build dependency), else GtkStatusIcon.
|
// Tray (host service only): AppIndicator via dlopen (no build dependency), else GtkStatusIcon.
|
||||||
static GtkWidget *tray_menu, *tray_allow;
|
static GtkWidget *tray_menu, *tray_allow;
|
||||||
@@ -54,6 +41,10 @@ static int suppress_tray;
|
|||||||
static int cur_verify, cur_refresh, cur_has_custom;
|
static int cur_verify, cur_refresh, cur_has_custom;
|
||||||
static char current_id[64], current_code[64];
|
static char current_id[64], current_code[64];
|
||||||
static int code_visible = 1, suppress_switch, start_hidden, close_hides;
|
static int code_visible = 1, suppress_switch, start_hidden, close_hides;
|
||||||
|
// A problem only the person at the desktop can fix (e.g. FFmpeg missing): red line at the top.
|
||||||
|
static GtkWidget *problem_label;
|
||||||
|
static gchar *problem_text;
|
||||||
|
static pthread_mutex_t problem_lock = PTHREAD_MUTEX_INITIALIZER;
|
||||||
|
|
||||||
static GtkWidget *label(const char *text, const char *cls) {
|
static GtkWidget *label(const char *text, const char *cls) {
|
||||||
GtkWidget *l = gtk_label_new(text);
|
GtkWidget *l = gtk_label_new(text);
|
||||||
@@ -89,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);
|
||||||
@@ -99,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) {
|
||||||
@@ -133,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) {
|
||||||
@@ -152,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) {
|
||||||
@@ -206,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);
|
||||||
}
|
}
|
||||||
@@ -219,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();
|
||||||
@@ -236,20 +227,25 @@ 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(L("刷新二维码", "Refresh QR code"));
|
||||||
|
gtk_widget_set_halign(qr_refresh, GTK_ALIGN_START);
|
||||||
|
gtk_widget_set_no_show_all(qr_refresh, TRUE);
|
||||||
|
g_signal_connect(qr_refresh, "clicked", G_CALLBACK(on_qr_refresh), NULL);
|
||||||
|
gtk_box_pack_start(GTK_BOX(qr_text), qr_refresh, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(qr_page), qr_text, TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(qr_page), qr_text, TRUE, TRUE, 0);
|
||||||
gtk_stack_add_named(GTK_STACK(account_stack), qr_page, "qr");
|
gtk_stack_add_named(GTK_STACK(account_stack), qr_page, "qr");
|
||||||
|
|
||||||
@@ -265,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);
|
||||||
@@ -287,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);
|
||||||
}
|
}
|
||||||
@@ -297,20 +293,49 @@ static void on_status_menu(GtkStatusIcon *i, guint button, guint time, gpointer
|
|||||||
(void)i; (void)button; (void)time; (void)d;
|
(void)i; (void)button; (void)time; (void)d;
|
||||||
gtk_menu_popup_at_pointer(GTK_MENU(tray_menu), NULL);
|
gtk_menu_popup_at_pointer(GTK_MENU(tray_menu), NULL);
|
||||||
}
|
}
|
||||||
|
// Monochrome tray icon that follows light/dark panels: GTK and the GNOME AppIndicator extension
|
||||||
|
// recolor "-symbolic" names, KDE recolors the ColorScheme-Text class. Installed into the user's
|
||||||
|
// hicolor theme (found by every panel's default lookup) and also offered as the icon theme path,
|
||||||
|
// so it needs no package install. KDE tries dash-trimmed names ("uu-remote-linux") in each theme
|
||||||
|
// before the next one, so the name must not trim into the colored app icon (#87).
|
||||||
|
static const char TRAY_ICON_NAME[] = "uuremote-tray-symbolic";
|
||||||
|
static const char TRAY_ICON_SVG[] =
|
||||||
|
"<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"16\" height=\"16\" viewBox=\"0 0 16 16\">"
|
||||||
|
"<style id=\"current-color-scheme\">.ColorScheme-Text{color:#232629}</style>"
|
||||||
|
"<path class=\"ColorScheme-Text\" fill=\"currentColor\" fill-rule=\"evenodd\" d=\"M2.5 2h11A1.5 1.5 0 0 1 15 3.5v7a1.5 1.5 0 0 1-1.5 1.5h-11"
|
||||||
|
"A1.5 1.5 0 0 1 1 10.5v-7A1.5 1.5 0 0 1 2.5 2zm0 1.5v7h11v-7z\"/>"
|
||||||
|
"<path class=\"ColorScheme-Text\" fill=\"currentColor\" d=\"M7.25 12h1.5v1.5H11a.75.75 0 0 1 0 1.5H5a.75.75 0 0 1 0-1.5h2.25z"
|
||||||
|
"M11.5 4.5v4l-1.35-1.35-3.1 3.1-1.2-1.2 3.1-3.1L7.5 4.5z\"/></svg>\n";
|
||||||
|
// Returns the icon theme root holding the icon ($XDG_DATA_HOME/icons), or NULL.
|
||||||
|
static gchar *write_tray_icon(void) {
|
||||||
|
gchar *root = g_build_filename(g_get_user_data_dir(), "icons", NULL);
|
||||||
|
gchar *apps = g_build_filename(root, "hicolor", "scalable", "apps", NULL);
|
||||||
|
gchar *file = g_strconcat(TRAY_ICON_NAME, ".svg", NULL);
|
||||||
|
gchar *path = g_build_filename(apps, file, NULL), *current = NULL;
|
||||||
|
// Rewriting an unchanged file would only make icon caches rescan.
|
||||||
|
int ok = g_file_get_contents(path, ¤t, NULL, NULL) && strcmp(current, TRAY_ICON_SVG) == 0;
|
||||||
|
if (!ok) ok = g_mkdir_with_parents(apps, 0755) == 0 && g_file_set_contents(path, TRAY_ICON_SVG, -1, NULL);
|
||||||
|
g_free(apps); g_free(file); g_free(path); g_free(current);
|
||||||
|
if (!ok) { g_free(root); return NULL; }
|
||||||
|
return root;
|
||||||
|
}
|
||||||
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);
|
||||||
gtk_menu_shell_append(GTK_MENU_SHELL(tray_menu), gtk_separator_menu_item_new());
|
gtk_menu_shell_append(GTK_MENU_SHELL(tray_menu), gtk_separator_menu_item_new());
|
||||||
gtk_menu_shell_append(GTK_MENU_SHELL(tray_menu), quit);
|
gtk_menu_shell_append(GTK_MENU_SHELL(tray_menu), quit);
|
||||||
gtk_widget_show_all(tray_menu);
|
gtk_widget_show_all(tray_menu);
|
||||||
const char *icon = gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), "uu-remote-linux") ? "uu-remote-linux" : "computer";
|
gchar *icon_path = write_tray_icon();
|
||||||
|
if (icon_path) gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), icon_path);
|
||||||
|
const char *fallback = gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), "uu-remote-linux") ? "uu-remote-linux" : "computer";
|
||||||
|
const char *icon = icon_path ? TRAY_ICON_NAME : fallback;
|
||||||
|
|
||||||
// StatusNotifierItem (GNOME AppIndicator extension, KDE): libayatana-appindicator3 / libappindicator3.
|
// StatusNotifierItem (GNOME AppIndicator extension, KDE): libayatana-appindicator3 / libappindicator3.
|
||||||
const char *libs[] = { "libayatana-appindicator3.so.1", "libappindicator3.so.1" };
|
const char *libs[] = { "libayatana-appindicator3.so.1", "libappindicator3.so.1" };
|
||||||
@@ -321,9 +346,12 @@ static void build_tray(void) {
|
|||||||
void (*set_status)(void *, int) = (void (*)(void *, int))dlsym(h, "app_indicator_set_status");
|
void (*set_status)(void *, int) = (void (*)(void *, int))dlsym(h, "app_indicator_set_status");
|
||||||
void (*set_menu)(void *, GtkMenu *) = (void (*)(void *, GtkMenu *))dlsym(h, "app_indicator_set_menu");
|
void (*set_menu)(void *, GtkMenu *) = (void (*)(void *, GtkMenu *))dlsym(h, "app_indicator_set_menu");
|
||||||
void (*set_title)(void *, const char *) = (void (*)(void *, const char *))dlsym(h, "app_indicator_set_title");
|
void (*set_title)(void *, const char *) = (void (*)(void *, const char *))dlsym(h, "app_indicator_set_title");
|
||||||
|
void (*set_theme_path)(void *, const char *) = (void (*)(void *, const char *))dlsym(h, "app_indicator_set_icon_theme_path");
|
||||||
if (ind_new && set_status && set_menu) {
|
if (ind_new && set_status && set_menu) {
|
||||||
void *ind = ind_new("uu-remote-linux", icon, 0 /* APPLICATION_STATUS */);
|
// Without a theme path the panel cannot find the cached icon; keep the installed one.
|
||||||
if (set_title) set_title(ind, "UU 远程 Linux 主机");
|
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 (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
|
||||||
@@ -333,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);
|
||||||
@@ -359,6 +383,11 @@ static void build_window(void) {
|
|||||||
GtkWidget *root = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
|
GtkWidget *root = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
|
||||||
gtk_container_set_border_width(GTK_CONTAINER(root), 24);
|
gtk_container_set_border_width(GTK_CONTAINER(root), 24);
|
||||||
gtk_container_add(GTK_CONTAINER(window), root);
|
gtk_container_add(GTK_CONTAINER(window), root);
|
||||||
|
problem_label = label("", "status");
|
||||||
|
gtk_style_context_add_class(gtk_widget_get_style_context(problem_label), "error");
|
||||||
|
gtk_label_set_line_wrap(GTK_LABEL(problem_label), TRUE);
|
||||||
|
gtk_label_set_max_width_chars(GTK_LABEL(problem_label), 40);
|
||||||
|
gtk_box_pack_start(GTK_BOX(root), problem_label, FALSE, FALSE, 0);
|
||||||
|
|
||||||
GtkWidget *card = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
|
GtkWidget *card = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
|
||||||
gtk_style_context_add_class(gtk_widget_get_style_context(card), "card");
|
gtk_style_context_add_class(gtk_widget_get_style_context(card), "card");
|
||||||
@@ -368,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);
|
||||||
|
|
||||||
@@ -382,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);
|
||||||
@@ -395,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);
|
||||||
@@ -407,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]);
|
||||||
@@ -427,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);
|
||||||
@@ -445,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);
|
||||||
@@ -460,23 +489,40 @@ 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)));
|
||||||
gtk_widget_set_visible(assist_card, show_assist);
|
gtk_widget_set_visible(assist_card, show_assist);
|
||||||
gtk_widget_set_visible(hint_label, show_assist);
|
gtk_widget_set_visible(hint_label, show_assist);
|
||||||
gtk_widget_set_visible(account_card, show_account);
|
gtk_widget_set_visible(account_card, show_account);
|
||||||
|
pthread_mutex_lock(&problem_lock);
|
||||||
|
gtk_label_set_text(GTK_LABEL(problem_label), problem_text ? problem_text : "");
|
||||||
|
gtk_widget_set_visible(problem_label, problem_text != NULL);
|
||||||
|
pthread_mutex_unlock(&problem_lock);
|
||||||
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;
|
||||||
@@ -529,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);
|
||||||
@@ -540,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;
|
||||||
@@ -641,6 +687,60 @@ void uu_ui_set_user(const char *name) {
|
|||||||
if (!ui_started || init_state != 1) return;
|
if (!ui_started || init_state != 1) return;
|
||||||
g_idle_add(apply_user, g_strdup(name ? name : ""));
|
g_idle_add(apply_user, g_strdup(name ? name : ""));
|
||||||
}
|
}
|
||||||
|
static gboolean apply_qr_refresh(gpointer data) {
|
||||||
|
if (window && qr_refresh) { if (GPOINTER_TO_INT(data)) gtk_widget_show(qr_refresh); else gtk_widget_hide(qr_refresh); }
|
||||||
|
return G_SOURCE_REMOVE;
|
||||||
|
}
|
||||||
|
void uu_login_ui_offer_refresh(int visible) {
|
||||||
|
if (!ui_started || init_state != 1 || atomic_load(&closed)) return;
|
||||||
|
atomic_store(&qr_refresh_requested, 0);
|
||||||
|
g_idle_add(apply_qr_refresh, GINT_TO_POINTER(visible != 0));
|
||||||
|
}
|
||||||
|
int uu_login_ui_take_refresh(void) { return atomic_exchange(&qr_refresh_requested, 0); }
|
||||||
|
|
||||||
|
static gboolean apply_problem(gpointer data) {
|
||||||
|
(void)data;
|
||||||
|
if (window && problem_label) {
|
||||||
|
pthread_mutex_lock(&problem_lock);
|
||||||
|
gtk_label_set_text(GTK_LABEL(problem_label), problem_text ? problem_text : "");
|
||||||
|
gtk_widget_set_visible(problem_label, problem_text != NULL);
|
||||||
|
pthread_mutex_unlock(&problem_lock);
|
||||||
|
}
|
||||||
|
return G_SOURCE_REMOVE;
|
||||||
|
}
|
||||||
|
// Freedesktop notification through the session bus (no GTK main loop needed). Returns 0 when delivered.
|
||||||
|
static int notify_desktop(const char *summary, const char *body) {
|
||||||
|
GDBusConnection *bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
|
||||||
|
if (!bus) return -1;
|
||||||
|
GVariantBuilder actions, hints;
|
||||||
|
g_variant_builder_init(&actions, G_VARIANT_TYPE("as"));
|
||||||
|
g_variant_builder_init(&hints, G_VARIANT_TYPE("a{sv}"));
|
||||||
|
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",
|
||||||
|
"org.freedesktop.Notifications", "Notify",
|
||||||
|
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_object_unref(bus);
|
||||||
|
if (!reply) return -1;
|
||||||
|
g_variant_unref(reply);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
// text NULL clears the window line. notify: also tell the person now, by a desktop notification or,
|
||||||
|
// without a notification daemon (e.g. bare Xfce), by opening the host window that shows the line.
|
||||||
|
// Returns 0 notified, 1 window opened, -1 neither (no notify requested, or no daemon and no window).
|
||||||
|
int uu_ui_set_problem(const char *summary, const char *text, int notify) {
|
||||||
|
pthread_mutex_lock(&problem_lock);
|
||||||
|
g_free(problem_text);
|
||||||
|
problem_text = text ? g_strdup(text) : NULL;
|
||||||
|
pthread_mutex_unlock(&problem_lock);
|
||||||
|
int window_ready = ui_started && init_state == 1 && !atomic_load(&closed);
|
||||||
|
if (window_ready) g_idle_add(apply_problem, NULL);
|
||||||
|
if (!notify || !text) return -1;
|
||||||
|
if (notify_desktop(summary ? summary : "", text) == 0) return 0;
|
||||||
|
if (!window_ready) return -1;
|
||||||
|
uu_assist_ui_present();
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
void uu_login_ui_set_done(const char *text) { uu_ui_set_user(text); }
|
void uu_login_ui_set_done(const char *text) { uu_ui_set_user(text); }
|
||||||
int uu_login_ui_closed(void) { return atomic_load(&closed); }
|
int uu_login_ui_closed(void) { return atomic_load(&closed); }
|
||||||
void uu_login_ui_close(void) { uu_assist_ui_close(); }
|
void uu_login_ui_close(void) { uu_assist_ui_close(); }
|
||||||
@@ -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,242 @@
|
|||||||
|
#include "dri3_capture.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <poll.h>
|
||||||
|
#include <X11/Xlib.h>
|
||||||
|
#include <X11/Xlib-xcb.h>
|
||||||
|
#include <xcb/xcb.h>
|
||||||
|
#include <xcb/dri3.h>
|
||||||
|
#include <xcb/damage.h>
|
||||||
|
#include <gbm.h>
|
||||||
|
|
||||||
|
struct Dri3Capture {
|
||||||
|
Display *dpy;
|
||||||
|
xcb_connection_t *conn;
|
||||||
|
xcb_screen_t *screen;
|
||||||
|
uint32_t width;
|
||||||
|
uint32_t height;
|
||||||
|
|
||||||
|
int drm_fd;
|
||||||
|
struct gbm_device *gbm;
|
||||||
|
struct gbm_bo *bo;
|
||||||
|
int bo_fd;
|
||||||
|
uint32_t stride;
|
||||||
|
|
||||||
|
xcb_pixmap_t pix;
|
||||||
|
xcb_gcontext_t gc;
|
||||||
|
xcb_damage_damage_t damage;
|
||||||
|
uint8_t damage_event_code;
|
||||||
|
};
|
||||||
|
|
||||||
|
Dri3Capture* dri3_capture_create(const char* display_name, uint32_t width, uint32_t height) {
|
||||||
|
Display *dpy = XOpenDisplay(display_name);
|
||||||
|
if (!dpy) {
|
||||||
|
fprintf(stderr, "[dri3_capture] failed to open display %s\n", display_name ? display_name : "default");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Events are read with xcb_poll_for_event below, so XCB, not Xlib, must own the queue
|
||||||
|
XSetEventQueueOwner(dpy, XCBOwnsEventQueue);
|
||||||
|
xcb_connection_t *conn = XGetXCBConnection(dpy);
|
||||||
|
const xcb_setup_t *setup = xcb_get_setup(conn);
|
||||||
|
xcb_screen_t *screen = xcb_setup_roots_iterator(setup).data;
|
||||||
|
if (!screen) {
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check the extension first: a DRI3 request on a server without it breaks the connection,
|
||||||
|
// and the Xlib cleanup below then exits the process.
|
||||||
|
const xcb_query_extension_reply_t *dri3_ext = xcb_get_extension_data(conn, &xcb_dri3_id);
|
||||||
|
if (!dri3_ext || !dri3_ext->present) {
|
||||||
|
fprintf(stderr, "[dri3_capture] DRI3 extension not supported on display\n");
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
// Query DRI3
|
||||||
|
xcb_dri3_query_version_cookie_t qvc = xcb_dri3_query_version(conn, 1, 2);
|
||||||
|
xcb_dri3_query_version_reply_t *qvr = xcb_dri3_query_version_reply(conn, qvc, NULL);
|
||||||
|
if (!qvr) {
|
||||||
|
fprintf(stderr, "[dri3_capture] DRI3 extension not supported on display\n");
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
free(qvr);
|
||||||
|
|
||||||
|
// Open DRM device via DRI3
|
||||||
|
xcb_dri3_open_cookie_t oc = xcb_dri3_open(conn, screen->root, 0);
|
||||||
|
xcb_dri3_open_reply_t *or = xcb_dri3_open_reply(conn, oc, NULL);
|
||||||
|
if (!or) {
|
||||||
|
fprintf(stderr, "[dri3_capture] xcb_dri3_open failed\n");
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
int drm_fd = xcb_dri3_open_reply_fds(conn, or)[0];
|
||||||
|
free(or);
|
||||||
|
|
||||||
|
uint32_t w = width > 0 ? width : screen->width_in_pixels;
|
||||||
|
uint32_t h = height > 0 ? height : screen->height_in_pixels;
|
||||||
|
|
||||||
|
struct gbm_device *gbm = gbm_create_device(drm_fd);
|
||||||
|
if (!gbm) {
|
||||||
|
fprintf(stderr, "[dri3_capture] gbm_create_device failed\n");
|
||||||
|
close(drm_fd);
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct gbm_bo *bo = gbm_bo_create(gbm, w, h, GBM_FORMAT_XRGB8888, GBM_BO_USE_RENDERING | GBM_BO_USE_LINEAR);
|
||||||
|
if (!bo) {
|
||||||
|
fprintf(stderr, "[dri3_capture] gbm_bo_create failed\n");
|
||||||
|
gbm_device_destroy(gbm);
|
||||||
|
close(drm_fd);
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
int bo_fd = gbm_bo_get_fd(bo);
|
||||||
|
uint32_t stride = gbm_bo_get_stride(bo);
|
||||||
|
|
||||||
|
xcb_pixmap_t pix = xcb_generate_id(conn);
|
||||||
|
xcb_generic_error_t *err = NULL;
|
||||||
|
// XCB takes ownership of the fd it sends and closes it after transmission; only a
|
||||||
|
// duplicate goes to X11, bo_fd stays ours for the VAAPI import and teardown.
|
||||||
|
int send_fd = fcntl(bo_fd, F_DUPFD_CLOEXEC, 3);
|
||||||
|
if (send_fd < 0) {
|
||||||
|
close(bo_fd);
|
||||||
|
gbm_bo_destroy(bo);
|
||||||
|
gbm_device_destroy(gbm);
|
||||||
|
close(drm_fd);
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
xcb_void_cookie_t pc = xcb_dri3_pixmap_from_buffer_checked(
|
||||||
|
conn, pix, screen->root, stride * h, w, h, stride, screen->root_depth, 32, send_fd
|
||||||
|
);
|
||||||
|
err = xcb_request_check(conn, pc);
|
||||||
|
if (err) {
|
||||||
|
fprintf(stderr, "[dri3_capture] xcb_dri3_pixmap_from_buffer failed: %d\n", err->error_code);
|
||||||
|
free(err);
|
||||||
|
close(bo_fd);
|
||||||
|
gbm_bo_destroy(bo);
|
||||||
|
gbm_device_destroy(gbm);
|
||||||
|
close(drm_fd);
|
||||||
|
XCloseDisplay(dpy);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
xcb_gcontext_t gc = xcb_generate_id(conn);
|
||||||
|
// The default ClipByChildren copies only the root background (solid black); XShmGetImage on the root
|
||||||
|
// includes child windows, so the blit must too.
|
||||||
|
uint32_t gc_mode = XCB_SUBWINDOW_MODE_INCLUDE_INFERIORS;
|
||||||
|
xcb_create_gc(conn, gc, pix, XCB_GC_SUBWINDOW_MODE, &gc_mode);
|
||||||
|
|
||||||
|
// Setup XDamage on root window
|
||||||
|
const xcb_query_extension_reply_t *ext = xcb_get_extension_data(conn, &xcb_damage_id);
|
||||||
|
uint8_t damage_event_code = 0;
|
||||||
|
xcb_damage_damage_t damage = 0;
|
||||||
|
if (ext && ext->present) {
|
||||||
|
damage_event_code = ext->first_event;
|
||||||
|
xcb_damage_query_version(conn, 1, 1);
|
||||||
|
damage = xcb_generate_id(conn);
|
||||||
|
xcb_damage_create(conn, damage, screen->root, XCB_DAMAGE_REPORT_LEVEL_NON_EMPTY);
|
||||||
|
}
|
||||||
|
|
||||||
|
Dri3Capture* cap = (Dri3Capture*)calloc(1, sizeof(Dri3Capture));
|
||||||
|
cap->dpy = dpy;
|
||||||
|
cap->conn = conn;
|
||||||
|
cap->screen = screen;
|
||||||
|
cap->width = w;
|
||||||
|
cap->height = h;
|
||||||
|
cap->drm_fd = drm_fd;
|
||||||
|
cap->gbm = gbm;
|
||||||
|
cap->bo = bo;
|
||||||
|
cap->bo_fd = bo_fd;
|
||||||
|
cap->stride = stride;
|
||||||
|
cap->pix = pix;
|
||||||
|
cap->gc = gc;
|
||||||
|
cap->damage = damage;
|
||||||
|
cap->damage_event_code = damage_event_code;
|
||||||
|
|
||||||
|
fprintf(stderr, "[dri3_capture] Initialized: %ux%u (stride: %u, dma_fd: %d) Pure GPU Blit ready!\n",
|
||||||
|
w, h, stride, bo_fd);
|
||||||
|
return cap;
|
||||||
|
}
|
||||||
|
|
||||||
|
int dri3_capture_blit(Dri3Capture* cap) {
|
||||||
|
if (!cap) return -1;
|
||||||
|
xcb_copy_area(cap->conn, cap->screen->root, cap->pix, cap->gc, 0, 0, 0, 0, cap->width, cap->height);
|
||||||
|
// Round trip: the server has executed (and flushed to the GPU) the copy before VAAPI reads the BO;
|
||||||
|
// xcb_flush alone only sends the request.
|
||||||
|
xcb_get_input_focus_reply_t *r = xcb_get_input_focus_reply(cap->conn, xcb_get_input_focus(cap->conn), NULL);
|
||||||
|
if (!r) return -1;
|
||||||
|
free(r);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int dri3_capture_wait_damage(Dri3Capture* cap, int timeout_ms) {
|
||||||
|
if (!cap) return -1;
|
||||||
|
|
||||||
|
// Check queued events
|
||||||
|
xcb_generic_event_t *ev = NULL;
|
||||||
|
int damaged = 0;
|
||||||
|
while ((ev = xcb_poll_for_event(cap->conn)) != NULL) {
|
||||||
|
if ((ev->response_type & 0x7f) == (cap->damage_event_code + XCB_DAMAGE_NOTIFY)) {
|
||||||
|
damaged = 1;
|
||||||
|
}
|
||||||
|
free(ev);
|
||||||
|
}
|
||||||
|
if (damaged) {
|
||||||
|
xcb_damage_subtract(cap->conn, cap->damage, XCB_NONE, XCB_NONE);
|
||||||
|
xcb_flush(cap->conn);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
int fd = xcb_get_file_descriptor(cap->conn);
|
||||||
|
struct pollfd pfd = { .fd = fd, .events = POLLIN, .revents = 0 };
|
||||||
|
int ret = poll(&pfd, 1, timeout_ms);
|
||||||
|
if (ret > 0 && (pfd.revents & POLLIN)) {
|
||||||
|
// Readable but not yet a whole event: polling again would return at once and spin a core
|
||||||
|
ev = xcb_poll_for_event(cap->conn);
|
||||||
|
if (!ev) ev = xcb_wait_for_event(cap->conn);
|
||||||
|
if (!ev) return -1;
|
||||||
|
do {
|
||||||
|
if ((ev->response_type & 0x7f) == (cap->damage_event_code + XCB_DAMAGE_NOTIFY)) {
|
||||||
|
damaged = 1;
|
||||||
|
}
|
||||||
|
free(ev);
|
||||||
|
} while ((ev = xcb_poll_for_event(cap->conn)) != NULL);
|
||||||
|
if (damaged) {
|
||||||
|
xcb_damage_subtract(cap->conn, cap->damage, XCB_NONE, XCB_NONE);
|
||||||
|
xcb_flush(cap->conn);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ret < 0 ? -1 : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int dri3_capture_get_dma_fd(Dri3Capture* cap) {
|
||||||
|
return cap ? cap->bo_fd : -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t dri3_capture_get_stride(Dri3Capture* cap) {
|
||||||
|
return cap ? cap->stride : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void dri3_capture_destroy(Dri3Capture* cap) {
|
||||||
|
if (!cap) return;
|
||||||
|
|
||||||
|
if (cap->damage) xcb_damage_destroy(cap->conn, cap->damage);
|
||||||
|
if (cap->gc) xcb_free_gc(cap->conn, cap->gc);
|
||||||
|
if (cap->pix) xcb_free_pixmap(cap->conn, cap->pix);
|
||||||
|
if (cap->bo_fd >= 0) close(cap->bo_fd);
|
||||||
|
if (cap->bo) gbm_bo_destroy(cap->bo);
|
||||||
|
if (cap->gbm) gbm_device_destroy(cap->gbm);
|
||||||
|
if (cap->drm_fd >= 0) close(cap->drm_fd);
|
||||||
|
if (cap->dpy) XCloseDisplay(cap->dpy);
|
||||||
|
|
||||||
|
free(cap);
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
#ifndef UU_DRI3_CAPTURE_H
|
||||||
|
#define UU_DRI3_CAPTURE_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef struct Dri3Capture Dri3Capture;
|
||||||
|
|
||||||
|
Dri3Capture* dri3_capture_create(const char* display_name, uint32_t width, uint32_t height);
|
||||||
|
|
||||||
|
// Trigger GPU blit from Root Window to the DRI3 DMA-BUF Pixmap.
|
||||||
|
// Returns 0 on success, negative on error.
|
||||||
|
int dri3_capture_blit(Dri3Capture* cap);
|
||||||
|
|
||||||
|
// Wait for next XDamage event or timeout (ms).
|
||||||
|
// Returns 1 if damaged, 0 if timeout, negative on error.
|
||||||
|
int dri3_capture_wait_damage(Dri3Capture* cap, int timeout_ms);
|
||||||
|
|
||||||
|
// Get the exported DMA-BUF file descriptor and stride
|
||||||
|
int dri3_capture_get_dma_fd(Dri3Capture* cap);
|
||||||
|
uint32_t dri3_capture_get_stride(Dri3Capture* cap);
|
||||||
|
|
||||||
|
void dri3_capture_destroy(Dri3Capture* cap);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // UU_DRI3_CAPTURE_H
|
||||||
@@ -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
|
||||||
@@ -0,0 +1,580 @@
|
|||||||
|
#include "nvenc_engine.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <dlfcn.h>
|
||||||
|
#include <ffnvcodec/dynlink_cuda.h>
|
||||||
|
#include <ffnvcodec/nvEncodeAPI.h>
|
||||||
|
|
||||||
|
// Struct revisions come from the vendored nvEncodeAPI.h (*_VER macros), so the session must be
|
||||||
|
// opened with that header's NVENCAPI_VERSION; older drivers are rejected in nvenc_create.
|
||||||
|
#define CU_MEMHOSTREGISTER_DEVICEMAP 0x02
|
||||||
|
|
||||||
|
typedef CUresult CUDAAPI (*tcuMemHostRegister)(void *p, size_t bytesize, unsigned int Flags);
|
||||||
|
typedef CUresult CUDAAPI (*tcuMemHostGetDevicePointer)(CUdeviceptr *pdptr, void *p, unsigned int Flags);
|
||||||
|
typedef CUresult CUDAAPI (*tcuMemHostUnregister)(void *p);
|
||||||
|
typedef NVENCSTATUS NVENCAPI (*tNvEncodeAPICreateInstance)(NV_ENCODE_API_FUNCTION_LIST *functionList);
|
||||||
|
typedef NVENCSTATUS NVENCAPI (*tNvEncodeAPIGetMaxSupportedVersion)(uint32_t *version);
|
||||||
|
|
||||||
|
struct NvencEngine {
|
||||||
|
void *cuda_lib;
|
||||||
|
void *nvenc_lib;
|
||||||
|
|
||||||
|
tcuInit *cuInit;
|
||||||
|
tcuDeviceGet *cuDeviceGet;
|
||||||
|
tcuDevicePrimaryCtxRetain *cuDevicePrimaryCtxRetain;
|
||||||
|
tcuDevicePrimaryCtxRelease *cuDevicePrimaryCtxRelease;
|
||||||
|
tcuCtxCreate_v2 *cuCtxCreate;
|
||||||
|
tcuCtxDestroy_v2 *cuCtxDestroy;
|
||||||
|
tcuCtxPushCurrent_v2 *cuCtxPushCurrent;
|
||||||
|
tcuCtxPopCurrent_v2 *cuCtxPopCurrent;
|
||||||
|
tcuMemAlloc_v2 *cuMemAlloc;
|
||||||
|
tcuMemFree_v2 *cuMemFree;
|
||||||
|
tcuMemcpyHtoD_v2 *cuMemcpyHtoD;
|
||||||
|
tcuMemHostRegister cuMemHostRegister;
|
||||||
|
tcuMemHostGetDevicePointer cuMemHostGetDevicePointer;
|
||||||
|
tcuMemHostUnregister cuMemHostUnregister;
|
||||||
|
|
||||||
|
CUdevice dev;
|
||||||
|
CUcontext cu_ctx;
|
||||||
|
int is_standalone_ctx; // cuCtxCreate fallback (primary context unavailable, seen on GB10)
|
||||||
|
CUdeviceptr cu_dptr;
|
||||||
|
size_t frame_bytes;
|
||||||
|
|
||||||
|
// Pinned XShm buffer registered for direct DMA reads
|
||||||
|
void *registered_host_ptr;
|
||||||
|
int is_zero_copy;
|
||||||
|
|
||||||
|
NV_ENCODE_API_FUNCTION_LIST fn;
|
||||||
|
void *encoder;
|
||||||
|
|
||||||
|
NV_ENC_REGISTER_RESOURCE reg_res;
|
||||||
|
NV_ENC_OUTPUT_PTR bitstream_buf;
|
||||||
|
|
||||||
|
uint32_t width;
|
||||||
|
uint32_t height;
|
||||||
|
int is_hevc;
|
||||||
|
|
||||||
|
uint8_t *output_staging;
|
||||||
|
size_t output_staging_cap;
|
||||||
|
};
|
||||||
|
|
||||||
|
// Returns 1 when the context was pushed; pop only in that case.
|
||||||
|
static int ctx_push(NvencEngine *engine) {
|
||||||
|
return engine->cuCtxPushCurrent && engine->cu_ctx && engine->cuCtxPushCurrent(engine->cu_ctx) == CUDA_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void ctx_pop(NvencEngine *engine, int pushed) {
|
||||||
|
if (pushed && engine->cuCtxPopCurrent) {
|
||||||
|
CUcontext dummy = NULL;
|
||||||
|
engine->cuCtxPopCurrent(&dummy);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
NvencEngine* nvenc_create(const NvencConfig* config) {
|
||||||
|
if (!config || config->width == 0 || config->height == 0) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
NvencEngine *engine = (NvencEngine*)calloc(1, sizeof(NvencEngine));
|
||||||
|
if (!engine) return NULL;
|
||||||
|
|
||||||
|
engine->width = config->width;
|
||||||
|
engine->height = config->height;
|
||||||
|
engine->is_hevc = config->is_hevc;
|
||||||
|
|
||||||
|
// 1. Load CUDA driver
|
||||||
|
engine->cuda_lib = dlopen("libcuda.so.1", RTLD_NOW);
|
||||||
|
if (!engine->cuda_lib) {
|
||||||
|
fprintf(stderr, "[nvenc] dlopen libcuda.so.1 failed\n");
|
||||||
|
free(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
engine->cuInit = (tcuInit*)dlsym(engine->cuda_lib, "cuInit");
|
||||||
|
engine->cuDeviceGet = (tcuDeviceGet*)dlsym(engine->cuda_lib, "cuDeviceGet");
|
||||||
|
engine->cuDevicePrimaryCtxRetain = (tcuDevicePrimaryCtxRetain*)dlsym(engine->cuda_lib, "cuDevicePrimaryCtxRetain");
|
||||||
|
engine->cuDevicePrimaryCtxRelease = (tcuDevicePrimaryCtxRelease*)dlsym(engine->cuda_lib, "cuDevicePrimaryCtxRelease_v2");
|
||||||
|
if (!engine->cuDevicePrimaryCtxRelease)
|
||||||
|
engine->cuDevicePrimaryCtxRelease = (tcuDevicePrimaryCtxRelease*)dlsym(engine->cuda_lib, "cuDevicePrimaryCtxRelease");
|
||||||
|
engine->cuCtxCreate = (tcuCtxCreate_v2*)dlsym(engine->cuda_lib, "cuCtxCreate_v2");
|
||||||
|
engine->cuCtxDestroy = (tcuCtxDestroy_v2*)dlsym(engine->cuda_lib, "cuCtxDestroy_v2");
|
||||||
|
engine->cuCtxPushCurrent = (tcuCtxPushCurrent_v2*)dlsym(engine->cuda_lib, "cuCtxPushCurrent_v2");
|
||||||
|
engine->cuCtxPopCurrent = (tcuCtxPopCurrent_v2*)dlsym(engine->cuda_lib, "cuCtxPopCurrent_v2");
|
||||||
|
engine->cuMemAlloc = (tcuMemAlloc_v2*)dlsym(engine->cuda_lib, "cuMemAlloc_v2");
|
||||||
|
engine->cuMemFree = (tcuMemFree_v2*)dlsym(engine->cuda_lib, "cuMemFree_v2");
|
||||||
|
engine->cuMemcpyHtoD = (tcuMemcpyHtoD_v2*)dlsym(engine->cuda_lib, "cuMemcpyHtoD_v2");
|
||||||
|
engine->cuMemHostRegister = (tcuMemHostRegister)dlsym(engine->cuda_lib, "cuMemHostRegister_v2");
|
||||||
|
engine->cuMemHostGetDevicePointer = (tcuMemHostGetDevicePointer)dlsym(engine->cuda_lib, "cuMemHostGetDevicePointer_v2");
|
||||||
|
engine->cuMemHostUnregister = (tcuMemHostUnregister)dlsym(engine->cuda_lib, "cuMemHostUnregister");
|
||||||
|
|
||||||
|
if (!engine->cuInit || !engine->cuDeviceGet || !engine->cuDevicePrimaryCtxRetain ||
|
||||||
|
!engine->cuDevicePrimaryCtxRelease || !engine->cuCtxPushCurrent || !engine->cuCtxPopCurrent ||
|
||||||
|
!engine->cuMemAlloc || !engine->cuMemFree || !engine->cuMemcpyHtoD) {
|
||||||
|
fprintf(stderr, "[nvenc] Missing CUDA driver symbols\n");
|
||||||
|
nvenc_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
CUresult cures = engine->cuInit(0);
|
||||||
|
if (cures != CUDA_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] cuInit failed: %d\n", cures);
|
||||||
|
nvenc_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
cures = engine->cuDeviceGet(&engine->dev, 0);
|
||||||
|
if (cures != CUDA_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] cuDeviceGet failed: %d\n", cures);
|
||||||
|
nvenc_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
cures = engine->cuDevicePrimaryCtxRetain(&engine->cu_ctx, engine->dev);
|
||||||
|
if ((cures != CUDA_SUCCESS || !engine->cu_ctx) && engine->cuCtxCreate && engine->cuCtxDestroy) {
|
||||||
|
engine->cu_ctx = NULL;
|
||||||
|
// cuCtxCreate makes the new context current; the push below makes it current again
|
||||||
|
cures = engine->cuCtxCreate(&engine->cu_ctx, 0, engine->dev);
|
||||||
|
if (cures == CUDA_SUCCESS && engine->cu_ctx) {
|
||||||
|
CUcontext dummy = NULL;
|
||||||
|
engine->cuCtxPopCurrent(&dummy);
|
||||||
|
engine->is_standalone_ctx = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (cures != CUDA_SUCCESS || !engine->cu_ctx) {
|
||||||
|
fprintf(stderr, "[nvenc] CUDA context creation failed: %d\n", cures);
|
||||||
|
engine->cu_ctx = NULL;
|
||||||
|
nvenc_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
int pushed = ctx_push(engine);
|
||||||
|
if (!pushed) {
|
||||||
|
fprintf(stderr, "[nvenc] cuCtxPushCurrent failed\n");
|
||||||
|
nvenc_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Load NVENC
|
||||||
|
engine->nvenc_lib = dlopen("libnvidia-encode.so.1", RTLD_NOW);
|
||||||
|
if (!engine->nvenc_lib) {
|
||||||
|
fprintf(stderr, "[nvenc] dlopen libnvidia-encode.so.1 failed\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Like FFmpeg: the driver must support the header's API version, otherwise fall back.
|
||||||
|
tNvEncodeAPIGetMaxSupportedVersion get_max_ver = (tNvEncodeAPIGetMaxSupportedVersion)dlsym(
|
||||||
|
engine->nvenc_lib, "NvEncodeAPIGetMaxSupportedVersion");
|
||||||
|
uint32_t max_supported_ver = 0;
|
||||||
|
if (!get_max_ver || get_max_ver(&max_supported_ver) != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] NvEncodeAPIGetMaxSupportedVersion failed\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
if (max_supported_ver < ((NVENCAPI_MAJOR_VERSION << 4) | NVENCAPI_MINOR_VERSION)) {
|
||||||
|
fprintf(stderr, "[nvenc] Driver NVENC API %u.%u is older than required %d.%d; update the NVIDIA driver\n",
|
||||||
|
max_supported_ver >> 4, max_supported_ver & 0xf, NVENCAPI_MAJOR_VERSION, NVENCAPI_MINOR_VERSION);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
tNvEncodeAPICreateInstance create_inst = (tNvEncodeAPICreateInstance)dlsym(engine->nvenc_lib, "NvEncodeAPICreateInstance");
|
||||||
|
if (!create_inst) {
|
||||||
|
fprintf(stderr, "[nvenc] dlsym NvEncodeAPICreateInstance failed\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
memset(&engine->fn, 0, sizeof(engine->fn));
|
||||||
|
engine->fn.version = NV_ENCODE_API_FUNCTION_LIST_VER;
|
||||||
|
NVENCSTATUS nvres = create_inst(&engine->fn);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] NvEncodeAPICreateInstance failed: %d\n", nvres);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Open Encode Session
|
||||||
|
NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS open_params;
|
||||||
|
memset(&open_params, 0, sizeof(open_params));
|
||||||
|
open_params.version = NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS_VER;
|
||||||
|
open_params.deviceType = NV_ENC_DEVICE_TYPE_CUDA;
|
||||||
|
open_params.device = engine->cu_ctx;
|
||||||
|
open_params.apiVersion = NVENCAPI_VERSION;
|
||||||
|
|
||||||
|
nvres = engine->fn.nvEncOpenEncodeSessionEx(&open_params, &engine->encoder);
|
||||||
|
if (nvres != NV_ENC_SUCCESS || !engine->encoder) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncOpenEncodeSessionEx failed: %d\n", nvres);
|
||||||
|
engine->encoder = NULL;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. Query Preset Config
|
||||||
|
GUID codec_guid = engine->is_hevc ? NV_ENC_CODEC_HEVC_GUID : NV_ENC_CODEC_H264_GUID;
|
||||||
|
NV_ENC_PRESET_CONFIG preset_cfg;
|
||||||
|
memset(&preset_cfg, 0, sizeof(preset_cfg));
|
||||||
|
preset_cfg.version = NV_ENC_PRESET_CONFIG_VER;
|
||||||
|
preset_cfg.presetCfg.version = NV_ENC_CONFIG_VER;
|
||||||
|
|
||||||
|
nvres = engine->fn.nvEncGetEncodePresetConfigEx(
|
||||||
|
engine->encoder,
|
||||||
|
codec_guid,
|
||||||
|
NV_ENC_PRESET_P4_GUID,
|
||||||
|
NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY,
|
||||||
|
&preset_cfg
|
||||||
|
);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncGetEncodePresetConfigEx failed: %d\n", nvres);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
NV_ENC_CONFIG enc_cfg;
|
||||||
|
memcpy(&enc_cfg, &preset_cfg.presetCfg, sizeof(NV_ENC_CONFIG));
|
||||||
|
|
||||||
|
enc_cfg.gopLength = config->gop > 0 ? config->gop : NVENC_INFINITE_GOPLENGTH;
|
||||||
|
enc_cfg.frameIntervalP = 1; // Strict low-latency: zero B-frames
|
||||||
|
enc_cfg.rcParams.rateControlMode = NV_ENC_PARAMS_RC_VBR;
|
||||||
|
enc_cfg.rcParams.averageBitRate = (uint32_t)(config->target_bps > 0 ? config->target_bps : 10000000);
|
||||||
|
enc_cfg.rcParams.maxBitRate = (uint32_t)(config->max_bps > 0 ? config->max_bps : 15000000);
|
||||||
|
enc_cfg.rcParams.vbvBufferSize = (uint32_t)(config->buffer_bits > 0 ? config->buffer_bits : (config->max_bps > 0 ? config->max_bps / 10 : 1500000));
|
||||||
|
enc_cfg.rcParams.targetQuality = (uint8_t)(config->cq > 0 ? config->cq : 28);
|
||||||
|
NV_ENC_CAPS_PARAM caps_param;
|
||||||
|
memset(&caps_param, 0, sizeof(caps_param));
|
||||||
|
caps_param.version = NV_ENC_CAPS_PARAM_VER;
|
||||||
|
int caps_val = 0;
|
||||||
|
if (config->chroma_444) {
|
||||||
|
// GPUs without 4:4:4 encode fail here; the caller falls back to FFmpeg/libx264, which keep 4:4:4.
|
||||||
|
caps_param.capsToQuery = NV_ENC_CAPS_SUPPORT_YUV444_ENCODE;
|
||||||
|
if (engine->fn.nvEncGetEncodeCaps(engine->encoder, codec_guid, &caps_param, &caps_val) != NV_ENC_SUCCESS || caps_val <= 0) {
|
||||||
|
fprintf(stderr, "[nvenc] 4:4:4 encoding not supported for this codec\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
// NVENC rejects AQ / temporal AQ in 4:4:4 mode.
|
||||||
|
enc_cfg.rcParams.enableAQ = 0;
|
||||||
|
enc_cfg.rcParams.enableTemporalAQ = 0;
|
||||||
|
} else {
|
||||||
|
enc_cfg.rcParams.enableAQ = 1;
|
||||||
|
// Temporal AQ only where the hardware/codec reports it
|
||||||
|
caps_param.capsToQuery = NV_ENC_CAPS_SUPPORT_TEMPORAL_AQ;
|
||||||
|
caps_val = 0;
|
||||||
|
enc_cfg.rcParams.enableTemporalAQ =
|
||||||
|
engine->fn.nvEncGetEncodeCaps(engine->encoder, codec_guid, &caps_param, &caps_val) == NV_ENC_SUCCESS && caps_val > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (engine->is_hevc) {
|
||||||
|
enc_cfg.profileGUID = config->chroma_444 ? NV_ENC_HEVC_PROFILE_FREXT_GUID : NV_ENC_HEVC_PROFILE_MAIN_GUID;
|
||||||
|
enc_cfg.encodeCodecConfig.hevcConfig.chromaFormatIDC = config->chroma_444 ? 3 : 1;
|
||||||
|
enc_cfg.encodeCodecConfig.hevcConfig.idrPeriod = enc_cfg.gopLength;
|
||||||
|
enc_cfg.encodeCodecConfig.hevcConfig.repeatSPSPPS = 1;
|
||||||
|
enc_cfg.encodeCodecConfig.hevcConfig.outputAUD = 1;
|
||||||
|
} else {
|
||||||
|
enc_cfg.profileGUID = config->chroma_444 ? NV_ENC_H264_PROFILE_HIGH_444_GUID : NV_ENC_H264_PROFILE_BASELINE_GUID;
|
||||||
|
enc_cfg.encodeCodecConfig.h264Config.chromaFormatIDC = config->chroma_444 ? 3 : 1;
|
||||||
|
enc_cfg.encodeCodecConfig.h264Config.idrPeriod = enc_cfg.gopLength;
|
||||||
|
enc_cfg.encodeCodecConfig.h264Config.repeatSPSPPS = 1;
|
||||||
|
enc_cfg.encodeCodecConfig.h264Config.outputAUD = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 5. Initialize Encoder
|
||||||
|
NV_ENC_INITIALIZE_PARAMS init_params;
|
||||||
|
memset(&init_params, 0, sizeof(init_params));
|
||||||
|
init_params.version = NV_ENC_INITIALIZE_PARAMS_VER;
|
||||||
|
init_params.encodeGUID = codec_guid;
|
||||||
|
init_params.presetGUID = NV_ENC_PRESET_P4_GUID;
|
||||||
|
init_params.encodeWidth = engine->width;
|
||||||
|
init_params.encodeHeight = engine->height;
|
||||||
|
init_params.darWidth = engine->width;
|
||||||
|
init_params.darHeight = engine->height;
|
||||||
|
init_params.frameRateNum = config->fps > 0 ? config->fps : 60;
|
||||||
|
init_params.frameRateDen = 1;
|
||||||
|
init_params.enablePTD = 1;
|
||||||
|
init_params.tuningInfo = NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY;
|
||||||
|
init_params.encodeConfig = &enc_cfg;
|
||||||
|
|
||||||
|
nvres = engine->fn.nvEncInitializeEncoder(engine->encoder, &init_params);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncInitializeEncoder failed: %d\n", nvres);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 6. Device input buffer (ARGB32), used until a host buffer is registered
|
||||||
|
engine->frame_bytes = (size_t)engine->width * engine->height * 4;
|
||||||
|
cures = engine->cuMemAlloc(&engine->cu_dptr, engine->frame_bytes);
|
||||||
|
if (cures != CUDA_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] cuMemAlloc failed: %d\n", cures);
|
||||||
|
engine->cu_dptr = 0;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
memset(&engine->reg_res, 0, sizeof(engine->reg_res));
|
||||||
|
engine->reg_res.version = NV_ENC_REGISTER_RESOURCE_VER;
|
||||||
|
engine->reg_res.resourceType = NV_ENC_INPUT_RESOURCE_TYPE_CUDADEVICEPTR;
|
||||||
|
engine->reg_res.width = engine->width;
|
||||||
|
engine->reg_res.height = engine->height;
|
||||||
|
engine->reg_res.pitch = engine->width * 4;
|
||||||
|
engine->reg_res.resourceToRegister = (void*)engine->cu_dptr;
|
||||||
|
engine->reg_res.bufferFormat = NV_ENC_BUFFER_FORMAT_ARGB;
|
||||||
|
|
||||||
|
nvres = engine->fn.nvEncRegisterResource(engine->encoder, &engine->reg_res);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncRegisterResource failed: %d\n", nvres);
|
||||||
|
engine->reg_res.registeredResource = NULL;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 7. Create bitstream output buffer
|
||||||
|
NV_ENC_CREATE_BITSTREAM_BUFFER bs_buf;
|
||||||
|
memset(&bs_buf, 0, sizeof(bs_buf));
|
||||||
|
bs_buf.version = NV_ENC_CREATE_BITSTREAM_BUFFER_VER;
|
||||||
|
nvres = engine->fn.nvEncCreateBitstreamBuffer(engine->encoder, &bs_buf);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncCreateBitstreamBuffer failed: %d\n", nvres);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
engine->bitstream_buf = bs_buf.bitstreamBuffer;
|
||||||
|
|
||||||
|
engine->output_staging_cap = 2 * 1024 * 1024;
|
||||||
|
engine->output_staging = (uint8_t*)malloc(engine->output_staging_cap);
|
||||||
|
if (!engine->output_staging) {
|
||||||
|
fprintf(stderr, "[nvenc] output buffer allocation failed\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return engine;
|
||||||
|
|
||||||
|
fail:
|
||||||
|
// Pop the creation push first; nvenc_destroy pushes and pops on its own.
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
nvenc_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
int nvenc_register_host_buffer(NvencEngine* engine, void* host_ptr, size_t size) {
|
||||||
|
if (!engine || !host_ptr || size < engine->frame_bytes) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if (!engine->cuMemHostRegister || !engine->cuMemHostGetDevicePointer || !engine->cuMemHostUnregister) {
|
||||||
|
return -2;
|
||||||
|
}
|
||||||
|
|
||||||
|
int pushed = ctx_push(engine);
|
||||||
|
if (!pushed) return -2;
|
||||||
|
|
||||||
|
// If already registered, unregister first
|
||||||
|
nvenc_unregister_host_buffer(engine);
|
||||||
|
|
||||||
|
CUresult cures = engine->cuMemHostRegister(host_ptr, size, CU_MEMHOSTREGISTER_DEVICEMAP);
|
||||||
|
if (cures != CUDA_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] cuMemHostRegister failed: %d\n", cures);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -3;
|
||||||
|
}
|
||||||
|
|
||||||
|
CUdeviceptr dev_ptr = 0;
|
||||||
|
cures = engine->cuMemHostGetDevicePointer(&dev_ptr, host_ptr, 0);
|
||||||
|
if (cures != CUDA_SUCCESS || dev_ptr == 0) {
|
||||||
|
fprintf(stderr, "[nvenc] cuMemHostGetDevicePointer failed: %d\n", cures);
|
||||||
|
engine->cuMemHostUnregister(host_ptr);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -4;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Register the pinned buffer before releasing the device buffer, so a failure keeps the copy path working
|
||||||
|
NV_ENC_REGISTER_RESOURCE new_reg;
|
||||||
|
memset(&new_reg, 0, sizeof(new_reg));
|
||||||
|
new_reg.version = NV_ENC_REGISTER_RESOURCE_VER;
|
||||||
|
new_reg.resourceType = NV_ENC_INPUT_RESOURCE_TYPE_CUDADEVICEPTR;
|
||||||
|
new_reg.width = engine->width;
|
||||||
|
new_reg.height = engine->height;
|
||||||
|
new_reg.pitch = engine->width * 4;
|
||||||
|
new_reg.resourceToRegister = (void*)dev_ptr;
|
||||||
|
new_reg.bufferFormat = NV_ENC_BUFFER_FORMAT_ARGB;
|
||||||
|
|
||||||
|
NVENCSTATUS nvres = engine->fn.nvEncRegisterResource(engine->encoder, &new_reg);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncRegisterResource (pinned host) failed: %d\n", nvres);
|
||||||
|
engine->cuMemHostUnregister(host_ptr);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -5;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (engine->reg_res.registeredResource) {
|
||||||
|
engine->fn.nvEncUnregisterResource(engine->encoder, engine->reg_res.registeredResource);
|
||||||
|
}
|
||||||
|
if (engine->cu_dptr) {
|
||||||
|
engine->cuMemFree(engine->cu_dptr);
|
||||||
|
engine->cu_dptr = 0;
|
||||||
|
}
|
||||||
|
engine->reg_res = new_reg;
|
||||||
|
engine->registered_host_ptr = host_ptr;
|
||||||
|
engine->is_zero_copy = 1;
|
||||||
|
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Caller has the context current.
|
||||||
|
void nvenc_unregister_host_buffer(NvencEngine* engine) {
|
||||||
|
if (!engine || !engine->is_zero_copy) return;
|
||||||
|
|
||||||
|
if (engine->reg_res.registeredResource && engine->encoder) {
|
||||||
|
engine->fn.nvEncUnregisterResource(engine->encoder, engine->reg_res.registeredResource);
|
||||||
|
memset(&engine->reg_res, 0, sizeof(engine->reg_res));
|
||||||
|
}
|
||||||
|
if (engine->registered_host_ptr && engine->cuMemHostUnregister) {
|
||||||
|
engine->cuMemHostUnregister(engine->registered_host_ptr);
|
||||||
|
engine->registered_host_ptr = NULL;
|
||||||
|
}
|
||||||
|
engine->is_zero_copy = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int nvenc_encode_frame(
|
||||||
|
NvencEngine* engine,
|
||||||
|
const uint8_t* input_argb,
|
||||||
|
uint32_t pitch,
|
||||||
|
int force_idr,
|
||||||
|
const uint8_t** out_data,
|
||||||
|
uint32_t* out_len
|
||||||
|
) {
|
||||||
|
if (!engine || !out_data || !out_len || !engine->reg_res.registeredResource) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
*out_data = NULL;
|
||||||
|
*out_len = 0;
|
||||||
|
|
||||||
|
int pushed = ctx_push(engine);
|
||||||
|
if (!pushed) return -1;
|
||||||
|
|
||||||
|
// Without a registered host buffer, copy the frame into the device buffer
|
||||||
|
if (!engine->is_zero_copy) {
|
||||||
|
if (!input_argb) {
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
CUresult cures = CUDA_SUCCESS;
|
||||||
|
if (pitch == engine->width * 4) {
|
||||||
|
cures = engine->cuMemcpyHtoD(engine->cu_dptr, input_argb, engine->frame_bytes);
|
||||||
|
} else {
|
||||||
|
for (uint32_t y = 0; y < engine->height && cures == CUDA_SUCCESS; y++) {
|
||||||
|
cures = engine->cuMemcpyHtoD(
|
||||||
|
engine->cu_dptr + (size_t)y * engine->width * 4,
|
||||||
|
input_argb + (size_t)y * pitch,
|
||||||
|
engine->width * 4
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (cures != CUDA_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] cuMemcpyHtoD failed: %d\n", cures);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
NV_ENC_MAP_INPUT_RESOURCE map_res;
|
||||||
|
memset(&map_res, 0, sizeof(map_res));
|
||||||
|
map_res.version = NV_ENC_MAP_INPUT_RESOURCE_VER;
|
||||||
|
map_res.registeredResource = engine->reg_res.registeredResource;
|
||||||
|
NVENCSTATUS nvres = engine->fn.nvEncMapInputResource(engine->encoder, &map_res);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncMapInputResource failed: %d\n", nvres);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -3;
|
||||||
|
}
|
||||||
|
|
||||||
|
NV_ENC_PIC_PARAMS pic_params;
|
||||||
|
memset(&pic_params, 0, sizeof(pic_params));
|
||||||
|
pic_params.version = NV_ENC_PIC_PARAMS_VER;
|
||||||
|
pic_params.inputWidth = engine->width;
|
||||||
|
pic_params.inputHeight = engine->height;
|
||||||
|
pic_params.inputPitch = engine->width * 4;
|
||||||
|
pic_params.inputBuffer = map_res.mappedResource;
|
||||||
|
pic_params.outputBitstream = engine->bitstream_buf;
|
||||||
|
pic_params.bufferFmt = NV_ENC_BUFFER_FORMAT_ARGB;
|
||||||
|
pic_params.pictureStruct = NV_ENC_PIC_STRUCT_FRAME;
|
||||||
|
if (force_idr) {
|
||||||
|
pic_params.encodePicFlags = NV_ENC_PIC_FLAG_FORCEIDR;
|
||||||
|
}
|
||||||
|
|
||||||
|
nvres = engine->fn.nvEncEncodePicture(engine->encoder, &pic_params);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncEncodePicture failed: %d\n", nvres);
|
||||||
|
engine->fn.nvEncUnmapInputResource(engine->encoder, map_res.mappedResource);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -4;
|
||||||
|
}
|
||||||
|
|
||||||
|
NV_ENC_LOCK_BITSTREAM lock_bs;
|
||||||
|
memset(&lock_bs, 0, sizeof(lock_bs));
|
||||||
|
lock_bs.version = NV_ENC_LOCK_BITSTREAM_VER;
|
||||||
|
lock_bs.outputBitstream = engine->bitstream_buf;
|
||||||
|
lock_bs.doNotWait = 0;
|
||||||
|
|
||||||
|
nvres = engine->fn.nvEncLockBitstream(engine->encoder, &lock_bs);
|
||||||
|
if (nvres != NV_ENC_SUCCESS) {
|
||||||
|
fprintf(stderr, "[nvenc] nvEncLockBitstream failed: %d\n", nvres);
|
||||||
|
engine->fn.nvEncUnmapInputResource(engine->encoder, map_res.mappedResource);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return -5;
|
||||||
|
}
|
||||||
|
|
||||||
|
int rc = 0;
|
||||||
|
uint32_t size = lock_bs.bitstreamSizeInBytes;
|
||||||
|
if (size > engine->output_staging_cap) {
|
||||||
|
size_t cap = (size_t)size + 64 * 1024;
|
||||||
|
uint8_t *grown = (uint8_t*)realloc(engine->output_staging, cap);
|
||||||
|
if (grown) {
|
||||||
|
engine->output_staging = grown;
|
||||||
|
engine->output_staging_cap = cap;
|
||||||
|
} else {
|
||||||
|
fprintf(stderr, "[nvenc] output buffer allocation failed: %u bytes\n", size);
|
||||||
|
rc = -6;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (rc == 0 && size > 0 && lock_bs.bitstreamBufferPtr) {
|
||||||
|
memcpy(engine->output_staging, lock_bs.bitstreamBufferPtr, size);
|
||||||
|
*out_data = engine->output_staging;
|
||||||
|
*out_len = size;
|
||||||
|
}
|
||||||
|
|
||||||
|
engine->fn.nvEncUnlockBitstream(engine->encoder, engine->bitstream_buf);
|
||||||
|
// The SDK allows unmapping only after the bitstream lock returned for this picture
|
||||||
|
engine->fn.nvEncUnmapInputResource(engine->encoder, map_res.mappedResource);
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
void nvenc_destroy(NvencEngine* engine) {
|
||||||
|
if (!engine) return;
|
||||||
|
|
||||||
|
int pushed = ctx_push(engine);
|
||||||
|
// Without a current context the NVENC/CUDA objects cannot be released safely; leak them.
|
||||||
|
if (pushed) {
|
||||||
|
if (engine->bitstream_buf && engine->encoder) {
|
||||||
|
engine->fn.nvEncDestroyBitstreamBuffer(engine->encoder, engine->bitstream_buf);
|
||||||
|
engine->bitstream_buf = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
nvenc_unregister_host_buffer(engine);
|
||||||
|
|
||||||
|
if (engine->reg_res.registeredResource && engine->encoder) {
|
||||||
|
engine->fn.nvEncUnregisterResource(engine->encoder, engine->reg_res.registeredResource);
|
||||||
|
memset(&engine->reg_res, 0, sizeof(engine->reg_res));
|
||||||
|
}
|
||||||
|
if (engine->cu_dptr) {
|
||||||
|
engine->cuMemFree(engine->cu_dptr);
|
||||||
|
engine->cu_dptr = 0;
|
||||||
|
}
|
||||||
|
if (engine->encoder) {
|
||||||
|
engine->fn.nvEncDestroyEncoder(engine->encoder);
|
||||||
|
engine->encoder = NULL;
|
||||||
|
}
|
||||||
|
ctx_pop(engine, pushed);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (engine->cu_ctx) {
|
||||||
|
if (engine->is_standalone_ctx) engine->cuCtxDestroy(engine->cu_ctx);
|
||||||
|
else engine->cuDevicePrimaryCtxRelease(engine->dev);
|
||||||
|
engine->cu_ctx = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
free(engine->output_staging);
|
||||||
|
// libcuda/libnvidia-encode stay loaded: their driver threads outlive the session, and
|
||||||
|
// dlclose crashed them on the next encoder start (SEGV_MAPERR in libnvcuvid).
|
||||||
|
free(engine);
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
#ifndef UU_NVENC_ENGINE_H
|
||||||
|
#define UU_NVENC_ENGINE_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef struct NvencEngine NvencEngine;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint32_t width;
|
||||||
|
uint32_t height;
|
||||||
|
uint32_t fps;
|
||||||
|
uint32_t gop;
|
||||||
|
uint32_t cq;
|
||||||
|
int64_t target_bps;
|
||||||
|
int64_t max_bps;
|
||||||
|
int64_t buffer_bits;
|
||||||
|
int is_hevc; // 1 = H.265, 0 = H.264
|
||||||
|
int chroma_444; // 1 = 4:4:4 (H.264 High 4:4:4 / HEVC FRExt), 0 = 4:2:0
|
||||||
|
} NvencConfig;
|
||||||
|
|
||||||
|
// Initialize and open an NVENC encoding session. Returns NULL on error.
|
||||||
|
NvencEngine* nvenc_create(const NvencConfig* config);
|
||||||
|
|
||||||
|
// Register host shared memory (XShm buffer) as CUDA pinned memory that NVENC reads by DMA.
|
||||||
|
// Returns 0 on success, negative value on error.
|
||||||
|
int nvenc_register_host_buffer(NvencEngine* engine, void* host_ptr, size_t size);
|
||||||
|
|
||||||
|
// Unregister a previously registered host buffer (the CUDA context must be current).
|
||||||
|
void nvenc_unregister_host_buffer(NvencEngine* engine);
|
||||||
|
|
||||||
|
// Encode one frame.
|
||||||
|
// If host buffer was registered via nvenc_register_host_buffer, input_argb can be NULL
|
||||||
|
// and the encoder reads the registered host memory directly (no host-to-device copy).
|
||||||
|
// force_idr: 1 to force keyframe/IDR, 0 otherwise
|
||||||
|
// out_data: pointer to receive the bitstream buffer (valid until next encode call or destroy)
|
||||||
|
// out_len: pointer to receive the bitstream size in bytes
|
||||||
|
// Returns 0 on success, negative value on error.
|
||||||
|
int nvenc_encode_frame(
|
||||||
|
NvencEngine* engine,
|
||||||
|
const uint8_t* input_argb,
|
||||||
|
uint32_t pitch,
|
||||||
|
int force_idr,
|
||||||
|
const uint8_t** out_data,
|
||||||
|
uint32_t* out_len
|
||||||
|
);
|
||||||
|
|
||||||
|
// Destroy the NVENC engine and free all CUDA/NVENC resources.
|
||||||
|
void nvenc_destroy(NvencEngine* engine);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // UU_NVENC_ENGINE_H
|
||||||
+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;
|
||||||
|
|||||||
+361
-33
@@ -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);
|
||||||
@@ -376,14 +594,21 @@ static int read_stream_result(struct uu_portal *p, GVariant *results) {
|
|||||||
if (streams) g_variant_unref(streams);
|
if (streams) g_variant_unref(streams);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
static void save_restore_token(struct uu_portal *p, void (*save_token)(const char *, void *),
|
||||||
|
uu_portal_save_detailed_fn save_detailed, void *save_data) {
|
||||||
|
if (!p->restore_token) return;
|
||||||
|
if (save_token) save_token(p->restore_token, save_data);
|
||||||
|
if (save_detailed) save_detailed(p->restore_token, save_data, p->has_position, p->position_x, p->position_y);
|
||||||
|
}
|
||||||
static struct uu_portal *open_persist(const char *restore, void (*save_token)(const char *, void *),
|
static struct uu_portal *open_persist(const char *restore, void (*save_token)(const char *, void *),
|
||||||
void *save_data, uu_portal_cancelled_fn cancelled, void *cancel_data,
|
uu_portal_save_detailed_fn save_detailed, void *save_data, uu_portal_cancelled_fn cancelled, void *cancel_data,
|
||||||
int *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 +637,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 +650,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);
|
||||||
@@ -461,7 +681,7 @@ static struct uu_portal *open_persist(const char *restore, void (*save_token)(co
|
|||||||
fprintf(stderr, "Portal persistence: requested=%d restore_attempted=%d token_returned=%d\n",
|
fprintf(stderr, "Portal persistence: requested=%d restore_attempted=%d token_returned=%d\n",
|
||||||
version >= 2, restore && *restore, p->restore_token && *p->restore_token);
|
version >= 2, restore && *restore, p->restore_token && *p->restore_token);
|
||||||
}
|
}
|
||||||
if (!*error && p->restore_token && save_token) save_token(p->restore_token, save_data);
|
if (!*error) save_restore_token(p, save_token, save_detailed, save_data);
|
||||||
g_variant_unref(results);
|
g_variant_unref(results);
|
||||||
if (*error) goto done;
|
if (*error) goto done;
|
||||||
p->main_loop = g_main_loop_new(p->context, FALSE);
|
p->main_loop = g_main_loop_new(p->context, FALSE);
|
||||||
@@ -494,11 +714,27 @@ struct uu_portal *uu_portal_open_persist_cancellable(const char *restore,
|
|||||||
void (*save_token)(const char *, void *), void *save_data,
|
void (*save_token)(const char *, void *), void *save_data,
|
||||||
uu_portal_cancelled_fn cancelled, void *cancel_data,
|
uu_portal_cancelled_fn cancelled, void *cancel_data,
|
||||||
int *error, uint32_t *width, uint32_t *height) {
|
int *error, uint32_t *width, uint32_t *height) {
|
||||||
return open_persist(restore, save_token, save_data, cancelled, cancel_data, error, width, height);
|
return open_persist(restore, save_token, NULL, save_data, cancelled, cancel_data, 0, error, width, height, 1);
|
||||||
|
}
|
||||||
|
struct uu_portal *uu_portal_open_persist_capture(const char *restore,
|
||||||
|
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, NULL, save_data, cancelled, cancel_data, prefer_dmabuf, error, width, height, 1);
|
||||||
}
|
}
|
||||||
struct uu_portal *uu_portal_open_persist(const char *restore, void (*save_token)(const char *, void *),
|
struct uu_portal *uu_portal_open_persist(const char *restore, void (*save_token)(const char *, void *),
|
||||||
void *data, int *error, uint32_t *width, uint32_t *height) {
|
void *data, int *error, uint32_t *width, uint32_t *height) {
|
||||||
return open_persist(restore, save_token, data, NULL, NULL, error, width, height);
|
return open_persist(restore, save_token, NULL, data, NULL, NULL, 0, error, width, height, 1);
|
||||||
|
}
|
||||||
|
struct uu_portal *uu_portal_open_virtual(const char *restore, void (*save_token)(const char *, void *),
|
||||||
|
void *data, int *error, uint32_t *width, uint32_t *height) {
|
||||||
|
return open_persist(restore, save_token, NULL, data, NULL, NULL, 0, error, width, height, 4);
|
||||||
|
}
|
||||||
|
struct uu_portal *uu_portal_open_detailed(const char *restore, uu_portal_save_detailed_fn save_token,
|
||||||
|
void *save_data, uu_portal_cancelled_fn cancelled, void *cancel_data, int prefer_dmabuf,
|
||||||
|
uint32_t source_types, int *error, uint32_t *width, uint32_t *height) {
|
||||||
|
if (source_types != 1 && source_types != 4) { *error = 3; *width = *height = 0; return NULL; }
|
||||||
|
return open_persist(restore, NULL, save_token, save_data, cancelled, cancel_data, prefer_dmabuf, error, width, height, source_types);
|
||||||
}
|
}
|
||||||
struct uu_portal *uu_portal_open_restore(const char *restore, int *error, uint32_t *width, uint32_t *height) {
|
struct uu_portal *uu_portal_open_restore(const char *restore, int *error, uint32_t *width, uint32_t *height) {
|
||||||
return uu_portal_open_persist(restore, NULL, NULL, error, width, height);
|
return uu_portal_open_persist(restore, NULL, NULL, error, width, height);
|
||||||
@@ -545,11 +781,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 +806,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 +910,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,21 @@
|
|||||||
#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);
|
||||||
|
typedef void (*uu_portal_save_detailed_fn)(const char *token, void *data, int has_position, int32_t x, int32_t y);
|
||||||
|
/* Reports the granted position alongside the rotated token before video initialization. */
|
||||||
|
struct uu_portal *uu_portal_open_detailed(const char *restore, uu_portal_save_detailed_fn save_token, void *save_data, uu_portal_cancelled_fn cancelled, void *cancel_data, int prefer_dmabuf, uint32_t source_types, int *error, uint32_t *width, uint32_t *height);
|
||||||
/* One object owns one consent/session and one PipeWire stream. */
|
/* One object owns one consent/session and one PipeWire stream. */
|
||||||
struct uu_portal *uu_portal_open(int *error, uint32_t *width, uint32_t *height);
|
struct uu_portal *uu_portal_open(int *error, uint32_t *width, uint32_t *height);
|
||||||
/* Saves the rotated token immediately after Start, before video initialization. */
|
/* Saves the rotated token immediately after Start, before video initialization. */
|
||||||
|
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 +30,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,88 @@
|
|||||||
|
// Privacy screen, wallpaper mode: a fullscreen keep-above window on each physical monitor showing
|
||||||
|
// a picture and a notice, while the remote session works on a KWin virtual output. Runs in its own
|
||||||
|
// process (`uuremote-server privacy-wallpaper`), which the host kills on restore.
|
||||||
|
#include <gtk/gtk.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include "i18n.h"
|
||||||
|
|
||||||
|
typedef struct { int x, y, w, h; } Rect;
|
||||||
|
static GdkPixbuf *picture;
|
||||||
|
|
||||||
|
static gboolean host_closed(GIOChannel *channel, GIOCondition condition, gpointer data) {
|
||||||
|
(void)channel; (void)condition; (void)data;
|
||||||
|
gtk_main_quit();
|
||||||
|
return G_SOURCE_REMOVE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean draw(GtkWidget *widget, cairo_t *cr, gpointer data) {
|
||||||
|
(void)data;
|
||||||
|
int w = gtk_widget_get_allocated_width(widget), h = gtk_widget_get_allocated_height(widget);
|
||||||
|
cairo_set_source_rgb(cr, 0, 0, 0); cairo_paint(cr);
|
||||||
|
if (picture) {
|
||||||
|
// Cover: scale to fill, crop the overflow, keep the aspect ratio.
|
||||||
|
double pw = gdk_pixbuf_get_width(picture), ph = gdk_pixbuf_get_height(picture);
|
||||||
|
double s = w / pw > h / ph ? w / pw : h / ph;
|
||||||
|
cairo_save(cr);
|
||||||
|
cairo_translate(cr, (w - pw * s) / 2, (h - ph * s) / 2);
|
||||||
|
cairo_scale(cr, s, s);
|
||||||
|
gdk_cairo_set_source_pixbuf(cr, picture, 0, 0);
|
||||||
|
cairo_paint(cr);
|
||||||
|
cairo_restore(cr);
|
||||||
|
}
|
||||||
|
PangoLayout *layout = gtk_widget_create_pango_layout(widget, L("此设备正在被远程控制", "This device is being remotely controlled"));
|
||||||
|
PangoFontDescription *font = pango_font_description_from_string("Sans 20");
|
||||||
|
pango_layout_set_font_description(layout, font);
|
||||||
|
int tw, th; pango_layout_get_pixel_size(layout, &tw, &th);
|
||||||
|
cairo_set_source_rgba(cr, 0, 0, 0, 0.45);
|
||||||
|
cairo_rectangle(cr, (w - tw) / 2.0 - 24, h - th - 96, tw + 48, th + 32); cairo_fill(cr);
|
||||||
|
cairo_set_source_rgb(cr, 1, 1, 1);
|
||||||
|
cairo_move_to(cr, (w - tw) / 2.0, h - th - 80);
|
||||||
|
pango_cairo_show_layout(cr, layout);
|
||||||
|
pango_font_description_free(font); g_object_unref(layout);
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* `rects` are the physical outputs in logical coordinates; monitors elsewhere (the virtual output)
|
||||||
|
* stay uncovered. Returns when every window is closed or the process is killed. */
|
||||||
|
int uu_privacy_wallpaper_run(const char *image, const int *rects, int count) {
|
||||||
|
if (!gtk_init_check(NULL, NULL)) return 1;
|
||||||
|
if (image && *image) picture = gdk_pixbuf_new_from_file(image, NULL);
|
||||||
|
GdkDisplay *display = gdk_display_get_default();
|
||||||
|
int shown = 0;
|
||||||
|
for (int i = 0; i < gdk_display_get_n_monitors(display); i++) {
|
||||||
|
GdkMonitor *monitor = gdk_display_get_monitor(display, i);
|
||||||
|
GdkRectangle g; gdk_monitor_get_geometry(monitor, &g);
|
||||||
|
int physical = 0;
|
||||||
|
for (int r = 0; r < count; r++) {
|
||||||
|
const int *c = rects + r * 4;
|
||||||
|
if (c[0] == g.x && c[1] == g.y && c[2] == g.width && c[3] == g.height) physical = 1;
|
||||||
|
}
|
||||||
|
if (!physical) continue;
|
||||||
|
GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
||||||
|
gtk_window_set_title(GTK_WINDOW(window), "uu-remote-linux privacy");
|
||||||
|
gtk_window_set_decorated(GTK_WINDOW(window), FALSE);
|
||||||
|
gtk_window_set_keep_above(GTK_WINDOW(window), TRUE);
|
||||||
|
gtk_window_set_skip_taskbar_hint(GTK_WINDOW(window), TRUE);
|
||||||
|
gtk_window_set_skip_pager_hint(GTK_WINDOW(window), TRUE);
|
||||||
|
gtk_window_set_default_size(GTK_WINDOW(window), g.width, g.height);
|
||||||
|
g_signal_connect(window, "draw", G_CALLBACK(draw), NULL);
|
||||||
|
g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
|
||||||
|
gtk_window_fullscreen_on_monitor(GTK_WINDOW(window), gtk_widget_get_screen(window), i);
|
||||||
|
gtk_widget_show_all(window);
|
||||||
|
shown++;
|
||||||
|
}
|
||||||
|
if (!shown) return 2;
|
||||||
|
/* Map the covers before reporting ready: the host marks them skip-taskbar through KWin right
|
||||||
|
after this line, and KWin can only list windows whose surfaces already exist. */
|
||||||
|
while (gtk_events_pending()) gtk_main_iteration_do(FALSE);
|
||||||
|
/* EOF follows the host process, including crashes, rather than its spawning worker thread. */
|
||||||
|
GIOChannel *host = g_io_channel_unix_new(0);
|
||||||
|
guint watch = g_io_add_watch(host, G_IO_HUP | G_IO_ERR | G_IO_NVAL, host_closed, NULL);
|
||||||
|
/* Readiness handshake: the host treats picture mode as on only after this line. */
|
||||||
|
fputs("ready\n", stdout); fflush(stdout);
|
||||||
|
gtk_main();
|
||||||
|
if (g_main_context_find_source_by_id(NULL, watch)) g_source_remove(watch);
|
||||||
|
g_io_channel_unref(host);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
@@ -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
|
||||||
@@ -0,0 +1,863 @@
|
|||||||
|
#include "vaapi_engine.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <dlfcn.h>
|
||||||
|
#include <va/va.h>
|
||||||
|
#include <va/va_drm.h>
|
||||||
|
#include <va/va_drmcommon.h>
|
||||||
|
#include <va/va_vpp.h>
|
||||||
|
#include <va/va_enc_h264.h>
|
||||||
|
|
||||||
|
// Runtime-loaded libva, like the NVENC engine's libcuda/libnvidia-encode: an inproc-av build
|
||||||
|
// must not add a hard DT_NEEDED on libva for users who never touch VAAPI.
|
||||||
|
// Signatures come from the installed headers via __typeof__ so they cannot drift.
|
||||||
|
static struct {
|
||||||
|
void *libva, *libva_drm;
|
||||||
|
__typeof__(vaGetDisplayDRM) *vaGetDisplayDRM;
|
||||||
|
__typeof__(vaInitialize) *vaInitialize;
|
||||||
|
__typeof__(vaTerminate) *vaTerminate;
|
||||||
|
__typeof__(vaErrorStr) *vaErrorStr;
|
||||||
|
__typeof__(vaCreateSurfaces) *vaCreateSurfaces;
|
||||||
|
__typeof__(vaDestroySurfaces) *vaDestroySurfaces;
|
||||||
|
__typeof__(vaCreateConfig) *vaCreateConfig;
|
||||||
|
__typeof__(vaDestroyConfig) *vaDestroyConfig;
|
||||||
|
__typeof__(vaCreateContext) *vaCreateContext;
|
||||||
|
__typeof__(vaDestroyContext) *vaDestroyContext;
|
||||||
|
__typeof__(vaCreateBuffer) *vaCreateBuffer;
|
||||||
|
__typeof__(vaDestroyBuffer) *vaDestroyBuffer;
|
||||||
|
__typeof__(vaMapBuffer) *vaMapBuffer;
|
||||||
|
__typeof__(vaUnmapBuffer) *vaUnmapBuffer;
|
||||||
|
__typeof__(vaCreateImage) *vaCreateImage;
|
||||||
|
__typeof__(vaDestroyImage) *vaDestroyImage;
|
||||||
|
__typeof__(vaPutImage) *vaPutImage;
|
||||||
|
__typeof__(vaBeginPicture) *vaBeginPicture;
|
||||||
|
__typeof__(vaRenderPicture) *vaRenderPicture;
|
||||||
|
__typeof__(vaEndPicture) *vaEndPicture;
|
||||||
|
__typeof__(vaSyncSurface) *vaSyncSurface;
|
||||||
|
} RT;
|
||||||
|
|
||||||
|
static int vaapi_load_runtime(void) {
|
||||||
|
if (RT.libva) return 0;
|
||||||
|
RT.libva = dlopen("libva.so.2", RTLD_NOW | RTLD_GLOBAL);
|
||||||
|
RT.libva_drm = dlopen("libva-drm.so.2", RTLD_NOW);
|
||||||
|
if (!RT.libva || !RT.libva_drm) {
|
||||||
|
fprintf(stderr, "[vaapi] dlopen libva/libva-drm failed\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
// libva-drm depends on libva, so one lookup covers both libraries
|
||||||
|
#define VA_LOAD(sym) do { \
|
||||||
|
*(void**)&RT.sym = dlsym(RT.libva_drm, #sym) ? dlsym(RT.libva_drm, #sym) : dlsym(RT.libva, #sym); \
|
||||||
|
if (!RT.sym) { dlclose(RT.libva_drm); dlclose(RT.libva); RT.libva = RT.libva_drm = NULL; return -1; } \
|
||||||
|
} while (0)
|
||||||
|
VA_LOAD(vaGetDisplayDRM);
|
||||||
|
VA_LOAD(vaInitialize);
|
||||||
|
VA_LOAD(vaTerminate);
|
||||||
|
VA_LOAD(vaErrorStr);
|
||||||
|
VA_LOAD(vaCreateSurfaces);
|
||||||
|
VA_LOAD(vaDestroySurfaces);
|
||||||
|
VA_LOAD(vaCreateConfig);
|
||||||
|
VA_LOAD(vaDestroyConfig);
|
||||||
|
VA_LOAD(vaCreateContext);
|
||||||
|
VA_LOAD(vaDestroyContext);
|
||||||
|
VA_LOAD(vaCreateBuffer);
|
||||||
|
VA_LOAD(vaDestroyBuffer);
|
||||||
|
VA_LOAD(vaMapBuffer);
|
||||||
|
VA_LOAD(vaUnmapBuffer);
|
||||||
|
VA_LOAD(vaCreateImage);
|
||||||
|
VA_LOAD(vaDestroyImage);
|
||||||
|
VA_LOAD(vaPutImage);
|
||||||
|
VA_LOAD(vaBeginPicture);
|
||||||
|
VA_LOAD(vaRenderPicture);
|
||||||
|
VA_LOAD(vaEndPicture);
|
||||||
|
VA_LOAD(vaSyncSurface);
|
||||||
|
#undef VA_LOAD
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct VaapiEngine {
|
||||||
|
int drm_fd;
|
||||||
|
VADisplay va_dpy;
|
||||||
|
uint32_t cap_width; // capture (RGB input) size
|
||||||
|
uint32_t cap_height;
|
||||||
|
uint32_t width; // encode (output) size
|
||||||
|
uint32_t height;
|
||||||
|
uint32_t fps;
|
||||||
|
uint32_t gop;
|
||||||
|
int64_t target_bps;
|
||||||
|
int64_t max_bps;
|
||||||
|
int64_t buffer_bits;
|
||||||
|
int is_hevc;
|
||||||
|
uint32_t frame_count;
|
||||||
|
// frames since the last IDR (periodic GOP), the alternating idr_pic_id, and an IDR owed after a lost frame
|
||||||
|
uint32_t since_idr;
|
||||||
|
uint32_t idr_pic_id;
|
||||||
|
int idr_pending;
|
||||||
|
// frame_num / POC bookkeeping since the last IDR; H264 state the driver does not derive itself
|
||||||
|
uint32_t frame_num;
|
||||||
|
uint32_t rc_mode;
|
||||||
|
|
||||||
|
// DMA-BUF backing
|
||||||
|
int dma_fd;
|
||||||
|
uint32_t stride;
|
||||||
|
|
||||||
|
// Surfaces & Contexts
|
||||||
|
VASurfaceID in_rgb_surf;
|
||||||
|
VASurfaceID nv12_surf;
|
||||||
|
VASurfaceID recon_surfs[2];
|
||||||
|
|
||||||
|
VAConfigID vpp_cfg;
|
||||||
|
VAContextID vpp_ctx;
|
||||||
|
VABufferID vpp_buf;
|
||||||
|
VARectangle src_rect, dst_rect;
|
||||||
|
|
||||||
|
VAConfigID enc_cfg;
|
||||||
|
VAContextID enc_ctx;
|
||||||
|
VABufferID coded_buf;
|
||||||
|
|
||||||
|
uint8_t *output_staging;
|
||||||
|
uint32_t output_staging_cap;
|
||||||
|
// Host upload path: a VAImage the CPU writes, then vaPutImage into in_rgb_surf
|
||||||
|
VAImage upload_img;
|
||||||
|
int upload_ready;
|
||||||
|
};
|
||||||
|
|
||||||
|
// The VPP pipeline buffer points at the engine-owned rects, so VPP scales cap -> output
|
||||||
|
static int vaapi_make_vpp_buffer(VaapiEngine* engine) {
|
||||||
|
VAProcPipelineParameterBuffer vpp_param;
|
||||||
|
memset(&vpp_param, 0, sizeof(vpp_param));
|
||||||
|
vpp_param.surface = engine->in_rgb_surf;
|
||||||
|
vpp_param.surface_region = &engine->src_rect;
|
||||||
|
vpp_param.output_region = &engine->dst_rect;
|
||||||
|
return RT.vaCreateBuffer(engine->va_dpy, engine->vpp_ctx, VAProcPipelineParameterBufferType,
|
||||||
|
sizeof(vpp_param), 1, &vpp_param, &engine->vpp_buf) == VA_STATUS_SUCCESS ? 0 : -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
VaapiEngine* vaapi_create(const VaapiConfig* config) {
|
||||||
|
if (!config || config->width == 0 || config->height == 0 || config->cap_width == 0 || config->cap_height == 0) return NULL;
|
||||||
|
|
||||||
|
if (vaapi_load_runtime() != 0) return NULL;
|
||||||
|
|
||||||
|
VaapiEngine* engine = (VaapiEngine*)calloc(1, sizeof(VaapiEngine));
|
||||||
|
if (!engine) return NULL;
|
||||||
|
|
||||||
|
engine->cap_width = config->cap_width;
|
||||||
|
engine->cap_height = config->cap_height;
|
||||||
|
engine->width = config->width;
|
||||||
|
engine->height = config->height;
|
||||||
|
engine->fps = config->fps > 0 ? config->fps : 60;
|
||||||
|
engine->gop = config->gop > 0 ? config->gop : 30;
|
||||||
|
engine->target_bps = config->target_bps > 0 ? config->target_bps : 6000000;
|
||||||
|
engine->max_bps = config->max_bps > engine->target_bps ? config->max_bps : engine->target_bps;
|
||||||
|
engine->buffer_bits = config->buffer_bits > 0 ? config->buffer_bits : engine->max_bps;
|
||||||
|
engine->is_hevc = config->is_hevc;
|
||||||
|
engine->dma_fd = -1;
|
||||||
|
// calloc leaves surface/context IDs at 0, which is a valid VA ID; mark them unset.
|
||||||
|
engine->in_rgb_surf = VA_INVALID_ID;
|
||||||
|
engine->nv12_surf = VA_INVALID_ID;
|
||||||
|
engine->recon_surfs[0] = VA_INVALID_ID;
|
||||||
|
engine->recon_surfs[1] = VA_INVALID_ID;
|
||||||
|
engine->vpp_cfg = VA_INVALID_ID;
|
||||||
|
engine->vpp_ctx = VA_INVALID_ID;
|
||||||
|
engine->vpp_buf = VA_INVALID_ID;
|
||||||
|
engine->enc_cfg = VA_INVALID_ID;
|
||||||
|
engine->enc_ctx = VA_INVALID_ID;
|
||||||
|
engine->coded_buf = VA_INVALID_ID;
|
||||||
|
engine->src_rect.width = config->cap_width;
|
||||||
|
engine->src_rect.height = config->cap_height;
|
||||||
|
engine->dst_rect.width = config->width;
|
||||||
|
engine->dst_rect.height = config->height;
|
||||||
|
|
||||||
|
engine->drm_fd = open(config->device ? config->device : "/dev/dri/renderD128", O_RDWR);
|
||||||
|
if (engine->drm_fd < 0) {
|
||||||
|
fprintf(stderr, "[vaapi] failed to open %s\n", config->device ? config->device : "/dev/dri/renderD128");
|
||||||
|
free(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
engine->va_dpy = RT.vaGetDisplayDRM(engine->drm_fd);
|
||||||
|
if (!engine->va_dpy) {
|
||||||
|
close(engine->drm_fd);
|
||||||
|
free(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
int maj, min;
|
||||||
|
VAStatus st = RT.vaInitialize(engine->va_dpy, &maj, &min);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
fprintf(stderr, "[vaapi] vaInitialize failed: %s\n", RT.vaErrorStr(st));
|
||||||
|
close(engine->drm_fd);
|
||||||
|
free(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1. NV12 intermediate + two Recon surfaces at the encode size (ping-pong: a P frame must
|
||||||
|
// not reference the surface its own reconstruction is being written into)
|
||||||
|
st = RT.vaCreateSurfaces(engine->va_dpy, VA_RT_FORMAT_YUV420, engine->width, engine->height, &engine->nv12_surf, 1, NULL, 0);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
vaapi_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
st = RT.vaCreateSurfaces(engine->va_dpy, VA_RT_FORMAT_YUV420, engine->width, engine->height, engine->recon_surfs, 2, NULL, 0);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
vaapi_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Setup VPP (Video Processing Pipeline for Hardware RGB->NV12 with scaling)
|
||||||
|
uint32_t vpp_w = engine->cap_width > engine->width ? engine->cap_width : engine->width;
|
||||||
|
uint32_t vpp_h = engine->cap_height > engine->height ? engine->cap_height : engine->height;
|
||||||
|
st = RT.vaCreateConfig(engine->va_dpy, VAProfileNone, VAEntrypointVideoProc, NULL, 0, &engine->vpp_cfg);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
vaapi_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
st = RT.vaCreateContext(engine->va_dpy, engine->vpp_cfg, vpp_w, vpp_h, 0, NULL, 0, &engine->vpp_ctx);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
vaapi_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Setup H.264 / HEVC EncSlice
|
||||||
|
VAProfile profile = engine->is_hevc ? VAProfileHEVCMain : VAProfileH264Main;
|
||||||
|
VAConfigAttrib enc_attrib[3];
|
||||||
|
enc_attrib[0].type = VAConfigAttribRTFormat;
|
||||||
|
enc_attrib[0].value = VA_RT_FORMAT_YUV420;
|
||||||
|
enc_attrib[1].type = VAConfigAttribRateControl;
|
||||||
|
// The engine writes SPS, PPS and slice headers itself (see BitWriter)
|
||||||
|
enc_attrib[2].type = VAConfigAttribEncPackedHeaders;
|
||||||
|
enc_attrib[2].value = VA_ENC_PACKED_HEADER_SEQUENCE | VA_ENC_PACKED_HEADER_SLICE;
|
||||||
|
// VBR like the FFmpeg VAAPI pipeline (target + maxrate), then CBR, then CQP
|
||||||
|
enc_attrib[1].value = VA_RC_VBR;
|
||||||
|
engine->rc_mode = VA_RC_VBR;
|
||||||
|
st = RT.vaCreateConfig(engine->va_dpy, profile, VAEntrypointEncSlice, enc_attrib, 3, &engine->enc_cfg);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
enc_attrib[1].value = VA_RC_CBR;
|
||||||
|
engine->rc_mode = VA_RC_CBR;
|
||||||
|
st = RT.vaCreateConfig(engine->va_dpy, profile, VAEntrypointEncSlice, enc_attrib, 3, &engine->enc_cfg);
|
||||||
|
}
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
// Fallback to CQP if CBR unsupported
|
||||||
|
enc_attrib[1].value = VA_RC_CQP;
|
||||||
|
st = RT.vaCreateConfig(engine->va_dpy, profile, VAEntrypointEncSlice, enc_attrib, 3, &engine->enc_cfg);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
fprintf(stderr, "[vaapi] vaCreateConfig EncSlice failed: %s\n", RT.vaErrorStr(st));
|
||||||
|
vaapi_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
engine->rc_mode = VA_RC_CQP;
|
||||||
|
}
|
||||||
|
|
||||||
|
st = RT.vaCreateContext(engine->va_dpy, engine->enc_cfg, engine->width, engine->height, VA_PROGRESSIVE, engine->recon_surfs, 2, &engine->enc_ctx);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
fprintf(stderr, "[vaapi] vaCreateContext EncSlice failed: %s\n", RT.vaErrorStr(st));
|
||||||
|
vaapi_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Coded bitstream buffer: generous, a 20M-preset intra frame can burst past 4MB
|
||||||
|
st = RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncCodedBufferType, 16 * 1024 * 1024, 1, NULL, &engine->coded_buf);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
vaapi_destroy(engine);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return engine;
|
||||||
|
}
|
||||||
|
|
||||||
|
int vaapi_import_dma_buffer(VaapiEngine* engine, int dma_fd, uint32_t stride) {
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void vaapi_clear_input(VaapiEngine *engine) {
|
||||||
|
if (engine->vpp_buf != VA_INVALID_ID) {
|
||||||
|
RT.vaDestroyBuffer(engine->va_dpy, engine->vpp_buf);
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
int vaapi_import_frame(VaapiEngine *engine, const UuDmaFrame *frame) {
|
||||||
|
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;
|
||||||
|
memset(&prime_desc, 0, sizeof(prime_desc));
|
||||||
|
prime_desc.fourcc = va_fourcc;
|
||||||
|
prime_desc.width = engine->cap_width;
|
||||||
|
prime_desc.height = engine->cap_height;
|
||||||
|
prime_desc.num_objects = 1;
|
||||||
|
prime_desc.objects[0].fd = frame->fd;
|
||||||
|
prime_desc.objects[0].size = frame->size;
|
||||||
|
prime_desc.objects[0].drm_format_modifier = frame->modifier;
|
||||||
|
prime_desc.num_layers = 1;
|
||||||
|
prime_desc.layers[0].drm_format = frame->fourcc;
|
||||||
|
prime_desc.layers[0].num_planes = 1;
|
||||||
|
prime_desc.layers[0].pitch[0] = frame->stride;
|
||||||
|
prime_desc.layers[0].offset[0] = frame->offset;
|
||||||
|
|
||||||
|
VASurfaceAttrib attribs[2];
|
||||||
|
attribs[0].type = VASurfaceAttribMemoryType;
|
||||||
|
attribs[0].flags = VA_SURFACE_ATTRIB_SETTABLE;
|
||||||
|
attribs[0].value.type = VAGenericValueTypeInteger;
|
||||||
|
attribs[0].value.value.i = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2;
|
||||||
|
attribs[1].type = VASurfaceAttribExternalBufferDescriptor;
|
||||||
|
attribs[1].flags = VA_SURFACE_ATTRIB_SETTABLE;
|
||||||
|
attribs[1].value.type = VAGenericValueTypePointer;
|
||||||
|
attribs[1].value.value.p = &prime_desc;
|
||||||
|
|
||||||
|
VAStatus st = RT.vaCreateSurfaces(engine->va_dpy, VA_RT_FORMAT_RGB32, engine->cap_width, engine->cap_height, &engine->in_rgb_surf, 1, attribs, 2);
|
||||||
|
if (st != VA_STATUS_SUCCESS) {
|
||||||
|
fprintf(stderr, "[vaapi] vaCreateSurfaces DRM_PRIME_2 failed: %s\n", RT.vaErrorStr(st));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (vaapi_make_vpp_buffer(engine) != 0) {
|
||||||
|
fprintf(stderr, "[vaapi] vaCreateBuffer VPP failed\n");
|
||||||
|
return -2;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int vaapi_upload_host_buffer(VaapiEngine* engine, const uint8_t* host_ptr, uint32_t pitch) {
|
||||||
|
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) {
|
||||||
|
VAStatus st = RT.vaCreateSurfaces(engine->va_dpy, VA_RT_FORMAT_RGB32, engine->cap_width, engine->cap_height, &engine->in_rgb_surf, 1, NULL, 0);
|
||||||
|
if (st != VA_STATUS_SUCCESS) return -2;
|
||||||
|
if (vaapi_make_vpp_buffer(engine) != 0) return -3;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!engine->upload_ready) {
|
||||||
|
VAImageFormat fmt;
|
||||||
|
memset(&fmt, 0, sizeof(fmt));
|
||||||
|
fmt.fourcc = VA_FOURCC_BGRX;
|
||||||
|
fmt.byte_order = VA_LSB_FIRST;
|
||||||
|
fmt.bits_per_pixel = 32;
|
||||||
|
fmt.depth = 24;
|
||||||
|
fmt.red_mask = 0x00ff0000;
|
||||||
|
fmt.green_mask = 0x0000ff00;
|
||||||
|
fmt.blue_mask = 0x000000ff;
|
||||||
|
// vaDeriveImage on the RGB32 surface is refused by some drivers
|
||||||
|
VAStatus st = RT.vaCreateImage(engine->va_dpy, &fmt, engine->cap_width, engine->cap_height, &engine->upload_img);
|
||||||
|
if (st != VA_STATUS_SUCCESS) return -4;
|
||||||
|
engine->upload_ready = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void* p = NULL;
|
||||||
|
VAStatus st = RT.vaMapBuffer(engine->va_dpy, engine->upload_img.buf, &p);
|
||||||
|
if (st != VA_STATUS_SUCCESS || !p) return -5;
|
||||||
|
uint32_t copy_bytes = engine->cap_width * 4;
|
||||||
|
for (uint32_t y = 0; y < engine->cap_height; y++) {
|
||||||
|
memcpy((uint8_t*)p + y * engine->upload_img.pitches[0], host_ptr + y * pitch, copy_bytes);
|
||||||
|
}
|
||||||
|
RT.vaUnmapBuffer(engine->va_dpy, engine->upload_img.buf);
|
||||||
|
|
||||||
|
st = RT.vaPutImage(engine->va_dpy, engine->in_rgb_surf, engine->upload_img.image_id,
|
||||||
|
0, 0, engine->cap_width, engine->cap_height, 0, 0, engine->cap_width, engine->cap_height);
|
||||||
|
if (st != VA_STATUS_SUCCESS) return -6;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sequence-level misc parameter. AMD's Mesa driver feeds the VCN ring message from these;
|
||||||
|
// a CBR config that never gets its rate-control/HRD parameters submits garbage and the
|
||||||
|
// encode job wedges the ring until a GPU reset.
|
||||||
|
// Packed H.264 / HEVC headers. Current radeonsi (Mesa 26) writes neither SPS/PPS nor the NAL/slice header from the
|
||||||
|
// parameter buffers alone (output began 00 00 00 01 00 ..., no SPS), so the host writes them like FFmpeg does.
|
||||||
|
// Every field here must match the sequence/picture/slice parameters submitted with it.
|
||||||
|
typedef struct { uint8_t buf[128]; uint32_t bits; } BitWriter;
|
||||||
|
|
||||||
|
static void bw_put(BitWriter* w, uint32_t value, int n) {
|
||||||
|
for (int i = n - 1; i >= 0; i--, w->bits++) {
|
||||||
|
if (w->bits / 8 >= sizeof(w->buf)) return;
|
||||||
|
if ((value >> i) & 1) w->buf[w->bits / 8] |= 0x80 >> (w->bits % 8);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
static void bw_ue(BitWriter* w, uint32_t value) {
|
||||||
|
int len = 0;
|
||||||
|
for (uint32_t v = value + 1; v > 1; v >>= 1) len++;
|
||||||
|
bw_put(w, 0, len);
|
||||||
|
bw_put(w, value + 1, len + 1);
|
||||||
|
}
|
||||||
|
static void bw_se(BitWriter* w, int32_t value) { bw_ue(w, value > 0 ? 2 * (uint32_t)value - 1 : 2 * (uint32_t)(-value)); }
|
||||||
|
static void bw_trailing(BitWriter* w) { bw_put(w, 1, 1); if (w->bits % 8) bw_put(w, 0, 8 - w->bits % 8); }
|
||||||
|
// Start code + NAL header; the payload follows unescaped, emulation prevention is applied by bw_escape.
|
||||||
|
static void bw_nal(BitWriter* w, int ref_idc, int type) { bw_put(w, 1, 32); bw_put(w, (ref_idc << 5) | type, 8); }
|
||||||
|
|
||||||
|
// Insert emulation prevention bytes after the start code + NAL header (byte 5 on). Returns the byte length.
|
||||||
|
static uint32_t bw_escape(const BitWriter* w, uint8_t* out, uint32_t cap) {
|
||||||
|
uint32_t len = (w->bits + 7) / 8, n = 0, zeros = 0;
|
||||||
|
for (uint32_t i = 0; i < len && n < cap; i++) {
|
||||||
|
if (i >= 5 && zeros >= 2 && w->buf[i] <= 3) { out[n++] = 3; zeros = 0; if (n >= cap) break; }
|
||||||
|
zeros = w->buf[i] == 0 && i >= 5 ? zeros + 1 : 0;
|
||||||
|
out[n++] = w->buf[i];
|
||||||
|
}
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Each NAL is escaped on its own, so the next NAL's start code stays intact.
|
||||||
|
static int vaapi_add_packed(VaapiEngine* engine, VAEncPackedHeaderType type, const BitWriter* nals, int count,
|
||||||
|
VABufferID* ids, int* n) {
|
||||||
|
uint8_t data[320];
|
||||||
|
uint32_t bytes = 0;
|
||||||
|
for (int i = 0; i < count; i++) bytes += bw_escape(&nals[i], data + bytes, sizeof(data) - bytes);
|
||||||
|
VAEncPackedHeaderParameterBuffer param = { .type = type, .bit_length = bytes * 8, .has_emulation_bytes = 1 };
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncPackedHeaderParameterBufferType, sizeof(param), 1, ¶m, &ids[*n]) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
(*n)++;
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncPackedHeaderDataBufferType, bytes, 1, data, &ids[*n]) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
(*n)++;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static VABufferID vaapi_create_misc_buffer(VaapiEngine* engine, VAEncMiscParameterType type, const void* param, uint32_t param_size) {
|
||||||
|
uint8_t buf[sizeof(VAEncMiscParameterBuffer) + 64];
|
||||||
|
VAEncMiscParameterBuffer* misc = (VAEncMiscParameterBuffer*)buf;
|
||||||
|
misc->type = type;
|
||||||
|
memcpy(misc->data, param, param_size);
|
||||||
|
VABufferID id = VA_INVALID_ID;
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncMiscParameterBufferType,
|
||||||
|
sizeof(VAEncMiscParameterBuffer) + param_size, 1, buf, &id) != VA_STATUS_SUCCESS) {
|
||||||
|
return VA_INVALID_ID;
|
||||||
|
}
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Buffers for one encoded picture; every created ID is destroyed after the picture, success or not.
|
||||||
|
typedef struct {
|
||||||
|
VABufferID seq, misc[3], pic, slice, packed[6];
|
||||||
|
int misc_n, packed_n;
|
||||||
|
} EncBuffers;
|
||||||
|
|
||||||
|
static int vaapi_h264_params(VaapiEngine* engine, int is_idr, VASurfaceID curr_recon, VASurfaceID prev_recon, EncBuffers* b) {
|
||||||
|
uint32_t mb_w = (engine->width + 15) / 16;
|
||||||
|
uint32_t mb_h = (engine->height + 15) / 16;
|
||||||
|
uint32_t frame_num = is_idr ? 0 : engine->frame_num;
|
||||||
|
uint32_t crop_right = (mb_w * 16 - engine->width) / 2, crop_bottom = (mb_h * 16 - engine->height) / 2;
|
||||||
|
if (is_idr) {
|
||||||
|
VAEncSequenceParameterBufferH264 seq_p;
|
||||||
|
memset(&seq_p, 0, sizeof(seq_p));
|
||||||
|
seq_p.seq_parameter_set_id = 0;
|
||||||
|
seq_p.level_idc = 51;
|
||||||
|
seq_p.intra_period = engine->gop;
|
||||||
|
seq_p.intra_idr_period = engine->gop;
|
||||||
|
seq_p.ip_period = 1;
|
||||||
|
seq_p.bits_per_second = (uint32_t)engine->max_bps;
|
||||||
|
seq_p.max_num_ref_frames = 1;
|
||||||
|
seq_p.picture_width_in_mbs = mb_w;
|
||||||
|
seq_p.picture_height_in_mbs = mb_h;
|
||||||
|
seq_p.seq_fields.bits.direct_8x8_inference_flag = 1;
|
||||||
|
seq_p.seq_fields.bits.frame_mbs_only_flag = 1;
|
||||||
|
seq_p.seq_fields.bits.pic_order_cnt_type = 0;
|
||||||
|
seq_p.frame_cropping_flag = crop_right || crop_bottom;
|
||||||
|
seq_p.frame_crop_right_offset = crop_right;
|
||||||
|
seq_p.frame_crop_bottom_offset = crop_bottom;
|
||||||
|
// An IDR without its SPS is undecodable: fail rather than submit pic + slice alone
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncSequenceParameterBufferType, sizeof(seq_p), 1, &seq_p, &b->seq) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
// SPS: Main, level 5.1, frame_num and POC lsb 4 bits (both wrap & 15 above), one reference
|
||||||
|
BitWriter sps = {0};
|
||||||
|
bw_nal(&sps, 3, 7);
|
||||||
|
bw_put(&sps, 77, 8); bw_put(&sps, 0x40, 8); bw_put(&sps, 51, 8); // constraint_set1: Main
|
||||||
|
bw_ue(&sps, 0); bw_ue(&sps, 0); bw_ue(&sps, 0); bw_ue(&sps, 0); // sps id, log2_max_frame_num-4, poc type 0, log2_max_poc_lsb-4
|
||||||
|
bw_ue(&sps, 1); bw_put(&sps, 0, 1); // max_num_ref_frames, gaps
|
||||||
|
bw_ue(&sps, mb_w - 1); bw_ue(&sps, mb_h - 1);
|
||||||
|
bw_put(&sps, 1, 1); bw_put(&sps, 1, 1); // frame_mbs_only, direct_8x8_inference
|
||||||
|
bw_put(&sps, seq_p.frame_cropping_flag, 1);
|
||||||
|
if (seq_p.frame_cropping_flag) { bw_ue(&sps, 0); bw_ue(&sps, crop_right); bw_ue(&sps, 0); bw_ue(&sps, crop_bottom); }
|
||||||
|
bw_put(&sps, 0, 1); // no VUI
|
||||||
|
bw_trailing(&sps);
|
||||||
|
// PPS: CABAC, one L0 reference, QP 26, default deblocking
|
||||||
|
BitWriter pps = {0};
|
||||||
|
bw_nal(&pps, 3, 8);
|
||||||
|
bw_ue(&pps, 0); bw_ue(&pps, 0); bw_put(&pps, 1, 1); bw_put(&pps, 0, 1);
|
||||||
|
bw_ue(&pps, 0); bw_ue(&pps, 0); bw_ue(&pps, 0); // slice groups, num_ref_idx l0/l1 - 1
|
||||||
|
bw_put(&pps, 0, 1); bw_put(&pps, 0, 2); // weighted pred / bipred
|
||||||
|
bw_se(&pps, 0); bw_se(&pps, 0); bw_se(&pps, 0); // pic_init_qp-26, qs, chroma offset
|
||||||
|
bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); // deblocking control, constrained intra, redundant
|
||||||
|
bw_trailing(&pps);
|
||||||
|
// SPS and PPS go out as one Sequence header, like FFmpeg
|
||||||
|
BitWriter headers[2] = { sps, pps };
|
||||||
|
if (vaapi_add_packed(engine, VAEncPackedHeaderSequence, headers, 2, b->packed, &b->packed_n) != 0) return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
VAEncPictureParameterBufferH264 pic_p;
|
||||||
|
memset(&pic_p, 0, sizeof(pic_p));
|
||||||
|
pic_p.CurrPic.picture_id = curr_recon;
|
||||||
|
pic_p.CurrPic.flags = VA_PICTURE_H264_SHORT_TERM_REFERENCE;
|
||||||
|
pic_p.CurrPic.frame_idx = frame_num;
|
||||||
|
pic_p.CurrPic.TopFieldOrderCnt = pic_p.CurrPic.BottomFieldOrderCnt = (2 * frame_num) & 15;
|
||||||
|
for (int i = 0; i < 16; i++) pic_p.ReferenceFrames[i].picture_id = VA_INVALID_ID;
|
||||||
|
if (!is_idr) {
|
||||||
|
pic_p.ReferenceFrames[0].picture_id = prev_recon;
|
||||||
|
pic_p.ReferenceFrames[0].flags = VA_PICTURE_H264_SHORT_TERM_REFERENCE;
|
||||||
|
pic_p.ReferenceFrames[0].frame_idx = (frame_num - 1) & 15;
|
||||||
|
pic_p.ReferenceFrames[0].TopFieldOrderCnt = pic_p.ReferenceFrames[0].BottomFieldOrderCnt = (2 * (frame_num - 1)) & 15;
|
||||||
|
}
|
||||||
|
pic_p.coded_buf = engine->coded_buf;
|
||||||
|
pic_p.frame_num = frame_num;
|
||||||
|
pic_p.pic_init_qp = 26;
|
||||||
|
pic_p.seq_parameter_set_id = 0;
|
||||||
|
pic_p.pic_parameter_set_id = 0;
|
||||||
|
pic_p.pic_fields.bits.idr_pic_flag = is_idr ? 1 : 0;
|
||||||
|
pic_p.pic_fields.bits.reference_pic_flag = 1;
|
||||||
|
pic_p.pic_fields.bits.entropy_coding_mode_flag = 1;
|
||||||
|
pic_p.pic_fields.bits.deblocking_filter_control_present_flag = 0;
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncPictureParameterBufferType, sizeof(pic_p), 1, &pic_p, &b->pic) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
VAEncSliceParameterBufferH264 slice_p;
|
||||||
|
memset(&slice_p, 0, sizeof(slice_p));
|
||||||
|
slice_p.macroblock_address = 0;
|
||||||
|
slice_p.num_macroblocks = mb_w * mb_h;
|
||||||
|
slice_p.macroblock_info = VA_INVALID_ID;
|
||||||
|
slice_p.slice_type = is_idr ? 2 : 0; // 2 = I-Slice, 0 = P-Slice
|
||||||
|
slice_p.direct_spatial_mv_pred_flag = 1;
|
||||||
|
// Consecutive IDRs must differ in idr_pic_id (7.4.3); flip it on every IDR
|
||||||
|
if (is_idr) engine->idr_pic_id ^= 1;
|
||||||
|
slice_p.idr_pic_id = engine->idr_pic_id;
|
||||||
|
slice_p.pic_order_cnt_lsb = pic_p.CurrPic.TopFieldOrderCnt;
|
||||||
|
for (int i = 0; i < 32; i++) slice_p.RefPicList0[i].picture_id = VA_INVALID_ID;
|
||||||
|
if (!is_idr) {
|
||||||
|
slice_p.RefPicList0[0].picture_id = prev_recon;
|
||||||
|
slice_p.RefPicList0[0].flags = VA_PICTURE_H264_SHORT_TERM_REFERENCE;
|
||||||
|
slice_p.RefPicList0[0].frame_idx = (frame_num - 1) & 15;
|
||||||
|
}
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncSliceParameterBufferType, sizeof(slice_p), 1, &slice_p, &b->slice) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
// Slice header including cabac_alignment_one_bit, byte aligned and escaped as FFmpeg submits it
|
||||||
|
BitWriter sh = {0};
|
||||||
|
bw_nal(&sh, 3, is_idr ? 5 : 1);
|
||||||
|
bw_ue(&sh, 0); bw_ue(&sh, is_idr ? 7 : 5); bw_ue(&sh, 0); // first_mb, slice_type I/P (all slices), pps id
|
||||||
|
bw_put(&sh, frame_num & 15, 4);
|
||||||
|
if (is_idr) bw_ue(&sh, slice_p.idr_pic_id);
|
||||||
|
bw_put(&sh, slice_p.pic_order_cnt_lsb & 15, 4);
|
||||||
|
if (!is_idr) { bw_put(&sh, 0, 1); bw_put(&sh, 0, 1); } // num_ref_idx override, ref list modification
|
||||||
|
if (is_idr) { bw_put(&sh, 0, 1); bw_put(&sh, 0, 1); } // no_output_of_prior_pics, long_term_reference
|
||||||
|
else bw_put(&sh, 0, 1); // adaptive_ref_pic_marking
|
||||||
|
if (!is_idr) bw_ue(&sh, 0); // cabac_init_idc
|
||||||
|
bw_se(&sh, 0); // slice_qp_delta (no deblocking fields)
|
||||||
|
while (sh.bits % 8) bw_put(&sh, 1, 1);
|
||||||
|
return vaapi_add_packed(engine, VAEncPackedHeaderSlice, &sh, 1, b->packed, &b->packed_n);
|
||||||
|
}
|
||||||
|
|
||||||
|
// HEVC NAL header: forbidden 0, nal_unit_type, nuh_layer_id 0, nuh_temporal_id_plus1 1.
|
||||||
|
static void bw_hevc_nal(BitWriter* w, int type) { bw_put(w, 1, 32); bw_put(w, (type << 9) | 1, 16); }
|
||||||
|
|
||||||
|
// profile_tier_level(1, 0): Main, Main 10 compatible like FFmpeg, progressive frames only.
|
||||||
|
static void bw_hevc_ptl(BitWriter* w, uint32_t level) {
|
||||||
|
bw_put(w, 0, 2); bw_put(w, 0, 1); bw_put(w, 1, 5); // profile space, tier, general_profile_idc Main
|
||||||
|
bw_put(w, 0x60000000, 32); // compatibility flags 1 and 2
|
||||||
|
bw_put(w, 1, 1); bw_put(w, 0, 1); bw_put(w, 1, 1); bw_put(w, 1, 1); // progressive, interlaced, non_packed, frame_only
|
||||||
|
bw_put(w, 0, 32); bw_put(w, 0, 12); // reserved_zero_43bits + inbld_flag
|
||||||
|
bw_put(w, level, 8);
|
||||||
|
}
|
||||||
|
|
||||||
|
// HEVC Main with FFmpeg's hevc_vaapi parameters on radeonsi (LIBVA_TRACE + trace_headers of its output):
|
||||||
|
// 64x64 CTB, 8x8 min CB, 4x4..32x32 TB, AMP and SAO on, one short-term reference, POC lsb 12 bits.
|
||||||
|
// FFmpeg also sends VA max_transform_hierarchy_depth 0 / diff_cu_qp_delta_depth 3 while its SPS/PPS
|
||||||
|
// say 4 / 0; both copies are kept as FFmpeg has them, since that is what decodes on this driver.
|
||||||
|
static int vaapi_hevc_params(VaapiEngine* engine, int is_idr, VASurfaceID curr_recon, VASurfaceID prev_recon, EncBuffers* b) {
|
||||||
|
// pic size must be a multiple of the 8x8 min CB; the conformance window (in chroma units) crops the rest
|
||||||
|
uint32_t w = (engine->width + 7) & ~7u, h = (engine->height + 7) & ~7u;
|
||||||
|
uint32_t crop_right = (w - engine->width) / 2, crop_bottom = (h - engine->height) / 2;
|
||||||
|
uint32_t poc = is_idr ? 0 : engine->since_idr;
|
||||||
|
// Level from luma picture size and sample rate (Table A.8): 4.1, 5.0, 5.1, 5.2
|
||||||
|
uint64_t size = (uint64_t)w * h, rate = size * engine->fps;
|
||||||
|
uint32_t level = rate > 534773760 ? 156 : rate > 267386880 ? 153 : (size > 2228224 || rate > 133693440) ? 150 : 123;
|
||||||
|
if (is_idr) {
|
||||||
|
VAEncSequenceParameterBufferHEVC seq_p;
|
||||||
|
memset(&seq_p, 0, sizeof(seq_p));
|
||||||
|
seq_p.general_profile_idc = 1;
|
||||||
|
seq_p.general_level_idc = level;
|
||||||
|
seq_p.intra_period = engine->gop;
|
||||||
|
seq_p.intra_idr_period = engine->gop;
|
||||||
|
seq_p.ip_period = 1;
|
||||||
|
seq_p.bits_per_second = (uint32_t)engine->max_bps;
|
||||||
|
seq_p.pic_width_in_luma_samples = w;
|
||||||
|
seq_p.pic_height_in_luma_samples = h;
|
||||||
|
seq_p.seq_fields.bits.chroma_format_idc = 1;
|
||||||
|
seq_p.seq_fields.bits.amp_enabled_flag = 1;
|
||||||
|
seq_p.seq_fields.bits.sample_adaptive_offset_enabled_flag = 1;
|
||||||
|
seq_p.log2_diff_max_min_luma_coding_block_size = 3;
|
||||||
|
seq_p.log2_diff_max_min_transform_block_size = 3;
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncSequenceParameterBufferType, sizeof(seq_p), 1, &seq_p, &b->seq) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
BitWriter vps = {0};
|
||||||
|
bw_hevc_nal(&vps, 32);
|
||||||
|
bw_put(&vps, 0, 4); bw_put(&vps, 1, 1); bw_put(&vps, 1, 1); // vps id, base layer internal / available
|
||||||
|
bw_put(&vps, 0, 6); bw_put(&vps, 0, 3); bw_put(&vps, 1, 1); // max layers-1, max sub layers-1, temporal id nesting
|
||||||
|
bw_put(&vps, 0xffff, 16);
|
||||||
|
bw_hevc_ptl(&vps, level);
|
||||||
|
bw_put(&vps, 0, 1); bw_ue(&vps, 1); bw_ue(&vps, 0); bw_ue(&vps, 0); // ordering info: dec buffering-1, reorder, latency
|
||||||
|
bw_put(&vps, 0, 6); bw_ue(&vps, 0); // max layer id, num layer sets-1
|
||||||
|
bw_put(&vps, 0, 1); bw_put(&vps, 0, 1); // no timing info, no extension
|
||||||
|
bw_trailing(&vps);
|
||||||
|
|
||||||
|
BitWriter sps = {0};
|
||||||
|
bw_hevc_nal(&sps, 33);
|
||||||
|
bw_put(&sps, 0, 4); bw_put(&sps, 0, 3); bw_put(&sps, 1, 1); // vps id, max sub layers-1, temporal id nesting
|
||||||
|
bw_hevc_ptl(&sps, level);
|
||||||
|
bw_ue(&sps, 0); bw_ue(&sps, 1); bw_ue(&sps, w); bw_ue(&sps, h); // sps id, 4:2:0, size
|
||||||
|
bw_put(&sps, crop_right || crop_bottom, 1);
|
||||||
|
if (crop_right || crop_bottom) { bw_ue(&sps, 0); bw_ue(&sps, crop_right); bw_ue(&sps, 0); bw_ue(&sps, crop_bottom); }
|
||||||
|
bw_ue(&sps, 0); bw_ue(&sps, 0); bw_ue(&sps, 8); // 8-bit luma/chroma, log2_max_poc_lsb-4
|
||||||
|
bw_put(&sps, 0, 1); bw_ue(&sps, 1); bw_ue(&sps, 0); bw_ue(&sps, 0);
|
||||||
|
bw_ue(&sps, 0); bw_ue(&sps, 3); bw_ue(&sps, 0); bw_ue(&sps, 3); // CB 8..64, TB 4..32
|
||||||
|
bw_ue(&sps, 4); bw_ue(&sps, 4); // max transform hierarchy depth inter/intra
|
||||||
|
bw_put(&sps, 0, 1); bw_put(&sps, 1, 1); bw_put(&sps, 1, 1); bw_put(&sps, 0, 1); // scaling list, AMP, SAO, PCM
|
||||||
|
bw_ue(&sps, 0); bw_put(&sps, 0, 1); // RPS in slice headers, no long-term refs
|
||||||
|
bw_put(&sps, 0, 1); bw_put(&sps, 0, 1); // temporal MVP, strong intra smoothing
|
||||||
|
bw_put(&sps, 0, 1); bw_put(&sps, 0, 1); // no VUI, no extension
|
||||||
|
bw_trailing(&sps);
|
||||||
|
|
||||||
|
BitWriter pps = {0};
|
||||||
|
bw_hevc_nal(&pps, 34);
|
||||||
|
bw_ue(&pps, 0); bw_ue(&pps, 0);
|
||||||
|
bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); bw_put(&pps, 0, 3); // dependent slices, output flag, extra bits
|
||||||
|
bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); // sign data hiding, cabac init present
|
||||||
|
bw_ue(&pps, 0); bw_ue(&pps, 0); bw_se(&pps, 0); // num_ref_idx l0/l1 default-1, init_qp-26
|
||||||
|
bw_put(&pps, 0, 1); bw_put(&pps, 1, 1); bw_put(&pps, 1, 1); // constrained intra, transform skip, cu_qp_delta
|
||||||
|
bw_ue(&pps, 0); bw_se(&pps, 0); bw_se(&pps, 0); // diff_cu_qp_delta_depth, cb/cr offsets
|
||||||
|
bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); // slice chroma offsets, weighted pred/bipred
|
||||||
|
bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); // transquant bypass, tiles, entropy sync
|
||||||
|
bw_put(&pps, 1, 1); bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); // loop filter across slices, deblocking ctl, scaling
|
||||||
|
bw_put(&pps, 0, 1); bw_ue(&pps, 0); bw_put(&pps, 0, 1); bw_put(&pps, 0, 1); // list mod, merge level-2, ext
|
||||||
|
bw_trailing(&pps);
|
||||||
|
|
||||||
|
BitWriter headers[3] = { vps, sps, pps };
|
||||||
|
if (vaapi_add_packed(engine, VAEncPackedHeaderSequence, headers, 3, b->packed, &b->packed_n) != 0) return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
VAEncPictureParameterBufferHEVC pic_p;
|
||||||
|
memset(&pic_p, 0, sizeof(pic_p));
|
||||||
|
pic_p.decoded_curr_pic.picture_id = curr_recon;
|
||||||
|
pic_p.decoded_curr_pic.pic_order_cnt = poc;
|
||||||
|
for (int i = 0; i < 15; i++) {
|
||||||
|
pic_p.reference_frames[i].picture_id = VA_INVALID_ID;
|
||||||
|
pic_p.reference_frames[i].flags = VA_PICTURE_HEVC_INVALID;
|
||||||
|
}
|
||||||
|
if (!is_idr) {
|
||||||
|
pic_p.reference_frames[0].picture_id = prev_recon;
|
||||||
|
pic_p.reference_frames[0].pic_order_cnt = poc - 1;
|
||||||
|
pic_p.reference_frames[0].flags = VA_PICTURE_HEVC_RPS_ST_CURR_BEFORE;
|
||||||
|
}
|
||||||
|
pic_p.coded_buf = engine->coded_buf;
|
||||||
|
pic_p.collocated_ref_pic_index = 0xff;
|
||||||
|
pic_p.pic_init_qp = 30;
|
||||||
|
pic_p.diff_cu_qp_delta_depth = 3;
|
||||||
|
pic_p.nal_unit_type = is_idr ? 19 : 1; // IDR_W_RADL / TRAIL_R
|
||||||
|
pic_p.pic_fields.bits.idr_pic_flag = is_idr;
|
||||||
|
pic_p.pic_fields.bits.coding_type = is_idr ? 1 : 2;
|
||||||
|
pic_p.pic_fields.bits.reference_pic_flag = 1;
|
||||||
|
pic_p.pic_fields.bits.transform_skip_enabled_flag = 1;
|
||||||
|
pic_p.pic_fields.bits.cu_qp_delta_enabled_flag = 1;
|
||||||
|
pic_p.pic_fields.bits.pps_loop_filter_across_slices_enabled_flag = 1;
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncPictureParameterBufferType, sizeof(pic_p), 1, &pic_p, &b->pic) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
VAEncSliceParameterBufferHEVC slice_p;
|
||||||
|
memset(&slice_p, 0, sizeof(slice_p));
|
||||||
|
slice_p.num_ctu_in_slice = ((w + 63) / 64) * ((h + 63) / 64);
|
||||||
|
slice_p.slice_type = is_idr ? 2 : 1; // I / P
|
||||||
|
for (int i = 0; i < 15; i++) {
|
||||||
|
slice_p.ref_pic_list0[i].picture_id = slice_p.ref_pic_list1[i].picture_id = VA_INVALID_ID;
|
||||||
|
slice_p.ref_pic_list0[i].flags = slice_p.ref_pic_list1[i].flags = VA_PICTURE_HEVC_INVALID;
|
||||||
|
}
|
||||||
|
if (!is_idr) slice_p.ref_pic_list0[0] = pic_p.reference_frames[0];
|
||||||
|
slice_p.max_num_merge_cand = 5;
|
||||||
|
slice_p.slice_fields.bits.last_slice_of_pic_flag = 1;
|
||||||
|
slice_p.slice_fields.bits.slice_sao_luma_flag = 1;
|
||||||
|
slice_p.slice_fields.bits.slice_sao_chroma_flag = 1;
|
||||||
|
slice_p.slice_fields.bits.collocated_from_l0_flag = !is_idr;
|
||||||
|
if (RT.vaCreateBuffer(engine->va_dpy, engine->enc_ctx, VAEncSliceParameterBufferType, sizeof(slice_p), 1, &slice_p, &b->slice) != VA_STATUS_SUCCESS)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
BitWriter sh = {0};
|
||||||
|
bw_hevc_nal(&sh, pic_p.nal_unit_type);
|
||||||
|
bw_put(&sh, 1, 1); // first slice segment
|
||||||
|
if (is_idr) bw_put(&sh, 0, 1); // no_output_of_prior_pics
|
||||||
|
bw_ue(&sh, 0); bw_ue(&sh, slice_p.slice_type); // pps id, slice type
|
||||||
|
if (!is_idr) {
|
||||||
|
bw_put(&sh, poc & 0xfff, 12);
|
||||||
|
bw_put(&sh, 0, 1); // RPS coded here: one previous picture
|
||||||
|
bw_ue(&sh, 1); bw_ue(&sh, 0); bw_ue(&sh, 0); bw_put(&sh, 1, 1); // negative 1, positive 0, delta-1 0, used
|
||||||
|
}
|
||||||
|
bw_put(&sh, 1, 1); bw_put(&sh, 1, 1); // SAO luma, chroma
|
||||||
|
if (!is_idr) { bw_put(&sh, 0, 1); bw_ue(&sh, 0); } // num_ref_idx override, five_minus_max_merge
|
||||||
|
bw_se(&sh, 0); // slice_qp_delta (the driver writes the real one)
|
||||||
|
bw_put(&sh, 0, 1); // loop filter across slices
|
||||||
|
bw_put(&sh, 1, 1); // byte_alignment()
|
||||||
|
while (sh.bits % 8) bw_put(&sh, 0, 1);
|
||||||
|
return vaapi_add_packed(engine, VAEncPackedHeaderSlice, &sh, 1, b->packed, &b->packed_n);
|
||||||
|
}
|
||||||
|
|
||||||
|
int vaapi_encode_frame(
|
||||||
|
VaapiEngine* engine,
|
||||||
|
int force_idr,
|
||||||
|
const uint8_t** out_data,
|
||||||
|
uint32_t* out_len
|
||||||
|
) {
|
||||||
|
if (out_data) *out_data = NULL;
|
||||||
|
if (out_len) *out_len = 0;
|
||||||
|
if (!engine || engine->in_rgb_surf == VA_INVALID_ID) return -1;
|
||||||
|
|
||||||
|
int is_idr = force_idr || engine->idr_pending || engine->frame_count == 0 || engine->since_idr >= engine->gop;
|
||||||
|
// Recon ping-pong: a P frame must reference the previous recon surface, not its own
|
||||||
|
VASurfaceID curr_recon = engine->recon_surfs[engine->frame_count & 1];
|
||||||
|
VASurfaceID prev_recon = engine->recon_surfs[(engine->frame_count + 1) & 1];
|
||||||
|
|
||||||
|
// 1. Hardware VPP Color Conversion + scaling (RGB -> NV12 entirely inside VRAM)
|
||||||
|
VAStatus st = RT.vaBeginPicture(engine->va_dpy, engine->vpp_ctx, engine->nv12_surf);
|
||||||
|
if (st != VA_STATUS_SUCCESS) return -10;
|
||||||
|
st = RT.vaRenderPicture(engine->va_dpy, engine->vpp_ctx, &engine->vpp_buf, 1);
|
||||||
|
if (st != VA_STATUS_SUCCESS) return -10;
|
||||||
|
st = RT.vaEndPicture(engine->va_dpy, engine->vpp_ctx);
|
||||||
|
if (st != VA_STATUS_SUCCESS) return -10;
|
||||||
|
|
||||||
|
// 2. Rate control (every IDR) and the codec's sequence / picture / slice parameters + packed headers
|
||||||
|
EncBuffers b = { .seq = VA_INVALID_ID, .pic = VA_INVALID_ID, .slice = VA_INVALID_ID };
|
||||||
|
int ret = -11;
|
||||||
|
if (is_idr) {
|
||||||
|
VAEncMiscParameterRateControl rc;
|
||||||
|
memset(&rc, 0, sizeof(rc));
|
||||||
|
// VBR: bits_per_second is the ceiling (maxrate) and target_percentage the average (#33)
|
||||||
|
rc.bits_per_second = (uint32_t)engine->max_bps;
|
||||||
|
rc.target_percentage = engine->rc_mode == VA_RC_VBR ? (uint32_t)(engine->target_bps * 100 / engine->max_bps) : 100;
|
||||||
|
rc.window_size = 1000;
|
||||||
|
rc.initial_qp = 28;
|
||||||
|
rc.min_qp = 16;
|
||||||
|
// The driver's VBR raises QP only up to max_qp; 44 blocked the capped presets from reaching
|
||||||
|
// the QP 51 hardware floor on hard content (2560x1600 testsrc2: 4.16 -> 2.60 Mbps, #33)
|
||||||
|
rc.max_qp = 51;
|
||||||
|
rc.rc_flags.bits.disable_frame_skip = 1; // a remote desktop must not drop frames silently
|
||||||
|
b.misc[b.misc_n++] = vaapi_create_misc_buffer(engine, VAEncMiscParameterTypeRateControl, &rc, sizeof(rc));
|
||||||
|
|
||||||
|
VAEncMiscParameterHRD hrd;
|
||||||
|
memset(&hrd, 0, sizeof(hrd));
|
||||||
|
hrd.buffer_size = (uint32_t)engine->buffer_bits; // the viewer preset's bufsize
|
||||||
|
hrd.initial_buffer_fullness = hrd.buffer_size / 2;
|
||||||
|
b.misc[b.misc_n++] = vaapi_create_misc_buffer(engine, VAEncMiscParameterTypeHRD, &hrd, sizeof(hrd));
|
||||||
|
|
||||||
|
// numerator in the low 16 bits, denominator in the high 16 bits
|
||||||
|
VAEncMiscParameterFrameRate fr = { .framerate = (1u << 16) | engine->fps };
|
||||||
|
b.misc[b.misc_n++] = vaapi_create_misc_buffer(engine, VAEncMiscParameterTypeFrameRate, &fr, sizeof(fr));
|
||||||
|
}
|
||||||
|
if ((engine->is_hevc ? vaapi_hevc_params : vaapi_h264_params)(engine, is_idr, curr_recon, prev_recon, &b) != 0) goto done;
|
||||||
|
|
||||||
|
// 3. Render and Encode on AMD VCN hardware
|
||||||
|
VABufferID render_b[12];
|
||||||
|
int render_n = 0;
|
||||||
|
// FFmpeg's order: sequence, rate control misc, picture, packed headers (parameter sets, slice header), slice.
|
||||||
|
// With misc first, radeonsi (Mesa 26) ignored the VBR target: the 1M preset ran at 1.6 Mbps, 0.96 after.
|
||||||
|
if (b.seq != VA_INVALID_ID) render_b[render_n++] = b.seq;
|
||||||
|
for (int i = 0; i < b.misc_n; i++) {
|
||||||
|
if (b.misc[i] != VA_INVALID_ID) render_b[render_n++] = b.misc[i];
|
||||||
|
}
|
||||||
|
render_b[render_n++] = b.pic;
|
||||||
|
for (int i = 0; i < b.packed_n; i++) render_b[render_n++] = b.packed[i];
|
||||||
|
render_b[render_n++] = b.slice;
|
||||||
|
|
||||||
|
st = RT.vaBeginPicture(engine->va_dpy, engine->enc_ctx, engine->nv12_surf);
|
||||||
|
if (st != VA_STATUS_SUCCESS) goto done;
|
||||||
|
st = RT.vaRenderPicture(engine->va_dpy, engine->enc_ctx, render_b, render_n);
|
||||||
|
if (st != VA_STATUS_SUCCESS) goto done;
|
||||||
|
st = RT.vaEndPicture(engine->va_dpy, engine->enc_ctx);
|
||||||
|
if (st != VA_STATUS_SUCCESS) goto done;
|
||||||
|
st = RT.vaSyncSurface(engine->va_dpy, curr_recon);
|
||||||
|
if (st != VA_STATUS_SUCCESS) goto done;
|
||||||
|
|
||||||
|
// 4. Map Bitstream Output; an access unit may arrive as several linked segments
|
||||||
|
VACodedBufferSegment *segment = NULL;
|
||||||
|
st = RT.vaMapBuffer(engine->va_dpy, engine->coded_buf, (void**)&segment);
|
||||||
|
if (st != VA_STATUS_SUCCESS || !segment) goto done;
|
||||||
|
uint32_t total = 0;
|
||||||
|
for (VACodedBufferSegment *seg = segment; seg; seg = seg->next) total += seg->size;
|
||||||
|
if (total > 0 && !(segment->status & VA_CODED_BUF_STATUS_SLICE_OVERFLOW_MASK)) {
|
||||||
|
if (total > engine->output_staging_cap) {
|
||||||
|
engine->output_staging_cap = total + 64 * 1024;
|
||||||
|
engine->output_staging = (uint8_t*)realloc(engine->output_staging, engine->output_staging_cap);
|
||||||
|
}
|
||||||
|
uint32_t off = 0;
|
||||||
|
for (VACodedBufferSegment *seg = segment; seg; seg = seg->next) {
|
||||||
|
memcpy(engine->output_staging + off, seg->buf, seg->size);
|
||||||
|
off += seg->size;
|
||||||
|
}
|
||||||
|
*out_data = engine->output_staging;
|
||||||
|
*out_len = total;
|
||||||
|
}
|
||||||
|
RT.vaUnmapBuffer(engine->va_dpy, engine->coded_buf);
|
||||||
|
|
||||||
|
engine->frame_num = is_idr ? 1 : ((engine->frame_num + 1) & 15);
|
||||||
|
engine->since_idr = is_idr ? 1 : engine->since_idr + 1;
|
||||||
|
engine->frame_count++;
|
||||||
|
ret = 0;
|
||||||
|
|
||||||
|
done:
|
||||||
|
// No bitstream (failure, empty or slice overflow): the next frame_num / POC would skip, so restart with an IDR
|
||||||
|
engine->idr_pending = ret != 0 || *out_len == 0;
|
||||||
|
for (int i = 0; i < b.misc_n; i++) {
|
||||||
|
if (b.misc[i] != VA_INVALID_ID) RT.vaDestroyBuffer(engine->va_dpy, b.misc[i]);
|
||||||
|
}
|
||||||
|
if (b.seq != VA_INVALID_ID) RT.vaDestroyBuffer(engine->va_dpy, b.seq);
|
||||||
|
if (b.pic != VA_INVALID_ID) RT.vaDestroyBuffer(engine->va_dpy, b.pic);
|
||||||
|
if (b.slice != VA_INVALID_ID) RT.vaDestroyBuffer(engine->va_dpy, b.slice);
|
||||||
|
for (int i = 0; i < b.packed_n; i++) RT.vaDestroyBuffer(engine->va_dpy, b.packed[i]);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
void vaapi_destroy(VaapiEngine* engine) {
|
||||||
|
if (!engine) return;
|
||||||
|
|
||||||
|
if (engine->coded_buf != VA_INVALID_ID) RT.vaDestroyBuffer(engine->va_dpy, engine->coded_buf);
|
||||||
|
if (engine->enc_ctx != VA_INVALID_ID) RT.vaDestroyContext(engine->va_dpy, engine->enc_ctx);
|
||||||
|
if (engine->enc_cfg != VA_INVALID_ID) RT.vaDestroyConfig(engine->va_dpy, engine->enc_cfg);
|
||||||
|
|
||||||
|
if (engine->vpp_buf != VA_INVALID_ID) RT.vaDestroyBuffer(engine->va_dpy, engine->vpp_buf);
|
||||||
|
if (engine->vpp_ctx != VA_INVALID_ID) RT.vaDestroyContext(engine->va_dpy, engine->vpp_ctx);
|
||||||
|
if (engine->vpp_cfg != VA_INVALID_ID) RT.vaDestroyConfig(engine->va_dpy, engine->vpp_cfg);
|
||||||
|
|
||||||
|
if (engine->upload_ready) RT.vaDestroyImage(engine->va_dpy, engine->upload_img.image_id);
|
||||||
|
if (engine->in_rgb_surf != VA_INVALID_ID) RT.vaDestroySurfaces(engine->va_dpy, &engine->in_rgb_surf, 1);
|
||||||
|
if (engine->nv12_surf != VA_INVALID_ID) RT.vaDestroySurfaces(engine->va_dpy, &engine->nv12_surf, 1);
|
||||||
|
if (engine->recon_surfs[0] != VA_INVALID_ID || engine->recon_surfs[1] != VA_INVALID_ID) {
|
||||||
|
RT.vaDestroySurfaces(engine->va_dpy, engine->recon_surfs, 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (engine->va_dpy) RT.vaTerminate(engine->va_dpy);
|
||||||
|
if (engine->drm_fd >= 0) close(engine->drm_fd);
|
||||||
|
if (engine->output_staging) free(engine->output_staging);
|
||||||
|
|
||||||
|
free(engine);
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
#ifndef UU_VAAPI_ENGINE_H
|
||||||
|
#define UU_VAAPI_ENGINE_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
#include "dmabuf_frame.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef struct VaapiEngine VaapiEngine;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint32_t width; // encode (output) size
|
||||||
|
uint32_t height;
|
||||||
|
uint32_t cap_width; // capture (input) size; VPP scales cap -> width
|
||||||
|
uint32_t cap_height;
|
||||||
|
uint32_t fps;
|
||||||
|
uint32_t gop;
|
||||||
|
int64_t target_bps;
|
||||||
|
int64_t max_bps; // VBR ceiling (viewer preset maxrate)
|
||||||
|
int64_t buffer_bits; // HRD buffer size
|
||||||
|
int is_hevc;
|
||||||
|
const char *device; // DRM render node (UU_VAAPI_DEVICE); NULL = /dev/dri/renderD128
|
||||||
|
} VaapiConfig;
|
||||||
|
|
||||||
|
VaapiEngine* vaapi_create(const VaapiConfig* config);
|
||||||
|
|
||||||
|
// 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_frame(VaapiEngine* engine, const UuDmaFrame *frame);
|
||||||
|
|
||||||
|
// 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);
|
||||||
|
|
||||||
|
// Encode one frame
|
||||||
|
int vaapi_encode_frame(
|
||||||
|
VaapiEngine* engine,
|
||||||
|
int force_idr,
|
||||||
|
const uint8_t** out_data,
|
||||||
|
uint32_t* out_len
|
||||||
|
);
|
||||||
|
|
||||||
|
void vaapi_destroy(VaapiEngine* engine);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // UU_VAAPI_ENGINE_H
|
||||||
+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. */
|
||||||
|
|||||||
+244
-165
@@ -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];
|
||||||
@@ -84,6 +73,14 @@ static GtkWidget *label(const char *text, const char *cls) {
|
|||||||
return l;
|
return l;
|
||||||
}
|
}
|
||||||
static GtkWidget *button(const char *text, const char *cls) { GtkWidget *b = gtk_button_new_with_label(text); if (cls) add_class(b, cls); return b; }
|
static GtkWidget *button(const char *text, const char *cls) { GtkWidget *b = gtk_button_new_with_label(text); if (cls) add_class(b, cls); return b; }
|
||||||
|
static GtkWidget *icon(const char *name, int size) {
|
||||||
|
GtkWidget *image = gtk_image_new_from_icon_name(name, GTK_ICON_SIZE_BUTTON);
|
||||||
|
gtk_image_set_pixel_size(GTK_IMAGE(image), size); return image;
|
||||||
|
}
|
||||||
|
static GtkWidget *icon_button(const char *text, const char *name, const char *cls) {
|
||||||
|
GtkWidget *b = button(text, cls); gtk_button_set_image(GTK_BUTTON(b), icon(name, 17));
|
||||||
|
gtk_button_set_always_show_image(GTK_BUTTON(b), TRUE); return b;
|
||||||
|
}
|
||||||
static GtkWidget *hbox(int spacing) { return gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing); }
|
static GtkWidget *hbox(int spacing) { return gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing); }
|
||||||
static GtkWidget *vbox(int spacing) { return gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing); }
|
static GtkWidget *vbox(int spacing) { return gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing); }
|
||||||
static GtkWidget *platform_icon(int platform, int online) {
|
static GtkWidget *platform_icon(int platform, int online) {
|
||||||
@@ -93,7 +90,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 +99,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,35 +107,37 @@ 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 *icons[] = {"folder-symbolic", "media-playback-start-symbolic", "utilities-terminal-symbolic", "network-wired-symbolic", "computer-symbolic", "view-refresh-symbolic", "system-shutdown-symbolic", "user-trash-symbolic"};
|
||||||
const char *kinds[] = {"file", "watch", "terminal", "portmap", "wol", "reboot", "shutdown", "unbind"};
|
const char *kinds[] = {"file", "watch", "terminal", "portmap", "wol", "reboot", "shutdown", "unbind"};
|
||||||
for (int i = 0; i < 8; i++) {
|
for (int i = 0; i < 8; i++) {
|
||||||
GtkWidget *b = gtk_button_new(), *line = hbox(10); add_class(b, "cardbtn");
|
GtkWidget *b = gtk_button_new(), *line = hbox(10); add_class(b, "cardbtn");
|
||||||
|
gtk_box_pack_start(GTK_BOX(line), icon(icons[i], 20), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(line), label(names[i], "devname"), TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(line), label(names[i], "devname"), TRUE, TRUE, 0);
|
||||||
gtk_box_pack_end(GTK_BOX(line), label("›", "hint"), FALSE, FALSE, 0);
|
gtk_box_pack_end(GTK_BOX(line), label("›", "hint"), FALSE, FALSE, 0);
|
||||||
gtk_container_add(GTK_CONTAINER(b), line);
|
gtk_container_add(GTK_CONTAINER(b), line);
|
||||||
@@ -146,8 +145,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 +158,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 +169,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,15 +226,16 @@ 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)); }
|
||||||
|
|
||||||
static GtkWidget *nav_row(const char *icon, const char *text, const char *kind) {
|
static GtkWidget *nav_row(const char *icon, const char *text, const char *kind) {
|
||||||
GtkWidget *row = gtk_list_box_row_new(), *line = hbox(10);
|
GtkWidget *row = gtk_list_box_row_new(), *line = hbox(10);
|
||||||
gtk_box_pack_start(GTK_BOX(line), label(icon, "devname"), FALSE, FALSE, 0);
|
GtkWidget *image = gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_BUTTON);
|
||||||
|
gtk_box_pack_start(GTK_BOX(line), image, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(line), label(text, "devname"), TRUE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(line), label(text, "devname"), TRUE, TRUE, 0);
|
||||||
gtk_container_add(GTK_CONTAINER(row), line);
|
gtk_container_add(GTK_CONTAINER(row), line);
|
||||||
g_object_set_data_full(G_OBJECT(row), "kind", g_strdup(kind), g_free);
|
g_object_set_data_full(G_OBJECT(row), "kind", g_strdup(kind), g_free);
|
||||||
@@ -220,18 +253,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 +272,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 +282,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 +300,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 +309,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("view-grid-symbolic", L("全部设备", "All devices"), "all"), -1);
|
||||||
gtk_widget_show_all(device_list); gtk_widget_show_all(all_box);
|
gtk_widget_show_all(device_list); gtk_widget_show_all(all_box);
|
||||||
return G_SOURCE_REMOVE;
|
return G_SOURCE_REMOVE;
|
||||||
}
|
}
|
||||||
|
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 +330,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 +341,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,26 +370,28 @@ 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"), L("更多", "More")}, *kinds[] = {"file", "watch", "terminal", "portmap", "more"};
|
||||||
|
const char *tool_icons[] = {"folder-symbolic", "media-playback-start-symbolic", "utilities-terminal-symbolic", "network-wired-symbolic", "view-more-symbolic"};
|
||||||
for (int i = 0; i < 5; i++) {
|
for (int i = 0; i < 5; i++) {
|
||||||
GtkWidget *b = button(names[i], "tool");
|
GtkWidget *b = icon_button(names[i], tool_icons[i], "tool");
|
||||||
g_signal_connect(b, "clicked", G_CALLBACK(on_tool), (gpointer)kinds[i]);
|
g_signal_connect(b, "clicked", G_CALLBACK(on_tool), (gpointer)kinds[i]);
|
||||||
gtk_box_pack_start(GTK_BOX(tools), b, i < 4, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(tools), b, i < 4, TRUE, 0);
|
||||||
if (i < 4) gtk_box_pack_start(GTK_BOX(tools), gtk_separator_new(GTK_ORIENTATION_VERTICAL), FALSE, FALSE, 0);
|
if (i < 4) gtk_box_pack_start(GTK_BOX(tools), gtk_separator_new(GTK_ORIENTATION_VERTICAL), FALSE, FALSE, 0);
|
||||||
}
|
}
|
||||||
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 +401,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 +416,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 +468,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 +484,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 +522,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 +532,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 +564,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 +648,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 +668,34 @@ 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), icon("computer-symbolic", 17), FALSE, FALSE, 0);
|
||||||
|
gtk_box_pack_start(GTK_BOX(mh), label(L("我的设备", "My devices"), "section"), TRUE, TRUE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(my_section), mh, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(my_section), mh, FALSE, FALSE, 0);
|
||||||
device_list = gtk_list_box_new(); g_signal_connect(device_list, "row-activated", G_CALLBACK(on_row), NULL);
|
device_list = gtk_list_box_new(); g_signal_connect(device_list, "row-activated", G_CALLBACK(on_row), NULL);
|
||||||
gtk_box_pack_start(GTK_BOX(my_section), device_list, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(my_section), device_list, FALSE, FALSE, 0);
|
||||||
GtkWidget *scroll = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
GtkWidget *scroll = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
||||||
GtkWidget *side_inner = vbox(0); gtk_box_pack_start(GTK_BOX(side_inner), my_section, FALSE, FALSE, 0);
|
GtkWidget *side_inner = vbox(0); gtk_box_pack_start(GTK_BOX(side_inner), my_section, FALSE, FALSE, 0);
|
||||||
GtkWidget *welcome_nav = gtk_list_box_new(); g_signal_connect(welcome_nav, "row-activated", G_CALLBACK(on_row), NULL);
|
GtkWidget *welcome_nav = gtk_list_box_new(); g_signal_connect(welcome_nav, "row-activated", G_CALLBACK(on_row), NULL);
|
||||||
GtkWidget *ah = label("⧉ 远程协助", "section"); gtk_widget_set_margin_start(ah, 18); gtk_widget_set_margin_top(ah, 16); gtk_widget_set_margin_bottom(ah, 6);
|
GtkWidget *ah = hbox(8); gtk_widget_set_margin_start(ah, 18); gtk_widget_set_margin_top(ah, 16); gtk_widget_set_margin_bottom(ah, 6);
|
||||||
|
gtk_box_pack_start(GTK_BOX(ah), icon("network-workgroup-symbolic", 17), FALSE, FALSE, 0);
|
||||||
|
gtk_box_pack_start(GTK_BOX(ah), label(L("远程协助", "Remote assistance"), "section"), FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(side_inner), ah, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(side_inner), ah, FALSE, FALSE, 0);
|
||||||
GtkWidget *assist = assist_list = gtk_list_box_new(); g_signal_connect(assist, "row-activated", G_CALLBACK(on_row), NULL);
|
GtkWidget *assist = assist_list = gtk_list_box_new(); g_signal_connect(assist, "row-activated", G_CALLBACK(on_row), NULL);
|
||||||
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("◧", "开始协助", "assist"), -1);
|
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("network-workgroup-symbolic", L("开始协助", "Start assistance"), "assist"), -1);
|
||||||
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("★", "收藏设备", "favorite"), -1);
|
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("starred-symbolic", L("收藏设备", "Favorites"), "favorite"), -1);
|
||||||
gtk_box_pack_start(GTK_BOX(side_inner), assist, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(side_inner), assist, FALSE, FALSE, 0);
|
||||||
gtk_list_box_unselect_all(GTK_LIST_BOX(assist));
|
gtk_list_box_unselect_all(GTK_LIST_BOX(assist));
|
||||||
(void)welcome_nav;
|
(void)welcome_nav;
|
||||||
@@ -628,13 +705,14 @@ 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 = icon_button("", "view-more-symbolic", "hbtn"); gtk_widget_set_tooltip_text(more_button, L("设备信息", "Device information")); g_signal_connect(more_button, "clicked", G_CALLBACK(on_more), NULL);
|
||||||
gtk_box_pack_start(GTK_BOX(header), badge, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(header), badge, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(header), title_label, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(header), title_label, FALSE, FALSE, 0);
|
||||||
gtk_box_pack_start(GTK_BOX(header), more_button, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(header), more_button, FALSE, FALSE, 0);
|
||||||
const char *icons[] = {"☰", "◉", "🔔"}, *kinds[] = {"menu", "account", "notice"};
|
const char *icons[] = {"open-menu-symbolic", "avatar-default-symbolic", "preferences-system-notifications-symbolic"}, *kinds[] = {"menu", "account", "notice"};
|
||||||
for (int i = 0; i < 3; i++) { GtkWidget *b = button(icons[i], "hbtn"); g_signal_connect(b, "clicked", G_CALLBACK(popup), (gpointer)kinds[i]); gtk_box_pack_end(GTK_BOX(header), b, FALSE, FALSE, 0); }
|
const char *tips[] = {L("菜单", "Menu"), L("账号", "Account"), L("通知", "Notifications")};
|
||||||
|
for (int i = 0; i < 3; i++) { GtkWidget *b = icon_button("", icons[i], "hbtn"); gtk_widget_set_tooltip_text(b, tips[i]); g_signal_connect(b, "clicked", G_CALLBACK(popup), (gpointer)kinds[i]); gtk_box_pack_end(GTK_BOX(header), b, FALSE, FALSE, 0); }
|
||||||
gtk_box_pack_start(GTK_BOX(main), header, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(main), header, FALSE, FALSE, 0);
|
||||||
GtkWidget *overlay = gtk_overlay_new();
|
GtkWidget *overlay = gtk_overlay_new();
|
||||||
stack = gtk_stack_new();
|
stack = gtk_stack_new();
|
||||||
@@ -676,12 +754,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 +794,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);
|
||||||
|
|||||||
+125
-85
@@ -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;
|
||||||
@@ -158,35 +159,16 @@ static size_t symbols_close(const char *text) {
|
|||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
/* Named keycodes the keymap gives no symbol to. Reading the compositor's own list is the only
|
/* Reusable codes for the separate text-only keyboard. Remapping real printable keys on that device
|
||||||
portable way: pressing an unmapped keycode types nothing, and uu_wl_key never matches one
|
keeps the physical-key map untouched and is the form Chromium accepts; the evdev "reserved" codes
|
||||||
because it searches by keysym. Highest first, since uu_wl_key takes the lowest match. */
|
that have no symbol are discarded by some clients. */
|
||||||
static unsigned find_spare_codes(xkb_keycode_t *out,unsigned limit) {
|
static unsigned find_spare_codes(xkb_keycode_t *out,unsigned limit) {
|
||||||
|
static const xkb_keycode_t text_codes[]={24,25,26,27,28,29,30,31,32,33,38,39,40,41,42,43,44,45,46,52,53,54,55,56,57,58};
|
||||||
unsigned count=0;
|
unsigned count=0;
|
||||||
xkb_keycode_t min=xkb_keymap_min_keycode(keymap);
|
for(unsigned i=0;i<sizeof(text_codes)/sizeof(text_codes[0]) && count<limit;i++)
|
||||||
for(xkb_keycode_t code=xkb_keymap_max_keycode(keymap);code>min && count<limit;code--) {
|
if(xkb_keymap_key_get_name(keymap,text_codes[i])) out[count++]=text_codes[i];
|
||||||
if(code<8 || code>=sizeof(held_keys) || !xkb_keymap_key_get_name(keymap,code)) continue;
|
|
||||||
int mapped=0;
|
|
||||||
for(xkb_level_index_t level=0;level<xkb_keymap_num_levels_for_key(keymap,code,0) && !mapped;level++) {
|
|
||||||
const xkb_keysym_t *syms;
|
|
||||||
if(xkb_keymap_key_get_syms_by_level(keymap,code,0,level,&syms)>0) mapped=1;
|
|
||||||
}
|
|
||||||
if(!mapped) out[count++]=code;
|
|
||||||
}
|
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
/* A keycode the session keymap already produces this symbol with, unshifted. Typing through it
|
|
||||||
needs no upload, so no client can mistranslate it - and it is how plain latin text and spaces
|
|
||||||
arrive without touching the keymap at all. Spares never match: the pristine keymap leaves them
|
|
||||||
unmapped. */
|
|
||||||
static xkb_keycode_t existing_keycode(xkb_keysym_t symbol) {
|
|
||||||
for(xkb_keycode_t code=xkb_keymap_min_keycode(keymap);code<=xkb_keymap_max_keycode(keymap);code++) {
|
|
||||||
if(code<8 || code>=sizeof(held_keys)) continue;
|
|
||||||
const xkb_keysym_t *syms;
|
|
||||||
if(xkb_keymap_key_get_syms_by_level(keymap,code,0,0,&syms)==1 && syms[0]==symbol) return code;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
static 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,6 +189,11 @@ 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(sync_display()!=0) return -1;
|
||||||
|
usleep(8000);
|
||||||
|
/* A keymap re-sent on a keyboard the client already knows is not handed to it again, so the
|
||||||
|
next batch would still decode with the previous one and repeat it. Re-attaching the text
|
||||||
|
keyboard is what makes the compositor deliver the new keymap. */
|
||||||
if(rekey_keyboard()!=0) return -1;
|
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);
|
||||||
@@ -217,13 +204,16 @@ static int flush_batch(char *buffer,size_t capacity,const char names[][64],const
|
|||||||
}
|
}
|
||||||
memcpy(buffer+at,keymap_text+keymap_insert,keymap_text_len-keymap_insert);
|
memcpy(buffer+at,keymap_text+keymap_insert,keymap_text_len-keymap_insert);
|
||||||
if(upload_keymap(buffer,at+(keymap_text_len-keymap_insert))!=0) return -1;
|
if(upload_keymap(buffer,at+(keymap_text_len-keymap_insert))!=0) return -1;
|
||||||
|
zwp_virtual_keyboard_v1_modifiers(keyboard,0,0,0,0);
|
||||||
if(sync_display()!=0) return -1;
|
if(sync_display()!=0) return -1;
|
||||||
|
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(sync_display()!=0) return -1;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
/* Type UTF-8 like xdotool type does on X11, but on Wayland: characters the session keymap already
|
/* Type UTF-8 like xdotool type does on X11: each character is a Unicode keysym carried by the
|
||||||
has go out as ordinary keycodes, the rest share the spares of one keymap upload (~70 KB, so one
|
text-only keyboard's printable codes, one keymap upload (~70 KB, so one batch per upload) in text
|
||||||
batch per upload), in text order. Never logs the text. */
|
order. Never logs the text. */
|
||||||
static int type_utf8_locked(const char *text) {
|
static int type_utf8_locked(const char *text) {
|
||||||
size_t capacity=keymap_text_len+(size_t)UU_TEXT_SPARE*96+64;
|
size_t capacity=keymap_text_len+(size_t)UU_TEXT_SPARE*96+64;
|
||||||
char *buffer=malloc(capacity);
|
char *buffer=malloc(capacity);
|
||||||
@@ -245,16 +235,11 @@ static int type_utf8_locked(const char *text) {
|
|||||||
if(cp=='\n') sym=0xff0d; /* Return */
|
if(cp=='\n') sym=0xff0d; /* Return */
|
||||||
else if(cp=='\t') sym=0xff09; /* Tab */
|
else if(cp=='\t') sym=0xff09; /* Tab */
|
||||||
else if(cp<0x20 || cp==0x7f || (cp>=0x80 && cp<0xa0)) continue; /* controls carry no text */
|
else if(cp<0x20 || cp==0x7f || (cp>=0x80 && cp<0xa0)) continue; /* controls carry no text */
|
||||||
else if(cp<0x100) sym=cp; /* Latin-1 keysyms equal the code point */
|
/* Every character goes out as a Unicode keysym, including ASCII: a plain Latin-1 keysym
|
||||||
else sym=(xkb_keysym_t)(0x1000000|cp); /* Unicode keysym */
|
is what a running input method composes as pinyin, so "abc" would turn into candidates
|
||||||
xkb_keycode_t existing=existing_keycode(sym);
|
instead of reaching the field. */
|
||||||
if(existing) {
|
else sym=(xkb_keysym_t)(0x1000000|cp);
|
||||||
if(count && flush_batch(buffer,capacity,names,codes,count,&typed)!=0) { failed=1; break; }
|
if(count==spare_count) {
|
||||||
count=0;
|
|
||||||
press_keycode(existing); typed++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if(count==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;
|
||||||
}
|
}
|
||||||
@@ -265,14 +250,26 @@ static int type_utf8_locked(const char *text) {
|
|||||||
}
|
}
|
||||||
if(!failed && count) failed=flush_batch(buffer,capacity,names,codes,count,&typed)!=0;
|
if(!failed && count) failed=flush_batch(buffer,capacity,names,codes,count,&typed)!=0;
|
||||||
free(buffer);
|
free(buffer);
|
||||||
/* Restore the pristine keymap whatever happened above, so uu_wl_key keeps its own symbol map. */
|
|
||||||
if(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(!keyboard_manager) { pthread_mutex_unlock(&lock); return -1; }
|
||||||
|
/* Text has its own device: remapping printable codes must not change physical-key input. */
|
||||||
|
release_held_keys_locked();
|
||||||
|
/* The original device stays alive, so key-up alone must not leave its modifiers held. */
|
||||||
|
zwp_virtual_keyboard_v1_modifiers(keyboard,
|
||||||
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_DEPRESSED),
|
||||||
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LATCHED),
|
||||||
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LOCKED),
|
||||||
|
xkb_state_serialize_layout(key_state,XKB_STATE_LAYOUT_EFFECTIVE));
|
||||||
|
struct zwp_virtual_keyboard_v1 *saved=keyboard;
|
||||||
|
keyboard=zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(keyboard_manager,seat);
|
||||||
|
if(keyboard) {typed=type_utf8_locked(text);sync_display();usleep(8000);if(keyboard) zwp_virtual_keyboard_v1_destroy(keyboard);}
|
||||||
|
keyboard=saved;
|
||||||
|
}
|
||||||
if(typed>=0 && wl_display_flush(display)<0) typed=-1;
|
if(typed>=0 && wl_display_flush(display)<0) typed=-1;
|
||||||
pthread_mutex_unlock(&lock); return typed;
|
pthread_mutex_unlock(&lock); return typed;
|
||||||
}
|
}
|
||||||
@@ -535,37 +532,47 @@ int uu_wl_init(int32_t *w,int32_t *h) {
|
|||||||
wl_registry_add_listener(registry,®istry_listener,NULL);
|
wl_registry_add_listener(registry,®istry_listener,NULL);
|
||||||
if(sync_display()!=0 || sync_display()!=0) goto end;
|
if(sync_display()!=0 || sync_display()!=0) goto end;
|
||||||
dma_init();
|
dma_init();
|
||||||
if(!shm || !seat || !copy_manager || !pointer_manager || !keyboard_manager || !output_count) goto end;
|
/* wlr-virtual-pointer is an optional input path. When the compositor does not
|
||||||
|
advertise it, pointer injection is skipped and the caller may drive input
|
||||||
|
through uinput; screencopy + virtual keyboard are still enough to capture. */
|
||||||
|
if(!shm || !seat || !copy_manager || !output_count) goto end;
|
||||||
const char *name=getenv("UU_WAYLAND_OUTPUT"); selected=0;
|
const char *name=getenv("UU_WAYLAND_OUTPUT"); selected=0;
|
||||||
if(name && *name) {
|
if(name && *name) {
|
||||||
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);
|
||||||
zwlr_output_power_v1_add_listener(power,&power_listener,NULL);
|
zwlr_output_power_v1_add_listener(power,&power_listener,NULL);
|
||||||
}
|
}
|
||||||
pointer=zwlr_virtual_pointer_manager_v1_create_virtual_pointer_with_output(pointer_manager,seat,outputs[selected].handle);
|
if(pointer_manager) pointer=zwlr_virtual_pointer_manager_v1_create_virtual_pointer_with_output(pointer_manager,seat,outputs[selected].handle);
|
||||||
keyboard=zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(keyboard_manager,seat);
|
/* Some compositors reject a virtual keyboard from anything that is not their active
|
||||||
xkb=xkb_context_new(XKB_CONTEXT_NO_FLAGS);
|
input method (Denial does), and a rejected proxy poisons later requests. Allow the
|
||||||
if(!xkb) goto end;
|
caller to opt out and rely on uinput for key input instead. */
|
||||||
struct xkb_rule_names names={.layout="us"};
|
const char *skip_kbd=getenv("UU_WAYLAND_NO_VIRTUAL_KEYBOARD");
|
||||||
keymap=xkb_keymap_new_from_names(xkb,&names,XKB_KEYMAP_COMPILE_NO_FLAGS);
|
if(keyboard_manager && !(skip_kbd && *skip_kbd && strcmp(skip_kbd,"0")))
|
||||||
if(!keymap) goto end;
|
keyboard=zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(keyboard_manager,seat);
|
||||||
key_state=xkb_state_new(keymap); if(!key_state) goto end;
|
if(keyboard) {
|
||||||
keymap_text=xkb_keymap_get_as_string(keymap,XKB_KEYMAP_FORMAT_TEXT_V1);
|
xkb=xkb_context_new(XKB_CONTEXT_NO_FLAGS);
|
||||||
if(!keymap_text) goto end;
|
if(!xkb) goto end;
|
||||||
keymap_text_len=strlen(keymap_text)+1;
|
struct xkb_rule_names names={.layout="us"};
|
||||||
if(upload_keymap(keymap_text,keymap_text_len)!=0) goto end;
|
keymap=xkb_keymap_new_from_names(xkb,&names,XKB_KEYMAP_COMPILE_NO_FLAGS);
|
||||||
if(sync_display()!=0) goto end;
|
if(!keymap) goto end;
|
||||||
/* Text typing needs unmapped keycodes and a place to declare them. A keymap without either
|
key_state=xkb_state_new(keymap); if(!key_state) goto end;
|
||||||
only costs that path - uu_wl_type_utf8 refuses and the caller keeps its own fallback. */
|
keymap_text=xkb_keymap_get_as_string(keymap,XKB_KEYMAP_FORMAT_TEXT_V1);
|
||||||
keymap_insert=symbols_close(keymap_text);
|
if(!keymap_text) goto end;
|
||||||
spare_count=find_spare_codes(spare_codes,sizeof(spare_codes)/sizeof(spare_codes[0]));
|
keymap_text_len=strlen(keymap_text)+1;
|
||||||
|
if(upload_keymap(keymap_text,keymap_text_len)!=0) goto end;
|
||||||
|
if(sync_display()!=0) goto end;
|
||||||
|
/* 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. */
|
||||||
|
keymap_insert=symbols_close(keymap_text);
|
||||||
|
spare_count=find_spare_codes(spare_codes,UU_TEXT_SPARE);
|
||||||
|
}
|
||||||
initialized=1; *w=width; *h=height; result=0;
|
initialized=1; *w=width; *h=height; result=0;
|
||||||
end:
|
end:
|
||||||
if(result!=0) reset();
|
if(result!=0) reset();
|
||||||
@@ -578,12 +585,16 @@ 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=zwlr_virtual_pointer_manager_v1_create_virtual_pointer_with_output(pointer_manager,seat,outputs[target].handle);
|
struct zwlr_virtual_pointer_v1 *next=NULL;
|
||||||
if(!next) goto end;
|
if(pointer_manager) {
|
||||||
if(sync_display()!=0) {zwlr_virtual_pointer_v1_destroy(next);goto end;}
|
next=zwlr_virtual_pointer_manager_v1_create_virtual_pointer_with_output(pointer_manager,seat,outputs[target].handle);
|
||||||
|
if(!next) goto end;
|
||||||
|
if(sync_display()!=0) {zwlr_virtual_pointer_v1_destroy(next);goto end;}
|
||||||
|
}
|
||||||
for(unsigned i=0;i<2;i++) { frame_clear(&frames[i]); dma_clear(&frames[i]); shm_clear(&frames[i]); }
|
for(unsigned i=0;i<2;i++) { frame_clear(&frames[i]); dma_clear(&frames[i]); shm_clear(&frames[i]); }
|
||||||
pending=0;
|
pending=0;
|
||||||
if(pointer) zwlr_virtual_pointer_v1_destroy(pointer);
|
if(pointer) zwlr_virtual_pointer_v1_destroy(pointer);
|
||||||
@@ -601,7 +612,11 @@ end:
|
|||||||
int uu_wl_wake(void) {
|
int uu_wl_wake(void) {
|
||||||
pthread_mutex_lock(&lock); int result=-1;
|
pthread_mutex_lock(&lock); int result=-1;
|
||||||
/* Output power management is optional; missing it must not block screencopy. */
|
/* Output power management is optional; missing it must not block screencopy. */
|
||||||
if(initialized && !power) result=0;
|
if(initialized && (!power || power_failed)) {
|
||||||
|
/* No power manager, or the compositor refused the mode (outputs without DPMS,
|
||||||
|
headless outputs): streaming continues, the screen simply stays as it is. */
|
||||||
|
result=0;
|
||||||
|
}
|
||||||
if(initialized && power && !power_failed) {
|
if(initialized && power && !power_failed) {
|
||||||
zwlr_output_power_v1_set_mode(power,ZWLR_OUTPUT_POWER_V1_MODE_ON);
|
zwlr_output_power_v1_set_mode(power,ZWLR_OUTPUT_POWER_V1_MODE_ON);
|
||||||
if(sync_display()==0 && !power_failed) result=0;
|
if(sync_display()==0 && !power_failed) result=0;
|
||||||
@@ -623,7 +638,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")) {
|
||||||
@@ -634,11 +649,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;
|
||||||
@@ -650,13 +676,21 @@ end:
|
|||||||
}
|
}
|
||||||
int uu_wl_move(int32_t x,int32_t y,int relative) {
|
int uu_wl_move(int32_t x,int32_t y,int relative) {
|
||||||
pthread_mutex_lock(&lock); int result=-1;
|
pthread_mutex_lock(&lock); int result=-1;
|
||||||
|
/* -2: no virtual pointer at all, so the caller may use uinput; -1 stays a real failure. */
|
||||||
|
if(initialized && !pointer) { result=-2; goto end; }
|
||||||
if(initialized) {
|
if(initialized) {
|
||||||
if(relative) {
|
if(relative) {
|
||||||
/* UU reports pixels (source DPR=1); Wayland motion is in logical points. */
|
/* UU reports pixels (source DPR=1); Wayland motion is in logical points. */
|
||||||
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;
|
||||||
}
|
}
|
||||||
@@ -664,6 +698,7 @@ end: pthread_mutex_unlock(&lock); return result;
|
|||||||
}
|
}
|
||||||
int uu_wl_button(int button,int pressed) {
|
int uu_wl_button(int button,int pressed) {
|
||||||
pthread_mutex_lock(&lock); int result=-1;
|
pthread_mutex_lock(&lock); int result=-1;
|
||||||
|
if(initialized && !pointer) { goto end; } /* no virtual pointer: report failure so the caller falls back to uinput */
|
||||||
if(initialized) {
|
if(initialized) {
|
||||||
if(button>=4 && button<=7) {
|
if(button>=4 && button<=7) {
|
||||||
if(pressed) {
|
if(pressed) {
|
||||||
@@ -683,6 +718,7 @@ end: pthread_mutex_unlock(&lock); return result;
|
|||||||
}
|
}
|
||||||
int uu_wl_key(uint64_t symbol,int pressed) {
|
int uu_wl_key(uint64_t symbol,int pressed) {
|
||||||
pthread_mutex_lock(&lock); int result=-1;
|
pthread_mutex_lock(&lock); int result=-1;
|
||||||
|
if(initialized && !keyboard) { pthread_mutex_unlock(&lock); return -1; } /* no virtual keyboard: caller falls back to uinput */
|
||||||
if(initialized) {
|
if(initialized) {
|
||||||
for(xkb_keycode_t code=xkb_keymap_min_keycode(keymap);code<=xkb_keymap_max_keycode(keymap);code++) {
|
for(xkb_keycode_t code=xkb_keymap_min_keycode(keymap);code<=xkb_keymap_max_keycode(keymap);code++) {
|
||||||
int matches=0;
|
int matches=0;
|
||||||
@@ -713,20 +749,24 @@ int uu_wl_release_all(void) {
|
|||||||
if(initialized) {
|
if(initialized) {
|
||||||
/* Sweep this client's virtual keyboard directly: a keysym lookup can
|
/* Sweep this client's virtual keyboard directly: a keysym lookup can
|
||||||
fail for unmapped OEM/keypad symbols before reaching held modifiers. */
|
fail for unmapped OEM/keypad symbols before reaching held modifiers. */
|
||||||
for(xkb_keycode_t code=xkb_keymap_min_keycode(keymap);code<=xkb_keymap_max_keycode(keymap);code++) {
|
if(keyboard) {
|
||||||
if(code<8 || code>=sizeof(held_keys) || !xkb_keymap_key_get_name(keymap,code)) continue;
|
for(xkb_keycode_t code=xkb_keymap_min_keycode(keymap);code<=xkb_keymap_max_keycode(keymap);code++) {
|
||||||
zwp_virtual_keyboard_v1_key(keyboard,timestamp(),code-8,WL_KEYBOARD_KEY_STATE_RELEASED);
|
if(code<8 || code>=sizeof(held_keys) || !xkb_keymap_key_get_name(keymap,code)) continue;
|
||||||
if(held_keys[code]) xkb_state_update_key(key_state,code,XKB_KEY_UP);
|
zwp_virtual_keyboard_v1_key(keyboard,timestamp(),code-8,WL_KEYBOARD_KEY_STATE_RELEASED);
|
||||||
|
if(held_keys[code]) xkb_state_update_key(key_state,code,XKB_KEY_UP);
|
||||||
|
}
|
||||||
|
zwp_virtual_keyboard_v1_modifiers(keyboard,
|
||||||
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_DEPRESSED),
|
||||||
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LATCHED),
|
||||||
|
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LOCKED),
|
||||||
|
xkb_state_serialize_layout(key_state,XKB_STATE_LAYOUT_EFFECTIVE));
|
||||||
}
|
}
|
||||||
memset(held_keys,0,sizeof(held_keys));
|
memset(held_keys,0,sizeof(held_keys));
|
||||||
zwp_virtual_keyboard_v1_modifiers(keyboard,
|
if(pointer) {
|
||||||
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_DEPRESSED),
|
for(unsigned code=0x110;code<=0x114;code++)
|
||||||
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LATCHED),
|
zwlr_virtual_pointer_v1_button(pointer,timestamp(),code,WL_POINTER_BUTTON_STATE_RELEASED);
|
||||||
xkb_state_serialize_mods(key_state,XKB_STATE_MODS_LOCKED),
|
zwlr_virtual_pointer_v1_frame(pointer);
|
||||||
xkb_state_serialize_layout(key_state,XKB_STATE_LAYOUT_EFFECTIVE));
|
}
|
||||||
for(unsigned code=0x110;code<=0x114;code++)
|
|
||||||
zwlr_virtual_pointer_v1_button(pointer,timestamp(),code,WL_POINTER_BUTTON_STATE_RELEASED);
|
|
||||||
zwlr_virtual_pointer_v1_frame(pointer);
|
|
||||||
result=wl_display_flush(display)<0?-1:0;
|
result=wl_display_flush(display)<0?-1:0;
|
||||||
}
|
}
|
||||||
pthread_mutex_unlock(&lock);return result;
|
pthread_mutex_unlock(&lock);return result;
|
||||||
|
|||||||
@@ -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);
|
||||||
|
}
|
||||||
+17
-2
@@ -56,6 +56,15 @@ static void track_injected_key(int keycode, int is_press) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* XShmAttach fails asynchronously (BadAccess when the X server cannot reach our segment, e.g. a
|
||||||
|
* server in another container); Xlib's default handler would exit the process before the XGetImage fallback. */
|
||||||
|
static volatile int g_shm_attach_failed = 0;
|
||||||
|
static int shm_attach_error(Display *display, XErrorEvent *event) {
|
||||||
|
(void)display; (void)event;
|
||||||
|
g_shm_attach_failed = 1;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static void shm_open_image(void) {
|
static void shm_open_image(void) {
|
||||||
g_use_shm = 0;
|
g_use_shm = 0;
|
||||||
if (!XShmQueryExtension(g_display)) return;
|
if (!XShmQueryExtension(g_display)) return;
|
||||||
@@ -66,9 +75,15 @@ static void shm_open_image(void) {
|
|||||||
if (g_shminfo.shmid == -1) return;
|
if (g_shminfo.shmid == -1) return;
|
||||||
g_shminfo.shmaddr = g_shm_image->data = (char *)shmat(g_shminfo.shmid, 0, 0);
|
g_shminfo.shmaddr = g_shm_image->data = (char *)shmat(g_shminfo.shmid, 0, 0);
|
||||||
g_shminfo.readOnly = False;
|
g_shminfo.readOnly = False;
|
||||||
if (g_shminfo.shmaddr != (char *)-1 && XShmAttach(g_display, &g_shminfo)) {
|
if (g_shminfo.shmaddr != (char *)-1) {
|
||||||
XSync(g_display, False);
|
XSync(g_display, False);
|
||||||
g_use_shm = 1;
|
g_shm_attach_failed = 0;
|
||||||
|
int (*previous)(Display *, XErrorEvent *) = XSetErrorHandler(shm_attach_error);
|
||||||
|
Status attached = XShmAttach(g_display, &g_shminfo);
|
||||||
|
XSync(g_display, False);
|
||||||
|
XSetErrorHandler(previous);
|
||||||
|
if (attached && !g_shm_attach_failed) g_use_shm = 1;
|
||||||
|
else fprintf(stderr, "X11 shared-memory capture unavailable; using XGetImage\n");
|
||||||
}
|
}
|
||||||
shmctl(g_shminfo.shmid, IPC_RMID, 0); // 标记删除,进程退出时自动回收;失败时也不遗留段
|
shmctl(g_shminfo.shmid, IPC_RMID, 0); // 标记删除,进程退出时自动回收;失败时也不遗留段
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
# Unofficial UU Remote Linux host in a container, for NAS boxes (Synology DSM, etc.) without a desktop.
|
# Unofficial UU Remote Linux host in a container, for NAS boxes (Synology DSM, etc.) without a desktop.
|
||||||
# Headless mode: file transfer, terminal and port mapping; no remote desktop. Uses the published release binary.
|
# Headless mode: file transfer, terminal and port mapping; no remote desktop. Uses the published release binary.
|
||||||
FROM ubuntu:24.04
|
FROM ubuntu:24.04
|
||||||
ARG VERSION=v0.2.18
|
ARG VERSION=v0.2.20
|
||||||
LABEL org.opencontainers.image.source="https://github.com/VallierDev/uu-remote-linux" \
|
LABEL org.opencontainers.image.source="https://github.com/VallierDev/uu-remote-linux" \
|
||||||
org.opencontainers.image.description="Unofficial UU Remote Linux host, headless (file transfer, terminal, port mapping)" \
|
org.opencontainers.image.description="Unofficial UU Remote Linux host, headless (file transfer, terminal, port mapping)" \
|
||||||
org.opencontainers.image.licenses="GPL-3.0"
|
org.opencontainers.image.licenses="GPL-3.0"
|
||||||
|
|||||||
@@ -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,166 @@
|
|||||||
|
# 实验性防窥 / Experimental privacy screen
|
||||||
|
|
||||||
|
仅支持 KDE Plasma Wayland(portal 后端)。开启后,采集和输入切换到 KWin 虚拟输出
|
||||||
|
(portal ScreenCast 的 VIRTUAL 源),再用 `kscreen-doctor` 禁用物理屏;远程操作不会点亮
|
||||||
|
本机屏幕。关闭、最后一个桌面连接断开或正常退出时,先重新启用物理屏,再结束虚拟输出、切回物理屏采集。
|
||||||
|
顺序参考 KRdp 虚拟显示器的 replace 策略和 Sunshine 的 KDE 方案:创建虚拟输出前记录物理屏,
|
||||||
|
从不禁用虚拟输出本身(KWin bug 527747)。GNOME、其他 Wayland 桌面和 X11 不支持。
|
||||||
|
|
||||||
|
壁纸模式:窗口随物理屏禁用迁到虚拟输出后,重新启用物理屏,把虚拟输出设为主屏、用 KWin 脚本把窗口
|
||||||
|
留在虚拟输出上,再由 `privacy-wallpaper` 子进程在每块物理屏上全屏置顶显示 Plasma 当前桌面壁纸和
|
||||||
|
“此设备正在被远程控制”。物理屏开着时 uinput 绝对坐标覆盖整个布局,主机按虚拟输出在布局中的位置换算。
|
||||||
|
需要 GTK3。
|
||||||
|
|
||||||
|
KDE Plasma Wayland only (portal backend). Enabling moves capture and input to a KWin virtual
|
||||||
|
output (portal ScreenCast VIRTUAL source) and disables the physical outputs with `kscreen-doctor`,
|
||||||
|
so remote input cannot wake them. Disabling, the last desktop disconnect or a normal exit re-enables
|
||||||
|
the physical outputs first, then ends the virtual share and returns to the monitor. Physical outputs
|
||||||
|
are recorded before the virtual one exists; the virtual output itself is never disabled (KWin bug
|
||||||
|
527747). GNOME, other Wayland desktops and X11 are unsupported.
|
||||||
|
|
||||||
|
Wallpaper mode: after the windows have moved to the virtual output, the physical outputs are turned
|
||||||
|
back on as secondary outputs, a KWin script keeps the windows on the virtual one, and the
|
||||||
|
`privacy-wallpaper` child process covers each physical output with Plasma's desktop wallpaper and a
|
||||||
|
notice (fullscreen, keep-above). uinput's absolute axes then span the whole layout, so pointer input
|
||||||
|
is aimed at the virtual output's region. Needs GTK3.
|
||||||
|
|
||||||
|
注意 / Notes:
|
||||||
|
|
||||||
|
- 虚拟屏分辨率由 KDE 决定(默认 1920x1080,首次可能在本机弹窗选择,之后沿用保存的授权
|
||||||
|
`portal-permissions/kde-virtual`)。窗口会被 KWin 移到虚拟屏,恢复后位置可能变化。
|
||||||
|
The virtual size is KDE's (1920x1080 by default; the first share may ask on the host, later ones
|
||||||
|
reuse `portal-permissions/kde-virtual`). KWin moves windows to it; positions may change on restore.
|
||||||
|
- KDE 不处理虚拟输出共享上的 portal 输入,防窥期间指针、按键和文字改走 uinput(需要 `/dev/uinput`
|
||||||
|
权限,见 README);手机拖动手势在此期间按普通鼠标拖动处理。
|
||||||
|
KDE ignores portal input on a virtual-output share, so pointer, keys and text use uinput while the
|
||||||
|
privacy screen is on (`/dev/uinput` access required); mobile drag gestures act as plain mouse drags.
|
||||||
|
- 开启期间通过 KWin 的 InputDevice 接口禁用本地键盘、鼠标、触摸板和触摸屏(含手势守护进程、ydotoold
|
||||||
|
等由本机驱动的虚拟设备),保留电源键、合盖开关和主机自己的 uinput 设备;`UU_PRIVACY_BLOCK_INPUT=0` 关闭此项。
|
||||||
|
KWin 会保存设备开关,所以主机另起 `privacy-guard` 子进程:主机以任何方式结束(包括 SIGKILL)都会按恢复记录
|
||||||
|
重新启用设备和物理屏;下次启动也会重试。防窥期间新插入的设备不会被禁用。
|
||||||
|
While on, local keyboards, pointers, touchpads and touchscreens are disabled through KWin's
|
||||||
|
InputDevice interface (including software devices fed by local hardware such as gesture daemons and
|
||||||
|
ydotoold); the power button, lid switch and the host's own uinput devices stay. Set
|
||||||
|
`UU_PRIVACY_BLOCK_INPUT=0` to keep local input. KWin saves the device flag, so a `privacy-guard`
|
||||||
|
child restores devices and outputs from the record whenever the host ends, including SIGKILL; the
|
||||||
|
next start retries too. Devices plugged in during privacy are not blocked.
|
||||||
|
- 自动开启:`UU_PRIVACY_AUTO=picture`(或 `2`)在第一个桌面控制端连上后自动启用隐私屏保,
|
||||||
|
`UU_PRIVACY_AUTO=screen-off`(或 `3`)自动关屏;默认关闭。远程协助(访客)的桌面会话同样适用。
|
||||||
|
控制端自己的请求优先:一次会话里只要客户端发过隐私请求(包括连接刚建立、会话计数还没开始的
|
||||||
|
那一刻),待执行的自动开启就不再触发;断开后照常恢复。主机不支持或依赖缺失时只记日志,不影响连接。
|
||||||
|
自动开启后主机会向控制端推送一次 SystemMetrics 和 SystemStateChange,控制端菜单随之更新。支持的主机上,
|
||||||
|
每次桌面连接也会先推送一次当前状态(关闭时为关闭),这是新增的主动上报。
|
||||||
|
Auto: `UU_PRIVACY_AUTO=picture` (or `2`) enables picture mode when the first desktop controller
|
||||||
|
connects; `screen-off` (or `3`) turns the physical screens off. Off by default. Remote-assistance
|
||||||
|
(guest) desktop sessions are covered too. The viewer's own request wins for that session, including
|
||||||
|
one that arrives right after the connection opens and before the session counter starts: a pending
|
||||||
|
auto-enable then does not run, and a disconnect restores as usual. Unsupported hosts or missing
|
||||||
|
tools only log; the connection is unaffected. After an auto-enable the host pushes SystemMetrics
|
||||||
|
and SystemStateChange once, so the viewer's menu follows; on supported hosts every desktop
|
||||||
|
connection also pushes the current state first (off when it is off), which is new outbound traffic.
|
||||||
|
- 这是尽力而为的遮挡,不是保密边界。/ This is best-effort obscuring, not a confidentiality boundary.
|
||||||
|
- 恢复记录保存在配置文件旁的 `privacy-power.json`(0600);崩溃后下次启动重新启用记录的物理屏。
|
||||||
|
若主机无法启动,可在本机终端执行 `kscreen-doctor output.<name>.enable`。
|
||||||
|
The recovery record `privacy-power.json` (0600) re-enables the recorded outputs at the next start
|
||||||
|
after a crash; manually: `kscreen-doctor output.<name>.enable`.
|
||||||
|
- 需要 coreutils `timeout`、`gdbus` 和可用的 uinput(`/dev/uinput` 可写,且未设 `UU_INPUT_BACKEND=native`);
|
||||||
|
缺少时请求在改动屏幕和设备之前被拒绝。隐私模式的遮挡窗口建好后才算开启,失败即回滚。
|
||||||
|
Requires coreutils `timeout`, `gdbus` and working uinput (`/dev/uinput` writable, not
|
||||||
|
`UU_INPUT_BACKEND=native`); otherwise the request is refused before outputs or devices change.
|
||||||
|
Picture mode counts as on only after the cover window reports ready; a failure rolls back.
|
||||||
|
|
||||||
|
## 协议 / Protocol
|
||||||
|
|
||||||
|
字段号来自官方 Mac 客户端的 SwiftProtobuf name map / Field numbers from the Mac UURemote name maps:
|
||||||
|
|
||||||
|
- RPC 7 `PrivateScreenSettingRequest {1 enable, 2 privacy_type, 3 setting_source}` → RpcResponse 3
|
||||||
|
`{1 error_code, 2 req_privacy_type, 3 cur_privacy_type}`;PrivateScreenType 2 隐私/picture, 3 关屏/screen off。
|
||||||
|
主机先应答再切换(客户端约数秒超时,报 9998);切换失败发 ReportError -7。
|
||||||
|
The host answers before switching (the viewer times out with 9998); a failed switch sends ReportError -7.
|
||||||
|
成功不发送 ReportError;Mac 4.43.0 的 -9 是系统会话变化提示,不是防窥成功通知。
|
||||||
|
Success does not send ReportError; -9 in Mac 4.43.0 reports a system session change, not privacy success.
|
||||||
|
- RPC 25 `update_screen_saver_req` → RpcResponse 21:开启隐私模式前发送,主机回空成功应答,画面仍用本机壁纸。
|
||||||
|
Sent before picture mode; answered empty (success), the host keeps its own wallpaper.
|
||||||
|
- FeatureFlag 4 `ff_private_screen` = 2 (ENHANCED_PRIVACY);SettingMetric 4 `private_screen`、7 `private_screen_type`
|
||||||
|
上报当前实际模式(1 关闭、2 屏保、3 关屏),不使用 host_settings.json 中的历史选项;SystemStateChange 5
|
||||||
|
`PrivateScreenState` 在状态变化时推送。
|
||||||
|
SettingMetric 4/7 report the effective mode (1 off, 2 picture, 3 screen off), not the saved preference;
|
||||||
|
SystemStateChange 5 is sent after a switch.
|
||||||
|
|
||||||
|
Mac 4.43.0 从 CONTROL 发送请求,但只在 TEXT 接收分支处理上述 RPC 应答与 SystemMetrics。
|
||||||
|
防窥与屏保应答走 TEXT;SystemMetrics 同步发送到 TEXT,并保留 CONTROL 上报以兼容其他客户端。
|
||||||
|
每个 peer 独立排队,TEXT 打开后才发送;待发 SystemMetrics 只保留最新一条,其他应答最多 64 条,
|
||||||
|
按入队顺序发送。满队列时丢弃新增应答并记录一次警告,不阻塞 CONTROL 请求处理。
|
||||||
|
SystemMetrics 优先读取非零的 field 7,仅在其为 0 时回退
|
||||||
|
到 field 4。SystemMetrics field 1 `metrics` 必须列出本次报告的类型(general=1、setting=2),
|
||||||
|
否则客户端直接忽略消息内容。已用原签名 Mac 4.43.0 客户端验证三种模式的安全浮层回显,
|
||||||
|
关屏后断开恢复物理屏与输入设备,再次连接回显“不启用”。
|
||||||
|
Mac 4.43.0 sends requests on CONTROL, but handles these RPC responses and SystemMetrics only on TEXT.
|
||||||
|
Privacy/screensaver replies use TEXT; SystemMetrics are also sent on TEXT, retaining CONTROL for other
|
||||||
|
viewers. Each peer queues messages until its TEXT channel opens, retaining only the latest pending
|
||||||
|
SystemMetrics and up to 64 other replies in FIFO order. Excess replies are dropped with one warning
|
||||||
|
per peer, without blocking CONTROL request handling. Nonzero field 7 takes precedence over
|
||||||
|
field 4. SystemMetrics field 1 `metrics` must list the reported sections (general=1, setting=2), or the
|
||||||
|
viewer ignores the payload. The original signed Mac 4.43.0 viewer was verified for all three labels,
|
||||||
|
physical-screen/input restoration on disconnect, and an off label after reconnecting.
|
||||||
|
|
||||||
|
官方主机侧依据:原签名 Mac `UURemoteServer` 4.43.0(626),arm64 UUID
|
||||||
|
`7E10CB24-F516-3728-8375-BA5EC124A2C5`。`SystemMetricsHandler.handleSystemMetrics`(`0x10000a96c`)
|
||||||
|
按请求填充各节,general 分支在 `0x10000abe8` 追加 `1`,setting helper(`0x10000a230`)
|
||||||
|
在 `0x10000a64c` 追加 `2`;`GvPb_SystemMetrics.traverse`(`0x100423840`)将列表按 packed enum
|
||||||
|
写入 field 1。发送链 `0x10000b11c → 0x10018e948 → ControlledSendTextData:data:` 使用 TEXT。
|
||||||
|
这是静态主机代码依据:请求 general 和 setting 时得到 `[1,2]`,不是抓包,也不表示每条响应都固定
|
||||||
|
包含两节或证明官方 CONTROL 报文。本实现总是报告两节,因此列出 `[1,2]`。
|
||||||
|
Official host evidence: the original signed Mac `UURemoteServer` 4.43.0 (626), arm64 UUID
|
||||||
|
`7E10CB24-F516-3728-8375-BA5EC124A2C5`. `SystemMetricsHandler.handleSystemMetrics` (`0x10000a96c`)
|
||||||
|
fills the requested sections, appending GENERAL=1 at `0x10000abe8` and SETTING=2 at `0x10000a64c`
|
||||||
|
in helper `0x10000a230`. `GvPb_SystemMetrics.traverse` (`0x100423840`) encodes that list as packed
|
||||||
|
field 1. The send chain `0x10000b11c → 0x10018e948 → ControlledSendTextData:data:` uses TEXT.
|
||||||
|
This is static host-code evidence: requesting both sections produces `[1,2]`; it is not a packet
|
||||||
|
capture or proof that every response includes both sections or that the official host sends it on
|
||||||
|
CONTROL. Our payload always reports both sections, so it lists `[1,2]`.
|
||||||
|
|
||||||
|
Android 4.43.0 已确认打开 TEXT;主机日志和手机端人工验收确认,关屏、隐私屏保、取消三种操作的
|
||||||
|
实际模式与菜单选中状态均正确。Windows/iOS 未在本轮验收。
|
||||||
|
Android 4.43.0 opens TEXT; host logs and manual phone-side acceptance confirmed that screen-off,
|
||||||
|
picture and off operations update both the effective mode and the selected menu item.
|
||||||
|
Windows/iOS were not tested in this round.
|
||||||
|
|
||||||
|
## 本机诊断 / Local diagnostic
|
||||||
|
|
||||||
|
禁用物理屏 5 秒后恢复,不登录、不启动第二个主机;先停止使用同一配置目录的主机。
|
||||||
|
Disables the physical outputs for five seconds, then restores them. Stop the host first.
|
||||||
|
|
||||||
|
```sh
|
||||||
|
cargo build --locked --features wayland,portal --bin uuremote-server
|
||||||
|
target/debug/uuremote-server privacy-screen-probe
|
||||||
|
UU_PRIVACY_PROBE_WALLPAPER=1 target/debug/uuremote-server privacy-screen-probe # 壁纸模式 / wallpaper mode
|
||||||
|
```
|
||||||
|
|
||||||
|
## 代码结构 / Code layout
|
||||||
|
|
||||||
|
`src/privacy_screen/` 分两层:与桌面无关的控制器和共享部件,以及每种桌面一个后端。
|
||||||
|
The module has a desktop-independent controller with shared parts, and one backend per desktop.
|
||||||
|
|
||||||
|
| 文件 / File | 职责 / Responsibility |
|
||||||
|
|---|---|
|
||||||
|
| `mod.rs` | 控制器:桌面会话计数、模式切换(先恢复再进入)、失败回滚、崩溃恢复、probe / controller: sessions, mode switch (leave, then enter), rollback, crash recovery, probe |
|
||||||
|
| `mode.rs` | `Mode { Picture, ScreenOff }` ↔ 协议 `privacy_type` 1 关 / 2 隐私 / 3 关屏 |
|
||||||
|
| `protocol.rs` | RPC 7 请求解析与 RpcResponse 3 编码 / request parsing and response encoding |
|
||||||
|
| `backend.rs` | `Backend` trait 与按桌面选择后端 / the trait and backend selection |
|
||||||
|
| `record.rs` | 恢复记录 `{backend, mode, data}`、进程锁、`Journal` / recovery record, process lock, journal |
|
||||||
|
| `guard.rs` | `privacy-guard` 子进程:主机以任何方式结束都按记录恢复 / restores from the record however the host ends |
|
||||||
|
| `cover.rs` | `privacy-wallpaper` 子进程:GTK 全屏遮挡窗口 / GTK cover window process |
|
||||||
|
| `tool.rs` | 带超时的外部命令、gdbus、等待生效 / bounded tool calls, gdbus, wait-until |
|
||||||
|
| `kde/` | KDE 后端:`outputs.rs` kscreen-doctor 布局,`input.rs` KWin 输入设备,`kwin.rs` KWin 脚本,`mod.rs` 编排 |
|
||||||
|
|
||||||
|
新增桌面(X11、GNOME…)只需实现 `Backend` 并在 `backend::detect` / `backend::named` 登记:
|
||||||
|
`enter` 在每一步改动之前通过 `Journal::save` 写入足以撤销它的数据;`leave` 只依据这些数据撤销,
|
||||||
|
因为崩溃恢复时(守护进程或下次启动)没有桌面视频流。Picture 模式可复用 `cover::show`;
|
||||||
|
若物理屏保持开启而 uinput 坐标覆盖整个布局,返回 `Entered::pointer_region`。
|
||||||
|
|
||||||
|
To add a desktop (X11, GNOME, ...), implement `Backend` and register it in `backend::detect` and
|
||||||
|
`backend::named`. `enter` saves, through `Journal::save`, what undoes each step before making it;
|
||||||
|
`leave` must undo from that data alone, because crash recovery (guard or next start) has no
|
||||||
|
desktop stream. Picture mode can reuse `cover::show`; when physical outputs stay on and uinput's
|
||||||
|
axes span the whole layout, return `Entered::pointer_region`.
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
无头 Wayland 出画面、自定义码率、`show` 与登录体验修复。/ Headless Wayland video, custom bitrate, `show` and login fixes.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **无头 Wayland 主机连上没有画面**(#64 / #65,感谢 @axlrose):输出不支持 DPMS 时电源握手失败不再中断视频;贡献者在 sway headless 上复现并验证。
|
||||||
|
- **自定义码率单位错误**(#67,感谢 @JuanZoran):手机端自定义码率按 bit/s 发送(1 Mbps = 1000000),此前被当成 kbit/s 而触发 100 Mbps 上限,
|
||||||
|
导致大量重传、画面滞留。贡献者在 Hyprland + NVENC 上用手机实测。另外对明显是 Mbps / kbps 的小数值做了兜底换算(维护者补充,未实测)。
|
||||||
|
- **`uuremote-server show` 静默卡 30 秒**(#62,感谢 @axlrose):服务被条件跳过、反复崩溃重启或启动失败时立即报出真实原因。贡献者已用真实 systemd 单元验证。
|
||||||
|
- **登录二维码反复立即失效**(#68,感谢 @axlrose):状态轮询在服务器立即应答时不再紧循环(2 秒退避);二维码连续在几秒内失效时指数退避,
|
||||||
|
并提示可备份删除 `~/.config/uuremote/config.json` 重新登录(注册新设备身份,#68 中以此恢复)。退避逻辑未在被标记的设备上实测。
|
||||||
|
|
||||||
|
### 改进 / Improved
|
||||||
|
- `doctor`:会话里没有 `DISPLAY` / `WAYLAND_DISPLAY` 时给出提示(#66,感谢 @axlrose)。
|
||||||
|
- 文档:`inproc-av` / `viewer-ffmpeg` 只支持 FFmpeg 6.x,FFmpeg 7+ 会在依赖里报 `avfft.h file not found`(#63)。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.19_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.19-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.19`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
扫码登录改为与官方客户端一致,修复二维码刚生成就失效。/ QR sign-in now matches the official client.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **登录二维码反复立即失效(1190)**(#68,感谢 @axlrose 的详细排查):逆向官方 Mac 客户端(4.42)后确认,新版服务端在生成二维码时
|
||||||
|
返回 `status_query_ticket`,官方客户端查询扫码状态和确认登录时都用它(放在 `token` 键下);我们此前优先发送旧的 `token` 字段。现在与官方一致:
|
||||||
|
- 生成二维码不带请求体;状态查询用 `status_query_ticket`(服务端没有时才用旧 `token`);
|
||||||
|
- 状态查询是长轮询,每次应答后立即再问,单次超时 60 秒(此前 12 秒);
|
||||||
|
- 状态 3 立即换新码、状态 0 在 0.35 秒后换新码、状态 4 登录(状态 3 不再去调确认登录);
|
||||||
|
- 出错(如 HTTP 400 / 1190)或超时时停止轮询,等用户点击登录窗口新增的「刷新二维码」按钮(终端里按回车;既无窗口也无终端时 60 秒后自动换码)。
|
||||||
|
取代 v0.2.19 的临时退避和「重新注册设备」提示。已用全新设备身份实测:状态查询正常挂起,60 秒后按官方行为停止并等待刷新;
|
||||||
|
未在 #68 那台被标记的设备上实测,「刷新二维码」按钮的界面尚未在桌面上目视验收。
|
||||||
|
- QR sign-in mirrors the official Mac client: `status_query_ticket` as the status ticket, 60 s long poll, regenerate on status 3/0,
|
||||||
|
stop on errors (e.g. code 1190) until the user clicks the new “refresh QR” button.
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.20_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.20-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.20`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
Wayland 合成器缺少虚拟指针或虚拟键盘时,桌面仍可使用;systemd 单元示例与 deb 包一致。/ Wayland desktops without virtual pointer/keyboard protocols still come up.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **只缺 wlr-virtual-pointer 或虚拟键盘受限的合成器整个桌面不可用**(#72、#73,感谢 @clionertr):Denial 等合成器不提供
|
||||||
|
`zwlr_virtual_pointer_manager_v1`,或只把虚拟键盘给它自己的输入法。现在这两个协议都是可选的:画面采集照常启动,
|
||||||
|
缺指针时绝对移动改走 uinput(需能访问 `/dev/uinput`,见 README);`UU_WAYLAND_NO_VIRTUAL_KEYBOARD=1` 可跳过虚拟键盘。
|
||||||
|
只有「完全没有虚拟指针」才回退 uinput;坐标超出当前采集输出等其他失败照旧返回,不会把指针移到别的屏幕(#78)。
|
||||||
|
CI 构建与测试通过,**未在 Denial 上实机验证**;Hyprland 等已有虚拟指针的合成器行为不变。
|
||||||
|
- Virtual pointer and keyboard are optional on Wayland; capture still starts and pointer motion falls back to uinput only when
|
||||||
|
the compositor has no wlr-virtual-pointer. Not tested on Denial.
|
||||||
|
|
||||||
|
### 文档 / Docs
|
||||||
|
- README 的用户 systemd 单元与 deb 包一致:不再写死 `DISPLAY=:0`,随 `graphical-session.target` 启动;无头模式、虚拟桌面和
|
||||||
|
Xfce/i3 等不启动该 target 的桌面改用 `WantedBy=default.target`(#69,感谢 @ferstar)。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.21_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.21-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.21`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
官方控制端能选「真彩」(4:4:4) 了;自行编译的 `inproc-av` 新增进程内 NVENC 与 AMD/Intel VAAPI。/ The official viewer can select true color (4:4:4); self-built `inproc-av` gains in-process NVENC and VAAPI.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **官方控制端里「真彩」不可选或打开后马上被切回**(#77、#79):设备能力里 HEVC/4:4:4 等格式的宽高原来填的是 0x0,官方控制端会把这样的条目当作不支持。现在每种格式都带上最大尺寸 3840x2160。
|
||||||
|
已实机验收:官方 Mac 控制端连 X11 + NVIDIA 主机,打开真彩后切到 HEVC 4:4:4,持续 30 秒以上没有被切回,也没有请求关键帧(PLI)。
|
||||||
|
- The device capability listed HEVC/4:4:4 formats as 0x0, which the official viewer treats as unsupported; each format now
|
||||||
|
carries its maximum size. Verified with the official Mac viewer: true color stays on (HEVC 4:4:4) for 30+ s, no PLI.
|
||||||
|
|
||||||
|
### 新增(需自行编译,预编译包不受影响)/ Added (self-built only; release packages unchanged)
|
||||||
|
- `--features inproc-av`(仅 X11):
|
||||||
|
- **NVENC 进程内编码**(#75、#77,感谢 @ferstar):直接读取 XShm,支持 4:4:4,不再经过 FFmpeg 进程;失败时依次回退到 FFmpeg 的 NVENC 管线、CPU。我方 NVIDIA 机器未单独验收这条进程内路径。
|
||||||
|
- **VAAPI 进程内编码**(#80、#81,感谢 @ferstar):通过 DRI3 DMA-BUF 零拷贝取屏(没有 DRI3 时改用 XShm 上传),经 VPP 转成 NV12 后送入硬件编码,支持 H.264 和 H.265。贡献者已在 AMD HawkPoint、Cezanne 上用官方 Mac 控制端实机验收;Intel 与 4K 尚未验证。需设置 `UU_VIDEO_ENCODER=vaapi`。
|
||||||
|
- libcuda、libva 都在运行时加载;编译所需的头文件见 README。
|
||||||
|
- In-process NVENC (XShm, 4:4:4) and VAAPI (DRI3 DMA-BUF zero copy, H.264/H.265) under `--features inproc-av` on X11,
|
||||||
|
each falling back to the FFmpeg process pipeline. VAAPI accepted by the contributor on AMD HawkPoint/Cezanne; Intel and 4K untested.
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.22_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.22-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.22`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
长时间连接后画面冻结的修复。/ Fixes video freezing after long sessions.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **控制端切到后台再恢复后画面冻结、延迟显示 0**(#83,感谢 @AYssu 定位并提供补丁):RTP 序号每 65536 包回绕一次;
|
||||||
|
回绕后如果控制端补要(NACK)回绕前的旧包,webrtc-srtp 0.12.0 会把加密状态退回旧值,之后的新包都用错误的回绕计数加密,
|
||||||
|
控制端全部认证失败,画面停住且不再恢复。现按 RFC 3711 附录 A 估算回绕计数,重传不再让状态倒退。加密算法和报文格式不变。
|
||||||
|
回归测试在原库上失败、修复后通过(AES-CM/HMAC 与 AES-GCM);报告者在 Windows 控制端实测后台放置恢复正常,跨过两次回绕。
|
||||||
|
- SRTP rollover counter no longer rewinds when a pre-wrap packet is retransmitted after the wrap (frozen video, #83).
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.23_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.23-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.23`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
X11 下切换分辨率会真正修改桌面分辨率。/ On X11 the viewer's resolution choice now changes the desktop resolution.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **控制端切换分辨率时真正修改桌面分辨率**,与官方 Windows 被控端一致:以前「其他分辨率」只缩放编码画面,选小分辨率反而让字更小更糊。
|
||||||
|
现在 X11 下用 xrandr 切换主显示器模式,列表里没有的分辨率会自动添加;选「原始」或断开连接后恢复原分辨率。
|
||||||
|
已用官方 Mac 控制端在 GNOME(X11)上实测切换与恢复。设置 `UU_DESKTOP_RESIZE=0` 可回到只缩放画面的旧行为;Wayland 不变。
|
||||||
|
- On X11 the resolution choice switches the display mode via xrandr (adding the mode when missing) and restores it for
|
||||||
|
"original" or on disconnect, like the official Windows host. `UU_DESKTOP_RESIZE=0` restores encoder scaling.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **连接中桌面分辨率变化后画面中断**:以前会把采集失败当成编码器故障,逐个换编码器后停止推流。现在按新尺寸重新采集,鼠标坐标随之更新。
|
||||||
|
- A desktop resize during a session no longer stops the stream; capture restarts at the new size and pointer mapping follows.
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.24_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.24-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.24`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
托盘图标随深色/浅色模式自动变色。/ The tray icon now follows light and dark panels.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **深色模式下托盘图标看不清**(#87):托盘改用内置单色符号图标,GNOME(AppIndicator 扩展)和 KDE 会按面板主题自动着色,
|
||||||
|
tarball 安装也不用另装图标。旧版 AppIndicator 库或缓存目录不可写时沿用原图标。目前只经过 CI 编译,尚未在 KDE / GNOME 面板上实机确认。
|
||||||
|
- The tray uses a built-in monochrome symbolic icon (written to the user cache and offered as the indicator's icon theme
|
||||||
|
path) that GNOME's AppIndicator extension and KDE recolor for the panel theme. Built in CI; not yet checked on a real panel.
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.25_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.25-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.25`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
修复 KDE 托盘图标显示为未知图标;显示器接在 NVIDIA 卡上时默认不再让 NVENC 直接编码 BGRA。/ Fixes the KDE tray icon; NVENC skips direct BGRA input when NVIDIA drives the display.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **KDE 托盘显示成未知(空白页)图标**(#87,v0.2.25 引入):单色托盘图标改名为 `uuremote-tray-symbolic`,写到 `~/.local/share/icons/hicolor`,
|
||||||
|
各家面板的默认图标查找都能找到,仍会随深色/浅色面板着色。已在 Plasma 6.7 / KF6 上用 KIconLoader 按 Plasma 的查找方式验证,Plasma 6.8 面板待报告者确认。
|
||||||
|
v0.2.25 留下的 `~/.cache/uu-remote-linux/icons` 不再使用,可以删除。
|
||||||
|
- **同一张 NVIDIA 卡负责显示时编码变慢**(#16):显示、采集、编码都在同一张 NVIDIA 卡上时,NVENC 直接编码 BGRA 反而比 CPU 转换慢
|
||||||
|
(RTX 5070 4K:探针 82.6 vs 98 fps)。现在只要有显示器接在 NVIDIA 卡上就改用 CPU 转换;核显接显示器的机器不变。`UU_NVENC_RGB=1` 强制直接编码,`=0` 强制 CPU 转换。
|
||||||
|
- The tray icon is installed as `uuremote-tray-symbolic` in the user hicolor theme, so KDE's default lookup finds it
|
||||||
|
(v0.2.25 showed the unknown icon on Plasma 6.8). NVENC no longer takes packed BGRA when a connected monitor hangs off
|
||||||
|
an NVIDIA card (slower when the desktop is composited on the encoding GPU); `UU_NVENC_RGB=1` forces it.
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.26_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.26-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.26`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
可手动选择视频编码器和 codec,auto 改为后台探测;Wayland 屏幕保活失败不再中断画面;viewer 新增安全输入 `type`。/ Encoder and codec settings, background auto probe, display-wake failures no longer stop video, and a secure `type` command in the viewer.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **编码器与 codec 设置**(#85 第①②步,#92、#93,感谢 @ferstar):`uuremote-server set-encoder auto|cpu|vaapi|nvenc`、
|
||||||
|
`uuremote-server set-codec auto|h264|h265` 写入 `~/.config/uuremote/host_settings.json`,优先级高于 `UU_VIDEO_ENCODER` / `UU_VIDEO_CODEC`,
|
||||||
|
下次建立桌面连接时生效;`doctor` 显示来源和最终 codec。auto 在启动时后台探测(每个候选编码一帧合成画面,限时 3 秒,不挡第一路出图):
|
||||||
|
有 NVIDIA 时 NVENC → CPU,没有 NVIDIA 时直接用 CPU 不探测。NVENC 探测失败只缓存 10 分钟,之后的桌面连接会在后台重探;
|
||||||
|
NVIDIA 驱动或设备中途出现/消失也会重探。显式指定编码器时不探测。VAAPI 要等 #33 解决后才进入 auto。
|
||||||
|
- **viewer 安全输入 `uuremote-viewer type`**(#70,感谢 @212duo):向已打开的桌面会话注入键盘(锁屏 PIN / 密码),文本不进 argv,
|
||||||
|
日志只记长度;按 US QWERTY 键位映射。本机 IPC 用私有目录和对端 uid 校验。
|
||||||
|
- `set-encoder` / `set-codec` write the video settings to `host_settings.json`; auto now probes NVENC then CPU in the background
|
||||||
|
(CPU only without NVIDIA, NVENC failures retried after 10 minutes). The viewer gains `type`, a secure key-injection command that
|
||||||
|
reuses the open desktop session.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **Wayland 运行中屏幕保活失败会停掉视频**(#94、#95,感谢 @AYssu):启动时和每 30 秒的屏幕保活改为尽力而为,失败只记警告、下轮重试,
|
||||||
|
画面继续发送;采集、编码、发送错误仍按原逻辑处理。
|
||||||
|
- A failed display wake at stream start or during the 30-second refresh is logged and retried instead of ending the video.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI(x86_64、arm64、Wayland、inproc-av、viewer)通过;以上改动尚未在报告者现场或 NVIDIA 机器上实机验收。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.27_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.27-<x86_64|aarch64>-linux.tar.gz`,或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.27`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
tar 包新增 `install.sh`,缺 FFmpeg 时自动安装;宿主缺 FFmpeg 时弹桌面提示,不再让客户端一直停在「正在传输画面」。/ The tarball gains `install.sh`, which installs FFmpeg when missing; the host tells the desktop user when FFmpeg is missing.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **tar 包安装脚本 `install.sh`**:解压后用普通桌面用户运行 `./install.sh`。程序和插件装到 `~/.local`,写入用户级 systemd 服务(已有则保留),
|
||||||
|
并检查 FFmpeg(需带 libx264)。缺失时询问后经 sudo 用 apt / pacman 安装(`--yes` 不询问,`--no-ffmpeg` 只检查);Fedora 需先启用 RPM Fusion,
|
||||||
|
openSUSE 需 Packman 源,脚本只打印命令、不替你添加第三方源。.deb 包本来就依赖 `ffmpeg`,不受影响。
|
||||||
|
- **缺 FFmpeg 时的桌面提示**:宿主在启动时和每次有人连接桌面时检查 FFmpeg。不可用时记 error,弹出「无法传输远程画面」桌面通知并给出安装命令;
|
||||||
|
没有通知服务的桌面(如精简 Xfce)改为打开宿主窗口,顶部红字提示。最多每 5 分钟一次;装好后重新连接即可,不用重启服务。
|
||||||
|
- `install.sh` installs into `~/.local`, writes the systemd user unit and installs FFmpeg with libx264 through apt or pacman when missing.
|
||||||
|
The host checks FFmpeg at startup and on every desktop connection and shows a desktop notification (or opens its window) when it is missing.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
`install.sh` 在 Debian 13(Xfce)上实测:卸掉 FFmpeg 后 `--yes` 自动装回;CI 在 Ubuntu 22.04 上做同样的测试。通知和窗口红字用测试程序在 Xfce 上实测
|
||||||
|
(有/无通知服务两种情况);宿主内的完整流程只有编译与 CI 覆盖。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.28_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.28-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.28`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
运行中切换编码器不再断开连接;X11 双屏/多屏可以只看其中一块屏幕(实验性)。/ Switch the encoder without dropping the session; select one monitor on X11 (experimental).
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **运行中切换编码器(#85 第③步,#96,感谢 @ferstar)**:`uuremote-server set-encoder auto|cpu|vaapi|nvenc` 和 `set-codec` 写入设置后会通知正在运行的宿主(`SIGUSR2`),
|
||||||
|
已连接的桌面在下一帧边界换用新编码器,不用断开重连;VAAPI 不支持真彩 4:4:4 时自动降为 4:2:0 并通知客户端。只通知完整路径相同的宿主程序,
|
||||||
|
避免误杀旧版本宿主;没有通知到宿主时会打印提示(下次连接或重启服务后生效)。编码格式(H.264/H.265)偏好仍在下次连接时生效。
|
||||||
|
- **X11 单屏选择(#98,实验性)**:设置 `UU_X11_MULTISCREEN=1` 后,主机按 `xrandr --listmonitors` 列出各显示器,控制端可选择其中一块,只采集该区域,
|
||||||
|
鼠标绝对坐标加上该屏幕的偏移;默认主显示器,`UU_X11_OUTPUT` 可指定其他屏幕。显示器布局在启动时读取,改动后需重启服务;此模式下「分辨率」改为缩放画面。默认关闭,单屏用户不受影响。
|
||||||
|
- `set-encoder` / `set-codec` now switch a live desktop stream's encoder via `SIGUSR2` (same binary only) without reconnecting.
|
||||||
|
`UU_X11_MULTISCREEN=1` lets the viewer pick one X11 monitor (RandR monitors; capture and absolute input follow the selected monitor).
|
||||||
|
|
||||||
|
### 其他 / Other
|
||||||
|
- Issue 模板的诊断命令:保留连接状态和端口映射日志、过滤 WebRTC 内部噪音,并抹掉 IPv6 和 MAC 地址。
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
运行中切换编码器:单元测试与 CI,官方客户端下的切换时序尚未实机验证。X11 单屏选择:单元测试;在 Debian 13 上用两块 RandR 虚拟显示器实测,
|
||||||
|
鼠标落点与按区域采集正确;官方客户端在真实双屏上的切换尚未实机验证,欢迎反馈。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.29_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.29-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.29`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
先开端口映射再打开桌面时不再黑屏;VAAPI 低码率档能压到更低码率。/ Opening the desktop after a port mapping no longer shows a black screen; VAAPI low-bitrate presets go lower.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **端口映射后打开桌面黑屏(#99)**:已有端口映射连接时,Mac 控制端打开桌面不会新建连接,而是在原连接上发送 `capture_desktop`。
|
||||||
|
宿主现在会把这条连接转为桌面:画面、光标、剪贴板和会话计数都会启动,剪贴板能力也会重新通告。之后再打开新的桌面时,旧连接只停掉桌面,
|
||||||
|
端口映射照常可用。若此前 X11 分辨率有变化,会按新尺寸重建采集。限制:Wayland Portal 后端暂不支持这种方式;这条连接上没有声音。
|
||||||
|
- **VAAPI 低档码率(#33,#102,感谢 @ferstar)**:in-process VAAPI 编码的最大 QP 从 44 放宽到 51,复杂画面下低档可降到硬件能达到的最低码率;中高档不受影响。
|
||||||
|
- A viewer that opens the desktop on an existing port-mapping connection (`capture_desktop`) now gets video, cursor, clipboard and session handling on that connection;
|
||||||
|
a later desktop stops it without closing the port mappings. In-process VAAPI `max_qp` raised from 44 to 51.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
#99:根因由报告者日志证实;修复只有单元测试与 CI,官方 Mac 控制端下尚未实机验证,欢迎反馈。#102:贡献者在 AMD 核显上实测(2560×1600 复杂画面最低档 4.16→2.60 Mbps,
|
||||||
|
中高档输出一致),我们这边仅 CI。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.30_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.30-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.30`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
NVENC 新增可选 VBV 缓冲开关,缓解高分辨率下关键帧按 GOP 周期闪烁。/ Opt-in NVENC VBV buffer for high-resolution keyframe pulsing.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **`UU_NVENC_BUFFER_MS`(#103,感谢 @zhl-HFUT 的分析)**:NVENC 的 VBV 缓冲(10–1000 ms,缓冲 = 码率上限 × 毫秒 / 1000),FFmpeg 进程管线和进程内引擎都生效。
|
||||||
|
默认缓冲(100–500 kbit)在 1440p 等高分辨率下会把关键帧压糊,画面按 GOP 周期“糊一下再变清”;遇到时可设 `UU_NVENC_BUFFER_MS=1000`。默认行为不变。
|
||||||
|
- New `UU_NVENC_BUFFER_MS` (10–1000 ms of the bitrate cap) for NVENC, applied to both the FFmpeg pipeline and the in-process engine. Default unchanged.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
仅单元测试与 CI,尚未在 NVENC 实机上验证,欢迎反馈。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.31_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.31-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.31`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
修复端口映射在 ICE 瞬断恢复后被续房拆掉、信令卡死后长时间假在线,以及查看器 CLI 的指针偏移与滚轮。/ Fixes port-mapping teardown after ICE recovery, stalled signaling, and viewer CLI pointer/wheel input.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **ICE 瞬断恢复后连接被拆(#109,感谢 @sinoyster 的细致分析)**:WebRTC 的 ICE 状态回调读到的是占位 DTLS 对象,ICE `Disconnected → Connected` 恢复后 PeerConnection 停在 `New`,15 分钟续房把仍在使用的端口映射当成空闲,拆房并断开所有映射 TCP 流。现在恢复后会回到 `Connected`。
|
||||||
|
After a brief ICE drop the peer state settled on `New` instead of `Connected`, so the idle room renewal tore down live port-mapping streams.
|
||||||
|
- **信令投递卡住时心跳检测失效(#104,感谢 @RiverOnVenus)**:事件队列阻塞时 Engine.IO 超时不再执行,主机可能带着半关闭的连接“在线”数小时。现在有独立看门狗、发送超时和关闭超时。
|
||||||
|
Heartbeat detection keeps running when event delivery stalls; the host reconnects instead of staying half-online.
|
||||||
|
- **查看器 CLI**:16:10 等非 16:9 主机的指针按内容区域映射,不再内偏(#107,感谢 @liuyanghejerry);鼠标滚轮/触控板转发为滚动(#108,感谢 @liuyanghejerry)。
|
||||||
|
Viewer CLI: pointer mapped to the content rectangle of the padded canvas; mouse wheel forwarded.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;#109 的 ICE 恢复场景尚未实机复现,欢迎反馈。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.32_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.32-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.32`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
修复 Wayland 锁屏或熄屏后,由工具连接(端口映射)升级的桌面视频结束后无法再次打开。/ Fixes a promoted tool connection whose desktop video could not be reopened after the screen locked or blanked.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **锁屏/熄屏后桌面无法重新打开(#114,感谢 @sinoyster 的完整报告)**:通过 capture_desktop 升级为桌面的工具连接上,若 Wayland 采集因锁屏或 DPMS 关闭而结束,再次 capture_desktop 不会重建视频,查看器只剩黑屏。现在会重新请求桌面并在原连接上重启视频,保留原输入租约。
|
||||||
|
On a tool connection promoted with capture_desktop, a desktop stream that ended (e.g. Wayland capture failing on lock/DPMS) is now restarted on the next capture_desktop, keeping the original input lease.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;#114 的锁屏场景尚未实机复现,欢迎反馈。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.33_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.33-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.33`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
修复网络波动后信令重连卡住,以及 Linux 控制端在平铺窗口管理器下画面空白。/ Fixes signaling reconnect stalling after a network hiccup, and the Linux viewer showing a blank window under tiling compositors.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **网络异常后停在 Acquired room signaling credentials(#115,感谢 @Changxi-M)**:信令 WebSocket 握手没有超时,网络半断时会无限等待,重连不再重试。现在握手限时 20 秒,超时后按原有退避重试。
|
||||||
|
The signaling WebSocket handshake is now bounded to 20 s, so a stalled handshake falls back to the normal reconnect retry instead of hanging forever.
|
||||||
|
- **控制端窗口平铺后画面空白(#118,感谢 @shao-zhijie)**:Linux 控制端只在收到新解码帧时绘制,合成器调整窗口尺寸后静止画面不会重绘;在尚未收到首帧时,Wayland 也不会映射没有提交缓冲的窗口。现在窗口尺寸变化/重新显示时用最后一帧重绘,无帧时先画黑底。
|
||||||
|
The Linux viewer now repaints the last frame after a compositor resize/expose, and paints a black frame before the first decoded frame so Wayland maps the window.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;#115、#118 的场景尚未实机复现,欢迎反馈。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.34_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.34-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.34`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
信令可走 HTTP 代理、二维码登录错误分类、重复主机实例诊断,以及 Wayland 手机端文字输入兜底。/ Signaling through an opt-in HTTP proxy, clearer QR login errors, duplicate-host diagnostics, and a Wayland fallback for mobile text input.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **信令遵循 `UU_USE_PROXY=1`(#123)**:主机和 Linux 控制端的 WebSocket 信令改用与 REST 接口相同的 HTTP 客户端,开启 `UU_USE_PROXY=1` 后也走环境里的 HTTP/HTTPS 代理(不支持 SOCKS;选中的代理失败不会改为直连;不跟随重定向)。不代理 ICE/WebRTC 媒体。默认(不开代理)行为不变。
|
||||||
|
Host and viewer signaling now use the same HTTP client as the REST API, so `UU_USE_PROXY=1` applies to signaling too (HTTP/HTTPS proxies only, no direct fallback, no redirects). Media is not proxied; the default is unchanged.
|
||||||
|
- **Wayland/Portal 手机端文字输入兜底(#119,感谢 @shofukantkts)**:没有空闲键码的合成器和 Portal 后端上,手机端输入的文字经剪贴板 + Shift+Insert 粘贴;`UU_WAYLAND_TEXT=0` 可关闭。
|
||||||
|
Mobile text input on Portal and compositors without spare keycodes is pasted via the clipboard and Shift+Insert; `UU_WAYLAND_TEXT=0` disables it.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **二维码登录错误分类(#121)**:状态查询失败不再一律提示「网络超时」,区分超时、连接失败、响应异常与二维码过期;诊断只含阶段、类别、耗时和状态码,不输出票据、URL 或服务器内容。
|
||||||
|
QR polling failures are no longer all reported as a network timeout; timeouts, connection failures, bad responses and expiry are distinguished, with diagnostics that never include tickets, URLs or server content.
|
||||||
|
- **重复主机实例(#122)**:同一身份的两个主机实例(拷贝了 `config.json`,或残留的旧手动实例)会互相把对方踢出房间,表现为控制端一连就断。`doctor` 现在能数到重新执行后进程名为 `exe` 的实例并给出提示;README 说明不要在机器之间拷贝 `config.json`;日志会记录无 peer id 的 leave 事件结构(仅键名/类型/长度)。
|
||||||
|
Two host instances sharing one identity kick each other out of the room. `doctor` now counts re-executed instances and warns about extras, the README explains not to copy `config.json` between machines, and leave events without a peer id log their shape (keys/types/lengths only).
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI。#123 在真实 Linux X11 主机上实测不开代理时信令与 iPhone 桌面连接正常;经真实代理的信令尚未实测。#122 的修复在报告环境实机验证。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.35_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.35-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.35`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
修复 X11 共享内存被拒时主机直接退出,以及 Linux 控制端加入已有会话时可能永久黑屏。/ Fixes the host exiting when X11 refuses shared memory, and a possible black screen when the Linux viewer joins a host that already streams to another session.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **X11 MIT-SHM 被拒时直接退出**:X 服务器无法访问本程序的共享内存段时(例如 X 服务器在另一个容器里),`XShmAttach` 返回 BadAccess,Xlib 默认错误处理直接结束了进程,原有的 `XGetImage` 退路没有机会执行。现在捕获该错误并改用 `XGetImage` 抓屏。
|
||||||
|
When `XShmAttach` is refused (BadAccess, e.g. an X server in another container), the host now falls back to `XGetImage` instead of being terminated by Xlib's default error handler.
|
||||||
|
- **控制端加入已有会话时黑屏(#124,感谢 @shao-zhijie)**:Linux 控制端过去只在丢包或解码出错时请求关键帧;加入一条已在推流的干净 H.264 流时永远等不到 IDR。现在首帧显示前每 30 个访问单元请求一次关键帧(PLI),300 个仍无画面时日志给出提示。
|
||||||
|
The Linux viewer now requests key frames (PLI) every 30 access units until the first frame is shown, and logs a warning after 300.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI。共享内存退路尚待在报告环境实机确认;#124 中官方 Mac 主机是否响应 PLI 尚未实测。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.36_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.36-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.36`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -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,13 @@
|
|||||||
|
Mac 控制端防窥菜单正确显示当前模式。/ The Mac viewer privacy menu now shows the active mode.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **Mac 控制端防窥状态回显(#147、#148,感谢 @ferstar)**:防窥切换应答与 SystemMetrics 改经 TEXT 通道发送(TEXT 打开前排队,metrics 只保留最新一份),SystemMetrics 带上报告的分节列表并报告当前防窥模式,修复 v0.2.43 中菜单切换后仍显示“不启用”的问题。
|
||||||
|
Privacy replies and SystemMetrics are now also delivered over the TEXT channel (queued until it opens, keeping only the latest metrics); SystemMetrics lists its reported sections and the current privacy mode, so the Mac viewer menu no longer shows "off" after switching.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI。贡献者在 KDE Wayland + Mac 控制端实机验证;维护者尚未用 Windows/iOS/Android 控制端复测。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.44_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.44-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.44`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
控制端远程窗口不再被本地输入法截获按键。/ The viewer's remote window no longer lets the local IME swallow keys.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **控制端本地输入法截获按键(#149、#150,感谢 @xfjm136)**:SDL 远程桌面窗口创建后关闭本地文本输入,按键只按物理键转发,由被控端输入法处理;修复本地与远端都用 Shift 切换中英文时,Shift 等按键被本地输入法吞掉的问题。不修改系统输入法设置,GTK 启动器不受影响。
|
||||||
|
The SDL remote desktop window now disables local text input after creation, so keys are forwarded as physical keys and the remote IME handles composition; Shift and similar keys are no longer swallowed by the local IME. System IME settings and the GTK launcher are unchanged.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试(含 SDL dummy 子进程测试)与 CI。贡献者在 KDE Wayland + Fcitx5 连接 Windows 实机验证;其他桌面/输入法后端未复测。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.45_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.45-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.45`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
Linux 复制的文本可直接粘贴到 Windows 控制端。/ Text copied on Linux now pastes in the Windows viewer.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **Linux → Windows 文本剪贴板无法粘贴(#151,感谢 @afwer1231 的定位)**:主机提供 Unicode 文本格式时,格式名改用官方 Windows 端的 `predefined_13`(id 仍为 13)。此前的 `CF_UNICODETEXT` 名字会让 Windows 控制端注册一个同名的自定义格式,文本虽已到达但普通粘贴读不到。Mac 控制端按 id 13 识别,不受影响。
|
||||||
|
The host now names its Unicode text offer `predefined_13` (id 13), as official Windows peers do. The previous `CF_UNICODETEXT` name made the Windows viewer register a custom format of that name, so the text arrived but normal paste could not read it. The Mac viewer matches by id 13 and is unaffected.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;格式名依据官方 Windows/Mac 程序中的字符串对照(推断)。尚未在 Windows 控制端实机验证。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.46_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.46-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.46`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
官方客户端的设备卡片在未连接时也能显示 Linux 主机的壁纸。/ Device cards in official clients now show the Linux host's wallpaper while disconnected.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **上报系统壁纸(#152/#153,感谢 @ferstar)**:已登录的图形主机按官方 Windows 被控端的流程获取文件令牌、上传当前壁纸并回报地址,每 60 秒检查一次,内容不变不重复上传。支持 GNOME/Cinnamon、KDE(Plasma 5/6,含壁纸包和主题默认壁纸)、Xfce;其他桌面可用 `UU_WALLPAPER=/绝对路径/图片` 指定(PNG/JPEG/WebP)。访客与无桌面模式不上报。
|
||||||
|
Signed-in graphical hosts fetch a file token, upload the current wallpaper and report its URL, following the official Windows host. Checks run every 60 seconds; unchanged content is not re-uploaded. Supports GNOME/Cinnamon, KDE (Plasma 5/6, including wallpaper packages and theme defaults) and Xfce; other desktops can set `UU_WALLPAPER=/absolute/path/image`. Guest and headless hosts skip it.
|
||||||
|
|
||||||
|
### 隐私 / Privacy
|
||||||
|
默认会把当前壁纸图片上传到 UU 的文件服务;设置 `UU_WALLPAPER_UPLOAD=0` 可关闭。日志只记录结果和失败阶段。
|
||||||
|
By default the current wallpaper image is uploaded to UU's file service; set `UU_WALLPAPER_UPLOAD=0` to disable. Logs record only the outcome and failing stage.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;贡献者在 KDE 上实机确认官方客户端显示壁纸。GNOME/Cinnamon、Xfce 尚无实机验收;多屏、动态/XML 壁纸不在本次范围。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.47_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.47-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.47`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
防窥模式可在连接时自动开启,查看端组合键和启动器图标修复,信令失败日志更易诊断。/ Optional auto-enabled privacy screen, viewer modifier and launcher icon fixes, and clearer signaling failure logs.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **连接时自动开启防窥(#161,感谢 @RiverOnVenus)**:设置 `UU_PRIVACY_AUTO=picture`(隐私屏保)或 `screen-off`(关闭显示屏),第一个桌面控制端连上后自动开启;默认关闭。控制端自己的防窥请求优先,不覆盖已保存的偏好;远程协助会话同样适用。仅 KDE Plasma Wayland(portal)。
|
||||||
|
Set `UU_PRIVACY_AUTO=picture` or `screen-off` to enable the privacy screen when the first desktop controller connects (off by default). The viewer's own request wins and the saved preference is not overwritten; remote-assistance sessions are covered too. KDE Plasma Wayland (portal) only.
|
||||||
|
- **Omarchy 壁纸自动发现(#157,感谢 @ferstar)**:Hyprland 下的 Omarchy 自动跟随当前壁纸上报。/ Omarchy on Hyprland reports its current background automatically.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **查看端组合键(#163/#165,感谢 @Zhenqiang-Weng)**:窗口失焦再聚焦后,仍按住的 Shift/Ctrl/Alt/Win(Mac 为 Command)在下一次按键前恢复,不再丢失修饰键。/ The native viewer restores still-held modifiers after a focus change.
|
||||||
|
- **启动器图标(#158,感谢 @Zhenqiang-Weng)**:改用系统主题符号图标,缺少 emoji 字体时不再显示方框。/ Launcher icons use the system icon theme instead of emoji glyphs.
|
||||||
|
- **信令连接失败日志(#166)**:记录脱敏后的失败原因(类别或 HTTP 状态码,不含 token 和地址),区分服务端拒绝与网络问题。/ Signaling connection failures now log a sanitized reason (category or HTTP status).
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;防窥自动开启由贡献者在 KDE Plasma 6 Wayland + iOS 客户端实机验证。查看端修复为合成事件测试,未做 Mac 主机实机验收。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.48_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.48-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.48`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
查看端显示远端光标形状,KDE 防窥遮罩不再出现在任务栏。/ The native viewer mirrors remote cursor shapes, and the KDE privacy cover no longer appears in the task manager.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **查看端远端光标形状(#168,感谢 @Zhenqiang-Weng)**:SDL 查看端使用主机经现有 CONTROL 消息发来的光标图片和热点(文本、调整大小等),指针离开画面、悬停本地控件或失焦时恢复本地箭头。光标 PNG 有大小和尺寸上限,日志只记录数量和尺寸。
|
||||||
|
The SDL viewer applies the host's cursor image and hotspot from the existing CONTROL message, restoring the local arrow outside the picture, over local controls and on focus loss. Cursor PNGs are size-bounded; logs record only counts and dimensions.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **KDE 防窥遮罩不进任务栏(#169,感谢 @RiverOnVenus)**:隐私屏保模式下,遮罩窗口通过 KWin 脚本设为不显示在任务管理器中(含多显示器的每个遮罩)。/ In picture mode, the cover windows (one per monitor) are hidden from the task manager through KWin scripting.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;KDE 遮罩修复由贡献者在 Plasma 6.8 Wayland 单屏实机验证,多屏未实测。光标形状未做官方主机实机验收。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.49_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.49-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.49`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
观看模式「批注」可用(X11),空闲主机 CPU 占用下降,防窥重启后可恢复输入设备,Portal 授权不再因中途失败丢失。/ Watch-mode annotation works on X11, idle hosts use less CPU, privacy restore survives a reboot, and rotated Portal consent is no longer lost.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **观看模式批注(#174,感谢 @Chr0mium24)**:主机应答官方查看端的批注 RPC(draw_req),笔迹画在可穿透点击的 X11 覆盖窗口上(需要合成器),分辨率变化时覆盖层随之重建。此前查看端报「批注开启失败(9998)」。仅 X11;Wayland、移动端查看端和多显示器未实测。
|
||||||
|
The host answers the official viewer's annotation RPC (draw_req) and draws strokes on a click-through X11 overlay (needs a compositor), rebuilt when the resolution changes. X11 only; Wayland, mobile viewers and multiple monitors untested.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **空闲主机 CPU(#172,感谢 @ferstar)**:指针工作线程在没有指针/滚轮/按键/触控手势时挂起,不再以 4 ms 周期空转(无查看端时约 3% CPU)。/ The pointer worker parks while no pointer, scroll, button or gesture work is pending, instead of ticking every 4 ms (~3% CPU idle).
|
||||||
|
- **防窥重启后恢复输入设备(#173,感谢 @RiverOnVenus)**:KDE 防窥记录按设备名称/产品/厂商匹配,重启后 eventN 编号变化也能重新启用被禁用的设备;已不存在的设备跳过,不再让后续防窥切换一直失败。/ KDE privacy records match devices by name/product/vendor, so a renumbered device is re-enabled after a reboot; missing devices are skipped.
|
||||||
|
- **Portal 授权先持久化(#175,感谢 @jinpeng2700-tech)**:Portal 返回轮换后的一次性 restore token 时立即保存,不再等首帧;采集失败或取消时不会丢失授权、下次重新弹窗。/ Rotated single-use Portal restore tokens are saved as soon as Portal returns them, so a failed or cancelled capture no longer forces a new consent prompt.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI。批注由贡献者用 Mac 查看端 4.42.0 在 Ubuntu 22.04 GNOME X11 实机验证;#172 在报告者的 KDE Wayland 主机验证原始版本;#173 由贡献者在 KDE Plasma 6.8 用 release 构建回放记录验证;#175 为单元/合成测试。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.50_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.50-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.50`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
Hyprland 等 wlroots 合成器上,手机查看端输入法打出的中文/符号文字可正常上屏。/ Phone IME text (Chinese and symbols) from mobile viewers now types correctly on Hyprland and other wlroots compositors.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **wlroots 手机输入法文字(#176,感谢 @Onekki)**:所有 wlroots 合成器统一用独立的虚拟文字键盘,每批文字重新 attach 键位表,ASCII 也按 Unicode keysym 发送;Wayland 下先走 keysym、失败再回退 uinput;输入前释放按键后同步原设备的修饰键状态,避免 Ctrl/Shift 残留。/ All wlroots compositors use a dedicated virtual text keyboard, re-attaching the keymap per batch and sending ASCII as Unicode keysyms; Wayland tries keysyms before falling back to uinput, and modifier state is re-synced to the original device so Ctrl/Shift do not stick.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;贡献者在 Hyprland 0.56.2 + fcitx5 实机验证。niri 等其他 wlroots 合成器未实测。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.51_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.51-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.51`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,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.
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
# Device-card wallpaper reporting
|
||||||
|
|
||||||
|
The official Windows host publishes the system wallpaper for device cards. This is separate from
|
||||||
|
the Linux viewer's local last-frame cache and does not require capturing desktop windows on disconnect.
|
||||||
|
|
||||||
|
## Static protocol evidence
|
||||||
|
|
||||||
|
Read-only analysis of the locally installed `GameViewerServer.exe` (SHA-256
|
||||||
|
`af3a15c3887e06bfa9506971e01cd8ec58f41efe8ac9eb5831e31dae1fc1cef8`) found:
|
||||||
|
|
||||||
|
- `ApplicationManager::updateWallpaper`, `getWallpaperPath`, `uploadWallpaper`, and log strings
|
||||||
|
`wallpaper check`, `wallpaper is not changed, the same md5`, `wallpaper file upload succeeded`.
|
||||||
|
The source path recorded in the executable is `server_core/business/apps/application_manager.cpp`.
|
||||||
|
- `0x140ade430`: GET `/api/v1/tool/fp/token?filetype=1`. Response parser `0x140ae3410`
|
||||||
|
reads `token`, `req_url`, `ttl`, optional `max_size` from API data.
|
||||||
|
- `0x140aeb8c0`: POST raw file bytes to `req_url`, with `Authorization` set directly to the
|
||||||
|
file token (no Bearer prefix, multipart wrapper, or account credentials).
|
||||||
|
- Upload callback `0x140ad1010` requires HTTP 200; parser `0x140ae1550` reads top-level
|
||||||
|
`fsize`, `url`, `md5`, `mime`. The wallpaper callback `0x1404206c0` uses `url`.
|
||||||
|
- `0x140b48d80`: POST `/api/v1/device/wallpaper`, JSON `{"wallpaper_url":"<uploaded URL>"}`.
|
||||||
|
Device response parsers and the official viewer also contain `wallpaper_url`.
|
||||||
|
|
||||||
|
Addresses are preferred virtual addresses for that executable only. No official binary, assets,
|
||||||
|
account data, upload tokens, desktop pictures, or account URLs are included here.
|
||||||
|
This establishes the wallpaper flow statically; it does not prove that every official client's
|
||||||
|
last-frame display uses this flow or establish the official timer interval.
|
||||||
|
|
||||||
|
## Linux behavior
|
||||||
|
|
||||||
|
Signed-in graphical hosts check the configured wallpaper on startup and every 60 seconds, upload
|
||||||
|
only changed supported image bytes, and retry failures on a later check. Guest and headless hosts skip
|
||||||
|
reporting. Account renewal replaces the reporting task; stopping the host cancels it. Network work
|
||||||
|
does not block signaling or alter peer connections. Images are bounded to 10 MiB and the file service's
|
||||||
|
advertised limit. HTTPS is required and upload redirects are disabled.
|
||||||
|
|
||||||
|
GNOME/Unity/Cinnamon use GSettings (GNOME dark preference included); KDE reads the first image
|
||||||
|
wallpaper containment, including image packages, or the installed look-and-feel's default wallpaper
|
||||||
|
when no explicit wallpaper is configured; Xfce reads the first `last-image`. Multi-monitor selection, slideshow/XML
|
||||||
|
wallpapers and unsupported formats are not inferred.
|
||||||
|
On Hyprland, Omarchy's `omarchy/current/background` link is read from `XDG_STATE_HOME`
|
||||||
|
(default `~/.local/state`), falling back to the older `XDG_CONFIG_HOME` location
|
||||||
|
(default `~/.config`). Wallpaper/theme changes are followed on the next check.
|
||||||
|
Other compositor-specific wallpaper daemons are not inferred.
|
||||||
|
`UU_WALLPAPER=/absolute/path/image.png` selects a file explicitly; `UU_WALLPAPER_UPLOAD=0` disables
|
||||||
|
reporting. PNG, JPEG, and WebP are supported. No desktop screenshot fallback is used.
|
||||||
|
|
||||||
|
Only success/failure is logged. Paths, hashes, URLs, response bodies and credentials stay out of logs.
|
||||||
Executable
+131
@@ -0,0 +1,131 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# Install uu-remote-linux from the release tarball for the current desktop user, and install FFmpeg
|
||||||
|
# (needed for desktop video) through the system package manager when it is missing.
|
||||||
|
# usage: ./install.sh [--yes] [--no-ffmpeg]
|
||||||
|
# --yes install FFmpeg without asking
|
||||||
|
# --no-ffmpeg only check FFmpeg, never install it
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
assume_yes=0 ffmpeg_install=1
|
||||||
|
for arg in "$@"; do
|
||||||
|
case $arg in
|
||||||
|
-y|--yes) assume_yes=1 ;;
|
||||||
|
--no-ffmpeg) ffmpeg_install=0 ;;
|
||||||
|
-h|--help) sed -n '2,6p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;;
|
||||||
|
*) echo "unknown option: $arg (see --help)" >&2; exit 2 ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
echo "Run this as your desktop user, not root: the host is a per-user service. It asks for sudo only to install FFmpeg." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
src=$(cd "$(dirname "$0")" && pwd)
|
||||||
|
bin=$HOME/.local/bin lib=$HOME/.local/lib/uu-remote-linux share=$HOME/.local/share
|
||||||
|
unit_dir=${XDG_CONFIG_HOME:-$HOME/.config}/systemd/user
|
||||||
|
|
||||||
|
# A running binary cannot be overwritten in place ("text file busy"): copy, then rename.
|
||||||
|
put() { install -Dm"$1" "$2" "$3.new" && mv -f "$3.new" "$3"; }
|
||||||
|
|
||||||
|
[ -f "$src/uuremote-server" ] || { echo "uuremote-server not found next to install.sh" >&2; exit 1; }
|
||||||
|
put 755 "$src/uuremote-server" "$bin/uuremote-server"
|
||||||
|
[ -f "$src/uuremote-viewer" ] && put 755 "$src/uuremote-viewer" "$bin/uuremote-viewer"
|
||||||
|
for so in libuu-wayland.so libuu-portal.so; do
|
||||||
|
[ -f "$src/$so" ] && put 644 "$src/$so" "$lib/$so"
|
||||||
|
done
|
||||||
|
if [ -d "$src/contrib/desktop" ]; then
|
||||||
|
put 644 "$src/contrib/desktop/uu-remote-linux.svg" "$share/icons/hicolor/scalable/apps/uu-remote-linux.svg"
|
||||||
|
put 644 "$src/contrib/desktop/uu-remote-linux.desktop" "$share/applications/uu-remote-linux.desktop"
|
||||||
|
[ -f "$bin/uuremote-viewer" ] && put 644 "$src/contrib/desktop/uu-remote-linux-viewer.desktop" "$share/applications/uu-remote-linux-viewer.desktop"
|
||||||
|
fi
|
||||||
|
echo "Installed uuremote-server to $bin"
|
||||||
|
|
||||||
|
# Same unit as the .deb, pointing at ~/.local/bin. An existing unit is the user's: leave it alone.
|
||||||
|
if [ -f "$unit_dir/uuremote-native.service" ]; then
|
||||||
|
echo "Kept existing $unit_dir/uuremote-native.service"
|
||||||
|
else
|
||||||
|
mkdir -p "$unit_dir"
|
||||||
|
cat > "$unit_dir/uuremote-native.service" <<'UNIT'
|
||||||
|
[Unit]
|
||||||
|
Description=UU Remote Linux host (unofficial)
|
||||||
|
After=graphical-session.target
|
||||||
|
PartOf=graphical-session.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Environment=RUST_LOG=info
|
||||||
|
ExecStart=%h/.local/bin/uuremote-server
|
||||||
|
Restart=always
|
||||||
|
RestartSec=5
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=graphical-session.target
|
||||||
|
UNIT
|
||||||
|
echo "Created $unit_dir/uuremote-native.service"
|
||||||
|
fi
|
||||||
|
if command -v systemctl >/dev/null 2>&1; then systemctl --user daemon-reload 2>/dev/null || true; fi
|
||||||
|
|
||||||
|
# FFmpeg with libx264 is required: without it the viewer waits on 正在传输画面 forever.
|
||||||
|
ffmpeg_ok() { command -v ffmpeg >/dev/null 2>&1 && ffmpeg -hide_banner -encoders 2>/dev/null | grep -qw libx264; }
|
||||||
|
|
||||||
|
ffmpeg_cmd=""
|
||||||
|
ffmpeg_note=""
|
||||||
|
if command -v apt-get >/dev/null 2>&1; then
|
||||||
|
ffmpeg_cmd="apt-get update && apt-get install -y ffmpeg"
|
||||||
|
elif command -v pacman >/dev/null 2>&1; then
|
||||||
|
ffmpeg_cmd="pacman -S --needed --noconfirm ffmpeg"
|
||||||
|
elif command -v dnf >/dev/null 2>&1; then
|
||||||
|
# Fedora's own ffmpeg-free has no libx264; the full build is in RPM Fusion, which we do not enable for you.
|
||||||
|
if dnf repolist --enabled 2>/dev/null | grep -qi rpmfusion-free; then
|
||||||
|
ffmpeg_cmd="dnf install -y --allowerasing ffmpeg"
|
||||||
|
else
|
||||||
|
ffmpeg_note="Enable RPM Fusion (https://rpmfusion.org/Configuration), then: sudo dnf install --allowerasing ffmpeg"
|
||||||
|
fi
|
||||||
|
elif command -v zypper >/dev/null 2>&1; then
|
||||||
|
ffmpeg_note="openSUSE's ffmpeg has no libx264; add the Packman repository, then: sudo zypper install ffmpeg"
|
||||||
|
else
|
||||||
|
ffmpeg_note="Install FFmpeg with libx264 from your distribution, or set \"ffmpeg_root\" in ~/.config/uuremote/config.json"
|
||||||
|
fi
|
||||||
|
|
||||||
|
ffmpeg_ready=1
|
||||||
|
if ffmpeg_ok; then
|
||||||
|
echo "FFmpeg with libx264: found"
|
||||||
|
else
|
||||||
|
if command -v ffmpeg >/dev/null 2>&1; then echo "FFmpeg is installed but has no libx264."; else echo "FFmpeg is not installed."; fi
|
||||||
|
if [ "$ffmpeg_install" = 1 ] && [ -n "$ffmpeg_cmd" ]; then
|
||||||
|
answer=n
|
||||||
|
if [ "$assume_yes" = 1 ]; then
|
||||||
|
answer=y
|
||||||
|
elif [ -t 0 ]; then
|
||||||
|
printf 'Install it now with: sudo sh -c "%s"? [Y/n] ' "$ffmpeg_cmd"
|
||||||
|
read -r answer || answer=n
|
||||||
|
case $answer in ""|y|Y|yes|YES) answer=y ;; esac
|
||||||
|
fi
|
||||||
|
if [ "$answer" = y ]; then
|
||||||
|
if [ "$(id -u)" != 0 ] && ! command -v sudo >/dev/null 2>&1; then
|
||||||
|
echo "sudo is not available; run as root: $ffmpeg_cmd" >&2
|
||||||
|
else
|
||||||
|
sudo sh -c "$ffmpeg_cmd" || echo "FFmpeg installation failed." >&2
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if ffmpeg_ok; then
|
||||||
|
echo "FFmpeg with libx264: installed"
|
||||||
|
else
|
||||||
|
ffmpeg_ready=0
|
||||||
|
if [ -n "$ffmpeg_cmd" ]; then echo "Install it with: sudo sh -c \"$ffmpeg_cmd\""; else echo "$ffmpeg_note"; fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
case ":$PATH:" in *":$bin:"*) ;; *) echo "Note: $bin is not on PATH; add it or call $bin/uuremote-server directly." ;; esac
|
||||||
|
cat <<NEXT
|
||||||
|
|
||||||
|
Next steps (as this user, inside the graphical session):
|
||||||
|
uuremote-server login # scan the QR code with the UU Remote app
|
||||||
|
systemctl --user enable --now uuremote-native.service # start with the graphical session
|
||||||
|
Desktops that do not export DISPLAY to systemd (e.g. Xfce) need a drop-in; see README step 4.
|
||||||
|
NEXT
|
||||||
|
if [ "$ffmpeg_ready" = 0 ]; then
|
||||||
|
echo "WARNING: desktop video will not start until FFmpeg with libx264 is installed." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
@@ -0,0 +1,538 @@
|
|||||||
|
//! Viewer annotation (观看模式「批注」): the viewer draws on the host screen while watching.
|
||||||
|
//!
|
||||||
|
//! RpcRequest field 27 `draw_req` (gv_pb.DrawRequest) is answered with RpcResponse field 23
|
||||||
|
//! `draw_resp` (gv_pb.DrawResponse). Schema read from the official Mac 4.42.0 build
|
||||||
|
//! (UURemoteService: SwiftProtobuf name maps and Swift field metadata):
|
||||||
|
//!
|
||||||
|
//! - DrawRequest { oneof: 1 stroke_request, 2 clear_request, 3 toggle_request }
|
||||||
|
//! - DrawResponse { oneof: 1 stroke_response, 2 clear_response, 3 toggle_response }
|
||||||
|
//! - DrawStrokeRequest { 1 uint32 stroke_id, 2 repeated DrawPoint points, 3 optional int32 screen_id,
|
||||||
|
//! 4 optional float line_width, 5 optional uint32 color }; DrawPoint { 1 float x, 2 float y }
|
||||||
|
//! - DrawClearRequest { 1 ClearType clear_type (1 all, 2 by id), 2 uint32 stroke_id, 3 optional int32 screen_id }
|
||||||
|
//! - DrawToggleRequest { 1 bool enable }
|
||||||
|
//! - Draw*Response { 1 int32 error_code }, 0 = success
|
||||||
|
//!
|
||||||
|
//! The Mac viewer sends normalized points (`annotationNormalizedPoint`) in batches that share a
|
||||||
|
//! stroke id (`flushAnnotationStrokePoints`), clears before a screen switch and toggles off on exit.
|
||||||
|
//! Without this handler the request went unanswered and the viewer showed 「批注开启失败」.
|
||||||
|
//!
|
||||||
|
//! The strokes are drawn on a click-through X11 overlay (c_engine/annotation_overlay.c), so the
|
||||||
|
//! person at the host sees them and the capture streams them back to the viewer.
|
||||||
|
|
||||||
|
use crate::protocol::{decode_wire, WireField, WireValue};
|
||||||
|
use std::sync::mpsc;
|
||||||
|
use std::sync::{Mutex, OnceLock};
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
pub const RPC_REQUEST: u32 = 27;
|
||||||
|
pub const RPC_RESPONSE: u64 = 23;
|
||||||
|
|
||||||
|
const SLOT_STROKE: u64 = 1;
|
||||||
|
const SLOT_CLEAR: u64 = 2;
|
||||||
|
const SLOT_TOGGLE: u64 = 3;
|
||||||
|
|
||||||
|
/// error_code: the overlay cannot be shown (no X display, no compositor or no ARGB visual).
|
||||||
|
const ERR_UNAVAILABLE: i32 = 1;
|
||||||
|
|
||||||
|
/// iOS system red, opaque: the viewer sends no color of its own (Mac 4.42.0).
|
||||||
|
const DEFAULT_COLOR: u32 = 0xFFFF_3B30;
|
||||||
|
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
extern "C" {
|
||||||
|
fn uu_annotation_open(display: *const libc::c_char, x: libc::c_int, y: libc::c_int, width: libc::c_int,
|
||||||
|
height: libc::c_int, error: *mut libc::c_int) -> *mut libc::c_void;
|
||||||
|
fn uu_annotation_size(handle: *mut libc::c_void, width: *mut libc::c_int, height: *mut libc::c_int);
|
||||||
|
fn uu_annotation_polyline(handle: *mut libc::c_void, points: *const i16, count: libc::c_int, argb: libc::c_uint,
|
||||||
|
line_width: libc::c_int);
|
||||||
|
fn uu_annotation_clear(handle: *mut libc::c_void);
|
||||||
|
fn uu_annotation_flush(handle: *mut libc::c_void);
|
||||||
|
fn uu_annotation_poll(handle: *mut libc::c_void) -> libc::c_int;
|
||||||
|
fn uu_annotation_close(handle: *mut libc::c_void);
|
||||||
|
}
|
||||||
|
|
||||||
|
// macOS development builds: no X display, so the overlay never opens.
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
unsafe fn uu_annotation_open(_: *const libc::c_char, _: libc::c_int, _: libc::c_int, _: libc::c_int, _: libc::c_int,
|
||||||
|
error: *mut libc::c_int) -> *mut libc::c_void { *error = 1; std::ptr::null_mut() }
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
unsafe fn uu_annotation_size(_: *mut libc::c_void, _: *mut libc::c_int, _: *mut libc::c_int) {}
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
unsafe fn uu_annotation_polyline(_: *mut libc::c_void, _: *const i16, _: libc::c_int, _: libc::c_uint, _: libc::c_int) {}
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
unsafe fn uu_annotation_clear(_: *mut libc::c_void) {}
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
unsafe fn uu_annotation_flush(_: *mut libc::c_void) {}
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
unsafe fn uu_annotation_poll(_: *mut libc::c_void) -> libc::c_int { 0 }
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
unsafe fn uu_annotation_close(_: *mut libc::c_void) {}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
pub enum Request {
|
||||||
|
Stroke { id: u32, points: Vec<(f32, f32)>, screen: Option<i32>, width: Option<f32>, color: Option<u32> },
|
||||||
|
Clear { all: bool, id: u32 },
|
||||||
|
Toggle(bool),
|
||||||
|
}
|
||||||
|
|
||||||
|
fn varint_field(fields: &[WireField], number: u32) -> Option<u64> {
|
||||||
|
fields.iter().find_map(|f| match (f.number, &f.value) { (n, WireValue::Varint(v)) if n == number => Some(*v), _ => None })
|
||||||
|
}
|
||||||
|
|
||||||
|
fn float_field(fields: &[WireField], number: u32) -> Option<f32> {
|
||||||
|
fields.iter().find_map(|f| match (f.number, &f.value) { (n, WireValue::Fixed32(b)) if n == number => Some(f32::from_le_bytes(*b)), _ => None })
|
||||||
|
}
|
||||||
|
|
||||||
|
fn bytes_field<'a>(fields: &'a [WireField<'a>], number: u32) -> Option<&'a [u8]> {
|
||||||
|
fields.iter().find_map(|f| match (f.number, &f.value) { (n, WireValue::Bytes(b)) if n == number => Some(*b), _ => None })
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Decodes a DrawRequest body (the bytes of RpcRequest field 27).
|
||||||
|
pub fn parse(body: &[u8]) -> Option<Request> {
|
||||||
|
let fields = decode_wire(body).ok()?;
|
||||||
|
if let Some(stroke) = bytes_field(&fields, 1) {
|
||||||
|
let s = decode_wire(stroke).ok()?;
|
||||||
|
let mut points = Vec::new();
|
||||||
|
for field in &s {
|
||||||
|
if let (2, WireValue::Bytes(point)) = (field.number, &field.value) {
|
||||||
|
let p = decode_wire(point).ok()?;
|
||||||
|
points.push((float_field(&p, 1).unwrap_or(0.0), float_field(&p, 2).unwrap_or(0.0)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Some(Request::Stroke {
|
||||||
|
id: varint_field(&s, 1).unwrap_or(0) as u32,
|
||||||
|
points,
|
||||||
|
screen: varint_field(&s, 3).map(|v| v as i32),
|
||||||
|
width: float_field(&s, 4),
|
||||||
|
color: varint_field(&s, 5).map(|v| v as u32),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if let Some(clear) = bytes_field(&fields, 2) {
|
||||||
|
let c = decode_wire(clear).ok()?;
|
||||||
|
let kind = varint_field(&c, 1).unwrap_or(0);
|
||||||
|
return Some(Request::Clear { all: kind != 2, id: varint_field(&c, 2).unwrap_or(0) as u32 });
|
||||||
|
}
|
||||||
|
if let Some(toggle) = bytes_field(&fields, 3) {
|
||||||
|
let t = decode_wire(toggle).ok()?;
|
||||||
|
return Some(Request::Toggle(varint_field(&t, 1).unwrap_or(0) != 0));
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
fn varint(mut v: u64, out: &mut Vec<u8>) {
|
||||||
|
while v >= 128 { out.push((v as u8 & 127) | 128); v >>= 7; }
|
||||||
|
out.push(v as u8);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn bytes(field: u64, v: &[u8], out: &mut Vec<u8>) {
|
||||||
|
varint(field << 3 | 2, out);
|
||||||
|
varint(v.len() as u64, out);
|
||||||
|
out.extend_from_slice(v);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// RpcResponse { 1 response_header (echoed request header), 23 DrawResponse { slot: { 1 error_code } } }.
|
||||||
|
pub fn encode_response(header: &[u8], slot: u64, error_code: i32) -> Vec<u8> {
|
||||||
|
let mut result = Vec::new();
|
||||||
|
if error_code != 0 { varint(1 << 3, &mut result); varint(error_code as i64 as u64, &mut result); }
|
||||||
|
let mut draw = Vec::new();
|
||||||
|
bytes(slot, &result, &mut draw);
|
||||||
|
let mut out = Vec::new();
|
||||||
|
bytes(1, header, &mut out);
|
||||||
|
bytes(RPC_RESPONSE, &draw, &mut out);
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
/// (request header, DrawRequest body) of an RpcRequest 27 draw_req; None for every other RPC.
|
||||||
|
pub fn draw_request(rpc: &[WireField]) -> Option<(Vec<u8>, Vec<u8>)> {
|
||||||
|
let body = bytes_field(rpc, RPC_REQUEST)?;
|
||||||
|
Some((bytes_field(rpc, 1).unwrap_or(&[]).to_vec(), body.to_vec()))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The peer a request came from: the address of that peer's `PeerActions`. Its session tracker
|
||||||
|
/// holds the Arc until it has sent its last reset, so a newer peer cannot reuse the key meanwhile.
|
||||||
|
pub type Owner = usize;
|
||||||
|
|
||||||
|
pub fn owner<T>(peer: &std::sync::Arc<T>) -> Owner { std::sync::Arc::as_ptr(peer) as *const () as usize }
|
||||||
|
|
||||||
|
/// Applies a draw_req from `owner` and builds its RpcResponse. Blocking: a toggle waits for the overlay.
|
||||||
|
pub fn respond(owner: Owner, header: &[u8], body: &[u8]) -> Vec<u8> {
|
||||||
|
let Some(request) = parse(body) else {
|
||||||
|
log::warn!("Annotation request not understood: {}", crate::protocol::wire_shape(body, 3));
|
||||||
|
return encode_response(header, SLOT_TOGGLE, ERR_UNAVAILABLE);
|
||||||
|
};
|
||||||
|
let (slot, code) = match request {
|
||||||
|
Request::Toggle(enable) => {
|
||||||
|
let (reply, result) = mpsc::channel();
|
||||||
|
send(Command::Toggle { owner, enable, reply });
|
||||||
|
// Opening the overlay is a few X round trips; never stall the channel for long.
|
||||||
|
let code = result.recv_timeout(Duration::from_secs(2)).unwrap_or(ERR_UNAVAILABLE);
|
||||||
|
log::info!("Annotation toggle: enable={} error_code={}", enable, code);
|
||||||
|
(SLOT_TOGGLE, code)
|
||||||
|
}
|
||||||
|
Request::Clear { all, id } => {
|
||||||
|
log::info!("Annotation clear: all={} stroke_present={}", all, id != 0);
|
||||||
|
send(Command::Clear { owner, all, id });
|
||||||
|
(SLOT_CLEAR, 0)
|
||||||
|
}
|
||||||
|
stroke @ Request::Stroke { .. } => {
|
||||||
|
send(Command::Stroke(owner, stroke));
|
||||||
|
(SLOT_STROKE, 0)
|
||||||
|
}
|
||||||
|
};
|
||||||
|
encode_response(header, slot, code)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `owner`'s desktop session ended: remove its overlay and strokes. A delayed reset from a replaced
|
||||||
|
/// peer leaves the annotation of the viewer that took over alone.
|
||||||
|
pub fn reset(owner: Owner) {
|
||||||
|
if let Some(worker) = WORKER.get() {
|
||||||
|
let _ = worker.lock().unwrap().send(Command::Reset(owner));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
enum Command {
|
||||||
|
Toggle { owner: Owner, enable: bool, reply: mpsc::Sender<i32> },
|
||||||
|
Stroke(Owner, Request),
|
||||||
|
Clear { owner: Owner, all: bool, id: u32 },
|
||||||
|
Reset(Owner),
|
||||||
|
/// Tests: (owner, overlay size, stroke count) while an overlay is shown.
|
||||||
|
#[cfg(test)]
|
||||||
|
Probe(mpsc::Sender<Option<(Owner, i32, i32, usize)>>),
|
||||||
|
}
|
||||||
|
|
||||||
|
static WORKER: OnceLock<Mutex<mpsc::Sender<Command>>> = OnceLock::new();
|
||||||
|
|
||||||
|
fn send(command: Command) {
|
||||||
|
let worker = WORKER.get_or_init(|| {
|
||||||
|
let (tx, rx) = mpsc::channel();
|
||||||
|
std::thread::Builder::new().name("annotation".into()).spawn(move || run(rx)).expect("annotation thread");
|
||||||
|
Mutex::new(tx)
|
||||||
|
});
|
||||||
|
let _ = worker.lock().unwrap().send(command);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A stroke keeps the viewer's points, so it can be laid out again when the overlay is rebuilt.
|
||||||
|
struct Stroke { id: u32, normalized: bool, argb: u32, line: Option<f32>, raw: Vec<(f32, f32)>, width: i32, points: Vec<i16> }
|
||||||
|
|
||||||
|
impl Stroke {
|
||||||
|
fn new(id: u32, raw: Vec<(f32, f32)>, line: Option<f32>, color: Option<u32>) -> Self {
|
||||||
|
let normalized = raw.iter().all(|&(x, y)| x.abs() <= 1.5 && y.abs() <= 1.5);
|
||||||
|
Self { id, normalized, argb: argb(color), line, raw, width: 0, points: Vec::new() }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Overlay pixels for all points; a single point is a dot (a zero-length round-capped segment).
|
||||||
|
fn layout(&mut self, width: i32, height: i32) {
|
||||||
|
self.width = line_width(self.line, height);
|
||||||
|
self.points = to_pixels(&self.raw, self.normalized, width, height);
|
||||||
|
if self.points.len() == 2 { self.points.extend_from_within(0..2); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Overlay { handle: *mut libc::c_void, screen: Option<i32>, region: (i32, i32, i32, i32), width: i32, height: i32 }
|
||||||
|
|
||||||
|
impl Overlay {
|
||||||
|
fn open(screen: Option<i32>) -> Result<Self, i32> {
|
||||||
|
let region = region(screen);
|
||||||
|
let display = crate::capture::x11_display().and_then(|d| std::ffi::CString::new(d).ok());
|
||||||
|
let mut error = 0;
|
||||||
|
let handle = unsafe {
|
||||||
|
uu_annotation_open(display.as_ref().map_or(std::ptr::null(), |d| d.as_ptr()), region.0, region.1, region.2, region.3, &mut error)
|
||||||
|
};
|
||||||
|
if handle.is_null() { return Err(error); }
|
||||||
|
let (mut width, mut height) = (0, 0);
|
||||||
|
unsafe { uu_annotation_size(handle, &mut width, &mut height) };
|
||||||
|
log::info!("Annotation overlay shown: {}x{}+{}+{}", width, height, region.0, region.1);
|
||||||
|
Ok(Self { handle, screen, region, width, height })
|
||||||
|
}
|
||||||
|
|
||||||
|
fn draw(&self, stroke: &Stroke, from: usize) {
|
||||||
|
let points = &stroke.points[from.min(stroke.points.len())..];
|
||||||
|
if points.len() < 2 { return; }
|
||||||
|
unsafe { uu_annotation_polyline(self.handle, points.as_ptr(), (points.len() / 2) as libc::c_int, stroke.argb, stroke.width) };
|
||||||
|
}
|
||||||
|
|
||||||
|
fn repaint(&self, strokes: &[Stroke]) {
|
||||||
|
unsafe { uu_annotation_clear(self.handle) };
|
||||||
|
for stroke in strokes { self.draw(stroke, 0); }
|
||||||
|
self.flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn flush(&self) { unsafe { uu_annotation_flush(self.handle) } }
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for Overlay {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
unsafe { uu_annotation_close(self.handle) };
|
||||||
|
log::info!("Annotation overlay removed");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The capture region a screen id maps to: an X11 multi-screen monitor, else the whole root (0 size).
|
||||||
|
fn region(screen: Option<i32>) -> (i32, i32, i32, i32) {
|
||||||
|
if crate::wayland::x11_multiscreen() {
|
||||||
|
let id = screen.filter(|s| *s >= 0).map_or_else(crate::wayland::selected, |s| s as usize);
|
||||||
|
if let Some(o) = crate::wayland::source(id) { return (o.x, o.y, o.width as i32, o.height as i32); }
|
||||||
|
}
|
||||||
|
(0, 0, 0, 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Premultiplied ARGB for the 32-bit visual; a color without alpha is opaque.
|
||||||
|
pub fn argb(color: Option<u32>) -> u32 {
|
||||||
|
let c = color.unwrap_or(DEFAULT_COLOR);
|
||||||
|
let c = if c >> 24 == 0 { c | 0xFF00_0000 } else { c };
|
||||||
|
let a = c >> 24;
|
||||||
|
let mul = |shift: u32| (((c >> shift) & 0xFF) * a / 255) << shift;
|
||||||
|
a << 24 | mul(16) | mul(8) | mul(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Line width in overlay pixels: values up to 1 are a fraction of the height, larger ones pixels.
|
||||||
|
pub fn line_width(width: Option<f32>, height: i32) -> i32 {
|
||||||
|
match width {
|
||||||
|
Some(w) if w.is_finite() && w > 0.0 => (if w <= 1.0 { w * height as f32 } else { w }).round().clamp(1.0, 64.0) as i32,
|
||||||
|
_ => (height as f32 / 360.0).round().max(3.0) as i32,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn to_pixels(points: &[(f32, f32)], normalized: bool, width: i32, height: i32) -> Vec<i16> {
|
||||||
|
let mut out = Vec::with_capacity(points.len() * 2);
|
||||||
|
for &(x, y) in points {
|
||||||
|
let (x, y) = if normalized { (x * width as f32, y * height as f32) } else { (x, y) };
|
||||||
|
let clamp = |v: f32| if v.is_finite() { v.round().clamp(-16_000.0, 16_000.0) as i16 } else { 0 };
|
||||||
|
out.push(clamp(x));
|
||||||
|
out.push(clamp(y));
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The worker's state: one overlay at a time, owned by the peer that last toggled it on or drew.
|
||||||
|
#[derive(Default)]
|
||||||
|
struct Annotation { overlay: Option<Overlay>, strokes: Vec<Stroke>, owner: Owner, unavailable: bool, logged: usize }
|
||||||
|
|
||||||
|
impl Annotation {
|
||||||
|
fn close(&mut self) { self.overlay = None; self.strokes.clear(); }
|
||||||
|
|
||||||
|
/// A request from another peer: the newer viewer takes over and the old strokes go.
|
||||||
|
fn claim(&mut self, owner: Owner) {
|
||||||
|
if self.owner != owner { self.close(); self.owner = owner; self.unavailable = false; }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn open(&mut self, screen: Option<i32>) -> bool {
|
||||||
|
match Overlay::open(screen) {
|
||||||
|
Ok(o) => { self.overlay = Some(o); true }
|
||||||
|
Err(error) => { log::warn!("Annotation overlay unavailable: error={}", error); self.unavailable = true; false }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn stroke(&mut self, id: u32, points: Vec<(f32, f32)>, screen: Option<i32>, width: Option<f32>, color: Option<u32>) {
|
||||||
|
if self.overlay.as_ref().is_some_and(|o| o.region != region(screen)) { self.close(); }
|
||||||
|
// A stroke without a toggle (e.g. after a host restart) shows the overlay anyway, but only
|
||||||
|
// one attempt until the next toggle instead of one per batch.
|
||||||
|
if self.overlay.is_none() && (self.unavailable || !self.open(screen)) { return; }
|
||||||
|
if self.logged < 8 {
|
||||||
|
// Counts and presence only: the drawing itself is the viewer's content.
|
||||||
|
self.logged += 1;
|
||||||
|
let normalized = points.iter().all(|&(x, y)| x.abs() <= 1.5 && y.abs() <= 1.5);
|
||||||
|
log::info!("Annotation stroke batch: points={} normalized={} screen_set={} width_set={} color_set={}",
|
||||||
|
points.len(), normalized, screen.is_some(), width.is_some(), color.is_some());
|
||||||
|
}
|
||||||
|
let o = self.overlay.as_ref().unwrap();
|
||||||
|
match self.strokes.iter_mut().find(|s| s.id == id) {
|
||||||
|
Some(stroke) => {
|
||||||
|
let from = stroke.points.len().saturating_sub(2);
|
||||||
|
stroke.points.extend(to_pixels(&points, stroke.normalized, o.width, o.height));
|
||||||
|
stroke.raw.extend(points);
|
||||||
|
o.draw(stroke, from);
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
let mut stroke = Stroke::new(id, points, width, color);
|
||||||
|
stroke.layout(o.width, o.height);
|
||||||
|
o.draw(&stroke, 0);
|
||||||
|
self.strokes.push(stroke);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
o.flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The root was resized (RandR; on X11 the viewer's resolution choice does this): rebuild the
|
||||||
|
/// overlay at the new geometry and lay the strokes out again.
|
||||||
|
fn follow_resize(&mut self) {
|
||||||
|
let Some(screen) = self.overlay.take().map(|o| o.screen) else { return };
|
||||||
|
if !self.open(screen) { self.strokes.clear(); return; }
|
||||||
|
let o = self.overlay.as_ref().unwrap();
|
||||||
|
for stroke in &mut self.strokes { stroke.layout(o.width, o.height); }
|
||||||
|
o.repaint(&self.strokes);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn handle(&mut self, command: Command) {
|
||||||
|
match command {
|
||||||
|
Command::Toggle { owner, enable: true, reply } => {
|
||||||
|
self.claim(owner);
|
||||||
|
self.unavailable = false;
|
||||||
|
let code = if self.overlay.is_some() || self.open(None) { 0 } else { ERR_UNAVAILABLE };
|
||||||
|
let _ = reply.send(code);
|
||||||
|
}
|
||||||
|
Command::Toggle { owner, enable: false, reply } => {
|
||||||
|
if owner == self.owner { self.close(); }
|
||||||
|
let _ = reply.send(0);
|
||||||
|
}
|
||||||
|
Command::Reset(owner) => {
|
||||||
|
if owner != self.owner { return; }
|
||||||
|
if self.overlay.is_some() { log::info!("Annotation ended with the viewer session"); }
|
||||||
|
self.close();
|
||||||
|
self.unavailable = false;
|
||||||
|
}
|
||||||
|
Command::Clear { owner, all, id } => {
|
||||||
|
if owner != self.owner { return; }
|
||||||
|
if all { self.strokes.clear(); } else { self.strokes.retain(|s| s.id != id); }
|
||||||
|
if let Some(o) = &self.overlay { o.repaint(&self.strokes); }
|
||||||
|
}
|
||||||
|
Command::Stroke(owner, Request::Stroke { id, points, screen, width, color }) => {
|
||||||
|
self.claim(owner);
|
||||||
|
self.stroke(id, points, screen, width, color);
|
||||||
|
}
|
||||||
|
Command::Stroke(..) => {}
|
||||||
|
#[cfg(test)]
|
||||||
|
Command::Probe(reply) => {
|
||||||
|
let _ = reply.send(self.overlay.as_ref().map(|o| (self.owner, o.width, o.height, self.strokes.len())));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run(rx: mpsc::Receiver<Command>) {
|
||||||
|
let mut state = Annotation::default();
|
||||||
|
loop {
|
||||||
|
let wait = if state.overlay.is_some() { Duration::from_millis(50) } else { Duration::from_secs(3600) };
|
||||||
|
match rx.recv_timeout(wait) {
|
||||||
|
Ok(command) => state.handle(command),
|
||||||
|
Err(mpsc::RecvTimeoutError::Timeout) => {}
|
||||||
|
Err(mpsc::RecvTimeoutError::Disconnected) => return,
|
||||||
|
}
|
||||||
|
match state.overlay.as_ref().map_or(0, |o| unsafe { uu_annotation_poll(o.handle) }) {
|
||||||
|
2 => state.follow_resize(),
|
||||||
|
1 => if let Some(o) = &state.overlay { o.repaint(&state.strokes); },
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn float(field: u64, v: f32, out: &mut Vec<u8>) { varint(field << 3 | 5, out); out.extend_from_slice(&v.to_le_bytes()); }
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parses_toggle_stroke_and_clear() {
|
||||||
|
let mut toggle = Vec::new();
|
||||||
|
bytes(3, &[8, 1], &mut toggle);
|
||||||
|
assert_eq!(parse(&toggle), Some(Request::Toggle(true)));
|
||||||
|
let mut off = Vec::new();
|
||||||
|
bytes(3, &[], &mut off);
|
||||||
|
assert_eq!(parse(&off), Some(Request::Toggle(false)));
|
||||||
|
|
||||||
|
let mut point = Vec::new();
|
||||||
|
float(1, 0.25, &mut point);
|
||||||
|
float(2, 0.75, &mut point);
|
||||||
|
let mut stroke = vec![8, 7];
|
||||||
|
bytes(2, &point, &mut stroke);
|
||||||
|
bytes(2, &point, &mut stroke);
|
||||||
|
stroke.extend_from_slice(&[24, 0]);
|
||||||
|
float(4, 4.0, &mut stroke);
|
||||||
|
stroke.push(40);
|
||||||
|
varint(0xFF00_FF00, &mut stroke);
|
||||||
|
let mut request = Vec::new();
|
||||||
|
bytes(1, &stroke, &mut request);
|
||||||
|
assert_eq!(parse(&request), Some(Request::Stroke {
|
||||||
|
id: 7, points: vec![(0.25, 0.75), (0.25, 0.75)], screen: Some(0), width: Some(4.0), color: Some(0xFF00_FF00) }));
|
||||||
|
|
||||||
|
let mut clear = Vec::new();
|
||||||
|
bytes(2, &[8, 2, 16, 9], &mut clear);
|
||||||
|
assert_eq!(parse(&clear), Some(Request::Clear { all: false, id: 9 }));
|
||||||
|
let mut clear_all = Vec::new();
|
||||||
|
bytes(2, &[8, 1], &mut clear_all);
|
||||||
|
assert_eq!(parse(&clear_all), Some(Request::Clear { all: true, id: 0 }));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn response_echoes_header_in_field_23() {
|
||||||
|
let ok = encode_response(&[8, 5], SLOT_TOGGLE, 0);
|
||||||
|
assert_eq!(ok, vec![10, 2, 8, 5, 186, 1, 2, 26, 0]);
|
||||||
|
let failed = encode_response(&[], SLOT_STROKE, 1);
|
||||||
|
assert_eq!(failed, vec![10, 0, 186, 1, 4, 10, 2, 8, 1]);
|
||||||
|
let fields = decode_wire(&failed).unwrap();
|
||||||
|
assert_eq!(fields[1].number, 23);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn answers_only_draw_requests() {
|
||||||
|
let mut other = Vec::new();
|
||||||
|
bytes(1, &[8, 1], &mut other);
|
||||||
|
bytes(28, &[], &mut other);
|
||||||
|
assert!(draw_request(&decode_wire(&other).unwrap()).is_none());
|
||||||
|
let mut draw = Vec::new();
|
||||||
|
bytes(1, &[8, 5], &mut draw);
|
||||||
|
bytes(27, &[26, 2, 8, 1], &mut draw);
|
||||||
|
assert_eq!(draw_request(&decode_wire(&draw).unwrap()), Some((vec![8, 5], vec![26, 2, 8, 1])));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Needs a composited X display: DISPLAY=:0 cargo test -- --ignored annotation_overlay_smoke
|
||||||
|
/// On a disposable display, UU_ANNOTATION_SMOKE_RESIZE=1024x768 also resizes the root (xrandr --fb).
|
||||||
|
#[test]
|
||||||
|
#[ignore]
|
||||||
|
fn annotation_overlay_smoke() {
|
||||||
|
let wait = Duration::from_secs(5);
|
||||||
|
let toggle = |owner, enable| { let (reply, r) = mpsc::channel(); send(Command::Toggle { owner, enable, reply }); r.recv_timeout(wait).unwrap() };
|
||||||
|
let probe = || { let (reply, r) = mpsc::channel(); send(Command::Probe(reply)); r.recv_timeout(wait).unwrap() };
|
||||||
|
let stroke = |owner, id, points: &[(f32, f32)], width, color| send(Command::Stroke(owner, Request::Stroke {
|
||||||
|
id, points: points.to_vec(), screen: None, width, color }));
|
||||||
|
assert_eq!(toggle(1, true), 0);
|
||||||
|
let diagonal: Vec<(f32, f32)> = (0..=20).map(|i| (0.3 + i as f32 * 0.02, 0.3 + i as f32 * 0.01)).collect();
|
||||||
|
stroke(1, 1, &diagonal[..10], None, None);
|
||||||
|
stroke(1, 1, &diagonal[10..], None, None);
|
||||||
|
stroke(1, 2, &[(0.5, 0.6)], Some(30.0), Some(0x0000FF));
|
||||||
|
std::thread::sleep(Duration::from_secs(
|
||||||
|
std::env::var("UU_ANNOTATION_SMOKE_SECS").ok().and_then(|s| s.parse().ok()).unwrap_or(3)));
|
||||||
|
assert_eq!(probe().map(|p| (p.0, p.3)), Some((1, 2)));
|
||||||
|
if let Ok(size) = std::env::var("UU_ANNOTATION_SMOKE_RESIZE") {
|
||||||
|
// xrandr may report an error for an output larger than the new size yet still resize.
|
||||||
|
let _ = std::process::Command::new("xrandr").args(["--fb", &size]).status();
|
||||||
|
std::thread::sleep(Duration::from_millis(500));
|
||||||
|
let (w, h) = size.split_once('x').map(|(w, h)| (w.parse().unwrap(), h.parse().unwrap())).unwrap();
|
||||||
|
assert_eq!(probe().map(|p| (p.1, p.2, p.3)), Some((w, h, 2)), "overlay follows the {size} root");
|
||||||
|
}
|
||||||
|
// A newer viewer takes over; the replaced peer's delayed reset and toggle-off leave it alone.
|
||||||
|
assert_eq!(toggle(2, true), 0);
|
||||||
|
reset(1);
|
||||||
|
assert_eq!(toggle(1, false), 0);
|
||||||
|
assert_eq!(probe().map(|p| (p.0, p.3)), Some((2, 0)));
|
||||||
|
stroke(2, 1, &diagonal, None, None);
|
||||||
|
assert_eq!(probe().map(|p| (p.0, p.3)), Some((2, 1)));
|
||||||
|
reset(2);
|
||||||
|
assert_eq!(probe(), None);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn strokes_are_laid_out_again_after_a_resize() {
|
||||||
|
let mut dot = Stroke::new(1, vec![(0.5, 0.5)], None, None);
|
||||||
|
dot.layout(100, 200);
|
||||||
|
assert_eq!((dot.points.clone(), dot.width), (vec![50, 100, 50, 100], 3));
|
||||||
|
dot.layout(3840, 2160);
|
||||||
|
assert_eq!((dot.points.clone(), dot.width), (vec![1920, 1080, 1920, 1080], 6));
|
||||||
|
let mut pixels = Stroke::new(2, vec![(10.0, 20.0), (30.0, 40.0)], Some(8.0), None);
|
||||||
|
pixels.layout(100, 200);
|
||||||
|
assert_eq!((pixels.normalized, pixels.points.clone(), pixels.width), (false, vec![10, 20, 30, 40], 8));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn colors_widths_and_points() {
|
||||||
|
assert_eq!(argb(None), 0xFFFF_3B30);
|
||||||
|
assert_eq!(argb(Some(0x00FF00)), 0xFF00_FF00);
|
||||||
|
assert_eq!(argb(Some(0x80FF_0000)), 0x8080_0000);
|
||||||
|
assert_eq!(line_width(None, 2160), 6);
|
||||||
|
assert_eq!(line_width(None, 720), 3);
|
||||||
|
assert_eq!(line_width(Some(8.0), 2160), 8);
|
||||||
|
assert_eq!(line_width(Some(0.01), 2000), 20);
|
||||||
|
assert_eq!(to_pixels(&[(0.5, 1.0)], true, 3840, 2160), vec![1920, 2160]);
|
||||||
|
assert_eq!(to_pixels(&[(12.4, f32::NAN)], false, 3840, 2160), vec![12, 0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -78,6 +78,20 @@ extern "C" {
|
|||||||
fn uu_assist_ui_set(id: *const libc::c_char, code: *const libc::c_char, allowed: libc::c_int, verify: libc::c_int, refresh: libc::c_int, has_custom: libc::c_int);
|
fn uu_assist_ui_set(id: *const libc::c_char, code: *const libc::c_char, allowed: libc::c_int, verify: libc::c_int, refresh: libc::c_int, has_custom: libc::c_int);
|
||||||
fn uu_assist_ui_take_command(arg: *mut libc::c_char, len: libc::size_t) -> libc::c_int;
|
fn uu_assist_ui_take_command(arg: *mut libc::c_char, len: libc::size_t) -> libc::c_int;
|
||||||
fn uu_assist_ui_close();
|
fn uu_assist_ui_close();
|
||||||
|
fn uu_ui_set_problem(summary: *const libc::c_char, text: *const libc::c_char, notify: libc::c_int) -> libc::c_int;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A problem only the person at the desktop can fix: a red line in the host window (`None` clears it)
|
||||||
|
/// and, with `notify`, a desktop notification, or the host window opened when no notification daemon
|
||||||
|
/// answers. Returns whether the person was told now.
|
||||||
|
pub fn show_problem(summary: &str, text: Option<&str>, notify: bool) -> bool {
|
||||||
|
#[cfg(uu_gtk)] {
|
||||||
|
let summary = std::ffi::CString::new(summary).unwrap_or_default();
|
||||||
|
let text = text.map(|t| std::ffi::CString::new(t).unwrap_or_default());
|
||||||
|
let text = text.as_ref().map_or(std::ptr::null(), |t| t.as_ptr());
|
||||||
|
unsafe { uu_ui_set_problem(summary.as_ptr(), text, i32::from(notify)) >= 0 }
|
||||||
|
}
|
||||||
|
#[cfg(not(uu_gtk))] { let _ = (summary, text, notify); false }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// "243829726" -> "243 829 726", as the official client shows device IDs.
|
/// "243829726" -> "243 829 726", as the official client shows device IDs.
|
||||||
|
|||||||
+97
-7
@@ -1,7 +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.
|
||||||
//! Encoding runs in this process with the `inproc-av` feature (unless `UU_FFMPEG_ROOT` is set),
|
//! inproc-av uses libpulse/libopus directly; other builds and native failures use FFmpeg.
|
||||||
//! otherwise an FFmpeg child process does it.
|
|
||||||
//! 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.
|
||||||
|
|
||||||
@@ -57,11 +56,38 @@ 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(feature = "inproc-av")]
|
#[cfg(all(target_os = "linux", feature = "inproc-av"))]
|
||||||
if crate::inproc_encoder::selected() {
|
if !crate::inproc_encoder::disabled() {
|
||||||
let job = tokio::task::spawn_blocking({
|
let source = std::ffi::CString::new(source).map_err(|_| "Audio source contains NUL")?;
|
||||||
let (stop, source) = (stop.clone(), source.to_owned());
|
let worker_stop = stop.clone();
|
||||||
move || crate::inproc_encoder::run_audio(&source, tx, stop)
|
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));
|
return Ok((Stopper { stop, child: None }, job));
|
||||||
}
|
}
|
||||||
@@ -71,6 +97,37 @@ fn start(source: &str, tx: tokio::sync::mpsc::Sender<bytes::Bytes>)
|
|||||||
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)
|
||||||
}
|
}
|
||||||
@@ -149,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();
|
||||||
|
}
|
||||||
|
}
|
||||||
+113
-2
@@ -91,6 +91,48 @@ pub struct UUAuthClient {
|
|||||||
guest_id: Option<String>,
|
guest_id: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// QR failures are safe to display: never retain a URL, source error or response body.
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
|
pub enum QrRequestErrorKind { Timeout, Connect, Decode, Body, Request }
|
||||||
|
impl QrRequestErrorKind {
|
||||||
|
fn from_reqwest(error: &reqwest::Error) -> Self {
|
||||||
|
if error.is_timeout() { Self::Timeout }
|
||||||
|
else if error.is_connect() { Self::Connect }
|
||||||
|
else if error.is_decode() { Self::Decode }
|
||||||
|
else if error.is_body() { Self::Body }
|
||||||
|
else { Self::Request }
|
||||||
|
}
|
||||||
|
fn label(self) -> &'static str {
|
||||||
|
match self { Self::Timeout => "timeout", Self::Connect => "connect", Self::Decode => "decode",
|
||||||
|
Self::Body => "body", Self::Request => "request" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct QrRequestError {
|
||||||
|
pub kind: QrRequestErrorKind,
|
||||||
|
phase: &'static str,
|
||||||
|
elapsed_ms: u128,
|
||||||
|
http_status: Option<u16>,
|
||||||
|
}
|
||||||
|
impl std::fmt::Display for QrRequestError {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
write!(f, "phase={} kind={} elapsed_ms={} http_status={:?}",
|
||||||
|
self.phase, self.kind.label(), self.elapsed_ms, self.http_status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl QrRequestError {
|
||||||
|
pub fn response_received(&self) -> bool { self.http_status.is_some() }
|
||||||
|
fn new(kind: QrRequestErrorKind, phase: &'static str, started: std::time::Instant, http_status: Option<u16>) -> Self {
|
||||||
|
Self { kind, phase, elapsed_ms: started.elapsed().as_millis(), http_status }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
async fn send_qr_request(request: reqwest::RequestBuilder, started: std::time::Instant) -> Result<(u16, serde_json::Value), QrRequestError> {
|
||||||
|
let resp = request.send().await.map_err(|e| QrRequestError::new(QrRequestErrorKind::from_reqwest(&e), "send", started, None))?;
|
||||||
|
let status = resp.status().as_u16();
|
||||||
|
let value = resp.json().await.map_err(|e| QrRequestError::new(QrRequestErrorKind::from_reqwest(&e), "response", started, Some(status)))?;
|
||||||
|
Ok((status, value))
|
||||||
|
}
|
||||||
|
|
||||||
/// Transport failures name only the outer request; the cause (certificate, proxy, DNS,
|
/// Transport failures name only the outer request; the cause (certificate, proxy, DNS,
|
||||||
/// timeout) lives in the source chain. URL user-info (proxy credentials) and query
|
/// timeout) lives in the source chain. URL user-info (proxy credentials) and query
|
||||||
/// strings are removed before the chain is shown.
|
/// strings are removed before the chain is shown.
|
||||||
@@ -121,17 +163,20 @@ fn redact_urls(text: &str) -> String {
|
|||||||
out
|
out
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Cloud API clients ignore ambient HTTP/SOCKS proxy settings by default: a local
|
/// Cloud API and signaling clients ignore ambient HTTP/HTTPS proxy settings by default: a local
|
||||||
/// proxy that intercepts TLS breaks login and signaling. `UU_USE_PROXY=1` opts back
|
/// proxy that intercepts TLS breaks login and signaling. `UU_USE_PROXY=1` opts back
|
||||||
/// into reqwest's standard proxy environment handling.
|
/// into reqwest's standard proxy environment handling.
|
||||||
pub fn http_client_builder() -> reqwest::ClientBuilder {
|
pub fn http_client_builder() -> reqwest::ClientBuilder {
|
||||||
let builder = reqwest::Client::builder();
|
let builder = reqwest::Client::builder();
|
||||||
if std::env::var("UU_USE_PROXY").ok().as_deref().is_some_and(proxy_requested) {
|
if proxy_enabled() {
|
||||||
builder
|
builder
|
||||||
} else {
|
} else {
|
||||||
builder.no_proxy()
|
builder.no_proxy()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
pub(crate) fn proxy_enabled() -> bool {
|
||||||
|
std::env::var("UU_USE_PROXY").ok().as_deref().is_some_and(proxy_requested)
|
||||||
|
}
|
||||||
fn proxy_requested(value: &str) -> bool {
|
fn proxy_requested(value: &str) -> bool {
|
||||||
matches!(value.trim().to_ascii_lowercase().as_str(), "1" | "true" | "yes" | "on")
|
matches!(value.trim().to_ascii_lowercase().as_str(), "1" | "true" | "yes" | "on")
|
||||||
}
|
}
|
||||||
@@ -251,6 +296,17 @@ impl UUAuthClient {
|
|||||||
Ok((status, value))
|
Ok((status, value))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Signed POST with an optional JSON body (None = empty body, like Moya `requestPlain`) and an
|
||||||
|
/// explicit timeout. The official clients long-poll the QR status with a 60 s request timeout.
|
||||||
|
pub async fn post_with_timeout(&self, path: &str, body: Option<&serde_json::Value>, timeout: std::time::Duration) -> Result<(u16, serde_json::Value), QrRequestError> {
|
||||||
|
let started = std::time::Instant::now();
|
||||||
|
let body_str = body.map(serde_json::to_string).transpose()
|
||||||
|
.map_err(|_| QrRequestError::new(QrRequestErrorKind::Request, "encode", started, None))?.unwrap_or_default();
|
||||||
|
let request = self.http.post(format!("{}{}", BASE_URL, path)).timeout(timeout)
|
||||||
|
.headers(self.build_headers("POST", path, &body_str)).body(body_str);
|
||||||
|
send_qr_request(request, started).await
|
||||||
|
}
|
||||||
|
|
||||||
/// Signed JSON POST to another API host (the signature covers the path only).
|
/// Signed JSON POST to another API host (the signature covers the path only).
|
||||||
pub async fn post_json_url(&self, base: &str, path: &str, body: &serde_json::Value) -> Result<(u16, serde_json::Value), String> {
|
pub async fn post_json_url(&self, base: &str, path: &str, body: &serde_json::Value) -> Result<(u16, serde_json::Value), String> {
|
||||||
let body_str = serde_json::to_string(body).map_err(|e| e.to_string())?;
|
let body_str = serde_json::to_string(body).map_err(|e| e.to_string())?;
|
||||||
@@ -378,3 +434,58 @@ mod guest_tests {
|
|||||||
for value in ["", "0", "false", "no", "off", "2"] { assert!(!super::proxy_requested(value)); }
|
for value in ["", "0", "false", "no", "off", "2"] { assert!(!super::proxy_requested(value)); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod qr_request_tests {
|
||||||
|
use super::*;
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
|
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
||||||
|
|
||||||
|
// Synthetic, loopback-only responses: no account, device, proxy or live login API.
|
||||||
|
async fn response(reply: &'static [u8], stall: bool) -> QrRequestError {
|
||||||
|
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||||
|
let addr = listener.local_addr().unwrap();
|
||||||
|
let server = tokio::spawn(async move {
|
||||||
|
let (mut socket, _) = listener.accept().await.unwrap();
|
||||||
|
let mut request = [0u8; 4096];
|
||||||
|
let _ = socket.read(&mut request).await.unwrap();
|
||||||
|
socket.write_all(reply).await.unwrap();
|
||||||
|
if stall { std::future::pending::<()>().await; }
|
||||||
|
});
|
||||||
|
let request = reqwest::Client::builder().no_proxy().build().unwrap()
|
||||||
|
.post(format!("http://fixture-user:fixture-password@{addr}/fixture-path?token=fixture-ticket"))
|
||||||
|
.timeout(Duration::from_secs(2));
|
||||||
|
let error = send_qr_request(request, Instant::now()).await.unwrap_err();
|
||||||
|
server.abort();
|
||||||
|
let output = format!("{error} {error:?}");
|
||||||
|
for secret in ["fixture-user", "fixture-password", "fixture-path", "fixture-ticket", "fixture-body", "127.0.0.1", "http://"] {
|
||||||
|
assert!(!output.contains(secret));
|
||||||
|
}
|
||||||
|
error
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn qr_request_distinguishes_send_timeout_body_timeout_and_bad_json_without_secrets() {
|
||||||
|
let error = response(b"", true).await;
|
||||||
|
assert_eq!((error.kind, error.phase, error.http_status), (QrRequestErrorKind::Timeout, "send", None));
|
||||||
|
assert!(!error.response_received());
|
||||||
|
let error = response(b"HTTP/1.1 200 OK\r\nContent-Length: 100\r\n\r\n", true).await;
|
||||||
|
assert_eq!((error.kind, error.phase, error.http_status), (QrRequestErrorKind::Timeout, "response", Some(200)));
|
||||||
|
assert!(error.response_received());
|
||||||
|
let error = response(b"HTTP/1.1 502 Bad Gateway\r\nContent-Length: 12\r\n\r\nfixture-body", false).await;
|
||||||
|
assert_eq!((error.kind, error.phase, error.http_status), (QrRequestErrorKind::Decode, "response", Some(502)));
|
||||||
|
assert!(error.response_received());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn qr_connection_failure_is_not_a_timeout() {
|
||||||
|
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||||
|
let addr = listener.local_addr().unwrap();
|
||||||
|
drop(listener);
|
||||||
|
let request = reqwest::Client::builder().no_proxy().build().unwrap()
|
||||||
|
.post(format!("http://{addr}/fixture-ticket")).timeout(Duration::from_secs(2));
|
||||||
|
let error = send_qr_request(request, Instant::now()).await.unwrap_err();
|
||||||
|
assert_eq!((error.kind, error.phase, error.http_status), (QrRequestErrorKind::Connect, "send", None));
|
||||||
|
assert!(!format!("{error} {error:?}").contains("fixture-ticket"));
|
||||||
|
}
|
||||||
|
}
|
||||||
+4
-3
@@ -35,12 +35,13 @@ pub fn h264_device_capability(
|
|||||||
/// The payload sits under `data.device_capability` with `type` beside it. The earlier flat shape
|
/// The payload sits under `data.device_capability` with `type` beside it. The earlier flat shape
|
||||||
/// (`type` at the top, fields directly in `data`) was not recognised by the iPhone client, which
|
/// (`type` at the top, fields directly in `data`) was not recognised by the iPhone client, which
|
||||||
/// then kept quality and chroma locked at their defaults (#49). Only 8-bit and the chroma formats
|
/// then kept quality and chroma locked at their defaults (#49). Only 8-bit and the chroma formats
|
||||||
/// the encoder really produces are listed; the first entry carries the maximum size as officially.
|
/// the encoder really produces are listed, each with its maximum size: the official viewer treats a
|
||||||
|
/// 0x0 entry as unsupported (#77; the 4.37 host we copied had a GTX 660 without HEVC/4:4:4).
|
||||||
pub fn device_capability(client_id: &str, ice_id: &str, display_id: i32, fps: i32, codec_impl: i32, hevc: bool, full_chroma: bool) -> Value {
|
pub fn device_capability(client_id: &str, ice_id: &str, display_id: i32, fps: i32, codec_impl: i32, hevc: bool, full_chroma: bool) -> Value {
|
||||||
let mut codecs = Vec::new();
|
let mut codecs = Vec::new();
|
||||||
for codec in [VIDEO_CODEC_H264].into_iter().chain(hevc.then_some(2)) {
|
for codec in [VIDEO_CODEC_H264].into_iter().chain(hevc.then_some(2)) {
|
||||||
for chroma in [1].into_iter().chain(full_chroma.then_some(3)) {
|
for chroma in [1].into_iter().chain(full_chroma.then_some(3)) {
|
||||||
let (width, height) = if codecs.is_empty() { (3840, 2160) } else { (0, 0) };
|
let (width, height) = (3840, 2160);
|
||||||
codecs.push(json!({"video_codec": codec, "chroma_sampling": chroma, "codec_impl": codec_impl,
|
codecs.push(json!({"video_codec": codec, "chroma_sampling": chroma, "codec_impl": codec_impl,
|
||||||
"bit_depth": 8, "width": width, "height": height}));
|
"bit_depth": 8, "width": width, "height": height}));
|
||||||
}
|
}
|
||||||
@@ -86,7 +87,7 @@ mod tests {
|
|||||||
let caps = &payload["data"]["device_capability"]["video_codec_capability"];
|
let caps = &payload["data"]["device_capability"]["video_codec_capability"];
|
||||||
assert_eq!(caps.as_array().unwrap().len(), 4);
|
assert_eq!(caps.as_array().unwrap().len(), 4);
|
||||||
assert_eq!(caps[0], json!({"video_codec":1,"chroma_sampling":1,"codec_impl":5,"bit_depth":8,"width":3840,"height":2160}));
|
assert_eq!(caps[0], json!({"video_codec":1,"chroma_sampling":1,"codec_impl":5,"bit_depth":8,"width":3840,"height":2160}));
|
||||||
assert_eq!(caps[3], json!({"video_codec":2,"chroma_sampling":3,"codec_impl":5,"bit_depth":8,"width":0,"height":0}));
|
assert_eq!(caps[3], json!({"video_codec":2,"chroma_sampling":3,"codec_impl":5,"bit_depth":8,"width":3840,"height":2160}));
|
||||||
assert_eq!(payload["data"]["device_capability"]["display_info"][0]["hdr"], -1);
|
assert_eq!(payload["data"]["device_capability"]["display_info"][0]["hdr"], -1);
|
||||||
let h264_420 = device_capability("c", "i", 0, 60, 5, false, false);
|
let h264_420 = device_capability("c", "i", 0, 60, 5, false, false);
|
||||||
assert_eq!(h264_420["data"]["device_capability"]["video_codec_capability"].as_array().unwrap().len(), 1);
|
assert_eq!(h264_420["data"]["device_capability"]["video_codec_capability"].as_array().unwrap().len(), 1);
|
||||||
|
|||||||
+22
-5
@@ -46,14 +46,28 @@ unsafe fn x11_display_name() -> *const libc::c_char { b":0\0".as_ptr().cast() }
|
|||||||
|
|
||||||
/// The X11 root can be resized while the host runs (RandR, xrdp reconnects); the
|
/// The X11 root can be resized while the host runs (RandR, xrdp reconnects); the
|
||||||
/// geometry read at startup then makes x11grab reject every new connection.
|
/// geometry read at startup then makes x11grab reject every new connection.
|
||||||
pub fn x11_resized() -> bool {
|
/// Re-reads the root size; None when the X11 engine is not in use or the query fails.
|
||||||
|
pub fn x11_size() -> Option<(u32, u32)> {
|
||||||
match unsafe { x11_refresh_geometry() } {
|
match unsafe { x11_refresh_geometry() } {
|
||||||
1 => true,
|
0 | 1 => x11_last_size(),
|
||||||
0 => false,
|
-1 => None,
|
||||||
code => { log::warn!("X11 geometry query failed with code {code}"); false }
|
code => { log::warn!("X11 geometry query failed with code {code}"); None }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The root size from the last refresh, without an X round trip (pointer mapping).
|
||||||
|
/// Display the X11 engine opened, once a capture has initialized it.
|
||||||
|
pub fn x11_display() -> Option<String> {
|
||||||
|
let name = unsafe { x11_display_name() };
|
||||||
|
if name.is_null() { None } else { Some(unsafe { std::ffi::CStr::from_ptr(name) }.to_string_lossy().into_owned()) }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn x11_last_size() -> Option<(u32, u32)> {
|
||||||
|
let (mut w, mut h): (libc::c_int, libc::c_int) = (0, 0);
|
||||||
|
if unsafe { x11_get_dimensions(&mut w, &mut h) } != 0 || w <= 0 || h <= 0 { return None; }
|
||||||
|
Some((w as u32, h as u32))
|
||||||
|
}
|
||||||
|
|
||||||
pub struct ScreenCapture {
|
pub struct ScreenCapture {
|
||||||
pub backend: crate::desktop_backend::DesktopBackend,
|
pub backend: crate::desktop_backend::DesktopBackend,
|
||||||
pub init_error: Option<String>,
|
pub init_error: Option<String>,
|
||||||
@@ -68,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> {
|
||||||
@@ -165,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();
|
||||||
|
|||||||
+126
-20
@@ -45,8 +45,8 @@ pub struct VideoSettings {
|
|||||||
pub fps: u32,
|
pub fps: u32,
|
||||||
pub codec: VideoCodec,
|
pub codec: VideoCodec,
|
||||||
pub quality: u64,
|
pub quality: u64,
|
||||||
/// Viewer max_custom_bitrate (only used for QUALITY_CUSTOM): Mbit/s, or kbit/s above 1000.
|
/// Viewer max_custom_bitrate in bits/s (only used for QUALITY_CUSTOM).
|
||||||
pub custom_mbps: u32,
|
pub custom_bps: u32,
|
||||||
/// Scaled stream size (其他分辨率); None streams the native desktop size.
|
/// Scaled stream size (其他分辨率); None streams the native desktop size.
|
||||||
pub output: Option<(u32, u32)>,
|
pub output: Option<(u32, u32)>,
|
||||||
/// CHROMA_420 or CHROMA_444 (真彩); 4:4:4 only when the encoder pipeline supports it.
|
/// CHROMA_420 or CHROMA_444 (真彩); 4:4:4 only when the encoder pipeline supports it.
|
||||||
@@ -54,7 +54,7 @@ pub struct VideoSettings {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Default for VideoSettings {
|
impl Default for VideoSettings {
|
||||||
fn default() -> Self { let (source_id,source_generation)=crate::wayland::selection(); Self { source_id,source_generation, codec: VideoCodec::H264, fps: 60, quality: QUALITY_AUTO, custom_mbps: 0, output: None, chroma: CHROMA_420 } }
|
fn default() -> Self { let (source_id,source_generation)=crate::wayland::selection(); Self { source_id,source_generation, codec: VideoCodec::H264, fps: 60, quality: QUALITY_AUTO, custom_bps: 0, output: None, chroma: CHROMA_420 } }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Selectable smaller stream sizes with the desktop's aspect ratio (even dimensions).
|
/// Selectable smaller stream sizes with the desktop's aspect ratio (even dimensions).
|
||||||
@@ -86,8 +86,8 @@ impl VideoSettings {
|
|||||||
QUALITY_GENERAL => Some(2_000),
|
QUALITY_GENERAL => Some(2_000),
|
||||||
QUALITY_HD => Some(8_000),
|
QUALITY_HD => Some(8_000),
|
||||||
QUALITY_BLURAY => Some(20_000),
|
QUALITY_BLURAY => Some(20_000),
|
||||||
QUALITY_CUSTOM if self.custom_mbps > 0 =>
|
QUALITY_CUSTOM if self.custom_bps > 0 =>
|
||||||
Some(if self.custom_mbps > 1_000 { self.custom_mbps } else { self.custom_mbps * 1_000 }.min(100_000)),
|
Some((self.custom_bps / 1_000).clamp(1, 100_000)),
|
||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -112,6 +112,15 @@ fn fps_from_option(value: u64) -> Option<u64> {
|
|||||||
|
|
||||||
/// Applies a capture-setting RPC to `settings` and returns the RpcResponse payload (Message 22),
|
/// Applies a capture-setting RPC to `settings` and returns the RpcResponse payload (Message 22),
|
||||||
/// or None when the RPC is not a capture/fps/quality setting.
|
/// or None when the RPC is not a capture/fps/quality setting.
|
||||||
|
/// max_custom_bitrate (field 8) in bit/s: the mobile viewer sends 1_000_000 for 1 Mbps (#67). Values
|
||||||
|
/// that can only be a different unit stay usable instead of collapsing to a 1 kbit/s cap: below 1000
|
||||||
|
/// they are Mbit/s, below 200_000 kbit/s (no viewer offers custom rates under 200 kbit/s).
|
||||||
|
fn custom_bitrate_bps(value: u64) -> u32 {
|
||||||
|
let bps = if value < 1_000 { value * 1_000_000 } else if value < 200_000 { value * 1_000 } else { value };
|
||||||
|
bps.min(u64::from(u32::MAX)) as u32
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
pub fn handle_rpc(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, native: (u32, u32)) -> Option<Vec<u8>> {
|
pub fn handle_rpc(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, native: (u32, u32)) -> Option<Vec<u8>> {
|
||||||
handle_rpc_with_codecs(rpc, settings, native, true, false)
|
handle_rpc_with_codecs(rpc, settings, native, true, false)
|
||||||
}
|
}
|
||||||
@@ -120,20 +129,50 @@ pub fn handle_rpc(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, na
|
|||||||
/// lists H265 first in its offer) and a hardware encoder is selected. Software libx265 is about ten
|
/// lists H265 first in its offer) and a hardware encoder is selected. Software libx265 is about ten
|
||||||
/// times slower than libx264 (measured 15 vs 155 fps at 1080p on a 4-core ARM host, #59), so CPU
|
/// times slower than libx264 (measured 15 vs 155 fps at 1080p on a 4-core ARM host, #59), so CPU
|
||||||
/// hosts default to H.264. UU_VIDEO_CODEC=h264 / h265 overrides.
|
/// hosts default to H.264. UU_VIDEO_CODEC=h264 / h265 overrides.
|
||||||
pub fn preferred_codec(h264: bool, h265: bool) -> VideoCodec {
|
#[cfg(test)]
|
||||||
let forced = std::env::var("UU_VIDEO_CODEC").ok().map(|v| v.to_ascii_lowercase());
|
fn test_selection() -> crate::video_select::Selection {
|
||||||
pick_codec(h264, h265, forced.as_deref(), crate::video::Encoder::requested() != crate::video::Encoder::Cpu)
|
crate::video_select::resolve_pair(Some("auto"), None, Some("auto"), None, false, None)
|
||||||
}
|
}
|
||||||
fn pick_codec(h264: bool, h265: bool, forced: Option<&str>, hardware: bool) -> VideoCodec {
|
|
||||||
|
#[cfg(test)]
|
||||||
|
pub fn preferred_codec(h264: bool, h265: bool) -> VideoCodec {
|
||||||
|
preferred_codec_for(h264, h265, test_selection())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn preferred_codec_for(h264: bool, h265: bool, selection: crate::video_select::Selection) -> VideoCodec {
|
||||||
|
pick_codec(h264, h265, crate::video_select::codec_force(selection.codec_pref), crate::video_select::hardware(selection.encoder))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn pick_codec(h264: bool, h265: bool, forced: Option<&str>, hardware: bool) -> VideoCodec {
|
||||||
let wants_h265 = match forced { Some("h264") => false, Some("h265" | "hevc") => true, _ => hardware };
|
let wants_h265 = match forced { Some("h264") => false, Some("h265" | "hevc") => true, _ => hardware };
|
||||||
if h265 && (wants_h265 || !h264) { VideoCodec::H265 } else { VideoCodec::H264 }
|
if h265 && (wants_h265 || !h264) { VideoCodec::H265 } else { VideoCodec::H264 }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
pub fn handle_rpc_with_codecs(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, native: (u32, u32), h264: bool, h265: bool) -> Option<Vec<u8>> {
|
pub fn handle_rpc_with_codecs(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, native: (u32, u32), h264: bool, h265: bool) -> Option<Vec<u8>> {
|
||||||
apply_rpc(rpc, settings, native, h264, h265, crate::video::full_chroma_available())
|
handle_rpc_for(rpc, settings, native, h264, h265, test_selection())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn apply_rpc(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, native: (u32, u32), h264: bool, h265: bool, full_chroma: bool) -> Option<Vec<u8>> {
|
pub fn handle_rpc_for(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, native: (u32, u32), h264: bool, h265: bool, selection: crate::video_select::Selection) -> Option<Vec<u8>> {
|
||||||
|
apply_rpc(rpc, settings, native, h264, h265, crate::video::full_chroma_for(selection.encoder), crate::video_select::codec_force(selection.codec_pref))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The resolution a capture/resolution RPC asks for, parsed like apply_rpc: X11 hosts apply it
|
||||||
|
/// to the display mode itself (desktop_mode), as the official Windows host changes its resolution.
|
||||||
|
pub fn requested_resolution(rpc: &[WireField]) -> Option<crate::desktop_mode::Request> {
|
||||||
|
use crate::desktop_mode::Request;
|
||||||
|
if let Some(request) = message(rpc, 2) {
|
||||||
|
let fields = decode_wire(request).ok()?;
|
||||||
|
if number(&fields, 10) == Some(3) { return Some(Request::Native); }
|
||||||
|
let (w, h) = number(&fields, 16).zip(number(&fields, 17)).or_else(|| number(&fields, 5).zip(number(&fields, 6)))?;
|
||||||
|
Some(Request::Size(u32::try_from(w).ok()?, u32::try_from(h).ok()?))
|
||||||
|
} else if let Some(request) = message(rpc, 6) {
|
||||||
|
let fields = decode_wire(request).ok()?;
|
||||||
|
Some(Request::Size(u32::try_from(number(&fields, 1)?).ok()?, u32::try_from(number(&fields, 2)?).ok()?))
|
||||||
|
} else { None }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn apply_rpc(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, native: (u32, u32), _h264: bool, h265: bool, full_chroma: bool, forced: Option<&str>) -> Option<Vec<u8>> {
|
||||||
let header = message(rpc, 1).unwrap_or(&[]);
|
let header = message(rpc, 1).unwrap_or(&[]);
|
||||||
let mut next = *settings.borrow();
|
let mut next = *settings.borrow();
|
||||||
if let Some(request) = message(rpc, 2) {
|
if let Some(request) = message(rpc, 2) {
|
||||||
@@ -144,11 +183,13 @@ fn apply_rpc(rpc: &[WireField], settings: &watch::Sender<VideoSettings>, native:
|
|||||||
// codec_type 13 (1 H264, 2 H265): like the official host (negotiateCodec), the host picks the
|
// codec_type 13 (1 H264, 2 H265): like the official host (negotiateCodec), the host picks the
|
||||||
// codec from both capability lists; the Mac viewer sends its current codec (1 while receiving
|
// codec from both capability lists; the Mac viewer sends its current codec (1 while receiving
|
||||||
// H.264), so only an explicit H.265 request switches, never one absent from the m-line.
|
// H.264), so only an explicit H.265 request switches, never one absent from the m-line.
|
||||||
if number(&fields, 13) == Some(2) && h265 { next.codec = VideoCodec::H265; }
|
// A forced codec (host_settings video_codec or UU_VIDEO_CODEC) wins over that switch, same
|
||||||
|
// rule as pick_codec at stream start: h264 stays H.264; auto/h265 still follow the request.
|
||||||
|
if number(&fields, 13) == Some(2) && h265 && forced != Some("h264") { next.codec = VideoCodec::H265; }
|
||||||
// Field 1 is the viewer's fps option index (1 = 30, 2 = 60, ...); 18 fpsCount is the frame rate.
|
// Field 1 is the viewer's fps option index (1 = 30, 2 = 60, ...); 18 fpsCount is the frame rate.
|
||||||
if let Some(fps) = number(&fields, 18).filter(|v| *v > 0).or_else(|| number(&fields, 1).and_then(fps_from_option)) { next.fps = fps as u32; }
|
if let Some(fps) = number(&fields, 18).filter(|v| *v > 0).or_else(|| number(&fields, 1).and_then(fps_from_option)) { next.fps = fps as u32; }
|
||||||
if let Some(quality) = number(&fields, 2).filter(|v| *v > 0) { next.quality = quality; }
|
if let Some(quality) = number(&fields, 2).filter(|v| *v > 0) { next.quality = quality; }
|
||||||
if let Some(bitrate) = number(&fields, 8).filter(|v| *v > 0) { next.custom_mbps = bitrate as u32; }
|
if let Some(bitrate) = number(&fields, 8).filter(|v| *v > 0) { next.custom_bps = custom_bitrate_bps(bitrate); }
|
||||||
// Field 7 chorma_format (sic): 3 = 4:4:4 when 真彩 is on, 1 = 4:2:0. The Sync reports what is encoded.
|
// Field 7 chorma_format (sic): 3 = 4:4:4 when 真彩 is on, 1 = 4:2:0. The Sync reports what is encoded.
|
||||||
match number(&fields, 7) {
|
match number(&fields, 7) {
|
||||||
Some(CHROMA_444) if full_chroma => next.chroma = CHROMA_444,
|
Some(CHROMA_444) if full_chroma => next.chroma = CHROMA_444,
|
||||||
@@ -237,7 +278,7 @@ pub fn sync_payload(settings: &VideoSettings, native: (u32, u32)) -> Vec<u8> {
|
|||||||
put_varint(1, u64::from(settings.fps), &mut out);
|
put_varint(1, u64::from(settings.fps), &mut out);
|
||||||
put_varint(2, settings.quality, &mut out);
|
put_varint(2, settings.quality, &mut out);
|
||||||
put_varint(3, settings.chroma, &mut out);
|
put_varint(3, settings.chroma, &mut out);
|
||||||
if settings.custom_mbps > 0 { put_varint(4, u64::from(settings.custom_mbps), &mut out); }
|
if settings.custom_bps > 0 { put_varint(4, u64::from(settings.custom_bps), &mut out); }
|
||||||
put_varint(5, u64::from(size.0), &mut out);
|
put_varint(5, u64::from(size.0), &mut out);
|
||||||
put_varint(6, u64::from(size.1), &mut out);
|
put_varint(6, u64::from(size.1), &mut out);
|
||||||
put_varint(9, u64::from(size.0), &mut out);
|
put_varint(9, u64::from(size.0), &mut out);
|
||||||
@@ -284,7 +325,7 @@ mod tests {
|
|||||||
put_varint(18, 30, &mut body);
|
put_varint(18, 30, &mut body);
|
||||||
let request = rpc(77, 2, &body);
|
let request = rpc(77, 2, &body);
|
||||||
let response = handle_rpc(&decode_wire(&request).unwrap(), &tx, (1920, 1080)).unwrap();
|
let response = handle_rpc(&decode_wire(&request).unwrap(), &tx, (1920, 1080)).unwrap();
|
||||||
assert_eq!(*rx.borrow(), VideoSettings { source_id:0,source_generation:0, codec: VideoCodec::H264, fps: 30, quality: QUALITY_GENERAL, custom_mbps: 0, output: None, chroma: CHROMA_420 });
|
assert_eq!(*rx.borrow(), VideoSettings { source_id:0,source_generation:0, codec: VideoCodec::H264, fps: 30, quality: QUALITY_GENERAL, custom_bps: 0, output: None, chroma: CHROMA_420 });
|
||||||
assert_eq!(rx.borrow().max_kbps(), Some(2_000));
|
assert_eq!(rx.borrow().max_kbps(), Some(2_000));
|
||||||
let fields = decode_wire(&response).unwrap();
|
let fields = decode_wire(&response).unwrap();
|
||||||
assert_eq!(message(&fields, 1), Some(&[8u8, 77][..]));
|
assert_eq!(message(&fields, 1), Some(&[8u8, 77][..]));
|
||||||
@@ -310,12 +351,12 @@ mod tests {
|
|||||||
let (tx, rx) = watch::channel(VideoSettings::default());
|
let (tx, rx) = watch::channel(VideoSettings::default());
|
||||||
// Observed Mac viewer request with 真彩 on: field 7 = 3.
|
// Observed Mac viewer request with 真彩 on: field 7 = 3.
|
||||||
let request = rpc(5, 2, &[8, 2, 16, 4, 56, 3, 144, 1, 60]);
|
let request = rpc(5, 2, &[8, 2, 16, 4, 56, 3, 144, 1, 60]);
|
||||||
apply_rpc(&decode_wire(&request).unwrap(), &tx, (1920, 1080), true, false, false).unwrap();
|
apply_rpc(&decode_wire(&request).unwrap(), &tx, (1920, 1080), true, false, false, None).unwrap();
|
||||||
assert_eq!(rx.borrow().chroma, CHROMA_420);
|
assert_eq!(rx.borrow().chroma, CHROMA_420);
|
||||||
apply_rpc(&decode_wire(&request).unwrap(), &tx, (1920, 1080), true, false, true).unwrap();
|
apply_rpc(&decode_wire(&request).unwrap(), &tx, (1920, 1080), true, false, true, None).unwrap();
|
||||||
assert_eq!(rx.borrow().chroma, CHROMA_444);
|
assert_eq!(rx.borrow().chroma, CHROMA_444);
|
||||||
assert_eq!(number(&decode_wire(&sync_payload(&rx.borrow(), (1920, 1080))).unwrap(), 3), Some(CHROMA_444));
|
assert_eq!(number(&decode_wire(&sync_payload(&rx.borrow(), (1920, 1080))).unwrap(), 3), Some(CHROMA_444));
|
||||||
apply_rpc(&decode_wire(&rpc(6, 2, &[56, 1])).unwrap(), &tx, (1920, 1080), true, false, true).unwrap();
|
apply_rpc(&decode_wire(&rpc(6, 2, &[56, 1])).unwrap(), &tx, (1920, 1080), true, false, true, None).unwrap();
|
||||||
assert_eq!(rx.borrow().chroma, CHROMA_420);
|
assert_eq!(rx.borrow().chroma, CHROMA_420);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -468,8 +509,40 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn auto_quality_keeps_constant_quality_encoding() {
|
fn auto_quality_keeps_constant_quality_encoding() {
|
||||||
assert_eq!(VideoSettings::default().max_kbps(), None);
|
assert_eq!(VideoSettings::default().max_kbps(), None);
|
||||||
assert_eq!(VideoSettings { quality: QUALITY_CUSTOM, custom_mbps: 0, ..Default::default() }.max_kbps(), None);
|
assert_eq!(VideoSettings { quality: QUALITY_CUSTOM, custom_bps: 0, ..Default::default() }.max_kbps(), None);
|
||||||
assert_eq!(VideoSettings { quality: QUALITY_CUSTOM, custom_mbps: 12, ..Default::default() }.max_kbps(), Some(12_000));
|
assert_eq!(VideoSettings { quality: QUALITY_CUSTOM, custom_bps: 12_000_000, ..Default::default() }.max_kbps(), Some(12_000));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn mobile_custom_bitrate_is_bits_per_second_in_request_and_sync() {
|
||||||
|
// Mobile viewer sends field 8 = 1_000_000 for 1 Mbps (observed live, 2026-10-20).
|
||||||
|
for (bps, kbps) in [(1_000_000, 1_000), (30_000_000, 30_000), (500_000, 500), (100_000_000, 100_000), (200_000_000, 100_000)] {
|
||||||
|
let (tx, rx) = watch::channel(VideoSettings::default());
|
||||||
|
let mut body = Vec::new();
|
||||||
|
put_varint(2, QUALITY_CUSTOM, &mut body);
|
||||||
|
put_varint(8, bps, &mut body);
|
||||||
|
handle_rpc(&decode_wire(&rpc(7, 2, &body)).unwrap(), &tx, (1920, 1080)).unwrap();
|
||||||
|
assert_eq!(rx.borrow().max_kbps(), Some(kbps));
|
||||||
|
let sync = sync_payload(&rx.borrow(), (1920, 1080));
|
||||||
|
assert_eq!(number(&decode_wire(&sync).unwrap(), 4), Some(bps));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn small_custom_bitrates_are_read_as_larger_units() {
|
||||||
|
assert_eq!(custom_bitrate_bps(20), 20_000_000);
|
||||||
|
assert_eq!(custom_bitrate_bps(8_000), 8_000_000);
|
||||||
|
assert_eq!(custom_bitrate_bps(1_000_000), 1_000_000);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn oversized_custom_bitrate_does_not_wrap_before_encoder_limit() {
|
||||||
|
let (tx, rx) = watch::channel(VideoSettings::default());
|
||||||
|
let mut body = Vec::new();
|
||||||
|
put_varint(2, QUALITY_CUSTOM, &mut body);
|
||||||
|
put_varint(8, u64::from(u32::MAX) + 1, &mut body);
|
||||||
|
handle_rpc(&decode_wire(&rpc(8, 2, &body)).unwrap(), &tx, (1920, 1080)).unwrap();
|
||||||
|
assert_eq!(rx.borrow().max_kbps(), Some(100_000));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -515,6 +588,39 @@ mod codec_tests {
|
|||||||
assert_eq!(pick_codec(false, true, None, false), VideoCodec::H265);
|
assert_eq!(pick_codec(false, true, None, false), VideoCodec::H265);
|
||||||
assert_eq!(pick_codec(true, false, Some("h265"), true), VideoCodec::H264);
|
assert_eq!(pick_codec(true, false, Some("h265"), true), VideoCodec::H264);
|
||||||
}
|
}
|
||||||
|
#[test]
|
||||||
|
fn forced_h264_ignores_later_h265_capture_request() {
|
||||||
|
let (tx, rx) = watch::channel(VideoSettings::default());
|
||||||
|
// Field 13 = 2 on a peer that negotiated both codecs.
|
||||||
|
let request = decode_wire(&[18, 2, 104, 2]).unwrap();
|
||||||
|
apply_rpc(&request, &tx, (1920, 1080), true, true, false, Some("h264")).unwrap();
|
||||||
|
assert_eq!(rx.borrow().codec, VideoCodec::H264);
|
||||||
|
apply_rpc(&request, &tx, (1920, 1080), true, true, false, None).unwrap();
|
||||||
|
assert_eq!(rx.borrow().codec, VideoCodec::H265);
|
||||||
|
let (tx, rx) = watch::channel(VideoSettings::default());
|
||||||
|
apply_rpc(&request, &tx, (1920, 1080), true, true, false, Some("h265")).unwrap();
|
||||||
|
assert_eq!(rx.borrow().codec, VideoCodec::H265);
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn true_color_keeps_codec_and_vaapi_reports_420() {
|
||||||
|
// Field 7 = 3 (真彩). full_chroma false is the VAAPI 4:2:0 drop; true encodes 4:4:4.
|
||||||
|
let request = decode_wire(&[18, 2, 56, 3]).unwrap();
|
||||||
|
let (tx, rx) = watch::channel(VideoSettings { codec: VideoCodec::H265, ..Default::default() });
|
||||||
|
apply_rpc(&request, &tx, (1920, 1080), true, true, true, None).unwrap();
|
||||||
|
assert_eq!((rx.borrow().chroma, rx.borrow().codec), (CHROMA_444, VideoCodec::H265));
|
||||||
|
// NVENC session (full chroma) that already chose H.265 stays H.265 when 真彩 is requested.
|
||||||
|
let nvenc = crate::video_select::resolve_pair(None, None, None, None, true, None);
|
||||||
|
assert_eq!(nvenc.encoder, crate::video::Encoder::Nvenc);
|
||||||
|
let (tx, rx) = watch::channel(VideoSettings { codec: preferred_codec_for(true, true, nvenc), ..VideoSettings::default() });
|
||||||
|
assert_eq!(rx.borrow().codec, VideoCodec::H265);
|
||||||
|
handle_rpc_for(&request, &tx, (1920, 1080), true, true, nvenc).unwrap();
|
||||||
|
assert_eq!((rx.borrow().chroma, rx.borrow().codec), (CHROMA_444, VideoCodec::H265));
|
||||||
|
let (tx, rx) = watch::channel(VideoSettings { codec: VideoCodec::H265, ..Default::default() });
|
||||||
|
apply_rpc(&request, &tx, (1920, 1080), true, true, false, None).unwrap();
|
||||||
|
assert_eq!((rx.borrow().chroma, rx.borrow().codec), (CHROMA_420, VideoCodec::H265));
|
||||||
|
assert_eq!(number(&decode_wire(&sync_payload(&rx.borrow(), (1920, 1080))).unwrap(), 3), Some(CHROMA_420));
|
||||||
|
assert!(decode_wire(&sync_payload(&rx.borrow(), (1920, 1080))).unwrap().iter().all(|f| f.number != 13));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
|||||||
+10
-2
@@ -17,6 +17,9 @@ impl TextFormat {
|
|||||||
}
|
}
|
||||||
fn id(self)->u64{match self{Self::Windows=>UNICODE_TEXT,Self::Mac=>0}}
|
fn id(self)->u64{match self{Self::Windows=>UNICODE_TEXT,Self::Mac=>0}}
|
||||||
fn name(self)->&'static str{match self{Self::Windows=>"CF_UNICODETEXT",Self::Mac=>MAC_TEXT}}
|
fn name(self)->&'static str{match self{Self::Windows=>"CF_UNICODETEXT",Self::Mac=>MAC_TEXT}}
|
||||||
|
/// Name in a format-list offer. Official Windows peers name predefined formats `predefined_<id>`; a plain
|
||||||
|
/// `CF_UNICODETEXT` makes the Windows viewer register a custom format instead of id 13 (issue #151).
|
||||||
|
fn offer_name(self)->&'static str{match self{Self::Windows=>WINDOWS_OFFER_NAME,Self::Mac=>MAC_TEXT}}
|
||||||
fn encode(self,text:&str)->Vec<u8>{match self{Self::Windows=>encode_windows(text),Self::Mac=>text.as_bytes().to_vec()}}
|
fn encode(self,text:&str)->Vec<u8>{match self{Self::Windows=>encode_windows(text),Self::Mac=>text.as_bytes().to_vec()}}
|
||||||
fn decode(self,data:&[u8])->Result<String,&'static str>{
|
fn decode(self,data:&[u8])->Result<String,&'static str>{
|
||||||
match self{
|
match self{
|
||||||
@@ -31,6 +34,7 @@ impl TextFormat {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
const WINDOWS_OFFER_NAME:&str="predefined_13";
|
||||||
const BLOCK_BYTES:usize=0x20000;
|
const BLOCK_BYTES:usize=0x20000;
|
||||||
const MAX_BYTES:usize=MAX_TEXT*2+2;
|
const MAX_BYTES:usize=MAX_TEXT*2+2;
|
||||||
pub struct ResultMessages {pub messages:Vec<(u32,Vec<u8>)>,pub text:Option<String>}
|
pub struct ResultMessages {pub messages:Vec<(u32,Vec<u8>)>,pub text:Option<String>}
|
||||||
@@ -96,7 +100,7 @@ impl State{
|
|||||||
if text.contains('\0')||encode_windows(&text).len()>MAX_BYTES{return Err("clipboard encoded text exceeds limit");}
|
if text.contains('\0')||encode_windows(&text).len()>MAX_BYTES{return Err("clipboard encoded text exceeds limit");}
|
||||||
self.local=Some(text);
|
self.local=Some(text);
|
||||||
let mut list=Vec::new();
|
let mut list=Vec::new();
|
||||||
for kind in formats {let mut format=Vec::new();int(1,kind.id(),&mut format);string(2,kind.name(),&mut format);nested(1,&format,&mut list);}
|
for kind in formats {let mut format=Vec::new();int(1,kind.id(),&mut format);string(2,kind.offer_name(),&mut format);nested(1,&format,&mut list);}
|
||||||
Ok(request(id,1,&list))
|
Ok(request(id,1,&list))
|
||||||
}
|
}
|
||||||
pub fn request(&mut self,rpc:&[u8],next:&mut impl FnMut()->u64)->Result<ResultMessages,&'static str>{
|
pub fn request(&mut self,rpc:&[u8],next:&mut impl FnMut()->u64)->Result<ResultMessages,&'static str>{
|
||||||
@@ -210,7 +214,11 @@ mod tests{
|
|||||||
let data=bytes(bytes(bytes(&out.messages[1].1,9).unwrap().unwrap(),3).unwrap().unwrap(),3).unwrap().unwrap();
|
let data=bytes(bytes(bytes(&out.messages[1].1,9).unwrap().unwrap(),3).unwrap().unwrap(),3).unwrap().unwrap();
|
||||||
assert_eq!(data,b"hi");
|
assert_eq!(data,b"hi");
|
||||||
// Host-side offers are unchanged: CF_UNICODETEXT only.
|
// Host-side offers are unchanged: CF_UNICODETEXT only.
|
||||||
assert_eq!(format_ids(&State::default().offer(1,"hi".into()).unwrap()),vec![13]);
|
let host_offer=State::default().offer(1,"hi".into()).unwrap();
|
||||||
|
assert_eq!(format_ids(&host_offer),vec![13]);
|
||||||
|
let list=bytes(bytes(&host_offer,9).unwrap().unwrap(),1).unwrap().unwrap();
|
||||||
|
let format=bytes(list,1).unwrap().unwrap();
|
||||||
|
assert_eq!(text_field(format,2),Ok(WINDOWS_OFFER_NAME));
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
fn desktop_clipboard_negotiates_and_buffers_unicode_until_confirmation(){
|
fn desktop_clipboard_negotiates_and_buffers_unicode_until_confirmation(){
|
||||||
|
|||||||
@@ -5,6 +5,13 @@
|
|||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::sync::OnceLock;
|
use std::sync::OnceLock;
|
||||||
|
|
||||||
|
/// Tests that point UU_CONFIG at a temp file must take this, or they race.
|
||||||
|
#[cfg(test)]
|
||||||
|
pub(crate) fn test_env_lock() -> &'static std::sync::Mutex<()> {
|
||||||
|
static LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(());
|
||||||
|
&LOCK
|
||||||
|
}
|
||||||
|
|
||||||
pub fn path() -> PathBuf {
|
pub fn path() -> PathBuf {
|
||||||
if let Some(p) = std::env::var_os("UU_CONFIG") { return PathBuf::from(p); }
|
if let Some(p) = std::env::var_os("UU_CONFIG") { return PathBuf::from(p); }
|
||||||
let base = std::env::var_os("XDG_CONFIG_HOME").map(PathBuf::from)
|
let base = std::env::var_os("XDG_CONFIG_HOME").map(PathBuf::from)
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -70,6 +70,16 @@ impl DamageCapture {
|
|||||||
|
|
||||||
pub fn size(&self) -> (u32, u32) { (self.width as u32, self.height as u32) }
|
pub fn size(&self) -> (u32, u32) { (self.width as u32, self.height as u32) }
|
||||||
|
|
||||||
|
pub fn shm_raw_ptr(&self) -> *mut u8 { self.shm_ptr }
|
||||||
|
|
||||||
|
pub fn shm_size(&self) -> usize { self.len }
|
||||||
|
|
||||||
|
pub fn refresh(&mut self) -> Result<(), String> {
|
||||||
|
self.conn.shm_get_image(self.root, 0, 0, self.width, self.height, !0, Z_PIXMAP, self.seg, 0)
|
||||||
|
.map_err(text)?.reply().map_err(text)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
/// Waits up to `timeout` for the screen to change. Returns `true` on change, `false` on timeout.
|
/// Waits up to `timeout` for the screen to change. Returns `true` on change, `false` on timeout.
|
||||||
pub fn wait(&mut self, timeout: Duration) -> Result<bool, String> {
|
pub fn wait(&mut self, timeout: Duration) -> Result<bool, String> {
|
||||||
let deadline = Instant::now() + timeout;
|
let deadline = Instant::now() + timeout;
|
||||||
|
|||||||
@@ -79,6 +79,107 @@ fn mapping(kind: u8, payload: &[u8]) -> Vec<u8> {
|
|||||||
crate::initialization::envelope(1, 0, 27, &frame)
|
crate::initialization::envelope(1, 0, 27, &frame)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn privacy_replies_wait_for_each_peers_text_channel() {
|
||||||
|
tokio::time::timeout(Duration::from_secs(25), async {
|
||||||
|
let mut peers = Vec::new();
|
||||||
|
for request_id in [41, 51] {
|
||||||
|
let (host, mut viewer) = connect(Arc::new(InputInjector::without_desktop()), false, None,
|
||||||
|
&["CONTROL_DATA_CHANNEL"]).await;
|
||||||
|
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 13).await;
|
||||||
|
for (id, case, payload) in [(request_id, 25, &[][..]), (request_id + 1, 7, &[8, 1, 16, 3][..])] {
|
||||||
|
let mut rpc = bytes(1, &[8, id]);
|
||||||
|
rpc.extend(bytes(case, payload));
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(1, 0, 21, &rpc)).await;
|
||||||
|
}
|
||||||
|
// A synthetic host rejects privacy without touching a physical desktop.
|
||||||
|
// Echo is a dispatch barrier: both replies are queued before TEXT exists.
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(2, 0, 3, &[8, 0])).await;
|
||||||
|
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 3).await;
|
||||||
|
peers.push((request_id, host, viewer));
|
||||||
|
}
|
||||||
|
for (request_id, host, mut viewer) in peers {
|
||||||
|
let text = viewer.pc.create_data_channel("TEXT_DATA_CHANNEL", None).await.unwrap();
|
||||||
|
let (tx, messages) = mpsc::unbounded_channel();
|
||||||
|
text.on_message(Box::new(move |message| {
|
||||||
|
let _ = tx.send(("TEXT_DATA_CHANNEL".into(), message.data.to_vec()));
|
||||||
|
Box::pin(async {})
|
||||||
|
}));
|
||||||
|
viewer.messages = messages;
|
||||||
|
let mut replies = Vec::new();
|
||||||
|
let mut metrics_seen = false;
|
||||||
|
while replies.len() < 2 || !metrics_seen {
|
||||||
|
let (channel, message) = tokio::time::timeout(Duration::from_secs(5), viewer.messages.recv()).await
|
||||||
|
.expect("late TEXT delivery timed out").expect("peer stopped responding");
|
||||||
|
assert_eq!(channel, "TEXT_DATA_CHANNEL");
|
||||||
|
if let Some(metrics) = body(&message, 13) {
|
||||||
|
assert_eq!(body(metrics, 1), Some([1, 2].as_slice()));
|
||||||
|
metrics_seen = true;
|
||||||
|
}
|
||||||
|
if body(&message, 22).is_some() { replies.push(message); }
|
||||||
|
}
|
||||||
|
for ((id, case), message) in [(request_id, 21), (request_id + 1, 3)].into_iter().zip(replies) {
|
||||||
|
let rpc = body(&message, 22).unwrap();
|
||||||
|
assert_eq!(body(rpc, 1), Some([8, id].as_slice()));
|
||||||
|
let response = body(rpc, case).expect("wrong RPC response case");
|
||||||
|
if case == 3 {
|
||||||
|
assert!(decode_wire(response).unwrap().iter().any(|f| f.number == 1 && f.value == WireValue::Varint(1)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
host.pc.close().await.unwrap();
|
||||||
|
viewer.pc.close().await.unwrap();
|
||||||
|
viewer.router.lock().await.stop().await.unwrap();
|
||||||
|
}
|
||||||
|
}).await.expect("privacy TEXT routing regression exceeded deadline");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn ready_portal_control_input_is_forwarded_while_locked() {
|
||||||
|
tokio::time::timeout(Duration::from_secs(20), async {
|
||||||
|
let input = Arc::new(InputInjector::without_desktop());
|
||||||
|
let mut screen = ScreenCapture::unavailable("synthetic ready desktop".into());
|
||||||
|
screen.backend = crate::desktop_backend::DesktopBackend::Portal;
|
||||||
|
screen.init_error = None;
|
||||||
|
let (lock, locked) = tokio::sync::watch::channel(Some(true));
|
||||||
|
let portal = Arc::new(crate::desktop_session::PortalDesktop::with_lock_state(Arc::new(screen), locked));
|
||||||
|
let (host, mut viewer) = connect(input.clone(), true, Some(portal.clone()), &["CONTROL_DATA_CHANNEL"]).await;
|
||||||
|
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 13).await;
|
||||||
|
for (index, state) in [Some(true), None].into_iter().enumerate() {
|
||||||
|
lock.send(state).unwrap();
|
||||||
|
let before = input.portal_input_counts_for_test();
|
||||||
|
for message in [
|
||||||
|
br#"{"action":"kbd_press","key":65}"#.as_slice(),
|
||||||
|
br#"{"action":"kbd_release","key":65}"#.as_slice(),
|
||||||
|
br#"{"action":"mouse_press","button":1}"#.as_slice(),
|
||||||
|
br#"{"action":"mouse_release","button":1}"#.as_slice(),
|
||||||
|
] {
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", message.to_vec()).await;
|
||||||
|
}
|
||||||
|
let sequence = 310 + index as u64;
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(sequence, 0, 3, &[8, 0])).await;
|
||||||
|
loop {
|
||||||
|
let response = receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 3).await;
|
||||||
|
let args: serde_json::Value = serde_json::from_slice(body(body(&response, 3).unwrap(), 2).unwrap()).unwrap();
|
||||||
|
if args["seq"] == sequence { break; }
|
||||||
|
}
|
||||||
|
let after = input.portal_input_counts_for_test();
|
||||||
|
assert_eq!(after[2] - before[2], 2, "keyboard dropped for lock state {state:?}");
|
||||||
|
assert_eq!(after[1] - before[1], 2, "mouse buttons dropped for lock state {state:?}");
|
||||||
|
}
|
||||||
|
let before = input.portal_input_counts_for_test();
|
||||||
|
let mut unavailable = ScreenCapture::unavailable("synthetic closed source".into());
|
||||||
|
unavailable.backend = crate::desktop_backend::DesktopBackend::Portal;
|
||||||
|
portal.publish_test_screen(Arc::new(unavailable));
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", br#"{"action":"kbd_click","key":65}"#.to_vec()).await;
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(320, 0, 3, &[8, 0])).await;
|
||||||
|
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 3).await;
|
||||||
|
assert_eq!(input.portal_input_counts_for_test(), before, "unavailable source accepted input");
|
||||||
|
host.pc.close().await.unwrap();
|
||||||
|
viewer.pc.close().await.unwrap();
|
||||||
|
viewer.router.lock().await.stop().await.unwrap();
|
||||||
|
}).await.expect("locked CONTROL input regression exceeded deadline");
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn closing_unnegotiated_peers_releases_callback_state() {
|
async fn closing_unnegotiated_peers_releases_callback_state() {
|
||||||
for desktop in [false, true] {
|
for desktop in [false, true] {
|
||||||
@@ -215,3 +316,56 @@ async fn locked_control_unlock_requests_and_tools_work_without_a_video_frame() {
|
|||||||
drop(lock);
|
drop(lock);
|
||||||
}).await.expect("locked bootstrap/tool regression exceeded deadline");
|
}).await.expect("locked bootstrap/tool regression exceeded deadline");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn capture_desktop_on_a_port_mapping_peer_promotes_it_once() {
|
||||||
|
tokio::time::timeout(Duration::from_secs(25), async {
|
||||||
|
let input = Arc::new(InputInjector::without_desktop());
|
||||||
|
let (host, mut viewer) = connect(input.clone(), false, None, &["CONTROL_DATA_CHANNEL", "FILE_DATA_CHANNEL"]).await;
|
||||||
|
let (requests, mut requested) = mpsc::unbounded_channel();
|
||||||
|
host.on_desktop_request(move || { let _ = requests.send(()); });
|
||||||
|
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 13).await;
|
||||||
|
assert!(!host.role.is_desktop() && host.role.input().is_none());
|
||||||
|
// The Mac viewer opens the desktop on its existing port-mapping peer (#99).
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(5, 0, 3, &[8, 4])).await;
|
||||||
|
tokio::time::timeout(Duration::from_secs(5), requested.recv()).await.unwrap().unwrap();
|
||||||
|
host.promote(None);
|
||||||
|
assert!(host.role.is_desktop());
|
||||||
|
assert!(host.role.input().is_some_and(|session| session.is_current()));
|
||||||
|
// CONTROL repeats the desktop initialization for the same viewer.
|
||||||
|
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 13).await;
|
||||||
|
// The port-mapping session on this peer still answers.
|
||||||
|
send(&viewer, "FILE_DATA_CHANNEL", mapping(2, b"still mapped")).await;
|
||||||
|
receive(&mut viewer.messages, "FILE_DATA_CHANNEL", 27).await;
|
||||||
|
// A repeated capture_desktop does not ask again, and a later promote is a no-op.
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(6, 0, 3, &[8, 4])).await;
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(7, 0, 3, &[8, 0])).await;
|
||||||
|
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 3).await;
|
||||||
|
assert!(requested.try_recv().is_err());
|
||||||
|
let lease = host.role.input().unwrap();
|
||||||
|
host.promote(None);
|
||||||
|
assert!(lease.is_current());
|
||||||
|
// Its video ended on its own (capture failed while locked, #114): capture_desktop restarts it
|
||||||
|
// on the same input lease.
|
||||||
|
let ended = tokio::spawn(async {});
|
||||||
|
*host.role.stream_task.lock().unwrap() = Some(ended.abort_handle());
|
||||||
|
ended.await.unwrap();
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(9, 0, 3, &[8, 4])).await;
|
||||||
|
tokio::time::timeout(Duration::from_secs(5), requested.recv()).await.unwrap().unwrap();
|
||||||
|
host.promote(None);
|
||||||
|
assert!(host.role.is_desktop() && !host.role.stream_ended() && lease.is_current());
|
||||||
|
// A newer desktop demotes it; the port mapping stays, and capture_desktop promotes it again.
|
||||||
|
host.demote();
|
||||||
|
assert!(!host.role.is_desktop() && host.role.input().is_none());
|
||||||
|
send(&viewer, "FILE_DATA_CHANNEL", mapping(2, b"after demotion")).await;
|
||||||
|
receive(&mut viewer.messages, "FILE_DATA_CHANNEL", 27).await;
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(8, 0, 3, &[8, 4])).await;
|
||||||
|
tokio::time::timeout(Duration::from_secs(5), requested.recv()).await.unwrap().unwrap();
|
||||||
|
host.promote(None);
|
||||||
|
assert!(host.role.is_desktop() && host.role.input().is_some_and(|session| session.is_current()));
|
||||||
|
receive(&mut viewer.messages, "CONTROL_DATA_CHANNEL", 13).await;
|
||||||
|
host.pc.close().await.unwrap();
|
||||||
|
viewer.pc.close().await.unwrap();
|
||||||
|
viewer.router.lock().await.stop().await.unwrap();
|
||||||
|
}).await.expect("capture_desktop promotion exceeded deadline");
|
||||||
|
}
|
||||||
@@ -0,0 +1,222 @@
|
|||||||
|
//! X11 desktop resolution follows the viewer's 分辨率 choice, like the official Windows host:
|
||||||
|
//! the display mode itself changes (xrandr), not just the encoded size. The mode in use before
|
||||||
|
//! the first change is restored for 原始/follow-remote and when the last desktop stream ends.
|
||||||
|
//! Disable with UU_DESKTOP_RESIZE=0 (the viewer choice then scales the encoded stream instead).
|
||||||
|
|
||||||
|
use std::process::Command;
|
||||||
|
use std::sync::Mutex;
|
||||||
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
|
pub enum Request { Native, Size(u32, u32) }
|
||||||
|
|
||||||
|
struct Original { display: String, output: String, mode: String }
|
||||||
|
|
||||||
|
static ORIGINAL: Mutex<Option<Original>> = Mutex::new(None);
|
||||||
|
static STREAMS: AtomicUsize = AtomicUsize::new(0);
|
||||||
|
|
||||||
|
/// Upper bound per side (H.264 NVENC/VAAPI limit) and lower bound for a usable desktop.
|
||||||
|
const MAX_SIDE: u32 = 4096;
|
||||||
|
const MIN_SIZE: (u32, u32) = (640, 480);
|
||||||
|
|
||||||
|
pub fn enabled() -> bool { std::env::var("UU_DESKTOP_RESIZE").map_or(true, |v| v != "0") }
|
||||||
|
|
||||||
|
/// Keeps the changed mode while any desktop stream runs; the last one restores it.
|
||||||
|
pub struct StreamGuard;
|
||||||
|
impl StreamGuard {
|
||||||
|
pub fn new() -> Self { STREAMS.fetch_add(1, Ordering::SeqCst); Self }
|
||||||
|
}
|
||||||
|
impl Drop for StreamGuard {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
if STREAMS.fetch_sub(1, Ordering::SeqCst) == 1 && ORIGINAL.lock().unwrap().is_some() {
|
||||||
|
// xrandr blocks; never run it on the async runtime thread dropping the stream.
|
||||||
|
std::thread::spawn(|| {
|
||||||
|
std::thread::sleep(std::time::Duration::from_secs(2));
|
||||||
|
if STREAMS.load(Ordering::SeqCst) == 0 { restore(); }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Applies the viewer's resolution request to the X11 display; returns the desktop size now in
|
||||||
|
/// use, or None when nothing changed hands (the caller keeps encoder scaling as the fallback).
|
||||||
|
pub fn apply(display: &str, request: Request) -> Option<(u32, u32)> {
|
||||||
|
match request {
|
||||||
|
Request::Native => { restore(); crate::capture::x11_size() },
|
||||||
|
Request::Size(w, h) => {
|
||||||
|
let target = fit(w, h)?;
|
||||||
|
match switch(display, target) {
|
||||||
|
Ok(()) => crate::capture::x11_size(),
|
||||||
|
Err(error) => { log::warn!("Desktop resolution change to {}x{} failed: {}", target.0, target.1, error); None },
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Even sides within MIN_SIZE..=MAX_SIDE, keeping the aspect ratio when scaled down.
|
||||||
|
fn fit(w: u32, h: u32) -> Option<(u32, u32)> {
|
||||||
|
if w == 0 || h == 0 { return None; }
|
||||||
|
let scale = (f64::from(MAX_SIDE) / f64::from(w.max(h))).min(1.0);
|
||||||
|
let (w, h) = ((f64::from(w) * scale).round() as u32, (f64::from(h) * scale).round() as u32);
|
||||||
|
Some((w.max(MIN_SIZE.0) & !1, h.max(MIN_SIZE.1) & !1))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn switch(display: &str, target: (u32, u32)) -> Result<(), String> {
|
||||||
|
let state = query(display)?;
|
||||||
|
if state.current == Some(target) { return Ok(()); }
|
||||||
|
{
|
||||||
|
let mut original = ORIGINAL.lock().unwrap();
|
||||||
|
if original.is_none() {
|
||||||
|
let mode = state.current_mode.clone().ok_or("current mode unknown")?;
|
||||||
|
log::info!("Desktop resolution: saving original mode {} on {}", mode, state.output);
|
||||||
|
*original = Some(Original { display: display.into(), output: state.output.clone(), mode });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mode = match state.modes.iter().find(|(_, size)| *size == target) {
|
||||||
|
Some((name, _)) => name.clone(),
|
||||||
|
None => {
|
||||||
|
let (name, timings) = cvt_reduced(target.0, target.1);
|
||||||
|
// An existing mode of this name (earlier session) makes --newmode fail harmlessly.
|
||||||
|
let mut args = vec!["--newmode", name.as_str()];
|
||||||
|
args.extend(timings.iter().map(String::as_str));
|
||||||
|
let _ = xrandr(display, &args);
|
||||||
|
xrandr(display, &["--addmode", &state.output, &name])?;
|
||||||
|
name
|
||||||
|
},
|
||||||
|
};
|
||||||
|
set_mode(display, &state.output, &mode, target)?;
|
||||||
|
log::info!("Desktop resolution changed to {}x{} ({})", target.0, target.1, mode);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Restores the mode saved before the first change, if any.
|
||||||
|
pub fn restore() {
|
||||||
|
let Some(original) = ORIGINAL.lock().unwrap().take() else { return; };
|
||||||
|
let size = query(&original.display).ok().and_then(|state| state.modes.into_iter().find(|(name, _)| *name == original.mode).map(|(_, size)| size));
|
||||||
|
match size.ok_or_else(|| "original mode no longer listed".to_owned())
|
||||||
|
.and_then(|size| set_mode(&original.display, &original.output, &original.mode, size)) {
|
||||||
|
Ok(()) => log::info!("Desktop resolution restored to {}", original.mode),
|
||||||
|
Err(error) => log::warn!("Desktop resolution restore failed: {}", error),
|
||||||
|
}
|
||||||
|
let _ = crate::capture::x11_size();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// GNOME/mutter may answer a mode list change by re-applying its preferred mode; set it again.
|
||||||
|
fn set_mode(display: &str, output: &str, mode: &str, size: (u32, u32)) -> Result<(), String> {
|
||||||
|
for _ in 0..3 {
|
||||||
|
xrandr(display, &["--output", output, "--mode", mode])?;
|
||||||
|
std::thread::sleep(std::time::Duration::from_millis(1500));
|
||||||
|
if query(display)?.current == Some(size) { return Ok(()); }
|
||||||
|
}
|
||||||
|
Err(format!("{output} did not keep {mode}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn xrandr(display: &str, args: &[&str]) -> Result<String, String> {
|
||||||
|
let output = Command::new("xrandr").arg("--display").arg(display).args(args).output()
|
||||||
|
.map_err(|e| format!("xrandr unavailable: {}", e.kind()))?;
|
||||||
|
if !output.status.success() { return Err(format!("xrandr {} exited with {}", args.first().unwrap_or(&""), output.status)); }
|
||||||
|
Ok(String::from_utf8_lossy(&output.stdout).into_owned())
|
||||||
|
}
|
||||||
|
|
||||||
|
struct State { output: String, current: Option<(u32, u32)>, current_mode: Option<String>, modes: Vec<(String, (u32, u32))> }
|
||||||
|
|
||||||
|
fn query(display: &str) -> Result<State, String> { parse(&xrandr(display, &["--query"])?).ok_or_else(|| "no connected output".into()) }
|
||||||
|
|
||||||
|
/// The primary connected output (else the first connected one with a mode) and its mode list.
|
||||||
|
fn parse(text: &str) -> Option<State> {
|
||||||
|
let mut outputs: Vec<(bool, State)> = Vec::new();
|
||||||
|
for line in text.lines() {
|
||||||
|
if let Some(rest) = line.strip_prefix(" ") {
|
||||||
|
let Some((_, state)) = outputs.last_mut() else { continue; };
|
||||||
|
let mut parts = rest.split_whitespace();
|
||||||
|
let Some(name) = parts.next() else { continue; };
|
||||||
|
let Some(size) = mode_size(name) else { continue; };
|
||||||
|
if parts.any(|rate| rate.contains('*')) { state.current = Some(size); state.current_mode = Some(name.into()); }
|
||||||
|
state.modes.push((name.into(), size));
|
||||||
|
} else if !line.starts_with(' ') {
|
||||||
|
let mut parts = line.split_whitespace();
|
||||||
|
let (Some(name), Some("connected")) = (parts.next(), parts.next()) else { outputs.push((false, State { output: String::new(), current: None, current_mode: None, modes: Vec::new() })); continue; };
|
||||||
|
let primary = line.contains(" connected primary ");
|
||||||
|
outputs.push((primary, State { output: name.into(), current: None, current_mode: None, modes: Vec::new() }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mut connected: Vec<(bool, State)> = outputs.into_iter().filter(|(_, s)| !s.output.is_empty() && s.current.is_some()).collect();
|
||||||
|
let index = connected.iter().position(|(primary, _)| *primary).unwrap_or(0);
|
||||||
|
(index < connected.len()).then(|| connected.swap_remove(index).1)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// "1920x1080", "1920x1080R", "1920x1080_60.00", "1920x1080i" → (1920, 1080).
|
||||||
|
fn mode_size(name: &str) -> Option<(u32, u32)> {
|
||||||
|
let (w, rest) = name.split_once('x')?;
|
||||||
|
let h: String = rest.chars().take_while(char::is_ascii_digit).collect();
|
||||||
|
Some((w.parse().ok()?, h.parse().ok()?))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// VESA CVT reduced-blanking (v1) timings: 60 Hz, or 30 Hz when 60 Hz exceeds an HDMI 2.0
|
||||||
|
/// pixel clock (virtual/forced connectors on integrated GPUs reject faster modes).
|
||||||
|
fn cvt_reduced(w: u32, h: u32) -> (String, Vec<String>) {
|
||||||
|
const H_BLANK: u32 = 160; const H_SYNC: u32 = 32; const H_FRONT: u32 = 48;
|
||||||
|
const V_FRONT: u32 = 3; const MIN_V_BACK: u32 = 6; const MIN_VBLANK_US: f64 = 460.0;
|
||||||
|
let v_sync = match (w * 3 == h * 4, w * 9 == h * 16, w * 10 == h * 16, w * 4 == h * 5, w * 9 == h * 15) {
|
||||||
|
(true, ..) => 4, (_, true, ..) => 5, (_, _, true, ..) => 6, (_, _, _, true, _) | (.., true) => 7, _ => 10,
|
||||||
|
};
|
||||||
|
let timing = |refresh: f64| {
|
||||||
|
let h_period = (1_000_000.0 / refresh - MIN_VBLANK_US) / f64::from(h);
|
||||||
|
let vbi = ((MIN_VBLANK_US / h_period) as u32 + 1).max(V_FRONT + v_sync + MIN_V_BACK);
|
||||||
|
let (total_h, total_v) = (w + H_BLANK, h + vbi);
|
||||||
|
let clock = (refresh * f64::from(total_h) * f64::from(total_v) / 1_000_000.0 / 0.25).floor() * 0.25;
|
||||||
|
(clock, total_h, total_v)
|
||||||
|
};
|
||||||
|
let (mut refresh, mut t) = (60, timing(60.0));
|
||||||
|
if t.0 > 590.0 { refresh = 30; t = timing(30.0); }
|
||||||
|
let (clock, total_h, total_v) = t;
|
||||||
|
let name = format!("{w}x{h}_{refresh}R");
|
||||||
|
let timings = [format!("{clock:.2}"), w.to_string(), (w + H_FRONT).to_string(), (w + H_FRONT + H_SYNC).to_string(), total_h.to_string(),
|
||||||
|
h.to_string(), (h + V_FRONT).to_string(), (h + V_FRONT + v_sync).to_string(), total_v.to_string(), "+hsync".into(), "-vsync".into()];
|
||||||
|
(name, timings.into())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn reduced_blanking_matches_the_cvt_tool() {
|
||||||
|
// `cvt -r 1920 1080`: 138.50 1920 1968 2000 2080 1080 1083 1088 1111 +hsync -vsync
|
||||||
|
let (name, t) = cvt_reduced(1920, 1080);
|
||||||
|
assert_eq!(name, "1920x1080_60R");
|
||||||
|
assert_eq!(t.join(" "), "138.50 1920 1968 2000 2080 1080 1083 1088 1111 +hsync -vsync");
|
||||||
|
// `cvt -r 2560 1600`: 268.50 2560 2608 2640 2720 1600 1603 1609 1646
|
||||||
|
assert_eq!(cvt_reduced(2560, 1600).1.join(" "), "268.50 2560 2608 2640 2720 1600 1603 1609 1646 +hsync -vsync");
|
||||||
|
// 4K at 60 Hz needs 533 MHz (under the cap); a larger desktop drops to 30 Hz.
|
||||||
|
assert_eq!(cvt_reduced(3840, 2160).0, "3840x2160_60R");
|
||||||
|
assert_eq!(cvt_reduced(4096, 2560).0, "4096x2560_30R");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn requested_sizes_are_even_and_bounded() {
|
||||||
|
assert_eq!(fit(1280, 720), Some((1280, 720)));
|
||||||
|
assert_eq!(fit(4112, 2580), Some((4096, 2570)));
|
||||||
|
assert_eq!(fit(301, 201), Some((640, 480)));
|
||||||
|
assert_eq!(fit(0, 1080), None);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parses_primary_output_modes_and_current_mode() {
|
||||||
|
let text = r"Screen 0: minimum 320 x 200, current 1920 x 1080, maximum 16384 x 16384
|
||||||
|
DP-1 disconnected (normal left inverted right x axis y axis)
|
||||||
|
HDMI-1 connected primary 1920x1080+0+0 (normal left inverted right x axis y axis) 0mm x 0mm
|
||||||
|
1024x768 60.00
|
||||||
|
3840x2160R 29.98
|
||||||
|
1920x1080R 59.93*+
|
||||||
|
HDMI-2 disconnected (normal left inverted right x axis y axis)
|
||||||
|
";
|
||||||
|
let state = parse(text).unwrap();
|
||||||
|
assert_eq!(state.output, "HDMI-1");
|
||||||
|
assert_eq!(state.current, Some((1920, 1080)));
|
||||||
|
assert_eq!(state.current_mode.as_deref(), Some("1920x1080R"));
|
||||||
|
assert_eq!(state.modes.len(), 3);
|
||||||
|
assert_eq!(state.modes[1], ("3840x2160R".to_owned(), (3840, 2160)));
|
||||||
|
assert!(parse("Screen 0: minimum 320 x 200\nDP-1 disconnected (normal)\n").is_none());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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)]
|
||||||
|
|||||||
+104
-15
@@ -16,6 +16,13 @@ fn env_state(name: &str) -> String {
|
|||||||
|
|
||||||
fn line(key: &str, value: impl std::fmt::Display) { println!("{key:<22} {}", redact(&value.to_string())); }
|
fn line(key: &str, value: impl std::fmt::Display) { println!("{key:<22} {}", redact(&value.to_string())); }
|
||||||
|
|
||||||
|
fn format_probe(probe: &crate::video_select::ProbeReport) -> String {
|
||||||
|
let body = probe.order.iter().zip(probe.outcomes.iter())
|
||||||
|
.map(|(e, o)| format!("{}={}", format!("{e:?}").to_ascii_lowercase(), o.label()))
|
||||||
|
.collect::<Vec<_>>().join(" ");
|
||||||
|
if probe.expires_at.is_some() { format!("{body} (failure result, retried after 10 min)") } else { body }
|
||||||
|
}
|
||||||
|
|
||||||
fn glibc() -> String {
|
fn glibc() -> String {
|
||||||
#[cfg(all(target_os = "linux", target_env = "gnu"))]
|
#[cfg(all(target_os = "linux", target_env = "gnu"))]
|
||||||
{
|
{
|
||||||
@@ -38,6 +45,14 @@ async fn command_output(program: &str, args: &[&str]) -> Option<String> {
|
|||||||
Some(String::from_utf8_lossy(&output.stdout).trim().to_owned())
|
Some(String::from_utf8_lossy(&output.stdout).trim().to_owned())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Whether the report must say that this session has no screen to capture: neither DISPLAY nor
|
||||||
|
/// WAYLAND_DISPLAY is set, and the backend is the X11 one that needs a display to open.
|
||||||
|
fn missing_display(backend: crate::desktop_backend::DesktopBackend, headless: bool,
|
||||||
|
display: Option<&std::ffi::OsStr>, wayland: Option<&std::ffi::OsStr>) -> bool {
|
||||||
|
!headless && backend == crate::desktop_backend::DesktopBackend::X11
|
||||||
|
&& display.is_none() && wayland.is_none()
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn run() -> Result<(), String> {
|
pub async fn run() -> Result<(), String> {
|
||||||
use crate::desktop_backend as backend;
|
use crate::desktop_backend as backend;
|
||||||
use crate::engine_plugin::{load, Engine};
|
use crate::engine_plugin::{load, Engine};
|
||||||
@@ -66,6 +81,13 @@ pub async fn run() -> Result<(), String> {
|
|||||||
if selected.as_ref().is_ok_and(|b| *b == backend::DesktopBackend::X11) && backend::wayland_session_running() && !backend::headless() {
|
if selected.as_ref().is_ok_and(|b| *b == backend::DesktopBackend::X11) && backend::wayland_session_running() && !backend::headless() {
|
||||||
println!(" ! X11 backend inside a Wayland session: the picture will be black");
|
println!(" ! X11 backend inside a Wayland session: the picture will be black");
|
||||||
}
|
}
|
||||||
|
// A session without any display cannot capture a screen; say so instead of naming a backend.
|
||||||
|
if let Ok(selected) = &selected {
|
||||||
|
if missing_display(*selected, backend::headless(), std::env::var_os("DISPLAY").as_deref(), std::env::var_os("WAYLAND_DISPLAY").as_deref()) {
|
||||||
|
println!(" ! DISPLAY and WAYLAND_DISPLAY are unset: the X11 engine will only try :0 and :1; without an X server there, no screen can be captured");
|
||||||
|
println!(" terminal, file transfer and port mapping still work; UU_DESKTOP_BACKEND=none marks the host as headless");
|
||||||
|
}
|
||||||
|
}
|
||||||
if cfg!(feature = "engine-plugins") {
|
if cfg!(feature = "engine-plugins") {
|
||||||
for engine in [Engine::Wayland, Engine::Portal] {
|
for engine in [Engine::Wayland, Engine::Portal] {
|
||||||
line(engine.file(), match load(engine) { Ok(()) => "loaded".to_owned(), Err(e) => e });
|
line(engine.file(), match load(engine) { Ok(()) => "loaded".to_owned(), Err(e) => e });
|
||||||
@@ -77,19 +99,24 @@ pub async fn run() -> Result<(), String> {
|
|||||||
line("UU_INPUT_BACKEND", std::env::var("UU_INPUT_BACKEND").unwrap_or_else(|_| "auto".into()));
|
line("UU_INPUT_BACKEND", std::env::var("UU_INPUT_BACKEND").unwrap_or_else(|_| "auto".into()));
|
||||||
|
|
||||||
println!("-- video");
|
println!("-- video");
|
||||||
let encoder = crate::video::Encoder::requested();
|
let selection = crate::video_select::selection();
|
||||||
line("encoder", format!("{encoder:?} (UU_VIDEO_ENCODER={})", std::env::var("UU_VIDEO_ENCODER").unwrap_or_else(|_| "auto".into())));
|
let env_enc = std::env::var("UU_VIDEO_ENCODER").unwrap_or_else(|_| "unset".into());
|
||||||
line("default codec", format!("{:?}", crate::capture_setting::preferred_codec(true, true)));
|
let codec = match selection.codec_pref { crate::video_select::CodecPref::Auto => "auto", crate::video_select::CodecPref::H264 => "h264", crate::video_select::CodecPref::H265 => "h265" };
|
||||||
let mut ffmpeg = crate::video::ffmpeg_command();
|
let probe_text = if selection.encoder_source == crate::video_select::Source::Auto {
|
||||||
ffmpeg.args(["-hide_banner", "-encoders"]).kill_on_drop(true);
|
format_probe(&crate::video::run_auto_probe().await)
|
||||||
match tokio::time::timeout(std::time::Duration::from_secs(5), ffmpeg.output()).await {
|
} else {
|
||||||
Ok(Ok(output)) => {
|
crate::video_select::cached_probe().as_ref().map(format_probe).unwrap_or_else(|| "not yet run".to_owned())
|
||||||
let text = String::from_utf8_lossy(&output.stdout);
|
};
|
||||||
let found: Vec<&str> = ["libx264", "libx265", "h264_nvenc", "hevc_nvenc", "h264_vaapi", "hevc_vaapi"].into_iter()
|
let selection = if selection.encoder_source == crate::video_select::Source::Auto { crate::video_select::selection() } else { selection };
|
||||||
.filter(|name| text.split_whitespace().any(|word| word == *name)).collect();
|
line("encoder probe", probe_text);
|
||||||
line("ffmpeg encoders", if found.is_empty() { "none of libx264/libx265/nvenc/vaapi".to_owned() } else { found.join(", ") });
|
line("encoder", format!("{:?} (source={}; UU_VIDEO_ENCODER={env_enc})", selection.encoder, crate::video_select::encoder_source_label(selection.encoder_source)));
|
||||||
}
|
line("codec", format!("{codec} (source={})", crate::video_select::source_label(selection.codec_source)));
|
||||||
_ => line("ffmpeg encoders", "ffmpeg not runnable (install ffmpeg or set ffmpeg_root)"),
|
// Both codecs offered: hardware prefers H.265, CPU stays H.264 unless the preference forces one.
|
||||||
|
let resolved = crate::capture_setting::pick_codec(true, true, crate::video_select::codec_force(selection.codec_pref), crate::video_select::hardware(selection.encoder));
|
||||||
|
line("resolved codec", format!("{resolved:?}"));
|
||||||
|
match crate::video::ffmpeg_encoders().await {
|
||||||
|
Some(found) => line("ffmpeg encoders", if found.is_empty() { "none of libx264/libx265/nvenc/vaapi".to_owned() } else { found.join(", ") }),
|
||||||
|
None => line("ffmpeg encoders", "ffmpeg not runnable (install ffmpeg or set ffmpeg_root)"),
|
||||||
}
|
}
|
||||||
let mut version = crate::video::ffmpeg_command();
|
let mut version = crate::video::ffmpeg_command();
|
||||||
version.arg("-version").kill_on_drop(true);
|
version.arg("-version").kill_on_drop(true);
|
||||||
@@ -120,11 +147,39 @@ pub async fn run() -> Result<(), String> {
|
|||||||
Err(_) => line("config mode", "missing (run `uuremote-server login`)"),
|
Err(_) => line("config mode", "missing (run `uuremote-server login`)"),
|
||||||
}
|
}
|
||||||
line("service", command_output("systemctl", &["--user", "is-active", "uuremote-native.service"]).await.unwrap_or_else(|| "systemctl unavailable".into()));
|
line("service", command_output("systemctl", &["--user", "is-active", "uuremote-native.service"]).await.unwrap_or_else(|| "systemctl unavailable".into()));
|
||||||
let running = command_output("pgrep", &["-c", "-x", "uuremote-server"]).await.filter(|n| !n.is_empty()).unwrap_or_else(|| "unknown".into());
|
let running = host_processes();
|
||||||
line("uuremote-server procs", format!("{running} (including this one; more than 2 means duplicates)"));
|
line("uuremote-server procs", format!("{} (including this one; more than 2 means duplicates)", running.map_or_else(|| "unknown".into(), |n| n.to_string())));
|
||||||
|
if running.is_some_and(|n| n > 2) {
|
||||||
|
println!(" ! another host instance is running (check `pgrep -af uuremote`); stop the extra one, e.g. an old copy started by hand");
|
||||||
|
println!(" instances sharing one identity, on this or another machine, kick each other out of the room: never copy config.json between machines");
|
||||||
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Hosts re-exec through /proc/self/exe (comm "exe"), so match the executable's file name, not the process name.
|
||||||
|
/// Helpers a host spawns (Wayland capture, login window) are its children and are not separate instances.
|
||||||
|
fn host_processes() -> Option<usize> {
|
||||||
|
let hosts: Vec<(u32, u32)> = std::fs::read_dir("/proc").ok()?.flatten()
|
||||||
|
.filter_map(|entry| Some((entry.file_name().to_str()?.parse::<u32>().ok()?, entry.path())))
|
||||||
|
.filter(|(_, dir)| std::fs::read_link(dir.join("exe")).is_ok_and(|exe| is_host_executable(&exe)))
|
||||||
|
.filter_map(|(pid, dir)| Some((pid, parent_pid(&std::fs::read_to_string(dir.join("stat")).ok()?)?)))
|
||||||
|
.collect();
|
||||||
|
Some(top_level(&hosts))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Field 4 of /proc/<pid>/stat; the command name in field 2 may contain spaces and parentheses.
|
||||||
|
fn parent_pid(stat: &str) -> Option<u32> {
|
||||||
|
stat.rsplit_once(')')?.1.split_whitespace().nth(1)?.parse().ok()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn top_level(hosts: &[(u32, u32)]) -> usize {
|
||||||
|
hosts.iter().filter(|(_, parent)| !hosts.iter().any(|(pid, _)| pid == parent)).count()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn is_host_executable(exe: &std::path::Path) -> bool {
|
||||||
|
exe.file_name().and_then(|name| name.to_str()).is_some_and(|name| name.trim_end_matches(" (deleted)") == "uuremote-server")
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
#[test]
|
#[test]
|
||||||
@@ -133,4 +188,38 @@ mod tests {
|
|||||||
if home.len() > 1 { assert_eq!(super::redact(&format!("{home}/.config/x")), "~/.config/x"); }
|
if home.len() > 1 { assert_eq!(super::redact(&format!("{home}/.config/x")), "~/.config/x"); }
|
||||||
assert_eq!(super::env_state("UU_DOCTOR_TEST_SURELY_UNSET"), "unset");
|
assert_eq!(super::env_state("UU_DOCTOR_TEST_SURELY_UNSET"), "unset");
|
||||||
}
|
}
|
||||||
|
#[test]
|
||||||
|
fn a_session_without_any_display_is_reported() {
|
||||||
|
use crate::desktop_backend::DesktopBackend;
|
||||||
|
let display = std::ffi::OsStr::new(":0");
|
||||||
|
let wayland = std::ffi::OsStr::new("wayland-1");
|
||||||
|
// No DISPLAY and no WAYLAND_DISPLAY: nothing can be captured.
|
||||||
|
assert!(super::missing_display(DesktopBackend::X11, false, None, None));
|
||||||
|
// One of them present: the backend has a screen to open.
|
||||||
|
assert!(!super::missing_display(DesktopBackend::X11, false, Some(display), None));
|
||||||
|
assert!(!super::missing_display(DesktopBackend::X11, false, None, Some(wayland)));
|
||||||
|
// Another backend, or a headless host: not this warning.
|
||||||
|
assert!(!super::missing_display(DesktopBackend::Wayland, false, None, None));
|
||||||
|
assert!(!super::missing_display(DesktopBackend::X11, true, None, None));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn host_processes_match_the_executable_even_after_reexec() {
|
||||||
|
use std::path::Path;
|
||||||
|
for exe in ["/usr/bin/uuremote-server", "/home/u/.local/bin/uuremote-server", "/usr/bin/uuremote-server (deleted)"] {
|
||||||
|
assert!(super::is_host_executable(Path::new(exe)));
|
||||||
|
}
|
||||||
|
for exe in ["/usr/bin/uuremote-viewer", "/usr/bin/bash", "/usr/bin/uuremote-server-old"] {
|
||||||
|
assert!(!super::is_host_executable(Path::new(exe)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn host_helpers_are_not_counted_as_instances() {
|
||||||
|
assert_eq!(super::parent_pid("8943 (exe) S 1699 8943 1699 0 -1"), Some(1699));
|
||||||
|
assert_eq!(super::parent_pid("12 (a) b (c) R 7 12"), Some(7));
|
||||||
|
// service 10 with a login window 11, a stale copy 20, doctor 30
|
||||||
|
assert_eq!(super::top_level(&[(10, 1), (11, 10), (20, 5), (30, 9)]), 3);
|
||||||
|
assert_eq!(super::top_level(&[(10, 1), (11, 10), (30, 9)]), 2);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
+1061
-397
File diff suppressed because it is too large.
Load diff
+870
-17
File diff suppressed because it is too large.
Load diff
+13
-5
@@ -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",
|
||||||
@@ -25,11 +33,11 @@ async fn black_frame(codec: VideoCodec) -> Result<Bytes, String> {
|
|||||||
Ok(output.stdout.into())
|
Ok(output.stdout.into())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn run(pc: &RTCPeerConnection, track: &VideoTrack, desktop: &PortalDesktop) -> Result<(), String> {
|
pub async fn run(pc: &RTCPeerConnection, track: &VideoTrack, desktop: &PortalDesktop, selection: crate::video_select::Selection) -> Result<(), String> {
|
||||||
run_with_encoder(pc, track, desktop, black_frame).await
|
run_with_encoder(pc, track, desktop, selection, black_frame).await
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn run_with_encoder<F, Fut>(pc: &RTCPeerConnection, track: &VideoTrack, desktop: &PortalDesktop, mut encode: F) -> Result<(), String>
|
async fn run_with_encoder<F, Fut>(pc: &RTCPeerConnection, track: &VideoTrack, desktop: &PortalDesktop, selection: crate::video_select::Selection, mut encode: F) -> Result<(), String>
|
||||||
where F: FnMut(VideoCodec) -> Fut, Fut: std::future::Future<Output = Result<Bytes, String>> {
|
where F: FnMut(VideoCodec) -> Fut, Fut: std::future::Future<Output = Result<Bytes, String>> {
|
||||||
// #29: iPhone 4.42.0 cold ON/OFF/ON tests only sent action15 after black video.
|
// #29: iPhone 4.42.0 cold ON/OFF/ON tests only sent action15 after black video.
|
||||||
// Keep CONTROL permissions truthful and use the existing video track until real capture is ready.
|
// Keep CONTROL permissions truthful and use the existing video track until real capture is ready.
|
||||||
@@ -55,8 +63,8 @@ where F: FnMut(VideoCodec) -> Fut, Fut: std::future::Future<Output = Result<Byte
|
|||||||
if !updates.borrow().waiting || *locked.borrow() != Some(true)
|
if !updates.borrow().waiting || *locked.borrow() != Some(true)
|
||||||
|| pc.connection_state() != RTCPeerConnectionState::Connected { continue; }
|
|| pc.connection_state() != RTCPeerConnectionState::Connected { continue; }
|
||||||
if frame.is_none() {
|
if frame.is_none() {
|
||||||
let codec = crate::capture_setting::preferred_codec(
|
let codec = crate::capture_setting::preferred_codec_for(
|
||||||
track.supports(VideoCodec::H264), track.supports(VideoCodec::H265));
|
track.supports(VideoCodec::H264), track.supports(VideoCodec::H265), selection);
|
||||||
let encoded = tokio::select! {
|
let encoded = tokio::select! {
|
||||||
biased;
|
biased;
|
||||||
_ = updates.changed() => continue,
|
_ = updates.changed() => continue,
|
||||||
|
|||||||
@@ -206,7 +206,7 @@ async fn exercise_locked_video(codec: VideoCodec) {
|
|||||||
let run_host = peers.host.clone();
|
let run_host = peers.host.clone();
|
||||||
let run_track = peers.track.clone();
|
let run_track = peers.track.clone();
|
||||||
let run_desktop = desktop.clone();
|
let run_desktop = desktop.clone();
|
||||||
let task = tokio::spawn(async move { run(&run_host, &run_track, &run_desktop).await });
|
let task = tokio::spawn(async move { run(&run_host, &run_track, &run_desktop, crate::video_select::selection()).await });
|
||||||
|
|
||||||
assert_ne!(peers.host.connection_state(), RTCPeerConnectionState::Connected);
|
assert_ne!(peers.host.connection_state(), RTCPeerConnectionState::Connected);
|
||||||
assert_no_rtp(&mut peers.packets, Duration::from_millis(150)).await;
|
assert_no_rtp(&mut peers.packets, Duration::from_millis(150)).await;
|
||||||
@@ -273,7 +273,7 @@ async fn locked_video_rechecks_state_when_encoding_finishes() {
|
|||||||
let (encoded_tx, mut encoded_rx) = mpsc::unbounded_channel();
|
let (encoded_tx, mut encoded_rx) = mpsc::unbounded_channel();
|
||||||
let revision = peers.track.revision();
|
let revision = peers.track.revision();
|
||||||
let task = tokio::spawn(async move {
|
let task = tokio::spawn(async move {
|
||||||
run_with_encoder(&run_host, &run_track, &run_desktop, |_| {
|
run_with_encoder(&run_host, &run_track, &run_desktop, crate::video_select::selection(), |_| {
|
||||||
let desktop = run_desktop.clone();
|
let desktop = run_desktop.clone();
|
||||||
let lock_tx = lock_tx.clone();
|
let lock_tx = lock_tx.clone();
|
||||||
let encoded_tx = encoded_tx.clone();
|
let encoded_tx = encoded_tx.clone();
|
||||||
@@ -317,7 +317,7 @@ async fn locked_video_stops_on_capture_rejection_and_terminal_peer_close() {
|
|||||||
let run_host = peers.host.clone();
|
let run_host = peers.host.clone();
|
||||||
let run_track = peers.track.clone();
|
let run_track = peers.track.clone();
|
||||||
let run_desktop = rejected_desktop.clone();
|
let run_desktop = rejected_desktop.clone();
|
||||||
let rejection_task = tokio::spawn(async move { run(&run_host, &run_track, &run_desktop).await });
|
let rejection_task = tokio::spawn(async move { run(&run_host, &run_track, &run_desktop, crate::video_select::selection()).await });
|
||||||
rejected_desktop.publish_test_screen(
|
rejected_desktop.publish_test_screen(
|
||||||
Arc::new(ScreenCapture::unavailable("synthetic capture rejection".into())),
|
Arc::new(ScreenCapture::unavailable("synthetic capture rejection".into())),
|
||||||
);
|
);
|
||||||
@@ -335,7 +335,7 @@ async fn locked_video_stops_on_capture_rejection_and_terminal_peer_close() {
|
|||||||
let run_host = peers.host.clone();
|
let run_host = peers.host.clone();
|
||||||
let run_track = peers.track.clone();
|
let run_track = peers.track.clone();
|
||||||
let run_desktop = pending_desktop;
|
let run_desktop = pending_desktop;
|
||||||
let close_task = tokio::spawn(async move { run(&run_host, &run_track, &run_desktop).await });
|
let close_task = tokio::spawn(async move { run(&run_host, &run_track, &run_desktop, crate::video_select::selection()).await });
|
||||||
peers.host.close().await.unwrap();
|
peers.host.close().await.unwrap();
|
||||||
tokio::time::timeout(Duration::from_secs(2), close_task).await
|
tokio::time::timeout(Duration::from_secs(2), close_task).await
|
||||||
.expect("locked video task did not stop after terminal peer close")
|
.expect("locked video task did not stop after terminal peer close")
|
||||||
|
|||||||
+188
-44
@@ -8,7 +8,7 @@
|
|||||||
//! (analysis/tools-fix-20261013/viewer-fieldmd.json). Results are written to the private
|
//! (analysis/tools-fix-20261013/viewer-fieldmd.json). Results are written to the private
|
||||||
//! config file (chmod 600). Tokens and tickets are never printed or logged.
|
//! config file (chmod 600). Tokens and tickets are never printed or logged.
|
||||||
|
|
||||||
use crate::auth::{Credentials, UUAuthClient};
|
use crate::auth::{Credentials, QrRequestErrorKind, UUAuthClient};
|
||||||
use crate::login_ui::{LoginUi, Tone};
|
use crate::login_ui::{LoginUi, Tone};
|
||||||
use serde_json::{json, Value};
|
use serde_json::{json, Value};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
@@ -127,6 +127,35 @@ fn render_qr(content: &str) -> Result<String, String> {
|
|||||||
/// API code for an expired login QR code.
|
/// API code for an expired login QR code.
|
||||||
const QR_EXPIRED: i64 = 1190;
|
const QR_EXPIRED: i64 = 1190;
|
||||||
|
|
||||||
|
/// QR API errors must not echo server messages/validation fields: they may contain credentials.
|
||||||
|
fn qr_data<'a>(stage: &str, status: u16, body: &'a Value) -> Result<&'a Value, String> {
|
||||||
|
let code = body.get("code").and_then(Value::as_i64);
|
||||||
|
if status == 200 && code == Some(0) { return Ok(body.get("data").unwrap_or(&Value::Null)); }
|
||||||
|
Err(format!("{stage}: http_status={status} api_code={code:?}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
|
enum QrPollAction { Wait(i64), Scanned, Confirmed, Refresh(Duration), Failed(&'static str) }
|
||||||
|
|
||||||
|
/// 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 {
|
||||||
|
if body.get("code").and_then(Value::as_i64) == Some(QR_EXPIRED) {
|
||||||
|
return QrPollAction::Failed(crate::i18n::s("二维码已失效","QR code expired"));
|
||||||
|
}
|
||||||
|
let Ok(data) = qr_data("qrcode status", http_status, body) else {
|
||||||
|
return QrPollAction::Failed(crate::i18n::s("二维码状态查询失败","QR status check failed"));
|
||||||
|
};
|
||||||
|
match data.get("status").and_then(Value::as_i64) {
|
||||||
|
Some(1) => QrPollAction::Wait(1),
|
||||||
|
Some(2) if last_status != 2 => QrPollAction::Scanned,
|
||||||
|
Some(2) => QrPollAction::Wait(2),
|
||||||
|
Some(0) => QrPollAction::Refresh(Duration::from_millis(350)),
|
||||||
|
Some(3) => QrPollAction::Refresh(Duration::ZERO),
|
||||||
|
Some(4) => QrPollAction::Confirmed,
|
||||||
|
_ => QrPollAction::Failed(crate::i18n::s("二维码状态响应异常","Unexpected QR status response")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// QR modules as RGBA pixels: `scale` pixels per module, `quiet` light modules around the code.
|
/// QR modules as RGBA pixels: `scale` pixels per module, `quiet` light modules around the code.
|
||||||
fn qr_rgba(content: &str, scale: usize, quiet: usize) -> Result<(Vec<u8>, usize), String> {
|
fn qr_rgba(content: &str, scale: usize, quiet: usize) -> Result<(Vec<u8>, usize), String> {
|
||||||
let code = qrcode::QrCode::new(content.as_bytes()).map_err(|e| format!("QR encode failed: {e}"))?;
|
let code = qrcode::QrCode::new(content.as_bytes()).map_err(|e| format!("QR encode failed: {e}"))?;
|
||||||
@@ -218,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(|_| ())
|
||||||
@@ -243,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();
|
||||||
@@ -268,18 +316,35 @@ pub async fn prepare_device() -> Result<(Value, Credentials), String> {
|
|||||||
pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
||||||
let (mut cfg, creds) = prepare_device().await?;
|
let (mut cfg, creds) = prepare_device().await?;
|
||||||
let client = UUAuthClient::new(creds.clone());
|
let client = UUAuthClient::new(creds.clone());
|
||||||
|
// Mirrors the official Mac client (LoginViewController / LoginManager, UURemote 4.42): gen/login has
|
||||||
|
// no body; the status long poll sends gen's `status_query_ticket` under `token` with the last
|
||||||
|
// status, re-asks as soon as an answer arrives (60 s request timeout), regenerates on status 3
|
||||||
|
// at once and on status 0 after 0.35 s, logs in on 4, and on any error (e.g. HTTP 400 code 1190)
|
||||||
|
// stops until the user asks for a new QR. Sending gen's older `token` field made the cloud reject
|
||||||
|
// every QR within seconds (#68).
|
||||||
|
let timeout = Duration::from_secs(60);
|
||||||
loop {
|
loop {
|
||||||
let (status, resp) = client.post_json("/api/v1/qrcode/gen/login", &json!({})).await?;
|
let (status, resp) = match client.post_with_timeout("/api/v1/qrcode/gen/login", None, timeout).await {
|
||||||
let d = data("qrcode gen", status, &resp)?;
|
Ok(r) => r,
|
||||||
|
Err(e) if e.response_received() => {
|
||||||
|
eprintln!("QR generation response failed: {e}");
|
||||||
|
wait_for_refresh(ui, crate::i18n::s("二维码加载失败","QR code failed to load")).await;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
Err(e) => return Err(format!("QR generation failed: {e}")),
|
||||||
|
};
|
||||||
|
let d = match qr_data("qrcode gen", status, &resp) {
|
||||||
|
Ok(d) => d.clone(),
|
||||||
|
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 = d.get("token").or_else(|| d.get("status_query_ticket")).and_then(|v| v.as_str())
|
let ticket = qr_ticket(&d).ok_or("qrcode gen returned no status ticket")?.to_string();
|
||||||
.ok_or("qrcode gen returned no token")?.to_string();
|
ui.offer_refresh(false);
|
||||||
if ui.shown() {
|
if ui.shown() {
|
||||||
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;
|
||||||
@@ -289,40 +354,49 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
|||||||
file.write_all(&crate::cursor::encode_png(edge as u32,edge as u32,&rgba)).map_err(|e|e.to_string())?;
|
file.write_all(&crate::cursor::encode_png(edge as u32,edge as u32,&rgba)).map_err(|e|e.to_string())?;
|
||||||
}
|
}
|
||||||
if !ui.quiet() { println!("\nScan with the UU Remote mobile app (网易UU远程 App 扫码登录):\n{}", render_qr(&url)?); }
|
if !ui.quiet() { println!("\nScan with the UU Remote mobile app (网易UU远程 App 扫码登录):\n{}", render_qr(&url)?); }
|
||||||
// Status is a long poll: send the state already shown (server enum 1..4; observed:
|
|
||||||
// 1 waiting, 2 scanned, 4 after the phone confirmed); the server answers when it changes.
|
|
||||||
let mut login_status = 1i64;
|
let mut login_status = 1i64;
|
||||||
let mut expired = false;
|
let failure = loop {
|
||||||
for _ in 0..150 {
|
|
||||||
let query = json!({"token": ticket, "qrcode_jump_url": url, "login_status": login_status});
|
let query = json!({"token": ticket, "qrcode_jump_url": url, "login_status": login_status});
|
||||||
let (status, resp) = match client.post_json("/api/v1/qrcode/login/status", &query).await {
|
let (status, resp) = match client.post_with_timeout("/api/v1/qrcode/login/status", Some(&query), timeout).await {
|
||||||
Ok(r) => r,
|
Ok(r) => r,
|
||||||
Err(_) => continue, // long-poll timeout: ask again
|
Err(e) => {
|
||||||
};
|
eprintln!("QR status query failed: {e}; last_status={login_status}");
|
||||||
// Code 1190 (HTTP 400, "二维码已失效"): the QR expired; generate a new one.
|
break match e.kind {
|
||||||
if resp.get("code").and_then(|c| c.as_i64()) == Some(QR_EXPIRED) {
|
QrRequestErrorKind::Timeout => crate::i18n::s("二维码状态查询超时(不代表二维码已失效)","QR status check timed out (the QR code may still be valid)"),
|
||||||
ui.status("二维码已过期,正在刷新…", Tone::Info);
|
_ => crate::i18n::s("二维码状态查询失败(不代表二维码已失效)","QR status check failed (the QR code may still be valid)"),
|
||||||
expired = true; break;
|
};
|
||||||
}
|
|
||||||
let st = data("qrcode status", status, &resp)?.get("status").and_then(|v| v.as_i64()).unwrap_or(login_status);
|
|
||||||
if st == login_status { continue; }
|
|
||||||
login_status = st;
|
|
||||||
match st {
|
|
||||||
2 => {
|
|
||||||
println!("已扫码,请在手机上确认 (scanned, confirm on the phone)");
|
|
||||||
ui.status("已扫码,请在手机上确认登录", Tone::Ok);
|
|
||||||
}
|
}
|
||||||
3 | 4 => {
|
};
|
||||||
// A final state: confirmed logs in; cancelled/expired is refused and a new QR follows.
|
match qr_poll_action(login_status, status, &resp) {
|
||||||
|
QrPollAction::Wait(st) => {
|
||||||
|
if st == 1 && login_status != 1 { ui.status(crate::i18n::s("等待扫码…","Waiting for scan…"), Tone::Info); }
|
||||||
|
login_status = st;
|
||||||
|
}
|
||||||
|
QrPollAction::Scanned => {
|
||||||
|
login_status = 2;
|
||||||
|
println!("已扫码,请在手机上确认 (scanned, confirm on the phone)");
|
||||||
|
ui.status(crate::i18n::s("已扫码,请在手机上确认登录","Scanned, confirm the sign-in on your phone"), Tone::Ok);
|
||||||
|
}
|
||||||
|
QrPollAction::Refresh(delay) => {
|
||||||
|
if delay.is_zero() { println!("QR code expired; generating a new one"); }
|
||||||
|
else { tokio::time::sleep(delay).await; }
|
||||||
|
break "";
|
||||||
|
}
|
||||||
|
QrPollAction::Confirmed => {
|
||||||
|
println!("已确认,正在完成登录 (confirmed, completing login)");
|
||||||
|
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) = client.post_json("/api/v1/login/by_qrcode", &body).await?;
|
let (status, resp) = match client.post_with_timeout("/api/v1/login/by_qrcode", Some(&body), timeout).await {
|
||||||
let d = match data("qrcode login", status, &resp) {
|
Ok(r) => r,
|
||||||
Ok(d) => d,
|
Err(e) if e.response_received() => {
|
||||||
Err(e) => {
|
eprintln!("QR login exchange response failed: {e}");
|
||||||
println!("QR status {st}: login not granted ({e})");
|
break crate::i18n::s("登录失败","Sign-in failed");
|
||||||
ui.status("手机端未确认登录,正在刷新二维码…", Tone::Error);
|
|
||||||
expired = true; break;
|
|
||||||
}
|
}
|
||||||
|
Err(e) => return Err(format!("QR login exchange failed: {e}")),
|
||||||
|
};
|
||||||
|
let d = match qr_data("qrcode login", status, &resp) {
|
||||||
|
Ok(d) => d,
|
||||||
|
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")?;
|
||||||
@@ -339,19 +413,88 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
|||||||
println!("Logged in as {} ({}); saved to {}", nickname, user, path.display());
|
println!("Logged in as {} ({}); saved to {}", nickname, user, path.display());
|
||||||
return Ok(if nickname.is_empty() { user.to_string() } else { nickname.to_string() });
|
return Ok(if nickname.is_empty() { user.to_string() } else { nickname.to_string() });
|
||||||
}
|
}
|
||||||
_ => { println!("QR status: {st}"); ui.status("二维码已失效,正在刷新…", Tone::Error); expired = true; break; }
|
QrPollAction::Failed(reason) => {
|
||||||
|
eprintln!("QR status query stopped: http_status={status} api_code={:?} status={:?} last_status={login_status}",
|
||||||
|
resp.get("code").and_then(Value::as_i64), resp.get("data").and_then(|d| d.get("status")).and_then(Value::as_i64));
|
||||||
|
break reason;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
println!("{}", if expired { "QR code expired; generating a new one" } else { "QR code timed out; generating a new one" });
|
if !failure.is_empty() { wait_for_refresh(ui, failure).await; }
|
||||||
tokio::time::sleep(Duration::from_secs(1)).await; // never spin if the server keeps refusing
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// gen/login's status ticket: `status_query_ticket` (current cloud and official clients), else the
|
||||||
|
/// older `token` field for servers that do not send it.
|
||||||
|
fn qr_ticket(gen: &Value) -> Option<&str> {
|
||||||
|
gen.get("status_query_ticket").or_else(|| gen.get("token")).and_then(|v| v.as_str()).filter(|t| !t.is_empty())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Stop like the official client and wait for the user: the 刷新二维码 button, Enter in a terminal,
|
||||||
|
/// or (no window and no terminal, e.g. a service) one minute.
|
||||||
|
async fn wait_for_refresh(ui: &LoginUi, reason: &str) {
|
||||||
|
use std::io::IsTerminal;
|
||||||
|
ui.status(&crate::tr!("{reason},请点击「刷新二维码」","{reason}. Click \"Refresh QR code\"."), Tone::Error);
|
||||||
|
ui.offer_refresh(true);
|
||||||
|
let terminal = !ui.quiet() && std::io::stdin().is_terminal();
|
||||||
|
if terminal { println!("{reason}. Press Enter to show a new QR code (按回车刷新二维码)"); }
|
||||||
|
else { println!("{reason}; waiting for 刷新二维码{}", if ui.shown() { "" } else { " (a new QR code follows in 60 s)" }); }
|
||||||
|
let mut line = terminal.then(|| tokio::task::spawn_blocking(|| { let mut s = String::new(); let _ = std::io::stdin().read_line(&mut s); }));
|
||||||
|
let started = std::time::Instant::now();
|
||||||
|
loop {
|
||||||
|
if ui.take_refresh() || (ui.shown() && ui.closed()) { break; }
|
||||||
|
if let Some(handle) = line.as_mut() { if handle.is_finished() { break; } }
|
||||||
|
if !ui.shown() && !terminal && started.elapsed() >= Duration::from_secs(60) { break; }
|
||||||
|
tokio::time::sleep(Duration::from_millis(200)).await;
|
||||||
|
}
|
||||||
|
ui.offer_refresh(false);
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
#[tokio::test]
|
#[test]
|
||||||
async fn service_waits_until_a_new_token_is_saved() {
|
fn qr_poll_keeps_waiting_scanned_and_confirmed_distinct() {
|
||||||
|
let reply = |status| json!({"code": 0, "data": {"status": status}});
|
||||||
|
assert_eq!(qr_poll_action(1, 200, &reply(1)), QrPollAction::Wait(1));
|
||||||
|
assert_eq!(qr_poll_action(1, 200, &reply(2)), QrPollAction::Scanned);
|
||||||
|
assert_eq!(qr_poll_action(2, 200, &reply(2)), QrPollAction::Wait(2));
|
||||||
|
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(2, 200, &reply(3)), QrPollAction::Refresh(Duration::ZERO));
|
||||||
|
assert_eq!(qr_poll_action(2, 400, &json!({"code": 1190})), QrPollAction::Failed(crate::i18n::s("二维码已失效","QR code expired")));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn qr_poll_failures_do_not_imply_expiry_or_confirmation() {
|
||||||
|
for last in [1, 2] {
|
||||||
|
for body in [json!(null), json!({"code": 1}), json!({"code": 0, "data": {"status": 4}})] {
|
||||||
|
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(crate::i18n::s("二维码状态查询失败","QR status check failed")));
|
||||||
|
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(crate::i18n::s("二维码状态响应异常","Unexpected QR status response")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn qr_api_errors_do_not_echo_server_content() {
|
||||||
|
let body = json!({"code": 1001, "msg": "fixture-token", "data": [{"loc": "fixture-ticket"}]});
|
||||||
|
assert_eq!(qr_data("qrcode gen", 400, &body).unwrap_err(), "qrcode gen: http_status=400 api_code=Some(1001)");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn status_ticket_prefers_status_query_ticket() {
|
||||||
|
assert_eq!(qr_ticket(&json!({"token": "old", "status_query_ticket": "new"})), Some("new"));
|
||||||
|
assert_eq!(qr_ticket(&json!({"token": "old"})), Some("old"));
|
||||||
|
assert_eq!(qr_ticket(&json!({"status_query_ticket": ""})), None);
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn service_waits_until_a_new_token_is_saved() {
|
||||||
|
let _env = crate::config::test_env_lock().lock().unwrap();
|
||||||
|
let rt = tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap();
|
||||||
|
rt.block_on(async {
|
||||||
let dir = std::env::temp_dir().join(format!("uu-login-wait-{}", std::process::id()));
|
let dir = std::env::temp_dir().join(format!("uu-login-wait-{}", std::process::id()));
|
||||||
std::fs::create_dir_all(&dir).unwrap();
|
std::fs::create_dir_all(&dir).unwrap();
|
||||||
let path = dir.join("config.json");
|
let path = dir.join("config.json");
|
||||||
@@ -367,6 +510,7 @@ mod tests {
|
|||||||
let got = tokio::time::timeout(Duration::from_secs(10), wait_for_credentials(Some("old".into()))).await.unwrap();
|
let got = tokio::time::timeout(Duration::from_secs(10), wait_for_credentials(Some("old".into()))).await.unwrap();
|
||||||
assert_eq!(got.token, "new"); // the expired token in the file is not accepted
|
assert_eq!(got.token, "new"); // the expired token in the file is not accepted
|
||||||
let _ = std::fs::remove_dir_all(&dir);
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ extern "C" {
|
|||||||
fn uu_login_ui_set_done(text: *const libc::c_char);
|
fn uu_login_ui_set_done(text: *const libc::c_char);
|
||||||
fn uu_login_ui_closed() -> libc::c_int;
|
fn uu_login_ui_closed() -> libc::c_int;
|
||||||
fn uu_login_ui_close();
|
fn uu_login_ui_close();
|
||||||
|
fn uu_login_ui_offer_refresh(visible: libc::c_int);
|
||||||
|
fn uu_login_ui_take_refresh() -> libc::c_int;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy)]
|
#[derive(Clone, Copy)]
|
||||||
@@ -56,6 +58,19 @@ impl LoginUi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[allow(unused_variables)]
|
#[allow(unused_variables)]
|
||||||
|
/// Show or hide the 刷新二维码 button (a failed QR waits for the user, like the official client).
|
||||||
|
pub fn offer_refresh(&self, visible: bool) {
|
||||||
|
#[cfg(uu_gtk)]
|
||||||
|
if self.shown { unsafe { uu_login_ui_offer_refresh(libc::c_int::from(visible)) } }
|
||||||
|
#[cfg(not(uu_gtk))]
|
||||||
|
let _ = visible;
|
||||||
|
}
|
||||||
|
/// The user clicked 刷新二维码 since the last call.
|
||||||
|
pub fn take_refresh(&self) -> bool {
|
||||||
|
#[cfg(uu_gtk)]
|
||||||
|
if self.shown { return unsafe { uu_login_ui_take_refresh() } != 0; }
|
||||||
|
false
|
||||||
|
}
|
||||||
pub fn status(&self, text: &str, tone: Tone) {
|
pub fn status(&self, text: &str, tone: Tone) {
|
||||||
#[cfg(uu_gtk)]
|
#[cfg(uu_gtk)]
|
||||||
if self.shown { let t = cstr(text); unsafe { uu_login_ui_set_status(t.as_ptr(), tone as libc::c_int) } }
|
if self.shown { let t = cstr(text); unsafe { uu_login_ui_set_status(t.as_ptr(), tone as libc::c_int) } }
|
||||||
|
|||||||
+346
-35
@@ -1,10 +1,13 @@
|
|||||||
//! UU Remote Pure Native Linux Server (Rust Edition)
|
//! UU Remote Pure Native Linux Server (Rust Edition)
|
||||||
//! Zero-Wine, Zero-Python, Single-Binary, 5 Native Tools Integrated
|
//! Zero-Wine, Zero-Python, Single-Binary, 5 Native Tools Integrated
|
||||||
|
|
||||||
|
mod ws_transport;
|
||||||
mod engine_plugin;
|
mod engine_plugin;
|
||||||
mod doctor;
|
mod doctor;
|
||||||
mod wol;
|
mod wol;
|
||||||
|
mod wallpaper;
|
||||||
mod desktop_backend;
|
mod desktop_backend;
|
||||||
|
mod desktop_mode;
|
||||||
mod desktop_session;
|
mod desktop_session;
|
||||||
mod desktop_power;
|
mod desktop_power;
|
||||||
mod portal;
|
mod portal;
|
||||||
@@ -14,6 +17,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;
|
||||||
@@ -29,6 +33,7 @@ mod signaling;
|
|||||||
mod terminal;
|
mod terminal;
|
||||||
mod webrtc;
|
mod webrtc;
|
||||||
mod video;
|
mod video;
|
||||||
|
mod video_select;
|
||||||
mod video_track;
|
mod video_track;
|
||||||
mod locked_video;
|
mod locked_video;
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
@@ -41,7 +46,9 @@ 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 annotation;
|
||||||
mod capability;
|
mod capability;
|
||||||
mod protocol;
|
mod protocol;
|
||||||
mod control_protocol;
|
mod control_protocol;
|
||||||
@@ -67,10 +74,20 @@ 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()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A peer whose transport is already broken can leave `PeerConnection::close`
|
||||||
|
/// waiting indefinitely; signaling must keep flowing without it.
|
||||||
|
async fn close_peer(pc: &::webrtc::peer_connection::RTCPeerConnection) {
|
||||||
|
if tokio::time::timeout(std::time::Duration::from_secs(5), pc.close()).await.is_err() {
|
||||||
|
log::warn!("Peer connection close timed out; continuing");
|
||||||
|
}
|
||||||
|
}
|
||||||
fn released_peer_ids<T>(sessions: &HashMap<String, T>, ice: Option<&serde_json::Value>) -> Vec<String> {
|
fn released_peer_ids<T>(sessions: &HashMap<String, T>, ice: Option<&serde_json::Value>) -> Vec<String> {
|
||||||
let ice = ice.map(|id| id.as_str().map(str::to_owned).unwrap_or_else(|| id.to_string()));
|
let ice = ice.map(|id| id.as_str().map(str::to_owned).unwrap_or_else(|| id.to_string()));
|
||||||
sessions.keys().filter(|id| ice.as_deref().map_or(true, |ice| id.as_str() == ice)).cloned().collect()
|
sessions.keys().filter(|id| ice.as_deref().map_or(true, |ice| id.as_str() == ice)).cloned().collect()
|
||||||
@@ -126,12 +143,179 @@ fn systemd_unit() -> Option<String> {
|
|||||||
cgroup.lines().find_map(|l| l.rsplit('/').next().filter(|u| u.ends_with(".service")).map(str::to_owned))
|
cgroup.lines().find_map(|l| l.rsplit('/').next().filter(|u| u.ends_with(".service")).map(str::to_owned))
|
||||||
}
|
}
|
||||||
fn display_present() -> bool { std::env::var_os("DISPLAY").is_some() || std::env::var_os("WAYLAND_DISPLAY").is_some() }
|
fn display_present() -> bool { std::env::var_os("DISPLAY").is_some() || std::env::var_os("WAYLAND_DISPLAY").is_some() }
|
||||||
|
|
||||||
|
fn set_video_pref() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
|
let which = std::env::args().nth(1).unwrap_or_default();
|
||||||
|
let stored = std::env::args().nth(2).unwrap_or_default().trim().to_ascii_lowercase();
|
||||||
|
let stored = if stored == "hevc" { "h265".to_owned() } else { stored };
|
||||||
|
if let Err(e) = system_actions::merge_save(|settings| {
|
||||||
|
if which == "set-encoder" { settings.video_encoder = Some(stored.clone()); }
|
||||||
|
else { settings.video_codec = Some(stored.clone()); }
|
||||||
|
}) {
|
||||||
|
// Exit 2 is reserved for bad CLI input; a settings file that cannot be merged is exit 1.
|
||||||
|
eprintln!("{which}: {e}");
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
let selection = video_select::selection();
|
||||||
|
let codec = match selection.codec_pref { video_select::CodecPref::Auto => "auto", video_select::CodecPref::H264 => "h264", video_select::CodecPref::H265 => "h265" };
|
||||||
|
println!("encoder={:?} source={} codec_pref={codec} source={}", selection.encoder, video_select::encoder_source_label(selection.encoder_source), video_select::source_label(selection.codec_source));
|
||||||
|
// Both subcommands wake the host. Encoder changes restart live desktop streams; codec changes are logged only.
|
||||||
|
match notify_host(libc::SIGUSR2) {
|
||||||
|
Ok(()) => println!("notified the running host"),
|
||||||
|
Err(_) => println!(
|
||||||
|
"host not running, or the running host is not this binary: takes effect the next time a desktop connection starts, or after restarting the service"
|
||||||
|
),
|
||||||
|
}
|
||||||
|
if which == "set-codec" {
|
||||||
|
println!("takes effect the next time a desktop connection starts");
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Signal the host recorded in host.pid only when `/proc/<pid>/exe` is exactly
|
||||||
|
/// `canonicalize(current_exe())`. A filename match is not enough: an older host
|
||||||
|
/// has no SIGUSR2 handler, and the default action terminates the process.
|
||||||
|
/// A replaced binary reads back as `… (deleted)` and does not match.
|
||||||
|
fn notify_host(signal: i32) -> Result<(), ()> {
|
||||||
|
let pid = std::fs::read_to_string(host_pid_path())
|
||||||
|
.ok()
|
||||||
|
.and_then(|s| s.trim().parse::<i32>().ok())
|
||||||
|
.filter(|p| *p > 1)
|
||||||
|
.ok_or(())?;
|
||||||
|
let exe = std::fs::read_link(format!("/proc/{pid}/exe")).map_err(|_| ())?;
|
||||||
|
let own = std::fs::canonicalize(std::env::current_exe().map_err(|_| ())?).map_err(|_| ())?;
|
||||||
|
if !same_host_binary(&exe, &own) {
|
||||||
|
return Err(());
|
||||||
|
}
|
||||||
|
if unsafe { libc::kill(pid, signal) } == 0 {
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
Err(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `/proc/<pid>/exe` must equal the canonical path of this binary. A trailing ` (deleted)` does not match.
|
||||||
|
fn same_host_binary(proc_exe: &std::path::Path, own: &std::path::Path) -> bool {
|
||||||
|
proc_exe == own
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Explicit command words for set-encoder / set-codec. Empty and whitespace are illegal.
|
||||||
|
pub(crate) fn cli_pref_ok(which: &str, value: &str) -> bool {
|
||||||
|
let value = value.trim();
|
||||||
|
if value.is_empty() { return false; }
|
||||||
|
let value = value.to_ascii_lowercase();
|
||||||
|
match which {
|
||||||
|
"set-encoder" => matches!(value.as_str(), "auto" | "cpu" | "vaapi" | "nvenc"),
|
||||||
|
"set-codec" => matches!(value.as_str(), "auto" | "h264" | "h265" | "hevc"),
|
||||||
|
_ => false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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"];
|
||||||
|
|
||||||
|
/// Unknown arguments and illegal set-encoder / set-codec values exit 2 (never start a second host).
|
||||||
|
/// help / -h / --help exit 0 so main prints usage instead of starting the host.
|
||||||
|
pub(crate) fn reject_cli(arg: Option<&str>, argc: usize, value_ok: bool) -> Option<i32> {
|
||||||
|
if matches!(arg, Some("help" | "-h" | "--help")) { return Some(0); }
|
||||||
|
if arg.is_some_and(|a| !SUBCOMMANDS.contains(&a)) { return Some(2); }
|
||||||
|
if matches!(arg, Some("set-encoder" | "set-codec")) && (argc != 3 || !value_ok) { return Some(2); }
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod cli_exit_tests {
|
||||||
|
#[test]
|
||||||
|
fn unknown_and_illegal_subcommand_exit_2() {
|
||||||
|
assert_eq!(super::reject_cli(Some("not-a-command"), 2, true), Some(2));
|
||||||
|
assert_eq!(super::reject_cli(Some("set-encoder"), 3, false), Some(2));
|
||||||
|
assert_eq!(super::reject_cli(Some("set-encoder"), 2, true), Some(2));
|
||||||
|
assert_eq!(super::reject_cli(Some("set-codec"), 4, true), Some(2));
|
||||||
|
assert_eq!(super::reject_cli(Some("set-encoder"), 3, true), None);
|
||||||
|
assert_eq!(super::reject_cli(Some("set-codec"), 3, true), None);
|
||||||
|
assert_eq!(super::reject_cli(Some("help"), 2, true), Some(0));
|
||||||
|
assert_eq!(super::reject_cli(Some("-h"), 2, true), Some(0));
|
||||||
|
assert_eq!(super::reject_cli(Some("--help"), 2, true), Some(0));
|
||||||
|
assert_eq!(super::reject_cli(None, 1, true), None);
|
||||||
|
assert!(!super::cli_pref_ok("set-encoder", ""));
|
||||||
|
assert!(!super::cli_pref_ok("set-encoder", " "));
|
||||||
|
assert!(!super::cli_pref_ok("set-codec", ""));
|
||||||
|
assert!(!super::cli_pref_ok("set-codec", "\t"));
|
||||||
|
assert!(!super::cli_pref_ok("set-encoder", "bogus"));
|
||||||
|
assert!(super::cli_pref_ok("set-encoder", " NVENC "));
|
||||||
|
assert!(super::cli_pref_ok("set-codec", "hevc"));
|
||||||
|
assert_eq!(super::reject_cli(Some("set-encoder"), 3, super::cli_pref_ok("set-encoder", "")), Some(2));
|
||||||
|
assert_eq!(super::reject_cli(Some("set-codec"), 3, super::cli_pref_ok("set-codec", " ")), Some(2));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// SIGUSR1 and SIGUSR2 are installed with no assist UI. `host.pid` is written only after both exist.
|
||||||
|
#[test]
|
||||||
|
fn signal_handlers_install_without_assist() {
|
||||||
|
let rt = tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap();
|
||||||
|
rt.block_on(async {
|
||||||
|
let _guard = crate::config::test_env_lock().lock().unwrap();
|
||||||
|
let dir =
|
||||||
|
std::env::temp_dir().join(format!("uuremote-signal-test-{}", std::process::id()));
|
||||||
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
std::env::set_var("UU_CONFIG", dir.join("config.json"));
|
||||||
|
assert!(super::install_host_signals(None));
|
||||||
|
let pid = std::fs::read_to_string(super::host_pid_path()).unwrap();
|
||||||
|
assert_eq!(pid.trim(), std::process::id().to_string());
|
||||||
|
std::env::remove_var("UU_CONFIG");
|
||||||
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn sigusr2_requires_the_same_canonical_binary() {
|
||||||
|
let own = std::path::Path::new("/home/user/.local/bin/uuremote-server");
|
||||||
|
assert!(super::same_host_binary(own, own));
|
||||||
|
assert!(!super::same_host_binary(
|
||||||
|
std::path::Path::new("/tmp/unpack/uuremote-server"),
|
||||||
|
own
|
||||||
|
));
|
||||||
|
assert!(!super::same_host_binary(
|
||||||
|
std::path::Path::new("/home/user/.local/bin/uuremote-server (deleted)"),
|
||||||
|
own
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
/// SIGUSR1 (`uuremote-server show`) opens the host window.
|
/// SIGUSR1 (`uuremote-server show`) opens the host window.
|
||||||
fn present_on_usr1(ui: std::sync::Arc<assist::LocalUi>) {
|
/// SIGUSR2 (set-encoder, set-codec, or `kill -USR2`) re-reads host_settings. Encoder changes switch live desktop streams; codec changes are logged for the next connection.
|
||||||
// Install the handler before publishing the pid: SIGUSR1's default action terminates the process.
|
/// The default action of either signal terminates the process, so both handlers are installed before `host.pid` is written.
|
||||||
let Ok(mut usr1) = tokio::signal::unix::signal(tokio::signal::unix::SignalKind::user_defined1()) else { return };
|
/// SIGUSR2 is independent of remote assistance: `UU_REMOTE_ASSIST=0` and a failed assist setup still switch live encoders.
|
||||||
|
/// SIGUSR1 is installed first as a no-op so `show` cannot terminate a host that has no assist window yet.
|
||||||
|
fn install_host_signals(ui: Option<std::sync::Arc<assist::LocalUi>>) -> bool {
|
||||||
|
static USR1: std::sync::Once = std::sync::Once::new();
|
||||||
|
static USR2: std::sync::Once = std::sync::Once::new();
|
||||||
|
let mut usr1_ok = true;
|
||||||
|
USR1.call_once(|| {
|
||||||
|
match tokio::signal::unix::signal(tokio::signal::unix::SignalKind::user_defined1()) {
|
||||||
|
Ok(mut usr1) => { tokio::spawn(async move { while usr1.recv().await.is_some() {} }); }
|
||||||
|
Err(_) => usr1_ok = false,
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if !usr1_ok { return false; }
|
||||||
|
let mut usr2_ok = true;
|
||||||
|
USR2.call_once(|| {
|
||||||
|
match tokio::signal::unix::signal(tokio::signal::unix::SignalKind::user_defined2()) {
|
||||||
|
Ok(mut usr2) => { tokio::spawn(async move { while usr2.recv().await.is_some() { crate::video_select::publish_reload(); } }); }
|
||||||
|
Err(_) => usr2_ok = false,
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if !usr2_ok { return false; }
|
||||||
|
// Assist attaches later and replaces the no-op with the window. A second registration replaces the first.
|
||||||
|
if let Some(ui) = ui {
|
||||||
|
if let Ok(mut usr1) = tokio::signal::unix::signal(tokio::signal::unix::SignalKind::user_defined1()) {
|
||||||
|
tokio::spawn(async move { while usr1.recv().await.is_some() { ui.present(); } });
|
||||||
|
}
|
||||||
|
}
|
||||||
write_host_pid();
|
write_host_pid();
|
||||||
tokio::spawn(async move { while usr1.recv().await.is_some() { ui.present(); } });
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
fn present_on_usr1(ui: std::sync::Arc<assist::LocalUi>) {
|
||||||
|
let _ = install_host_signals(Some(ui));
|
||||||
}
|
}
|
||||||
|
|
||||||
fn host_pid_path() -> std::path::PathBuf { config::path().with_file_name("host.pid") }
|
fn host_pid_path() -> std::path::PathBuf { config::path().with_file_name("host.pid") }
|
||||||
@@ -139,10 +323,41 @@ fn host_pid_path() -> std::path::PathBuf { config::path().with_file_name("host.p
|
|||||||
fn write_host_pid() {
|
fn write_host_pid() {
|
||||||
use std::os::unix::fs::OpenOptionsExt;
|
use std::os::unix::fs::OpenOptionsExt;
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
if let Ok(mut f) = std::fs::OpenOptions::new().write(true).create(true).truncate(true).mode(0o600).open(host_pid_path()) {
|
let path = host_pid_path();
|
||||||
|
if let Some(dir) = path.parent() { let _ = std::fs::create_dir_all(dir); }
|
||||||
|
if let Ok(mut f) = std::fs::OpenOptions::new().write(true).create(true).truncate(true).mode(0o600).open(path) {
|
||||||
let _ = write!(f, "{}", std::process::id());
|
let _ = write!(f, "{}", std::process::id());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// Why `unit` is not (going to be) running, from `systemctl --user show`; None while it is active or starting.
|
||||||
|
fn unit_not_running(unit: &str, settled: bool) -> Option<String> {
|
||||||
|
let output = std::process::Command::new("systemctl").args(["--user", "show", unit, "-p", "ActiveState,SubState,ConditionResult"]).output().ok()?;
|
||||||
|
let text = String::from_utf8_lossy(&output.stdout);
|
||||||
|
let value = |key: &str| text.lines().find_map(|l| l.strip_prefix(key).and_then(|v| v.strip_prefix('='))).unwrap_or("").to_owned();
|
||||||
|
unit_state_problem(unit, &value("ActiveState"), &value("SubState"), &value("ConditionResult"), settled)
|
||||||
|
}
|
||||||
|
fn unit_state_problem(unit: &str, active: &str, sub: &str, condition: &str, settled: bool) -> Option<String> {
|
||||||
|
let hint = format!("see `systemctl --user status {unit}` and `journalctl --user -u {unit}`");
|
||||||
|
if condition == "no" { return Some(format!("{unit} was skipped: a Condition in the unit is not met (e.g. ConditionEnvironment outside the graphical session); {hint}")); }
|
||||||
|
if active == "failed" { return Some(format!("{unit} failed to start; {hint}")); }
|
||||||
|
if sub == "auto-restart" { return Some(format!("{unit} keeps exiting and being restarted; {hint}")); }
|
||||||
|
if settled && active == "inactive" { return Some(format!("{unit} is not running; {hint}")); }
|
||||||
|
None
|
||||||
|
}
|
||||||
|
#[cfg(test)]
|
||||||
|
mod show_unit_tests {
|
||||||
|
#[test]
|
||||||
|
fn skipped_crashing_and_failed_units_are_reported() {
|
||||||
|
let p = |a, s, c, settled| super::unit_state_problem("u.service", a, s, c, settled);
|
||||||
|
assert!(p("inactive", "dead", "no", false).unwrap().contains("skipped"));
|
||||||
|
assert!(p("activating", "auto-restart", "yes", false).unwrap().contains("restarted"));
|
||||||
|
assert!(p("failed", "failed", "yes", false).unwrap().contains("failed"));
|
||||||
|
assert!(p("inactive", "dead", "yes", false).is_none());
|
||||||
|
assert!(p("inactive", "dead", "yes", true).unwrap().contains("not running"));
|
||||||
|
assert!(p("active", "running", "yes", true).is_none());
|
||||||
|
assert!(p("activating", "start", "yes", true).is_none());
|
||||||
|
}
|
||||||
|
}
|
||||||
/// `uuremote-server show` (desktop launcher): open the running host's window, or start the host in the
|
/// `uuremote-server show` (desktop launcher): open the running host's window, or start the host in the
|
||||||
/// foreground with its window when none runs (e.g. no systemd unit installed yet).
|
/// foreground with its window when none runs (e.g. no systemd unit installed yet).
|
||||||
fn show_running_host() -> Result<(), Box<dyn std::error::Error>> {
|
fn show_running_host() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
@@ -162,7 +377,10 @@ fn show_running_host() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null()).status().is_ok_and(|s| s.success());
|
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null()).status().is_ok_and(|s| s.success());
|
||||||
if installed && std::process::Command::new("systemctl").args(["--user", "start", &unit]).status().is_ok_and(|s| s.success()) {
|
if installed && std::process::Command::new("systemctl").args(["--user", "start", &unit]).status().is_ok_and(|s| s.success()) {
|
||||||
let before = std::fs::metadata(host_pid_path()).and_then(|m| m.modified()).ok();
|
let before = std::fs::metadata(host_pid_path()).and_then(|m| m.modified()).ok();
|
||||||
for _ in 0..60 {
|
for attempt in 0..60 {
|
||||||
|
// `systemctl start` also returns 0 when the unit is skipped by a Condition or keeps
|
||||||
|
// crashing under Restart=; report that instead of waiting 30 s for a pid (#62).
|
||||||
|
if let Some(reason) = unit_not_running(&unit, attempt >= 2) { return Err(reason.into()); }
|
||||||
std::thread::sleep(std::time::Duration::from_millis(500));
|
std::thread::sleep(std::time::Duration::from_millis(500));
|
||||||
let fresh = std::fs::metadata(host_pid_path()).and_then(|m| m.modified()).ok().is_some_and(|t| Some(t) != before);
|
let fresh = std::fs::metadata(host_pid_path()).and_then(|m| m.modified()).ok().is_some_and(|t| Some(t) != before);
|
||||||
let pid = std::fs::read_to_string(host_pid_path()).ok().and_then(|s| s.trim().parse::<i32>().ok());
|
let pid = std::fs::read_to_string(host_pid_path()).ok().and_then(|s| s.trim().parse::<i32>().ok());
|
||||||
@@ -171,7 +389,7 @@ fn show_running_host() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
if unsafe { libc::kill(pid, libc::SIGUSR1) } == 0 { return Ok(()); }
|
if unsafe { libc::kill(pid, libc::SIGUSR1) } == 0 { return Ok(()); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Err("the UU remote host service started but did not open its window".into());
|
return Err(format!("{unit} is running but did not open its window within 30 s; check `journalctl --user -u {unit}`").into());
|
||||||
}
|
}
|
||||||
use std::os::unix::process::CommandExt;
|
use std::os::unix::process::CommandExt;
|
||||||
Err(Box::new(std::process::Command::new("/proc/self/exe").env("UU_SHOW_WINDOW", "1").exec()))
|
Err(Box::new(std::process::Command::new("/proc/self/exe").env("UU_SHOW_WINDOW", "1").exec()))
|
||||||
@@ -193,16 +411,20 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
.filter_module("uuremote_server", log::LevelFilter::Info).init();
|
.filter_module("uuremote_server", log::LevelFilter::Info).init();
|
||||||
} else { env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init(); }
|
} else { env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init(); }
|
||||||
// An unknown argument must never fall through to starting a second full host server.
|
// An unknown argument must never fall through to starting a second full host server.
|
||||||
const SUBCOMMANDS: [&str; 15] = ["doctor", "show", "assist", "desktop-input-probe", "virtual-audio-probe", "login", "unlock-check", "desktop-probe", "desktop-video-probe", "desktop-audio-probe", "wayland-capture",
|
let arg1 = std::env::args().nth(1);
|
||||||
"wayland-input-probe", "wayland-text-probe", "clipboard-acceptance", "portal-acceptance"];
|
let value_ok = match arg1.as_deref() {
|
||||||
if let Some(arg) = std::env::args().nth(1).filter(|a| !SUBCOMMANDS.contains(&a.as_str())) {
|
Some(which @ ("set-encoder" | "set-codec")) => cli_pref_ok(which, &std::env::args().nth(2).unwrap_or_default()),
|
||||||
|
_ => true,
|
||||||
|
};
|
||||||
|
if let Some(code) = reject_cli(arg1.as_deref(), std::env::args().len(), value_ok) {
|
||||||
let usage = format!("usage: uuremote-server [{}]\n (no argument: run the host)", SUBCOMMANDS.join(" | "));
|
let usage = format!("usage: uuremote-server [{}]\n (no argument: run the host)", SUBCOMMANDS.join(" | "));
|
||||||
if matches!(arg.as_str(), "help" | "-h" | "--help") { println!("{usage}"); return Ok(()); }
|
if code == 0 { println!("{usage}"); return Ok(()); }
|
||||||
eprintln!("unknown argument\n{usage}");
|
eprintln!("unknown argument\n{usage}");
|
||||||
std::process::exit(2);
|
std::process::exit(code);
|
||||||
}
|
}
|
||||||
|
|
||||||
if std::env::args().nth(1).as_deref() == Some("show") { return show_running_host(); }
|
if std::env::args().nth(1).as_deref() == Some("show") { return show_running_host(); }
|
||||||
|
if matches!(std::env::args().nth(1).as_deref(), Some("set-encoder") | Some("set-codec")) { return set_video_pref(); }
|
||||||
if assist_enabled && !unified {
|
if assist_enabled && !unified {
|
||||||
if std::env::args().len() > 2 { return Err("assist accepts no additional arguments; configure it with a private UU_CONFIG".into()); }
|
if std::env::args().len() > 2 { return Err("assist accepts no additional arguments; configure it with a private UU_CONFIG".into()); }
|
||||||
assist::configure()?;
|
assist::configure()?;
|
||||||
@@ -411,9 +633,28 @@ 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.
|
||||||
|
let _ = install_host_signals(None);
|
||||||
|
video::warm_auto_probe();
|
||||||
|
video::check_ffmpeg_usable();
|
||||||
|
|
||||||
if !desktop_backend::headless() && desktop_backend::detect()? == desktop_backend::DesktopBackend::X11 && desktop_backend::wayland_session_running() {
|
if !desktop_backend::headless() && desktop_backend::detect()? == desktop_backend::DesktopBackend::X11 && desktop_backend::wayland_session_running() {
|
||||||
// X11 capture inside a Wayland session reads XWayland's root window: all black, no error (#61).
|
// X11 capture inside a Wayland session reads XWayland's root window: all black, no error (#61).
|
||||||
@@ -444,7 +685,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 };
|
||||||
@@ -474,8 +715,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
if let Some(task) = command_task { task.abort(); }
|
if let Some(task) = command_task { task.abort(); }
|
||||||
// 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() { let _ = old.pc.close().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.
|
||||||
@@ -492,6 +733,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,
|
||||||
@@ -521,11 +777,14 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
client
|
client
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let mut wallpaper_task = AbortOnDrop(wallpaper::start(auth.clone()));
|
||||||
// One peer per viewer connection (desktop, file transfer, terminal...), keyed by ice_id.
|
// One peer per viewer connection (desktop, file transfer, terminal...), keyed by ice_id.
|
||||||
let mut next_capture_type: Option<(u64,crate::session_ice::SessionIce)> = None;
|
let mut next_capture_type: Option<(u64,crate::session_ice::SessionIce)> = None;
|
||||||
let mut capture_types: HashMap<String, (u64,crate::session_ice::SessionIce)> = HashMap::new();
|
let mut capture_types: HashMap<String, (u64,crate::session_ice::SessionIce)> = HashMap::new();
|
||||||
let mut mac_by_ice: HashMap<String, bool> = HashMap::new();
|
let mut controller_by_ice: HashMap<String, crate::input::Controller> = HashMap::new();
|
||||||
let mut next_mac = false;
|
let mut next_controller = crate::input::Controller::Other;
|
||||||
|
// Tool peers ask here to become the desktop (capture_desktop on an existing connection, #99).
|
||||||
|
let (desktop_requests, mut desktop_requested) = mpsc::unbounded_channel::<String>();
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
if *shutdown.borrow() {
|
if *shutdown.borrow() {
|
||||||
@@ -556,6 +815,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
log::error!("UU login is invalid or expired; a new QR login is required");
|
log::error!("UU login is invalid or expired; a new QR login is required");
|
||||||
let stale = config::read_fresh().ok().flatten().and_then(|f| f.get("token").and_then(|t| t.as_str()).map(str::to_owned));
|
let stale = config::read_fresh().ok().flatten().and_then(|f| f.get("token").and_then(|t| t.as_str()).map(str::to_owned));
|
||||||
auth = Arc::new(UUAuthClient::new(login::wait_for_credentials(stale).await));
|
auth = Arc::new(UUAuthClient::new(login::wait_for_credentials(stale).await));
|
||||||
|
wallpaper_task.0.abort();
|
||||||
|
wallpaper_task = AbortOnDrop(wallpaper::start(auth.clone()));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
@@ -595,8 +856,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
Arc::new(cli)
|
Arc::new(cli)
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let _ = e;
|
// ws_transport errors carry only a category or HTTP status, never the token or URL.
|
||||||
log::error!("Failed to connect signaling; retrying in 5s (details omitted)");
|
log::error!("Failed to connect signaling; retrying in 5s: {e}");
|
||||||
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
|
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -610,6 +871,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
_ = shutdown.changed() => Some(SignalingEvent::Stop),
|
_ = shutdown.changed() => Some(SignalingEvent::Stop),
|
||||||
command = commands.recv(), if assist.is_some() => Some(SignalingEvent::AssistCommand(command.unwrap_or(assist::Command::Stop))),
|
command = commands.recv(), if assist.is_some() => Some(SignalingEvent::AssistCommand(command.unwrap_or(assist::Command::Stop))),
|
||||||
_ = assist_tick.tick(), if assist.is_some() => Some(SignalingEvent::AssistTick),
|
_ = assist_tick.tick(), if assist.is_some() => Some(SignalingEvent::AssistTick),
|
||||||
|
Some(ice) = desktop_requested.recv() => Some(SignalingEvent::DesktopRequested(ice)),
|
||||||
event = rx_event.recv() => event,
|
event = rx_event.recv() => event,
|
||||||
};
|
};
|
||||||
let Some(evt) = event else { break; };
|
let Some(evt) = event else { break; };
|
||||||
@@ -644,8 +906,10 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Closed |
|
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Closed |
|
||||||
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Failed)).map(|(id, _)| id.clone()).collect();
|
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Failed)).map(|(id, _)| id.clone()).collect();
|
||||||
let mut desktop_ended = false;
|
let mut desktop_ended = false;
|
||||||
for id in ended { if let Some(s) = sessions.remove(&id) { desktop_ended |= s.desktop; let _ = s.pc.close().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.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 => {
|
||||||
@@ -707,9 +971,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(); }
|
||||||
@@ -732,27 +996,32 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Closed |
|
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Closed |
|
||||||
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Failed)).map(|(k, _)| k.clone()).collect();
|
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Failed)).map(|(k, _)| k.clone()).collect();
|
||||||
let mut desktop_ended = false;
|
let mut desktop_ended = false;
|
||||||
for k in ended { if let Some(old) = sessions.remove(&k) { desktop_ended |= old.desktop; let _ = old.pc.close().await; } }
|
for k in ended { if let Some(old) = sessions.remove(&k) { desktop_ended |= old.role.is_desktop(); close_peer(&old.pc).await; } }
|
||||||
if desktop_ended && !sessions.values().any(|s| s.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()?; } }
|
||||||
if let Some(s) = assist.as_mut() { s.tick()?; }
|
if let Some(s) = assist.as_mut() { s.tick()?; }
|
||||||
|
|
||||||
if soac.msg_type == "offer" {
|
if soac.msg_type == "offer" {
|
||||||
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.
|
||||||
|
if desktop { video::warm_auto_probe(); video::check_ffmpeg_usable(); }
|
||||||
// Replace only this ICE id or a previous desktop, never tool peers.
|
// Replace only this ICE id or a previous desktop, never tool peers.
|
||||||
for id in superseded_peer_ids(&sessions, &ice, desktop) {
|
for id in superseded_peer_ids(&sessions, &ice, desktop) {
|
||||||
if let Some(old) = sessions.remove(&id) { let _ = old.pc.close().await; }
|
if let Some(old) = sessions.remove(&id) { close_peer(&old.pc).await; }
|
||||||
}
|
}
|
||||||
|
// A tool peer promoted by capture_desktop stops its desktop but keeps its tools.
|
||||||
|
if desktop { for old in sessions.values() { old.demote(); } }
|
||||||
if desktop && desktop_backend::headless() {
|
if desktop && desktop_backend::headless() {
|
||||||
log::info!("Desktop connection ignored: headless mode (terminal, file transfer and port mapping remain available)");
|
log::info!("Desktop connection ignored: headless mode (terminal, file transfer and port mapping remain available)");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
let resized=desktop && capture.init_error.is_none() && capture.backend==desktop_backend::DesktopBackend::X11
|
let resized=desktop && capture.init_error.is_none() && capture.backend==desktop_backend::DesktopBackend::X11
|
||||||
&& tokio::task::spawn_blocking(crate::capture::x11_resized).await.unwrap_or(false);
|
// Compare with this capture, not the engine: a live stream may already have refreshed it.
|
||||||
|
&& tokio::task::spawn_blocking(crate::capture::x11_size).await.ok().flatten().is_some_and(|size| size!=(capture.width,capture.height));
|
||||||
if resized { log::info!("Desktop geometry changed since startup; reinitializing capture"); }
|
if resized { log::info!("Desktop geometry changed since startup; reinitializing capture"); }
|
||||||
let session_capture=if desktop && portal_desktop.is_none() && (capture.init_error.is_some() || resized) {
|
let session_capture=if desktop && portal_desktop.is_none() && (capture.init_error.is_some() || resized) {
|
||||||
match tokio::task::spawn_blocking(ScreenCapture::new).await {
|
match tokio::task::spawn_blocking(ScreenCapture::new).await {
|
||||||
@@ -767,7 +1036,12 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
if desktop { if let Some(portal) = &portal_desktop { portal.begin(); } }
|
if desktop { if let Some(portal) = &portal_desktop { portal.begin(); } }
|
||||||
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(sess) => {
|
Ok(mut sess) => {
|
||||||
|
sess.controller = controller;
|
||||||
|
if !desktop {
|
||||||
|
let (requests, peer) = (desktop_requests.clone(), ice.clone());
|
||||||
|
sess.on_desktop_request(move || { let _ = requests.send(peer.clone()); });
|
||||||
|
}
|
||||||
// Register before awaiting SDP: shutdown can always close
|
// Register before awaiting SDP: shutdown can always close
|
||||||
// a peer whose answer may already be queued to the viewer.
|
// a peer whose answer may already be queued to the viewer.
|
||||||
sessions.insert(ice.clone(), sess);
|
sessions.insert(ice.clone(), sess);
|
||||||
@@ -790,7 +1064,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
}
|
}
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
log::error!("Failed to handle offer (details omitted)");
|
log::error!("Failed to handle offer (details omitted)");
|
||||||
if let Some(session) = sessions.remove(&ice) { let _ = session.pc.close().await; }
|
if let Some(session) = sessions.remove(&ice) { close_peer(&session.pc).await; }
|
||||||
}
|
}
|
||||||
}},
|
}},
|
||||||
Err(_) => log::error!("Create peer failed (details omitted)"),
|
Err(_) => log::error!("Create peer failed (details omitted)"),
|
||||||
@@ -812,13 +1086,50 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
let mut desktop_ended = false;
|
let mut desktop_ended = false;
|
||||||
for k in targets {
|
for k in targets {
|
||||||
if let Some(old) = sessions.remove(&k) {
|
if let Some(old) = sessions.remove(&k) {
|
||||||
desktop_ended |= old.desktop;
|
desktop_ended |= old.role.is_desktop();
|
||||||
if let Err(e) = old.pc.close().await { log::warn!("Close released peer failed: {}", e); }
|
close_peer(&old.pc).await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if desktop_ended && !sessions.values().any(|s| s.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()?; } }
|
||||||
if let Some(s) = assist.as_mut() { s.tick()?; }
|
if let Some(s) = assist.as_mut() { s.tick()?; }
|
||||||
}
|
}
|
||||||
|
SignalingEvent::DesktopRequested(ice) => {
|
||||||
|
let mut sessions = webrtc_sessions.lock().await;
|
||||||
|
let Some(peer) = sessions.get(&ice).filter(|peer| !peer.role.is_desktop()) else { continue; };
|
||||||
|
if desktop_backend::headless() {
|
||||||
|
log::info!("Desktop request on a tool connection ignored: headless mode");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if portal_desktop.is_some() {
|
||||||
|
log::info!("Desktop request on a tool connection not supported with the Portal backend; open the desktop before port mapping");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let controller = peer.controller;
|
||||||
|
let current = peer.desktop_capture();
|
||||||
|
// 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
|
||||||
|
&& tokio::task::spawn_blocking(crate::capture::x11_size).await.ok().flatten().is_some_and(|size| size != (current.width, current.height));
|
||||||
|
if resized { log::info!("Desktop geometry changed since this connection opened; reinitializing capture"); }
|
||||||
|
let screen = if current.init_error.is_some() || resized {
|
||||||
|
match tokio::task::spawn_blocking(ScreenCapture::new).await {
|
||||||
|
Ok(Ok(screen)) => { capture = Arc::new(screen); Some(capture.clone()) },
|
||||||
|
Ok(Err(error)) => { log::info!("Desktop request on a tool connection ignored: {error}"); continue; },
|
||||||
|
Err(_) => { log::warn!("Desktop initialization worker failed"); continue; },
|
||||||
|
}
|
||||||
|
} else { None };
|
||||||
|
video::warm_auto_probe(); video::check_ffmpeg_usable();
|
||||||
|
input.set_controller(controller);
|
||||||
|
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
|
||||||
|
// close; a promoted tool peer only stops its desktop and keeps its tools.
|
||||||
|
let superseded: Vec<String> = sessions.iter().filter(|(id, old)| id.as_str() != ice && old.role.is_desktop())
|
||||||
|
.map(|(id, _)| id.clone()).collect();
|
||||||
|
for id in superseded {
|
||||||
|
if sessions[&id].desktop { if let Some(old) = sessions.remove(&id) { close_peer(&old.pc).await; } }
|
||||||
|
else { sessions[&id].demote(); }
|
||||||
|
}
|
||||||
|
if let Some(peer) = sessions.get(&ice) { peer.promote(screen); }
|
||||||
|
}
|
||||||
SignalingEvent::Disconnected => {
|
SignalingEvent::Disconnected => {
|
||||||
capture_types.clear();
|
capture_types.clear();
|
||||||
next_capture_type=None;
|
next_capture_type=None;
|
||||||
|
|||||||
Loaded 100 of 268 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user