kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

xwayland: implement copy/paste

Browse source
This commit is contained in:
Julian Orth 2022-05-10 01:47:10 +02:00
parent c8068ee2e7
commit d6fabcb2b5
22 changed files with 1565 additions and 380 deletions
Download patch file Download diff file Expand all files Collapse all files

167
src/ifs/ipc/zwp_primary_selection_device_v1.rs
View file

@ -3,21 +3,21 @@ use {
client::{Client, ClientError, ClientId},
ifs::{
ipc::{
break_device_loops, destroy_device,
zwp_primary_selection_device_manager_v1::ZwpPrimarySelectionDeviceManagerV1,
break_device_loops, destroy_data_device,
zwp_primary_selection_offer_v1::ZwpPrimarySelectionOfferV1,
zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1, DeviceData,
OfferData, Role, SourceData, Vtable,
IpcVtable, OfferData, Role, SourceData,
},
wl_seat::{WlSeat, WlSeatError, WlSeatGlobal},
wl_seat::{WlSeatError, WlSeatGlobal},
},
leaks::Tracker,
object::{Object, ObjectId},
object::Object,
utils::buffd::{MsgParser, MsgParserError},
wire::{
zwp_primary_selection_device_v1::*, ZwpPrimarySelectionDeviceV1Id,
ZwpPrimarySelectionOfferV1Id,
ZwpPrimarySelectionOfferV1Id, ZwpPrimarySelectionSourceV1Id,
},
xwayland::XWaylandEvent,
},
std::rc::Rc,
thiserror::Error,
@ -26,54 +26,83 @@ use {
pub struct ZwpPrimarySelectionDeviceV1 {
pub id: ZwpPrimarySelectionDeviceV1Id,
pub manager: Rc<ZwpPrimarySelectionDeviceManagerV1>,
seat: Rc<WlSeat>,
data: DeviceData<Self>,
pub client: Rc<Client>,
pub version: u32,
pub seat: Rc<WlSeatGlobal>,
data: DeviceData<PrimarySelectionIpc>,
pub tracker: Tracker<Self>,
}
impl ZwpPrimarySelectionDeviceV1 {
pub fn new(
id: ZwpPrimarySelectionDeviceV1Id,
manager: &Rc<ZwpPrimarySelectionDeviceManagerV1>,
seat: &Rc<WlSeat>,
client: &Rc<Client>,
version: u32,
seat: &Rc<WlSeatGlobal>,
is_xwm: bool,
) -> Self {
Self {
id,
manager: manager.clone(),
client: client.clone(),
version,
seat: seat.clone(),
data: DeviceData::default(),
data: DeviceData {
selection: Default::default(),
dnd: Default::default(),
is_xwm,
},
tracker: Default::default(),
}
}
pub fn send_data_offer(&self, offer: ZwpPrimarySelectionOfferV1Id) {
self.manager.client.event(DataOffer {
self_id: self.id,
offer,
})
pub fn send_data_offer(&self, offer: &Rc<ZwpPrimarySelectionOfferV1>) {
if self.data.is_xwm {
self.client
.state
.xwayland
.queue
.push(XWaylandEvent::PrimarySelectionSetOffer(offer.clone()));
} else {
self.client.event(DataOffer {
self_id: self.id,
offer: offer.id,
})
}
}
pub fn send_selection(&self, id: ZwpPrimarySelectionOfferV1Id) {
self.manager.client.event(Selection {
self_id: self.id,
id,
})
pub fn send_selection(&self, offer: Option<&Rc<ZwpPrimarySelectionOfferV1>>) {
if self.data.is_xwm {
self.client
.state
.xwayland
.queue
.push(XWaylandEvent::PrimarySelectionSetSelection(
self.seat.id(),
offer.cloned(),
));
} else {
let id = offer
.map(|o| o.id)
.unwrap_or(ZwpPrimarySelectionOfferV1Id::NONE);
self.client.event(Selection {
self_id: self.id,
id,
})
}
}
fn set_selection(
&self,
parser: MsgParser<'_, '_>,
) -> Result<(), ZwpPrimarySelectionDeviceV1Error> {
let req: SetSelection = self.manager.client.parse(self, parser)?;
if !self.manager.client.valid_serial(req.serial) {
let req: SetSelection = self.client.parse(self, parser)?;
if !self.client.valid_serial(req.serial) {
log::warn!("Client tried to set_selection with an invalid serial");
return Ok(());
}
if !self
.seat
.global
.may_modify_primary_selection(&self.seat.client, req.serial)
.may_modify_primary_selection(&self.client, Some(req.serial))
{
log::warn!("Ignoring disallowed set_selection request");
return Ok(());
@ -81,40 +110,50 @@ impl ZwpPrimarySelectionDeviceV1 {
let src = if req.source.is_none() {
None
} else {
Some(self.manager.client.lookup(req.source)?)
Some(self.client.lookup(req.source)?)
};
self.seat
.global
.set_primary_selection(src, Some(req.serial))?;
self.seat.set_primary_selection(src, Some(req.serial))?;
Ok(())
}
fn destroy(&self, parser: MsgParser<'_, '_>) -> Result<(), ZwpPrimarySelectionDeviceV1Error> {
let _req: Destroy = self.manager.client.parse(self, parser)?;
destroy_device::<Self>(self);
let _req: Destroy = self.client.parse(self, parser)?;
destroy_data_device::<PrimarySelectionIpc>(self);
self.seat.remove_primary_selection_device(self);
self.manager.client.remove_obj(self)?;
self.client.remove_obj(self)?;
Ok(())
}
}
impl Vtable for ZwpPrimarySelectionDeviceV1 {
type DeviceId = ZwpPrimarySelectionDeviceV1Id;
type OfferId = ZwpPrimarySelectionOfferV1Id;
pub struct PrimarySelectionIpc;
impl IpcVtable for PrimarySelectionIpc {
type Device = ZwpPrimarySelectionDeviceV1;
type Source = ZwpPrimarySelectionSourceV1;
type Offer = ZwpPrimarySelectionOfferV1;
fn device_id(dd: &Self::Device) -> Self::DeviceId {
dd.id
}
fn get_device_data(dd: &Self::Device) -> &DeviceData<Self> {
&dd.data
}
fn get_device_seat(dd: &Self::Device) -> Rc<WlSeatGlobal> {
dd.seat.clone()
}
fn create_xwm_source(client: &Rc<Client>) -> Self::Source {
ZwpPrimarySelectionSourceV1::new(ZwpPrimarySelectionSourceV1Id::NONE, client, true)
}
fn set_seat_selection(
seat: &Rc<WlSeatGlobal>,
source: &Rc<Self::Source>,
serial: Option<u32>,
) -> Result<(), WlSeatError> {
seat.set_primary_selection(Some(source.clone()), serial)
}
fn get_offer_data(offer: &Self::Offer) -> &OfferData<Self> {
&offer.offer_data
&offer.data
}
fn get_source_data(src: &Self::Source) -> &SourceData<Self> {
@ -130,37 +169,43 @@ impl Vtable for ZwpPrimarySelectionDeviceV1 {
fn create_offer(
client: &Rc<Client>,
_device: &Rc<ZwpPrimarySelectionDeviceV1>,
device: &Rc<ZwpPrimarySelectionDeviceV1>,
offer_data: OfferData<Self>,
id: ObjectId,
) -> Rc<Self::Offer> {
) -> Result<Rc<Self::Offer>, ClientError> {
let id = if device.data.is_xwm {
ZwpPrimarySelectionOfferV1Id::NONE
} else {
client.new_id()?
};
let rc = Rc::new(ZwpPrimarySelectionOfferV1 {
id: id.into(),
id,
u64_id: client.state.data_offer_ids.fetch_add(1),
seat: device.seat.clone(),
client: client.clone(),
offer_data,
data: offer_data,
tracker: Default::default(),
});
track!(client, rc);
rc
Ok(rc)
}
fn send_selection(dd: &Self::Device, offer: Self::OfferId) {
fn send_selection(dd: &Self::Device, offer: Option<&Rc<Self::Offer>>) {
dd.send_selection(offer);
}
fn send_cancelled(source: &Self::Source) {
fn send_cancelled(source: &Rc<Self::Source>) {
source.send_cancelled();
}
fn get_offer_id(offer: &Self::Offer) -> Self::OfferId {
offer.id
fn get_offer_id(offer: &Self::Offer) -> u64 {
offer.u64_id
}
fn send_offer(dd: &Self::Device, offer: &Self::Offer) {
dd.send_data_offer(offer.id);
fn send_offer(dd: &Self::Device, offer: &Rc<Self::Offer>) {
dd.send_data_offer(offer);
}
fn send_mime_type(offer: &Self::Offer, mime_type: &str) {
fn send_mime_type(offer: &Rc<Self::Offer>, mime_type: &str) {
offer.send_offer(mime_type);
}
@ -168,9 +213,17 @@ impl Vtable for ZwpPrimarySelectionDeviceV1 {
seat.unset_primary_selection();
}
fn send_send(src: &Self::Source, mime_type: &str, fd: Rc<OwnedFd>) {
fn send_send(src: &Rc<Self::Source>, mime_type: &str, fd: Rc<OwnedFd>) {
src.send_send(mime_type, fd);
}
fn remove_from_seat(device: &Self::Device) {
device.seat.remove_primary_selection_device(device);
}
fn get_offer_seat(offer: &Self::Offer) -> Rc<WlSeatGlobal> {
offer.seat.clone()
}
}
object_base! {
@ -186,7 +239,7 @@ impl Object for ZwpPrimarySelectionDeviceV1 {
}
fn break_loops(&self) {
break_device_loops::<Self>(self);
break_device_loops::<PrimarySelectionIpc>(self);
self.seat.remove_primary_selection_device(self);
}
}