]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkdnd.c
Remove deprecated 'shadow' properties in GtkFrame and GtkHandleBox
[~andy/gtk] / gtk / gtkdnd.c
index 8bbb4d24dad3b4fe89e24a035e10a2d61775834e..f190b3953a763653e8b1c609645fabaff36bfc28 100644 (file)
 #include "gtkmain.h"
 #include "gtkplug.h"
 #include "gtkstock.h"
+#include "gtktooltip.h"
 #include "gtkwindow.h"
 #include "gtkintl.h"
 #include "gtkdndcursors.h"
-#include "gtkalias.h"
 
 static GSList *source_widgets = NULL;
 
@@ -59,7 +59,6 @@ typedef struct _GtkDragSourceInfo GtkDragSourceInfo;
 typedef struct _GtkDragDestSite GtkDragDestSite;
 typedef struct _GtkDragDestInfo GtkDragDestInfo;
 typedef struct _GtkDragAnim GtkDragAnim;
-typedef struct _GtkDragFindData GtkDragFindData;
 
 
 typedef enum 
@@ -170,18 +169,11 @@ struct _GtkDragAnim
   gint n_steps;
 };
 
-struct _GtkDragFindData 
-{
-  gint x;
-  gint y;
-  GdkDragContext *context;
-  GtkDragDestInfo *info;
-  gboolean found;
-  gboolean toplevel;
-  gboolean (*callback) (GtkWidget *widget, GdkDragContext *context,
-                       gint x, gint y, guint32 time);
-  guint32 time;
-};
+typedef gboolean (* GtkDragDestCallback) (GtkWidget      *widget,
+                                          GdkDragContext *context,
+                                          gint            x,
+                                          gint            y,
+                                          guint32         time);
 
 /* Enumeration for some targets we handle internally */
 
@@ -191,14 +183,6 @@ enum {
   TARGET_DELETE
 };
 
-/* Drag icons */
-
-static GdkPixmap   *default_icon_pixmap = NULL;
-static GdkPixmap   *default_icon_mask = NULL;
-static GdkColormap *default_icon_colormap = NULL;
-static gint         default_icon_hot_x;
-static gint         default_icon_hot_y;
-
 /* Forward declarations */
 static void          gtk_drag_get_event_actions (GdkEvent        *event, 
                                                 gint             button,
@@ -221,8 +205,13 @@ static void     gtk_drag_selection_received     (GtkWidget        *widget,
                                                 GtkSelectionData *selection_data,
                                                 guint             time,
                                                 gpointer          data);
-static void     gtk_drag_find_widget            (GtkWidget        *widget,
-                                                GtkDragFindData  *data);
+static gboolean gtk_drag_find_widget            (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 GtkDragDestInfo  *info,
+                                                 gint              x,
+                                                 gint              y,
+                                                 guint32           time,
+                                                 GtkDragDestCallback callback);
 static void     gtk_drag_proxy_begin            (GtkWidget        *widget,
                                                 GtkDragDestInfo  *dest_info,
                                                 guint32           time);
@@ -390,16 +379,20 @@ gtk_drag_get_ipc_widget (GtkWidget *widget)
   
   if (GTK_IS_WINDOW (toplevel))
     {
-      if (GTK_WINDOW (toplevel)->group)
-       gtk_window_group_add_window (GTK_WINDOW (toplevel)->group, 
+      if (gtk_window_has_group (GTK_WINDOW (toplevel)))
+        gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)),
                                      GTK_WINDOW (result));
     }
 
   return result;
 }
 
-
-#ifdef GDK_WINDOWING_X11
+/* FIXME: modifying the XEvent window as in root_key_filter() isn't
+ * going to work with XGE/XI2, since the actual event to handle would
+ * be allocated/freed before GDK gets to translate the event.
+ * Active grabs on the keyboard are used instead at the moment...
+ */
+#if defined (GDK_WINDOWING_X11) && !defined (XINPUT_2)
 
 /*
  * We want to handle a handful of keys during DND, e.g. Escape to abort.
@@ -418,7 +411,7 @@ root_key_filter (GdkXEvent *xevent,
                  GdkEvent  *event,
                  gpointer   data)
 {
-  XEvent *ev = (XEvent *)xevent;
+  XEvent *ev = (XEvent *) xevent;
 
   if ((ev->type == KeyPress || ev->type == KeyRelease) &&
       ev->xkey.root == ev->xkey.window)
@@ -458,13 +451,14 @@ static GrabKey grab_keys[] = {
 
 static void
 grab_dnd_keys (GtkWidget *widget,
+               GdkDevice *device,
                guint32    time)
 {
   guint i;
   GdkWindow *window, *root;
   gint keycode;
 
-  window = widget->window;
+  window = gtk_widget_get_window (widget);
   root = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
 
   gdk_error_trap_push ();
@@ -488,13 +482,14 @@ grab_dnd_keys (GtkWidget *widget,
 
 static void
 ungrab_dnd_keys (GtkWidget *widget,
+                 GdkDevice *device,
                  guint32    time)
 {
   guint i;
   GdkWindow *window, *root;
   gint keycode;
 
-  window = widget->window;
+  window = gtk_widget_get_window (widget);
   root = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
 
   gdk_window_remove_filter (NULL, root_key_filter, (gpointer) GDK_WINDOW_XID (window));
@@ -513,23 +508,29 @@ ungrab_dnd_keys (GtkWidget *widget,
   gdk_error_trap_pop ();
 }
 
-#else
+#else /* GDK_WINDOWING_X11 && !XINPUT_2 */
 
 static void
 grab_dnd_keys (GtkWidget *widget,
+               GdkDevice *device,
                guint32    time)
 {
-  gdk_keyboard_grab (widget->window, FALSE, time);
+  gdk_device_grab (device,
+                   gtk_widget_get_window (widget),
+                   GDK_OWNERSHIP_APPLICATION, FALSE,
+                   GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
+                   NULL, time);
 }
 
 static void
 ungrab_dnd_keys (GtkWidget *widget,
+                 GdkDevice *device,
                  guint32    time)
 {
-  gdk_display_keyboard_ungrab (gtk_widget_get_display (widget), time);
+  gdk_device_ungrab (device, time);
 }
 
-#endif
+#endif /* GDK_WINDOWING_X11 */
 
 
 /***************************************************************
@@ -545,11 +546,23 @@ gtk_drag_release_ipc_widget (GtkWidget *widget)
 {
   GtkWindow *window = GTK_WINDOW (widget);
   GdkScreen *screen = gtk_widget_get_screen (widget);
+  GdkDragContext *context = g_object_get_data (G_OBJECT (widget), "drag-context");
   GSList *drag_widgets = g_object_get_data (G_OBJECT (screen),
                                            "gtk-dnd-ipc-widgets");
-  ungrab_dnd_keys (widget, GDK_CURRENT_TIME);
-  if (window->group)
-    gtk_window_group_remove_window (window->group, window);
+  GdkDevice *pointer, *keyboard;
+
+  if (context)
+    {
+      pointer = gdk_drag_context_get_device (context);
+      keyboard = gdk_device_get_associated_device (pointer);
+
+      if (keyboard)
+        ungrab_dnd_keys (widget, keyboard, GDK_CURRENT_TIME);
+    }
+
+  if (gtk_window_has_group (window))
+    gtk_window_group_remove_window (gtk_window_get_group (window),
+                                    window);
   drag_widgets = g_slist_prepend (drag_widgets, widget);
   g_object_set_data (G_OBJECT (screen),
                     I_("gtk-dnd-ipc-widgets"),
@@ -940,11 +953,14 @@ gtk_drag_update_cursor (GtkDragSourceInfo *info)
   
   if (cursor != info->cursor)
     {
-      gdk_pointer_grab (info->ipc_widget->window, FALSE,
-                       GDK_POINTER_MOTION_MASK |
-                       GDK_BUTTON_RELEASE_MASK,
-                       NULL,
-                       cursor, info->grab_time);
+      GdkDevice *pointer;
+
+      pointer = gdk_drag_context_get_device (info->context);
+      gdk_device_grab (pointer,
+                       gtk_widget_get_window (info->ipc_widget),
+                       GDK_OWNERSHIP_APPLICATION, FALSE,
+                       GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
+                       cursor, info->grab_time);
       info->cursor = cursor;
     }
 }
@@ -1016,8 +1032,8 @@ gtk_drag_get_source_widget (GdkDragContext *context)
   while (tmp_list)
     {
       GtkWidget *ipc_widget = tmp_list->data;
-      
-      if (ipc_widget->window == context->source_window)
+
+      if (gtk_widget_get_window (ipc_widget) == context->source_window)
        {
          GtkDragSourceInfo *info;
          info = g_object_get_data (G_OBJECT (ipc_widget), "gtk-info");
@@ -1102,30 +1118,36 @@ gtk_drag_highlight_expose (GtkWidget      *widget,
 {
   gint x, y, width, height;
   
-  if (GTK_WIDGET_DRAWABLE (widget))
+  if (gtk_widget_is_drawable (widget))
     {
+      GdkWindow *window;
       cairo_t *cr;
-      
-      if (GTK_WIDGET_NO_WINDOW (widget))
+
+      window = gtk_widget_get_window (widget);
+
+      if (!gtk_widget_get_has_window (widget))
        {
-         x = widget->allocation.x;
-         y = widget->allocation.y;
-         width = widget->allocation.width;
-         height = widget->allocation.height;
+          GtkAllocation allocation;
+
+          gtk_widget_get_allocation (widget, &allocation);
+         x = allocation.x;
+         y = allocation.y;
+         width = allocation.width;
+         height = allocation.height;
        }
       else
        {
          x = 0;
          y = 0;
-         gdk_drawable_get_size (widget->window, &width, &height);
+          gdk_drawable_get_size (window, &width, &height);
        }
-      
-      gtk_paint_shadow (widget->style, widget->window,
+
+      gtk_paint_shadow (gtk_widget_get_style (widget), window,
                        GTK_STATE_NORMAL, GTK_SHADOW_OUT,
                        &event->area, widget, "dnd",
                        x, y, width, height);
 
-      cr = gdk_cairo_create (widget->window);
+      cr = gdk_cairo_create (window);
       cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */
       cairo_set_line_width (cr, 1.0);
       cairo_rectangle (cr,
@@ -1200,7 +1222,7 @@ gtk_drag_dest_set_internal (GtkWidget       *widget,
       site->track_motion = old_site->track_motion;
     }
 
-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
     gtk_drag_dest_realized (widget);
 
   g_signal_connect (widget, "realize",
@@ -1216,10 +1238,11 @@ gtk_drag_dest_set_internal (GtkWidget       *widget,
  * gtk_drag_dest_set:
  * @widget: a #GtkWidget
  * @flags: which types of default drag behavior to use
- * @targets: a pointer to an array of #GtkTargetEntry<!-- -->s indicating
- * the drop types that this @widget will accept. Later you can access the list
- * with gtk_drag_dest_get_target_list() and gtk_drag_dest_find_target().
- * @n_targets: the number of entries in @targets.
+ * @targets: (allow-none) (array length=n_targets): a pointer to an array of #GtkTargetEntry<!-- -->s
+ *     indicating the drop types that this @widget will accept, or %NULL.
+ *     Later you can access the list with gtk_drag_dest_get_target_list()
+ *     and gtk_drag_dest_find_target().
+ * @n_targets: the number of entries in @targets
  * @actions: a bitmask of possible actions for a drop onto this @widget.
  *
  * Sets a widget as a potential drop destination, and adds default behaviors.
@@ -1239,6 +1262,28 @@ gtk_drag_dest_set_internal (GtkWidget       *widget,
  * and invokations of gtk_drag_finish() in #GtkWidget:drag-data-received.
  * Especially the later is dramatic, when your own #GtkWidget:drag-motion
  * handler calls gtk_drag_get_data() to inspect the dragged data.
+ *
+ * There's no way to set a default action here, you can use the
+ * #GtkWidget:drag-motion callback for that. Here's an example which selects
+ * the action to use depending on whether the control key is pressed or not:
+ * |[
+ * static void
+ * drag_motion (GtkWidget *widget,
+ *              GdkDragContext *context,
+ *              gint x,
+ *              gint y,
+ *              guint time)
+ * {
+ *   GdkModifierType mask;
+ *
+ *   gdk_window_get_pointer (gtk_widget_get_window (widget),
+ *                           NULL, NULL, &mask);
+ *   if (mask & GDK_CONTROL_MASK)
+ *     gdk_drag_status (context, GDK_ACTION_COPY, time);
+ *   else
+ *     gdk_drag_status (context, GDK_ACTION_MOVE, time);
+ * }
+ * ]|
  */
 void
 gtk_drag_dest_set (GtkWidget            *widget,
@@ -1319,8 +1364,22 @@ gtk_drag_dest_set_proxy (GtkWidget      *widget,
 void 
 gtk_drag_dest_unset (GtkWidget *widget)
 {
+  GtkDragDestSite *old_site;
+
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
+  old_site = g_object_get_data (G_OBJECT (widget),
+                                "gtk-drag-dest");
+  if (old_site)
+    {
+      g_signal_handlers_disconnect_by_func (widget,
+                                            gtk_drag_dest_realized,
+                                            old_site);
+      g_signal_handlers_disconnect_by_func (widget,
+                                            gtk_drag_dest_hierarchy_changed,
+                                            old_site);
+    }
+
   g_object_set_data (G_OBJECT (widget), I_("gtk-drag-dest"), NULL);
 }
 
@@ -1348,7 +1407,7 @@ gtk_drag_dest_get_target_list (GtkWidget *widget)
 /**
  * gtk_drag_dest_set_target_list:
  * @widget: a #GtkWidget that's a drag destination
- * @target_list: list of droppable targets, or %NULL for none
+ * @target_list: (allow-none): list of droppable targets, or %NULL for none
  * 
  * Sets the target types that this widget can accept from drag-and-drop.
  * The widget must first be made into a drag destination with
@@ -1558,8 +1617,9 @@ _gtk_drag_dest_handle_event (GtkWidget *toplevel,
     case GDK_DRAG_MOTION:
     case GDK_DROP_START:
       {
-       GtkDragFindData data;
+        GdkWindow *window;
        gint tx, ty;
+        gboolean found;
 
        if (event->type == GDK_DROP_START)
          {
@@ -1574,6 +1634,8 @@ _gtk_drag_dest_handle_event (GtkWidget *toplevel,
              }
          }
 
+        window = gtk_widget_get_window (toplevel);
+
 #ifdef GDK_WINDOWING_X11
        /* Hackaround for: http://bugzilla.gnome.org/show_bug.cgi?id=136112
         *
@@ -1582,24 +1644,22 @@ _gtk_drag_dest_handle_event (GtkWidget *toplevel,
         * expensive gdk_window_get_origin().
         */
        if (GTK_IS_PLUG (toplevel))
-         gdk_window_get_origin (toplevel->window, &tx, &ty);
+         gdk_window_get_origin (window, &tx, &ty);
        else
 #endif /* GDK_WINDOWING_X11 */
-         gdk_window_get_position (toplevel->window, &tx, &ty);
-
-       data.x = event->dnd.x_root - tx;
-       data.y = event->dnd.y_root - ty;
-       data.context = context;
-       data.info = info;
-       data.found = FALSE;
-       data.toplevel = TRUE;
-       data.callback = (event->type == GDK_DRAG_MOTION) ?
-         gtk_drag_dest_motion : gtk_drag_dest_drop;
-       data.time = event->dnd.time;
-
-       gtk_drag_find_widget (toplevel, &data);
+         gdk_window_get_position (window, &tx, &ty);
 
-       if (info->widget && !data.found)
+       found = gtk_drag_find_widget (toplevel,
+                                      context,
+                                      info,
+                                      event->dnd.x_root - tx,
+                                      event->dnd.y_root - ty,
+                                      event->dnd.time,
+                                      (event->type == GDK_DRAG_MOTION) ?
+                                      gtk_drag_dest_motion :
+                                      gtk_drag_dest_drop);
+
+       if (info->widget && !found)
          {
            gtk_drag_dest_leave (info->widget, context, event->dnd.time);
            info->widget = NULL;
@@ -1609,13 +1669,13 @@ _gtk_drag_dest_handle_event (GtkWidget *toplevel,
         */
        if (event->type == GDK_DRAG_MOTION)
          {
-           if (!data.found)
+           if (!found)
              gdk_drag_status (context, 0, event->dnd.time);
          }
        else if (event->type == GDK_DROP_START && !info->proxy_source)
          {
-           gdk_drop_reply (context, data.found, event->dnd.time);
-            if ((context->protocol == GDK_DRAG_PROTO_MOTIF) && !data.found)
+           gdk_drop_reply (context, found, event->dnd.time);
+            if ((context->protocol == GDK_DRAG_PROTO_MOTIF) && !found)
              gtk_drag_finish (context, FALSE, FALSE, event->dnd.time);
          }
       }
@@ -1630,7 +1690,7 @@ _gtk_drag_dest_handle_event (GtkWidget *toplevel,
  * gtk_drag_dest_find_target:
  * @widget: drag destination widget
  * @context: drag context
- * @target_list: list of droppable targets, or %NULL to use
+ * @target_list: (allow-none): list of droppable targets, or %NULL to use
  *    gtk_drag_dest_get_target_list (@widget).
  * 
  * Looks for a match between @context->targets and the
@@ -1780,156 +1840,105 @@ gtk_drag_selection_received (GtkWidget        *widget,
   gtk_drag_release_ipc_widget (widget);
 }
 
-static void
-prepend_and_ref_widget (GtkWidget *widget,
-                       gpointer   data)
-{
-  GSList **slist_p = data;
-
-  *slist_p = g_slist_prepend (*slist_p, g_object_ref (widget));
-}
-
 /*************************************************************
  * gtk_drag_find_widget:
- *     Recursive callback used to locate widgets for 
+ *     Function used to locate widgets for
  *     DRAG_MOTION and DROP_START events.
- *   arguments:
- *     
- *   results:
  *************************************************************/
 
-static void
-gtk_drag_find_widget (GtkWidget       *widget,
-                     GtkDragFindData *data)
+static gboolean
+gtk_drag_find_widget (GtkWidget           *widget,
+                      GdkDragContext      *context,
+                      GtkDragDestInfo     *info,
+                      gint                 x,
+                      gint                 y,
+                      guint32              time,
+                      GtkDragDestCallback  callback)
 {
-  GtkAllocation new_allocation;
-  gint allocation_to_window_x = 0;
-  gint allocation_to_window_y = 0;
-  gint x_offset = 0;
-  gint y_offset = 0;
+  if (!gtk_widget_get_mapped (widget) ||
+      !gtk_widget_get_sensitive (widget))
+    return FALSE;
 
-  if (data->found || !GTK_WIDGET_MAPPED (widget) || !GTK_WIDGET_SENSITIVE (widget))
-    return;
+  /* Get the widget at the pointer coordinates and travel up
+   * the widget hierarchy from there.
+   */
+  widget = _gtk_widget_find_at_coords (gtk_widget_get_window (widget),
+                                       x, y, &x, &y);
+  if (!widget)
+    return FALSE;
 
-  /* Note that in the following code, we only count the
-   * position as being inside a WINDOW widget if it is inside
-   * widget->window; points that are outside of widget->window
-   * but within the allocation are not counted. This is consistent
-   * with the way we highlight drag targets.
-   *
-   * data->x,y are relative to widget->parent->window (if
-   * widget is not a toplevel, widget->window otherwise).
-   * We compute the allocation of widget in the same coordinates,
-   * clipping to widget->window, and all intermediate
-   * windows. If data->x,y is inside that, then we translate
-   * our coordinates to be relative to widget->window and
-   * recurse.
-   */  
-  new_allocation = widget->allocation;
-
-  if (widget->parent)
+  while (widget)
     {
-      gint tx, ty;
-      GdkWindow *window = widget->window;
-
-      /* Compute the offset from allocation-relative to
-       * window-relative coordinates.
-       */
-      allocation_to_window_x = widget->allocation.x;
-      allocation_to_window_y = widget->allocation.y;
+      GtkWidget *parent;
+      GList *hierarchy = NULL;
+      gboolean found = FALSE;
 
-      if (!GTK_WIDGET_NO_WINDOW (widget))
-       {
-         /* The allocation is relative to the parent window for
-          * window widgets, not to widget->window.
-          */
-          gdk_window_get_position (window, &tx, &ty);
-         
-          allocation_to_window_x -= tx;
-          allocation_to_window_y -= ty;
-       }
+      if (!gtk_widget_get_mapped (widget) ||
+          !gtk_widget_get_sensitive (widget))
+        return FALSE;
 
-      new_allocation.x = 0 + allocation_to_window_x;
-      new_allocation.y = 0 + allocation_to_window_y;
-      
-      while (window && window != widget->parent->window)
-       {
-         GdkRectangle window_rect = { 0, 0, 0, 0 };
-         
-         gdk_drawable_get_size (window, &window_rect.width, &window_rect.height);
-
-         gdk_rectangle_intersect (&new_allocation, &window_rect, &new_allocation);
-
-         gdk_window_get_position (window, &tx, &ty);
-         new_allocation.x += tx;
-         x_offset += tx;
-         new_allocation.y += ty;
-         y_offset += ty;
-         
-         window = gdk_window_get_parent (window);
-       }
-
-      if (!window)             /* Window and widget heirarchies didn't match. */
-       return;
-    }
-
-  if (data->toplevel ||
-      ((data->x >= new_allocation.x) && (data->y >= new_allocation.y) &&
-       (data->x < new_allocation.x + new_allocation.width) && 
-       (data->y < new_allocation.y + new_allocation.height)))
-    {
-      /* First, check if the drag is in a valid drop site in
-       * one of our children 
+      /* need to reference the entire hierarchy temporarily in case the
+       * ::drag-motion/::drag-drop callbacks change the widget hierarchy.
        */
-      if (GTK_IS_CONTAINER (widget))
-       {
-         GtkDragFindData new_data = *data;
-         GSList *children = NULL;
-         GSList *tmp_list;
-         
-         new_data.x -= x_offset;
-         new_data.y -= y_offset;
-         new_data.found = FALSE;
-         new_data.toplevel = FALSE;
-         
-         /* need to reference children temporarily in case the
-          * ::drag-motion/::drag-drop callbacks change the widget hierarchy.
-          */
-         gtk_container_forall (GTK_CONTAINER (widget), prepend_and_ref_widget, &children);
-         for (tmp_list = children; tmp_list; tmp_list = tmp_list->next)
-           {
-             if (!new_data.found && GTK_WIDGET_DRAWABLE (tmp_list->data))
-               gtk_drag_find_widget (tmp_list->data, &new_data);
-             g_object_unref (tmp_list->data);
-           }
-         g_slist_free (children);
-         
-         data->found = new_data.found;
-       }
+      for (parent = widget;
+           parent;
+           parent = gtk_widget_get_parent (parent))
+        {
+          hierarchy = g_list_prepend (hierarchy, g_object_ref (parent));
+        }
 
-      /* If not, and this widget is registered as a drop site, check to
-       * emit "drag-motion" to check if we are actually in
-       * a drop site.
+      /* If the current widget is registered as a drop site, check to
+       * emit "drag-motion" to check if we are actually in a drop
+       * site.
        */
-      if (!data->found &&
-         g_object_get_data (G_OBJECT (widget), "gtk-drag-dest"))
+      if (g_object_get_data (G_OBJECT (widget), "gtk-drag-dest"))
        {
-         data->found = data->callback (widget,
-                                       data->context,
-                                       data->x - x_offset - allocation_to_window_x,
-                                       data->y - y_offset - allocation_to_window_y,
-                                       data->time);
+         found = callback (widget, context, x, y, time);
+
          /* If so, send a "drag-leave" to the last widget */
-         if (data->found)
+         if (found)
            {
-             if (data->info->widget && data->info->widget != widget)
+             if (info->widget && info->widget != widget)
                {
-                 gtk_drag_dest_leave (data->info->widget, data->context, data->time);
+                 gtk_drag_dest_leave (info->widget, context, time);
                }
-             data->info->widget = widget;
+
+             info->widget = widget;
            }
        }
+
+      if (!found)
+        {
+          /* Get the parent before unreffing the hierarchy because
+           * invoking the callback might have destroyed the widget
+           */
+          parent = gtk_widget_get_parent (widget);
+
+          /* The parent might be going away when unreffing the
+           * hierarchy, so also protect againt that
+           */
+          if (parent)
+            g_object_add_weak_pointer (G_OBJECT (parent), (gpointer *) &parent);
+        }
+
+      g_list_foreach (hierarchy, (GFunc) g_object_unref, NULL);
+      g_list_free (hierarchy);
+
+      if (found)
+        return TRUE;
+
+      if (parent)
+        g_object_remove_weak_pointer (G_OBJECT (parent), (gpointer *) &parent);
+      else
+        return FALSE;
+
+      if (!gtk_widget_translate_coordinates (widget, parent, x, y, &x, &y))
+        return FALSE;
+
+      widget = parent;
     }
+
+  return FALSE;
 }
 
 static void
@@ -1950,7 +1959,7 @@ gtk_drag_proxy_begin (GtkWidget       *widget,
     }
   
   ipc_widget = gtk_drag_get_ipc_widget (widget);
-  context = gdk_drag_begin (ipc_widget->window,
+  context = gdk_drag_begin (gtk_widget_get_window (ipc_widget),
                            dest_info->context->targets);
 
   source_info = gtk_drag_get_source_info (context, TRUE);
@@ -2043,8 +2052,8 @@ gtk_drag_dest_realized (GtkWidget *widget)
 {
   GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
 
-  if (GTK_WIDGET_TOPLEVEL (toplevel))
-    gdk_window_register_dnd (toplevel->window);
+  if (gtk_widget_is_toplevel (toplevel))
+    gdk_window_register_dnd (gtk_widget_get_window (toplevel));
 }
 
 static void
@@ -2053,8 +2062,8 @@ gtk_drag_dest_hierarchy_changed (GtkWidget *widget,
 {
   GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
 
-  if (GTK_WIDGET_TOPLEVEL (toplevel) && GTK_WIDGET_REALIZED (toplevel))
-    gdk_window_register_dnd (toplevel->window);
+  if (gtk_widget_is_toplevel (toplevel) && gtk_widget_get_realized (toplevel))
+    gdk_window_register_dnd (gtk_widget_get_window (toplevel));
 }
 
 static void
@@ -2342,7 +2351,10 @@ gtk_drag_begin_internal (GtkWidget         *widget,
   GdkDragContext *context;
   GtkWidget *ipc_widget;
   GdkCursor *cursor;
+  GdkDevice *pointer, *keyboard;
+  GdkWindow *ipc_window;
+
+  pointer = keyboard = NULL;
   ipc_widget = gtk_drag_get_ipc_widget (widget);
   
   gtk_drag_get_event_actions (event, button, actions,
@@ -2353,24 +2365,53 @@ gtk_drag_begin_internal (GtkWidget         *widget,
                                NULL);
   
   if (event)
-    time = gdk_event_get_time (event);
+    {
+      time = gdk_event_get_time (event);
+      if (time == GDK_CURRENT_TIME)
+        time = gtk_get_current_event_time ();
 
-  if (gdk_pointer_grab (ipc_widget->window, FALSE,
-                       GDK_POINTER_MOTION_MASK |
-                       GDK_BUTTON_RELEASE_MASK, NULL,
-                       cursor, time) != GDK_GRAB_SUCCESS)
+      pointer = gdk_event_get_device (event);
+
+      if (pointer->source == GDK_SOURCE_KEYBOARD)
+        {
+          keyboard = pointer;
+          pointer = gdk_device_get_associated_device (keyboard);
+        }
+      else
+        keyboard = gdk_device_get_associated_device (pointer);
+    }
+  else
+    {
+      GdkDeviceManager *device_manager;
+
+      device_manager = gdk_display_get_device_manager (gtk_widget_get_display (widget));
+      pointer = gdk_device_manager_get_client_pointer (device_manager);
+      keyboard = gdk_device_get_associated_device (pointer);
+    }
+
+  if (!pointer)
+    return NULL;
+
+  ipc_window = gtk_widget_get_window (ipc_widget);
+
+  if (gdk_device_grab (pointer, ipc_window,
+                       GDK_OWNERSHIP_APPLICATION, FALSE,
+                       GDK_POINTER_MOTION_MASK |
+                       GDK_BUTTON_RELEASE_MASK,
+                       cursor, time) != GDK_GRAB_SUCCESS)
     {
       gtk_drag_release_ipc_widget (ipc_widget);
       return NULL;
     }
 
-  grab_dnd_keys (ipc_widget, time);
+  if (keyboard)
+    grab_dnd_keys (ipc_widget, keyboard, time);
 
   /* We use a GTK grab here to override any grabs that the widget
    * we are dragging from might have held
    */
-  gtk_grab_add (ipc_widget);
-  
+  gtk_device_grab_add (ipc_widget, pointer, FALSE);
+
   tmp_list = g_list_last (target_list->list);
   while (tmp_list)
     {
@@ -2382,7 +2423,8 @@ gtk_drag_begin_internal (GtkWidget         *widget,
 
   source_widgets = g_slist_prepend (source_widgets, ipc_widget);
 
-  context = gdk_drag_begin (ipc_widget->window, targets);
+  context = gdk_drag_begin (ipc_window, targets);
+  gdk_drag_context_set_device (context, pointer);
   g_list_free (targets);
   
   info = gtk_drag_get_source_info (context, TRUE);
@@ -2414,10 +2456,10 @@ gtk_drag_begin_internal (GtkWidget         *widget,
       info->cur_x = event->motion.x_root;
       info->cur_y = event->motion.y_root;
     }
-  else 
+  else
     {
-      gdk_display_get_pointer (gtk_widget_get_display (widget),
-                              &info->cur_screen, &info->cur_x, &info->cur_y, NULL);
+      gdk_display_get_device_state (gtk_widget_get_display (widget), pointer,
+                                    &info->cur_screen, &info->cur_x, &info->cur_y, NULL);
     }
 
   g_signal_emit_by_name (widget, "drag-begin", info->context);
@@ -2473,11 +2515,11 @@ gtk_drag_begin_internal (GtkWidget         *widget,
   
       if (cursor != info->cursor)
         {
-         gdk_pointer_grab (widget->window, FALSE,
-                           GDK_POINTER_MOTION_MASK |
-                           GDK_BUTTON_RELEASE_MASK,
-                           NULL,
-                           cursor, time);
+          gdk_device_grab (pointer, gtk_widget_get_window (widget),
+                           GDK_OWNERSHIP_APPLICATION, FALSE,
+                           GDK_POINTER_MOTION_MASK |
+                           GDK_BUTTON_RELEASE_MASK,
+                           cursor, time);
           info->cursor = cursor;
         }
     }
@@ -2524,6 +2566,29 @@ gtk_drag_begin_internal (GtkWidget         *widget,
  * only needs to be used when the application is
  * starting drags itself, and is not needed when
  * gtk_drag_source_set() is used.
+ *
+ * The @event is used to retrieve the timestamp that will be used internally to
+ * grab the pointer.  If @event is #NULL, then GDK_CURRENT_TIME will be used.
+ * However, you should try to pass a real event in all cases, since that can be
+ * used by GTK+ to get information about the start position of the drag, for
+ * example if the @event is a GDK_MOTION_NOTIFY.
+ *
+ * Generally there are three cases when you want to start a drag by hand by calling
+ * this function:
+ *
+ * 1. During a button-press-event handler, if you want to start a drag immediately
+ * when the user presses the mouse button.  Pass the @event that you have in your
+ * button-press-event handler.
+ *
+ * 2. During a motion-notify-event handler, if you want to start a drag when the mouse
+ * moves past a certain threshold distance after a button-press.  Pass the @event that you
+ * have in your motion-notify-event handler.
+ *
+ * 3. During a timeout handler, if you want to start a drag after the mouse
+ * button is held down for some time.  Try to save the last event that you got
+ * from the mouse, using gdk_event_copy(), and pass it to this function
+ * (remember to free the event with gdk_event_free() when you are done).  If you
+ * can really not pass a real event, pass #NULL instead.
  * 
  * Return value: the context for this drag.
  **/
@@ -2535,26 +2600,26 @@ gtk_drag_begin (GtkWidget         *widget,
                GdkEvent          *event)
 {
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
   g_return_val_if_fail (targets != NULL, NULL);
 
   return gtk_drag_begin_internal (widget, NULL, targets,
                                  actions, button, event);
 }
 
-/*************************************************************
+/**
  * gtk_drag_source_set:
- *     Register a drop site, and possibly add default behaviors.
- *   arguments:
- *     widget:
- *     start_button_mask: Mask of allowed buttons to start drag
- *     targets:           Table of targets for this source
- *     n_targets:
- *     actions:           Actions allowed for this source
- *   results:
- *************************************************************/
-
-void 
+ * @widget: a #GtkWidget
+ * @start_button_mask: the bitmask of buttons that can start the drag
+ * @targets: (allow-none) (array length=n_targets): the table of targets that the drag will support,
+ *     may be %NULL
+ * @n_targets: the number of items in @targets
+ * @actions: the bitmask of possible actions for a drag from this widget
+ *
+ * Sets up a widget so that GTK+ will start a drag operation when the user
+ * clicks and drags on the widget. The widget must have a window.
+ */
+void
 gtk_drag_source_set (GtkWidget            *widget,
                     GdkModifierType       start_button_mask,
                     const GtkTargetEntry *targets,
@@ -2657,7 +2722,7 @@ gtk_drag_source_get_target_list (GtkWidget *widget)
 /**
  * gtk_drag_source_set_target_list:
  * @widget: a #GtkWidget that's a drag source
- * @target_list: list of draggable targets, or %NULL for none
+ * @target_list: (allow-none): list of draggable targets, or %NULL for none
  *
  * Changes the target types that this widget offers for drag-and-drop.
  * The widget must first be made into a drag source with
@@ -2809,10 +2874,10 @@ gtk_drag_source_unset_icon (GtkDragSourceSite *site)
  * @widget: a #GtkWidget
  * @colormap: the colormap of the icon
  * @pixmap: the image data for the icon
- * @mask: the transparency mask for an image.
- * 
+ * @mask: (allow-none): the transparency mask for an image.
+ *
  * Sets the icon that will be used for drags from a particular widget
- * from a pixmap/mask. GTK+ retains references for the arguments, and 
+ * from a pixmap/mask. GTK+ retains references for the arguments, and
  * will release them when they are no longer needed.
  * Use gtk_drag_source_set_icon_pixbuf() instead.
  **/
@@ -2954,16 +3019,8 @@ gtk_drag_get_icon (GtkDragSourceInfo *info,
          save_destroy_icon = info->destroy_icon;
 
          info->icon_window = NULL;
-         if (!default_icon_pixmap)
-           set_icon_stock_pixbuf (info->context, 
-                                  GTK_STOCK_DND, NULL, -2, -2, TRUE);
-         else
-           gtk_drag_set_icon_pixmap (info->context, 
-                                     default_icon_colormap, 
-                                     default_icon_pixmap, 
-                                     default_icon_mask,
-                                     default_icon_hot_x,
-                                     default_icon_hot_y);
+          set_icon_stock_pixbuf (info->context, 
+                                 GTK_STOCK_DND, NULL, -2, -2, TRUE);
          info->fallback_icon = info->icon_window;
          
          info->icon_window = save_icon_window;
@@ -2977,16 +3034,8 @@ gtk_drag_get_icon (GtkDragSourceInfo *info,
       *icon_window = info->fallback_icon;
       gtk_window_set_screen (GTK_WINDOW (*icon_window), info->cur_screen);
       
-      if (!default_icon_pixmap)
-       {
-         *hot_x = -2;
-         *hot_y = -2;
-       }
-      else
-       {
-         *hot_x = default_icon_hot_x;
-         *hot_y = default_icon_hot_y;
-       }
+      *hot_x = -2;
+      *hot_y = -2;
     }
   else
     {
@@ -3013,8 +3062,8 @@ gtk_drag_update_icon (GtkDragSourceInfo *info)
                       info->cur_x - hot_x, 
                       info->cur_y - hot_y);
 
-      if (GTK_WIDGET_VISIBLE (icon_window))
-       gdk_window_raise (icon_window->window);
+      if (gtk_widget_get_visible (icon_window))
+       gdk_window_raise (gtk_widget_get_window (icon_window));
       else
        gtk_widget_show (icon_window);
     }
@@ -3093,8 +3142,9 @@ icon_window_realize (GtkWidget *window,
   gdk_pixbuf_render_pixmap_and_mask_for_colormap (pixbuf,
                                                  gtk_widget_get_colormap (window),
                                                  &pixmap, &mask, 128);
-  
-  gdk_window_set_back_pixmap (window->window, pixmap, FALSE);
+
+  gdk_window_set_back_pixmap (gtk_widget_get_window (window),
+                              pixmap, FALSE);
   g_object_unref (pixmap);
   
   if (mask)
@@ -3235,7 +3285,7 @@ gtk_drag_set_icon_stock  (GdkDragContext *context,
  *            with a  context for the source side of a drag)
  * @colormap: the colormap of the icon 
  * @pixmap: the image data for the icon 
- * @mask: the transparency mask for the icon or %NULL for none.
+ * @mask: (allow-none): the transparency mask for the icon or %NULL for none.
  * @hot_x: the X offset within @pixmap of the hotspot.
  * @hot_y: the Y offset within @pixmap of the hotspot.
  * 
@@ -3283,8 +3333,9 @@ gtk_drag_set_icon_pixmap (GdkDragContext    *context,
   gtk_widget_set_size_request (window, width, height);
   gtk_widget_realize (window);
 
-  gdk_window_set_back_pixmap (window->window, pixmap, FALSE);
-  
+  gdk_window_set_back_pixmap (gtk_widget_get_window (window),
+                              pixmap, FALSE);
+
   if (mask)
     gtk_widget_shape_combine_mask (window, mask, 0, 0);
 
@@ -3358,64 +3409,9 @@ gtk_drag_set_icon_default (GdkDragContext *context)
   g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
   g_return_if_fail (context->is_source);
 
-  if (!default_icon_pixmap)
-    gtk_drag_set_icon_stock (context, GTK_STOCK_DND, -2, -2);
-  else
-    gtk_drag_set_icon_pixmap (context, 
-                             default_icon_colormap, 
-                             default_icon_pixmap, 
-                             default_icon_mask,
-                             default_icon_hot_x,
-                             default_icon_hot_y);
+  gtk_drag_set_icon_stock (context, GTK_STOCK_DND, -2, -2);
 }
 
-/**
- * gtk_drag_set_default_icon:
- * @colormap: the colormap of the icon
- * @pixmap: the image data for the icon
- * @mask: the transparency mask for an image.
- * @hot_x: The X offset within @widget of the hotspot.
- * @hot_y: The Y offset within @widget of the hotspot.
- * 
- * Changes the default drag icon. GTK+ retains references for the
- * arguments, and will release them when they are no longer needed.
- *
- * Deprecated: Change the default drag icon via the stock system by 
- *     changing the stock pixbuf for #GTK_STOCK_DND instead.
- **/
-void 
-gtk_drag_set_default_icon (GdkColormap   *colormap,
-                          GdkPixmap     *pixmap,
-                          GdkBitmap     *mask,
-                          gint           hot_x,
-                          gint           hot_y)
-{
-  g_return_if_fail (GDK_IS_COLORMAP (colormap));
-  g_return_if_fail (GDK_IS_PIXMAP (pixmap));
-  g_return_if_fail (!mask || GDK_IS_PIXMAP (mask));
-  
-  if (default_icon_colormap)
-    g_object_unref (default_icon_colormap);
-  if (default_icon_pixmap)
-    g_object_unref (default_icon_pixmap);
-  if (default_icon_mask)
-    g_object_unref (default_icon_mask);
-
-  default_icon_colormap = colormap;
-  g_object_ref (colormap);
-  
-  default_icon_pixmap = pixmap;
-  g_object_ref (pixmap);
-
-  default_icon_mask = mask;
-  if (mask)
-    g_object_ref (mask);
-  
-  default_icon_hot_x = hot_x;
-  default_icon_hot_y = hot_y;
-}
-
-
 /*************************************************************
  * _gtk_drag_source_handle_event:
  *     Called from widget event handling code on Drag events
@@ -3478,11 +3474,13 @@ _gtk_drag_source_handle_event (GtkWidget *widget,
                                          info);
            if (info->cursor != cursor)
              {
-               gdk_pointer_grab (widget->window, FALSE,
-                                 GDK_POINTER_MOTION_MASK |
-                                 GDK_BUTTON_RELEASE_MASK,
-                                 NULL,
-                                 cursor, info->grab_time);
+                GdkDevice *pointer;
+
+                pointer = gdk_drag_context_get_device (context);
+                gdk_device_grab (pointer, gtk_widget_get_window (widget),
+                                 GDK_OWNERSHIP_APPLICATION, FALSE,
+                                 GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
+                                 cursor, info->grab_time);
                info->cursor = cursor;
              }
            
@@ -3634,7 +3632,7 @@ gtk_drag_source_release_selections (GtkDragSourceInfo *info,
   while (tmp_list)
     {
       GdkAtom selection = GDK_POINTER_TO_ATOM (tmp_list->data);
-      if (gdk_selection_owner_get_for_display (display, selection) == info->ipc_widget->window)
+      if (gdk_selection_owner_get_for_display (display, selection) == gtk_widget_get_window (info->ipc_widget))
        gtk_selection_owner_set_for_display (display, NULL, selection, time);
 
       tmp_list = tmp_list->next;
@@ -3987,7 +3985,7 @@ gtk_drag_update_idle (gpointer data)
                                  &action, &possible_actions);
       gtk_drag_update_icon (info);
       gdk_drag_find_window_for_screen (info->context,
-                                      info->icon_window ? info->icon_window->window : NULL,
+                                       info->icon_window ? gtk_widget_get_window (info->icon_window) : NULL,
                                       info->cur_screen, info->cur_x, info->cur_y,
                                       &dest_window, &protocol);
       
@@ -4072,7 +4070,14 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time)
 {
   GdkEvent *send_event;
   GtkWidget *source_widget = info->widget;
-  GdkDisplay *display = gtk_widget_get_display (source_widget);
+  GdkDevice *pointer, *keyboard;
+
+  pointer = gdk_drag_context_get_device (info->context);
+  keyboard = gdk_device_get_associated_device (pointer);
+
+  /* Prevent ungrab before grab (see bug 623865) */
+  if (info->grab_time == GDK_CURRENT_TIME)
+    time = GDK_CURRENT_TIME;
 
   if (info->update_idle)
     {
@@ -4104,9 +4109,9 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time)
                                        gtk_drag_key_cb,
                                        info);
 
-  gdk_display_pointer_ungrab (display, time);
-  ungrab_dnd_keys (info->ipc_widget, time);
-  gtk_grab_remove (info->ipc_widget);
+  gdk_device_ungrab (pointer, time);
+  ungrab_dnd_keys (info->ipc_widget, keyboard, time);
+  gtk_device_grab_remove (info->ipc_widget, pointer);
 
   /* Send on a release pair to the original 
    * widget to convince it to release its grab. We need to
@@ -4124,7 +4129,7 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time)
   send_event->button.axes = NULL;
   send_event->button.state = 0;
   send_event->button.button = info->button;
-  send_event->button.device = gdk_display_get_core_pointer (display);
+  send_event->button.device = pointer;
   send_event->button.x_root = 0;
   send_event->button.y_root = 0;
 
@@ -4170,15 +4175,16 @@ gtk_drag_motion_cb (GtkWidget      *widget,
   if (event->is_hint)
     {
       GdkDisplay *display = gtk_widget_get_display (widget);
-      
-      gdk_display_get_pointer (display, &screen, &x_root, &y_root, NULL);
+
+      gdk_display_get_device_state (display, event->device,
+                                    &screen, &x_root, &y_root, NULL);
       event->x_root = x_root;
       event->y_root = y_root;
     }
   else
     screen = gdk_event_get_screen ((GdkEvent *)event);
 
-  gtk_drag_update (info, screen, event->x_root, event->y_root, (GdkEvent *)event);
+  gtk_drag_update (info, screen, event->x_root, event->y_root, (GdkEvent *) event);
 
   return TRUE;
 }
@@ -4202,10 +4208,12 @@ gtk_drag_key_cb (GtkWidget         *widget,
   GtkDragSourceInfo *info = (GtkDragSourceInfo *)data;
   GdkModifierType state;
   GdkWindow *root_window;
+  GdkDevice *pointer;
   gint dx, dy;
 
   dx = dy = 0;
   state = event->state & gtk_accelerator_get_default_mod_mask ();
+  pointer = gdk_device_get_associated_device (gdk_event_get_device ((GdkEvent *) event));
 
   if (event->type == GDK_KEY_PRESS)
     {
@@ -4254,16 +4262,16 @@ gtk_drag_key_cb (GtkWidget         *widget,
    * that would be overkill.
    */
   root_window = gtk_widget_get_root_window (widget);
-  gdk_window_get_pointer (root_window, NULL, NULL, &state);
+  gdk_window_get_device_position (root_window, pointer, NULL, NULL, &state);
   event->state = state;
 
   if (dx != 0 || dy != 0)
     {
       info->cur_x += dx;
       info->cur_y += dy;
-      gdk_display_warp_pointer (gtk_widget_get_display (widget), 
-                               gtk_widget_get_screen (widget), 
-                               info->cur_x, info->cur_y);
+      gdk_display_warp_device (gtk_widget_get_display (widget), pointer,
+                               gtk_widget_get_screen (widget),
+                               info->cur_x, info->cur_y);
     }
 
   gtk_drag_update (info, info->cur_screen, info->cur_x, info->cur_y, (GdkEvent *)event);
@@ -4283,8 +4291,8 @@ gtk_drag_grab_broken_event_cb (GtkWidget          *widget,
    * example, when changing the drag cursor.
    */
   if (event->implicit
-      || event->grab_window == info->widget->window
-      || event->grab_window == info->ipc_widget->window)
+      || event->grab_window == gtk_widget_get_window (info->widget)
+      || event->grab_window == gtk_widget_get_window (info->ipc_widget))
     return FALSE;
 
   gtk_drag_cancel (info, GTK_DRAG_RESULT_GRAB_BROKEN, gtk_get_current_event_time ());
@@ -4297,8 +4305,11 @@ gtk_drag_grab_notify_cb (GtkWidget        *widget,
                         gpointer          data)
 {
   GtkDragSourceInfo *info = (GtkDragSourceInfo *)data;
+  GdkDevice *pointer;
 
-  if (!was_grabbed)
+  pointer = gdk_drag_context_get_device (info->context);
+
+  if (gtk_widget_device_is_shadowed (widget, pointer))
     {
       /* We have to block callbacks to avoid recursion here, because
         gtk_drag_cancel calls gtk_grab_remove (via gtk_drag_end) */
@@ -4387,6 +4398,3 @@ gtk_drag_check_threshold (GtkWidget *widget,
   return (ABS (current_x - start_x) > drag_threshold ||
          ABS (current_y - start_y) > drag_threshold);
 }
-
-#define __GTK_DND_C__
-#include "gtkaliasdef.c"