monolith

public

Star0

Fork 0

Watch0

320 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `dd5b0783344d`

tarball

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

3 files changed+17-10

xwayland: gate X11 selection writes by the selection access setting

The setting only covered reads, so any X11 client could overwrite the Wayland clipboard and primary selection at will. new_selection now applies the same check as allow_selection_access, and the config docs say it covers both.

Modified file: crates/config/default.toml+3 additions−3 deletions@@ -79,9 +79,9 @@ repeat_delay = 200
 repeat_rate = 25
 
 [xwayland]
-# Which X11 clients may read a Wayland-owned clipboard or primary selection.
-# focused allows only the window holding keyboard focus, any allows every X11
-# client, which clipboard managers and headless xclip need.
+# Which X11 clients may read the Wayland clipboard or primary selection, and
+# set it. focused allows only the window holding keyboard focus, any allows
+# every X11 client, which clipboard managers and headless xclip need.
 selection_access = "focused"
 
 # libinput settings, bare metal only. Anything left out keeps the device's

Modified file: crates/config/src/lib.rs+1−1

@@ -72,7 +72,7 @@ impl Default for General {

7272 #[derive(Deserialize, Debug, Clone, PartialEq)]

7373 #[serde(default, deny_unknown_fields)]

7474 pub struct Xwayland {

75- /// Which X11 clients may read a Wayland-owned selection.

75+ /// Which X11 clients may read the Wayland selections and set them.

7676 pub selection_access: SelectionAccess,

7777 }

7878

Modified file: crates/monolith/src/xwayland.rs+13 additions−6 deletions@@ -459,11 +459,7 @@ impl XwmHandler for State {
     }
 
     fn allow_selection_access(&mut self, xwm: XwmId, _selection: SelectionTarget) -> bool {
-        self.settings.config.xwayland.selection_access == SelectionAccess::Any
-            || matches!(
-                self.input.seat.get_keyboard().and_then(|k| k.current_focus()),
-                Some(Focus::X11(x)) if x.xwm_id() == Some(xwm)
-            )
+        self.x11_selection_allowed(xwm)
     }
 
     fn send_selection(
@@ -503,7 +499,10 @@ impl XwmHandler for State {
         }
     }
 
-    fn new_selection(&mut self, _xwm: XwmId, selection: SelectionTarget, mime_types: Vec<String>) {
+    fn new_selection(&mut self, xwm: XwmId, selection: SelectionTarget, mime_types: Vec<String>) {
+        if !self.x11_selection_allowed(xwm) {
+            return;
+        }
         let (dh, seat) = (&self.core.display, &self.input.seat);
         match selection {
             SelectionTarget::Clipboard => set_data_device_selection(dh, seat, mime_types, ()),
@@ -565,6 +564,14 @@ pub fn fixed_size(window: &X11Surface) -> Option<Size<i32, Logical>> {
 }
 
 impl State {
+    fn x11_selection_allowed(&self, xwm: XwmId) -> bool {
+        self.settings.config.xwayland.selection_access == SelectionAccess::Any
+            || matches!(
+                self.input.seat.get_keyboard().and_then(|k| k.current_focus()),
+                Some(Focus::X11(x)) if x.xwm_id() == Some(xwm)
+            )
+    }
+
     /// 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.

monolith

Commit dd5b0783344d

Commit `dd5b0783344d`