[*] update normally

Author: heng30

lib/capture/src/backend.rs

@@ -52,6 +52,27 @@ pub(crate) struct OutputInfo {
     pub image_ready: bool,
 }
 
+impl Drop for OutputInfo {
+    fn drop(&mut self) {
+        log::debug!("Cleaning up OutputInfo resources");
+
+        // Release Wayland output object
+        self.wl_output.release();
+
+        // Clean up memory mapping first
+        if let Some(mmap) = self.image_mmap.take() {
+            drop(mmap);
+        }
+
+        // Clean up memory file descriptor
+        if let Some(memfd) = self.image_memfd.take() {
+            drop(memfd);
+        }
+
+        log::debug!("OutputInfo resources cleaned up");
+    }
+}
+
 /// Global state for Wayland connection and screen capture.
 ///
 /// This struct maintains the global state for the Wayland connection,
@@ -70,6 +91,23 @@ pub(crate) struct State {
     pub output_infos: Vec<OutputInfo>,
 }
 
+impl Drop for State {
+    fn drop(&mut self) {
+        log::debug!("Cleaning up State resources");
+
+        // Wayland objects will be automatically cleaned up when dropped
+        // No need to explicitly call release() on them
+        self.wlr_screencopy_manager.take();
+        self.xdg_output_manager.take();
+        self.wl_shm.take();
+
+        // OutputInfo objects will be cleaned up automatically through their Drop implementation
+        self.output_infos.clear();
+
+        log::debug!("State resources cleaned up");
+    }
+}
+
 /// Handle Wayland registry events to discover available globals.
 ///
 /// This implementation processes Wayland registry events to bind to the necessary

lib/capture/src/capture.rs

@@ -222,6 +222,7 @@ pub fn capture_output_iter(
         // Check for cancellation signal
         if config.cancel_sig.load(Ordering::Relaxed) {
             log::info!("Exit capture_iter process after Stopped");
+            drop(state);
             return Ok(CaptureIterStatus::Stopped);
         }
 

lib/capture/src/screen_info.rs

@@ -270,7 +270,7 @@ fn protocol_get() -> Result<Vec<ScreenInfo>, Error> {
     let (state, _) = backend::connect_and_get_output_info()?;
     let mut infos = vec![];
 
-    for output_info in state.output_infos.into_iter() {
+    for output_info in state.output_infos.iter() {
         if let OutputInfo {
             name: Some(name),
             output_logical_position: Some(output_logical_position),
@@ -281,7 +281,7 @@ fn protocol_get() -> Result<Vec<ScreenInfo>, Error> {
         } = output_info
         {
             infos.push(ScreenInfo {
-                name,
+                name: name.clone(),
                 position: Position {
                     x: output_logical_position.x,
                     y: output_logical_position.y,
@@ -291,8 +291,8 @@ fn protocol_get() -> Result<Vec<ScreenInfo>, Error> {
                     height: output_logical_size.height,
                 },
                 physical_size: None,
-                scale_factor: scale_factor as f32,
-                transform,
+                scale_factor: *scale_factor as f32,
+                transform: *transform,
             });
         }
     }