From 806bb8853080267dba2a69e8620cd1e55270b698 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 15 May 2002 22:26:45 +0000 Subject: [PATCH] Don't call gdk_pointer_grab() to change the cursor if we've already Wed May 15 18:15:45 2002 Owen Taylor * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't call gdk_pointer_grab() to change the cursor if we've already ungrabbed on button release / escape. (#80420, Dave Camp) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkdnd.c | 8 +++++++- 7 files changed, 49 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0392fcfc44..48903f9e3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed May 15 18:15:45 2002 Owen Taylor + + * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't + call gdk_pointer_grab() to change the cursor if we've + already ungrabbed on button release / escape. + (#80420, Dave Camp) + Wed May 15 17:12:50 2002 Owen Taylor * gtk/gtktooltips.c: Special case menu items to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0392fcfc44..48903f9e3c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed May 15 18:15:45 2002 Owen Taylor + + * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't + call gdk_pointer_grab() to change the cursor if we've + already ungrabbed on button release / escape. + (#80420, Dave Camp) + Wed May 15 17:12:50 2002 Owen Taylor * gtk/gtktooltips.c: Special case menu items to diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0392fcfc44..48903f9e3c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Wed May 15 18:15:45 2002 Owen Taylor + + * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't + call gdk_pointer_grab() to change the cursor if we've + already ungrabbed on button release / escape. + (#80420, Dave Camp) + Wed May 15 17:12:50 2002 Owen Taylor * gtk/gtktooltips.c: Special case menu items to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0392fcfc44..48903f9e3c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Wed May 15 18:15:45 2002 Owen Taylor + + * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't + call gdk_pointer_grab() to change the cursor if we've + already ungrabbed on button release / escape. + (#80420, Dave Camp) + Wed May 15 17:12:50 2002 Owen Taylor * gtk/gtktooltips.c: Special case menu items to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0392fcfc44..48903f9e3c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed May 15 18:15:45 2002 Owen Taylor + + * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't + call gdk_pointer_grab() to change the cursor if we've + already ungrabbed on button release / escape. + (#80420, Dave Camp) + Wed May 15 17:12:50 2002 Owen Taylor * gtk/gtktooltips.c: Special case menu items to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0392fcfc44..48903f9e3c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed May 15 18:15:45 2002 Owen Taylor + + * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't + call gdk_pointer_grab() to change the cursor if we've + already ungrabbed on button release / escape. + (#80420, Dave Camp) + Wed May 15 17:12:50 2002 Owen Taylor * gtk/gtktooltips.c: Special case menu items to diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index ca209fade0..d67fef4e15 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -102,6 +102,8 @@ struct _GtkDragSourceInfo guint drop_timeout; /* Timeout for aborting drop */ guint destroy_icon : 1; /* If true, destroy icon_window */ + guint have_grab : 1; /* Do we still have the pointer grab + */ }; struct _GtkDragDestSite @@ -1879,6 +1881,8 @@ gtk_drag_begin (GtkWidget *widget, } } + info->have_grab = TRUE; + return info->context; } @@ -2431,7 +2435,7 @@ _gtk_drag_source_handle_event (GtkWidget *widget, } } } - else + else if (info->have_grab) { cursor = gtk_drag_get_cursor (event->dnd.context->action); if (info->cursor != cursor) @@ -2989,6 +2993,8 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time) GdkEvent send_event; GtkWidget *source_widget = info->widget; + info->have_grab = FALSE; + gdk_pointer_ungrab (time); gdk_keyboard_ungrab (time);