diff --git a/src/client/objects.rs b/src/client/objects.rs index d4449f84..28bb46a1 100644 --- a/src/client/objects.rs +++ b/src/client/objects.rs @@ -10,7 +10,7 @@ use { ext_image_capture_source_v1::ExtImageCaptureSourceV1, ext_image_copy::ext_image_copy_capture_session_v1::ExtImageCopyCaptureSessionV1, head_management::jay_head_error_v1::JayHeadErrorV1, - ipc::{ + data_transfer::{ data_control::{ ext_data_control_source_v1::ExtDataControlSourceV1, zwlr_data_control_source_v1::ZwlrDataControlSourceV1, diff --git a/src/globals.rs b/src/globals.rs index f27155ca..23d303e2 100644 --- a/src/globals.rs +++ b/src/globals.rs @@ -11,7 +11,7 @@ use { ext_session_lock_manager_v1::ExtSessionLockManagerV1Global, head_management::jay_head_manager_v1::JayHeadManagerV1Global, hyprland_focus_grab_manager_v1::HyprlandFocusGrabManagerV1Global, - ipc::{ + data_transfer::{ data_control::{ ext_data_control_manager_v1::ExtDataControlManagerV1Global, zwlr_data_control_manager_v1::ZwlrDataControlManagerV1Global, diff --git a/src/ifs.rs b/src/ifs.rs index 36d5f8a1..7df67bae 100644 --- a/src/ifs.rs +++ b/src/ifs.rs @@ -1,4 +1,5 @@ pub mod color_management; +pub mod data_transfer; pub mod ext_foreign_toplevel_handle_v1; pub mod ext_foreign_toplevel_image_capture_source_manager_v1; pub mod ext_foreign_toplevel_list_v1; @@ -12,7 +13,6 @@ pub mod ext_session_lock_v1; pub mod head_management; pub mod hyprland_focus_grab_manager_v1; pub mod hyprland_focus_grab_v1; -pub mod ipc; pub mod jay_client_query; pub mod jay_color_management; pub mod jay_compositor; diff --git a/src/ifs/ipc.rs b/src/ifs/data_transfer.rs similarity index 99% rename from src/ifs/ipc.rs rename to src/ifs/data_transfer.rs index 58c4adaf..cab966f1 100644 --- a/src/ifs/ipc.rs +++ b/src/ifs/data_transfer.rs @@ -2,7 +2,7 @@ use { crate::{ client::{Client, ClientError, ClientId}, fixed::Fixed, - ifs::{ipc::x_data_device::XIpcDevice, wl_seat::WlSeatGlobal}, + ifs::{data_transfer::x_data_device::XIpcDevice, wl_seat::WlSeatGlobal}, utils::{ bitflags::BitflagsExt, cell_ext::CellExt, clonecell::CloneCell, numcell::NumCell, smallmap::SmallMap, diff --git a/src/ifs/ipc/data_control.rs b/src/ifs/data_transfer/data_control.rs similarity index 90% rename from src/ifs/ipc/data_control.rs rename to src/ifs/data_transfer/data_control.rs index 26fe691c..01242833 100644 --- a/src/ifs/ipc/data_control.rs +++ b/src/ifs/data_transfer/data_control.rs @@ -1,5 +1,5 @@ use { - crate::ifs::ipc::{DynDataSource, IpcLocation}, + crate::ifs::data_transfer::{DynDataSource, IpcLocation}, std::rc::Rc, }; diff --git a/src/ifs/ipc/data_control/ext_data_control_device_v1.rs b/src/ifs/data_transfer/data_control/ext_data_control_device_v1.rs similarity index 99% rename from src/ifs/ipc/data_control/ext_data_control_device_v1.rs rename to src/ifs/data_transfer/data_control/ext_data_control_device_v1.rs index 2765e45c..bdb29e12 100644 --- a/src/ifs/ipc/data_control/ext_data_control_device_v1.rs +++ b/src/ifs/data_transfer/data_control/ext_data_control_device_v1.rs @@ -2,7 +2,7 @@ use { crate::{ client::Client, ifs::{ - ipc::data_control::{ + data_transfer::data_control::{ ext_data_control_offer_v1::ExtDataControlOfferV1, ext_data_control_source_v1::ExtDataControlSourceV1, private::{ diff --git a/src/ifs/ipc/data_control/ext_data_control_manager_v1.rs b/src/ifs/data_transfer/data_control/ext_data_control_manager_v1.rs similarity index 99% rename from src/ifs/ipc/data_control/ext_data_control_manager_v1.rs rename to src/ifs/data_transfer/data_control/ext_data_control_manager_v1.rs index a1d60588..c7caaf21 100644 --- a/src/ifs/ipc/data_control/ext_data_control_manager_v1.rs +++ b/src/ifs/data_transfer/data_control/ext_data_control_manager_v1.rs @@ -2,7 +2,7 @@ use { crate::{ client::{CAP_DATA_CONTROL_MANAGER, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, - ifs::ipc::{ + ifs::data_transfer::{ IpcLocation, data_control::{ DynDataControlDevice, ext_data_control_device_v1::ExtDataControlDeviceV1, diff --git a/src/ifs/ipc/data_control/ext_data_control_offer_v1.rs b/src/ifs/data_transfer/data_control/ext_data_control_offer_v1.rs similarity index 97% rename from src/ifs/ipc/data_control/ext_data_control_offer_v1.rs rename to src/ifs/data_transfer/data_control/ext_data_control_offer_v1.rs index 66985730..66b555bb 100644 --- a/src/ifs/ipc/data_control/ext_data_control_offer_v1.rs +++ b/src/ifs/data_transfer/data_control/ext_data_control_offer_v1.rs @@ -1,6 +1,6 @@ use { crate::{ - ifs::ipc::data_control::{ + ifs::data_transfer::data_control::{ ext_data_control_device_v1::ExtDataControlIpc, private::{ DataControlOffer, DataControlOfferData, diff --git a/src/ifs/ipc/data_control/ext_data_control_source_v1.rs b/src/ifs/data_transfer/data_control/ext_data_control_source_v1.rs similarity index 98% rename from src/ifs/ipc/data_control/ext_data_control_source_v1.rs rename to src/ifs/data_transfer/data_control/ext_data_control_source_v1.rs index 50ea99d5..0baf5964 100644 --- a/src/ifs/ipc/data_control/ext_data_control_source_v1.rs +++ b/src/ifs/data_transfer/data_control/ext_data_control_source_v1.rs @@ -1,7 +1,7 @@ use { crate::{ client::Client, - ifs::ipc::{ + ifs::data_transfer::{ IpcLocation, SourceData, data_control::{ ext_data_control_device_v1::ExtDataControlIpc, diff --git a/src/ifs/ipc/data_control/private.rs b/src/ifs/data_transfer/data_control/private.rs similarity index 99% rename from src/ifs/ipc/data_control/private.rs rename to src/ifs/data_transfer/data_control/private.rs index bb5aeb47..f23dad15 100644 --- a/src/ifs/ipc/data_control/private.rs +++ b/src/ifs/data_transfer/data_control/private.rs @@ -2,7 +2,7 @@ use { crate::{ client::{Client, ClientError, ClientId, WaylandObject, WaylandObjectLookup}, ifs::{ - ipc::{ + data_transfer::{ DataOffer, DataOfferId, DataSource, DeviceData, DynDataOffer, DynDataSource, IpcLocation, IpcVtable, OfferData, Role, SourceData, cancel_offer, cancel_offers, data_control::{DataControlDeviceId, DynDataControlDevice}, @@ -292,7 +292,7 @@ pub mod logic { crate::{ client::ClientError, ifs::{ - ipc::{ + data_transfer::{ IpcLocation, add_data_source_mime_type, break_device_loops, break_offer_loops, break_source_loops, data_control::private::{ diff --git a/src/ifs/ipc/data_control/zwlr_data_control_device_v1.rs b/src/ifs/data_transfer/data_control/zwlr_data_control_device_v1.rs similarity index 99% rename from src/ifs/ipc/data_control/zwlr_data_control_device_v1.rs rename to src/ifs/data_transfer/data_control/zwlr_data_control_device_v1.rs index f4683217..f41182af 100644 --- a/src/ifs/ipc/data_control/zwlr_data_control_device_v1.rs +++ b/src/ifs/data_transfer/data_control/zwlr_data_control_device_v1.rs @@ -2,7 +2,7 @@ use { crate::{ client::Client, ifs::{ - ipc::data_control::{ + data_transfer::data_control::{ private::{ DataControlDevice, DataControlDeviceData, DataControlIpc, DataControlOfferData, logic::{self, DataControlError}, diff --git a/src/ifs/ipc/data_control/zwlr_data_control_manager_v1.rs b/src/ifs/data_transfer/data_control/zwlr_data_control_manager_v1.rs similarity index 99% rename from src/ifs/ipc/data_control/zwlr_data_control_manager_v1.rs rename to src/ifs/data_transfer/data_control/zwlr_data_control_manager_v1.rs index b79b4a0f..5f030451 100644 --- a/src/ifs/ipc/data_control/zwlr_data_control_manager_v1.rs +++ b/src/ifs/data_transfer/data_control/zwlr_data_control_manager_v1.rs @@ -2,7 +2,7 @@ use { crate::{ client::{CAP_DATA_CONTROL_MANAGER, Client, ClientCaps, ClientError}, globals::{Global, GlobalName}, - ifs::ipc::{ + ifs::data_transfer::{ IpcLocation, data_control::{ DynDataControlDevice, zwlr_data_control_device_v1::ZwlrDataControlDeviceV1, diff --git a/src/ifs/ipc/data_control/zwlr_data_control_offer_v1.rs b/src/ifs/data_transfer/data_control/zwlr_data_control_offer_v1.rs similarity index 97% rename from src/ifs/ipc/data_control/zwlr_data_control_offer_v1.rs rename to src/ifs/data_transfer/data_control/zwlr_data_control_offer_v1.rs index f806576f..898342ff 100644 --- a/src/ifs/ipc/data_control/zwlr_data_control_offer_v1.rs +++ b/src/ifs/data_transfer/data_control/zwlr_data_control_offer_v1.rs @@ -1,6 +1,6 @@ use { crate::{ - ifs::ipc::data_control::{ + ifs::data_transfer::data_control::{ private::{ DataControlOffer, DataControlOfferData, logic::{self, DataControlError}, diff --git a/src/ifs/ipc/data_control/zwlr_data_control_source_v1.rs b/src/ifs/data_transfer/data_control/zwlr_data_control_source_v1.rs similarity index 98% rename from src/ifs/ipc/data_control/zwlr_data_control_source_v1.rs rename to src/ifs/data_transfer/data_control/zwlr_data_control_source_v1.rs index 13beb7a9..8e707a55 100644 --- a/src/ifs/ipc/data_control/zwlr_data_control_source_v1.rs +++ b/src/ifs/data_transfer/data_control/zwlr_data_control_source_v1.rs @@ -1,7 +1,7 @@ use { crate::{ client::Client, - ifs::ipc::{ + ifs::data_transfer::{ IpcLocation, SourceData, data_control::{ private::{ diff --git a/src/ifs/ipc/wl_data_device.rs b/src/ifs/data_transfer/wl_data_device.rs similarity index 99% rename from src/ifs/ipc/wl_data_device.rs rename to src/ifs/data_transfer/wl_data_device.rs index 67f75540..053e9391 100644 --- a/src/ifs/ipc/wl_data_device.rs +++ b/src/ifs/data_transfer/wl_data_device.rs @@ -3,7 +3,7 @@ use { client::{Client, ClientError, ClientId}, fixed::Fixed, ifs::{ - ipc::{ + data_transfer::{ DeviceData, IpcVtable, IterableIpcVtable, OfferData, Role, break_device_loops, destroy_data_device, wl_data_offer::WlDataOffer, wl_data_source::WlDataSource, }, diff --git a/src/ifs/ipc/wl_data_device_manager.rs b/src/ifs/data_transfer/wl_data_device_manager.rs similarity index 96% rename from src/ifs/ipc/wl_data_device_manager.rs rename to src/ifs/data_transfer/wl_data_device_manager.rs index 922629f0..30e68ef7 100644 --- a/src/ifs/ipc/wl_data_device_manager.rs +++ b/src/ifs/data_transfer/wl_data_device_manager.rs @@ -2,7 +2,7 @@ use { crate::{ client::{Client, ClientError}, globals::{Global, GlobalName}, - ifs::ipc::{wl_data_device::WlDataDevice, wl_data_source::WlDataSource}, + ifs::data_transfer::{wl_data_device::WlDataDevice, wl_data_source::WlDataSource}, leaks::Tracker, object::{Object, Version}, wire::{WlDataDeviceManagerId, wl_data_device_manager::*}, diff --git a/src/ifs/ipc/wl_data_offer.rs b/src/ifs/data_transfer/wl_data_offer.rs similarity index 99% rename from src/ifs/ipc/wl_data_offer.rs rename to src/ifs/data_transfer/wl_data_offer.rs index d043708c..54ba950a 100644 --- a/src/ifs/ipc/wl_data_offer.rs +++ b/src/ifs/data_transfer/wl_data_offer.rs @@ -3,7 +3,7 @@ use { client::{Client, ClientError, ClientId}, fixed::Fixed, ifs::{ - ipc::{ + data_transfer::{ DataOffer, DataOfferId, DynDataOffer, OFFER_STATE_ACCEPTED, OFFER_STATE_DROPPED, OFFER_STATE_FINISHED, OfferData, Role, SOURCE_STATE_FINISHED, break_offer_loops, cancel_offer, destroy_data_offer, receive_data_offer, diff --git a/src/ifs/ipc/wl_data_source.rs b/src/ifs/data_transfer/wl_data_source.rs similarity index 99% rename from src/ifs/ipc/wl_data_source.rs rename to src/ifs/data_transfer/wl_data_source.rs index 0693527b..763a2bf3 100644 --- a/src/ifs/ipc/wl_data_source.rs +++ b/src/ifs/data_transfer/wl_data_source.rs @@ -2,7 +2,7 @@ use { crate::{ client::{Client, ClientError}, ifs::{ - ipc::{ + data_transfer::{ DataSource, DynDataOffer, DynDataSource, OFFER_STATE_ACCEPTED, OFFER_STATE_DROPPED, SOURCE_STATE_CANCELLED, SOURCE_STATE_DROPPED, SharedState, SourceData, add_data_source_mime_type, break_source_loops, cancel_offers, destroy_data_source, diff --git a/src/ifs/ipc/x_data_device.rs b/src/ifs/data_transfer/x_data_device.rs similarity index 99% rename from src/ifs/ipc/x_data_device.rs rename to src/ifs/data_transfer/x_data_device.rs index 4eeadc91..cf9e8c73 100644 --- a/src/ifs/ipc/x_data_device.rs +++ b/src/ifs/data_transfer/x_data_device.rs @@ -2,7 +2,7 @@ use { crate::{ client::{Client, ClientError}, ifs::{ - ipc::{ + data_transfer::{ DeviceData, IpcLocation, IpcVtable, OfferData, Role, x_data_offer::XDataOffer, x_data_source::XDataSource, }, diff --git a/src/ifs/ipc/x_data_offer.rs b/src/ifs/data_transfer/x_data_offer.rs similarity index 98% rename from src/ifs/ipc/x_data_offer.rs rename to src/ifs/data_transfer/x_data_offer.rs index d6449714..8b562476 100644 --- a/src/ifs/ipc/x_data_offer.rs +++ b/src/ifs/data_transfer/x_data_offer.rs @@ -2,7 +2,7 @@ use { crate::{ client::ClientId, ifs::{ - ipc::{ + data_transfer::{ DataOffer, DataOfferId, DynDataOffer, IpcLocation, OfferData, cancel_offer, x_data_device::{XClipboardIpc, XIpcDevice, XPrimarySelectionIpc}, }, diff --git a/src/ifs/ipc/x_data_source.rs b/src/ifs/data_transfer/x_data_source.rs similarity index 98% rename from src/ifs/ipc/x_data_source.rs rename to src/ifs/data_transfer/x_data_source.rs index 346d0462..d0528fc1 100644 --- a/src/ifs/ipc/x_data_source.rs +++ b/src/ifs/data_transfer/x_data_source.rs @@ -1,7 +1,7 @@ use { crate::{ ifs::{ - ipc::{ + data_transfer::{ DataSource, DynDataSource, IpcLocation, SourceData, cancel_offers, detach_seat, x_data_device::XIpcDevice, }, diff --git a/src/ifs/ipc/zwp_primary_selection_device_manager_v1.rs b/src/ifs/data_transfer/zwp_primary_selection_device_manager_v1.rs similarity index 99% rename from src/ifs/ipc/zwp_primary_selection_device_manager_v1.rs rename to src/ifs/data_transfer/zwp_primary_selection_device_manager_v1.rs index 20714596..98414949 100644 --- a/src/ifs/ipc/zwp_primary_selection_device_manager_v1.rs +++ b/src/ifs/data_transfer/zwp_primary_selection_device_manager_v1.rs @@ -2,7 +2,7 @@ use { crate::{ client::{Client, ClientError}, globals::{Global, GlobalName}, - ifs::ipc::{ + ifs::data_transfer::{ zwp_primary_selection_device_v1::ZwpPrimarySelectionDeviceV1, zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1, }, diff --git a/src/ifs/ipc/zwp_primary_selection_device_v1.rs b/src/ifs/data_transfer/zwp_primary_selection_device_v1.rs similarity index 99% rename from src/ifs/ipc/zwp_primary_selection_device_v1.rs rename to src/ifs/data_transfer/zwp_primary_selection_device_v1.rs index d163b530..c66ec93d 100644 --- a/src/ifs/ipc/zwp_primary_selection_device_v1.rs +++ b/src/ifs/data_transfer/zwp_primary_selection_device_v1.rs @@ -2,7 +2,7 @@ use { crate::{ client::{Client, ClientError, ClientId}, ifs::{ - ipc::{ + data_transfer::{ DeviceData, IpcVtable, IterableIpcVtable, OfferData, Role, break_device_loops, destroy_data_device, zwp_primary_selection_offer_v1::ZwpPrimarySelectionOfferV1, zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1, diff --git a/src/ifs/ipc/zwp_primary_selection_offer_v1.rs b/src/ifs/data_transfer/zwp_primary_selection_offer_v1.rs similarity index 98% rename from src/ifs/ipc/zwp_primary_selection_offer_v1.rs rename to src/ifs/data_transfer/zwp_primary_selection_offer_v1.rs index 071b19f3..71553a03 100644 --- a/src/ifs/ipc/zwp_primary_selection_offer_v1.rs +++ b/src/ifs/data_transfer/zwp_primary_selection_offer_v1.rs @@ -2,7 +2,7 @@ use { crate::{ client::{Client, ClientError, ClientId}, ifs::{ - ipc::{ + data_transfer::{ DataOffer, DataOfferId, DynDataOffer, OfferData, break_offer_loops, cancel_offer, destroy_data_offer, receive_data_offer, zwp_primary_selection_device_v1::{ diff --git a/src/ifs/ipc/zwp_primary_selection_source_v1.rs b/src/ifs/data_transfer/zwp_primary_selection_source_v1.rs similarity index 99% rename from src/ifs/ipc/zwp_primary_selection_source_v1.rs rename to src/ifs/data_transfer/zwp_primary_selection_source_v1.rs index 26d10321..050a7943 100644 --- a/src/ifs/ipc/zwp_primary_selection_source_v1.rs +++ b/src/ifs/data_transfer/zwp_primary_selection_source_v1.rs @@ -2,7 +2,7 @@ use { crate::{ client::{Client, ClientError}, ifs::{ - ipc::{ + data_transfer::{ DataSource, DynDataSource, SourceData, add_data_source_mime_type, break_source_loops, cancel_offers, destroy_data_source, detach_seat, offer_source_to_x, diff --git a/src/ifs/wl_seat.rs b/src/ifs/wl_seat.rs index 74ff4eda..4c5d02bd 100644 --- a/src/ifs/wl_seat.rs +++ b/src/ifs/wl_seat.rs @@ -34,7 +34,7 @@ use { globals::{Global, GlobalName}, ifs::{ ext_idle_notification_v1::ExtIdleNotificationV1, - ipc::{ + data_transfer::{ self, DynDataSource, IpcError, IpcLocation, data_control::{DataControlDeviceId, DynDataControlDevice}, offer_source_to_regular_client, @@ -159,7 +159,7 @@ pub struct DroppedDnd { impl Drop for DroppedDnd { fn drop(&mut self) { if let Some(src) = self.dnd.src.take() { - ipc::detach_seat(&*src, &self.dnd.seat); + data_transfer::detach_seat(&*src, &self.dnd.seat); } } } @@ -1287,8 +1287,8 @@ impl WlSeatGlobal { location: IpcLocation, ) -> Result<(), WlSeatError> where - T: ipc::IterableIpcVtable, - X: ipc::IpcVtable, + T: data_transfer::IterableIpcVtable, + X: data_transfer::IpcVtable, S: DynDataSource, { if let (Some(new), Some(old)) = (&src, &field.get()) @@ -1297,7 +1297,7 @@ impl WlSeatGlobal { return Ok(()); } if let Some(new) = &src { - ipc::attach_seat(&**new, self, ipc::Role::Selection)?; + data_transfer::attach_seat(&**new, self, data_transfer::Role::Selection)?; } let src_dyn = src.clone().map(|s| s as Rc); if let Some(old) = field.set(src_dyn) { @@ -1319,8 +1319,8 @@ impl WlSeatGlobal { selection: Option>, client: &Rc, ) where - T: ipc::IterableIpcVtable, - X: ipc::IpcVtable, + T: data_transfer::IterableIpcVtable, + X: data_transfer::IpcVtable, { if let Some(src) = &selection { src.cancel_unprivileged_offers(); diff --git a/src/ifs/wl_seat/event_handling.rs b/src/ifs/wl_seat/event_handling.rs index 8d19ac5f..53a030de 100644 --- a/src/ifs/wl_seat/event_handling.rs +++ b/src/ifs/wl_seat/event_handling.rs @@ -9,7 +9,7 @@ use { ei::ei_ifs::ei_seat::EiSeat, fixed::Fixed, ifs::{ - ipc::{ + data_transfer::{ offer_source_to_regular_client, wl_data_device::{ClipboardIpc, WlDataDevice}, x_data_device::{XClipboardIpc, XPrimarySelectionIpc}, diff --git a/src/ifs/wl_seat/pointer_owner.rs b/src/ifs/wl_seat/pointer_owner.rs index d1133c46..d0ce8532 100644 --- a/src/ifs/wl_seat/pointer_owner.rs +++ b/src/ifs/wl_seat/pointer_owner.rs @@ -4,8 +4,8 @@ use { cursor::KnownCursor, fixed::Fixed, ifs::{ - ipc, - ipc::wl_data_source::WlDataSource, + data_transfer, + data_transfer::wl_data_source::WlDataSource, wl_seat::{ BTN_LEFT, BTN_RIGHT, CHANGE_CURSOR_MOVED, CHANGE_TREE, Dnd, DroppedDnd, NodeSeatState, WlSeatError, WlSeatGlobal, wl_pointer::PendingScroll, @@ -606,7 +606,7 @@ impl PointerOwner for DndPointerOwner { target.node_on_dnd_leave(&self.dnd); target.node_seat_state().remove_dnd_target(seat); if !should_drop && let Some(src) = &self.dnd.src { - ipc::detach_seat(&**src, seat); + data_transfer::detach_seat(&**src, seat); } if let Some(icon) = self.icon.get() { icon.disable(); @@ -651,7 +651,7 @@ impl PointerOwner for DndPointerOwner { target.node_on_dnd_leave(&self.dnd); target.node_seat_state().remove_dnd_target(seat); if let Some(src) = &self.dnd.src { - ipc::detach_seat(&**src, seat); + data_transfer::detach_seat(&**src, seat); } if let Some(icon) = self.icon.get() { icon.disable(); @@ -887,7 +887,7 @@ impl SimplePointerOwnerUsecase for DefaultPointerUsecase { icon.enable(); } if let Some(new) = &src { - ipc::attach_seat(&**new, seat, ipc::Role::Dnd)?; + data_transfer::attach_seat(&**new, seat, data_transfer::Role::Dnd)?; if let Some(drag) = new.toplevel_drag.get() { drag.start_drag(); } diff --git a/src/ifs/xdg_toplevel_drag_v1.rs b/src/ifs/xdg_toplevel_drag_v1.rs index 3234be47..94af7da8 100644 --- a/src/ifs/xdg_toplevel_drag_v1.rs +++ b/src/ifs/xdg_toplevel_drag_v1.rs @@ -2,7 +2,7 @@ use { crate::{ client::{Client, ClientError}, ifs::{ - ipc::wl_data_source::WlDataSource, wl_seat::WlSeatGlobal, + data_transfer::wl_data_source::WlDataSource, wl_seat::WlSeatGlobal, wl_surface::xdg_surface::xdg_toplevel::XdgToplevel, }, leaks::Tracker, diff --git a/src/state.rs b/src/state.rs index 46ecbcfc..232dc085 100644 --- a/src/state.rs +++ b/src/state.rs @@ -63,7 +63,7 @@ use { HeadManagers, HeadNames, jay_head_manager_session_v1::{HeadManagerEvent, JayHeadManagerSessionV1}, }, - ipc::{ + data_transfer::{ DataOfferIds, DataSourceIds, data_control::DataControlDeviceIds, x_data_device::XIpcDeviceIds, }, diff --git a/src/xwayland.rs b/src/xwayland.rs index 308bd196..b0e409e3 100644 --- a/src/xwayland.rs +++ b/src/xwayland.rs @@ -7,7 +7,7 @@ use { compositor::DISPLAY, forker::{ForkerError, ForkerProxy}, ifs::{ - ipc::{DataOfferId, DataSourceId, IpcLocation, x_data_offer::XDataOffer}, + data_transfer::{DataOfferId, DataSourceId, IpcLocation, x_data_offer::XDataOffer}, wl_seat::SeatId, wl_surface::x_surface::xwindow::{Xwindow, XwindowData}, }, diff --git a/src/xwayland/xwm.rs b/src/xwayland/xwm.rs index f94645fe..effaf682 100644 --- a/src/xwayland/xwm.rs +++ b/src/xwayland/xwm.rs @@ -6,7 +6,7 @@ use { client::Client, criteria::tlm::{TL_CHANGED_CLASS_INST, TL_CHANGED_ROLE}, ifs::{ - ipc::{ + data_transfer::{ DataOfferId, DataSourceId, DynDataOffer, DynDataSource, IpcLocation, IpcVtable, SourceData, add_data_source_mime_type, destroy_data_device, destroy_data_offer, destroy_data_source, receive_data_offer,