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

Merge pull request #4632 from fufesou/fix/keyboard_input_when_more_than_one_connection

Browse Source 
keyboard may not work, if jump between two connections
This commit is contained in:
RustDesk 2023-06-13 11:08:01 +08:00 committed by GitHub
commit fb02f09c4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/client.rs
View File

@ -53,11 +53,7 @@ use scrap::{
ImageFormat, ImageRgb,
};
use crate::common::{
self,
input::{MOUSE_TYPE_TRACKPAD, MOUSE_TYPE_WHEEL},
is_keyboard_mode_supported,
};
use crate::common::{self, is_keyboard_mode_supported};
#[cfg(not(any(target_os = "android", target_os = "ios")))]
use crate::common::{check_clipboard, ClipboardContext, CLIPBOARD_INTERVAL};
@ -1912,10 +1908,10 @@ pub async fn handle_test_delay(t: TestDelay, peer: &mut Stream) {
#[cfg(all(target_os = "macos"))]
fn check_scroll_on_mac(mask: i32, x: i32, y: i32) -> bool {
// flutter version we set mask type bit to 4 when track pad scrolling.
if mask & 7 == MOUSE_TYPE_TRACKPAD {
if mask & 7 == crate::common::input::MOUSE_TYPE_TRACKPAD {
return true;
}
if mask & 3 != MOUSE_TYPE_WHEEL {
if mask & 3 != crate::common::input::MOUSE_TYPE_WHEEL {
return false;
}
let btn = mask >> 3;
@ -1979,7 +1975,7 @@ pub fn send_mouse(
#[cfg(all(target_os = "macos", not(feature = "flutter")))]
if check_scroll_on_mac(mask, x, y) {
let factor = 3;
mouse_event.mask = MOUSE_TYPE_TRACKPAD;
mouse_event.mask = crate::common::input::MOUSE_TYPE_TRACKPAD;
mouse_event.x *= factor;
mouse_event.y *= factor;
}

9
src/flutter_ffi.rs
View File

@ -348,7 +348,13 @@ pub fn session_handle_flutter_key_event(
}
}
pub fn session_enter_or_leave(_session_id: SessionID, _enter: bool) {
// SyncReturn<()> is used to make sure enter() and leave() are executed in the sequence this function is called.
//
// If the cursor jumps between remote page of two connections, leave view and enter view will be called.
// session_enter_or_leave() will be called then.
// As rust is multi-thread, it is possible that enter() is called before leave().
// This will cause the keyboard input to take no effect.
pub fn session_enter_or_leave(_session_id: SessionID, _enter: bool) -> SyncReturn<()> {
#[cfg(not(any(target_os = "android", target_os = "ios")))]
if let Some(session) = SESSIONS.read().unwrap().get(&_session_id) {
if _enter {
@ -357,6 +363,7 @@ pub fn session_enter_or_leave(_session_id: SessionID, _enter: bool) {
session.leave();
}
}
SyncReturn(())
}
pub fn session_input_key(