monolith

public

Star0

Fork 0

Watch0

109 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `24fca1aad608`

tarball

atagen <boss@atagen.co>2026-10-17 09:57 UTC

4 files changed+68-6

monolith: add focus-follows-mouse and mouse-follows-focus

Both are off by default. Focus changes the pointer made itself are marked as followed, so neither option sets off the other. Warping is skipped nested, where the host owns the pointer.

Modified file: crates/config/default.toml+5 additions@@ -12,6 +12,11 @@ gaps = { inner = 8, outer = 8 }
 # What a window move does when it meets a neighbour. swap trades places,
 # merge joins its lane. invert-move does the other one for the next move.
 move = "swap"
+# Focus whatever window the pointer moves onto.
+focus_follows_mouse = false
+# Put the pointer in the middle of a window focused from the keyboard, a
+# rule or a new map. Bare metal only, a nested pointer belongs to the host.
+mouse_follows_focus = false
 
 [decoration]
 # Borders sit in the gap around each window, so keep them under half the inner gap.

Modified file: crates/config/src/lib.rs+4 additions@@ -31,6 +31,8 @@ pub struct General {
     /// What a window move does when it meets a neighbour.
     #[serde(rename = "move")]
     pub move_mode: MoveMode,
+    pub focus_follows_mouse: bool,
+    pub mouse_follows_focus: bool,
 }
 
 #[derive(Deserialize, Debug, Clone, Copy, PartialEq, Eq, Default)]
@@ -49,6 +51,8 @@ impl Default for General {
             mod_key: Modifier::Super,
             gaps: Gaps::default(),
             move_mode: MoveMode::Swap,
+            focus_follows_mouse: false,
+            mouse_follows_focus: false,
         }
     }
 }

Modified file: crates/monolith/src/input.rs+54 additions−6 deletions@@ -20,6 +20,7 @@ impl State {
         let Some(pointer) = self.input.seat.get_pointer() else {
             return;
         };
+        focus_on_hover(self, pos);
         let under = self.surface_under(pos);
         pointer.motion(
             self,
@@ -149,20 +150,67 @@ fn focus_under_pointer(state: &mut State) {
     if state.wm.layer_focus.take().is_some() {
         state.sync_focus();
     }
-    let id = state
-        .wm
-        .space
-        .element_under(pos)
-        .and_then(|(w, _)| crate::wm::root(w))
-        .and_then(|s| state.window_id(&s));
+    let id = window_at(state, pos);
     if let Some(id) = id
         && state.wm.layout.focused() != Some(id)
     {
+        state.input.followed = Some(id);
         state.wm.layout.focus(id);
         state.apply_layout();
     }
 }
 
+fn window_at(state: &State, pos: Point<f64, Logical>) -> Option<WindowId> {
+    let (w, _) = state.wm.space.element_under(pos)?;
+    state.window_id(&crate::wm::root(w)?)
+}
+
+/// Layers above windows, like a bar, keep the focus where it was.
+fn focus_on_hover(state: &mut State, pos: Point<f64, Logical>) {
+    if !state.settings.config.general.focus_follows_mouse
+        || state.services.lock.active()
+        || state
+            .layer_under(pos, &[Layer::Overlay, Layer::Top])
+            .is_some()
+    {
+        return;
+    }
+    let Some(id) = window_at(state, pos) else {
+        return;
+    };
+    if state.wm.layout.focused() == Some(id) {
+        return;
+    }
+    state.wm.layer_focus = None;
+    state.input.followed = Some(id);
+    state.wm.layout.focus(id);
+    state.apply_layout();
+}
+
+impl State {
+    /// Puts the pointer in the middle of a window that gained focus from
+    /// anything but the pointer.
+    pub fn follow_focus(&mut self) {
+        let focused = self.wm.layout.focused();
+        if focused == std::mem::replace(&mut self.input.followed, focused)
+            || !self.settings.config.general.mouse_follows_focus
+            || self.backend.drm().is_none()
+            || self.services.lock.active()
+        {
+            return;
+        }
+        let Some((_, r, _)) = focused.and_then(|id| self.wm.get(id)?.placed) else {
+            return;
+        };
+        self.pointer_to(
+            Point::from((r.x + r.w / 2.0, r.y + r.h / 2.0)),
+            InputTime::now(),
+        );
+        self.pointer_frame();
+        self.dirty.cursor = true;
+    }
+}
+
 const BTN_LEFT: u32 = 0x110;
 const BTN_RIGHT: u32 = 0x111;
 

Modified file: crates/monolith/src/state.rs+5 additions@@ -49,6 +49,9 @@ pub struct Input {
     pub suppressed: Vec<Keycode>,
     pub drag: Option<crate::input::Drag>,
     pub move_inverted: bool,
+    /// The focus mouse-follows-focus last saw, so pointer-made focus
+    /// changes can mark themselves as already followed.
+    pub followed: Option<WindowId>,
     pub cursor: crate::cursor::Cursor,
     pub cursor_status: CursorImageStatus,
 }
@@ -167,6 +170,7 @@ impl State {
                 suppressed: Vec::new(),
                 drag: None,
                 move_inverted: false,
+                followed: None,
                 cursor: crate::cursor::Cursor::load(),
                 cursor_status: CursorImageStatus::default_named(),
             },
@@ -343,6 +347,7 @@ impl State {
             }
         }
         self.sync_focus();
+        self.follow_focus();
         self.update_inhibit();
         self.dirty.redraw = true;
         self.dirty.snapshot = true;

monolith

Commit 24fca1aad608

Commit `24fca1aad608`