-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
575 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
# Unreleased | ||
|
||
- Add support fo ext-data-control-v1. | ||
|
||
# 1.7.0 (2024-10-25) | ||
|
||
- Various bugfixes. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,158 @@ | ||
use { | ||
crate::{ | ||
client::Client, | ||
ifs::{ | ||
ipc::data_control::{ | ||
ext_data_control_offer_v1::ExtDataControlOfferV1, | ||
ext_data_control_source_v1::ExtDataControlSourceV1, | ||
private::{ | ||
logic::{self, DataControlError}, | ||
DataControlDevice, DataControlDeviceData, DataControlIpc, DataControlOfferData, | ||
}, | ||
}, | ||
wl_seat::WlSeatGlobal, | ||
}, | ||
leaks::Tracker, | ||
object::{Object, Version}, | ||
wire::{ | ||
ext_data_control_device_v1::*, ExtDataControlDeviceV1Id, ExtDataControlOfferV1Id, | ||
ExtDataControlSourceV1Id, | ||
}, | ||
}, | ||
std::rc::Rc, | ||
thiserror::Error, | ||
}; | ||
|
||
pub struct ExtDataControlDeviceV1 { | ||
pub id: ExtDataControlDeviceV1Id, | ||
pub data: DataControlDeviceData<ExtDataControlIpc>, | ||
pub tracker: Tracker<Self>, | ||
} | ||
|
||
impl ExtDataControlDeviceV1 { | ||
pub fn new( | ||
id: ExtDataControlDeviceV1Id, | ||
client: &Rc<Client>, | ||
version: Version, | ||
seat: &Rc<WlSeatGlobal>, | ||
) -> Self { | ||
Self { | ||
id, | ||
data: DataControlDeviceData { | ||
data_control_device_id: client.state.data_control_device_ids.next(), | ||
client: client.clone(), | ||
version, | ||
seat: seat.clone(), | ||
clipboard_data: Default::default(), | ||
primary_selection_data: Default::default(), | ||
}, | ||
tracker: Default::default(), | ||
} | ||
} | ||
|
||
pub fn send_data_offer(&self, offer: &Rc<ExtDataControlOfferV1>) { | ||
self.data.client.event(DataOffer { | ||
self_id: self.id, | ||
id: offer.id, | ||
}) | ||
} | ||
|
||
pub fn send_selection(&self, offer: Option<&Rc<ExtDataControlOfferV1>>) { | ||
let id = offer.map(|o| o.id).unwrap_or(ExtDataControlOfferV1Id::NONE); | ||
self.data.client.event(Selection { | ||
self_id: self.id, | ||
id, | ||
}) | ||
} | ||
|
||
pub fn send_primary_selection(&self, offer: Option<&Rc<ExtDataControlOfferV1>>) { | ||
let id = offer.map(|o| o.id).unwrap_or(ExtDataControlOfferV1Id::NONE); | ||
self.data.client.event(PrimarySelection { | ||
self_id: self.id, | ||
id, | ||
}) | ||
} | ||
} | ||
|
||
impl ExtDataControlDeviceV1RequestHandler for ExtDataControlDeviceV1 { | ||
type Error = ExtDataControlDeviceV1Error; | ||
|
||
fn set_selection(&self, req: SetSelection, _slf: &Rc<Self>) -> Result<(), Self::Error> { | ||
logic::device_set_selection(self, req.source.is_some().then_some(req.source))?; | ||
Ok(()) | ||
} | ||
|
||
fn destroy(&self, _req: Destroy, _slf: &Rc<Self>) -> Result<(), Self::Error> { | ||
logic::device_destroy(self)?; | ||
Ok(()) | ||
} | ||
|
||
fn set_primary_selection( | ||
&self, | ||
req: SetPrimarySelection, | ||
_slf: &Rc<Self>, | ||
) -> Result<(), Self::Error> { | ||
logic::device_set_primary_selection(self, req.source.is_some().then_some(req.source))?; | ||
Ok(()) | ||
} | ||
} | ||
|
||
pub struct ExtDataControlIpc; | ||
|
||
impl DataControlIpc for ExtDataControlIpc { | ||
const PRIMARY_SELECTION_SINCE: Version = Version(1); | ||
type Device = ExtDataControlDeviceV1; | ||
type OfferId = ExtDataControlOfferV1Id; | ||
type Offer = ExtDataControlOfferV1; | ||
type SourceId = ExtDataControlSourceV1Id; | ||
type Source = ExtDataControlSourceV1; | ||
|
||
fn create_offer(id: Self::OfferId, data: DataControlOfferData<Self>) -> Rc<Self::Offer> { | ||
let rc = Rc::new(ExtDataControlOfferV1 { | ||
id, | ||
data, | ||
tracker: Default::default(), | ||
}); | ||
track!(rc.data.client, rc); | ||
rc | ||
} | ||
} | ||
|
||
impl DataControlDevice for ExtDataControlDeviceV1 { | ||
type Ipc = ExtDataControlIpc; | ||
|
||
fn data(&self) -> &DataControlDeviceData<Self::Ipc> { | ||
&self.data | ||
} | ||
|
||
fn send_data_offer(&self, offer: &Rc<<Self::Ipc as DataControlIpc>::Offer>) { | ||
self.send_data_offer(offer) | ||
} | ||
|
||
fn send_selection(&self, offer: Option<&Rc<<Self::Ipc as DataControlIpc>::Offer>>) { | ||
self.send_selection(offer) | ||
} | ||
|
||
fn send_primary_selection(&self, offer: Option<&Rc<<Self::Ipc as DataControlIpc>::Offer>>) { | ||
self.send_primary_selection(offer) | ||
} | ||
} | ||
|
||
object_base! { | ||
self = ExtDataControlDeviceV1; | ||
version = self.data.version; | ||
} | ||
|
||
impl Object for ExtDataControlDeviceV1 { | ||
fn break_loops(&self) { | ||
logic::data_device_break_loops(self); | ||
} | ||
} | ||
|
||
simple_add_obj!(ExtDataControlDeviceV1); | ||
|
||
#[derive(Debug, Error)] | ||
pub enum ExtDataControlDeviceV1Error { | ||
#[error(transparent)] | ||
DataControlError(#[from] DataControlError), | ||
} |
134 changes: 134 additions & 0 deletions
134
src/ifs/ipc/data_control/ext_data_control_manager_v1.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,134 @@ | ||
use { | ||
crate::{ | ||
client::{Client, ClientCaps, ClientError, CAP_DATA_CONTROL_MANAGER}, | ||
globals::{Global, GlobalName}, | ||
ifs::ipc::{ | ||
data_control::{ | ||
ext_data_control_device_v1::ExtDataControlDeviceV1, | ||
ext_data_control_source_v1::ExtDataControlSourceV1, DynDataControlDevice, | ||
}, | ||
IpcLocation, | ||
}, | ||
leaks::Tracker, | ||
object::{Object, Version}, | ||
wire::{ext_data_control_manager_v1::*, ExtDataControlManagerV1Id}, | ||
}, | ||
std::rc::Rc, | ||
thiserror::Error, | ||
}; | ||
|
||
pub struct ExtDataControlManagerV1Global { | ||
name: GlobalName, | ||
} | ||
|
||
pub struct ExtDataControlManagerV1 { | ||
pub id: ExtDataControlManagerV1Id, | ||
pub client: Rc<Client>, | ||
pub version: Version, | ||
tracker: Tracker<Self>, | ||
} | ||
|
||
impl ExtDataControlManagerV1Global { | ||
pub fn new(name: GlobalName) -> Self { | ||
Self { name } | ||
} | ||
|
||
fn bind_( | ||
self: Rc<Self>, | ||
id: ExtDataControlManagerV1Id, | ||
client: &Rc<Client>, | ||
version: Version, | ||
) -> Result<(), ExtDataControlManagerV1Error> { | ||
let obj = Rc::new(ExtDataControlManagerV1 { | ||
id, | ||
client: client.clone(), | ||
version, | ||
tracker: Default::default(), | ||
}); | ||
track!(client, obj); | ||
client.add_client_obj(&obj)?; | ||
Ok(()) | ||
} | ||
} | ||
|
||
impl ExtDataControlManagerV1RequestHandler for ExtDataControlManagerV1 { | ||
type Error = ExtDataControlManagerV1Error; | ||
|
||
fn create_data_source( | ||
&self, | ||
req: CreateDataSource, | ||
_slf: &Rc<Self>, | ||
) -> Result<(), Self::Error> { | ||
let res = Rc::new(ExtDataControlSourceV1::new( | ||
req.id, | ||
&self.client, | ||
self.version, | ||
)); | ||
track!(self.client, res); | ||
self.client.add_client_obj(&res)?; | ||
Ok(()) | ||
} | ||
|
||
fn get_data_device(&self, req: GetDataDevice, _slf: &Rc<Self>) -> Result<(), Self::Error> { | ||
let seat = self.client.lookup(req.seat)?; | ||
let dev = Rc::new(ExtDataControlDeviceV1::new( | ||
req.id, | ||
&self.client, | ||
self.version, | ||
&seat.global, | ||
)); | ||
track!(self.client, dev); | ||
seat.global.add_data_control_device(dev.clone()); | ||
self.client.add_client_obj(&dev)?; | ||
dev.clone() | ||
.handle_new_source(IpcLocation::Clipboard, seat.global.get_selection()); | ||
dev.clone().handle_new_source( | ||
IpcLocation::PrimarySelection, | ||
seat.global.get_primary_selection(), | ||
); | ||
Ok(()) | ||
} | ||
|
||
fn destroy(&self, _req: Destroy, _slf: &Rc<Self>) -> Result<(), Self::Error> { | ||
self.client.remove_obj(self)?; | ||
Ok(()) | ||
} | ||
} | ||
|
||
global_base!( | ||
ExtDataControlManagerV1Global, | ||
ExtDataControlManagerV1, | ||
ExtDataControlManagerV1Error | ||
); | ||
|
||
impl Global for ExtDataControlManagerV1Global { | ||
fn singleton(&self) -> bool { | ||
true | ||
} | ||
|
||
fn version(&self) -> u32 { | ||
1 | ||
} | ||
|
||
fn required_caps(&self) -> ClientCaps { | ||
CAP_DATA_CONTROL_MANAGER | ||
} | ||
} | ||
|
||
simple_add_global!(ExtDataControlManagerV1Global); | ||
|
||
object_base! { | ||
self = ExtDataControlManagerV1; | ||
version = self.version; | ||
} | ||
|
||
impl Object for ExtDataControlManagerV1 {} | ||
|
||
simple_add_obj!(ExtDataControlManagerV1); | ||
|
||
#[derive(Debug, Error)] | ||
pub enum ExtDataControlManagerV1Error { | ||
#[error(transparent)] | ||
ClientError(Box<ClientError>), | ||
} | ||
efrom!(ExtDataControlManagerV1Error, ClientError); |
Oops, something went wrong.