mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 08:50:40 +01:00
viewer: mirror remote cursor shapes and hotspots in SDL (#168)
This commit is contained in:
1 parent
c461db10a4
commit
ba8f8ada20
9 files changed
+193
-8
No files matched your search
Generated
+34
-1
@@ -673,6 +673,15 @@ dependencies = [
|
||||
"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]]
|
||||
name = "ff"
|
||||
version = "0.13.1"
|
||||
@@ -727,7 +736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb"
|
||||
dependencies = [
|
||||
"crc32fast",
|
||||
"miniz_oxide",
|
||||
"miniz_oxide 0.9.1",
|
||||
"zlib-rs",
|
||||
]
|
||||
|
||||
@@ -1323,6 +1332,16 @@ version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
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]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.9.1"
|
||||
@@ -1571,6 +1590,19 @@ version = "0.3.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
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]]
|
||||
name = "polyval"
|
||||
version = "0.6.2"
|
||||
@@ -2788,6 +2820,7 @@ dependencies = [
|
||||
"libc",
|
||||
"log",
|
||||
"nix 0.29.0",
|
||||
"png",
|
||||
"qrcode",
|
||||
"rand 0.8.8",
|
||||
"rcgen",
|
||||
|
||||
+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", "dep:ab_glyph"]
|
||||
viewer-sdl = ["native-viewer", "dep:sdl2", "dep:ab_glyph", "dep:png"]
|
||||
wayland = []
|
||||
# Experimental direct linear framebuffer capture; never enabled in release builds.
|
||||
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"] }
|
||||
ab_glyph = { version = "0.2", optional = true }
|
||||
png = { version = "0.18", optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
# 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.
|
||||
|
||||
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).
|
||||
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
|
||||
|
||||
@@ -537,6 +537,8 @@ xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`。
|
||||
|
||||
组合键使用 SDL 按键事件携带的左右修饰键状态;窗口失焦时释放远端按键,重新聚焦后的下一次普通按键会恢复仍按住的 Shift/Ctrl/Alt/Win(Mac 为 Command)。此行为内置,无需适配库或开关。
|
||||
|
||||
控制端会同步远端以 PNG 发送的指针形状(如文本光标和窗口缩放箭头),并保留正确热点。离开远控画面或打开本地菜单时恢复本机箭头。
|
||||
|
||||
SDL 剪贴板复用桌面窗口,避免 GNOME Wayland 上临时窗口引起的 Dock 跳动(#37)。niri 改用支持 data-control 的
|
||||
`wl-clipboard`,不需要桌面窗口保持焦点;其他 SDL 后端仅在桌面窗口获得焦点时同步。
|
||||
保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。
|
||||
|
||||
@@ -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 clipboard;
|
||||
pub mod cursor;
|
||||
pub mod power;
|
||||
pub mod secure_input;
|
||||
pub mod type_ipc;
|
||||
|
||||
+6
-4
@@ -45,6 +45,7 @@ pub struct Peer {
|
||||
clipboard:super::clipboard::Bridge,
|
||||
pub tools:super::tools::Inbox,
|
||||
pub rumble:super::native_rumble::Feedback,
|
||||
pub cursor:super::cursor::State,
|
||||
pub pc:Arc<RTCPeerConnection>,
|
||||
pub channels:Vec<Arc<RTCDataChannel>>,
|
||||
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 tools:super::tools::Inbox=Arc::new(std::sync::Mutex::new(None));
|
||||
let rumble=super::native_rumble::Feedback::default();
|
||||
let cursor=super::cursor::State::default();
|
||||
let inbox=tools.clone();
|
||||
pc.on_peer_connection_state_change(Box::new(move |state|{
|
||||
use webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState;
|
||||
@@ -205,11 +207,11 @@ impl Peer {
|
||||
if [0,3,4].contains(&index){closed.lock().unwrap().take();}
|
||||
})}));
|
||||
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()};
|
||||
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 {
|
||||
feedback.receive(&message.data);
|
||||
feedback.receive(&message.data);pointer.receive(&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(chroma)=chroma {
|
||||
@@ -257,7 +259,7 @@ impl Peer {
|
||||
Ok::<_,String>((channels,tools,clipboard))
|
||||
}.await;
|
||||
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)},
|
||||
}
|
||||
}
|
||||
|
||||
+11
-2
@@ -1,7 +1,7 @@
|
||||
use super::{desktop::{Frame,FrameSink},input::{Input,Viewport},session::Session};
|
||||
use sdl2::{event::{Event,WindowEvent},mouse::MouseButton,pixels::PixelFormatEnum,rect::Rect};
|
||||
#[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>,
|
||||
pub last_frame:Option<Frame>, chrome:Chrome }
|
||||
/// 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};
|
||||
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,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 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 {
|
||||
let window=self.canvas.window().size();
|
||||
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()=>{
|
||||
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);
|
||||
window.sync_cursor(&session.peer.cursor);
|
||||
if !window.has_picture() {window.loading_frame(false);}
|
||||
if !restored && session.peer.ready(super::rtc::ReadyPolicy::EchoOnly,false) {restored=true;window.restore_remote_settings();}
|
||||
for command in window.take_commands() {
|
||||
|
||||
Vendored
BIN
Binary file not shown.
|
After Width: | Height: | Size: 68 B |
Reference in new issue
Block a user