djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

egui-winit: improve clipboard logging

Browse source
This commit is contained in:
Emil Ernerfeldt 2022-12-13 09:09:25 +01:00
parent 26eb002270
commit 32677a54e4
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/egui-winit/src/clipboard.rs
View file

@ -30,6 +30,7 @@ impl Clipboard {
Self { Self {
#[cfg(all(feature = "arboard", not(target_os = "android")))] #[cfg(all(feature = "arboard", not(target_os = "android")))]
arboard: init_arboard(), arboard: init_arboard(),
#[cfg(all( #[cfg(all(
any( any(
target_os = "linux", target_os = "linux",
@ -41,6 +42,7 @@ impl Clipboard {
feature = "smithay-clipboard" feature = "smithay-clipboard"
))] ))]
smithay: init_smithay_clipboard(wayland_display), smithay: init_smithay_clipboard(wayland_display),
clipboard: Default::default(), clipboard: Default::default(),
} }
} }
@ -60,7 +62,7 @@ impl Clipboard {
return match clipboard.load() { return match clipboard.load() {
Ok(text) => Some(text), Ok(text) => Some(text),
Err(err) => { Err(err) => {
tracing::error!("Paste error: {}", err); tracing::error!("smithay paste error: {err}");
None None
} }
}; };
@ -71,7 +73,7 @@ impl Clipboard {
return match clipboard.get_text() { return match clipboard.get_text() {
Ok(text) => Some(text), Ok(text) => Some(text),
Err(err) => { Err(err) => {
tracing::error!("Paste error: {}", err); tracing::error!("arboard paste error: {err}");
None None
} }
}; };
@ -99,7 +101,7 @@ impl Clipboard {
#[cfg(all(feature = "arboard", not(target_os = "android")))] #[cfg(all(feature = "arboard", not(target_os = "android")))]
if let Some(clipboard) = &mut self.arboard { if let Some(clipboard) = &mut self.arboard {
if let Err(err) = clipboard.set_text(text) { if let Err(err) = clipboard.set_text(text) {
tracing::error!("Copy/Cut error: {}", err); tracing::error!("arboard copy/cut error: {err}");
} }
return; return;
} }
@ -110,10 +112,11 @@ impl Clipboard {
#[cfg(all(feature = "arboard", not(target_os = "android")))] #[cfg(all(feature = "arboard", not(target_os = "android")))]
fn init_arboard() -> Option<arboard::Clipboard> { fn init_arboard() -> Option<arboard::Clipboard> {
tracing::debug!("Initializing arboard clipboard…");
match arboard::Clipboard::new() { match arboard::Clipboard::new() {
Ok(clipboard) => Some(clipboard), Ok(clipboard) => Some(clipboard),
Err(err) => { Err(err) => {
tracing::error!("Failed to initialize clipboard: {}", err); tracing::warn!("Failed to initialize arboard clipboard: {err}");
None None
} }
} }
@ -133,10 +136,11 @@ fn init_smithay_clipboard(
wayland_display: Option<*mut c_void>, wayland_display: Option<*mut c_void>,
) -> Option<smithay_clipboard::Clipboard> { ) -> Option<smithay_clipboard::Clipboard> {
if let Some(display) = wayland_display { if let Some(display) = wayland_display {
tracing::debug!("Initializing smithay clipboard…");
#[allow(unsafe_code)] #[allow(unsafe_code)]
Some(unsafe { smithay_clipboard::Clipboard::new(display) }) Some(unsafe { smithay_clipboard::Clipboard::new(display) })
} else { } else {
tracing::error!("Cannot initialize smithay clipboard without a display handle!"); tracing::debug!("Cannot initialize smithay clipboard without a display handle");
None None
} }
} }