[gimp/gtk3-port: 205/226] app: use gdk_device_get_position() inetad of gdk_display_get_pointer()

[Michael Natterer <mitch src gnome org>]

commit b19865160db9d384026a9f765d4b9320e813b700
Author: Michael Natterer <mitch gimp org>
Date:   Sat Mar 5 21:29:21 2011 +0100

    app: use gdk_device_get_position() inetad of gdk_display_get_pointer()

 app/gui/gui-vtable.c        |   10 +++++++---
 app/widgets/gimpuimanager.c |   20 ++++++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/app/gui/gui-vtable.c b/app/gui/gui-vtable.c
index 3876f76..fbc92c2 100644
--- a/app/gui/gui-vtable.c
+++ b/app/gui/gui-vtable.c
@@ -252,10 +252,14 @@ gui_get_display_name (Gimp *gimp,
     }
   else
     {
-      gint x, y;
+      GdkDeviceManager *device_manager;
+      GdkDevice        *device;
+      gint              x, y;
 
-      gdk_display_get_pointer (gdk_display_get_default (),
-                               &screen, &x, &y, NULL);
+      device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
+      device = gdk_device_manager_get_client_pointer (device_manager);
+
+      gdk_device_get_position (device, &screen, &x, &y);
       monitor = gdk_screen_get_monitor_at_point (screen, x, y);
     }
 
diff --git a/app/widgets/gimpuimanager.c b/app/widgets/gimpuimanager.c
index 0672f09..de7fef5 100644
--- a/app/widgets/gimpuimanager.c
+++ b/app/widgets/gimpuimanager.c
@@ -796,20 +796,24 @@ gimp_ui_manager_menu_position (GtkMenu  *menu,
                                gint     *y,
                                gpointer  data)
 {
-  GdkScreen      *screen;
-  GtkRequisition  requisition;
-  GdkRectangle    rect;
-  gint            monitor;
-  gint            pointer_x;
-  gint            pointer_y;
+  GdkDeviceManager *device_manager;
+  GdkDevice        *device;
+  GdkScreen        *screen;
+  GtkRequisition    requisition;
+  GdkRectangle      rect;
+  gint              monitor;
+  gint              pointer_x;
+  gint              pointer_y;
 
   g_return_if_fail (GTK_IS_MENU (menu));
   g_return_if_fail (x != NULL);
   g_return_if_fail (y != NULL);
   g_return_if_fail (GTK_IS_WIDGET (data));
 
-  gdk_display_get_pointer (gtk_widget_get_display (GTK_WIDGET (data)),
-                           &screen, &pointer_x, &pointer_y, NULL);
+  device_manager = gdk_display_get_device_manager (gtk_widget_get_display (data));
+  device = gdk_device_manager_get_client_pointer (device_manager);
+
+  gdk_device_get_position (device, &screen, &pointer_x, &pointer_y);
 
   monitor = gdk_screen_get_monitor_at_point (screen, pointer_x, pointer_y);
   gdk_screen_get_monitor_geometry (screen, monitor, &rect);