monolith

public

Star0

Fork 0

Watch0

187 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `3de753c486d2`

tarball

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

2 files changed+30-3

xwayland: replay Wayland selections when the xwm starts

Xwayland starts lazily, so a copy made before the first X11 client connected reached no xwm and X11 apps saw nothing until the next copy. Xwayland now remembers the mime types of the current Wayland-owned clipboard and primary selections and hands them to X11Wm::new_selection on Ready.

Modified file: crates/monolith/src/seat.rs+7 additions−2 deletions@@ -47,8 +47,13 @@ impl SelectionHandler for State {
         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()))
+        let mimes = source.map(|s| s.mime_types());
+        let Some(x) = self.services.xwayland.as_mut() else {
+            return;
+        };
+        *x.wayland_selection(ty) = mimes.clone();
+        if let Some(wm) = x.wm.as_mut()
+            && let Err(e) = wm.new_selection(ty, mimes)
         {
             tracing::warn!("cannot set the X11 {ty:?} selection: {e:?}");
         }

Modified file: crates/monolith/src/xwayland.rs+23 additions−1 deletions@@ -37,6 +37,17 @@ pub struct Xwayland {
     pub wm: Option<X11Wm>,
     /// Override-redirect windows such as menus and tooltips, bottom to top.
     pub unmanaged: Vec<X11Surface>,
+    wayland_clipboard: Option<Vec<String>>,
+    wayland_primary: Option<Vec<String>>,
+}
+
+impl Xwayland {
+    pub fn wayland_selection(&mut self, ty: SelectionTarget) -> &mut Option<Vec<String>> {
+        match ty {
+            SelectionTarget::Clipboard => &mut self.wayland_clipboard,
+            SelectionTarget::Primary => &mut self.wayland_primary,
+        }
+    }
 }
 
 impl Drop for Xwayland {
@@ -130,6 +141,8 @@ pub fn init(state: &mut State) {
         running: false,
         wm: None,
         unmanaged: Vec::new(),
+        wayland_clipboard: None,
+        wayland_primary: None,
     });
 }
 
@@ -203,9 +216,14 @@ fn start(state: &mut State, fired: usize) {
             XWaylandEvent::Ready { x11_socket, .. } => {
                 let dh = state.core.display.clone();
                 match X11Wm::start_wm(state.core.handle.clone(), &dh, x11_socket, client.clone()) {
-                    Ok(wm) => {
+                    Ok(mut wm) => {
                         tracing::info!("Xwayland ready");
                         if let Some(x) = state.services.xwayland.as_mut() {
+                            for ty in [SelectionTarget::Clipboard, SelectionTarget::Primary] {
+                                if let Some(mimes) = x.wayland_selection(ty).clone() {
+                                    logged("selection", wm.new_selection(ty, Some(mimes)));
+                                }
+                            }
                             x.wm = Some(wm);
                         }
                     }
@@ -371,6 +389,10 @@ impl XwmHandler for State {
             SelectionTarget::Clipboard => set_data_device_selection(dh, seat, mime_types, ()),
             SelectionTarget::Primary => set_primary_selection(dh, seat, mime_types, ()),
         }
+        // set_*_selection echoes through SelectionHandler::new_selection, but an X11 owner dies with Xwayland and must not be replayed
+        if let Some(x) = self.services.xwayland.as_mut() {
+            *x.wayland_selection(selection) = None;
+        }
     }
 
     fn cleared_selection(&mut self, _xwm: XwmId, selection: SelectionTarget) {

monolith

Commit 3de753c486d2

Commit `3de753c486d2`