[*] fix: wayshot-cursor send the same position twice and portal cursor monitor doesn't exit when stop recording

Author: heng30

.github/workflows/linux-portal.yml

@@ -54,7 +54,7 @@ jobs:
           cp -rf release/$binary_name-cursor $binary_name-cursor
           tar -zcf $output $binary_name-cursor
           cp $output ..
-          echo "ASSET=$output" >> $GITHUB_ENV
+          echo "CURSOR_ASSET=$output" >> $GITHUB_ENV
 
           output="$binary_name-portal-${{ env.VERSION }}-x86_64-linux.deb"
           cp -rf $binary_name.deb $output
@@ -68,6 +68,7 @@ jobs:
         with:
           files: |
             ${{ env.ASSET }}
+            ${{ env.CURSOR_ASSET }}
             ${{ env.DEB_ASSET }}
 
       - run: echo "🍏 This job's status is ${{ job.status }}."

lib/screen-capture-wayland-portal/src/cursor.rs

@@ -40,6 +40,10 @@ fn process_mouse_positions(
     callback: &mut (impl FnMut(CursorPosition) + Send + 'static),
 ) -> Result<()> {
     loop {
+        if config.stop_sig.load(Ordering::Relaxed) {
+            break;
+        }
+
         let pos = receive_position(stream)?;
         let x = ((pos >> 32) & 0x0000_0000_ffff_ffff) as i32;
         let y = (pos & 0x0000_0000_ffff_ffff) as i32;
@@ -59,6 +63,8 @@ fn process_mouse_positions(
 
         std::thread::sleep(Duration::from_millis(5));
     }
+
+    Ok(())
 }
 
 fn receive_position(stream: &mut UnixStream) -> Result<u64> {

lib/screen-capture/src/lib.rs

@@ -28,6 +28,7 @@ pub trait ScreenCapture {
         cb: impl FnMut(CaptureStreamCallbackData),
     ) -> Result<CaptureStatus, ScreenCaptureError>;
 
+    // don't same the same cursor position twice
     fn monitor_cursor_position(
         &mut self,
         config: MonitorCursorPositionConfig,

wayshot-cursor/src/main.rs

@@ -72,6 +72,8 @@ fn server() -> Result<()> {
                                 log::warn!("send position failed: {e}");
                                 break;
                             }
+
+                            LAST_SENT_POSITION.store(pos, Ordering::Relaxed);
                         }
 
                         std::thread::sleep(std::time::Duration::from_millis(5));

wayshot/src/version.rs

@@ -1 +1 @@
-pub static VERSION: &str = "v0.2.9";
+pub static VERSION: &str = "v0.2.9-beta1";