fix: filter by active workspace in overlap notify

pop-os · Dec 5, 2024 · 76863aa · 76863aa
1 parent fc84fa9
commit 76863aa
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 4 deletions.
diff --git a/src/wayland/handlers/overlap_notify.rs b/src/wayland/handlers/overlap_notify.rs
@@ -37,6 +37,19 @@ impl OverlapNotifyHandler for State {
         let shell = self.common.shell.read().unwrap();
         shell.outputs().cloned().collect::<Vec<_>>().into_iter()
     }
+
+    fn active_workspaces(
+        &self,
+    ) -> impl Iterator<Item = crate::wayland::protocols::workspace::WorkspaceHandle> {
+        let shell = self.common.shell.read().unwrap();
+        shell
+            .workspaces
+            .sets
+            .iter()
+            .map(|(_, set)| set.workspaces[set.active].handle)
+            .collect::<Vec<_>>()
+            .into_iter()
+    }
 }
 
 delegate_overlap_notify!(State);
diff --git a/src/wayland/protocols/overlap_notify.rs b/src/wayland/protocols/overlap_notify.rs
@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-use std::{collections::HashMap, sync::Mutex};
+use std::{
+    collections::{HashMap, HashSet},
+    sync::Mutex,
+};
 
 use cosmic_protocols::{
     overlap_notify::v1::server::{
@@ -32,8 +35,11 @@ use wayland_backend::server::{GlobalId, ObjectId};
 
 use crate::utils::prelude::{RectExt, RectGlobalExt, RectLocalExt};
 
-use super::toplevel_info::{
-    ToplevelHandleState, ToplevelInfoGlobalData, ToplevelInfoHandler, ToplevelState, Window,
+use super::{
+    toplevel_info::{
+        ToplevelHandleState, ToplevelInfoGlobalData, ToplevelInfoHandler, ToplevelState, Window,
+    },
+    workspace::WorkspaceHandle,
 };
 
 #[derive(Debug)]
@@ -82,8 +88,10 @@ impl OverlapNotifyState {
             + 'static,
         W: Window + 'static,
     {
+        let active_workspaces: Vec<_> = state.active_workspaces().collect();
         for output in state.outputs() {
             let map = layer_map_for_output(&output);
+
             for layer_surface in map.layers() {
                 if let Some(data) = layer_surface
                     .user_data()
@@ -100,7 +108,22 @@ impl OverlapNotifyState {
                             .as_local()
                             .to_global(&output);
 
-                        for window in state.toplevel_info_state().registered_toplevels() {
+                        for window in
+                            state
+                                .toplevel_info_state()
+                                .registered_toplevels()
+                                .filter(|w| {
+                                    let state = w
+                                        .user_data()
+                                        .get::<ToplevelState>()
+                                        .unwrap()
+                                        .lock()
+                                        .unwrap();
+                                    active_workspaces.iter().any(|active_workspace| {
+                                        state.in_workspace(&active_workspace)
+                                    })
+                                })
+                        {
                             if let Some(window_geo) = window.global_geometry() {
                                 if let Some(intersection) = layer_geo.intersection(window_geo) {
                                     // relative to layer location
@@ -146,6 +169,7 @@ pub trait OverlapNotifyHandler: ToplevelInfoHandler {
     fn overlap_notify_state(&mut self) -> &mut OverlapNotifyState;
     fn layer_surface_from_resource(&self, resource: ZwlrLayerSurfaceV1) -> Option<LayerSurface>;
     fn outputs(&self) -> impl Iterator<Item = Output>;
+    fn active_workspaces(&self) -> impl Iterator<Item = (WorkspaceHandle)>;
 }
 
 pub struct OverlapNotifyGlobalData {

diff --git a/src/wayland/protocols/toplevel_info.rs b/src/wayland/protocols/toplevel_info.rs
@@ -80,6 +80,10 @@ impl ToplevelStateInner {
     pub fn foreign_handle(&self) -> Option<&ForeignToplevelHandle> {
         self.foreign_handle.as_ref()
     }
+
+    pub fn in_workspace(&self, handle: &WorkspaceHandle) -> bool {
+        self.workspaces.contains(handle)
+    }
 }
 
 pub struct ToplevelHandleStateInner<W: Window> {