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

fix mouse cannot be controled, when show remote cursor is on

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2022-11-11 14:28:35 +08:00
parent 03e7b48d6f
commit 3d768098f8
1 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/server/input_service.rs
View File

@ -13,6 +13,8 @@ use std::{
time::Instant, time::Instant,
}; };
const INVALID_CURSOR_POS: i32 = i32::MIN;
#[derive(Default)] #[derive(Default)]
struct StateCursor { struct StateCursor {
hcursor: u64, hcursor: u64,
@ -28,14 +30,27 @@ impl super::service::Reset for StateCursor {
} }
} }
#[derive(Default)]
struct StatePos { struct StatePos {
cursor_pos: (i32, i32), cursor_pos: (i32, i32),
} }
impl Default for StatePos {
fn default() -> Self {
Self {
cursor_pos: (INVALID_CURSOR_POS, INVALID_CURSOR_POS),
}
}
}
impl super::service::Reset for StatePos { impl super::service::Reset for StatePos {
fn reset(&mut self) { fn reset(&mut self) {
self.cursor_pos = (0, 0); self.cursor_pos = (INVALID_CURSOR_POS, INVALID_CURSOR_POS);
}
}
impl StatePos {
fn is_valid(&self) -> bool {
self.cursor_pos.0 != INVALID_CURSOR_POS && self.cursor_pos.1 != INVALID_CURSOR_POS
} }
} }
@ -114,25 +129,27 @@ fn update_last_cursor_pos(x: i32, y: i32) {
fn run_pos(sp: GenericService, state: &mut StatePos) -> ResultType<()> { fn run_pos(sp: GenericService, state: &mut StatePos) -> ResultType<()> {
if let Some((x, y)) = crate::get_cursor_pos() { if let Some((x, y)) = crate::get_cursor_pos() {
update_last_cursor_pos(x, y); update_last_cursor_pos(x, y);
if state.cursor_pos.0 != x || state.cursor_pos.1 != y { if state.is_valid() {
state.cursor_pos = (x, y); if state.cursor_pos.0 != x || state.cursor_pos.1 != y {
let mut msg_out = Message::new(); let mut msg_out = Message::new();
msg_out.set_cursor_position(CursorPosition { msg_out.set_cursor_position(CursorPosition {
x, x,
y, y,
..Default::default() ..Default::default()
}); });
let exclude = { let exclude = {
let now = get_time(); let now = get_time();
let lock = LATEST_INPUT_CURSOR.lock().unwrap(); let lock = LATEST_INPUT_CURSOR.lock().unwrap();
if now - lock.time < 300 { if now - lock.time < 300 {
lock.conn lock.conn
} else { } else {
0 0
} }
}; };
sp.send_without(msg_out, exclude); sp.send_without(msg_out, exclude);
}
} }
state.cursor_pos = (x, y);
} }
sp.snapshot(|sps| { sp.snapshot(|sps| {