mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7b8980771d | ||
|
|
50ff42e8d7 | ||
|
|
ba8f8ada20 |
No files matched your search
Generated
+35
-2
@@ -673,6 +673,15 @@ dependencies = [
|
|||||||
"windows-sys 0.61.2",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fdeflate"
|
||||||
|
version = "0.3.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
|
||||||
|
dependencies = [
|
||||||
|
"simd-adler32",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ff"
|
name = "ff"
|
||||||
version = "0.13.1"
|
version = "0.13.1"
|
||||||
@@ -727,7 +736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb"
|
checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crc32fast",
|
"crc32fast",
|
||||||
"miniz_oxide",
|
"miniz_oxide 0.9.1",
|
||||||
"zlib-rs",
|
"zlib-rs",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -1323,6 +1332,16 @@ version = "0.2.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "miniz_oxide"
|
||||||
|
version = "0.8.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
|
||||||
|
dependencies = [
|
||||||
|
"adler2",
|
||||||
|
"simd-adler32",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "miniz_oxide"
|
name = "miniz_oxide"
|
||||||
version = "0.9.1"
|
version = "0.9.1"
|
||||||
@@ -1571,6 +1590,19 @@ version = "0.3.34"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548"
|
checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "png"
|
||||||
|
version = "0.18.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.13.2",
|
||||||
|
"crc32fast",
|
||||||
|
"fdeflate",
|
||||||
|
"flate2",
|
||||||
|
"miniz_oxide 0.8.9",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "polyval"
|
name = "polyval"
|
||||||
version = "0.6.2"
|
version = "0.6.2"
|
||||||
@@ -2772,7 +2804,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.48"
|
version = "0.2.49"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ab_glyph",
|
"ab_glyph",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -2788,6 +2820,7 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"nix 0.29.0",
|
"nix 0.29.0",
|
||||||
|
"png",
|
||||||
"qrcode",
|
"qrcode",
|
||||||
"rand 0.8.8",
|
"rand 0.8.8",
|
||||||
"rcgen",
|
"rcgen",
|
||||||
|
|||||||
+3
-2
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.48"
|
version = "0.2.49"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "uuremote-server"
|
default-run = "uuremote-server"
|
||||||
authors = ["uu-remote-linux contributors"]
|
authors = ["uu-remote-linux contributors"]
|
||||||
@@ -23,7 +23,7 @@ required-features = ["native-viewer"]
|
|||||||
default = []
|
default = []
|
||||||
native-viewer = []
|
native-viewer = []
|
||||||
viewer-ffmpeg = ["native-viewer", "dep:ffmpeg-next"]
|
viewer-ffmpeg = ["native-viewer", "dep:ffmpeg-next"]
|
||||||
viewer-sdl = ["native-viewer", "dep:sdl2", "dep:ab_glyph"]
|
viewer-sdl = ["native-viewer", "dep:sdl2", "dep:ab_glyph", "dep:png"]
|
||||||
wayland = []
|
wayland = []
|
||||||
# Experimental direct linear framebuffer capture; never enabled in release builds.
|
# Experimental direct linear framebuffer capture; never enabled in release builds.
|
||||||
kms = []
|
kms = []
|
||||||
@@ -60,6 +60,7 @@ x11rb = { version = "0.13", features = ["damage", "shm", "allow-unsafe-code"], o
|
|||||||
|
|
||||||
sdl2 = { version = "0.37", optional = true, features = ["use-pkgconfig"] }
|
sdl2 = { version = "0.37", optional = true, features = ["use-pkgconfig"] }
|
||||||
ab_glyph = { version = "0.2", optional = true }
|
ab_glyph = { version = "0.2", optional = true }
|
||||||
|
png = { version = "0.18", optional = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
# Synthetic loopback WSS certificates only; both crates already occur in Cargo.lock.
|
# Synthetic loopback WSS certificates only; both crates already occur in Cargo.lock.
|
||||||
|
|||||||
@@ -615,6 +615,8 @@ terminal emulator (`TERMINAL` selects one). From source: `sudo apt install libsd
|
|||||||
|
|
||||||
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.
|
Key combinations use the left/right modifier state attached to each SDL key event. Focus loss releases remote keys; after focus returns, the next non-modifier key restores any still-held Shift/Ctrl/Alt/Win (Command on Mac). This is built in, with no adapter or setting required.
|
||||||
|
|
||||||
|
The viewer mirrors remote PNG pointer shapes (including text and window-resize cursors) with their hotspots. Leaving the remote picture or opening local controls restores the local arrow.
|
||||||
|
|
||||||
SDL clipboard access reuses the desktop window to avoid temporary-window Dock churn on GNOME Wayland (#37).
|
SDL clipboard access reuses the desktop window to avoid temporary-window Dock churn on GNOME Wayland (#37).
|
||||||
On niri, data-control-capable `wl-clipboard` is used instead, so synchronization does not require window focus.
|
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
|
Other SDL backends synchronize only while that window is focused. The 30 KiB text limit applies. Selections without a supported
|
||||||
|
|||||||
@@ -537,6 +537,8 @@ xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`。
|
|||||||
|
|
||||||
组合键使用 SDL 按键事件携带的左右修饰键状态;窗口失焦时释放远端按键,重新聚焦后的下一次普通按键会恢复仍按住的 Shift/Ctrl/Alt/Win(Mac 为 Command)。此行为内置,无需适配库或开关。
|
组合键使用 SDL 按键事件携带的左右修饰键状态;窗口失焦时释放远端按键,重新聚焦后的下一次普通按键会恢复仍按住的 Shift/Ctrl/Alt/Win(Mac 为 Command)。此行为内置,无需适配库或开关。
|
||||||
|
|
||||||
|
控制端会同步远端以 PNG 发送的指针形状(如文本光标和窗口缩放箭头),并保留正确热点。离开远控画面或打开本地菜单时恢复本机箭头。
|
||||||
|
|
||||||
SDL 剪贴板复用桌面窗口,避免 GNOME Wayland 上临时窗口引起的 Dock 跳动(#37)。niri 改用支持 data-control 的
|
SDL 剪贴板复用桌面窗口,避免 GNOME Wayland 上临时窗口引起的 Dock 跳动(#37)。niri 改用支持 data-control 的
|
||||||
`wl-clipboard`,不需要桌面窗口保持焦点;其他 SDL 后端仅在桌面窗口获得焦点时同步。
|
`wl-clipboard`,不需要桌面窗口保持焦点;其他 SDL 后端仅在桌面窗口获得焦点时同步。
|
||||||
保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。
|
保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。
|
||||||
|
|||||||
@@ -73,6 +73,9 @@ int uu_privacy_wallpaper_run(const char *image, const int *rects, int count) {
|
|||||||
shown++;
|
shown++;
|
||||||
}
|
}
|
||||||
if (!shown) return 2;
|
if (!shown) return 2;
|
||||||
|
/* Map the covers before reporting ready: the host marks them skip-taskbar through KWin right
|
||||||
|
after this line, and KWin can only list windows whose surfaces already exist. */
|
||||||
|
while (gtk_events_pending()) gtk_main_iteration_do(FALSE);
|
||||||
/* EOF follows the host process, including crashes, rather than its spawning worker thread. */
|
/* EOF follows the host process, including crashes, rather than its spawning worker thread. */
|
||||||
GIOChannel *host = g_io_channel_unix_new(0);
|
GIOChannel *host = g_io_channel_unix_new(0);
|
||||||
guint watch = g_io_add_watch(host, G_IO_HUP | G_IO_ERR | G_IO_NVAL, host_closed, NULL);
|
guint watch = g_io_add_watch(host, G_IO_HUP | G_IO_ERR | G_IO_NVAL, host_closed, NULL);
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
查看端显示远端光标形状,KDE 防窥遮罩不再出现在任务栏。/ The native viewer mirrors remote cursor shapes, and the KDE privacy cover no longer appears in the task manager.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **查看端远端光标形状(#168,感谢 @Zhenqiang-Weng)**:SDL 查看端使用主机经现有 CONTROL 消息发来的光标图片和热点(文本、调整大小等),指针离开画面、悬停本地控件或失焦时恢复本地箭头。光标 PNG 有大小和尺寸上限,日志只记录数量和尺寸。
|
||||||
|
The SDL viewer applies the host's cursor image and hotspot from the existing CONTROL message, restoring the local arrow outside the picture, over local controls and on focus loss. Cursor PNGs are size-bounded; logs record only counts and dimensions.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **KDE 防窥遮罩不进任务栏(#169,感谢 @RiverOnVenus)**:隐私屏保模式下,遮罩窗口通过 KWin 脚本设为不显示在任务管理器中(含多显示器的每个遮罩)。/ In picture mode, the cover windows (one per monitor) are hidden from the task manager through KWin scripting.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;KDE 遮罩修复由贡献者在 Plasma 6.8 Wayland 单屏实机验证,多屏未实测。光标形状未做官方主机实机验收。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.49_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.49-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.49`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -23,3 +23,12 @@ pub fn move_windows_to(output: &str) -> Result<(), String> {
|
|||||||
script(&format!(r#"const v = workspace.screens.find(o => o.name == "{output}");
|
script(&format!(r#"const v = workspace.screens.find(o => o.name == "{output}");
|
||||||
if (v) for (const w of workspace.windowList()) if (w.normalWindow || w.dialog) workspace.sendClientToScreen(w, v);"#))
|
if (v) for (const w of workspace.windowList()) if (w.normalWindow || w.dialog) workspace.sendClientToScreen(w, v);"#))
|
||||||
}
|
}
|
||||||
|
/// Hides the cover window from the task manager. GTK's skip-taskbar hint is an X11 hint and KWin
|
||||||
|
/// ignores it on Wayland, so the cover showed up as an unidentified window with the theme's
|
||||||
|
/// generic "wayland" icon. `skipTaskbar` is writable through KWin scripting. Picture mode creates
|
||||||
|
/// one cover per physical monitor with the same title, and KWin appends " <2>" and so on to
|
||||||
|
/// duplicate captions, so match the title as a prefix.
|
||||||
|
pub fn hide_cover_from_taskbar() -> Result<(), String> {
|
||||||
|
script(r#"for (const w of workspace.windowList())
|
||||||
|
if (w.resourceClass === "uuremote-server" && w.caption.indexOf("uu-remote-linux privacy") === 0) w.skipTaskbar = true;"#)
|
||||||
|
}
|
||||||
@@ -47,6 +47,13 @@ fn cover(data: &Data) -> Result<[f64; 4], String> {
|
|||||||
if physical.len() != data.outputs.len() { return Err("physical outputs did not come back".into()); }
|
if physical.len() != data.outputs.len() { return Err("physical outputs did not come back".into()); }
|
||||||
let region = outputs::region(&layout, &virtual_name).ok_or("virtual output geometry")?;
|
let region = outputs::region(&layout, &virtual_name).ok_or("virtual output geometry")?;
|
||||||
super::cover::show(wallpaper().as_deref(), &physical)?;
|
super::cover::show(wallpaper().as_deref(), &physical)?;
|
||||||
|
// The cover is a plain Wayland toplevel: GTK's skip-taskbar hint is X11-only, so without this
|
||||||
|
// the task manager shows it as an unidentified window with the theme's generic "wayland" icon.
|
||||||
|
// KWin lists a freshly mapped window asynchronously, so one more pass catches a late cover.
|
||||||
|
for pass in 0..2 {
|
||||||
|
if let Err(e) = kwin::hide_cover_from_taskbar() { log::warn!("Privacy cover taskbar: {e}"); break; }
|
||||||
|
if pass == 0 { std::thread::sleep(std::time::Duration::from_millis(200)); }
|
||||||
|
}
|
||||||
Ok(region)
|
Ok(region)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,135 @@
|
|||||||
|
//! Session-scoped remote pointer shapes. Wire evidence is documented in src/cursor.rs.
|
||||||
|
use crate::protocol::{decode_wire,WireValue};
|
||||||
|
use std::sync::{Arc,Mutex};
|
||||||
|
const MAX_SIDE:u32=512;
|
||||||
|
const MAX_PNG:usize=1024*1024;
|
||||||
|
#[derive(Clone,Debug,PartialEq)]
|
||||||
|
pub struct Shape {pub width:u32,pub height:u32,pub hot_x:u32,pub hot_y:u32,pub scale_x:f64,pub scale_y:f64,pub png:Vec<u8>}
|
||||||
|
fn blob(data:&[u8],field:u32)->Option<&[u8]>{decode_wire(data).ok()?.into_iter().find_map(|f|match(f.number,f.value){(n,WireValue::Bytes(v))if n==field=>Some(v),_=>None})}
|
||||||
|
fn parse(data:&[u8])->Result<Option<Shape>,()> {
|
||||||
|
if data.len()>MAX_PNG+512{return Err(())}
|
||||||
|
let Some(change)=blob(data,15) else{return Ok(None)};
|
||||||
|
let Some(shape)=blob(change,2) else{return Ok(None)};
|
||||||
|
let fields=decode_wire(shape).map_err(|_|())?;
|
||||||
|
let uint=|n|fields.iter().find_map(|f|match(f.number,&f.value){(i,WireValue::Varint(v))if i==n=>Some(*v),_=>None}).unwrap_or(0);
|
||||||
|
let scale=|n|fields.iter().find_map(|f|match(f.number,&f.value){(i,WireValue::Fixed64(v))if i==n=>Some(f64::from_le_bytes(*v)),_=>None}).unwrap_or(1.);
|
||||||
|
let png=blob(shape,5).unwrap_or_default();
|
||||||
|
// Type-only/unsupported shapes restore the local arrow instead of leaving a stale resize cursor.
|
||||||
|
if png.is_empty(){return Ok(Some(Shape{width:0,height:0,hot_x:0,hot_y:0,scale_x:1.,scale_y:1.,png:Vec::new()}))}
|
||||||
|
let(width,height)=(u32::try_from(uint(3)).map_err(|_|())?,u32::try_from(uint(4)).map_err(|_|())?);
|
||||||
|
let(hot_x,hot_y)=(u32::try_from(uint(1)).map_err(|_|())?,u32::try_from(uint(2)).map_err(|_|())?);
|
||||||
|
let(scale_x,scale_y)=(scale(7),scale(8));
|
||||||
|
if width==0||height==0||width>MAX_SIDE||height>MAX_SIDE||hot_x>=width||hot_y>=height
|
||||||
|
|| ![scale_x,scale_y].iter().all(|v|v.is_finite()&&*v>0.&&*v<=16.) {return Err(())}
|
||||||
|
if png.len()<33||png.len()>MAX_PNG||!png.starts_with(b"\x89PNG\r\n\x1a\n")||&png[12..16]!=b"IHDR"{return Err(())}
|
||||||
|
let pw=u32::from_be_bytes(png[16..20].try_into().unwrap());let ph=u32::from_be_bytes(png[20..24].try_into().unwrap());
|
||||||
|
if pw==0||ph==0||pw>MAX_SIDE||ph>MAX_SIDE{return Err(())}
|
||||||
|
Ok(Some(Shape{width,height,hot_x,hot_y,scale_x,scale_y,png:png.to_vec()}))
|
||||||
|
}
|
||||||
|
#[derive(Default)] struct Latest {last:Option<Arc<Shape>>,pending:Option<Arc<Shape>>,count:u64}
|
||||||
|
#[derive(Clone,Default)] pub struct State(Arc<Mutex<Latest>>);
|
||||||
|
impl State {
|
||||||
|
pub fn receive(&self,data:&[u8]) {
|
||||||
|
let Ok(Some(shape))=parse(data) else{return};let mut state=self.0.lock().unwrap();
|
||||||
|
if state.last.as_deref()==Some(&shape){return}
|
||||||
|
state.count+=1;
|
||||||
|
if state.count<=3 || state.count%100==0 {log::info!("Viewer remote cursor: count={} size={}x{} png_bytes={}",state.count,shape.width,shape.height,shape.png.len());}
|
||||||
|
let shape=Arc::new(shape);state.last=Some(shape.clone());state.pending=Some(shape);
|
||||||
|
}
|
||||||
|
pub fn take(&self)->Option<Arc<Shape>>{self.0.lock().unwrap().pending.take()}
|
||||||
|
}
|
||||||
|
#[cfg(feature="viewer-sdl")]
|
||||||
|
mod display {
|
||||||
|
use super::*;
|
||||||
|
use sdl2::{mouse::{Cursor,SystemCursor},surface::Surface,pixels::PixelFormatEnum};
|
||||||
|
struct Image {shape:Arc<Shape>,width:u32,height:u32,rgba:Vec<u8>}
|
||||||
|
fn decode(shape:Arc<Shape>)->Result<Image,()> {
|
||||||
|
let mut decoder=png::Decoder::new_with_limits(std::io::Cursor::new(&shape.png),png::Limits{bytes:4*MAX_PNG});
|
||||||
|
decoder.set_ignore_text_chunk(true);decoder.set_ignore_iccp_chunk(true);
|
||||||
|
decoder.set_transformations(png::Transformations::EXPAND|png::Transformations::STRIP_16);
|
||||||
|
let mut reader=decoder.read_info().map_err(|_|())?;
|
||||||
|
let size=reader.output_buffer_size().filter(|v|*v<=MAX_SIDE as usize*MAX_SIDE as usize*4).ok_or(())?;
|
||||||
|
let mut data=vec![0;size];let info=reader.next_frame(&mut data).map_err(|_|())?;
|
||||||
|
if info.width==0||info.height==0||info.width>MAX_SIDE||info.height>MAX_SIDE{return Err(())}
|
||||||
|
data.truncate(info.buffer_size());let mut rgba=Vec::with_capacity(info.width as usize*info.height as usize*4);
|
||||||
|
match info.color_type {
|
||||||
|
png::ColorType::Rgba=>rgba=data,
|
||||||
|
png::ColorType::Rgb=>for p in data.chunks_exact(3){rgba.extend_from_slice(&[p[0],p[1],p[2],255]);},
|
||||||
|
png::ColorType::Grayscale=>for p in data {rgba.extend_from_slice(&[p,p,p,255]);},
|
||||||
|
png::ColorType::GrayscaleAlpha=>for p in data.chunks_exact(2){rgba.extend_from_slice(&[p[0],p[0],p[0],p[1]]);},
|
||||||
|
_=>return Err(()),
|
||||||
|
}
|
||||||
|
if rgba.len()!=info.width as usize*info.height as usize*4{return Err(())}
|
||||||
|
Ok(Image{shape,width:info.width,height:info.height,rgba})
|
||||||
|
}
|
||||||
|
fn geometry(s:&Shape)->(u32,u32,i32,i32) {
|
||||||
|
// Cursor width/hotspot are the host's cursor units. Video coordinate
|
||||||
|
// scales belong to pointer position mapping, not the local OS cursor.
|
||||||
|
// Keep the cursor readable when a large remote desktop is fitted down.
|
||||||
|
let w=s.width.clamp(1,256);let h=s.height.clamp(1,256);
|
||||||
|
let x=(s.hot_x as f64*w as f64/s.width as f64).round().clamp(0.,(w-1) as f64) as i32;
|
||||||
|
let y=(s.hot_y as f64*h as f64/s.height as f64).round().clamp(0.,(h-1) as f64) as i32;
|
||||||
|
(w,h,x,y)
|
||||||
|
}
|
||||||
|
pub struct Display {arrow:Option<Cursor>,remote:Option<Cursor>,image:Option<Image>,geometry:Option<(u32,u32,i32,i32)>,active:bool,applied:u64}
|
||||||
|
impl Display {
|
||||||
|
pub fn new()->Self {Self{arrow:Cursor::from_system(SystemCursor::Arrow).ok(),remote:None,image:None,geometry:None,active:false,applied:0}}
|
||||||
|
pub fn reset(&mut self){if let Some(cursor)=&self.arrow{cursor.set();}self.active=false;}
|
||||||
|
pub fn update(&mut self,shape:Option<Arc<Shape>>,active:bool){
|
||||||
|
if let Some(shape)=shape {
|
||||||
|
self.reset();self.remote=None;self.geometry=None;
|
||||||
|
self.image=if shape.png.is_empty(){None}else{match decode(shape){Ok(image)=>Some(image),Err(())=>{log::warn!("Viewer remote cursor PNG rejected");None}}};
|
||||||
|
}
|
||||||
|
if let Some(image)=self.image.as_mut(){
|
||||||
|
let size=geometry(&image.shape);
|
||||||
|
if self.geometry!=Some(size) {
|
||||||
|
let result=(||->Result<Cursor,String>{
|
||||||
|
let mut src=Surface::from_data(&mut image.rgba,image.width,image.height,image.width*4,PixelFormatEnum::RGBA32)?;
|
||||||
|
src.set_blend_mode(sdl2::render::BlendMode::None)?;
|
||||||
|
let mut target=Surface::new(size.0,size.1,PixelFormatEnum::RGBA32)?;
|
||||||
|
src.blit_scaled(None,&mut target,None)?;
|
||||||
|
Cursor::from_surface(&target,size.2,size.3)
|
||||||
|
})();
|
||||||
|
self.reset();self.remote=match result {Ok(cursor)=>{self.applied+=1;if self.applied<=3||self.applied%100==0{log::info!("Viewer cursor applied: count={} size={}x{}",self.applied,size.0,size.1);}Some(cursor)},Err(_)=>{log::warn!("Viewer remote cursor unavailable on this display");None}};self.geometry=Some(size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let active=active&&self.remote.is_some();
|
||||||
|
if active!=self.active {
|
||||||
|
if active {self.remote.as_ref().unwrap().set();self.active=true;}else{self.reset();}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl Drop for Display {fn drop(&mut self){self.reset();}}
|
||||||
|
#[cfg(test)] mod tests {
|
||||||
|
use super::*;
|
||||||
|
#[test] fn png_pixels_and_retina_hotspot_use_stable_cursor_units(){
|
||||||
|
let mut png=Vec::new();{
|
||||||
|
let mut encoder=png::Encoder::new(&mut png,4,4);encoder.set_color(png::ColorType::Rgba);encoder.set_depth(png::BitDepth::Eight);
|
||||||
|
encoder.write_header().unwrap().write_image_data(&[128;64]).unwrap();
|
||||||
|
}
|
||||||
|
let shape=Arc::new(Shape{width:2,height:2,hot_x:1,hot_y:1,scale_x:2.,scale_y:2.,png});
|
||||||
|
let image=decode(shape.clone()).unwrap();assert_eq!(image.rgba,vec![128;64]);
|
||||||
|
assert_eq!(geometry(&shape),(2,2,1,1));
|
||||||
|
let mut changed=(*shape).clone();changed.scale_x=0.25;changed.scale_y=0.25;assert_eq!(geometry(&changed),(2,2,1,1));
|
||||||
|
let mut bad=(*shape).clone();bad.png[40]^=255;assert!(decode(Arc::new(bad)).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[cfg(feature="viewer-sdl")] pub use display::Display;
|
||||||
|
#[cfg(test)] mod tests {
|
||||||
|
use super::*;
|
||||||
|
fn packet(w:u64,hot:u64,scale:f64,png:&[u8])->Vec<u8>{
|
||||||
|
let mut shape=Vec::new();super::super::wire::int(3,w,&mut shape);super::super::wire::int(4,w,&mut shape);super::super::wire::int(1,hot,&mut shape);
|
||||||
|
super::super::wire::bytes(5,png,&mut shape);shape.push(7<<3|1);shape.extend_from_slice(&scale.to_le_bytes());
|
||||||
|
let mut change=Vec::new();super::super::wire::bytes(2,&shape,&mut change);super::super::wire::envelope(1,15,&change)
|
||||||
|
}
|
||||||
|
#[test] fn shape_bounds_and_latest_only_updates(){
|
||||||
|
let png=include_bytes!("../../tests/fixtures/clipboard-test.png");
|
||||||
|
let state=State::default();let valid=packet(16,2,1.,png);state.receive(&valid);state.receive(&valid);
|
||||||
|
assert_eq!(state.take().unwrap().width,16);assert!(state.take().is_none());
|
||||||
|
for bad in [packet(0,0,1.,png),packet(513,0,1.,png),packet(16,16,1.,png),packet(16,0,f64::NAN,png),packet(16,0,0.,png)] {assert!(parse(&bad).is_err());state.receive(&bad);assert!(state.take().is_none());}
|
||||||
|
state.receive(&packet(20,2,1.,png));state.receive(&packet(24,2,1.,png));assert_eq!(state.take().unwrap().width,24);
|
||||||
|
state.receive(&packet(0,0,1.,&[]));assert!(state.take().unwrap().png.is_empty());
|
||||||
|
assert!(parse(&vec![0;MAX_PNG+513]).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -25,6 +25,7 @@ pub mod native_gamepad;
|
|||||||
pub mod native_rumble;
|
pub mod native_rumble;
|
||||||
|
|
||||||
pub mod clipboard;
|
pub mod clipboard;
|
||||||
|
pub mod cursor;
|
||||||
pub mod power;
|
pub mod power;
|
||||||
pub mod secure_input;
|
pub mod secure_input;
|
||||||
pub mod type_ipc;
|
pub mod type_ipc;
|
||||||
|
|||||||
+6
-4
@@ -45,6 +45,7 @@ pub struct Peer {
|
|||||||
clipboard:super::clipboard::Bridge,
|
clipboard:super::clipboard::Bridge,
|
||||||
pub tools:super::tools::Inbox,
|
pub tools:super::tools::Inbox,
|
||||||
pub rumble:super::native_rumble::Feedback,
|
pub rumble:super::native_rumble::Feedback,
|
||||||
|
pub cursor:super::cursor::State,
|
||||||
pub pc:Arc<RTCPeerConnection>,
|
pub pc:Arc<RTCPeerConnection>,
|
||||||
pub channels:Vec<Arc<RTCDataChannel>>,
|
pub channels:Vec<Arc<RTCDataChannel>>,
|
||||||
pub observed:Arc<Observed>,
|
pub observed:Arc<Observed>,
|
||||||
@@ -80,6 +81,7 @@ impl Peer {
|
|||||||
let pc=Arc::new(api.new_peer_connection(config).await.map_err(|e|format!("Peer creation failed: {}",crate::auth::transport_error(&e)))?);
|
let pc=Arc::new(api.new_peer_connection(config).await.map_err(|e|format!("Peer creation failed: {}",crate::auth::transport_error(&e)))?);
|
||||||
let tools:super::tools::Inbox=Arc::new(std::sync::Mutex::new(None));
|
let tools:super::tools::Inbox=Arc::new(std::sync::Mutex::new(None));
|
||||||
let rumble=super::native_rumble::Feedback::default();
|
let rumble=super::native_rumble::Feedback::default();
|
||||||
|
let cursor=super::cursor::State::default();
|
||||||
let inbox=tools.clone();
|
let inbox=tools.clone();
|
||||||
pc.on_peer_connection_state_change(Box::new(move |state|{
|
pc.on_peer_connection_state_change(Box::new(move |state|{
|
||||||
use webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState;
|
use webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState;
|
||||||
@@ -205,11 +207,11 @@ impl Peer {
|
|||||||
if [0,3,4].contains(&index){closed.lock().unwrap().take();}
|
if [0,3,4].contains(&index){closed.lock().unwrap().take();}
|
||||||
})}));
|
})}));
|
||||||
let state=observed.clone();let inbox=tools.clone();let clipboard_tx=clipboard.sender();
|
let state=observed.clone();let inbox=tools.clone();let clipboard_tx=clipboard.sender();
|
||||||
let feedback=rumble.clone();
|
let feedback=rumble.clone();let pointer=cursor.clone();
|
||||||
let control_for_echo=if index==0 {Arc::downgrade(&channel)} else {std::sync::Weak::new()};
|
let control_for_echo=if index==0 {Arc::downgrade(&channel)} else {std::sync::Weak::new()};
|
||||||
channel.on_message(Box::new(move |message| {let state=state.clone();let inbox=inbox.clone();let control_for_echo=control_for_echo.clone();let clipboard_tx=clipboard_tx.clone();let feedback=feedback.clone();Box::pin(async move {
|
channel.on_message(Box::new(move |message| {let state=state.clone();let inbox=inbox.clone();let control_for_echo=control_for_echo.clone();let clipboard_tx=clipboard_tx.clone();let feedback=feedback.clone();let pointer=pointer.clone();Box::pin(async move {
|
||||||
if index==0 {
|
if index==0 {
|
||||||
feedback.receive(&message.data);
|
feedback.receive(&message.data);pointer.receive(&message.data);
|
||||||
let (codecs,chroma)=wire::media_control(&message.data);
|
let (codecs,chroma)=wire::media_control(&message.data);
|
||||||
if let Some(codecs)=codecs {state.encoder_codecs.store(codecs,Ordering::Release);}
|
if let Some(codecs)=codecs {state.encoder_codecs.store(codecs,Ordering::Release);}
|
||||||
if let Some(chroma)=chroma {
|
if let Some(chroma)=chroma {
|
||||||
@@ -257,7 +259,7 @@ impl Peer {
|
|||||||
Ok::<_,String>((channels,tools,clipboard))
|
Ok::<_,String>((channels,tools,clipboard))
|
||||||
}.await;
|
}.await;
|
||||||
match result {
|
match result {
|
||||||
Ok((channels,tools,clipboard))=>Ok(Self{clipboard,tools,rumble,pc,channels,observed,desktop,audio,answered:false,early:Vec::new(),app_id:app_id.into(),ice_id:ice_id.into(),remote_client:remote_client.into()}),
|
Ok((channels,tools,clipboard))=>Ok(Self{clipboard,tools,rumble,cursor,pc,channels,observed,desktop,audio,answered:false,early:Vec::new(),app_id:app_id.into(),ice_id:ice_id.into(),remote_client:remote_client.into()}),
|
||||||
Err(e)=>{let _=pc.close().await;Err(e)},
|
Err(e)=>{let _=pc.close().await;Err(e)},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-2
@@ -1,7 +1,7 @@
|
|||||||
use super::{desktop::{Frame,FrameSink},input::{Input,Viewport},session::Session};
|
use super::{desktop::{Frame,FrameSink},input::{Input,Viewport},session::Session};
|
||||||
use sdl2::{event::{Event,WindowEvent},mouse::MouseButton,pixels::PixelFormatEnum,rect::Rect};
|
use sdl2::{event::{Event,WindowEvent},mouse::MouseButton,pixels::PixelFormatEnum,rect::Rect};
|
||||||
#[derive(Debug)] enum Command { Files, Type }
|
#[derive(Debug)] enum Command { Files, Type }
|
||||||
pub struct Window { canvas:sdl2::render::Canvas<sdl2::video::Window>, events:sdl2::EventPump, _sdl:sdl2::Sdl, frame:(u32,u32), focused:bool, files:bool, mac:bool,
|
pub struct Window {cursor:super::cursor::Display,canvas:sdl2::render::Canvas<sdl2::video::Window>, events:sdl2::EventPump, _sdl:sdl2::Sdl, frame:(u32,u32), focused:bool, files:bool, mac:bool,
|
||||||
clipboard:sdl2::clipboard::ClipboardUtil, clipboard_dirty:bool, clipboard_tx:tokio::sync::mpsc::Sender<super::clipboard::ClipboardRequest>, clipboard_requests:tokio::sync::mpsc::Receiver<super::clipboard::ClipboardRequest>,
|
clipboard:sdl2::clipboard::ClipboardUtil, clipboard_dirty:bool, clipboard_tx:tokio::sync::mpsc::Sender<super::clipboard::ClipboardRequest>, clipboard_requests:tokio::sync::mpsc::Receiver<super::clipboard::ClipboardRequest>,
|
||||||
pub last_frame:Option<Frame>, chrome:Chrome }
|
pub last_frame:Option<Frame>, chrome:Chrome }
|
||||||
/// In-window chrome state (src/viewer/hud.rs): menu, network panel, loading screen.
|
/// In-window chrome state (src/viewer/hud.rs): menu, network panel, loading screen.
|
||||||
@@ -32,10 +32,18 @@ impl Window {
|
|||||||
title:crate::tr!("正在连接 {name}","Connecting to {name}"),stage:crate::i18n::s("正在连接远端设备…","Contacting the remote device…").into(),labels:Default::default(),menu_cache:None};
|
title:crate::tr!("正在连接 {name}","Connecting to {name}"),stage:crate::i18n::s("正在连接远端设备…","Contacting the remote device…").into(),labels:Default::default(),menu_cache:None};
|
||||||
let events=sdl.event_pump()?;let clipboard=video.clipboard();
|
let events=sdl.event_pump()?;let clipboard=video.clipboard();
|
||||||
let(clipboard_tx,clipboard_requests)=tokio::sync::mpsc::channel(16);
|
let(clipboard_tx,clipboard_requests)=tokio::sync::mpsc::channel(16);
|
||||||
Ok(Self{canvas,events,_sdl:sdl,frame:(1920,1080),focused:true,files:false,mac:false,clipboard,clipboard_dirty:true,clipboard_tx,clipboard_requests,last_frame:None,chrome})
|
Ok(Self{cursor:super::cursor::Display::new(),canvas,events,_sdl:sdl,frame:(1920,1080),focused:true,files:false,mac:false,clipboard,clipboard_dirty:true,clipboard_tx,clipboard_requests,last_frame:None,chrome})
|
||||||
}
|
}
|
||||||
pub fn clipboard_bridge(&self)->super::clipboard::Bridge{super::clipboard::Bridge::sdl(self.clipboard_tx.clone())}
|
pub fn clipboard_bridge(&self)->super::clipboard::Bridge{super::clipboard::Bridge::sdl(self.clipboard_tx.clone())}
|
||||||
pub fn set_mac(&mut self,mac:bool){self.mac=mac;}
|
pub fn set_mac(&mut self,mac:bool){self.mac=mac;}
|
||||||
|
fn sync_cursor(&mut self,state:&super::cursor::State){
|
||||||
|
let mouse=self.events.mouse_state();let(x,y)=(mouse.x() as f64,mouse.y() as f64);let v=self.viewport();
|
||||||
|
let tab=hud::tab_rect(self.chrome.font.as_ref(),self.canvas.window().size(),self.chrome.scale);
|
||||||
|
let active=self.focused&&self.canvas.window().has_mouse_focus()&&!self.chrome.menu.open
|
||||||
|
&&x>=v.x&&y>=v.y&&x<v.x+v.width&&y<v.y+v.height
|
||||||
|
&&!(self.tab_visible()&&tab.contains(x as f32,y as f32));
|
||||||
|
self.cursor.update(state.take(),active);
|
||||||
|
}
|
||||||
fn viewport(&self)->Viewport {
|
fn viewport(&self)->Viewport {
|
||||||
let window=self.canvas.window().size();
|
let window=self.canvas.window().size();
|
||||||
if !self.chrome.state.one_to_one {return Viewport::fit(window,self.frame)}
|
if !self.chrome.state.one_to_one {return Viewport::fit(window,self.frame)}
|
||||||
@@ -496,6 +504,7 @@ pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super:
|
|||||||
_=tick.tick()=>{
|
_=tick.tick()=>{
|
||||||
if let Some(playback)=audio.as_mut(){if playback.pump().is_err(){log::warn!("Viewer audio playback stopped");audio=None;}}
|
if let Some(playback)=audio.as_mut(){if playback.pump().is_err(){log::warn!("Viewer audio playback stopped");audio=None;}}
|
||||||
let (quit,mut messages)=window.poll(&mut input);
|
let (quit,mut messages)=window.poll(&mut input);
|
||||||
|
window.sync_cursor(&session.peer.cursor);
|
||||||
if !window.has_picture() {window.loading_frame(false);}
|
if !window.has_picture() {window.loading_frame(false);}
|
||||||
if !restored && session.peer.ready(super::rtc::ReadyPolicy::EchoOnly,false) {restored=true;window.restore_remote_settings();}
|
if !restored && session.peer.ready(super::rtc::ReadyPolicy::EchoOnly,false) {restored=true;window.restore_remote_settings();}
|
||||||
for command in window.take_commands() {
|
for command in window.take_commands() {
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
|
After Width: | Height: | Size: 68 B |
Reference in new issue
Block a user