screencapture: implement ext_foreign_toplevel_image_capture_source_manager_v1

src/client/objects.rs

@@ -2,6 +2,7 @@ use {
     crate::{
         client::{Client, ClientError},
         ifs::{
+            ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1,
             ext_image_capture_source_v1::ExtImageCaptureSourceV1,
             ipc::{
                 wl_data_source::WlDataSource, zwlr_data_control_source_v1::ZwlrDataControlSourceV1,
@@ -32,11 +33,12 @@ use {
             copyhashmap::{CopyHashMap, Locked},
         },
         wire::{
-            ExtImageCaptureSourceV1Id, JayOutputId, JayScreencastId, JayToplevelId, JayWorkspaceId,
-            WlBufferId, WlDataSourceId, WlOutputId, WlPointerId, WlRegionId, WlRegistryId,
-            WlSeatId, WlSurfaceId, WpDrmLeaseConnectorV1Id, WpLinuxDrmSyncobjTimelineV1Id,
-            XdgPopupId, XdgPositionerId, XdgSurfaceId, XdgToplevelId, XdgWmBaseId,
-            ZwlrDataControlSourceV1Id, ZwpPrimarySelectionSourceV1Id, ZwpTabletToolV2Id,
+            ExtForeignToplevelHandleV1Id, ExtImageCaptureSourceV1Id, JayOutputId, JayScreencastId,
+            JayToplevelId, JayWorkspaceId, WlBufferId, WlDataSourceId, WlOutputId, WlPointerId,
+            WlRegionId, WlRegistryId, WlSeatId, WlSurfaceId, WpDrmLeaseConnectorV1Id,
+            WpLinuxDrmSyncobjTimelineV1Id, XdgPopupId, XdgPositionerId, XdgSurfaceId,
+            XdgToplevelId, XdgWmBaseId, ZwlrDataControlSourceV1Id, ZwpPrimarySelectionSourceV1Id,
+            ZwpTabletToolV2Id,
         },
     },
     std::{cell::RefCell, mem, rc::Rc},
@@ -69,6 +71,8 @@ pub struct Objects {
     pub tablet_tools: CopyHashMap<ZwpTabletToolV2Id, Rc<ZwpTabletToolV2>>,
     pub xdg_popups: CopyHashMap<XdgPopupId, Rc<XdgPopup>>,
     pub image_capture_sources: CopyHashMap<ExtImageCaptureSourceV1Id, Rc<ExtImageCaptureSourceV1>>,
+    pub foreign_toplevel_handles:
+        CopyHashMap<ExtForeignToplevelHandleV1Id, Rc<ExtForeignToplevelHandleV1>>,
     ids: RefCell<Vec<usize>>,
 }
 
@@ -103,6 +107,7 @@ impl Objects {
             tablet_tools: Default::default(),
             xdg_popups: Default::default(),
             image_capture_sources: Default::default(),
+            foreign_toplevel_handles: Default::default(),
             ids: RefCell::new(vec![]),
         }
     }
@@ -141,6 +146,7 @@ impl Objects {
         self.tablet_tools.clear();
         self.xdg_popups.clear();
         self.image_capture_sources.clear();
+        self.foreign_toplevel_handles.clear();
     }
 
     pub fn id<T>(&self, client_data: &Client) -> Result<T, ClientError>

src/globals.rs

@@ -3,6 +3,7 @@ use {
         backend::Backend,
         client::{Client, ClientCaps},
         ifs::{
+            ext_foreign_toplevel_image_capture_source_manager_v1::ExtForeignToplevelImageCaptureSourceManagerV1Global,
             ext_foreign_toplevel_list_v1::ExtForeignToplevelListV1Global,
             ext_idle_notifier_v1::ExtIdleNotifierV1Global,
             ext_output_image_capture_source_manager_v1::ExtOutputImageCaptureSourceManagerV1Global,
@@ -199,6 +200,7 @@ impl Globals {
         add_singleton!(ZwpTabletManagerV2Global);
         add_singleton!(JayDamageTrackingGlobal);
         add_singleton!(ExtOutputImageCaptureSourceManagerV1Global);
+        add_singleton!(ExtForeignToplevelImageCaptureSourceManagerV1Global);
     }
 
     pub fn add_backend_singletons(&self, backend: &Rc<dyn Backend>) {

src/ifs.rs

@@ -1,4 +1,5 @@
 pub mod ext_foreign_toplevel_handle_v1;
+pub mod ext_foreign_toplevel_image_capture_source_manager_v1;
 pub mod ext_foreign_toplevel_list_v1;
 pub mod ext_idle_notification_v1;
 pub mod ext_idle_notifier_v1;

src/ifs/ext_foreign_toplevel_handle_v1.rs

@@ -78,7 +78,11 @@ impl Object for ExtForeignToplevelHandleV1 {
     }
 }
 
-simple_add_obj!(ExtForeignToplevelHandleV1);
+dedicated_add_obj!(
+    ExtForeignToplevelHandleV1,
+    ExtForeignToplevelHandleV1Id,
+    foreign_toplevel_handles
+);
 
 #[derive(Debug, Error)]
 pub enum ExtForeignToplevelHandleV1Error {

src/ifs/ext_foreign_toplevel_image_capture_source_manager_v1.rs

@@ -0,0 +1,110 @@
+use {
+    crate::{
+        client::{Client, ClientError},
+        globals::{Global, GlobalName},
+        ifs::ext_image_capture_source_v1::{ExtImageCaptureSourceV1, ImageCaptureSource},
+        leaks::Tracker,
+        object::{Object, Version},
+        wire::{
+            ext_foreign_toplevel_image_capture_source_manager_v1::*,
+            ExtForeignToplevelImageCaptureSourceManagerV1Id,
+        },
+    },
+    std::rc::Rc,
+    thiserror::Error,
+};
+
+pub struct ExtForeignToplevelImageCaptureSourceManagerV1Global {
+    pub name: GlobalName,
+}
+
+impl ExtForeignToplevelImageCaptureSourceManagerV1Global {
+    pub fn new(name: GlobalName) -> Self {
+        Self { name }
+    }
+
+    fn bind_(
+        self: Rc<Self>,
+        id: ExtForeignToplevelImageCaptureSourceManagerV1Id,
+        client: &Rc<Client>,
+        version: Version,
+    ) -> Result<(), ExtForeignToplevelImageCaptureSourceManagerV1Error> {
+        let obj = Rc::new(ExtForeignToplevelImageCaptureSourceManagerV1 {
+            id,
+            client: client.clone(),
+            tracker: Default::default(),
+            version,
+        });
+        track!(client, obj);
+        client.add_client_obj(&obj)?;
+        Ok(())
+    }
+}
+
+pub struct ExtForeignToplevelImageCaptureSourceManagerV1 {
+    pub id: ExtForeignToplevelImageCaptureSourceManagerV1Id,
+    pub client: Rc<Client>,
+    pub tracker: Tracker<Self>,
+    pub version: Version,
+}
+
+impl ExtForeignToplevelImageCaptureSourceManagerV1RequestHandler
+    for ExtForeignToplevelImageCaptureSourceManagerV1
+{
+    type Error = ExtForeignToplevelImageCaptureSourceManagerV1Error;
+
+    fn create_source(&self, req: CreateSource, _slf: &Rc<Self>) -> Result<(), Self::Error> {
+        let handle = self.client.lookup(req.toplevel_handle)?;
+        let obj = Rc::new(ExtImageCaptureSourceV1 {
+            id: req.source,
+            client: self.client.clone(),
+            tracker: Default::default(),
+            ty: ImageCaptureSource::Toplevel(handle.toplevel.clone()),
+        });
+        track!(self.client, obj);
+        self.client.add_client_obj(&obj)?;
+        Ok(())
+    }
+
+    fn destroy(&self, _req: Destroy, _slf: &Rc<Self>) -> Result<(), Self::Error> {
+        self.client.remove_obj(self)?;
+        Ok(())
+    }
+}
+
+global_base!(
+    ExtForeignToplevelImageCaptureSourceManagerV1Global,
+    ExtForeignToplevelImageCaptureSourceManagerV1,
+    ExtForeignToplevelImageCaptureSourceManagerV1Error
+);
+
+impl Global for ExtForeignToplevelImageCaptureSourceManagerV1Global {
+    fn singleton(&self) -> bool {
+        true
+    }
+
+    fn version(&self) -> u32 {
+        1
+    }
+}
+
+simple_add_global!(ExtForeignToplevelImageCaptureSourceManagerV1Global);
+
+object_base! {
+    self = ExtForeignToplevelImageCaptureSourceManagerV1;
+    version = self.version;
+}
+
+impl Object for ExtForeignToplevelImageCaptureSourceManagerV1 {}
+
+simple_add_obj!(ExtForeignToplevelImageCaptureSourceManagerV1);
+
+#[derive(Debug, Error)]
+pub enum ExtForeignToplevelImageCaptureSourceManagerV1Error {
+    #[error(transparent)]
+    ClientError(Box<ClientError>),
+}
+efrom!(
+    ExtForeignToplevelImageCaptureSourceManagerV1Error,
+    ClientError
+);

src/ifs/ext_image_capture_source_v1.rs

@@ -4,6 +4,7 @@ use {
         ifs::wl_output::OutputGlobalOpt,
         leaks::Tracker,
         object::{Object, Version},
+        tree::ToplevelOpt,
         wire::{ext_image_capture_source_v1::*, ExtImageCaptureSourceV1Id},
     },
     std::rc::Rc,
@@ -14,6 +15,7 @@ use {
 #[derive(Clone)]
 pub enum ImageCaptureSource {
     Output(Rc<OutputGlobalOpt>),
+    Toplevel(ToplevelOpt),
 }
 
 pub struct ExtImageCaptureSourceV1 {