Make the nograbs flag always available
authorMatthias Clasen <mclasen@redhat.com>
Thu, 22 Sep 2022 00:53:46 +0000 (20:53 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 22 Sep 2022 00:53:46 +0000 (20:53 -0400)
No need to restrict this to debug builds.

gdk/gdk.c
gdk/x11/gdkdevice-xi2.c

index 73b5371c363d47a75abacb2b8e11bde2895ac8d2..46abff469f649b76746941d09ec417851627fb25 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -116,7 +116,7 @@ static const GdkDebugKey gdk_debug_keys[] = {
   { "vulkan",          GDK_DEBUG_VULKAN, "Information about Vulkan" },
   { "selection",       GDK_DEBUG_SELECTION, "Information about selections" },
   { "clipboard",       GDK_DEBUG_CLIPBOARD, "Information about clipboards" },
-  { "nograbs",         GDK_DEBUG_NOGRABS, "Disable pointer and keyboard grabs (X11)" },
+  { "nograbs",         GDK_DEBUG_NOGRABS, "Disable pointer and keyboard grabs (X11)", TRUE },
   { "portals",         GDK_DEBUG_PORTALS, "Force the use of portals" },
   { "gl-disable",      GDK_DEBUG_GL_DISABLE, "Disable OpenGL support" },
   { "gl-software",     GDK_DEBUG_GL_SOFTWARE, "Force OpenGL software rendering" },
index a8a0461e20ea7955ea5e4b9674b5bf836a0e516b..a068b009290347c71c22b8d4bfd6e41e755d29c8 100644 (file)
@@ -333,11 +333,9 @@ gdk_x11_device_xi2_grab (GdkDevice    *device,
                                                         event_mask,
                                                         &mask.mask_len);
 
-#ifdef G_ENABLE_DEBUG
-  if (GDK_DISPLAY_DEBUG_CHECK (display, NOGRABS))
+  if (gdk_display_get_debug_flags (display) & GDK_DEBUG_NOGRABS)
     status = GrabSuccess;
   else
-#endif
     status = XIGrabDevice (GDK_DISPLAY_XDISPLAY (display),
                            device_xi2->device_id,
                            xwindow,