feat: add methods for loading raw data
This commit is contained in:
parent
5dd795d463
commit
71df657777
9 changed files with 153 additions and 63 deletions
|
|
@ -5,13 +5,9 @@ use crate::{
|
|||
|
||||
use raw_window_handle::{HasDisplayHandle, RawDisplayHandle};
|
||||
use std::error::Error;
|
||||
use wayland::MimeType;
|
||||
|
||||
pub use clipboard_wayland as wayland;
|
||||
pub use clipboard_x11 as x11;
|
||||
pub use wayland::{
|
||||
AllowedMimeTypes as InnerAllowedMimeTypes, AsMimeTypes as InnerAsMimeTypes,
|
||||
};
|
||||
|
||||
pub enum Clipboard {
|
||||
Wayland(wayland::Clipboard),
|
||||
|
|
@ -54,7 +50,7 @@ impl ClipboardProvider for Clipboard {
|
|||
|
||||
fn read_data<T: 'static>(&self) -> Option<Result<T, Box<dyn Error>>>
|
||||
where
|
||||
ClipboardLoadData<T>: InnerAllowedMimeTypes,
|
||||
T: mime::AllowedMimeTypes,
|
||||
{
|
||||
match self {
|
||||
Clipboard::Wayland(c) => {
|
||||
|
|
@ -70,7 +66,7 @@ impl ClipboardProvider for Clipboard {
|
|||
contents: ClipboardStoreData<T>,
|
||||
) -> Option<Result<(), Box<dyn Error>>>
|
||||
where
|
||||
ClipboardStoreData<T>: InnerAsMimeTypes,
|
||||
T: mime::AsMimeTypes,
|
||||
{
|
||||
match self {
|
||||
Clipboard::Wayland(c) => {
|
||||
|
|
@ -82,7 +78,7 @@ impl ClipboardProvider for Clipboard {
|
|||
|
||||
fn read_primary_data<T: 'static>(&self) -> Option<Result<T, Box<dyn Error>>>
|
||||
where
|
||||
ClipboardLoadData<T>: InnerAllowedMimeTypes,
|
||||
T: mime::AllowedMimeTypes,
|
||||
{
|
||||
match self {
|
||||
Clipboard::Wayland(c) => {
|
||||
|
|
@ -93,12 +89,32 @@ impl ClipboardProvider for Clipboard {
|
|||
}
|
||||
}
|
||||
|
||||
fn read_primary_raw(
|
||||
&self,
|
||||
allowed: Vec<String>,
|
||||
) -> Option<Result<(Vec<u8>, String), Box<dyn Error>>> {
|
||||
match self {
|
||||
Clipboard::Wayland(c) => Some(c.read_primary_raw(allowed)),
|
||||
Clipboard::X11(_) => None,
|
||||
}
|
||||
}
|
||||
|
||||
fn read_raw(
|
||||
&self,
|
||||
allowed: Vec<String>,
|
||||
) -> Option<Result<(Vec<u8>, String), Box<dyn Error>>> {
|
||||
match self {
|
||||
Clipboard::Wayland(c) => Some(c.read_raw(allowed)),
|
||||
Clipboard::X11(_) => None,
|
||||
}
|
||||
}
|
||||
|
||||
fn write_primary_data<T: Send + Sync + 'static>(
|
||||
&mut self,
|
||||
contents: ClipboardStoreData<T>,
|
||||
) -> Option<Result<(), Box<dyn Error>>>
|
||||
where
|
||||
ClipboardStoreData<T>: InnerAsMimeTypes,
|
||||
T: mime::AsMimeTypes,
|
||||
{
|
||||
match self {
|
||||
Clipboard::Wayland(c) => {
|
||||
|
|
@ -121,51 +137,3 @@ pub unsafe fn connect<W: HasDisplayHandle>(
|
|||
|
||||
Ok(clipboard)
|
||||
}
|
||||
|
||||
impl<T: crate::mime::AsMimeTypes> InnerAsMimeTypes for ClipboardLoadData<T> {
|
||||
fn available(&self) -> std::borrow::Cow<'static, [MimeType]> {
|
||||
self.0
|
||||
.available()
|
||||
.into_iter()
|
||||
.map(|m| MimeType::Other(m.clone().into()))
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn as_bytes(
|
||||
&self,
|
||||
mime_type: &MimeType,
|
||||
) -> Option<std::borrow::Cow<'static, [u8]>> {
|
||||
self.0.as_bytes(mime_type.as_ref())
|
||||
}
|
||||
}
|
||||
|
||||
impl<T: crate::mime::AllowedMimeTypes> InnerAllowedMimeTypes
|
||||
for ClipboardLoadData<T>
|
||||
where
|
||||
ClipboardLoadData<T>: TryFrom<(Vec<u8>, MimeType)>,
|
||||
{
|
||||
// TODO select text variants if string matches...
|
||||
fn allowed() -> std::borrow::Cow<'static, [wayland::MimeType]> {
|
||||
T::allowed()
|
||||
.into_iter()
|
||||
.map(|s| MimeType::Other(s.clone().into()))
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> TryFrom<(Vec<u8>, MimeType)> for ClipboardLoadData<T>
|
||||
where
|
||||
T: for<'b> TryFrom<(Vec<u8>, String)>,
|
||||
T: 'static,
|
||||
{
|
||||
type Error = crate::mime::Error;
|
||||
|
||||
fn try_from(
|
||||
(value, mime): (Vec<u8>, MimeType),
|
||||
) -> Result<Self, Self::Error> {
|
||||
let mime = mime.to_string();
|
||||
Ok(ClipboardLoadData(
|
||||
T::try_from((value, mime)).map_err(|_| crate::mime::Error)?,
|
||||
))
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue