summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2022-09-21 20:53:46 -0400
committerMatthias Clasen <mclasen@redhat.com>2022-09-21 20:53:46 -0400
commita99b05525dcc687de924265ea30d9ce8d23db270 (patch)
treed5ce7e23cfd7c0043059ac9868a47b27eb5d370c /gdk
parenta337b21a4fdd934e66cb1cc976a62ac578b6e695 (diff)
downloadgtk+-a99b05525dcc687de924265ea30d9ce8d23db270.tar.gz
Make the nograbs flag always available
No need to restrict this to debug builds.
Diffstat (limited to 'gdk')
-rw-r--r--gdk/gdk.c2
-rw-r--r--gdk/x11/gdkdevice-xi2.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 73b5371c36..46abff469f 100644
--- 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" },
diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index a8a0461e20..a068b00929 100644
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -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,