github/rustdesk
4
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-10-21 04:15:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

cursor: capture the macOS cursor shown without checking the seed around it

Browse Source 
Every macOS seed change is now captured, pixel by pixel, and a seed
that moved during that capture failed it; the service then logged an
error and slept a second, so the controller's cursor lagged while it
changed. The check guarded nothing: the shape is named by its content,
not the seed, and a change after get_cursor read the seed moves it on,
so the next poll captures it anyway. Resetting the seed on a failed
check was not needed for the same reason.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EZ49AbZJYfm8NTp5yDPMab
This commit is contained in:
rustdesk
2026-09-25 10:11:52 +08:00
co-authored by Claude Opus 5.5
parent eeeb87043c
commit c0351e3178
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platform/macos.rs
+2 -11
View File
@@ -586,13 +586,8 @@ pub fn get_cursor_data(hcursor: u64) -> ResultType<CursorData> {
// https://github.com/stweil/OSXvnc/blob/master/OSXvnc-server/mousecursor.c
fn unsafe_get_cursor_data(hcursor: u64) -> ResultType<CursorData> {
unsafe {
// Captured only while the cursor is the change `hcursor` names. One that changed again is
// left for get_cursor to report again, or the change would be lost.
let changed = || CGSCurrentCursorSeed() as u32 as u64 != hcursor;
if changed() {
LATEST_SEED = 0;
bail!("cursor changed");
}
// The cursor shown is captured even if it changed after get_cursor read the seed: the
// content names the shape, and that change moved the seed on, so the next poll captures it.
let c: id = msg_send![class!(NSCursor), currentSystemCursor];
if c == nil {
bail!("Failed to call [NSCursor currentSystemCursor]");
@@ -636,10 +631,6 @@ fn unsafe_get_cursor_data(hcursor: u64) -> ResultType<CursorData> {
colors.push((a * 255.) as _);
}
}
if changed() {
LATEST_SEED = 0;
bail!("cursor changed");
}
Ok(CursorData {
id: hcursor,
colors: colors.into(),
src/platform/mod.rs
+4 -7
View File
@@ -228,16 +228,13 @@ mod tests {
#[cfg(target_os = "macos")]
macos::is_process_trusted(false);
}
// macOS reports a change of cursor, and a capture that finds the cursor changed again
// leaves the change to be reported once more, not lost.
// A macOS capture takes the cursor shown, whatever seed it is asked for.
#[cfg(target_os = "macos")]
{
macos::reset_input_cache();
let change = get_cursor().unwrap().expect("a change after a reset");
assert_eq!(get_cursor().unwrap(), None, "nothing changed since");
assert!(get_cursor_data(change).is_ok());
assert!(get_cursor_data(change.wrapping_add(1)).is_err());
assert!(get_cursor().unwrap().is_some(), "the change is reported again");
if let Some(change) = get_cursor().unwrap() {
assert!(get_cursor_data(change.wrapping_add(1)).is_ok());
}
}
}
#[test]