#include "wx/wxprec.h"
#ifndef WX_PRECOMP
+ #ifdef __WXMSW__
+ #include "wx/msw/missing.h"
+ #endif
#include "wx/intl.h"
#include "wx/log.h"
+ #include "wx/utils.h"
+ #include "wx/hashmap.h"
#endif
#include "wx/strconv.h"
#ifdef __WINDOWS__
#include "wx/msw/private.h"
- #include "wx/msw/missing.h"
#endif
#ifndef __WXWINCE__
#include "wx/encconv.h"
#include "wx/fontmap.h"
-#include "wx/utils.h"
#ifdef __WXMAC__
#ifndef __DARWIN__
size_t dstWritten = 0;
// the number of NULs terminating this string
- size_t nulLen wxDUMMY_INITIALIZE(0);
+ size_t nulLen = 0; // not really needed, but just to avoid warnings
// if we were not given the input size we just have to assume that the
// string is properly terminated as we have no way of knowing how long it
const wxCharBuffer
wxMBConv::cWC2MB(const wchar_t *inBuff, size_t inLen, size_t *outLen) const
{
- const size_t dstLen = FromWChar(NULL, 0, inBuff, inLen);
+ size_t dstLen = FromWChar(NULL, 0, inBuff, inLen);
if ( dstLen != wxCONV_FAILED )
{
- wxCharBuffer buf(dstLen - 1);
+ // special case of empty input: can't allocate 0 size buffer below as
+ // wxCharBuffer insists on NUL-terminating it
+ wxCharBuffer buf(dstLen ? dstLen - 1 : 1);
if ( FromWChar(buf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED )
{
if ( outLen )
*outLen = dstLen;
const size_t nulLen = GetMBNulLen();
- if ( !NotAllNULs(buf.data() + dstLen - nulLen, nulLen) )
+ if ( dstLen >= nulLen &&
+ !NotAllNULs(buf.data() + dstLen - nulLen, nulLen) )
{
// in this case the output is NUL-terminated and we're not
// supposed to count NUL
- (*outLen) -= nulLen;
+ *outLen -= nulLen;
}
}
#if wxUSE_FONTMAP
const wxChar **names = wxFontMapperBase::GetAllEncodingNames(WC_ENC);
#else // !wxUSE_FONTMAP
- static const wxChar *names[] =
+ static const wxChar *names_static[] =
{
#if SIZEOF_WCHAR_T == 4
_T("UCS-4"),
#endif
NULL
};
+ const wxChar **names = names_static;
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
for ( ; *names && ms_wcCharsetName.empty(); ++names )
}
#if wxUSE_THREADS
- // NB: iconv() is MT-safe, but each thread must use it's own iconv_t handle.
- // Unfortunately there is a couple of global wxCSConv objects such as
+ // NB: iconv() is MT-safe, but each thread must use its own iconv_t handle.
+ // Unfortunately there are a couple of global wxCSConv objects such as
// wxConvLocal that are used all over wx code, so we have to make sure
// the handle is used by at most one thread at the time. Otherwise
// only a few wx classes would be safe to use from non-main threads
}
wxMBConv_win32(const wxMBConv_win32& conv)
+ : wxMBConv()
{
m_CodePage = conv.m_CodePage;
m_minMBCharWidth = conv.m_minMBCharWidth;
int verMaj, verMin;
switch ( wxGetOsVersion(&verMaj, &verMin) )
{
- case wxWIN95:
+ case wxOS_WINDOWS_9X:
s_isWin98Or2k = verMaj >= 4 && verMin >= 10;
break;
- case wxWINDOWS_NT:
+ case wxOS_WINDOWS_NT:
s_isWin98Or2k = verMaj >= 5;
break;
Init( wxCFStringEncFromFontEnc(encoding) );
}
- ~wxMBConv_cocoa()
+ virtual ~wxMBConv_cocoa()
{
}
Init( wxMacGetSystemEncFromFontEnc(encoding) );
}
- ~wxMBConv_mac()
+ virtual ~wxMBConv_mac()
{
OSStatus status = noErr ;
- status = TECDisposeConverter(m_MB2WC_converter);
- status = TECDisposeConverter(m_WC2MB_converter);
+ if (m_MB2WC_converter)
+ status = TECDisposeConverter(m_MB2WC_converter);
+ if (m_WC2MB_converter)
+ status = TECDisposeConverter(m_WC2MB_converter);
}
-
- void Init( TextEncodingBase encoding)
+ void Init( TextEncodingBase encoding,TextEncodingVariant encodingVariant = kTextEncodingDefaultVariant ,
+ TextEncodingFormat encodingFormat = kTextEncodingDefaultFormat)
{
- OSStatus status = noErr ;
- m_char_encoding = encoding ;
+ m_MB2WC_converter = NULL ;
+ m_WC2MB_converter = NULL ;
+ m_char_encoding = CreateTextEncoding(encoding, encodingVariant, encodingFormat) ;
m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault, 0, kUnicode16BitFormat) ;
+ }
- status = TECCreateConverter(&m_MB2WC_converter,
+ virtual void CreateIfNeeded() const
+ {
+ if ( m_MB2WC_converter == NULL && m_WC2MB_converter == NULL )
+ {
+ OSStatus status = noErr ;
+ status = TECCreateConverter(&m_MB2WC_converter,
m_char_encoding,
m_unicode_encoding);
- status = TECCreateConverter(&m_WC2MB_converter,
+ wxASSERT_MSG( status == noErr , _("Unable to create TextEncodingConverter")) ;
+ status = TECCreateConverter(&m_WC2MB_converter,
m_unicode_encoding,
m_char_encoding);
+ wxASSERT_MSG( status == noErr , _("Unable to create TextEncodingConverter")) ;
+ }
}
size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
+ CreateIfNeeded() ;
OSStatus status = noErr ;
ByteCount byteOutLen ;
ByteCount byteInLen = strlen(psz) + 1;
size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
+ CreateIfNeeded() ;
OSStatus status = noErr ;
ByteCount byteOutLen ;
ByteCount byteInLen = wxWcslen(psz) * SIZEOF_WCHAR_T ;
virtual wxMBConv *Clone() const { return new wxMBConv_mac(*this); }
bool IsOk() const
- { return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL; }
+ {
+ CreateIfNeeded() ;
+ return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL;
+ }
-private:
- TECObjectRef m_MB2WC_converter;
- TECObjectRef m_WC2MB_converter;
+protected :
+ mutable TECObjectRef m_MB2WC_converter;
+ mutable TECObjectRef m_WC2MB_converter;
TextEncodingBase m_char_encoding;
TextEncodingBase m_unicode_encoding;
};
+// MB is decomposed (D) normalized UTF8
+
+class wxMBConv_macUTF8D : public wxMBConv_mac
+{
+public :
+ wxMBConv_macUTF8D()
+ {
+ Init( kTextEncodingUnicodeDefault , kUnicodeNoSubset , kUnicodeUTF8Format ) ;
+ m_uni = NULL;
+ m_uniBack = NULL ;
+ }
+
+ virtual ~wxMBConv_macUTF8D()
+ {
+ if (m_uni!=NULL)
+ DisposeUnicodeToTextInfo(&m_uni);
+ if (m_uniBack!=NULL)
+ DisposeUnicodeToTextInfo(&m_uniBack);
+ }
+
+ size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const
+ {
+ CreateIfNeeded() ;
+ OSStatus status = noErr ;
+ ByteCount byteOutLen ;
+ ByteCount byteInLen = wxWcslen(psz) * SIZEOF_WCHAR_T ;
+
+ char *tbuf = NULL ;
+
+ if (buf == NULL)
+ {
+ // Apple specs say at least 32
+ n = wxMax( 32, ((byteInLen / SIZEOF_WCHAR_T) * 8) + SIZEOF_WCHAR_T );
+ tbuf = (char*) malloc( n ) ;
+ }
+
+ ByteCount byteBufferLen = n ;
+ UniChar* ubuf = NULL ;
+
+#if SIZEOF_WCHAR_T == 4
+ wxMBConvUTF16 converter ;
+ size_t unicharlen = converter.WC2MB( NULL, psz, 0 ) ;
+ byteInLen = unicharlen ;
+ ubuf = (UniChar*) malloc( byteInLen + 2 ) ;
+ converter.WC2MB( (char*) ubuf, psz, unicharlen + 2 ) ;
+#else
+ ubuf = (UniChar*) psz ;
+#endif
+
+ // 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 ,
+ kUnicodeDefaultDirectionMask, 0, NULL, NULL, NULL, dcubuflen , &dcubufread , &dcubufwritten , dcubuf ) ;
+
+ // we now convert that decomposed buffer into UTF8
+
+ status = TECConvertText(
+ m_WC2MB_converter, (ConstTextPtr) dcubuf, dcubufwritten, &dcubufread,
+ (TextPtr) (buf ? buf : tbuf), byteBufferLen, &byteOutLen);
+
+ free( dcubuf );
+
+#if SIZEOF_WCHAR_T == 4
+ free( ubuf ) ;
+#endif
+
+ if ( buf == NULL )
+ free(tbuf) ;
+
+ size_t res = byteOutLen ;
+ if ( buf && res < n)
+ {
+ buf[res] = 0;
+ // don't test for round-trip fidelity yet, we cannot guarantee it yet
+ }
+
+ return res ;
+ }
+
+ size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
+ {
+ CreateIfNeeded() ;
+ OSStatus status = noErr ;
+ ByteCount byteOutLen ;
+ ByteCount byteInLen = strlen(psz) + 1;
+ 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 ) ;
+
+ status = TECConvertText(
+ m_MB2WC_converter, (ConstTextPtr) psz, byteInLen, &byteInLen,
+ (TextPtr) dcubuf, dcubuflen, &byteOutLen);
+ // 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 ,
+ 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 ) ;
+ free( ubuf ) ;
+#else
+ res = byteOutLen / sizeof( UniChar ) ;
+#endif
+
+ if ( buf == NULL )
+ free(tbuf) ;
+
+ if ( buf && res < n)
+ buf[res] = 0;
+
+ return res ;
+ }
+
+ virtual void CreateIfNeeded() const
+ {
+ wxMBConv_mac::CreateIfNeeded() ;
+ if ( m_uni == NULL )
+ {
+ m_map.unicodeEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault,
+ kUnicodeNoSubset, kTextEncodingDefaultFormat);
+ m_map.otherEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault,
+ kUnicodeCanonicalDecompVariant, kTextEncodingDefaultFormat);
+ m_map.mappingVersion = kUnicodeUseLatestMapping;
+
+ 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);
+ wxASSERT_MSG( err == noErr , _(" Couldn't create the UnicodeConverter")) ;
+ }
+ }
+protected :
+ mutable UnicodeToTextInfo m_uni;
+ mutable UnicodeToTextInfo m_uniBack;
+ mutable UnicodeMapping m_map;
+};
#endif // defined(__WXMAC__) && defined(TARGET_CARBON)
// ============================================================================
}
#if wxUSE_FONTMAP
-#include "wx/hashmap.h"
WX_DECLARE_HASH_MAP( wxFontEncoding, wxString, wxIntegerHash, wxIntegerEqual,
wxEncodingNameCache );
#endif // !wxUSE_FONTMAP
{
wxString name(m_name);
+#if wxUSE_FONTMAP
wxFontEncoding encoding(m_encoding);
+#endif
if ( !name.empty() )
{
}
const wxChar** names = wxFontMapperBase::GetAllEncodingNames(encoding);
-
- for ( ; *names; ++names )
+ // 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
+ // 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 )
{
- wxMBConv_iconv *conv = new wxMBConv_iconv(*names);
- if ( conv->IsOk() )
+ for ( ; *names; ++names )
{
- gs_nameCache[encoding] = *names;
- return conv;
+ wxMBConv_iconv *conv = new wxMBConv_iconv(*names);
+ if ( conv->IsOk() )
+ {
+ gs_nameCache[encoding] = *names;
+ return conv;
+ }
+
+ delete conv;
}
- delete conv;
+ gs_nameCache[encoding] = _T(""); // cache the failure
}
-
- gs_nameCache[encoding] = _T(""); // cache the failure
}
#endif // wxUSE_FONTMAP
}
// NB: This is a hack to prevent deadlock. What could otherwise happen
// in Unicode build: wxConvLocal creation ends up being here
// because of some failure and logs the error. But wxLog will try to
- // attach timestamp, for which it will need wxConvLocal (to convert
- // time to char* and then wchar_t*), but that fails, tries to log
- // error, but wxLog has a (already locked) critical section that
- // guards static buffer.
+ // attach a timestamp, for which it will need wxConvLocal (to convert
+ // time to char* and then wchar_t*), but that fails, tries to log the
+ // error, but wxLog has an (already locked) critical section that
+ // guards the static buffer.
static bool alreadyLoggingError = false;
if (!alreadyLoggingError)
{
#if wxUSE_FONTMAP
wxFontMapperBase::GetEncodingDescription(m_encoding).c_str()
#else // !wxUSE_FONTMAP
- wxString::Format(_("encoding %s"), m_encoding).c_str()
+ wxString::Format(_("encoding %i"), m_encoding).c_str()
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
);
{
wxCSConv *self = (wxCSConv *)this; // const_cast
-#if wxUSE_INTL
// if we don't have neither the name nor the encoding, use the default
// encoding for this system
if ( !m_name && m_encoding == wxFONTENCODING_SYSTEM )
{
+#if wxUSE_INTL
self->m_name = wxStrdup(wxLocale::GetSystemEncodingName());
- }
+#else
+ // fallback to some reasonable default:
+ self->m_encoding = wxFONTENCODING_ISO8859_1;
#endif // wxUSE_INTL
+ }
self->m_convReal = DoCreate();
self->m_deferred = false;
static wxCSConv wxConvISO8859_1Obj(wxFONTENCODING_ISO8859_1);
static wxMBConvUTF7 wxConvUTF7Obj;
static wxMBConvUTF8 wxConvUTF8Obj;
-
+#if defined(__WXMAC__) && defined(TARGET_CARBON)
+static wxMBConv_macUTF8D wxConvMacUTF8DObj;
+#endif
WXDLLIMPEXP_DATA_BASE(wxMBConv&) wxConvLibc = wxConvLibcObj;
WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvLocal = wxConvLocalObj;
WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvISO8859_1 = wxConvISO8859_1Obj;
WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI = &wxConvLocal;
WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName = &
#ifdef __WXOSX__
+#if defined(__WXMAC__) && defined(TARGET_CARBON)
+ wxConvMacUTF8DObj;
+#else
wxConvUTF8Obj;
+#endif
#else
wxConvLibcObj;
#endif
projects / wxWidgets.git / blobdiff