hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: clipboard, cmd ipc (#9270)

Browse Source 
1. Send raw contents if `content_len` > 1024*3.
2. Send raw contents if it is not empty.
3. Try read clipboard again if no data from cm.

Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou 2024-09-05 23:39:07 +08:00 committed by GitHub
parent 4150036589
commit 26ebd0deb9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/server/clipboard_service.rs
View File

@ -95,25 +95,30 @@ impl Handler {
log::error!("Failed to read clipboard from cm: {}", e);
}
Ok(data) => {
let mut msg = Message::new();
let multi_clipboards = MultiClipboards {
clipboards: data
.into_iter()
.map(|c| Clipboard {
compress: c.compress,
content: c.content,
width: c.width,
height: c.height,
format: ClipboardFormat::from_i32(c.format)
.unwrap_or(ClipboardFormat::Text)
.into(),
..Default::default()
})
.collect(),
..Default::default()
};
msg.set_multi_clipboards(multi_clipboards);
return Some(msg);
// Skip sending empty clipboard data.
// Maybe there's something wrong reading the clipboard data in cm, but no error msg is returned.
// The clipboard data should not be empty, the last line will try again to get the clipboard data.
if !data.is_empty() {
let mut msg = Message::new();
let multi_clipboards = MultiClipboards {
clipboards: data
.into_iter()
.map(|c| Clipboard {
compress: c.compress,
content: c.content,
width: c.width,
height: c.height,
format: ClipboardFormat::from_i32(c.format)
.unwrap_or(ClipboardFormat::Text)
.into(),
..Default::default()
})
.collect(),
..Default::default()
};
msg.set_multi_clipboards(multi_clipboards);
return Some(msg);
}
}
}
}

8
src/ui_cm_interface.rs
View File

@ -498,10 +498,10 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
let (content, next_raw) = {
// TODO: find out a better threshold
if content_len > 1024 * 3 {
(c.content, false)
} else {
raw_contents.extend(c.content);
(bytes::Bytes::new(), true)
} else {
(c.content, false)
}
};
main_data.push(ClipboardNonFile {
@ -515,7 +515,9 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
});
}
allow_err!(self.stream.send(&Data::ClipboardNonFile(Some(("".to_owned(), main_data)))).await);
allow_err!(self.stream.send_raw(raw_contents.into()).await);
if !raw_contents.is_empty() {
allow_err!(self.stream.send_raw(raw_contents.into()).await);
}
}
Err(e) => {
allow_err!(self.stream.send(&Data::ClipboardNonFile(Some((format!("{}", e), vec![])))).await);