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

trivial code refactor

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

44
src/server/input_service.rs
View File

@ -49,8 +49,14 @@ impl super::service::Reset for StatePos {
} }
impl StatePos { impl StatePos {
#[inline]
fn is_valid(&self) -> bool { fn is_valid(&self) -> bool {
self.cursor_pos.0 != INVALID_CURSOR_POS && self.cursor_pos.1 != INVALID_CURSOR_POS self.cursor_pos.0 != INVALID_CURSOR_POS
}
#[inline]
fn is_moved(&self, x: i32, y: i32) -> bool {
self.is_valid() && (self.cursor_pos.0 != x || self.cursor_pos.1 != y)
} }
} }
@ -129,25 +135,23 @@ 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.is_valid() { if state.is_moved(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); state.cursor_pos = (x, y);
} }