From 017b683af9916b5ebdd95672abf1811152e3748a Mon Sep 17 00:00:00 2001
From: Shawn Wallace <yungwallace@live.com>
Date: Tue, 11 Jun 2024 21:44:57 -0400
Subject: [PATCH] Support globals with higher advertised versions than
 supported

Fixes launching on Gnome.
---
 src/server/mod.rs    |  3 ++-
 tests/integration.rs |  2 +-
 testwl/src/lib.rs    | 57 +++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/server/mod.rs b/src/server/mod.rs
index ededef6..c848048 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -389,7 +389,8 @@ fn handle_globals<'a, C: XConnection>(
                     match global.interface {
                         $(
                             ref x if x == <$global>::interface().name => {
-                                dh.create_global::<ServerState<C>, $global, Global>(global.version, global.clone());
+                                let version = u32::min(global.version, <$global>::interface().version);
+                                dh.create_global::<ServerState<C>, $global, Global>(version, global.clone());
                             }
                         )+
                         _ => {}
diff --git a/tests/integration.rs b/tests/integration.rs
index 07c7c20..ceec3c5 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -137,7 +137,7 @@ impl Fixture {
             ready = our_data.display.lock().unwrap().is_some();
         }
 
-        assert!(ready, "connecting to xwayland");
+        assert!(ready, "connecting to xwayland failed");
 
         let display = our_data.display.lock().unwrap().take().unwrap();
         Self {
diff --git a/testwl/src/lib.rs b/testwl/src/lib.rs
index 6601d66..d0814e5 100644
--- a/testwl/src/lib.rs
+++ b/testwl/src/lib.rs
@@ -3,7 +3,7 @@ use std::io::Read;
 use std::io::Write;
 use std::os::fd::{AsFd, BorrowedFd, OwnedFd};
 use std::os::unix::net::UnixStream;
-use std::sync::Mutex;
+use std::sync::{Arc, Mutex, OnceLock};
 use std::time::Instant;
 use wayland_protocols::{
     wp::{
@@ -24,7 +24,10 @@ use wayland_protocols::{
     },
 };
 use wayland_server::{
-    backend::protocol::ProtocolError,
+    backend::{
+        protocol::{Interface, ProtocolError},
+        GlobalHandler, ObjectData,
+    },
     protocol::{
         self as proto,
         wl_buffer::WlBuffer,
@@ -288,9 +291,57 @@ impl Server {
         global_noop!(ZwpRelativePointerManagerV1);
         global_noop!(ZxdgOutputManagerV1);
         global_noop!(WpViewporter);
-        global_noop!(WlDrm);
         global_noop!(ZwpPointerConstraintsV1);
 
+        struct HandlerData;
+        impl ObjectData<State> for HandlerData {
+            fn request(
+                self: Arc<Self>,
+                _: &wayland_server::backend::Handle,
+                _: &mut State,
+                _: wayland_server::backend::ClientId,
+                _: wayland_server::backend::protocol::Message<
+                    wayland_server::backend::ObjectId,
+                    OwnedFd,
+                >,
+            ) -> Option<Arc<dyn ObjectData<State>>> {
+                None
+            }
+            fn destroyed(
+                self: Arc<Self>,
+                _: &wayland_server::backend::Handle,
+                _: &mut State,
+                _: wayland_server::backend::ClientId,
+                _: wayland_server::backend::ObjectId,
+            ) {
+            }
+        }
+        struct Handler;
+        impl GlobalHandler<State> for Handler {
+            fn bind(
+                self: Arc<Self>,
+                _: &wayland_server::backend::Handle,
+                _: &mut State,
+                _: wayland_server::backend::ClientId,
+                _: wayland_server::backend::GlobalId,
+                _: wayland_server::backend::ObjectId,
+            ) -> Arc<dyn wayland_server::backend::ObjectData<State>> {
+                Arc::new(HandlerData)
+            }
+        }
+
+        // Simulate interface with higher interface than supported client side
+        static IF: OnceLock<Interface> = OnceLock::new();
+        let interface = IF.get_or_init(|| Interface {
+            version: WlDrm::interface().version + 1,
+            ..*WlDrm::interface()
+        });
+
+        if noops {
+            dh.backend_handle()
+                .create_global(&interface, interface.version, Arc::new(Handler));
+        }
+
         Self {
             display,
             dh,