leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

protocol/workspace: Store manager as part of workspace/group udata

Browse source
This commit is contained in:
Ian Douglas Scott 2025-04-16 15:47:22 -07:00 • committed by Ian Douglas Scott
parent 2d4912bd20
commit 2f6d600502
3 changed files with 62 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/wayland/protocols/workspace/cosmic_v2.rs
View file

@ -74,24 +74,27 @@ where
}, },
); );
if let Some(data) = workspace.data::<WorkspaceData>() { if let Some(data) = workspace.data::<WorkspaceData>() {
let mut data = data.lock().unwrap(); let mut inner = data.inner.lock().unwrap();
if data.cosmic_v2_handle.as_ref().is_some_and(|x| x.is_alive()) { if inner
.cosmic_v2_handle
.as_ref()
.is_some_and(|x| x.is_alive())
{
obj.post_error( obj.post_error(
zcosmic_workspace_manager_v2::Error::WorkspaceExists, zcosmic_workspace_manager_v2::Error::WorkspaceExists,
"zcosmic_workspace_handle_v2 already exists for ext_workspace_handle_v1", "zcosmic_workspace_handle_v2 already exists for ext_workspace_handle_v1",
); );
return; return;
} }
data.cosmic_v2_handle = Some(cosmic_workspace.downgrade()); inner.cosmic_v2_handle = Some(cosmic_workspace.downgrade());
if let Some((workspace, ext_mngr, _)) = state if let Some(workspace) = state
.workspace_state() .workspace_state()
.groups .groups
.iter() .iter()
.flat_map(|g| &g.workspaces) .flat_map(|g| &g.workspaces)
.flat_map(|w| w.ext_instances.iter().map(move |(mngr, i)| (w, mngr, i))) .find(|w| w.ext_instances.contains(&workspace))
.find(|(_, _, i)| **i == workspace)
{ {
if let Ok(ext_mngr) = ext_mngr.upgrade() { if let Ok(ext_mngr) = data.manager.upgrade() {
send_workspace_to_client(&cosmic_workspace, workspace); send_workspace_to_client(&cosmic_workspace, workspace);
ext_mngr.done(); ext_mngr.done();
} }

56
src/wayland/protocols/workspace/ext.rs
View file

@ -32,7 +32,10 @@ pub struct WorkspaceGroupDataInner {
workspace_count: usize, workspace_count: usize,
} }
pub type WorkspaceGroupData = Mutex<WorkspaceGroupDataInner>; pub struct WorkspaceGroupData {
inner: Mutex<WorkspaceGroupDataInner>,
pub(super) manager: Weak<ExtWorkspaceManagerV1>,
}
#[derive(Default)] #[derive(Default)]
pub struct WorkspaceDataInner { pub struct WorkspaceDataInner {
@ -43,7 +46,10 @@ pub struct WorkspaceDataInner {
pub(super) cosmic_v2_handle: Option<Weak<ZcosmicWorkspaceHandleV2>>, pub(super) cosmic_v2_handle: Option<Weak<ZcosmicWorkspaceHandleV2>>,
} }
pub type WorkspaceData = Mutex<WorkspaceDataInner>; pub struct WorkspaceData {
pub(super) inner: Mutex<WorkspaceDataInner>,
pub(super) manager: Weak<ExtWorkspaceManagerV1>,
}
impl<D> GlobalDispatch<ExtWorkspaceManagerV1, WorkspaceGlobalData, D> for WorkspaceState<D> impl<D> GlobalDispatch<ExtWorkspaceManagerV1, WorkspaceGlobalData, D> for WorkspaceState<D>
where where
@ -135,7 +141,7 @@ where
.workspace_state() .workspace_state()
.groups .groups
.iter() .iter()
.find(|g| g.ext_instances.iter().any(|(_, i)| i == obj)) .find(|g| g.ext_instances.contains(obj))
.map(|g| g.id) .map(|g| g.id)
{ {
let mut state = client let mut state = client
@ -152,7 +158,7 @@ where
} }
ext_workspace_group_handle_v1::Request::Destroy => { ext_workspace_group_handle_v1::Request::Destroy => {
for group in &mut state.workspace_state_mut().groups { 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, _data: &WorkspaceGroupData,
) { ) {
for group in &mut state.workspace_state_mut().groups { 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() .workspace_state()
.groups .groups
.iter() .iter()
.find(|g| g.ext_instances.iter().any(|(_, i)| *i == workspace_group)) .find(|g| g.ext_instances.contains(&workspace_group))
.map(|g| g.id) .map(|g| g.id)
{ {
let mut state = client let mut state = client
@ -251,7 +257,7 @@ where
ext_workspace_handle_v1::Request::Destroy => { ext_workspace_handle_v1::Request::Destroy => {
for group in &mut state.workspace_state_mut().groups { for group in &mut state.workspace_state_mut().groups {
for workspace in &mut group.workspaces { 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 group in &mut state.workspace_state_mut().groups {
for workspace in &mut group.workspaces { 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<D>(
where where
D: WorkspaceHandler, 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::<WorkspaceGroupData>().unwrap().manager == *mngr)
{
Some(i) => i, Some(i) => i,
None => { None => {
if let Ok(client) = dh.get_client(mngr.id()) { if let Ok(client) = dh.get_client(mngr.id()) {
if let Ok(handle) = client.create_resource::<ExtWorkspaceGroupHandleV1, _, D>( if let Ok(handle) = client.create_resource::<ExtWorkspaceGroupHandleV1, _, D>(
dh, dh,
mngr.version(), mngr.version(),
WorkspaceGroupData::default(), WorkspaceGroupData {
inner: Mutex::new(WorkspaceGroupDataInner::default()),
manager: mngr.downgrade(),
},
) { ) {
mngr.workspace_group(&handle); mngr.workspace_group(&handle);
group.ext_instances.push((mngr.downgrade(), handle)); group.ext_instances.push(handle);
group.ext_instances.last_mut().unwrap() group.ext_instances.last_mut().unwrap()
} else { } else {
return false; return false;
@ -305,6 +318,7 @@ where
let mut handle_state = instance let mut handle_state = instance
.data::<WorkspaceGroupData>() .data::<WorkspaceGroupData>()
.unwrap() .unwrap()
.inner
.lock() .lock()
.unwrap(); .unwrap();
let mut changed = false; let mut changed = false;
@ -360,21 +374,28 @@ fn send_workspace_to_client<D>(
where where
D: WorkspaceHandler, 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::<WorkspaceData>().unwrap().manager == *mngr)
{
Some(i) => i, Some(i) => i,
None => { None => {
if let Ok(client) = dh.get_client(mngr.id()) { if let Ok(client) = dh.get_client(mngr.id()) {
if let Ok(handle) = client.create_resource::<ExtWorkspaceHandleV1, _, D>( if let Ok(handle) = client.create_resource::<ExtWorkspaceHandleV1, _, D>(
dh, dh,
mngr.version(), mngr.version(),
WorkspaceData::default(), WorkspaceData {
inner: Mutex::new(WorkspaceDataInner::default()),
manager: mngr.downgrade(),
},
) { ) {
mngr.workspace(&handle); mngr.workspace(&handle);
group.workspace_enter(&handle); group.workspace_enter(&handle);
if let Some(id) = workspace.ext_id.clone() { if let Some(id) = workspace.ext_id.clone() {
handle.id(id); handle.id(id);
} }
workspace.ext_instances.push((mngr.downgrade(), handle)); workspace.ext_instances.push(handle);
workspace.ext_instances.last_mut().unwrap() workspace.ext_instances.last_mut().unwrap()
} else { } else {
return false; return false;
@ -386,7 +407,12 @@ where
}; };
let instance = instance.clone(); let instance = instance.clone();
let mut handle_state = instance.data::<WorkspaceData>().unwrap().lock().unwrap(); let mut handle_state = instance
.data::<WorkspaceData>()
.unwrap()
.inner
.lock()
.unwrap();
let mut changed = false; let mut changed = false;
if handle_state.name != workspace.name { if handle_state.name != workspace.name {

24
src/wayland/protocols/workspace/mod.rs
View file

@ -12,7 +12,7 @@ use smithay::{
}, },
wayland_server::{ wayland_server::{
backend::{ClientData, GlobalId, ObjectId}, 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)] #[derive(Debug)]
pub struct WorkspaceGroup { pub struct WorkspaceGroup {
id: usize, id: usize,
ext_instances: Vec<(Weak<ExtWorkspaceManagerV1>, ExtWorkspaceGroupHandleV1)>, ext_instances: Vec<ExtWorkspaceGroupHandleV1>,
workspaces: Vec<Workspace>, workspaces: Vec<Workspace>,
outputs: Vec<Output>, outputs: Vec<Output>,
@ -93,7 +93,7 @@ pub struct WorkspaceGroupHandle {
#[derive(Debug)] #[derive(Debug)]
pub struct Workspace { pub struct Workspace {
id: usize, id: usize,
ext_instances: Vec<(Weak<ExtWorkspaceManagerV1>, ExtWorkspaceHandleV1)>, ext_instances: Vec<ExtWorkspaceHandleV1>,
name: String, name: String,
capabilities: WorkspaceCapabilities, capabilities: WorkspaceCapabilities,
@ -285,7 +285,6 @@ where
.find_map(|g| g.workspaces.iter().find(|w| w.id == workspace.id)) .find_map(|g| g.workspaces.iter().find(|w| w.id == workspace.id))
.into_iter() .into_iter()
.flat_map(|w| &w.ext_instances) .flat_map(|w| &w.ext_instances)
.map(|(_, i)| i)
.filter(|i| Resource::id(*i).same_client_as(client)) .filter(|i| Resource::id(*i).same_client_as(client))
} }
@ -315,11 +314,8 @@ where
) -> Option<WorkspaceHandle> { ) -> Option<WorkspaceHandle> {
self.groups self.groups
.iter() .iter()
.find_map(|g| { .flat_map(|g| &g.workspaces)
g.workspaces .find(|w| w.ext_instances.contains(handle))
.iter()
.find(|w| w.ext_instances.iter().any(|(_, i)| i == handle))
})
.map(|w| WorkspaceHandle { id: w.id }) .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) { 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(); instance.removed();
} }
} }
@ -397,9 +393,11 @@ where
pub fn remove_workspace(&mut self, workspace: WorkspaceHandle) { pub fn remove_workspace(&mut self, workspace: WorkspaceHandle) {
for group in &mut self.0.groups { for group in &mut self.0.groups {
if let Some(workspace) = group.workspaces.iter().find(|w| w.id == workspace.id) { if let Some(workspace) = group.workspaces.iter().find(|w| w.id == workspace.id) {
for (manager, instance) in &workspace.ext_instances { for instance in &workspace.ext_instances {
for (group_manager, group_instance) in &group.ext_instances { let manager = &instance.data::<WorkspaceData>().unwrap().manager;
if manager == group_manager { for group_instance in &group.ext_instances {
if *manager == group_instance.data::<WorkspaceGroupData>().unwrap().manager
{
group_instance.workspace_leave(instance); group_instance.workspace_leave(instance);
} }
} }