backend/rs/server: Removed destroy objects from known_registries

For use with the `wl_fixes` protocol.

Author: ids1024

wayland-backend/src/rs/server_impl/handle.rs

@@ -41,7 +41,7 @@ impl<D> State<D> {
 
     pub(crate) fn cleanup<'a>(&mut self) -> impl FnOnce(&super::Handle, &mut D) + 'a {
         let dead_clients = self.clients.cleanup(&mut self.pending_destructors);
-        self.registry.cleanup(&dead_clients);
+        self.registry.cleanup(&dead_clients, &self.pending_destructors);
         // return a closure that will do the cleanup once invoked
         let pending_destructors = std::mem::take(&mut self.pending_destructors);
         move |handle, data| {

wayland-backend/src/rs/server_impl/registry.rs

@@ -8,6 +8,7 @@ use crate::types::server::{GlobalInfo, InvalidId};
 
 use super::{
     client::{Client, ClientStore},
+    handle::PendingDestructor,
     ClientId, GlobalHandler, GlobalId, InnerGlobalId, InnerObjectId, ObjectId,
 };
 
@@ -127,9 +128,17 @@ impl<D> Registry<D> {
         Some((target_global.interface, target_global.id.clone(), target_global.handler.clone()))
     }
 
-    pub(crate) fn cleanup(&mut self, dead_clients: &[Client<D>]) {
-        self.known_registries
-            .retain(|obj_id| !dead_clients.iter().any(|cid| cid.id == obj_id.client_id))
+    pub(crate) fn cleanup(
+        &mut self,
+        dead_clients: &[Client<D>],
+        pending_destructors: &[PendingDestructor<D>],
+    ) {
+        // Remote registries with client id matching any dead clients, or object
+        // id matching pending destructors.
+        self.known_registries.retain(|obj_id| {
+            !dead_clients.iter().any(|cid| cid.id == obj_id.client_id)
+                && !pending_destructors.iter().any(|(_, _, id)| id == obj_id)
+        })
     }
 
     pub(crate) fn disable_global(&mut self, id: InnerGlobalId, clients: &mut ClientStore<D>) {