#290 supporting using a vec of hooks as a hook

sminez · Jan 19, 2024 · 6a6de92 · 6a6de92
1 parent 7b7ed75
commit 6a6de92
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 13 deletions.
diff --git a/src/core/hooks.rs b/src/core/hooks.rs
@@ -141,6 +141,23 @@ where
     }
 }
 
+impl<X> EventHook<X> for Vec<Box<dyn EventHook<X>>>
+where
+    X: XConn,
+{
+    fn call(&mut self, event: &XEvent, state: &mut State<X>, x: &X) -> Result<bool> {
+        let mut call_next = true;
+        for hook in self.iter_mut() {
+            call_next = hook.call(event, state, x)?;
+            if !call_next {
+                return Ok(false);
+            }
+        }
+
+        Ok(call_next)
+    }
+}
+
 impl<X: XConn> fmt::Debug for Box<dyn EventHook<X>> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("EventHook").finish()
@@ -224,6 +241,19 @@ where
     }
 }
 
+impl<X> ManageHook<X> for Vec<Box<dyn ManageHook<X>>>
+where
+    X: XConn,
+{
+    fn call(&mut self, id: Xid, state: &mut State<X>, x: &X) -> Result<()> {
+        for hook in self.iter_mut() {
+            hook.call(id, state, x)?;
+        }
+
+        Ok(())
+    }
+}
+
 impl<X: XConn> fmt::Debug for Box<dyn ManageHook<X>> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("ManageHook").finish()
@@ -301,6 +331,19 @@ where
     }
 }
 
+impl<X> StateHook<X> for Vec<Box<dyn StateHook<X>>>
+where
+    X: XConn,
+{
+    fn call(&mut self, state: &mut State<X>, x: &X) -> Result<()> {
+        for hook in self.iter_mut() {
+            hook.call(state, x)?;
+        }
+
+        Ok(())
+    }
+}
+
 impl<X: XConn> fmt::Debug for Box<dyn StateHook<X>> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("StateHook").finish()

diff --git a/src/extensions/hooks/manage.rs b/src/extensions/hooks/manage.rs
@@ -26,19 +26,6 @@ where
     }
 }
 
-impl<X> ManageHook<X> for Vec<Box<dyn ManageHook<X>>>
-where
-    X: XConn,
-{
-    fn call(&mut self, id: Xid, state: &mut State<X>, x: &X) -> Result<()> {
-        for hook in self.iter_mut() {
-            hook.call(id, state, x)?;
-        }
-
-        Ok(())
-    }
-}
-
 fn float<X: XConn>(client: Xid, r: Rect, state: &mut State<X>, _: &X) -> Result<()> {
     state.client_set.float(client, r)
 }