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

Merge pull request #5016 from fufesou/fix/wayland_change_resolutions

Browse Source 
fix, wayland, change resolutions
This commit is contained in:
RustDesk
2023-07-16 11:52:00 +08:00
committed by GitHub
parent b60c4bd952 77231f6538
commit bf33b28483
4 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/video_service.rs
View File

@@ -503,7 +503,7 @@ fn run(sp: GenericService) -> ResultType<()> {
#[cfg(not(any(target_os = "android", target_os = "ios")))]
let _wake_lock = get_wake_lock();
// ensure_inited() is needed because release_resource() may be called.
// ensure_inited() is needed because clear() may be called.
#[cfg(target_os = "linux")]
super::wayland::ensure_inited()?;
#[cfg(windows)]
@@ -623,6 +623,8 @@ fn run(sp: GenericService) -> ResultType<()> {
bail!("SWITCH");
}
if c.current != *CURRENT_DISPLAY.lock().unwrap() {
#[cfg(target_os = "linux")]
super::wayland::clear();
*SWITCH.lock().unwrap() = true;
bail!("SWITCH");
}
@@ -657,6 +659,8 @@ fn run(sp: GenericService) -> ResultType<()> {
if let Some(msg_out) = check_get_displays_changed_msg() {
sp.send(msg_out);
log::info!("Displays changed");
#[cfg(target_os = "linux")]
super::wayland::clear();
*SWITCH.lock().unwrap() = true;
bail!("SWITCH");
}
@@ -725,7 +729,7 @@ fn run(sp: GenericService) -> ResultType<()> {
// Do not reset the capturer for now, as it will cause the prompt to show every few minutes.
// https://github.com/rustdesk/rustdesk/issues/4276
//
// super::wayland::release_resource();
// super::wayland::clear();
// bail!("Wayland capturer none 100 times, try restart capture");
}
}
@@ -734,6 +738,8 @@ fn run(sp: GenericService) -> ResultType<()> {
Err(err) => {
if check_display_changed(c.ndisplay, c.current, c.width, c.height) {
log::info!("Displays changed");
#[cfg(target_os = "linux")]
super::wayland::clear();
*SWITCH.lock().unwrap() = true;
bail!("SWITCH");
}
@@ -778,9 +784,7 @@ fn run(sp: GenericService) -> ResultType<()> {
}
#[cfg(target_os = "linux")]
if !scrap::is_x11() {
super::wayland::release_resource();
}
super::wayland::clear();
Ok(())
}

18
src/server/wayland.rs
View File

@@ -186,21 +186,6 @@ pub(super) async fn check_init() -> ResultType<()> {
Ok(())
}
pub fn clear() {
if scrap::is_x11() {
return;
}
let mut lock = CAP_DISPLAY_INFO.write().unwrap();
if *lock != 0 {
unsafe {
let cap_display_info = Box::from_raw(*lock as *mut CapDisplayInfo);
let _ = Box::from_raw(cap_display_info.capturer.0);
}
*lock = 0;
}
}
pub(super) async fn get_displays() -> ResultType<(usize, Vec<DisplayInfo>)> {
check_init().await?;
let addr = *CAP_DISPLAY_INFO.read().unwrap();
@@ -230,8 +215,7 @@ pub(super) fn get_primary() -> ResultType<usize> {
}
}
#[allow(dead_code)]
pub(super) fn release_resource() {
pub fn clear() {
if scrap::is_x11() {
return;
}