Merge pull request #600 from xrelkd/feat/wayland

Remove `Wayland` Support

README.md

@@ -36,7 +36,7 @@
 - [x] Persistent contents of clipboard
 - [x] Support snippets
 - [x] Support `X11`
-- [x] Support `Wayland` (experimentally)
+- [ ] ~~Support `Wayland` (experimentally)~~
 - [x] Support `macOS`
 - [x] Support `gRPC`
   - [x] gRPC over `HTTP`
@@ -87,9 +87,9 @@ Currently, `clipcat` supports the following [windowing systems](https://en.wikip
 - `X11`, the following `crate`s are leveraged:
   - [x11rb](https://github.com/psychon/x11rb)
   - [arboard](https://github.com/1Password/arboard)
-- `Wayland` (experimentally), the following `crate`s are leveraged:
-  - [wl-clipboard-rs](https://github.com/YaLTeR/wl-clipboard-rs)
-  - [arboard](https://github.com/1Password/arboard)
+- ~~`Wayland` (experimentally), the following `crate`s are leveraged:~~
+  - ~~[wl-clipboard-rs](https://github.com/YaLTeR/wl-clipboard-rs)~~
+  - ~~[arboard](https://github.com/1Password/arboard)~~
 
 ### Clipcat Client
 
@@ -200,9 +200,9 @@ emit_stderr = false
 level = "INFO"
 
 [watcher]
-# Enable watching X11/Wayland clipboard selection.
+# Enable watching X11 clipboard selection.
 enable_clipboard = true
-# Enable watching X11/Wayland primary selection.
+# Enable watching X11 primary selection.
 enable_primary = true
 # Ignore clips which match with one of the X11 `TARGETS`.
 sensitive_x11_atoms = ["x-kde-passwordManagerHint"]

crates/clipboard/Cargo.toml

@@ -28,25 +28,24 @@ snafu       = { workspace = true }
 clipcat-base = { path = "../base/" }
 
 [target.'cfg(all(unix, not(any(target_os="macos", target_os="android", target_os="emscripten"))))'.dependencies]
-x11rb           = { version = "0.13", features = ["xfixes"] }
-wl-clipboard-rs = "0.9"
+x11rb = { version = "0.13", features = ["xfixes"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc            = "0.2"
 objc_id         = "0.1"
 objc-foundation = "0.1"
 
 [dev-dependencies]
-tracing-subscriber = "0.3"
+tracing-subscriber = { workspace = true }
 
-tokio = { version = "1", features = [
+tokio = { workspace = true, features = [
   "macros",
   "rt-multi-thread",
   "signal",
   "sync",
 ] }
 
-sigfinn = "0.2"
+sigfinn = { workspace = true }
 
 [[example]]
 name = "load"

crates/clipboard/src/default.rs

@@ -30,7 +30,7 @@ use crate::listener::MacOsListener;
         target_os = "emscripten"
     ))
 ))]
-use crate::listener::{WaylandListener, X11Listener};
+use crate::listener::X11Listener;
 use crate::{
     traits::EventObserver, ClipboardKind, ClipboardLoad, ClipboardStore, ClipboardSubscribe, Error,
     Subscriber,
@@ -98,33 +98,24 @@ impl Clipboard {
         clip_filter: Arc<ClipFilter>,
         event_observers: Vec<Arc<dyn EventObserver>>,
     ) -> Result<Self, Error> {
-        let listener: Arc<dyn ClipboardSubscribe<Subscriber = Subscriber>> =
-            if let Ok(display_name) = std::env::var("WAYLAND_DISPLAY") {
-                tracing::info!(
-                    "Build Wayland listener ({clipboard_kind}) with display `{display_name}`"
-                );
-                Arc::new(WaylandListener::new(clipboard_kind)?)
-            } else {
-                match std::env::var("DISPLAY") {
-                    Ok(display_name) => {
-                        tracing::info!(
-                            "Build X11 listener ({clipboard_kind}) with display `{display_name}`"
-                        );
-                        Arc::new(X11Listener::new(
-                            Some(display_name),
-                            clipboard_kind,
-                            clip_filter,
-                            event_observers,
-                        )?)
-                    }
-                    Err(_) => Arc::new(X11Listener::new(
-                        None,
+        let listener: Arc<dyn ClipboardSubscribe<Subscriber = Subscriber>> = {
+            match std::env::var("DISPLAY") {
+                Ok(display_name) => {
+                    tracing::info!(
+                        "Build X11 listener ({clipboard_kind}) with display `{display_name}`"
+                    );
+                    Arc::new(X11Listener::new(
+                        Some(display_name),
                         clipboard_kind,
                         clip_filter,
                         event_observers,
-                    )?),
+                    )?)
+                }
+                Err(_) => {
+                    Arc::new(X11Listener::new(None, clipboard_kind, clip_filter, event_observers)?)
                 }
-            };
+            }
+        };
 
         let clear_on_drop = Arc::new(AtomicBool::from(false));
 

crates/clipboard/src/error.rs

@@ -18,18 +18,6 @@ pub enum Error {
     #[snafu(display("{error}"))]
     X11Listener { error: crate::listener::x11::Error },
 
-    #[cfg(all(
-        unix,
-        not(any(
-            target_os = "macos",
-            target_os = "ios",
-            target_os = "android",
-            target_os = "emscripten"
-        ))
-    ))]
-    #[snafu(display("{error}"))]
-    WaylandListener { error: crate::listener::wayland::Error },
-
     #[cfg(target_os = "macos")]
     #[snafu(display("{error}"))]
     MacOsListener { error: crate::listener::macos::Error },
@@ -61,19 +49,6 @@ impl From<crate::listener::x11::Error> for Error {
     fn from(error: crate::listener::x11::Error) -> Self { Self::X11Listener { error } }
 }
 
-#[cfg(all(
-    unix,
-    not(any(
-        target_os = "macos",
-        target_os = "ios",
-        target_os = "android",
-        target_os = "emscripten"
-    ))
-))]
-impl From<crate::listener::wayland::Error> for Error {
-    fn from(error: crate::listener::wayland::Error) -> Self { Self::WaylandListener { error } }
-}
-
 #[cfg(target_os = "macos")]
 impl From<crate::listener::macos::Error> for Error {
     fn from(error: crate::listener::macos::Error) -> Self { Self::MacOsListener { error } }

crates/clipboard/src/lib.rs

@@ -16,7 +16,7 @@ pub use clipcat_base::ClipboardKind;
         target_os = "emscripten"
     ))
 ))]
-pub use self::listener::{WaylandListenerError, X11ListenerError};
+pub use self::listener::X11ListenerError;
 pub use self::{
     default::Clipboard,
     error::Error,
@@ -32,5 +32,4 @@ pub use self::{
 #[derive(Clone, Copy, Debug)]
 pub enum ListenerKind {
     X11,
-    Wayland,
 }

crates/clipboard/src/listener/mod.rs

@@ -1,15 +1,6 @@
 #[cfg(target_os = "macos")]
 pub mod macos;
-#[cfg(all(
-    unix,
-    not(any(
-        target_os = "macos",
-        target_os = "ios",
-        target_os = "android",
-        target_os = "emscripten"
-    ))
-))]
-pub mod wayland;
+
 #[cfg(all(
     unix,
     not(any(
@@ -32,7 +23,4 @@ pub use self::macos::Listener as MacOsListener;
         target_os = "emscripten"
     ))
 ))]
-pub use self::{
-    wayland::{Error as WaylandListenerError, Listener as WaylandListener},
-    x11::{Error as X11ListenerError, Listener as X11Listener},
-};
+pub use self::x11::{Error as X11ListenerError, Listener as X11Listener};