From ee39e22472c803224f9f57d0737b43ae71484360 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Mon, 29 Dec 2025 02:53:29 +0900
Subject: [PATCH] ShouldRender::Should if mouse moved

---
 wlx-capture/src/frame.rs            |  2 +-
 wlx-overlay-s/src/overlays/wayvr.rs | 36 ++++++++++++++++-------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/wlx-capture/src/frame.rs b/wlx-capture/src/frame.rs
index 37470edf..16e57f7d 100644
--- a/wlx-capture/src/frame.rs
+++ b/wlx-capture/src/frame.rs
@@ -130,7 +130,7 @@ pub struct MemPtrFrame {
     pub mouse: Option<MouseMeta>,
 }
 
-#[derive(Default, Clone)]
+#[derive(Default, Clone, PartialEq)]
 pub struct MouseMeta {
     pub x: f32,
     pub y: f32,
diff --git a/wlx-overlay-s/src/overlays/wayvr.rs b/wlx-overlay-s/src/overlays/wayvr.rs
index 0cac34a0..881f8be7 100644
--- a/wlx-overlay-s/src/overlays/wayvr.rs
+++ b/wlx-overlay-s/src/overlays/wayvr.rs
@@ -62,6 +62,7 @@ pub struct WvrWindowBackend {
     window: wayvr::window::WindowHandle,
     just_resumed: bool,
     meta: Option<FrameMeta>,
+    mouse: Option<MouseMeta>,
     stereo: Option<StereoMode>,
     cur_image: Option<Arc<ImageView>>,
 }
@@ -79,6 +80,7 @@ impl WvrWindowBackend {
             interaction_transform: None,
             just_resumed: false,
             meta: None,
+            mouse: None,
             stereo: if matches!(xr_backend, XrBackend::OpenXR) {
                 Some(StereoMode::None)
             } else {
@@ -143,6 +145,21 @@ impl OverlayBackend for WvrWindowBackend {
                     self.interaction_transform = Some(ui_transform(meta.extent.extent_u32arr()));
                 }
 
+                let mouse = app
+                    .wvr_server
+                    .as_ref()
+                    .unwrap()
+                    .wm
+                    .mouse
+                    .as_ref()
+                    .filter(|m| m.hover_window == self.window)
+                    .map(|m| MouseMeta {
+                        x: (m.x as f32) / (meta.extent[0] as f32),
+                        y: (m.y as f32) / (meta.extent[1] as f32),
+                    });
+
+                let mouse_dirty = self.mouse != mouse;
+                self.mouse = mouse;
                 self.meta = Some(meta);
                 if self
                     .cur_image
@@ -156,8 +173,9 @@ impl OverlayBackend for WvrWindowBackend {
                     );
                     self.cur_image = Some(surf.image);
                     Ok(ShouldRender::Should)
+                } else if mouse_dirty {
+                    Ok(ShouldRender::Should)
                 } else {
-                    log::trace!("{}: no new image", self.name);
                     Ok(ShouldRender::Can)
                 }
             } else {
@@ -174,24 +192,10 @@ impl OverlayBackend for WvrWindowBackend {
     ) -> anyhow::Result<()> {
         let image = self.cur_image.as_ref().unwrap().clone();
 
-        let wvr_server = app.wvr_server.as_mut().unwrap(); //never None
-        let mouse = wvr_server
-            .wm
-            .mouse
-            .as_ref()
-            .filter(|m| m.hover_window == self.window)
-            .map(|m| {
-                let extent = image.extent_f32();
-                MouseMeta {
-                    x: (m.x as f32) / extent[0],
-                    y: (m.y as f32) / extent[1],
-                }
-            });
-
         self.pipeline
             .as_mut()
             .unwrap()
-            .render(image, mouse.as_ref(), app, rdr)?;
+            .render(image, self.mouse.as_ref(), app, rdr)?;
 
         Ok(())
     }