[Xfce4-commits] [apps/xfce4-dict] 13/43: Replace gdk_window_get_pointer by gdk_window_get_device_position

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

andre pushed a commit to branch master
in repository apps/xfce4-dict.

commit b983044d932dc807848572f2a89b83f65a8e9547
Author: Andre Miranda <andre42m at gmail.com>
Date:   Wed Jul 20 22:55:39 2016 -0300

    Replace gdk_window_get_pointer by gdk_window_get_device_position
---
 lib/gui.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/lib/gui.c b/lib/gui.c
index c3d9863..b1b97b9 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -226,8 +226,18 @@ static gboolean textview_motion_notify_event(GtkWidget *text_view, GdkEventMotio
 static gboolean textview_visibility_notify_event(GtkWidget *text_view, GdkEventVisibility *event)
 {
 	gint wx, wy, bx, by;
+	GdkDevice *pointer;
+
+#if GTK_CHECK_VERSION (3,2,0)
+    GdkSeat *seat = gdk_display_get_default_seat (gdk_display_get_default ());
+    pointer = gdk_seat_get_pointer (seat);
+#else
+    GdkDeviceManager *devman = gdk_display_get_device_manager (gdk_display_get_default ());
+    pointer = gdk_device_manager_get_client_pointer (devman);
+#endif
 
-	gdk_window_get_pointer(text_view->window, &wx, &wy, NULL);
+	gdk_window_get_device_position(gtk_widget_get_window (text_view),
+								   pointer, &wx, &wy, NULL);
 
 	gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(text_view),
 		GTK_TEXT_WINDOW_WIDGET, wx, wy, &bx, &by);
@@ -246,8 +256,18 @@ static gchar *textview_get_text_at_cursor(DictData *dd)
 	if (! gtk_text_buffer_get_selection_bounds(dd->main_textbuffer, &start, &end))
 	{
 		gint wx, wy, bx, by;
+		GdkDevice *pointer;
+
+#if GTK_CHECK_VERSION (3,2,0)
+		GdkSeat *seat = gdk_display_get_default_seat (gdk_display_get_default ());
+		pointer = gdk_seat_get_pointer (seat);
+#else
+		GdkDeviceManager *devman = gdk_display_get_device_manager (gdk_display_get_default ());
+		pointer = gdk_device_manager_get_client_pointer (devman);
+#endif
 
-		gdk_window_get_pointer(dd->main_textview->window, &wx, &wy, NULL);
+		gdk_window_get_device_position(gtk_widget_get_window (dd->main_textview),
+									   pointer, &wx, &wy, NULL);
 
 		gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(dd->main_textview),
 			GTK_TEXT_WINDOW_WIDGET, wx, wy, &bx, &by);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.