// standard icons
//----------------------------------------------------------------------------
-/* XPM */
-static char * gv_xpm[] = {
-"40 34 3 1",
-" s None c None",
-". c black",
-"X c white",
-" ",
-" ",
-" ...... ",
-" ..XXXXXX.. ",
-" .XXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXX. ",
-" .XXX..XXXX..XXX. ",
-" ....XX....XX....XX. ",
-" .XXX.XXX..XXXX..XXX.... ",
-" .XXXXXXXXXXXXXXXXXXX.XXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXXXXX. ",
-" ..XXXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXX... ",
-" ..XXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXXXXXXXXX. ",
-" .XXXXXXXXXXXXXX.XXXXXXX. ",
-" .XXXXXXX.XXXXXXX.XXXXXXX. ",
-" .XXXXXXXX.XXXXXXX.XXXXXXX. ",
-" .XXXXXXX...XXXXX...XXXXX. ",
-" .XXXXXXX. ..... ..... ",
-" ..XXXX.. ",
-" .... ",
-" ",
-" ",
-" "};
-
/* XPM */
static char * page_xpm[] = {
/* width height ncolors chars_per_pixel */
this is only valid for the duration of this call */
drop_target->SetDragContext( context );
- bool ret = FALSE;
+ wxDragResult result;
+ if ( context->suggested_action == GDK_ACTION_COPY )
+ result = wxDragCopy;
+ else
+ result = wxDragMove;
if (drop_target->m_firstMotion)
{
/* the first "drag_motion" event substitutes a "drag_enter" event */
- ret = drop_target->OnEnter( x, y );
+ result = drop_target->OnEnter( x, y, result );
}
else
{
/* give program a chance to react (i.e. to say no by returning FALSE) */
- ret = drop_target->OnMove( x, y );
+ result = drop_target->OnDragOver( x, y, result );
}
- /* we don't yet handle which "actions" (i.e. copy or move)
- the target accepts. so far we simply accept the
- suggested action. TODO. */
+ bool ret = wxIsDragResultOk( result );
if (ret)
- gdk_drag_status( context, context->suggested_action, time );
+ {
+ GdkDragAction action;
+ if (result == wxDragCopy)
+ action = GDK_ACTION_COPY;
+ else
+ action = GDK_ACTION_MOVE;
+
+ gdk_drag_status( context, action, time );
+ }
/* after this, invalidate the drop_target's GdkDragContext */
drop_target->SetDragContext( (GdkDragContext*) NULL );
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;
+*/
+
bool ret = drop_target->OnDrop( x, y );
if (!ret)
{
wxLogDebug( wxT( "Drop target: OnDrop returned TRUE") );
-
+
/* cancel the whole thing */
gtk_drag_finish( context,
FALSE, /* no success */
else
{
wxLogDebug( wxT( "Drop target: OnDrop returned TRUE") );
-
+
#if wxUSE_THREADS
/* disable GUI threads */
wxapp_uninstall_thread_wakeup();
#endif
GdkAtom format = drop_target->GetMatchingPair();
- wxASSERT( format );
-
+ wxASSERT( 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,
/* 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
}
wxLogDebug( 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;
+ if ( context->suggested_action == GDK_ACTION_COPY )
+ result = wxDragCopy;
+ else
+ result = wxDragMove;
+
+ if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
{
wxLogDebug( 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") );
-
+
/* tell GTK that data transfer was not successfull */
gtk_drag_finish( context, FALSE, FALSE, time );
}
// wxDropTarget
//----------------------------------------------------------------------------
-wxDropTarget::wxDropTarget( wxDataObject *data )
- : wxDropTargetBase( data )
+wxDropTarget::wxDropTarget( wxDataObject *data )
+ : wxDropTargetBase( data )
{
m_firstMotion = TRUE;
m_dragContext = (GdkDragContext*) NULL;
m_dragTime = 0;
}
-bool wxDropTarget::OnEnter( int WXUNUSED(x), int WXUNUSED(y) )
+wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
+ wxCoord WXUNUSED(y),
+ wxDragResult def )
{
- if (!m_dataObject)
- return FALSE;
-
- return (GetMatchingPair() != (GdkAtom) 0);
-}
+ // GetMatchingPair() checks for m_dataObject too, no need to do it here
-bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
-{
- if (!m_dataObject)
- return FALSE;
-
- return (GetMatchingPair() != (GdkAtom) 0);
+ // 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;
}
-bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
+bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
{
if (!m_dataObject)
return FALSE;
-
+
return (GetMatchingPair() != (GdkAtom) 0);
}
-bool wxDropTarget::OnData( int WXUNUSED(x), int 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);
- wxDataFormat format( formatAtom );
+ wxDataFormat format( formatAtom );
#ifdef __WXDEBUG__
- char *name = gdk_atom_name( formatAtom );
- if (name) wxLogDebug( "Drop target: drag has format: %s", name );
-#endif
+ wxLogDebug("Drop target: drag has format: %s", format.GetId().c_str() );
+#endif // Debug
+
if (m_dataObject->IsSupportedFormat( format ))
- return formatAtom;
+ return formatAtom;
child = child->next;
}
bool wxDropTarget::GetData()
{
- if (!m_dragData)
+ if (!m_dragData)
return FALSE;
- if (!m_dataObject)
+ if (!m_dataObject)
return FALSE;
wxDataFormat dragFormat( m_dragData->target );
-
+
if (!m_dataObject->IsSupportedFormat( dragFormat ))
return FALSE;
{
wxTextDataObject *text_object = (wxTextDataObject*)m_dataObject;
text_object->SetText( (const char*)m_dragData->data );
- return TRUE;
+ return TRUE;
}
if (dragFormat.GetType() == wxDF_FILENAME)
{
wxFileDataObject *file_object = (wxFileDataObject*)m_dataObject;
file_object->SetData( 0, (const char*)m_dragData->data );
- return TRUE;
+ return TRUE;
}
m_dataObject->SetData( dragFormat, (size_t)m_dragData->length, (const void*)m_dragData->data );
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"
//----------------------------------------------------------------------------
if (g_isIdle) wxapp_install_idle_handler();
wxDataFormat format( selection_data->target );
-
+
wxLogDebug( 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") );
- return;
+ return;
}
if (!data->IsSupportedFormat(format))
{
wxLogDebug( wxT("Drop source: unsupported format") );
- return;
+ return;
}
if (data->GetDataSize(format) == 0)
{
wxLogDebug( wxT("Drop source: empty data") );
- return;
+ 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;
- return;
+ return;
}
#if wxUSE_THREADS
#endif
delete[] d;
-
+
/* so far only copy, no moves. TODO. */
drop_source->m_retValue = wxDragCopy;
}
drop_source->m_waiting = FALSE;
}
+//-----------------------------------------------------------------------------
+// "configure_event" from m_iconWindow
+//-----------------------------------------------------------------------------
+
+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 );
+
+ return 0;
+}
+
//---------------------------------------------------------------------------
// wxDropSource
//---------------------------------------------------------------------------
-wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop )
+wxDropSource::wxDropSource( wxWindow *win, const wxIcon &icon )
{
g_blockEventsOnDrag = 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_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
- m_goaheadCursor = wxCursor( wxCURSOR_HAND );
-
- m_goIcon = go;
- if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
- m_stopIcon = stop;
- if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
+ m_icon = icon;
+ if (wxNullIcon == icon) m_icon = wxIcon( page_xpm );
}
-wxDropSource::wxDropSource( wxDataObject& data, wxWindow *win,
- const wxIcon &go, const wxIcon &stop )
+wxDropSource::wxDropSource( wxDataObject& data, wxWindow *win, const wxIcon &icon )
{
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_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY );
- m_goaheadCursor = wxCursor( wxCURSOR_HAND );
+ m_retValue = wxDragCancel;
- m_goIcon = go;
- if (wxNullIcon == go) m_goIcon = wxIcon( page_xpm );
- m_stopIcon = stop;
- if (wxNullIcon == stop) m_stopIcon = wxIcon( gv_xpm );
+ m_icon = icon;
+ if (wxNullIcon == icon) m_icon = wxIcon( page_xpm );
}
wxDropSource::~wxDropSource()
g_blockEventsOnDrag = FALSE;
}
+void wxDropSource::PrepareIcon( int hot_x, int hot_y, GdkDragContext *context )
+{
+ GdkBitmap *mask = (GdkBitmap *) NULL;
+ if (m_icon.GetMask()) mask = m_icon.GetMask()->GetBitmap();
+ GdkPixmap *pixmap = m_icon.GetPixmap();
+
+ gint width,height;
+ gdk_window_get_size (pixmap, &width, &height);
+
+ GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
+ gtk_widget_push_visual (gdk_colormap_get_visual (colormap));
+ 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_pop_visual ();
+ gtk_widget_pop_colormap ();
+
+ gtk_widget_set_usize (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 );
+
+ 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 );
+}
+
wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) )
{
wxASSERT_MSG( m_data, wxT("wxDragSource: no data") );
- if (!m_data)
+ if (!m_data)
return (wxDragResult) wxDragNone;
- if (m_data->GetFormatCount() == 0)
+ if (m_data->GetFormatCount() == 0)
return (wxDragResult) wxDragNone;
-
+
g_blockEventsOnDrag = TRUE;
RegisterWindow();
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++)
{
GdkAtom atom = array[i];
- wxLogDebug( wxT("Supported atom %s"), gdk_atom_name( atom ) );
+ wxLogDebug( wxT("Supported atom %s"), gdk_atom_name( atom ) );
gtk_target_list_add( target_list, atom, 0, 0 );
}
delete[] array;
{
GdkDragContext *context = gtk_drag_begin( m_widget,
target_list,
- GDK_ACTION_COPY,
+ (GdkDragAction)(GDK_ACTION_COPY|GDK_ACTION_MOVE),
button_number, /* number of mouse button which started drag */
(GdkEvent*) &event );
- wxMask *mask = m_goIcon.GetMask();
- GdkBitmap *bm = (GdkBitmap *) NULL;
- if (mask) bm = mask->GetBitmap();
- GdkPixmap *pm = m_goIcon.GetPixmap();
-
- gtk_drag_set_icon_pixmap( context,
- gtk_widget_get_colormap( m_widget ),
- pm,
- bm,
- 0,
- 0 );
+ m_dragContext = context;
+
+ PrepareIcon( 0, 0, context );
while (m_waiting) gtk_main_iteration();;
}
projects / wxWidgets.git / blobdiff