From ba52553ddf2f8189f28d85591d0425cb8c7828f8 Mon Sep 17 00:00:00 2001 From: Demmie <2e3s19@gmail.com> Date: Sun, 4 Feb 2024 10:33:56 -0500 Subject: [PATCH] Clarify names --- watchers/src/watchers.rs | 10 ++++++---- watchers/src/watchers/wl_connection.rs | 2 +- ...n_toplevel.rs => wl_foreign_toplevel_management.rs} | 0 3 files changed, 7 insertions(+), 5 deletions(-) rename watchers/src/watchers/{wl_foreign_toplevel.rs => wl_foreign_toplevel_management.rs} (100%) diff --git a/watchers/src/watchers.rs b/watchers/src/watchers.rs index 911574e..f4e5ddd 100644 --- a/watchers/src/watchers.rs +++ b/watchers/src/watchers.rs @@ -9,7 +9,7 @@ mod idle; mod kwin_window; mod wl_connection; mod wl_ext_idle_notify; -mod wl_foreign_toplevel; +mod wl_foreign_toplevel_management; mod wl_kwin_idle; mod x11_connection; mod x11_screensaver_idle; @@ -81,11 +81,11 @@ async fn filter_first_supported( WatcherType::Idle => { watch!(create_watcher::( client, - "Wayland idle (ext_idle_notification_v1)" + "Wayland idle (ext-idle-notify-v1)" )); watch!(create_watcher::( client, - "Wayland idle (KWin)" + "Wayland idle (KDE)" )); watch!(create_watcher::( client, @@ -98,7 +98,9 @@ async fn filter_first_supported( )); } WatcherType::ActiveWindow => { - watch!(create_watcher::( + watch!(create_watcher::< + wl_foreign_toplevel_management::WindowWatcher, + >( client, "Wayland window (wlr-foreign-toplevel-management-unstable-v1)" )); diff --git a/watchers/src/watchers/wl_connection.rs b/watchers/src/watchers/wl_connection.rs index 03a1c65..6654e32 100644 --- a/watchers/src/watchers/wl_connection.rs +++ b/watchers/src/watchers/wl_connection.rs @@ -66,7 +66,7 @@ where self.globals .bind::( &self.queue_handle, - 1..=OrgKdeKwinIdle::interface().version, + 1..=ZwlrForeignToplevelManagerV1::interface().version, (), ) .map_err(std::convert::Into::into) diff --git a/watchers/src/watchers/wl_foreign_toplevel.rs b/watchers/src/watchers/wl_foreign_toplevel_management.rs similarity index 100% rename from watchers/src/watchers/wl_foreign_toplevel.rs rename to watchers/src/watchers/wl_foreign_toplevel_management.rs