X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46c87a9a8a037a1b0edeed5f1bfd7917a31aa509..222702b112dcc7bebe018d6f4d66fe469fefd02c:/src/gtk/dnd.cpp diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index a95bf1c889..dcb0b56c32 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -7,12 +7,17 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dnd.h" #endif -#include "wx/dnd.h" +// 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" @@ -21,8 +26,8 @@ #include "wx/intl.h" #include "wx/utils.h" -#include -#include +#include "wx/gtk/private.h" + #include #include @@ -40,8 +45,6 @@ extern bool g_isIdle; //----------------------------------------------------------------------------- #if wxUSE_THREADS -extern void wxapp_install_thread_wakeup(); -extern void wxapp_uninstall_thread_wakeup(); #endif //---------------------------------------------------------------------------- @@ -50,6 +53,9 @@ 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) @@ -59,56 +65,113 @@ 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<<<SetDragContext( (GdkDragContext*) NULL ); } +} // ---------------------------------------------------------------------------- // "drag_motion" // ---------------------------------------------------------------------------- +extern "C" { static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), GdkDragContext *context, gint x, @@ -152,11 +217,46 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), 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 ( context->suggested_action == GDK_ACTION_COPY ) - result = wxDragCopy; - else + 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) { @@ -175,6 +275,8 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), GdkDragAction action; if (result == wxDragCopy) action = GDK_ACTION_COPY; + else if (result == wxDragLink) + action = GDK_ACTION_LINK; else action = GDK_ACTION_MOVE; @@ -189,11 +291,13 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), return ret; } +} // ---------------------------------------------------------------------------- // "drag_drop" // ---------------------------------------------------------------------------- +extern "C" { static gboolean target_drag_drop( GtkWidget *widget, GdkDragContext *context, gint x, @@ -254,11 +358,12 @@ static gboolean target_drag_drop( GtkWidget *widget, #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; @@ -273,7 +378,6 @@ static gboolean target_drag_drop( GtkWidget *widget, #if wxUSE_THREADS /* re-enable GUI threads */ - wxapp_install_thread_wakeup(); #endif } @@ -288,11 +392,13 @@ static gboolean target_drag_drop( GtkWidget *widget, return ret; } +} // ---------------------------------------------------------------------------- // "drag_data_received" // ---------------------------------------------------------------------------- +extern "C" { static void target_drag_data_received( GtkWidget *WXUNUSED(widget), GdkDragContext *context, gint x, @@ -322,30 +428,27 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), this is only valid for the duration of this call */ drop_target->SetDragData( data ); - wxDragResult result; - if ( context->suggested_action == GDK_ACTION_COPY ) - result = wxDragCopy; - else - result = wxDragMove; + wxDragResult result = ConvertFromGTK(context->action); if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) ) { 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 ); } +} //---------------------------------------------------------------------------- // wxDropTarget @@ -498,6 +601,7 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) // "drag_data_get" //---------------------------------------------------------------------------- +extern "C" { static void source_drag_data_get (GtkWidget *WXUNUSED(widget), GdkDragContext *WXUNUSED(context), @@ -549,7 +653,6 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), #if wxUSE_THREADS /* disable GUI threads */ - wxapp_uninstall_thread_wakeup(); #endif gtk_selection_data_set( selection_data, @@ -560,16 +663,17 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), #if wxUSE_THREADS /* enable GUI threads */ - wxapp_install_thread_wakeup(); #endif delete[] d; } +} //---------------------------------------------------------------------------- // "drag_data_delete" //---------------------------------------------------------------------------- +extern "C" { static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), GdkDragContext *context, wxDropSource *WXUNUSED(drop_source) ) @@ -579,11 +683,13 @@ static void source_drag_data_delete( GtkWidget *WXUNUSED(widget), // 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) ) @@ -593,11 +699,13 @@ static void source_drag_begin( GtkWidget *WXUNUSED(widget), // printf( "Drag source: drag_begin.\n" ); } +} //---------------------------------------------------------------------------- // "drag_end" //---------------------------------------------------------------------------- +extern "C" { static void source_drag_end( GtkWidget *WXUNUSED(widget), GdkDragContext *WXUNUSED(context), wxDropSource *drop_source ) @@ -608,25 +716,24 @@ static void source_drag_end( GtkWidget *WXUNUSED(widget), 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(); - 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( action ); + source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) ); return 0; } +} //--------------------------------------------------------------------------- // wxDropSource @@ -742,19 +849,14 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context ) gtk_drag_set_icon_widget( context, m_iconWindow, 0, 0 ); } -wxDragResult wxDropSource::DoDragDrop( bool allowMove ) +wxDragResult wxDropSource::DoDragDrop(int flags) { - wxASSERT_MSG( m_data, wxT("Drop source: no data") ); - - if (!m_data) - return (wxDragResult) wxDragNone; - - if (m_data->GetFormatCount() == 0) - return (wxDragResult) wxDragNone; + wxCHECK_MSG( m_data && m_data->GetFormatCount(), wxDragNone, + wxT("Drop source: no data") ); // still in drag if (g_blockEventsOnDrag) - return (wxDragResult) wxDragNone; + return wxDragNone; // disabled for now g_blockEventsOnDrag = TRUE; @@ -767,7 +869,8 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove ) 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]; wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom )); @@ -794,15 +897,20 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove ) #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 ( allowMove ) + 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)action, @@ -813,17 +921,16 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove ) PrepareIcon( action, context ); - while (m_waiting) gtk_main_iteration(); + while (m_waiting) + gtk_main_iteration(); - if (context->action == GDK_ACTION_COPY) - m_retValue = wxDragCopy; - if (context->action == GDK_ACTION_MOVE) - m_retValue = wxDragMove; + 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;