X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b5d569973c2bf329a666c38e1612ca836695576..50259962667c5c7485fee30e602f2fe551efaf6f:/src/gtk1/dnd.cpp?ds=inline diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index cd2143caa4..34f533e5c7 100644 --- a/src/gtk1/dnd.cpp +++ b/src/gtk1/dnd.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dnd.cpp +// Name: src/gtk1/dnd.cpp // Purpose: wxDropTarget class // Author: Robert Roebling // Id: $Id$ @@ -7,26 +7,28 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dnd.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" -#if wxUSE_DRAG_AND_DROP +#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 -#include "wx/window.h" -#include "wx/app.h" -#include "wx/gdicmn.h" -#include "wx/intl.h" -#include "wx/utils.h" +#include "wx/gtk1/private.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" -#include "gdk/gdkprivate.h" +#include -#include "gtk/gtkdnd.h" -#include "gtk/gtkselection.h" +#include +#include //----------------------------------------------------------------------------- // idle system @@ -40,8 +42,6 @@ extern bool g_isIdle; //----------------------------------------------------------------------------- #if wxUSE_THREADS -extern void wxapp_install_thread_wakeup(); -extern void wxapp_uninstall_thread_wakeup(); #endif //---------------------------------------------------------------------------- @@ -50,60 +50,125 @@ extern void wxapp_uninstall_thread_wakeup(); extern bool g_blockEventsOnDrag; +// the flags used for the last DoDragDrop() +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"); + //---------------------------------------------------------------------------- // standard icons //---------------------------------------------------------------------------- -/* XPM */ -static 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", +/* Copyright (c) Julian Smart */ +static const char * page_xpm[] = { +/* 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<<<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 ); } +} // ---------------------------------------------------------------------------- // "drag_motion" // ---------------------------------------------------------------------------- +extern "C" { static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), GdkDragContext *context, gint x, @@ -147,8 +214,46 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), this is only valid for the duration of this call */ drop_target->SetDragContext( context ); - wxDragResult result = wxDragMove; - if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy; + // 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 (drop_target->GetDefaultAction() == wxDragNone) + { + // use default action set by wxDropSource::DoDragDrop() + if ( (gs_flagsForDrag & wxDrag_DefaultMove) == wxDrag_DefaultMove && + (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) ) + { + // we're requested to move but we can't + result = wxDragCopy; + } + } + } + else if (drop_target->GetDefaultAction() == wxDragMove && + (context->actions & GDK_ACTION_MOVE)) + { + result = wxDragMove; + } + 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) { @@ -161,11 +266,17 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), result = drop_target->OnDragOver( x, y, result ); } - bool ret = result != wxDragNone; + bool ret = wxIsDragResultOk( result ); if (ret) { - GdkDragAction action = GDK_ACTION_MOVE; - if (result == wxDragCopy) action = GDK_ACTION_COPY; + GdkDragAction action; + if (result == wxDragCopy) + action = GDK_ACTION_COPY; + else if (result == wxDragLink) + action = GDK_ACTION_LINK; + else + action = GDK_ACTION_MOVE; + gdk_drag_status( context, action, time ); } @@ -173,15 +284,17 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), drop_target->SetDragContext( (GdkDragContext*) 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; } +} // ---------------------------------------------------------------------------- // "drag_drop" // ---------------------------------------------------------------------------- +extern "C" { static gboolean target_drag_drop( GtkWidget *widget, GdkDragContext *context, gint x, @@ -219,12 +332,17 @@ static gboolean target_drag_drop( GtkWidget *widget, if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy; */ + /* 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; + bool ret = drop_target->OnDrop( x, y ); if (!ret) { - wxLogDebug( wxT( "Drop target: OnDrop returned TRUE") ); - + wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") ); + /* cancel the whole thing */ gtk_drag_finish( context, FALSE, /* no success */ @@ -233,20 +351,21 @@ static gboolean target_drag_drop( GtkWidget *widget, } else { - wxLogDebug( wxT( "Drop target: OnDrop returned TRUE") ); - + wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned TRUE") ); + #if wxUSE_THREADS /* disable GUI threads */ - wxapp_uninstall_thread_wakeup(); #endif GdkAtom format = drop_target->GetMatchingPair(); - wxASSERT( format ); - + + // this does happen somehow, see bug 555111 + wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") ); + /* GdkDragAction action = GDK_ACTION_MOVE; - if (result == wxDragCopy) action == GDK_ACTION_COPY; - context->action = action; + if (result == wxDragCopy) action == GDK_ACTION_COPY; + context->action = action; */ /* this should trigger an "drag_data_received" event */ gtk_drag_get_data( widget, @@ -256,7 +375,6 @@ static gboolean target_drag_drop( GtkWidget *widget, #if wxUSE_THREADS /* re-enable GUI threads */ - wxapp_install_thread_wakeup(); #endif } @@ -267,15 +385,17 @@ static gboolean target_drag_drop( GtkWidget *widget, drop_target->SetDragWidget( (GtkWidget*) 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, @@ -290,7 +410,6 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), /* Owen Taylor: "call gtk_drag_finish() with success == TRUE" */ - if ((data->length <= 0) || (data->format != 8)) { /* negative data length and non 8-bit data format @@ -300,39 +419,42 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), return; } - wxLogDebug( wxT( "Drop target: data received event") ); - + wxLogTrace(TRACE_DND, wxT( "Drop target: data received event") ); + /* inform the wxDropTarget about the current GtkSelectionData. this is only valid for the duration of this call */ drop_target->SetDragData( data ); - if (drop_target->OnData( x, y )) + wxDragResult result = ConvertFromGTK(context->action); + + if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) ) { - wxLogDebug( wxT( "Drop target: OnData returned TRUE") ); - - /* tell GTK that data transfer was successfull */ + wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned TRUE") ); + + /* tell GTK that data transfer was successful */ gtk_drag_finish( context, TRUE, FALSE, time ); } else { - wxLogDebug( wxT( "Drop target: OnData returned FALSE") ); - - /* tell GTK that data transfer was not successfull */ + wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") ); + + /* 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 ); } +} //---------------------------------------------------------------------------- // wxDropTarget //---------------------------------------------------------------------------- -wxDropTarget::wxDropTarget( wxDataObject *data ) - : wxDropTargetBase( data ) +wxDropTarget::wxDropTarget( wxDataObject *data ) + : wxDropTargetBase( data ) { - m_firstMotion = TRUE; + m_firstMotion = true; m_dragContext = (GdkDragContext*) NULL; m_dragWidget = (GtkWidget*) NULL; m_dragData = (GtkSelectionData*) NULL; @@ -343,7 +465,7 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult def ) { - // GetMatchingPair() checks for m_dataObject too, no need to do it here + // 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 @@ -357,39 +479,40 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x), bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) { if (!m_dataObject) - return FALSE; - + return false; + return (GetMatchingPair() != (GdkAtom) 0); } -bool wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) +wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), + wxDragResult def ) { if (!m_dataObject) - return FALSE; - + return wxDragNone; + if (GetMatchingPair() == (GdkAtom) 0) - return FALSE; - - return GetData(); + return wxDragNone; + + return GetData() ? def : wxDragNone; } GdkAtom wxDropTarget::GetMatchingPair() { - if (!m_dataObject) + if (!m_dataObject) return (GdkAtom) 0; - if (!m_dragContext) + if (!m_dragContext) return (GdkAtom) 0; GList *child = m_dragContext->targets; while (child) { - GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data); + GdkAtom formatAtom = GPOINTER_TO_INT(child->data); wxDataFormat format( formatAtom ); #ifdef __WXDEBUG__ - char *name = gdk_atom_name( formatAtom ); - wxLogDebug("Drop target: drag has format: %s", name ? name : "unnamed"); + wxLogTrace(TRACE_DND, wxT("Drop target: drag has format: %s"), + format.GetId().c_str()); #endif // Debug if (m_dataObject->IsSupportedFormat( format )) @@ -403,34 +526,20 @@ GdkAtom wxDropTarget::GetMatchingPair() bool wxDropTarget::GetData() { - if (!m_dragData) - return FALSE; + if (!m_dragData) + return false; - if (!m_dataObject) - return FALSE; + if (!m_dataObject) + return false; wxDataFormat dragFormat( m_dragData->target ); - - if (!m_dataObject->IsSupportedFormat( dragFormat )) - return FALSE; - if (dragFormat.GetType() == wxDF_TEXT) - { - wxTextDataObject *text_object = (wxTextDataObject*)m_dataObject; - text_object->SetText( (const char*)m_dragData->data ); - return TRUE; - } - - if (dragFormat.GetType() == wxDF_FILENAME) - { - wxFileDataObject *file_object = (wxFileDataObject*)m_dataObject; - file_object->SetData( 0, (const char*)m_dragData->data ); - return TRUE; - } + if (!m_dataObject->IsSupportedFormat( dragFormat )) + return false; m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data ); - return TRUE; + return true; } void wxDropTarget::UnregisterWidget( GtkWidget *widget ) @@ -485,48 +594,14 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); } -// ---------------------------------------------------------------------------- -// wxTextDropTarget -// ---------------------------------------------------------------------------- - -wxTextDropTarget::wxTextDropTarget() - : wxDropTarget(new wxTextDataObject) -{ -} - -bool wxTextDropTarget::OnData(wxCoord x, wxCoord y) -{ - if ( !GetData() ) - return FALSE; - - return OnDropText(x, y, ((wxTextDataObject *)m_dataObject)->GetText()); -} - -// ---------------------------------------------------------------------------- -// wxFileDropTarget -// ---------------------------------------------------------------------------- - -wxFileDropTarget::wxFileDropTarget() - : wxDropTarget(new wxFileDataObject) -{ -} - -bool wxFileDropTarget::OnData(wxCoord x, wxCoord y) -{ - if ( !GetData() ) - return FALSE; - - return OnDropFiles(x, y, - ((wxFileDataObject *)m_dataObject)->GetFilenames()); -} - //---------------------------------------------------------------------------- // "drag_data_get" //---------------------------------------------------------------------------- +extern "C" { static void source_drag_data_get (GtkWidget *WXUNUSED(widget), - GdkDragContext *context, + GdkDragContext *WXUNUSED(context), GtkSelectionData *selection_data, guint WXUNUSED(info), guint WXUNUSED(time), @@ -535,37 +610,38 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), if (g_isIdle) wxapp_install_idle_handler(); wxDataFormat format( selection_data->target ); - - wxLogDebug( wxT("Drop source: format requested: %s"), format.GetId().c_str() ); + + wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"), + format.GetId().c_str()); drop_source->m_retValue = wxDragCancel; - + wxDataObject *data = drop_source->GetDataObject(); - + if (!data) { - wxLogDebug( wxT("Drop source: no data object") ); + wxLogTrace(TRACE_DND, wxT("Drop source: no data object") ); return; } if (!data->IsSupportedFormat(format)) { - wxLogDebug( wxT("Drop source: unsupported format") ); + wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") ); return; } if (data->GetDataSize(format) == 0) { - wxLogDebug( wxT("Drop source: empty data") ); + wxLogTrace(TRACE_DND, wxT("Drop source: empty data") ); return; } - + size_t size = data->GetDataSize(format); // printf( "data size: %d.\n", (int)data_size ); guchar *d = new guchar[size]; - + if (!data->GetDataHere( format, (void*)d )) { delete[] d; @@ -574,137 +650,169 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), #if wxUSE_THREADS /* disable GUI threads */ - wxapp_uninstall_thread_wakeup(); #endif - gtk_selection_data_set( selection_data, - selection_data->target, - 8, // 8-bit - d, - size ); + gtk_selection_data_set( selection_data, + selection_data->target, + 8, // 8-bit + d, + size ); #if wxUSE_THREADS /* enable GUI threads */ - wxapp_install_thread_wakeup(); #endif delete[] d; - - /* so far only copy, no moves. TODO. */ - drop_source->m_retValue = wxDragCopy; +} } //---------------------------------------------------------------------------- // "drag_data_delete" //---------------------------------------------------------------------------- -static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), - GdkDragContext *WXUNUSED(context), - wxDropSource *drop_source ) +extern "C" { +static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), + GdkDragContext *context, + wxDropSource *WXUNUSED(drop_source) ) { - if (g_isIdle) wxapp_install_idle_handler(); - -// printf( "Delete the data!\n" ); + if (g_isIdle) + wxapp_install_idle_handler(); - drop_source->m_retValue = wxDragMove; + // printf( "Drag source: drag_data_delete\n" ); +} } //---------------------------------------------------------------------------- // "drag_begin" //---------------------------------------------------------------------------- +extern "C" { static void source_drag_begin( GtkWidget *WXUNUSED(widget), GdkDragContext *WXUNUSED(context), wxDropSource *WXUNUSED(drop_source) ) { - if (g_isIdle) wxapp_install_idle_handler(); + if (g_isIdle) + wxapp_install_idle_handler(); -// printf( "drag_begin.\n" ); + // 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_end.\n" ); + // printf( "Drag source: drag_end.\n" ); - drop_source->m_waiting = FALSE; + drop_source->m_waiting = false; +} } //----------------------------------------------------------------------------- // "configure_event" from m_iconWindow //----------------------------------------------------------------------------- -static gint +extern "C" { +static gint gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source ) { - if (g_isIdle) + if (g_isIdle) wxapp_install_idle_handler(); - wxDragResult action = wxDragNone; - if (source->m_dragContext->action == GDK_ACTION_COPY) action = wxDragCopy; - if (source->m_dragContext->action == GDK_ACTION_MOVE) action = wxDragMove; + source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) ); - source->GiveFeedback( action, FALSE ); - return 0; } +} //--------------------------------------------------------------------------- // wxDropSource //--------------------------------------------------------------------------- -wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon ) +wxDropSource::wxDropSource(wxWindow *win, + const wxIcon &iconCopy, + const wxIcon &iconMove, + const wxIcon &iconNone) { - g_blockEventsOnDrag = TRUE; - m_waiting = TRUE; + m_waiting = true; m_iconWindow = (GtkWidget*) NULL; - + m_window = win; m_widget = win->m_widget; if (win->m_wxwindow) m_widget = win->m_wxwindow; m_retValue = wxDragCancel; - m_icon = icon; - if (wxNullIcon == icon) m_icon = wxIcon( page_xpm ); + SetIcons(iconCopy, iconMove, iconNone); } -wxDropSource::wxDropSource( wxDataObject& data, wxWindow *win, const wxIcon &icon ) +wxDropSource::wxDropSource(wxDataObject& data, + wxWindow *win, + const wxIcon &iconCopy, + const wxIcon &iconMove, + const wxIcon &iconNone) { - m_waiting = TRUE; - + m_waiting = true; + SetData( data ); m_iconWindow = (GtkWidget*) NULL; - + m_window = win; m_widget = win->m_widget; if (win->m_wxwindow) m_widget = win->m_wxwindow; - + m_retValue = wxDragCancel; - m_icon = icon; - if (wxNullIcon == icon) m_icon = wxIcon( page_xpm ); + SetIcons(iconCopy, iconMove, iconNone); +} + +void wxDropSource::SetIcons(const wxIcon &iconCopy, + const wxIcon &iconMove, + const wxIcon &iconNone) +{ + m_iconCopy = iconCopy; + m_iconMove = iconMove; + m_iconNone = iconNone; + + if ( !m_iconCopy.Ok() ) + m_iconCopy = wxIcon(page_xpm); + if ( !m_iconMove.Ok() ) + m_iconMove = m_iconCopy; + if ( !m_iconNone.Ok() ) + m_iconNone = m_iconCopy; } wxDropSource::~wxDropSource() { - g_blockEventsOnDrag = FALSE; } -void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context ) +void wxDropSource::PrepareIcon( int action, GdkDragContext *context ) { - GdkBitmap *mask = (GdkBitmap *) NULL; - if (m_icon.GetMask()) mask = m_icon.GetMask()->GetBitmap(); - GdkPixmap *pixmap = m_icon.GetPixmap(); + // get the right icon to display + wxIcon *icon = NULL; + if ( action & GDK_ACTION_MOVE ) + icon = &m_iconMove; + else if ( action & GDK_ACTION_COPY ) + icon = &m_iconCopy; + else + icon = &m_iconNone; + + GdkBitmap *mask; + if ( icon->GetMask() ) + mask = icon->GetMask()->GetBitmap(); + else + mask = (GdkBitmap *)NULL; + + GdkPixmap *pixmap = icon->GetPixmap(); gint width,height; gdk_window_get_size (pixmap, &width, &height); @@ -725,39 +833,40 @@ void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context ) gtk_signal_connect( GTK_OBJECT(m_iconWindow), "configure_event", GTK_SIGNAL_FUNC(gtk_dnd_window_configure_callback), (gpointer)this ); - + gdk_window_set_back_pixmap (m_iconWindow->window, pixmap, FALSE); - + if (mask) gtk_widget_shape_combine_mask (m_iconWindow, mask, 0, 0); - gtk_drag_set_icon_widget( context, m_iconWindow, hot_x, hot_y ); + gtk_drag_set_icon_widget( context, m_iconWindow, 0, 0 ); } -wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) +wxDragResult wxDropSource::DoDragDrop(int flags) { - wxASSERT_MSG( m_data, wxT("wxDragSource: no data") ); + wxCHECK_MSG( m_data && m_data->GetFormatCount(), wxDragNone, + wxT("Drop source: no data") ); - if (!m_data) - return (wxDragResult) wxDragNone; + // still in drag + if (g_blockEventsOnDrag) + return wxDragNone; - if (m_data->GetFormatCount() == 0) - return (wxDragResult) wxDragNone; - - g_blockEventsOnDrag = TRUE; + // disabled for now + g_blockEventsOnDrag = true; RegisterWindow(); - m_waiting = TRUE; + m_waiting = true; GtkTargetList *target_list = gtk_target_list_new( (GtkTargetEntry*) NULL, 0 ); - + wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ]; m_data->GetAllFormats( array ); - for (size_t i = 0; i < m_data->GetFormatCount(); i++) + size_t count = m_data->GetFormatCount(); + for (size_t i = 0; i < count; i++) { GdkAtom atom = array[i]; - wxLogDebug( wxT("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; @@ -771,7 +880,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) event.x = x; event.y = y; event.state = state; - event.time = GDK_CURRENT_TIME; + event.time = (guint32)GDK_CURRENT_TIME; /* GTK wants to know which button was pressed which caused the dragging */ int button_number = 0; @@ -781,31 +890,43 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) #if wxUSE_THREADS /* disable GUI threads */ - wxapp_uninstall_thread_wakeup(); #endif /* 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; + GdkDragContext *context = gtk_drag_begin( m_widget, - target_list, - (GdkDragAction)(GDK_ACTION_COPY|GDK_ACTION_MOVE), - button_number, /* number of mouse button which started drag */ - (GdkEvent*) &event ); - - m_dragContext = context; - - PrepareIcon( 0, 0, context ); - - while (m_waiting) gtk_main_iteration();; + target_list, + (GdkDragAction)action, + button_number, /* number of mouse button which started drag */ + (GdkEvent*) &event ); + + m_dragContext = context; + + PrepareIcon( action, context ); + + while (m_waiting) + gtk_main_iteration(); + + m_retValue = ConvertFromGTK(context->action); + if ( m_retValue == wxDragNone ) + m_retValue = wxDragCancel; } #if wxUSE_THREADS /* re-enable GUI threads */ - wxapp_install_thread_wakeup(); #endif - g_blockEventsOnDrag = FALSE; + g_blockEventsOnDrag = false; UnregisterWindow(); @@ -842,5 +963,4 @@ void wxDropSource::UnregisterWindow() } #endif - // wxUSE_DRAG_AND_DROP