X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkdnd.c;h=f190b3953a763653e8b1c609645fabaff36bfc28;hb=d45d970144fe0fd6422fab873a6c20335ca096b9;hp=9d97c21c8b32b06cd6182220dbc077925eb677ec;hpb=712dc6b8dac570dc248230392ebe3f5cf6a1990b;p=~andy%2Fgtk diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 9d97c21c8..f190b3953 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -24,7 +24,7 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#include +#include "config.h" #include #include @@ -33,6 +33,12 @@ #include "gdk/gdkkeysyms.h" +#ifdef GDK_WINDOWING_X11 +#include +#include +#include "gdk/x11/gdkx.h" +#endif + #include "gtkdnd.h" #include "gtkiconfactory.h" #include "gtkicontheme.h" @@ -41,9 +47,10 @@ #include "gtkmain.h" #include "gtkplug.h" #include "gtkstock.h" +#include "gtktooltip.h" #include "gtkwindow.h" #include "gtkintl.h" -#include "gtkalias.h" +#include "gtkdndcursors.h" static GSList *source_widgets = NULL; @@ -52,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 @@ -131,6 +137,7 @@ struct _GtkDragDestSite guint do_proxy : 1; guint proxy_coords : 1; guint have_drag : 1; + guint track_motion : 1; }; struct _GtkDragDestInfo @@ -162,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 */ @@ -183,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, @@ -201,7 +193,8 @@ static GdkCursor * gtk_drag_get_cursor (GdkDisplay *display, GdkDragAction action, GtkDragSourceInfo *info); static void gtk_drag_update_cursor (GtkDragSourceInfo *info); -static GtkWidget *gtk_drag_get_ipc_widget (GdkScreen *screen); +static GtkWidget *gtk_drag_get_ipc_widget (GtkWidget *widget); +static GtkWidget *gtk_drag_get_ipc_widget_for_screen (GdkScreen *screen); static void gtk_drag_release_ipc_widget (GtkWidget *widget); static gboolean gtk_drag_highlight_expose (GtkWidget *widget, @@ -212,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); @@ -249,9 +247,10 @@ static void gtk_drag_source_release_selections (GtkDragSourceInfo *info, static void gtk_drag_drop (GtkDragSourceInfo *info, guint32 time); static void gtk_drag_drop_finished (GtkDragSourceInfo *info, - gboolean success, + GtkDragResult result, guint time); static void gtk_drag_cancel (GtkDragSourceInfo *info, + GtkDragResult result, guint32 time); static gboolean gtk_drag_source_event_cb (GtkWidget *widget, @@ -282,17 +281,25 @@ static gboolean gtk_drag_key_cb (GtkWidget *widget, static gboolean gtk_drag_grab_broken_event_cb (GtkWidget *widget, GdkEventGrabBroken *event, gpointer data); +static void gtk_drag_grab_notify_cb (GtkWidget *widget, + gboolean was_grabbed, + gpointer data); static gboolean gtk_drag_button_release_cb (GtkWidget *widget, GdkEventButton *event, gpointer data); static gboolean gtk_drag_abort_timeout (gpointer data); +static void set_icon_stock_pixbuf (GdkDragContext *context, + const gchar *stock_id, + GdkPixbuf *pixbuf, + gint hot_x, + gint hot_y, + gboolean force_window); + /************************ * Cursor and Icon data * ************************/ -#include "gtkdndcursors.h" - static struct { GdkDragAction action; const gchar *name; @@ -331,17 +338,8 @@ get_can_change_screen (GtkWidget *widget) } -/************************************************************* - * gtk_drag_get_ipc_widget: - * Return a invisible, off-screen, override-redirect - * widget for IPC. - * arguments: - * - * results: - *************************************************************/ - static GtkWidget * -gtk_drag_get_ipc_widget (GdkScreen *screen) +gtk_drag_get_ipc_widget_for_screen (GdkScreen *screen) { GtkWidget *result; GSList *drag_widgets = g_object_get_data (G_OBJECT (screen), @@ -359,13 +357,182 @@ gtk_drag_get_ipc_widget (GdkScreen *screen) } else { - result = gtk_invisible_new_for_screen (screen); + result = gtk_window_new (GTK_WINDOW_POPUP); + gtk_window_set_screen (GTK_WINDOW (result), screen); + gtk_window_resize (GTK_WINDOW (result), 1, 1); + gtk_window_move (GTK_WINDOW (result), -100, -100); gtk_widget_show (result); + } + + return result; +} + +static GtkWidget * +gtk_drag_get_ipc_widget (GtkWidget *widget) +{ + GtkWidget *result; + GtkWidget *toplevel; + + result = gtk_drag_get_ipc_widget_for_screen (gtk_widget_get_screen (widget)); + + toplevel = gtk_widget_get_toplevel (widget); + + if (GTK_IS_WINDOW (toplevel)) + { + 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; } +/* 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. + * Grabbing the keyboard has the unfortunate side-effect of preventing + * useful things such as using Alt-Tab to cycle between windows or + * switching workspaces. Therefore, we just grab the few keys we are + * interested in. Note that we need to put the grabs on the root window + * in order for them to still work when the focus is moved to another + * app/workspace. + * + * GDK needs a little help to successfully deliver root key events... + */ + +static GdkFilterReturn +root_key_filter (GdkXEvent *xevent, + GdkEvent *event, + gpointer data) +{ + XEvent *ev = (XEvent *) xevent; + + if ((ev->type == KeyPress || ev->type == KeyRelease) && + ev->xkey.root == ev->xkey.window) + ev->xkey.window = (Window)data; + + return GDK_FILTER_CONTINUE; +} + +typedef struct { + gint keysym; + gint modifiers; +} GrabKey; + +static GrabKey grab_keys[] = { + { XK_Escape, 0 }, + { XK_space, 0 }, + { XK_KP_Space, 0 }, + { XK_Return, 0 }, + { XK_KP_Enter, 0 }, + { XK_Up, 0 }, + { XK_Up, Mod1Mask }, + { XK_Down, 0 }, + { XK_Down, Mod1Mask }, + { XK_Left, 0 }, + { XK_Left, Mod1Mask }, + { XK_Right, 0 }, + { XK_Right, Mod1Mask }, + { XK_KP_Up, 0 }, + { XK_KP_Up, Mod1Mask }, + { XK_KP_Down, 0 }, + { XK_KP_Down, Mod1Mask }, + { XK_KP_Left, 0 }, + { XK_KP_Left, Mod1Mask }, + { XK_KP_Right, 0 }, + { XK_KP_Right, Mod1Mask } +}; + +static void +grab_dnd_keys (GtkWidget *widget, + GdkDevice *device, + guint32 time) +{ + guint i; + GdkWindow *window, *root; + gint keycode; + + window = gtk_widget_get_window (widget); + root = gdk_screen_get_root_window (gtk_widget_get_screen (widget)); + + gdk_error_trap_push (); + + for (i = 0; i < G_N_ELEMENTS (grab_keys); ++i) + { + keycode = XKeysymToKeycode (GDK_WINDOW_XDISPLAY (window), grab_keys[i].keysym); + XGrabKey (GDK_WINDOW_XDISPLAY (window), + keycode, grab_keys[i].modifiers, + GDK_WINDOW_XID (root), + FALSE, + GrabModeAsync, + GrabModeAsync); + } + + gdk_flush (); + gdk_error_trap_pop (); + + gdk_window_add_filter (NULL, root_key_filter, (gpointer) GDK_WINDOW_XID (window)); +} + +static void +ungrab_dnd_keys (GtkWidget *widget, + GdkDevice *device, + guint32 time) +{ + guint i; + GdkWindow *window, *root; + gint keycode; + + 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)); + + gdk_error_trap_push (); + + for (i = 0; i < G_N_ELEMENTS (grab_keys); ++i) + { + keycode = XKeysymToKeycode (GDK_WINDOW_XDISPLAY (window), grab_keys[i].keysym); + XUngrabKey (GDK_WINDOW_XDISPLAY (window), + keycode, grab_keys[i].modifiers, + GDK_WINDOW_XID (root)); + } + + gdk_flush (); + gdk_error_trap_pop (); +} + +#else /* GDK_WINDOWING_X11 && !XINPUT_2 */ + +static void +grab_dnd_keys (GtkWidget *widget, + GdkDevice *device, + guint32 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_device_ungrab (device, time); +} + +#endif /* GDK_WINDOWING_X11 */ + + /*************************************************************** * gtk_drag_release_ipc_widget: * Releases widget retrieved with gtk_drag_get_ipc_widget () @@ -377,9 +544,25 @@ gtk_drag_get_ipc_widget (GdkScreen *screen) static void 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"); + 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"), @@ -551,7 +734,7 @@ gtk_drag_get_cursor (GdkDisplay *display, GdkDragAction action, GtkDragSourceInfo *info) { - gint i, j; + gint i; /* reconstruct the cursors for each new drag (thus !info), * to catch cursor theme changes @@ -770,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; } } @@ -806,12 +992,12 @@ gtk_drag_get_data (GtkWidget *widget, g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); g_return_if_fail (!context->is_source); - selection_widget = gtk_drag_get_ipc_widget (gtk_widget_get_screen (widget)); + selection_widget = gtk_drag_get_ipc_widget (widget); g_object_ref (context); g_object_ref (widget); - g_signal_connect (selection_widget, "selection_received", + g_signal_connect (selection_widget, "selection-received", G_CALLBACK (gtk_drag_selection_received), widget); g_object_set_data (G_OBJECT (selection_widget), I_("drag-context"), context); @@ -846,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"); @@ -896,12 +1082,12 @@ gtk_drag_finish (GdkDragContext *context, if (target != GDK_NONE) { - GtkWidget *selection_widget = gtk_drag_get_ipc_widget (gdk_drawable_get_screen (context->source_window)); + GtkWidget *selection_widget = gtk_drag_get_ipc_widget_for_screen (gdk_drawable_get_screen (context->source_window)); g_object_ref (context); g_object_set_data (G_OBJECT (selection_widget), I_("drag-context"), context); - g_signal_connect (selection_widget, "selection_received", + g_signal_connect (selection_widget, "selection-received", G_CALLBACK (gtk_drag_selection_received), NULL); @@ -932,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, - NULL, widget, "dnd", + &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, @@ -981,7 +1173,7 @@ gtk_drag_highlight (GtkWidget *widget) { g_return_if_fail (GTK_IS_WIDGET (widget)); - g_signal_connect_after (widget, "expose_event", + g_signal_connect_after (widget, "expose-event", G_CALLBACK (gtk_drag_highlight_expose), NULL); @@ -1026,39 +1218,79 @@ gtk_drag_dest_set_internal (GtkWidget *widget, g_signal_handlers_disconnect_by_func (widget, gtk_drag_dest_hierarchy_changed, old_site); + + 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", G_CALLBACK (gtk_drag_dest_realized), site); - g_signal_connect (widget, "hierarchy_changed", + g_signal_connect (widget, "hierarchy-changed", G_CALLBACK (gtk_drag_dest_hierarchy_changed), site); g_object_set_data_full (G_OBJECT (widget), I_("gtk-drag-dest"), site, gtk_drag_dest_site_destroy); } - -/************************************************************* +/** * gtk_drag_dest_set: - * Register a drop site, and possibly add default behaviors. - * arguments: - * widget: - * flags: Which types of default drag behavior to use - * targets: Table of targets that can be accepted - * n_targets: Number of of entries in targets - * actions: - * results: - *************************************************************/ - -void -gtk_drag_dest_set (GtkWidget *widget, - GtkDestDefaults flags, - const GtkTargetEntry *targets, - gint n_targets, - GdkDragAction actions) + * @widget: a #GtkWidget + * @flags: which types of default drag behavior to use + * @targets: (allow-none) (array length=n_targets): a pointer to an array of #GtkTargetEntrys + * 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. + * + * The default behaviors listed in @flags have an effect similar + * to installing default handlers for the widget's drag-and-drop signals + * (#GtkWidget:drag-motion, #GtkWidget:drag-drop, ...). They all exist + * for convenience. When passing #GTK_DEST_DEFAULT_ALL for instance it is + * sufficient to connect to the widget's #GtkWidget::drag-data-received + * signal to get primitive, but consistent drag-and-drop support. + * + * Things become more complicated when you try to preview the dragged data, + * as described in the documentation for #GtkWidget:drag-motion. The default + * behaviors described by @flags make some assumptions, that can conflict + * with your own signal handlers. For instance #GTK_DEST_DEFAULT_DROP causes + * invokations of gdk_drag_status() in the context of #GtkWidget:drag-motion, + * 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, + GtkDestDefaults flags, + const GtkTargetEntry *targets, + gint n_targets, + GdkDragAction actions) { GtkDragDestSite *site; @@ -1075,6 +1307,7 @@ gtk_drag_dest_set (GtkWidget *widget, site->actions = actions; site->do_proxy = FALSE; site->proxy_window = NULL; + site->track_motion = FALSE; gtk_drag_dest_set_internal (widget, site); } @@ -1115,6 +1348,7 @@ gtk_drag_dest_set_proxy (GtkWidget *widget, site->do_proxy = TRUE; site->proxy_protocol = protocol; site->proxy_coords = use_coordinates; + site->track_motion = FALSE; gtk_drag_dest_set_internal (widget, site); } @@ -1130,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); } @@ -1159,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 @@ -1272,6 +1520,61 @@ gtk_drag_dest_add_uri_targets (GtkWidget *widget) gtk_target_list_unref (target_list); } +/** + * gtk_drag_dest_set_track_motion: + * @widget: a #GtkWidget that's a drag destination + * @track_motion: whether to accept all targets + * + * Tells the widget to emit ::drag-motion and ::drag-leave + * events regardless of the targets and the %GTK_DEST_DEFAULT_MOTION + * flag. + * + * This may be used when a widget wants to do generic + * actions regardless of the targets that the source offers. + * + * Since: 2.10 + **/ +void +gtk_drag_dest_set_track_motion (GtkWidget *widget, + gboolean track_motion) +{ + GtkDragDestSite *site; + + g_return_if_fail (GTK_IS_WIDGET (widget)); + + site = g_object_get_data (G_OBJECT (widget), "gtk-drag-dest"); + + g_return_if_fail (site != NULL); + + site->track_motion = track_motion != FALSE; +} + +/** + * gtk_drag_dest_get_track_motion: + * @widget: a #GtkWidget that's a drag destination + * + * Returns whether the widget has been configured to always + * emit ::drag-motion signals. + * + * Return Value: %TRUE if the widget always emits ::drag-motion events + * + * Since: 2.10 + **/ +gboolean +gtk_drag_dest_get_track_motion (GtkWidget *widget) +{ + GtkDragDestSite *site; + + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); + + site = g_object_get_data (G_OBJECT (widget), "gtk-drag-dest"); + + if (site) + return site->track_motion; + + return FALSE; +} + /************************************************************* * _gtk_drag_dest_handle_event: * Called from widget event handling code on Drag events @@ -1314,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) { @@ -1330,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 * @@ -1338,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; @@ -1365,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); } } @@ -1386,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 @@ -1431,7 +1735,9 @@ gtk_drag_dest_find_target (GtkWidget *widget, if (tmp_source->data == GUINT_TO_POINTER (pair->target)) { if ((!(pair->flags & GTK_TARGET_SAME_APP) || source_widget) && - (!(pair->flags & GTK_TARGET_SAME_WIDGET) || (source_widget == widget))) + (!(pair->flags & GTK_TARGET_SAME_WIDGET) || (source_widget == widget)) && + (!(pair->flags & GTK_TARGET_OTHER_APP) || !source_widget) && + (!(pair->flags & GTK_TARGET_OTHER_WIDGET) || (source_widget != widget))) return pair->target; else break; @@ -1497,7 +1803,7 @@ gtk_drag_selection_received (GtkWidget *widget, if (!(site->flags & GTK_DEST_DEFAULT_DROP) || selection_data->length >= 0) g_signal_emit_by_name (drop_widget, - "drag_data_received", + "drag-data-received", context, info->drop_x, info->drop_y, selection_data, target_info, time); @@ -1506,7 +1812,7 @@ gtk_drag_selection_received (GtkWidget *widget, else { g_signal_emit_by_name (drop_widget, - "drag_data_received", + "drag-data-received", context, info->drop_x, info->drop_y, selection_data, 0, time); @@ -1534,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; + GtkWidget *parent; + GList *hierarchy = NULL; + gboolean found = FALSE; - /* Compute the offset from allocation-relative to - * window-relative coordinates. - */ - allocation_to_window_x = widget->allocation.x; - allocation_to_window_y = widget->allocation.y; - - 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; - } - - 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); + if (!gtk_widget_get_mapped (widget) || + !gtk_widget_get_sensitive (widget)) + return FALSE; - 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 heirarchy. - */ - 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); - /* If so, send a "drag_leave" to the last widget */ - if (data->found) + found = callback (widget, context, x, y, time); + + /* If so, send a "drag-leave" to the last widget */ + 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 @@ -1703,14 +1958,14 @@ gtk_drag_proxy_begin (GtkWidget *widget, dest_info->proxy_source = NULL; } - ipc_widget = gtk_drag_get_ipc_widget (gtk_widget_get_screen (widget)); - context = gdk_drag_begin (ipc_widget->window, + ipc_widget = gtk_drag_get_ipc_widget (widget); + context = gdk_drag_begin (gtk_widget_get_window (ipc_widget), dest_info->context->targets); source_info = gtk_drag_get_source_info (context, TRUE); source_info->ipc_widget = ipc_widget; - source_info->widget = gtk_widget_ref (widget); + source_info->widget = g_object_ref (widget); source_info->target_list = gtk_target_list_new (NULL, 0); tmp_list = dest_info->context->targets; @@ -1724,7 +1979,7 @@ gtk_drag_proxy_begin (GtkWidget *widget, source_info->proxy_dest = dest_info; g_signal_connect (ipc_widget, - "selection_get", + "selection-get", G_CALLBACK (gtk_drag_selection_get), source_info); @@ -1797,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 @@ -1807,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 @@ -1856,9 +2111,9 @@ gtk_drag_dest_leave (GtkWidget *widget, if ((site->flags & GTK_DEST_DEFAULT_HIGHLIGHT) && site->have_drag) gtk_drag_unhighlight (widget); - if (!(site->flags & GTK_DEST_DEFAULT_MOTION) || site->have_drag) - g_signal_emit_by_name (widget, "drag_leave", - context, time); + if (!(site->flags & GTK_DEST_DEFAULT_MOTION) || site->have_drag || + site->track_motion) + g_signal_emit_by_name (widget, "drag-leave", context, time); site->have_drag = FALSE; } @@ -1927,7 +2182,7 @@ gtk_drag_dest_motion (GtkWidget *widget, return TRUE; } - if (site->flags & GTK_DEST_DEFAULT_MOTION) + if (site->track_motion || site->flags & GTK_DEST_DEFAULT_MOTION) { if (context->suggested_action & site->actions) action = context->suggested_action; @@ -1935,7 +2190,7 @@ gtk_drag_dest_motion (GtkWidget *widget, { gint i; - for (i=0; i<8; i++) + for (i = 0; i < 8; i++) { if ((site->actions & (1 << i)) && (context->actions & (1 << i))) @@ -1945,7 +2200,7 @@ gtk_drag_dest_motion (GtkWidget *widget, } } } - + if (action && gtk_drag_dest_find_target (widget, context, NULL)) { if (!site->have_drag) @@ -1954,17 +2209,18 @@ gtk_drag_dest_motion (GtkWidget *widget, if (site->flags & GTK_DEST_DEFAULT_HIGHLIGHT) gtk_drag_highlight (widget); } - + gdk_drag_status (context, action, time); } else { gdk_drag_status (context, 0, time); - return TRUE; + if (!site->track_motion) + return TRUE; } } - g_signal_emit_by_name (widget, "drag_motion", + g_signal_emit_by_name (widget, "drag-motion", context, x, y, time, &retval); return (site->flags & GTK_DEST_DEFAULT_MOTION) ? TRUE : retval; @@ -2055,17 +2311,17 @@ gtk_drag_dest_drop (GtkWidget *widget, if (site->flags & GTK_DEST_DEFAULT_DROP) { GdkAtom target = gtk_drag_dest_find_target (widget, context, NULL); - + if (target == GDK_NONE) { gtk_drag_finish (context, FALSE, FALSE, time); return TRUE; } - else + else gtk_drag_get_data (widget, context, target, time); } - g_signal_emit_by_name (widget, "drag_drop", + g_signal_emit_by_name (widget, "drag-drop", context, x, y, time, &retval); return (site->flags & GTK_DEST_DEFAULT_DROP) ? TRUE : retval; @@ -2095,8 +2351,11 @@ gtk_drag_begin_internal (GtkWidget *widget, GdkDragContext *context; GtkWidget *ipc_widget; GdkCursor *cursor; - - ipc_widget = gtk_drag_get_ipc_widget (gtk_widget_get_screen (widget)); + 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, &suggested_action, &possible_actions); @@ -2106,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 (); + + 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; - if (gdk_pointer_grab (ipc_widget->window, FALSE, - GDK_POINTER_MOTION_MASK | - GDK_BUTTON_RELEASE_MASK, NULL, - cursor, time) != GDK_GRAB_SUCCESS) + 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; } - gdk_keyboard_grab (ipc_widget->window, FALSE, 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) { @@ -2135,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); @@ -2143,7 +2432,7 @@ gtk_drag_begin_internal (GtkWidget *widget, info->ipc_widget = ipc_widget; g_object_set_data (G_OBJECT (info->ipc_widget), I_("gtk-info"), info); - info->widget = gtk_widget_ref (widget); + info->widget = g_object_ref (widget); info->button = button; info->cursor = cursor; @@ -2158,7 +2447,7 @@ gtk_drag_begin_internal (GtkWidget *widget, info->icon_window = NULL; info->destroy_icon = FALSE; - /* Set cur_x, cur_y here so if the "drag_begin" signal shows + /* Set cur_x, cur_y here so if the "drag-begin" signal shows * the drag icon, it will be in the right place */ if (event && event->type == GDK_MOTION_NOTIFY) @@ -2167,13 +2456,13 @@ 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); + g_signal_emit_by_name (widget, "drag-begin", info->context); /* Ensure that we have an icon before we start the drag; the * application may have set one in ::drag_begin, or it may @@ -2226,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; } } @@ -2245,15 +2534,17 @@ gtk_drag_begin_internal (GtkWidget *widget, g_signal_connect (info->ipc_widget, "grab-broken-event", G_CALLBACK (gtk_drag_grab_broken_event_cb), info); - g_signal_connect (info->ipc_widget, "button_release_event", + g_signal_connect (info->ipc_widget, "grab-notify", + G_CALLBACK (gtk_drag_grab_notify_cb), info); + g_signal_connect (info->ipc_widget, "button-release-event", G_CALLBACK (gtk_drag_button_release_cb), info); - g_signal_connect (info->ipc_widget, "motion_notify_event", + g_signal_connect (info->ipc_widget, "motion-notify-event", G_CALLBACK (gtk_drag_motion_cb), info); - g_signal_connect (info->ipc_widget, "key_press_event", + g_signal_connect (info->ipc_widget, "key-press-event", G_CALLBACK (gtk_drag_key_cb), info); - g_signal_connect (info->ipc_widget, "key_release_event", + g_signal_connect (info->ipc_widget, "key-release-event", G_CALLBACK (gtk_drag_key_cb), info); - g_signal_connect (info->ipc_widget, "selection_get", + g_signal_connect (info->ipc_widget, "selection-get", G_CALLBACK (gtk_drag_selection_get), info); info->have_grab = TRUE; @@ -2275,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. **/ @@ -2286,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, @@ -2334,13 +2648,13 @@ gtk_drag_source_set (GtkWidget *widget, site->icon_type = GTK_IMAGE_EMPTY; - g_signal_connect (widget, "button_press_event", + g_signal_connect (widget, "button-press-event", G_CALLBACK (gtk_drag_source_event_cb), site); - g_signal_connect (widget, "button_release_event", + g_signal_connect (widget, "button-release-event", G_CALLBACK (gtk_drag_source_event_cb), site); - g_signal_connect (widget, "motion_notify_event", + g_signal_connect (widget, "motion-notify-event", G_CALLBACK (gtk_drag_source_event_cb), site); @@ -2408,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 @@ -2560,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. **/ @@ -2705,7 +3019,8 @@ gtk_drag_get_icon (GtkDragSourceInfo *info, save_destroy_icon = info->destroy_icon; info->icon_window = NULL; - gtk_drag_set_icon_default (info->context); + 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; @@ -2719,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 { @@ -2755,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); } @@ -2772,10 +3079,17 @@ gtk_drag_set_icon_window (GdkDragContext *context, GtkDragSourceInfo *info; info = gtk_drag_get_source_info (context, FALSE); + if (info == NULL) + { + if (destroy_on_release) + gtk_widget_destroy (widget); + return; + } + gtk_drag_remove_icon (info); if (widget) - gtk_widget_ref (widget); + g_object_ref (widget); info->icon_window = widget; info->hot_x = hot_x; @@ -2802,7 +3116,7 @@ gtk_drag_set_icon_window (GdkDragContext *context, * * Changes the icon for a widget to a given widget. GTK+ * will not destroy the icon, so if you don't want - * it to persist, you should connect to the "drag_end" + * it to persist, you should connect to the "drag-end" * signal and destroy it yourself. **/ void @@ -2828,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) @@ -2861,12 +3176,13 @@ set_icon_stock_pixbuf (GdkDragContext *context, /* Push a NULL colormap to guard against gtk_widget_push_colormap() */ gtk_widget_push_colormap (NULL); window = gtk_window_new (GTK_WINDOW_POPUP); + gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DND); gtk_window_set_screen (GTK_WINDOW (window), screen); set_can_change_screen (window, TRUE); gtk_widget_pop_colormap (); gtk_widget_set_events (window, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); - gtk_widget_set_app_paintable (GTK_WIDGET (window), TRUE); + gtk_widget_set_app_paintable (window, TRUE); if (stock_id) { @@ -2969,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 + * @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. * @@ -3006,6 +3322,7 @@ gtk_drag_set_icon_pixmap (GdkDragContext *context, gtk_widget_push_colormap (colormap); window = gtk_window_new (GTK_WINDOW_POPUP); + gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DND); gtk_window_set_screen (GTK_WINDOW (window), screen); set_can_change_screen (window, FALSE); gtk_widget_set_events (window, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); @@ -3016,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); @@ -3086,68 +3404,14 @@ gtk_drag_set_icon_name (GdkDragContext *context, * icon. **/ void -gtk_drag_set_icon_default (GdkDragContext *context) +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. - * This function is obsolete. The default icon should now be changed - * via the stock system by changing the stock pixbuf for #GTK_STOCK_DND. - **/ -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 @@ -3210,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; } @@ -3224,7 +3490,7 @@ _gtk_drag_source_handle_event (GtkWidget *widget, break; case GDK_DROP_FINISHED: - gtk_drag_drop_finished (info, TRUE, event->dnd.time); + gtk_drag_drop_finished (info, GTK_DRAG_RESULT_SUCCESS, event->dnd.time); break; default: g_assert_not_reached (); @@ -3304,9 +3570,12 @@ gtk_drag_source_check_selection (GtkDragSourceInfo *info, static void gtk_drag_drop_finished (GtkDragSourceInfo *info, - gboolean success, + GtkDragResult result, guint time) { + gboolean success; + + success = (result == GTK_DRAG_RESULT_SUCCESS); gtk_drag_source_release_selections (info, time); if (info->proxy_dest) @@ -3318,6 +3587,10 @@ gtk_drag_drop_finished (GtkDragSourceInfo *info, } else { + if (!success) + g_signal_emit_by_name (info->widget, "drag-failed", + info->context, result, &success); + if (success) { gtk_drag_source_info_destroy (info); @@ -3344,7 +3617,7 @@ gtk_drag_drop_finished (GtkDragSourceInfo *info, * to respond really late, we still are OK. */ gtk_drag_clear_source_info (info->context); - g_timeout_add (ANIM_STEP_TIME, gtk_drag_anim_timeout, anim); + gdk_threads_add_timeout (ANIM_STEP_TIME, gtk_drag_anim_timeout, anim); } } } @@ -3359,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; @@ -3403,18 +3676,18 @@ gtk_drag_drop (GtkDragSourceInfo *info, selection_data.data = NULL; selection_data.length = -1; - g_signal_emit_by_name (info->widget, "drag_data_get", + g_signal_emit_by_name (info->widget, "drag-data-get", info->context, &selection_data, pair->info, time); /* FIXME: Should we check for length >= 0 here? */ - gtk_drag_drop_finished (info, TRUE, time); + gtk_drag_drop_finished (info, GTK_DRAG_RESULT_SUCCESS, time); return; } tmp_list = tmp_list->next; } - gtk_drag_drop_finished (info, FALSE, time); + gtk_drag_drop_finished (info, GTK_DRAG_RESULT_NO_TARGET, time); } else { @@ -3422,7 +3695,7 @@ gtk_drag_drop (GtkDragSourceInfo *info, gtk_widget_hide (info->icon_window); gdk_drag_drop (info->context, time); - info->drop_timeout = g_timeout_add (DROP_ABORT_TIME, + info->drop_timeout = gdk_threads_add_timeout (DROP_ABORT_TIME, gtk_drag_abort_timeout, info); } @@ -3521,16 +3794,16 @@ gtk_drag_selection_get (GtkWidget *widget, { case TARGET_DELETE: g_signal_emit_by_name (info->widget, - "drag_data_delete", + "drag-data-delete", info->context); gtk_selection_data_set (selection_data, null_atom, 8, NULL, 0); break; case TARGET_MOTIF_SUCCESS: - gtk_drag_drop_finished (info, TRUE, time); + gtk_drag_drop_finished (info, GTK_DRAG_RESULT_SUCCESS, time); gtk_selection_data_set (selection_data, null_atom, 8, NULL, 0); break; case TARGET_MOTIF_FAILURE: - gtk_drag_drop_finished (info, FALSE, time); + gtk_drag_drop_finished (info, GTK_DRAG_RESULT_NO_TARGET, time); gtk_selection_data_set (selection_data, null_atom, 8, NULL, 0); break; default: @@ -3553,7 +3826,7 @@ gtk_drag_selection_get (GtkWidget *widget, selection_data->target, &target_info)) { - g_signal_emit_by_name (info->widget, "drag_data_get", + g_signal_emit_by_name (info->widget, "drag-data-get", info->context, selection_data, target_info, @@ -3571,8 +3844,6 @@ gtk_drag_anim_timeout (gpointer data) gint x, y; gboolean retval; - GDK_THREADS_ENTER (); - if (anim->step == anim->n_steps) { gtk_drag_source_info_destroy (anim->info); @@ -3602,8 +3873,6 @@ gtk_drag_anim_timeout (gpointer data) retval = TRUE; } - GDK_THREADS_LEAVE (); - return retval; } @@ -3644,19 +3913,17 @@ gtk_drag_source_info_destroy (GtkDragSourceInfo *info) gtk_drag_remove_icon (info); if (info->icon_pixbuf) - g_object_unref (info->icon_pixbuf); - - if (!info->proxy_dest) - g_signal_emit_by_name (info->widget, "drag_end", - info->context); - - if (info->widget) - g_object_unref (info->widget); - + { + g_object_unref (info->icon_pixbuf); + info->icon_pixbuf = NULL; + } g_signal_handlers_disconnect_by_func (info->ipc_widget, gtk_drag_grab_broken_event_cb, info); + g_signal_handlers_disconnect_by_func (info->ipc_widget, + gtk_drag_grab_notify_cb, + info); g_signal_handlers_disconnect_by_func (info->ipc_widget, gtk_drag_button_release_cb, info); @@ -3670,6 +3937,12 @@ gtk_drag_source_info_destroy (GtkDragSourceInfo *info) gtk_drag_selection_get, info); + if (!info->proxy_dest) + g_signal_emit_by_name (info->widget, "drag-end", info->context); + + if (info->widget) + g_object_unref (info->widget); + gtk_selection_remove_all (info->ipc_widget); g_object_set_data (G_OBJECT (info->ipc_widget), I_("gtk-info"), NULL); source_widgets = g_slist_remove (source_widgets, info->ipc_widget); @@ -3683,6 +3956,9 @@ gtk_drag_source_info_destroy (GtkDragSourceInfo *info) if (info->drop_timeout) g_source_remove (info->drop_timeout); + if (info->update_idle) + g_source_remove (info->update_idle); + g_free (info); } @@ -3698,8 +3974,6 @@ gtk_drag_update_idle (gpointer data) GdkDragAction possible_actions; guint32 time; - GDK_THREADS_ENTER (); - info->update_idle = 0; if (info->last_event) @@ -3711,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); @@ -3733,19 +4007,17 @@ gtk_drag_update_idle (gpointer data) } - GDK_THREADS_LEAVE (); - return FALSE; } static void gtk_drag_add_update_idle (GtkDragSourceInfo *info) { - /* We use an idle lowerthan GDK_PRIORITY_REDRAW so that exposes + /* We use an idle lower than GDK_PRIORITY_REDRAW so that exposes * from the last move can catch up before we move again. */ if (!info->update_idle) - info->update_idle = g_idle_add_full (GDK_PRIORITY_REDRAW + 5, + info->update_idle = gdk_threads_add_idle_full (GDK_PRIORITY_REDRAW + 5, gtk_drag_update_idle, info, NULL); @@ -3798,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) { @@ -3814,13 +4093,12 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time) info->have_grab = FALSE; - gdk_display_pointer_ungrab (display, time); - gdk_display_keyboard_ungrab (display, time); - gtk_grab_remove (info->ipc_widget); - g_signal_handlers_disconnect_by_func (info->ipc_widget, gtk_drag_grab_broken_event_cb, info); + g_signal_handlers_disconnect_by_func (info->ipc_widget, + gtk_drag_grab_notify_cb, + info); g_signal_handlers_disconnect_by_func (info->ipc_widget, gtk_drag_button_release_cb, info); @@ -3831,6 +4109,10 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time) gtk_drag_key_cb, info); + 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 * call gtk_propagate_event() here, instead of @@ -3847,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; @@ -3866,16 +4148,16 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time) *************************************************************/ static void -gtk_drag_cancel (GtkDragSourceInfo *info, guint32 time) +gtk_drag_cancel (GtkDragSourceInfo *info, GtkDragResult result, guint32 time) { gtk_drag_end (info, time); gdk_drag_abort (info->context, time); - gtk_drag_drop_finished (info, FALSE, time); + gtk_drag_drop_finished (info, result, time); } /************************************************************* * gtk_drag_motion_cb: - * "motion_notify_event" callback during drag. + * "motion-notify-event" callback during drag. * arguments: * * results: @@ -3893,22 +4175,23 @@ 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; } /************************************************************* * gtk_drag_key_cb: - * "key_press/release_event" callback during drag. + * "key-press/release-event" callback during drag. * arguments: * * results: @@ -3925,21 +4208,24 @@ 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) { switch (event->keyval) { case GDK_Escape: - gtk_drag_cancel (info, event->time); + gtk_drag_cancel (info, GTK_DRAG_RESULT_USER_CANCELLED, event->time); return TRUE; case GDK_space: case GDK_Return: + case GDK_ISO_Enter: case GDK_KP_Enter: case GDK_KP_Space: gtk_drag_end (info, event->time); @@ -3976,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); @@ -4005,17 +4291,38 @@ 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_get_current_event_time ()); + gtk_drag_cancel (info, GTK_DRAG_RESULT_GRAB_BROKEN, gtk_get_current_event_time ()); return TRUE; } +static void +gtk_drag_grab_notify_cb (GtkWidget *widget, + gboolean was_grabbed, + gpointer data) +{ + GtkDragSourceInfo *info = (GtkDragSourceInfo *)data; + GdkDevice *pointer; + + 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) */ + g_signal_handlers_block_by_func (widget, gtk_drag_grab_notify_cb, data); + gtk_drag_cancel (info, GTK_DRAG_RESULT_GRAB_BROKEN, gtk_get_current_event_time ()); + g_signal_handlers_unblock_by_func (widget, gtk_drag_grab_notify_cb, data); + } +} + + /************************************************************* * gtk_drag_button_release_cb: - * "button_release_event" callback during drag. + * "button-release-event" callback during drag. * arguments: * * results: @@ -4038,7 +4345,7 @@ gtk_drag_button_release_cb (GtkWidget *widget, } else { - gtk_drag_cancel (info, event->time); + gtk_drag_cancel (info, GTK_DRAG_RESULT_NO_TARGET, event->time); } return TRUE; @@ -4050,15 +4357,11 @@ gtk_drag_abort_timeout (gpointer data) GtkDragSourceInfo *info = data; guint32 time = GDK_CURRENT_TIME; - GDK_THREADS_ENTER (); - if (info->proxy_dest) time = info->proxy_dest->proxy_drop_time; info->drop_timeout = 0; - gtk_drag_drop_finished (info, FALSE, time); - - GDK_THREADS_LEAVE (); + gtk_drag_drop_finished (info, GTK_DRAG_RESULT_TIMEOUT_EXPIRED, time); return FALSE; } @@ -4095,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"