From 1b1f852086b69e44c31feb4d1d5f94e4765d1200 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Mon, 29 Mar 2021 13:52:31 +0200
Subject: [PATCH] backends/x11: Add traps around XIPointerWarp call

This is left up to higher level code, which is not too nice.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1807>
---
 src/backends/x11/meta-seat-x11.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/backends/x11/meta-seat-x11.c b/src/backends/x11/meta-seat-x11.c
index 5b899114d..d43834bd7 100644
--- a/src/backends/x11/meta-seat-x11.c
+++ b/src/backends/x11/meta-seat-x11.c
@@ -1493,12 +1493,14 @@ meta_seat_x11_warp_pointer (ClutterSeat *seat,
 {
   MetaSeatX11 *seat_x11 = META_SEAT_X11 (seat);
 
+  clutter_x11_trap_x_errors ();
   XIWarpPointer (clutter_x11_get_default_display (),
                  seat_x11->pointer_id,
                  None,
                  clutter_x11_get_root_window (),
                  0, 0, 0, 0,
                  x, y);
+  clutter_x11_untrap_x_errors ();
 }
 
 static uint32_t