wayland: implement wlr-data-control

src/client/objects.rs

@@ -3,7 +3,7 @@ use {
         client::{Client, ClientError},
         ifs::{
             ipc::{
-                wl_data_source::WlDataSource,
+                wl_data_source::WlDataSource, zwlr_data_control_source_v1::ZwlrDataControlSourceV1,
                 zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1,
             },
             jay_output::JayOutput,
@@ -32,7 +32,7 @@ use {
             JayOutputId, JayScreencastId, JayWorkspaceId, WlBufferId, WlDataSourceId, WlOutputId,
             WlPointerId, WlRegionId, WlRegistryId, WlSeatId, WlSurfaceId,
             WpLinuxDrmSyncobjTimelineV1Id, XdgPositionerId, XdgSurfaceId, XdgToplevelId,
-            XdgWmBaseId, ZwpPrimarySelectionSourceV1Id,
+            XdgWmBaseId, ZwlrDataControlSourceV1Id, ZwpPrimarySelectionSourceV1Id,
         },
     },
     std::{cell::RefCell, mem, rc::Rc},
@@ -59,6 +59,7 @@ pub struct Objects {
     pub seats: CopyHashMap<WlSeatId, Rc<WlSeat>>,
     pub screencasts: CopyHashMap<JayScreencastId, Rc<JayScreencast>>,
     pub timelines: CopyHashMap<WpLinuxDrmSyncobjTimelineV1Id, Rc<WpLinuxDrmSyncobjTimelineV1>>,
+    pub zwlr_data_sources: CopyHashMap<ZwlrDataControlSourceV1Id, Rc<ZwlrDataControlSourceV1>>,
     ids: RefCell<Vec<usize>>,
 }
 
@@ -87,6 +88,7 @@ impl Objects {
             seats: Default::default(),
             screencasts: Default::default(),
             timelines: Default::default(),
+            zwlr_data_sources: Default::default(),
             ids: RefCell::new(vec![]),
         }
     }

src/globals.rs

@@ -8,6 +8,7 @@ use {
             ext_session_lock_manager_v1::ExtSessionLockManagerV1Global,
             ipc::{
                 wl_data_device_manager::WlDataDeviceManagerGlobal,
+                zwlr_data_control_manager_v1::ZwlrDataControlManagerV1Global,
                 zwp_primary_selection_device_manager_v1::ZwpPrimarySelectionDeviceManagerV1Global,
             },
             jay_compositor::JayCompositorGlobal,
@@ -171,6 +172,7 @@ impl Globals {
         add_singleton!(ZwpIdleInhibitManagerV1Global);
         add_singleton!(ExtIdleNotifierV1Global);
         add_singleton!(XdgToplevelDragManagerV1Global);
+        add_singleton!(ZwlrDataControlManagerV1Global);
     }
 
     pub fn add_backend_singletons(&self, backend: &Rc<dyn Backend>) {

src/ifs/ipc.rs

@@ -3,7 +3,9 @@ use {
         client::{Client, ClientError, ClientId},
         fixed::Fixed,
         ifs::{
-            ipc::x_data_device::XIpcDevice,
+            ipc::{
+                x_data_device::XIpcDevice, zwlr_data_control_device_v1::ZwlrDataControlDeviceV1,
+            },
             wl_seat::{WlSeatError, WlSeatGlobal},
         },
         utils::{
@@ -31,6 +33,10 @@ pub mod wl_data_source;
 pub mod x_data_device;
 pub mod x_data_offer;
 pub mod x_data_source;
+pub mod zwlr_data_control_device_v1;
+pub mod zwlr_data_control_manager_v1;
+pub mod zwlr_data_control_offer_v1;
+pub mod zwlr_data_control_source_v1;
 pub mod zwp_primary_selection_device_manager_v1;
 pub mod zwp_primary_selection_device_v1;
 pub mod zwp_primary_selection_offer_v1;
@@ -60,8 +66,9 @@ pub trait DynDataSource: 'static {
     fn send_send(&self, mime_type: &str, fd: Rc<OwnedFd>);
     fn offer_to_regular_client(self: Rc<Self>, client: &Rc<Client>);
     fn offer_to_x(self: Rc<Self>, dd: &Rc<XIpcDevice>);
+    fn offer_to_wlr_device(self: Rc<Self>, dd: &Rc<ZwlrDataControlDeviceV1>);
     fn detach_seat(&self, seat: &Rc<WlSeatGlobal>);
-    fn cancel_offers(&self);
+    fn cancel_unprivileged_offers(&self);
 
     fn send_target(&self, mime_type: Option<&str>) {
         let _ = mime_type;
@@ -98,6 +105,10 @@ pub trait DynDataOffer: 'static {
     fn cancel(&self);
     fn get_seat(&self) -> Rc<WlSeatGlobal>;
 
+    fn is_privileged(&self) -> bool {
+        false
+    }
+
     fn send_action(&self, action: u32) {
         let _ = action;
         log::warn!(
@@ -129,6 +140,12 @@ pub trait IterableIpcVtable: IpcVtable {
         C: FnMut(&Rc<Self::Device>);
 }
 
+pub trait WlrIpcVtable: IpcVtable<Device = ZwlrDataControlDeviceV1> {
+    fn for_each_device<C>(seat: &WlSeatGlobal, f: C)
+    where
+        C: FnMut(&Rc<Self::Device>);
+}
+
 pub trait IpcVtable: Sized {
     const LOCATION: IpcLocation;
 
@@ -277,11 +294,17 @@ pub fn attach_seat<S: DynDataSource>(
     Ok(())
 }
 
-pub fn cancel_offers<S: DynDataSource>(src: &S) {
+pub fn cancel_offers<S: DynDataSource>(src: &S, cancel_privileged: bool) {
     let data = src.source_data();
-    while let Some((_, offer)) = data.offers.pop() {
-        offer.cancel();
-    }
+    let mut offers = data.offers.take();
+    offers.retain(|o| {
+        let retain = !cancel_privileged && o.1.is_privileged();
+        if !retain {
+            o.1.cancel();
+        }
+        retain
+    });
+    data.offers.replace(offers);
 }
 
 pub fn cancel_offer<T: IpcVtable>(offer: &T::Offer) {
@@ -293,7 +316,7 @@ pub fn cancel_offer<T: IpcVtable>(offer: &T::Offer) {
 pub fn detach_seat<S: DataSource>(src: &S, seat: &Rc<WlSeatGlobal>) {
     let data = src.source_data();
     data.seat.set(None);
-    cancel_offers(src);
+    cancel_offers(src, true);
     if !data.state.get().contains(SOURCE_STATE_FINISHED) {
         src.send_cancelled(seat);
     }
@@ -342,12 +365,23 @@ where
     S: DynDataSource,
 {
     let data = src.source_data();
-    src.cancel_offers();
+    src.cancel_unprivileged_offers();
     let shared = data.shared.get();
     shared.role.set(data.role.get());
     offer_source_to_device::<T, S>(src, dd, data, shared);
 }
 
+pub fn offer_source_to_wlr_device<T, S>(src: &Rc<S>, dd: &Rc<T::Device>)
+where
+    T: IpcVtable<Device = ZwlrDataControlDeviceV1>,
+    S: DynDataSource,
+{
+    let data = src.source_data();
+    let shared = data.shared.get();
+    shared.role.set(data.role.get());
+    offer_source_to_device::<T, _>(src, dd, data, shared);
+}
+
 fn offer_source_to_regular_client<T: IterableIpcVtable, S: DynDataSource>(
     src: &Rc<S>,
     client: &Rc<Client>,
@@ -360,7 +394,7 @@ fn offer_source_to_regular_client<T: IterableIpcVtable, S: DynDataSource>(
             return;
         }
     };
-    src.cancel_offers();
+    src.cancel_unprivileged_offers();
     let shared = data.shared.get();
     shared.role.set(data.role.get());
     T::for_each_device(&seat, client.id, |dd| {

src/ifs/ipc/wl_data_source.rs

@@ -4,10 +4,12 @@ use {
         ifs::{
             ipc::{
                 add_data_source_mime_type, break_source_loops, cancel_offers, destroy_data_source,
-                detach_seat, offer_source_to_regular_client, offer_source_to_x,
+                detach_seat, offer_source_to_regular_client, offer_source_to_wlr_device,
+                offer_source_to_x,
                 wl_data_device::ClipboardIpc,
                 wl_data_device_manager::{DND_ALL, DND_NONE},
                 x_data_device::{XClipboardIpc, XIpcDevice},
+                zwlr_data_control_device_v1::{WlrClipboardIpc, ZwlrDataControlDeviceV1},
                 DataSource, DynDataOffer, DynDataSource, SharedState, SourceData,
                 OFFER_STATE_ACCEPTED, OFFER_STATE_DROPPED, SOURCE_STATE_CANCELLED,
                 SOURCE_STATE_DROPPED,
@@ -66,12 +68,16 @@ impl DynDataSource for WlDataSource {
         offer_source_to_x::<XClipboardIpc, Self>(&self, dd);
     }
 
+    fn offer_to_wlr_device(self: Rc<Self>, dd: &Rc<ZwlrDataControlDeviceV1>) {
+        offer_source_to_wlr_device::<WlrClipboardIpc, Self>(&self, dd)
+    }
+
     fn detach_seat(&self, seat: &Rc<WlSeatGlobal>) {
         detach_seat(self, seat);
     }
 
-    fn cancel_offers(&self) {
-        cancel_offers(self);
+    fn cancel_unprivileged_offers(&self) {
+        cancel_offers(self, false);
     }
 
     fn send_target(&self, mime_type: Option<&str>) {
@@ -112,7 +118,7 @@ impl WlDataSource {
         self.data.shared.set(Rc::new(SharedState::default()));
         self.send_target(None);
         self.send_action(DND_NONE);
-        cancel_offers(self);
+        cancel_offers(self, false);
     }
 
     pub fn update_selected_action(&self) {

src/ifs/ipc/x_data_source.rs

@@ -4,9 +4,14 @@ use {
         ifs::{
             ipc::{
                 cancel_offers, detach_seat, offer_source_to_regular_client,
-                wl_data_device::ClipboardIpc, x_data_device::XIpcDevice,
-                zwp_primary_selection_device_v1::PrimarySelectionIpc, DataSource, DynDataSource,
-                IpcLocation, SourceData,
+                offer_source_to_wlr_device,
+                wl_data_device::ClipboardIpc,
+                x_data_device::XIpcDevice,
+                zwlr_data_control_device_v1::{
+                    WlrClipboardIpc, WlrPrimarySelectionIpc, ZwlrDataControlDeviceV1,
+                },
+                zwp_primary_selection_device_v1::PrimarySelectionIpc,
+                DataSource, DynDataSource, IpcLocation, SourceData,
             },
             wl_seat::WlSeatGlobal,
         },
@@ -61,19 +66,30 @@ impl DynDataSource for XDataSource {
     }
 
     fn offer_to_x(self: Rc<Self>, _dd: &Rc<XIpcDevice>) {
-        self.cancel_offers();
+        self.cancel_unprivileged_offers();
         self.state.xwayland.queue.push(IpcSetSelection {
             location: self.location,
             seat: self.device.seat.id(),
             offer: None,
         });
     }
 
+    fn offer_to_wlr_device(self: Rc<Self>, dd: &Rc<ZwlrDataControlDeviceV1>) {
+        match self.location {
+            IpcLocation::Clipboard => {
+                offer_source_to_wlr_device::<WlrClipboardIpc, Self>(&self, dd)
+            }
+            IpcLocation::PrimarySelection => {
+                offer_source_to_wlr_device::<WlrPrimarySelectionIpc, Self>(&self, dd)
+            }
+        }
+    }
+
     fn detach_seat(&self, seat: &Rc<WlSeatGlobal>) {
         detach_seat(self, seat);
     }
 
-    fn cancel_offers(&self) {
-        cancel_offers(self)
+    fn cancel_unprivileged_offers(&self) {
+        cancel_offers(self, false)
     }
 }