DND coordinates confusion : screen or client

To get all the nice inter-app drag & drop of The GIMP working
under win32 I've played a little wit ScreenToClient() 
transformations on the delivered - so called 'root_x' and 
'root_y' coordinates for GDK_DRAG_MOTION and GDK_DROP_START.

Other then the variable names suggest the point seems to be
needed in event.dnd.window coordinates space and not in root
window coordinates. Everything seems to work fine with this
change, but it may hide another bug in the win32 backend.

Or maybe the variable names are just suggesting the wrong
thingh- At least to me it appears so as if there is no
transformation done in the x11 backend for these case 
either. Am I looking at the wrong place ?

Oh: and the patch reverts (or I think highly simplifies the
fix for bug #116320; haven't tested it, but that part appears
to be independent  ;)


Thanks,
    Hans


diff --exclude-from=c:\util\tool\diff.ign -up -r
from-cvs/gtk+/gdk/win32/gdkdnd-win32.c my-gtk/gtk+/gdk/win32/gdkdnd-win32.c
--- from-cvs/gtk+/gdk/win32/gdkdnd-win32.c	Sat Mar  6 12:42:54 2004
+++ my-gtk/gtk+/gdk/win32/gdkdnd-win32.c	Sun Mar 14 20:17:50 2004
@@ -1146,8 +1146,20 @@ local_send_motion (GdkDragContext *conte
       current_dest_drag->suggested_action = action;
       current_dest_drag->actions = current_dest_drag->suggested_action;
 
+#if 0
       tmp_event.dnd.x_root = x_root;
       tmp_event.dnd.y_root = y_root;
+#else
+      //FIXME: this appears to be working around a gdk/x11 bug
+      {
+        POINT pt;
+        pt.x = x_root;
+        pt.y = y_root;
+        ScreenToClient (GDK_WINDOW_HWND (tmp_event.dnd.window), &pt);
+        tmp_event.dnd.x_root = pt.x;
+        tmp_event.dnd.y_root = pt.y;
+      }
+#endif
 
       (GDK_DRAG_CONTEXT_PRIVATE_DATA (current_dest_drag))->last_x = x_root;
       (GDK_DRAG_CONTEXT_PRIVATE_DATA (current_dest_drag))->last_y = y_root;
@@ -1178,8 +1190,20 @@ local_send_drop (GdkDragContext *context
       tmp_event.dnd.context = current_dest_drag;
       tmp_event.dnd.time = GDK_CURRENT_TIME;
       
+#if 0
       tmp_event.dnd.x_root = private->last_x;
       tmp_event.dnd.y_root = private->last_y;
+#else
+      //FIXME: this appears to be working around a gdk/x11 bug
+      {
+        POINT pt;
+        pt.x = private->last_x;
+        pt.y = private->last_y;
+        ScreenToClient (GDK_WINDOW_HWND (tmp_event.dnd.window), &pt);
+        tmp_event.dnd.x_root = pt.x;
+        tmp_event.dnd.y_root = pt.y;
+      }
+#endif
       
       current_dest_drag = NULL;
 
@@ -1361,13 +1385,21 @@ gdk_drag_find_window_for_screen (GdkDrag
 				 GdkDragProtocol *protocol)
 {
   find_window_enum_arg a;
+  POINT pt;
+  HWND  hwnd;
 
-  a.x = x_root;
-  a.y = y_root;
+  pt.x = a.x = x_root;
+  pt.y = a.y = y_root;
   a.ignore = drag_window ? GDK_WINDOW_HWND (drag_window) : NULL;
   a.result = NULL;
 
+#if 0
   EnumWindows (find_window_enum_proc, (LPARAM) &a);
+#else
+  hwnd = WindowFromPoint (pt);
+  if (hwnd != a.ignore)
+    a.result = hwnd;
+#endif
 
   if (a.result == NULL)
     *dest_window = NULL;
@@ -1409,7 +1441,7 @@ gdk_drag_motion (GdkDragContext *context
 
   g_return_val_if_fail (context != NULL, FALSE);
 
-  GDK_NOTE (DND, g_print ("gdk_drag_motion\n"));
+  GDK_NOTE (DND, g_print ("gdk_drag_motion:"));
 
   private = GDK_DRAG_CONTEXT_PRIVATE_DATA (context);
   
@@ -1431,6 +1463,7 @@ gdk_drag_motion (GdkDragContext *context
 	  switch (protocol)
 	    {
 	    case GDK_DRAG_PROTO_LOCAL:
+                GDK_NOTE (DND, g_print (" local enter,"));
 	      local_send_enter (context, time);
 	      break;
 
@@ -1458,7 +1491,10 @@ gdk_drag_motion (GdkDragContext *context
 
       temp_event.dnd.context = context;
       temp_event.dnd.time = time;
+      temp_event.dnd.x_root = x_root;
+      temp_event.dnd.y_root = y_root;
 
+      GDK_NOTE (DND, g_print (" put,"));
       gdk_event_put (&temp_event);
     }
   else
@@ -1478,6 +1514,7 @@ gdk_drag_motion (GdkDragContext *context
 	  switch (context->protocol)
 	    {
 	    case GDK_DRAG_PROTO_LOCAL:
+                GDK_NOTE (DND, g_print (" local motion,"));
 	      local_send_motion (context, x_root, y_root, suggested_action, time);
 	      break;
 	      
@@ -1490,9 +1527,13 @@ gdk_drag_motion (GdkDragContext *context
 	    }
 	}
       else
-	return TRUE;
+	{
+	  GDK_NOTE (DND, g_print (" ret TRUE.\n"));
+	  return TRUE;
+	}
     }
 
+  GDK_NOTE (DND, g_print (" ret FALSE.\n"));
   return FALSE;
 }
 
@@ -1610,7 +1651,7 @@ gdk_drop_finish (GdkDragContext *context
 	
   g_return_if_fail (context != NULL);
 
-  GDK_NOTE (DND, g_print ("gdk_drop_finish"));
+  GDK_NOTE (DND, g_print ("gdk_drop_finish\n"));
 
   private = GDK_DRAG_CONTEXT_PRIVATE_DATA (context);