From 98ecad062135d7821740d9c92a9a61e1a676854b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 21 Jul 2008 15:53:21 +0000 Subject: [PATCH] avoid unnecessary conversions in wxTextDataObject code in UTF-8 build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dataobj.h | 14 ++++- src/common/dobjcmn.cpp | 124 ++++++++++++++++++++++++----------------- 2 files changed, 84 insertions(+), 54 deletions(-) diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index 8966541e4e..1dc04bef55 100644 --- a/include/wx/dataobj.h +++ b/include/wx/dataobj.h @@ -324,6 +324,14 @@ private: // wxTextDataObject contains text data // ---------------------------------------------------------------------------- +#if wxUSE_UNICODE + #if defined(__WXGTK20__) + #define wxNEEDS_UTF8_FOR_TEXT_DATAOBJ + #elif defined(__WXMAC__) + #define wxNEEDS_UTF16_FOR_TEXT_DATAOBJ + #endif +#endif // wxUSE_UNICODE + class WXDLLIMPEXP_CORE wxTextDataObject : public wxDataObjectSimple { public: @@ -351,7 +359,7 @@ public: // ---------------------------------- // some platforms have 2 and not 1 format for text data -#if wxUSE_UNICODE && (defined(__WXGTK20__) || defined(__WXMAC__)) +#if defined(wxNEEDS_UTF8_FOR_TEXT_DATAOBJ) || defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ) virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const { return 2; } virtual void GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction WXUNUSED(dir) = Get) const; @@ -363,7 +371,7 @@ public: size_t GetDataSize(const wxDataFormat& format) const; bool GetDataHere(const wxDataFormat& format, void *pBuf) const; bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf); -#else +#else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ virtual size_t GetDataSize() const; virtual bool GetDataHere(void *buf) const; virtual bool SetData(size_t len, const void *buf); @@ -380,7 +388,7 @@ public: { return SetData(len, buf); } -#endif +#endif // different wxTextDataObject implementations private: wxString m_text; diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp index 1dbe454bc0..02786e98cd 100644 --- a/src/common/dobjcmn.cpp +++ b/src/common/dobjcmn.cpp @@ -232,7 +232,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) { @@ -275,7 +281,70 @@ bool wxTextDataObject::SetData(const wxDataFormat& format, return true; } -#elif wxUSE_UNICODE && defined(__WXMAC__) +#else // wxUSE_UNICODE_UTF8 + +size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const +{ + 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 ) + return false; + + 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(buf, bufLocal, strlen(bufLocal)); + } + + return true; +} + +bool wxTextDataObject::SetData(const wxDataFormat& format, + size_t len, const void *buf_) +{ + const char * const buf = wx_static_cast(const char *, buf_); + + if ( buf == NULL ) + return false; + + 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; +} + +#endif // wxUSE_UNICODE_WCHAR/wxUSE_UNICODE_UTF8 + +#elif defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ) static wxMBConvUTF16 sUTF16Converter; @@ -324,7 +393,7 @@ bool wxTextDataObject::SetData(const wxDataFormat& format, return true; } -#else +#else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ size_t wxTextDataObject::GetDataSize() const { @@ -345,54 +414,7 @@ bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf) return true; } -#endif - -// ---------------------------------------------------------------------------- -// wxFileDataObjectBase -// ---------------------------------------------------------------------------- - -// 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 - -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 str; -} - -void wxFileDataObjectBase::SetFilenames(const wxChar* filenames) -{ - m_filenames.Empty(); - - 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(); - } - } -} - -#endif +#endif // different wxTextDataObject implementations // ---------------------------------------------------------------------------- // wxCustomDataObject -- 2.45.2