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

fix linux restore button and clipboard initial sync issue

Browse Source
This commit is contained in:
rustdesk
2021-05-25 12:01:27 +08:00
parent 7e1c56033b
commit d825d30e53
4 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui/header.tis
View File

@@ -36,7 +36,9 @@ function stateChanged() {
cur_window_state = view.windowState;
adjustBorder();
adaptDisplay();
if (!is_linux) view.focus = handler; // this cause windows always topmost on linux
if (cur_window_state != View.WINDOW_MINIMIZED) {
view.focus = handler; // to make focus away from restore/maximize button, so that enter key work
}
var fs = view.windowState == View.WINDOW_FULL_SCREEN;
var el = $(#fullscreen);
if (el) el.attributes.toggleClass("active", fs);

22
src/ui/remote.rs
View File

@@ -9,6 +9,7 @@ use hbb_common::{
fs, log,
message_proto::*,
protobuf::Message as _,
sleep,
tokio::{
self,
sync::mpsc,
@@ -1145,7 +1146,7 @@ impl Remote {
}
fn start_clipboard(&mut self) -> Option<std::sync::mpsc::Sender<()>> {
if self.handler.is_file_transfer() {
if self.handler.is_file_transfer() || self.handler.is_port_forward() {
return None;
}
let (tx, rx) = std::sync::mpsc::channel();
@@ -1430,6 +1431,23 @@ impl Remote {
}
Some(login_response::Union::peer_info(pi)) => {
self.handler.handle_peer_info(pi);
if !(self.handler.is_file_transfer()
|| self.handler.is_port_forward()
|| !*self.clipboard.read().unwrap()
|| !*self.keyboard.read().unwrap()
|| self.handler.lc.read().unwrap().disable_clipboard)
{
let txt = self.old_clipboard.lock().unwrap().clone();
if !txt.is_empty() {
let msg_out = crate::create_clipboard_msg(txt);
let sender = self.sender.clone();
tokio::spawn(async move {
// due to clipboard service interval time
sleep(common::CLIPBOARD_INTERVAL as f32 / 1_000.).await;
sender.send(Data::Message(msg_out)).ok();
});
}
}
}
_ => {}
},
@@ -1587,7 +1605,7 @@ impl Interface for Handler {
pi_sciter.set_item("sas_enabled", pi.sas_enabled);
if self.is_file_transfer() {
if pi.username.is_empty() {
self.on_error("No active user logged on, please connect and logon first.");
self.on_error("No active console user logged on, please connect and logon first.");
return;
}
} else if !self.is_port_forward() {