X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..c1dda21b64f300d89cbc084802082d37c694e971:/src/common/strconv.cpp diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index b83ff1a340..2fd2d740b3 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -26,11 +26,6 @@ #if wxUSE_WCHAR_T -#ifdef __WINDOWS__ - #include "wx/msw/private.h" - #include "wx/msw/missing.h" -#endif - #ifndef __WXWINCE__ #include #endif @@ -40,6 +35,8 @@ #include #if defined(__WIN32__) && !defined(__WXMICROWIN__) + #include "wx/msw/private.h" + #include "wx/msw/missing.h" #define wxHAVE_WIN32_MB2WC #endif @@ -2773,7 +2770,7 @@ public: wxASSERT_MSG( status == noErr , _("Unable to create TextEncodingConverter")) ; } } - + size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const { CreateIfNeeded() ; @@ -2888,9 +2885,9 @@ public: virtual wxMBConv *Clone() const { return new wxMBConv_mac(*this); } bool IsOk() const - { + { CreateIfNeeded() ; - return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL; + return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL; } protected : @@ -2906,13 +2903,13 @@ protected : class wxMBConv_macUTF8D : public wxMBConv_mac { public : - wxMBConv_macUTF8D() + wxMBConv_macUTF8D() { Init( kTextEncodingUnicodeDefault , kUnicodeNoSubset , kUnicodeUTF8Format ) ; m_uni = NULL; m_uniBack = NULL ; } - + virtual ~wxMBConv_macUTF8D() { if (m_uni!=NULL) @@ -2920,7 +2917,7 @@ public : if (m_uniBack!=NULL) DisposeUnicodeToTextInfo(&m_uniBack); } - + size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const { CreateIfNeeded() ; @@ -2950,15 +2947,15 @@ public : ubuf = (UniChar*) psz ; #endif - // ubuf is a non-decomposed UniChar buffer - + // ubuf is a non-decomposed UniChar buffer + ByteCount dcubuflen = byteInLen * 2 + 2 ; ByteCount dcubufread , dcubufwritten ; - UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; - - ConvertFromUnicodeToText( m_uni , byteInLen , ubuf , + UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; + + ConvertFromUnicodeToText( m_uni , byteInLen , ubuf , kUnicodeDefaultDirectionMask, 0, NULL, NULL, NULL, dcubuflen , &dcubufread , &dcubufwritten , dcubuf ) ; - + // we now convert that decomposed buffer into UTF8 status = TECConvertText( @@ -2983,7 +2980,7 @@ public : return res ; } - + size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const { CreateIfNeeded() ; @@ -2993,25 +2990,25 @@ public : wchar_t *tbuf = NULL ; UniChar* ubuf = NULL ; size_t res = 0 ; - + if (buf == NULL) { // Apple specs say at least 32 n = wxMax( 32, byteInLen ) ; tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T ) ; } - + ByteCount byteBufferLen = n * sizeof( UniChar ) ; - + #if SIZEOF_WCHAR_T == 4 ubuf = (UniChar*) malloc( byteBufferLen + 2 ) ; #else ubuf = (UniChar*) (buf ? buf : tbuf) ; #endif - + ByteCount dcubuflen = byteBufferLen * 2 + 2 ; ByteCount dcubufread , dcubufwritten ; - UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; + UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; status = TECConvertText( m_MB2WC_converter, (ConstTextPtr) psz, byteInLen, &byteInLen, @@ -3019,16 +3016,16 @@ public : // we have to terminate here, because n might be larger for the trailing zero, and if UniChar // is not properly terminated we get random characters at the end dcubuf[byteOutLen / sizeof( UniChar ) ] = 0 ; - + // now from the decomposed UniChar to properly composed uniChar - ConvertFromUnicodeToText( m_uniBack , byteOutLen , dcubuf , + ConvertFromUnicodeToText( m_uniBack , byteOutLen , dcubuf , kUnicodeDefaultDirectionMask, 0, NULL, NULL, NULL, dcubuflen , &dcubufread , &dcubufwritten , ubuf ) ; free( dcubuf ); byteOutLen = dcubufwritten ; ubuf[byteOutLen / sizeof( UniChar ) ] = 0 ; - - + + #if SIZEOF_WCHAR_T == 4 wxMBConvUTF16 converter ; res = converter.MB2WC( (buf ? buf : tbuf), (const char*)ubuf, n ) ; @@ -3036,13 +3033,13 @@ public : #else res = byteOutLen / sizeof( UniChar ) ; #endif - + if ( buf == NULL ) free(tbuf) ; - + if ( buf && res < n) buf[res] = 0; - + return res ; } @@ -3056,16 +3053,16 @@ public : m_map.otherEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault, kUnicodeCanonicalDecompVariant, kTextEncodingDefaultFormat); m_map.mappingVersion = kUnicodeUseLatestMapping; - - OSStatus err = CreateUnicodeToTextInfo(&m_map, &m_uni); + + OSStatus err = CreateUnicodeToTextInfo(&m_map, &m_uni); wxASSERT_MSG( err == noErr , _(" Couldn't create the UnicodeConverter")) ; - + m_map.unicodeEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault, kUnicodeNoSubset, kTextEncodingDefaultFormat); m_map.otherEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault, kUnicodeCanonicalCompVariant, kTextEncodingDefaultFormat); m_map.mappingVersion = kUnicodeUseLatestMapping; - err = CreateUnicodeToTextInfo(&m_map, &m_uniBack); + err = CreateUnicodeToTextInfo(&m_map, &m_uniBack); wxASSERT_MSG( err == noErr , _(" Couldn't create the UnicodeConverter")) ; } } @@ -3073,7 +3070,7 @@ protected : mutable UnicodeToTextInfo m_uni; mutable UnicodeToTextInfo m_uniBack; mutable UnicodeMapping m_map; -}; +}; #endif // defined(__WXMAC__) && defined(TARGET_CARBON) // ============================================================================ @@ -3340,7 +3337,7 @@ wxMBConv *wxCSConv::DoCreate() const const wxChar** names = wxFontMapperBase::GetAllEncodingNames(encoding); // CS : in case this does not return valid names (eg for MacRoman) encoding - // got a 'failure' entry in the cache all the same, although it just has to + // got a 'failure' entry in the cache all the same, although it just has to // be created using a different method, so only store failed iconv creation // attempts (or perhaps we shoulnd't do this at all ?) if ( names[0] != NULL ) @@ -3516,6 +3513,43 @@ void wxCSConv::CreateConvIfNeeded() const } } +bool wxCSConv::IsOk() const +{ + CreateConvIfNeeded(); + + // special case: no convReal created for wxFONTENCODING_ISO8859_1 + if ( m_encoding == wxFONTENCODING_ISO8859_1 ) + return true; // always ok as we do it ourselves + + // m_convReal->IsOk() is called at its own creation, so we know it must + // be ok if m_convReal is non-NULL + return m_convReal != NULL; +} + +size_t wxCSConv::ToWChar(wchar_t *dst, size_t dstLen, + const char *src, size_t srcLen) const +{ + CreateConvIfNeeded(); + + if (m_convReal) + return m_convReal->ToWChar(dst, dstLen, src, srcLen); + + // latin-1 (direct) + return wxMBConv::ToWChar(dst, dstLen, src, srcLen); +} + +size_t wxCSConv::FromWChar(char *dst, size_t dstLen, + const wchar_t *src, size_t srcLen) const +{ + CreateConvIfNeeded(); + + if (m_convReal) + return m_convReal->FromWChar(dst, dstLen, src, srcLen); + + // latin-1 (direct) + return wxMBConv::FromWChar(dst, dstLen, src, srcLen); +} + size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const { CreateConvIfNeeded(); @@ -3611,9 +3645,39 @@ WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName = & #else wxConvUTF8Obj; #endif -#else +#else // !__WXOSX__ wxConvLibcObj; -#endif +#endif // __WXOSX__/!__WXOSX__ + +#if wxUSE_UNICODE + +wxWCharBuffer wxSafeConvertMB2WX(const char *s) +{ + if ( !s ) + return wxWCharBuffer(); + + wxWCharBuffer wbuf(wxConvLibc.cMB2WX(s)); + if ( !wbuf ) + wbuf = wxConvUTF8.cMB2WX(s); + if ( !wbuf ) + wbuf = wxConvISO8859_1.cMB2WX(s); + + return wbuf; +} + +wxCharBuffer wxSafeConvertWX2MB(const wchar_t *ws) +{ + if ( !ws ) + return wxCharBuffer(); + + wxCharBuffer buf(wxConvLibc.cWX2MB(ws)); + if ( !buf ) + buf = wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL).cWX2MB(ws); + + return buf; +} + +#endif // wxUSE_UNICODE #else // !wxUSE_WCHAR_T