From 8f7b9202b29c7363be691233ca3cd8e427b8164a Mon Sep 17 00:00:00 2001 From: LGUG2Z Date: Tue, 6 Aug 2024 17:12:36 -0700 Subject: [PATCH] refactor(wm): reduce process_event log noise --- komorebi/src/process_event.rs | 2 +- komorebi/src/window_manager_event.rs | 42 ++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/komorebi/src/process_event.rs b/komorebi/src/process_event.rs index ef68d9ae..c0479f98 100644 --- a/komorebi/src/process_event.rs +++ b/komorebi/src/process_event.rs @@ -64,7 +64,7 @@ pub fn listen_for_events(wm: Arc>) { impl WindowManager { #[allow(clippy::too_many_lines, clippy::cognitive_complexity)] - #[tracing::instrument(skip(self))] + #[tracing::instrument(skip(self, event), fields(event = event.title(), winevent = event.winevent(), hwnd = event.hwnd()))] pub fn process_event(&mut self, event: WindowManagerEvent) -> Result<()> { if self.is_paused { tracing::trace!("ignoring while paused"); diff --git a/komorebi/src/window_manager_event.rs b/komorebi/src/window_manager_event.rs index 8f7fb36f..813625ed 100644 --- a/komorebi/src/window_manager_event.rs +++ b/komorebi/src/window_manager_event.rs @@ -102,6 +102,48 @@ impl WindowManagerEvent { } } + pub const fn hwnd(self) -> isize { + self.window().hwnd + } + + pub const fn title(self) -> &'static str { + match self { + WindowManagerEvent::Destroy(_, _) => "Destroy", + WindowManagerEvent::FocusChange(_, _) => "FocusChange", + WindowManagerEvent::Hide(_, _) => "Hide", + WindowManagerEvent::Cloak(_, _) => "Cloak", + WindowManagerEvent::Minimize(_, _) => "Minimize", + WindowManagerEvent::Show(_, _) => "Show", + WindowManagerEvent::Uncloak(_, _) => "Uncloak", + WindowManagerEvent::MoveResizeStart(_, _) => "MoveResizeStart", + WindowManagerEvent::MoveResizeEnd(_, _) => "MoveResizeEnd", + WindowManagerEvent::MouseCapture(_, _) => "MouseCapture", + WindowManagerEvent::Manage(_) => "Manage", + WindowManagerEvent::Unmanage(_) => "Unmanage", + WindowManagerEvent::Raise(_) => "Raise", + WindowManagerEvent::TitleUpdate(_, _) => "TitleUpdate", + } + } + + pub fn winevent(self) -> Option { + match self { + WindowManagerEvent::Destroy(event, _) + | WindowManagerEvent::FocusChange(event, _) + | WindowManagerEvent::Hide(event, _) + | WindowManagerEvent::Cloak(event, _) + | WindowManagerEvent::Minimize(event, _) + | WindowManagerEvent::Show(event, _) + | WindowManagerEvent::Uncloak(event, _) + | WindowManagerEvent::MoveResizeStart(event, _) + | WindowManagerEvent::MoveResizeEnd(event, _) + | WindowManagerEvent::MouseCapture(event, _) + | WindowManagerEvent::TitleUpdate(event, _) => Some(event.to_string()), + WindowManagerEvent::Manage(_) + | WindowManagerEvent::Unmanage(_) + | WindowManagerEvent::Raise(_) => None, + } + } + pub fn from_win_event(winevent: WinEvent, window: Window) -> Option { match winevent { WinEvent::ObjectDestroy => Option::from(Self::Destroy(winevent, window)),