diff options
| author | Bilal Elmoussaoui <belmouss@redhat.com> | 2022-06-01 10:06:55 +0200 |
|---|---|---|
| committer | Bilal Elmoussaoui <belmouss@redhat.com> | 2023-05-15 20:36:23 +0200 |
| commit | 0f88f0931c11431354556b1ffaae082048e98777 (patch) | |
| tree | 9fde489475ba3a17c413acdd43d960e9dcf3ff35 | |
| parent | 3e95609073b3a455693e19e58b365688b7f877ba (diff) | |
| download | mutter-0f88f0931c11431354556b1ffaae082048e98777.tar.gz | |
core/events: Guard X11 types
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2445>
| -rw-r--r-- | src/core/events.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/core/events.c b/src/core/events.c index 1767dded3..182de33bb 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -27,14 +27,17 @@ #include "backends/meta-cursor-tracker-private.h" #include "backends/meta-dnd-private.h" #include "backends/meta-idle-manager.h" -#include "backends/x11/meta-backend-x11.h" -#include "backends/x11/meta-input-device-x11.h" #include "compositor/compositor-private.h" #include "compositor/meta-window-actor-private.h" #include "core/display-private.h" #include "core/window-private.h" #include "meta/meta-backend.h" +#ifdef HAVE_X11_CLIENT +#include "backends/x11/meta-backend-x11.h" +#include "backends/x11/meta-input-device-x11.h" +#endif + #ifdef HAVE_NATIVE_BACKEND #include "backends/native/meta-backend-native.h" #endif @@ -165,6 +168,7 @@ sequence_is_pointer_emulated (MetaDisplay *display, return FALSE; } +#ifdef HAVE_X11_CLIENT static void maybe_unfreeze_pointer_events (MetaBackend *backend, const ClutterEvent *event, @@ -203,6 +207,7 @@ maybe_unfreeze_pointer_events (MetaBackend *backend, xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend)); XIAllowEvents (xdisplay, device_id, event_mode, event->button.time); } +#endif static gboolean meta_display_handle_event (MetaDisplay *display, @@ -465,8 +470,9 @@ meta_display_handle_event (MetaDisplay *display, { /* Only replay button press events, since that's where we * have the synchronous grab. */ +#ifdef HAVE_X11_CLIENT maybe_unfreeze_pointer_events (backend, event, EVENTS_UNFREEZE_REPLAY); - +#endif /* If the focus window has an active close dialog let clutter * events go through, so fancy clutter dialogs can get to handle * all events. @@ -486,7 +492,9 @@ meta_display_handle_event (MetaDisplay *display, /* We could not match the event with a window, make sure we sync * the pointer to discard the sequence and don't keep events frozen. */ - maybe_unfreeze_pointer_events (backend, event, EVENTS_UNFREEZE_SYNC); +#ifdef HAVE_X11_CLIENT + maybe_unfreeze_pointer_events (backend, event, EVENTS_UNFREEZE_SYNC); +#endif } out: |