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

protocol/workspace: Fix behavior with multiple manager instances

Browse source 
Similarly to https://github.com/pop-os/cosmic-comp/pull/1061, track a
weak reference to the manager each workspace/group instance was created
from, instead of just matching by client.
This commit is contained in:
Ian Douglas Scott 2025-02-12 18:32:01 -08:00 • committed by Victoria Brekenfeld
parent 723f758439
commit 2728a9ee71
4 changed files with 65 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/wayland/protocols/toplevel_info.rs
View file

@ -590,7 +590,7 @@ where
.iter() .iter()
.filter(|w| !handle_state.workspaces.contains(w)) .filter(|w| !handle_state.workspaces.contains(w))
{ {
if let Some(handle) = workspace_state.raw_workspace_handle(&new_workspace, &instance.id()) { for handle in workspace_state.raw_workspace_handles(&new_workspace, &instance.id()) {
instance.workspace_enter(&handle); instance.workspace_enter(&handle);
changed = true; changed = true;
} }
@ -600,7 +600,7 @@ where
.iter() .iter()
.filter(|w| !state.workspaces.contains(w)) .filter(|w| !state.workspaces.contains(w))
{ {
if let Some(handle) = workspace_state.raw_workspace_handle(&old_workspace, &instance.id()) { for handle in workspace_state.raw_workspace_handles(&old_workspace, &instance.id()) {
instance.workspace_leave(&handle); instance.workspace_leave(&handle);
changed = true; changed = true;
} }

29
src/wayland/protocols/workspace/cosmic.rs
View file

@ -130,7 +130,7 @@ where
.workspace_state() .workspace_state()
.groups .groups
.iter() .iter()
.find(|g| g.instances.contains(obj)) .find(|g| g.instances.iter().any(|(_, i)| i == obj))
.map(|g| g.id) .map(|g| g.id)
{ {
let mut state = client let mut state = client
@ -147,7 +147,7 @@ where
} }
zcosmic_workspace_group_handle_v1::Request::Destroy => { zcosmic_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.instances.retain(|i| i != obj) group.instances.retain(|(_, i)| i != obj)
} }
} }
_ => {} _ => {}
@ -161,7 +161,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.instances.retain(|i| i != resource) group.instances.retain(|(_, i)| i != resource)
} }
} }
} }
@ -252,7 +252,7 @@ where
zcosmic_workspace_handle_v1::Request::Destroy => { zcosmic_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.instances.retain(|i| i != obj) workspace.instances.retain(|(_, i)| i != obj)
} }
} }
} }
@ -268,7 +268,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.instances.retain(|i| i != resource) workspace.instances.retain(|(_, i)| i != resource)
} }
} }
} }
@ -288,11 +288,7 @@ where
+ 'static, + 'static,
<D as WorkspaceHandler>::Client: ClientData + WorkspaceClientHandler + 'static, <D as WorkspaceHandler>::Client: ClientData + WorkspaceClientHandler + 'static,
{ {
let instance = match group let (_, instance) = match group.instances.iter_mut().find(|(m, _)| m == mngr) {
.instances
.iter_mut()
.find(|i| i.id().same_client_as(&mngr.id()))
{
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()) {
@ -302,7 +298,7 @@ where
WorkspaceGroupData::default(), WorkspaceGroupData::default(),
) { ) {
mngr.workspace_group(&handle); mngr.workspace_group(&handle);
group.instances.push(handle); group.instances.push((mngr.downgrade(), handle));
group.instances.last_mut().unwrap() group.instances.last_mut().unwrap()
} else { } else {
return false; return false;
@ -363,7 +359,7 @@ where
handle_state.workspace_count = group.workspaces.len(); handle_state.workspace_count = group.workspaces.len();
for workspace in &mut group.workspaces { for workspace in &mut group.workspaces {
if send_workspace_to_client::<D>(dh, instance, workspace) { if send_workspace_to_client::<D>(dh, mngr, instance, workspace) {
changed = true; changed = true;
} }
} }
@ -373,6 +369,7 @@ where
fn send_workspace_to_client<D>( fn send_workspace_to_client<D>(
dh: &DisplayHandle, dh: &DisplayHandle,
mngr: &ZcosmicWorkspaceManagerV1,
group: &ZcosmicWorkspaceGroupHandleV1, group: &ZcosmicWorkspaceGroupHandleV1,
workspace: &mut Workspace, workspace: &mut Workspace,
) -> bool ) -> bool
@ -385,11 +382,7 @@ where
+ 'static, + 'static,
<D as WorkspaceHandler>::Client: ClientData + WorkspaceClientHandler + 'static, <D as WorkspaceHandler>::Client: ClientData + WorkspaceClientHandler + 'static,
{ {
let instance = match workspace let (_, instance) = match workspace.instances.iter_mut().find(|(m, _)| m == mngr) {
.instances
.iter_mut()
.find(|i| i.id().same_client_as(&group.id()))
{
Some(i) => i, Some(i) => i,
None => { None => {
if let Ok(client) = dh.get_client(group.id()) { if let Ok(client) = dh.get_client(group.id()) {
@ -399,7 +392,7 @@ where
WorkspaceData::default(), WorkspaceData::default(),
) { ) {
group.workspace(&handle); group.workspace(&handle);
workspace.instances.push(handle); workspace.instances.push((mngr.downgrade(), handle));
workspace.instances.last_mut().unwrap() workspace.instances.last_mut().unwrap()
} else { } else {
return false; return false;

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

@ -125,7 +125,7 @@ where
.workspace_state() .workspace_state()
.groups .groups
.iter() .iter()
.find(|g| g.ext_instances.contains(obj)) .find(|g| g.ext_instances.iter().any(|(_, i)| i == obj))
.map(|g| g.id) .map(|g| g.id)
{ {
let mut state = client let mut state = client
@ -142,7 +142,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)
} }
} }
_ => {} _ => {}
@ -156,7 +156,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)
} }
} }
} }
@ -228,7 +228,7 @@ where
.workspace_state() .workspace_state()
.groups .groups
.iter() .iter()
.find(|g| g.ext_instances.contains(&workspace_group)) .find(|g| g.ext_instances.iter().any(|(_, i)| *i == workspace_group))
.map(|g| g.id) .map(|g| g.id)
{ {
let mut state = client let mut state = client
@ -247,7 +247,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)
} }
} }
} }
@ -263,7 +263,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)
} }
} }
} }
@ -283,11 +283,7 @@ where
+ 'static, + 'static,
<D as WorkspaceHandler>::Client: ClientData + WorkspaceClientHandler + 'static, <D as WorkspaceHandler>::Client: ClientData + WorkspaceClientHandler + 'static,
{ {
let instance = match group let (_, instance) = match group.ext_instances.iter_mut().find(|(m, _)| m == mngr) {
.ext_instances
.iter_mut()
.find(|i| i.id().same_client_as(&mngr.id()))
{
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()) {
@ -297,7 +293,7 @@ where
WorkspaceGroupData::default(), WorkspaceGroupData::default(),
) { ) {
mngr.workspace_group(&handle); mngr.workspace_group(&handle);
group.ext_instances.push(handle); group.ext_instances.push((mngr.downgrade(), handle));
group.ext_instances.last_mut().unwrap() group.ext_instances.last_mut().unwrap()
} else { } else {
return false; return false;
@ -372,11 +368,7 @@ where
+ 'static, + 'static,
<D as WorkspaceHandler>::Client: ClientData + WorkspaceClientHandler + 'static, <D as WorkspaceHandler>::Client: ClientData + WorkspaceClientHandler + 'static,
{ {
let instance = match workspace let (_, instance) = match workspace.ext_instances.iter_mut().find(|(m, _)| m == mngr) {
.ext_instances
.iter_mut()
.find(|i| Resource::id(*i).same_client_as(&mngr.id()))
{
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()) {
@ -390,7 +382,7 @@ where
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(handle); workspace.ext_instances.push((mngr.downgrade(), handle));
workspace.ext_instances.last_mut().unwrap() workspace.ext_instances.last_mut().unwrap()
} else { } else {
return false; return false;

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

@ -13,7 +13,7 @@ use smithay::{
wayland_server::{ wayland_server::{
backend::{ClientData, GlobalId, ObjectId}, backend::{ClientData, GlobalId, ObjectId},
protocol::wl_output::WlOutput, protocol::wl_output::WlOutput,
Client, Dispatch, DisplayHandle, GlobalDispatch, Resource, Client, Dispatch, DisplayHandle, GlobalDispatch, Resource, Weak,
}, },
}, },
}; };
@ -84,8 +84,11 @@ 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,
instances: Vec<ZcosmicWorkspaceGroupHandleV1>, instances: Vec<(
ext_instances: Vec<ExtWorkspaceGroupHandleV1>, Weak<ZcosmicWorkspaceManagerV1>,
ZcosmicWorkspaceGroupHandleV1,
)>,
ext_instances: Vec<(Weak<ExtWorkspaceManagerV1>, ExtWorkspaceGroupHandleV1)>,
workspaces: Vec<Workspace>, workspaces: Vec<Workspace>,
outputs: Vec<Output>, outputs: Vec<Output>,
@ -134,8 +137,8 @@ pub type WorkspaceGroupData = Mutex<WorkspaceGroupDataInner>;
#[derive(Debug)] #[derive(Debug)]
pub struct Workspace { pub struct Workspace {
id: usize, id: usize,
instances: Vec<ZcosmicWorkspaceHandleV1>, instances: Vec<(Weak<ZcosmicWorkspaceManagerV1>, ZcosmicWorkspaceHandleV1)>,
ext_instances: Vec<ExtWorkspaceHandleV1>, ext_instances: Vec<(Weak<ExtWorkspaceManagerV1>, ExtWorkspaceHandleV1)>,
name: String, name: String,
capabilities: WorkspaceCapabilities, capabilities: WorkspaceCapabilities,
@ -357,7 +360,7 @@ where
) -> Option<WorkspaceGroupHandle> { ) -> Option<WorkspaceGroupHandle> {
self.groups self.groups
.iter() .iter()
.find(|g| g.instances.contains(group)) .find(|g| g.instances.iter().any(|(_, i)| i == group))
.map(|g| WorkspaceGroupHandle { id: g.id }) .map(|g| WorkspaceGroupHandle { id: g.id })
} }
pub fn workspace_handle( pub fn workspace_handle(
@ -369,32 +372,35 @@ where
.find_map(|g| { .find_map(|g| {
g.workspaces g.workspaces
.iter() .iter()
.find(|w| w.instances.contains(workspace)) .find(|w| w.instances.iter().any(|(_, i)| i == workspace))
}) })
.map(|w| WorkspaceHandle { id: w.id }) .map(|w| WorkspaceHandle { id: w.id })
} }
pub fn raw_group_handle( pub fn raw_group_handles<'a>(
&self, &'a self,
group: &WorkspaceGroupHandle, group: &'a WorkspaceGroupHandle,
client: &ObjectId, client: &'a ObjectId,
) -> Option<ZcosmicWorkspaceGroupHandleV1> { ) -> impl Iterator<Item = &ZcosmicWorkspaceGroupHandleV1> + 'a {
self.groups self.groups
.iter() .iter()
.find(|g| g.id == group.id) .filter(|g| g.id == group.id)
.and_then(|g| g.instances.iter().find(|i| i.id().same_client_as(client))) .flat_map(|g| &g.instances)
.cloned() .map(|(_, i)| i)
.filter(|i| i.id().same_client_as(client))
} }
pub fn raw_workspace_handle( pub fn raw_workspace_handles<'a>(
&self, &'a self,
workspace: &WorkspaceHandle, workspace: &'a WorkspaceHandle,
client: &ObjectId, client: &'a ObjectId,
) -> Option<ZcosmicWorkspaceHandleV1> { ) -> impl Iterator<Item = &ZcosmicWorkspaceHandleV1> + 'a {
self.groups self.groups
.iter() .iter()
.find_map(|g| g.workspaces.iter().find(|w| w.id == workspace.id)) .find_map(|g| g.workspaces.iter().find(|w| w.id == workspace.id))
.and_then(|w| w.instances.iter().find(|i| i.id().same_client_as(client))) .into_iter()
.cloned() .flat_map(|w| &w.instances)
.map(|(_, i)| i)
.filter(|i| i.id().same_client_as(client))
} }
pub fn update(&mut self) -> WorkspaceUpdateGuard<'_, D> { pub fn update(&mut self) -> WorkspaceUpdateGuard<'_, D> {
@ -433,7 +439,11 @@ where
) -> Option<WorkspaceHandle> { ) -> Option<WorkspaceHandle> {
self.groups self.groups
.iter() .iter()
.find_map(|g| g.workspaces.iter().find(|w| w.instances.contains(handle))) .find_map(|g| {
g.workspaces
.iter()
.find(|w| w.instances.iter().any(|(_, i)| i == handle))
})
.map(|w| WorkspaceHandle { id: w.id }) .map(|w| WorkspaceHandle { id: w.id })
} }
@ -446,7 +456,7 @@ where
.find_map(|g| { .find_map(|g| {
g.workspaces g.workspaces
.iter() .iter()
.find(|w| w.ext_instances.contains(handle)) .find(|w| w.ext_instances.iter().any(|(_, i)| i == handle))
}) })
.map(|w| WorkspaceHandle { id: w.id }) .map(|w| WorkspaceHandle { id: w.id })
} }
@ -524,10 +534,10 @@ 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.instances { for (_, instance) in &group.instances {
instance.remove(); instance.remove();
} }
for instance in &group.ext_instances { for (_, instance) in &group.ext_instances {
instance.removed(); instance.removed();
} }
} }
@ -538,13 +548,14 @@ 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 instance in &workspace.instances { for (_, instance) in &workspace.instances {
instance.remove(); instance.remove();
} }
for instance in &workspace.ext_instances { for (manager, instance) in &workspace.ext_instances {
// TODO remove only if it matches the group for (group_manager, group_instance) in &group.ext_instances {
for group_instance in &group.ext_instances { if manager == group_manager {
group_instance.workspace_leave(instance); group_instance.workspace_leave(instance);
}
} }
instance.removed(); instance.removed();
} }