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

return x11 for tty session

Browse Source
This commit is contained in:
rustdesk 2024-07-03 21:37:25 +08:00
parent 9349210a87
commit 92f570831d
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libs/hbb_common/src/platform/linux.rs
View File

@ -85,40 +85,19 @@ pub fn get_display_server_of_session(session: &str) -> String {
run_loginctl(Some(vec!["show-session", "-p", "Type", session])) run_loginctl(Some(vec!["show-session", "-p", "Type", session]))
// Check session type of the session // Check session type of the session
{ {
let display_server = String::from_utf8_lossy(&output.stdout) String::from_utf8_lossy(&output.stdout)
.replace("Type=", "") .replace("Type=", "")
.trim_end() .trim_end()
.into(); .into();
if display_server == "tty" {
// If the type is tty...
if let Ok(output) = run_loginctl(Some(vec!["show-session", "-p", "TTY", session]))
// Get the tty number
{
let tty: String = String::from_utf8_lossy(&output.stdout)
.replace("TTY=", "")
.trim_end()
.into();
if let Ok(xorg_results) = run_cmds(&format!("ps -e | grep \"{tty}.\\\\+Xorg\""))
// And check if Xorg is running on that tty
{
if xorg_results.trim_end() != "" {
// If it is, manually return "x11", otherwise return tty
return "x11".to_owned();
}
}
}
}
display_server
} else { } else {
"".to_owned() "".to_owned()
}; };
if display_server.is_empty() || display_server == "tty" { if display_server.is_empty() || display_server == "tty" {
// loginctl has not given the expected output. try something else.
if let Ok(sestype) = std::env::var("XDG_SESSION_TYPE") { if let Ok(sestype) = std::env::var("XDG_SESSION_TYPE") {
display_server = sestype; if !sestype.is_empty() {
return sestype.to_lowercase();
} }
} }
if display_server == "" {
display_server = "x11".to_owned(); display_server = "x11".to_owned();
} }
display_server.to_lowercase() display_server.to_lowercase()