From 9dbf81e7d9962079e1a9635fa16a04d6dc3aab8a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 26 Aug 2020 16:06:11 -0400 Subject: [PATCH] x11: Stop setting the query_state vfunc --- gdk/x11/gdkdevice-xi2.c | 1 - gdk/x11/gdksurface-x11.c | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c index ca9e813cfb..49f900178d 100644 --- a/gdk/x11/gdkdevice-xi2.c +++ b/gdk/x11/gdkdevice-xi2.c @@ -108,7 +108,6 @@ gdk_x11_device_xi2_class_init (GdkX11DeviceXI2Class *klass) object_class->set_property = gdk_x11_device_xi2_set_property; device_class->set_surface_cursor = gdk_x11_device_xi2_set_surface_cursor; - device_class->query_state = gdk_x11_device_xi2_query_state; device_class->grab = gdk_x11_device_xi2_grab; device_class->ungrab = gdk_x11_device_xi2_ungrab; device_class->surface_at_position = gdk_x11_device_xi2_surface_at_position; diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c index dc76c6544e..2c3cdf86b4 100644 --- a/gdk/x11/gdksurface-x11.c +++ b/gdk/x11/gdksurface-x11.c @@ -34,6 +34,7 @@ #include "gdkvisual-x11.h" #include "gdkinternals.h" #include "gdkdeviceprivate.h" +#include "gdkdevice-xi2-private.h" #include "gdkframeclockidleprivate.h" #include "gdkasync.h" #include "gdkeventsource.h" @@ -2669,10 +2670,7 @@ gdk_x11_surface_get_device_state (GdkSurface *surface, if (GDK_SURFACE_DESTROYED (surface)) return FALSE; - /*HIDPI: handle coords here?*/ - GDK_DEVICE_GET_CLASS (device)->query_state (device, surface, - &child, - x, y, mask); + gdk_x11_device_xi2_query_state (device, surface, &child, x, y, mask); return child != NULL; }