X11 dnd: Calculate relative coords right in events

GdkSurface.x/y is mostly 0, we need to look atht GdkX11Surface->abs_x/y.

diff --git a/gdk/x11/gdkdrop-x11.c b/gdk/x11/gdkdrop-x11.c
index 6043f52b2697eafeabf97162a17195de41f5ef00..68535043c240c5189105ec84c7cf70201cf6d3ae 100644 (file)
--- a/gdk/x11/gdkdrop-x11.c
+++ b/gdk/x11/gdkdrop-x11.c
@@ -625,11 +625,11 @@ xdnd_position_filter (GdkSurface   *surface,
 
       if (drop_x11->enter_emitted)
         {
-          gdk_drop_emit_motion_event (drop, FALSE, drop_x11->last_x - surface->x, drop_x11->last_y - surface->y, time);
+          gdk_drop_emit_motion_event (drop, FALSE, drop_x11->last_x - impl->abs_x, drop_x11->last_y - impl->abs_y, time);
         }
       else
         {
-          gdk_drop_emit_enter_event (drop, FALSE, drop_x11->last_x - surface->x, drop_x11->last_y - surface->y, time);
+          gdk_drop_emit_enter_event (drop, FALSE, drop_x11->last_x - impl->abs_x, drop_x11->last_y - impl->abs_y, time);
           drop_x11->enter_emitted = TRUE;
         }
     }
@@ -662,9 +662,10 @@ xdnd_drop_filter (GdkSurface   *surface,
       (drop_x11->source_window == source_window))
     {
       GdkSurface *s = gdk_drop_get_surface (drop);
+      GdkX11Surface *si = GDK_X11_SURFACE (s);
       gdk_x11_surface_set_user_time (s, time);
 
-      gdk_drop_emit_drop_event (drop, FALSE, drop_x11->last_x - s->x, drop_x11->last_y - s->y, time);
+      gdk_drop_emit_drop_event (drop, FALSE, drop_x11->last_x - si->abs_x, drop_x11->last_y - si->abs_y, time);
     }
 
   return TRUE;