X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab8884aca6f480f3568167c7fe592a03e7e102b2..9d2f3c71d83c52fc4db6c8041de533562816b1d6:/src/gtk/dnd.cpp diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index 80f557def2..ff56d90299 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -27,13 +27,103 @@ #include -// ---------------------------------------------------------------------------- -// global -// ---------------------------------------------------------------------------- +//---------------------------------------------------------------------------- +// global data +//---------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; -#ifdef NEW_GTK_DND_CODE +//---------------------------------------------------------------------------- +// 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 */ +"32 32 5 1", +/* colors */ +" s None c None", +". c black", +"X c wheat", +"o c tan", +"O c #6699FF", +/* 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. ", +" ......................... "}; + + +#if (GTK_MINOR_VERSION > 0) #include "gtk/gtkdnd.h" #include "gtk/gtkselection.h" @@ -43,10 +133,13 @@ extern bool g_blockEventsOnDrag; // ---------------------------------------------------------------------------- static void target_drag_leave( GtkWidget *WXUNUSED(widget), - GdkDragContext *WXUNUSED(context), - guint WXUNUSED(time) ) + GdkDragContext *context, + guint WXUNUSED(time), + wxDropTarget *dt ) { - printf( "leave.\n" ); + dt->SetDragContext( context ); + dt->OnLeave(); + dt->SetDragContext( (GdkDragContext*) NULL ); } // ---------------------------------------------------------------------------- @@ -55,12 +148,23 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget), static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget), GdkDragContext *context, - gint WXUNUSED(x), - gint WXUNUSED(y), - guint time ) + gint x, + gint y, + guint time, + wxDropTarget *dt ) { - printf( "motion.\n" ); - gdk_drag_status( context, context->suggested_action, time ); + dt->SetDragContext( context ); + + if (dt->OnMove( x, y )) + { + gdk_drag_status( context, context->suggested_action, time ); + } + else + { + gdk_drag_status( context, (GdkDragAction)0, time ); + } + + dt->SetDragContext( (GdkDragContext*) NULL ); return TRUE; } @@ -123,355 +227,397 @@ wxDropTarget::~wxDropTarget() { } +void wxDropTarget::OnEnter() +{ +} + +void wxDropTarget::OnLeave() +{ +} + +bool wxDropTarget::OnMove( int x, int y ) +{ + printf( "generic move %d %d.\n", x, y ); + + return TRUE; +} + +bool wxDropTarget::OnDrop( int x, int y ) +{ + printf( "generic drop %d %d.\n", x, y ); + + return TRUE; +} + +bool wxDropTarget::IsSupported( wxDataFormat format ) +{ + printf( "generic is supported.\n" ); + + if (!m_dragContext) return FALSE; + + GList *child = m_dragContext->targets; + while (child) + { + GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data); + char *name = gdk_atom_name( formatAtom ); + if (name) printf( "Format available: %s.\n", name ); + + child = child->next; + } + + + return TRUE; +} + +bool wxDropTarget::GetData( wxDataObject *data ) +{ + return FALSE; +} + void wxDropTarget::UnregisterWidget( GtkWidget *widget ) { - wxCHECK_RET( widget != NULL, "unregister widget is NULL" ); + wxCHECK_RET( widget != NULL, "unregister widget is NULL" ); - gtk_drag_dest_set( widget, + gtk_drag_dest_set( widget, (GtkDestDefaults) 0, (GtkTargetEntry*) NULL, 0, (GdkDragAction) 0 ); - gtk_signal_disconnect_by_func( GTK_OBJECT(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_disconnect_by_func( GTK_OBJECT(widget), GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); - gtk_signal_disconnect_by_func( GTK_OBJECT(widget), + 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_disconnect_by_func( GTK_OBJECT(widget), GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); } void wxDropTarget::RegisterWidget( GtkWidget *widget ) { - wxCHECK_RET( widget != NULL, "register widget is NULL" ); + wxCHECK_RET( widget != NULL, "register widget is NULL" ); - GtkTargetEntry format; - format.info = 0; - format.flags = 0; - char buf[100]; + GtkTargetEntry format; + format.info = 0; + format.flags = 0; + char buf[100]; + strcpy( buf, "text/plain" ); + format.target = buf; - int valid = 0; - for ( size_t i = 0; i < GetFormatCount(); i++ ) - { - wxDataFormat df = GetFormat( i ); - switch (df) - { - case wxDF_TEXT: - format.target = "text/plain"; - valid++; - break; - case wxDF_FILENAME: - format.target = "file:ALL"; - valid++; - break; - case wxDF_PRIVATE: - wxPrivateDropTarget *pdt = (wxPrivateDropTarget *)this; - strcpy( buf, "applications/" ); - strcat( buf, WXSTRINGCAST pdt->GetID() ); - format.target = buf; - valid++; - default: - break; - } - } - - wxASSERT_MSG( valid != 0, "No valid DnD format supported." ); - - gtk_drag_dest_set( widget, + gtk_drag_dest_set( widget, GTK_DEST_DEFAULT_ALL, &format, 1, (GdkDragAction)(GDK_ACTION_COPY | GDK_ACTION_MOVE) ); - gtk_signal_connect( GTK_OBJECT(widget), "drag_leave", + gtk_signal_connect( GTK_OBJECT(widget), "drag_leave", GTK_SIGNAL_FUNC(target_drag_leave), (gpointer) this ); - gtk_signal_connect( GTK_OBJECT(widget), "drag_motion", + gtk_signal_connect( GTK_OBJECT(widget), "drag_motion", GTK_SIGNAL_FUNC(target_drag_motion), (gpointer) this ); - gtk_signal_connect( GTK_OBJECT(widget), "drag_drop", + gtk_signal_connect( GTK_OBJECT(widget), "drag_drop", GTK_SIGNAL_FUNC(target_drag_drop), (gpointer) this ); - gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received", + gtk_signal_connect( GTK_OBJECT(widget), "drag_data_received", GTK_SIGNAL_FUNC(target_drag_data_received), (gpointer) this ); } -// ---------------------------------------------------------------------------- +//------------------------------------------------------------------------- // wxTextDropTarget -// ---------------------------------------------------------------------------- +//------------------------------------------------------------------------- -bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) ) +bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) ) { - OnDropText( x, y, (const char*)data ); - return TRUE; + printf( "text move.\n" ); + + return IsSupported( wxDF_TEXT ); // same as "TEXT" } -bool wxTextDropTarget::OnDropText( long x, long y, const char *psz ) +bool wxTextDropTarget::OnDrop( int x, int y ) { - printf( "Got dropped text: %s.\n", psz ); - printf( "At x: %d, y: %d.\n", (int)x, (int)y ); - return TRUE; + printf( "text drop.\n" ); + + if (!IsSupported( wxDF_TEXT )) return FALSE; + + wxTextDataObject data; + if (!GetData( &data )) return FALSE; + + return OnDropText( x, y, data.GetText() ); } -size_t wxTextDropTarget::GetFormatCount() const +//------------------------------------------------------------------------- +// wxPrivateDropTarget +//------------------------------------------------------------------------- + +wxPrivateDropTarget::wxPrivateDropTarget() { - return 1; + m_id = wxTheApp->GetAppName(); } -wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const +wxPrivateDropTarget::wxPrivateDropTarget( const wxString &id ) { - return wxDF_TEXT; + m_id = id; } -// ---------------------------------------------------------------------------- -// wxFileDropTarget -// ---------------------------------------------------------------------------- - -bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const aszFiles[] ) +bool wxPrivateDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) ) { - printf( "Got %d dropped files.\n", (int)nFiles ); - printf( "At x: %d, y: %d.\n", (int)x, (int)y ); - for (size_t i = 0; i < nFiles; i++) - { - printf( aszFiles[i] ); - printf( "\n" ); - } - return TRUE; + return IsSupported( m_id ); } -bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) +bool wxPrivateDropTarget::OnDrop( int x, int y ) { - size_t number = 0; - char *text = (char*) data; - for (size_t i = 0; i < size; i++) - if (text[i] == 0) number++; + if (!IsSupported( m_id )) return FALSE; - if (number == 0) return TRUE; + wxPrivateDataObject data; + if (!GetData( &data )) return FALSE; - char **files = new char*[number]; - - text = (char*) data; - for (size_t i = 0; i < number; i++) - { - files[i] = text; - int len = strlen( text ); - text += len+1; - } - - bool ret = OnDropFiles( x, y, 1, files ); - - free( files ); - - return ret; + return OnDropData( x, y, data.GetData(), data.GetSize() ); } -size_t wxFileDropTarget::GetFormatCount() const +//---------------------------------------------------------------------------- +// A drop target which accepts files (dragged from File Manager or Explorer) +//---------------------------------------------------------------------------- + +bool wxFileDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) ) { - return 1; + return IsSupported( wxDF_FILENAME ); // same as "file:ALL" } -wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const +bool wxFileDropTarget::OnDrop( int x, int y ) { - return wxDF_FILENAME; + if (!IsSupported( wxDF_FILENAME )) return FALSE; + + wxFileDataObject data; + if (!GetData( &data )) return FALSE; + + /* get number of substrings /root/mytext.txt/0/root/myothertext.txt/0/0 */ + size_t number = 0; + size_t i; + size_t size = data.GetFiles().Length(); + char *text = WXSTRINGCAST data.GetFiles(); + for ( i = 0; i < size; i++) + if (text[i] == 0) number++; + + if (number == 0) return TRUE; + + char **files = new char*[number]; + + text = WXSTRINGCAST data.GetFiles(); + for (i = 0; i < number; i++) + { + files[i] = text; + int len = strlen( text ); + text += len+1; + } + + bool ret = OnDropFiles( x, y, number, files ); + + free( files ); + + return ret; } //------------------------------------------------------------------------- // wxDropSource //------------------------------------------------------------------------- -wxDropSource::wxDropSource( wxWindow *win ) + +wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop ) { - g_blockEventsOnDrag = TRUE; + g_blockEventsOnDrag = TRUE; - m_window = win; - m_widget = win->m_widget; - if (win->m_wxwindow) m_widget = win->m_wxwindow; + m_window = win; + m_widget = win->m_widget; + if (win->m_wxwindow) m_widget = win->m_wxwindow; - m_data = (wxDataObject *) NULL; - m_retValue = wxDragCancel; + m_data = (wxDataBroker*) NULL; + m_retValue = wxDragCancel; - m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); - m_goaheadCursor = wxCursor( wxCURSOR_HAND ); + 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 ); } -wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win ) +wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop ) { - g_blockEventsOnDrag = TRUE; + g_blockEventsOnDrag = TRUE; - m_window = win; - m_widget = win->m_widget; - if (win->m_wxwindow) m_widget = win->m_wxwindow; - m_retValue = wxDragCancel; + m_window = win; + m_widget = win->m_widget; + if (win->m_wxwindow) m_widget = win->m_wxwindow; + m_retValue = wxDragCancel; - m_data = &data; + if (data) + { + m_data = new wxDataBroker(); + m_data->Add( data ); + } + else + { + m_data = (wxDataBroker*) NULL; + } - m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); - m_goaheadCursor = wxCursor( wxCURSOR_HAND ); + 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 ); } -void wxDropSource::SetData( wxDataObject &data ) +wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win ) { - m_data = &data; + g_blockEventsOnDrag = TRUE; + + m_window = win; + m_widget = win->m_widget; + if (win->m_wxwindow) m_widget = win->m_wxwindow; + m_retValue = wxDragCancel; + + m_data = data; + + m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); + m_goaheadCursor = wxCursor( wxCURSOR_HAND ); +} + +void wxDropSource::SetData( wxDataObject *data ) +{ + if (m_data) delete m_data; + + if (data) + { + m_data = new wxDataBroker(); + m_data->Add( data ); + } + else + { + m_data = (wxDataBroker*) NULL; + } +} + +void wxDropSource::SetData( wxDataBroker *data ) +{ + if (m_data) delete m_data; + + m_data = data; } wxDropSource::~wxDropSource(void) { -// if (m_data) delete m_data; + if (m_data) delete m_data; - g_blockEventsOnDrag = FALSE; + g_blockEventsOnDrag = FALSE; } wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) { - wxASSERT_MSG( m_data, "wxDragSource: no data" ); - - if (!m_data) return (wxDragResult) wxDragNone; - if (m_data->GetDataSize() == 0) return (wxDragResult) wxDragNone; - - RegisterWindow(); - - // TODO - - UnregisterWindow(); + wxASSERT_MSG( m_data, "wxDragSource: no data" ); - g_blockEventsOnDrag = FALSE; + if (!m_data) return (wxDragResult) wxDragNone; - return m_retValue; -} + static GtkWidget *drag_icon = (GtkWidget*) NULL; + static GtkWidget *drop_icon = (GtkWidget*) NULL; -void wxDropSource::RegisterWindow(void) -{ - if (!m_data) return; + GdkPoint hotspot_1 = {0,-5 }; + + if (!drag_icon) + { +/* + drag_icon = shape_create_icon ( m_stopIcon, + 440, 140, 0,0, GTK_WINDOW_POPUP); + + gtk_signal_connect (GTK_OBJECT (drag_icon), "destroy", + GTK_SIGNAL_FUNC(gtk_widget_destroyed), + &drag_icon); - wxString formats; - - wxDataFormat df = m_data->GetPreferredFormat(); - - switch (df) + gtk_widget_hide (drag_icon); +*/ + } + + GdkPoint hotspot_2 = {-5,-5}; + + if (!drop_icon) { - case wxDF_TEXT: - formats += "text/plain"; - break; - case wxDF_FILENAME: - formats += "file:ALL"; - break; - default: - break; +/* + drop_icon = shape_create_icon ( m_goIcon, + 440, 140, 0,0, GTK_WINDOW_POPUP); + + gtk_signal_connect (GTK_OBJECT (drop_icon), "destroy", + GTK_SIGNAL_FUNC(gtk_widget_destroyed), + &drop_icon); + + gtk_widget_hide (drop_icon); +*/ } - - char *str = WXSTRINGCAST formats; - - // TODO + + + return FALSE; +} + +void wxDropSource::RegisterWindow(void) +{ + if (!m_data) return; } void wxDropSource::UnregisterWindow(void) { - if (!m_widget) return; - - // TODO + if (!m_widget) return; } #else // NEW_CODE -GtkWidget *shape_create_icon (char **data, +//---------------------------------------------------------------------------- +// forward +//---------------------------------------------------------------------------- + +GtkWidget *shape_create_icon ( const wxIcon &shape, gint x, gint y, gint px, gint py, gint window_type); -/* 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 */ -"32 32 5 1", -/* colors */ -" s None c None", -". c black", -"X c wheat", -"o c tan", -"O c #6699FF", -/* 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. ", -" ......................... "}; - - +//----------------------------------------------------------------------------- +// globals +//----------------------------------------------------------------------------- + +wxDropSource *gs_currentDropSource = (wxDropSource*) NULL; + +//----------------------------------------------------------------------------- +// "drop_enter_event" +//----------------------------------------------------------------------------- + +static void gtk_target_enter_callback( GtkWidget *WXUNUSED(widget), + GdkEventDropEnter *WXUNUSED(event), + wxDropTarget *target ) +{ + if (target) + target->OnEnter(); +} + +//----------------------------------------------------------------------------- +// "drop_leave_event" +//----------------------------------------------------------------------------- + +static void gtk_target_leave_callback( GtkWidget *WXUNUSED(widget), + GdkEventDropLeave *WXUNUSED(event), + wxDropTarget *target ) +{ + if (target) + target->OnLeave(); +} + //----------------------------------------------------------------------------- // "drop_data_available_event" //----------------------------------------------------------------------------- @@ -503,10 +649,17 @@ static void gtk_target_callback( GtkWidget *widget, wxDropTarget::wxDropTarget() { + m_format = (wxDataFormat*) NULL; } wxDropTarget::~wxDropTarget() { + if (m_format) delete m_format; +} + +wxDataFormat &wxDropTarget::GetFormat(size_t n) const +{ + return (*m_format); } void wxDropTarget::UnregisterWidget( GtkWidget *widget ) @@ -526,8 +679,7 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) for ( size_t i = 0; i < GetFormatCount(); i++ ) { - wxDataFormat df = GetFormat( i ); - switch (df) + switch (GetFormat(i).GetType()) { case wxDF_TEXT: { @@ -547,7 +699,6 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) { if (i > 0) formats += ";"; wxPrivateDropTarget *pdt = (wxPrivateDropTarget *)this; - formats += "applications/"; formats += pdt->GetId(); valid++; break; @@ -563,12 +714,23 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) gtk_signal_connect( GTK_OBJECT(widget), "drop_data_available_event", GTK_SIGNAL_FUNC(gtk_target_callback), (gpointer) this ); + + gtk_signal_connect( GTK_OBJECT(widget), "drop_enter_event", + GTK_SIGNAL_FUNC(gtk_target_enter_callback), (gpointer) this ); + + gtk_signal_connect( GTK_OBJECT(widget), "drop_leave_event", + GTK_SIGNAL_FUNC(gtk_target_leave_callback), (gpointer) this ); } // ---------------------------------------------------------------------------- // wxTextDropTarget // ---------------------------------------------------------------------------- +wxTextDropTarget::wxTextDropTarget() +{ + m_format = new wxDataFormat( wxDF_TEXT ); +} + bool wxTextDropTarget::OnDrop( long x, long y, const void *data, size_t WXUNUSED(size) ) { OnDropText( x, y, (const char*)data ); @@ -589,11 +751,6 @@ size_t wxTextDropTarget::GetFormatCount() const return 1; } -wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const -{ - return wxDF_TEXT; -} - // ---------------------------------------------------------------------------- // wxPrivateDropTarget // ---------------------------------------------------------------------------- @@ -601,22 +758,29 @@ wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const wxPrivateDropTarget::wxPrivateDropTarget() { m_id = wxTheApp->GetAppName(); + m_format = new wxDataFormat( m_id ); } -size_t wxPrivateDropTarget::GetFormatCount() const +void wxPrivateDropTarget::SetId( const wxString& id ) { - return 1; + m_id = id; + m_format->SetId( id ); } -wxDataFormat wxPrivateDropTarget::GetFormat(size_t WXUNUSED(n)) const +size_t wxPrivateDropTarget::GetFormatCount() const { - return wxDF_PRIVATE; + return 1; } // ---------------------------------------------------------------------------- // wxFileDropTarget // ---------------------------------------------------------------------------- +wxFileDropTarget::wxFileDropTarget() +{ + m_format = new wxDataFormat( wxDF_FILENAME ); +} + bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * const aszFiles[] ) { printf( "Got %d dropped files.\n", (int)nFiles ); @@ -634,8 +798,9 @@ bool wxFileDropTarget::OnDropFiles( long x, long y, size_t nFiles, const char * bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) { size_t number = 0; + size_t i; char *text = (char*) data; - for (size_t i = 0; i < size; i++) + for ( i = 0; i < size; i++) if (text[i] == 0) number++; if (number == 0) return TRUE; @@ -643,7 +808,7 @@ bool wxFileDropTarget::OnDrop(long x, long y, const void *data, size_t size ) char **files = new char*[number]; text = (char*) data; - for (size_t i = 0; i < number; i++) + for (i = 0; i < number; i++) { files[i] = text; int len = strlen( text ); @@ -662,81 +827,88 @@ size_t wxFileDropTarget::GetFormatCount() const return 1; } -wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const -{ - return wxDF_FILENAME; -} - //------------------------------------------------------------------------- // wxDropSource //------------------------------------------------------------------------- static void shape_motion (GtkWidget *widget, - GdkEventMotion */*event*/); + GdkEventMotion * /*event*/); //----------------------------------------------------------------------------- -// drag request +// "drag_request_event" +//----------------------------------------------------------------------------- -void gtk_drag_callback( GtkWidget *widget, GdkEvent *event, wxDropSource *source ) +void gtk_drag_callback( GtkWidget *widget, GdkEventDragRequest *event, wxDropSource *source ) { - wxDataObject *data = source->m_data; - - switch (data->GetFormat()) + wxDataBroker *data = source->m_data; + + if (!data) return; + + wxNode *node = data->m_dataObjects.First(); { - case wxDF_PRIVATE: - { - wxPrivateDataObject *pdo = (wxPrivateDataObject*) data; - - gtk_widget_dnd_data_set( widget, - event, - (unsigned char*) pdo->GetData(), - (int) pdo->GetDataSize() ); - - break; - } - case wxDF_TEXT: + wxDataObject *dobj = (wxDataObject*) node->Data(); + + if ((strcmp(event->data_type,"file:ALL") == 0) && + (dobj->GetFormat().GetType() == wxDF_FILENAME)) { - wxTextDataObject *text_object = (wxTextDataObject*) data; + wxFileDataObject *file_object = (wxFileDataObject*) dobj; - wxString text = text_object->GetText(); + wxString text = file_object->GetFiles(); char *s = WXSTRINGCAST text; gtk_widget_dnd_data_set( widget, - event, + (GdkEvent*)event, (unsigned char*) s, (int) text.Length()+1 ); - break; + source->m_retValue = wxDragCopy; + + return; } - case wxDF_FILENAME: + if ((strcmp(event->data_type,"text/plain") == 0) && + (dobj->GetFormat().GetType() == wxDF_TEXT)) { - wxFileDataObject *file_object = (wxFileDataObject*) data; + wxTextDataObject *text_object = (wxTextDataObject*) dobj; - wxString text = file_object->GetFiles(); + wxString text = text_object->GetText(); char *s = WXSTRINGCAST text; gtk_widget_dnd_data_set( widget, - event, + (GdkEvent*)event, (unsigned char*) s, (int) text.Length()+1 ); - break; + source->m_retValue = wxDragCopy; + + return; } - default: + if (dobj->GetFormat().GetType() == wxDF_PRIVATE) { - return; + wxPrivateDataObject *pdo = (wxPrivateDataObject*) dobj; + + if (pdo->GetId() == event->data_type) + { + gtk_widget_dnd_data_set( widget, + (GdkEvent*)event, + (unsigned char*) pdo->GetData(), + (int) pdo->GetSize() ); + + source->m_retValue = wxDragCopy; + + return; + } } + + node = node->Next(); } - - source->m_retValue = wxDragCopy; } -wxDropSource::wxDropSource( wxWindow *win ) +wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop ) { g_blockEventsOnDrag = TRUE; @@ -744,14 +916,19 @@ wxDropSource::wxDropSource( wxWindow *win ) m_widget = win->m_widget; if (win->m_wxwindow) m_widget = win->m_wxwindow; - m_data = (wxDataObject *) NULL; + m_data = (wxDataBroker*) NULL; 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 ); } -wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win ) +wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go, const wxIcon &stop ) { g_blockEventsOnDrag = TRUE; @@ -760,20 +937,65 @@ wxDropSource::wxDropSource( wxDataObject &data, wxWindow *win ) if (win->m_wxwindow) m_widget = win->m_wxwindow; m_retValue = wxDragCancel; - m_data = &data; + if (data) + { + m_data = new wxDataBroker(); + m_data->Add( data ); + } + else + { + m_data = (wxDataBroker*) NULL; + } 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 ); } -void wxDropSource::SetData( wxDataObject &data ) +wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win ) { - m_data = &data; + g_blockEventsOnDrag = TRUE; + + m_window = win; + m_widget = win->m_widget; + if (win->m_wxwindow) m_widget = win->m_wxwindow; + m_retValue = wxDragCancel; + + m_data = data; + + m_defaultCursor = wxCursor( wxCURSOR_NO_ENTRY ); + m_goaheadCursor = wxCursor( wxCURSOR_HAND ); +} + +void wxDropSource::SetData( wxDataObject *data ) +{ + if (m_data) delete m_data; + + if (data) + { + m_data = new wxDataBroker(); + m_data->Add( data ); + } + else + { + m_data = (wxDataBroker*) NULL; + } +} + +void wxDropSource::SetData( wxDataBroker *data ) +{ + if (m_data) delete m_data; + + m_data = data; } wxDropSource::~wxDropSource(void) { -// if (m_data) delete m_data; + if (m_data) delete m_data; g_blockEventsOnDrag = FALSE; } @@ -794,7 +1016,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) if (!drag_icon) { - drag_icon = shape_create_icon ( gv_xpm, + drag_icon = shape_create_icon ( m_stopIcon, 440, 140, 0,0, GTK_WINDOW_POPUP); gtk_signal_connect (GTK_OBJECT (drag_icon), "destroy", @@ -808,7 +1030,7 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) if (!drop_icon) { - drop_icon = shape_create_icon ( page_xpm, + drop_icon = shape_create_icon ( m_goIcon, 440, 140, 0,0, GTK_WINDOW_POPUP); gtk_signal_connect (GTK_OBJECT (drop_icon), "destroy", @@ -870,8 +1092,12 @@ wxDragResult wxDropSource::DoDragDrop( bool WXUNUSED(bAllowMove) ) wxGetMousePosition( &x, &y ); gdk_dnd_display_drag_cursor( x, y, FALSE, TRUE ); - + + gs_currentDropSource = this; + while (gdk_dnd.drag_really || gdk_dnd.drag_perhaps) wxYield(); + + gs_currentDropSource = (wxDropSource*) NULL; UnregisterWindow(); @@ -886,29 +1112,33 @@ void wxDropSource::RegisterWindow(void) wxString formats; - wxDataFormat df = m_data->GetFormat(); - - switch (df) + wxNode *node = m_data->m_dataObjects.First(); + while (node) { - case wxDF_TEXT: - { - formats += "text/plain"; - break; - } - case wxDF_FILENAME: - { - formats += "file:ALL"; - break; - } - case wxDF_PRIVATE: - { - wxPrivateDataObject* pdo = (wxPrivateDataObject*) m_data; - formats += "applications/"; - formats += pdo->GetId(); - break; + wxDataObject* dobj = (wxDataObject*) node->Data(); + + switch (dobj->GetFormat().GetType()) + { + case wxDF_TEXT: + { + formats += "text/plain"; + break; + } + case wxDF_FILENAME: + { + formats += "file:ALL"; + break; + } + case wxDF_PRIVATE: + { + wxPrivateDataObject* pdo = (wxPrivateDataObject*) m_data; + formats += pdo->GetId(); + break; + } + default: + break; } - default: - break; + node = node->Next(); } char *str = WXSTRINGCAST formats; @@ -969,7 +1199,7 @@ shape_released (GtkWidget *widget) static void shape_motion (GtkWidget *widget, - GdkEventMotion */*event*/) + GdkEventMotion * /*event*/ ) { gint xp, yp; CursorOffset * p; @@ -981,36 +1211,27 @@ shape_motion (GtkWidget *widget, * Can't use event->x / event->y here * because I need absolute coordinates. */ + gdk_window_get_pointer (root_win, &xp, &yp, &mask); gtk_widget_set_uposition (widget, xp - p->x, yp - p->y); + + if (gs_currentDropSource) gs_currentDropSource->GiveFeedback( wxDragCopy, FALSE ); } GtkWidget * -shape_create_icon (char **data, +shape_create_icon (const wxIcon &shape, gint x, gint y, gint px, gint py, gint window_type) { - GtkWidget *window; - GtkWidget *pixmap; - GtkWidget *fixed; - CursorOffset* icon_pos; - GdkGC* gc; - GdkBitmap *gdk_pixmap_mask; - GdkPixmap *gdk_pixmap; - GtkStyle *style; - - style = gtk_widget_get_default_style (); - gc = style->black_gc; - /* * GDK_WINDOW_TOPLEVEL works also, giving you a title border */ - window = gtk_window_new ((GtkWindowType)window_type); + GtkWidget *window = gtk_window_new ((GtkWindowType)window_type); - fixed = gtk_fixed_new (); + GtkWidget *fixed = gtk_fixed_new (); gtk_widget_set_usize (fixed, 100,100); gtk_container_add (GTK_CONTAINER (window), fixed); gtk_widget_show (fixed); @@ -1023,15 +1244,14 @@ shape_create_icon (char **data, gtk_widget_realize (window); - gdk_pixmap = gdk_pixmap_create_from_xpm_d (window->window, &gdk_pixmap_mask, - &style->bg[GTK_STATE_NORMAL], - (gchar**) data ); + GdkBitmap *mask = (GdkBitmap*) NULL; + if (shape.GetMask()) mask = shape.GetMask()->GetBitmap(); - pixmap = gtk_pixmap_new (gdk_pixmap, gdk_pixmap_mask); + GtkWidget *pixmap = gtk_pixmap_new (shape.GetPixmap(), mask); gtk_fixed_put (GTK_FIXED (fixed), pixmap, px,py); gtk_widget_show (pixmap); - gtk_widget_shape_combine_mask (window, gdk_pixmap_mask, px,py); + gtk_widget_shape_combine_mask (window, mask, px,py); gtk_signal_connect (GTK_OBJECT (window), "button_press_event", @@ -1041,7 +1261,7 @@ shape_create_icon (char **data, gtk_signal_connect (GTK_OBJECT (window), "motion_notify_event", GTK_SIGNAL_FUNC (shape_motion),NULL); - icon_pos = g_new (CursorOffset, 1); + CursorOffset*icon_pos = g_new (CursorOffset, 1); gtk_object_set_user_data(GTK_OBJECT(window), icon_pos); gtk_widget_set_uposition (window, x, y);