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

refact linux desktop env

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-03-29 12:08:24 +08:00
parent e4c2e9af00
commit 6149c7f477
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/platform/linux.rs
View File

@ -769,6 +769,7 @@ mod desktop {
pub protocal: String,
pub display: String,
pub xauth: String,
pub is_rustdesk_subprocess: bool,
}
impl Desktop {
@ -787,6 +788,11 @@ mod desktop {
self.sid.is_empty()
}
#[inline]
pub fn is_headless(&self) -> bool {
self.sid.is_empty() || self.is_rustdesk_subprocess
}
fn get_display(&mut self) {
self.display = get_env_tries("DISPLAY", &self.uid, GNOME_SESSION_BINARY, 10);
if self.display.is_empty() {
@ -901,6 +907,16 @@ mod desktop {
last
}
fn set_is_subprocess(&mut self) {
self.is_rustdesk_subprocess = false;
let cmd = "ps -ef | grep 'rustdesk/xorg.conf' | grep -v grep | wc -l";
if let Ok(res) = run_cmds(cmd) {
if res.trim() != "0" {
self.is_rustdesk_subprocess = true;
}
}
}
pub fn refresh(&mut self) {
if !self.sid.is_empty() && is_active(&self.sid) {
return;
@ -909,6 +925,7 @@ mod desktop {
let seat0_values = get_values_of_seat0(&[0, 1, 2]);
if seat0_values[0].is_empty() {
*self = Self::default();
self.is_rustdesk_subprocess = false;
return;
}
@ -924,6 +941,9 @@ mod desktop {
self.get_display();
self.get_xauth();
self.set_is_subprocess();
println!("REMOVE ME ======================================= desktop: {:?}", self);
}
}
}