monolith

public

Star0

Fork 0

Watch0

186 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `5c3ede313624`

tarball

atagen <boss@atagen.co>2026-10-19 07:56 UTC

2 files changed+92-1

xwayland: bridge the X11 and Wayland selections

XwmHandler implemented none of the selection hooks and smithay's default allow_selection_access refuses, so clipboard and primary selection never crossed between X11 and Wayland clients. SelectionHandler now forwards Wayland owners to the X11 selection owner, and X11 owners are exposed through set_data_device_selection and set_primary_selection so data-control clients see them too.

Modified file: crates/monolith/src/seat.rs+30 additions−1 deletions@@ -6,13 +6,14 @@ use smithay::reexports::wayland_server::Resource;
 use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;
 use smithay::utils::Serial;
 use smithay::wayland::seat::WaylandFocus;
-use smithay::wayland::selection::SelectionHandler;
 use smithay::wayland::selection::data_device::{
     DataDeviceHandler, DataDeviceState, WaylandDndGrabHandler, set_data_device_focus,
 };
 use smithay::wayland::selection::primary_selection::{
     PrimarySelectionHandler, PrimarySelectionState, set_primary_focus,
 };
+use smithay::wayland::selection::{SelectionHandler, SelectionSource, SelectionTarget};
+use std::os::fd::OwnedFd;
 
 impl SeatHandler for State {
     type KeyboardFocus = crate::focus::Focus;
@@ -39,6 +40,34 @@ impl SeatHandler for State {
 
 impl SelectionHandler for State {
     type SelectionUserData = ();
+
+    fn new_selection(
+        &mut self,
+        ty: SelectionTarget,
+        source: Option<SelectionSource>,
+        _seat: Seat<Self>,
+    ) {
+        if let Some(wm) = self.services.xwayland.as_mut().and_then(|x| x.wm.as_mut())
+            && let Err(e) = wm.new_selection(ty, source.map(|s| s.mime_types()))
+        {
+            tracing::warn!("cannot set the X11 {ty:?} selection: {e:?}");
+        }
+    }
+
+    fn send_selection(
+        &mut self,
+        ty: SelectionTarget,
+        mime_type: String,
+        fd: OwnedFd,
+        _seat: Seat<Self>,
+        _user_data: &(),
+    ) {
+        if let Some(wm) = self.services.xwayland.as_mut().and_then(|x| x.wm.as_mut())
+            && let Err(e) = wm.send_selection(ty, mime_type, fd)
+        {
+            tracing::warn!("cannot read the X11 {ty:?} selection: {e:?}");
+        }
+    }
 }
 
 impl DataDeviceHandler for State {

Modified file: crates/monolith/src/xwayland.rs+62 additions@@ -3,6 +3,7 @@
 //! connection that woke it is served. Xwayland exits once its last client
 //! leaves and the socket is watched again.
 
+use crate::focus::Focus;
 use crate::state::State;
 use smithay::desktop::Window;
 use smithay::reexports::calloop::generic::Generic;
@@ -10,10 +11,20 @@ use smithay::reexports::calloop::{Interest, Mode, PostAction, RegistrationToken}
 use smithay::reexports::rustix::io::{FdFlags, fcntl_getfd, fcntl_setfd};
 use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;
 use smithay::utils::{Logical, Rectangle, Size};
+use smithay::wayland::selection::SelectionTarget;
+use smithay::wayland::selection::data_device::{
+    clear_data_device_selection, current_data_device_selection_userdata,
+    request_data_device_client_selection, set_data_device_selection,
+};
+use smithay::wayland::selection::primary_selection::{
+    clear_primary_selection, current_primary_selection_userdata, request_primary_client_selection,
+    set_primary_selection,
+};
 use smithay::wayland::xwayland_shell::{XWaylandShellHandler, XWaylandShellState};
 use smithay::xwayland::xwm::{Reorder, ResizeEdge, WmWindowProperty, WmWindowType, XwmId};
 use smithay::xwayland::{X11Surface, X11Wm, XWayland, XWaylandEvent, XwmHandler};
 use std::os::fd::AsFd;
+use std::os::fd::OwnedFd;
 use std::os::linux::net::SocketAddrExt;
 use std::os::unix::net::{SocketAddr, UnixListener};
 use std::process::Stdio;
@@ -327,6 +338,57 @@ impl XwmHandler for State {
         }
     }
 
+    fn allow_selection_access(&mut self, xwm: XwmId, _selection: SelectionTarget) -> bool {
+        matches!(
+            self.input.seat.get_keyboard().and_then(|k| k.current_focus()),
+            Some(Focus::X11(x)) if x.xwm_id() == Some(xwm)
+        )
+    }
+
+    fn send_selection(
+        &mut self,
+        _xwm: XwmId,
+        selection: SelectionTarget,
+        mime_type: String,
+        fd: OwnedFd,
+    ) {
+        let seat = &self.input.seat;
+        let result = match selection {
+            SelectionTarget::Clipboard => request_data_device_client_selection(seat, mime_type, fd)
+                .map_err(|e| format!("{e:?}")),
+            SelectionTarget::Primary => {
+                request_primary_client_selection(seat, mime_type, fd).map_err(|e| format!("{e:?}"))
+            }
+        };
+        if let Err(e) = result {
+            tracing::warn!("cannot serve {selection:?} to X11: {e}");
+        }
+    }
+
+    fn new_selection(&mut self, _xwm: XwmId, selection: SelectionTarget, mime_types: Vec<String>) {
+        let (dh, seat) = (&self.core.display, &self.input.seat);
+        match selection {
+            SelectionTarget::Clipboard => set_data_device_selection(dh, seat, mime_types, ()),
+            SelectionTarget::Primary => set_primary_selection(dh, seat, mime_types, ()),
+        }
+    }
+
+    fn cleared_selection(&mut self, _xwm: XwmId, selection: SelectionTarget) {
+        let (dh, seat) = (&self.core.display, &self.input.seat);
+        match selection {
+            SelectionTarget::Clipboard => {
+                if current_data_device_selection_userdata(seat).is_some() {
+                    clear_data_device_selection(dh, seat);
+                }
+            }
+            SelectionTarget::Primary => {
+                if current_primary_selection_userdata(seat).is_some() {
+                    clear_primary_selection(dh, seat);
+                }
+            }
+        }
+    }
+
     fn disconnected(&mut self, _xwm: XwmId) {
         tracing::info!("Xwayland exited");
         let gone: Vec<_> = self

monolith

Commit 5c3ede313624

Commit `5c3ede313624`