TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-09-17 18:01:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Keep density-aware cursor IDs compatible with legacy Web clients

Browse Source
This commit is contained in:
fufesou
2026-09-12 22:56:13 +08:00
parent 1fabdd6a9c
commit 6e2d838bf1
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/platform/linux/cursor.rs
View File

@@ -17,12 +17,14 @@ thread_local! {
} }
pub(super) fn cache_id(id: u64, scale: f64) -> u64 { pub(super) fn cache_id(id: u64, scale: f64) -> u64 {
// Legacy Web decoders require JS-safe integers; zero is the service's initial ID.
const MAX_CURSOR_ID: u64 = (1 << 53) - 1;
if scale == 0.0 { if scale == 0.0 {
return id; return id;
} }
let mut hash = DefaultHasher::new(); let mut hash = DefaultHasher::new();
(id, scale.to_bits()).hash(&mut hash); (id, scale.to_bits()).hash(&mut hash);
hash.finish() hash.finish() % MAX_CURSOR_ID + 1
} }
pub(super) fn x11_cursor_id(id: u64) -> u64 { pub(super) fn x11_cursor_id(id: u64) -> u64 {
@@ -129,10 +131,21 @@ fn wayland_scale(display: &base::platform::linux::WaylandDisplayInfo) -> ResultT
Ok(f64::from(width) / f64::from(logical_width)) Ok(f64::from(width) / f64::from(logical_width))
} }
#[cfg(all(test, feature = "drm"))] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
#[test]
fn cursor_cache_ids_fit_legacy_web_numbers() {
for cursor in [1, 123, u64::MAX] {
assert_eq!(cache_id(cursor, 0.0), cursor);
for scale in [1.0, 1.25, 2.0] {
assert!((1..=9_007_199_254_740_991).contains(&cache_id(cursor, scale)));
}
}
}
#[cfg(feature = "drm")]
#[test] #[test]
fn cursor_density_tracks_fractional_rotation_and_cache_identity() { fn cursor_density_tracks_fractional_rotation_and_cache_identity() {
let display = base::platform::linux::WaylandDisplayInfo { let display = base::platform::linux::WaylandDisplayInfo {

13
src/platform/macos/cursor.rs
View File

@@ -40,9 +40,11 @@ pub(super) fn scale() -> ResultType<f64> {
} }
pub(super) fn cache_id(cursor: u64, scale: f64) -> u64 { pub(super) fn cache_id(cursor: u64, scale: f64) -> u64 {
// Legacy Web decoders require JS-safe integers; zero is the service's initial ID.
const MAX_CURSOR_ID: u64 = (1 << 53) - 1;
let mut hash = DefaultHasher::new(); let mut hash = DefaultHasher::new();
(cursor, scale.to_bits()).hash(&mut hash); (cursor, scale.to_bits()).hash(&mut hash);
hash.finish() hash.finish() % MAX_CURSOR_ID + 1
} }
unsafe fn bitmap(size: NSSize) -> ResultType<StrongPtr> { unsafe fn bitmap(size: NSSize) -> ResultType<StrongPtr> {
@@ -239,4 +241,13 @@ mod tests {
fn cursor_cache_changes_with_display_scale() { fn cursor_cache_changes_with_display_scale() {
assert_ne!(cache_id(123, 1.0), cache_id(123, 2.0)); assert_ne!(cache_id(123, 1.0), cache_id(123, 2.0));
} }
#[test]
fn cursor_cache_ids_fit_legacy_web_numbers() {
for cursor in [1, 123, u64::MAX] {
for scale in [1.0, 1.25, 2.0] {
assert!((1..=9_007_199_254_740_991).contains(&cache_id(cursor, scale)));
}
}
}
} }