input: Don't follow focus for resize borders

Author: Drakulix

src/input/mod.rs

@@ -402,6 +402,9 @@ impl State {
 
                         if old_keyboard_target != new_keyboard_target
                             && new_keyboard_target.is_some()
+                            && new_under
+                                .as_ref()
+                                .is_some_and(|(target, _)| target.should_follow_focus())
                         {
                             let create_source = if self.common.pointer_focus_state.is_none() {
                                 true

src/shell/element/stack.rs

@@ -507,14 +507,20 @@ impl CosmicStack {
                         && point_i32.y - geo.loc.y < geo.size.h + TAB_HEIGHT + RESIZE_BORDER)
                 {
                     stack_ui = Some((
-                        PointerFocusTarget::StackUI(self.clone()),
+                        PointerFocusTarget::StackUI {
+                            stack: self.clone(),
+                            is_border: true,
+                        },
                         Point::from((0., 0.)),
                     ));
                 }
 
                 if point_i32.y - geo.loc.y < TAB_HEIGHT {
                     stack_ui = Some((
-                        PointerFocusTarget::StackUI(self.clone()),
+                        PointerFocusTarget::StackUI {
+                            stack: self.clone(),
+                            is_border: false,
+                        },
                         Point::from((0., 0.)),
                     ));
                 }

src/shell/element/window.rs

@@ -262,14 +262,20 @@ impl CosmicWindow {
                         && point_i32.y - geo.loc.y < geo.size.h + ssd_height + RESIZE_BORDER)
                 {
                     window_ui = Some((
-                        PointerFocusTarget::WindowUI(self.clone()),
+                        PointerFocusTarget::WindowUI {
+                            window: self.clone(),
+                            is_border: true,
+                        },
                         Point::from((0., 0.)),
                     ));
                 }
 
                 if has_ssd && (point_i32.y - geo.loc.y < SSD_HEIGHT) {
                     window_ui = Some((
-                        PointerFocusTarget::WindowUI(self.clone()),
+                        PointerFocusTarget::WindowUI {
+                            window: self.clone(),
+                            is_border: false,
+                        },
                         Point::from((0., 0.)),
                     ));
                 }

src/shell/focus/target.rs

@@ -42,8 +42,14 @@ pub enum PointerFocusTarget {
         surface: WlSurface,
         toplevel: Option<PointerFocusToplevel>,
     },
-    StackUI(CosmicStack),
-    WindowUI(CosmicWindow),
+    StackUI {
+        stack: CosmicStack,
+        is_border: bool,
+    },
+    WindowUI {
+        window: CosmicWindow,
+        is_border: bool,
+    },
     ResizeFork(ResizeForkTarget),
     ZoomUI(ZoomFocusTarget),
 }
@@ -114,8 +120,8 @@ impl PointerFocusTarget {
     fn inner_pointer_target(&self) -> &dyn PointerTarget<State> {
         match self {
             PointerFocusTarget::WlSurface { surface, .. } => surface,
-            PointerFocusTarget::StackUI(u) => u,
-            PointerFocusTarget::WindowUI(u) => u,
+            PointerFocusTarget::StackUI { stack, .. } => stack,
+            PointerFocusTarget::WindowUI { window, .. } => window,
             PointerFocusTarget::ResizeFork(f) => f,
             PointerFocusTarget::ZoomUI(e) => e,
         }
@@ -124,8 +130,8 @@ impl PointerFocusTarget {
     fn inner_touch_target(&self) -> &dyn TouchTarget<State> {
         match self {
             PointerFocusTarget::WlSurface { surface, .. } => surface,
-            PointerFocusTarget::StackUI(u) => u,
-            PointerFocusTarget::WindowUI(u) => u,
+            PointerFocusTarget::StackUI { stack, .. } => stack,
+            PointerFocusTarget::WindowUI { window, .. } => window,
             PointerFocusTarget::ResizeFork(f) => f,
             PointerFocusTarget::ZoomUI(e) => e,
         }
@@ -174,8 +180,8 @@ impl PointerFocusTarget {
                         .find(|(w, _)| w.wl_surface().map(|s2| s == *s2).unwrap_or(false))
                         .map(|(s, _)| s)
                 }),
-            PointerFocusTarget::StackUI(stack) => Some(stack.active()),
-            PointerFocusTarget::WindowUI(window) => Some(window.surface()),
+            PointerFocusTarget::StackUI { stack, .. } => Some(stack.active()),
+            PointerFocusTarget::WindowUI { window, .. } => Some(window.surface()),
             _ => None,
         }
     }
@@ -188,6 +194,15 @@ impl PointerFocusTarget {
             _ => false,
         }
     }
+
+    pub fn should_follow_focus(&self) -> bool {
+        match self {
+            PointerFocusTarget::WlSurface { .. } => true,
+            PointerFocusTarget::StackUI { is_border, .. }
+            | PointerFocusTarget::WindowUI { is_border, .. } => !*is_border,
+            PointerFocusTarget::ResizeFork(_) | PointerFocusTarget::ZoomUI(_) => false,
+        }
+    }
 }
 
 impl KeyboardFocusTarget {
@@ -259,8 +274,8 @@ impl IsAlive for PointerFocusTarget {
         match self {
             // XXX? does this change anything
             PointerFocusTarget::WlSurface { surface, .. } => surface.alive(),
-            PointerFocusTarget::StackUI(e) => e.alive(),
-            PointerFocusTarget::WindowUI(e) => e.alive(),
+            PointerFocusTarget::StackUI { stack, .. } => stack.alive(),
+            PointerFocusTarget::WindowUI { window, .. } => window.alive(),
             PointerFocusTarget::ResizeFork(f) => f.alive(),
             PointerFocusTarget::ZoomUI(_) => true,
         }
@@ -547,8 +562,8 @@ impl WaylandFocus for PointerFocusTarget {
         Some(match self {
             PointerFocusTarget::WlSurface { surface, .. } => Cow::Borrowed(surface),
             PointerFocusTarget::ResizeFork(_)
-            | PointerFocusTarget::StackUI(_)
-            | PointerFocusTarget::WindowUI(_)
+            | PointerFocusTarget::StackUI { .. }
+            | PointerFocusTarget::WindowUI { .. }
             | PointerFocusTarget::ZoomUI(_) => {
                 return None;
             }
@@ -557,12 +572,12 @@ impl WaylandFocus for PointerFocusTarget {
     fn same_client_as(&self, object_id: &ObjectId) -> bool {
         match self {
             PointerFocusTarget::WlSurface { surface, .. } => surface.id().same_client_as(object_id),
-            PointerFocusTarget::StackUI(stack) => stack
+            PointerFocusTarget::StackUI { stack, .. } => stack
                 .active()
                 .wl_surface()
                 .map(|s| s.id().same_client_as(object_id))
                 .unwrap_or(false),
-            PointerFocusTarget::WindowUI(window) => window
+            PointerFocusTarget::WindowUI { window, .. } => window
                 .wl_surface()
                 .map(|s| s.id().same_client_as(object_id))
                 .unwrap_or(false),