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

debug, macos trackpad, flutter

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-06-11 15:56:09 +08:00
parent f72ed0d3e5
commit 6e21f8410a
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/client.rs
View File

@@ -53,7 +53,11 @@ use scrap::{
ImageFormat, ImageRgb,
};
use crate::common::{self, is_keyboard_mode_supported};
use crate::common::{
self,
input::{MOUSE_TYPE_TRACKPAD, MOUSE_TYPE_WHEEL},
is_keyboard_mode_supported,
};
#[cfg(not(any(target_os = "android", target_os = "ios")))]
use crate::common::{check_clipboard, ClipboardContext, CLIPBOARD_INTERVAL};
@@ -1908,10 +1912,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 == 4 {
if mask & 7 == MOUSE_TYPE_TRACKPAD {
return true;
}
if mask & 3 != 3 {
if mask & 3 != MOUSE_TYPE_WHEEL {
return false;
}
let btn = mask >> 3;
@@ -1972,9 +1976,12 @@ pub fn send_mouse(
if command {
mouse_event.modifiers.push(ControlKey::Meta.into());
}
#[cfg(all(target_os = "macos"))]
#[cfg(all(target_os = "macos", not(feature = "flutter")))]
if check_scroll_on_mac(mask, x, y) {
mouse_event.modifiers.push(ControlKey::Scroll.into());
let factor = 3;
mouse_event.mask = MOUSE_TYPE_TRACKPAD;
mouse_event.x *= factor;
mouse_event.y *= factor;
}
interface.swap_modifier_mouse(&mut mouse_event);
msg_out.set_mouse_event(mouse_event);