diff options
| author | Bilal Elmoussaoui <belmouss@redhat.com> | 2022-06-01 09:39:01 +0200 |
|---|---|---|
| committer | Bilal Elmoussaoui <belmouss@redhat.com> | 2023-03-28 11:24:03 +0200 |
| commit | d0a4ddbe0c0e2157d788e815a7f362198f14c0fa (patch) | |
| tree | f1d41bae6e033146ebf9402d083e700a78fc4022 | |
| parent | 15613d3757ec0b0d07589fa509e0a147ea3d9760 (diff) | |
| download | mutter-d0a4ddbe0c0e2157d788e815a7f362198f14c0fa.tar.gz | |
compositor/dnd: Guard X11 types
| -rw-r--r-- | src/backends/meta-dnd-private.h | 7 | ||||
| -rw-r--r-- | src/compositor/meta-dnd.c | 4 | ||||
| -rw-r--r-- | src/x11/meta-x11-display.c | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/backends/meta-dnd-private.h b/src/backends/meta-dnd-private.h index a4cb37220..856b88942 100644 --- a/src/backends/meta-dnd-private.h +++ b/src/backends/meta-dnd-private.h @@ -21,17 +21,22 @@ #define META_DND_PRIVATE__H #include <glib.h> + +#ifdef HAVE_X11 #include <X11/Xlib.h> +#include "compositor/meta-compositor-x11.h" +#endif #include "backends/meta-backend-private.h" -#include "compositor/meta-compositor-x11.h" +#ifdef HAVE_X11 gboolean meta_dnd_handle_xdnd_event (MetaBackend *backend, MetaCompositorX11 *compositor_x11, Display *xdisplay, XEvent *xev); void meta_dnd_init_xdnd (MetaX11Display *x11_display); +#endif #ifdef HAVE_WAYLAND void meta_dnd_wayland_handle_begin_modal (MetaCompositor *compositor); diff --git a/src/compositor/meta-dnd.c b/src/compositor/meta-dnd.c index afe23807b..8d916c4c5 100644 --- a/src/compositor/meta-dnd.c +++ b/src/compositor/meta-dnd.c @@ -125,6 +125,7 @@ meta_dnd_get_backend (MetaDnd *dnd) return priv->backend; } +#ifdef HAVE_X11 void meta_dnd_init_xdnd (MetaX11Display *x11_display) { @@ -155,6 +156,7 @@ meta_dnd_init_xdnd (MetaX11Display *x11_display) XInternAtom (xdisplay, "XdndProxy", False), XA_WINDOW, 32, PropModeReplace, (const unsigned char *) &xwindow, 1); } +#endif static void meta_dnd_notify_dnd_enter (MetaDnd *dnd) @@ -184,6 +186,7 @@ meta_dnd_notify_dnd_leave (MetaDnd *dnd) * * http://www.freedesktop.org/wiki/Specifications/XDND */ +#ifdef HAVE_X11 gboolean meta_dnd_handle_xdnd_event (MetaBackend *backend, MetaCompositorX11 *compositor_x11, @@ -243,6 +246,7 @@ meta_dnd_handle_xdnd_event (MetaBackend *backend, return FALSE; } +#endif #ifdef HAVE_WAYLAND static MetaWaylandDataDevice * diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c index e4fb41f61..1728329dc 100644 --- a/src/x11/meta-x11-display.c +++ b/src/x11/meta-x11-display.c @@ -1420,8 +1420,10 @@ meta_x11_display_new (MetaDisplay *display, meta_x11_startup_notification_init (x11_display); meta_x11_selection_init (x11_display); +#ifdef HAVE_X11 if (!meta_is_wayland_compositor ()) meta_dnd_init_xdnd (x11_display); +#endif sprintf (buf, "WM_S%d", number); |