config: make focus-follows-mouse optional

src/config/handler.rs

@@ -41,7 +41,7 @@ use {
                 Capability, CAP_GESTURE, CAP_KEYBOARD, CAP_POINTER, CAP_SWITCH, CAP_TABLET_PAD,
                 CAP_TABLET_TOOL, CAP_TOUCH,
             },
-            InputDevice, Seat,
+            FocusFollowsMouseMode, InputDevice, Seat,
         },
         keyboard::{mods::Modifiers, syms::KeySym, Keymap},
         logging::LogLevel,
@@ -324,6 +324,20 @@ impl ConfigProxyHandler {
         Ok(())
     }
 
+    fn handle_set_focus_follows_mouse_mode(
+        &self,
+        seat: Seat,
+        mode: FocusFollowsMouseMode,
+    ) -> Result<(), CphError> {
+        let seat = self.get_seat(seat)?;
+        let focus_follows_mouse = match mode {
+            FocusFollowsMouseMode::True => true,
+            FocusFollowsMouseMode::False => false,
+        };
+        seat.set_focus_follows_mouse(focus_follows_mouse);
+        Ok(())
+    }
+
     fn handle_set_status(&self, status: &str) {
         self.state.set_status(status);
     }
@@ -1791,6 +1805,9 @@ impl ConfigProxyHandler {
             } => self
                 .handle_add_shortcut(seat, mod_mask, mods, sym)
                 .wrn("add_shortcut")?,
+            ClientMessage::SetFocusFollowsMouseMode { seat, mode } => self
+                .handle_set_focus_follows_mouse_mode(seat, mode)
+                .wrn("set_focus_follows_mouse_mode")?,
         }
         Ok(())
     }

src/ifs/wl_seat.rs

@@ -181,6 +181,7 @@ pub struct WlSeatGlobal {
     input_method: CloneCell<Option<Rc<ZwpInputMethodV2>>>,
     input_method_grab: CloneCell<Option<Rc<ZwpInputMethodKeyboardGrabV2>>>,
     forward: Cell<bool>,
+    focus_follows_mouse: Cell<bool>,
 }
 
 const CHANGE_CURSOR_MOVED: u32 = 1 << 0;
@@ -250,6 +251,7 @@ impl WlSeatGlobal {
             input_method: Default::default(),
             input_method_grab: Default::default(),
             forward: Cell::new(false),
+            focus_follows_mouse: Cell::new(true),
         });
         state.add_cursor_size(*DEFAULT_CURSOR_SIZE);
         let seat = slf.clone();
@@ -1165,6 +1167,10 @@ impl WlSeatGlobal {
     pub fn select_workspace(self: &Rc<Self>, selector: impl WorkspaceSelector) {
         self.pointer_owner.select_workspace(self, selector);
     }
+
+    pub fn set_focus_follows_mouse(&self, focus_follows_mouse: bool) {
+        self.focus_follows_mouse.set(focus_follows_mouse);
+    }
 }
 
 global_base!(WlSeatGlobal, WlSeat, WlSeatError);

src/ifs/wl_seat/event_handling.rs

@@ -756,7 +756,10 @@ impl WlSeatGlobal {
 // Enter callbacks
 impl WlSeatGlobal {
     pub fn enter_toplevel(self: &Rc<Self>, n: Rc<dyn ToplevelNode>) {
-        if n.tl_accepts_keyboard_focus() && self.changes.get().contains(CHANGE_CURSOR_MOVED) {
+        if n.tl_accepts_keyboard_focus()
+            && self.changes.get().contains(CHANGE_CURSOR_MOVED)
+            && self.focus_follows_mouse.get()
+        {
             self.focus_toplevel(n);
         }
     }