monolith

public

Star0

Fork 0

Watch0

317 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `3c5663c16f2a`

tarball

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

1 file changed+22-13

xwayland: clear an X11-owned selection when Xwayland exits

disconnected dropped the X11Wm, which never reports cleared_selection, so a selection an X11 client owned stayed on the seat and every paste waited on a source that was gone.

Modified file: crates/monolith/src/xwayland.rs+22 additions−13 deletions@@ -517,19 +517,7 @@ impl XwmHandler for State {
     }
 
     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);
-                }
-            }
-        }
+        self.clear_x11_selection(selection);
     }
 
     fn disconnected(&mut self, _xwm: XwmId) {
@@ -547,6 +535,8 @@ impl XwmHandler for State {
             x.wm = None;
             x.unmanaged.clear();
         }
+        self.clear_x11_selection(SelectionTarget::Clipboard);
+        self.clear_x11_selection(SelectionTarget::Primary);
         rearm(self);
     }
 }
@@ -575,6 +565,25 @@ pub fn fixed_size(window: &X11Surface) -> Option<Size<i32, Logical>> {
 }
 
 impl State {
+    /// Clears `selection` when an X11 client owns it, since a client-owned
+    /// selection carries no user data. Xwayland dying takes the owner with it
+    /// without a cleared_selection call.
+    fn clear_x11_selection(&mut self, 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);
+                }
+            }
+        }
+    }
+
     pub fn x11_window_id(&self, window: &X11Surface) -> Option<monolith_layout::WindowId> {
         self.wm
             .iter()

monolith

Commit 3c5663c16f2a

Commit `3c5663c16f2a`