X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b666df2c102d1e183532adf0c003e63b1a591e2f..5664fc3253cbf994465257fffdb7734e6ee2c9f9:/src/gtk1/dnd.cpp diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index 4ac5d9bc3c..5ea4529238 100644 --- a/src/gtk1/dnd.cpp +++ b/src/gtk1/dnd.cpp @@ -171,8 +171,7 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) break; case wxDF_PRIVATE: wxPrivateDropTarget *pdt = (wxPrivateDropTarget *)this; - strcpy( buf, "applications/" ); - strcat( buf, WXSTRINGCAST pdt->GetID() ); + strcpy( buf, WXSTRINGCAST pdt->GetID() ); format.target = buf; valid++; default: @@ -247,8 +246,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; @@ -256,7 +256,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 ); @@ -379,7 +379,7 @@ void wxDropSource::UnregisterWindow(void) #else // NEW_CODE -GtkWidget *shape_create_icon (char **data, +GtkWidget *shape_create_icon ( const wxIcon &shape, gint x, gint y, gint px, @@ -533,10 +533,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 ) @@ -556,8 +563,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: { @@ -577,7 +583,6 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) { if (i > 0) formats += ";"; wxPrivateDropTarget *pdt = (wxPrivateDropTarget *)this; - formats += "applications/"; formats += pdt->GetId(); valid++; break; @@ -605,6 +610,11 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget ) // 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 ); @@ -625,11 +635,6 @@ size_t wxTextDropTarget::GetFormatCount() const return 1; } -wxDataFormat wxTextDropTarget::GetFormat(size_t WXUNUSED(n)) const -{ - return wxDF_TEXT; -} - // ---------------------------------------------------------------------------- // wxPrivateDropTarget // ---------------------------------------------------------------------------- @@ -637,22 +642,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 ); @@ -670,8 +682,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; @@ -679,7 +692,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 ); @@ -698,11 +711,6 @@ size_t wxFileDropTarget::GetFormatCount() const return 1; } -wxDataFormat wxFileDropTarget::GetFormat(size_t WXUNUSED(n)) const -{ - return wxDF_FILENAME; -} - //------------------------------------------------------------------------- // wxDropSource //------------------------------------------------------------------------- @@ -712,67 +720,79 @@ shape_motion (GtkWidget *widget, 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; @@ -780,14 +800,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; @@ -796,20 +821,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 ) +{ + 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 ) { - m_data = &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; } @@ -830,7 +900,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", @@ -844,7 +914,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", @@ -926,29 +996,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; @@ -1029,31 +1103,19 @@ shape_motion (GtkWidget *widget, } 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); @@ -1066,15 +1128,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", @@ -1084,7 +1145,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);