From 52e3b8838240c01b416783372703bf4ad9045c1d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 27 Oct 2014 21:18:15 -0700 Subject: [PATCH] gdkwindow: Specify some invariants for cursors Cursors should not be on a different display than their window / device, as that would break Wayland. --- gdk/gdkwindow.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index c0186aa74f..1f05aff3ef 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -6015,6 +6015,9 @@ gdk_window_set_cursor_internal (GdkWindow *window, if (GDK_WINDOW_DESTROYED (window)) return; + g_assert (gdk_window_get_display (window) == gdk_device_get_display (device)); + g_assert (!cursor || gdk_window_get_display (window) == gdk_cursor_get_display (cursor)); + if (window->window_type == GDK_WINDOW_ROOT || window->window_type == GDK_WINDOW_FOREIGN) GDK_WINDOW_IMPL_GET_CLASS (window->impl)->set_device_cursor (window, device, cursor);