X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f480da37ca0840ddbe48b908d511d2e9fc20bf4..15ba5c2731f1c4a7555408b35c7d593b1cb1a590:/src/gtk1/dataobj.cpp diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp index 342d813401..d591070266 100644 --- a/src/gtk1/dataobj.cpp +++ b/src/gtk1/dataobj.cpp @@ -14,107 +14,78 @@ #include "wx/dataobj.h" #include "wx/app.h" #include "wx/debug.h" +#include "wx/mstream.h" +#include "wx/image.h" -#include "gdk/gdk.h" - +#include //------------------------------------------------------------------------- // global data //------------------------------------------------------------------------- GdkAtom g_textAtom = 0; +GdkAtom g_pngAtom = 0; +GdkAtom g_fileAtom = 0; //------------------------------------------------------------------------- // wxDataFormat //------------------------------------------------------------------------- -IMPLEMENT_CLASS(wxDataFormat, wxObject) - wxDataFormat::wxDataFormat() { - if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); + // do *not* call PrepareFormats() from here for 2 reasons: + // + // 1. we will have time to do it later because some other Set function + // must be called before we really need them + // + // 2. doing so prevents us from declaring global wxDataFormats because + // calling PrepareFormats (and thus gdk_atom_intern) before GDK is + // initialised will result in a crash m_type = wxDF_INVALID; - m_hasAtom = FALSE; - m_atom = (GdkAtom) 0; + m_format = (GdkAtom) 0; } wxDataFormat::wxDataFormat( wxDataFormatId type ) { - if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); + PrepareFormats(); SetType( type ); } wxDataFormat::wxDataFormat( const wxChar *id ) { - if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); + PrepareFormats(); SetId( id ); } wxDataFormat::wxDataFormat( const wxString &id ) { - if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); + PrepareFormats(); SetId( id ); } -wxDataFormat::wxDataFormat( wxDataFormat &format ) -{ - if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); - m_type = format.GetType(); - m_id = format.GetId(); - m_hasAtom = TRUE; - m_atom = format.GetAtom(); -} - -wxDataFormat::wxDataFormat( const GdkAtom atom ) +wxDataFormat::wxDataFormat( NativeFormat format ) { - if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); - m_hasAtom = TRUE; - - m_atom = atom; - - if (m_atom == g_textAtom) - { - m_type = wxDF_TEXT; - } else - if (m_atom == GDK_TARGET_BITMAP) - { - m_type = wxDF_BITMAP; - } else - { - m_type = wxDF_PRIVATE; - m_id = gdk_atom_name( m_atom ); - - if (m_id == _T("file:ALL")) - { - m_type = wxDF_FILENAME; - } - } + PrepareFormats(); + SetId( format ); } void wxDataFormat::SetType( wxDataFormatId type ) { + PrepareFormats(); m_type = type; if (m_type == wxDF_TEXT) - { - m_id = _T("STRING"); - } + m_format = g_textAtom; else if (m_type == wxDF_BITMAP) - { - m_id = _T("BITMAP"); - } + m_format = g_pngAtom; else if (m_type == wxDF_FILENAME) - { - m_id = _T("file:ALL"); - } + m_format = g_fileAtom; else { - wxFAIL_MSG( _T("invalid dataformat") ); + wxFAIL_MSG( wxT("invalid dataformat") ); } - - m_hasAtom = FALSE; } wxDataFormatId wxDataFormat::GetType() const @@ -124,346 +95,281 @@ wxDataFormatId wxDataFormat::GetType() const wxString wxDataFormat::GetId() const { - return m_id; -} - -void wxDataFormat::SetId( const wxChar *id ) -{ - m_type = wxDF_PRIVATE; - m_id = id; - m_hasAtom = FALSE; -} - -GdkAtom wxDataFormat::GetAtom() -{ - if (!m_hasAtom) - { - m_hasAtom = TRUE; - - if (m_type == wxDF_TEXT) - { - m_atom = g_textAtom; - } - else - if (m_type == wxDF_BITMAP) - { - m_atom = GDK_TARGET_BITMAP; - } - else - if (m_type == wxDF_PRIVATE) - { - m_atom = gdk_atom_intern( MBSTRINGCAST m_id.mbc_str(), FALSE ); - } - else - if (m_type == wxDF_FILENAME) - { - m_atom = gdk_atom_intern( "file:ALL", FALSE ); - } - else - { - m_hasAtom = FALSE; - m_atom = (GdkAtom) 0; - } - } - - return m_atom; -} - -//------------------------------------------------------------------------- -// wxDataBroker -//------------------------------------------------------------------------- - -IMPLEMENT_CLASS(wxDataBroker,wxObject) - -wxDataBroker::wxDataBroker() -{ - m_dataObjects.DeleteContents(TRUE); - m_preferred = 0; -} - -void wxDataBroker::Add( wxDataObject *dataObject, bool preferred ) -{ - if (preferred) m_preferred = m_dataObjects.GetCount(); - m_dataObjects.Append( dataObject ); -} - -size_t wxDataBroker::GetFormatCount() const -{ - return m_dataObjects.GetCount(); -} - -wxDataFormat &wxDataBroker::GetPreferredFormat() const -{ - wxNode *node = m_dataObjects.Nth( m_preferred ); - - wxASSERT( node ); - - wxDataObject* data_obj = (wxDataObject*)node->Data(); - - return data_obj->GetFormat(); + wxString ret( gdk_atom_name( m_format ) ); // this will convert from ascii to Unicode + return ret; } -wxDataFormat &wxDataBroker::GetNthFormat( size_t nth ) const +void wxDataFormat::SetId( NativeFormat format ) { - wxNode *node = m_dataObjects.Nth( nth ); + PrepareFormats(); + m_format = format; - wxASSERT( node ); - - wxDataObject* data_obj = (wxDataObject*)node->Data(); - - return data_obj->GetFormat(); + if (m_format == g_textAtom) + m_type = wxDF_TEXT; + else + if (m_format == g_pngAtom) + m_type = wxDF_BITMAP; + else + if (m_format == g_fileAtom) + m_type = wxDF_FILENAME; + else + m_type = wxDF_PRIVATE; } -bool wxDataBroker::IsSupportedFormat( wxDataFormat &format ) const +void wxDataFormat::SetId( const wxChar *id ) { - wxNode *node = m_dataObjects.First(); - while (node) - { - wxDataObject *dobj = (wxDataObject*)node->Data(); - - if (dobj->GetFormat().GetAtom() == format.GetAtom()) - { - return TRUE; - } - - node = node->Next(); - } - - return FALSE; + PrepareFormats(); + m_type = wxDF_PRIVATE; + wxString tmp( id ); + m_format = gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE ); // what is the string cast for? } -size_t wxDataBroker::GetSize( wxDataFormat& format ) const +void wxDataFormat::PrepareFormats() { - wxNode *node = m_dataObjects.First(); - while (node) - { - wxDataObject *dobj = (wxDataObject*)node->Data(); - - if (dobj->GetFormat().GetAtom() == format.GetAtom()) - { - return dobj->GetSize(); - } - - node = node->Next(); - } - - return 0; -} - -void wxDataBroker::WriteData( wxDataFormat& format, void *dest ) const -{ - wxNode *node = m_dataObjects.First(); - while (node) - { - wxDataObject *dobj = (wxDataObject*)node->Data(); - - if (dobj->GetFormat().GetAtom() == format.GetAtom()) - { - dobj->WriteData( dest ); - } - - node = node->Next(); - } + // VZ: GNOME included in RedHat 6.1 uses the MIME types below and not the + // atoms STRING and file:ALL as the old code was, but normal X apps + // use STRING for text selection when transfering the data via + // clipboard, for example, so do use STRING for now (GNOME apps will + // probably support STRING as well for compatibility anyhow), but use + // text/uri-list for file dnd because compatibility is not important + // here (with whom?) + if (!g_textAtom) + g_textAtom = gdk_atom_intern( "STRING" /* "text/plain" */, FALSE ); + if (!g_pngAtom) + g_pngAtom = gdk_atom_intern( "image/png", FALSE ); + if (!g_fileAtom) + g_fileAtom = gdk_atom_intern( "text/uri-list", FALSE ); } //------------------------------------------------------------------------- // wxDataObject //------------------------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS( wxDataObject, wxObject ) - wxDataObject::wxDataObject() { } -wxDataObject::~wxDataObject() -{ -} - -wxDataFormat &wxDataObject::GetFormat() +bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const { - return m_format; -} + size_t nFormatCount = GetFormatCount(dir); + if ( nFormatCount == 1 ) + { + return format == GetPreferredFormat(); + } + else + { + wxDataFormat *formats = new wxDataFormat[nFormatCount]; + GetAllFormats(formats,dir); -wxDataFormatId wxDataObject::GetFormatType() const -{ - return m_format.GetType(); -} + size_t n; + for ( n = 0; n < nFormatCount; n++ ) + { + if ( formats[n] == format ) + break; + } -wxString wxDataObject::GetFormatId() const -{ - return m_format.GetId(); -} + delete [] formats; -GdkAtom wxDataObject::GetFormatAtom() const -{ - GdkAtom ret = ((wxDataObject*) this)->m_format.GetAtom(); - return ret; + // found? + return n < nFormatCount; + } } // ---------------------------------------------------------------------------- -// wxTextDataObject +// wxFileDataObject // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS( wxTextDataObject, wxDataObject ) - -wxTextDataObject::wxTextDataObject() +bool wxFileDataObject::GetDataHere(void *buf) const { - m_format.SetType( wxDF_TEXT ); -} - -wxTextDataObject::wxTextDataObject( const wxString& data ) -{ - m_format.SetType( wxDF_TEXT ); + wxString filenames; - m_data = data; -} - -void wxTextDataObject::SetText( const wxString& data ) -{ - m_data = data; -} - -wxString wxTextDataObject::GetText() const -{ - return m_data; -} + for (size_t i = 0; i < m_filenames.GetCount(); i++) + { + filenames += m_filenames[i]; + filenames += (wxChar) 0; + } -void wxTextDataObject::WriteData( void *dest ) const -{ - WriteString( m_data, dest ); -} + memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 ); -size_t wxTextDataObject::GetSize() const -{ - return m_data.Len() + 1; + return TRUE; } -void wxTextDataObject::WriteString( const wxString &str, void *dest ) const +size_t wxFileDataObject::GetDataSize() const { - memcpy( dest, str.mb_str(), str.Len()+1 ); -} - -// ---------------------------------------------------------------------------- -// wxFileDataObject -// ---------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS( wxFileDataObject, wxDataObject ) + size_t res = 0; -wxFileDataObject::wxFileDataObject() -{ - m_format.SetType( wxDF_FILENAME ); -} + for (size_t i = 0; i < m_filenames.GetCount(); i++) + { + res += m_filenames[i].Len(); + res += 1; + } -void wxFileDataObject::AddFile( const wxString &file ) -{ - m_files += file; - m_files += (wxChar)0; + return res + 1; } -wxString wxFileDataObject::GetFiles() const +bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf) { - return m_files; -} + // VZ: old format +#if 0 + // filenames are stores as a string with #0 as deliminators + const char *filenames = (const char*) buf; + size_t pos = 0; + for(;;) + { + if (filenames[0] == 0) + break; + if (pos >= size) + break; + wxString file( filenames ); // this returns the first file + AddFile( file ); + pos += file.Len()+1; + filenames += file.Len()+1; + } +#else // 1 + m_filenames.Empty(); + + // the text/uri-list format is a sequence of URIs (filenames prefixed by + // "file:" as far as I see) delimited by "\r\n" of total length size + // (I wonder what happens if the file has '\n' in its filename??) + wxString filename; + for ( const char *p = (const char *)buf; ; p++ ) + { + // some broken programs (testdnd GTK+ sample!) omit the trailing + // "\r\n", so check for '\0' explicitly here instead of doing it in + // the loop statement to account for it + if ( (*p == '\r' && *(p+1) == '\n') || !*p ) + { + size_t lenPrefix = 5; // strlen("file:") + if ( filename.Left(lenPrefix).MakeLower() == _T("file:") ) + { + // sometimes the syntax is "file:filename", sometimes it's + // URL-like: "file://filename" - deal with both + if ( filename[lenPrefix] == _T('/') && + filename[lenPrefix + 1] == _T('/') ) + { + // skip the slashes + lenPrefix += 2; + } + + AddFile(filename.c_str() + lenPrefix); + filename.Empty(); + } + else + { + wxLogDebug(_T("Unsupported URI '%s' in wxFileDataObject"), + filename.c_str()); + } + + if ( !*p ) + break; + + // skip '\r' + p++; + } + else + { + filename += *p; + } + } +#endif // 0/1 -void wxFileDataObject::WriteData( void *dest ) const -{ - memcpy( dest, m_files.mbc_str(), GetSize() ); + return TRUE; } -size_t wxFileDataObject::GetSize() const +void wxFileDataObject::AddFile( const wxString &filename ) { - return m_files.Len() + 1; + m_filenames.Add( filename ); } // ---------------------------------------------------------------------------- // wxBitmapDataObject // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS( wxBitmapDataObject, wxDataObject ) - wxBitmapDataObject::wxBitmapDataObject() { - m_format.SetType( wxDF_BITMAP ); + Init(); } wxBitmapDataObject::wxBitmapDataObject( const wxBitmap& bitmap ) + : wxBitmapDataObjectBase(bitmap) { - m_format.SetType( wxDF_BITMAP ); + Init(); - m_bitmap = bitmap; + DoConvertToPng(); } -void wxBitmapDataObject::SetBitmap( const wxBitmap &bitmap ) +wxBitmapDataObject::~wxBitmapDataObject() { - m_bitmap = bitmap; + Clear(); } -wxBitmap wxBitmapDataObject::GetBitmap() const +void wxBitmapDataObject::SetBitmap( const wxBitmap &bitmap ) { - return m_bitmap; -} + ClearAll(); -void wxBitmapDataObject::WriteData( void *dest ) const -{ - WriteBitmap( m_bitmap, dest ); -} + wxBitmapDataObjectBase::SetBitmap(bitmap); -size_t wxBitmapDataObject::GetSize() const -{ - return 0; + DoConvertToPng(); } -void wxBitmapDataObject::WriteBitmap( const wxBitmap &bitmap, void *dest ) const +bool wxBitmapDataObject::GetDataHere(void *buf) const { - memcpy( dest, m_bitmap.GetPixmap(), GetSize() ); -} + if ( !m_pngSize ) + { + wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") ); -// ---------------------------------------------------------------------------- -// wxPrivateDataObject -// ---------------------------------------------------------------------------- + return FALSE; + } -IMPLEMENT_DYNAMIC_CLASS( wxPrivateDataObject, wxDataObject ) + memcpy(buf, m_pngData, m_pngSize); -void wxPrivateDataObject::Free() -{ - if ( m_data ) - free(m_data); + return TRUE; } -wxPrivateDataObject::wxPrivateDataObject() +bool wxBitmapDataObject::SetData(size_t size, const void *buf) { - wxString id = _T("application/"); - id += wxTheApp->GetAppName(); + Clear(); - m_format.SetId( id ); +#if wxUSE_LIBPNG + m_pngSize = size; + m_pngData = malloc(m_pngSize); - m_size = 0; - m_data = (void *)NULL; -} + memcpy( m_pngData, buf, m_pngSize ); -void wxPrivateDataObject::SetData( const void *data, size_t size ) -{ - Free(); + wxMemoryInputStream mstream( (char*) m_pngData, m_pngSize ); + wxImage image; + wxPNGHandler handler; + if ( !handler.LoadFile( &image, mstream ) ) + { + return FALSE; + } - m_size = size; - m_data = malloc(size); + m_bitmap = image.ConvertToBitmap(); - memcpy( m_data, data, size ); + return m_bitmap.Ok(); +#else + return FALSE; +#endif } -void wxPrivateDataObject::WriteData( void *dest ) const +void wxBitmapDataObject::DoConvertToPng() { - WriteData( m_data, dest ); -} +#if wxUSE_LIBPNG + if (!m_bitmap.Ok()) + return; -size_t wxPrivateDataObject::GetSize() const -{ - return m_size; -} + wxImage image( m_bitmap ); + wxPNGHandler handler; -void wxPrivateDataObject::WriteData( const void *data, void *dest ) const -{ - memcpy( dest, data, GetSize() ); + wxCountingOutputStream count; + handler.SaveFile( &image, count ); + + m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ??? + m_pngData = malloc(m_pngSize); + + wxMemoryOutputStream mstream( (char*) m_pngData, m_pngSize ); + handler.SaveFile( &image, mstream ); +#endif } +