]> Pileus Git - ~andy/gtk/blobdiff - gdk/x11/gdkdnd-x11.c
Cleanups
[~andy/gtk] / gdk / x11 / gdkdnd-x11.c
index 2c5c9c3ff943bc433fa8b8ba9a6fdf280d16efb3..f9104313301fb46ca04589f8387c93cfef2aa60b 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <config.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <string.h>
 
 #include "gdk.h"          /* For gdk_flush() */
 #include "gdkx.h"
+#include "gdkasync.h"
 #include "gdkdnd.h"
 #include "gdkproperty.h"
 #include "gdkprivate-x11.h"
 #include "gdkinternals.h"
 #include "gdkscreen-x11.h"
 #include "gdkdisplay-x11.h"
+#include "gdkalias.h"
 
 typedef struct _GdkDragContextPrivateX11 GdkDragContextPrivateX11;
 
@@ -66,7 +69,6 @@ struct _GdkDragContextPrivateX11 {
   GdkDragContext context;
 
   Atom motif_selection;
-  Atom xdnd_selection;
   guint   ref_count;
 
   guint16 last_x;              /* Coordinates from last event */
@@ -79,9 +81,12 @@ struct _GdkDragContextPrivateX11 {
   Window drop_xid;            /* The (non-proxied) window that is receiving drops */
   guint xdnd_targets_set : 1;   /* Whether we've already set XdndTypeList */
   guint xdnd_actions_set : 1;   /* Whether we've already set XdndActionList */
-  guint xdnd_have_actions : 1; /* Whether an XdndActionList was provided */
+  guint xdnd_have_actions : 1;  /* Whether an XdndActionList was provided */
   guint motif_targets_set : 1;  /* Whether we've already set motif initiator info */
   guint drag_status : 4;       /* current status of drag */
+  
+  guint drop_failed : 1;        /* Whether the drop was unsuccessful */
+  guint version;                /* Xdnd protocol version */
 
   GSList *window_caches;
 };
@@ -98,76 +103,56 @@ static GdkFilterReturn motif_dnd_filter (GdkXEvent *xev,
                                         GdkEvent  *event,
                                         gpointer   data);
 
-static GdkFilterReturn xdnd_enter_filter (GdkXEvent *xev,
-                                         GdkEvent  *event,
-                                         gpointer   data);
-
-static GdkFilterReturn xdnd_leave_filter (GdkXEvent *xev,
-                                         GdkEvent  *event,
-                                         gpointer   data);
-
+static GdkFilterReturn xdnd_enter_filter    (GdkXEvent *xev,
+                                            GdkEvent  *event,
+                                            gpointer   data);
+static GdkFilterReturn xdnd_leave_filter    (GdkXEvent *xev,
+                                            GdkEvent  *event,
+                                            gpointer   data);
 static GdkFilterReturn xdnd_position_filter (GdkXEvent *xev,
                                             GdkEvent  *event,
                                             gpointer   data);
-
-static GdkFilterReturn xdnd_status_filter (GdkXEvent *xev,
-                                          GdkEvent  *event,
-                                          gpointer   data);
-
+static GdkFilterReturn xdnd_status_filter   (GdkXEvent *xev,
+                                            GdkEvent  *event,
+                                            gpointer   data);
 static GdkFilterReturn xdnd_finished_filter (GdkXEvent *xev,
-                                           GdkEvent  *event,
-                                           gpointer   data);
-
-static GdkFilterReturn xdnd_drop_filter (GdkXEvent *xev,
-                                        GdkEvent  *event,
-                                        gpointer   data);
+                                            GdkEvent  *event,
+                                            gpointer   data);
+static GdkFilterReturn xdnd_drop_filter     (GdkXEvent *xev,
+                                            GdkEvent  *event,
+                                            gpointer   data);
 
 static void   xdnd_manage_source_filter (GdkDragContext *context,
                                         GdkWindow      *window,
                                         gboolean        add_filter);
 
-static void gdk_drag_context_init       (GdkDragContext      *dragcontext);
-static void gdk_drag_context_class_init (GdkDragContextClass *klass);
 static void gdk_drag_context_finalize   (GObject              *object);
 
-static gpointer parent_class = NULL;
 static GList *contexts;
 
-GType
-gdk_drag_context_get_type (void)
-{
-  static GType object_type = 0;
-
-  if (!object_type)
-    {
-      static const GTypeInfo object_info =
-      {
-        sizeof (GdkDragContextClass),
-        (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) gdk_drag_context_class_init,
-        NULL,           /* class_finalize */
-        NULL,           /* class_data */
-        sizeof (GdkDragContext),
-        0,              /* n_preallocs */
-        (GInstanceInitFunc) gdk_drag_context_init,
-      };
-      
-      object_type = g_type_register_static (G_TYPE_OBJECT,
-                                            "GdkDragContext",
-                                            &object_info, 0);
-    }
-  
-  return object_type;
-}
+static const struct {
+  const char *atom_name;
+  GdkFilterFunc func;
+} xdnd_filters[] = {
+  { "XdndEnter",    xdnd_enter_filter },
+  { "XdndLeave",    xdnd_leave_filter },
+  { "XdndPosition", xdnd_position_filter },
+  { "XdndStatus",   xdnd_status_filter },
+  { "XdndFinished", xdnd_finished_filter },
+  { "XdndDrop",     xdnd_drop_filter },
+};
+             
+G_DEFINE_TYPE (GdkDragContext, gdk_drag_context, G_TYPE_OBJECT)
 
 static void
 gdk_drag_context_init (GdkDragContext *dragcontext)
 {
   GdkDragContextPrivateX11 *private;
 
-  private = g_new0 (GdkDragContextPrivateX11, 1);
-
+  private = G_TYPE_INSTANCE_GET_PRIVATE (dragcontext, 
+                                        GDK_TYPE_DRAG_CONTEXT, 
+                                        GdkDragContextPrivateX11);
+  
   dragcontext->windowing_data = private;
 
   contexts = g_list_prepend (contexts, dragcontext);
@@ -178,9 +163,9 @@ gdk_drag_context_class_init (GdkDragContextClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  parent_class = g_type_class_peek_parent (klass);
-
   object_class->finalize = gdk_drag_context_finalize;
+
+  g_type_class_add_private (object_class, sizeof (GdkDragContextPrivateX11));
 }
 
 static void
@@ -210,9 +195,7 @@ gdk_drag_context_finalize (GObject *object)
   
   contexts = g_list_remove (contexts, context);
 
-  g_free (private);
-  
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS (gdk_drag_context_parent_class)->finalize (object);
 }
 
 /* Drag Contexts */
@@ -225,9 +208,9 @@ gdk_drag_context_finalize (GObject *object)
  * Return value: the newly created #GdkDragContext.
  **/
 GdkDragContext *
-gdk_drag_context_new        (void)
+gdk_drag_context_new (void)
 {
-  return g_object_new (gdk_drag_context_get_type (), NULL);
+  return g_object_new (GDK_TYPE_DRAG_CONTEXT, NULL);
 }
 
 /**
@@ -296,6 +279,29 @@ gdk_drag_context_find (GdkDisplay *display,
   return NULL;
 }
 
+static void
+precache_target_list (GdkDragContext *context)
+{
+  if (context->targets)
+    {
+      GPtrArray *targets = g_ptr_array_new ();
+      GList *tmp_list;
+      int i;
+
+      for (tmp_list = context->targets; tmp_list; tmp_list = tmp_list->next)
+       g_ptr_array_add (targets, gdk_atom_name (GDK_POINTER_TO_ATOM (tmp_list->data)));
+
+      _gdk_x11_precache_atoms (GDK_WINDOW_DISPLAY (context->source_window),
+                              (const gchar **)targets->pdata,
+                              targets->len);
+
+      for (i =0; i < targets->len; i++)
+       g_free (targets->pdata[i]);
+
+      g_ptr_array_free (targets, TRUE);
+    }
+}
+
 /* Utility functions */
 
 static void
@@ -441,11 +447,10 @@ static GdkWindowCache *
 gdk_window_cache_new (GdkScreen *screen)
 {
   XWindowAttributes xwa;
-  Window root, parent, *children;
-  unsigned int nchildren;
-  int i;
   Display *xdisplay = GDK_SCREEN_XDISPLAY (screen);
   GdkWindow *root_window = gdk_screen_get_root_window (screen);
+  GdkChildInfoX11 *children;
+  guint nchildren, i;
   
   GdkWindowCache *result = g_new (GdkWindowCache, 1);
 
@@ -455,29 +460,43 @@ gdk_window_cache_new (GdkScreen *screen)
 
   XGetWindowAttributes (xdisplay, GDK_WINDOW_XWINDOW (root_window), &xwa);
   result->old_event_mask = xwa.your_event_mask;
+
+  if (G_UNLIKELY (!GDK_DISPLAY_X11 (GDK_SCREEN_X11 (screen)->display)->trusted_client)) 
+    {
+      GList *toplevel_windows, *list;
+      GdkWindow *window;
+      gint x, y, width, height;
+      
+      toplevel_windows = gdk_screen_get_toplevel_windows (screen);
+      for (list = toplevel_windows; list; list = list->next) {
+       window = GDK_WINDOW (list->data);
+       gdk_window_get_geometry (window, &x, &y, &width, &height, NULL);
+       gdk_window_cache_add (result, GDK_WINDOW_XID (window), 
+                             x, y, width, height, 
+                             gdk_window_is_visible (window));
+      }
+      g_list_free (toplevel_windows);
+      return result;
+    }
+
   XSelectInput (xdisplay, GDK_WINDOW_XWINDOW (root_window),
                result->old_event_mask | SubstructureNotifyMask);
   gdk_window_add_filter (root_window, gdk_window_cache_filter, result);
 
-  gdk_error_trap_push ();
+  if (!_gdk_x11_get_window_child_info (gdk_screen_get_display (screen),
+                                      GDK_WINDOW_XWINDOW (root_window),
+                                      FALSE, NULL,
+                                      &children, &nchildren))
+    return result;
 
-  if (!XQueryTree(xdisplay, GDK_WINDOW_XWINDOW (root_window),
-                 &root, &parent, &children, &nchildren))
-    {
-      gdk_error_trap_pop ();
-      return result;
-    }
-  
   for (i = 0; i < nchildren ; i++)
     {
-      if (XGetWindowAttributes (xdisplay, children[i], &xwa))
-       gdk_window_cache_add (result, children[i],
-                             xwa.x, xwa.y, xwa.width, xwa.height,
-                             xwa.map_state != IsUnmapped);
+      gdk_window_cache_add (result, children[i].window,
+                           children[i].x, children[i].y, children[i].width, children[i].height,
+                           children[i].is_mapped);
     }
 
-  XFree (children);
-  gdk_error_trap_pop ();
+  g_free (children);
 
   return result;
 }
@@ -502,64 +521,53 @@ gdk_window_cache_destroy (GdkWindowCache *cache)
 static Window
 get_client_window_at_coords_recurse (GdkDisplay *display,
                                     Window      win,
+                                    gboolean    is_toplevel,
                                     gint        x,
                                     gint        y)
 {
-  Window root, tmp_parent, *children;
+  GdkChildInfoX11 *children;
   unsigned int nchildren;
   int i;
-  Window child = None;
-  Atom type = None;
-  int format;
-  unsigned long nitems, after;
-  unsigned char *data;
-  
-  if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(display), win,
-                         gdk_x11_get_xatom_by_name_for_display (display, "WM_STATE"),
-                         0, 0, False, AnyPropertyType,
-                         &type, &format, &nitems, &after, &data) != Success)
+  gboolean found_child = FALSE;
+  GdkChildInfoX11 child = { 0, };
+  gboolean has_wm_state = FALSE;
+
+  if (!_gdk_x11_get_window_child_info (display, win, TRUE,
+                                      is_toplevel? &has_wm_state : NULL,
+                                      &children, &nchildren))
     return None;
 
-  if (type != None)
+  if (has_wm_state)
     {
-      XFree (data);
+      g_free (children);
+
       return win;
     }
 
-#if 0
-  /* This is beautiful! Damn Enlightenment and click-to-focus */
-  if (!XTranslateCoordinates (gdk_display, _gdk_root_window, win,
-                             x_root, y_root, &dest_x, &dest_y, &child))
-    return None;
-  
-#else
-  if (!XQueryTree (GDK_DISPLAY_XDISPLAY (display), win,
-                  &root, &tmp_parent, &children, &nchildren))
-    return 0;
-  
-  for (i = nchildren - 1; (i >= 0) && (child == None); i--)
+  for (i = nchildren - 1; (i >= 0) && !found_child; i--)
     {
-      XWindowAttributes xwa;
-      
-      if (XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (display),
-                               children[i], &xwa))
-       {
-         if ((xwa.map_state == IsViewable) && (xwa.class == InputOutput) &&
-             (x >= xwa.x) && (x < xwa.x + (gint)xwa.width) &&
-             (y >= xwa.y) && (y < xwa.y + (gint)xwa.height))
-           {
-             x -= xwa.x;
-             y -= xwa.y;
-             child = children[i];
-           }
-       }
+      GdkChildInfoX11 *cur_child = &children[i];
+       
+      if ((cur_child->is_mapped) && (cur_child->window_class == InputOutput) &&
+         (x >= cur_child->x) && (x < cur_child->x + cur_child->width) &&
+         (y >= cur_child->y) && (y < cur_child->y + cur_child->height))
+       {
+         x -= cur_child->x;
+         y -= cur_child->y;
+         child = *cur_child;
+         found_child = TRUE;
+       }
+    }
+   
+  g_free (children);
+  if (found_child)
+    {
+      if (child.has_wm_state)
+       return child.window;
+      else
+       return get_client_window_at_coords_recurse (display, child.window, FALSE, x, y);
     }
-  
-  XFree (children);
-#endif  
-
-  if (child)
-    return get_client_window_at_coords_recurse (display, child, x, y);
   else
     return None;
 }
@@ -587,7 +595,7 @@ get_client_window_at_coords (GdkWindowCache *cache,
              (y_root >= child->y) && (y_root < child->y + child->height))
            {
              retval = get_client_window_at_coords_recurse (gdk_screen_get_display (cache->screen),
-                                                           child->xid,
+                                                           child->xid, TRUE,
                                                            x_root - child->x,
                                                            y_root - child->y);
              if (!retval)
@@ -839,7 +847,7 @@ motif_find_drag_window (GdkDisplay *display,
                XCreateWindow (persistant_xdisplay, 
                               RootWindow (persistant_xdisplay, 0),
                              -100, -100, 10, 10, 0, 0,
-                             InputOnly, CopyFromParent,
+                             InputOnly, (Visual *)CopyFromParent,
                              (CWOverrideRedirect | CWEventMask), &attr);
              
              GDK_NOTE (DND,
@@ -895,6 +903,7 @@ motif_read_target_table (GdkDisplay *display)
 
   if (motif_find_drag_window (display, FALSE))
     {
+      guchar *data;
       MotifTargetTableHeader *header = NULL;
       guchar *target_bytes = NULL;
       guchar *p;
@@ -907,11 +916,13 @@ motif_read_target_table (GdkDisplay *display)
                          0, (sizeof(MotifTargetTableHeader)+3)/4, FALSE,
                          motif_drag_targets_atom, 
                          &type, &format, &nitems, &bytes_after,
-                         (guchar **)&header);
+                         &data);
 
       if (gdk_error_trap_pop () || (format != 8) || (nitems < sizeof (MotifTargetTableHeader)))
        goto error;
 
+      header = (MotifTargetTableHeader *)data;
+
       header->n_lists = card16_to_host (header->n_lists, header->byte_order);
       header->total_size = card32_to_host (header->total_size, header->byte_order);
 
@@ -1246,6 +1257,7 @@ motif_check_dest (GdkDisplay *display,
                  Window      win)
 {
   gboolean retval = FALSE;
+  guchar *data;
   MotifDragReceiverInfo *info;
   Atom type = None;
   int format;
@@ -1257,12 +1269,14 @@ motif_check_dest (GdkDisplay *display,
                      motif_drag_receiver_info_atom, 
                      0, (sizeof(*info)+3)/4, False, AnyPropertyType,
                      &type, &format, &nitems, &after, 
-                     (guchar **)&info);
+                     &data);
 
   if (gdk_error_trap_pop() == 0)
     {
       if (type != None)
        {
+         info = (MotifDragReceiverInfo *)data;
+         
          if ((format == 8) && (nitems == sizeof(*info)))
            {
              if ((info->protocol_version == 0) &&
@@ -1292,6 +1306,9 @@ motif_send_enter (GdkDragContext  *context,
   GdkDisplay *display = GDK_DRAWABLE_DISPLAY (context->source_window);
   XEvent xev;
 
+  if (!G_LIKELY (GDK_DISPLAY_X11 (display)->trusted_client))
+    return; /* Motif Dnd requires getting properties on the root window */
+
   xev.xclient.type = ClientMessage;
   xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_AND_DROP_MESSAGE");
   xev.xclient.format = 8;
@@ -1442,6 +1459,7 @@ motif_read_initiator_info (GdkDisplay *display,
   gint format;
   gulong nitems;
   gulong bytes_after;
+  guchar *data;
   MotifDragInitiatorInfo *initiator_info;
   
   GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
@@ -1451,7 +1469,7 @@ motif_read_initiator_info (GdkDisplay *display,
                      0, sizeof(*initiator_info), FALSE,
                      gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_INITIATOR_INFO"),
                      &type, &format, &nitems, &bytes_after,
-                     (guchar **)&initiator_info);
+                     &data);
 
   if (gdk_error_trap_pop () || (format != 8) || (nitems != sizeof (MotifDragInitiatorInfo)) || (bytes_after != 0))
     {
@@ -1459,6 +1477,8 @@ motif_read_initiator_info (GdkDisplay *display,
       return FALSE;
     }
 
+  initiator_info = (MotifDragInitiatorInfo *)data;
+
   motif_read_target_table (display);
 
   initiator_info->targets_index = 
@@ -1718,6 +1738,8 @@ motif_drop_start (GdkEvent *event,
   event->dnd.x_root = x_root;
   event->dnd.y_root = y_root;
 
+  gdk_x11_window_set_user_time (event->any.window, timestamp);
+
   g_object_ref (new_context);
   display_x11->current_dest_drag = new_context;
 
@@ -1869,7 +1891,7 @@ motif_dnd_filter (GdkXEvent *xev,
 /* Utility functions */
 
 static struct {
-  gchar *name;
+  const gchar *name;
   GdkAtom atom;
   GdkDragAction action;
 } xdnd_actions_table[] = {
@@ -1890,7 +1912,7 @@ xdnd_initialize_actions (void)
   
   xdnd_actions_initialized = TRUE;
   for (i=0; i < xdnd_n_actions; i++)
-    xdnd_actions_table[i].atom = gdk_atom_intern (xdnd_actions_table[i].name, FALSE);
+    xdnd_actions_table[i].atom = gdk_atom_intern_static_string (xdnd_actions_table[i].name);
 }
 
 static GdkDragAction
@@ -1987,6 +2009,7 @@ xdnd_finished_filter (GdkXEvent *xev,
   XEvent *xevent = (XEvent *)xev;
   guint32 dest_window = xevent->xclient.data.l[0];
   GdkDragContext *context;
+  GdkDragContextPrivateX11 *private;
 
   if (!event->any.window ||
       gdk_window_get_window_type (event->any.window) == GDK_WINDOW_FOREIGN)
@@ -2000,10 +2023,16 @@ xdnd_finished_filter (GdkXEvent *xev,
   
   if (context)
     {
+      private = PRIVATE_DATA (context);
+      if (private->version == 5)
+       private->drop_failed = xevent->xclient.data.l[1] == 0;
+      
       event->dnd.type = GDK_DROP_FINISHED;
       event->dnd.context = context;
       g_object_ref (context);
 
+      event->dnd.time = GDK_CURRENT_TIME; /* FIXME? */
+
       return GDK_FILTER_TRANSLATE;
     }
 
@@ -2086,32 +2115,126 @@ xdnd_set_actions (GdkDragContext *context)
 
   g_free (atomlist);
 
-  private->xdnd_actions_set = 1;
+  private->xdnd_actions_set = TRUE;
   private->xdnd_actions = context->actions;
 }
 
-/*************************************************************
- * xdnd_send_xevent:
- *     Like gdk_send_event, but if the target is the root
- *     window, sets an event mask of ButtonPressMask, otherwise
- *     an event mask of 0.
- *   arguments:
- *     
- *   results:
- *************************************************************/
+static void
+send_client_message_async_cb (Window   window,
+                             gboolean success,
+                             gpointer data)
+{
+  GdkDragContext *context = data;
+  GDK_NOTE (DND,
+           g_message ("Got async callback for #%lx, success = %d",
+                      window, success));
+
+  /* On failure, we immediately continue with the protocol
+   * so we don't end up blocking for a timeout
+   */
+  if (!success &&
+      context->dest_window &&
+      window == GDK_WINDOW_XID (context->dest_window))
+    {
+      GdkEvent temp_event;
+      GdkDragContextPrivateX11 *private = PRIVATE_DATA (context);
+
+      g_object_unref (context->dest_window);
+      context->dest_window = NULL;
+      context->action = 0;
+
+      private->drag_status = GDK_DRAG_STATUS_DRAG;
+
+      temp_event.dnd.type = GDK_DRAG_STATUS;
+      temp_event.dnd.window = context->source_window;
+      temp_event.dnd.send_event = TRUE;
+      temp_event.dnd.context = context;
+      temp_event.dnd.time = GDK_CURRENT_TIME;
+
+      gdk_event_put (&temp_event);
+    }
+
+  g_object_unref (context);
+}
+
+
+static GdkDisplay *
+gdk_drag_context_get_display (GdkDragContext *context)
+{
+  if (context->source_window)
+    return GDK_DRAWABLE_DISPLAY (context->source_window);
+  else if (context->dest_window)
+    return GDK_DRAWABLE_DISPLAY (context->dest_window);
+
+  g_assert_not_reached ();
+  return NULL;
+}
+
+static void
+send_client_message_async (GdkDragContext      *context,
+                          Window               window, 
+                          gboolean             propagate,
+                          glong                event_mask,
+                          XClientMessageEvent *event_send)
+{
+  GdkDisplay *display = gdk_drag_context_get_display (context);
+  
+  g_object_ref (context);
+
+  _gdk_x11_send_client_message_async (display, window,
+                                     propagate, event_mask, event_send,
+                                     send_client_message_async_cb, context);
+}
 
 static gboolean
-xdnd_send_xevent (GdkDisplay *display, 
-                 Window      window, 
-                 gboolean    propagate, 
-                 XEvent     *event_send)
+xdnd_send_xevent (GdkDragContext *context,
+                 GdkWindow      *window, 
+                 gboolean        propagate,
+                 XEvent         *event_send)
 {
-  if (_gdk_x11_display_is_root_window (display, window))
-    return _gdk_send_xevent (display, window, propagate, ButtonPressMask, event_send);
+  GdkDisplay *display = gdk_drag_context_get_display (context);
+  Window xwindow;
+  glong event_mask;
+
+  g_assert (event_send->xany.type == ClientMessage);
+
+  /* We short-circuit messages to ourselves */
+  if (gdk_window_get_window_type (window) != GDK_WINDOW_FOREIGN)
+    {
+      gint i;
+      
+      for (i = 0; i < G_N_ELEMENTS (xdnd_filters); i++)
+       {
+         if (gdk_x11_get_xatom_by_name_for_display (display, xdnd_filters[i].atom_name) ==
+             event_send->xclient.message_type)
+           {
+             GdkEvent temp_event;
+             temp_event.any.window = window;
+
+             if  ((*xdnd_filters[i].func) (event_send, &temp_event, NULL) == GDK_FILTER_TRANSLATE)
+               {
+                 gdk_event_put (&temp_event);
+                 g_object_unref (temp_event.dnd.context);
+               }
+             
+             return TRUE;
+           }
+       }
+    }
+
+  xwindow = GDK_WINDOW_XWINDOW (window);
+  
+  if (_gdk_x11_display_is_root_window (display, xwindow))
+    event_mask = ButtonPressMask;
   else
-    return _gdk_send_xevent (display, window, propagate, 0, event_send);
-}
+    event_mask = 0;
+  
+  send_client_message_async (context, xwindow, propagate, event_mask,
+                            &event_send->xclient);
 
+  return TRUE;
+}
 static void
 xdnd_send_enter (GdkDragContext *context)
 {
@@ -2126,14 +2249,14 @@ xdnd_send_enter (GdkDragContext *context)
                            private->drop_xid : 
                            GDK_DRAWABLE_XID (context->dest_window);
   xev.xclient.data.l[0] = GDK_DRAWABLE_XID (context->source_window);
-  xev.xclient.data.l[1] = (3 << 24); /* version */
+  xev.xclient.data.l[1] = (private->version << 24); /* version */
   xev.xclient.data.l[2] = 0;
   xev.xclient.data.l[3] = 0;
   xev.xclient.data.l[4] = 0;
 
-  if (!private->xdnd_selection)
-    private->xdnd_selection = gdk_x11_get_xatom_by_name_for_display (display, "XdndSelection");
-
+  GDK_NOTE(DND,
+          g_message ("Sending enter source window %#lx XDND protocol version %d\n",
+                     GDK_DRAWABLE_XID (context->source_window), private->version));
   if (g_list_length (context->targets) > 3)
     {
       if (!private->xdnd_targets_set)
@@ -2154,8 +2277,7 @@ xdnd_send_enter (GdkDragContext *context)
        }
     }
 
-  if (!xdnd_send_xevent (display,
-                        GDK_DRAWABLE_XID (context->dest_window),
+  if (!xdnd_send_xevent (context, context->dest_window,
                         FALSE, &xev))
     {
       GDK_NOTE (DND, 
@@ -2186,8 +2308,7 @@ xdnd_send_leave (GdkDragContext *context)
   xev.xclient.data.l[3] = 0;
   xev.xclient.data.l[4] = 0;
 
-  if (!xdnd_send_xevent (display,
-                        GDK_DRAWABLE_XID (context->dest_window),
+  if (!xdnd_send_xevent (context, context->dest_window,
                         FALSE, &xev))
     {
       GDK_NOTE (DND, 
@@ -2217,8 +2338,7 @@ xdnd_send_drop (GdkDragContext *context, guint32 time)
   xev.xclient.data.l[3] = 0;
   xev.xclient.data.l[4] = 0;
 
-  if (!xdnd_send_xevent (display,
-                        GDK_DRAWABLE_XID (context->dest_window),
+  if (!xdnd_send_xevent (context, context->dest_window,
                         FALSE, &xev))
     {
       GDK_NOTE (DND, 
@@ -2252,8 +2372,7 @@ xdnd_send_motion (GdkDragContext *context,
   xev.xclient.data.l[3] = time;
   xev.xclient.data.l[4] = xdnd_action_to_atom (display, action);
 
-  if (!xdnd_send_xevent (display,
-                        GDK_DRAWABLE_XID (context->dest_window),
+  if (!xdnd_send_xevent (context, context->dest_window,
                         FALSE, &xev))
     {
       GDK_NOTE (DND, 
@@ -2267,12 +2386,14 @@ xdnd_send_motion (GdkDragContext *context,
 
 static guint32
 xdnd_check_dest (GdkDisplay *display,
-                Window      win)
+                Window      win,
+                guint      *xdnd_version)
 {
   gboolean retval = FALSE;
   Atom type = None;
   int format;
   unsigned long nitems, after;
+  guchar *data;
   Atom *version;
   Window *proxy_data;
   Window proxy;
@@ -2287,17 +2408,19 @@ xdnd_check_dest (GdkDisplay *display,
                          xdnd_proxy_atom, 0, 
                          1, False, AnyPropertyType,
                          &type, &format, &nitems, &after, 
-                         (guchar **)&proxy_data) == Success)
+                         &data) == Success)
     {
       if (type != None)
        {
+         proxy_data = (Window *)data;
+         
          if ((format == 32) && (nitems == 1))
            {
              proxy = *proxy_data;
            }
          else
            GDK_NOTE (DND, 
-                     g_warning ("Invalid XdndOwner "
+                     g_warning ("Invalid XdndProxy "
                                 "property on window %ld\n", win));
          
          XFree (proxy_data);
@@ -2307,17 +2430,22 @@ xdnd_check_dest (GdkDisplay *display,
                               xdnd_aware_atom, 0, 
                               1, False, AnyPropertyType,
                               &type, &format, &nitems, &after, 
-                              (guchar **)&version) == Success) &&
+                              &data) == Success) &&
          type != None)
        {
+         version = (Atom *)data;
+         
          if ((format == 32) && (nitems == 1))
            {
              if (*version >= 3)
                retval = TRUE;
+             if (xdnd_version)
+               *xdnd_version = *version;
            }
          else
            GDK_NOTE (DND, 
-                     g_warning ("Invalid XdndAware property on window %ld\n", win));
+                     g_warning ("Invalid XdndAware "
+                                "property on window %ld\n", win));
          
          XFree (version);
        }
@@ -2337,51 +2465,77 @@ xdnd_read_actions (GdkDragContext *context)
   Atom type;
   int format;
   gulong nitems, after;
-  Atom *data;
+  guchar *data;
+  Atom *atoms;
 
   gint i;
-
-  /* Get the XdndActionList, if set */
-
-  gdk_error_trap_push ();
   
-  if (XGetWindowProperty (GDK_DRAWABLE_XDISPLAY (context->source_window),
-                         GDK_DRAWABLE_XID (context->source_window),
-                         gdk_x11_get_xatom_by_name_for_display (display, "XdndActionList"),
-                         0, 65536,
-                         False, XA_ATOM, &type, &format, &nitems,
-                         &after, (guchar **)&data) == Success &&
-      type == XA_ATOM)
-    {
-      context->actions = 0;
-
-      for (i=0; i<nitems; i++)
-       context->actions |= xdnd_action_from_atom (display, data[i]);
+  PRIVATE_DATA (context)->xdnd_have_actions = FALSE;
 
-      (PRIVATE_DATA (context))->xdnd_have_actions = TRUE;
-
-#ifdef G_ENABLE_DEBUG
-      if (_gdk_debug_flags & GDK_DEBUG_DND)
+  if (gdk_window_get_window_type (context->source_window) == GDK_WINDOW_FOREIGN)
+    {
+      /* Get the XdndActionList, if set */
+      
+      gdk_error_trap_push ();
+      
+      if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
+                             GDK_DRAWABLE_XID (context->source_window),
+                             gdk_x11_get_xatom_by_name_for_display (display, "XdndActionList"),
+                             0, 65536,
+                             False, XA_ATOM, &type, &format, &nitems,
+                             &after, &data) == Success &&
+         type == XA_ATOM)
        {
-         GString *action_str = g_string_new (NULL);
-         if (context->actions & GDK_ACTION_MOVE)
-           g_string_append(action_str, "MOVE ");
-         if (context->actions & GDK_ACTION_COPY)
-           g_string_append(action_str, "COPY ");
-         if (context->actions & GDK_ACTION_LINK)
-           g_string_append(action_str, "LINK ");
-         if (context->actions & GDK_ACTION_ASK)
-           g_string_append(action_str, "ASK ");
+         atoms = (Atom *)data;
          
-         g_message("Xdnd actions = %s", action_str->str);
-         g_string_free (action_str, TRUE);
-       }
+         context->actions = 0;
+         
+         for (i=0; i<nitems; i++)
+           context->actions |= xdnd_action_from_atom (display, atoms[i]);
+         
+         PRIVATE_DATA (context)->xdnd_have_actions = TRUE;
+         
+#ifdef G_ENABLE_DEBUG
+         if (_gdk_debug_flags & GDK_DEBUG_DND)
+           {
+             GString *action_str = g_string_new (NULL);
+             if (context->actions & GDK_ACTION_MOVE)
+               g_string_append(action_str, "MOVE ");
+             if (context->actions & GDK_ACTION_COPY)
+               g_string_append(action_str, "COPY ");
+             if (context->actions & GDK_ACTION_LINK)
+               g_string_append(action_str, "LINK ");
+             if (context->actions & GDK_ACTION_ASK)
+               g_string_append(action_str, "ASK ");
+             
+             g_message("Xdnd actions = %s", action_str->str);
+             g_string_free (action_str, TRUE);
+           }
 #endif /* G_ENABLE_DEBUG */
+         
+       }
 
-      XFree(data);
+      if (data)
+       XFree (data);
+      
+      gdk_error_trap_pop ();
     }
+  else
+    {
+      /* Local drag
+       */
+      GdkDragContext *source_context;
 
-  gdk_error_trap_pop ();
+      source_context = gdk_drag_context_find (display, TRUE,
+                                             GDK_DRAWABLE_XID (context->source_window),
+                                             GDK_DRAWABLE_XID (context->dest_window));
+
+      if (source_context)
+       {
+         context->actions = source_context->actions;
+         PRIVATE_DATA (context)->xdnd_have_actions = TRUE;
+       }
+    }
 }
 
 /* We have to make sure that the XdndActionList we keep internally
@@ -2415,17 +2569,17 @@ xdnd_manage_source_filter (GdkDragContext *context,
                           GdkWindow      *window,
                           gboolean        add_filter)
 {
-  gdk_error_trap_push ();
-
-  if (!GDK_WINDOW_DESTROYED (window))
+  if (!GDK_WINDOW_DESTROYED (window) &&
+      gdk_window_get_window_type (window) == GDK_WINDOW_FOREIGN)
     {
+      gdk_error_trap_push ();
+
       if (add_filter)
        {
          gdk_window_set_events (window,
                                 gdk_window_get_events (window) |
                                 GDK_PROPERTY_CHANGE_MASK);
          gdk_window_add_filter (window, xdnd_source_window_filter, context);
-
        }
       else
        {
@@ -2437,10 +2591,63 @@ xdnd_manage_source_filter (GdkDragContext *context,
           * INCR selection transactions).
           */
        }
+      
+      gdk_display_sync (gdk_drawable_get_display (window));
+      gdk_error_trap_pop ();  
+    }
+}
+
+static void
+base_precache_atoms (GdkDisplay *display)
+{
+  GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
+
+  if (!display_x11->base_dnd_atoms_precached)
+    {
+      static const char *const precache_atoms[] = {
+       "ENLIGHTENMENT_DESKTOP",
+       "WM_STATE",
+       "XdndAware",
+       "XdndProxy",
+       "_MOTIF_DRAG_RECEIVER_INFO"
+      };
+
+      _gdk_x11_precache_atoms (display,
+                              precache_atoms, G_N_ELEMENTS (precache_atoms));
+
+      display_x11->base_dnd_atoms_precached = TRUE;
     }
+}
+
+static void
+xdnd_precache_atoms (GdkDisplay *display)
+{
+  GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
+
+  if (!display_x11->xdnd_atoms_precached)
+    {
+      static const char *const precache_atoms[] = {
+       "XdndActionAsk",
+       "XdndActionCopy",
+       "XdndActionLink",
+       "XdndActionList",
+       "XdndActionMove",
+       "XdndActionPrivate",
+       "XdndDrop",
+       "XdndEnter",
+       "XdndFinished",
+       "XdndLeave",
+       "XdndPosition",
+       "XdndSelection",
+       "XdndStatus",
+       "XdndTypeList"
+      };
 
-  gdk_display_sync (gdk_drawable_get_display (window));
-  gdk_error_trap_pop ();  
+      _gdk_x11_precache_atoms (display,
+                              precache_atoms, G_N_ELEMENTS (precache_atoms));
+
+      display_x11->xdnd_atoms_precached = TRUE;
+    }
 }
 
 static GdkFilterReturn 
@@ -2457,7 +2664,8 @@ xdnd_enter_filter (GdkXEvent *xev,
   Atom type;
   int format;
   gulong nitems, after;
-  Atom *data;
+  guchar *data;
+  Atom *atoms;
 
   guint32 source_window;
   gboolean get_types;
@@ -2474,11 +2682,13 @@ xdnd_enter_filter (GdkXEvent *xev,
   display = GDK_DRAWABLE_DISPLAY (event->any.window);
   display_x11 = GDK_DISPLAY_X11 (display);
 
+  xdnd_precache_atoms (display);
+
   GDK_NOTE (DND, 
            g_message ("XdndEnter: source_window: %#x, version: %#x",
                       source_window, version));
 
-  if (version != 3)
+  if (version < 3)
     {
       /* Old source ignore */
       GDK_NOTE (DND, g_message ("Ignored old XdndEnter message"));
@@ -2493,7 +2703,7 @@ xdnd_enter_filter (GdkXEvent *xev,
 
   new_context = gdk_drag_context_new ();
   new_context->protocol = GDK_DRAG_PROTO_XDND;
-  new_context->is_source = FALSE;
+  PRIVATE_DATA(new_context)->version = version;
 
   new_context->source_window = gdk_window_lookup_for_display (display, source_window);
   if (new_context->source_window)
@@ -2519,21 +2729,27 @@ xdnd_enter_filter (GdkXEvent *xev,
                          gdk_x11_get_xatom_by_name_for_display (display, "XdndTypeList"),
                          0, 65536,
                          False, XA_ATOM, &type, &format, &nitems,
-                         &after, (guchar **)&data);
+                         &after, &data);
 
       if (gdk_error_trap_pop () || (format != 32) || (type != XA_ATOM))
        {
          g_object_unref (new_context);
+
+         if (data)
+           XFree (data);
+
          return GDK_FILTER_REMOVE;
        }
 
+      atoms = (Atom *)data;
+
       for (i=0; i<nitems; i++)
        new_context->targets = 
          g_list_append (new_context->targets,
                         GDK_ATOM_TO_POINTER (gdk_x11_xatom_to_atom_for_display (display,
-                                                                                data[i])));
+                                                                                atoms[i])));
 
-      XFree(data);
+      XFree(atoms);
     }
   else
     {
@@ -2559,8 +2775,6 @@ xdnd_enter_filter (GdkXEvent *xev,
 
   display_x11->current_dest_drag = new_context;
 
-  (PRIVATE_DATA (new_context))->xdnd_selection = 
-    gdk_x11_get_xatom_by_name_for_display (display, "XdndSelection");
   return GDK_FILTER_TRANSLATE;
 }
 
@@ -2571,6 +2785,7 @@ xdnd_leave_filter (GdkXEvent *xev,
 {
   XEvent *xevent = (XEvent *)xev;
   guint32 source_window = xevent->xclient.data.l[0];
+  GdkDisplay *display;
   GdkDisplayX11 *display_x11;
 
   if (!event->any.window ||
@@ -2581,7 +2796,10 @@ xdnd_leave_filter (GdkXEvent *xev,
            g_message ("XdndLeave: source_window: %#x",
                       source_window));
 
-  display_x11 = GDK_DISPLAY_X11 (GDK_DRAWABLE_DISPLAY (event->any.window));
+  display = GDK_DRAWABLE_DISPLAY (event->any.window);
+  display_x11 = GDK_DISPLAY_X11 (display);
+
+  xdnd_precache_atoms (display);
 
   if ((display_x11->current_dest_drag != NULL) &&
       (display_x11->current_dest_drag->protocol == GDK_DRAG_PROTO_XDND) &&
@@ -2625,6 +2843,8 @@ xdnd_position_filter (GdkXEvent *xev,
   display = GDK_DRAWABLE_DISPLAY (event->any.window);
   display_x11 = GDK_DISPLAY_X11 (display);
   
+  xdnd_precache_atoms (display);
+
   if ((display_x11->current_dest_drag != NULL) &&
       (display_x11->current_dest_drag->protocol == GDK_DRAG_PROTO_XDND) &&
       (GDK_DRAWABLE_XID (display_x11->current_dest_drag->source_window) == source_window))
@@ -2660,6 +2880,7 @@ xdnd_drop_filter (GdkXEvent *xev,
   XEvent *xevent = (XEvent *)xev;
   guint32 source_window = xevent->xclient.data.l[0];
   guint32 time = xevent->xclient.data.l[2];
+  GdkDisplay *display;
   GdkDisplayX11 *display_x11;
   
   if (!event->any.window ||
@@ -2670,7 +2891,10 @@ xdnd_drop_filter (GdkXEvent *xev,
            g_message ("XdndDrop: source_window: %#x  time: %d",
                       source_window, time));
 
-  display_x11 = GDK_DISPLAY_X11 (GDK_DRAWABLE_DISPLAY (event->any.window));
+  display = GDK_DRAWABLE_DISPLAY (event->any.window);
+  display_x11 = GDK_DISPLAY_X11 (display);
+
+  xdnd_precache_atoms (display);
 
   if ((display_x11->current_dest_drag != NULL) &&
       (display_x11->current_dest_drag->protocol == GDK_DRAG_PROTO_XDND) &&
@@ -2687,6 +2911,8 @@ xdnd_drop_filter (GdkXEvent *xev,
       event->dnd.time = time;
       event->dnd.x_root = private->last_x;
       event->dnd.y_root = private->last_y;
+
+      gdk_x11_window_set_user_time (event->any.window, time);
       
       return GDK_FILTER_TRANSLATE;
     }
@@ -2700,36 +2926,21 @@ xdnd_drop_filter (GdkXEvent *xev,
 void
 _gdk_dnd_init (GdkDisplay *display)
 {
+  int i;
   init_byte_order ();
 
   gdk_display_add_client_message_filter (
        display,
-       gdk_atom_intern ("_MOTIF_DRAG_AND_DROP_MESSAGE", FALSE),
+       gdk_atom_intern_static_string ("_MOTIF_DRAG_AND_DROP_MESSAGE"),
        motif_dnd_filter, NULL);
-  gdk_display_add_client_message_filter (
-       display,                                     
-       gdk_atom_intern ("XdndEnter", FALSE),
-       xdnd_enter_filter, NULL);
-  gdk_display_add_client_message_filter (
-       display,                                     
-       gdk_atom_intern ("XdndLeave", FALSE),
-       xdnd_leave_filter, NULL);
-  gdk_display_add_client_message_filter (
-       display,
-       gdk_atom_intern ("XdndPosition", FALSE),
-       xdnd_position_filter, NULL);
-  gdk_display_add_client_message_filter (
-       display,
-       gdk_atom_intern ("XdndStatus", FALSE),
-       xdnd_status_filter, NULL);
-  gdk_display_add_client_message_filter (
+  
+  for (i = 0; i < G_N_ELEMENTS (xdnd_filters); i++)
+    {
+      gdk_display_add_client_message_filter (
        display,
-       gdk_atom_intern ("XdndFinished", FALSE),
-       xdnd_finished_filter, NULL);
-  gdk_display_add_client_message_filter (
-       display,                                     
-       gdk_atom_intern ("XdndDrop", FALSE),
-       xdnd_drop_filter, NULL);
+       gdk_atom_intern_static_string (xdnd_filters[i].atom_name),
+       xdnd_filters[i].func, NULL);
+    }
 }                    
 
 /* Source side */
@@ -2783,36 +2994,52 @@ gdk_drag_begin (GdkWindow     *window,
   g_object_ref (window);
 
   new_context->targets = g_list_copy (targets);
+  precache_target_list (new_context);
+  
   new_context->actions = 0;
 
   return new_context;
 }
 
-/**
- * gdk_drag_get_protocol_for_display:
- * @display: the #GdkDisplay where the destination window resides
- * @xid: the X id of the destination window.
- * @protocol: location where the supported DND protocol is returned.
- * @returns: the X id of the window where the drop should happen. This 
- *     may be @xid or the X id of a proxy window, or None if @xid doesn't
- *     support Drag and Drop.
- *
- * Finds out the DND protocol supported by a window.
- *
- * Since: 2.2
- */ 
-guint32
-gdk_drag_get_protocol_for_display (GdkDisplay      *display,
-                                  guint32          xid,
-                                  GdkDragProtocol *protocol)
+static guint32
+_gdk_drag_get_protocol_for_display (GdkDisplay      *display,
+                                   guint32          xid,
+                                   GdkDragProtocol *protocol,
+                                   guint           *version)
+
 {
+  GdkWindow *window;
   guint32 retval;
   g_return_val_if_fail (GDK_IS_DISPLAY (display), None);
-  
-  if ((retval = xdnd_check_dest (display, xid)))
+
+  base_precache_atoms (display);
+
+  /* Check for a local drag
+   */
+  window = gdk_window_lookup_for_display (display, xid);
+  if (window &&
+      gdk_window_get_window_type (window) != GDK_WINDOW_FOREIGN)
+    {
+      if (g_object_get_data (G_OBJECT (window), "gdk-dnd-registered") != NULL)
+       {
+         *protocol = GDK_DRAG_PROTO_XDND;
+         *version = 5;
+         xdnd_precache_atoms (display);
+         GDK_NOTE (DND, g_message ("Entering local Xdnd window %#x\n", xid));
+         return xid;
+       }
+      else if (_gdk_x11_display_is_root_window (display, (Window) xid))
+       {
+         *protocol = GDK_DRAG_PROTO_ROOTWIN;
+         GDK_NOTE (DND, g_message ("Entering root window\n"));
+         return xid;
+       }
+    }
+  else if ((retval = xdnd_check_dest (display, xid, version)))
     {
       *protocol = GDK_DRAG_PROTO_XDND;
-      GDK_NOTE (DND, g_message ("Entering dnd window %#x\n", xid));
+      xdnd_precache_atoms (display);
+      GDK_NOTE (DND, g_message ("Entering Xdnd window %#x\n", xid));
       return retval;
     }
   else if ((retval = motif_check_dest (display, xid)))
@@ -2861,7 +3088,10 @@ gdk_drag_get_protocol_for_display (GdkDisplay      *display,
                                  0, 0, False, AnyPropertyType,
                                  &type, &format, &nitems, &data) &&
              type != None)
-           rootwin = TRUE;
+           {
+             XFree (data);
+             rootwin = TRUE;
+           }
        }
 #endif      
 
@@ -2869,6 +3099,7 @@ gdk_drag_get_protocol_for_display (GdkDisplay      *display,
 
       if (rootwin)
        {
+         GDK_NOTE (DND, g_message ("Entering root window\n"));
          *protocol = GDK_DRAG_PROTO_ROOTWIN;
          return xid;
        }
@@ -2878,6 +3109,27 @@ gdk_drag_get_protocol_for_display (GdkDisplay      *display,
   return None;
 }
 
+/**
+ * gdk_drag_get_protocol_for_display:
+ * @display: the #GdkDisplay where the destination window resides
+ * @xid: the X id of the destination window.
+ * @protocol: location where the supported DND protocol is returned.
+ * @returns: the X id of the window where the drop should happen. This 
+ *     may be @xid or the X id of a proxy window, or None if @xid doesn't
+ *     support Drag and Drop.
+ *
+ * Finds out the DND protocol supported by a window.
+ *
+ * Since: 2.2
+ */ 
+guint32
+gdk_drag_get_protocol_for_display (GdkDisplay      *display,
+                                  guint32          xid,
+                                  GdkDragProtocol *protocol)
+{
+  return _gdk_drag_get_protocol_for_display (display, xid, protocol, NULL);
+}
+
 static GdkWindowCache *
 drag_context_find_window_cache (GdkDragContext  *context,
                                GdkScreen       *screen)
@@ -2956,7 +3208,8 @@ gdk_drag_find_window_for_screen (GdkDragContext  *context,
        * two are passed explicitely, the third implicitly through
        * protocol->dest_xid.
        */
-      if ((recipient = gdk_drag_get_protocol_for_display (display, dest, protocol)))
+      if ((recipient = _gdk_drag_get_protocol_for_display (display, dest, 
+                                                          protocol, &private->version)))
        {
          *dest_window = gdk_window_lookup_for_display (display, recipient);
          if (*dest_window)
@@ -3009,16 +3262,58 @@ gdk_drag_motion (GdkDragContext *context,
 
   g_return_val_if_fail (context != NULL, FALSE);
 
-  /* When we have a Xdnd target, make sure our XdndActionList
-   * matches the current actions;
-   */
   private->old_actions = context->actions;
   context->actions = possible_actions;
   
-  if ((protocol == GDK_DRAG_PROTO_XDND) &&
-      (!private->xdnd_actions_set ||
-       private->xdnd_actions != possible_actions))
-    xdnd_set_actions (context);
+  if (private->old_actions != possible_actions)
+    private->xdnd_actions_set = FALSE;
+  
+  if (protocol == GDK_DRAG_PROTO_XDND && private->version == 0)
+    {
+      /* This ugly hack is necessary since GTK+ doesn't know about
+       * the XDND protocol version, and in particular doesn't know 
+       * that gdk_drag_find_window_for_screen() has the side-effect 
+       * of setting private->version, and therefore sometimes call
+       * gdk_drag_motion() without a prior call to 
+       * gdk_drag_find_window_for_screen(). This happens, e.g.
+       * when GTK+ is proxying DND events to embedded windows.
+       */ 
+      if (dest_window)
+       {
+         GdkDisplay *display = GDK_WINDOW_DISPLAY (dest_window);
+         
+         xdnd_check_dest (display, 
+                          GDK_DRAWABLE_XID (dest_window), 
+                          &private->version);
+       }
+    }
+
+  /* When we have a Xdnd target, make sure our XdndActionList
+   * matches the current actions;
+   */
+  if (protocol == GDK_DRAG_PROTO_XDND && !private->xdnd_actions_set)
+    {
+      if (dest_window)
+       {
+         if (gdk_window_get_window_type (dest_window) == GDK_WINDOW_FOREIGN)
+           xdnd_set_actions (context);
+         else if (context->dest_window == dest_window)
+           {
+             GdkDisplay *display = GDK_WINDOW_DISPLAY (dest_window);
+             GdkDragContext *dest_context;
+                   
+             dest_context = gdk_drag_context_find (display, FALSE,
+                                                   GDK_DRAWABLE_XID (context->source_window),
+                                                   GDK_DRAWABLE_XID (dest_window));
+
+             if (dest_context)
+               {
+                 dest_context->actions = context->actions;
+                 PRIVATE_DATA (dest_context)->xdnd_have_actions = TRUE;
+               }
+           }
+       }
+    }
 
   if (context->dest_window != dest_window)
     {
@@ -3107,9 +3402,16 @@ gdk_drag_motion (GdkDragContext *context,
            case GDK_DRAG_PROTO_ROOTWIN:
              {
                GdkEvent temp_event;
+               /* GTK+ traditionally has used application/x-rootwin-drop,
+                * but the XDND spec specifies x-rootwindow-drop.
+                */
+               GdkAtom target1 = gdk_atom_intern_static_string ("application/x-rootwindow-drop");
+               GdkAtom target2 = gdk_atom_intern_static_string ("application/x-rootwin-drop");
 
                if (g_list_find (context->targets,
-                                GDK_ATOM_TO_POINTER (gdk_atom_intern ("application/x-rootwin-drop", FALSE))))
+                                GDK_ATOM_TO_POINTER (target1)) ||
+                   g_list_find (context->targets,
+                                GDK_ATOM_TO_POINTER (target2)))
                  context->action = context->suggested_action;
                else
                  context->action = 0;
@@ -3314,8 +3616,7 @@ gdk_drag_status (GdkDragContext   *context,
       xev.xclient.data.l[3] = 0;
       xev.xclient.data.l[4] = xdnd_action_to_atom (display, action);
       
-      if (!xdnd_send_xevent (display,
-                            GDK_DRAWABLE_XID (context->source_window),
+      if (!xdnd_send_xevent (context, context->source_window,
                             FALSE, &xev))
        GDK_NOTE (DND, 
                  g_message ("Send event to %lx failed",
@@ -3409,13 +3710,21 @@ gdk_drop_finish (GdkDragContext   *context,
       xev.xclient.window = GDK_DRAWABLE_XID (context->source_window);
       
       xev.xclient.data.l[0] = GDK_DRAWABLE_XID (context->dest_window);
-      xev.xclient.data.l[1] = 0;
-      xev.xclient.data.l[2] = 0;
+      if (success)
+       {
+         xev.xclient.data.l[1] = 1;
+         xev.xclient.data.l[2] = xdnd_action_to_atom (display, 
+                                                      context->action);
+       }
+      else
+       {
+         xev.xclient.data.l[1] = 0;
+         xev.xclient.data.l[2] = None;
+       }
       xev.xclient.data.l[3] = 0;
       xev.xclient.data.l[4] = 0;
 
-      if (!xdnd_send_xevent (display,
-                            GDK_DRAWABLE_XID (context->source_window),
+      if (!xdnd_send_xevent (context, context->source_window,
                             FALSE, &xev))
        GDK_NOTE (DND, 
                  g_message ("Send event to %lx failed",
@@ -3427,14 +3736,16 @@ gdk_drop_finish (GdkDragContext   *context,
 void            
 gdk_window_register_dnd (GdkWindow      *window)
 {
-  static gulong xdnd_version = 3;
+  static const gulong xdnd_version = 5;
   MotifDragReceiverInfo info;
   Atom motif_drag_receiver_info_atom;
   GdkDisplay *display = gdk_drawable_get_display (window);
 
   g_return_if_fail (window != NULL);
 
-  if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "gdk-dnd-registered")))
+  base_precache_atoms (display);
+
+  if (g_object_get_data (G_OBJECT (window), "gdk-dnd-registered") != NULL)
     return;
   else
     g_object_set_data (G_OBJECT (window), "gdk-dnd-registered", GINT_TO_POINTER (TRUE));
@@ -3443,6 +3754,8 @@ gdk_window_register_dnd (GdkWindow      *window)
 
   motif_drag_receiver_info_atom = gdk_x11_get_xatom_by_name_for_display (display,
                                                                         "_MOTIF_DRAG_RECEIVER_INFO");
+  /* initialize to zero to avoid writing uninitialized data to socket */
+  memset(&info, 0, sizeof(info));
   info.byte_order = local_byte_order;
   info.protocol_version = 0;
   info.protocol_style = XmDRAG_DYNAMIC;
@@ -3484,9 +3797,35 @@ gdk_drag_get_selection (GdkDragContext *context)
     return gdk_x11_xatom_to_atom_for_display (GDK_DRAWABLE_DISPLAY (context->source_window),
                                              (PRIVATE_DATA (context))->motif_selection);
   else if (context->protocol == GDK_DRAG_PROTO_XDND)
-    return gdk_x11_xatom_to_atom_for_display (GDK_DRAWABLE_DISPLAY (context->source_window),
-                                             (PRIVATE_DATA (context))->xdnd_selection);
+    return gdk_atom_intern_static_string ("XdndSelection");
   else
     return GDK_NONE;
 }
 
+/**
+ * gdk_drag_drop_succeeded:
+ * @context: a #GdkDragContext
+ * 
+ * Returns wether the dropped data has been successfully 
+ * transferred. This function is intended to be used while 
+ * handling a %GDK_DROP_FINISHED event, its return value is
+ * meaningless at other times.
+ * 
+ * Return value: %TRUE if the drop was successful.
+ *
+ * Since: 2.6
+ **/
+gboolean 
+gdk_drag_drop_succeeded (GdkDragContext *context)
+{
+  GdkDragContextPrivateX11 *private;
+
+  g_return_val_if_fail (context != NULL, FALSE);
+
+  private = PRIVATE_DATA (context);
+
+  return !private->drop_failed;
+}
+
+#define __GDK_DND_X11_C__
+#include "gdkaliasdef.c"