X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/974e8d946f30af2bd79b9029d1d2fb9e0d5b2dd4..d275c7eb8420c81e97a8b308c60c27d9856b58f9:/src/gtk/dnd.cpp diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index fdd1f25e8f..a95bf1c889 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -8,7 +8,7 @@ /////////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "dnd.h" + #pragma implementation "dnd.h" #endif #include "wx/dnd.h" @@ -21,12 +21,12 @@ #include "wx/intl.h" #include "wx/utils.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" -#include "gdk/gdkprivate.h" +#include +#include +#include -#include "gtk/gtkdnd.h" -#include "gtk/gtkselection.h" +#include +#include //----------------------------------------------------------------------------- // idle system @@ -50,6 +50,11 @@ extern void wxapp_uninstall_thread_wakeup(); extern bool g_blockEventsOnDrag; +// 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 //---------------------------------------------------------------------------- @@ -226,11 +231,16 @@ 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, @@ -240,7 +250,7 @@ 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 */ @@ -306,7 +316,7 @@ 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 */ @@ -320,14 +330,14 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget), if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) ) { - wxLogDebug( wxT( "Drop target: OnData returned TRUE") ); + wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned TRUE") ); /* tell GTK that data transfer was successfull */ gtk_drag_finish( context, TRUE, FALSE, time ); } else { - wxLogDebug( wxT( "Drop target: OnData returned FALSE") ); + wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") ); /* tell GTK that data transfer was not successfull */ gtk_drag_finish( context, FALSE, FALSE, time ); @@ -401,7 +411,8 @@ GdkAtom wxDropTarget::GetMatchingPair() wxDataFormat format( formatAtom ); #ifdef __WXDEBUG__ - wxLogDebug("Drop target: drag has format: %s", format.GetId().c_str() ); + wxLogTrace(TRACE_DND, wxT("Drop target: drag has format: %s"), + format.GetId().c_str()); #endif // Debug if (m_dataObject->IsSupportedFormat( format )) @@ -426,20 +437,6 @@ bool wxDropTarget::GetData() 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; - } - m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data ); return TRUE; @@ -503,7 +500,7 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) static void source_drag_data_get (GtkWidget *WXUNUSED(widget), - GdkDragContext *context, + GdkDragContext *WXUNUSED(context), GtkSelectionData *selection_data, guint WXUNUSED(info), guint WXUNUSED(time), @@ -513,7 +510,8 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), 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; @@ -521,19 +519,19 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), 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; } @@ -566,24 +564,20 @@ source_drag_data_get (GtkWidget *WXUNUSED(widget), #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 ) +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" ); } //---------------------------------------------------------------------------- @@ -594,9 +588,10 @@ 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" ); } //---------------------------------------------------------------------------- @@ -609,7 +604,7 @@ static void source_drag_end( GtkWidget *WXUNUSED(widget), { if (g_isIdle) wxapp_install_idle_handler(); -// printf( "drag_end.\n" ); + // printf( "Drag source: drag_end.\n" ); drop_source->m_waiting = FALSE; } @@ -637,9 +632,11 @@ gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigur // 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_iconWindow = (GtkWidget*) NULL; @@ -650,11 +647,14 @@ wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon ) 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; @@ -668,33 +668,64 @@ wxDropSource::wxDropSource( wxDataObject& data, wxWindow *win, const wxIcon &ico 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); 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); +#ifndef __WXGTK20__ gtk_widget_pop_visual (); +#endif gtk_widget_pop_colormap (); gtk_widget_set_usize (m_iconWindow, width, height); @@ -708,12 +739,12 @@ void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context ) 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( bool allowMove ) { - wxASSERT_MSG( m_data, wxT("wxDragSource: no data") ); + wxASSERT_MSG( m_data, wxT("Drop source: no data") ); if (!m_data) return (wxDragResult) wxDragNone; @@ -721,6 +752,11 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) if (m_data->GetFormatCount() == 0) return (wxDragResult) wxDragNone; + // still in drag + if (g_blockEventsOnDrag) + return (wxDragResult) wxDragNone; + + // disabled for now g_blockEventsOnDrag = TRUE; RegisterWindow(); @@ -734,7 +770,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) for (size_t i = 0; i < m_data->GetFormatCount(); 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; @@ -748,7 +784,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; @@ -764,17 +800,25 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) /* don't start dragging if no button is down */ if (button_number) { + int action = GDK_ACTION_COPY; + if ( allowMove ) + action |= GDK_ACTION_MOVE; 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 ); + target_list, + (GdkDragAction)action, + button_number, /* number of mouse button which started drag */ + (GdkEvent*) &event ); m_dragContext = context; - PrepareIcon( 0, 0, context ); + 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; } #if wxUSE_THREADS @@ -819,5 +863,4 @@ void wxDropSource::UnregisterWindow() } #endif - // wxUSE_DRAG_AND_DROP