From 2f6d6005026cac82d6949cb48928889fb7e8dae4 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Wed, 16 Apr 2025 15:47:22 -0700 Subject: [PATCH] protocol/workspace: Store manager as part of workspace/group udata --- src/wayland/protocols/workspace/cosmic_v2.rs | 17 +++--- src/wayland/protocols/workspace/ext.rs | 56 ++++++++++++++------ src/wayland/protocols/workspace/mod.rs | 24 ++++----- 3 files changed, 62 insertions(+), 35 deletions(-) diff --git a/src/wayland/protocols/workspace/cosmic_v2.rs b/src/wayland/protocols/workspace/cosmic_v2.rs index 4b635b48..6b4c3060 100644 --- a/src/wayland/protocols/workspace/cosmic_v2.rs +++ b/src/wayland/protocols/workspace/cosmic_v2.rs @@ -74,24 +74,27 @@ where }, ); if let Some(data) = workspace.data::() { - let mut data = data.lock().unwrap(); - if data.cosmic_v2_handle.as_ref().is_some_and(|x| x.is_alive()) { + let mut inner = data.inner.lock().unwrap(); + if inner + .cosmic_v2_handle + .as_ref() + .is_some_and(|x| x.is_alive()) + { obj.post_error( zcosmic_workspace_manager_v2::Error::WorkspaceExists, "zcosmic_workspace_handle_v2 already exists for ext_workspace_handle_v1", ); return; } - data.cosmic_v2_handle = Some(cosmic_workspace.downgrade()); - if let Some((workspace, ext_mngr, _)) = state + inner.cosmic_v2_handle = Some(cosmic_workspace.downgrade()); + if let Some(workspace) = state .workspace_state() .groups .iter() .flat_map(|g| &g.workspaces) - .flat_map(|w| w.ext_instances.iter().map(move |(mngr, i)| (w, mngr, i))) - .find(|(_, _, i)| **i == workspace) + .find(|w| w.ext_instances.contains(&workspace)) { - if let Ok(ext_mngr) = ext_mngr.upgrade() { + if let Ok(ext_mngr) = data.manager.upgrade() { send_workspace_to_client(&cosmic_workspace, workspace); ext_mngr.done(); } diff --git a/src/wayland/protocols/workspace/ext.rs b/src/wayland/protocols/workspace/ext.rs index 0e3d73e8..50a6871d 100644 --- a/src/wayland/protocols/workspace/ext.rs +++ b/src/wayland/protocols/workspace/ext.rs @@ -32,7 +32,10 @@ pub struct WorkspaceGroupDataInner { workspace_count: usize, } -pub type WorkspaceGroupData = Mutex; +pub struct WorkspaceGroupData { + inner: Mutex, + pub(super) manager: Weak, +} #[derive(Default)] pub struct WorkspaceDataInner { @@ -43,7 +46,10 @@ pub struct WorkspaceDataInner { pub(super) cosmic_v2_handle: Option>, } -pub type WorkspaceData = Mutex; +pub struct WorkspaceData { + pub(super) inner: Mutex, + pub(super) manager: Weak, +} impl GlobalDispatch for WorkspaceState where @@ -135,7 +141,7 @@ where .workspace_state() .groups .iter() - .find(|g| g.ext_instances.iter().any(|(_, i)| i == obj)) + .find(|g| g.ext_instances.contains(obj)) .map(|g| g.id) { let mut state = client @@ -152,7 +158,7 @@ where } ext_workspace_group_handle_v1::Request::Destroy => { for group in &mut state.workspace_state_mut().groups { - group.ext_instances.retain(|(_, i)| i != obj) + group.ext_instances.retain(|i| i != obj) } } _ => {} @@ -166,7 +172,7 @@ where _data: &WorkspaceGroupData, ) { for group in &mut state.workspace_state_mut().groups { - group.ext_instances.retain(|(_, i)| i != resource) + group.ext_instances.retain(|i| i != resource) } } } @@ -232,7 +238,7 @@ where .workspace_state() .groups .iter() - .find(|g| g.ext_instances.iter().any(|(_, i)| *i == workspace_group)) + .find(|g| g.ext_instances.contains(&workspace_group)) .map(|g| g.id) { let mut state = client @@ -251,7 +257,7 @@ where ext_workspace_handle_v1::Request::Destroy => { for group in &mut state.workspace_state_mut().groups { for workspace in &mut group.workspaces { - workspace.ext_instances.retain(|(_, i)| i != obj) + workspace.ext_instances.retain(|i| i != obj) } } } @@ -267,7 +273,7 @@ where ) { for group in &mut state.workspace_state_mut().groups { for workspace in &mut group.workspaces { - workspace.ext_instances.retain(|(_, i)| i != resource) + workspace.ext_instances.retain(|i| i != resource) } } } @@ -281,17 +287,24 @@ pub(super) fn send_group_to_client( where D: WorkspaceHandler, { - let (_, instance) = match group.ext_instances.iter_mut().find(|(m, _)| m == mngr) { + let instance = match group + .ext_instances + .iter_mut() + .find(|i| i.data::().unwrap().manager == *mngr) + { Some(i) => i, None => { if let Ok(client) = dh.get_client(mngr.id()) { if let Ok(handle) = client.create_resource::( dh, mngr.version(), - WorkspaceGroupData::default(), + WorkspaceGroupData { + inner: Mutex::new(WorkspaceGroupDataInner::default()), + manager: mngr.downgrade(), + }, ) { mngr.workspace_group(&handle); - group.ext_instances.push((mngr.downgrade(), handle)); + group.ext_instances.push(handle); group.ext_instances.last_mut().unwrap() } else { return false; @@ -305,6 +318,7 @@ where let mut handle_state = instance .data::() .unwrap() + .inner .lock() .unwrap(); let mut changed = false; @@ -360,21 +374,28 @@ fn send_workspace_to_client( where D: WorkspaceHandler, { - let (_, instance) = match workspace.ext_instances.iter_mut().find(|(m, _)| m == mngr) { + let instance = match workspace + .ext_instances + .iter_mut() + .find(|i| i.data::().unwrap().manager == *mngr) + { Some(i) => i, None => { if let Ok(client) = dh.get_client(mngr.id()) { if let Ok(handle) = client.create_resource::( dh, mngr.version(), - WorkspaceData::default(), + WorkspaceData { + inner: Mutex::new(WorkspaceDataInner::default()), + manager: mngr.downgrade(), + }, ) { mngr.workspace(&handle); group.workspace_enter(&handle); if let Some(id) = workspace.ext_id.clone() { handle.id(id); } - workspace.ext_instances.push((mngr.downgrade(), handle)); + workspace.ext_instances.push(handle); workspace.ext_instances.last_mut().unwrap() } else { return false; @@ -386,7 +407,12 @@ where }; let instance = instance.clone(); - let mut handle_state = instance.data::().unwrap().lock().unwrap(); + let mut handle_state = instance + .data::() + .unwrap() + .inner + .lock() + .unwrap(); let mut changed = false; if handle_state.name != workspace.name { diff --git a/src/wayland/protocols/workspace/mod.rs b/src/wayland/protocols/workspace/mod.rs index fa3ac4f5..752541b5 100644 --- a/src/wayland/protocols/workspace/mod.rs +++ b/src/wayland/protocols/workspace/mod.rs @@ -12,7 +12,7 @@ use smithay::{ }, wayland_server::{ backend::{ClientData, GlobalId, ObjectId}, - Client, Dispatch, DisplayHandle, GlobalDispatch, Resource, Weak, + Client, Dispatch, DisplayHandle, GlobalDispatch, Resource, }, }, }; @@ -65,7 +65,7 @@ crate::utils::id_gen!(next_workspace_id, WORKSPACE_ID, WORKSPACE_IDS); #[derive(Debug)] pub struct WorkspaceGroup { id: usize, - ext_instances: Vec<(Weak, ExtWorkspaceGroupHandleV1)>, + ext_instances: Vec, workspaces: Vec, outputs: Vec, @@ -93,7 +93,7 @@ pub struct WorkspaceGroupHandle { #[derive(Debug)] pub struct Workspace { id: usize, - ext_instances: Vec<(Weak, ExtWorkspaceHandleV1)>, + ext_instances: Vec, name: String, capabilities: WorkspaceCapabilities, @@ -285,7 +285,6 @@ where .find_map(|g| g.workspaces.iter().find(|w| w.id == workspace.id)) .into_iter() .flat_map(|w| &w.ext_instances) - .map(|(_, i)| i) .filter(|i| Resource::id(*i).same_client_as(client)) } @@ -315,11 +314,8 @@ where ) -> Option { self.groups .iter() - .find_map(|g| { - g.workspaces - .iter() - .find(|w| w.ext_instances.iter().any(|(_, i)| i == handle)) - }) + .flat_map(|g| &g.workspaces) + .find(|w| w.ext_instances.contains(handle)) .map(|w| WorkspaceHandle { id: w.id }) } @@ -386,7 +382,7 @@ where } if let Some(group) = self.0.groups.iter().find(|g| g.id == group.id) { - for (_, instance) in &group.ext_instances { + for instance in &group.ext_instances { instance.removed(); } } @@ -397,9 +393,11 @@ where pub fn remove_workspace(&mut self, workspace: WorkspaceHandle) { for group in &mut self.0.groups { if let Some(workspace) = group.workspaces.iter().find(|w| w.id == workspace.id) { - for (manager, instance) in &workspace.ext_instances { - for (group_manager, group_instance) in &group.ext_instances { - if manager == group_manager { + for instance in &workspace.ext_instances { + let manager = &instance.data::().unwrap().manager; + for group_instance in &group.ext_instances { + if *manager == group_instance.data::().unwrap().manager + { group_instance.workspace_leave(instance); } }