From b3e3241c6f8e5bbc85ad35f33a48e3b2db563a66 Mon Sep 17 00:00:00 2001 From: Jethro Beekman Date: Mon, 27 Jan 2025 22:15:56 +0100 Subject: [PATCH] screenshot: Don't consider X11 to be available when running under XWayland --- plug-ins/screenshot/screenshot-x11.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plug-ins/screenshot/screenshot-x11.c b/plug-ins/screenshot/screenshot-x11.c index db20eb4027..ff32350773 100644 --- a/plug-ins/screenshot/screenshot-x11.c +++ b/plug-ins/screenshot/screenshot-x11.c @@ -547,8 +547,12 @@ add_cursor_image (GimpImage *image, gboolean screenshot_x11_available (void) { - return (gdk_display_get_default () && - GDK_IS_X11_DISPLAY (gdk_display_get_default ())); + int major_opcode, first_event, first_error; + GdkDisplay *d = gdk_display_get_default (); + + return (d && GDK_IS_X11_DISPLAY (d) && + ! XQueryExtension (GDK_DISPLAY_XDISPLAY (d), "XWAYLAND", + &major_opcode, &first_event, &first_error)); } ScreenshotCapabilities