Move periodic tasks to event loop closure

2 files changed, 10 insertions, 6 deletions

diff --git a/src/main.rs b/src/main.rs
index d259b4a0..d89dcab1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -105,9 +105,16 @@ fn main() {
 
     event_loop
         .run(None, &mut data, move |data| {
-            // niri is running.
-            let _span = tracy_client::span!("flush_clients");
-            data.display.flush_clients().unwrap();
+            let _span = tracy_client::span!("loop callback");
+
+            // These should be called periodically, before flushing the clients.
+            data.niri.space.refresh();
+            data.niri.popups.cleanup();
+
+            {
+                let _span = tracy_client::span!("flush_clients");
+                data.display.flush_clients().unwrap();
+            }
         })
         .unwrap();
 }
diff --git a/src/niri.rs b/src/niri.rs
index 0fbd49f5..4c95ec81 100644
--- a/src/niri.rs
+++ b/src/niri.rs
@@ -225,9 +225,6 @@ impl Niri {
                 |_, _| Some(output.clone()),
             )
         });
-
-        self.space.refresh();
-        self.popups.cleanup();
     }
 }