globals: interfere singleton-ness from the Singleton enum

src/globals.rs

@@ -135,10 +135,10 @@ pub trait GlobalBase {
         version: Version,
     ) -> Result<(), GlobalsError>;
     fn interface(&self) -> Interface;
+    fn singleton(&self) -> Option<Singleton>;
 }
 
 pub trait Global: GlobalBase {
-    fn singleton(&self) -> bool;
     fn version(&self) -> u32;
     fn required_caps(&self) -> ClientCaps {
         ClientCaps::none()
@@ -168,6 +168,15 @@ macro_rules! singletons {
                 globals.singletons[Singleton::$name] = name;
             )*
         }
+
+        #[expect(non_upper_case_globals)]
+        pub mod interface_singletons {
+            pub use crate::wire::interface_singletons::*;
+
+            $(
+                pub const $name: Option<crate::globals::Singleton> = Some(crate::globals::Singleton::$name);
+            )*
+        }
     };
 }
 
@@ -328,7 +337,7 @@ impl Globals {
         macro_rules! emit {
             ($singleton:expr) => {
                 for global in globals.values() {
-                    if global.singleton() == $singleton {
+                    if global.singleton().is_some() == $singleton {
                         if global.exposed(&registry.client.state)
                             && caps.contains(global.required_caps())
                             && (xwayland || !global.xwayland_only())

src/ifs/color_management/wp_color_manager_v1.rs

@@ -283,10 +283,6 @@ global_base!(
 );
 
 impl Global for WpColorManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         2
     }

src/ifs/ext_foreign_toplevel_image_capture_source_manager_v1.rs

@@ -79,10 +79,6 @@ global_base!(
 );
 
 impl Global for ExtForeignToplevelImageCaptureSourceManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/ext_foreign_toplevel_list_v1.rs

@@ -134,10 +134,6 @@ global_base!(
 );
 
 impl Global for ExtForeignToplevelListV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/ext_idle_notifier_v1.rs

@@ -140,10 +140,6 @@ global_base!(
 );
 
 impl Global for ExtIdleNotifierV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         2
     }

src/ifs/ext_image_copy/ext_image_copy_capture_manager_v1.rs

@@ -142,10 +142,6 @@ global_base!(
 );
 
 impl Global for ExtImageCopyCaptureManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/ext_output_image_capture_source_manager_v1.rs

@@ -76,10 +76,6 @@ global_base!(
 );
 
 impl Global for ExtOutputImageCaptureSourceManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/ext_session_lock_manager_v1.rs

@@ -91,10 +91,6 @@ global_base!(
 );
 
 impl Global for ExtSessionLockManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/head_management/jay_head_manager_v1.rs

@@ -62,10 +62,6 @@ global_base!(
 simple_add_global!(JayHeadManagerV1Global);
 
 impl Global for JayHeadManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/ipc/data_control/ext_data_control_manager_v1.rs

@@ -102,10 +102,6 @@ global_base!(
 );
 
 impl Global for ExtDataControlManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/ipc/data_control/zwlr_data_control_manager_v1.rs

@@ -102,10 +102,6 @@ global_base!(
 );
 
 impl Global for ZwlrDataControlManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         2
     }

src/ifs/ipc/wl_data_device_manager.rs

@@ -95,10 +95,6 @@ global_base!(
 );
 
 impl Global for WlDataDeviceManagerGlobal {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         4
     }

src/ifs/ipc/zwp_primary_selection_device_manager_v1.rs

@@ -90,10 +90,6 @@ global_base!(
 );
 
 impl Global for ZwpPrimarySelectionDeviceManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/jay_compositor.rs

@@ -75,10 +75,6 @@ impl JayCompositorGlobal {
 global_base!(JayCompositorGlobal, JayCompositor, JayCompositorError);
 
 impl Global for JayCompositorGlobal {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         25
     }

src/ifs/jay_damage_tracking.rs

@@ -53,10 +53,6 @@ global_base!(
 );
 
 impl Global for JayDamageTrackingGlobal {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/jay_popup_ext_manager_v1.rs

@@ -54,10 +54,6 @@ global_base!(
 );
 
 impl Global for JayPopupExtManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/jay_tray_v1.rs

@@ -50,10 +50,6 @@ impl JayTrayV1Global {
 global_base!(JayTrayV1Global, JayTrayV1, JayTrayManagerV1Error);
 
 impl Global for JayTrayV1Global {
-    fn singleton(&self) -> bool {
-        false
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/org_kde_kwin_server_decoration_manager.rs

@@ -53,10 +53,6 @@ global_base!(
 );
 
 impl Global for OrgKdeKwinServerDecorationManagerGlobal {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wl_compositor.rs

@@ -79,10 +79,6 @@ impl WlCompositorRequestHandler for WlCompositor {
 global_base!(WlCompositorGlobal, WlCompositor, WlCompositorError);
 
 impl Global for WlCompositorGlobal {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         7
     }

src/ifs/wl_drm.rs

@@ -56,10 +56,6 @@ impl WlDrmGlobal {
 global_base!(WlDrmGlobal, WlDrm, WlDrmError);
 
 impl Global for WlDrmGlobal {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         2
     }

src/ifs/wl_fixes.rs

@@ -42,10 +42,6 @@ global_base!(WlFixesGlobal, WlFixes, WlFixesError);
 simple_add_global!(WlFixesGlobal);
 
 impl Global for WlFixesGlobal {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wl_output.rs

@@ -423,10 +423,6 @@ global_base!(WlOutputGlobal, WlOutput, WlOutputError);
 const OUTPUT_VERSION: u32 = 4;
 
 impl Global for WlOutputGlobal {
-    fn singleton(&self) -> bool {
-        false
-    }
-
     fn version(&self) -> u32 {
         OUTPUT_VERSION
     }

src/ifs/wl_output/removed_output.rs

@@ -38,10 +38,6 @@ impl RemovedOutputGlobal {
 global_base!(RemovedOutputGlobal, WlOutput, RemovedOutputError);
 
 impl Global for RemovedOutputGlobal {
-    fn singleton(&self) -> bool {
-        false
-    }
-
     fn version(&self) -> u32 {
         OUTPUT_VERSION
     }

src/ifs/wl_seat.rs

@@ -1599,10 +1599,6 @@ impl CursorUserOwner for WlSeatGlobal {
 global_base!(WlSeatGlobal, WlSeat, WlSeatError);
 
 impl Global for WlSeatGlobal {
-    fn singleton(&self) -> bool {
-        false
-    }
-
     fn version(&self) -> u32 {
         10
     }

src/ifs/wl_seat/ext_transient_seat_manager_v1.rs

@@ -52,10 +52,6 @@ global_base!(
 );
 
 impl Global for ExtTransientSeatManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wl_seat/tablet/zwp_tablet_manager_v2.rs

@@ -52,10 +52,6 @@ global_base!(
 );
 
 impl Global for ZwpTabletManagerV2Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         2
     }

src/ifs/wl_seat/text_input/zwp_input_method_manager_v2.rs

@@ -52,10 +52,6 @@ global_base!(
 );
 
 impl Global for ZwpInputMethodManagerV2Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wl_seat/text_input/zwp_text_input_manager_v3.rs

@@ -52,10 +52,6 @@ global_base!(
 );
 
 impl Global for ZwpTextInputManagerV3Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wl_seat/wp_pointer_warp_v1.rs

@@ -45,10 +45,6 @@ impl WpPointerWarpV1Global {
 global_base!(WpPointerWarpV1Global, WpPointerWarpV1, WpPointerWarpV1Error);
 
 impl Global for WpPointerWarpV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wl_seat/zwp_pointer_constraints_v1.rs

@@ -313,10 +313,6 @@ global_base!(
 );
 
 impl Global for ZwpPointerConstraintsV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wl_seat/zwp_pointer_gestures_v1.rs

@@ -56,10 +56,6 @@ global_base!(
 );
 
 impl Global for ZwpPointerGesturesV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         3
     }

src/ifs/wl_seat/zwp_relative_pointer_manager_v1.rs

@@ -52,10 +52,6 @@ global_base!(
 );
 
 impl Global for ZwpRelativePointerManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wl_seat/zwp_virtual_keyboard_manager_v1.rs

@@ -53,10 +53,6 @@ global_base!(
 );
 
 impl Global for ZwpVirtualKeyboardManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wl_shm.rs

@@ -85,10 +85,6 @@ impl WlShmRequestHandler for WlShm {
 global_base!(WlShmGlobal, WlShm, WlShmError);
 
 impl Global for WlShmGlobal {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         2
     }

src/ifs/wl_subcompositor.rs

@@ -70,10 +70,6 @@ impl WlSubcompositorRequestHandler for WlSubcompositor {
 global_base!(WlSubcompositorGlobal, WlSubcompositor, WlSubcompositorError);
 
 impl Global for WlSubcompositorGlobal {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wl_surface/xwayland_shell_v1.rs

@@ -79,10 +79,6 @@ impl XwaylandShellV1RequestHandler for XwaylandShellV1 {
 global_base!(XwaylandShellV1Global, XwaylandShellV1, XwaylandShellV1Error);
 
 impl Global for XwaylandShellV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wlr_output_manager/zwlr_output_manager_v1.rs

@@ -253,10 +253,6 @@ global_base!(
 );
 
 impl Global for ZwlrOutputManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         4
     }

src/ifs/workspace_manager/ext_workspace_manager_v1.rs

@@ -211,10 +211,6 @@ global_base!(
 );
 
 impl Global for ExtWorkspaceManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wp_alpha_modifier_v1.rs

@@ -75,10 +75,6 @@ global_base!(
 );
 
 impl Global for WpAlphaModifierV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wp_color_representation_manager_v1.rs

@@ -126,10 +126,6 @@ global_base!(
 );
 
 impl Global for WpColorRepresentationManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wp_commit_timing_manager_v1.rs

@@ -57,10 +57,6 @@ global_base!(
 );
 
 impl Global for WpCommitTimingManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wp_content_type_manager_v1.rs

@@ -47,10 +47,6 @@ global_base!(
 simple_add_global!(WpContentTypeManagerV1Global);
 
 impl Global for WpContentTypeManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wp_cursor_shape_manager_v1.rs

@@ -47,10 +47,6 @@ global_base!(
 simple_add_global!(WpCursorShapeManagerV1Global);
 
 impl Global for WpCursorShapeManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         2
     }

src/ifs/wp_drm_lease_device_v1.rs

@@ -77,10 +77,6 @@ global_base!(
 simple_add_global!(WpDrmLeaseDeviceV1Global);
 
 impl Global for WpDrmLeaseDeviceV1Global {
-    fn singleton(&self) -> bool {
-        false
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wp_drm_lease_device_v1/removed_device.rs

@@ -50,10 +50,6 @@ global_base!(
 simple_add_global!(RemovedWpDrmLeaseDeviceV1Global);
 
 impl Global for RemovedWpDrmLeaseDeviceV1Global {
-    fn singleton(&self) -> bool {
-        false
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wp_fifo_manager_v1.rs

@@ -48,10 +48,6 @@ impl WpFifoManagerV1Global {
 global_base!(WpFifoManagerV1Global, WpFifoManagerV1, WpFifoManagerV1Error);
 
 impl Global for WpFifoManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wp_fractional_scale_manager_v1.rs

@@ -52,10 +52,6 @@ global_base!(
 );
 
 impl Global for WpFractionalScaleManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wp_linux_drm_syncobj_manager_v1.rs

@@ -59,10 +59,6 @@ global_base!(
 );
 
 impl Global for WpLinuxDrmSyncobjManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wp_presentation.rs

@@ -44,10 +44,6 @@ impl WpPresentationGlobal {
 global_base!(WpPresentationGlobal, WpPresentation, WpPresentationError);
 
 impl Global for WpPresentationGlobal {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         2
     }

src/ifs/wp_security_context_manager_v1.rs

@@ -45,10 +45,6 @@ global_base!(
 );
 
 impl Global for WpSecurityContextManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wp_single_pixel_buffer_manager_v1.rs

@@ -45,10 +45,6 @@ global_base!(
 );
 
 impl Global for WpSinglePixelBufferManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wp_tearing_control_manager_v1.rs

@@ -45,10 +45,6 @@ global_base!(
 );
 
 impl Global for WpTearingControlManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/wp_viewporter.rs

@@ -41,10 +41,6 @@ impl WpViewporterGlobal {
 global_base!(WpViewporterGlobal, WpViewporter, WpViewporterError);
 
 impl Global for WpViewporterGlobal {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/xdg_activation_v1.rs

@@ -44,10 +44,6 @@ global_base!(XdgActivationV1Global, XdgActivationV1, XdgActivationV1Error);
 simple_add_global!(XdgActivationV1Global);
 
 impl Global for XdgActivationV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/xdg_toplevel_drag_manager_v1.rs

@@ -47,10 +47,6 @@ global_base!(
 simple_add_global!(XdgToplevelDragManagerV1Global);
 
 impl Global for XdgToplevelDragManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/xdg_toplevel_tag_manager_v1.rs

@@ -46,10 +46,6 @@ global_base!(
 );
 
 impl Global for XdgToplevelTagManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/xdg_wm_base.rs

@@ -107,10 +107,6 @@ impl XdgWmBaseRequestHandler for XdgWmBase {
 global_base!(XdgWmBaseGlobal, XdgWmBase, XdgWmBaseError);
 
 impl Global for XdgWmBaseGlobal {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         7
     }

src/ifs/xdg_wm_dialog_v1.rs

@@ -43,10 +43,6 @@ impl XdgWmDialogV1Global {
 global_base!(XdgWmDialogV1Global, XdgWmDialogV1, XdgWmDialogV1Error);
 
 impl Global for XdgWmDialogV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/zwlr_foreign_toplevel_manager_v1.rs

@@ -126,10 +126,6 @@ global_base!(
 );
 
 impl Global for ZwlrForeignToplevelManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         3
     }

src/ifs/zwlr_gamma_control_manager_v1.rs

@@ -47,10 +47,6 @@ global_base!(
 simple_add_global!(ZwlrGammaControlManagerV1Global);
 
 impl Global for ZwlrGammaControlManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/zwlr_layer_shell_v1.rs

@@ -102,10 +102,6 @@ global_base!(
 );
 
 impl Global for ZwlrLayerShellV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         5
     }

src/ifs/zwlr_screencopy_manager_v1.rs

@@ -51,10 +51,6 @@ global_base!(
 simple_add_global!(ZwlrScreencopyManagerV1Global);
 
 impl Global for ZwlrScreencopyManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         3
     }

src/ifs/zwp_idle_inhibit_manager_v1.rs

@@ -48,10 +48,6 @@ global_base!(
 );
 
 impl Global for ZwpIdleInhibitManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         1
     }

src/ifs/zwp_linux_dmabuf_v1.rs

@@ -65,10 +65,6 @@ global_base!(
 );
 
 impl Global for ZwpLinuxDmabufV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         5
     }

src/ifs/zxdg_decoration_manager_v1.rs

@@ -45,10 +45,6 @@ global_base!(
 );
 
 impl Global for ZxdgDecorationManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         2
     }

src/ifs/zxdg_output_manager_v1.rs

@@ -77,10 +77,6 @@ global_base!(
 );
 
 impl Global for ZxdgOutputManagerV1Global {
-    fn singleton(&self) -> bool {
-        true
-    }
-
     fn version(&self) -> u32 {
         3
     }

src/macros.rs

@@ -87,6 +87,10 @@ macro_rules! global_base {
             fn interface(&self) -> crate::object::Interface {
                 crate::wire::$ifname
             }
+
+            fn singleton(&self) -> Option<crate::globals::Singleton> {
+                crate::globals::interface_singletons::$ifname
+            }
         }
 
         impl From<$ename> for crate::globals::GlobalError {