TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-02 02:11:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	Cargo.lock
#	src/server/connection.rs
This commit is contained in:
mcfans
2023-11-07 12:13:15 +08:00
parent e474b595ad 05a254c682
commit b522de3b56
166 changed files with 10361 additions and 6739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/flutter_ffi.rs
View File

@@ -430,13 +430,7 @@ pub fn session_ctrl_alt_del(session_id: SessionID) {
}
pub fn session_switch_display(session_id: SessionID, value: Vec<i32>) {
if let Some(session) = sessions::get_session_by_session_id(&session_id) {
if value.len() == 1 {
session.switch_display(value[0]);
} else {
session.capture_displays(vec![], vec![], value);
}
}
sessions::session_switch_display(session_id, value);
}
pub fn session_handle_flutter_key_event(
@@ -1095,7 +1089,7 @@ pub fn main_get_user_default_option(key: String) -> SyncReturn<String> {
}
pub fn main_handle_relay_id(id: String) -> String {
handle_relay_id(id)
handle_relay_id(&id).to_owned()
}
pub fn main_get_main_display() -> SyncReturn<String> {
@@ -1726,6 +1720,17 @@ pub fn main_use_texture_render() -> SyncReturn<bool> {
}
}
pub fn main_has_file_clipboard() -> SyncReturn<bool> {
let ret = cfg!(any(
target_os = "windows",
all(
feature = "unix-file-copy-paste",
any(target_os = "linux", target_os = "macos")
)
));
SyncReturn(ret)
}
pub fn cm_init() {
#[cfg(not(any(target_os = "android", target_os = "ios")))]
crate::flutter::connection_manager::cm_init();