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

Simplify macro

Browse Source
This commit is contained in:
Demmie 2024-02-03 16:47:47 -05:00
parent b6ee2d2904
commit 3dcc37e630
No known key found for this signature in database
GPG Key ID: B06DAA3D432C6E9A
1 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
watchers/src/watchers.rs
View File

@ -52,21 +52,24 @@ pub trait Watcher: Send {
async fn run_iteration(&mut self, client: &Arc<ReportClient>) -> anyhow::Result<()>; async fn run_iteration(&mut self, client: &Arc<ReportClient>) -> anyhow::Result<()>;
} }
async fn create_watcher<T: Watcher>(client: &Arc<ReportClient>, name: &str) -> Option<T> {
match T::new(client).await {
Ok(watcher) => {
info!("Selected watcher: {name}");
Some(watcher)
}
Err(e) => {
debug!("Watcher \"{name}\" cannot run: {e}");
None
}
}
}
macro_rules! watch { macro_rules! watch {
($client:expr, $watcher_type:expr, $watcher_struct:ty) => { ($watcher:expr) => {
match <$watcher_struct>::new($client).await { if let Some(watcher) = $watcher.await {
Ok(watcher) => { return Some(Box::new(watcher));
info!( }
"Selected {} as {} watcher",
stringify!($watcher_struct),
$watcher_type
);
return Some(Box::new(watcher));
}
Err(e) => {
debug!("{} cannot run: {e}", stringify!($watcher_struct));
}
};
}; };
} }
@ -76,20 +79,44 @@ async fn filter_first_supported(
) -> Option<Box<dyn Watcher>> { ) -> Option<Box<dyn Watcher>> {
match watcher_type { match watcher_type {
WatcherType::Idle => { WatcherType::Idle => {
watch!(client, watcher_type, wl_ext_idle_notify::IdleWatcher); watch!(create_watcher::<wl_ext_idle_notify::IdleWatcher>(
watch!(client, watcher_type, wl_kwin_idle::IdleWatcher); client,
watch!(client, watcher_type, x11_screensaver_idle::IdleWatcher); "Wayland idle (ext_idle_notification_v1)"
));
watch!(create_watcher::<wl_kwin_idle::IdleWatcher>(
client,
"Wayland idle (KWin)"
));
watch!(create_watcher::<x11_screensaver_idle::IdleWatcher>(
client,
"X11 idle (screensaver)"
));
#[cfg(feature = "gnome")] #[cfg(feature = "gnome")]
watch!(client, watcher_type, gnome_idle::IdleWatcher); watch!(create_watcher::<gnome_idle::IdleWatcher>(
client,
"Gnome idle (Mutter/IdleMonitor)"
));
} }
WatcherType::ActiveWindow => { WatcherType::ActiveWindow => {
watch!(client, watcher_type, wl_foreign_toplevel::WindowWatcher); watch!(create_watcher::<wl_foreign_toplevel::WindowWatcher>(
client,
"Wayland window (wlr-foreign-toplevel-management-unstable-v1)"
));
// XWayland gives _NET_WM_NAME on some windows in KDE, but not on others // XWayland gives _NET_WM_NAME on some windows in KDE, but not on others
#[cfg(feature = "kwin_window")] #[cfg(feature = "kwin_window")]
watch!(client, watcher_type, kwin_window::WindowWatcher); watch!(create_watcher::<kwin_window::WindowWatcher>(
watch!(client, watcher_type, x11_window::WindowWatcher); client,
"KWin window (script)"
));
watch!(create_watcher::<x11_window::WindowWatcher>(
client,
"X11 window"
));
#[cfg(feature = "gnome")] #[cfg(feature = "gnome")]
watch!(client, watcher_type, gnome_window::WindowWatcher); watch!(create_watcher::<gnome_window::WindowWatcher>(
client,
"Gnome window (extension)"
));
} }
}; };