diff --git a/src/xwayland/xwm.rs b/src/xwayland/xwm.rs index e3856daa..d35b4d2a 100644 --- a/src/xwayland/xwm.rs +++ b/src/xwayland/xwm.rs @@ -25,7 +25,6 @@ use { x_surface::xwindow::{XInputModel, Xwindow, XwindowData}, }, }, - io_uring::{IoUring, IoUringError}, rect::Rect, state::State, tree::{Node, ToplevelNode}, @@ -39,7 +38,6 @@ use { hash_map_ext::HashMapExt, linkedlist::LinkedList, numcell::NumCell, - oserror::OsError, pipe::{Pipe, pipe}, rc_eq::rc_eq, }, @@ -65,10 +63,9 @@ use { ICCCM_WM_HINT_INPUT, ICCCM_WM_STATE_ICONIC, ICCCM_WM_STATE_NORMAL, ICCCM_WM_STATE_WITHDRAWN, INPUT_FOCUS_POINTER_ROOT, MWM_HINTS_DECORATIONS_FIELD, MWM_HINTS_FLAGS_FIELD, NOTIFY_DETAIL_POINTER, NOTIFY_MODE_GRAB, NOTIFY_MODE_UNGRAB, - PROP_MODE_APPEND, PROP_MODE_REPLACE, RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID, - SELECTION_CLIENT_CLOSE_MASK, SELECTION_WINDOW_DESTROY_MASK, - SET_SELECTION_OWNER_MASK, STACK_MODE_ABOVE, STACK_MODE_BELOW, - WINDOW_CLASS_INPUT_OUTPUT, + PROP_MODE_REPLACE, RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID, SELECTION_CLIENT_CLOSE_MASK, + SELECTION_WINDOW_DESTROY_MASK, SET_SELECTION_OWNER_MASK, STACK_MODE_ABOVE, + STACK_MODE_BELOW, WINDOW_CLASS_INPUT_OUTPUT, }, }, xwayland::{XWaylandError, XWaylandEvent}, @@ -84,9 +81,8 @@ use { mem::{self}, ops::{Deref, DerefMut}, rc::Rc, - time::Duration, }, - uapi::{OwnedFd, c}, + uapi::OwnedFd, }; atoms! { diff --git a/src/xwayland/xwm/transfer.rs b/src/xwayland/xwm/transfer.rs index 9eecc440..c090b12c 100644 --- a/src/xwayland/xwm/transfer.rs +++ b/src/xwayland/xwm/transfer.rs @@ -1,4 +1,18 @@ -use super::*; +use { + super::XwmShared, + crate::{ + io_uring::{IoUring, IoUringError}, + state::State, + utils::{buf::Buf, errorfmt::ErrorFmt, oserror::OsError}, + wire_xcon::{ChangeProperty, SelectionNotify}, + xcon::{ + Xcon, + consts::{ATOM_NONE, PROP_MODE_APPEND}, + }, + }, + std::{rc::Rc, time::Duration}, + uapi::{OwnedFd, c}, +}; pub(super) struct XToWaylandTransfer { pub(super) id: u64,