X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d834f22c8e4248e8c035643ec1894a4cfd038419..7ac05a91abea459438b8ea62074108d3daf39568:/src/common/strconv.cpp diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index d2b1144af8..1b69297e1d 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -9,6 +9,14 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma implementation "strconv.h" #endif @@ -20,6 +28,11 @@ #pragma hdrstop #endif +#ifdef __WXMSW__ + #include "wx/msw/private.h" +#endif + +#include #include #include #include @@ -28,27 +41,102 @@ #include #endif +#ifdef HAVE_ICONV_H + #include +#endif +#ifdef HAVE_LANGINFO_H + #include +#endif + +#ifdef __WXMSW__ + #include +#endif + #include "wx/debug.h" #include "wx/strconv.h" +#include "wx/intl.h" +#include "wx/log.h" -//---------------------------------------------------------------------------- -// wxConvCurrent -//---------------------------------------------------------------------------- +#if defined(WORDS_BIGENDIAN) || defined(__STDC_ISO_10646__) +#define BSWAP_UCS4(str, len) +#define BSWAP_UCS2(str, len) +#else +#define BSWAP_UCS4(str, len) { unsigned _c; for (_c=0; _c=0x110000) + { + return (size_t)-1; + } + else + { + if (output) + { + *output++ = (input >> 10)+0xd7c0; + *output++ = (input&0x3ff)+0xdc00; + } + return 2; + } +} -//---------------------------------------------------------------------------- +static size_t decode_utf16(wxUint16*input,wxUint32&output) +{ + if ((*input<0xd800) || (*input>0xdfff)) + { + output = *input; + return 1; + } + else if ((input[1]<0xdc00) || (input[1]>=0xdfff)) + { + output = *input; + return (size_t)-1; + } + else + { + output = ((input[0] - 0xd7c0) << 10) + (input[1] - 0xdc00); + return 2; + } +} + +#endif // WC_UTF16 + +// ---------------------------------------------------------------------------- // wxMBConv -//---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- WXDLLEXPORT_DATA(wxMBConv) wxConvLibc; @@ -64,33 +152,37 @@ size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const { - if (psz) + if (psz) { size_t nLen = MB2WC((wchar_t *) NULL, psz, 0); + if (nLen == (size_t)-1) + return wxWCharBuffer((wchar_t *) NULL); wxWCharBuffer buf(nLen); MB2WC((wchar_t *)(const wchar_t *) buf, psz, nLen); return buf; - } - else + } + else return wxWCharBuffer((wchar_t *) NULL); } const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *psz) const { - if (psz) + if (psz) { size_t nLen = WC2MB((char *) NULL, psz, 0); + if (nLen == (size_t)-1) + return wxCharBuffer((char *) NULL); wxCharBuffer buf(nLen); WC2MB((char *)(const char *) buf, psz, nLen); return buf; - } - else + } + else return wxCharBuffer((char *) NULL); } -//---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // standard file conversion -//---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- WXDLLEXPORT_DATA(wxMBConvFile) wxConvFile; @@ -105,11 +197,11 @@ size_t wxMBConvFile::WC2MB(char *buf, const wchar_t *psz, size_t n) const return wxWC2MB(buf, psz, n); } -#ifdef __WXGTK12__ - -//---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // standard gdk conversion -//---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- + +#ifdef __WXGTK12__ WXDLLEXPORT_DATA(wxMBConvGdk) wxConvGdk; @@ -117,27 +209,34 @@ WXDLLEXPORT_DATA(wxMBConvGdk) wxConvGdk; size_t wxMBConvGdk::MB2WC(wchar_t *buf, const char *psz, size_t n) const { - if (buf) { - return gdk_mbstowcs((GdkWChar *)buf, psz, n); - } else { - GdkWChar *nbuf = new GdkWChar[n=strlen(psz)]; - size_t len = gdk_mbstowcs(nbuf, psz, n); - delete [] nbuf; - return len; - } + if (buf) + { + return gdk_mbstowcs((GdkWChar *)buf, psz, n); + } + else + { + GdkWChar *nbuf = new GdkWChar[n=strlen(psz)]; + size_t len = gdk_mbstowcs(nbuf, psz, n); + delete[] nbuf; + return len; + } } size_t wxMBConvGdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const { - char *mbstr = gdk_wcstombs((GdkWChar *)psz); - size_t len = mbstr ? strlen(mbstr) : 0; - if (buf) { - if (len > n) len = n; - memcpy(buf, psz, len); - if (len < n) buf[len] = 0; - } - return len; + char *mbstr = gdk_wcstombs((GdkWChar *)psz); + size_t len = mbstr ? strlen(mbstr) : 0; + if (buf) + { + if (len > n) + len = n; + memcpy(buf, psz, len); + if (len < n) + buf[len] = 0; + } + return len; } + #endif // GTK > 1.0 // ---------------------------------------------------------------------------- @@ -171,297 +270,616 @@ size_t wxMBConvUTF7::WC2MB(char * WXUNUSED(buf), return 0; } -//---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // UTF-8 -//---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- WXDLLEXPORT_DATA(wxMBConvUTF8) wxConvUTF8; -static unsigned long utf8_max[]={0x7f,0x7ff,0xffff,0x1fffff,0x3ffffff,0x7fffffff,0xffffffff}; +static wxUint32 utf8_max[]= + { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff }; size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const { - size_t len = 0; - - while (*psz && ((!buf) || (len>cnt); - while (cnt--) { - cc = *psz++; - if ((cc&0xC0)!=0x80) { - // invalid UTF-8 sequence - return (size_t)-1; - } - res=(res<<6)|(cc&0x3f); - } - if (res<=utf8_max[ocnt]) { - // illegal UTF-8 encoding - return (size_t)-1; + size_t len = 0; + + while (*psz && ((!buf) || (len < n))) + { + unsigned char cc = *psz++, fc = cc; + unsigned cnt; + for (cnt = 0; fc & 0x80; cnt++) + fc <<= 1; + if (!cnt) + { + // plain ASCII char + if (buf) + *buf++ = cc; + len++; + } + else + { + cnt--; + if (!cnt) + { + // invalid UTF-8 sequence + return (size_t)-1; + } + else + { + unsigned ocnt = cnt - 1; + wxUint32 res = cc & (0x3f >> cnt); + while (cnt--) + { + cc = *psz++; + if ((cc & 0xC0) != 0x80) + { + // invalid UTF-8 sequence + return (size_t)-1; + } + res = (res << 6) | (cc & 0x3f); + } + if (res <= utf8_max[ocnt]) + { + // illegal UTF-8 encoding + return (size_t)-1; + } +#ifdef WC_UTF16 + size_t pa = encode_utf16(res, buf); + if (pa == (size_t)-1) + return (size_t)-1; + if (buf) + buf += pa; + len += pa; +#else + if (buf) + *buf++ = res; + len++; +#endif + } } - if (buf) *buf++=res; - len++; - } } - } - if (buf && (lenutf8_max[cnt]; cnt++); - if (!cnt) { - // plain ASCII char - if (buf) *buf++=cc; - len++; - } else { - len+=cnt+1; - if (buf) { - *buf++=(-128>>cnt)|((cc>>(cnt*6))&(0x3f>>cnt)); - while (cnt--) - *buf++=0x80|((cc>>(cnt*6))&0x3f); - } + size_t len = 0; + + while (*psz && ((!buf) || (len < n))) + { + wxUint32 cc; +#ifdef WC_UTF16 + size_t pa = decode_utf16(psz,cc); + psz += (pa == (size_t)-1) ? 1 : pa; +#else + cc=(*psz++) & 0x7fffffff; +#endif + unsigned cnt; + for (cnt = 0; cc > utf8_max[cnt]; cnt++) {} + if (!cnt) + { + // plain ASCII char + if (buf) + *buf++ = cc; + len++; + } + + else + { + len += cnt + 1; + if (buf) + { + *buf++ = (-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt)); + while (cnt--) + *buf++ = 0x80 | ((cc >> (cnt * 6)) & 0x3f); + } + } } - } - if (buf && (len wxConvUTF8) +// - move wxEncodingConverter meat in here + +#ifdef __WIN32__ +#include "wx/msw/registry.h" +// this should work if M$ Internet Exploiter is installed +static long CharsetToCodepage(const wxChar *name) +{ + if (!name) + return GetACP(); + + long CP=-1; + + wxString cn(name); + do { + wxString path(wxT("MIME\\Database\\Charset\\")); + path += cn; + wxRegKey key(wxRegKey::HKCR, path); + + if (!key.Exists()) continue; + + // two cases: either there's an AliasForCharset string, + // or there are Codepage and InternetEncoding dwords. + // The InternetEncoding gives us the actual encoding, + // the Codepage just says which Windows character set to + // use when displaying the data. + if (key.HasValue(wxT("InternetEncoding")) && + key.QueryValue(wxT("InternetEncoding"), &CP)) break; + + // no encoding, see if it's an alias + if (!key.HasValue(wxT("AliasForCharset")) || + !key.QueryValue(wxT("AliasForCharset"), cn)) break; + } while (1); + + return CP; +} #endif class wxCharacterSet { public: - wxArrayString names; - wchar_t *data; + wxCharacterSet(const wxChar*name) + : cname(name) {} + virtual ~wxCharacterSet() + {} + virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) + { return (size_t)-1; } + virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) + { return (size_t)-1; } + virtual bool usable() + { return FALSE; } +public: + const wxChar*cname; +}; + +class ID_CharSet : public wxCharacterSet +{ +public: + ID_CharSet(const wxChar *name,wxMBConv *cnv) + : wxCharacterSet(name), work(cnv) {} + + size_t MB2WC(wchar_t *buf, const char *psz, size_t n) + { return work ? work->MB2WC(buf,psz,n) : (size_t)-1; } + + size_t WC2MB(char *buf, const wchar_t *psz, size_t n) + { return work ? work->WC2MB(buf,psz,n) : (size_t)-1; } + + bool usable() + { return work!=NULL; } +public: + wxMBConv*work; }; -WX_DECLARE_OBJARRAY(wxCharacterSet, wxCSArray); -#include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(wxCSArray); -static wxCSArray wxCharsets; +#ifdef HAVE_ICONV_H -static void wxLoadCharacterSets(void) +// 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) && \ + (errno != E2BIG || bufLeft != 0)) +#else +#define ICONV_FAILED(cres, bufLeft) (cres == (size_t)-1) +#endif + +class IC_CharSet : public wxCharacterSet { - static bool already_loaded = FALSE; - - if (already_loaded) return; - - already_loaded = TRUE; -#if defined(__UNIX__) && wxUSE_TEXTFILE - // search through files in /usr/share/i18n/charmaps - wxString fname; - for (fname = ::wxFindFirstFile(wxT("/usr/share/i18n/charmaps/*")); - !fname.IsEmpty(); - fname = ::wxFindNextFile()) { - wxTextFile cmap(fname); - if (cmap.Open()) { - wxCharacterSet *cset = new wxCharacterSet; - wxString comchar,escchar; - bool in_charset = FALSE; - - // wxFprintf(stderr,wxT("Loaded: %s\n"),fname.c_str()); - - wxString line; - for (line = cmap.GetFirstLine(); - !cmap.Eof(); - line = cmap.GetNextLine()) { - // wxFprintf(stderr,wxT("line contents: %s\n"),line.c_str()); - wxStringTokenizer token(line); - wxString cmd = token.GetNextToken(); - if (cmd == comchar) { - if (token.GetNextToken() == wxT("alias")) - cset->names.Add(token.GetNextToken()); - } - else if (cmd == wxT("")) - cset->names.Add(token.GetNextToken()); - else if (cmd == wxT("")) - comchar = token.GetNextToken(); - else if (cmd == wxT("")) - escchar = token.GetNextToken(); - else if (cmd == wxT("")) { - delete cset; - cset = (wxCharacterSet *) NULL; - break; // we don't support multibyte charsets ourselves (yet) +public: + IC_CharSet(const wxChar *name) + : wxCharacterSet(name) + { + m2w = iconv_open(WC_NAME, wxConvLibc.cWX2MB(cname)); + w2m = iconv_open(wxConvLibc.cWX2MB(cname), WC_NAME); + } + + ~IC_CharSet() + { + if ( m2w != (iconv_t)-1 ) + iconv_close(m2w); + if ( w2m != (iconv_t)-1 ) + iconv_close(w2m); + } + + size_t MB2WC(wchar_t *buf, const char *psz, size_t n) + { + size_t inbuf = strlen(psz); + size_t outbuf = n * SIZEOF_WCHAR_T; + size_t res, cres; + // VS: Use these instead of psz, buf because iconv() modifies its arguments: + wchar_t *bufPtr = buf; + const char *pszPtr = psz; + + if (buf) + { + // have destination buffer, convert there +#ifdef WX_ICONV_TAKES_CHAR + cres = iconv(m2w, (char**)&pszPtr, &inbuf, (char**)&bufPtr, &outbuf); +#else + cres = iconv(m2w, &pszPtr, &inbuf, (char**)&bufPtr, &outbuf); +#endif + res = n - (outbuf / SIZEOF_WCHAR_T); + // convert to native endianness +#ifdef WC_NEED_BSWAP + WC_BSWAP(buf /* _not_ bufPtr */, res) +#endif } - else if (cmd == wxT("CHARMAP")) { - cset->data = (wchar_t *)calloc(256, sizeof(wchar_t)); - in_charset = TRUE; + else + { + // no destination buffer... convert using temp buffer + // to calculate destination buffer requirement + wchar_t tbuf[8]; + res = 0; + do { + bufPtr = tbuf; outbuf = 8*SIZEOF_WCHAR_T; +#ifdef WX_ICONV_TAKES_CHAR + cres = iconv( m2w, (char**)&pszPtr, &inbuf, (char**)&bufPtr, &outbuf ); +#else + cres = iconv( m2w, &pszPtr, &inbuf, (char**)&bufPtr, &outbuf ); +#endif + res += 8-(outbuf/SIZEOF_WCHAR_T); + } while ((cres==(size_t)-1) && (errno==E2BIG)); } - else if (cmd == wxT("END")) { - if (token.GetNextToken() == wxT("CHARMAP")) - in_charset = FALSE; + + if (ICONV_FAILED(cres, inbuf)) + return (size_t)-1; + + return res; + } + + size_t WC2MB(char *buf, const wchar_t *psz, size_t n) + { +#if defined(__BORLANDC__) && (__BORLANDC__ > 0x530) + size_t inbuf = std::wcslen(psz) * SIZEOF_WCHAR_T; +#else + size_t inbuf = ::wcslen(psz) * SIZEOF_WCHAR_T; +#endif + size_t outbuf = n; + size_t res, cres; + +#ifdef WC_NEED_BSWAP + // 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 + // could be in read-only memory, or be accessed in some other thread) + wchar_t *tmpbuf=(wchar_t*)malloc((inbuf+1)*SIZEOF_WCHAR_T); + memcpy(tmpbuf,psz,(inbuf+1)*SIZEOF_WCHAR_T); + WC_BSWAP(tmpbuf, inbuf) + psz=tmpbuf; +#endif + if (buf) + { + // have destination buffer, convert there +#ifdef WX_ICONV_TAKES_CHAR + cres = iconv( w2m, (char**)&psz, &inbuf, &buf, &outbuf ); +#else + cres = iconv( w2m, (const char**)&psz, &inbuf, &buf, &outbuf ); +#endif + res = n-outbuf; } - else if (in_charset) { - // format: /x00 NULL (NUL) - // /x41 LATIN CAPITAL LETTER A - wxString hex = token.GetNextToken(); - // skip whitespace (why doesn't wxStringTokenizer do this?) - while (wxIsEmpty(hex) && token.HasMoreTokens()) hex = token.GetNextToken(); - wxString uni = token.GetNextToken(); - // skip whitespace again - while (wxIsEmpty(uni) && token.HasMoreTokens()) uni = token.GetNextToken(); - if ((hex.Len() > 2) && (wxString(hex.GetChar(0)) == escchar) && (hex.GetChar(1) == wxT('x')) && - (uni.Left(2) == wxT("=0) { - unsigned long uni1 = ::wxHexToDec(uni.Mid(2,2)); - unsigned long uni2 = ::wxHexToDec(uni.Mid(4,2)); - cset->data[pos] = (uni1 << 16) | uni2; - // wxFprintf(stderr,wxT("char %02x mapped to %04x (%c)\n"),pos,cset->data[pos],cset->data[pos]); - } - } + else + { + // no destination buffer... convert using temp buffer + // to calculate destination buffer requirement + char tbuf[16]; + res = 0; + do { + buf = tbuf; outbuf = 16; +#ifdef WX_ICONV_TAKES_CHAR + cres = iconv( w2m, (char**)&psz, &inbuf, &buf, &outbuf ); +#else + cres = iconv( w2m, (const char**)&psz, &inbuf, &buf, &outbuf ); +#endif + res += 16 - outbuf; + } while ((cres==(size_t)-1) && (errno==E2BIG)); } - } - if (cset) { - cset->names.Shrink(); - wxCharsets.Add(cset); - } +#ifdef WC_NEED_BSWAP + free(tmpbuf); +#endif + if (ICONV_FAILED(cres, inbuf)) + return (size_t)-1; + + return res; } - } + + bool usable() + { return (m2w != (iconv_t)-1) && (w2m != (iconv_t)-1); } + +public: + iconv_t m2w, w2m; +}; #endif - wxCharsets.Shrink(); -} -static wxCharacterSet *wxFindCharacterSet(const wxChar *charset) +#ifdef __WIN32__ +class CP_CharSet : public wxCharacterSet { - if (!charset) return (wxCharacterSet *)NULL; - wxLoadCharacterSets(); - for (size_t n=0; nCharsetToEncoding(name, FALSE); + m2w.Init(enc, wxFONTENCODING_UNICODE); + w2m.Init(wxFONTENCODING_UNICODE, enc); + } + + size_t MB2WC(wchar_t *buf, const char *psz, size_t n) + { + size_t inbuf = strlen(psz); + if (buf) + m2w.Convert(psz,buf); + return inbuf; + } + + size_t WC2MB(char *buf, const wchar_t *psz, size_t n) + { +#if defined(__BORLANDC__) && (__BORLANDC__ > 0x530) + size_t inbuf = std::wcslen(psz); +#else + size_t inbuf = ::wcslen(psz); +#endif + if (buf) + w2m.Convert(psz,buf); + + return inbuf; + } + + bool usable() + { return (enc!=wxFONTENCODING_SYSTEM) && (enc!=wxFONTENCODING_DEFAULT); } + +public: + wxFontEncoding enc; + wxEncodingConverter m2w, w2m; +}; + +static wxCharacterSet *wxGetCharacterSet(const wxChar *name) +{ + wxCharacterSet *cset = NULL; + if (name) + { + if (wxStricmp(name, wxT("UTF8")) == 0 || wxStricmp(name, wxT("UTF-8")) == 0) + { + cset = new ID_CharSet(name, &wxConvUTF8); + } + else + { +#ifdef HAVE_ICONV_H + cset = new IC_CharSet(name); // may not take NULL +#endif + } + } + + if (cset && cset->usable()) return cset; + if (cset) delete cset; + cset = NULL; +#ifdef __WIN32__ + cset = new CP_CharSet(name); // may take NULL + if (cset->usable()) return cset; +#endif + if (cset) delete cset; + cset = new EC_CharSet(name); + if (cset->usable()) return cset; + delete cset; + wxLogError(_("Unknown encoding '%s'!"), name); + return NULL; +} wxCSConv::wxCSConv(const wxChar *charset) { - m_name = (wxChar *) NULL; - m_cset = (wxCharacterSet *) NULL; - m_deferred = TRUE; - SetName(charset); + m_name = (wxChar *) NULL; + m_cset = (wxCharacterSet *) NULL; + m_deferred = TRUE; + SetName(charset); } wxCSConv::~wxCSConv() { - if (m_name) free(m_name); + if (m_name) free(m_name); + if (m_cset) delete m_cset; } void wxCSConv::SetName(const wxChar *charset) { - if (charset) { -#ifdef __UNIX__ - // first, convert the character set name to standard form - wxString codeset; - if (wxString(charset,3).CmpNoCase(wxT("ISO")) == 0) { - // make sure it's represented in the standard form: ISO_8859-1 - codeset = wxT("ISO_"); - charset += 3; - if ((*charset == wxT('-')) || (*charset == wxT('_'))) charset++; - if (wxStrlen(charset)>4) { - if (wxString(charset,4) == wxT("8859")) { - codeset << wxT("8859-"); - if (*charset == wxT('-')) charset++; - } - } + if (charset) + { + m_name = wxStrdup(charset); + m_deferred = TRUE; } - codeset << charset; - codeset.MakeUpper(); - m_name = wxStrdup(codeset.c_str()); - m_deferred = TRUE; -#endif - } } void wxCSConv::LoadNow() { -// wxPrintf(wxT("Conversion request\n")); - if (m_deferred) { - if (!m_name) { + if (m_deferred) + { + if (!m_name) + { #ifdef __UNIX__ - wxChar *lang = wxGetenv(wxT("LANG")); - wxChar *dot = lang ? wxStrchr(lang, wxT('.')) : (wxChar *)NULL; - if (dot) SetName(dot+1); +#if defined(HAVE_LANGINFO_H) && defined(CODESET) + // GNU libc provides current character set this way + char *alang = nl_langinfo(CODESET); + if (alang) + { + SetName(wxConvLibc.cMB2WX(alang)); + } + else +#endif + { + // if we can't get at the character set directly, + // try to see if it's in the environment variables + // (in most cases this won't work, but I was out of ideas) + wxChar *lang = wxGetenv(wxT("LC_ALL")); + wxChar *dot = lang ? wxStrchr(lang, wxT('.')) : (wxChar *)NULL; + if (!dot) + { + lang = wxGetenv(wxT("LC_CTYPE")); + dot = lang ? wxStrchr(lang, wxT('.')) : (wxChar *)NULL; + } + if (!dot) + { + lang = wxGetenv(wxT("LANG")); + dot = lang ? wxStrchr(lang, wxT('.')) : (wxChar *)NULL; + } + if (dot) + SetName(dot+1); + } #endif + } + m_cset = wxGetCharacterSet(m_name); + m_deferred = FALSE; } - m_cset = wxFindCharacterSet(m_name); - m_deferred = FALSE; - } } size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const { - ((wxCSConv *)this)->LoadNow(); // discard constness - if (buf) { - if (m_cset) { - for (size_t c=0; cdata[(unsigned char)(psz[c])]; - } else { - // latin-1 (direct) - for (size_t c=0; cLoadNow(); // discard constness + + if (m_cset) + return m_cset->MB2WC(buf, psz, n); + + // latin-1 (direct) + size_t len = strlen(psz); + + if (buf) + { + for (size_t c = 0; c <= len; c++) + buf[c] = (unsigned char)(psz[c]); } - return n; - } - return strlen(psz); + + return len; } size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const { - ((wxCSConv *)this)->LoadNow(); // discard constness - if (buf) { - if (m_cset) { - for (size_t c=0; cdata[n] != psz[c]); n++); - buf[c] = (n>0xff) ? '?' : n; - } - } else { - // latin-1 (direct) - for (size_t c=0; c0xff) ? '?' : psz[c]; - } - return n; - } + ((wxCSConv *)this)->LoadNow(); // discard constness + + if (m_cset) + return m_cset->WC2MB(buf, psz, n); + + // latin-1 (direct) #if defined(__BORLANDC__) && (__BORLANDC__ > 0x530) - return std::wcslen(psz); + size_t len=std::wcslen(psz); #else - return ::wcslen(psz); + size_t len=::wcslen(psz); #endif + if (buf) + { + for (size_t c = 0; c <= len; c++) + buf[c] = (psz[c] > 0xff) ? '?' : psz[c]; + } + + return len; } +#ifdef HAVE_ICONV_H +class IC_CharSetConverter +{ +public: + IC_CharSetConverter(IC_CharSet *from, IC_CharSet *to) + { + cnv = iconv_open(wxConvLibc.cWX2MB(to->cname), + wxConvLibc.cWX2MB(from->cname)); + } + + ~IC_CharSetConverter() + { + if (cnv != (iconv_t)-1) + iconv_close(cnv); + } + + size_t Convert(char *buf, const char *psz, size_t n) + { + size_t inbuf = strlen(psz); + size_t outbuf = n; +#ifdef WX_ICONV_TAKES_CHAR + size_t res = iconv( cnv, (char**)&psz, &inbuf, &buf, &outbuf ); +#else + size_t res = iconv( cnv, &psz, &inbuf, &buf, &outbuf ); #endif - //wxUSE_WCHAR_T + if (res == (size_t)-1) + return (size_t)-1; + return (n - outbuf); + } + +public: + iconv_t cnv; +}; +#endif + +class EC_CharSetConverter +{ +public: + EC_CharSetConverter(EC_CharSet*from,EC_CharSet*to) + { cnv.Init(from->enc,to->enc); } + + size_t Convert(char*buf, const char*psz, size_t n) + { + size_t inbuf = strlen(psz); + if (buf) cnv.Convert(psz,buf); + return inbuf; + } + +public: + wxEncodingConverter cnv; +}; + +#else // !wxUSE_WCHAR_T + +// ---------------------------------------------------------------------------- +// stand-ins in absence of wchar_t +// ---------------------------------------------------------------------------- + +WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile; + +#endif // wxUSE_WCHAR_T