/////////////////////////////////////////////////////////////////////////////
-// Name: strconv.cpp
+// Name: src/common/strconv.cpp
// Purpose: Unicode conversion classes
-// Author: Ove Kaaven, Robert Roebling, Vadim Zeitlin, Vaclav Slavik
+// Author: Ove Kaaven, Robert Roebling, Vadim Zeitlin, Vaclav Slavik,
+// Ryan Norton, Fredrik Roubert (UTF7)
// Modified by:
// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1999 Ove Kaaven, Robert Roebling, Vaclav Slavik
// (c) 2000-2003 Vadim Zeitlin
+// (c) 2004 Ryan Norton, Fredrik Roubert
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "strconv.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_WCHAR_T
-#ifdef __WXMSW__
- #include "wx/msw/private.h"
-#endif
-
#ifdef __WINDOWS__
+ #include "wx/msw/private.h"
#include "wx/msw/missing.h"
#endif
#define wxHAVE_WIN32_MB2WC
#endif // __WIN32__ but !__WXMICROWIN__
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
#ifdef __SALFORDC__
#include <clib.h>
#endif
#ifdef HAVE_ICONV
#include <iconv.h>
+ #include "wx/thread.h"
#endif
#include "wx/encconv.h"
#include "wx/utils.h"
#ifdef __WXMAC__
+#ifndef __DARWIN__
#include <ATSUnicode.h>
#include <TextCommon.h>
#include <TextEncodingConverter.h>
+#endif
#include "wx/mac/private.h" // includes mac headers
#endif
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-#define BSWAP_UCS4(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT32_SWAP_ALWAYS(str[_c]); }
-#define BSWAP_UTF16(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT16_SWAP_ALWAYS(str[_c]); }
+#define TRACE_STRCONV _T("strconv")
-#if SIZEOF_WCHAR_T == 4
- #define WC_NAME "UCS4"
- #define WC_BSWAP BSWAP_UCS4
- #ifdef WORDS_BIGENDIAN
- #define WC_NAME_BEST "UCS-4BE"
- #else
- #define WC_NAME_BEST "UCS-4LE"
- #endif
-#elif SIZEOF_WCHAR_T == 2
- #define WC_NAME "UTF16"
- #define WC_BSWAP BSWAP_UTF16
+#if SIZEOF_WCHAR_T == 2
#define WC_UTF16
- #ifdef WORDS_BIGENDIAN
- #define WC_NAME_BEST "UTF-16BE"
- #else
- #define WC_NAME_BEST "UTF-16LE"
- #endif
-#else // sizeof(wchar_t) != 2 nor 4
- // does this ever happen?
- #error "Unknown sizeof(wchar_t): please report this to wx-dev@lists.wxwindows.org"
#endif
// ============================================================================
output = *input;
return 1;
}
- else if ((input[1]<0xdc00) || (input[1]>=0xdfff))
+ else if ((input[1]<0xdc00) || (input[1]>0xdfff))
{
output = *input;
return (size_t)-1;
return buf;
}
+const wxWCharBuffer
+wxMBConv::cMB2WC(const char *in, size_t inLen, size_t *outLen) const
+{
+ // the currently accumulated wide characters
+ wxWCharBuffer wbuf;
+
+ // the current length of wbuf
+ size_t lenBuf = 0;
+
+ // we need to know the representation of L'\0' for this conversion
+ size_t nulLen;
+ const char * const nul = GetMBNul(&nulLen);
+ if ( nulLen == (size_t)-1 || nulLen == 0 )
+ return wxWCharBuffer();
+
+ // make a copy of the input string unless it is already properly
+ // NUL-terminated
+ wxCharBuffer bufTmp;
+
+ // now we can compute the input size if we were not given it: notice that
+ // in this case the string must be properly NUL-terminated, of course, as
+ // otherwise we have no way of knowing how long it is
+ if ( inLen == (size_t)-1 )
+ {
+ // not the most efficient algorithm but it shouldn't matter as normally
+ // there are not many NULs in the string and so normally memcmp()
+ // should stop on the first character
+ const char *p = in;
+ while ( memcmp(p, nul, nulLen) != 0 )
+ p++;
+
+ inLen = p - in + nulLen;
+ }
+ else // we already have the size
+ {
+ // check if it's not already NUL-terminated too to avoid the copy
+ if ( inLen < nulLen || memcmp(in + inLen - nulLen, nul, nulLen) != 0 )
+ {
+ // make a copy in order to properly NUL-terminate the string
+ bufTmp = wxCharBuffer(inLen + nulLen - 1 /* 1 will be added */);
+ memcpy(bufTmp.data(), in, inLen);
+ memcpy(bufTmp.data() + inLen, nul, nulLen);
+ }
+ }
+
+ if ( bufTmp )
+ in = bufTmp;
+
+ for ( const char * const inEnd = in + inLen;; )
+ {
+ // try to convert the current chunk if anything left
+ size_t lenChunk = in < inEnd ? MB2WC(NULL, in, 0) : 0;
+ if ( lenChunk == 0 )
+ {
+ // nothing left in the input string, conversion succeeded
+ if ( outLen )
+ {
+ // we shouldn't include the last NUL in the result length
+ *outLen = lenBuf ? lenBuf - 1 : 0;
+ }
+
+ return wbuf;
+ }
+
+ if ( lenChunk == (size_t)-1 )
+ break;
+
+ const size_t lenBufNew = lenBuf + lenChunk;
+ if ( !wbuf.extend(lenBufNew) )
+ break;
+
+ lenChunk = MB2WC(wbuf.data() + lenBuf, in, lenChunk + 1 /* for NUL */);
+ if ( lenChunk == (size_t)-1 )
+ break;
+
+ // +! for the embedded NUL (if something follows)
+ lenBuf = lenBufNew + 1;
+
+ // advance the input pointer past the end of this chunk
+ while ( memcmp(in, nul, nulLen) != 0 )
+ in++;
+
+ in += nulLen; // skipping over its terminator as well
+ }
+
+ // conversion failed
+ if ( outLen )
+ *outLen = 0;
+
+ return wxWCharBuffer();
+}
+
+const wxCharBuffer
+wxMBConv::cWC2MB(const wchar_t *in, size_t inLen, size_t *outLen) const
+{
+ // the currently accumulated multibyte characters
+ wxCharBuffer buf;
+
+ // the current length of buf
+ size_t lenBuf = 0;
+
+ // make a copy of the input string unless it is already properly
+ // NUL-terminated
+ //
+ // if we don't know its length we have no choice but to assume that it is,
+ // indeed, properly terminated
+ wxWCharBuffer bufTmp;
+ if ( inLen == (size_t)-1 )
+ {
+ inLen = wxWcslen(in) + 1;
+ }
+ else if ( inLen != 0 && in[inLen - 1] != L'\0' )
+ {
+ // make a copy in order to properly NUL-terminate the string
+ bufTmp = wxWCharBuffer(inLen);
+ memcpy(bufTmp.data(), in, inLen*sizeof(wchar_t));
+ }
+
+ if ( bufTmp )
+ in = bufTmp;
+
+ for ( const wchar_t * const inEnd = in + inLen;; )
+ {
+ // try to convert the current chunk, if anything left
+ size_t lenChunk = in < inEnd ? WC2MB(NULL, in, 0) : 0;
+ if ( lenChunk == 0 )
+ {
+ // nothing left in the input string, conversion succeeded
+ if ( outLen )
+ *outLen = lenBuf ? lenBuf - 1 : lenBuf;
+
+ return buf;
+ }
+
+ if ( lenChunk == (size_t)-1 )
+ break;
+
+ const size_t lenBufNew = lenBuf + lenChunk;
+ if ( !buf.extend(lenBufNew) )
+ break;
+
+ lenChunk = WC2MB(buf.data() + lenBuf, in, lenChunk + 1 /* for NUL */);
+ if ( lenChunk == (size_t)-1 )
+ break;
+
+ // chunk successfully converted, go to the next one
+ in += wxWcslen(in) + 1 /* skip NUL too */;
+ lenBuf = lenBufNew + 1;
+ }
+
+ // conversion failed
+ if ( outLen )
+ *outLen = 0;
+
+ return wxCharBuffer();
+}
+
// ----------------------------------------------------------------------------
// wxMBConvLibc
// ----------------------------------------------------------------------------
return wxWC2MB(buf, psz, n);
}
+// ----------------------------------------------------------------------------
+// wxConvBrokenFileNames
+// ----------------------------------------------------------------------------
+
+#ifdef __UNIX__
+
+wxConvBrokenFileNames::wxConvBrokenFileNames(const wxChar *charset)
+{
+ if ( !charset || wxStricmp(charset, _T("UTF-8")) == 0
+ || wxStricmp(charset, _T("UTF8")) == 0 )
+ m_conv = new wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL);
+ else
+ m_conv = new wxCSConv(charset);
+}
+
+#endif // __UNIX__
+
// ----------------------------------------------------------------------------
// UTF-7
// ----------------------------------------------------------------------------
-#if 0
-static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "abcdefghijklmnopqrstuvwxyz"
- "0123456789'(),-./:?";
-static char utf7_setO[]="!\"#$%&*;<=>@[]^_`{|}";
-static char utf7_setB[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "abcdefghijklmnopqrstuvwxyz"
- "0123456789+/";
-#endif
+// Implementation (C) 2004 Fredrik Roubert
+
+//
+// BASE64 decoding table
+//
+static const unsigned char utf7unb64[] =
+{
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0x3e, 0xff, 0xff, 0xff, 0x3f,
+ 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
+ 0x3c, 0x3d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
+ 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
+ 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
+ 0x17, 0x18, 0x19, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
+ 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
+ 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
+ 0x31, 0x32, 0x33, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+};
-// TODO: write actual implementations of UTF-7 here
-size_t wxMBConvUTF7::MB2WC(wchar_t * WXUNUSED(buf),
- const char * WXUNUSED(psz),
- size_t WXUNUSED(n)) const
+size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
- return (size_t)-1;
+ size_t len = 0;
+
+ while ( *psz && (!buf || (len < n)) )
+ {
+ unsigned char cc = *psz++;
+ if (cc != '+')
+ {
+ // plain ASCII char
+ if (buf)
+ *buf++ = cc;
+ len++;
+ }
+ else if (*psz == '-')
+ {
+ // encoded plus sign
+ if (buf)
+ *buf++ = cc;
+ len++;
+ psz++;
+ }
+ else // start of BASE64 encoded string
+ {
+ bool lsb, ok;
+ unsigned int d, l;
+ for ( ok = lsb = false, d = 0, l = 0;
+ (cc = utf7unb64[(unsigned char)*psz]) != 0xff;
+ psz++ )
+ {
+ d <<= 6;
+ d += cc;
+ for (l += 6; l >= 8; lsb = !lsb)
+ {
+ unsigned char c = (unsigned char)((d >> (l -= 8)) % 256);
+ if (lsb)
+ {
+ if (buf)
+ *buf++ |= c;
+ len ++;
+ }
+ else
+ {
+ if (buf)
+ *buf = (wchar_t)(c << 8);
+ }
+
+ ok = true;
+ }
+ }
+
+ if ( !ok )
+ {
+ // in valid UTF7 we should have valid characters after '+'
+ return (size_t)-1;
+ }
+
+ if (*psz == '-')
+ psz++;
+ }
+ }
+
+ if ( buf && (len < n) )
+ *buf = '\0';
+
+ return len;
}
-size_t wxMBConvUTF7::WC2MB(char * WXUNUSED(buf),
- const wchar_t * WXUNUSED(psz),
- size_t WXUNUSED(n)) const
+//
+// BASE64 encoding table
+//
+static const unsigned char utf7enb64[] =
{
- return (size_t)-1;
+ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+ 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+ 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+ 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+ 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+ 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+ 'w', 'x', 'y', 'z', '0', '1', '2', '3',
+ '4', '5', '6', '7', '8', '9', '+', '/'
+};
+
+//
+// UTF-7 encoding table
+//
+// 0 - Set D (directly encoded characters)
+// 1 - Set O (optional direct characters)
+// 2 - whitespace characters (optional)
+// 3 - special characters
+//
+static const unsigned char utf7encode[128] =
+{
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 2, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 2, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 3, 0, 0, 0, 3,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0,
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 1, 1, 1,
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 3
+};
+
+size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+ size_t len = 0;
+
+ while (*psz && ((!buf) || (len < n)))
+ {
+ wchar_t cc = *psz++;
+ if (cc < 0x80 && utf7encode[cc] < 1)
+ {
+ // plain ASCII char
+ if (buf)
+ *buf++ = (char)cc;
+ len++;
+ }
+#ifndef WC_UTF16
+ else if (((wxUint32)cc) > 0xffff)
+ {
+ // no surrogate pair generation (yet?)
+ return (size_t)-1;
+ }
+#endif
+ else
+ {
+ if (buf)
+ *buf++ = '+';
+ len++;
+ if (cc != '+')
+ {
+ // BASE64 encode string
+ unsigned int lsb, d, l;
+ for (d = 0, l = 0; /*nothing*/; psz++)
+ {
+ for (lsb = 0; lsb < 2; lsb ++)
+ {
+ d <<= 8;
+ d += lsb ? cc & 0xff : (cc & 0xff00) >> 8;
+
+ for (l += 8; l >= 6; )
+ {
+ l -= 6;
+ if (buf)
+ *buf++ = utf7enb64[(d >> l) % 64];
+ len++;
+ }
+ }
+ cc = *psz;
+ if (!(cc) || (cc < 0x80 && utf7encode[cc] < 1))
+ break;
+ }
+ if (l != 0)
+ {
+ if (buf)
+ *buf++ = utf7enb64[((d % 16) << (6 - l)) % 64];
+ len++;
+ }
+ }
+ if (buf)
+ *buf++ = '-';
+ len++;
+ }
+ }
+ if (buf && (len < n))
+ *buf = 0;
+ return len;
}
// ----------------------------------------------------------------------------
static wxUint32 utf8_max[]=
{ 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff };
+// boundaries of the private use area we use to (temporarily) remap invalid
+// characters invalid in a UTF-8 encoded string
+const wxUint32 wxUnicodePUA = 0x100000;
+const wxUint32 wxUnicodePUAEnd = wxUnicodePUA + 256;
+
size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
size_t len = 0;
while (*psz && ((!buf) || (len < n)))
{
+ const char *opsz = psz;
+ bool invalid = false;
unsigned char cc = *psz++, fc = cc;
unsigned cnt;
for (cnt = 0; fc & 0x80; cnt++)
if (buf)
*buf++ = cc;
len++;
+
+ // escape the escape character for octal escapes
+ if ((m_options & MAP_INVALID_UTF8_TO_OCTAL)
+ && cc == '\\' && (!buf || len < n))
+ {
+ if (buf)
+ *buf++ = cc;
+ len++;
+ }
}
else
{
if (!cnt)
{
// invalid UTF-8 sequence
- return (size_t)-1;
+ invalid = true;
}
else
{
wxUint32 res = cc & (0x3f >> cnt);
while (cnt--)
{
- cc = *psz++;
+ cc = *psz;
if ((cc & 0xC0) != 0x80)
{
// invalid UTF-8 sequence
- return (size_t)-1;
+ invalid = true;
+ break;
}
+ psz++;
res = (res << 6) | (cc & 0x3f);
}
- if (res <= utf8_max[ocnt])
+ if (invalid || res <= utf8_max[ocnt])
{
// illegal UTF-8 encoding
- return (size_t)-1;
+ invalid = true;
}
+ else if ((m_options & MAP_INVALID_UTF8_TO_PUA) &&
+ res >= wxUnicodePUA && res < wxUnicodePUAEnd)
+ {
+ // if one of our PUA characters turns up externally
+ // it must also be treated as an illegal sequence
+ // (a bit like you have to escape an escape character)
+ invalid = true;
+ }
+ else
+ {
#ifdef WC_UTF16
- // cast is ok because wchar_t == wxUuint16 if WC_UTF16
- size_t pa = encode_utf16(res, (wxUint16 *)buf);
- if (pa == (size_t)-1)
- return (size_t)-1;
- if (buf)
- buf += pa;
- len += pa;
+ // cast is ok because wchar_t == wxUuint16 if WC_UTF16
+ size_t pa = encode_utf16(res, (wxUint16 *)buf);
+ if (pa == (size_t)-1)
+ {
+ invalid = true;
+ }
+ else
+ {
+ if (buf)
+ buf += pa;
+ len += pa;
+ }
#else // !WC_UTF16
- if (buf)
- *buf++ = res;
- len++;
+ if (buf)
+ *buf++ = (wchar_t)res;
+ len++;
#endif // WC_UTF16/!WC_UTF16
+ }
+ }
+ if (invalid)
+ {
+ if (m_options & MAP_INVALID_UTF8_TO_PUA)
+ {
+ while (opsz < psz && (!buf || len < n))
+ {
+#ifdef WC_UTF16
+ // cast is ok because wchar_t == wxUuint16 if WC_UTF16
+ size_t pa = encode_utf16((unsigned char)*opsz + wxUnicodePUA, (wxUint16 *)buf);
+ wxASSERT(pa != (size_t)-1);
+ if (buf)
+ buf += pa;
+ opsz++;
+ len += pa;
+#else
+ if (buf)
+ *buf++ = (wchar_t)(wxUnicodePUA + (unsigned char)*opsz);
+ opsz++;
+ len++;
+#endif
+ }
+ }
+ else if (m_options & MAP_INVALID_UTF8_TO_OCTAL)
+ {
+ while (opsz < psz && (!buf || len < n))
+ {
+ if ( buf && len + 3 < n )
+ {
+ unsigned char on = *opsz;
+ *buf++ = L'\\';
+ *buf++ = (wchar_t)( L'0' + on / 0100 );
+ *buf++ = (wchar_t)( L'0' + (on % 0100) / 010 );
+ *buf++ = (wchar_t)( L'0' + on % 010 );
+ }
+ opsz++;
+ len += 4;
+ }
+ }
+ else // MAP_INVALID_UTF8_NOT
+ {
+ return (size_t)-1;
+ }
}
}
}
return len;
}
+static inline bool isoctal(wchar_t wch)
+{
+ return L'0' <= wch && wch <= L'7';
+}
+
size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
size_t len = 0;
#else
cc=(*psz++) & 0x7fffffff;
#endif
- unsigned cnt;
- for (cnt = 0; cc > utf8_max[cnt]; cnt++) {}
- if (!cnt)
+
+ if ( (m_options & MAP_INVALID_UTF8_TO_PUA)
+ && cc >= wxUnicodePUA && cc < wxUnicodePUAEnd )
+ {
+ if (buf)
+ *buf++ = (char)(cc - wxUnicodePUA);
+ len++;
+ }
+ else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL)
+ && cc == L'\\' && psz[0] == L'\\' )
{
- // plain ASCII char
if (buf)
- *buf++ = (char) cc;
+ *buf++ = (char)cc;
+ psz++;
len++;
}
+ else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL) &&
+ cc == L'\\' &&
+ isoctal(psz[0]) && isoctal(psz[1]) && isoctal(psz[2]) )
+ {
+ if (buf)
+ {
+ *buf++ = (char) ((psz[0] - L'0')*0100 +
+ (psz[1] - L'0')*010 +
+ (psz[2] - L'0'));
+ }
+ psz += 3;
+ len++;
+ }
else
{
- len += cnt + 1;
- if (buf)
+ unsigned cnt;
+ for (cnt = 0; cc > utf8_max[cnt]; cnt++) {}
+ if (!cnt)
{
- *buf++ = (char) ((-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt)));
- while (cnt--)
- *buf++ = (char) (0x80 | ((cc >> (cnt * 6)) & 0x3f));
+ // plain ASCII char
+ if (buf)
+ *buf++ = (char) cc;
+ len++;
+ }
+
+ else
+ {
+ len += cnt + 1;
+ if (buf)
+ {
+ *buf++ = (char) ((-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt)));
+ while (cnt--)
+ *buf++ = (char) (0x80 | ((cc >> (cnt * 6)) & 0x3f));
+ }
}
}
}
- if (buf && (len<n)) *buf = 0;
+ if (buf && (len<n))
+ *buf = 0;
return len;
}
-
-
-
// ----------------------------------------------------------------------------
// UTF-16
// ----------------------------------------------------------------------------
// swap 16bit MB to 16bit String
size_t wxMBConvUTF16swap::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
- size_t len=0;
+ size_t len = 0;
- while (*(wxUint16*)psz && (!buf || len < n))
+ // UTF16 string must be terminated by 2 NULs as single NULs may occur
+ // inside the string
+ while ( (psz[0] || psz[1]) && (!buf || len < n) )
{
- if (buf)
+ if ( buf )
{
((char *)buf)[0] = psz[1];
((char *)buf)[1] = psz[0];
buf++;
}
len++;
- psz += sizeof(wxUint16);
+ psz += 2;
}
- if (buf && len<n) *buf=0;
+
+ if ( buf && len < n )
+ *buf = L'\0';
return len;
}
// swap 16bit MB to 16bit String
size_t wxMBConvUTF16swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
- size_t len=0;
+ size_t len = 0;
- while (*psz && (!buf || len < n))
+ while ( *psz && (!buf || len < n) )
{
- if (buf)
+ if ( buf )
{
*buf++ = ((char*)psz)[1];
*buf++ = ((char*)psz)[0];
}
- len += sizeof(wxUint16);
+ len += 2;
psz++;
}
- if (buf && len<=n-sizeof(wxUint16)) *(wxUint16*)buf=0;
+
+ if ( buf && len < n )
+ *buf = '\0';
return len;
}
return pa;
if (buf)
- *buf++ = cc;
+ *buf++ = (wchar_t)cc;
len++;
psz += pa * sizeof(wxUint16);
}
return pa;
if (buf)
- *buf++ = cc;
+ *buf++ = (wchar_t)cc;
len++;
psz += pa * sizeof(wxUint16);
while (*(wxUint32*)psz && (!buf || len < n))
{
if (buf)
- *buf++ = *(wxUint32*)psz;
+ *buf++ = (wchar_t)(*(wxUint32*)psz);
len++;
psz += sizeof(wxUint32);
}
#ifdef HAVE_ICONV
-// VS: glibc 2.1.3 is broken in that iconv() conversion to/from UCS4 fails with E2BIG
-// if output buffer is _exactly_ as big as needed. Such case is (unless there's
-// yet another bug in glibc) the only case when iconv() returns with (size_t)-1
-// (which means error) and says there are 0 bytes left in the input buffer --
-// when _real_ error occurs, bytes-left-in-input buffer is non-zero. Hence,
-// this alternative test for iconv() failure.
+// VS: glibc 2.1.3 is broken in that iconv() conversion to/from UCS4 fails with
+// E2BIG if output buffer is _exactly_ as big as needed. Such case is
+// (unless there's yet another bug in glibc) the only case when iconv()
+// returns with (size_t)-1 (which means error) and says there are 0 bytes
+// left in the input buffer -- when _real_ error occurs,
+// bytes-left-in-input buffer is non-zero. Hence, this alternative test for
+// iconv() failure.
// [This bug does not appear in glibc 2.2.]
#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 1
#define ICONV_FAILED(cres, bufLeft) ((cres == (size_t)-1) && \
#define ICONV_CHAR_CAST(x) ((ICONV_CONST char **)(x))
+#define ICONV_T_INVALID ((iconv_t)-1)
+
+#if SIZEOF_WCHAR_T == 4
+ #define WC_BSWAP wxUINT32_SWAP_ALWAYS
+ #define WC_ENC wxFONTENCODING_UTF32
+#elif SIZEOF_WCHAR_T == 2
+ #define WC_BSWAP wxUINT16_SWAP_ALWAYS
+ #define WC_ENC wxFONTENCODING_UTF16
+#else // sizeof(wchar_t) != 2 nor 4
+ // does this ever happen?
+ #error "Unknown sizeof(wchar_t): please report this to wx-dev@lists.wxwindows.org"
+#endif
+
// ----------------------------------------------------------------------------
// wxMBConv_iconv: encapsulates an iconv character set
// ----------------------------------------------------------------------------
virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
bool IsOk() const
- { return (m2w != (iconv_t)-1) && (w2m != (iconv_t)-1); }
+ { return (m2w != ICONV_T_INVALID) && (w2m != ICONV_T_INVALID); }
protected:
// the iconv handlers used to translate from multibyte to wide char and in
// the other direction
iconv_t m2w,
w2m;
+#if wxUSE_THREADS
+ // guards access to m2w and w2m objects
+ wxMutex m_iconvMutex;
+#endif
private:
+ virtual const char *GetMBNul(size_t *nulLen) const;
+
// the name (for iconv_open()) of a wide char charset -- if none is
// available on this machine, it will remain NULL
- static const char *ms_wcCharsetName;
+ static wxString ms_wcCharsetName;
// true if the wide char encoding we use (i.e. ms_wcCharsetName) has
// different endian-ness than the native one
static bool ms_wcNeedsSwap;
+
+ // NUL representation
+ size_t m_nulLen;
+ char m_nulBuf[8];
};
-const char *wxMBConv_iconv::ms_wcCharsetName = NULL;
+// make the constructor available for unit testing
+WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_iconv( const wxChar* name )
+{
+ wxMBConv_iconv* result = new wxMBConv_iconv( name );
+ if ( !result->IsOk() )
+ {
+ delete result;
+ return 0;
+ }
+ return result;
+}
+
+wxString wxMBConv_iconv::ms_wcCharsetName;
bool wxMBConv_iconv::ms_wcNeedsSwap = false;
wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
{
- // Do it the hard way
- char cname[100];
- for (size_t i = 0; i < wxStrlen(name)+1; i++)
- cname[i] = (char) name[i];
+ m_nulLen = (size_t)-2;
+
+ // iconv operates with chars, not wxChars, but luckily it uses only ASCII
+ // names for the charsets
+ const wxCharBuffer cname(wxString(name).ToAscii());
// check for charset that represents wchar_t:
- if (ms_wcCharsetName == NULL)
+ if ( ms_wcCharsetName.empty() )
{
- ms_wcNeedsSwap = false;
+ wxLogTrace(TRACE_STRCONV, _T("Looking for wide char codeset:"));
- // try charset with explicit bytesex info (e.g. "UCS-4LE"):
- ms_wcCharsetName = WC_NAME_BEST;
- m2w = iconv_open(ms_wcCharsetName, cname);
+#if wxUSE_FONTMAP
+ const wxChar **names = wxFontMapperBase::GetAllEncodingNames(WC_ENC);
+#else // !wxUSE_FONTMAP
+ static const wxChar *names[] =
+ {
+#if SIZEOF_WCHAR_T == 4
+ _T("UCS-4"),
+#elif SIZEOF_WCHAR_T = 2
+ _T("UCS-2"),
+#endif
+ NULL
+ };
+#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
- if (m2w == (iconv_t)-1)
+ for ( ; *names && ms_wcCharsetName.empty(); ++names )
{
- // try charset w/o bytesex info (e.g. "UCS4")
- // and check for bytesex ourselves:
- ms_wcCharsetName = WC_NAME;
- m2w = iconv_open(ms_wcCharsetName, cname);
+ const wxString nameCS(*names);
- // last bet, try if it knows WCHAR_T pseudo-charset
- if (m2w == (iconv_t)-1)
- {
- ms_wcCharsetName = "WCHAR_T";
- m2w = iconv_open(ms_wcCharsetName, cname);
- }
+ // first try charset with explicit bytesex info (e.g. "UCS-4LE"):
+ wxString nameXE(nameCS);
+ #ifdef WORDS_BIGENDIAN
+ nameXE += _T("BE");
+ #else // little endian
+ nameXE += _T("LE");
+ #endif
+
+ wxLogTrace(TRACE_STRCONV, _T(" trying charset \"%s\""),
+ nameXE.c_str());
- if (m2w != (iconv_t)-1)
+ m2w = iconv_open(nameXE.ToAscii(), cname);
+ if ( m2w == ICONV_T_INVALID )
{
- char buf[2], *bufPtr;
- wchar_t wbuf[2], *wbufPtr;
- size_t insz, outsz;
- size_t res;
-
- buf[0] = 'A';
- buf[1] = 0;
- wbuf[0] = 0;
- insz = 2;
- outsz = SIZEOF_WCHAR_T * 2;
- wbufPtr = wbuf;
- bufPtr = buf;
-
- res = iconv(m2w, ICONV_CHAR_CAST(&bufPtr), &insz,
- (char**)&wbufPtr, &outsz);
-
- if (ICONV_FAILED(res, insz))
- {
- ms_wcCharsetName = NULL;
- wxLogLastError(wxT("iconv"));
- wxLogError(_("Conversion to charset '%s' doesn't work."), name);
- }
- else
+ // try charset w/o bytesex info (e.g. "UCS4")
+ wxLogTrace(TRACE_STRCONV, _T(" trying charset \"%s\""),
+ nameCS.c_str());
+ m2w = iconv_open(nameCS.ToAscii(), cname);
+
+ // and check for bytesex ourselves:
+ if ( m2w != ICONV_T_INVALID )
{
- ms_wcNeedsSwap = wbuf[0] != (wchar_t)buf[0];
+ char buf[2], *bufPtr;
+ wchar_t wbuf[2], *wbufPtr;
+ size_t insz, outsz;
+ size_t res;
+
+ buf[0] = 'A';
+ buf[1] = 0;
+ wbuf[0] = 0;
+ insz = 2;
+ outsz = SIZEOF_WCHAR_T * 2;
+ wbufPtr = wbuf;
+ bufPtr = buf;
+
+ res = iconv(m2w, ICONV_CHAR_CAST(&bufPtr), &insz,
+ (char**)&wbufPtr, &outsz);
+
+ if (ICONV_FAILED(res, insz))
+ {
+ wxLogLastError(wxT("iconv"));
+ wxLogError(_("Conversion to charset '%s' doesn't work."),
+ nameCS.c_str());
+ }
+ else // ok, can convert to this encoding, remember it
+ {
+ ms_wcCharsetName = nameCS;
+ ms_wcNeedsSwap = wbuf[0] != (wchar_t)buf[0];
+ }
}
}
- else
+ else // use charset not requiring byte swapping
{
- ms_wcCharsetName = NULL;
-
- // VS: we must not output an error here, since wxWidgets will safely
- // fall back to using wxEncodingConverter.
- wxLogTrace(wxT("strconv"), wxT("Impossible to convert to/from charset '%s' with iconv, falling back to wxEncodingConverter."), name);
- //wxLogError(
+ ms_wcCharsetName = nameXE;
}
}
- wxLogTrace(wxT("strconv"), wxT("wchar_t charset is '%s', needs swap: %i"), ms_wcCharsetName, ms_wcNeedsSwap);
+
+ wxLogTrace(TRACE_STRCONV,
+ wxT("iconv wchar_t charset is \"%s\"%s"),
+ ms_wcCharsetName.empty() ? _T("<none>")
+ : ms_wcCharsetName.c_str(),
+ ms_wcNeedsSwap ? _T(" (needs swap)")
+ : _T(""));
}
else // we already have ms_wcCharsetName
{
- m2w = iconv_open(ms_wcCharsetName, cname);
+ m2w = iconv_open(ms_wcCharsetName.ToAscii(), cname);
}
- // NB: don't ever pass NULL to iconv_open(), it may crash!
- if ( ms_wcCharsetName )
+ if ( ms_wcCharsetName.empty() )
{
- w2m = iconv_open( cname, ms_wcCharsetName);
+ w2m = ICONV_T_INVALID;
}
else
{
- w2m = (iconv_t)-1;
+ w2m = iconv_open(cname, ms_wcCharsetName.ToAscii());
+ if ( w2m == ICONV_T_INVALID )
+ {
+ wxLogTrace(TRACE_STRCONV,
+ wxT("\"%s\" -> \"%s\" works but not the converse!?"),
+ ms_wcCharsetName.c_str(), cname.data());
+ }
}
}
wxMBConv_iconv::~wxMBConv_iconv()
{
- if ( m2w != (iconv_t)-1 )
+ if ( m2w != ICONV_T_INVALID )
iconv_close(m2w);
- if ( w2m != (iconv_t)-1 )
+ if ( w2m != ICONV_T_INVALID )
iconv_close(w2m);
}
size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
+#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
+ // 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
+ // as MB<->WC conversion would fail "randomly".
+ wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex);
+#endif
+
size_t inbuf = strlen(psz);
size_t outbuf = n * SIZEOF_WCHAR_T;
size_t res, cres;
if (ms_wcNeedsSwap)
{
// convert to native endianness
- WC_BSWAP(buf /* _not_ bufPtr */, res)
+ for ( unsigned i = 0; i < res; i++ )
+ buf[n] = WC_BSWAP(buf[i]);
}
// NB: iconv was given only strlen(psz) characters on input, and so
if (ICONV_FAILED(cres, inbuf))
{
//VS: it is ok if iconv fails, hence trace only
- wxLogTrace(wxT("strconv"), wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode()));
+ wxLogTrace(TRACE_STRCONV, wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode()));
return (size_t)-1;
}
size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
- size_t inbuf = wxWcslen(psz) * SIZEOF_WCHAR_T;
+#if wxUSE_THREADS
+ // NB: explained in MB2WC
+ wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex);
+#endif
+
+ size_t inlen = wxWcslen(psz);
+ size_t inbuf = inlen * SIZEOF_WCHAR_T;
size_t outbuf = n;
size_t res, cres;
if (ms_wcNeedsSwap)
{
// need to copy to temp buffer to switch endianness
- // this absolutely doesn't rock!
- // (no, doing WC_BSWAP twice on the original buffer won't help, as it
+ // (doing WC_BSWAP twice on the original buffer won't help, as it
// could be in read-only memory, or be accessed in some other thread)
- tmpbuf=(wchar_t*)malloc((inbuf+1)*SIZEOF_WCHAR_T);
- memcpy(tmpbuf,psz,(inbuf+1)*SIZEOF_WCHAR_T);
- WC_BSWAP(tmpbuf, inbuf)
- psz=tmpbuf;
+ tmpbuf = (wchar_t *)malloc(inbuf + SIZEOF_WCHAR_T);
+ for ( size_t i = 0; i < inlen; i++ )
+ tmpbuf[n] = WC_BSWAP(psz[i]);
+ tmpbuf[inlen] = L'\0';
+ psz = tmpbuf;
}
if (buf)
if (ICONV_FAILED(cres, inbuf))
{
- //VS: it is ok if iconv fails, hence trace only
- wxLogTrace(wxT("strconv"), wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode()));
+ wxLogTrace(TRACE_STRCONV, wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode()));
return (size_t)-1;
}
- return res;
+ return res;
+}
+
+const char *wxMBConv_iconv::GetMBNul(size_t *nulLen) const
+{
+ if ( m_nulLen == (size_t)-2 )
+ {
+ wxMBConv_iconv * const self = wxConstCast(this, wxMBConv_iconv);
+
+#if wxUSE_THREADS
+ // NB: explained in MB2WC
+ wxMutexLocker lock(self->m_iconvMutex);
+#endif
+
+ wchar_t *wnul = L"";
+ size_t inLen = sizeof(wchar_t),
+ outLen = WXSIZEOF(m_nulBuf);
+ char *in = (char *)wnul,
+ *out = self->m_nulBuf;
+ if ( iconv(w2m, &in, &inLen, &out, &outLen) == (size_t)-1 )
+ {
+ self->m_nulLen = (size_t)-1;
+ }
+ else // ok
+ {
+ self->m_nulLen = out - m_nulBuf;
+ }
+ }
+
+ *nulLen = m_nulLen;
+ return m_nulBuf;
}
#endif // HAVE_ICONV
wxMBConv_win32()
{
m_CodePage = CP_ACP;
+ m_nulLen = (size_t)-2;
}
#if wxUSE_FONTMAP
wxMBConv_win32(const wxChar* name)
{
m_CodePage = wxCharsetToCodepage(name);
+ m_nulLen = (size_t)-2;
}
wxMBConv_win32(wxFontEncoding encoding)
{
m_CodePage = wxEncodingToCodepage(encoding);
+ m_nulLen = (size_t)-2;
}
-#endif
+#endif // wxUSE_FONTMAP
size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
// and break the library itself, e.g. wxTextInputStream::NextChar()
// wouldn't work if reading an incomplete MB char didn't result in an
// error
+ //
+ // note however that using MB_ERR_INVALID_CHARS with CP_UTF7 results in
+ // an error (tested under Windows Server 2003) and apparently it is
+ // done on purpose, i.e. the function accepts any input in this case
+ // and although I'd prefer to return error on ill-formed output, our
+ // own wxMBConvUTF7 doesn't detect errors (e.g. lone "+" which is
+ // explicitly ill-formed according to RFC 2152) neither so we don't
+ // even have any fallback here...
+ //
+ // Moreover, MB_ERR_INVALID_CHARS is only supported on Win 2K SP4 or
+ // Win XP or newer and if it is specified on older versions, conversion
+ // from CP_UTF8 (which can have flags only 0 or MB_ERR_INVALID_CHARS)
+ // fails. So we can only use the flag on newer Windows versions.
+ // Additionally, the flag is not supported by UTF7, symbol and CJK
+ // encodings. See here:
+ // http://blogs.msdn.com/michkap/archive/2005/04/19/409566.aspx
+ // http://msdn.microsoft.com/library/en-us/intl/unicode_17si.asp
+ int flags = 0;
+ if ( m_CodePage != CP_UTF7 && m_CodePage != CP_SYMBOL &&
+ m_CodePage < 50000 &&
+ IsAtLeastWin2kSP4() )
+ {
+ flags = MB_ERR_INVALID_CHARS;
+ }
+ else if ( m_CodePage == CP_UTF8 )
+ {
+ // Avoid round-trip in the special case of UTF-8 by using our
+ // own UTF-8 conversion code:
+ return wxMBConvUTF8().MB2WC(buf, psz, n);
+ }
+
const size_t len = ::MultiByteToWideChar
(
m_CodePage, // code page
- MB_ERR_INVALID_CHARS, // flags: fall on error
+ flags, // flags: fall on error
psz, // input string
-1, // its length (NUL-terminated)
buf, // output string
buf ? n : 0 // size of output buffer
);
+ if ( !len )
+ {
+ // function totally failed
+ return (size_t)-1;
+ }
+
+ // if we were really converting and didn't use MB_ERR_INVALID_CHARS,
+ // check if we succeeded, by doing a double trip:
+ if ( !flags && buf )
+ {
+ const size_t mbLen = strlen(psz);
+ wxCharBuffer mbBuf(mbLen);
+ if ( ::WideCharToMultiByte
+ (
+ m_CodePage,
+ 0,
+ buf,
+ -1,
+ mbBuf.data(),
+ mbLen + 1, // size in bytes, not length
+ NULL,
+ NULL
+ ) == 0 ||
+ strcmp(mbBuf, psz) != 0 )
+ {
+ // we didn't obtain the same thing we started from, hence
+ // the conversion was lossy and we consider that it failed
+ return (size_t)-1;
+ }
+ }
// note that it returns count of written chars for buf != NULL and size
// of the needed buffer for buf == NULL so in either case the length of
// the string (which never includes the terminating NUL) is one less
- return len ? len - 1 : (size_t)-1;
+ return len - 1;
}
size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const
return s_isWin98Or2k == 1;
}
+ static bool IsAtLeastWin2kSP4()
+ {
+#ifdef __WXWINCE__
+ return false;
+#else
+ static int s_isAtLeastWin2kSP4 = -1;
+
+ if ( s_isAtLeastWin2kSP4 == -1 )
+ {
+ OSVERSIONINFOEX ver;
+
+ memset(&ver, 0, sizeof(ver));
+ ver.dwOSVersionInfoSize = sizeof(ver);
+ GetVersionEx((OSVERSIONINFO*)&ver);
+
+ s_isAtLeastWin2kSP4 =
+ ((ver.dwMajorVersion > 5) || // Vista+
+ (ver.dwMajorVersion == 5 && ver.dwMinorVersion > 0) || // XP/2003
+ (ver.dwMajorVersion == 5 && ver.dwMinorVersion == 0 &&
+ ver.wServicePackMajor >= 4)) // 2000 SP4+
+ ? 1 : 0;
+ }
+
+ return s_isAtLeastWin2kSP4 == 1;
+#endif
+ }
+
+ virtual const char *GetMBNul(size_t *nulLen) const
+ {
+ if ( m_nulLen == (size_t)-2 )
+ {
+ wxMBConv_win32 * const self = wxConstCast(this, wxMBConv_win32);
+
+ self->m_nulLen = ::WideCharToMultiByte
+ (
+ m_CodePage, // code page
+ 0, // no flags
+ L"", // input string
+ 1, // translate just NUL
+ self->m_nulBuf, // output buffer
+ WXSIZEOF(m_nulBuf), // and its size
+ NULL, // "replacement" char
+ NULL // [out] was it used?
+ );
+
+ if ( m_nulLen == 0 )
+ self->m_nulLen = (size_t)-1;
+ }
+
+ *nulLen = m_nulLen;
+ return m_nulBuf;
+ }
+
long m_CodePage;
+ size_t m_nulLen;
+ char m_nulBuf[8];
};
#endif // wxHAVE_WIN32_MB2WC
CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
{
- CFStringEncoding enc = 0 ;
+ CFStringEncoding enc = kCFStringEncodingInvalidId ;
if ( encoding == wxFONTENCODING_DEFAULT )
{
-#if wxUSE_GUI
- encoding = wxFont::GetDefaultEncoding() ;
-#else
- encoding = wxLocale::GetSystemEncoding() ;
-#endif
+ enc = CFStringGetSystemEncoding();
}
else switch( encoding)
{
case wxFONTENCODING_CP950 :
enc = kCFStringEncodingDOSChineseTrad;
break ;
-
case wxFONTENCODING_CP1250 :
enc = kCFStringEncodingWindowsLatin2;
break ;
case wxFONTENCODING_CP1257 :
enc = kCFStringEncodingWindowsBalticRim;
break ;
- case wxFONTENCODING_UTF7 :
- enc = kCFStringEncodingNonLossyASCII ;
- break ;
+// This only really encodes to UTF7 (if that) evidently
+// case wxFONTENCODING_UTF7 :
+// enc = kCFStringEncodingNonLossyASCII ;
+// break ;
case wxFONTENCODING_UTF8 :
enc = kCFStringEncodingUTF8 ;
break ;
return enc ;
}
-wxFontEncoding wxFontEncFromCFStringEnc(CFStringEncoding encoding)
-{
- wxFontEncoding enc = wxFONTENCODING_DEFAULT ;
-
- switch( encoding)
- {
- case kCFStringEncodingISOLatin1 :
- enc = wxFONTENCODING_ISO8859_1 ;
- break ;
- case kCFStringEncodingISOLatin2 :
- enc = wxFONTENCODING_ISO8859_2;
- break ;
- case kCFStringEncodingISOLatin3 :
- enc = wxFONTENCODING_ISO8859_3 ;
- break ;
- case kCFStringEncodingISOLatin4 :
- enc = wxFONTENCODING_ISO8859_4;
- break ;
- case kCFStringEncodingISOLatinCyrillic :
- enc = wxFONTENCODING_ISO8859_5;
- break ;
- case kCFStringEncodingISOLatinArabic :
- enc = wxFONTENCODING_ISO8859_6;
- break ;
- case kCFStringEncodingISOLatinGreek :
- enc = wxFONTENCODING_ISO8859_7;
- break ;
- case kCFStringEncodingISOLatinHebrew :
- enc = wxFONTENCODING_ISO8859_8;
- break ;
- case kCFStringEncodingISOLatin5 :
- enc = wxFONTENCODING_ISO8859_9;
- break ;
- case kCFStringEncodingISOLatin6 :
- enc = wxFONTENCODING_ISO8859_10;
- break ;
- case kCFStringEncodingISOLatin7 :
- enc = wxFONTENCODING_ISO8859_13;
- break ;
- case kCFStringEncodingISOLatin8 :
- enc = wxFONTENCODING_ISO8859_14;
- break ;
- case kCFStringEncodingISOLatin9 :
- enc =wxFONTENCODING_ISO8859_15 ;
- break ;
-
- case kCFStringEncodingKOI8_R :
- enc = wxFONTENCODING_KOI8;
- break ;
-
-// case :
-// enc = wxFONTENCODING_BULGARIAN;
-// break ;
-
- case kCFStringEncodingDOSLatinUS :
- enc = wxFONTENCODING_CP437;
- break ;
- case kCFStringEncodingDOSLatin1 :
- enc = wxFONTENCODING_CP850;
- break ;
- case kCFStringEncodingDOSLatin2 :
- enc =wxFONTENCODING_CP852 ;
- break ;
- case kCFStringEncodingDOSCyrillic :
- enc = wxFONTENCODING_CP855;
- break ;
- case kCFStringEncodingDOSRussian :
- enc = wxFONTENCODING_CP866;
- break ;
- case kCFStringEncodingDOSThai :
- enc =wxFONTENCODING_CP874 ;
- break ;
- case kCFStringEncodingDOSJapanese :
- enc = wxFONTENCODING_CP932;
- break ;
- case kCFStringEncodingDOSChineseSimplif :
- enc = wxFONTENCODING_CP936;
- break ;
- case kCFStringEncodingDOSKorean :
- enc = wxFONTENCODING_CP949;
- break ;
- case kCFStringEncodingDOSChineseTrad :
- enc = wxFONTENCODING_CP950;
- break ;
-
- case kCFStringEncodingWindowsLatin2 :
- enc = wxFONTENCODING_CP1250;
- break ;
- case kCFStringEncodingWindowsCyrillic :
- enc = wxFONTENCODING_CP1251;
- break ;
- case kCFStringEncodingWindowsLatin1 :
- enc = wxFONTENCODING_CP1252;
- break ;
- case kCFStringEncodingWindowsGreek :
- enc = wxFONTENCODING_CP1253;
- break ;
- case kCFStringEncodingWindowsLatin5 :
- enc = wxFONTENCODING_CP1254;
- break ;
- case kCFStringEncodingWindowsHebrew :
- enc = wxFONTENCODING_CP1255;
- break ;
- case kCFStringEncodingWindowsArabic :
- enc = wxFONTENCODING_CP1256;
- break ;
- case kCFStringEncodingWindowsBalticRim :
- enc =wxFONTENCODING_CP1257 ;
- break ;
- case kCFStringEncodingEUC_JP :
- enc = wxFONTENCODING_EUC_JP;
- break ;
- case kCFStringEncodingUnicode :
- enc = wxFONTENCODING_UTF16;
- break;
- case kCFStringEncodingMacRoman :
- enc = wxFONTENCODING_MACROMAN ;
- break ;
- case kCFStringEncodingMacJapanese :
- enc = wxFONTENCODING_MACJAPANESE ;
- break ;
- case kCFStringEncodingMacChineseTrad :
- enc = wxFONTENCODING_MACCHINESETRAD ;
- break ;
- case kCFStringEncodingMacKorean :
- enc = wxFONTENCODING_MACKOREAN ;
- break ;
- case kCFStringEncodingMacArabic :
- enc =wxFONTENCODING_MACARABIC ;
- break ;
- case kCFStringEncodingMacHebrew :
- enc = wxFONTENCODING_MACHEBREW ;
- break ;
- case kCFStringEncodingMacGreek :
- enc = wxFONTENCODING_MACGREEK ;
- break ;
- case kCFStringEncodingMacCyrillic :
- enc = wxFONTENCODING_MACCYRILLIC ;
- break ;
- case kCFStringEncodingMacDevanagari :
- enc = wxFONTENCODING_MACDEVANAGARI ;
- break ;
- case kCFStringEncodingMacGurmukhi :
- enc = wxFONTENCODING_MACGURMUKHI ;
- break ;
- case kCFStringEncodingMacGujarati :
- enc = wxFONTENCODING_MACGUJARATI ;
- break ;
- case kCFStringEncodingMacOriya :
- enc =wxFONTENCODING_MACORIYA ;
- break ;
- case kCFStringEncodingMacBengali :
- enc =wxFONTENCODING_MACBENGALI ;
- break ;
- case kCFStringEncodingMacTamil :
- enc = wxFONTENCODING_MACTAMIL ;
- break ;
- case kCFStringEncodingMacTelugu :
- enc = wxFONTENCODING_MACTELUGU ;
- break ;
- case kCFStringEncodingMacKannada :
- enc = wxFONTENCODING_MACKANNADA ;
- break ;
- case kCFStringEncodingMacMalayalam :
- enc = wxFONTENCODING_MACMALAJALAM ;
- break ;
- case kCFStringEncodingMacSinhalese :
- enc = wxFONTENCODING_MACSINHALESE ;
- break ;
- case kCFStringEncodingMacBurmese :
- enc = wxFONTENCODING_MACBURMESE ;
- break ;
- case kCFStringEncodingMacKhmer :
- enc = wxFONTENCODING_MACKHMER ;
- break ;
- case kCFStringEncodingMacThai :
- enc = wxFONTENCODING_MACTHAI ;
- break ;
- case kCFStringEncodingMacLaotian :
- enc = wxFONTENCODING_MACLAOTIAN ;
- break ;
- case kCFStringEncodingMacGeorgian :
- enc = wxFONTENCODING_MACGEORGIAN ;
- break ;
- case kCFStringEncodingMacArmenian :
- enc = wxFONTENCODING_MACARMENIAN ;
- break ;
- case kCFStringEncodingMacChineseSimp :
- enc = wxFONTENCODING_MACCHINESESIMP ;
- break ;
- case kCFStringEncodingMacTibetan :
- enc = wxFONTENCODING_MACTIBETAN ;
- break ;
- case kCFStringEncodingMacMongolian :
- enc = wxFONTENCODING_MACMONGOLIAN ;
- break ;
- case kCFStringEncodingMacEthiopic :
- enc = wxFONTENCODING_MACETHIOPIC ;
- break ;
- case kCFStringEncodingMacCentralEurRoman:
- enc = wxFONTENCODING_MACCENTRALEUR ;
- break ;
- case kCFStringEncodingMacVietnamese:
- enc = wxFONTENCODING_MACVIATNAMESE ;
- break ;
- case kCFStringEncodingMacExtArabic :
- enc = wxFONTENCODING_MACARABICEXT ;
- break ;
- case kCFStringEncodingMacSymbol :
- enc = wxFONTENCODING_MACSYMBOL ;
- break ;
- case kCFStringEncodingMacDingbats :
- enc = wxFONTENCODING_MACDINGBATS ;
- break ;
- case kCFStringEncodingMacTurkish :
- enc = wxFONTENCODING_MACTURKISH ;
- break ;
- case kCFStringEncodingMacCroatian :
- enc = wxFONTENCODING_MACCROATIAN ;
- break ;
- case kCFStringEncodingMacIcelandic :
- enc = wxFONTENCODING_MACICELANDIC ;
- break ;
- case kCFStringEncodingMacRomanian :
- enc = wxFONTENCODING_MACROMANIAN ;
- break ;
- case kCFStringEncodingMacCeltic :
- enc = wxFONTENCODING_MACCELTIC ;
- break ;
- case kCFStringEncodingMacGaelic :
- enc = wxFONTENCODING_MACGAELIC ;
- break ;
-// case kCFStringEncodingMacKeyboardGlyphs :
-// enc = wxFONTENCODING_MACKEYBOARD ;
-// break ;
- } ;
- return enc ;
-}
-
class wxMBConv_cocoa : public wxMBConv
{
public:
Init(CFStringGetSystemEncoding()) ;
}
+#if wxUSE_FONTMAP
wxMBConv_cocoa(const wxChar* name)
{
- Init( wxCFStringEncFromFontEnc(wxFontMapper::Get()->CharsetToEncoding(name, false) ) ) ;
+ Init( wxCFStringEncFromFontEnc(wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) ) ;
}
+#endif
wxMBConv_cocoa(wxFontEncoding encoding)
{
void Init( CFStringEncoding encoding)
{
- m_char_encoding = encoding ;
- m_unicode_encoding = kCFStringEncodingUnicode;
+ m_encoding = encoding ;
}
size_t MB2WC(wchar_t * szOut, const char * szUnConv, size_t nOutSize) const
{
wxASSERT(szUnConv);
- size_t nBufSize = strlen(szUnConv) + 1;
- size_t nRealOutSize;
-
- UniChar* szUniCharBuffer = (UniChar*) szOut;
- wchar_t* szConvBuffer = szOut;
-
- if (szConvBuffer == NULL && nOutSize != 0)
- {
- szConvBuffer = new wchar_t[nOutSize] ;
- }
-
-#if SIZEOF_WCHAR_T == 4
- szUniCharBuffer = new UniChar[nOutSize];
-#endif
-
- CFDataRef theData = CFDataCreateWithBytesNoCopy (
- NULL, //allocator
- (const UInt8*)szUnConv,
- nBufSize - 1,
- NULL //deallocator
- );
-
- wxASSERT(theData);
-
- CFStringRef theString = CFStringCreateFromExternalRepresentation (
- NULL,
- theData,
- m_char_encoding
+ CFStringRef theString = CFStringCreateWithBytes (
+ NULL, //the allocator
+ (const UInt8*)szUnConv,
+ strlen(szUnConv),
+ m_encoding,
+ false //no BOM/external representation
);
wxASSERT(theString);
- if (nOutSize == 0)
+ size_t nOutLength = CFStringGetLength(theString);
+
+ if (szOut == NULL)
{
- nRealOutSize = CFStringGetLength(theString) + 1;
CFRelease(theString);
- return nRealOutSize - 1;
+ return nOutLength;
}
- CFRange theRange = { 0, CFStringGetLength(theString) };
-
- CFStringGetCharacters(theString, theRange, szUniCharBuffer);
+ CFRange theRange = { 0, nOutSize };
+#if SIZEOF_WCHAR_T == 4
+ UniChar* szUniCharBuffer = new UniChar[nOutSize];
+#endif
- nRealOutSize = (CFStringGetLength(theString) + 1);
+ CFStringGetCharacters(theString, theRange, szUniCharBuffer);
CFRelease(theString);
- szUniCharBuffer[nRealOutSize-1] = '\0' ;
+ szUniCharBuffer[nOutLength] = '\0' ;
#if SIZEOF_WCHAR_T == 4
wxMBConvUTF16 converter ;
- converter.MB2WC(szConvBuffer , (const char*)szUniCharBuffer , nRealOutSize ) ;
+ converter.MB2WC(szOut, (const char*)szUniCharBuffer , nOutSize ) ;
delete[] szUniCharBuffer;
#endif
- if ( szOut == NULL )
- delete [] szConvBuffer;
- return nRealOutSize ;
+ return nOutLength;
}
size_t WC2MB(char *szOut, const wchar_t *szUnConv, size_t nOutSize) const
{
- size_t nBufSize = wxWcslen(szUnConv) + 1;
+ wxASSERT(szUnConv);
+
size_t nRealOutSize;
- char* szBuffer = szOut;
+ size_t nBufSize = wxWcslen(szUnConv);
UniChar* szUniBuffer = (UniChar*) szUnConv;
- if (szOut == NULL)
- {
- // worst case
- nRealOutSize = wxString::WorstEncodingCase(nBufSize - 1, *this)+1 ;
- szBuffer = new char[ nRealOutSize ] ;
- }
- else
- nRealOutSize = nOutSize;
-
#if SIZEOF_WCHAR_T == 4
- wxMBConvUTF16BE converter ;
+ wxMBConvUTF16 converter ;
nBufSize = converter.WC2MB( NULL , szUnConv , 0 );
szUniBuffer = new UniChar[ (nBufSize / sizeof(UniChar)) + 1] ;
converter.WC2MB( (char*) szUniBuffer , szUnConv, nBufSize + sizeof(UniChar)) ;
nBufSize /= sizeof(UniChar);
- ++nBufSize;
#endif
CFStringRef theString = CFStringCreateWithCharactersNoCopy(
NULL, //allocator
szUniBuffer,
nBufSize,
- NULL //deallocator
+ kCFAllocatorNull //deallocator - we want to deallocate it ourselves
);
wxASSERT(theString);
//Note that CER puts a BOM when converting to unicode
- //so we may want to check and use getchars instead in that case
- CFDataRef theData = CFStringCreateExternalRepresentation(
- NULL, //allocator
- theString,
- m_char_encoding,
- 0 //what to put in characters that can't be converted -
- //0 tells CFString to return NULL if it meets such a character
- );
-
- if(!theData)
- return (size_t)-1;
-
- CFRelease(theString);
-
- nRealOutSize = CFDataGetLength(theData);
-
- if ( szOut == NULL )
- delete[] szBuffer;
+ //so we check and use getchars instead in that case
+ if (m_encoding == kCFStringEncodingUnicode)
+ {
+ if (szOut != NULL)
+ CFStringGetCharacters(theString, CFRangeMake(0, nOutSize - 1), (UniChar*) szOut);
- if(nOutSize == 0)
+ nRealOutSize = CFStringGetLength(theString) + 1;
+ }
+ else
{
-//TODO: This gets flagged as a non-malloced address by the debugger...
-//#if SIZEOF_WCHAR_T == 4
-// delete[] szUniBuffer;
-//#endif
- CFRelease(theData);
- return nRealOutSize - 1;
+ CFStringGetBytes(
+ theString,
+ CFRangeMake(0, CFStringGetLength(theString)),
+ m_encoding,
+ 0, //what to put in characters that can't be converted -
+ //0 tells CFString to return NULL if it meets such a character
+ false, //not an external representation
+ (UInt8*) szOut,
+ nOutSize,
+ (CFIndex*) &nRealOutSize
+ );
}
- CFRange theRange = {0, CFDataGetLength(theData) };
- CFDataGetBytes(theData, theRange, (UInt8*) szBuffer);
+ CFRelease(theString);
- CFRelease(theData);
+#if SIZEOF_WCHAR_T == 4
+ delete[] szUniBuffer;
+#endif
-//TODO: This gets flagged as a non-malloced address by the debugger...
-//#if SIZEOF_WCHAR_T == 4
-// delete[] szUniBuffer;
-//#endif
return nRealOutSize - 1;
}
bool IsOk() const
{
- //TODO: check for invalid en/de/coding
- return true;
+ return m_encoding != kCFStringEncodingInvalidId &&
+ CFStringIsEncodingAvailable(m_encoding);
}
private:
- CFStringEncoding m_char_encoding ;
- CFStringEncoding m_unicode_encoding ;
+ CFStringEncoding m_encoding ;
};
#endif // defined(__WXCOCOA__)
Init(CFStringGetSystemEncoding()) ;
}
+#if wxUSE_FONTMAP
wxMBConv_mac(const wxChar* name)
{
- Init( wxMacGetSystemEncFromFontEnc(wxFontMapper::Get()->CharsetToEncoding(name, false) ) ) ;
+ Init( wxMacGetSystemEncFromFontEnc(wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) ) ;
}
+#endif
wxMBConv_mac(wxFontEncoding encoding)
{
if (buf == NULL)
{
- n = byteInLen ;
+ //apple specs say at least 32
+ n = wxMax( 32 , byteInLen ) ;
tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T) ;
}
ByteCount byteBufferLen = n * sizeof( UniChar ) ;
// 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
ubuf[byteOutLen / sizeof( UniChar ) ] = 0 ;
- wxMBConvUTF16BE converter ;
+ wxMBConvUTF16 converter ;
res = converter.MB2WC( (buf ? buf : tbuf) , (const char*)ubuf , n ) ;
free( ubuf ) ;
#else
if (buf == NULL)
{
- // worst case
- n = wxString::WorstEncodingCase(byteInLen / SIZEOF_WCHAR_T, *this) + SIZEOF_WCHAR_T;
+ //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
- wxMBConvUTF16BE converter ;
+ wxMBConvUTF16 converter ;
size_t unicharlen = converter.WC2MB( NULL , psz , 0 ) ;
byteInLen = unicharlen ;
ubuf = (UniChar*) malloc( byteInLen + 2 ) ;
size_t res = byteOutLen ;
if ( buf && res < n)
+ {
buf[res] = 0;
+ //we need to double-trip to verify it didn't insert any ? in place
+ //of bogus characters
+ wxWCharBuffer wcBuf(n);
+ size_t pszlen = wxWcslen(psz);
+ if ( MB2WC(wcBuf.data(), buf, n) == (size_t)-1 ||
+ wxWcslen(wcBuf) != pszlen ||
+ memcmp(wcBuf, psz, pszlen * sizeof(wchar_t)) != 0 )
+ {
+ // we didn't obtain the same thing we started from, hence
+ // the conversion was lossy and we consider that it failed
+ return (size_t)-1;
+ }
+ }
+
return res ;
}
wxMBConv_wxwin(const wxChar* name)
{
if (name)
- m_enc = wxFontMapper::Get()->CharsetToEncoding(name, false);
+ m_enc = wxFontMapperBase::Get()->CharsetToEncoding(name, false);
else
m_enc = wxFONTENCODING_SYSTEM;
{
size_t inbuf = strlen(psz);
if (buf)
- m2w.Convert(psz,buf);
+ {
+ if (!m2w.Convert(psz,buf))
+ return (size_t)-1;
+ }
return inbuf;
}
{
const size_t inbuf = wxWcslen(psz);
if (buf)
- w2m.Convert(psz,buf);
+ {
+ if (!w2m.Convert(psz,buf))
+ return (size_t)-1;
+ }
return inbuf;
}
wxFontEncoding m_enc;
wxEncodingConverter m2w, w2m;
+private:
+ virtual const char *GetMBNul(size_t *nulLen) const
+ {
+ switch ( m_enc )
+ {
+ case wxFONTENCODING_UTF16BE:
+ case wxFONTENCODING_UTF16LE:
+ *nulLen = 2;
+ return "\0";
+
+ case wxFONTENCODING_UTF32BE:
+ case wxFONTENCODING_UTF32LE:
+ *nulLen = 4;
+ return "\0\0\0";
+
+ default:
+ *nulLen = 1;
+ return "";
+ }
+ }
+
// were we initialized successfully?
bool m_ok;
DECLARE_NO_COPY_CLASS(wxMBConv_wxwin)
};
+// make the constructors available for unit testing
+WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_wxwin( const wxChar* name )
+{
+ wxMBConv_wxwin* result = new wxMBConv_wxwin( name );
+ if ( !result->IsOk() )
+ {
+ delete result;
+ return 0;
+ }
+ return result;
+}
+
#endif // wxUSE_FONTMAP
// ============================================================================
SetName(charset);
}
+#if wxUSE_FONTMAP
+ m_encoding = wxFontMapperBase::GetEncodingFromName(charset);
+#else
m_encoding = wxFONTENCODING_SYSTEM;
+#endif
}
wxCSConv::wxCSConv(wxFontEncoding encoding)
}
}
+#if wxUSE_FONTMAP
+#include "wx/hashmap.h"
+
+WX_DECLARE_HASH_MAP( wxFontEncoding, wxString, wxIntegerHash, wxIntegerEqual,
+ wxEncodingNameCache );
+
+static wxEncodingNameCache gs_nameCache;
+#endif
+
wxMBConv *wxCSConv::DoCreate() const
{
+#if wxUSE_FONTMAP
+ wxLogTrace(TRACE_STRCONV,
+ wxT("creating conversion for %s"),
+ (m_name ? m_name
+ : wxFontMapperBase::GetEncodingName(m_encoding).c_str()));
+#endif // wxUSE_FONTMAP
+
// check for the special case of ASCII or ISO8859-1 charset: as we have
// special knowledge of it anyhow, we don't need to create a special
// conversion object
- if ( m_encoding == wxFONTENCODING_ISO8859_1 )
+ if ( m_encoding == wxFONTENCODING_ISO8859_1 ||
+ m_encoding == wxFONTENCODING_DEFAULT )
{
// don't convert at all
return NULL;
#endif // !wxUSE_FONTMAP
{
wxString name(m_name);
+ wxFontEncoding encoding(m_encoding);
+
+ if ( !name.empty() )
+ {
+ wxMBConv_iconv *conv = new wxMBConv_iconv(name);
+ if ( conv->IsOk() )
+ return conv;
+
+ delete conv;
#if wxUSE_FONTMAP
- if ( name.empty() )
- name = wxFontMapper::Get()->GetEncodingName(m_encoding);
+ encoding =
+ wxFontMapperBase::Get()->CharsetToEncoding(name, false);
#endif // wxUSE_FONTMAP
+ }
+#if wxUSE_FONTMAP
+ {
+ const wxEncodingNameCache::iterator it = gs_nameCache.find(encoding);
+ if ( it != gs_nameCache.end() )
+ {
+ if ( it->second.empty() )
+ return NULL;
- wxMBConv_iconv *conv = new wxMBConv_iconv(name);
- if ( conv->IsOk() )
- return conv;
+ wxMBConv_iconv *conv = new wxMBConv_iconv(it->second);
+ if ( conv->IsOk() )
+ return conv;
- delete conv;
+ delete conv;
+ }
+
+ const wxChar** names = wxFontMapperBase::GetAllEncodingNames(encoding);
+
+ for ( ; *names; ++names )
+ {
+ wxMBConv_iconv *conv = new wxMBConv_iconv(*names);
+ if ( conv->IsOk() )
+ {
+ gs_nameCache[encoding] = *names;
+ return conv;
+ }
+
+ delete conv;
+ }
+
+ gs_nameCache[encoding] = _T(""); // cache the failure
+ }
+#endif // wxUSE_FONTMAP
}
#endif // HAVE_ICONV
#endif // wxHAVE_WIN32_MB2WC
#if defined(__WXMAC__)
{
- if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ) )
+ // leave UTF16 and UTF32 to the built-ins of wx
+ if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ||
+ ( m_encoding >= wxFONTENCODING_MACMIN && m_encoding <= wxFONTENCODING_MACMAX ) ) )
{
+#if wxUSE_FONTMAP
wxMBConv_mac *conv = m_name ? new wxMBConv_mac(m_name)
: new wxMBConv_mac(m_encoding);
+#else
+ wxMBConv_mac *conv = new wxMBConv_mac(m_encoding);
+#endif
if ( conv->IsOk() )
return conv;
if ( m_name || ( m_encoding <= wxFONTENCODING_UTF16 ) )
{
+#if wxUSE_FONTMAP
wxMBConv_cocoa *conv = m_name ? new wxMBConv_cocoa(m_name)
: new wxMBConv_cocoa(m_encoding);
+#else
+ wxMBConv_cocoa *conv = new wxMBConv_cocoa(m_encoding);
+#endif
if ( conv->IsOk() )
return conv;
// use "false" to suppress interactive dialogs -- we can be called from
// anywhere and popping up a dialog from here is the last thing we want to
// do
- enc = wxFontMapper::Get()->CharsetToEncoding(m_name, false);
+ enc = wxFontMapperBase::Get()->CharsetToEncoding(m_name, false);
}
#endif // wxUSE_FONTMAP
m_name ? m_name
:
#if wxUSE_FONTMAP
- wxFontMapper::GetEncodingDescription(m_encoding).c_str()
+ wxFontMapperBase::GetEncodingDescription(m_encoding).c_str()
#else // !wxUSE_FONTMAP
wxString::Format(_("encoding %s"), m_encoding).c_str()
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
return len;
}
+const char *wxCSConv::GetMBNul(size_t *nulLen) const
+{
+ CreateConvIfNeeded();
+
+ if ( m_convReal )
+ {
+ // cast needed just to call private function of m_convReal
+ return ((wxCSConv *)m_convReal)->GetMBNul(nulLen);
+ }
+
+ *nulLen = 1;
+ return "";
+}
+
// ----------------------------------------------------------------------------
// globals
// ----------------------------------------------------------------------------
static wxMBConvUTF7 wxConvUTF7Obj;
static wxMBConvUTF8 wxConvUTF8Obj;
-
WXDLLIMPEXP_DATA_BASE(wxMBConv&) wxConvLibc = wxConvLibcObj;
WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvLocal = wxConvLocalObj;
WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvISO8859_1 = wxConvISO8859_1Obj;
WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7&) wxConvUTF7 = wxConvUTF7Obj;
WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8&) wxConvUTF8 = wxConvUTF8Obj;
WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = &wxConvLibcObj;
+WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName = &
+#ifdef __WXOSX__
+ wxConvUTF8Obj;
+#else
+ wxConvLibcObj;
+#endif
+
#else // !wxUSE_WCHAR_T
wxConvUTF8;
#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
-
-
projects / wxWidgets.git / blobdiff