From 9ee16d0390cdacc29b4e3d632974f68167a95c86 Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Mon, 3 Feb 2025 12:20:28 -0800
Subject: [PATCH] client-toolkit/screencopy: Re-export failure reason / options

---
 client-toolkit/examples/screenshot-screencopy.rs | 13 +++++--------
 client-toolkit/src/screencopy/mod.rs             |  7 +++++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client-toolkit/examples/screenshot-screencopy.rs b/client-toolkit/examples/screenshot-screencopy.rs
index cb6154ec0a..484c8cac11 100644
--- a/client-toolkit/examples/screenshot-screencopy.rs
+++ b/client-toolkit/examples/screenshot-screencopy.rs
@@ -1,7 +1,7 @@
 use cosmic_client_toolkit::screencopy::{
-    CaptureFrame, CaptureSession, CaptureSource, Formats, ScreencopyFrameData,
-    ScreencopyFrameDataExt, ScreencopyHandler, ScreencopySessionData, ScreencopySessionDataExt,
-    ScreencopyState,
+    CaptureFrame, CaptureOptions, CaptureSession, CaptureSource, FailureReason, Formats,
+    ScreencopyFrameData, ScreencopyFrameDataExt, ScreencopyHandler, ScreencopySessionData,
+    ScreencopySessionDataExt, ScreencopyState,
 };
 use sctk::{
     output::{OutputHandler, OutputState},
@@ -15,9 +15,6 @@ use wayland_client::{
     protocol::{wl_buffer, wl_output, wl_shm},
     Connection, QueueHandle, WEnum,
 };
-use wayland_protocols::ext::image_copy_capture::v1::client::{
-    ext_image_copy_capture_frame_v1, ext_image_copy_capture_manager_v1,
-};
 
 struct AppData {
     shm_state: Shm,
@@ -138,7 +135,7 @@ impl ScreencopyHandler for AppData {
         _: &Connection,
         _: &QueueHandle<Self>,
         _: &CaptureFrame,
-        reason: WEnum<ext_image_copy_capture_frame_v1::FailureReason>,
+        reason: WEnum<FailureReason>,
     ) {
         println!("Failed to capture output: {:?}", reason);
         self.outputs_done += 1;
@@ -200,7 +197,7 @@ fn main() {
                 .capturer()
                 .create_session(
                     &CaptureSource::Output(output),
-                    ext_image_copy_capture_manager_v1::Options::empty(),
+                    CaptureOptions::empty(),
                     &qh,
                     SessionData {
                         output_name: info.name.clone().unwrap(),
diff --git a/client-toolkit/src/screencopy/mod.rs b/client-toolkit/src/screencopy/mod.rs
index 573ca5da6c..48cdbe20c8 100644
--- a/client-toolkit/src/screencopy/mod.rs
+++ b/client-toolkit/src/screencopy/mod.rs
@@ -29,6 +29,9 @@ use wayland_protocols::ext::{
     },
 };
 
+pub use ext_image_copy_capture_frame_v1::FailureReason;
+pub use ext_image_copy_capture_manager_v1::Options as CaptureOptions;
+
 use crate::GlobalData;
 
 mod capture_source;
@@ -182,7 +185,7 @@ impl Capturer {
     pub fn create_session<D, U>(
         &self,
         source: &CaptureSource,
-        options: ext_image_copy_capture_manager_v1::Options,
+        options: CaptureOptions,
         qh: &QueueHandle<D>,
         udata: U,
     ) -> Result<CaptureSession, CaptureSourceError>
@@ -404,7 +407,7 @@ pub trait ScreencopyHandler: Sized {
         conn: &Connection,
         qh: &QueueHandle<Self>,
         screencopy_frame: &CaptureFrame,
-        reason: WEnum<ext_image_copy_capture_frame_v1::FailureReason>,
+        reason: WEnum<FailureReason>,
     );
 }