mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 08:50:40 +01:00
控制端:原生分辨率、中英文界面、控制中心、实测 RTT 与稳定性修复 (#129)
* viewer: decode at the host's native size and filter window scaling Every frame was scaled into a fixed 1920x1080 canvas and SDL then stretched it to the window with nearest-neighbour sampling, so remote text looked uneven and blurry. Decode at the native size (read from ffmpeg's verbose scaler line), restart the decoder when the host resolution changes, and use linear render scaling. UU_VIEWER_SIZE keeps the fixed canvas, now resampled with Lanczos. Co-Authored-By: Claude Opus 5.5 <[email protected]> * Add Chinese/English UI language All GTK windows (viewer launcher, tool windows, host main window and QR login) and viewer messages are available in Chinese and English. The language comes from UU_LANG, the choice saved in Settings -> General, then the locale. README: document the fork's changes and language selection. Co-Authored-By: Claude Opus 5.5 <[email protected]> * Host main window: add the language selector Co-Authored-By: Claude Opus 5.5 <[email protected]> * viewer: control center, network status, loading screen, device previews In-window chrome drawn on the SDL canvas with a fontconfig font (ab_glyph): - loading animation with the connection stage instead of a black window - control center (Ctrl+Alt+M or the top tab): quality, fps, true color, resolution, fit/1:1, volume, auto lock and host mute (SimpleAction 19, 14/18/16), system shortcut grab, file transfer, watch mode, full screen, disconnect - network status panel (Ctrl+Alt+G): time, route, fps, bitrate, RTT, loss - launcher device previews from the last remote picture (local 0600 cache) - viewer sign-in keeps the local host user service running, so this computer joins the account's device list; the settings switch controls it Co-Authored-By: Claude Opus 5.5 <[email protected]> * viewer: compact cascading control center Narrow category list with an options card beside the selected row, sized to its content; opaque cards with a hairline border and soft shadow, so the remote picture no longer shows through. Co-Authored-By: Claude Opus 5.5 <[email protected]> * viewer: keep the control center responsive; resync on a key frame The menu was rasterized on every mouse event just to hit-test it; hit testing now uses the layout alone and the drawn menu is cached until what it shows changes. A stalled UI overflowed the access-unit queue, and the reset decoder then smeared P-frames into blocks; after a reset it now waits for an IDR/IRAP while requesting key frames. The tab icon is drawn, since fonts without U+2630 showed a box. Co-Authored-By: Claude Opus 5.5 <[email protected]> * viewer: measured RTT, no crash on closing tool windows, account card webrtc-ice never measured the round trip, so the network panel always read 'RTT --'. Binding responses now record it on their pair, and the selected pair is pinged when the sample is older than the keepalive interval, since a streaming pair never idles (vendor/webrtc-ice/PATCHES.md). On Wayland, libdecor's GTK plugin drew SDL's title bar with GTK3 from SDL's thread while the file window ran gtk_main on its own; closing that window crashed in GTK's style code. GTK builds now offer libdecor only the cairo plugin unless LIBDECOR_PLUGIN_DIR is set. Settings > General gets an Account card with the signed-in user and Sign out. Co-Authored-By: Claude Opus 5.5 <[email protected]> * README: keep the language section, without the fork notes Co-Authored-By: Claude Opus 5.5 <[email protected]> * viewer: English server errors in the English UI; stable type_ipc tests UU servers answer in Chinese only. The English UI now translates the known messages (2002 target already controlled, assistance refusals) and shows the code for unknown ones instead of Chinese text. type_ipc tests shared one temp directory per process and read XDG_RUNTIME_DIR while another test pointed it at a planted directory; each call now gets its own directory and socket tests hold the environment lock. Co-Authored-By: Claude Opus 5.5 <[email protected]> * viewer launcher: switching the language restarts the launcher The choice was saved but took effect only on the next start, so the window seemed to ignore it. The launcher now re-executes itself in place; session windows are separate processes and stay connected. Co-Authored-By: Claude Opus 5.5 <[email protected]> * viewer: show pictures as soon as decoded; coalesce mouse motion The raw-stream parser closed an access unit only when the next began, and frames were collected only when another one arrived, so a single remote change (a typed letter) waited for the next one. An access unit delimiter now follows each unit and the loop drains finished frames between units. Motions within one 8 ms poll collapse to the newest position (click order kept), so a drag no longer queues behind itself on a relayed path. Co-Authored-By: Claude Opus 5.5 <[email protected]> * viewer launcher: hosting is opt-in Signing in to the viewer no longer installs or enables uuremote-native.service. Only the Settings switch enables or disables it, and the unit's enabled state is the saved choice, so turning it off survives a restart. A new sign-in restarts the host only when the user turned it on and it is running. PATCHES.md: the RTT keepalive also runs on the host; checked with the official Android client controlling a Linux host. Co-Authored-By: Claude Opus 5.5 <[email protected]> * viewer: drop SDL event types sdl2 0.37 does not define sdl2 0.37 transmutes every event type into SDL_EventType. sdl2-compat on SDL3 delivers types SDL 2 does not define (0x207), which is undefined behaviour and aborts with debug checks (clipboard_requests_use_existing_window on Fedora 44). Poll raw events and skip those types before the crate converts them. Co-Authored-By: Claude Opus 5.5 <[email protected]> * Keep the package version at 0.2.39 The maintainer sets the version at release time. Co-Authored-By: Claude Opus 5.5 <[email protected]> --------- Co-authored-by: Claude Opus 5.5 <[email protected]>
This commit is contained in:
1 parent
47c7728822
commit
0cbfc5b4f1
37 files changed
+1644
-380
No files matched your search
@@ -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`.
|
||||
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.
|
||||
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
|
||||
|
||||
@@ -168,6 +171,8 @@ for a new QR login.
|
||||
| `src/assist.rs`, `c_engine/assist_window.c` | remote assistance (guest + account) and the unified GTK main window (assist + account/QR card) |
|
||||
| `src/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) |
|
||||
| `src/viewer/hud.rs` | in-window chrome drawn on the SDL canvas: loading screen, control center (Ctrl+Alt+M; capture settings RPC 2 and SimpleActions 14/16/18/19 as the official viewer sends them), network-status panel (Ctrl+Alt+G); fontconfig font via ab_glyph |
|
||||
| `src/viewer/thumbs.rs`, `src/viewer/host.rs` | launcher device previews (last picture, local 0600 cache); viewer sign-in keeps the local host user service running so the machine joins the account's device list |
|
||||
|
||||
Diagnostic subcommands: `doctor` (paste-safe report: session, selected backend, engine plugins, uinput, encoder and codec with source, sign-in/service state; booleans and names only), `set-encoder auto|cpu|vaapi|nvenc` and `set-codec auto|h264|h265` (both notify a running host with SIGUSR2; live encoder switch, negotiated codec unchanged, codec preference on the next desktop stream; illegal values exit 2), `login [--no-gui]`, `unlock-check` (password on stdin, prints only accepted/rejected),
|
||||
`desktop-probe [new.png]`, `desktop-video-probe` (`UU_PROBE_FPS`, `UU_PROBE_FRAMES`, `UU_PROBE_QUALITY` 1-5 = viewer bitrate preset, 5 auto; `UU_PROBE_CHROMA=444` 真彩; `UU_PROBE_INPUT` fixed video/image sequence, `UU_PROBE_LOOP=1` repeats), `wayland-input-probe`, `clipboard-acceptance`,
|
||||
|
||||
Generated
+32
@@ -2,6 +2,22 @@
|
||||
# It is not intended for manual editing.
|
||||
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]]
|
||||
name = "adler2"
|
||||
version = "2.0.1"
|
||||
@@ -1440,6 +1456,15 @@ version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
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]]
|
||||
name = "p256"
|
||||
version = "0.13.2"
|
||||
@@ -2629,6 +2654,12 @@ version = "0.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
|
||||
|
||||
[[package]]
|
||||
name = "ttf-parser"
|
||||
version = "0.25.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
|
||||
|
||||
[[package]]
|
||||
name = "tungstenite"
|
||||
version = "0.23.0"
|
||||
@@ -2743,6 +2774,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
||||
name = "uu-remote-linux"
|
||||
version = "0.2.39"
|
||||
dependencies = [
|
||||
"ab_glyph",
|
||||
"async-trait",
|
||||
"base64 0.22.1",
|
||||
"bytes",
|
||||
|
||||
+2
-1
@@ -23,7 +23,7 @@ required-features = ["native-viewer"]
|
||||
default = []
|
||||
native-viewer = []
|
||||
viewer-ffmpeg = ["native-viewer", "dep:ffmpeg-next"]
|
||||
viewer-sdl = ["native-viewer", "dep:sdl2"]
|
||||
viewer-sdl = ["native-viewer", "dep:sdl2", "dep:ab_glyph"]
|
||||
wayland = []
|
||||
# Experimental direct linear framebuffer capture; never enabled in release builds.
|
||||
kms = []
|
||||
@@ -59,6 +59,7 @@ ffmpeg-next = { version = "6.1", optional = true, default-features = false, feat
|
||||
x11rb = { version = "0.13", features = ["damage", "shm", "allow-unsafe-code"], optional = true }
|
||||
|
||||
sdl2 = { version = "0.37", optional = true, features = ["use-pkgconfig"] }
|
||||
ab_glyph = { version = "0.2", optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
# Synthetic loopback WSS certificates only; both crates already occur in Cargo.lock.
|
||||
|
||||
+19
-1
@@ -21,7 +21,23 @@
|
||||
<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"><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>
|
||||
|
||||
## 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, remove account/device details and NetEase logos, save it as docs/images/remote-desktop.png
|
||||
@@ -602,6 +618,8 @@ GNOME-to-official-Mac bidirectional clipboard synchronization is still unverifie
|
||||
- Desktop offers H.264 / H.265; the host chooses the codec. `UU_VIEWER_CODEC=h264` limits both SDP and decoder capabilities to H.264.
|
||||
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.
|
||||
- Frames are decoded at the host's native resolution and scaled to the window with linear filtering; a host resolution
|
||||
change restarts the decoder. `UU_VIEWER_SIZE=WxH` forces a fixed letterboxed canvas instead.
|
||||
|
||||
Mac targets use native macOS keycodes; Windows / Linux targets retain Windows VK. Keys follow physical positions, without
|
||||
automatically translating Ctrl to Command; on a Mac target the PC Super / Windows key acts as Command. Only verified target
|
||||
|
||||
@@ -19,6 +19,21 @@
|
||||
<p align="center"><img src="docs/images/main-window.png" width="620" alt="Linux 主机主窗口:远程协助与账号"></p>
|
||||
<p align="center"><sub>Linux 被控端主窗口:远程协助与账号(设备 ID、验证码和账号已打码)</sub></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 桌面的效果图。请自行截图并去掉账号、设备名等信息后放到
|
||||
docs/images/remote-desktop.png,再取消下面这行的注释。注意不要截入网易的图标和品牌素材。 -->
|
||||
<!-- <p align="center"><img src="docs/images/remote-desktop.png" width="720" alt="用官方 Mac 客户端远控 Linux 桌面"></p> -->
|
||||
@@ -527,6 +542,7 @@ GNOME 与官方 Mac 被控端的双向剪贴板尚未验证通过;此修改不
|
||||
- 桌面同时提供 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,
|
||||
以 CaptureSettingSync 回报为准。两种色度均由 FFmpeg 转为 RGB24 显示。
|
||||
- 按被控端原始分辨率解码,窗口缩放使用线性过滤;被控端分辨率变化时自动重启解码器。`UU_VIEWER_SIZE=WxH` 可改为固定的留黑边画布。
|
||||
|
||||
Mac 目标使用 macOS 原生键码,Windows / Linux 目标保留 Windows VK。键盘按物理键位置转发,不自动把 Ctrl 改成 Command;
|
||||
控制 Mac 时,PC 键盘的 Super / Win 键对应 Command。仅接受已验证的目标平台值 1(Windows / 本项目 Linux 主机)和 4(Mac),
|
||||
|
||||
+71
-55
@@ -8,6 +8,8 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <dlfcn.h>
|
||||
#include "i18n.h"
|
||||
static void on_language(GtkComboBox *c, gpointer note);
|
||||
|
||||
static const char *CSS =
|
||||
"window { background-color: #f5f6f8; }\n"
|
||||
@@ -96,9 +98,9 @@ static void on_custom_changed(GtkEditable *e, gpointer ok) {
|
||||
|
||||
// Returns 1 when a new custom code was entered and posted.
|
||||
static int ask_custom_code(void) {
|
||||
GtkWidget *d = gtk_dialog_new_with_buttons("设置自定义验证码", GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||
"取消", GTK_RESPONSE_CANCEL, NULL);
|
||||
GtkWidget *ok = gtk_dialog_add_button(GTK_DIALOG(d), "确定", GTK_RESPONSE_OK);
|
||||
GtkWidget *d = gtk_dialog_new_with_buttons(L("设置自定义验证码", "Set custom code"), GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||
L("取消", "Cancel"), GTK_RESPONSE_CANCEL, NULL);
|
||||
GtkWidget *ok = gtk_dialog_add_button(GTK_DIALOG(d), L("确定", "OK"), GTK_RESPONSE_OK);
|
||||
gtk_widget_set_sensitive(ok, FALSE);
|
||||
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(d));
|
||||
gtk_container_set_border_width(GTK_CONTAINER(area), 16);
|
||||
@@ -106,10 +108,10 @@ static int ask_custom_code(void) {
|
||||
GtkWidget *entry = gtk_entry_new();
|
||||
gtk_entry_set_max_length(GTK_ENTRY(entry), 16);
|
||||
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);
|
||||
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);
|
||||
int done = 0;
|
||||
if (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK) {
|
||||
@@ -140,12 +142,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 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) {
|
||||
if (!code_label) return;
|
||||
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) {
|
||||
@@ -159,19 +161,19 @@ static void on_copy_id(GtkButton *b, gpointer d) {
|
||||
char digits[64]; size_t n = 0;
|
||||
for (const char *p = current_id; *p && n + 1 < sizeof digits; p++) if (*p != ' ') digits[n++] = *p;
|
||||
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_share(GtkButton *b, gpointer d) {
|
||||
(void)b; (void)d;
|
||||
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);
|
||||
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) {
|
||||
@@ -213,10 +215,10 @@ static gboolean draw_avatar(GtkWidget *w, cairo_t *cr, gpointer d) {
|
||||
static void on_logout(GtkButton *b, gpointer d) {
|
||||
(void)b; (void)d;
|
||||
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) {
|
||||
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);
|
||||
}
|
||||
@@ -226,7 +228,7 @@ static GtkWidget *build_account_card(void) {
|
||||
gtk_style_context_add_class(gtk_widget_get_style_context(card), "card");
|
||||
GtkWidget *header = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
|
||||
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), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
|
||||
account_stack = gtk_stack_new();
|
||||
@@ -243,21 +245,21 @@ static GtkWidget *build_account_card(void) {
|
||||
GtkWidget *spinner = gtk_spinner_new();
|
||||
gtk_spinner_start(GTK_SPINNER(spinner));
|
||||
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");
|
||||
qr_image = gtk_image_new();
|
||||
gtk_stack_add_named(GTK_STACK(qr_stack), qr_image, "qr");
|
||||
gtk_box_pack_start(GTK_BOX(qr_page), qr_stack, FALSE, FALSE, 0);
|
||||
GtkWidget *qr_text = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
||||
gtk_widget_set_valign(qr_text, GTK_ALIGN_CENTER);
|
||||
gtk_box_pack_start(GTK_BOX(qr_text), label("扫码登录", "heading"), FALSE, FALSE, 0);
|
||||
GtkWidget *cap = label("请使用网易 UU 远程 App 扫一扫登录。\n登录后本机会出现在你的设备列表中,可直接远程控制;\n远程协助在登录前后都可以使用。", "hint");
|
||||
gtk_box_pack_start(GTK_BOX(qr_text), label(L("扫码登录", "Scan to sign in"), "heading"), FALSE, FALSE, 0);
|
||||
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_box_pack_start(GTK_BOX(qr_text), cap, FALSE, FALSE, 0);
|
||||
login_status = label("", "status");
|
||||
gtk_label_set_line_wrap(GTK_LABEL(login_status), TRUE);
|
||||
gtk_box_pack_start(GTK_BOX(qr_text), login_status, FALSE, FALSE, 0);
|
||||
qr_refresh = gtk_button_new_with_label("刷新二维码");
|
||||
qr_refresh = gtk_button_new_with_label(L("刷新二维码", "Refresh QR code"));
|
||||
gtk_widget_set_halign(qr_refresh, GTK_ALIGN_START);
|
||||
gtk_widget_set_no_show_all(qr_refresh, TRUE);
|
||||
g_signal_connect(qr_refresh, "clicked", G_CALLBACK(on_qr_refresh), NULL);
|
||||
@@ -277,9 +279,9 @@ static GtkWidget *build_account_card(void) {
|
||||
gtk_widget_set_valign(user_text, GTK_ALIGN_CENTER);
|
||||
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), 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);
|
||||
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_widget_set_valign(logout, GTK_ALIGN_CENTER);
|
||||
g_signal_connect(logout, "clicked", G_CALLBACK(on_logout), NULL);
|
||||
@@ -299,8 +301,8 @@ static void on_tray_allow(GtkCheckMenuItem *i, gpointer d) {
|
||||
static void on_tray_quit(GtkMenuItem *i, gpointer d) {
|
||||
(void)i; (void)d;
|
||||
GtkWidget *dlg = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL,
|
||||
"退出后本机将下线:设备列表和远程协助都无法连接,直到再次启动。确定退出吗?");
|
||||
gtk_window_set_title(GTK_WINDOW(dlg), "UU 远程 Linux 主机");
|
||||
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), L("UU 远程 Linux 主机", "UU Remote Linux host"));
|
||||
if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK) post(CMD_QUIT);
|
||||
gtk_widget_destroy(dlg);
|
||||
}
|
||||
@@ -337,11 +339,11 @@ static gchar *write_tray_icon(void) {
|
||||
}
|
||||
static void build_tray(void) {
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
gtk_menu_shell_append(GTK_MENU_SHELL(tray_menu), open);
|
||||
gtk_menu_shell_append(GTK_MENU_SHELL(tray_menu), tray_allow);
|
||||
@@ -367,7 +369,7 @@ static void build_tray(void) {
|
||||
// Without a theme path the panel cannot find the cached icon; keep the installed one.
|
||||
void *ind = ind_new("uu-remote-linux", set_theme_path ? icon : fallback, 0 /* APPLICATION_STATUS */);
|
||||
if (icon_path && set_theme_path) set_theme_path(ind, icon_path);
|
||||
if (set_title) set_title(ind, "UU 远程 Linux 主机");
|
||||
if (set_title) set_title(ind, L("UU 远程 Linux 主机", "UU Remote Linux host"));
|
||||
set_menu(ind, GTK_MENU(tray_menu));
|
||||
set_status(ind, 1 /* ACTIVE */);
|
||||
return; // keep the library loaded for the indicator's lifetime
|
||||
@@ -377,8 +379,8 @@ static void build_tray(void) {
|
||||
// XEmbed system tray (Xfce, Cinnamon, MATE...).
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||
GtkStatusIcon *status = gtk_status_icon_new_from_icon_name(icon);
|
||||
gtk_status_icon_set_tooltip_text(status, "UU 远程 Linux 主机");
|
||||
gtk_status_icon_set_title(status, "UU 远程 Linux 主机");
|
||||
gtk_status_icon_set_tooltip_text(status, L("UU 远程 Linux 主机", "UU Remote Linux host"));
|
||||
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, "popup-menu", G_CALLBACK(on_status_menu), NULL);
|
||||
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
@@ -393,7 +395,7 @@ static void build_window(void) {
|
||||
|
||||
gtk_window_set_default_icon_name("uu-remote-linux"); // contrib/desktop icon, when installed
|
||||
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_resizable(GTK_WINDOW(window), FALSE);
|
||||
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
|
||||
@@ -417,12 +419,12 @@ static void build_window(void) {
|
||||
// Header: 本设备 ... 允许他人远程协助 [switch]
|
||||
GtkWidget *header = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
|
||||
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();
|
||||
gtk_widget_set_valign(allow_switch, GTK_ALIGN_CENTER);
|
||||
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), 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), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
|
||||
|
||||
@@ -431,12 +433,12 @@ static void build_window(void) {
|
||||
gtk_container_set_border_width(GTK_CONTAINER(body), 20);
|
||||
gtk_grid_set_column_spacing(GTK_GRID(body), 48);
|
||||
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);
|
||||
id_label = label("获取中…", "big");
|
||||
id_label = label(L("获取中…", "Loading…"), "big");
|
||||
gtk_label_set_selectable(GTK_LABEL(id_label), TRUE);
|
||||
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_widget_set_valign(copy_id, GTK_ALIGN_CENTER);
|
||||
g_signal_connect(copy_id, "clicked", G_CALLBACK(on_copy_id), NULL);
|
||||
@@ -444,11 +446,11 @@ static void build_window(void) {
|
||||
gtk_grid_attach(GTK_GRID(body), id_row, 0, 1, 1, 1);
|
||||
|
||||
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();
|
||||
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(verify_combo), "仅使用临时验证码");
|
||||
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(verify_combo), "仅使用自定义验证码");
|
||||
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), L("仅使用自定义验证码", "Custom code only"));
|
||||
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);
|
||||
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);
|
||||
@@ -456,17 +458,17 @@ static void build_window(void) {
|
||||
GtkWidget *code_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
|
||||
code_label = label("--------", "big");
|
||||
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");
|
||||
g_signal_connect(eye_button, "clicked", G_CALLBACK(on_eye), NULL);
|
||||
// Gear menu: 立即刷新 / 自动刷新 ▸ (每次远控结束, 每小时, 每 12 小时, 每 24 小时, 关闭) / 设置自定义验证码
|
||||
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);
|
||||
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();
|
||||
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;
|
||||
for (int i = 0; i < 5; i++) {
|
||||
refresh_items[i] = gtk_radio_menu_item_new_with_label(group, names[i]);
|
||||
@@ -476,15 +478,15 @@ static void build_window(void) {
|
||||
}
|
||||
gtk_menu_item_set_submenu(GTK_MENU_ITEM(auto_item), sub);
|
||||
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);
|
||||
gtk_menu_shell_append(GTK_MENU_SHELL(menu), custom_item);
|
||||
gtk_widget_show_all(menu);
|
||||
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_widget_set_tooltip_text(gear, "刷新设置");
|
||||
gtk_widget_set_tooltip_text(gear, L("刷新设置", "Refresh settings"));
|
||||
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_widget_set_valign(copy_code, GTK_ALIGN_CENTER);
|
||||
g_signal_connect(copy_code, "clicked", G_CALLBACK(on_copy_code), NULL);
|
||||
@@ -494,10 +496,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), gear, FALSE, FALSE, 0);
|
||||
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);
|
||||
|
||||
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_widget_set_valign(share_button, GTK_ALIGN_CENTER);
|
||||
g_signal_connect(share_button, "clicked", G_CALLBACK(on_share), NULL);
|
||||
@@ -509,9 +511,18 @@ static void build_window(void) {
|
||||
account_card = build_account_card();
|
||||
gtk_widget_set_margin_top(account_card, 6);
|
||||
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);
|
||||
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);
|
||||
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();
|
||||
if (close_hides) build_tray();
|
||||
gtk_widget_show_all(gtk_bin_get_child(GTK_BIN(window)));
|
||||
@@ -525,6 +536,11 @@ static void build_window(void) {
|
||||
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) {
|
||||
(void)arg;
|
||||
int ok = gtk_init_check(NULL, NULL);
|
||||
@@ -582,7 +598,7 @@ static gboolean apply_state(gpointer data) {
|
||||
if (window) {
|
||||
g_strlcpy(current_id, s->id, sizeof current_id);
|
||||
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();
|
||||
suppress_switch = 1;
|
||||
gtk_switch_set_active(GTK_SWITCH(allow_switch), s->allowed);
|
||||
@@ -593,12 +609,12 @@ static gboolean apply_state(gpointer data) {
|
||||
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;
|
||||
}
|
||||
gtk_label_set_text(GTK_LABEL(note_label), s->verify == VERIFY_CUSTOM ? "自定义验证码不会自动刷新"
|
||||
: s->verify == VERIFY_BOTH ? "也可使用自定义验证码连接" : REFRESH_NOTES[s->refresh >= 0 && s->refresh < 5 ? s->refresh : 0]);
|
||||
gtk_label_set_text(GTK_LABEL(note_label), s->verify == VERIFY_CUSTOM ? L("自定义验证码不会自动刷新", "Custom code is never refreshed automatically")
|
||||
: 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_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);
|
||||
return G_SOURCE_REMOVE;
|
||||
@@ -725,7 +741,7 @@ static int notify_desktop(const char *summary, const char *body) {
|
||||
g_variant_builder_add(&hints, "{sv}", "urgency", g_variant_new_byte(2)); // critical: stays until dismissed
|
||||
GVariant *reply = g_dbus_connection_call_sync(bus, "org.freedesktop.Notifications", "/org/freedesktop/Notifications",
|
||||
"org.freedesktop.Notifications", "Notify",
|
||||
g_variant_new("(susssasa{sv}i)", "UU 远程 Linux 主机", 0u, "uu-remote-linux", summary, body, &actions, &hints, -1),
|
||||
g_variant_new("(susssasa{sv}i)", L("UU 远程 Linux 主机", "UU Remote Linux host"), 0u, "uu-remote-linux", summary, body, &actions, &hints, -1),
|
||||
G_VARIANT_TYPE("(u)"), G_DBUS_CALL_FLAGS_NONE, 3000, NULL, NULL);
|
||||
g_object_unref(bus);
|
||||
if (!reply) return -1;
|
||||
|
||||
@@ -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
|
||||
+50
-49
@@ -9,6 +9,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
#include "i18n.h"
|
||||
|
||||
#define QSIZE 64
|
||||
static char queue[QSIZE][4096];
|
||||
@@ -97,9 +98,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) {
|
||||
if (!secs) { snprintf(out, len, "--"); return; }
|
||||
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 ---------------- */
|
||||
enum { C_NAME, C_TIME, C_TYPE, C_SIZE, C_PATH, C_KIND, C_N };
|
||||
@@ -111,7 +112,7 @@ static char local_dir[2048] = "", remote_dir[2048] = ":/";
|
||||
static void load_local(const char *path) {
|
||||
char *dir = g_strdup(path); /* path may alias local_dir */
|
||||
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);
|
||||
gtk_entry_set_text(GTK_ENTRY(local_path), local_dir);
|
||||
gtk_list_store_clear(local_store);
|
||||
@@ -150,7 +151,7 @@ static void on_row_activated(GtkTreeView *view, GtkTreePath *path, GtkTreeViewCo
|
||||
g_free(full);
|
||||
}
|
||||
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);
|
||||
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);
|
||||
@@ -158,21 +159,21 @@ static char *ask_name(const char *title) {
|
||||
char *name = NULL;
|
||||
if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_OK) {
|
||||
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);
|
||||
return name;
|
||||
}
|
||||
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);
|
||||
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);
|
||||
}
|
||||
static void on_remote_mkdir(GtkButton *b, gpointer d) {
|
||||
(void)b; (void)d;
|
||||
if (!strcmp(remote_dir, ":/")) { show_toast("请先进入一个文件夹"); return; }
|
||||
char *name = ask_name("新建文件夹"); if (!name) return;
|
||||
if (!strcmp(remote_dir, ":/")) { show_toast(L("请先进入一个文件夹", "Open a folder first")); return; }
|
||||
char *name = ask_name(L("新建文件夹", "New folder")); if (!name) return;
|
||||
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);
|
||||
}
|
||||
@@ -181,8 +182,8 @@ static void on_remote_mkdir(GtkButton *b, gpointer d) {
|
||||
static void on_send(GtkButton *b, gpointer upload) {
|
||||
(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);
|
||||
if (!rows) { show_toast("请先选择要发送的文件"); return; }
|
||||
if (upload && !strcmp(remote_dir, ":/")) { show_toast("请先在远端进入目标文件夹"); g_list_free_full(rows, (GDestroyNotify)gtk_tree_path_free); return; }
|
||||
if (!rows) { show_toast(L("请先选择要发送的文件", "Select the files to send first")); 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;
|
||||
for (GList *r = rows; r; r = r->next) {
|
||||
GtkTreeIter it; char *full, *name; int kind;
|
||||
@@ -199,7 +200,7 @@ static void on_send(GtkButton *b, gpointer upload) {
|
||||
g_free(full); g_free(name);
|
||||
}
|
||||
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_clear_done(GtkButton *b, gpointer d) {
|
||||
@@ -209,13 +210,13 @@ static void on_clear_done(GtkButton *b, gpointer d) {
|
||||
}
|
||||
static GtkWidget *pane(int remote) {
|
||||
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();
|
||||
gtk_widget_set_tooltip_text(up, "上一级"); gtk_widget_set_tooltip_text(refresh, "刷新");
|
||||
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, 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), 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);
|
||||
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);
|
||||
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);
|
||||
@@ -229,13 +230,13 @@ static GtkWidget *pane(int remote) {
|
||||
return card;
|
||||
}
|
||||
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);
|
||||
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);
|
||||
char host[256]; if (gethostname(host, sizeof host) != 0) snprintf(host, sizeof host, "本机"); host[sizeof host - 1] = 0;
|
||||
GtkWidget *tag_l = label("本机", "tag"), *tag_r = label("远端", "tag"); add_class(tag_r, "remote");
|
||||
GtkWidget *send_r = button("发送 →", NULL), *send_l = button("← 发送", NULL);
|
||||
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(L("本机", "This device"), "tag"), *tag_r = label(L("远端", "Remote"), "tag"); add_class(tag_r, "remote");
|
||||
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_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);
|
||||
@@ -247,25 +248,25 @@ static void build_files(void) {
|
||||
gtk_grid_set_row_spacing(GTK_GRID(head), 14);
|
||||
gtk_box_pack_start(GTK_BOX(content), head, TRUE, TRUE, 0);
|
||||
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);
|
||||
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);
|
||||
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));
|
||||
add_column(tview, "名称", T_NAME, 1); add_column(tview, "状态", T_STATUS, 0); add_column(tview, "大小", T_SIZE, 0);
|
||||
add_column(tview, "发送路径", T_FROM, 1); add_column(tview, "接收路径", T_TO, 1);
|
||||
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, 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(content), tasks, TRUE, TRUE, 0);
|
||||
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; };
|
||||
static gboolean remote_idle(gpointer d) {
|
||||
struct listing *l = d;
|
||||
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);
|
||||
char **lines = g_strsplit(l->rows, "\n", -1);
|
||||
for (char **line = lines; *line; line++) {
|
||||
@@ -312,10 +313,10 @@ static GtkListStore *rule_store;
|
||||
static GtkWidget *rule_stack;
|
||||
static void on_add_rule(GtkButton *b, gpointer 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);
|
||||
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];
|
||||
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);
|
||||
@@ -328,7 +329,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]));
|
||||
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;
|
||||
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);
|
||||
break;
|
||||
}
|
||||
@@ -336,27 +337,27 @@ static void on_add_rule(GtkButton *b, gpointer d) {
|
||||
}
|
||||
static void on_remove_rule(GtkButton *b, gpointer view) {
|
||||
(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);
|
||||
}
|
||||
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);
|
||||
GtkWidget *head = hbox(12), *add = button("添加规则", "primary"), *del = button("删除", NULL);
|
||||
GtkWidget *dot = label("● 已连接", "online");
|
||||
GtkWidget *head = hbox(12), *add = button(L("添加规则", "Add rule"), "primary"), *del = button(L("删除", "Remove"), NULL);
|
||||
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_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);
|
||||
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));
|
||||
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();
|
||||
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), scrolled(view, 360), "list");
|
||||
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), 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(del, "clicked", G_CALLBACK(on_remove_rule), view);
|
||||
}
|
||||
@@ -394,36 +395,36 @@ static void on_open_session(GtkTreeView *v, GtkTreePath *path, GtkTreeViewColumn
|
||||
}
|
||||
static void on_kill_session(GtkButton *b, gpointer d) {
|
||||
(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,
|
||||
GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "确定结束会话 %u?", id);
|
||||
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dlg), "会话内正在运行的程序将被终止。");
|
||||
gtk_dialog_add_buttons(GTK_DIALOG(dlg), "取消", GTK_RESPONSE_CANCEL, "结束会话", GTK_RESPONSE_OK, NULL);
|
||||
GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, L("确定结束会话 %u?", "End session %u?"), id);
|
||||
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), L("取消", "Cancel"), GTK_RESPONSE_CANCEL, L("结束会话", "End session"), GTK_RESPONSE_OK, NULL);
|
||||
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); }
|
||||
gtk_widget_destroy(dlg);
|
||||
}
|
||||
static void build_terminal(void) {
|
||||
GtkWidget *content; frame("终端远控", &content); gtk_window_set_default_size(GTK_WINDOW(window), 820, 560);
|
||||
GtkWidget *head = hbox(12); session_dot = label("● 正在读取会话", "online");
|
||||
session_create = button("创建会话", "primary"); session_kill = button("结束会话", NULL);
|
||||
GtkWidget *content; frame(L("终端远控", "Remote terminal"), &content); gtk_window_set_default_size(GTK_WINDOW(window), 820, 560);
|
||||
GtkWidget *head = hbox(12); session_dot = label(L("● 正在读取会话", "● Loading sessions"), "online");
|
||||
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), 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_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_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, "创建时间", S_TIME, 0); add_column(session_view, "状态", S_STATE, 0);
|
||||
add_column(session_view, L("会话 ID", "Session ID"), S_ID, 0); add_column(session_view, "Shell", S_SHELL, 1);
|
||||
add_column(session_view, L("创建时间", "Created"), S_TIME, 0); add_column(session_view, L("状态", "Status"), S_STATE, 0);
|
||||
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), label("正在读取会话…", "empty"), "loading");
|
||||
gtk_stack_add_named(GTK_STACK(session_stack), label("连接已断开,请关闭窗口后重试", "empty"), "offline");
|
||||
gtk_stack_add_named(GTK_STACK(session_stack), label(L("正在读取会话…", "Loading sessions…"), "empty"), "loading");
|
||||
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_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), 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);
|
||||
g_signal_connect(session_create, "clicked", G_CALLBACK(on_create_session), NULL);
|
||||
g_signal_connect(session_kill, "clicked", G_CALLBACK(on_kill_session), NULL);
|
||||
@@ -449,7 +450,7 @@ static gboolean sessions_idle(gpointer d) {
|
||||
g_strfreev(f);
|
||||
}
|
||||
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_view, s->connected);
|
||||
gtk_stack_set_visible_child_name(GTK_STACK(session_stack), s->connected ? (n ? "list" : "empty") : "offline");
|
||||
|
||||
+196
-120
@@ -9,6 +9,8 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <sys/stat.h>
|
||||
#include "i18n.h"
|
||||
|
||||
static const char *CSS =
|
||||
"window { background-color: #ffffff; }\n"
|
||||
@@ -49,7 +51,7 @@ static const char *CSS =
|
||||
".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 int device_count;
|
||||
static char queue[16][200];
|
||||
@@ -93,7 +95,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 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) {
|
||||
if (selected < 0) return;
|
||||
@@ -102,7 +104,7 @@ static void connect_kind(const char *kind) {
|
||||
snprintf(cmd, sizeof cmd, "connect\t%s\t%s", devices[selected].id, kind);
|
||||
pthread_mutex_unlock(&d_lock);
|
||||
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 more_item(GtkButton *b, gpointer kind) {
|
||||
@@ -110,32 +112,32 @@ static void more_item(GtkButton *b, gpointer kind) {
|
||||
const char *k = kind;
|
||||
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,
|
||||
!strcmp(k, "reboot") ? "确定要重启被控电脑吗?" : "确定要关闭被控电脑吗?");
|
||||
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), "远程会话会断开。");
|
||||
gtk_dialog_add_buttons(GTK_DIALOG(d), "取消", GTK_RESPONSE_CANCEL, "确认", GTK_RESPONSE_OK, NULL);
|
||||
!strcmp(k, "reboot") ? L("确定要重启被控电脑吗?", "Restart the remote computer?") : L("确定要关闭被控电脑吗?", "Shut down the remote computer?"));
|
||||
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), L("远程会话会断开。", "The remote session will be disconnected."));
|
||||
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);
|
||||
if (ok) { connect_kind(k); show_toast("正在发送电源指令…"); }
|
||||
if (ok) { connect_kind(k); show_toast(L("正在发送电源指令…", "Sending power command…")); }
|
||||
return;
|
||||
}
|
||||
if (!strcmp(k, "unbind")) {
|
||||
GtkWidget *d = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
|
||||
"确定要从账号中删除该设备吗?");
|
||||
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), "删除后需要在该设备上重新登录才能再次远控。");
|
||||
gtk_dialog_add_buttons(GTK_DIALOG(d), "取消", GTK_RESPONSE_CANCEL, "删除", GTK_RESPONSE_OK, NULL);
|
||||
L("确定要从账号中删除该设备吗?", "Remove this device from your account?"));
|
||||
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), 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);
|
||||
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;
|
||||
}
|
||||
gtk_widget_destroy(dialog);
|
||||
on_tool(NULL, kind);
|
||||
}
|
||||
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);
|
||||
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)), *box = vbox(10);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(box), 22);
|
||||
gtk_box_pack_start(GTK_BOX(box), label("更多工具", "h2"), FALSE, FALSE, 6);
|
||||
const char *names[] = {"🗂 文件传输", "▶ 观看模式", "⌨ 终端", "⇄ 端口映射", "⏻ 远程开机", "↻ 重启", "⏻ 关机", "🗑 删除设备"};
|
||||
gtk_box_pack_start(GTK_BOX(box), label(L("更多工具", "More tools"), "h2"), FALSE, FALSE, 6);
|
||||
const char *names[] = {L("🗂 文件传输", "🗂 File transfer"), L("▶ 观看模式", "▶ Watch mode"), L("⌨ 终端", "⌨ Terminal"), L("⇄ 端口映射", "⇄ Port mapping"), L("⏻ 远程开机", "⏻ Wake on LAN"), L("↻ 重启", "↻ Restart"), L("⏻ 关机", "⏻ Shut down"), L("🗑 删除设备", "🗑 Remove device")};
|
||||
const char *kinds[] = {"file", "watch", "terminal", "portmap", "wol", "reboot", "shutdown", "unbind"};
|
||||
for (int i = 0; i < 8; i++) {
|
||||
GtkWidget *b = gtk_button_new(), *line = hbox(10); add_class(b, "cardbtn");
|
||||
@@ -146,8 +148,8 @@ static void open_more(void) {
|
||||
else g_signal_connect(b, "clicked", G_CALLBACK(more_item), (gpointer)kinds[i]);
|
||||
gtk_box_pack_start(GTK_BOX(box), b, FALSE, FALSE, 0);
|
||||
}
|
||||
GtkWidget *foot = hbox(10), *order = button("调整顺序", "secondary"), *close = button("关闭", "secondary");
|
||||
g_signal_connect(order, "clicked", G_CALLBACK(unsupported), "调整顺序");
|
||||
GtkWidget *foot = hbox(10), *order = button(L("调整顺序", "Reorder"), "secondary"), *close = button(L("关闭", "Close"), "secondary");
|
||||
g_signal_connect(order, "clicked", G_CALLBACK(unsupported), L("调整顺序", "Reorder"));
|
||||
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(box), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 8);
|
||||
@@ -159,10 +161,10 @@ static void on_tool(GtkButton *b, gpointer kind) {
|
||||
(void)b;
|
||||
if (!strcmp(kind, "more")) open_more();
|
||||
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);
|
||||
}
|
||||
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) {
|
||||
gtk_label_set_text(GTK_LABEL(title_label), title);
|
||||
@@ -170,19 +172,52 @@ static void set_header(const char *title, int device_page) {
|
||||
}
|
||||
static void show_page(const char *name, const char *title) {
|
||||
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);
|
||||
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) {
|
||||
pthread_mutex_lock(&d_lock);
|
||||
if (index < 0 || index >= device_count) { pthread_mutex_unlock(&d_lock); return; }
|
||||
selected = index;
|
||||
char name[128]; snprintf(name, sizeof name, "%s", devices[index].name);
|
||||
int online = devices[index].online;
|
||||
char thumb[512]; snprintf(thumb, sizeof thumb, "%s", devices[index].thumb);
|
||||
pthread_mutex_unlock(&d_lock);
|
||||
load_thumb(thumb);
|
||||
set_header(name, 1);
|
||||
gtk_label_set_markup(GTK_LABEL(badge), online ? "<span foreground='#22c55e'>●</span> 在线" : "离线");
|
||||
gtk_label_set_markup(GTK_LABEL(badge), online ? L("<span foreground='#22c55e'>●</span> 在线", "<span foreground='#22c55e'>●</span> Online") : L("离线", "Offline"));
|
||||
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");
|
||||
gtk_stack_set_visible_child_name(GTK_STACK(stack), "device");
|
||||
@@ -194,9 +229,9 @@ static void on_row(GtkListBox *box, GtkListBoxRow *row, gpointer d) {
|
||||
gtk_list_box_unselect_all(GTK_LIST_BOX(box == GTK_LIST_BOX(device_list) ? assist_list : device_list));
|
||||
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 (!strcmp(kind, "all")) show_page("all", "全部设备");
|
||||
else if (!strcmp(kind, "assist")) show_page("assist", "远程协助");
|
||||
else if (!strcmp(kind, "favorite")) show_page("favorite", "收藏设备");
|
||||
if (!strcmp(kind, "all")) show_page("all", L("全部设备", "All devices"));
|
||||
else if (!strcmp(kind, "assist")) show_page("assist", L("远程协助", "Remote assistance"));
|
||||
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)); }
|
||||
|
||||
@@ -220,18 +255,18 @@ static void on_info(GtkButton *b, gpointer index) {
|
||||
int i = GPOINTER_TO_INT(index);
|
||||
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);
|
||||
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);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(box), 20);
|
||||
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);
|
||||
GtkWidget *rename = button("重命名", "secondary"); gtk_widget_set_halign(rename, GTK_ALIGN_END);
|
||||
g_signal_connect(rename, "clicked", G_CALLBACK(unsupported), "重命名");
|
||||
GtkWidget *rename = button(L("重命名", "Rename"), "secondary"); gtk_widget_set_halign(rename, GTK_ALIGN_END);
|
||||
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(box), c1, FALSE, FALSE, 0);
|
||||
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++) {
|
||||
GtkWidget *line = hbox(8);
|
||||
gtk_box_pack_start(GTK_BOX(line), label(rows[k], "devname"), TRUE, TRUE, 0);
|
||||
@@ -239,7 +274,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(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_widget_show_all(dialog); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog);
|
||||
}
|
||||
@@ -249,8 +284,9 @@ static gboolean apply_devices(gpointer d) {
|
||||
(void)d;
|
||||
clear(device_list); clear(all_box);
|
||||
pthread_mutex_lock(&d_lock);
|
||||
if (selected >= 0 && selected < device_count) load_thumb(devices[selected].thumb);
|
||||
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);
|
||||
for (int i = 0; i < device_count; i++) {
|
||||
GtkWidget *row = gtk_list_box_row_new(), *line = hbox(8);
|
||||
@@ -266,7 +302,7 @@ static gboolean apply_devices(gpointer d) {
|
||||
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), 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");
|
||||
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); }
|
||||
@@ -275,12 +311,20 @@ static gboolean apply_devices(gpointer d) {
|
||||
gtk_box_pack_start(GTK_BOX(all_box), card, FALSE, FALSE, 4);
|
||||
}
|
||||
pthread_mutex_unlock(&d_lock);
|
||||
gtk_list_box_insert(GTK_LIST_BOX(device_list), nav_row("◼", "全部设备", "all"), -1);
|
||||
gtk_list_box_insert(GTK_LIST_BOX(device_list), nav_row("◼", L("全部设备", "All devices"), "all"), -1);
|
||||
gtk_widget_show_all(device_list); gtk_widget_show_all(all_box);
|
||||
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) {
|
||||
(void)d;
|
||||
refresh_account();
|
||||
gtk_label_set_text(GTK_LABEL(status_label), status_text);
|
||||
if (qr_path[0]) {
|
||||
GdkPixbuf *pix = gdk_pixbuf_new_from_file_at_size(qr_path, 240, 240, NULL);
|
||||
@@ -288,9 +332,9 @@ static gboolean apply_login(gpointer d) {
|
||||
} else gtk_image_clear(GTK_IMAGE(qr_image));
|
||||
gtk_widget_set_visible(my_section, logged_in);
|
||||
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, "assist")) show_page("welcome", "全部设备");
|
||||
if (!logged_in && qr_path[0]) { gtk_stack_set_visible_child_name(GTK_STACK(stack), "login"); set_header("登录", 0); }
|
||||
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", L("全部设备", "All devices"));
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -299,28 +343,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 *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);
|
||||
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);
|
||||
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);
|
||||
gtk_box_pack_start(GTK_BOX(page), b, FALSE, FALSE, 0);
|
||||
return page;
|
||||
}
|
||||
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 *brand = label("UU 远程 Linux 控制端(非官方)", "h2"); gtk_widget_set_halign(brand, GTK_ALIGN_CENTER);
|
||||
GtkWidget *t = label("扫码登录", "group"); gtk_widget_set_halign(t, 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(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), t, FALSE, FALSE, 0);
|
||||
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);
|
||||
gtk_container_add(GTK_CONTAINER(box), qr_image);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
gtk_box_pack_start(GTK_BOX(page), again, FALSE, FALSE, 0);
|
||||
return page;
|
||||
@@ -328,14 +372,15 @@ static GtkWidget *build_login(void) {
|
||||
static GtkWidget *build_device(void) {
|
||||
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);
|
||||
preview_bg = bg; g_signal_connect_after(bg, "draw", G_CALLBACK(draw_preview), NULL);
|
||||
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);
|
||||
g_signal_connect(enter, "clicked", G_CALLBACK(on_tool), "desktop");
|
||||
gtk_overlay_add_overlay(GTK_OVERLAY(preview), enter);
|
||||
gtk_box_pack_start(GTK_BOX(page), preview, FALSE, FALSE, 0);
|
||||
GtkWidget *tools = hbox(0); add_class(tools, "toolbar");
|
||||
const char *names[] = {"🗂 文件传输", "▶ 观看模式", "⌨ 终端", "⇄ 端口映射", "▦"}, *kinds[] = {"file", "watch", "terminal", "portmap", "more"};
|
||||
const char *names[] = {L("🗂 文件传输", "🗂 File transfer"), L("▶ 观看模式", "▶ Watch mode"), L("⌨ 终端", "⌨ Terminal"), L("⇄ 端口映射", "⇄ Port mapping"), "▦"}, *kinds[] = {"file", "watch", "terminal", "portmap", "more"};
|
||||
for (int i = 0; i < 5; i++) {
|
||||
GtkWidget *b = button(names[i], "tool");
|
||||
g_signal_connect(b, "clicked", G_CALLBACK(on_tool), (gpointer)kinds[i]);
|
||||
@@ -343,11 +388,11 @@ static GtkWidget *build_device(void) {
|
||||
if (i < 4) gtk_box_pack_start(GTK_BOX(tools), gtk_separator_new(GTK_ORIENTATION_VERTICAL), FALSE, FALSE, 0);
|
||||
}
|
||||
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 *add = button("+", "round"); gtk_widget_set_halign(add, GTK_ALIGN_CENTER);
|
||||
g_signal_connect(add, "clicked", G_CALLBACK(unsupported), "快速启动");
|
||||
GtkWidget *al = label("添加", "hint"); gtk_widget_set_halign(al, GTK_ALIGN_CENTER);
|
||||
g_signal_connect(add, "clicked", G_CALLBACK(unsupported), L("快速启动", "Quick launch"));
|
||||
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(page), quick, FALSE, FALSE, 0);
|
||||
return page;
|
||||
@@ -357,8 +402,8 @@ static GtkWidget *build_all(void) {
|
||||
GtkWidget *page = vbox(8); gtk_container_set_border_width(GTK_CONTAINER(page), 26);
|
||||
banner = hbox(10); add_class(banner, "banner");
|
||||
GtkWidget *text = vbox(4);
|
||||
gtk_box_pack_start(GTK_BOX(text), label("ⓘ 添加你的其他设备", "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("ⓘ 添加你的其他设备", "ⓘ Add your other devices"), "group"), 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);
|
||||
GtkWidget *x = button("×", "hbtn"); gtk_widget_set_valign(x, GTK_ALIGN_START);
|
||||
g_signal_connect(x, "clicked", G_CALLBACK(close_banner), NULL);
|
||||
@@ -372,51 +417,51 @@ static GtkWidget *build_all(void) {
|
||||
static void on_assist_connect(GtkButton *b, gpointer entry) {
|
||||
(void)b;
|
||||
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");
|
||||
const char *code = gtk_entry_get_text(GTK_ENTRY(code_entry));
|
||||
if (!code[0]) { show_toast("请输入伙伴的设备验证码"); return; }
|
||||
if (strpbrk(id, "\t\r\n") || strpbrk(code, "\t\r\n")) { show_toast("设备 ID 和验证码不能包含换行或制表符"); 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(L("设备 ID 和验证码不能包含换行或制表符", "Device ID and code cannot contain line breaks or tabs")); return; }
|
||||
char cmd[200];
|
||||
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);
|
||||
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), "");
|
||||
show_toast("正在连接…");
|
||||
show_toast(L("正在连接…", "Connecting…"));
|
||||
}
|
||||
static GtkWidget *build_assist(void) {
|
||||
GtkWidget *page = vbox(20); gtk_container_set_border_width(GTK_CONTAINER(page), 26);
|
||||
GtkWidget *mine = vbox(14); add_class(mine, "card");
|
||||
GtkWidget *top = hbox(10); gtk_box_pack_start(GTK_BOX(top), label("本设备", "h2"), TRUE, TRUE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(top), label("允许他人远程协助", "devname"), FALSE, FALSE, 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(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);
|
||||
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);
|
||||
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(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("每次远控结束刷新", "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(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);
|
||||
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("通过其他设备的【设备 ID】及【设备验证码】启动远程控制", "hint"), 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(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), label("伙伴的设备 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 *code = gtk_entry_new(); gtk_entry_set_placeholder_text(GTK_ENTRY(code), "请输入设备验证码");
|
||||
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), 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), L("请输入设备验证码", "Enter verification code"));
|
||||
gtk_entry_set_visibility(GTK_ENTRY(code), FALSE);
|
||||
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);
|
||||
g_object_set_data(G_OBJECT(entry), "assist-code", code);
|
||||
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(peer), row, FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(page), peer, FALSE, FALSE, 0);
|
||||
@@ -424,10 +469,10 @@ static GtkWidget *build_assist(void) {
|
||||
}
|
||||
static void on_add_favorite(GtkButton *b, gpointer 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");
|
||||
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;
|
||||
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);
|
||||
@@ -440,17 +485,17 @@ static void on_add_favorite(GtkButton *b, gpointer d) {
|
||||
int response = gtk_dialog_run(GTK_DIALOG(dialog));
|
||||
int has_id = first && gtk_entry_get_text(GTK_ENTRY(first))[0];
|
||||
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) {
|
||||
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);
|
||||
gtk_box_pack_start(GTK_BOX(page), add, FALSE, FALSE, 0);
|
||||
fav_stack = gtk_stack_new();
|
||||
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 *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_stack_add_named(GTK_STACK(fav_stack), empty, "empty");
|
||||
gtk_box_pack_start(GTK_BOX(page), fav_stack, TRUE, TRUE, 0);
|
||||
@@ -478,7 +523,7 @@ static GtkWidget *settings_card(GtkWidget **rows, int n) {
|
||||
return card;
|
||||
}
|
||||
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_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).
|
||||
@@ -488,15 +533,31 @@ static void own_titlebar(GtkWidget *w, const char *title) {
|
||||
gtk_header_bar_set_show_close_button(GTK_HEADER_BAR(bar), TRUE);
|
||||
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) {
|
||||
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);
|
||||
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_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, "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();
|
||||
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);
|
||||
@@ -504,60 +565,74 @@ static void open_settings(void) {
|
||||
gtk_box_pack_start(GTK_BOX(root), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
|
||||
// 常规
|
||||
GtkWidget *general = settings_page();
|
||||
const char *wake[] = {"永不", "接通电源时", "始终"}, *close_opts[] = {"最小化", "退出程序"};
|
||||
GtkWidget *g1[] = { setting_row("开机自启动", NULL, gtk_switch_new()),
|
||||
setting_row("保持唤醒状态", "防止电脑进入睡眠状态,导致无法远程访问。", combo(wake, 3)),
|
||||
setting_row("关闭窗口时", NULL, combo(close_opts, 2)) };
|
||||
GtkWidget *acct = hbox(12), *acct_text = vbox(2);
|
||||
gtk_box_pack_start(GTK_BOX(acct_text), label(L("账号", "Account"), "devname"), FALSE, FALSE, 0);
|
||||
account_who = label("", "hint"); gtk_box_pack_start(GTK_BOX(acct_text), account_who, FALSE, FALSE, 0);
|
||||
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 *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);
|
||||
GtkWidget *path = hbox(8); GtkWidget *change = button("修改路径", "secondary"), *open = button("打开文件夹", "secondary");
|
||||
g_signal_connect(change, "clicked", G_CALLBACK(unsupported), "修改路径"); g_signal_connect(open, "clicked", G_CALLBACK(unsupported), "打开文件夹");
|
||||
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), 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);
|
||||
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);
|
||||
GtkWidget *real = button("在手机 App 中查看", "secondary"); gtk_widget_set_sensitive(real, FALSE);
|
||||
GtkWidget *g3[] = { setting_row("实名认证", NULL, real) };
|
||||
GtkWidget *real = button(L("在手机 App 中查看", "View in the mobile app"), "secondary"); gtk_widget_set_sensitive(real, FALSE);
|
||||
GtkWidget *g3[] = { setting_row(L("实名认证", "Identity verification"), NULL, real) };
|
||||
gtk_box_pack_start(GTK_BOX(general), settings_card(g3, 1), FALSE, FALSE, 0);
|
||||
gtk_stack_add_titled(GTK_STACK(tabs), general, "general", "⚙ 常规");
|
||||
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) };
|
||||
gtk_box_pack_start(GTK_BOX(general), settings_card(g4, 1), FALSE, FALSE, 0);
|
||||
gtk_stack_add_titled(GTK_STACK(tabs), general, "general", L("⚙ 常规", "⚙ General"));
|
||||
// 安全
|
||||
GtkWidget *security = settings_page();
|
||||
const char *verify[] = {"仅使用临时验证码", "仅使用自定义验证码", "临时与自定义验证码"};
|
||||
GtkWidget *s1[] = { setting_row("允许同账号控制本设备", NULL, gtk_switch_new()), setting_row("允许他人远程协助", NULL, gtk_switch_new()) };
|
||||
GtkWidget *s2[] = { setting_row("远程协助连接本设备的验证方式", NULL, combo(verify, 3)) };
|
||||
GtkWidget *s3[] = { setting_row("客户端锁定", "防止客户端设置被修改,保障数据与使用安全。", gtk_switch_new()) };
|
||||
const char *verify[] = {L("仅使用临时验证码", "Temporary code only"), L("仅使用自定义验证码", "Custom code only"), L("临时与自定义验证码", "Temporary and custom codes")};
|
||||
host_switch = gtk_switch_new(); gtk_switch_set_active(GTK_SWITCH(host_switch), atomic_load(&host_active));
|
||||
g_signal_connect(host_switch, "notify::active", G_CALLBACK(on_host), NULL);
|
||||
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(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), label("本机被控相关设置由 uuremote-server 主机端提供。", "hint"), FALSE, FALSE, 0);
|
||||
gtk_stack_add_titled(GTK_STACK(tabs), security, "security", "🔒 安全");
|
||||
gtk_stack_add_titled(GTK_STACK(tabs), security, "security", L("🔒 安全", "🔒 Security"));
|
||||
// 键盘
|
||||
GtkWidget *keys = settings_page();
|
||||
gtk_box_pack_start(GTK_BOX(keys), label("仅控制端响应的快捷键", "h2"), FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(keys), label("远控时按下以下快捷键,仅在控制端本地响应,不会发送到被控端。", "hint"), FALSE, FALSE, 0);
|
||||
GtkWidget *addk = button("添加控制端快捷键", "secondary"); g_signal_connect(addk, "clicked", G_CALLBACK(unsupported), "添加快捷键");
|
||||
GtkWidget *k1[] = { setting_row("当前暂无设置", NULL, NULL), setting_row("", NULL, addk) };
|
||||
gtk_box_pack_start(GTK_BOX(keys), label(L("仅控制端响应的快捷键", "Viewer-only shortcuts"), "h2"), FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(keys), label(L("远控时按下以下快捷键,仅在控制端本地响应,不会发送到被控端。", "These shortcuts are handled locally on the viewer and are not sent to the remote device."), "hint"), FALSE, FALSE, 0);
|
||||
GtkWidget *addk = button(L("添加控制端快捷键", "Add viewer shortcut"), "secondary"); g_signal_connect(addk, "clicked", G_CALLBACK(unsupported), L("添加快捷键", "Add shortcut"));
|
||||
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), label("功能快捷键", "h2"), FALSE, FALSE, 6);
|
||||
gtk_box_pack_start(GTK_BOX(keys), label("按下以下快捷键时,仅在本地触发对应功能,不会发送到被控端。", "hint"), FALSE, FALSE, 0);
|
||||
const char *fns[] = {"使用被控端鼠标/解锁鼠标", "被控时解除防窥模式", "切换上一个屏幕", "切换下一个屏幕", "显示/隐藏悬浮球", "静音/取消静音", "老板键(隐藏/显示所有客户端窗口)", "发送 Ctrl+Alt+Delete 组合键"};
|
||||
gtk_box_pack_start(GTK_BOX(keys), label(L("功能快捷键", "Function shortcuts"), "h2"), FALSE, FALSE, 6);
|
||||
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[] = {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];
|
||||
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);
|
||||
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();
|
||||
const char *proxy[] = {"使用系统环境代理", "不使用代理"};
|
||||
GtkWidget *n1[] = { setting_row("代理设置", NULL, combo(proxy, 2)) };
|
||||
const char *proxy[] = {L("使用系统环境代理", "Use system proxy"), L("不使用代理", "No proxy")};
|
||||
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_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_container_add(GTK_CONTAINER(settings_window), root);
|
||||
gtk_widget_show_all(settings_window);
|
||||
}
|
||||
static void confirm_logout(void) {
|
||||
GtkWidget *d = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "确定要退出登录吗?");
|
||||
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), "退出登录会中断正在进行中的连接,你的设备也将从本账户删除。请谨慎操作!");
|
||||
gtk_dialog_add_buttons(GTK_DIALOG(d), "取消", GTK_RESPONSE_CANCEL, "确认", GTK_RESPONSE_OK, NULL);
|
||||
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), L("退出登录会中断正在进行中的连接,你的设备也将从本账户删除。请谨慎操作!", "Signing out ends active connections and removes your device from this account. Be careful!"));
|
||||
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");
|
||||
gtk_widget_destroy(d);
|
||||
}
|
||||
@@ -571,15 +646,15 @@ static void on_menu(GtkMenuItem *item, gpointer what) {
|
||||
static void popup(GtkButton *b, gpointer kind) {
|
||||
GtkWidget *menu = gtk_menu_new();
|
||||
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);
|
||||
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);
|
||||
} 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);
|
||||
} 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); }
|
||||
}
|
||||
gtk_widget_show_all(menu);
|
||||
@@ -598,27 +673,27 @@ static void *run(void *arg) {
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
// Sidebar
|
||||
GtkWidget *side = vbox(0); add_class(side, "sidebar"); gtk_widget_set_size_request(side, 270, -1);
|
||||
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);
|
||||
gtk_box_pack_start(GTK_BOX(mh), label("⧉ 我的设备", "section"), TRUE, TRUE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(mh), label(L("⧉ 我的设备", "⧉ My devices"), "section"), TRUE, TRUE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(my_section), mh, FALSE, FALSE, 0);
|
||||
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);
|
||||
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 *welcome_nav = gtk_list_box_new(); g_signal_connect(welcome_nav, "row-activated", G_CALLBACK(on_row), NULL);
|
||||
GtkWidget *ah = label("⧉ 远程协助", "section"); gtk_widget_set_margin_start(ah, 18); gtk_widget_set_margin_top(ah, 16); gtk_widget_set_margin_bottom(ah, 6);
|
||||
GtkWidget *ah = label(L("⧉ 远程协助", "⧉ Remote assistance"), "section"); gtk_widget_set_margin_start(ah, 18); gtk_widget_set_margin_top(ah, 16); gtk_widget_set_margin_bottom(ah, 6);
|
||||
gtk_box_pack_start(GTK_BOX(side_inner), ah, FALSE, FALSE, 0);
|
||||
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("★", "收藏设备", "favorite"), -1);
|
||||
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("◧", L("开始协助", "Start assistance"), "assist"), -1);
|
||||
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("★", L("收藏设备", "Favorites"), "favorite"), -1);
|
||||
gtk_box_pack_start(GTK_BOX(side_inner), assist, FALSE, FALSE, 0);
|
||||
gtk_list_box_unselect_all(GTK_LIST_BOX(assist));
|
||||
(void)welcome_nav;
|
||||
@@ -628,7 +703,7 @@ static void *run(void *arg) {
|
||||
// Main area
|
||||
GtkWidget *main = vbox(0), *header = hbox(10); add_class(header, "header");
|
||||
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);
|
||||
gtk_box_pack_start(GTK_BOX(header), badge, FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(header), title_label, FALSE, FALSE, 0);
|
||||
@@ -676,12 +751,13 @@ void uu_viewer_ui_set_devices(const char *tsv) {
|
||||
device_count = 0;
|
||||
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)) {
|
||||
char *f[5] = {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;
|
||||
char *f[6] = {0}, *s2 = NULL; int n = 0;
|
||||
for (char *p = strtok_r(line, "\t", &s2); p && n < 6; p = strtok_r(NULL, "\t", &s2)) f[n++] = p;
|
||||
if (n < 5) continue;
|
||||
Device *d = &devices[device_count++];
|
||||
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]);
|
||||
snprintf(d->thumb, sizeof d->thumb, "%s", n > 5 && f[5][0] == '/' ? f[5] : "");
|
||||
}
|
||||
free(copy);
|
||||
selected = -1;
|
||||
@@ -715,8 +791,8 @@ static int replace_result;
|
||||
static gboolean confirm_replace(gpointer d) {
|
||||
(void)d;
|
||||
GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "打开后将断开当前与该设备的连接,继续吗?");
|
||||
gtk_dialog_add_buttons(GTK_DIALOG(dialog), "取消", GTK_RESPONSE_CANCEL, "继续", GTK_RESPONSE_OK, NULL);
|
||||
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, L("打开后将断开当前与该设备的连接,继续吗?", "Opening this disconnects your current connection to this device. Continue?"));
|
||||
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;
|
||||
gtk_widget_destroy(dialog);
|
||||
pthread_mutex_lock(&init_lock); replace_result = accepted; pthread_cond_signal(&init_cond); pthread_mutex_unlock(&init_lock);
|
||||
|
||||
+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);
|
||||
}
|
||||
}
|
||||
+21
-21
@@ -140,10 +140,10 @@ enum QrPollAction { Wait(i64), Scanned, Confirmed, Refresh(Duration), Failed(&'s
|
||||
/// Preserve the official refresh policy; a failed query says nothing about QR expiry.
|
||||
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("二维码已失效");
|
||||
return QrPollAction::Failed(crate::i18n::s("二维码已失效","QR code expired"));
|
||||
}
|
||||
let Ok(data) = qr_data("qrcode status", http_status, body) else {
|
||||
return QrPollAction::Failed("二维码状态查询失败");
|
||||
return QrPollAction::Failed(crate::i18n::s("二维码状态查询失败","QR status check failed"));
|
||||
};
|
||||
match data.get("status").and_then(Value::as_i64) {
|
||||
Some(1) => QrPollAction::Wait(1),
|
||||
@@ -152,7 +152,7 @@ fn qr_poll_action(last_status: i64, http_status: u16, body: &Value) -> QrPollAct
|
||||
Some(0) => QrPollAction::Refresh(Duration::from_millis(350)),
|
||||
Some(3) => QrPollAction::Refresh(Duration::ZERO),
|
||||
Some(4) => QrPollAction::Confirmed,
|
||||
_ => QrPollAction::Failed("二维码状态响应异常"),
|
||||
_ => QrPollAction::Failed(crate::i18n::s("二维码状态响应异常","Unexpected QR status response")),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -247,10 +247,10 @@ pub async fn run(gui: bool) -> Result<(), String> {
|
||||
};
|
||||
match &result {
|
||||
Ok(name) => {
|
||||
ui.done(&format!("登录成功\n{name}"));
|
||||
ui.status("登录信息已保存到本机配置,可以关闭此窗口", Tone::Ok);
|
||||
ui.done(&crate::tr!("登录成功\n{name}","Signed in\n{name}"));
|
||||
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; }
|
||||
result.map(|_| ())
|
||||
@@ -328,14 +328,14 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
||||
Ok(r) => r,
|
||||
Err(e) if e.response_received() => {
|
||||
eprintln!("QR generation response failed: {e}");
|
||||
wait_for_refresh(ui, "二维码加载失败").await;
|
||||
wait_for_refresh(ui, crate::i18n::s("二维码加载失败","QR code failed to load")).await;
|
||||
continue;
|
||||
}
|
||||
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, "二维码加载失败").await; continue; }
|
||||
Err(e) => { println!("QR code could not be loaded ({e})"); wait_for_refresh(ui, crate::i18n::s("二维码加载失败","QR code failed to load")).await; continue; }
|
||||
};
|
||||
let url = d.get("qrcode_jump_url").and_then(|v| v.as_str()).ok_or("qrcode gen returned no qrcode_jump_url")?.to_string();
|
||||
let ticket = qr_ticket(&d).ok_or("qrcode gen returned no status ticket")?.to_string();
|
||||
@@ -344,7 +344,7 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
||||
let modules = qrcode::QrCode::new(url.as_bytes()).map_err(|e| e.to_string())?.width() + 2;
|
||||
let (rgba, edge) = qr_rgba(&url, (224 / modules).max(2), 1)?;
|
||||
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") {
|
||||
use std::io::Write;
|
||||
@@ -362,20 +362,20 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
||||
Err(e) => {
|
||||
eprintln!("QR status query failed: {e}; last_status={login_status}");
|
||||
break match e.kind {
|
||||
QrRequestErrorKind::Timeout => "二维码状态查询超时(不代表二维码已失效)",
|
||||
_ => "二维码状态查询失败(不代表二维码已失效)",
|
||||
QrRequestErrorKind::Timeout => crate::i18n::s("二维码状态查询超时(不代表二维码已失效)","QR status check timed out (the QR code may still be valid)"),
|
||||
_ => crate::i18n::s("二维码状态查询失败(不代表二维码已失效)","QR status check failed (the QR code may still be valid)"),
|
||||
};
|
||||
}
|
||||
};
|
||||
match qr_poll_action(login_status, status, &resp) {
|
||||
QrPollAction::Wait(st) => {
|
||||
if st == 1 && login_status != 1 { ui.status("等待扫码…", Tone::Info); }
|
||||
if st == 1 && login_status != 1 { ui.status(crate::i18n::s("等待扫码…","Waiting for scan…"), Tone::Info); }
|
||||
login_status = st;
|
||||
}
|
||||
QrPollAction::Scanned => {
|
||||
login_status = 2;
|
||||
println!("已扫码,请在手机上确认 (scanned, confirm on the phone)");
|
||||
ui.status("已扫码,请在手机上确认登录", Tone::Ok);
|
||||
ui.status(crate::i18n::s("已扫码,请在手机上确认登录","Scanned, confirm the sign-in on your phone"), Tone::Ok);
|
||||
}
|
||||
QrPollAction::Refresh(delay) => {
|
||||
if delay.is_zero() { println!("QR code expired; generating a new one"); }
|
||||
@@ -384,19 +384,19 @@ pub(crate) async fn flow(ui: &LoginUi) -> Result<String, String> {
|
||||
}
|
||||
QrPollAction::Confirmed => {
|
||||
println!("已确认,正在完成登录 (confirmed, completing login)");
|
||||
ui.status("已确认,正在完成登录…", Tone::Info);
|
||||
ui.status(crate::i18n::s("已确认,正在完成登录…","Confirmed, finishing sign-in…"), Tone::Info);
|
||||
let body = json!({"token": ticket, "qrcode_jump_url": url});
|
||||
let (status, resp) = match client.post_with_timeout("/api/v1/login/by_qrcode", Some(&body), timeout).await {
|
||||
Ok(r) => r,
|
||||
Err(e) if e.response_received() => {
|
||||
eprintln!("QR login exchange response failed: {e}");
|
||||
break "登录失败";
|
||||
break crate::i18n::s("登录失败","Sign-in failed");
|
||||
}
|
||||
Err(e) => return Err(format!("QR login exchange failed: {e}")),
|
||||
};
|
||||
let d = match qr_data("qrcode login", status, &resp) {
|
||||
Ok(d) => d,
|
||||
Err(e) => { println!("QR login not granted ({e})"); break "登录失败"; }
|
||||
Err(e) => { println!("QR login not granted ({e})"); break crate::i18n::s("登录失败","Sign-in failed"); }
|
||||
};
|
||||
let token = d.get("token").and_then(|v| v.as_str()).ok_or("login returned no token")?;
|
||||
let user = d.get("user_id").and_then(|v| v.as_str()).ok_or("login returned no user_id")?;
|
||||
@@ -434,7 +434,7 @@ fn qr_ticket(gen: &Value) -> Option<&str> {
|
||||
/// 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(&format!("{reason},请点击「刷新二维码」"), Tone::Error);
|
||||
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 (按回车刷新二维码)"); }
|
||||
@@ -462,18 +462,18 @@ mod tests {
|
||||
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("二维码已失效"));
|
||||
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("二维码状态查询失败"));
|
||||
assert_eq!(qr_poll_action(last, 503, &body), QrPollAction::Failed(crate::i18n::s("二维码状态查询失败","QR status check failed")));
|
||||
}
|
||||
assert_eq!(qr_poll_action(last, 200, &json!({"code": 1})), QrPollAction::Failed("二维码状态查询失败"));
|
||||
assert_eq!(qr_poll_action(last, 200, &json!({"code": 1})), QrPollAction::Failed(crate::i18n::s("二维码状态查询失败","QR status check failed")));
|
||||
for data in [json!(null), json!({}), json!({"status": "4"}), json!({"status": 99}), json!({"status": -1})] {
|
||||
assert_eq!(qr_poll_action(last, 200, &json!({"code": 0, "data": data})), QrPollAction::Failed("二维码状态响应异常"));
|
||||
assert_eq!(qr_poll_action(last, 200, &json!({"code": 0, "data": data})), QrPollAction::Failed(crate::i18n::s("二维码状态响应异常","Unexpected QR status response")));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ mod wayland;
|
||||
mod auth;
|
||||
mod assist;
|
||||
mod config;
|
||||
mod i18n;
|
||||
mod login;
|
||||
mod login_ui;
|
||||
mod session_lock;
|
||||
|
||||
+4
-4
@@ -376,11 +376,11 @@ pub fn check_ffmpeg_usable() {
|
||||
if crate::desktop_backend::headless() { return; }
|
||||
tokio::spawn(async {
|
||||
static LAST_NOTICE: std::sync::Mutex<Option<Instant>> = std::sync::Mutex::new(None);
|
||||
const SUMMARY: &str = "无法传输远程画面";
|
||||
let summary = crate::i18n::s("无法传输远程画面","Cannot stream the remote desktop");
|
||||
match ffmpeg_encoders().await {
|
||||
None => {
|
||||
log::error!("FFmpeg is not runnable: desktop video cannot start and viewers stay on 正在传输画面. Install ffmpeg (Debian/Ubuntu: sudo apt install ffmpeg; Arch: sudo pacman -S ffmpeg; Fedora: ffmpeg from RPM Fusion), or set ffmpeg_root, then check `uuremote-server doctor`");
|
||||
let text = "未找到可运行的 FFmpeg,客户端会一直停在「正在传输画面」。\n请安装后重新连接:sudo apt install ffmpeg(Arch:sudo pacman -S ffmpeg;Fedora 需先启用 RPM Fusion)";
|
||||
let text = crate::i18n::s("未找到可运行的 FFmpeg,客户端会一直停在「正在传输画面」。\n请安装后重新连接:sudo apt install ffmpeg(Arch:sudo pacman -S ffmpeg;Fedora 需先启用 RPM Fusion)","No runnable FFmpeg found; viewers stay on the loading screen.\nInstall it and reconnect: sudo apt install ffmpeg (Arch: sudo pacman -S ffmpeg; Fedora: enable RPM Fusion first)");
|
||||
let previous = {
|
||||
let mut last = LAST_NOTICE.lock().unwrap_or_else(|e| e.into_inner());
|
||||
let previous = *last;
|
||||
@@ -389,7 +389,7 @@ pub fn check_ffmpeg_usable() {
|
||||
due.then_some(previous)
|
||||
};
|
||||
// The notification is a blocking D-Bus call (bounded to 3 s).
|
||||
let told = tokio::task::spawn_blocking(move || crate::assist::show_problem(SUMMARY, Some(text), previous.is_some())).await.unwrap_or(false);
|
||||
let told = tokio::task::spawn_blocking(move || crate::assist::show_problem(summary, Some(text), previous.is_some())).await.unwrap_or(false);
|
||||
// Only a notice that reached the person starts the 5-minute quiet period.
|
||||
if let (Some(previous), false) = (previous, told) {
|
||||
*LAST_NOTICE.lock().unwrap_or_else(|e| e.into_inner()) = previous;
|
||||
@@ -398,7 +398,7 @@ pub fn check_ffmpeg_usable() {
|
||||
}
|
||||
Some(found) => {
|
||||
if !found.contains(&"libx264") { log::warn!("FFmpeg has no libx264: CPU encoding and the fallback after a hardware encoder failure are unavailable. Install a full ffmpeg build"); }
|
||||
tokio::task::spawn_blocking(|| crate::assist::show_problem(SUMMARY, None, false));
|
||||
tokio::task::spawn_blocking(move || crate::assist::show_problem(summary, None, false));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
+27
-10
@@ -22,20 +22,35 @@ fn device_platform(data:&Value,device:&str)->Option<i64>{
|
||||
.find(|d|d.get("device_id").and_then(Value::as_str)==Some(device))
|
||||
.and_then(|d|d.get("platform")).and_then(Value::as_i64)
|
||||
}
|
||||
/// English for server messages observed in assistance and connection replies.
|
||||
fn english_message(msg: &str) -> Option<&'static str> {
|
||||
Some(match msg {
|
||||
"验证码错误" => "Wrong verification code",
|
||||
"对方未开启协助" => "The partner has not turned on remote assistance",
|
||||
"无法对同账号的设备发起远程协助" => "Remote assistance between devices of the same account is not possible",
|
||||
"被控端正在被远控中,无法发起连接" => "This computer is already being controlled from another device",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
#[derive(Debug, PartialEq, Eq)]
|
||||
pub enum Error { AuthenticationExpired, Api(i32, String), InvalidResponse, Transport, MissingRoom, InvalidDevice, InvalidAssist, UnknownKeyboardPlatform }
|
||||
impl std::fmt::Display for Error {
|
||||
// The server's short message is user-facing (e.g. 2002 「被控端正在被远控中,无法发起连接」).
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
Error::Api(code, msg) if !msg.is_empty() => write!(f, "{msg} (code {code})"),
|
||||
Error::AuthenticationExpired => write!(f, "登录已过期,请重新登录"),
|
||||
Error::Transport => write!(f, "网络连接失败"),
|
||||
Error::InvalidAssist => write!(f, "请输入对方的设备 ID 和有效验证码"),
|
||||
Error::InvalidResponse => write!(f, "服务器响应格式无效"),
|
||||
Error::MissingRoom => write!(f, "服务器未返回可用的房间或信令信息"),
|
||||
Error::UnknownKeyboardPlatform => write!(f, "无法确定目标键盘平台,不能启用控制"),
|
||||
Error::Api(code, _) => write!(f, "连接请求失败(错误码 {code})"),
|
||||
// Observed 2002: the target already has a controller (another viewer, a phone).
|
||||
Error::Api(2002, _) => f.write_str(crate::i18n::s("被控端正在被远控中,无法发起连接(错误码 2002)",
|
||||
"This computer is already being controlled from another device; disconnect there and try again (error 2002)")),
|
||||
// Server messages are Chinese only: the English UI translates the known ones.
|
||||
Error::Api(code, msg) if !msg.is_empty() && !crate::i18n::english() => write!(f, "{msg} (code {code})"),
|
||||
Error::Api(code, msg) if english_message(msg).is_some() => write!(f, "{} (code {code})", english_message(msg).unwrap_or_default()),
|
||||
Error::AuthenticationExpired => f.write_str(crate::i18n::s("登录已过期,请重新登录","Sign-in expired, please sign in again")),
|
||||
Error::Transport => f.write_str(crate::i18n::s("网络连接失败","Network connection failed")),
|
||||
Error::InvalidAssist => f.write_str(crate::i18n::s("请输入对方的设备 ID 和有效验证码","Enter the partner's device ID and a valid code")),
|
||||
Error::InvalidResponse => f.write_str(crate::i18n::s("服务器响应格式无效","Invalid server response")),
|
||||
Error::MissingRoom => f.write_str(crate::i18n::s("服务器未返回可用的房间或信令信息","The server returned no usable room or signaling info")),
|
||||
Error::UnknownKeyboardPlatform => f.write_str(crate::i18n::s("无法确定目标键盘平台,不能启用控制","Unknown remote keyboard platform; control is disabled")),
|
||||
Error::Api(code, _) => f.write_str(&crate::tr!("连接请求失败(错误码 {code})","Connection request failed (error {code})")),
|
||||
_ => write!(f, "viewer API: {self:?}"),
|
||||
}
|
||||
}
|
||||
@@ -237,7 +252,8 @@ mod tests {
|
||||
assert_eq!(parse_share(200,v,&[]).err().unwrap(),Error::MissingRoom);
|
||||
}
|
||||
for msg in ["验证码错误","对方未开启协助","无法对同账号的设备发起远程协助"] {
|
||||
assert_eq!(parse_share(422,json!({"code":9876,"msg":msg}),&[]).err().unwrap().to_string(),format!("{msg} (code 9876)"));
|
||||
let shown=if crate::i18n::english() {english_message(msg).unwrap()} else {msg};
|
||||
assert_eq!(parse_share(422,json!({"code":9876,"msg":msg}),&[]).err().unwrap().to_string(),format!("{shown} (code 9876)"));
|
||||
}
|
||||
assert_eq!(parse_share(422,json!({"code":9876,"msg":"fixture-code\nfixture-token"}),&["fixture-code","fixture-token",""]).err().unwrap(),Error::Api(9876,"[已隐藏][已隐藏]".into()));
|
||||
assert_eq!(parse_share(422,json!({"code":1120,"msg":"expired"}),&[]).err().unwrap(),Error::AuthenticationExpired);
|
||||
@@ -405,7 +421,8 @@ mod http_tests {
|
||||
for msg in ["验证码错误","对方未开启协助","无法对同账号的设备发起远程协助"] {
|
||||
let(url,job)=server(vec![(422,json!({"code":9876,"msg":msg}))]).await;
|
||||
let error=Api::new(signer(),&url).join_share("synthetic-id","synthetic-code").await.err().unwrap();
|
||||
assert_eq!(error.to_string(),format!("{msg} (code 9876)"));assert_eq!(job.await.unwrap().len(),1);
|
||||
let shown=if crate::i18n::english() {english_message(msg).unwrap()} else {msg};
|
||||
assert_eq!(error.to_string(),format!("{shown} (code 9876)"));assert_eq!(job.await.unwrap().len(),1);
|
||||
}
|
||||
for (status,body,expected) in [
|
||||
(200,json!({"code":405,"msg":"业务拒绝"}),Error::Api(405,"业务拒绝".into())),
|
||||
|
||||
@@ -4,10 +4,10 @@ use tokio::{io::AsyncWriteExt,process::{Child,Command}};
|
||||
|
||||
pub fn read_code(input: impl BufRead) -> Result<String,String> {
|
||||
let mut code=String::new();
|
||||
input.take(1025).read_line(&mut code).map_err(|_|"无法从 stdin 读取验证码")?;
|
||||
if code.len()>1024 {return Err("验证码过长".into())}
|
||||
input.take(1025).read_line(&mut code).map_err(|_|crate::i18n::s("无法从 stdin 读取验证码","Cannot read the code from stdin"))?;
|
||||
if code.len()>1024 {return Err(crate::i18n::s("验证码过长","Code is too long").into())}
|
||||
if code.ends_with('\n') {code.pop();if code.ends_with('\r'){code.pop();}}
|
||||
if code.trim().is_empty() || code.chars().any(char::is_control) {return Err("请输入有效验证码".into())}
|
||||
if code.trim().is_empty() || code.chars().any(char::is_control) {return Err(crate::i18n::s("请输入有效验证码","Enter a valid code").into())}
|
||||
Ok(code)
|
||||
}
|
||||
pub fn command(exe:&Path,id:&str)->Command {
|
||||
@@ -17,10 +17,10 @@ pub fn command(exe:&Path,id:&str)->Command {
|
||||
}
|
||||
pub async fn send_code(child:&mut Child,code:&str)->Result<(),String> {
|
||||
let result=async {
|
||||
let mut stdin=child.stdin.take().ok_or("无法打开会话输入管道")?;
|
||||
stdin.write_all(code.as_bytes()).await.map_err(|_|"无法向会话传递验证码")?;
|
||||
stdin.write_all(b"\n").await.map_err(|_|"无法向会话传递验证码")?;
|
||||
stdin.shutdown().await.map_err(|_|"无法关闭会话输入管道")
|
||||
let mut stdin=child.stdin.take().ok_or(crate::i18n::s("无法打开会话输入管道","Cannot open the session input pipe"))?;
|
||||
stdin.write_all(code.as_bytes()).await.map_err(|_|crate::i18n::s("无法向会话传递验证码","Cannot pass the code to the session"))?;
|
||||
stdin.write_all(b"\n").await.map_err(|_|crate::i18n::s("无法向会话传递验证码","Cannot pass the code to the session"))?;
|
||||
stdin.shutdown().await.map_err(|_|crate::i18n::s("无法关闭会话输入管道","Cannot close the session input pipe"))
|
||||
}.await;
|
||||
if result.is_err() {let _=child.kill().await;}
|
||||
result.map_err(str::to_owned)
|
||||
|
||||
+4
-3
@@ -93,20 +93,21 @@ mod playback {
|
||||
if let Some(mut child)=self.child.take() {let _=child.start_kill();tokio::spawn(async move {let _=child.wait().await;});}
|
||||
}
|
||||
}
|
||||
pub struct Playback { queue:sdl2::audio::AudioQueue<i16>, decoder:Decoder }
|
||||
pub struct Playback { queue:sdl2::audio::AudioQueue<i16>, decoder:Decoder, pub volume:u8 }
|
||||
impl Playback {
|
||||
pub fn new(sdl:&sdl2::Sdl,audio:Audio)->Option<Self> {
|
||||
if !audio.enabled {return None}
|
||||
let result=(|| {
|
||||
let subsystem=sdl.audio()?;
|
||||
let queue=subsystem.open_queue::<i16,_>(None,&sdl2::audio::AudioSpecDesired{freq:Some(48000),channels:Some(2),samples:Some(960)})?;
|
||||
let decoder=Decoder::new(audio)?;queue.resume();Ok::<_,String>(Self{queue,decoder})
|
||||
let decoder=Decoder::new(audio)?;queue.resume();Ok::<_,String>(Self{queue,decoder,volume:100})
|
||||
})();
|
||||
match result {Ok(p)=>Some(p),Err(_)=>{log::warn!("Viewer audio playback unavailable");None}}
|
||||
}
|
||||
pub fn pump(&mut self)->Result<(),String> {
|
||||
if !self.decoder.alive() {return Err("Audio decoder stopped".into())}
|
||||
while let Some(samples)=self.decoder.pcm.pop() {
|
||||
while let Some(mut samples)=self.decoder.pcm.pop() {
|
||||
if self.volume<100 {let v=i32::from(self.volume);for s in samples.iter_mut(){*s=(i32::from(*s)*v/100) as i16;}}
|
||||
if self.queue.size()+samples.len() as u32*2>SDL_BYTES {self.queue.clear();}
|
||||
self.queue.queue_audio(&samples).map_err(|_|"Audio queue failed")?;
|
||||
}Ok(())
|
||||
|
||||
+82
-29
@@ -1,34 +1,35 @@
|
||||
//! H.264/H.265 decoding through an external `ffmpeg` process, like the host's encoder pipeline.
|
||||
//! Needs only the ffmpeg CLI, not FFmpeg development libraries.
|
||||
//! Output is scaled into a fixed letterboxed canvas so every frame has a known byte length; the
|
||||
//! source size from ffmpeg's stream line tells the window which sub-rectangle is picture content.
|
||||
//! Frames are decoded at the host's native size (resampling the picture blurs text); ffmpeg's verbose
|
||||
//! scaler line gives the size before the first frame. `UU_VIEWER_SIZE` keeps the old fixed letterboxed
|
||||
//! canvas, where the stream line tells the window which sub-rectangle is picture content.
|
||||
use super::desktop::{Decoder,Frame};
|
||||
use super::media::Codec;
|
||||
use std::io::{BufRead,Read,Write};
|
||||
use std::process::{Child,ChildStdin,Command,Stdio};
|
||||
use std::sync::Arc;
|
||||
use std::sync::atomic::{AtomicU64,Ordering};
|
||||
use std::sync::atomic::{AtomicBool,AtomicU64,Ordering};
|
||||
use std::sync::mpsc::{Receiver,TryRecvError};
|
||||
|
||||
pub struct Cli { child:Child, input:Option<ChildStdin>, codec:Codec, frames:Receiver<Vec<u8>>, width:u32, height:u32, source:Arc<AtomicU64> }
|
||||
pub struct Cli { child:Child, input:Option<ChildStdin>, codec:Codec, frames:Receiver<(u32,u32,Vec<u8>)>, fixed:Option<(u32,u32)>, source:Arc<AtomicU64>, resized:Arc<AtomicBool> }
|
||||
|
||||
impl Cli {
|
||||
/// `UU_VIEWER_SIZE=WxH` picks the decoded size (default 1920x1080); `UU_VIEWER_FFMPEG` the binary.
|
||||
/// `UU_VIEWER_SIZE=WxH` scales into a fixed canvas (default: native size); `UU_VIEWER_FFMPEG` the binary.
|
||||
pub fn new()->Result<Self,String> {
|
||||
let (width,height)=std::env::var("UU_VIEWER_SIZE").ok()
|
||||
let fixed=std::env::var("UU_VIEWER_SIZE").ok()
|
||||
.and_then(|v|{let (w,h)=v.split_once('x')?;Some((w.parse().ok()?,h.parse().ok()?))})
|
||||
.filter(|&(w,h):&(u32,u32)|(16..=8192).contains(&w)&&(16..=8192).contains(&h)&&w%2==0&&h%2==0)
|
||||
.unwrap_or((1920,1080));
|
||||
Self::with_codec(Codec::H264,width,height)
|
||||
.filter(|&(w,h):&(u32,u32)|(16..=8192).contains(&w)&&(16..=8192).contains(&h)&&w%2==0&&h%2==0);
|
||||
Self::with_codec(Codec::H264,fixed)
|
||||
}
|
||||
fn with_codec(codec:Codec,width:u32,height:u32)->Result<Self,String> {
|
||||
fn with_codec(codec:Codec,fixed:Option<(u32,u32)>)->Result<Self,String> {
|
||||
let ffmpeg=std::env::var("UU_VIEWER_FFMPEG").unwrap_or_else(|_|"ffmpeg".into());
|
||||
let filter=format!("scale={width}:{height}:force_original_aspect_ratio=decrease,pad={width}:{height}:(ow-iw)/2:(oh-ih)/2");
|
||||
let filter=fixed.map(|(width,height)|format!("scale={width}:{height}:force_original_aspect_ratio=decrease:flags=lanczos,pad={width}:{height}:(ow-iw)/2:(oh-ih)/2"));
|
||||
let passthrough=passthrough_args(&ffmpeg);
|
||||
let mut child=Command::new(&ffmpeg)
|
||||
.args(["-hide_banner","-loglevel","info","-nostats","-nostdin","-threads","1","-probesize","32","-analyzeduration","0",
|
||||
"-fflags","nobuffer","-flags","low_delay","-f",codec.demuxer(),"-i","pipe:0","-an","-vf",&filter,
|
||||
"-pix_fmt","rgb24",
|
||||
let mut command=Command::new(&ffmpeg);
|
||||
command.args(["-hide_banner","-loglevel","verbose","-nostats","-nostdin","-threads","1","-probesize","32","-analyzeduration","0",
|
||||
"-fflags","nobuffer","-flags","low_delay","-f",codec.demuxer(),"-i","pipe:0","-an"]);
|
||||
if let Some(filter)=&filter {command.args(["-vf",filter]);}
|
||||
let mut child=command.args(["-pix_fmt","rgb24",
|
||||
// Raw H.264/H.265 carries no timestamps; constant-rate output dropped almost every frame of
|
||||
// the official Mac host's stream (270 → 2). Pass frames through unchanged.
|
||||
passthrough.0,passthrough.1,"-f","rawvideo","pipe:1"])
|
||||
@@ -37,30 +38,58 @@ impl Cli {
|
||||
let input=child.stdin.take().ok_or("ffmpeg stdin missing")?;
|
||||
let mut output=child.stdout.take().ok_or("ffmpeg stdout missing")?;
|
||||
// Source picture size from the one-time stream line; 0 until parsed. Only the numbers are kept.
|
||||
let source=Arc::new(AtomicU64::new(0));
|
||||
let source=Arc::new(AtomicU64::new(0));let resized=Arc::new(AtomicBool::new(false));
|
||||
let (size_tx,size_rx)=std::sync::mpsc::sync_channel::<(u32,u32)>(1);
|
||||
if let Some((w,h))=fixed {let _=size_tx.send((w,h));}
|
||||
if let Some(stderr)=child.stderr.take() {
|
||||
let source=source.clone();
|
||||
let (source,resized)=(source.clone(),resized.clone());
|
||||
let _=std::thread::Builder::new().name("uu-viewer-ffmpeg-info".into()).spawn(move||{
|
||||
let mut native=None;
|
||||
for line in std::io::BufReader::new(stderr).lines().map_while(Result::ok) {
|
||||
if source.load(Ordering::Relaxed)!=0 {continue}
|
||||
if let Some((w,h))=parse_video_size(&line) {source.store((u64::from(w)<<32)|u64::from(h),Ordering::Relaxed);}
|
||||
if fixed.is_some() {
|
||||
if source.load(Ordering::Relaxed)!=0 {continue}
|
||||
if let Some((w,h))=parse_video_size(&line) {source.store((u64::from(w)<<32)|u64::from(h),Ordering::Relaxed);}
|
||||
continue
|
||||
}
|
||||
// Native: the first scaler line fixes the output size; ffmpeg auto-scales a later
|
||||
// resolution change to it, so a different input size means the decoder must restart.
|
||||
let Some((input,out))=parse_scaler_sizes(&line) else {continue};
|
||||
match native {
|
||||
None=>{native=Some(out);let _=size_tx.send(out);},
|
||||
Some(size) if input!=size=>resized.store(true,Ordering::Release),
|
||||
Some(_)=>{},
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
let size=width as usize*height as usize*3;
|
||||
// Bounded: a slow window drops decoded frames instead of growing memory.
|
||||
let (tx,frames)=std::sync::mpsc::sync_channel(2);
|
||||
std::thread::Builder::new().name("uu-viewer-decode".into()).spawn(move||{
|
||||
let Ok((width,height))=size_rx.recv() else {return};
|
||||
let size=width as usize*height as usize*3;
|
||||
loop {
|
||||
let mut frame=vec![0;size];
|
||||
if output.read_exact(&mut frame).is_err() {break;}
|
||||
match tx.try_send(frame) { Ok(())|Err(std::sync::mpsc::TrySendError::Full(_))=>{}, Err(_)=>break }
|
||||
match tx.try_send((width,height,frame)) { Ok(())|Err(std::sync::mpsc::TrySendError::Full(_))=>{}, Err(_)=>break }
|
||||
}
|
||||
}).map_err(|e|format!("Decoder reader: {e}"))?;
|
||||
Ok(Self{child,input:Some(input),codec,frames,width,height,source})
|
||||
Ok(Self{child,input:Some(input),codec,frames,fixed,source,resized})
|
||||
}
|
||||
}
|
||||
|
||||
/// Verbose swscale setup line: `[auto_scale_0 @ 0x..] w:3024 h:1964 fmt:yuv420p ... -> w:3024 h:1964 fmt:rgb24 ...`.
|
||||
fn parse_scaler_sizes(line:&str)->Option<((u32,u32),(u32,u32))> {
|
||||
let (input,out)=line.split_once(" -> ")?;
|
||||
if !out.contains(" fmt:") {return None}
|
||||
fn size(part:&str)->Option<(u32,u32)> {
|
||||
let mut words=part.split_whitespace();
|
||||
let w=words.find_map(|t|t.strip_prefix("w:"))?.parse().ok()?;
|
||||
let h=words.next()?.strip_prefix("h:")?.parse().ok()?;
|
||||
((16..=16384).contains(&w)&&(16..=16384).contains(&h)).then_some((w,h))
|
||||
}
|
||||
Some((size(input.rsplit_once("] ").map_or(input,|(_,rest)|rest))?,size(out)?))
|
||||
}
|
||||
|
||||
/// `30000/1001`-style or display strings are irrelevant here: the first WxH on a `Video:` line is the
|
||||
/// coded picture size, which is the aspect the scale+pad filter letterboxes into the canvas.
|
||||
fn parse_video_size(line:&str)->Option<(u32,u32)> {
|
||||
@@ -93,19 +122,33 @@ fn passthrough_args(ffmpeg:&str)->(&'static str,&'static str) {
|
||||
|
||||
impl Decoder for Cli {
|
||||
fn set_codec(&mut self,codec:Codec)->Result<(),String>{
|
||||
if self.codec!=codec {*self=Self::with_codec(codec,self.width,self.height)?;}Ok(())
|
||||
if self.codec!=codec {*self=Self::with_codec(codec,self.fixed)?;}Ok(())
|
||||
}
|
||||
fn reset(&mut self) {}
|
||||
fn decode(&mut self,au:&[u8])->Result<Vec<Frame>,String> {
|
||||
if self.resized.load(Ordering::Acquire) {
|
||||
// The caller resets and asks for a key frame; the new process sizes itself from it.
|
||||
*self=Self::with_codec(self.codec,self.fixed)?;
|
||||
return Err("remote resolution changed".into());
|
||||
}
|
||||
let input=self.input.as_mut().ok_or("ffmpeg input closed")?;
|
||||
input.write_all(au).and_then(|_|input.flush()).map_err(|_|"ffmpeg decoder exited")?;
|
||||
// The raw-stream parser ends an access unit only when the next one starts; an access unit
|
||||
// delimiter right after it releases the picture now instead of one remote frame later.
|
||||
let delimiter:&[u8]=match self.codec {Codec::H264=>&[0,0,0,1,0x09,0xf0],Codec::H265=>&[0,0,0,1,0x46,0x01,0x50]};
|
||||
input.write_all(au).and_then(|_|input.write_all(delimiter)).and_then(|_|input.flush()).map_err(|_|"ffmpeg decoder exited")?;
|
||||
self.take_frames()
|
||||
}
|
||||
fn poll(&mut self)->Vec<Frame> {self.take_frames().unwrap_or_default()}
|
||||
}
|
||||
impl Cli {
|
||||
fn take_frames(&mut self)->Result<Vec<Frame>,String> {
|
||||
let mut out=Vec::new();
|
||||
loop {
|
||||
match self.frames.try_recv() {
|
||||
Ok(rgb)=>{
|
||||
Ok((width,height,rgb))=>{
|
||||
let source=self.source.load(Ordering::Relaxed);
|
||||
let content=(source!=0).then(||((source>>32) as u32,source as u32));
|
||||
out.push(Frame{width:self.width,height:self.height,rgb,content})
|
||||
let content=(self.fixed.is_some()&&source!=0).then(||((source>>32) as u32,source as u32));
|
||||
out.push(Frame{width,height,rgb,content})
|
||||
},
|
||||
Err(TryRecvError::Empty)=>break,
|
||||
Err(TryRecvError::Disconnected)=>return Err("ffmpeg decoder exited".into()),
|
||||
@@ -135,7 +178,9 @@ impl Drop for Cli { fn drop(&mut self) { let _=self.child.kill(); let _=self.chi
|
||||
Err(e) if e.kind()==std::io::ErrorKind::NotFound=>{eprintln!("skip: ffmpeg is not on PATH");return},
|
||||
result=>assert!(result.expect("ffmpeg availability").success()),
|
||||
}
|
||||
let mut cli=Cli::with_codec(Codec::H265,32,32).unwrap();
|
||||
// Native size and the fixed UU_VIEWER_SIZE canvas.
|
||||
for fixed in [None,Some((32,32))] {
|
||||
let mut cli=Cli::with_codec(Codec::H265,fixed).unwrap();
|
||||
for (codec,data) in [
|
||||
(Codec::H264,&include_bytes!("../../tests/fixtures/viewer/red-420.h264")[..]),
|
||||
(Codec::H265,&include_bytes!("../../tests/fixtures/viewer/red-420.hevc")[..]),
|
||||
@@ -146,7 +191,7 @@ impl Drop for Cli { fn drop(&mut self) { let _=self.child.kill(); let _=self.chi
|
||||
// Exercise the same streaming process and RGB conversion as SDL, then drain at EOF.
|
||||
let mut frames=cli.decode(data).unwrap();drop(cli.input.take());
|
||||
loop {match cli.frames.recv_timeout(std::time::Duration::from_secs(5)) {
|
||||
Ok(rgb)=>frames.push(Frame{width:32,height:32,rgb,content:None}),
|
||||
Ok((width,height,rgb))=>frames.push(Frame{width,height,rgb,content:None}),
|
||||
Err(std::sync::mpsc::RecvTimeoutError::Disconnected)=>break,
|
||||
Err(e)=>panic!("{codec:?} decoder did not finish: {e}"),
|
||||
}}
|
||||
@@ -155,9 +200,17 @@ impl Drop for Cli { fn drop(&mut self) { let _=self.child.kill(); let _=self.chi
|
||||
assert!(!frames.is_empty(),"{codec:?}: no RGB frames");
|
||||
for frame in frames {
|
||||
assert_eq!(frame.rgb.len(),32*32*3);
|
||||
assert_eq!((frame.width,frame.height),(32,32));
|
||||
assert!(frame.rgb.chunks_exact(3).all(|p|p[0]>220 && p[1]<30 && p[2]<30),"{codec:?}: RGB conversion");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#[test] fn native_size_is_read_from_the_scaler_line(){
|
||||
assert_eq!(super::parse_scaler_sizes("[auto_scale_0 @ 0x7f55ac005f40] w:3024 h:1964 fmt:yuv420p csp:unknown range:unknown sar:1/1 -> w:3024 h:1964 fmt:rgb24 csp:gbr range:pc sar:1/1 flags:0x00000004"),Some(((3024,1964),(3024,1964))));
|
||||
assert_eq!(super::parse_scaler_sizes("[auto_scaler_0 @ 0x55d] w:2560 h:1440 fmt:yuv444p sar:1/1 -> w:1920 h:1080 fmt:rgb24 sar:1/1 flags:0x4"),Some(((2560,1440),(1920,1080))));
|
||||
assert_eq!(super::parse_scaler_sizes("[Parsed_pad_1 @ 0x7f00] w:32 h:32 -> w:64 h:32 x:16 y:0 color:0x000000FF"),None);
|
||||
assert_eq!(super::parse_scaler_sizes(" Stream #0:0 -> #0:0 (h264 (native) -> rawvideo (native))"),None);
|
||||
}
|
||||
#[test] fn source_size_is_read_from_the_ffmpeg_stream_line(){
|
||||
assert_eq!(super::parse_video_size(" Stream #0:0: Video: h264 (High), yuv420p(progressive), 3024x1964, 25 fps"),Some((3024,1964)));
|
||||
|
||||
+23
-1
@@ -7,11 +7,26 @@ impl Default for Desktop {
|
||||
}
|
||||
/// `content` is the source picture size inside the (possibly padded) RGB canvas; None = full frame.
|
||||
pub struct Frame { pub width:u32, pub height:u32, pub rgb:Vec<u8>, pub content:Option<(u32,u32)> }
|
||||
pub trait Decoder { fn set_codec(&mut self,codec:super::media::Codec)->Result<(),String>; fn decode(&mut self, au:&[u8])->Result<Vec<Frame>,String>; fn reset(&mut self); }
|
||||
pub trait Decoder { fn set_codec(&mut self,codec:super::media::Codec)->Result<(),String>; fn decode(&mut self, au:&[u8])->Result<Vec<Frame>,String>; fn reset(&mut self);
|
||||
/// Frames finished since the last call, without new input; an asynchronous decoder
|
||||
/// returns a picture here instead of holding it until the next access unit arrives.
|
||||
fn poll(&mut self)->Vec<Frame> {Vec::new()} }
|
||||
pub trait FrameSink { fn present(&mut self,frame:&Frame)->Result<(),String>; }
|
||||
/// Counts only (access units, presented frames, decode errors) for the periodic stats line.
|
||||
pub static STATS:[std::sync::atomic::AtomicU64;3]=[std::sync::atomic::AtomicU64::new(0),std::sync::atomic::AtomicU64::new(0),std::sync::atomic::AtomicU64::new(0)];
|
||||
fn wants_key_frame(units:u64,presented:u64)->bool {presented==0 && units%30==0}
|
||||
/// True when an Annex-B access unit carries an IDR/IRAP slice the decoder can restart from.
|
||||
pub fn is_key_frame(codec:super::media::Codec,au:&[u8])->bool {
|
||||
au.windows(4).enumerate().filter(|(_,w)|w[..3]==[0,0,1]).any(|(_,w)|match codec {
|
||||
super::media::Codec::H264=>w[3]&0x1f==5,
|
||||
super::media::Codec::H265=>(16..=21).contains(&((w[3]>>1)&0x3f)),
|
||||
})
|
||||
}
|
||||
/// Shows the newest frame a decoder finished between access units.
|
||||
pub fn drain(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink)->Result<(),String> {
|
||||
if let Some(frame)=decoder.poll().pop() {STATS[1].fetch_add(1,Ordering::Relaxed);sink.present(&frame)?;}
|
||||
Ok(())
|
||||
}
|
||||
pub fn display(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink,au:&[u8],codec:super::media::Codec,pli:&AtomicBool)->Result<(),String> {
|
||||
let units=STATS[0].fetch_add(1,Ordering::Relaxed)+1;
|
||||
// A later session can join a clean stream with no IDR in flight (#124): keep asking until a frame shows.
|
||||
@@ -35,6 +50,13 @@ pub fn display(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink,au:&[u8],codec:s
|
||||
}
|
||||
}
|
||||
#[cfg(test)] mod tests {
|
||||
#[test] fn key_frames_by_nal_type(){
|
||||
use crate::viewer::media::Codec;
|
||||
assert!(super::is_key_frame(Codec::H264,&[0,0,0,1,0x67,1,0,0,0,1,0x68,2,0,0,0,1,0x65,3]));
|
||||
assert!(!super::is_key_frame(Codec::H264,&[0,0,0,1,0x61,1]));
|
||||
assert!(super::is_key_frame(Codec::H265,&[0,0,0,1,0x40,1,0,0,1,0x26,1,3]));
|
||||
assert!(!super::is_key_frame(Codec::H265,&[0,0,0,1,0x02,1]));
|
||||
}
|
||||
use super::*;
|
||||
struct Mock(bool);impl Decoder for Mock {fn set_codec(&mut self,_:crate::viewer::media::Codec)->Result<(),String>{Ok(())} fn decode(&mut self,_:&[u8])->Result<Vec<Frame>,String>{if self.0{Err("synthetic".into())}else{Ok(vec![Frame{width:1,height:1,rgb:vec![0;3],content:None}])}} fn reset(&mut self){self.0=false;}}
|
||||
struct Sink(usize);impl FrameSink for Sink{fn present(&mut self,f:&Frame)->Result<(),String>{assert_eq!(f.rgb.len(),3);self.0+=1;Ok(())}}
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
//! "Allow the same account to control this device": the Settings switch runs this computer's own
|
||||
//! host (`uuremote-server`, the sibling binary) as the systemd user service, so the Linux machine
|
||||
//! shows up in every client of that account. Hosting is opt-in: the viewer never enables the
|
||||
//! service by itself, and the unit's enabled state is the saved choice. The host reads the shared
|
||||
//! config.json, so a running host only needs a restart to go online with a new account.
|
||||
use std::process::{Command, Stdio};
|
||||
|
||||
const UNIT: &str = "uuremote-native.service";
|
||||
/// `UU_VIEWER_HOST=0` leaves the host service alone.
|
||||
pub fn managed() -> bool { std::env::var("UU_VIEWER_HOST").as_deref() != Ok("0") }
|
||||
fn systemctl(args: &[&str]) -> bool {
|
||||
Command::new("systemctl").arg("--user").args(args).stdin(Stdio::null()).stdout(Stdio::null()).stderr(Stdio::null())
|
||||
.status().is_ok_and(|s| s.success())
|
||||
}
|
||||
pub fn active() -> bool { systemctl(&["is-active", "--quiet", UNIT]) }
|
||||
fn installed() -> bool { systemctl(&["cat", UNIT]) }
|
||||
|
||||
/// Same unit as packaging/deb and README (graphical-session.target imports DISPLAY / WAYLAND_DISPLAY).
|
||||
fn unit_text(server: &std::path::Path) -> String {
|
||||
format!("[Unit]\nDescription=UU Remote Linux host (unofficial)\nAfter=graphical-session.target\nPartOf=graphical-session.target\n\n\
|
||||
[Service]\nEnvironment=RUST_LOG=info\nExecStart={}\nRestart=always\nRestartSec=5\n\n[Install]\nWantedBy=graphical-session.target\n", server.display())
|
||||
}
|
||||
fn install(server: &std::path::Path) -> Result<(), String> {
|
||||
let base = std::env::var_os("XDG_CONFIG_HOME").map(std::path::PathBuf::from).filter(|p| p.is_absolute())
|
||||
.or_else(|| std::env::var_os("HOME").map(|h| std::path::PathBuf::from(h).join(".config"))).ok_or("No config directory")?;
|
||||
let dir = base.join("systemd/user");
|
||||
std::fs::create_dir_all(&dir).map_err(|_| "Cannot create the systemd user directory")?;
|
||||
std::fs::write(dir.join(UNIT), unit_text(server)).map_err(|_| "Cannot write the host service")?;
|
||||
if systemctl(&["daemon-reload"]) { Ok(()) } else { Err("systemctl --user daemon-reload failed".into()) }
|
||||
}
|
||||
|
||||
/// Starts the host and keeps it enabled (installing the user unit next to the viewer's binary if
|
||||
/// there is none). Only the Settings switch calls this.
|
||||
pub fn enable(viewer: &std::path::Path) -> Result<(), String> {
|
||||
if !installed() {
|
||||
let server = viewer.with_file_name("uuremote-server");
|
||||
if !server.is_file() { return Err("uuremote-server is not installed next to the viewer".into()) }
|
||||
install(&server)?;
|
||||
}
|
||||
if systemctl(&["enable", "--now", UNIT]) { log::info!("Host service enabled"); Ok(()) } else { Err("Cannot start the host service".into()) }
|
||||
}
|
||||
/// The account changed: a running host reloads its credentials. A stopped host stays stopped.
|
||||
pub fn restart() -> Result<(), String> {
|
||||
if systemctl(&["try-restart", UNIT]) { log::info!("Host service restarted"); Ok(()) } else { Err("Cannot restart the host service".into()) }
|
||||
}
|
||||
pub fn disable() -> Result<(), String> {
|
||||
if systemctl(&["disable", "--now", UNIT]) { log::info!("Host service disabled"); Ok(()) } else { Err("Cannot stop the host service".into()) }
|
||||
}
|
||||
|
||||
#[cfg(test)] mod tests {
|
||||
#[test] fn unit_runs_the_given_server(){
|
||||
let text=super::unit_text(std::path::Path::new("/opt/uu/uuremote-server"));
|
||||
assert!(text.contains("ExecStart=/opt/uu/uuremote-server\n"));assert!(text.contains("WantedBy=graphical-session.target"));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,374 @@
|
||||
//! In-window viewer chrome drawn over the remote picture, like the official client's: the loading
|
||||
//! screen, the network-status panel (Ctrl+Alt+G), the control-center tab and its menu (Ctrl+Alt+M).
|
||||
//! Shapes and text are rasterized on the CPU into small RGBA layers (anti-aliased); text uses a system
|
||||
//! font found with fc-match (CJK capable). Without a font only shapes are drawn.
|
||||
use ab_glyph::{Font, FontVec, PxScale, ScaleFont};
|
||||
use crate::i18n::s;
|
||||
|
||||
pub type Rgba = [u8; 4];
|
||||
const PANEL: Rgba = [32, 34, 40, 255];
|
||||
const HOVER: Rgba = [255, 255, 255, 16];
|
||||
const TEXT: Rgba = [240, 242, 245, 255];
|
||||
const DIM: Rgba = [160, 166, 176, 255];
|
||||
const ACCENT: Rgba = [59, 130, 246, 255];
|
||||
const DANGER: Rgba = [248, 113, 113, 255];
|
||||
|
||||
/// Straight-alpha RGBA pixels, uploaded as SDL_PIXELFORMAT_RGBA32 with alpha blending.
|
||||
pub struct Layer { pub w: u32, pub h: u32, pub px: Vec<u8> }
|
||||
impl Layer {
|
||||
pub fn new(w: u32, h: u32) -> Self { Self { w: w.max(1), h: h.max(1), px: vec![0; w.max(1) as usize * h.max(1) as usize * 4] } }
|
||||
fn blend(&mut self, x: i32, y: i32, c: Rgba, coverage: f32) {
|
||||
if x < 0 || y < 0 || x >= self.w as i32 || y >= self.h as i32 || coverage <= 0. { return }
|
||||
let i = (y as usize * self.w as usize + x as usize) * 4;
|
||||
let sa = c[3] as f32 / 255. * coverage.min(1.);
|
||||
let da = self.px[i + 3] as f32 / 255.;
|
||||
let oa = sa + da * (1. - sa);
|
||||
if oa <= 0. { return }
|
||||
for k in 0..3 { self.px[i + k] = ((c[k] as f32 * sa + self.px[i + k] as f32 * da * (1. - sa)) / oa).round() as u8; }
|
||||
self.px[i + 3] = (oa * 255.).round() as u8;
|
||||
}
|
||||
/// Anti-aliased rounded rectangle; coverage from the signed distance to the rounded edge.
|
||||
pub fn round_rect(&mut self, x: f32, y: f32, w: f32, h: f32, r: f32, c: Rgba) {
|
||||
let r = r.min(w / 2.).min(h / 2.);
|
||||
for py in y.floor() as i32..(y + h).ceil() as i32 { for px in x.floor() as i32..(x + w).ceil() as i32 {
|
||||
let (fx, fy) = (px as f32 + 0.5, py as f32 + 0.5);
|
||||
let qx = (fx - (x + w / 2.)).abs() - (w / 2. - r);
|
||||
let qy = (fy - (y + h / 2.)).abs() - (h / 2. - r);
|
||||
let d = (qx.max(0.).hypot(qy.max(0.))) + qx.max(qy).min(0.) - r;
|
||||
self.blend(px, py, c, 0.5 - d);
|
||||
}}
|
||||
}
|
||||
pub fn circle(&mut self, cx: f32, cy: f32, r: f32, c: Rgba) { self.round_rect(cx - r, cy - r, r * 2., r * 2., r, c); }
|
||||
/// Text with its top-left at (x, y); returns the advance width.
|
||||
pub fn text(&mut self, font: Option<&FontVec>, x: f32, y: f32, text: &str, size: f32, c: Rgba) -> f32 {
|
||||
let Some(font) = font else { return 0. };
|
||||
let scaled = font.as_scaled(PxScale::from(size));
|
||||
let mut caret = x;
|
||||
for ch in text.chars() {
|
||||
let id = scaled.glyph_id(ch);
|
||||
let glyph = id.with_scale_and_position(PxScale::from(size), ab_glyph::point(caret, y + scaled.ascent()));
|
||||
caret += scaled.h_advance(id);
|
||||
if let Some(outline) = font.outline_glyph(glyph) {
|
||||
let b = outline.px_bounds();
|
||||
outline.draw(|gx, gy, v| self.blend(b.min.x.floor() as i32 + gx as i32, b.min.y.floor() as i32 + gy as i32, c, v));
|
||||
}
|
||||
}
|
||||
caret - x
|
||||
}
|
||||
}
|
||||
pub fn measure(font: Option<&FontVec>, text: &str, size: f32) -> f32 {
|
||||
let Some(font) = font else { return text.chars().count() as f32 * size * 0.55 };
|
||||
let scaled = font.as_scaled(PxScale::from(size));
|
||||
text.chars().map(|ch| scaled.h_advance(scaled.glyph_id(ch))).sum()
|
||||
}
|
||||
|
||||
/// The UI font: `UU_VIEWER_FONT` (a .ttf/.otf/.ttc path), else fontconfig's CJK-capable sans-serif.
|
||||
pub fn load_font() -> Option<FontVec> {
|
||||
let (path, index) = match std::env::var("UU_VIEWER_FONT") {
|
||||
Ok(p) if !p.is_empty() => (p, 0),
|
||||
_ => {
|
||||
let out = std::process::Command::new("fc-match").args(["-f", "%{file}\t%{index}", "sans-serif:lang=zh-cn"]).output().ok()?;
|
||||
let line = String::from_utf8(out.stdout).ok()?;
|
||||
let (file, index) = line.split_once('\t').unwrap_or((line.as_str(), "0"));
|
||||
// fontconfig puts the variable-font named instance in the upper 16 bits; the face is below.
|
||||
(file.to_owned(), index.trim().parse::<u32>().unwrap_or(0) & 0xffff)
|
||||
}
|
||||
};
|
||||
let data = std::fs::read(&path).ok()?;
|
||||
let mut font = FontVec::try_from_vec_and_index(data, index).ok()?;
|
||||
// Variable CJK fonts default to their lightest master; use a regular UI weight.
|
||||
use ab_glyph::VariableFont;
|
||||
font.set_variation(b"wght", 450.);
|
||||
Some(font)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- loading screen
|
||||
|
||||
pub fn spinner(t: f32, size: u32) -> Layer {
|
||||
let mut l = Layer::new(size, size);
|
||||
let c = size as f32 / 2.;
|
||||
let head = (t * 1.1).fract() * std::f32::consts::TAU;
|
||||
for i in 0..12 {
|
||||
let a = i as f32 / 12. * std::f32::consts::TAU;
|
||||
// Brightness falls off smoothly behind the rotating head.
|
||||
let behind = (head - a).rem_euclid(std::f32::consts::TAU) / std::f32::consts::TAU;
|
||||
let alpha = (255. * (1. - behind).powf(1.6)).max(40.) as u8;
|
||||
l.circle(c + a.sin() * c * 0.72, c - a.cos() * c * 0.72, size as f32 * 0.07, [255, 255, 255, alpha]);
|
||||
}
|
||||
l
|
||||
}
|
||||
|
||||
pub fn label_layer(font: Option<&FontVec>, text: &str, size: f32, c: Rgba) -> Layer {
|
||||
let mut l = Layer::new(measure(font, text, size).ceil() as u32 + 4, (size * 1.4).ceil() as u32);
|
||||
l.text(font, 2., 0., text, size, c);
|
||||
l
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- network status
|
||||
|
||||
#[derive(Default, Clone, PartialEq)]
|
||||
pub struct NetStats { pub elapsed: u64, pub route: String, pub fps: u32, pub kbps: f64, pub rtt_ms: Option<u32>, pub loss: f64, pub size: (u32, u32), pub codec: &'static str, pub chroma: u32 }
|
||||
pub fn stats_lines(n: &NetStats) -> Vec<String> {
|
||||
let rate = if n.kbps >= 1000. { format!("{:.1} Mbps", n.kbps / 1000.) } else { format!("{:.0} Kbps", n.kbps) };
|
||||
vec![
|
||||
format!("{:02}:{:02}:{:02}", n.elapsed / 3600, n.elapsed / 60 % 60, n.elapsed % 60),
|
||||
if n.route.is_empty() { "--".into() } else { n.route.clone() },
|
||||
format!("{} fps · {}", n.fps, n.codec),
|
||||
rate,
|
||||
n.rtt_ms.map_or_else(|| "RTT --".into(), |r| format!("RTT {r} ms")),
|
||||
format!("{} {:.1}%", s("丢包", "Loss"), n.loss),
|
||||
format!("{}×{} · {}", n.size.0, n.size.1, if n.chroma == 3 { "4:4:4" } else { "4:2:0" }),
|
||||
]
|
||||
}
|
||||
pub fn stats_layer(font: Option<&FontVec>, lines: &[String], scale: f32) -> Layer {
|
||||
let size = 13. * scale;
|
||||
let w = lines.iter().map(|l| measure(font, l, size)).fold(0., f32::max) + 24. * scale;
|
||||
let h = lines.len() as f32 * size * 1.45 + 16. * scale;
|
||||
let mut l = Layer::new(w.ceil() as u32, h.ceil() as u32);
|
||||
l.round_rect(0., 0., w, h, 8. * scale, [0, 0, 0, 150]);
|
||||
for (i, line) in lines.iter().enumerate() { l.text(font, 12. * scale, 8. * scale + i as f32 * size * 1.45, line, size, TEXT); }
|
||||
l
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- control center
|
||||
|
||||
#[derive(Clone, Copy, PartialEq, Debug)]
|
||||
pub enum Command {
|
||||
Quality(u64), Fps(u32), Chroma(u32), FollowRemote(bool), OneToOne(bool), Volume(u8),
|
||||
AutoLock(bool), HostMute(bool), GrabKeys(bool), Files, Watch(bool), Stats(bool), HideTab(bool), Fullscreen, Disconnect,
|
||||
}
|
||||
/// What the menu shows as selected. Remote settings start at the official viewer's defaults and
|
||||
/// reflect only this session's choices; the host does not report them back.
|
||||
#[derive(Clone, PartialEq)]
|
||||
pub struct State {
|
||||
pub quality: u64, pub fps: u32, pub chroma: u32, pub follow_remote: bool, pub one_to_one: bool, pub volume: u8,
|
||||
pub auto_lock: bool, pub host_mute: bool, pub grab_keys: bool, pub watch: bool, pub stats: bool, pub hide_tab: bool, pub fullscreen: bool,
|
||||
}
|
||||
impl Default for State {
|
||||
fn default() -> Self { Self { quality: 5, fps: 60, chroma: 1, follow_remote: true, one_to_one: false, volume: 100, auto_lock: false,
|
||||
host_mute: false, grab_keys: false, watch: false, stats: false, hide_tab: false, fullscreen: false } }
|
||||
}
|
||||
|
||||
enum Opt { Header(&'static str), Radio(&'static str, bool, Command), Check(&'static str, bool, Command), Action(&'static str, Command, &'static str), Slider }
|
||||
fn categories() -> [&'static str; 10] {
|
||||
[s("显示屏", "Display"), s("画质", "Quality"), s("窗口", "Window"), s("声音", "Sound"), s("安全", "Security"),
|
||||
s("外设", "Peripherals"), s("工具", "Tools"), s("更多", "More"), s("全屏", "Full screen"), s("退出远控", "Disconnect")]
|
||||
}
|
||||
fn options(cat: usize, st: &State) -> Vec<Opt> {
|
||||
use Opt::*;
|
||||
match cat {
|
||||
0 => vec![Header(s("分辨率", "Resolution")), Radio(s("跟随被控端", "Follow the remote"), st.follow_remote, Command::FollowRemote(true)),
|
||||
Radio(s("跟随当前窗口", "Match this window"), !st.follow_remote, Command::FollowRemote(false))],
|
||||
1 => vec![Radio(s("自动", "Auto"), st.quality == 5, Command::Quality(5)), Radio(s("原画 20M", "Original 20M"), st.quality == 4, Command::Quality(4)),
|
||||
Radio(s("超清 8M", "Ultra HD 8M"), st.quality == 3, Command::Quality(3)), Radio(s("高清 2M", "HD 2M"), st.quality == 2, Command::Quality(2)),
|
||||
Header(s("帧率", "Frame rate")), Radio(s("144 帧", "144 fps"), st.fps == 144, Command::Fps(144)), Radio(s("90 帧", "90 fps"), st.fps == 90, Command::Fps(90)),
|
||||
Radio(s("60 帧", "60 fps"), st.fps == 60, Command::Fps(60)), Radio(s("30 帧", "30 fps"), st.fps == 30, Command::Fps(30)),
|
||||
Header(s("色彩", "Color")), Radio(s("真彩 4:4:4", "True color 4:4:4"), st.chroma == 3, Command::Chroma(3)),
|
||||
Radio(s("常规色彩", "Standard color"), st.chroma != 3, Command::Chroma(1))],
|
||||
2 => vec![Radio(s("自适应", "Fit to window"), !st.one_to_one, Command::OneToOne(false)), Radio(s("实际大小 1:1", "Actual size 1:1"), st.one_to_one, Command::OneToOne(true))],
|
||||
3 => vec![Slider],
|
||||
4 => vec![Check(s("远程结束后,被控端自动锁屏", "Lock the remote when the session ends"), st.auto_lock, Command::AutoLock(!st.auto_lock)),
|
||||
Check(s("被控端静音运行", "Mute the remote while connected"), st.host_mute, Command::HostMute(!st.host_mute))],
|
||||
5 => vec![Header(s("键盘", "Keyboard")), Check(s("发送系统快捷键到被控端", "Send system shortcuts (Alt+Tab)"), st.grab_keys, Command::GrabKeys(!st.grab_keys))],
|
||||
6 => vec![Action(s("文件传输", "File transfer"), Command::Files, "Ctrl+Alt+F"), Check(s("观看模式", "Watch mode"), st.watch, Command::Watch(!st.watch))],
|
||||
7 => vec![Check(s("显示网络状态", "Show network status"), st.stats, Command::Stats(!st.stats)),
|
||||
Check(s("全屏状态隐藏控制按钮", "Hide the control tab in full screen"), st.hide_tab, Command::HideTab(!st.hide_tab))],
|
||||
_ => vec![],
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, PartialEq)]
|
||||
pub enum Hit { Tab, Category(usize), Option(usize, usize), Slider(f32, f32), Panel }
|
||||
#[derive(Clone, PartialEq)]
|
||||
pub struct Menu { pub open: bool, pub category: usize, pub hover: Option<Hit>, pub dragging: bool }
|
||||
impl Default for Menu { fn default() -> Self { Self { open: false, category: 1, hover: None, dragging: false } } }
|
||||
|
||||
pub struct Rect { pub x: f32, pub y: f32, pub w: f32, pub h: f32 }
|
||||
impl Rect { pub fn contains(&self, x: f32, y: f32) -> bool { x >= self.x && y >= self.y && x < self.x + self.w && y < self.y + self.h } }
|
||||
|
||||
pub const TAB_H: f32 = 30.;
|
||||
pub fn tab_text() -> &'static str { s("控制中心", "Control center") }
|
||||
/// Width of the drawn menu icon plus its gap; fonts without U+2630 would show a box.
|
||||
const ICON_W: f32 = 18.;
|
||||
pub fn tab_rect(font: Option<&FontVec>, window: (u32, u32), scale: f32) -> Rect {
|
||||
let w = measure(font, tab_text(), 13. * scale) + (28. + ICON_W) * scale;
|
||||
Rect { x: (window.0 as f32 - w) / 2., y: 0., w, h: TAB_H * scale }
|
||||
}
|
||||
pub fn tab_layer(font: Option<&FontVec>, scale: f32, hover: bool) -> Layer {
|
||||
let r = tab_rect(font, (0, 0), scale);
|
||||
let mut l = Layer::new(r.w.ceil() as u32, r.h.ceil() as u32);
|
||||
// Flat top edge: the pill hangs from the window border.
|
||||
l.round_rect(0., -12. * scale, r.w, r.h + 12. * scale, 12. * scale, if hover { [40, 44, 52, 235] } else { [24, 26, 31, 205] });
|
||||
for i in 0..3 { l.round_rect(14. * scale, r.h / 2. + (i as f32 * 4. - 5.) * scale, 11. * scale, 1.6 * scale, 0.8 * scale, TEXT); }
|
||||
l.text(font, (14. + ICON_W) * scale, (r.h - 13. * scale * 1.25) / 2., tab_text(), 13. * scale, TEXT);
|
||||
l
|
||||
}
|
||||
|
||||
/// Menu geometry relative to its own layer; the same list drives drawing and hit testing.
|
||||
/// Cascading like the official client: a narrow category list and, beside the hovered row,
|
||||
/// a card sized to the selected category's options.
|
||||
pub struct Layout { pub w: f32, pub h: f32, pub items: Vec<(Rect, Hit)>, pub panels: Vec<Rect> }
|
||||
const ROW: f32 = 30.; const HEADER: f32 = 22.; const SLIDER: f32 = 36.; const PAD: f32 = 6.; const SHADOW: f32 = 14.;
|
||||
const MAIN_W: f32 = 150.; const GAP: f32 = 6.; const TEXT_SIZE: f32 = 13.;
|
||||
fn option_height(opt: &Opt) -> f32 { match opt { Opt::Header(_) => HEADER, Opt::Slider => SLIDER, _ => ROW } }
|
||||
fn option_width(font: Option<&FontVec>, opt: &Opt, scale: f32) -> f32 {
|
||||
let text = |t: &str, size: f32| measure(font, t, size * scale);
|
||||
match opt {
|
||||
Opt::Header(t) => text(t, 11.) + 28. * scale,
|
||||
Opt::Radio(t, ..) | Opt::Check(t, ..) => text(t, TEXT_SIZE) + 52. * scale,
|
||||
Opt::Action(t, _, key) => text(t, TEXT_SIZE) + text(key, 11.) + 72. * scale,
|
||||
Opt::Slider => 210. * scale,
|
||||
}
|
||||
}
|
||||
pub fn layout(font: Option<&FontVec>, st: &State, menu: &Menu, scale: f32) -> Layout {
|
||||
let k = |v: f32| v * scale;
|
||||
let cats = categories().len();
|
||||
let main = Rect { x: k(SHADOW), y: k(SHADOW), w: k(MAIN_W), h: k(PAD * 2. + ROW * cats as f32) };
|
||||
let mut items: Vec<(Rect, Hit)> = (0..cats).map(|i| (Rect { x: main.x + k(PAD), y: main.y + k(PAD + ROW * i as f32), w: main.w - k(PAD * 2.), h: k(ROW) }, Hit::Category(i))).collect();
|
||||
let mut panels = vec![Rect { x: main.x, y: main.y, w: main.w, h: main.h }];
|
||||
let opts = options(menu.category, st);
|
||||
let (mut w, mut h) = (main.x + main.w + k(SHADOW), main.y + main.h + k(SHADOW));
|
||||
if !opts.is_empty() {
|
||||
let sub_w = opts.iter().map(|o| option_width(font, o, scale)).fold(k(180.), f32::max);
|
||||
let sub_h = k(PAD * 2.) + opts.iter().map(|o| k(option_height(o))).sum::<f32>();
|
||||
// Aligned with the selected category row, kept inside the main panel's height when possible.
|
||||
let row_y = main.y + k(PAD + ROW * menu.category as f32) - k(PAD);
|
||||
let sub = Rect { x: main.x + main.w + k(GAP), y: row_y.min((main.y + main.h - sub_h).max(main.y)), w: sub_w, h: sub_h };
|
||||
let mut y = sub.y + k(PAD);
|
||||
for (i, opt) in opts.iter().enumerate() {
|
||||
let r = Rect { x: sub.x + k(PAD), y, w: sub.w - k(PAD * 2.), h: k(option_height(opt)) };
|
||||
match opt {
|
||||
Opt::Header(_) => {}
|
||||
Opt::Slider => items.push((r, Hit::Slider(sub.x + k(18.), sub.w - k(70.)))),
|
||||
_ => items.push((r, Hit::Option(menu.category, i))),
|
||||
}
|
||||
y += k(option_height(opt));
|
||||
}
|
||||
w = sub.x + sub.w + k(SHADOW); h = h.max(sub.y + sub.h + k(SHADOW));
|
||||
panels.push(sub);
|
||||
}
|
||||
Layout { w, h, items, panels }
|
||||
}
|
||||
fn card(l: &mut Layer, r: &Rect, scale: f32) {
|
||||
// Soft drop shadow, then an opaque card with a hairline border.
|
||||
for i in (1..=6).rev() {
|
||||
let e = i as f32 * 2. * scale;
|
||||
l.round_rect(r.x - e / 2., r.y - e / 2. + 3. * scale, r.w + e, r.h + e, 10. * scale + e / 2., [0, 0, 0, 9]);
|
||||
}
|
||||
l.round_rect(r.x - 1., r.y - 1., r.w + 2., r.h + 2., 10. * scale + 1., [255, 255, 255, 26]);
|
||||
l.round_rect(r.x, r.y, r.w, r.h, 10. * scale, PANEL);
|
||||
}
|
||||
pub fn menu_layer(font: Option<&FontVec>, st: &State, menu: &Menu, scale: f32) -> (Layer, Layout) {
|
||||
let lay = layout(font, st, menu, scale);
|
||||
let k = |v: f32| v * scale;
|
||||
let mut l = Layer::new(lay.w.ceil() as u32, lay.h.ceil() as u32);
|
||||
for p in &lay.panels { card(&mut l, p, scale); }
|
||||
let size = k(TEXT_SIZE);
|
||||
let mid = |r: &Rect, size: f32| r.y + (r.h - size * 1.25) / 2.;
|
||||
let opts = options(menu.category, st);
|
||||
for (i, name) in categories().iter().enumerate() {
|
||||
let r = &lay.items[i].0;
|
||||
let selected = menu.category == i && !opts.is_empty();
|
||||
if selected { l.round_rect(r.x, r.y + 1., r.w, r.h - 2., k(6.), [255, 255, 255, 30]); }
|
||||
else if menu.hover == Some(Hit::Category(i)) { l.round_rect(r.x, r.y + 1., r.w, r.h - 2., k(6.), HOVER); }
|
||||
if i == 9 { l.round_rect(r.x + k(4.), r.y - k(1.), r.w - k(8.), 1., 0., [255, 255, 255, 22]); }
|
||||
l.text(font, r.x + k(10.), mid(r, size), name, size, if i == 9 { DANGER } else { TEXT });
|
||||
if !options(i, st).is_empty() { l.text(font, r.x + r.w - k(14.), mid(r, size), "›", size, if selected { TEXT } else { DIM }); }
|
||||
}
|
||||
if let Some(sub) = lay.panels.get(1) {
|
||||
let mut y = sub.y + k(PAD);
|
||||
for (i, opt) in opts.iter().enumerate() {
|
||||
let r = Rect { x: sub.x + k(PAD), y, w: sub.w - k(PAD * 2.), h: k(option_height(opt)) };
|
||||
if menu.hover == Some(Hit::Option(menu.category, i)) { l.round_rect(r.x, r.y + 1., r.w, r.h - 2., k(6.), HOVER); }
|
||||
match opt {
|
||||
Opt::Header(t) => { l.text(font, r.x + k(10.), r.y + k(6.), t, k(11.), DIM); }
|
||||
Opt::Radio(t, on, _) => {
|
||||
if *on { l.circle(r.x + k(16.), r.y + r.h / 2., k(3.), ACCENT); }
|
||||
l.text(font, r.x + k(30.), mid(&r, size), t, size, if *on { TEXT } else { [214, 218, 224, 255] });
|
||||
}
|
||||
Opt::Check(t, on, _) => {
|
||||
// Drawn check mark: fonts without U+2713 would show a box.
|
||||
if *on { let (cx, cy) = (r.x + k(16.), r.y + r.h / 2.);
|
||||
for j in 0..8 { let f = j as f32 / 7.; l.circle(cx - k(4.) + f * k(3.), cy + f * k(3.), k(1.1), ACCENT); l.circle(cx - k(1.) + f * k(6.), cy + k(3.) - f * k(7.), k(1.1), ACCENT); } }
|
||||
l.text(font, r.x + k(30.), mid(&r, size), t, size, if *on { TEXT } else { [214, 218, 224, 255] });
|
||||
}
|
||||
Opt::Action(t, _, key) => {
|
||||
l.text(font, r.x + k(30.), mid(&r, size), t, size, TEXT);
|
||||
let kw = measure(font, key, k(11.));
|
||||
l.text(font, r.x + r.w - kw - k(10.), mid(&r, k(11.)), key, k(11.), DIM);
|
||||
}
|
||||
Opt::Slider => {
|
||||
let (a, len) = (sub.x + k(18.), sub.w - k(70.));
|
||||
let v = st.volume as f32 / 100.; let cy = r.y + r.h / 2.;
|
||||
l.round_rect(a, cy - k(2.), len, k(4.), k(2.), [255, 255, 255, 40]);
|
||||
l.round_rect(a, cy - k(2.), (len * v).max(k(4.)), k(4.), k(2.), ACCENT);
|
||||
l.circle(a + len * v, cy, k(7.), [0, 0, 0, 60]);
|
||||
l.circle(a + len * v, cy, k(6.), [255, 255, 255, 255]);
|
||||
let label = format!("{}%", st.volume);
|
||||
l.text(font, sub.x + sub.w - k(14.) - measure(font, &label, k(12.)), mid(&r, k(12.)), &label, k(12.), DIM);
|
||||
}
|
||||
}
|
||||
y += r.h;
|
||||
}
|
||||
}
|
||||
(l, lay)
|
||||
}
|
||||
/// The command for a click on an option row.
|
||||
pub fn option_command(st: &State, cat: usize, index: usize) -> Option<Command> {
|
||||
match options(cat, st).get(index)? { Opt::Radio(_, _, c) | Opt::Check(_, _, c) | Opt::Action(_, c, _) => Some(*c), _ => None }
|
||||
}
|
||||
pub fn category_command(cat: usize) -> Option<Command> { match cat { 8 => Some(Command::Fullscreen), 9 => Some(Command::Disconnect), _ => None } }
|
||||
pub fn slider_value(x: f32, a: f32, len: f32) -> u8 { (((x - a) / len).clamp(0., 1.) * 100.).round() as u8 }
|
||||
|
||||
/// Viewer preferences that outlive a session (`viewer.json` next to config.json).
|
||||
pub fn load_prefs(st: &mut State) {
|
||||
let Ok(text) = std::fs::read_to_string(prefs_path()) else { return };
|
||||
let Ok(v) = serde_json::from_str::<serde_json::Value>(&text) else { return };
|
||||
if let Some(b) = v["stats"].as_bool() { st.stats = b; }
|
||||
if let Some(b) = v["hide_tab_fullscreen"].as_bool() { st.hide_tab = b; }
|
||||
if let Some(b) = v["one_to_one"].as_bool() { st.one_to_one = b; }
|
||||
if let Some(n) = v["volume"].as_u64() { st.volume = n.min(100) as u8; }
|
||||
}
|
||||
pub fn save_prefs(st: &State) {
|
||||
let path = prefs_path();
|
||||
if let Some(dir) = path.parent() { let _ = std::fs::create_dir_all(dir); }
|
||||
let v = serde_json::json!({"stats": st.stats, "hide_tab_fullscreen": st.hide_tab, "one_to_one": st.one_to_one, "volume": st.volume});
|
||||
let _ = std::fs::write(path, v.to_string());
|
||||
}
|
||||
fn prefs_path() -> std::path::PathBuf { crate::config::path().parent().map_or_else(|| "viewer.json".into(), |d| d.join("viewer.json")) }
|
||||
|
||||
#[cfg(test)] mod tests {
|
||||
use super::*;
|
||||
#[test] fn layers_blend_inside_bounds_only(){
|
||||
let mut l=Layer::new(8,8);l.round_rect(-4.,-4.,20.,20.,3.,[255,0,0,255]);l.circle(100.,100.,5.,[0,0,0,255]);
|
||||
assert!(l.px.chunks_exact(4).all(|p|p==[255,0,0,255]));
|
||||
let mut l=Layer::new(4,4);l.round_rect(0.,0.,4.,4.,0.,[0,0,255,128]);assert_eq!(&l.px[..4],&[0,0,255,128]);
|
||||
}
|
||||
#[test] fn every_option_row_has_a_command_and_categories_map_actions(){
|
||||
let st=State::default();
|
||||
for cat in 0..10 { let lay=layout(None,&st,&Menu{category:cat,..Default::default()},1.);
|
||||
for (_,hit) in &lay.items { if let Hit::Option(c,i)=hit { assert!(option_command(&st,*c,*i).is_some()); } } }
|
||||
assert_eq!(category_command(9),Some(Command::Disconnect));assert_eq!(category_command(1),None);
|
||||
assert_eq!(slider_value(150.,100.,100.),50);assert_eq!(slider_value(0.,100.,100.),0);
|
||||
}
|
||||
/// `UU_HUD_PREVIEW=dir cargo test render_preview -- --ignored` writes the chrome as PNGs (visual check).
|
||||
#[test] #[ignore] fn render_preview(){
|
||||
let Some(dir)=std::env::var_os("UU_HUD_PREVIEW") else {return};let dir=std::path::PathBuf::from(dir);
|
||||
let font=load_font();let font=font.as_ref();
|
||||
let save=|name:&str,l:&Layer,bg:[u8;3]|{
|
||||
let rgb:Vec<u8>=l.px.chunks_exact(4).flat_map(|p|{let a=p[3] as u32;(0..3).map(move|k|((p[k] as u32*a+bg[k] as u32*(255-a))/255) as u8)}).collect();
|
||||
crate::viewer::type_ipc::write_png_rgb(&dir.join(name),l.w,l.h,&rgb,false).unwrap();
|
||||
};
|
||||
let st=State{stats:true,..State::default()};
|
||||
for cat in [1usize,3,4] {let (l,_)=menu_layer(font,&st,&Menu{open:true,category:cat,hover:Some(Hit::Option(cat,1)),dragging:false},1.);save(&format!("menu{cat}.png"),&l,[200,200,210]);}
|
||||
save("tab.png",&tab_layer(font,1.,false),[230,230,230]);
|
||||
let n=NetStats{elapsed:57,route:"UDP · relay".into(),fps:60,kbps:8420.,rtt_ms:Some(36),loss:0.,size:(1920,1080),codec:"H.265",chroma:1};
|
||||
save("stats.png",&stats_layer(font,&stats_lines(&n),1.),[230,230,230]);
|
||||
save("spinner.png",&spinner(0.3,56),[17,19,24]);
|
||||
save("title.png",&label_layer(font,"Connecting to PUNOSEVAC",20.,[240,242,245,255]),[17,19,24]);
|
||||
}
|
||||
#[test] fn stats_lines_format_numbers(){
|
||||
let n=NetStats{elapsed:3723,route:"UDP · relay".into(),fps:60,kbps:8420.,rtt_ms:Some(36),loss:0.25,size:(1920,1080),codec:"H.265",chroma:3};
|
||||
let l=stats_lines(&n);assert_eq!(l[0],"01:02:03");assert_eq!(l[3],"8.4 Mbps");assert_eq!(l[4],"RTT 36 ms");assert!(l[6].ends_with("4:4:4"));
|
||||
}
|
||||
}
|
||||
@@ -66,6 +66,7 @@ impl Input {
|
||||
pub fn new(view_only:bool)->Self {Self{view_only,..Default::default()}}
|
||||
pub fn set_mac(&mut self,mac:bool){self.mac=mac;}
|
||||
pub fn enabled(&self)->bool {!self.view_only}
|
||||
pub fn set_view_only(&mut self,view_only:bool){self.view_only=view_only;}
|
||||
pub fn key(&mut self,scan:i32,down:bool)->Option<Value> {
|
||||
if self.view_only {return None}
|
||||
let vk=if self.mac{mac_keycode(scan)}else{windows_vk(scan)}?;
|
||||
|
||||
+6
-3
@@ -16,6 +16,9 @@ pub mod desktop;
|
||||
#[cfg(uu_gtk)] pub mod ui;
|
||||
#[cfg(uu_gtk)] pub mod tools_ui;
|
||||
#[cfg(feature="viewer-sdl")] pub mod sdl;
|
||||
#[cfg(feature="viewer-sdl")] pub mod hud;
|
||||
pub mod thumbs;
|
||||
#[cfg(uu_gtk)] pub mod host;
|
||||
|
||||
pub mod tools;
|
||||
|
||||
@@ -25,7 +28,7 @@ pub mod secure_input;
|
||||
pub mod type_ipc;
|
||||
|
||||
fn device_label(name:Option<&str>)->&str{
|
||||
name.filter(|name|!name.is_empty()).unwrap_or("远端设备")
|
||||
name.filter(|name|!name.is_empty()).unwrap_or_else(||crate::i18n::s("远端设备","Remote device"))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -33,7 +36,7 @@ mod device_label_tests {
|
||||
#[test]
|
||||
fn device_name_or_fallback(){
|
||||
assert_eq!(super::device_label(Some("测试电脑")),"测试电脑");
|
||||
assert_eq!(super::device_label(None),"远端设备");
|
||||
assert_eq!(super::device_label(Some("")),"远端设备");
|
||||
assert_eq!(super::device_label(None),crate::i18n::s("远端设备","Remote device"));
|
||||
assert_eq!(super::device_label(Some("")),crate::i18n::s("远端设备","Remote device"));
|
||||
}
|
||||
}
|
||||
@@ -36,6 +36,10 @@ pub struct Observed {
|
||||
pub media_packets:AtomicU64,
|
||||
pub encoder_codecs:AtomicU32,
|
||||
pub chroma:AtomicU32,
|
||||
/// Received RTP payload bytes and video packets vs. sequence span, for the network-status panel.
|
||||
pub media_bytes:AtomicU64,
|
||||
pub video_received:AtomicU64,
|
||||
pub video_expected:AtomicU64,
|
||||
}
|
||||
pub struct Peer {
|
||||
clipboard:super::clipboard::Bridge,
|
||||
@@ -115,11 +119,22 @@ impl Peer {
|
||||
let mut receiver=super::media::Receiver::new(super::media::Codec::from_mime(&track.codec().capability.mime_type).unwrap_or_default());
|
||||
let mut tick=tokio::time::interval(std::time::Duration::from_millis(40));
|
||||
let mut last_pli=std::time::Instant::now()-std::time::Duration::from_secs(1);
|
||||
let mut span:Option<(u16,u64)>=None;
|
||||
loop {
|
||||
let output=tokio::select! {
|
||||
packet=track.read_rtp()=>match packet {
|
||||
Ok((p,_))=>{
|
||||
counters.media_packets.fetch_add(1,Ordering::Relaxed);
|
||||
counters.media_bytes.fetch_add(p.payload.len() as u64+12,Ordering::Relaxed);
|
||||
if video {
|
||||
// Extended sequence span: forward steps add, reordered/old packets do not.
|
||||
let seq=p.header.sequence_number;
|
||||
let (last,expected)=span.unwrap_or((seq.wrapping_sub(1),0));
|
||||
let step=seq.wrapping_sub(last);
|
||||
span=Some(if step!=0 && step<32768 {(seq,expected+u64::from(step))} else {(last,expected)});
|
||||
counters.video_expected.store(span.map_or(0,|s|s.1),Ordering::Relaxed);
|
||||
counters.video_received.fetch_add(1,Ordering::Relaxed);
|
||||
}
|
||||
if !video {if opus {audio.push(p.header.sequence_number,&p.payload);}continue}
|
||||
// TrackRemote updates codec from the negotiated payload type on each read.
|
||||
let Some(codec)=super::media::Codec::from_mime(&track.codec().capability.mime_type) else{continue};
|
||||
@@ -295,6 +310,25 @@ impl Peer {
|
||||
if channel.ready_state()!=webrtc::data_channel::data_channel_state::RTCDataChannelState::Open {return Err("CONTROL is not open".into())}
|
||||
channel.send(&bytes::Bytes::from(value.to_string())).await.map_err(|_|"CONTROL input send failed")?;Ok(())
|
||||
}
|
||||
/// Binary CONTROL message (protobuf envelope), e.g. capture settings and SimpleActions.
|
||||
pub async fn send_control(&self,data:Vec<u8>)->Result<(),String> {
|
||||
let channel=&self.channels[0];
|
||||
if channel.ready_state()!=webrtc::data_channel::data_channel_state::RTCDataChannelState::Open {return Err("CONTROL is not open".into())}
|
||||
channel.send(&bytes::Bytes::from(data)).await.map_err(|_|"CONTROL send failed")?;Ok(())
|
||||
}
|
||||
/// Selected ICE pair: (round-trip ms, "UDP · direct" / "TCP · relay" ...). Addresses are not kept.
|
||||
pub async fn route(&self)->(Option<u32>,String) {
|
||||
use webrtc::stats::StatsReportType as T;
|
||||
let report=self.pc.get_stats().await;
|
||||
let pair=report.reports.values().filter_map(|r|match r{T::CandidatePair(p) if p.nominated=>Some(p),_=>None}).max_by_key(|p|p.bytes_received);
|
||||
let Some(pair)=pair else {return (None,String::new())};
|
||||
let local=report.reports.get(&pair.local_candidate_id).and_then(|r|match r{T::LocalCandidate(c)=>Some(c),_=>None});
|
||||
let remote=report.reports.get(&pair.remote_candidate_id).and_then(|r|match r{T::RemoteCandidate(c)=>Some(c),_=>None});
|
||||
let relay=[local,remote].iter().flatten().any(|c|c.candidate_type==webrtc::ice::candidate::CandidateType::Relay);
|
||||
let tcp=local.is_some_and(|c|c.network_type.to_string().to_ascii_lowercase().contains("tcp") || c.relay_protocol.eq_ignore_ascii_case("tcp"));
|
||||
let rtt=(pair.current_round_trip_time>0.).then(||(pair.current_round_trip_time*1000.).round() as u32);
|
||||
(rtt,format!("{} · {}",if tcp{"TCP"}else{"UDP"},if relay{"relay"}else{"direct"}))
|
||||
}
|
||||
pub async fn close(&self) {self.clipboard.stop();self.tools.lock().unwrap().take();let _=self.pc.close().await;}
|
||||
}
|
||||
fn answer_sdp(body:&Value)->Result<String,String> {
|
||||
|
||||
+333
-18
@@ -3,22 +3,42 @@ use sdl2::{event::{Event,WindowEvent},mouse::MouseButton,pixels::PixelFormatEnum
|
||||
#[derive(Debug)] enum Command { Files, Type }
|
||||
pub struct Window { canvas:sdl2::render::Canvas<sdl2::video::Window>, events:sdl2::EventPump, _sdl:sdl2::Sdl, frame:(u32,u32), focused:bool, files:bool, mac:bool,
|
||||
clipboard:sdl2::clipboard::ClipboardUtil, clipboard_dirty:bool, clipboard_tx:tokio::sync::mpsc::Sender<super::clipboard::ClipboardRequest>, clipboard_requests:tokio::sync::mpsc::Receiver<super::clipboard::ClipboardRequest>,
|
||||
pub last_frame:Option<Frame> }
|
||||
pub last_frame:Option<Frame>, chrome:Chrome }
|
||||
/// In-window chrome state (src/viewer/hud.rs): menu, network panel, loading screen.
|
||||
struct Chrome { font:Option<ab_glyph::FontVec>, scale:f32, pub state:hud::State, menu:hud::Menu, net:Option<hud::NetStats>, tab_hover:bool, tab_down:bool,
|
||||
commands:Vec<hud::Command>, started:std::time::Instant, last_loading:std::time::Instant, title:String, stage:String, labels:std::collections::HashMap<(String,u32,u32),hud::Layer>,
|
||||
menu_cache:Option<(hud::State,hud::Menu,f32,hud::Layer)> }
|
||||
use super::hud;
|
||||
impl Window {
|
||||
pub fn new()->Result<Self,String>{
|
||||
// SDL's default nearest-neighbour scaling makes remote text uneven whenever the window size
|
||||
// differs from the stream; filter instead. Set before the renderer/textures exist.
|
||||
sdl2::hint::set_with_priority("SDL_RENDER_SCALE_QUALITY","linear",&sdl2::hint::Hint::Default);
|
||||
#[cfg(uu_gtk)] cairo_decorations();
|
||||
let sdl=sdl2::init()?;let video=sdl.video()?;
|
||||
let window=video.window("Native viewer (experimental)",1280,720).position_centered().resizable().build().map_err(|_|"Window creation failed")?;
|
||||
let name=super::device_label(std::env::var("UU_VIEWER_DEVICE_NAME").ok().as_deref()).to_owned();
|
||||
let window=video.window(&format!("{name} · {}",crate::i18n::s("UU 远程 Linux 控制端","UU Remote Linux viewer")),1280,720).position_centered().resizable().build().map_err(|_|"Window creation failed")?;
|
||||
let mut canvas=window.into_canvas().build().map_err(|_|"Renderer creation failed")?;
|
||||
// Wayland maps a toplevel only after its first buffer; without this the window stays
|
||||
// invisible until the first decoded frame, which a stalled stream never delivers.
|
||||
canvas.set_draw_color(sdl2::pixels::Color::BLACK);canvas.clear();canvas.present();
|
||||
canvas.set_draw_color(LOADING_BG);canvas.clear();canvas.present();
|
||||
let scale=std::env::var("UU_VIEWER_UI_SCALE").ok().and_then(|v|v.parse::<f32>().ok()).filter(|v|(0.5..=4.).contains(v)).unwrap_or(1.);
|
||||
let mut state=hud::State::default();hud::load_prefs(&mut state);
|
||||
let now=std::time::Instant::now();
|
||||
let chrome=Chrome{font:hud::load_font(),scale,state,menu:hud::Menu::default(),net:None,tab_hover:false,tab_down:false,commands:Vec::new(),started:now,last_loading:now-std::time::Duration::from_secs(1),
|
||||
title:crate::tr!("正在连接 {name}","Connecting to {name}"),stage:crate::i18n::s("正在连接远端设备…","Contacting the remote device…").into(),labels:Default::default(),menu_cache:None};
|
||||
let events=sdl.event_pump()?;let clipboard=video.clipboard();
|
||||
let(clipboard_tx,clipboard_requests)=tokio::sync::mpsc::channel(16);
|
||||
Ok(Self{canvas,events,_sdl:sdl,frame:(1920,1080),focused:true,files:false,mac:false,clipboard,clipboard_dirty:true,clipboard_tx,clipboard_requests,last_frame:None})
|
||||
Ok(Self{canvas,events,_sdl:sdl,frame:(1920,1080),focused:true,files:false,mac:false,clipboard,clipboard_dirty:true,clipboard_tx,clipboard_requests,last_frame:None,chrome})
|
||||
}
|
||||
pub fn clipboard_bridge(&self)->super::clipboard::Bridge{super::clipboard::Bridge::sdl(self.clipboard_tx.clone())}
|
||||
pub fn set_mac(&mut self,mac:bool){self.mac=mac;}
|
||||
fn viewport(&self)->Viewport {Viewport::fit(self.canvas.window().size(),self.frame)}
|
||||
fn viewport(&self)->Viewport {
|
||||
let window=self.canvas.window().size();
|
||||
if !self.chrome.state.one_to_one {return Viewport::fit(window,self.frame)}
|
||||
let (w,h)=(self.frame.0 as f64,self.frame.1 as f64);
|
||||
Viewport{x:((window.0 as f64-w)/2.).round(),y:((window.1 as f64-h)/2.).round(),width:w,height:h}
|
||||
}
|
||||
fn poll_clipboard(&mut self){
|
||||
// Use the existing SDL window; wl-paste creates a transient toplevel on GNOME every poll.
|
||||
while let Ok(request)=self.clipboard_requests.try_recv(){
|
||||
@@ -41,21 +61,183 @@ impl Window {
|
||||
}
|
||||
pub fn poll(&mut self,input:&mut Input)->(bool,Vec<serde_json::Value>){
|
||||
let viewport=self.viewport();
|
||||
let dirty=&mut self.clipboard_dirty;let mut redraw=false;
|
||||
let events=self.events.poll_iter().inspect(|event|{
|
||||
if matches!(event,Event::ClipboardUpdate{..}|Event::Window{win_event:WindowEvent::FocusGained,..}){*dirty=true;}
|
||||
redraw|=needs_redraw(event);
|
||||
});
|
||||
let result=translate_actions(events,input,viewport,&mut self.focused,&mut self.files);
|
||||
let mut redraw=false;
|
||||
let events=poll_events(&mut self.events);
|
||||
let mut forward=Vec::with_capacity(events.len());
|
||||
for event in events {
|
||||
if matches!(event,Event::ClipboardUpdate{..}|Event::Window{win_event:WindowEvent::FocusGained,..}){self.clipboard_dirty=true;}
|
||||
redraw|=needs_redraw(&event);
|
||||
let (consumed,changed)=self.chrome_event(&event);redraw|=changed;
|
||||
if !consumed {forward.push(event);}
|
||||
}
|
||||
let result=translate_actions(forward,input,viewport,&mut self.focused,&mut self.files);
|
||||
// A compositor resize (tiling, maximize) leaves the surface without a buffer of the new size
|
||||
// until the next frame; a static remote desktop sends none, so repaint the last frame now.
|
||||
if redraw {if let Some(frame)=self.last_frame.take(){
|
||||
log::debug!("Viewer window resized: {:?}",self.canvas.window().size());
|
||||
if let Err(e)=self.draw(&frame){log::warn!("Viewer redraw failed: {e}");}
|
||||
self.last_frame=Some(frame);
|
||||
}else{self.canvas.set_draw_color(sdl2::pixels::Color::BLACK);self.canvas.clear();self.canvas.present();}}
|
||||
}else{self.loading_frame(true);}}
|
||||
result
|
||||
}
|
||||
/// Menu, hotkeys and the control tab. Returns (consumed, needs redraw).
|
||||
fn chrome_event(&mut self,event:&Event)->(bool,bool){
|
||||
use sdl2::keyboard::{Mod,Scancode};
|
||||
let size=self.canvas.window().size();let scale=self.chrome.scale;
|
||||
let tab=hud::tab_rect(self.chrome.font.as_ref(),size,scale);
|
||||
let tab_visible=self.tab_visible();
|
||||
if let Event::KeyDown{scancode:Some(code),keymod,repeat,..}=event {
|
||||
let chord=keymod.intersects(Mod::LCTRLMOD|Mod::RCTRLMOD)&&keymod.intersects(Mod::LALTMOD|Mod::RALTMOD);
|
||||
let command=match code {Scancode::M=>Some(None),Scancode::G=>Some(Some(hud::Command::Stats(!self.chrome.state.stats))),Scancode::Return=>Some(Some(hud::Command::Fullscreen)),_=>None};
|
||||
if chord { if let Some(command)=command {
|
||||
if !repeat { match command {None=>self.chrome.menu.open^=true,Some(c)=>self.command(c)} }
|
||||
return (true,true)
|
||||
}}
|
||||
if self.chrome.menu.open { if *code==Scancode::Escape {self.chrome.menu.open=false;} return (true,true) }
|
||||
}
|
||||
if !self.chrome.menu.open {
|
||||
return match *event {
|
||||
Event::MouseMotion{x,y,..}=>{let h=tab_visible&&tab.contains(x as f32,y as f32);let changed=h!=self.chrome.tab_hover;self.chrome.tab_hover=h;(false,changed)},
|
||||
Event::MouseButtonDown{x,y,mouse_btn:MouseButton::Left,..} if tab_visible&&tab.contains(x as f32,y as f32)=>{self.chrome.menu.open=true;self.chrome.tab_down=true;(true,true)},
|
||||
Event::MouseButtonUp{mouse_btn:MouseButton::Left,..} if self.chrome.tab_down=>{self.chrome.tab_down=false;(true,false)},
|
||||
_=>(false,false),
|
||||
}
|
||||
}
|
||||
let lay=hud::layout(self.chrome.font.as_ref(),&self.chrome.state,&self.chrome.menu,scale);let origin=self.menu_origin(&lay);
|
||||
let hit=|x:i32,y:i32|->Option<hud::Hit>{
|
||||
let (lx,ly)=(x as f32-origin.0,y as f32-origin.1);
|
||||
if tab.contains(x as f32,y as f32) {return Some(hud::Hit::Tab)}
|
||||
if !lay.panels.iter().any(|p|p.contains(lx,ly)) {return None}
|
||||
Some(lay.items.iter().find(|(r,_)|r.contains(lx,ly)).map_or(hud::Hit::Panel,|(_,h)|*h))
|
||||
};
|
||||
match *event {
|
||||
Event::MouseMotion{x,y,..}=>{
|
||||
if self.chrome.menu.dragging { if let Some((a,len))=slider(&lay) {self.command(hud::Command::Volume(hud::slider_value(x as f32-origin.0,a,len)));} return (true,true) }
|
||||
let h=hit(x,y);
|
||||
if let Some(hud::Hit::Category(i))=h { if hud::category_command(i).is_none() {self.chrome.menu.category=i;} }
|
||||
let changed=h!=self.chrome.menu.hover;self.chrome.menu.hover=h;(true,changed)
|
||||
},
|
||||
Event::MouseButtonDown{x,y,mouse_btn:MouseButton::Left,..}=>{
|
||||
match hit(x,y) {
|
||||
None|Some(hud::Hit::Tab)=>{self.chrome.menu.open=false;self.chrome.tab_down=true},
|
||||
Some(hud::Hit::Category(i))=>match hud::category_command(i) {Some(c)=>{self.chrome.menu.open=false;self.command(c)},None=>self.chrome.menu.category=i},
|
||||
Some(hud::Hit::Option(c,i))=>if let Some(command)=hud::option_command(&self.chrome.state,c,i) {
|
||||
if command==hud::Command::Files {self.chrome.menu.open=false;}
|
||||
self.command(command);
|
||||
},
|
||||
Some(hud::Hit::Slider(a,len))=>{self.chrome.menu.dragging=true;self.command(hud::Command::Volume(hud::slider_value(x as f32-origin.0,a,len)))},
|
||||
Some(hud::Hit::Panel)=>{},
|
||||
}
|
||||
(true,true)
|
||||
},
|
||||
Event::MouseButtonUp{..}=>{self.chrome.tab_down=false;if std::mem::take(&mut self.chrome.menu.dragging){hud::save_prefs(&self.chrome.state);}(true,true)},
|
||||
Event::MouseButtonDown{..}|Event::MouseWheel{..}|Event::KeyUp{..}|Event::TextInput{..}=>(true,false),
|
||||
_=>(false,false),
|
||||
}
|
||||
}
|
||||
/// Local effects happen here; remote ones are drained by `run` through `take_commands`.
|
||||
fn command(&mut self,command:hud::Command){
|
||||
let st=&mut self.chrome.state;
|
||||
match command {
|
||||
hud::Command::Quality(q)=>st.quality=q, hud::Command::Fps(f)=>st.fps=f, hud::Command::Chroma(c)=>st.chroma=c,
|
||||
hud::Command::FollowRemote(b)=>st.follow_remote=b, hud::Command::Volume(v)=>st.volume=v,
|
||||
hud::Command::AutoLock(b)=>st.auto_lock=b, hud::Command::HostMute(b)=>st.host_mute=b, hud::Command::Watch(b)=>st.watch=b,
|
||||
hud::Command::OneToOne(b)=>{st.one_to_one=b;hud::save_prefs(st)},
|
||||
hud::Command::Stats(b)=>{st.stats=b;hud::save_prefs(st)},
|
||||
hud::Command::HideTab(b)=>{st.hide_tab=b;hud::save_prefs(st)},
|
||||
hud::Command::GrabKeys(b)=>{st.grab_keys=b;self.canvas.window_mut().set_keyboard_grab(b)},
|
||||
hud::Command::Fullscreen=>{
|
||||
st.fullscreen^=true;let mode=if st.fullscreen{sdl2::video::FullscreenType::Desktop}else{sdl2::video::FullscreenType::Off};
|
||||
let _=self.canvas.window_mut().set_fullscreen(mode);
|
||||
},
|
||||
hud::Command::Files=>self.files=true,
|
||||
hud::Command::Disconnect=>{},
|
||||
}
|
||||
self.chrome.commands.push(command);
|
||||
}
|
||||
pub fn take_commands(&mut self)->Vec<hud::Command>{std::mem::take(&mut self.chrome.commands)}
|
||||
pub fn state(&self)->&hud::State{&self.chrome.state}
|
||||
pub fn sync_chroma(&mut self,chroma:u32){if chroma!=0 {self.chrome.state.chroma=chroma;}}
|
||||
pub fn set_stage(&mut self,stage:&str){self.chrome.stage=stage.into();}
|
||||
pub fn window_size(&self)->(u32,u32){self.canvas.window().size()}
|
||||
pub fn has_picture(&self)->bool{self.last_frame.is_some()}
|
||||
pub fn set_net(&mut self,net:hud::NetStats){
|
||||
let show=self.chrome.state.stats;let changed=self.chrome.net.as_ref()!=Some(&net);
|
||||
self.chrome.net=Some(net);
|
||||
if show && changed {self.redraw();}
|
||||
}
|
||||
fn tab_visible(&self)->bool{!(self.chrome.state.fullscreen&&self.chrome.state.hide_tab)||self.chrome.menu.open}
|
||||
fn menu_layout(&self)->(hud::Layer,hud::Layout){hud::menu_layer(self.chrome.font.as_ref(),&self.chrome.state,&self.chrome.menu,self.chrome.scale)}
|
||||
fn menu_origin(&self,lay:&hud::Layout)->(f32,f32){
|
||||
let size=self.canvas.window().size();
|
||||
// The category list sits centered under the tab; the cascade card grows to its right.
|
||||
let shadow=14.*self.chrome.scale;let main=lay.panels.first().map_or(lay.w,|p|p.w);
|
||||
(((size.0 as f32-main)/2.-shadow).max(-shadow).min(size.0 as f32-lay.w+shadow).round(),(hud::TAB_H*self.chrome.scale+4.-shadow).round())
|
||||
}
|
||||
pub fn redraw(&mut self){
|
||||
if let Some(frame)=self.last_frame.take(){if let Err(e)=self.draw(&frame){log::warn!("Viewer redraw failed: {e}");}self.last_frame=Some(frame);}
|
||||
else {self.loading_frame(true);}
|
||||
}
|
||||
fn blit(&mut self,layer:&hud::Layer,x:i32,y:i32)->Result<(),String>{
|
||||
let creator=self.canvas.texture_creator();
|
||||
let mut t=creator.create_texture_streaming(PixelFormatEnum::RGBA32,layer.w,layer.h).map_err(|_|"Texture creation failed")?;
|
||||
t.set_blend_mode(sdl2::render::BlendMode::Blend);
|
||||
t.update(None,&layer.px,layer.w as usize*4).map_err(|_|"Texture update failed")?;
|
||||
self.canvas.copy(&t,None,Some(Rect::new(x,y,layer.w,layer.h)))
|
||||
}
|
||||
fn label(&mut self,text:&str,size:f32,color:hud::Rgba)->hud::Layer{
|
||||
let key=(text.to_owned(),size.to_bits(),u32::from_le_bytes(color));
|
||||
if self.chrome.labels.len()>64 {self.chrome.labels.clear();}
|
||||
let font=self.chrome.font.as_ref();
|
||||
let layer=self.chrome.labels.entry(key).or_insert_with(||hud::label_layer(font,text,size,color));
|
||||
hud::Layer{w:layer.w,h:layer.h,px:layer.px.clone()}
|
||||
}
|
||||
/// Network panel, control tab and menu over the picture.
|
||||
fn draw_chrome(&mut self)->Result<(),String>{
|
||||
let size=self.canvas.window().size();let scale=self.chrome.scale;
|
||||
if self.chrome.state.stats { if let Some(net)=self.chrome.net.clone() {
|
||||
let layer=hud::stats_layer(self.chrome.font.as_ref(),&hud::stats_lines(&net),scale);
|
||||
self.blit(&layer,size.0 as i32-layer.w as i32-(12.*scale) as i32,size.1 as i32-layer.h as i32-(12.*scale) as i32)?;
|
||||
}}
|
||||
if self.tab_visible() {
|
||||
let r=hud::tab_rect(self.chrome.font.as_ref(),size,scale);
|
||||
let layer=hud::tab_layer(self.chrome.font.as_ref(),scale,self.chrome.tab_hover||self.chrome.menu.open);
|
||||
self.blit(&layer,r.x.round() as i32,0)?;
|
||||
}
|
||||
if self.chrome.menu.open {
|
||||
// Rasterizing the menu is costly; reuse it until what it shows changes.
|
||||
let c=&self.chrome;
|
||||
let cached=matches!(&c.menu_cache,Some((st,m,sc,_)) if *st==c.state&&*m==c.menu&&*sc==c.scale);
|
||||
if !cached {let (layer,_)=self.menu_layout();self.chrome.menu_cache=Some((self.chrome.state.clone(),self.chrome.menu.clone(),scale,layer));}
|
||||
let lay=hud::layout(self.chrome.font.as_ref(),&self.chrome.state,&self.chrome.menu,scale);let o=self.menu_origin(&lay);
|
||||
let (st,m,sc,layer)=self.chrome.menu_cache.take().expect("menu cached above");
|
||||
let r=self.blit(&layer,o.0 as i32,o.1 as i32);
|
||||
self.chrome.menu_cache=Some((st,m,sc,layer));r?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
/// Animated "connecting" screen until the first remote picture; throttled to ~60 fps.
|
||||
pub fn loading_frame(&mut self,force:bool){
|
||||
let now=std::time::Instant::now();
|
||||
if !force && now.duration_since(self.chrome.last_loading)<std::time::Duration::from_millis(16) {return}
|
||||
self.chrome.last_loading=now;
|
||||
let size=self.canvas.window().size();let scale=self.chrome.scale;
|
||||
self.canvas.set_draw_color(LOADING_BG);self.canvas.clear();
|
||||
let t=now.duration_since(self.chrome.started).as_secs_f32();
|
||||
let spin=hud::spinner(t,(56.*scale) as u32);
|
||||
let cy=size.1 as i32/2-(40.*scale) as i32;
|
||||
let _=self.blit(&spin,(size.0 as i32-spin.w as i32)/2,cy-spin.h as i32/2);
|
||||
let (title,stage)=(self.chrome.title.clone(),self.chrome.stage.clone());
|
||||
let a=self.label(&title,20.*scale,[240,242,245,255]);
|
||||
let _=self.blit(&a,(size.0 as i32-a.w as i32)/2,cy+(48.*scale) as i32);
|
||||
// The stage line breathes gently so a long wait still looks alive.
|
||||
let alpha=(170.+60.*(t*2.2).sin()) as u8;
|
||||
let b=self.label(&stage,14.*scale,[160,166,176,255]);
|
||||
let mut b2=b;for p in b2.px.chunks_exact_mut(4){p[3]=(u16::from(p[3])*u16::from(alpha)/255) as u8;}
|
||||
let _=self.blit(&b2,(size.0 as i32-b2.w as i32)/2,cy+(84.*scale) as i32);
|
||||
if self.chrome.menu.open||self.tab_visible() {let _=self.draw_chrome();}
|
||||
self.canvas.present();
|
||||
}
|
||||
fn draw(&mut self,frame:&Frame)->Result<(),String>{
|
||||
// Pad bars belong to the decoded canvas, not the remote picture: viewport and input use the
|
||||
// content aspect, and only the content sub-rectangle of the texture is drawn.
|
||||
@@ -66,9 +248,61 @@ impl Window {
|
||||
self.canvas.set_draw_color(sdl2::pixels::Color::BLACK);self.canvas.clear();
|
||||
let src=super::input::content_rect((frame.width,frame.height),content)
|
||||
.map(|(x,y,w,h)|Rect::new(x.round() as i32,y.round() as i32,w.round().max(1.) as u32,h.round().max(1.) as u32));
|
||||
self.canvas.copy(&texture,src,Some(Rect::new(v.x.round() as i32,v.y.round() as i32,v.width.round().max(1.) as u32,v.height.round().max(1.) as u32)))?;self.canvas.present();Ok(())
|
||||
self.canvas.copy(&texture,src,Some(Rect::new(v.x.round() as i32,v.y.round() as i32,v.width.round().max(1.) as u32,v.height.round().max(1.) as u32)))?;
|
||||
drop(texture);self.draw_chrome()?;self.canvas.present();Ok(())
|
||||
}
|
||||
}
|
||||
/// On Wayland SDL draws its title bar through libdecor; the GTK plugin calls GTK3 from SDL's thread
|
||||
/// while the tool windows run gtk_main on theirs, and the two crash in GTK's style code (SIGSEGV on
|
||||
/// closing the file window). Offer libdecor only its cairo plugin unless the user chose a directory.
|
||||
#[cfg(uu_gtk)]
|
||||
fn cairo_decorations(){
|
||||
if std::env::var_os("LIBDECOR_PLUGIN_DIR").is_some() {return}
|
||||
let Some(cairo)=["/usr/lib64/libdecor/plugins-1","/usr/lib/x86_64-linux-gnu/libdecor/plugins-1","/usr/lib/libdecor/plugins-1"]
|
||||
.iter().map(|d|std::path::Path::new(d).join("libdecor-cairo.so")).find(|p|p.exists()) else {return};
|
||||
let dir=std::env::var_os("XDG_RUNTIME_DIR").map_or_else(std::env::temp_dir,std::path::PathBuf::from).join("uuremote-libdecor");
|
||||
let link=dir.join("libdecor-cairo.so");
|
||||
if std::fs::create_dir_all(&dir).is_ok() && (link.exists() || std::os::unix::fs::symlink(&cairo,&link).is_ok()) {
|
||||
std::env::set_var("LIBDECOR_PLUGIN_DIR",&dir);
|
||||
}
|
||||
}
|
||||
const LOADING_BG:sdl2::pixels::Color=sdl2::pixels::Color::RGB(17,19,24);
|
||||
/// sdl2 0.37 transmutes every event type into its `SDL_EventType` enum, which is undefined
|
||||
/// behaviour for a type SDL 2 does not define (an abort with debug checks). sdl2-compat on SDL3
|
||||
/// delivers such types (e.g. 0x207), so drop them before the crate converts the event.
|
||||
fn poll_events(_pump:&mut sdl2::EventPump)->Vec<Event>{
|
||||
let mut events=Vec::new();
|
||||
loop{
|
||||
let mut raw=std::mem::MaybeUninit::<sdl2::sys::SDL_Event>::uninit();
|
||||
// SAFETY: the pump proves SDL events are initialised on this thread; SDL_PollEvent fills the event when it returns 1.
|
||||
if unsafe{sdl2::sys::SDL_PollEvent(raw.as_mut_ptr())}!=1 {return events}
|
||||
let raw=unsafe{raw.assume_init()};
|
||||
if sdl2_event_type(unsafe{raw.type_}) {events.push(Event::from_ll(raw));}
|
||||
}
|
||||
}
|
||||
/// The values of sdl2-sys 0.37 `SDL_EventType`.
|
||||
fn sdl2_event_type(t:u32)->bool{
|
||||
matches!(t,0|0x100..=0x107|0x150|0x200|0x201|0x300..=0x305|0x400..=0x403|0x600..=0x607|0x650..=0x659|0x700..=0x702
|
||||
|0x800..=0x802|0x900|0x1000..=0x1003|0x1100|0x1101|0x1200|0x2000|0x2001|0x7F00|0x8000|0xFFFF)
|
||||
}
|
||||
fn slider(lay:&hud::Layout)->Option<(f32,f32)>{lay.items.iter().find_map(|(_,h)|match h{hud::Hit::Slider(a,len)=>Some((*a,*len)),_=>None})}
|
||||
/// Runs `fut` while the window shows the loading animation; closing the window cancels it.
|
||||
pub async fn loading<T>(window:Option<&mut Window>,stage:&str,fut:impl std::future::Future<Output=T>)->Result<T,String>{
|
||||
let Some(window)=window else {return Ok(fut.await)};
|
||||
window.set_stage(stage);
|
||||
tokio::pin!(fut);
|
||||
let mut tick=tokio::time::interval(std::time::Duration::from_millis(16));
|
||||
loop {tokio::select!{
|
||||
value=&mut fut=>return Ok(value),
|
||||
_=tick.tick()=>{
|
||||
for event in poll_events(&mut window.events) {
|
||||
if matches!(event,Event::Quit{..}|Event::Window{win_event:WindowEvent::Close,..}) {return Err("Viewer window closed".into())}
|
||||
let _=window.chrome_event(&event);
|
||||
}
|
||||
window.loading_frame(false);
|
||||
},
|
||||
}}
|
||||
}
|
||||
fn clipboard_text(bytes:&[u8])->Option<String>{
|
||||
if bytes.len()>super::clipboard::MAX_TEXT{return None}
|
||||
std::str::from_utf8(bytes).ok().map(str::to_owned)
|
||||
@@ -111,7 +345,13 @@ fn translate_actions(events:impl IntoIterator<Item=Event>,input:&mut Input,viewp
|
||||
input.scroll(dx,dy)
|
||||
},
|
||||
_=>None,
|
||||
};if let Some(m)=message{messages.push(m);}
|
||||
};if let Some(m)=message{
|
||||
// Several motions in one poll: only the newest position matters. Sending each one
|
||||
// queues a drag behind itself on a slow (relayed) path; clicks keep their order.
|
||||
let motion=|m:&serde_json::Value|m.get("action").and_then(serde_json::Value::as_str)==Some("mouse_move_absolute");
|
||||
if motion(&m) && messages.last().is_some_and(motion) {messages.pop();}
|
||||
messages.push(m);
|
||||
}
|
||||
} (quit,messages)
|
||||
}
|
||||
|
||||
@@ -158,6 +398,15 @@ pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super:
|
||||
let mut input=Input::new(view_only);input.set_mac(window.mac);let mut tick=tokio::time::interval(std::time::Duration::from_millis(8));
|
||||
let mut heartbeat=tokio::time::interval(std::time::Duration::from_secs(1));
|
||||
let deadline=tokio::time::sleep(std::time::Duration::from_secs(30));tokio::pin!(deadline);
|
||||
window.set_stage(crate::i18n::s("正在传输画面…","Waiting for the remote picture…"));
|
||||
if let Some(playback)=audio.as_mut(){playback.volume=window.state().volume;}
|
||||
if window.state().grab_keys {window.canvas.window_mut().set_keyboard_grab(true);}
|
||||
let started=std::time::Instant::now();let mut seq=3_000_000u64;
|
||||
let mut last=(0u64,0u64,0u64,0u64,std::time::Instant::now());
|
||||
let mut codec_name="--";
|
||||
// After a local drop the decoder has no reference picture; P-frames would only smear blocks.
|
||||
let mut await_key=false;
|
||||
let mut next_thumb=std::time::Instant::now()+std::time::Duration::from_secs(5);
|
||||
let result=async {
|
||||
loop {tokio::select!{
|
||||
command=commands.recv(),if command_open=>{
|
||||
@@ -195,10 +444,47 @@ pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super:
|
||||
let o=&session.peer.observed;let s=&super::desktop::STATS;let r=std::sync::atomic::Ordering::Relaxed;
|
||||
log::info!("Viewer desktop stats: control_open={} echo={} media_packets={} access_units={} presented={} decode_errors={}",
|
||||
o.control_open.load(r),o.echo_received.load(r),o.media_packets.load(r),s[0].load(r),s[1].load(r),s[2].load(r));
|
||||
// Network-status panel: per-second deltas of local counters plus the selected ICE pair.
|
||||
let now=(s[1].load(r),o.media_bytes.load(r),o.video_received.load(r),o.video_expected.load(r),std::time::Instant::now());
|
||||
let secs=now.4.duration_since(last.4).as_secs_f64().max(0.2);
|
||||
let expected=now.3.saturating_sub(last.3);let lost=expected.saturating_sub(now.2.saturating_sub(last.2));
|
||||
let (rtt_ms,route)=session.peer.route().await;
|
||||
window.sync_chroma(o.chroma.load(r));
|
||||
let size=window.last_frame.as_ref().map_or((0,0),|f|f.content.unwrap_or((f.width,f.height)));
|
||||
window.set_net(hud::NetStats{elapsed:started.elapsed().as_secs(),route,fps:((now.0-last.0) as f64/secs).round() as u32,
|
||||
kbps:(now.1-last.1) as f64*8./1000./secs,rtt_ms,loss:if expected>0 {lost as f64*100./expected as f64} else {0.},size,
|
||||
codec:codec_name,chroma:window.state().chroma});
|
||||
last=now;
|
||||
if std::time::Instant::now()>=next_thumb { if let Some(frame)=window.last_frame.as_ref() {
|
||||
if let Err(e)=super::thumbs::save(device,frame){log::debug!("Viewer thumbnail not saved: {e}");}
|
||||
next_thumb=std::time::Instant::now()+std::time::Duration::from_secs(30);
|
||||
}}
|
||||
},
|
||||
_=tick.tick()=>{
|
||||
if let Some(playback)=audio.as_mut(){if playback.pump().is_err(){log::warn!("Viewer audio playback stopped");audio=None;}}
|
||||
let (quit,messages)=window.poll(&mut input);
|
||||
let (quit,mut messages)=window.poll(&mut input);
|
||||
if !window.has_picture() {window.loading_frame(false);}
|
||||
for command in window.take_commands() {
|
||||
seq+=1;
|
||||
let control=match command {
|
||||
hud::Command::Quality(q)=>Some(super::wire::capture_setting(seq,&[(2,q)])),
|
||||
hud::Command::Fps(f)=>Some(super::wire::capture_setting(seq,&[(1,match f{30=>1,60=>2,90=>3,_=>4}),(18,u64::from(f))])),
|
||||
hud::Command::Chroma(c)=>Some(super::wire::capture_setting(seq,&[(7,u64::from(c))])),
|
||||
hud::Command::FollowRemote(true)=>Some(super::wire::capture_setting(seq,&[(10,3)])),
|
||||
hud::Command::FollowRemote(false)=>{let (w,h)=window.window_size();let (w,h)=(u64::from(w&!1),u64::from(h&!1));
|
||||
Some(super::wire::capture_setting(seq,&[(5,w),(6,h),(16,w),(17,h)]))},
|
||||
// 远程结束后自动锁屏: SimpleAction 19, value 2 = on, 1 = off.
|
||||
hud::Command::AutoLock(on)=>Some(super::wire::simple_action(seq,19,Some(if on {2} else {1}))),
|
||||
// 静音运行: on = SimpleAction 14 then 18, off = 16 (src/system_actions.rs).
|
||||
hud::Command::HostMute(true)=>{let _=session.peer.send_control(super::wire::simple_action(seq,14,None)).await;seq+=1;Some(super::wire::simple_action(seq,18,None))},
|
||||
hud::Command::HostMute(false)=>Some(super::wire::simple_action(seq,16,None)),
|
||||
hud::Command::Volume(v)=>{if let Some(playback)=audio.as_mut(){playback.volume=v;}None},
|
||||
hud::Command::Watch(on)=>{messages.extend(input.release_all());input.set_view_only(on||view_only);None},
|
||||
hud::Command::Disconnect=>return Ok(()),
|
||||
_=>None,
|
||||
};
|
||||
if let Some(data)=control { if let Err(e)=session.peer.send_control(data).await {log::warn!("Viewer control command not sent: {e}");} }
|
||||
}
|
||||
window.poll_clipboard();
|
||||
requested|=std::mem::take(&mut window.files);
|
||||
#[cfg(uu_gtk)] {
|
||||
@@ -247,12 +533,21 @@ pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super:
|
||||
if quit{return Ok(())}
|
||||
// At most one AU per iteration keeps local event polling responsive.
|
||||
if let Some(au)=session.peer.desktop.units.pop(){
|
||||
if session.peer.desktop.reset.swap(false,std::sync::atomic::Ordering::AcqRel){decoder.reset();}
|
||||
decoder.set_codec(au.codec)?;
|
||||
super::desktop::display(decoder,window,&au.data,au.codec,&session.peer.desktop.pli)?;}
|
||||
if session.peer.desktop.reset.swap(false,std::sync::atomic::Ordering::AcqRel){decoder.reset();await_key=true;}
|
||||
if await_key && !super::desktop::is_key_frame(au.codec,&au.data) {session.peer.desktop.pli.store(true,std::sync::atomic::Ordering::Release);}
|
||||
else {
|
||||
await_key=false;
|
||||
decoder.set_codec(au.codec)?;
|
||||
codec_name=if au.codec==super::media::Codec::H265 {"H.265"} else {"H.264"};
|
||||
super::desktop::display(decoder,window,&au.data,au.codec,&session.peer.desktop.pli)?;
|
||||
}}
|
||||
// A picture can finish after its access unit was written; show it without waiting
|
||||
// for the next one (a single keystroke may change the remote screen only once).
|
||||
else {super::desktop::drain(decoder,window)?;}
|
||||
}
|
||||
}}
|
||||
}.await;
|
||||
if let Some(frame)=window.last_frame.as_ref() {if let Err(e)=super::thumbs::save(device,frame){log::debug!("Viewer thumbnail not saved: {e}");}}
|
||||
#[cfg(uu_gtk)] if let Some(f)=files {f.abort();let _=f.await;super::tools_ui::hide();session.peer.tools.lock().unwrap().take();}
|
||||
if let Some(t)=type_ipc {t.abort();let _=t.await;}
|
||||
for m in input.release_all(){let _=session.peer.send_input(&m).await;}
|
||||
@@ -442,6 +737,15 @@ async fn pump_type_job(job: &mut TypeJob, session: &mut Session, window: &mut Wi
|
||||
assert!(tx.is_closed());drop(bridge);
|
||||
let window=Window::new().unwrap();assert!(window.clipboard_bridge().enabled);
|
||||
}
|
||||
#[test] fn only_event_types_sdl2_defines_reach_the_crate(){
|
||||
use sdl2::sys::SDL_EventType as T;
|
||||
for t in [T::SDL_QUIT,T::SDL_LOCALECHANGED,T::SDL_DISPLAYEVENT,T::SDL_WINDOWEVENT,T::SDL_TEXTEDITING_EXT,T::SDL_MOUSEWHEEL,
|
||||
T::SDL_JOYBATTERYUPDATED,T::SDL_CONTROLLERSENSORUPDATE,T::SDL_FINGERMOTION,T::SDL_MULTIGESTURE,T::SDL_CLIPBOARDUPDATE,
|
||||
T::SDL_DROPCOMPLETE,T::SDL_AUDIODEVICEREMOVED,T::SDL_SENSORUPDATE,T::SDL_RENDER_DEVICE_RESET,T::SDL_POLLSENTINEL,T::SDL_USEREVENT]{
|
||||
assert!(sdl2_event_type(t as u32),"{:#x}",t as u32);
|
||||
}
|
||||
for t in [0x151,0x202,0x207,0x306,0x404,0x608,0x65A,0x703,0x901,0x1004,0x1102,0x1201,0x2002,0x8001]{assert!(!sdl2_event_type(t),"{t:#x}");}
|
||||
}
|
||||
#[test] fn clipboard_text_rejects_invalid_or_large_data_and_keeps_empty_text(){
|
||||
assert_eq!(clipboard_text(b""),Some(String::new()));
|
||||
assert_eq!(clipboard_text(b"text\n"),Some("text\n".into()));
|
||||
@@ -497,6 +801,17 @@ async fn pump_type_job(job: &mut TypeJob, session: &mut Session, window: &mut Wi
|
||||
let (quit,out)=translate(events,&mut input,Viewport::fit((800,600),(1920,1080)),&mut focused);
|
||||
assert!(quit);assert!(out.is_empty());assert!(input.release_all().is_empty());
|
||||
}
|
||||
#[test] fn motions_in_one_poll_send_only_the_newest_and_keep_click_order(){
|
||||
let mut input=Input::default();let mut focused=true;
|
||||
let motion=|x,y|Event::MouseMotion{timestamp:0,window_id:1,which:0,mousestate:sdl2::mouse::MouseState::from_sdl_state(0),x,y,xrel:1,yrel:1};
|
||||
let down=Event::MouseButtonDown{timestamp:0,window_id:1,which:0,mouse_btn:MouseButton::Left,clicks:1,x:0,y:0};
|
||||
let v=Viewport::fit((800,600),(800,600));
|
||||
let (_,out)=translate([motion(10,10),motion(20,20),down,motion(30,30),motion(40,40)],&mut input,v,&mut focused);
|
||||
let actions:Vec<&str>=out.iter().map(|m|m["action"].as_str().unwrap()).collect();
|
||||
assert_eq!(actions.len(),3,"{out:?}");
|
||||
assert_eq!(actions[0],"mouse_move_absolute");assert_eq!(actions[2],"mouse_move_absolute");assert_ne!(actions[1],"mouse_move_absolute");
|
||||
assert!((out[0]["abs_x"].as_f64().unwrap()-20./800.).abs()<0.01 && (out[2]["abs_x"].as_f64().unwrap()-40./800.).abs()<0.01,"{out:?}");
|
||||
}
|
||||
#[test] fn focus_event_releases_and_suppresses_input_until_focus_returns(){
|
||||
let mut input=Input::default();input.key(4,true);input.button(1,true);let mut focused=true;
|
||||
let focus=|win_event|Event::Window{timestamp:0,window_id:1,win_event};
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
//! Device preview pictures for the launcher, like the official client's device card: the desktop
|
||||
//! window saves a small PNG of the last remote picture. Local only (`$XDG_CACHE_HOME/uuremote/thumbs`,
|
||||
//! 0700 directory, 0600 files); `UU_VIEWER_THUMBNAILS=0` turns it off.
|
||||
use std::path::PathBuf;
|
||||
|
||||
pub fn enabled() -> bool { std::env::var("UU_VIEWER_THUMBNAILS").as_deref() != Ok("0") }
|
||||
fn dir() -> Option<PathBuf> {
|
||||
let base = std::env::var_os("XDG_CACHE_HOME").map(PathBuf::from).filter(|p| p.is_absolute())
|
||||
.or_else(|| std::env::var_os("HOME").map(|h| PathBuf::from(h).join(".cache")))?;
|
||||
Some(base.join("uuremote").join("thumbs"))
|
||||
}
|
||||
pub fn path(device: &str) -> Option<PathBuf> { Some(dir()?.join(format!("{}.png", &super::type_ipc::device_key(device)[..32]))) }
|
||||
pub fn existing(device: &str) -> Option<PathBuf> { enabled().then(|| path(device)).flatten().filter(|p| p.is_file()) }
|
||||
|
||||
/// Box-filtered downscale of the content rectangle to at most `max_w` pixels wide.
|
||||
pub fn downscale(width: u32, height: u32, rgb: &[u8], content: (u32, u32, u32, u32), max_w: u32) -> (u32, u32, Vec<u8>) {
|
||||
let (cx, cy, cw, ch) = content;
|
||||
let ratio = (cw as f64 / max_w as f64).max(1.);
|
||||
let (w, h) = (((cw as f64 / ratio).round() as u32).max(1), ((ch as f64 / ratio).round() as u32).max(1));
|
||||
let mut out = Vec::with_capacity(w as usize * h as usize * 3);
|
||||
for y in 0..h { for x in 0..w {
|
||||
let (x0, x1) = (cx + (x as f64 * ratio) as u32, (cx + ((x + 1) as f64 * ratio) as u32).max(cx + (x as f64 * ratio) as u32 + 1).min(cx + cw).min(width));
|
||||
let (y0, y1) = (cy + (y as f64 * ratio) as u32, (cy + ((y + 1) as f64 * ratio) as u32).max(cy + (y as f64 * ratio) as u32 + 1).min(cy + ch).min(height));
|
||||
let mut sum = [0u64; 3]; let mut n = 0u64;
|
||||
for sy in y0..y1 { for sx in x0..x1 {
|
||||
let i = (sy as usize * width as usize + sx as usize) * 3;
|
||||
for k in 0..3 { sum[k] += u64::from(rgb[i + k]); } n += 1;
|
||||
}}
|
||||
for k in 0..3 { out.push((sum[k] / n.max(1)) as u8); }
|
||||
}}
|
||||
(w, h, out)
|
||||
}
|
||||
|
||||
pub fn save(device: &str, frame: &super::desktop::Frame) -> Result<(), String> {
|
||||
if !enabled() { return Ok(()) }
|
||||
let path = path(device).ok_or("No cache directory")?;
|
||||
let dir = path.parent().ok_or("No cache directory")?;
|
||||
use std::os::unix::fs::{DirBuilderExt, PermissionsExt};
|
||||
std::fs::DirBuilder::new().recursive(true).mode(0o700).create(dir).map_err(|_| "Cannot create the thumbnail directory")?;
|
||||
let _ = std::fs::set_permissions(dir, std::fs::Permissions::from_mode(0o700));
|
||||
let content = super::input::content_rect((frame.width, frame.height), frame.content.unwrap_or((frame.width, frame.height)))
|
||||
.map_or((0, 0, frame.width, frame.height), |(x, y, w, h)| (x as u32, y as u32, w as u32, h as u32));
|
||||
let (w, h, rgb) = downscale(frame.width, frame.height, &frame.rgb, content, 640);
|
||||
// Write then rename, so the launcher never reads a half-written file.
|
||||
let tmp = path.with_extension("tmp");
|
||||
let _ = std::fs::remove_file(&tmp);
|
||||
super::type_ipc::write_png_rgb(&tmp, w, h, &rgb, true)?;
|
||||
std::fs::rename(&tmp, &path).map_err(|_| "Cannot store the thumbnail".into())
|
||||
}
|
||||
|
||||
#[cfg(test)] mod tests {
|
||||
#[test] fn downscale_averages_and_keeps_aspect(){
|
||||
let rgb:Vec<u8>=(0..4*2).flat_map(|i|if i%2==0{[0,0,0]}else{[200,100,50]}).collect();
|
||||
let (w,h,out)=super::downscale(4,2,&rgb,(0,0,4,2),2);
|
||||
assert_eq!((w,h),(2,1));assert_eq!(&out[..3],&[100,50,25]);
|
||||
assert_eq!(super::downscale(4,2,&rgb,(0,0,4,2),640).0,4);
|
||||
}
|
||||
}
|
||||
@@ -161,7 +161,7 @@ pub fn session_rows(sessions:&[Value])->String{
|
||||
let mut rows:Vec<_>=sessions.iter().filter_map(|s|{
|
||||
let id=u32::try_from(s["session_id"].as_u64()?).ok().filter(|n|*n!=0)?;
|
||||
let shell=s["shell"].as_str().unwrap_or("--").chars().take(256).collect::<String>().replace(['\t','\n','\r','\0']," ");
|
||||
let state=match s["state"].as_str(){Some("running")=>"运行中",Some("detached")=>"已分离",_=>"--"};
|
||||
let state=match s["state"].as_str(){Some("running")=>crate::i18n::s("运行中","Running"),Some("detached")=>crate::i18n::s("已分离","Detached"),_=>"--"};
|
||||
Some((id,format!("{id}\t{shell}\t{}\t{state}\n",s["created_at_ms"].as_u64().unwrap_or(0))))
|
||||
}).collect();rows.sort_by_key(|r|r.0);rows.into_iter().map(|r|r.1).collect()
|
||||
}
|
||||
@@ -156,7 +156,7 @@ fn terminal_metadata_is_allowlisted_and_sorted(){
|
||||
serde_json::json!({"session_id":2,"shell":"/bin/bash","state":"running"}),
|
||||
serde_json::json!({"session_id":0}),serde_json::json!({"session_id":4294967296u64}),
|
||||
]);
|
||||
assert_eq!(rows,"2\t/bin/bash\t0\t运行中\n9\t/bin/sh X Y \t123\t已分离\n");
|
||||
assert_eq!(rows,format!("2\t/bin/bash\t0\t{}\n9\t/bin/sh X Y \t123\t{}\n",crate::i18n::s("运行中","Running"),crate::i18n::s("已分离","Detached")));
|
||||
assert!(!rows.contains("PRIVATE"));assert!(terminal::session_rows(&[]).is_empty());
|
||||
}
|
||||
#[tokio::test]
|
||||
|
||||
+18
-18
@@ -54,7 +54,7 @@ fn task(id:i32,name:&str,status:&str,done:u64,total:u64,from:&str,to:&str,state:
|
||||
let(n,s,f,t)=(c(name),c(status),c(from),c(to));
|
||||
unsafe{uu_files_ui_task(id,n.as_ptr(),s.as_ptr(),done,total,f.as_ptr(),t.as_ptr(),state)}
|
||||
}
|
||||
fn reason(error:&str)->String{if error.contains("canceled"){"已取消".into()}else{format!("失败:{error}")}}
|
||||
fn reason(error:&str)->String{if error.contains("canceled"){crate::i18n::s("已取消","Canceled").into()}else{crate::tr!("失败:{error}","Failed: {error}")}}
|
||||
|
||||
pub async fn files(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(),String>{
|
||||
start("files",name)?;
|
||||
@@ -67,7 +67,7 @@ pub async fn files(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(),
|
||||
let mut guard=shown.lock().unwrap();let Some(a)=guard.as_mut() else{continue};
|
||||
if a.last.elapsed()<Duration::from_millis(200) && p.transferred<p.total{continue}a.last=Instant::now();
|
||||
let percent=if p.total>0{p.transferred*100/p.total}else{0};
|
||||
task(a.id,&a.name,&format!("传输中 {percent}%"),p.transferred,p.total,&a.from,&a.to,0);
|
||||
task(a.id,&a.name,&crate::tr!("传输中 {percent}%","Transferring {percent}%"),p.transferred,p.total,&a.from,&a.to,0);
|
||||
}
|
||||
});
|
||||
let _reporter=super::tools::Cancel(reporter.abort_handle());
|
||||
@@ -79,24 +79,24 @@ pub async fn files(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(),
|
||||
while let Some(job)=queue.recv().await{if worker_closing.load(Ordering::Acquire){break}match job{
|
||||
Job::List(path)=>match worker_f.list_dir(&path).await{
|
||||
Ok(entries)=>{remote=path.clone();let(p,r)=(c(&path),c(&entry_rows(&entries)));unsafe{uu_files_ui_set_remote(p.as_ptr(),r.as_ptr())}}
|
||||
Err(e)=>toast(&format!("无法读取远端目录:{e}")),
|
||||
Err(e)=>toast(&crate::tr!("无法读取远端目录:{e}","Cannot read remote folder: {e}")),
|
||||
},
|
||||
Job::Mkdir(path,parent)=>match worker_f.mkdir(&path).await{
|
||||
Ok(())=>if parent==remote{if let Ok(entries)=worker_f.list_dir(&remote).await{let(p,r)=(c(&remote),c(&entry_rows(&entries)));unsafe{uu_files_ui_set_remote(p.as_ptr(),r.as_ptr())}}},
|
||||
Err(e)=>toast(&format!("无法创建远端文件夹:{e}")),
|
||||
Err(e)=>toast(&crate::tr!("无法创建远端文件夹:{e}","Cannot create remote folder: {e}")),
|
||||
},
|
||||
Job::Transfer{id,upload,from,dir,generation}=>{
|
||||
let name=base_name(&from).to_owned();
|
||||
let to=if upload{remote_join(&dir,&name)}else{free_local(std::path::Path::new(&dir),&name).to_string_lossy().into_owned()};
|
||||
if generation!=worker_gen.load(Ordering::Acquire){task(id,&name,"已取消",0,0,&from,&to,2);continue}
|
||||
if generation!=worker_gen.load(Ordering::Acquire){task(id,&name,crate::i18n::s("已取消","Canceled"),0,0,&from,&to,2);continue}
|
||||
*worker_active.lock().unwrap()=Some(Active{id,name:name.clone(),from:from.clone(),to:to.clone(),last:Instant::now()});
|
||||
task(id,&name,"传输中",0,0,&from,&to,0);
|
||||
task(id,&name,crate::i18n::s("传输中","Transferring"),0,0,&from,&to,0);
|
||||
let result=if upload{worker_f.upload(&from,&to).await}else{worker_f.download(&from,&to).await};
|
||||
*worker_active.lock().unwrap()=None;
|
||||
match result{
|
||||
Ok(())=>{
|
||||
let size=std::fs::metadata(if upload{&from}else{&to}).map(|m|if m.is_file(){m.len()}else{0}).unwrap_or(0);
|
||||
task(id,&name,"已完成",size,size,&from,&to,1);
|
||||
task(id,&name,crate::i18n::s("已完成","Done"),size,size,&from,&to,1);
|
||||
if upload{if dir==remote{if let Ok(entries)=worker_f.list_dir(&remote).await{let(p,r)=(c(&remote),c(&entry_rows(&entries)));unsafe{uu_files_ui_set_remote(p.as_ptr(),r.as_ptr())}}}}
|
||||
else{unsafe{uu_files_ui_refresh_local()}}
|
||||
}
|
||||
@@ -118,7 +118,7 @@ pub async fn files(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(),
|
||||
["mkdir",path]=>{let parent=path.rfind(['/','\\']).map(|i|path[..i.max(1)].to_owned()).unwrap_or_default();let _=jobs.send(Job::Mkdir((*path).into(),parent));}
|
||||
[kind@("put"|"get"),from,dir]=>{
|
||||
let(id,upload)=(NEXT_TASK.fetch_add(1,Ordering::Relaxed),*kind=="put");
|
||||
let name=base_name(from);task(id,name,"等待中",0,0,from,dir,0);
|
||||
let name=base_name(from);task(id,name,crate::i18n::s("等待中","Waiting"),0,0,from,dir,0);
|
||||
let _=jobs.send(Job::Transfer{id,upload,from:(*from).into(),dir:(*dir).into(),generation:generation.load(Ordering::Acquire)});
|
||||
}
|
||||
["cancel"]=>{generation.fetch_add(1,Ordering::AcqRel);f.cancel();}
|
||||
@@ -147,12 +147,12 @@ pub async fn portmap(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(
|
||||
["add",rule,local,host,port]=>match(local.parse::<u16>(),port.parse::<u16>()){
|
||||
(Ok(local),Ok(port))=>match p.add_rule(*rule,local,*host,port).await{
|
||||
Ok(id)=>{targets.insert(id,format!("{host}:{port}"));}
|
||||
Err(e)=>toast(&format!("添加失败:{}",if e.contains("bind"){"本地端口已被占用".to_owned()}else{e})),
|
||||
Err(e)=>toast(&crate::tr!("添加失败:{}","Add failed: {}",if e.contains("bind"){crate::i18n::s("本地端口已被占用","Local port is already in use").to_owned()}else{e})),
|
||||
},
|
||||
_=>toast("端口无效"),
|
||||
_=>toast(crate::i18n::s("端口无效","Invalid port")),
|
||||
},
|
||||
["remove",id]=>if let Ok(id)=id.parse::<u64>(){
|
||||
if let Err(e)=p.remove_rule(id).await{toast(&format!("删除失败:{e}"))}targets.remove(&id);
|
||||
if let Err(e)=p.remove_rule(id).await{toast(&crate::tr!("删除失败:{e}","Remove failed: {e}"))}targets.remove(&id);
|
||||
},
|
||||
_=>{}
|
||||
}
|
||||
@@ -160,9 +160,9 @@ pub async fn portmap(io:Transport,rx:mpsc::Receiver<Packet>,name:&str)->Result<(
|
||||
let mut status=p.status();status.sort_by_key(|s|s.id);
|
||||
let rows:String=status.iter().map(|s|format!("{}\t{}\t127.0.0.1:{}\t{}\t{}\n",s.id,s.name.replace(['\t','\n']," "),s.local_port,
|
||||
targets.get(&s.id).map(String::as_str).unwrap_or("-"),
|
||||
if s.failures>0{format!("已启用 · {} 个连接 · {} 次失败",s.streams,s.failures)}else{format!("已启用 · {} 个连接",s.streams)})).collect();
|
||||
if s.failures>0{crate::tr!("已启用 · {} 个连接 · {} 次失败","On · {} connections · {} failures",s.streams,s.failures)}else{crate::tr!("已启用 · {} 个连接","On · {} connections",s.streams)})).collect();
|
||||
if rows!=last{let r=c(&rows);unsafe{uu_portmap_ui_set_rules(r.as_ptr())};last=rows;}
|
||||
tokio::select!{_=&mut closed_transport=>{toast("连接已断开");tokio::time::sleep(Duration::from_secs(3)).await;break Err("Forwarding transport closed".into())},_=tokio::time::sleep(Duration::from_millis(200))=>{}}
|
||||
tokio::select!{_=&mut closed_transport=>{toast(crate::i18n::s("连接已断开","Disconnected"));tokio::time::sleep(Duration::from_secs(3)).await;break Err("Forwarding transport closed".into())},_=tokio::time::sleep(Duration::from_millis(200))=>{}}
|
||||
};
|
||||
let ids:Vec<u64>=p.status().iter().map(|s|s.id).collect();for id in ids{let _=p.remove_rule(id).await;}
|
||||
result
|
||||
@@ -190,14 +190,14 @@ pub async fn terminal(io:Transport,rx:mpsc::Receiver<Packet>,_device:&str,name:&
|
||||
unsafe{uu_terminal_ui_set(rows.as_ptr(),1)}
|
||||
},
|
||||
id=queue.recv()=>match id{
|
||||
Some(id)=>{if t.kill(id).await.is_err(){toast("结束会话失败,会话可能已退出")}
|
||||
Some(id)=>{if t.kill(id).await.is_err(){toast(crate::i18n::s("结束会话失败,会话可能已退出","Could not end the session; it may have exited"))}
|
||||
let rows=c(&session_rows(&t.list_sessions().await?));unsafe{uu_terminal_ui_set(rows.as_ptr(),1)}},
|
||||
None=>return Ok::<(),String>(()),
|
||||
},
|
||||
_=tokio::time::sleep(Duration::from_millis(100)),if relay.0.is_finished()=>return Err("Terminal channel closed".into()),
|
||||
}}
|
||||
}.await;
|
||||
if operation.is_err(){unsafe{uu_terminal_ui_set(c("").as_ptr(),0)};toast("终端连接已断开,请关闭窗口后重试")}
|
||||
if operation.is_err(){unsafe{uu_terminal_ui_set(c("").as_ptr(),0)};toast(crate::i18n::s("终端连接已断开,请关闭窗口后重试","Terminal disconnected. Close the window and try again"))}
|
||||
});
|
||||
let _worker=super::tools::Cancel(worker.abort_handle());
|
||||
let mut children:Vec<std::process::Child>=Vec::new();
|
||||
@@ -205,7 +205,7 @@ pub async fn terminal(io:Transport,rx:mpsc::Receiver<Packet>,_device:&str,name:&
|
||||
if worker.is_finished(){ipc.0.abort();}
|
||||
children.retain_mut(|child|matches!(child.try_wait(),Ok(None)));
|
||||
while let Some(cmd)=take(){
|
||||
if worker.is_finished(){toast("连接已断开");continue}
|
||||
if worker.is_finished(){toast(crate::i18n::s("连接已断开","Disconnected"));continue}
|
||||
let parts:Vec<_>=cmd.split('\t').collect();
|
||||
let session=match parts.as_slice(){
|
||||
["create"]=>None,
|
||||
@@ -214,8 +214,8 @@ pub async fn terminal(io:Transport,rx:mpsc::Receiver<Packet>,_device:&str,name:&
|
||||
_=>continue,
|
||||
};
|
||||
match local_terminal_command(&exe,&path,session){
|
||||
Some(mut command)=>match command.spawn(){Ok(child)=>children.push(child),Err(_)=>toast("无法启动本机终端程序")},
|
||||
None=>toast("没有找到本机终端程序(可设置 TERMINAL 环境变量)"),
|
||||
Some(mut command)=>match command.spawn(){Ok(child)=>children.push(child),Err(_)=>toast(crate::i18n::s("无法启动本机终端程序","Cannot start a local terminal"))},
|
||||
None=>toast(crate::i18n::s("没有找到本机终端程序(可设置 TERMINAL 环境变量)","No local terminal found (set the TERMINAL environment variable)")),
|
||||
}
|
||||
}
|
||||
tokio::time::sleep(Duration::from_millis(100)).await;
|
||||
|
||||
@@ -392,7 +392,10 @@ mod tests {
|
||||
|
||||
fn tempfile_dir() -> PathBuf {
|
||||
use std::os::unix::fs::DirBuilderExt;
|
||||
let dir = std::env::temp_dir().join(format!("uu-type-ipc-test-{}", std::process::id()));
|
||||
// One directory per call: tests run in parallel and must not remove each other's files.
|
||||
static NEXT: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
|
||||
let dir = std::env::temp_dir().join(format!("uu-type-ipc-test-{}-{}", std::process::id(),
|
||||
NEXT.fetch_add(1, std::sync::atomic::Ordering::Relaxed)));
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
std::fs::DirBuilder::new()
|
||||
.mode(0o700)
|
||||
@@ -404,6 +407,8 @@ mod tests {
|
||||
#[tokio::test]
|
||||
async fn server_client_roundtrip_and_uid_gate() {
|
||||
let device = format!("ipc-test-{}", uuidish());
|
||||
// XDG_RUNTIME_DIR is process-wide; another test points it at a planted directory.
|
||||
let _env = crate::viewer::secure_input::ENV_LOCK.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
|
||||
let server = Server::bind(&device).await.unwrap();
|
||||
let path = server.path.clone();
|
||||
let (tx, mut rx) = mpsc::channel::<PendingType>(4);
|
||||
@@ -463,6 +468,8 @@ mod tests {
|
||||
#[tokio::test]
|
||||
async fn oversized_frame_rejected() {
|
||||
let device = format!("oversize-{}", uuidish());
|
||||
// XDG_RUNTIME_DIR is process-wide; another test points it at a planted directory.
|
||||
let _env = crate::viewer::secure_input::ENV_LOCK.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
|
||||
let server = Server::bind(&device).await.unwrap();
|
||||
let path = server.path.clone();
|
||||
let (tx, mut rx) = mpsc::channel::<PendingType>(1);
|
||||
|
||||
+54
-23
@@ -13,6 +13,7 @@ extern "C" {
|
||||
fn uu_viewer_ui_closed() -> c_int;
|
||||
fn uu_viewer_ui_confirm_replace() -> c_int;
|
||||
fn uu_viewer_ui_toast(text: *const c_char);
|
||||
fn uu_viewer_ui_set_host(active: c_int);
|
||||
}
|
||||
fn toast(text: &str) { let t = c(text); unsafe { uu_viewer_ui_toast(t.as_ptr()) } }
|
||||
|
||||
@@ -46,12 +47,12 @@ fn watch_session(mut child: tokio::process::Child, mut cancel: tokio::sync::ones
|
||||
}).await;
|
||||
if !status.is_ok_and(|s| s.success()) {
|
||||
let reason = match last.as_str() {
|
||||
"" => "连接已断开".to_owned(),
|
||||
"CONTROL echo timed out" => "连接超时:被控端没有响应(官方主机互通尚未完成)".to_owned(),
|
||||
"Remote session released" => "被控端结束了本次连接".to_owned(),
|
||||
"" => crate::i18n::s("连接已断开","Disconnected").to_owned(),
|
||||
"CONTROL echo timed out" => crate::i18n::s("连接超时:被控端没有响应(官方主机互通尚未完成)","Timed out: the remote device did not answer (official host interop is not finished)").to_owned(),
|
||||
"Remote session released" => crate::i18n::s("被控端结束了本次连接","The remote device ended the connection").to_owned(),
|
||||
other => other.to_owned(),
|
||||
};
|
||||
toast(&format!("连接失败:{reason}"));
|
||||
toast(&crate::tr!("连接失败:{reason}","Connection failed: {reason}"));
|
||||
} else if let Some(message) = success { toast(message); }
|
||||
})
|
||||
}
|
||||
@@ -81,7 +82,8 @@ pub fn device_rows(devices: &[Value], current: Option<&str>) -> String {
|
||||
let name = d.get("alias").and_then(Value::as_str).unwrap_or(id);
|
||||
let platform = d.get("platform").and_then(Value::as_i64).unwrap_or(0);
|
||||
let online = d.get("status").and_then(Value::as_str) == Some("CONNECTED");
|
||||
Some(format!("{}\t{}\t{}\t{}\t{}\n", clean(id), clean(name), platform, online as u8, (current == Some(id)) as u8))
|
||||
let thumb = super::thumbs::existing(id).map(|p| clean(&p.to_string_lossy())).unwrap_or_default();
|
||||
Some(format!("{}\t{}\t{}\t{}\t{}\t{}\n", clean(id), clean(name), platform, online as u8, (current == Some(id)) as u8, thumb))
|
||||
}).collect()
|
||||
}
|
||||
|
||||
@@ -94,6 +96,10 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
||||
let mut next_refresh = Instant::now();
|
||||
let mut sessions:std::collections::HashMap<String,Running>=Default::default();
|
||||
let mut names: std::collections::HashMap<String, String> = Default::default();
|
||||
// Account token seen last; a new sign-in restarts a host the user turned on.
|
||||
let mut host_token: Option<String> = None;
|
||||
let mut just_logged_in = false;
|
||||
unsafe { uu_viewer_ui_set_host(super::host::active().into()) }
|
||||
let refresh = |creds: &crate::auth::Credentials| {
|
||||
let api = super::api::Api::new(crate::auth::UUAuthClient::new(creds.clone()), crate::auth::BASE_URL);
|
||||
async move { api.device_list().await }
|
||||
@@ -103,27 +109,40 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
||||
sessions.retain(|_,s| !s.task.is_finished());
|
||||
if let Some(child) = login.as_mut() {
|
||||
if let Ok(meta) = std::fs::metadata(&qr) {
|
||||
if meta.modified().ok() != qr_seen { qr_seen = meta.modified().ok(); set_login(false, &qr.to_string_lossy(), "请用手机扫码并确认", ""); }
|
||||
if meta.modified().ok() != qr_seen { qr_seen = meta.modified().ok(); set_login(false, &qr.to_string_lossy(), crate::i18n::s("请用手机扫码并确认","Scan with your phone and confirm"), ""); }
|
||||
}
|
||||
if let Ok(Some(_)) = child.try_wait() { login = None; let _ = std::fs::remove_file(&qr); next_refresh = Instant::now(); }
|
||||
if let Ok(Some(_)) = child.try_wait() { login = None; let _ = std::fs::remove_file(&qr); next_refresh = Instant::now(); just_logged_in = true; }
|
||||
} else if Instant::now() >= next_refresh {
|
||||
next_refresh = Instant::now() + Duration::from_secs(30);
|
||||
match credentials() {
|
||||
Ok(creds) => {
|
||||
set_login(true, "", "", "已登录");
|
||||
set_login(true, "", "", crate::i18n::s("已登录","Signed in"));
|
||||
// Hosting is opt-in (Settings switch): signing in never starts the host, but a
|
||||
// host the user turned on goes online with the new account.
|
||||
if host_token.as_deref() != Some(creds.token.as_str()) {
|
||||
let changed = host_token.is_some() || std::mem::take(&mut just_logged_in);
|
||||
if changed && super::host::managed() && super::host::active() {
|
||||
match super::host::restart() {
|
||||
Ok(()) => toast(crate::i18n::s("本机已上线,可在你的其他设备上远程控制","This computer is online; control it from your other devices")),
|
||||
Err(e) => log::warn!("Host service not restarted: {e}"),
|
||||
}
|
||||
unsafe { uu_viewer_ui_set_host(super::host::active().into()) }
|
||||
}
|
||||
host_token = Some(creds.token.clone());
|
||||
}
|
||||
match refresh(&creds).await {
|
||||
Ok(data) => {
|
||||
let list = data.get("my_binded_devices").and_then(Value::as_array).cloned().unwrap_or_default();
|
||||
let current = data.pointer("/current_device/device_id").and_then(Value::as_str);
|
||||
names = list.iter().filter_map(|d| Some((d.get("device_id")?.as_str()?.to_owned(),
|
||||
d.get("alias").and_then(Value::as_str).unwrap_or("远端设备").to_owned()))).collect();
|
||||
d.get("alias").and_then(Value::as_str).unwrap_or_else(|| crate::i18n::s("远端设备","Remote device")).to_owned()))).collect();
|
||||
let rows = c(&device_rows(&list, current)); unsafe { uu_viewer_ui_set_devices(rows.as_ptr()) }
|
||||
}
|
||||
Err(super::api::Error::AuthenticationExpired) => set_login(false, "", "登录已过期,请重新登录", ""),
|
||||
Err(super::api::Error::AuthenticationExpired) => set_login(false, "", crate::i18n::s("登录已过期,请重新登录","Sign-in expired, please sign in again"), ""),
|
||||
Err(_) => {}
|
||||
}
|
||||
}
|
||||
Err(_) => set_login(false, "", "尚未登录", ""),
|
||||
Err(_) => set_login(false, "", crate::i18n::s("尚未登录","Not signed in"), ""),
|
||||
}
|
||||
}
|
||||
while let Some(cmd) = take() {
|
||||
@@ -131,6 +150,18 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
||||
match parts.as_slice() {
|
||||
["quit"] => break,
|
||||
["refresh"] => next_refresh = Instant::now(),
|
||||
["relaunch"] => {
|
||||
// Language is read once at start: restart the launcher in place. Open
|
||||
// sessions are separate processes and keep running.
|
||||
use std::os::unix::process::CommandExt;
|
||||
let _ = std::process::Command::new(&exe).args(std::env::args_os().skip(1)).exec();
|
||||
toast(crate::i18n::s("请重新启动控制端以切换语言","Restart the viewer to switch the language"));
|
||||
}
|
||||
["host", state] => {
|
||||
let result = if *state == "on" { super::host::enable(&exe) } else { super::host::disable() };
|
||||
if let Err(e) = result { toast(&crate::tr!("本机被控设置失败:{e}","Could not change hosting: {e}")); }
|
||||
unsafe { uu_viewer_ui_set_host(super::host::active().into()) }
|
||||
}
|
||||
["logout"] => {
|
||||
// Sign out locally: drop the account token, keep the device identity.
|
||||
let path = crate::config::path();
|
||||
@@ -140,7 +171,7 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
||||
}
|
||||
for (_,s) in sessions.drain() { s.stop().await; }
|
||||
unsafe { uu_viewer_ui_set_devices(c("").as_ptr()) }
|
||||
set_login(false, "", "已退出登录", "");
|
||||
set_login(false, "", crate::i18n::s("已退出登录","Signed out"), "");
|
||||
next_refresh = Instant::now() + Duration::from_secs(3600);
|
||||
}
|
||||
["login"] if login.is_none() => {
|
||||
@@ -149,7 +180,7 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
||||
.env("UU_LOGIN_QR_PNG", &qr).stdin(std::process::Stdio::null())
|
||||
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::null())
|
||||
.kill_on_drop(true).spawn().ok();
|
||||
if login.is_none() { set_login(false, "", "找不到配套的 uuremote-server", ""); }
|
||||
if login.is_none() { set_login(false, "", crate::i18n::s("找不到配套的 uuremote-server","The matching uuremote-server was not found"), ""); }
|
||||
}
|
||||
["connect", id, kind] if matches!(*kind, "desktop" | "watch") => {
|
||||
if !replace(&mut sessions,id).await{continue}
|
||||
@@ -161,38 +192,38 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
||||
match command.env("UU_VIEWER_COMMANDS","1").stdin(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::piped()).kill_on_drop(true).spawn() {
|
||||
Ok(mut child) => { let input=child.stdin.take();let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,None);sessions.insert((*id).into(),Running{cancel,task,input}); }
|
||||
Err(_) => toast("连接失败:无法启动会话进程"),
|
||||
Err(_) => toast(crate::i18n::s("连接失败:无法启动会话进程","Connection failed: cannot start the session process")),
|
||||
}
|
||||
}
|
||||
["assist", id, code] => {
|
||||
match super::assist::command(&exe, id).spawn() {
|
||||
Ok(mut child) => match super::assist::send_code(&mut child, code).await {
|
||||
Ok(()) => { let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,None);sessions.insert(format!("assist:{id}"),Running{cancel,task,input:None}); }
|
||||
Err(reason) => toast(&format!("连接失败:{reason}")),
|
||||
Err(reason) => toast(&crate::tr!("连接失败:{reason}","Connection failed: {reason}")),
|
||||
},
|
||||
Err(_) => toast("连接失败:无法启动协助会话进程"),
|
||||
Err(_) => toast(crate::i18n::s("连接失败:无法启动协助会话进程","Connection failed: cannot start the assistance session")),
|
||||
}
|
||||
}
|
||||
["connect", id, kind @ ("file" | "portmap" | "terminal")] => {
|
||||
if *kind=="file" {if let Some(s)=sessions.get_mut(*id){if let Some(input)=s.input.as_mut(){
|
||||
use tokio::io::AsyncWriteExt;
|
||||
if input.write_all(b"files\n").await.is_err(){toast("桌面会话命令发送失败,请重试")}continue
|
||||
if input.write_all(b"files\n").await.is_err(){toast(crate::i18n::s("桌面会话命令发送失败,请重试","Could not send the command to the desktop session, try again"))}continue
|
||||
}}}
|
||||
if !replace(&mut sessions,id).await{continue}
|
||||
let name = names.get(*id).cloned().unwrap_or_else(|| "远端设备".into());
|
||||
let name = names.get(*id).cloned().unwrap_or_else(|| crate::i18n::s("远端设备","Remote device").into());
|
||||
let tool = if *kind == "file" { "files-ui" } else if *kind == "terminal" { "terminal-ui" } else { "portmap-ui" };
|
||||
match tokio::process::Command::new(&exe).args([tool, id, &name])
|
||||
.stderr(std::process::Stdio::piped()).kill_on_drop(true).spawn() {
|
||||
Ok(child) => { let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,None);sessions.insert((*id).into(),Running{cancel,task,input:None}); }
|
||||
Err(_) => toast("连接失败:无法启动工具进程"),
|
||||
Err(_) => toast(crate::i18n::s("连接失败:无法启动工具进程","Connection failed: cannot start the tool process")),
|
||||
}
|
||||
}
|
||||
["connect", id, kind @ ("reboot" | "shutdown")] => {
|
||||
if !replace(&mut sessions,id).await{continue}
|
||||
match tokio::process::Command::new(&exe).args(["power", id, kind])
|
||||
.stdout(std::process::Stdio::null()).stderr(std::process::Stdio::piped()).kill_on_drop(true).spawn() {
|
||||
Ok(child) => { let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,Some("电源指令已发送,未确认远端执行结果"));sessions.insert((*id).into(),Running{cancel,task,input:None}); }
|
||||
Err(_) => toast("电源指令失败:无法启动会话进程"),
|
||||
Ok(child) => { let (cancel,rx)=tokio::sync::oneshot::channel();let task=watch_session(child,rx,Some(crate::i18n::s("电源指令已发送,未确认远端执行结果","Power command sent; the result on the remote device is not confirmed")));sessions.insert((*id).into(),Running{cancel,task,input:None}); }
|
||||
Err(_) => toast(crate::i18n::s("电源指令失败:无法启动会话进程","Power command failed: cannot start the session process")),
|
||||
}
|
||||
}
|
||||
["connect", id, "unbind"] => {
|
||||
@@ -201,7 +232,7 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
||||
Ok(creds)=>super::api::Api::new(crate::auth::UUAuthClient::new(creds),crate::auth::BASE_URL).unbind(id,false).await.map_err(|e|e.to_string()),
|
||||
Err(e)=>Err(e),
|
||||
};
|
||||
match result {Ok(())=>toast("设备已从账号删除"),Err(e)=>toast(&format!("删除设备失败:{e}"))}
|
||||
match result {Ok(())=>toast(crate::i18n::s("设备已从账号删除","Device removed from the account")),Err(e)=>toast(&crate::tr!("删除设备失败:{e}","Removing the device failed: {e}"))}
|
||||
next_refresh=Instant::now();
|
||||
}
|
||||
["connect", _, kind] => log::info!("Viewer UI: {kind} is not supported yet"),
|
||||
@@ -221,6 +252,6 @@ pub async fn run(credentials: impl Fn() -> Result<crate::auth::Credentials, Stri
|
||||
serde_json::json!({"device_id":"d2","platform":1,"status":"DISCONNECTED"}),
|
||||
serde_json::json!({"alias":"no id"}),
|
||||
], Some("d2"));
|
||||
assert_eq!(rows, "d1\ta b\t4\t1\t0\nd2\td2\t1\t0\t1\n");
|
||||
assert_eq!(rows, "d1\ta b\t4\t1\t0\t\nd2\td2\t1\t0\t1\t\n");
|
||||
}
|
||||
}
|
||||
@@ -213,6 +213,19 @@ pub fn request_chroma444()->Vec<u8>{
|
||||
let mut rpc=Vec::new();bytes(1,&header,&mut rpc);bytes(2,&setting,&mut rpc);
|
||||
envelope(2_000_000,21,&rpc)
|
||||
}
|
||||
/// RpcRequest case 2 CaptureSettingRequest with the given (field, value) pairs: 1 fps option
|
||||
/// index, 18 fpsCount, 2 quality, 7 chroma, 10 resolution_type, 16/17 pixel size (src/capture_setting.rs).
|
||||
pub fn capture_setting(seq:u64,fields:&[(u32,u64)])->Vec<u8>{
|
||||
let mut header=Vec::new();int(1,seq,&mut header);
|
||||
let mut setting=Vec::new();for &(f,v) in fields {int(f,v,&mut setting);}
|
||||
let mut rpc=Vec::new();bytes(1,&header,&mut rpc);bytes(2,&setting,&mut rpc);
|
||||
envelope(seq,21,&rpc)
|
||||
}
|
||||
/// Message 3 SimpleAction {1 action, 5 value} as the official 安全 menu sends it.
|
||||
pub fn simple_action(seq:u64,action:u64,value:Option<u64>)->Vec<u8>{
|
||||
let mut body=Vec::new();int(1,action,&mut body);if let Some(v)=value {int(5,v,&mut body);}
|
||||
envelope(seq,3,&body)
|
||||
}
|
||||
/// Message 18 is an encoder capability LIST, not the chosen codec; RTP's negotiated PT is authoritative.
|
||||
/// Message 25 reports actual encoded chroma, which may fall back to 4:2:0.
|
||||
pub fn media_control(data:&[u8])->(Option<u32>,Option<u32>){
|
||||
|
||||
+16
-10
@@ -2,6 +2,7 @@
|
||||
#![allow(dead_code)]
|
||||
#[path = "auth.rs"] mod auth;
|
||||
#[path = "config.rs"] mod config;
|
||||
#[path = "i18n.rs"] mod i18n;
|
||||
#[path = "protocol.rs"] mod protocol;
|
||||
mod ws_transport;
|
||||
mod viewer;
|
||||
@@ -57,8 +58,8 @@ async fn run(args:&[String])->Result<(),String> {
|
||||
Ok(())
|
||||
}
|
||||
Some("unbind") if (args.len()==2 || (args.len()==3 && args[2]=="--shared")) && !args[1].is_empty() => {
|
||||
api()?.unbind(&args[1],args.len()==3).await.map_err(|e|format!("删除设备失败:{e}"))?;
|
||||
println!("已从账号删除设备");Ok(())
|
||||
api()?.unbind(&args[1],args.len()==3).await.map_err(|e|crate::tr!("删除设备失败:{e}","Removing the device failed: {e}"))?;
|
||||
println!("{}",crate::i18n::s("已从账号删除设备","Device removed from the account"));Ok(())
|
||||
}
|
||||
Some("power")=>power_command(args).await,
|
||||
Some("type")=>type_command(args).await,
|
||||
@@ -69,7 +70,7 @@ async fn run(args:&[String])->Result<(),String> {
|
||||
Some("terminal"|"files"|"portmap"|"files-ui"|"portmap-ui"|"terminal-ui")=>tool_command(args).await,
|
||||
Some("assist") if args.len()==2=> {
|
||||
let code=viewer::assist::read_code(std::io::stdin().lock())?;
|
||||
desktop_command(&["connect".into(),args[1].clone(),"false".into(),"-".into(),"echo".into(),"legacy".into()],Some(code)).await.map_err(|e|format!("协助连接失败:{e}"))
|
||||
desktop_command(&["connect".into(),args[1].clone(),"false".into(),"-".into(),"echo".into(),"legacy".into()],Some(code)).await.map_err(|e|crate::tr!("协助连接失败:{e}","Assistance connection failed: {e}"))
|
||||
}
|
||||
Some("connect") if args.len()==6 || args.len()==7=> desktop_command(args,None).await,
|
||||
_=>Err(HELP.into()),
|
||||
@@ -96,11 +97,16 @@ async fn desktop_command(args:&[String],code:Option<String>)->Result<(),String>
|
||||
let creds=credentials()?;
|
||||
let api=Api::new(auth::UUAuthClient::new(creds.clone()),auth::BASE_URL);
|
||||
let account_connection=code.is_none();
|
||||
let room=match code {
|
||||
#[cfg(feature="viewer-sdl")]
|
||||
macro_rules! wait {($stage:expr,$fut:expr)=>{viewer::sdl::loading(desktop.as_mut().map(|d|&mut d.0),$stage,$fut).await?}}
|
||||
#[cfg(not(feature="viewer-sdl"))]
|
||||
macro_rules! wait {($stage:expr,$fut:expr)=>{{let _=$stage;$fut.await}}}
|
||||
let contacting=i18n::s("正在连接远端设备…","Contacting the remote device…");
|
||||
let room=wait!(contacting,async{match code {
|
||||
Some(code)=>api.join_share(&args[1],&code).await,
|
||||
None=>api.join(&args[1],force,true).await,
|
||||
}.map_err(|e|e.to_string())?;
|
||||
let target_mac=if shape.capture_type==1 {api.target_is_mac(&room,account_connection.then_some(args[1].as_str())).await} else {Err(viewer::api::Error::UnknownKeyboardPlatform)};
|
||||
}}).map_err(|e|e.to_string())?;
|
||||
let target_mac=if shape.capture_type==1 {wait!(contacting,api.target_is_mac(&room,account_connection.then_some(args[1].as_str())))} else {Err(viewer::api::Error::UnknownKeyboardPlatform)};
|
||||
#[cfg(feature="viewer-sdl")]
|
||||
if let Some((window,_))=desktop.as_mut().filter(|_|!view_only){
|
||||
window.set_mac(*target_mac.as_ref().map_err(|e|e.to_string())?);
|
||||
@@ -111,7 +117,7 @@ async fn desktop_command(args:&[String],code:Option<String>)->Result<(),String>
|
||||
let mut clipboard=clipboard::Bridge::new(shape.capture_type==1);
|
||||
clipboard.set_target_mac(target_mac.ok());
|
||||
let options=Options{timeout:Duration::from_secs(12),legacy_prefix:legacy,ready_policy:policy,clipboard};
|
||||
let mut session=Session::open(&room,&shape,&creds.device_id,&creds.client_id,options,Default::default()).await?;
|
||||
let mut session=wait!(i18n::s("正在建立安全连接…","Establishing a secure connection…"),Session::open(&room,&shape,&creds.device_id,&creds.client_id,options,Default::default()))?;
|
||||
#[cfg(feature="viewer-sdl")]
|
||||
let result=if let Some((window,decoder))=desktop.as_mut(){viewer::sdl::run(&mut session,window,decoder.as_mut(),view_only,&args[1]).await}else{session.run().await};
|
||||
#[cfg(not(feature="viewer-sdl"))]
|
||||
@@ -169,7 +175,7 @@ async fn type_command(args:&[String])->Result<(),String>{
|
||||
if !response.ok {
|
||||
return Err(response.error.unwrap_or_else(||"Secure input failed on running viewer".into()));
|
||||
}
|
||||
println!("安全输入已发送({} 个按键事件,{} 字符)。", response.events, response.chars);
|
||||
println!("{}",crate::tr!("安全输入已发送({} 个按键事件,{} 字符)。","Secure input sent ({} key events, {} characters).", response.events, response.chars));
|
||||
if let Some(path)=response.snapshot {
|
||||
println!("snapshot={path}");
|
||||
log::info!("Secure input snapshot: {path}");
|
||||
@@ -196,7 +202,7 @@ async fn type_command(args:&[String])->Result<(),String>{
|
||||
let mut session=Session::open(&room,&shape,&creds.device_id,&creds.client_id,options,Default::default()).await?;
|
||||
let result=viewer::secure_input::run_session(&mut session,actions.as_slice(),delay).await;
|
||||
session.close().await;
|
||||
if result.is_ok(){println!("安全输入已发送({event_count} 个按键事件);新会话路径无截图。");}
|
||||
if result.is_ok(){println!("{}",crate::tr!("安全输入已发送({event_count} 个按键事件);新会话路径无截图。","Secure input sent ({event_count} key events); no snapshot on the new-session path."));}
|
||||
result
|
||||
}
|
||||
|
||||
@@ -295,6 +301,6 @@ async fn power_command(args:&[String])->Result<(),String>{
|
||||
let mut session=Session::open(&room,&shape,&creds.device_id,&creds.client_id,options,Default::default()).await?;
|
||||
let result=viewer::power::run(&mut session,action).await;
|
||||
session.close().await;
|
||||
if result.is_ok(){println!("电源指令已发送;未确认远端执行结果。");}
|
||||
if result.is_ok(){println!("{}",crate::i18n::s("电源指令已发送;未确认远端执行结果。","Power command sent; the result on the remote device is not confirmed."));}
|
||||
result
|
||||
}
|
||||
Vendored
+14
@@ -14,3 +14,17 @@ padding) per read. `agent_gather.rs` uses it for `ProtoType::Tcp` URLs. UDP gath
|
||||
|
||||
TLS trusts the system certificate store (`rustls-native-certs`, as OpenSSL does) plus the bundled
|
||||
Mozilla roots. A name mismatch is accepted only when the TURN URL is an IP literal.
|
||||
|
||||
## Round-trip time
|
||||
|
||||
Upstream never measures it: `CandidatePairStats::current_round_trip_time` is always 0. A successful
|
||||
binding response now records `now - request timestamp` on its candidate pair, and the stats report
|
||||
the latest sample. Keepalive pings only an idle pair, which a streaming session never is, so the
|
||||
selected pair is also pinged when its last sample is older than the keepalive interval (a binding
|
||||
request, like a consent check from RFC 7675).
|
||||
|
||||
The host (`uuremote-server`) uses the same crate, so on the selected pair it also sends one
|
||||
binding request per keepalive interval (2 s) while media flows. Checked on the host side with the
|
||||
official Android client controlling a Linux host (GNOME, cloud ICE servers incl. TURN) over repeated
|
||||
sessions: the client answers every request and sessions stay up. Official Windows/macOS controllers
|
||||
have not been tried against the host yet.
|
||||
+6
-3
@@ -480,14 +480,15 @@ impl AgentInternal {
|
||||
/// if no packet has been sent on that pair in the last keepaliveInterval.
|
||||
/// Note: the caller should hold the agent lock.
|
||||
pub(crate) async fn check_keepalive(&self) {
|
||||
let (local, remote) = {
|
||||
let (local, remote, rtt_stale) = {
|
||||
let selected_pair = self.agent_conn.selected_pair.load();
|
||||
(*selected_pair)
|
||||
.as_ref()
|
||||
.map_or((None, None), |selected_pair| {
|
||||
.map_or((None, None, false), |selected_pair| {
|
||||
(
|
||||
Some(selected_pair.local.clone()),
|
||||
Some(selected_pair.remote.clone()),
|
||||
selected_pair.rtt_stale(self.keepalive_interval),
|
||||
)
|
||||
})
|
||||
};
|
||||
@@ -503,7 +504,9 @@ impl AgentInternal {
|
||||
|
||||
if (self.keepalive_interval != Duration::from_secs(0))
|
||||
&& ((last_sent > self.keepalive_interval)
|
||||
|| (last_received > self.keepalive_interval))
|
||||
|| (last_received > self.keepalive_interval)
|
||||
// A busy media path never idles; ping anyway so the round trip stays current.
|
||||
|| rtt_stale)
|
||||
{
|
||||
// we use binding request instead of indication to support refresh consent schemas
|
||||
// see https://tools.ietf.org/html/rfc7675
|
||||
|
||||
@@ -325,6 +325,9 @@ impl ControllingSelector for AgentInternal {
|
||||
remote,
|
||||
local
|
||||
);
|
||||
if let Some(p) = self.find_pair(local, remote).await {
|
||||
p.record_rtt(pending_request.timestamp.elapsed());
|
||||
}
|
||||
let selected_pair_is_none = self.agent_conn.get_selected_pair().is_none();
|
||||
|
||||
if let Some(p) = self.find_pair(local, remote).await {
|
||||
@@ -483,6 +486,9 @@ impl ControlledSelector for AgentInternal {
|
||||
remote,
|
||||
local
|
||||
);
|
||||
if let Some(p) = self.find_pair(local, remote).await {
|
||||
p.record_rtt(pending_request.timestamp.elapsed());
|
||||
}
|
||||
|
||||
if let Some(p) = self.find_pair(local, remote).await {
|
||||
p.state
|
||||
|
||||
+3
@@ -224,6 +224,9 @@ impl AgentInternal {
|
||||
remote_candidate_id: cp.remote.id(),
|
||||
state: cp.state.load(Ordering::SeqCst).into(),
|
||||
nominated: cp.nominated.load(Ordering::SeqCst),
|
||||
current_round_trip_time: cp
|
||||
.current_round_trip_time()
|
||||
.map_or(0.0, |rtt| rtt.as_secs_f64()),
|
||||
..CandidatePairStats::default()
|
||||
};
|
||||
res.push(stat);
|
||||
|
||||
+17
@@ -233,6 +233,8 @@ pub struct CandidatePair {
|
||||
pub(crate) binding_request_count: AtomicU16,
|
||||
pub(crate) state: AtomicU8, // convert it to CandidatePairState,
|
||||
pub(crate) nominated: AtomicBool,
|
||||
/// Latest STUN binding round trip and when it was measured (local patch, see PATCHES.md).
|
||||
pub(crate) rtt: std::sync::Mutex<Option<(std::time::Instant, std::time::Duration)>>,
|
||||
}
|
||||
|
||||
impl Default for CandidatePair {
|
||||
@@ -244,6 +246,7 @@ impl Default for CandidatePair {
|
||||
state: AtomicU8::new(CandidatePairState::Waiting as u8),
|
||||
binding_request_count: AtomicU16::new(0),
|
||||
nominated: AtomicBool::new(false),
|
||||
rtt: std::sync::Mutex::new(None),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -296,9 +299,23 @@ impl CandidatePair {
|
||||
state: AtomicU8::new(CandidatePairState::Waiting as u8),
|
||||
binding_request_count: AtomicU16::new(0),
|
||||
nominated: AtomicBool::new(false),
|
||||
rtt: std::sync::Mutex::new(None),
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn record_rtt(&self, rtt: std::time::Duration) {
|
||||
*self.rtt.lock().unwrap() = Some((std::time::Instant::now(), rtt));
|
||||
}
|
||||
|
||||
pub fn current_round_trip_time(&self) -> Option<std::time::Duration> {
|
||||
self.rtt.lock().unwrap().map(|(_, rtt)| rtt)
|
||||
}
|
||||
|
||||
/// True when no round trip was measured within `max`.
|
||||
pub(crate) fn rtt_stale(&self, max: std::time::Duration) -> bool {
|
||||
self.rtt.lock().unwrap().map_or(true, |(at, _)| at.elapsed() > max)
|
||||
}
|
||||
|
||||
/// RFC 5245 - 5.7.2. Computing Pair Priority and Ordering Pairs
|
||||
/// Let G be the priority for the candidate provided by the controlling
|
||||
/// agent. Let D be the priority for the candidate provided by the
|
||||
|
||||
Reference in new issue
Block a user