weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com-rustdesk:rustdesk/rustdesk

Browse Source
This commit is contained in:
rustdesk
2022-11-29 22:02:12 +08:00
parent 420dd9c9db b06063f124
commit 60dcd96874
18 changed files with 159 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/io_loop.rs
View File

@@ -976,7 +976,7 @@ impl<T: InvokeUiSession> Remote<T> {
self.handler.ui_handler.switch_display(&s);
self.video_sender.send(MediaData::Reset).ok();
if s.width > 0 && s.height > 0 {
self.handler.set_display(s.x, s.y, s.width, s.height);
self.handler.set_display(s.x, s.y, s.width, s.height, s.cursor_embeded);
}
}
Some(misc::Union::CloseReason(c)) => {

4
src/flutter.rs
View File

@@ -155,7 +155,7 @@ impl InvokeUiSession for FlutterHandler {
}
/// unused in flutter, use switch_display or set_peer_info
fn set_display(&self, _x: i32, _y: i32, _w: i32, _h: i32) {}
fn set_display(&self, _x: i32, _y: i32, _w: i32, _h: i32, _cursor_embeded: bool) {}
fn update_privacy_mode(&self) {
self.push_event("update_privacy_mode", [].into());
@@ -295,6 +295,7 @@ impl InvokeUiSession for FlutterHandler {
h.insert("y", d.y);
h.insert("width", d.width);
h.insert("height", d.height);
h.insert("cursor_embeded", if d.cursor_embeded { 1 } else { 0 });
displays.push(h);
}
let displays = serde_json::ser::to_string(&displays).unwrap_or("".to_owned());
@@ -343,6 +344,7 @@ impl InvokeUiSession for FlutterHandler {
("y", &display.y.to_string()),
("width", &display.width.to_string()),
("height", &display.height.to_string()),
("cursor_embeded", &{if display.cursor_embeded {1} else {0}}.to_string()),
],
);
}

6
src/server.rs
View File

@@ -85,8 +85,10 @@ pub fn new() -> ServerPtr {
#[cfg(not(any(target_os = "android", target_os = "ios")))]
{
server.add_service(Box::new(clipboard_service::new()));
server.add_service(Box::new(input_service::new_cursor()));
server.add_service(Box::new(input_service::new_pos()));
if !video_service::capture_cursor_embeded() {
server.add_service(Box::new(input_service::new_cursor()));
server.add_service(Box::new(input_service::new_pos()));
}
}
Arc::new(RwLock::new(server))
}

6
src/server/video_service.rs
View File

@@ -74,6 +74,10 @@ fn is_capturer_mag_supported() -> bool {
false
}
pub fn capture_cursor_embeded() -> bool {
scrap::is_cursor_embeded()
}
pub fn notify_video_frame_feched(conn_id: i32, frame_tm: Option<Instant>) {
FRAME_FETCHED_NOTIFIER.0.send((conn_id, frame_tm)).unwrap()
}
@@ -455,6 +459,7 @@ fn run(sp: GenericService) -> ResultType<()> {
y: c.origin.1 as _,
width: c.width as _,
height: c.height as _,
cursor_embeded: capture_cursor_embeded(),
..Default::default()
});
let mut msg_out = Message::new();
@@ -783,6 +788,7 @@ pub(super) fn get_displays_2(all: &Vec<Display>) -> (usize, Vec<DisplayInfo>) {
height: d.height() as _,
name: d.name(),
online: d.is_online(),
cursor_embeded: false,
..Default::default()
});
}

5
src/server/wayland.rs
View File

@@ -127,7 +127,10 @@ pub(super) async fn check_init() -> ResultType<()> {
if *lock == 0 {
let all = Display::all()?;
let num = all.len();
let (primary, displays) = super::video_service::get_displays_2(&all);
let (primary, mut displays) = super::video_service::get_displays_2(&all);
for display in displays.iter_mut() {
display.cursor_embeded = true;
}
let mut rects: Vec<((i32, i32), usize, usize)> = Vec::new();
for d in &all {

9
src/ui/header.tis
View File

@@ -164,6 +164,13 @@ class Header: Reactor.Component {
var codecs = handler.supported_hwcodec();
var show_codec = handler.has_hwcodec() && (codecs[0] || codecs[1]);
var cursor_embeded = false;
if ((pi.displays || []).length > 0) {
if (pi.displays.length > pi.current_display) {
cursor_embeded = pi.displays[pi.current_display].cursor_embeded;
}
}
return <popup>
<menu.context #display-options>
<li #adjust-window style="display:none">{translate('Adjust Window')}</li>
@@ -184,7 +191,7 @@ class Header: Reactor.Component {
{codecs[1] ? <li #h265 type="codec-preference"><span>{svg_checkmark}</span>H265</li> : ""}
</div> : ""}
<div .separator />
<li #show-remote-cursor .toggle-option><span>{svg_checkmark}</span>{translate('Show remote cursor')}</li>
{!cursor_embeded && <li #show-remote-cursor .toggle-option><span>{svg_checkmark}</span>{translate('Show remote cursor')}</li>}
<li #show-quality-monitor .toggle-option><span>{svg_checkmark}</span>{translate('Show quality monitor')}</li>
{audio_enabled ? <li #disable-audio .toggle-option><span>{svg_checkmark}</span>{translate('Mute')}</li> : ""}
{is_win && pi.platform == 'Windows' && file_enabled ? <li #enable-file-transfer .toggle-option><span>{svg_checkmark}</span>{translate('Allow file copy and paste')}</li> : ""}

5
src/ui/remote.rs
View File

@@ -79,8 +79,8 @@ impl InvokeUiSession for SciterHandler {
}
}
fn set_display(&self, x: i32, y: i32, w: i32, h: i32) {
self.call("setDisplay", &make_args!(x, y, w, h));
fn set_display(&self, x: i32, y: i32, w: i32, h: i32, cursor_embeded: bool) {
self.call("setDisplay", &make_args!(x, y, w, h, cursor_embeded));
// https://sciter.com/forums/topic/color_spaceiyuv-crash
// Nothing spectacular in decoder – done on CPU side.
// So if you can do BGRA translation on your side – the better.
@@ -223,6 +223,7 @@ impl InvokeUiSession for SciterHandler {
display.set_item("y", d.y);
display.set_item("width", d.width);
display.set_item("height", d.height);
display.set_item("cursor_embeded", d.cursor_embeded);
displays.push(display);
}
pi_sciter.set_item("displays", displays);

11
src/ui/remote.tis
View File

@@ -6,6 +6,7 @@ var display_width = 0;
var display_height = 0;
var display_origin_x = 0;
var display_origin_y = 0;
var display_cursor_embeded = false;
var display_scale = 1;
var keyboard_enabled = true; // server side
var clipboard_enabled = true; // server side
@@ -15,11 +16,12 @@ var restart_enabled = true; // server side
var recording_enabled = true; // server side
var scroll_body = $(body);
handler.setDisplay = function(x, y, w, h) {
handler.setDisplay = function(x, y, w, h, cursor_embeded) {
display_width = w;
display_height = h;
display_origin_x = x;
display_origin_y = y;
display_cursor_embeded = cursor_embeded;
adaptDisplay();
if (recording) handler.record_screen(true, w, h);
}
@@ -195,6 +197,9 @@ function handler.onMouse(evt)
dragging = false;
break;
case Event.MOUSE_MOVE:
if (display_cursor_embeded) {
break;
}
if (cursor_img.style#display != "none" && keyboard_enabled) {
cursor_img.style#display = "none";
}
@@ -360,6 +365,10 @@ function updateCursor(system=false) {
}
function refreshCursor() {
if (display_cursor_embeded) {
cursor_img.style#display = "none";
return;
}
if (cur_id != -1) {
handler.setCursorId(cur_id);
}

4
src/ui_session_interface.rs
View File

@@ -1098,7 +1098,7 @@ pub trait InvokeUiSession: Send + Sync + Clone + 'static + Sized + Default {
fn set_cursor_data(&self, cd: CursorData);
fn set_cursor_id(&self, id: String);
fn set_cursor_position(&self, cp: CursorPosition);
fn set_display(&self, x: i32, y: i32, w: i32, h: i32);
fn set_display(&self, x: i32, y: i32, w: i32, h: i32, cursor_embeded: bool);
fn switch_display(&self, display: &SwitchDisplay);
fn set_peer_info(&self, peer_info: &PeerInfo); // flutter
fn update_privacy_mode(&self);
@@ -1211,7 +1211,7 @@ impl<T: InvokeUiSession> Interface for Session<T> {
input_os_password(p, true, self.clone());
}
let current = &pi.displays[pi.current_display as usize];
self.set_display(current.x, current.y, current.width, current.height);
self.set_display(current.x, current.y, current.width, current.height, current.cursor_embeded);
}
self.update_privacy_mode();
// Save recent peers, then push event to flutter. So flutter can refresh peer page.