wayland: Use wl_fixes to free registry

Author: ids1024

Cargo.toml

@@ -70,7 +70,7 @@ memmap2 = { version = "0.9.0", optional = true }
 wayland-backend = { version = "0.3.0", optional = true, features = [
     "client_system",
 ] }
-wayland-client = { version = "0.31.0", optional = true }
+wayland-client = { version = "0.31.12", optional = true }
 wayland-sys = { version = "0.31.0", optional = true }
 # X11
 as-raw-xcb-connection = { version = "1.0.0", optional = true }

src/backends/wayland/mod.rs

@@ -11,7 +11,7 @@ use std::{
 use wayland_client::{
     backend::{Backend, ObjectId},
     globals::{registry_queue_init, GlobalListContents},
-    protocol::{wl_registry, wl_shm, wl_surface},
+    protocol::{wl_fixes, wl_registry, wl_shm, wl_surface},
     Connection, Dispatch, EventQueue, Proxy, QueueHandle,
 };
 
@@ -58,6 +58,17 @@ impl<D: HasDisplayHandle + ?Sized> ContextInterface<D> for Arc<WaylandDisplayImp
         let shm: wl_shm::WlShm = globals
             .bind(&qh, 1..=1, ())
             .swbuf_err("Failed to instantiate Wayland Shm")?;
+
+        // If `wl_fixes` is supported, destroy registry using it.
+        // We don't need the registry anymore.
+        if let Ok(fixes) = globals.bind::<wl_fixes::WlFixes, _, ()>(&qh, 1..=1, ()) {
+            fixes.destroy_registry(globals.registry());
+            conn.backend()
+                .destroy_object(&globals.registry().id())
+                .unwrap();
+            fixes.destroy();
+        }
+
         Ok(Arc::new(WaylandDisplayImpl {
             conn: Some(conn),
             event_queue: Mutex::new(event_queue),
@@ -313,3 +324,15 @@ impl Dispatch<wl_shm::WlShm, ()> for State {
     ) {
     }
 }
+
+impl Dispatch<wl_fixes::WlFixes, ()> for State {
+    fn event(
+        _: &mut State,
+        _: &wl_fixes::WlFixes,
+        _: wl_fixes::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<State>,
+    ) {
+    }
+}