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

fix wayland cursor mismatch

Browse Source 
Signed-off-by: Sahil Yeole <sahilyeole93@gmail.com>
This commit is contained in:
Sahil Yeole 2023-09-20 19:55:13 +05:30
parent 38f8956bd0
commit bf5f58e0ce
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/server/wayland.rs
View File

@ -2,6 +2,7 @@ use super::*;
use hbb_common::{allow_err, platform::linux::DISTRO}; use hbb_common::{allow_err, platform::linux::DISTRO};
use scrap::{is_cursor_embedded, set_map_err, Capturer, Display, Frame, TraitCapturer}; use scrap::{is_cursor_embedded, set_map_err, Capturer, Display, Frame, TraitCapturer};
use std::io; use std::io;
use std::process::{Command, Output};
use crate::client::{ use crate::client::{
SCRAP_OTHER_VERSION_OR_X11_REQUIRED, SCRAP_UBUNTU_HIGHER_REQUIRED, SCRAP_X11_REQUIRED, SCRAP_OTHER_VERSION_OR_X11_REQUIRED, SCRAP_UBUNTU_HIGHER_REQUIRED, SCRAP_X11_REQUIRED,
@ -115,6 +116,22 @@ pub(super) fn is_inited() -> Option<Message> {
} }
} }
fn get_max_desktop_resolution() -> Option<String> {
// works with Xwayland
let output: Output = Command::new("sh")
.arg("-c")
.arg("xrandr | awk '/current/ { print $8,$9,$10 }'")
.output()
.ok()?;
if output.status.success() {
let result = String::from_utf8_lossy(&output.stdout);
Some(result.trim().to_string())
} else {
None
}
}
pub(super) async fn check_init() -> ResultType<()> { pub(super) async fn check_init() -> ResultType<()> {
if !scrap::is_x11() { if !scrap::is_x11() {
let mut minx = 0; let mut minx = 0;
@ -151,10 +168,20 @@ pub(super) async fn check_init() -> ResultType<()> {
num_cpus::get(), num_cpus::get(),
); );
minx = origin.0; let (max_width, max_height) = match get_max_desktop_resolution() {
maxx = origin.0 + width as i32; Some(result) if !result.is_empty() => {
miny = origin.1; let resolution: Vec<&str> = result.split(" ").collect();
maxy = origin.1 + height as i32; let w: i32 = resolution[0].parse().unwrap_or(origin.0 + width as i32);
let h: i32 = resolution[2].trim_end_matches(",").parse().unwrap_or(origin.1 + height as i32);
(w, h)
}
_ => (origin.0 + width as i32, origin.1 + height as i32)
};
minx = 0;
maxx = max_width;
miny = 0;
maxy = max_height;
let capturer = Box::into_raw(Box::new( let capturer = Box::into_raw(Box::new(
Capturer::new(display, true).with_context(|| "Failed to create capturer")?, Capturer::new(display, true).with_context(|| "Failed to create capturer")?,