zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't try to connect to X11/Wayland when headless (#15028)

Browse Source 
Release Notes:

- remote development: Stopped logging every 16ms when connected to a
remote server with a badly configured X server.
This commit is contained in:
Conrad Irwin 2024-07-23 14:11:47 -06:00 committed by GitHub
parent 5021397c01
commit 41a3e78b1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/gpui/src/platform.rs
View File

@ -87,6 +87,9 @@ pub(crate) fn current_platform(headless: bool) -> Rc<dyn Platform> {
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
#[inline] #[inline]
pub fn guess_compositor() -> &'static str { pub fn guess_compositor() -> &'static str {
if std::env::var_os("ZED_HEADLESS").is_some() {
return "Headless";
}
let wayland_display = std::env::var_os("WAYLAND_DISPLAY"); let wayland_display = std::env::var_os("WAYLAND_DISPLAY");
let x11_display = std::env::var_os("DISPLAY"); let x11_display = std::env::var_os("DISPLAY");

2
crates/recent_projects/src/dev_servers.rs
View File

@ -1171,7 +1171,7 @@ pub async fn spawn_ssh_task(
"-x".to_string(), "-x".to_string(),
"-c".to_string(), "-c".to_string(),
format!( format!(
r#"~/.local/bin/zed -v >/dev/stderr || (curl -f https://zed.dev/install.sh || wget -qO- https://zed.dev/install.sh) | sh && ~/.local/bin/zed --dev-server-token {}"#, r#"~/.local/bin/zed -v >/dev/stderr || (curl -f https://zed.dev/install.sh || wget -qO- https://zed.dev/install.sh) | sh && ZED_HEADLESS=1 ~/.local/bin/zed --dev-server-token {}"#,
access_token access_token
), ),
]; ];