mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 08:50:40 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c461db10a4 | ||
|
|
4c86c7f782 | ||
|
|
81e9ccfa05 | ||
|
|
c0abdeae72 | ||
|
|
1dad755823 | ||
|
|
fcfd2b6717 |
No files matched your search
Generated
+1
-1
@@ -2772,7 +2772,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
||||
|
||||
[[package]]
|
||||
name = "uu-remote-linux"
|
||||
version = "0.2.47"
|
||||
version = "0.2.48"
|
||||
dependencies = [
|
||||
"ab_glyph",
|
||||
"async-trait",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "uu-remote-linux"
|
||||
version = "0.2.47"
|
||||
version = "0.2.48"
|
||||
edition = "2021"
|
||||
default-run = "uuremote-server"
|
||||
authors = ["uu-remote-linux contributors"]
|
||||
|
||||
+6
-2
@@ -25,8 +25,10 @@
|
||||
|
||||
## Appearance / 外观
|
||||
|
||||
Launcher icons use the system icon theme instead of emoji glyphs, so they do not depend on emoji font coverage.
|
||||
|
||||
Signed-in graphical hosts report the system wallpaper for disconnected device cards in official clients
|
||||
(no desktop-window screenshot). GNOME/Cinnamon, KDE and Xfce are supported; checks run every 60 seconds
|
||||
(no desktop-window screenshot). GNOME/Cinnamon, KDE, Xfce and Omarchy on Hyprland are supported (following the current wallpaper); checks run every 60 seconds
|
||||
and unchanged content is not uploaded again. Other desktops can set `UU_WALLPAPER=/absolute/path/image.png`
|
||||
(PNG/JPEG/WebP). Set `UU_WALLPAPER_UPLOAD=0` to disable; guest and headless hosts skip reporting.
|
||||
See [protocol evidence and limitations](docs/wallpaper-protocol.md).
|
||||
@@ -157,7 +159,7 @@ On niri, `niri msg --json outputs` enumerates enabled monitors. Normal and 90/18
|
||||
| True color (4:4:4) | Supported (v0.1.15): the default FFmpeg pipeline with NVENC / libx264 encodes H.264 High 4:4:4; `inproc-av` native NVENC encodes H.264 High 4:4:4 / HEVC FRExt; VAAPI stays 4:2:0 and reports that to the client |
|
||||
| HDR | Not implemented |
|
||||
| Super screen / virtual display | Not implemented |
|
||||
| Privacy screen on the host | Experimental, KDE Plasma Wayland (portal) only; off, picture and screen-off status labels verified with Mac 4.43.0; see [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||
| Privacy screen on the host | Experimental, KDE Plasma Wayland (portal) only; off, picture and screen-off status labels verified with Mac 4.43.0; `UU_PRIVACY_AUTO=picture` / `screen-off` enables it automatically on desktop connect; see [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||
| Microphone (viewer audio played on the host) | Not implemented (needs a virtual sound card) |
|
||||
| Plugins such as the WoW queue notifier | Not supported; the client is told that no plugins exist |
|
||||
| Linux login screen | The system login screen (before anyone logs in to the Linux desktop) cannot be controlled yet; use headless mode or a virtual desktop (see below). This is about the Linux login: **without a UU account** the host can now be used through remote assistance |
|
||||
@@ -611,6 +613,8 @@ separate from the host `uuremote-server`; the default host build and behaviour a
|
||||
terminal emulator (`TERMINAL` selects one). From source: `sudo apt install libsdl2-dev`, then
|
||||
`cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`.
|
||||
|
||||
Key combinations use the left/right modifier state attached to each SDL key event. Focus loss releases remote keys; after focus returns, the next non-modifier key restores any still-held Shift/Ctrl/Alt/Win (Command on Mac). This is built in, with no adapter or setting required.
|
||||
|
||||
SDL clipboard access reuses the desktop window to avoid temporary-window Dock churn on GNOME Wayland (#37).
|
||||
On niri, data-control-capable `wl-clipboard` is used instead, so synchronization does not require window focus.
|
||||
Other SDL backends synchronize only while that window is focused. The 30 KiB text limit applies. Selections without a supported
|
||||
|
||||
@@ -21,7 +21,9 @@
|
||||
|
||||
## 外观 / Appearance
|
||||
|
||||
已登录的图形主机会上报系统壁纸,供官方客户端的设备卡片在未连接时显示背景图(不是桌面窗口截图)。支持 GNOME/Cinnamon、KDE、Xfce;每 60 秒检查一次,内容不变则不重复上传。其他桌面可用 `UU_WALLPAPER=/绝对路径/图片.png` 指定 PNG/JPEG/WebP;`UU_WALLPAPER_UPLOAD=0` 关闭。访客和无桌面模式跳过上报。协议依据与限制见 [设备壁纸上报](docs/wallpaper-protocol.md)。
|
||||
启动器图标使用系统主题的符号图标,避免缺少 emoji 字体时显示方框。
|
||||
|
||||
已登录的图形主机会上报系统壁纸,供官方客户端的设备卡片在未连接时显示背景图(不是桌面窗口截图)。支持 GNOME/Cinnamon、KDE、Xfce 和 Hyprland 下的 Omarchy(自动跟随当前壁纸);每 60 秒检查一次,内容不变则不重复上传。其他桌面可用 `UU_WALLPAPER=/绝对路径/图片.png` 指定 PNG/JPEG/WebP;`UU_WALLPAPER_UPLOAD=0` 关闭。访客和无桌面模式跳过上报。协议依据与限制见 [设备壁纸上报](docs/wallpaper-protocol.md)。
|
||||
|
||||
在控制端的 **设置 → 常规 → 外观**,或主机 / 工具窗口的齿轮设置按钮中选择 **跟随系统 / 浅色 / 深色**(默认跟随系统)。
|
||||
选择保存在 `$XDG_CONFIG_HOME/uuremote/theme`(默认 `~/.config/uuremote/theme`)。
|
||||
@@ -138,7 +140,7 @@ niri 会话通过 `niri msg --json outputs` 枚举已启用的显示器。普通
|
||||
| 真彩(4:4:4) | 支持(v0.1.15):NVENC / libx264 的默认 FFmpeg 管线输出 H.264 High 4:4:4;`inproc-av` 原生 NVENC 输出 H.264 High 4:4:4 / HEVC FRExt;VAAPI 管线仍为 4:2:0,并如实回报给客户端 |
|
||||
| HDR | 未实现 |
|
||||
| 超级屏 / 虚拟显示器 | 未实现 |
|
||||
| 被控端防窥模式 | 实验性,仅 KDE Plasma Wayland(portal);Mac 4.43.0 已验证不启用、隐私屏保、关闭显示屏三种状态回显,见 [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||
| 被控端防窥模式 | 实验性,仅 KDE Plasma Wayland(portal);Mac 4.43.0 已验证不启用、隐私屏保、关闭显示屏三种状态回显;`UU_PRIVACY_AUTO=picture` / `screen-off` 可在桌面连接时自动开启,见 [docs/privacy-screen.md](docs/privacy-screen.md) |
|
||||
| 麦克风(控制端声音传到被控端) | 未实现(需要虚拟声卡) |
|
||||
| 魔兽世界排队提醒等插件 | 不支持,会明确告诉客户端「无插件」 |
|
||||
| Linux 系统登录界面 | 还不支持控制开机后的系统登录界面(还没有人登录 Linux 桌面时);这种情况可以用无头模式或虚拟桌面(见下文)。注意:这里说的是 Linux 系统登录,**不登录 UU 账号**现在可以通过「远程协助」使用 |
|
||||
@@ -533,6 +535,8 @@ xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`。
|
||||
`ffmpeg` 命令;SDL 桌面窗口直接同步文本剪贴板(Wayland/X11),无需额外剪贴板工具;终端功能需要本机终端程序(可用 `TERMINAL` 指定)。
|
||||
从源码构建:`sudo apt install libsdl2-dev`,然后 `cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`。
|
||||
|
||||
组合键使用 SDL 按键事件携带的左右修饰键状态;窗口失焦时释放远端按键,重新聚焦后的下一次普通按键会恢复仍按住的 Shift/Ctrl/Alt/Win(Mac 为 Command)。此行为内置,无需适配库或开关。
|
||||
|
||||
SDL 剪贴板复用桌面窗口,避免 GNOME Wayland 上临时窗口引起的 Dock 跳动(#37)。niri 改用支持 data-control 的
|
||||
`wl-clipboard`,不需要桌面窗口保持焦点;其他 SDL 后端仅在桌面窗口获得焦点时同步。
|
||||
保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。
|
||||
|
||||
+32
-16
@@ -73,6 +73,14 @@ static GtkWidget *label(const char *text, const char *cls) {
|
||||
return l;
|
||||
}
|
||||
static GtkWidget *button(const char *text, const char *cls) { GtkWidget *b = gtk_button_new_with_label(text); if (cls) add_class(b, cls); return b; }
|
||||
static GtkWidget *icon(const char *name, int size) {
|
||||
GtkWidget *image = gtk_image_new_from_icon_name(name, GTK_ICON_SIZE_BUTTON);
|
||||
gtk_image_set_pixel_size(GTK_IMAGE(image), size); return image;
|
||||
}
|
||||
static GtkWidget *icon_button(const char *text, const char *name, const char *cls) {
|
||||
GtkWidget *b = button(text, cls); gtk_button_set_image(GTK_BUTTON(b), icon(name, 17));
|
||||
gtk_button_set_always_show_image(GTK_BUTTON(b), TRUE); return b;
|
||||
}
|
||||
static GtkWidget *hbox(int spacing) { return gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing); }
|
||||
static GtkWidget *vbox(int spacing) { return gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing); }
|
||||
static GtkWidget *platform_icon(int platform, int online) {
|
||||
@@ -124,10 +132,12 @@ static void open_more(void) {
|
||||
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)), *box = vbox(10);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(box), 22);
|
||||
gtk_box_pack_start(GTK_BOX(box), label(L("更多工具", "More tools"), "h2"), FALSE, FALSE, 6);
|
||||
const char *names[] = {L("🗂 文件传输", "🗂 File transfer"), L("▶ 观看模式", "▶ Watch mode"), L("⌨ 终端", "⌨ Terminal"), L("⇄ 端口映射", "⇄ Port mapping"), L("⏻ 远程开机", "⏻ Wake on LAN"), L("↻ 重启", "↻ Restart"), L("⏻ 关机", "⏻ Shut down"), L("🗑 删除设备", "🗑 Remove device")};
|
||||
const char *names[] = {L("文件传输", "File transfer"), L("观看模式", "Watch mode"), L("终端", "Terminal"), L("端口映射", "Port mapping"), L("远程开机", "Wake on LAN"), L("重启", "Restart"), L("关机", "Shut down"), L("删除设备", "Remove device")};
|
||||
const char *icons[] = {"folder-symbolic", "media-playback-start-symbolic", "utilities-terminal-symbolic", "network-wired-symbolic", "computer-symbolic", "view-refresh-symbolic", "system-shutdown-symbolic", "user-trash-symbolic"};
|
||||
const char *kinds[] = {"file", "watch", "terminal", "portmap", "wol", "reboot", "shutdown", "unbind"};
|
||||
for (int i = 0; i < 8; i++) {
|
||||
GtkWidget *b = gtk_button_new(), *line = hbox(10); add_class(b, "cardbtn");
|
||||
gtk_box_pack_start(GTK_BOX(line), icon(icons[i], 20), FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(line), label(names[i], "devname"), TRUE, TRUE, 0);
|
||||
gtk_box_pack_end(GTK_BOX(line), label("›", "hint"), FALSE, FALSE, 0);
|
||||
gtk_container_add(GTK_CONTAINER(b), line);
|
||||
@@ -224,7 +234,8 @@ static void on_card(GtkButton *b, gpointer index) { (void)b; show_device(GPOINTE
|
||||
|
||||
static GtkWidget *nav_row(const char *icon, const char *text, const char *kind) {
|
||||
GtkWidget *row = gtk_list_box_row_new(), *line = hbox(10);
|
||||
gtk_box_pack_start(GTK_BOX(line), label(icon, "devname"), FALSE, FALSE, 0);
|
||||
GtkWidget *image = gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_BUTTON);
|
||||
gtk_box_pack_start(GTK_BOX(line), image, FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(line), label(text, "devname"), TRUE, TRUE, 0);
|
||||
gtk_container_add(GTK_CONTAINER(row), line);
|
||||
g_object_set_data_full(G_OBJECT(row), "kind", g_strdup(kind), g_free);
|
||||
@@ -298,7 +309,7 @@ static gboolean apply_devices(gpointer d) {
|
||||
gtk_box_pack_start(GTK_BOX(all_box), card, FALSE, FALSE, 4);
|
||||
}
|
||||
pthread_mutex_unlock(&d_lock);
|
||||
gtk_list_box_insert(GTK_LIST_BOX(device_list), nav_row("◼", L("全部设备", "All devices"), "all"), -1);
|
||||
gtk_list_box_insert(GTK_LIST_BOX(device_list), nav_row("view-grid-symbolic", L("全部设备", "All devices"), "all"), -1);
|
||||
gtk_widget_show_all(device_list); gtk_widget_show_all(all_box);
|
||||
return G_SOURCE_REMOVE;
|
||||
}
|
||||
@@ -367,9 +378,10 @@ static GtkWidget *build_device(void) {
|
||||
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[] = {L("🗂 文件传输", "🗂 File transfer"), L("▶ 观看模式", "▶ Watch mode"), L("⌨ 终端", "⌨ Terminal"), L("⇄ 端口映射", "⇄ Port mapping"), "▦"}, *kinds[] = {"file", "watch", "terminal", "portmap", "more"};
|
||||
const char *names[] = {L("文件传输", "File transfer"), L("观看模式", "Watch mode"), L("终端", "Terminal"), L("端口映射", "Port mapping"), L("更多", "More")}, *kinds[] = {"file", "watch", "terminal", "portmap", "more"};
|
||||
const char *tool_icons[] = {"folder-symbolic", "media-playback-start-symbolic", "utilities-terminal-symbolic", "network-wired-symbolic", "view-more-symbolic"};
|
||||
for (int i = 0; i < 5; i++) {
|
||||
GtkWidget *b = button(names[i], "tool");
|
||||
GtkWidget *b = icon_button(names[i], tool_icons[i], "tool");
|
||||
g_signal_connect(b, "clicked", G_CALLBACK(on_tool), (gpointer)kinds[i]);
|
||||
gtk_box_pack_start(GTK_BOX(tools), b, i < 4, TRUE, 0);
|
||||
if (i < 4) gtk_box_pack_start(GTK_BOX(tools), gtk_separator_new(GTK_ORIENTATION_VERTICAL), FALSE, FALSE, 0);
|
||||
@@ -581,7 +593,7 @@ static void open_settings(void) {
|
||||
GtkWidget *gscroll = gtk_scrolled_window_new(NULL, NULL);
|
||||
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(gscroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
||||
gtk_container_add(GTK_CONTAINER(gscroll), general);
|
||||
gtk_stack_add_titled(GTK_STACK(tabs), gscroll, "general", L("⚙ 常规", "⚙ General"));
|
||||
gtk_stack_add_titled(GTK_STACK(tabs), gscroll, "general", L("常规", "General"));
|
||||
// 安全
|
||||
GtkWidget *security = settings_page();
|
||||
const char *verify[] = {L("仅使用临时验证码", "Temporary code only"), L("仅使用自定义验证码", "Custom code only"), L("临时与自定义验证码", "Temporary and custom codes")};
|
||||
@@ -593,7 +605,7 @@ static void open_settings(void) {
|
||||
gtk_box_pack_start(GTK_BOX(security), settings_card(s1, 2), FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(security), settings_card(s2, 1), FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(security), settings_card(s3, 1), FALSE, FALSE, 0);
|
||||
gtk_stack_add_titled(GTK_STACK(tabs), security, "security", L("🔒 安全", "🔒 Security"));
|
||||
gtk_stack_add_titled(GTK_STACK(tabs), security, "security", L("安全", "Security"));
|
||||
// 键盘
|
||||
GtkWidget *keys = settings_page();
|
||||
gtk_box_pack_start(GTK_BOX(keys), label(L("仅控制端响应的快捷键", "Viewer-only shortcuts"), "h2"), FALSE, FALSE, 0);
|
||||
@@ -608,13 +620,13 @@ static void open_settings(void) {
|
||||
for (int i = 0; i < 8; i++) k2[i] = setting_row(fns[i], NULL, edit_button(fns[i]));
|
||||
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", L("⌨ 键盘", "⌨ Keyboard"));
|
||||
gtk_stack_add_titled(GTK_STACK(tabs), kscroll, "keys", L("键盘", "Keyboard"));
|
||||
// 网络
|
||||
GtkWidget *network = settings_page();
|
||||
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", L("🌐 网络", "🌐 Network"));
|
||||
gtk_stack_add_titled(GTK_STACK(tabs), network, "network", L("网络", "Network"));
|
||||
gtk_box_pack_start(GTK_BOX(root), tabs, TRUE, TRUE, 0);
|
||||
gtk_container_add(GTK_CONTAINER(settings_window), root);
|
||||
gtk_widget_show_all(settings_window);
|
||||
@@ -669,18 +681,21 @@ static void *run(void *arg) {
|
||||
GtkWidget *side = vbox(0); add_class(side, "sidebar"); gtk_widget_set_size_request(side, 270, -1);
|
||||
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(L("⧉ 我的设备", "⧉ My devices"), "section"), TRUE, TRUE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(mh), icon("computer-symbolic", 17), FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(mh), label(L("我的设备", "My devices"), "section"), TRUE, TRUE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(my_section), mh, FALSE, FALSE, 0);
|
||||
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(L("⧉ 远程协助", "⧉ Remote assistance"), "section"); gtk_widget_set_margin_start(ah, 18); gtk_widget_set_margin_top(ah, 16); gtk_widget_set_margin_bottom(ah, 6);
|
||||
GtkWidget *ah = hbox(8); gtk_widget_set_margin_start(ah, 18); gtk_widget_set_margin_top(ah, 16); gtk_widget_set_margin_bottom(ah, 6);
|
||||
gtk_box_pack_start(GTK_BOX(ah), icon("network-workgroup-symbolic", 17), FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(ah), label(L("远程协助", "Remote assistance"), "section"), FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(side_inner), ah, FALSE, FALSE, 0);
|
||||
GtkWidget *assist = assist_list = gtk_list_box_new(); g_signal_connect(assist, "row-activated", G_CALLBACK(on_row), NULL);
|
||||
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("◧", L("开始协助", "Start assistance"), "assist"), -1);
|
||||
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("★", L("收藏设备", "Favorites"), "favorite"), -1);
|
||||
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("network-workgroup-symbolic", L("开始协助", "Start assistance"), "assist"), -1);
|
||||
gtk_list_box_insert(GTK_LIST_BOX(assist), nav_row("starred-symbolic", 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;
|
||||
@@ -691,12 +706,13 @@ static void *run(void *arg) {
|
||||
GtkWidget *main = vbox(0), *header = hbox(10); add_class(header, "header");
|
||||
badge = gtk_label_new(""); add_class(badge, "badge");
|
||||
title_label = label(L("全部设备", "All devices"), "title");
|
||||
more_button = button("⋮", "hbtn"); g_signal_connect(more_button, "clicked", G_CALLBACK(on_more), NULL);
|
||||
more_button = icon_button("", "view-more-symbolic", "hbtn"); gtk_widget_set_tooltip_text(more_button, L("设备信息", "Device information")); g_signal_connect(more_button, "clicked", G_CALLBACK(on_more), NULL);
|
||||
gtk_box_pack_start(GTK_BOX(header), badge, FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(header), title_label, FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(header), more_button, FALSE, FALSE, 0);
|
||||
const char *icons[] = {"☰", "◉", "🔔"}, *kinds[] = {"menu", "account", "notice"};
|
||||
for (int i = 0; i < 3; i++) { GtkWidget *b = button(icons[i], "hbtn"); g_signal_connect(b, "clicked", G_CALLBACK(popup), (gpointer)kinds[i]); gtk_box_pack_end(GTK_BOX(header), b, FALSE, FALSE, 0); }
|
||||
const char *icons[] = {"open-menu-symbolic", "avatar-default-symbolic", "preferences-system-notifications-symbolic"}, *kinds[] = {"menu", "account", "notice"};
|
||||
const char *tips[] = {L("菜单", "Menu"), L("账号", "Account"), L("通知", "Notifications")};
|
||||
for (int i = 0; i < 3; i++) { GtkWidget *b = icon_button("", icons[i], "hbtn"); gtk_widget_set_tooltip_text(b, tips[i]); g_signal_connect(b, "clicked", G_CALLBACK(popup), (gpointer)kinds[i]); gtk_box_pack_end(GTK_BOX(header), b, FALSE, FALSE, 0); }
|
||||
gtk_box_pack_start(GTK_BOX(main), header, FALSE, FALSE, 0);
|
||||
GtkWidget *overlay = gtk_overlay_new();
|
||||
stack = gtk_stack_new();
|
||||
|
||||
@@ -44,6 +44,20 @@ is aimed at the virtual output's region. Needs GTK3.
|
||||
`UU_PRIVACY_BLOCK_INPUT=0` to keep local input. KWin saves the device flag, so a `privacy-guard`
|
||||
child restores devices and outputs from the record whenever the host ends, including SIGKILL; the
|
||||
next start retries too. Devices plugged in during privacy are not blocked.
|
||||
- 自动开启:`UU_PRIVACY_AUTO=picture`(或 `2`)在第一个桌面控制端连上后自动启用隐私屏保,
|
||||
`UU_PRIVACY_AUTO=screen-off`(或 `3`)自动关屏;默认关闭。远程协助(访客)的桌面会话同样适用。
|
||||
控制端自己的请求优先:一次会话里只要客户端发过隐私请求(包括连接刚建立、会话计数还没开始的
|
||||
那一刻),待执行的自动开启就不再触发;断开后照常恢复。主机不支持或依赖缺失时只记日志,不影响连接。
|
||||
自动开启后主机会向控制端推送一次 SystemMetrics 和 SystemStateChange,控制端菜单随之更新。支持的主机上,
|
||||
每次桌面连接也会先推送一次当前状态(关闭时为关闭),这是新增的主动上报。
|
||||
Auto: `UU_PRIVACY_AUTO=picture` (or `2`) enables picture mode when the first desktop controller
|
||||
connects; `screen-off` (or `3`) turns the physical screens off. Off by default. Remote-assistance
|
||||
(guest) desktop sessions are covered too. The viewer's own request wins for that session, including
|
||||
one that arrives right after the connection opens and before the session counter starts: a pending
|
||||
auto-enable then does not run, and a disconnect restores as usual. Unsupported hosts or missing
|
||||
tools only log; the connection is unaffected. After an auto-enable the host pushes SystemMetrics
|
||||
and SystemStateChange once, so the viewer's menu follows; on supported hosts every desktop
|
||||
connection also pushes the current state first (off when it is off), which is new outbound traffic.
|
||||
- 这是尽力而为的遮挡,不是保密边界。/ This is best-effort obscuring, not a confidentiality boundary.
|
||||
- 恢复记录保存在配置文件旁的 `privacy-power.json`(0600);崩溃后下次启动重新启用记录的物理屏。
|
||||
若主机无法启动,可在本机终端执行 `kscreen-doctor output.<name>.enable`。
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
防窥模式可在连接时自动开启,查看端组合键和启动器图标修复,信令失败日志更易诊断。/ Optional auto-enabled privacy screen, viewer modifier and launcher icon fixes, and clearer signaling failure logs.
|
||||
|
||||
### 新增 / Added
|
||||
- **连接时自动开启防窥(#161,感谢 @RiverOnVenus)**:设置 `UU_PRIVACY_AUTO=picture`(隐私屏保)或 `screen-off`(关闭显示屏),第一个桌面控制端连上后自动开启;默认关闭。控制端自己的防窥请求优先,不覆盖已保存的偏好;远程协助会话同样适用。仅 KDE Plasma Wayland(portal)。
|
||||
Set `UU_PRIVACY_AUTO=picture` or `screen-off` to enable the privacy screen when the first desktop controller connects (off by default). The viewer's own request wins and the saved preference is not overwritten; remote-assistance sessions are covered too. KDE Plasma Wayland (portal) only.
|
||||
- **Omarchy 壁纸自动发现(#157,感谢 @ferstar)**:Hyprland 下的 Omarchy 自动跟随当前壁纸上报。/ Omarchy on Hyprland reports its current background automatically.
|
||||
|
||||
### 修复 / Fixed
|
||||
- **查看端组合键(#163/#165,感谢 @Zhenqiang-Weng)**:窗口失焦再聚焦后,仍按住的 Shift/Ctrl/Alt/Win(Mac 为 Command)在下一次按键前恢复,不再丢失修饰键。/ The native viewer restores still-held modifiers after a focus change.
|
||||
- **启动器图标(#158,感谢 @Zhenqiang-Weng)**:改用系统主题符号图标,缺少 emoji 字体时不再显示方框。/ Launcher icons use the system icon theme instead of emoji glyphs.
|
||||
- **信令连接失败日志(#166)**:记录脱敏后的失败原因(类别或 HTTP 状态码,不含 token 和地址),区分服务端拒绝与网络问题。/ Signaling connection failures now log a sanitized reason (category or HTTP status).
|
||||
|
||||
### 验证范围 / Validation
|
||||
单元测试与 CI;防窥自动开启由贡献者在 KDE Plasma 6 Wayland + iOS 客户端实机验证。查看端修复为合成事件测试,未做 Mac 主机实机验收。
|
||||
|
||||
### 下载 / Download
|
||||
`uu-remote-linux_0.2.48_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.48-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.48`(x86_64)。
|
||||
|
||||
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||
@@ -36,7 +36,11 @@ advertised limit. HTTPS is required and upload redirects are disabled.
|
||||
GNOME/Unity/Cinnamon use GSettings (GNOME dark preference included); KDE reads the first image
|
||||
wallpaper containment, including image packages, or the installed look-and-feel's default wallpaper
|
||||
when no explicit wallpaper is configured; Xfce reads the first `last-image`. Multi-monitor selection, slideshow/XML
|
||||
wallpapers, compositor-specific wallpaper daemons, and unsupported formats are not inferred.
|
||||
wallpapers and unsupported formats are not inferred.
|
||||
On Hyprland, Omarchy's `omarchy/current/background` link is read from `XDG_STATE_HOME`
|
||||
(default `~/.local/state`), falling back to the older `XDG_CONFIG_HOME` location
|
||||
(default `~/.config`). Wallpaper/theme changes are followed on the next check.
|
||||
Other compositor-specific wallpaper daemons are not inferred.
|
||||
`UU_WALLPAPER=/absolute/path/image.png` selects a file explicitly; `UU_WALLPAPER_UPLOAD=0` disables
|
||||
reporting. PNG, JPEG, and WebP are supported. No desktop screenshot fallback is used.
|
||||
|
||||
|
||||
+2
-2
@@ -855,8 +855,8 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
||||
Arc::new(cli)
|
||||
}
|
||||
Err(e) => {
|
||||
let _ = e;
|
||||
log::error!("Failed to connect signaling; retrying in 5s (details omitted)");
|
||||
// ws_transport errors carry only a category or HTTP status, never the token or URL.
|
||||
log::error!("Failed to connect signaling; retrying in 5s: {e}");
|
||||
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -883,6 +883,10 @@ pub fn monitor_key(connector: &str) -> String { permissions::monitor_key(connect
|
||||
pub fn register(session: &Arc<PortalSession>) {
|
||||
*ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner) = Some(Arc::downgrade(session));
|
||||
}
|
||||
/// Whether a desktop capture session is registered for monitor/virtual switching.
|
||||
pub fn available() -> bool {
|
||||
ACTIVE.lock().unwrap_or_else(std::sync::PoisonError::into_inner).as_ref().and_then(std::sync::Weak::upgrade).is_some()
|
||||
}
|
||||
/// Privacy screen: see `Session::set_virtual`. Restoring without a live session is a no-op;
|
||||
/// failures switching a live session must reach the controller so its recovery record survives.
|
||||
pub fn set_virtual_active(on: bool) -> Result<(), String> {
|
||||
|
||||
@@ -21,6 +21,10 @@ static STATE: Mutex<State> = Mutex::new(State { sessions: 0, active: None });
|
||||
static ACTIVE: AtomicBool = AtomicBool::new(false);
|
||||
static PICTURE: AtomicBool = AtomicBool::new(false);
|
||||
static POINTER: Mutex<Option<[f64; 4]>> = Mutex::new(None);
|
||||
/// Set by any viewer RPC 7 during the current desktop sessions and cleared when the last one
|
||||
/// ends. An auto-enable never overrides it, including an RPC that arrives after the connection
|
||||
/// opens but before `session_started` bumps the counter.
|
||||
static VIEWER_OVERRIDE: AtomicBool = AtomicBool::new(false);
|
||||
|
||||
pub fn supported() -> bool { backend::detect().is_some() }
|
||||
pub fn active() -> bool { ACTIVE.load(Ordering::Relaxed) }
|
||||
@@ -80,7 +84,9 @@ fn save_preference(mode: Mode) {
|
||||
if let Err(e) = crate::system_actions::merge_save(|s| s.privacy_type = Some(mode.wire_type())) { log::warn!("Privacy mode not saved: {e}"); }
|
||||
}
|
||||
/// RPC 7: `mode` is None for an unknown privacy_type.
|
||||
fn set(enable: bool, mode: Option<Mode>) -> Result<(), String> {
|
||||
fn set(enable: bool, mode: Option<Mode>) -> Result<(), String> { set_inner(enable, mode, true) }
|
||||
/// `save` records the viewer's preference; the auto-enable path must not overwrite it.
|
||||
fn set_inner(enable: bool, mode: Option<Mode>, save: bool) -> Result<(), String> {
|
||||
let mut state = STATE.lock().map_err(|_| "privacy state poisoned")?;
|
||||
if !enable { return leave(&mut state); }
|
||||
let mode = mode.ok_or("unsupported privacy type")?;
|
||||
@@ -89,7 +95,7 @@ fn set(enable: bool, mode: Option<Mode>) -> Result<(), String> {
|
||||
// A failed rollback keeps the record and the guard: the next request, exit or start retries.
|
||||
if result.is_err() { if let Err(e) = leave(&mut state) { log::warn!("Privacy rollback failed: {e}"); } }
|
||||
drop(state);
|
||||
if result.is_ok() { save_preference(mode); }
|
||||
if result.is_ok() && save { save_preference(mode); }
|
||||
result
|
||||
}
|
||||
/// Why RPC 7 cannot be served at all; checked before answering.
|
||||
@@ -119,21 +125,83 @@ pub fn rpc_accept(rpc: &[crate::protocol::WireField]) -> Option<(Vec<u8>, Option
|
||||
pub const REPORT_ERROR: i32 = -7;
|
||||
impl Accepted {
|
||||
pub fn apply(self) -> Result<(), String> {
|
||||
VIEWER_OVERRIDE.store(true, Ordering::Relaxed);
|
||||
let result = set(self.enable, self.mode);
|
||||
if let Err(e) = &result { log::warn!("Privacy request failed: enable={} mode={:?}: {e}", self.enable, self.mode); }
|
||||
result
|
||||
}
|
||||
}
|
||||
pub fn session_started() { if let Ok(mut s) = STATE.lock() { s.sessions += 1; } }
|
||||
/// `UU_PRIVACY_AUTO` accepts `picture`/`2` and `screen-off`/`3`; anything else leaves the viewer
|
||||
/// in charge (and so does the viewer's own RPC 7, which cancels a pending auto-enable).
|
||||
fn parse_auto(value: &str) -> Option<Mode> {
|
||||
match value.trim().to_ascii_lowercase().as_str() {
|
||||
"2" | "picture" => Some(Mode::Picture),
|
||||
"3" | "screen-off" | "screen_off" => Some(Mode::ScreenOff),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
fn auto_mode() -> Option<Mode> { std::env::var("UU_PRIVACY_AUTO").ok().as_deref().and_then(parse_auto) }
|
||||
/// Enter the auto mode with the viewer-override check inside the STATE lock, so a request that
|
||||
/// lands between the caller's check and this lock still wins. Ok(false): the viewer overrode it.
|
||||
fn auto_set(mode: Mode) -> Result<bool, String> {
|
||||
let mut state = STATE.lock().map_err(|_| "privacy state poisoned")?;
|
||||
if VIEWER_OVERRIDE.load(Ordering::Relaxed) { return Ok(false); }
|
||||
if state.sessions == 0 { return Err("no active desktop session".into()); }
|
||||
let result = enter(&mut state, mode);
|
||||
if result.is_err() { if let Err(e) = leave(&mut state) { log::warn!("Privacy rollback failed: {e}"); } }
|
||||
result.map(|_| true)
|
||||
}
|
||||
/// The capture session and the viewer's CONTROL state need a moment after the peer connects;
|
||||
/// retry while the portal session is still missing, and let the viewer's RPC 7 win if it arrives.
|
||||
fn auto_enable(mode: Mode) {
|
||||
for attempt in 1..=5 {
|
||||
if VIEWER_OVERRIDE.load(Ordering::Relaxed) {
|
||||
log::info!("Privacy auto: skipped, the viewer already chose a mode");
|
||||
return;
|
||||
}
|
||||
// Not a failure yet: the desktop capture opens its portal session a moment after the peer
|
||||
// connects, and entering without it would roll back and log a restore for nothing.
|
||||
if !crate::portal::available() {
|
||||
log::info!("Privacy auto: waiting for the desktop capture (attempt {attempt})");
|
||||
std::thread::sleep(std::time::Duration::from_secs(1));
|
||||
continue;
|
||||
}
|
||||
match auto_set(mode) {
|
||||
Ok(true) => { log::info!("Privacy auto: enabled mode={mode:?} on attempt {attempt}"); return; }
|
||||
Ok(false) => { log::info!("Privacy auto: skipped, the viewer already chose a mode"); return; }
|
||||
Err(e) if e.contains("no active desktop session") => return,
|
||||
Err(e) if e.contains("Portal desktop unavailable") => {
|
||||
log::info!("Privacy auto: desktop capture not ready (attempt {attempt})");
|
||||
std::thread::sleep(std::time::Duration::from_secs(1));
|
||||
}
|
||||
Err(e) => { log::warn!("Privacy auto failed: {e}"); return; }
|
||||
}
|
||||
}
|
||||
log::warn!("Privacy auto: giving up; the viewer can still enable the privacy screen");
|
||||
}
|
||||
pub fn session_started() {
|
||||
let auto = auto_mode();
|
||||
let first = STATE.lock().ok().is_some_and(|mut s| { s.sessions += 1; s.sessions == 1 });
|
||||
let Some(mode) = auto else { return };
|
||||
if !first { return; }
|
||||
std::thread::spawn(move || {
|
||||
std::thread::sleep(std::time::Duration::from_millis(1500));
|
||||
auto_enable(mode);
|
||||
});
|
||||
}
|
||||
pub fn session_ended() {
|
||||
if let Ok(mut s) = STATE.lock() {
|
||||
s.sessions = s.sessions.saturating_sub(1);
|
||||
if s.sessions == 0 { if let Err(e) = leave(&mut s) { log::warn!("Privacy restore failed: {e}"); } }
|
||||
if s.sessions == 0 {
|
||||
VIEWER_OVERRIDE.store(false, Ordering::Relaxed);
|
||||
if let Err(e) = leave(&mut s) { log::warn!("Privacy restore failed: {e}"); }
|
||||
}
|
||||
}
|
||||
}
|
||||
pub fn shutdown() {
|
||||
if let Ok(mut s) = STATE.lock() {
|
||||
s.sessions = 0;
|
||||
VIEWER_OVERRIDE.store(false, Ordering::Relaxed);
|
||||
if let Err(e) = leave(&mut s) { log::warn!("Privacy restore failed: {e}"); }
|
||||
}
|
||||
}
|
||||
@@ -167,6 +235,17 @@ pub fn cover_main(args: &[String]) -> i32 { cover::main(args) }
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
#[test]
|
||||
fn parses_auto_privacy_modes() {
|
||||
use super::{parse_auto, Mode};
|
||||
assert_eq!(parse_auto("picture"), Some(Mode::Picture));
|
||||
assert_eq!(parse_auto("2"), Some(Mode::Picture));
|
||||
assert_eq!(parse_auto(" screen-off "), Some(Mode::ScreenOff));
|
||||
assert_eq!(parse_auto("3"), Some(Mode::ScreenOff));
|
||||
assert_eq!(parse_auto("0"), None);
|
||||
assert_eq!(parse_auto("off"), None);
|
||||
assert_eq!(parse_auto(""), None);
|
||||
}
|
||||
#[test]
|
||||
fn enabling_without_a_backend_is_refused_and_reports_off() {
|
||||
let bytes = [10, 2, 8, 42, 58, 4, 8, 1, 16, 3];
|
||||
|
||||
+1
-1
@@ -248,7 +248,7 @@ impl SignalingClient {
|
||||
let mut req = ws_url
|
||||
.clone()
|
||||
.into_client_request()
|
||||
.map_err(|e| format!("Invalid WS request: {}", e))?;
|
||||
.map_err(|_| "Invalid WS request".to_string())?;
|
||||
|
||||
req.headers_mut().insert(
|
||||
"X-NRD-AUTH",
|
||||
|
||||
+85
-1
@@ -345,7 +345,13 @@ fn translate_actions(events:impl IntoIterator<Item=Event>,input:&mut Input,viewp
|
||||
if !repeat{*files=true;messages.extend(input.release_all());}None
|
||||
},
|
||||
_ if !*focused || !input.enabled()=>None,
|
||||
Event::KeyDown{scancode:Some(s),repeat:false,..}=>input.key(s as i32,true),
|
||||
Event::KeyDown{scancode:Some(s),keymod,repeat:false,..}=>{
|
||||
// FocusLost releases remote keys, while a modifier may remain physically held.
|
||||
// SDL_Keysym.mod is the event-time snapshot: restore it before the next key,
|
||||
// without querying the final state of a whole polled batch or typing text.
|
||||
if !(224..=231).contains(&(s as i32)){messages.extend(sync_modifiers(input,keymod));}
|
||||
input.key(s as i32,true)
|
||||
},
|
||||
Event::KeyUp{scancode:Some(s),..}=>input.key(s as i32,false),
|
||||
Event::MouseMotion{x,y,..}=>viewport.motion(x as f64,y as f64),
|
||||
Event::MouseButtonDown{mouse_btn,..}=>button(mouse_btn).and_then(|b|input.button(b,true)),
|
||||
@@ -366,6 +372,18 @@ fn translate_actions(events:impl IntoIterator<Item=Event>,input:&mut Input,viewp
|
||||
} (quit,messages)
|
||||
}
|
||||
|
||||
fn sync_modifiers(input:&mut Input,keymod:sdl2::keyboard::Mod)->Vec<serde_json::Value>{
|
||||
use sdl2::keyboard::Mod as M;
|
||||
let modifiers=[(224,M::LCTRLMOD),(225,M::LSHIFTMOD),(226,M::LALTMOD),(227,M::LGUIMOD),
|
||||
(228,M::RCTRLMOD),(229,M::RSHIFTMOD),(230,M::RALTMOD),(231,M::RGUIMOD)];
|
||||
let mut out=Vec::new();
|
||||
// Release stale modifiers before pressing new ones. Input deduplicates transitions.
|
||||
// Caps/Num/Scroll Lock and MODE are not physical held modifiers.
|
||||
for down in [false,true]{for (scan,flag) in modifiers{
|
||||
if keymod.contains(flag)==down{out.extend(input.key(scan,down));}
|
||||
}}out
|
||||
}
|
||||
|
||||
fn needs_redraw(event:&Event)->bool{
|
||||
matches!(event,Event::Window{win_event:WindowEvent::SizeChanged(..)|WindowEvent::Resized(..)|WindowEvent::Exposed|WindowEvent::Maximized|WindowEvent::Restored,..})
|
||||
}
|
||||
@@ -709,6 +727,72 @@ async fn pump_type_job(job: &mut TypeJob, session: &mut Session, window: &mut Wi
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)] mod modifier_tests {
|
||||
use super::*;
|
||||
use sdl2::keyboard::{Scancode as S,Mod as M};
|
||||
fn key(scan:S,down:bool,mods:M)->Event{
|
||||
if down{Event::KeyDown{timestamp:0,window_id:1,keycode:None,scancode:Some(scan),keymod:mods,repeat:false}}
|
||||
else{Event::KeyUp{timestamp:0,window_id:1,keycode:None,scancode:Some(scan),keymod:mods,repeat:false}}
|
||||
}
|
||||
fn focus(event:WindowEvent)->Event{Event::Window{timestamp:0,window_id:1,win_event:event}}
|
||||
fn send(input:&mut Input,focused:&mut bool,events:impl IntoIterator<Item=Event>)->Vec<serde_json::Value>{
|
||||
translate(events,input,Viewport::fit((800,600),(1920,1080)),focused).1
|
||||
}
|
||||
fn codes(messages:&[serde_json::Value])->Vec<(&str,i64)>{
|
||||
messages.iter().map(|m|(m["action"].as_str().unwrap(),m["key"].as_i64().unwrap())).collect()
|
||||
}
|
||||
#[test] fn held_left_and_right_modifiers_recover_after_focus_return(){
|
||||
for mac in [false,true]{for (scan,flag) in [(S::LCtrl,M::LCTRLMOD),(S::LShift,M::LSHIFTMOD),
|
||||
(S::LAlt,M::LALTMOD),(S::LGui,M::LGUIMOD),(S::RCtrl,M::RCTRLMOD),(S::RShift,M::RSHIFTMOD),
|
||||
(S::RAlt,M::RALTMOD),(S::RGui,M::RGUIMOD)]{
|
||||
let code=|scan:S|i64::from(if mac{super::super::input::mac_keycode(scan as i32)}else{super::super::input::windows_vk(scan as i32)}.unwrap());
|
||||
let mut input=Input::default();input.set_mac(mac);let mut focused=true;
|
||||
let out=send(&mut input,&mut focused,[key(scan,true,flag),focus(WindowEvent::FocusLost)]);
|
||||
assert_eq!(codes(&out),vec![("kbd_press",code(scan)),("kbd_release",code(scan))]);
|
||||
assert!(!focused);
|
||||
let out=send(&mut input,&mut focused,[focus(WindowEvent::FocusGained),key(S::Num2,true,flag),
|
||||
key(S::Num2,false,flag),key(scan,false,M::NOMOD)]);
|
||||
assert_eq!(codes(&out),vec![("kbd_press",code(scan)),("kbd_press",code(S::Num2)),
|
||||
("kbd_release",code(S::Num2)),("kbd_release",code(scan))]);
|
||||
assert!(input.release_all().is_empty());
|
||||
}}
|
||||
}
|
||||
#[test] fn combined_snapshot_releases_stale_modifiers_before_new_chord(){
|
||||
let mut input=Input::default();input.set_mac(true);let mut focused=true;
|
||||
send(&mut input,&mut focused,[key(S::LShift,true,M::LSHIFTMOD),key(S::RGui,true,M::LSHIFTMOD|M::RGUIMOD)]);
|
||||
let mods=M::RSHIFTMOD|M::LCTRLMOD|M::LALTMOD;
|
||||
let out=send(&mut input,&mut focused,[key(S::A,true,mods),key(S::A,false,mods),
|
||||
key(S::B,true,M::NOMOD),key(S::B,false,M::NOMOD)]);
|
||||
assert_eq!(codes(&out),vec![("kbd_release",56),("kbd_release",54),
|
||||
("kbd_press",59),("kbd_press",58),("kbd_press",60),("kbd_press",0),("kbd_release",0),
|
||||
("kbd_release",59),("kbd_release",58),("kbd_release",60),("kbd_press",11),("kbd_release",11)]);
|
||||
assert!(input.release_all().is_empty());
|
||||
}
|
||||
#[test] fn complete_chords_and_overlapping_letters_are_not_duplicated(){
|
||||
let mut input=Input::default();input.set_mac(true);let mut focused=true;
|
||||
let mods=M::LSHIFTMOD|M::RSHIFTMOD;
|
||||
let out=send(&mut input,&mut focused,[key(S::LShift,true,M::LSHIFTMOD),key(S::RShift,true,mods),
|
||||
key(S::A,true,mods),key(S::B,true,mods),key(S::A,false,mods),key(S::LShift,false,M::RSHIFTMOD),
|
||||
key(S::B,false,M::RSHIFTMOD),key(S::RShift,false,M::NOMOD)]);
|
||||
assert_eq!(codes(&out),vec![("kbd_press",56),("kbd_press",60),("kbd_press",0),("kbd_press",11),
|
||||
("kbd_release",0),("kbd_release",56),("kbd_release",11),("kbd_release",60)]);
|
||||
assert!(input.release_all().is_empty());
|
||||
}
|
||||
#[test] fn snapshot_is_event_time_and_does_not_create_lock_or_view_only_keys(){
|
||||
let mut input=Input::default();let mut focused=true;
|
||||
let out=send(&mut input,&mut focused,[key(S::Num2,true,M::LSHIFTMOD|M::CAPSMOD|M::NUMMOD|M::MODEMOD),
|
||||
key(S::Num2,false,M::LSHIFTMOD),key(S::A,true,M::NOMOD),key(S::A,false,M::NOMOD)]);
|
||||
assert_eq!(codes(&out),vec![("kbd_press",0xa0),("kbd_press",0x32),("kbd_release",0x32),
|
||||
("kbd_release",0xa0),("kbd_press",0x41),("kbd_release",0x41)]);
|
||||
for watch in [false,true]{
|
||||
let mut input=Input::new(watch);let mut focused=false;
|
||||
assert!(send(&mut input,&mut focused,[key(S::A,true,M::LSHIFTMOD)]).is_empty());
|
||||
if watch{assert!(send(&mut input,&mut focused,[focus(WindowEvent::FocusGained),key(S::A,true,M::LSHIFTMOD)]).is_empty());}
|
||||
assert!(input.release_all().is_empty());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)] mod tests {
|
||||
use super::*;
|
||||
#[cfg_attr(target_os="macos",ignore)]
|
||||
|
||||
@@ -50,6 +50,13 @@ async fn source() -> Option<PathBuf> {
|
||||
let path = PathBuf::from(path); return path.is_absolute().then_some(path);
|
||||
}
|
||||
let desktop = std::env::var("XDG_CURRENT_DESKTOP").unwrap_or_default().to_lowercase();
|
||||
if desktop.split(':').any(|name| name == "hyprland") {
|
||||
let home = std::env::var_os("HOME").map(PathBuf::from);
|
||||
let xdg = |name, fallback| std::env::var_os(name).map(PathBuf::from)
|
||||
.filter(|p| p.is_absolute()).or_else(|| home.as_ref().map(|p| p.join(fallback)));
|
||||
return omarchy_background(xdg("XDG_STATE_HOME", ".local/state").as_deref(),
|
||||
xdg("XDG_CONFIG_HOME", ".config").as_deref()).await;
|
||||
}
|
||||
if desktop.contains("gnome") || desktop.contains("unity") || desktop.contains("cinnamon") {
|
||||
let schema = if desktop.contains("cinnamon") { "org.cinnamon.desktop.background" } else { "org.gnome.desktop.background" };
|
||||
if schema == "org.gnome.desktop.background" && command("gsettings", &["get", "org.gnome.desktop.interface", "color-scheme"])
|
||||
@@ -87,6 +94,16 @@ async fn source() -> Option<PathBuf> {
|
||||
None
|
||||
}
|
||||
|
||||
// Omarchy maintains this link when changing wallpaper/theme. Prefer its current
|
||||
// XDG state location, while supporting older installations using XDG config.
|
||||
async fn omarchy_background(state: Option<&std::path::Path>, config: Option<&std::path::Path>) -> Option<PathBuf> {
|
||||
for root in [state, config].into_iter().flatten() {
|
||||
let path = root.join("omarchy/current/background");
|
||||
if tokio::fs::metadata(&path).await.is_ok_and(|meta| meta.is_file()) { return Some(path); }
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
async fn package_image(path: PathBuf) -> Option<PathBuf> {
|
||||
if tokio::fs::metadata(&path).await.ok()?.is_file() { return Some(path); }
|
||||
let mut entries = tokio::fs::read_dir(path.join("contents/images")).await.ok()?;
|
||||
@@ -271,6 +288,35 @@ mod tests {
|
||||
std::fs::remove_dir_all(root).unwrap();
|
||||
}
|
||||
#[tokio::test]
|
||||
async fn omarchy_follows_current_wallpaper_links_and_supports_legacy_location() {
|
||||
use std::os::unix::fs::symlink;
|
||||
let root = std::env::temp_dir().join(format!("uu-omarchy-{}-{}", std::process::id(), rand::random::<u64>()));
|
||||
let state = root.join("custom-state");
|
||||
let config = root.join("custom-config");
|
||||
for dir in [&state, &config] { std::fs::create_dir_all(dir.join("omarchy/current")).unwrap(); }
|
||||
let current = state.join("omarchy/current/background");
|
||||
let legacy = config.join("omarchy/current/background");
|
||||
let first = root.join("first.png");
|
||||
let second = root.join("second.jpg");
|
||||
std::fs::write(&first, b"\x89PNG\r\n\x1a\n").unwrap();
|
||||
std::fs::write(&second, b"\xff\xd8\xff").unwrap();
|
||||
symlink(&second, &legacy).unwrap();
|
||||
let detect = || omarchy_background(Some(&state), Some(&config));
|
||||
assert_eq!(detect().await, Some(legacy.clone()));
|
||||
symlink(&first, ¤t).unwrap();
|
||||
assert_eq!(detect().await, Some(current.clone()));
|
||||
assert_eq!(read_image(&detect().await.unwrap()).await.unwrap(), std::fs::read(&first).unwrap());
|
||||
std::fs::remove_file(¤t).unwrap(); symlink(&second, ¤t).unwrap();
|
||||
assert_eq!(read_image(&detect().await.unwrap()).await.unwrap(), std::fs::read(&second).unwrap());
|
||||
std::fs::remove_file(¤t).unwrap(); symlink(root.join("missing"), ¤t).unwrap();
|
||||
assert_eq!(detect().await, Some(legacy.clone()));
|
||||
std::fs::remove_file(¤t).unwrap(); symlink(&root, ¤t).unwrap();
|
||||
assert_eq!(detect().await, Some(legacy.clone()));
|
||||
std::fs::remove_file(&legacy).unwrap();
|
||||
assert_eq!(detect().await, None);
|
||||
std::fs::remove_dir_all(root).unwrap();
|
||||
}
|
||||
#[tokio::test]
|
||||
async fn kde_packages_select_landscape_and_image_reads_are_bounded() {
|
||||
let root = std::env::temp_dir().join(format!("uu-wallpaper-test-{}-{}", std::process::id(), rand::random::<u64>()));
|
||||
let images = root.join("contents/images");
|
||||
|
||||
+15
-1
@@ -1002,6 +1002,7 @@ impl WebRtcSession {
|
||||
// Default file-transfer folder: the desktop user's home directory.
|
||||
let home = std::env::var("HOME").unwrap_or_else(|_| "/".into());
|
||||
let (mut desktop, mut promoted, mut lock_reported) = (desktop, false, desktop);
|
||||
let mut privacy_reported = false;
|
||||
let mut screen = screen;
|
||||
loop {
|
||||
loop {
|
||||
@@ -1056,11 +1057,20 @@ impl WebRtcSession {
|
||||
if !lock_reported {
|
||||
lock_reported = true;
|
||||
tokio::spawn(crate::session_lock::report_states(channel.clone(), sequence.clone(), crate::session_lock::watch_locked()));
|
||||
}
|
||||
// The viewer's menu only learns about a mode it did not ask for (an
|
||||
// auto-enable) from this push, so desktop peers need it too, not only a
|
||||
// tool peer promoted to desktop.
|
||||
if !privacy_reported && crate::privacy_screen::supported() {
|
||||
privacy_reported = true;
|
||||
let (channel, sequence, actions) = (channel.clone(), sequence.clone(), init_actions.clone());
|
||||
let portal = portal_desktop.clone();
|
||||
let text_out = text_out.clone();
|
||||
tokio::spawn(async move {
|
||||
let mut previous = crate::privacy_screen::current_type();
|
||||
// 0 is not a wire type: the first tick must push the effective state.
|
||||
// An auto-enable can land before this task starts, and the viewer
|
||||
// never sent an RPC to learn the mode from a response.
|
||||
let mut previous = 0u8;
|
||||
let mut tick = tokio::time::interval(std::time::Duration::from_secs(1));
|
||||
loop {
|
||||
tick.tick().await;
|
||||
@@ -1068,6 +1078,7 @@ impl WebRtcSession {
|
||||
let current = crate::privacy_screen::current_type();
|
||||
if current == previous { continue; }
|
||||
previous = current;
|
||||
log::info!("Privacy state change pushed: type={current}");
|
||||
let permission = portal.as_ref().map_or(crate::system_metrics::Permission::Allow, |p| p.snapshot().permission(true));
|
||||
let ts = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_secs();
|
||||
let payload = actions.metrics_payload(desktop_sound, permission);
|
||||
@@ -1075,6 +1086,9 @@ impl WebRtcSession {
|
||||
text_out.metrics(message.clone());
|
||||
if channel.send(&bytes::Bytes::from(message)).await.is_err() { return; }
|
||||
let state = crate::privacy_screen::state_message(sequence.fetch_add(1, std::sync::atomic::Ordering::Relaxed), ts);
|
||||
// Android 4.43.0 handles privacy replies on TEXT; CONTROL stays for
|
||||
// viewers that only read the desktop channel.
|
||||
let _ = text_out.send(state.clone());
|
||||
if channel.send(&bytes::Bytes::from(state)).await.is_err() { return; }
|
||||
}
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user