X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..e215c9959cfae9db319cbca376553301dfa17cf1:/src/common/dobjcmn.cpp diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp index 97b89544ed..d9327709c5 100644 --- a/src/common/dobjcmn.cpp +++ b/src/common/dobjcmn.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: common/dobjcmn.cpp +// Name: src/common/dobjcmn.cpp // Purpose: implementation of data object methods common to all platforms // Author: Vadim Zeitlin, Robert Roebling // Modified by: @@ -9,14 +9,7 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - +// For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -25,12 +18,11 @@ #if wxUSE_DATAOBJ +#include "wx/dataobj.h" + #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/debug.h" -#endif // WX_PRECOMP - -#include "wx/dataobj.h" +#endif // ---------------------------------------------------------------------------- // lists @@ -38,7 +30,7 @@ #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxSimpleDataObjectList); +WX_DEFINE_LIST(wxSimpleDataObjectList) // ---------------------------------------------------------------------------- // globals @@ -62,15 +54,15 @@ wxDataObjectBase::~wxDataObjectBase() bool wxDataObjectBase::IsSupported(const wxDataFormat& format, Direction dir) const { - size_t nFormatCount = GetFormatCount(dir); + size_t nFormatCount = GetFormatCount( dir ); if ( nFormatCount == 1 ) { - return format == GetPreferredFormat(dir); + return format == GetPreferredFormat( dir ); } else { wxDataFormat *formats = new wxDataFormat[nFormatCount]; - GetAllFormats(formats, dir); + GetAllFormats( formats, dir ); size_t n; for ( n = 0; n < nFormatCount; n++ ) @@ -93,11 +85,12 @@ bool wxDataObjectBase::IsSupported(const wxDataFormat& format, wxDataObjectComposite::wxDataObjectComposite() { m_preferred = 0; + m_receivedFormat = wxFormatInvalid; } wxDataObjectComposite::~wxDataObjectComposite() { - WX_CLEAR_LIST(wxSimpleDataObjectList, m_dataObjects); + WX_CLEAR_LIST( wxSimpleDataObjectList, m_dataObjects ); } wxDataObjectSimple * @@ -127,6 +120,11 @@ void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred) m_dataObjects.Append( dataObject ); } +wxDataFormat wxDataObjectComposite::GetReceivedFormat() const +{ + return m_receivedFormat; +} + wxDataFormat wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const { @@ -168,7 +166,7 @@ const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer, void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size, const wxDataFormat& format ) { - wxDataObjectSimple *dataObj = GetObject(format); + wxDataObjectSimple *dataObj = GetObject( format ); wxCHECK_MSG( dataObj, NULL, wxT("unsupported format in wxDataObjectComposite")); @@ -209,31 +207,38 @@ size_t wxDataObjectComposite::GetDataSize(const wxDataFormat& format) const bool wxDataObjectComposite::GetDataHere(const wxDataFormat& format, void *buf) const { - wxDataObjectSimple *dataObj = GetObject(format); + wxDataObjectSimple *dataObj = GetObject( format ); wxCHECK_MSG( dataObj, false, wxT("unsupported format in wxDataObjectComposite")); - return dataObj->GetDataHere(buf); + return dataObj->GetDataHere( buf ); } bool wxDataObjectComposite::SetData(const wxDataFormat& format, size_t len, const void *buf) { - wxDataObjectSimple *dataObj = GetObject(format); + wxDataObjectSimple *dataObj = GetObject( format ); wxCHECK_MSG( dataObj, false, wxT("unsupported format in wxDataObjectComposite")); - return dataObj->SetData(len, buf); + m_receivedFormat = format; + return dataObj->SetData( len, buf ); } // ---------------------------------------------------------------------------- // wxTextDataObject // ---------------------------------------------------------------------------- -#if defined(__WXGTK20__) && wxUSE_UNICODE +#ifdef wxNEEDS_UTF8_FOR_TEXT_DATAOBJ + +// FIXME-UTF8: we should be able to merge wchar_t and UTF-8 versions once we +// have a way to get UTF-8 string (and its length) in both builds +// without loss of efficiency (i.e. extra buffer copy/strlen call) + +#if wxUSE_UNICODE_WCHAR static inline wxMBConv& GetConv(const wxDataFormat& format) { @@ -244,16 +249,21 @@ static inline wxMBConv& GetConv(const wxDataFormat& format) size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const { wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() ); - return buffer ? strlen(buffer) + 1 : 0; + + return buffer ? strlen( buffer ) : 0; } bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const { + if ( !buf ) + return false; + wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() ); if ( !buffer ) return false; - strcpy( (char*) buf, buffer ); + memcpy( (char*) buf, buffer, GetDataSize(format) ); + // strcpy( (char*) buf, buffer ); return true; } @@ -261,126 +271,150 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const bool wxTextDataObject::SetData(const wxDataFormat& format, size_t WXUNUSED(len), const void *buf) { - wxWCharBuffer buffer = GetConv(format).cMB2WX((const char *)buf); - if ( !buffer ) + if ( buf == NULL ) return false; - SetText(buffer); + wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf ); + + SetText( buffer ); return true; } -#elif wxUSE_UNICODE && defined(__WXMAC__) - -static wxMBConvUTF16 sUTF16Converter ; - -static inline wxMBConv& GetConv(const wxDataFormat& format) -{ - return format == wxDF_UNICODETEXT ? sUTF16Converter : (wxMBConv&) wxConvLocal; -} +#else // wxUSE_UNICODE_UTF8 size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const { - size_t len = GetConv(format).WC2MB( NULL , GetText().c_str() , 0 ) - + ( format == wxDF_UNICODETEXT ? 2 : 1 ) ; - return len ; + if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 ) + { + return m_text.utf8_length(); + } + else // wxDF_TEXT + { + const wxCharBuffer buf(wxConvLocal.cWC2MB(m_text.wc_str())); + return buf ? strlen(buf) : 0; + } } bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const { - wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() ); - if ( !buffer ) + if ( !buf ) return false; - size_t len = GetConv(format).WC2MB( NULL , GetText().c_str() , 0 ) - + ( format == wxDF_UNICODETEXT ? 2 : 1 ) ; + if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 ) + { + memcpy(buf, m_text.utf8_str(), m_text.utf8_length()); + } + else // wxDF_TEXT + { + const wxCharBuffer bufLocal(wxConvLocal.cWC2MB(m_text.wc_str())); + if ( !bufLocal ) + return false; - memcpy( (char*) buf, (const char*) buffer , len ); // trailing (uni)char 0 + memcpy(buf, bufLocal, strlen(bufLocal)); + } return true; } bool wxTextDataObject::SetData(const wxDataFormat& format, - size_t WXUNUSED(len), const void *buf) + size_t len, const void *buf_) { - wxWCharBuffer buffer = GetConv(format).cMB2WX((const char *)buf); - if ( !buffer ) + const char * const buf = static_cast(buf_); + + if ( buf == NULL ) return false; - - SetText(buffer); - + + if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 ) + { + // normally the data is in UTF-8 so we could use FromUTF8Unchecked() + // but it's not absolutely clear what GTK+ does if the clipboard data + // is not in UTF-8 so do an extra check for tranquility, it shouldn't + // matter much if we lose a bit of performance when pasting from + // clipboard + m_text = wxString::FromUTF8(buf, len); + } + else // wxDF_TEXT, convert from current (non-UTF8) locale + { + m_text = wxConvLocal.cMB2WC(buf, len, NULL); + } + return true; } -#else +#endif // wxUSE_UNICODE_WCHAR/wxUSE_UNICODE_UTF8 -size_t wxTextDataObject::GetDataSize() const +#elif defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ) + +static wxMBConvUTF16 sUTF16Converter; + +static inline wxMBConv& GetConv(const wxDataFormat& format) { - return GetTextLength() * sizeof(wxChar); + return + format == wxDF_UNICODETEXT + ? (wxMBConv&) sUTF16Converter + : (wxMBConv&) wxConvLocal; } -bool wxTextDataObject::GetDataHere(void *buf) const +size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const { - wxStrcpy((wxChar *)buf, GetText().c_str()); + size_t len = GetConv(format).WC2MB( NULL, GetText().c_str(), 0 ); + len += (format == wxDF_UNICODETEXT ? 2 : 1); - return true; + return len; } -bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf) +bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const { - SetText(wxString((const wxChar *)buf)); + if ( buf == NULL ) + return false; + + wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() ); + + size_t len = GetConv(format).WC2MB( NULL, GetText().c_str(), 0 ); + len += (format == wxDF_UNICODETEXT ? 2 : 1); + + // trailing (uni)char 0 + memcpy( (char*)buf, (const char*)buffer, len ); return true; } -#endif +bool wxTextDataObject::SetData(const wxDataFormat& format, + size_t WXUNUSED(len), const void *buf) +{ + if ( buf == NULL ) + return false; -// ---------------------------------------------------------------------------- -// wxFileDataObjectBase -// ---------------------------------------------------------------------------- + wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf ); -// VZ: I don't need this in MSW finally, so if it is needed in wxGTK, it should -// be moved to gtk/dataobj.cpp -#if 0 + SetText( buffer ); -wxString wxFileDataObjectBase::GetFilenames() const -{ - wxString str; - size_t count = m_filenames.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - str << m_filenames[n] << wxT('\0'); - } + return true; +} + +#else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ - return str; +size_t wxTextDataObject::GetDataSize() const +{ + return GetTextLength() * sizeof(wxChar); } -void wxFileDataObjectBase::SetFilenames(const wxChar* filenames) +bool wxTextDataObject::GetDataHere(void *buf) const { - m_filenames.Empty(); + wxStrcpy( (wxChar*)buf, GetText().c_str() ); - wxString current; - for ( const wxChar *pc = filenames; ; pc++ ) - { - if ( *pc ) - { - current += *pc; - } - else - { - if ( !current ) - { - // 2 consecutive NULs - this is the end of the string - break; - } + return true; +} - m_filenames.Add(current); - current.Empty(); - } - } +bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf) +{ + SetText( wxString((const wxChar*)buf) ); + + return true; } -#endif // 0 +#endif // different wxTextDataObject implementations // ---------------------------------------------------------------------------- // wxCustomDataObject @@ -389,7 +423,8 @@ void wxFileDataObjectBase::SetFilenames(const wxChar* filenames) wxCustomDataObject::wxCustomDataObject(const wxDataFormat& format) : wxDataObjectSimple(format) { - m_data = (void *)NULL; + m_data = NULL; + m_size = 0; } wxCustomDataObject::~wxCustomDataObject() @@ -412,9 +447,9 @@ void *wxCustomDataObject::Alloc(size_t size) void wxCustomDataObject::Free() { - delete [] (char *)m_data; + delete [] (char*)m_data; m_size = 0; - m_data = (void *)NULL; + m_data = (void*)NULL; } size_t wxCustomDataObject::GetDataSize() const @@ -424,11 +459,14 @@ size_t wxCustomDataObject::GetDataSize() const bool wxCustomDataObject::GetDataHere(void *buf) const { + if ( buf == NULL ) + return false; + void *data = GetData(); - if ( !data ) + if ( data == NULL ) return false; - memcpy(buf, data, GetSize()); + memcpy( buf, data, GetSize() ); return true; } @@ -438,10 +476,11 @@ bool wxCustomDataObject::SetData(size_t size, const void *buf) Free(); m_data = Alloc(size); - if ( !m_data ) + if ( m_data == NULL ) return false; - memcpy(m_data, buf, m_size = size); + m_size = size; + memcpy( m_data, buf, m_size ); return true; } @@ -473,7 +512,7 @@ wxDragResult wxTextDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def) return wxDragNone; wxTextDataObject *dobj = (wxTextDataObject *)m_dataObject; - return OnDropText(x, y, dobj->GetText()) ? def : wxDragNone; + return OnDropText( x, y, dobj->GetText() ) ? def : wxDragNone; } // ---------------------------------------------------------------------------- @@ -491,7 +530,7 @@ wxDragResult wxFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def) return wxDragNone; wxFileDataObject *dobj = (wxFileDataObject *)m_dataObject; - return OnDropFiles(x, y, dobj->GetFilenames()) ? def : wxDragNone; + return OnDropFiles( x, y, dobj->GetFilenames() ) ? def : wxDragNone; } #endif // wxUSE_DRAG_AND_DROP