screencopy: Use send_success_when_ready for other forms of capture

A little annoying to add a `loop_handle` argument to `render_output`,
but generally straightforward.

src/backend/render/mod.rs

@@ -28,7 +28,7 @@ use crate::{
         handlers::{
             compositor::FRAME_TIME_FILTER,
             data_device::get_dnd_icon,
-            screencopy::{render_session, FrameHolder, PendingImageCopyData, SessionData},
+            screencopy::{render_session, FrameHolder, SessionData},
         },
         protocols::workspace::WorkspaceHandle,
     },
@@ -1150,6 +1150,7 @@ pub fn render_output<'d, R>(
     output: &Output,
     cursor_mode: CursorMode,
     screen_filter: &'d mut ScreenFilterStorage,
+    loop_handle: &calloop::LoopHandle<'static, State>,
 ) -> Result<RenderOutputResult<'d>, RenderError<R::Error>>
 where
     R: Renderer
@@ -1332,11 +1333,7 @@ where
     match result {
         Ok((res, mut elements)) => {
             for (session, frame) in output.take_pending_frames() {
-                if let Some(PendingImageCopyData { frame, damage, .. }) = render_session::<
+                if let Some(pending_image_copy_data) = render_session::<_, _, GlesTexture>(
-                    _,
-                    _,
-                    GlesTexture,
-                >(
                     renderer,
                     &session.user_data().get::<SessionData>().unwrap(),
                     frame,
@@ -1437,7 +1434,11 @@ where
                         })
                     },
                 )? {
-                    frame.success(output.current_transform(), damage, now);
+                    pending_image_copy_data.send_success_when_ready(
+                        output.current_transform(),
+                        loop_handle,
+                        now,
+                    );
                 }
             }
 

src/backend/winit.rs

@@ -63,6 +63,7 @@ impl WinitState {
             &self.output,
             CursorMode::NotDefault,
             &mut self.screen_filter_state,
+            &state.event_loop_handle,
         ) {
             Ok(RenderOutputResult { damage, states, .. }) => {
                 std::mem::drop(fb);

src/backend/x11.rs

@@ -230,6 +230,7 @@ impl Surface {
             &self.output,
             render::CursorMode::NotDefault,
             &mut self.screen_filter_state,
+            &state.event_loop_handle,
         ) {
             Ok(RenderOutputResult { damage, states, .. }) => {
                 self.surface

src/wayland/handlers/screencopy/render.rs

@@ -471,8 +471,12 @@ pub fn render_workspace_to_buffer(
         }
     };
 
-    if let Some(PendingImageCopyData { frame, damage, .. }) = result {
+    if let Some(pending_image_copy_data) = result {
-        frame.success(transform, damage, common.clock.now())
+        pending_image_copy_data.send_success_when_ready(
+            transform,
+            &common.event_loop_handle,
+            common.clock.now(),
+        );
     }
 }
 
@@ -702,8 +706,12 @@ pub fn render_window_to_buffer(
         },
     };
 
-    if let Some(PendingImageCopyData { frame, damage, .. }) = result {
+    if let Some(pending_image_copy_data) = result {
-        frame.success(Transform::Normal, damage, common.clock.now())
+        pending_image_copy_data.send_success_when_ready(
+            Transform::Normal,
+            &common.event_loop_handle,
+            common.clock.now(),
+        );
     }
 }
 
@@ -858,7 +866,11 @@ pub fn render_cursor_to_buffer(
         }
     };
 
-    if let Some(PendingImageCopyData { frame, damage, .. }) = result {
+    if let Some(pending_image_copy_data) = result {
-        frame.success(Transform::Normal, damage, common.clock.now())
+        pending_image_copy_data.send_success_when_ready(
+            Transform::Normal,
+            &common.event_loop_handle,
+            common.clock.now(),
+        );
     }
 }