X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..41936464fd460f5f66db75c82672af9870e47e5f:/src/gtk/dnd.cpp diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index 3eaf282f59..c7bdf480a8 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -1,51 +1,32 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dnd.cpp +// Name: src/gtk/dnd.cpp // Purpose: wxDropTarget class // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dnd.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/dnd.h" -#include "wx/log.h" - - #if wxUSE_DRAG_AND_DROP -#include "wx/window.h" -#include "wx/app.h" -#include "wx/gdicmn.h" -#include "wx/intl.h" -#include "wx/utils.h" - -#include "wx/gtk/private.h" - -#include - -#include -#include - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +#include "wx/dnd.h" -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/window.h" + #include "wx/gdicmn.h" +#endif -//----------------------------------------------------------------------------- -// thread system -//----------------------------------------------------------------------------- +#include "wx/scopeguard.h" -#if wxUSE_THREADS -#endif +#include +#include "wx/gtk/private/gtk2-compat.h" //---------------------------------------------------------------------------- // global data @@ -59,55 +40,92 @@ static long gs_flagsForDrag = 0; // the trace mask we use with wxLogTrace() - call // wxLog::AddTraceMask(TRACE_DND) to enable the trace messages from here // (there are quite a few of them, so don't enable this by default) -static const wxChar *TRACE_DND = _T("dnd"); +#define TRACE_DND "dnd" + +// global variables because GTK+ DnD want to have the +// mouse event that caused it +extern GdkEvent *g_lastMouseEvent; +extern int g_lastButtonNumber; //---------------------------------------------------------------------------- // standard icons //---------------------------------------------------------------------------- -/* XPM */ +/* Copyright (c) Julian Smart */ static const char * page_xpm[] = { -/* width height ncolors chars_per_pixel */ -"32 32 5 1", -/* colors */ -" s None c None", -". c black", -"X c wheat", -"o c tan", -"O c #6699FF", +/* columns rows colors chars-per-pixel */ +"32 32 37 1", +"5 c #7198D9", +", c #769CDA", +"2 c #DCE6F6", +"i c #FFFFFF", +"e c #779DDB", +": c #9AB6E4", +"9 c #EAF0FA", +"- c #B1C7EB", +"$ c #6992D7", +"y c #F7F9FD", +"= c #BED0EE", +"q c #F0F5FC", +"; c #A8C0E8", +"@ c #366BC2", +" c None", +"u c #FDFEFF", +"8 c #5987D3", +"* c #C4D5F0", +"7 c #7CA0DC", +"O c #487BCE", +"< c #6B94D7", +"& c #CCDAF2", +"> c #89A9DF", +"3 c #5584D1", +"w c #82A5DE", +"1 c #3F74CB", +"+ c #3A70CA", +". c #3569BF", +"% c #D2DFF4", +"# c #3366BB", +"r c #F5F8FD", +"0 c #FAFCFE", +"4 c #DFE8F7", +"X c #5E8AD4", +"o c #5282D0", +"t c #B8CCEC", +"6 c #E5EDF9", /* pixels */ -" ................... ", -" .XXXXXXXXXXXXXXXXX.. ", -" .XXXXXXXXXXXXXXXXX.o. ", -" .XXXXXXXXXXXXXXXXX.oo. ", -" .XXXXXXXXXXXXXXXXX.ooo. ", -" .XXXXXXXXXXXXXXXXX.oooo. ", -" .XXXXXXXXXXXXXXXXX....... ", -" .XXXXXOOOOOOOOOOXXXooooo. ", -" .XXXXXXXXXXXXXXXXXXooooo. ", -" .XXXXXOOOOOOOOOOXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXOOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXOOOOOOOOOOXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXOOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXOOOOOOOOOOXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXOOOOOOOOOOXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXOOOOOOOXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXX. ", -" ......................... "}; +" ", +" ", +" ", +" ", +" ", +" .XXXooOO++@# ", +" $%&*=-;::>,<1 ", +" $2%&*=-;::><:3 ", +" $42%&*=-;::<&:3 ", +" 56477<<<<8<<9&:X ", +" 59642%&*=-;<09&:5 ", +" 5q9642%&*=-<<<<<# ", +" 5qqw777<<<<<88:>+ ", +" erqq9642%&*=t;::+ ", +" eyrqq9642%&*=t;:O ", +" eyywwww777<<<SetDragContext( context ); + drop_target->GTKSetDragContext( context ); /* we don't need return values. this event is just for information */ drop_target->OnLeave(); /* this has to be done because GDK has no "drag_enter" event */ - drop_target->m_firstMotion = TRUE; + drop_target->m_firstMotion = true; /* after this, invalidate the drop_target's GdkDragContext */ - drop_target->SetDragContext( (GdkDragContext*) NULL ); + drop_target->GTKSetDragContext( NULL ); +} } // ---------------------------------------------------------------------------- // "drag_motion" // ---------------------------------------------------------------------------- +extern "C" { static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), GdkDragContext *context, gint x, @@ -172,77 +191,76 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), guint time, wxDropTarget *drop_target ) { - if (g_isIdle) wxapp_install_idle_handler(); - /* Owen Taylor: "if the coordinates not in a drop zone, return FALSE, otherwise call gtk_drag_status() and return TRUE" */ - /* inform the wxDropTarget about the current GdkDragContext. - this is only valid for the duration of this call */ - drop_target->SetDragContext( context ); - - // 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 result; - if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove && - (context->actions & GDK_ACTION_MOVE ) ) +#if 0 + wxPrintf( "motion\n" ); + GList *tmp_list; + for (tmp_list = context->targets; tmp_list; tmp_list = tmp_list->next) { - // move is requested by the program and allowed by GTK+ - do it, even - // though suggested_action may be currently wxDragCopy - result = wxDragMove; + wxString atom = wxString::FromAscii( gdk_atom_name (GDK_POINTER_TO_ATOM (tmp_list->data)) ); + wxPrintf( "Atom: %s\n", atom ); } - else // use whatever GTK+ says we should - { - result = ConvertFromGTK(context->suggested_action); +#endif - if ( (result == wxDragMove) && !(gs_flagsForDrag & wxDrag_AllowMove) ) - { - // we're requested to move but we can't - result = wxDragCopy; - } + // Inform the wxDropTarget about the current GdkDragContext. + // This is only valid for the duration of this call. + drop_target->GTKSetDragContext( context ); + + // Does the source actually accept the data type? + if (drop_target->GTKGetMatchingPair() == (GdkAtom) 0) + { + drop_target->GTKSetDragContext( NULL ); + return FALSE; } + wxDragResult suggested_action = drop_target->GTKFigureOutSuggestedAction(); + + wxDragResult result = wxDragNone; + if (drop_target->m_firstMotion) { - /* the first "drag_motion" event substitutes a "drag_enter" event */ - result = drop_target->OnEnter( x, y, result ); + // the first "drag_motion" event substitutes a "drag_enter" event + result = drop_target->OnEnter( x, y, suggested_action ); } else { - /* give program a chance to react (i.e. to say no by returning FALSE) */ - result = drop_target->OnDragOver( x, y, result ); + // give program a chance to react (i.e. to say no by returning FALSE) + result = drop_target->OnDragOver( x, y, suggested_action ); } - bool ret = wxIsDragResultOk( result ); - if (ret) - { - GdkDragAction action; - if (result == wxDragCopy) - action = GDK_ACTION_COPY; - else if (result == wxDragLink) - action = GDK_ACTION_LINK; - else - action = GDK_ACTION_MOVE; + GdkDragAction result_action = GDK_ACTION_DEFAULT; + if (result == wxDragCopy) + result_action = GDK_ACTION_COPY; + else if (result == wxDragLink) + result_action = GDK_ACTION_LINK; + else + 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 */ - drop_target->SetDragContext( (GdkDragContext*) NULL ); + if (ret) + gdk_drag_status( context, result_action, time ); - /* this has to be done because GDK has no "drag_enter" event */ - drop_target->m_firstMotion = FALSE; + // 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; return ret; } +} // ---------------------------------------------------------------------------- // "drag_drop" // ---------------------------------------------------------------------------- +extern "C" { static gboolean target_drag_drop( GtkWidget *widget, GdkDragContext *context, gint x, @@ -250,40 +268,43 @@ static gboolean target_drag_drop( GtkWidget *widget, guint time, wxDropTarget *drop_target ) { - if (g_isIdle) wxapp_install_idle_handler(); - /* Owen Taylor: "if the drop is not in a drop zone, return FALSE, otherwise, if you aren't accepting the drop, call gtk_drag_finish() with success == FALSE otherwise call gtk_drag_data_get()" */ -// printf( "drop.\n" ); - - /* 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. this is only valid for the duration of this call */ - drop_target->SetDragContext( 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. this is only valid for the duration of this call */ - drop_target->SetDragWidget( widget ); + drop_target->GTKSetDragWidget( widget ); /* inform the wxDropTarget about the current drag time. this is only valid for the duration of this call */ - drop_target->SetDragTime( time ); - -/* - wxDragResult result = wxDragMove; - if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy; -*/ + drop_target->GTKSetDragTime( time ); /* reset the block here as someone might very well show a dialog as a reaction to a drop and this wouldn't work without events */ - g_blockEventsOnDrag = FALSE; + g_blockEventsOnDrag = false; bool ret = drop_target->OnDrop( x, y ); @@ -299,49 +320,38 @@ static gboolean target_drag_drop( GtkWidget *widget, } else { - wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned TRUE") ); + wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") ); -#if wxUSE_THREADS - /* disable GUI threads */ -#endif - - GdkAtom format = drop_target->GetMatchingPair(); + GdkAtom format = drop_target->GTKGetMatchingPair(); // this does happen somehow, see bug 555111 - wxCHECK_MSG( format, FALSE, _T("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 */ gtk_drag_get_data( widget, context, format, time ); - -#if wxUSE_THREADS - /* re-enable GUI threads */ -#endif } /* after this, invalidate the drop_target's GdkDragContext */ - drop_target->SetDragContext( (GdkDragContext*) NULL ); + drop_target->GTKSetDragContext( NULL ); /* after this, invalidate the drop_target's drag widget */ - drop_target->SetDragWidget( (GtkWidget*) NULL ); + drop_target->GTKSetDragWidget( NULL ); /* this has to be done because GDK has no "drag_enter" event */ - drop_target->m_firstMotion = TRUE; + drop_target->m_firstMotion = true; return ret; } +} // ---------------------------------------------------------------------------- // "drag_data_received" // ---------------------------------------------------------------------------- +extern "C" { static void target_drag_data_received( GtkWidget *WXUNUSED(widget), GdkDragContext *context, gint x, @@ -351,12 +361,10 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), guint time, wxDropTarget *drop_target ) { - if (g_isIdle) wxapp_install_idle_handler(); - /* Owen Taylor: "call gtk_drag_finish() with success == TRUE" */ - if ((data->length <= 0) || (data->format != 8)) + if (gtk_selection_data_get_length(data) <= 0 || gtk_selection_data_get_format(data) != 8) { /* negative data length and non 8-bit data format qualifies for junk */ @@ -369,27 +377,28 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), /* inform the wxDropTarget about the current GtkSelectionData. this is only valid for the duration of this call */ - drop_target->SetDragData( data ); + drop_target->GTKSetDragData( data ); - wxDragResult result = ConvertFromGTK(context->suggested_action); + wxDragResult result = ConvertFromGTK(context->action); if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) ) { - wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned TRUE") ); + wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned true") ); - /* tell GTK that data transfer was successfull */ + /* tell GTK that data transfer was successful */ gtk_drag_finish( context, TRUE, FALSE, time ); } else { wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") ); - /* tell GTK that data transfer was not successfull */ + /* tell GTK that data transfer was not successful */ gtk_drag_finish( context, FALSE, FALSE, time ); } /* after this, invalidate the drop_target's drag data */ - drop_target->SetDragData( (GtkSelectionData*) NULL ); + drop_target->GTKSetDragData( NULL ); +} } //---------------------------------------------------------------------------- @@ -399,10 +408,10 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), wxDropTarget::wxDropTarget( wxDataObject *data ) : wxDropTargetBase( data ) { - m_firstMotion = TRUE; - m_dragContext = (GdkDragContext*) NULL; - m_dragWidget = (GtkWidget*) NULL; - m_dragData = (GtkSelectionData*) NULL; + m_firstMotion = true; + m_dragContext = NULL; + m_dragWidget = NULL; + m_dragData = NULL; m_dragTime = 0; } @@ -410,38 +419,85 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult def ) { - // GetMatchingPair() checks for m_dataObject too, no need to do it here - - // disable the debug message from GetMatchingPair() - there are too many - // of them otherwise -#ifdef __WXDEBUG__ - wxLogNull noLog; -#endif // Debug - - return (GetMatchingPair() != (GdkAtom) 0) ? def : wxDragNone; + return def; } bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) { - if (!m_dataObject) - return FALSE; - - return (GetMatchingPair() != (GdkAtom) 0); + return true; } wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult def ) { - if (!m_dataObject) - return wxDragNone; + return GetData() ? def : wxDragNone; +} - if (GetMatchingPair() == (GdkAtom) 0) - return wxDragNone; +wxDragResult wxDropTarget::GTKFigureOutSuggestedAction() +{ + if (!m_dragContext) + return wxDragError; - return GetData() ? def : wxDragNone; + // 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() +{ + return wxDataFormat( GTKGetMatchingPair() ); } -GdkAtom wxDropTarget::GetMatchingPair() +GdkAtom wxDropTarget::GTKGetMatchingPair(bool quiet) { if (!m_dataObject) return (GdkAtom) 0; @@ -452,13 +508,14 @@ GdkAtom wxDropTarget::GetMatchingPair() GList *child = m_dragContext->targets; while (child) { - GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data); + GdkAtom formatAtom = (GdkAtom)(child->data); wxDataFormat format( formatAtom ); -#ifdef __WXDEBUG__ - wxLogTrace(TRACE_DND, wxT("Drop target: drag has format: %s"), - format.GetId().c_str()); -#endif // Debug + if ( !quiet ) + { + wxLogTrace(TRACE_DND, wxT("Drop target: drag has format: %s"), + format.GetId().c_str()); + } if (m_dataObject->IsSupportedFormat( format )) return formatAtom; @@ -472,41 +529,40 @@ GdkAtom wxDropTarget::GetMatchingPair() bool wxDropTarget::GetData() { if (!m_dragData) - return FALSE; + return false; if (!m_dataObject) - return FALSE; + return false; - wxDataFormat dragFormat( m_dragData->target ); + wxDataFormat dragFormat(gtk_selection_data_get_target(m_dragData)); if (!m_dataObject->IsSupportedFormat( dragFormat )) - return FALSE; + return false; - m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data ); + m_dataObject->SetData(dragFormat, + (size_t)gtk_selection_data_get_length(m_dragData), + (const void*)gtk_selection_data_get_data(m_dragData)); - return TRUE; + return true; } -void wxDropTarget::UnregisterWidget( GtkWidget *widget ) +void wxDropTarget::GtkUnregisterWidget( GtkWidget *widget ) { wxCHECK_RET( widget != NULL, wxT("unregister widget is NULL") ); gtk_drag_dest_unset( widget ); - gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this ); - - gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); - - gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); - - gtk_signal_disconnect_by_func( GTK_OBJECT(widget), - GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); + g_signal_handlers_disconnect_by_func (widget, + (gpointer) target_drag_leave, this); + g_signal_handlers_disconnect_by_func (widget, + (gpointer) target_drag_motion, this); + g_signal_handlers_disconnect_by_func (widget, + (gpointer) target_drag_drop, this); + g_signal_handlers_disconnect_by_func (widget, + (gpointer) target_drag_data_received, this); } -void wxDropTarget::RegisterWidget( GtkWidget *widget ) +void wxDropTarget::GtkRegisterWidget( GtkWidget *widget ) { wxCHECK_RET( widget != NULL, wxT("register widget is NULL") ); @@ -522,43 +578,42 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) gtk_drag_dest_set( widget, (GtkDestDefaults) 0, /* no default behaviour */ - (GtkTargetEntry*) NULL, /* we don't supply any formats here */ + NULL, /* we don't supply any formats here */ 0, /* number of targets = 0 */ (GdkDragAction) 0 ); /* we don't supply any actions here */ - gtk_signal_connect( GTK_OBJECT(widget), "drag_leave", - GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this ); + g_signal_connect (widget, "drag_leave", + G_CALLBACK (target_drag_leave), this); - gtk_signal_connect( GTK_OBJECT(widget), "drag_motion", - GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); + g_signal_connect (widget, "drag_motion", + G_CALLBACK (target_drag_motion), this); - gtk_signal_connect( GTK_OBJECT(widget), "drag_drop", - GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); + g_signal_connect (widget, "drag_drop", + G_CALLBACK (target_drag_drop), this); - gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received", - GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); + g_signal_connect (widget, "drag_data_received", + G_CALLBACK (target_drag_data_received), this); } //---------------------------------------------------------------------------- // "drag_data_get" //---------------------------------------------------------------------------- +extern "C" { static void source_drag_data_get (GtkWidget *WXUNUSED(widget), - GdkDragContext *WXUNUSED(context), + GdkDragContext *context, GtkSelectionData *selection_data, guint WXUNUSED(info), guint WXUNUSED(time), wxDropSource *drop_source ) { - if (g_isIdle) wxapp_install_idle_handler(); - - wxDataFormat format( selection_data->target ); + wxDataFormat format(gtk_selection_data_get_target(selection_data)); wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"), format.GetId().c_str()); - drop_source->m_retValue = wxDragCancel; + drop_source->m_retValue = wxDragError; wxDataObject *data = drop_source->GetDataObject(); @@ -592,80 +647,44 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), return; } -#if wxUSE_THREADS - /* disable GUI threads */ -#endif + drop_source->m_retValue = ConvertFromGTK( context->action ); - gtk_selection_data_set( selection_data, - selection_data->target, - 8, // 8-bit - d, - size ); - -#if wxUSE_THREADS - /* enable GUI threads */ -#endif + gtk_selection_data_set( selection_data, + gtk_selection_data_get_target(selection_data), + 8, // 8-bit + d, + size ); delete[] d; } - -//---------------------------------------------------------------------------- -// "drag_data_delete" -//---------------------------------------------------------------------------- - -static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), - GdkDragContext *context, - wxDropSource *WXUNUSED(drop_source) ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - // printf( "Drag source: drag_data_delete\n" ); -} - -//---------------------------------------------------------------------------- -// "drag_begin" -//---------------------------------------------------------------------------- - -static void source_drag_begin( GtkWidget *WXUNUSED(widget), - GdkDragContext *WXUNUSED(context), - wxDropSource *WXUNUSED(drop_source) ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - // printf( "Drag source: drag_begin.\n" ); } //---------------------------------------------------------------------------- // "drag_end" //---------------------------------------------------------------------------- +extern "C" { static void source_drag_end( GtkWidget *WXUNUSED(widget), GdkDragContext *WXUNUSED(context), wxDropSource *drop_source ) { - if (g_isIdle) wxapp_install_idle_handler(); - - // printf( "Drag source: drag_end.\n" ); - - drop_source->m_waiting = FALSE; + drop_source->m_waiting = false; +} } //----------------------------------------------------------------------------- // "configure_event" from m_iconWindow //----------------------------------------------------------------------------- +extern "C" { static gint gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source ) { - if (g_isIdle) - wxapp_install_idle_handler(); - source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) ); return 0; } +} //--------------------------------------------------------------------------- // wxDropSource @@ -676,15 +695,15 @@ wxDropSource::wxDropSource(wxWindow *win, const wxIcon &iconMove, const wxIcon &iconNone) { - m_waiting = TRUE; + m_waiting = true; - m_iconWindow = (GtkWidget*) NULL; + m_iconWindow = NULL; m_window = win; m_widget = win->m_widget; if (win->m_wxwindow) m_widget = win->m_wxwindow; - m_retValue = wxDragCancel; + m_retValue = wxDragNone; SetIcons(iconCopy, iconMove, iconNone); } @@ -695,17 +714,17 @@ wxDropSource::wxDropSource(wxDataObject& data, const wxIcon &iconMove, const wxIcon &iconNone) { - m_waiting = TRUE; + m_waiting = true; SetData( data ); - m_iconWindow = (GtkWidget*) NULL; + m_iconWindow = NULL; m_window = win; m_widget = win->m_widget; if (win->m_wxwindow) m_widget = win->m_wxwindow; - m_retValue = wxDragCancel; + m_retValue = wxDragNone; SetIcons(iconCopy, iconMove, iconNone); } @@ -718,11 +737,11 @@ void wxDropSource::SetIcons(const wxIcon &iconCopy, m_iconMove = iconMove; m_iconNone = iconNone; - if ( !m_iconCopy.Ok() ) + if ( !m_iconCopy.IsOk() ) m_iconCopy = wxIcon(page_xpm); - if ( !m_iconMove.Ok() ) + if ( !m_iconMove.IsOk() ) m_iconMove = m_iconCopy; - if ( !m_iconNone.Ok() ) + if ( !m_iconNone.IsOk() ) m_iconNone = m_iconCopy; } @@ -745,35 +764,29 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context ) if ( icon->GetMask() ) mask = icon->GetMask()->GetBitmap(); else - mask = (GdkBitmap *)NULL; + mask = NULL; GdkPixmap *pixmap = icon->GetPixmap(); gint width,height; - gdk_window_get_size (pixmap, &width, &height); + gdk_drawable_get_size (pixmap, &width, &height); GdkColormap *colormap = gtk_widget_get_colormap( m_widget ); -#ifndef __WXGTK20__ - gtk_widget_push_visual (gdk_colormap_get_visual (colormap)); -#endif gtk_widget_push_colormap (colormap); m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP); gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); - gtk_widget_set_app_paintable (GTK_WIDGET (m_iconWindow), TRUE); + gtk_widget_set_app_paintable (m_iconWindow, TRUE); -#ifndef __WXGTK20__ - gtk_widget_pop_visual (); -#endif gtk_widget_pop_colormap (); - gtk_widget_set_usize (m_iconWindow, width, height); + gtk_widget_set_size_request (m_iconWindow, width, height); gtk_widget_realize (m_iconWindow); - gtk_signal_connect( GTK_OBJECT(m_iconWindow), "configure_event", - GTK_SIGNAL_FUNC(gtk_dnd_window_configure_callback), (gpointer)this ); + g_signal_connect (m_iconWindow, "configure_event", + G_CALLBACK (gtk_dnd_window_configure_callback), this); - gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE); + gdk_window_set_back_pixmap(gtk_widget_get_window(m_iconWindow), pixmap, false); if (mask) gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0); @@ -790,14 +803,20 @@ wxDragResult wxDropSource::DoDragDrop(int flags) if (g_blockEventsOnDrag) return wxDragNone; - // disabled for now - g_blockEventsOnDrag = TRUE; + // don't start dragging if no button is down + if (g_lastButtonNumber == 0) + return wxDragNone; - RegisterWindow(); + // we can only start a drag after a mouse event + if (g_lastMouseEvent == NULL) + return wxDragNone; - m_waiting = TRUE; + GTKConnectDragSignals(); + wxON_BLOCK_EXIT_OBJ0(*this, wxDropSource::GTKDisconnectDragSignals); - GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 ); + m_waiting = true; + + GtkTargetList *target_list = gtk_target_list_new( NULL, 0 ); wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ]; m_data->GetAllFormats( array ); @@ -805,100 +824,75 @@ wxDragResult wxDropSource::DoDragDrop(int flags) for (size_t i = 0; i < count; i++) { GdkAtom atom = array[i]; - wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom )); + wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), + gdk_atom_name( atom )); gtk_target_list_add( target_list, atom, 0, 0 ); } delete[] array; - GdkEventMotion event; - event.window = m_widget->window; - int x = 0; - int y = 0; - GdkModifierType state; - gdk_window_get_pointer( event.window, &x, &y, &state ); - event.x = x; - event.y = y; - event.state = state; - event.time = (guint32)GDK_CURRENT_TIME; - - /* GTK wants to know which button was pressed which caused the dragging */ - int button_number = 0; - if (event.state & GDK_BUTTON1_MASK) button_number = 1; - else if (event.state & GDK_BUTTON2_MASK) button_number = 2; - else if (event.state & GDK_BUTTON3_MASK) button_number = 3; - -#if wxUSE_THREADS - /* disable GUI threads */ -#endif + int allowed_actions = GDK_ACTION_COPY; + if ( flags & wxDrag_AllowMove ) + allowed_actions |= GDK_ACTION_MOVE; - /* don't start dragging if no button is down */ - if (button_number) - { - int action = GDK_ACTION_COPY; - if ( flags & wxDrag_AllowMove ) - action |= GDK_ACTION_MOVE; + // 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 + // surely prefer a better way to do it + gs_flagsForDrag = flags; - // 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 - // surely prefer a better way to do it - gs_flagsForDrag = flags; + m_retValue = wxDragCancel; - GdkDragContext *context = gtk_drag_begin( m_widget, + GdkDragContext *context = gtk_drag_begin( m_widget, target_list, - (GdkDragAction)action, - button_number, /* number of mouse button which started drag */ - (GdkEvent*) &event ); - - m_dragContext = context; - - PrepareIcon( action, context ); + (GdkDragAction)allowed_actions, + g_lastButtonNumber, // number of mouse button which started drag + (GdkEvent*) g_lastMouseEvent ); - while (m_waiting) - gtk_main_iteration(); - - m_retValue = ConvertFromGTK(context->action); - if ( m_retValue == wxDragNone ) - m_retValue = wxDragCancel; + if ( !context ) + { + // this can happen e.g. if gdk_pointer_grab() failed + return wxDragError; } -#if wxUSE_THREADS - /* re-enable GUI threads */ -#endif + m_dragContext = context; - g_blockEventsOnDrag = FALSE; + PrepareIcon( allowed_actions, context ); - UnregisterWindow(); + while (m_waiting) + gtk_main_iteration(); + + g_signal_handlers_disconnect_by_func (m_iconWindow, + (gpointer) gtk_dnd_window_configure_callback, this); return m_retValue; } -void wxDropSource::RegisterWindow() +void wxDropSource::GTKConnectDragSignals() { - if (!m_widget) return; + if (!m_widget) + return; - gtk_signal_connect( GTK_OBJECT(m_widget), "drag_data_get", - GTK_SIGNAL_FUNC (source_drag_data_get), (gpointer) this); - gtk_signal_connect (GTK_OBJECT(m_widget), "drag_data_delete", - GTK_SIGNAL_FUNC (source_drag_data_delete), (gpointer) this ); - gtk_signal_connect (GTK_OBJECT(m_widget), "drag_begin", - GTK_SIGNAL_FUNC (source_drag_begin), (gpointer) this ); - gtk_signal_connect (GTK_OBJECT(m_widget), "drag_end", - GTK_SIGNAL_FUNC (source_drag_end), (gpointer) this ); + g_blockEventsOnDrag = true; + + g_signal_connect (m_widget, "drag_data_get", + G_CALLBACK (source_drag_data_get), this); + g_signal_connect (m_widget, "drag_end", + G_CALLBACK (source_drag_end), this); } -void wxDropSource::UnregisterWindow() +void wxDropSource::GTKDisconnectDragSignals() { - if (!m_widget) return; - - gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), - GTK_SIGNAL_FUNC(source_drag_data_get), (gpointer) this ); - gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), - GTK_SIGNAL_FUNC(source_drag_data_delete), (gpointer) this ); - gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), - GTK_SIGNAL_FUNC(source_drag_begin), (gpointer) this ); - gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), - GTK_SIGNAL_FUNC(source_drag_end), (gpointer) this ); + if (!m_widget) + return; + + g_blockEventsOnDrag = false; + + g_signal_handlers_disconnect_by_func (m_widget, + (gpointer) source_drag_data_get, + this); + g_signal_handlers_disconnect_by_func (m_widget, + (gpointer) source_drag_end, + this); } #endif