From 3b04abf8487f6f61fc991ea365ce79cc88778ae6 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Tue, 1 Aug 2017 15:46:11 +0200 Subject: display scrollarea: avoid deprecated gdk_window_get_pointer --- capplets/display/scrollarea.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'capplets/display/scrollarea.c') diff --git a/capplets/display/scrollarea.c b/capplets/display/scrollarea.c index b475fda2..b3302a75 100644 --- a/capplets/display/scrollarea.c +++ b/capplets/display/scrollarea.c @@ -526,6 +526,14 @@ emit_viewport_changed (FooScrollArea *scroll_area, GdkRectangle *new_viewport, GdkRectangle *old_viewport) { +#if GTK_CHECK_VERSION (3, 20, 0) + GdkDisplay *display; + GdkSeat *seat; +#else + GdkDeviceManager *manager; +#endif + GdkDevice *pointer; + int px, py; g_signal_emit (scroll_area, signals[VIEWPORT_CHANGED], 0, new_viewport, old_viewport); @@ -533,7 +541,19 @@ emit_viewport_changed (FooScrollArea *scroll_area, if (scroll_area->priv->input_window == NULL) return; - gdk_window_get_pointer (scroll_area->priv->input_window, &px, &py, NULL); +#if GTK_CHECK_VERSION (3, 20, 0) + display = gdk_window_get_display (scroll_area->priv->input_window); + seat = gdk_display_get_default_seat (display); + pointer = gdk_seat_get_pointer (seat); +#else + manager = gdk_display_get_device_manager (gdk_window_get_display (scroll_area->priv->input_window)); + pointer = gdk_device_manager_get_client_pointer (manager); +#endif + gdk_window_get_device_position (scroll_area->priv->input_window, + pointer, + &px, + &py, + NULL); process_event (scroll_area, FOO_MOTION, px, py); } -- cgit v1.2.1