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

set cursor mode according to availible modes

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-01-28 20:32:46 +08:00
parent dc1fcac845
commit 7e0c9e17df
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/scrap/src/wayland/pipewire.rs
View File

@ -473,7 +473,17 @@ fn request_screen_cast(
args.insert("multiple".into(), Variant(Box::new(true))); args.insert("multiple".into(), Variant(Box::new(true)));
args.insert("types".into(), Variant(Box::new(1u32))); //| 2u32))); args.insert("types".into(), Variant(Box::new(1u32))); //| 2u32)));
let cursor_mode = if capture_cursor { 2u32 } else { 1u32 }; let mut cursor_mode = 0u32;
let mut available_cursor_modes = 0u32;
if let Ok(modes) = portal.available_cursor_modes() {
available_cursor_modes = modes;
}
if capture_cursor {
cursor_mode = 2u32 & available_cursor_modes;
}
if cursor_mode == 0 {
cursor_mode = 1u32 & available_cursor_modes;
}
let plasma = std::env::var("DESKTOP_SESSION").map_or(false, |s| s.contains("plasma")); let plasma = std::env::var("DESKTOP_SESSION").map_or(false, |s| s.contains("plasma"));
if plasma && capture_cursor { if plasma && capture_cursor {
// Warn the user if capturing the cursor is tried on kde as this can crash // Warn the user if capturing the cursor is tried on kde as this can crash
@ -483,7 +493,9 @@ fn request_screen_cast(
desktop, see https://bugs.kde.org/show_bug.cgi?id=435042 for details! \ desktop, see https://bugs.kde.org/show_bug.cgi?id=435042 for details! \
You have been warned."); You have been warned.");
} }
args.insert("cursor_mode".into(), Variant(Box::new(cursor_mode))); if cursor_mode > 0 {
args.insert("cursor_mode".into(), Variant(Box::new(cursor_mode)));
}
let session: dbus::Path = r let session: dbus::Path = r
.results .results
.get("session_handle") .get("session_handle")