X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2c906a490735b158266030c0531ab779257d0aff..f239a20092359e3c914adb79bd39f3f5d2b2e06f:/src/common/dobjcmn.cpp?ds=inline diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp index cbed32d72f..f019177524 100644 --- a/src/common/dobjcmn.cpp +++ b/src/common/dobjcmn.cpp @@ -18,13 +18,12 @@ #if wxUSE_DATAOBJ +#include "wx/dataobj.h" + #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/debug.h" #endif -#include "wx/dataobj.h" - // ---------------------------------------------------------------------------- // lists // ---------------------------------------------------------------------------- @@ -86,6 +85,7 @@ bool wxDataObjectBase::IsSupported(const wxDataFormat& format, wxDataObjectComposite::wxDataObjectComposite() { m_preferred = 0; + m_receivedFormat = wxFormatInvalid; } wxDataObjectComposite::~wxDataObjectComposite() @@ -94,22 +94,19 @@ wxDataObjectComposite::~wxDataObjectComposite() } wxDataObjectSimple * -wxDataObjectComposite::GetObject(const wxDataFormat& format) const +wxDataObjectComposite::GetObject(const wxDataFormat& format, wxDataObjectBase::Direction dir) const { wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.GetFirst(); + while ( node ) { wxDataObjectSimple *dataObj = node->GetData(); - if ( dataObj->GetFormat() == format ) - { - return dataObj; - } - + if (dataObj->IsSupported(format,dir)) + return dataObj; node = node->GetNext(); } - - return (wxDataObjectSimple *)NULL; + return NULL; } void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred) @@ -120,6 +117,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 { @@ -171,21 +173,33 @@ void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size, #endif -size_t wxDataObjectComposite::GetFormatCount(Direction WXUNUSED(dir)) const +size_t wxDataObjectComposite::GetFormatCount(Direction dir) const { - // TODO what about the Get/Set only formats? - return m_dataObjects.GetCount(); + size_t n = 0; + + // NOTE: some wxDataObjectSimple objects may return a number greater than 1 + // from GetFormatCount(): this is the case of e.g. wxTextDataObject + // under wxMac and wxGTK + wxSimpleDataObjectList::compatibility_iterator node; + for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() ) + n += node->GetData()->GetFormatCount(dir); + + return n; } void wxDataObjectComposite::GetAllFormats(wxDataFormat *formats, - Direction WXUNUSED(dir)) const + Direction dir) const { - size_t n = 0; + size_t index(0); wxSimpleDataObjectList::compatibility_iterator node; + for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() ) { - // TODO if ( !outputOnlyToo ) && this one counts ... - formats[n++] = node->GetData()->GetFormat(); + // NOTE: some wxDataObjectSimple objects may return more than 1 format + // from GetAllFormats(): this is the case of e.g. wxTextDataObject + // under wxMac and wxGTK + node->GetData()->GetAllFormats(formats+index, dir); + index += node->GetData()->GetFormatCount(dir); } } @@ -219,6 +233,7 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format, wxCHECK_MSG( dataObj, false, wxT("unsupported format in wxDataObjectComposite")); + m_receivedFormat = format; return dataObj->SetData( len, buf ); } @@ -226,7 +241,13 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format, // 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) { @@ -243,12 +264,15 @@ size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const { - if ( buf == NULL ) + 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; } @@ -266,124 +290,137 @@ bool wxTextDataObject::SetData(const wxDataFormat& format, return true; } -#elif wxUSE_UNICODE && defined(__WXMAC__) - -static wxMBConvUTF16 sUTF16Converter; - -static inline wxMBConv& GetConv(const wxDataFormat& format) -{ - return - format == wxDF_UNICODETEXT - ? (wxMBConv&) 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 ); - len += (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 { - if ( buf == NULL ) + if ( !buf ) 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); + 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; - // trailing (uni)char 0 - memcpy( (char*)buf, (const char*)buffer, len ); + 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_) { + const char * const buf = static_cast(buf_); + if ( buf == NULL ) return false; - wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf ); - - 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) + +namespace { - return GetTextLength() * sizeof(wxChar); + +inline wxMBConv& GetConv(const wxDataFormat& format) +{ + static wxMBConvUTF16 s_UTF16Converter; + + return format == wxDF_UNICODETEXT ? static_cast(s_UTF16Converter) + : static_cast(wxConvLocal); } -bool wxTextDataObject::GetDataHere(void *buf) const +} // anonymous namespace + +size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const { - wxStrcpy( (wxChar*)buf, GetText().c_str() ); + return GetConv(format).WC2MB(NULL, GetText().wc_str(), 0); +} + +bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const +{ + if ( buf == NULL ) + return false; + + wxCharBuffer buffer(GetConv(format).cWX2MB(GetText().c_str())); + + memcpy(buf, buffer.data(), buffer.length()); return true; } -bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf) +bool wxTextDataObject::SetData(const wxDataFormat& format, + size_t WXUNUSED(len), + const void *buf) { - SetText( wxString((const wxChar*)buf) ); + if ( buf == NULL ) + return false; + + SetText(GetConv(format).cMB2WX(static_cast(buf))); return true; } -#endif - -// ---------------------------------------------------------------------------- -// wxFileDataObjectBase -// ---------------------------------------------------------------------------- +#else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ -// 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 +size_t wxTextDataObject::GetDataSize() const +{ + return GetTextLength() * sizeof(wxChar); +} -wxString wxFileDataObjectBase::GetFilenames() const +bool wxTextDataObject::GetDataHere(void *buf) const { - wxString str; - size_t count = m_filenames.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - str << m_filenames[n] << wxT('\0'); - } + // NOTE: use wxTmemcpy() instead of wxStrncpy() to allow + // retrieval of strings with embedded NULLs + wxTmemcpy( (wxChar*)buf, GetText().c_str(), GetTextLength() ); - return str; + return true; } -void wxFileDataObjectBase::SetFilenames(const wxChar* filenames) +bool wxTextDataObject::SetData(size_t len, const void *buf) { - m_filenames.Empty(); + SetText( wxString((const wxChar*)buf, len/sizeof(wxChar)) ); - 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; - } - - m_filenames.Add(current); - current.Empty(); - } - } + return true; } -#endif +#endif // different wxTextDataObject implementations // ---------------------------------------------------------------------------- // wxCustomDataObject @@ -418,7 +455,7 @@ void wxCustomDataObject::Free() { delete [] (char*)m_data; m_size = 0; - m_data = (void*)NULL; + m_data = NULL; } size_t wxCustomDataObject::GetDataSize() const