Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do earlier and better checking for matching actions and data format, hopefully fixes #11201

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-11-15 13:39:05 +00:00
parent 36b960067d
commit 1aeae3f7d4
2 changed files with 137 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/gtk/dnd.h
View File

@@ -41,7 +41,8 @@ public:
// implementation // implementation
GdkAtom GtkGetMatchingPair(bool quiet = false); GdkAtom GTKGetMatchingPair(bool quiet = false);
wxDragResult GTKFigureOutSuggestedAction();
void GtkRegisterWidget( GtkWidget *widget ); void GtkRegisterWidget( GtkWidget *widget );
void GtkUnregisterWidget( GtkWidget *widget ); void GtkUnregisterWidget( GtkWidget *widget );
@@ -52,10 +53,10 @@ public:
guint m_dragTime; guint m_dragTime;
bool m_firstMotion; // gdk has no "gdk_drag_enter" event bool m_firstMotion; // gdk has no "gdk_drag_enter" event
void GtkSetDragContext( GdkDragContext *dc ) { m_dragContext = dc; } void GTKSetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
void GtkSetDragWidget( GtkWidget *w ) { m_dragWidget = w; } void GTKSetDragWidget( GtkWidget *w ) { m_dragWidget = w; }
void GtkSetDragData( GtkSelectionData *sd ) { m_dragData = sd; } void GTKSetDragData( GtkSelectionData *sd ) { m_dragData = sd; }
void GtkSetDragTime( guint time ) { m_dragTime = time; } void GTKSetDragTime( guint time ) { m_dragTime = time; }
}; };
//------------------------------------------------------------------------- //-------------------------------------------------------------------------

251
src/gtk/dnd.cpp
View File

@@ -164,7 +164,7 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget),
{ {
/* inform the wxDropTarget about the current GdkDragContext. /* inform the wxDropTarget about the current GdkDragContext.
this is only valid for the duration of this call */ this is only valid for the duration of this call */
drop_target->GtkSetDragContext( context ); drop_target->GTKSetDragContext( context );
/* we don't need return values. this event is just for /* we don't need return values. this event is just for
information */ information */
@@ -174,7 +174,7 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget),
drop_target->m_firstMotion = true; drop_target->m_firstMotion = true;
/* after this, invalidate the drop_target's GdkDragContext */ /* after this, invalidate the drop_target's GdkDragContext */
drop_target->GtkSetDragContext( NULL ); drop_target->GTKSetDragContext( NULL );
} }
} }
@@ -204,81 +204,51 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
} }
#endif #endif
/* inform the wxDropTarget about the current GdkDragContext. // Inform the wxDropTarget about the current GdkDragContext.
this is only valid for the duration of this call */ // This is only valid for the duration of this call.
drop_target->GtkSetDragContext( context ); drop_target->GTKSetDragContext( context );
// GTK+ always supposes that we want to copy the data by default while we // Does the source actually accept the data type?
// might want to move it, so examine not only suggested_action - which is if (drop_target->GTKGetMatchingPair() == (GdkAtom) 0)
// only good if we don't have our own preferences - but also the actions
// field
wxDragResult result;
if (drop_target->GetDefaultAction() == wxDragNone)
{ {
// use default action set by wxDropSource::DoDragDrop() drop_target->GTKSetDragContext( NULL );
if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove && return FALSE;
(context->actions & GDK_ACTION_MOVE ) )
{
// move is requested by the program and allowed by GTK+ - do it, even
// though suggested_action may be currently wxDragCopy
result = wxDragMove;
} }
else // use whatever GTK+ says we should
{
result = ConvertFromGTK(context->suggested_action);
if ( (result == wxDragMove) && !(gs_flagsForDrag & wxDrag_AllowMove) ) wxDragResult suggested_action = drop_target->GTKFigureOutSuggestedAction();
{
// we're requested to move but we can't
result = wxDragCopy;
}
}
}
else if (drop_target->GetDefaultAction() == wxDragMove &&
(context->actions & GDK_ACTION_MOVE))
{
result = wxDragMove; wxDragResult result = wxDragNone;
}
else
{
if (context->actions & GDK_ACTION_COPY)
result = wxDragCopy;
else if (context->actions & GDK_ACTION_MOVE)
result = wxDragMove;
else
result = wxDragNone;
}
if (drop_target->m_firstMotion) if (drop_target->m_firstMotion)
{ {
/* the first "drag_motion" event substitutes a "drag_enter" event */ // the first "drag_motion" event substitutes a "drag_enter" event
result = drop_target->OnEnter( x, y, result ); result = drop_target->OnEnter( x, y, suggested_action );
} }
else else
{ {
/* give program a chance to react (i.e. to say no by returning FALSE) */ // give program a chance to react (i.e. to say no by returning FALSE)
result = drop_target->OnDragOver( x, y, result ); result = drop_target->OnDragOver( x, y, suggested_action );
} }
bool ret = wxIsDragResultOk( result ); GdkDragAction result_action = GDK_ACTION_DEFAULT;
if (ret)
{
GdkDragAction action;
if (result == wxDragCopy) if (result == wxDragCopy)
action = GDK_ACTION_COPY; result_action = GDK_ACTION_COPY;
else if (result == wxDragLink) else if (result == wxDragLink)
action = GDK_ACTION_LINK; result_action = GDK_ACTION_LINK;
else else
action = GDK_ACTION_MOVE; result_action = GDK_ACTION_MOVE;
gdk_drag_status( context, action, time ); // is result action actually supported
} bool ret ((result_action != GDK_ACTION_DEFAULT) &&
(context->actions & result_action));
/* after this, invalidate the drop_target's GdkDragContext */ if (ret)
drop_target->GtkSetDragContext( NULL ); gdk_drag_status( context, result_action, time );
/* this has to be done because GDK has no "drag_enter" event */ // after this, invalidate the drop_target's GdkDragContext
drop_target->GTKSetDragContext( NULL );
// this has to be done because GDK has no "drag_enter" event
drop_target->m_firstMotion = false; drop_target->m_firstMotion = false;
return ret; return ret;
@@ -302,26 +272,33 @@ static gboolean target_drag_drop( GtkWidget *widget,
the drop, call gtk_drag_finish() with success == FALSE the drop, call gtk_drag_finish() with success == FALSE
otherwise call gtk_drag_data_get()" */ otherwise call gtk_drag_data_get()" */
/* this seems to make a difference between not accepting
due to wrong target area and due to wrong format. let
us hope that this is not required.. */
/* inform the wxDropTarget about the current GdkDragContext. /* inform the wxDropTarget about the current GdkDragContext.
this is only valid for the duration of this call */ this is only valid for the duration of this call */
drop_target->GtkSetDragContext( context ); drop_target->GTKSetDragContext( context );
// Does the source actually accept the data type?
if (drop_target->GTKGetMatchingPair() == (GdkAtom) 0)
{
// cancel the whole thing
gtk_drag_finish( context,
FALSE, // no success
FALSE, // don't delete data on dropping side
time );
drop_target->GTKSetDragContext( NULL );
drop_target->m_firstMotion = true;
return FALSE;
}
/* inform the wxDropTarget about the current drag widget. /* inform the wxDropTarget about the current drag widget.
this is only valid for the duration of this call */ this is only valid for the duration of this call */
drop_target->GtkSetDragWidget( widget ); drop_target->GTKSetDragWidget( widget );
/* inform the wxDropTarget about the current drag time. /* inform the wxDropTarget about the current drag time.
this is only valid for the duration of this call */ this is only valid for the duration of this call */
drop_target->GtkSetDragTime( time ); drop_target->GTKSetDragTime( time );
/*
wxDragResult result = wxDragMove;
if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy;
*/
/* reset the block here as someone might very well /* reset the block here as someone might very well
show a dialog as a reaction to a drop and this show a dialog as a reaction to a drop and this
@@ -344,36 +321,23 @@ static gboolean target_drag_drop( GtkWidget *widget,
{ {
wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") ); wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") );
#if wxUSE_THREADS GdkAtom format = drop_target->GTKGetMatchingPair();
/* disable GUI threads */
#endif
GdkAtom format = drop_target->GtkGetMatchingPair();
// this does happen somehow, see bug 555111 // this does happen somehow, see bug 555111
wxCHECK_MSG( format, FALSE, wxT("no matching GdkAtom for format?") ); wxCHECK_MSG( format, FALSE, wxT("no matching GdkAtom for format?") );
/*
GdkDragAction action = GDK_ACTION_MOVE;
if (result == wxDragCopy) action == GDK_ACTION_COPY;
context->action = action;
*/
/* this should trigger an "drag_data_received" event */ /* this should trigger an "drag_data_received" event */
gtk_drag_get_data( widget, gtk_drag_get_data( widget,
context, context,
format, format,
time ); time );
#if wxUSE_THREADS
/* re-enable GUI threads */
#endif
} }
/* after this, invalidate the drop_target's GdkDragContext */ /* after this, invalidate the drop_target's GdkDragContext */
drop_target->GtkSetDragContext( NULL ); drop_target->GTKSetDragContext( NULL );
/* after this, invalidate the drop_target's drag widget */ /* after this, invalidate the drop_target's drag widget */
drop_target->GtkSetDragWidget( NULL ); drop_target->GTKSetDragWidget( NULL );
/* this has to be done because GDK has no "drag_enter" event */ /* this has to be done because GDK has no "drag_enter" event */
drop_target->m_firstMotion = true; drop_target->m_firstMotion = true;
@@ -412,7 +376,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
/* inform the wxDropTarget about the current GtkSelectionData. /* inform the wxDropTarget about the current GtkSelectionData.
this is only valid for the duration of this call */ this is only valid for the duration of this call */
drop_target->GtkSetDragData( data ); drop_target->GTKSetDragData( data );
wxDragResult result = ConvertFromGTK(context->action); wxDragResult result = ConvertFromGTK(context->action);
@@ -432,7 +396,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
} }
/* after this, invalidate the drop_target's drag data */ /* after this, invalidate the drop_target's drag data */
drop_target->GtkSetDragData( NULL ); drop_target->GTKSetDragData( NULL );
} }
} }
@@ -454,40 +418,85 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
wxCoord WXUNUSED(y), wxCoord WXUNUSED(y),
wxDragResult def ) wxDragResult def )
{ {
// GetMatchingPair() checks for m_dataObject too, no need to do it here return def;
// disable the trace message from GetMatchingPair() by passing true to it
// (there are just too many of them otherwise)
return (GtkGetMatchingPair(true) != (GdkAtom) 0) ? def : wxDragNone;
} }
bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
{ {
if (!m_dataObject) return true;
return false;
return (GtkGetMatchingPair() != (GdkAtom) 0);
} }
wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
wxDragResult def ) wxDragResult def )
{ {
if (!m_dataObject)
return wxDragNone;
if (GtkGetMatchingPair() == (GdkAtom) 0)
return wxDragNone;
return GetData() ? def : wxDragNone; return GetData() ? def : wxDragNone;
} }
wxDragResult wxDropTarget::GTKFigureOutSuggestedAction()
{
if (!m_dragContext)
return wxDragError;
// GTK+ always supposes that we want to copy the data by default while we
// might want to move it, so examine not only suggested_action - which is
// only good if we don't have our own preferences - but also the actions
// field
wxDragResult suggested_action = wxDragNone;
if (GetDefaultAction() == wxDragNone)
{
// use default action set by wxDropSource::DoDragDrop()
if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove &&
(m_dragContext->actions & GDK_ACTION_MOVE ) )
{
// move is requested by the program and allowed by GTK+ - do it, even
// though suggested_action may be currently wxDragCopy
suggested_action = wxDragMove;
}
else // use whatever GTK+ says we should
{
suggested_action = ConvertFromGTK(m_dragContext->suggested_action);
#if 0
// RR: I don't understand the code below: if the drag comes from
// a different app, the gs_flagsForDrag is invalid; if it
// comes from the same wx app, then GTK+ hopefully won't
// suggest something we didn't allow in the frist place
// in DoDrop()
if ( (suggested_action == wxDragMove) && !(gs_flagsForDrag & wxDrag_AllowMove) )
{
// we're requested to move but we can't
suggested_action = wxDragCopy;
}
#endif
}
}
else if (GetDefaultAction() == wxDragMove &&
(m_dragContext->actions & GDK_ACTION_MOVE))
{
suggested_action = wxDragMove;
}
else
{
if (m_dragContext->actions & GDK_ACTION_COPY)
suggested_action = wxDragCopy;
else if (m_dragContext->actions & GDK_ACTION_MOVE)
suggested_action = wxDragMove;
else if (m_dragContext->actions & GDK_ACTION_LINK)
suggested_action = wxDragLink;
else
suggested_action = wxDragNone;
}
return suggested_action;
}
wxDataFormat wxDropTarget::GetMatchingPair() wxDataFormat wxDropTarget::GetMatchingPair()
{ {
return wxDataFormat( GtkGetMatchingPair() ); return wxDataFormat( GTKGetMatchingPair() );
} }
GdkAtom wxDropTarget::GtkGetMatchingPair(bool quiet) GdkAtom wxDropTarget::GTKGetMatchingPair(bool quiet)
{ {
if (!m_dataObject) if (!m_dataObject)
return (GdkAtom) 0; return (GdkAtom) 0;
@@ -590,7 +599,7 @@ void wxDropTarget::GtkRegisterWidget( GtkWidget *widget )
extern "C" { extern "C" {
static void static void
source_drag_data_get (GtkWidget *WXUNUSED(widget), source_drag_data_get (GtkWidget *WXUNUSED(widget),
GdkDragContext *WXUNUSED(context), GdkDragContext *context,
GtkSelectionData *selection_data, GtkSelectionData *selection_data,
guint WXUNUSED(info), guint WXUNUSED(info),
guint WXUNUSED(time), guint WXUNUSED(time),
@@ -601,7 +610,7 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget),
wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"), wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"),
format.GetId().c_str()); format.GetId().c_str());
drop_source->m_retValue = wxDragCancel; drop_source->m_retValue = wxDragError;
wxDataObject *data = drop_source->GetDataObject(); wxDataObject *data = drop_source->GetDataObject();
@@ -635,9 +644,7 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget),
return; return;
} }
#if wxUSE_THREADS drop_source->m_retValue = ConvertFromGTK( context->action );
/* disable GUI threads */
#endif
gtk_selection_data_set( selection_data, gtk_selection_data_set( selection_data,
selection_data->target, selection_data->target,
@@ -645,10 +652,6 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget),
d, d,
size ); size );
#if wxUSE_THREADS
/* enable GUI threads */
#endif
delete[] d; delete[] d;
} }
} }
@@ -662,8 +665,6 @@ static void source_drag_end( GtkWidget *WXUNUSED(widget),
GdkDragContext *WXUNUSED(context), GdkDragContext *WXUNUSED(context),
wxDropSource *drop_source ) wxDropSource *drop_source )
{ {
// printf( "Drag source: drag_end.\n" );
drop_source->m_waiting = false; drop_source->m_waiting = false;
} }
} }
@@ -699,7 +700,7 @@ wxDropSource::wxDropSource(wxWindow *win,
m_widget = win->m_widget; m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow; if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_retValue = wxDragCancel; m_retValue = wxDragNone;
SetIcons(iconCopy, iconMove, iconNone); SetIcons(iconCopy, iconMove, iconNone);
} }
@@ -720,7 +721,7 @@ wxDropSource::wxDropSource(wxDataObject& data,
m_widget = win->m_widget; m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow; if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_retValue = wxDragCancel; m_retValue = wxDragNone;
SetIcons(iconCopy, iconMove, iconNone); SetIcons(iconCopy, iconMove, iconNone);
} }
@@ -826,18 +827,20 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
} }
delete[] array; delete[] array;
int action = GDK_ACTION_COPY; int allowed_actions = GDK_ACTION_COPY;
if ( flags & wxDrag_AllowMove ) if ( flags & wxDrag_AllowMove )
action |= GDK_ACTION_MOVE; allowed_actions |= GDK_ACTION_MOVE;
// VZ: as we already use g_blockEventsOnDrag it shouldn't be that bad // VZ: as we already use g_blockEventsOnDrag it shouldn't be that bad
// to use a global to pass the flags to the drop target but I'd // to use a global to pass the flags to the drop target but I'd
// surely prefer a better way to do it // surely prefer a better way to do it
gs_flagsForDrag = flags; gs_flagsForDrag = flags;
m_retValue = wxDragCancel;
GdkDragContext *context = gtk_drag_begin( m_widget, GdkDragContext *context = gtk_drag_begin( m_widget,
target_list, target_list,
(GdkDragAction)action, (GdkDragAction)allowed_actions,
g_lastButtonNumber, // number of mouse button which started drag g_lastButtonNumber, // number of mouse button which started drag
(GdkEvent*) g_lastMouseEvent ); (GdkEvent*) g_lastMouseEvent );
@@ -849,15 +852,11 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
m_dragContext = context; m_dragContext = context;
PrepareIcon( action, context ); PrepareIcon( allowed_actions, context );
while (m_waiting) while (m_waiting)
gtk_main_iteration(); gtk_main_iteration();
m_retValue = ConvertFromGTK(context->action);
if ( m_retValue == wxDragNone )
m_retValue = wxDragCancel;
return m_retValue; return m_retValue;
} }