weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: fix enigo crash & mid commit

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2022-10-13 06:34:50 -07:00
parent 3c9ac9e4d7
commit 5ddb10366e
7 changed files with 65 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/server/wayland.rs
View File

@@ -12,13 +12,22 @@ pub const SCRAP_X11_REF_URL: &str = "https://rustdesk.com/docs/en/manual/linux/#
lazy_static::lazy_static! {
static ref CAP_DISPLAY_INFO: RwLock<u64> = RwLock::new(0);
static ref LOG_SCRAP_COUNT: Mutex<u32> = Mutex::new(0);
static ref GLOBAL_INIT_REG_HELPER: u8 = {
set_map_err(map_err_scrap);
0u8
};
}
pub fn map_err_scrap(err: String) -> io::Error {
pub fn set_wayland_scrap_map_err() {
set_map_err(map_err_scrap);
}
fn map_err_scrap(err: String) -> io::Error {
// REMOVE ME ===================================== uncomment to handle error
// // to-do: Handle error better, do not restart server
// if err.starts_with("Did not receive a reply") {
// log::error!("Fatal pipewire error, {}", &err);
// std::process::exit(-1);
// }
log::error!("REMOVE ME ===================================== wayland scrap error {}", &err);
if DISTRO.name.to_uppercase() == "Ubuntu".to_uppercase() {
if DISTRO.version_id < "21".to_owned() {
io::Error::new(io::ErrorKind::Other, SCRAP_UBUNTU_HIGHER_REQUIRED)
@@ -79,6 +88,11 @@ struct CapDisplayInfo {
capturer: CapturerPtr,
}
#[tokio::main(flavor = "current_thread")]
pub(super) async fn ensure_inited() -> ResultType<()> {
check_init().await
}
async fn check_init() -> ResultType<()> {
if !scrap::is_x11() {
let mut minx = 0;
@@ -205,6 +219,21 @@ pub(super) fn get_display_num() -> ResultType<usize> {
}
}
pub(super) fn release_resouce() {
if scrap::is_x11() {
return;
}
let mut write_lock = CAP_DISPLAY_INFO.write().unwrap();
if *write_lock != 0 {
let cap_display_info: *mut CapDisplayInfo = *write_lock as _;
unsafe {
let box_capturer = Box::from_raw((*cap_display_info).capturer.0);
let box_cap_display_info = Box::from_raw(cap_display_info);
*write_lock = 0;
}
}
}
pub(super) fn get_capturer() -> ResultType<super::video_service::CapturerInfo> {
if scrap::is_x11() {
bail!("Do not call this function if not wayland");