monolith

public

Star0

Fork 0

Watch0

306 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `ccb74661e8c4`

tarball

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

1 file changed+21-15

input: end a drag only on its own button

Any button release ended a Mod drag, so pressing and releasing a second button mid-drag stopped it and the later release of the real button reached the client with no press. Drag now always records its starting button and a separate flag says whether the client still sees the release. A new press can no longer replace a drag in progress.

Modified file: crates/monolith/src/input.rs+21 additions−15 deletions@@ -130,11 +130,8 @@ impl State {
     pub fn pointer_button(&mut self, button: u32, pressed: ButtonState, time: InputTime) {
         self.activity();
         if pressed == ButtonState::Released {
-            let ended = self
-                .input
-                .drag
-                .take_if(|d| d.button.is_none_or(|b| b == button));
-            if ended.is_some() {
+            let ended = self.input.drag.take_if(|d| d.button == button);
+            if let Some(d) = ended {
                 if self.wm.resizing.take().is_some() {
                     self.apply_layout();
                 }
@@ -143,15 +140,15 @@ impl State {
                     .edge_at(pos, self.cover_under(pos).map(|c| c.2))
                     .map(|(_, e)| e);
                 self.dirty.cursor = true;
-            }
-            if ended.is_some_and(|d| d.button.is_none()) {
-                return;
+                if !d.client {
+                    return;
+                }
             }
         }
         if pressed == ButtonState::Pressed && !self.services.lock.active() && !self.pointer_locked()
         {
             focus_under_pointer(self);
-            if start_drag(self, button) {
+            if self.input.drag.is_none() && start_drag(self, button) {
                 return;
             }
         }
@@ -490,8 +487,10 @@ pub struct Drag {
     tiled: bool,
     /// None moves the window.
     edges: Option<Edges>,
-    /// The client's button, whose release is still the client's to see.
-    button: Option<u32>,
+    /// The button the drag started with, whose release ends it.
+    button: u32,
+    /// Whether the client asked for the drag and so still sees the release.
+    client: bool,
 }
 
 impl Input {
@@ -580,7 +579,7 @@ fn start_drag(state: &mut State, button: u32) -> bool {
             state.input.followed = state.wm.layout.focus(id);
             state.apply_layout();
         }
-        return begin_drag(state, id, Some(edges), None);
+        return begin_drag(state, id, Some(edges), button, false);
     }
     let Some(id) = state.wm.layout.focused() else {
         return false;
@@ -594,7 +593,7 @@ fn start_drag(state: &mut State, button: u32) -> bool {
         }
         _ => None,
     };
-    begin_drag(state, id, edges, None)
+    begin_drag(state, id, edges, button, false)
 }
 
 fn window_rect(layout: &Layout, id: WindowId) -> Option<Rect> {
@@ -615,12 +614,18 @@ impl State {
     /// client's request. Tiled windows are left alone.
     pub fn client_drag(&mut self, id: WindowId, edges: Option<Edges>, button: u32) {
         if self.wm.layout.window(id).is_some_and(|w| w.floating) {
-            begin_drag(self, id, edges, Some(button));
+            begin_drag(self, id, edges, button, true);
         }
     }
 }
 
-fn begin_drag(state: &mut State, id: WindowId, edges: Option<Edges>, button: Option<u32>) -> bool {
+fn begin_drag(
+    state: &mut State,
+    id: WindowId,
+    edges: Option<Edges>,
+    button: u32,
+    client: bool,
+) -> bool {
     let layout = &state.wm.layout;
     let Some(win) = layout.window(id).filter(|w| !w.fullscreen) else {
         return false;
@@ -656,6 +661,7 @@ fn begin_drag(state: &mut State, id: WindowId, edges: Option<Edges>, button: Opt
         tiled,
         edges,
         button,
+        client,
     });
     true
 }

monolith

Commit ccb74661e8c4

Commit `ccb74661e8c4`