Merge branch 'pointer-warp' into 'main'

xwayland: Allow pointer warps even when cursor is visible.

See merge request xorg/xserver!1839
This commit is contained in:
Rémi Bernon 2026-06-05 07:35:14 +00:00
commit fb1aa4e4ca

View file

@ -3529,9 +3529,6 @@ xwl_seat_emulate_pointer_warp(struct xwl_seat *xwl_seat,
if (!xwl_seat_can_emulate_pointer_warp(xwl_seat))
return;
if (xwl_seat->x_cursor != NULL)
return;
if (!xwl_seat->pointer_warp_emulator)
xwl_seat_create_pointer_warp_emulator(xwl_seat);
@ -3542,6 +3539,9 @@ xwl_seat_emulate_pointer_warp(struct xwl_seat *xwl_seat,
xwl_window,
sprite,
x, y);
if (xwl_seat->x_cursor != NULL)
xwl_seat_destroy_pointer_warp_emulator(xwl_seat);
}
static Bool