github/awatcher
1
1
Fork 0
mirror of https://github.com/2e3s/awatcher.git synced 2025-06-07 03:55:29 +00:00
Code Issues 17 Packages Projects Releases Wiki Activity

Skip KWin watcher if X11 is detectable

Browse Source
This commit is contained in:
Demmie 2023-11-04 21:46:36 -04:00
parent 451346901d
commit 8eed243593
No known key found for this signature in database
GPG Key ID: B06DAA3D432C6E9A
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
watchers/src/watchers/kwin_window.rs
View File

@ -7,7 +7,7 @@ use super::Watcher;
use crate::report_client::ReportClient; use crate::report_client::ReportClient;
use anyhow::{anyhow, Context}; use anyhow::{anyhow, Context};
use async_trait::async_trait; use async_trait::async_trait;
use std::env::temp_dir; use std::env::{self, temp_dir};
use std::path::Path; use std::path::Path;
use std::sync::{mpsc::channel, Arc}; use std::sync::{mpsc::channel, Arc};
use std::thread; use std::thread;
@ -175,6 +175,12 @@ impl Watcher for WindowWatcher {
debug!("KWin script is already loaded, unloading"); debug!("KWin script is already loaded, unloading");
kwin_script.unload().await?; kwin_script.unload().await?;
} }
if env::var("WAYLAND_DISPLAY").is_err()
&& env::var_os("XDG_SESSION_TYPE").unwrap_or("".into()) == "x11"
{
return Err(anyhow!("X11 should be tried instead"));
}
kwin_script.load().await.unwrap(); kwin_script.load().await.unwrap();
let active_window = Arc::new(Mutex::new(ActiveWindow { let active_window = Arc::new(Mutex::new(ActiveWindow {