From 06dae3a8cc05f2dee34183bc045411d88633a00b Mon Sep 17 00:00:00 2001 From: Daniel van Vugt Date: Wed, 5 Feb 2020 15:38:05 +0800 Subject: [PATCH] wayland-pointer: Bail unconditionally if without native backend Using `-Dnative_backend=false` caused build failure due to a missing (implicit) definition of `META_IS_BACKEND_X11`. But if we define it properly then that just leaves some of the function's locals uninitialized and it will never work anyway. Just return unconditionally if there's no native backend to initialize the variables. Closes: https://gitlab.gnome.org/GNOME/mutter/issues/1025 --- src/wayland/meta-wayland-pointer.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c index c643000c3..edf12459c 100644 --- a/src/wayland/meta-wayland-pointer.c +++ b/src/wayland/meta-wayland-pointer.c @@ -283,6 +283,7 @@ void meta_wayland_pointer_send_relative_motion (MetaWaylandPointer *pointer, const ClutterEvent *event) { +#ifdef HAVE_NATIVE_BACKEND struct wl_resource *resource; double dx, dy; double dx_unaccel, dy_unaccel; @@ -296,21 +297,14 @@ meta_wayland_pointer_send_relative_motion (MetaWaylandPointer *pointer, if (!pointer->focus_client) return; -#ifdef HAVE_NATIVE_BACKEND if (!META_IS_BACKEND_NATIVE (backend) || !meta_event_native_get_relative_motion (event, &dx, &dy, &dx_unaccel, &dy_unaccel)) return; -#else - if (META_IS_BACKEND_X11 (backend)) - return; -#endif -#ifdef HAVE_NATIVE_BACKEND time_us = meta_event_native_get_time_usec (event); if (time_us == 0) -#endif time_us = clutter_event_get_time (event) * 1000ULL; time_us_hi = (uint32_t) (time_us >> 32); time_us_lo = (uint32_t) time_us; @@ -330,6 +324,7 @@ meta_wayland_pointer_send_relative_motion (MetaWaylandPointer *pointer, dx_unaccelf, dy_unaccelf); } +#endif } void