#include "wx/log.h"
#endif // WX_PRECOMP
+#include "wx/strconv.h"
+
+#if wxUSE_WCHAR_T
+
#ifdef __WXMSW__
#include "wx/msw/private.h"
#endif
#include <string.h>
#include <stdlib.h>
-#include "wx/module.h"
-#include "wx/strconv.h"
-
#if defined(__WIN32__) && !defined(__WXMICROWIN__)
#define wxHAVE_WIN32_MB2WC
#endif // __WIN32__ but !__WXMICROWIN__
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
-#if wxUSE_WCHAR_T
- WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc;
- WXDLLIMPEXP_DATA_BASE(wxCSConv) wxConvLocal((const wxChar *)NULL);
- WXDLLIMPEXP_DATA_BASE(wxCSConv) wxConvISO8859_1(_T("iso-8859-1"));
-#else
- // stand-ins in absence of wchar_t
- WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc,
- wxConvFile,
- wxConvISO8859_1,
- wxConvLocal,
- wxConvUTF8;
-#endif // wxUSE_WCHAR_T
-
-WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = &wxConvLibc;
-
-class wxStrConvModule: public wxModule
-{
-public:
- wxStrConvModule() : wxModule() { }
- virtual bool OnInit() { return true; }
- virtual void OnExit()
- {
-#if wxUSE_WCHAR_T
- wxConvLocal.Clear();
- wxConvISO8859_1.Clear();
-#endif
- }
-
- DECLARE_DYNAMIC_CLASS(wxStrConvModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxStrConvModule, wxModule)
-
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if wxUSE_WCHAR_T
-
#ifdef __SALFORDC__
#include <clib.h>
#endif
#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]); }
-// under Unix SIZEOF_WCHAR_T is defined by configure, but under other platforms
-// it might be not defined - assume the most common value
-#ifndef SIZEOF_WCHAR_T
- #define SIZEOF_WCHAR_T 2
-#endif // !defined(SIZEOF_WCHAR_T)
-
#if SIZEOF_WCHAR_T == 4
#define WC_NAME "UCS4"
#define WC_BSWAP BSWAP_UCS4
#define WC_NAME_BEST "UTF-16LE"
#endif
#else // sizeof(wchar_t) != 2 nor 4
- // I don't know what to do about this
- #error "Weird sizeof(wchar_t): please report your platform details to wx-users mailing list"
+ // does this ever happen?
+ #error "Unknown sizeof(wchar_t): please report this to wx-dev@lists.wxwindows.org"
#endif
// ============================================================================
// wxMBConv
// ----------------------------------------------------------------------------
-#define IGNORE_LIBC 0
-
wxMBConv::~wxMBConv()
{
// nothing to do here
}
-size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
-{
-#if IGNORE_LIBC
- if (buf)
- {
- for (size_t i = 0; i < strlen( psz )+1; i++)
- buf[i] = (wchar_t) psz[i];
- return strlen( psz );
- }
- else
- {
- return strlen( psz );
- }
-#else
- return wxMB2WC(buf, psz, n);
-#endif
-}
-
-size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
-{
-#if IGNORE_LIBC
- if (buf)
- {
- for (size_t i = 0; i < wxStrlen( psz )+1; i++)
- buf[i] = (char) psz[i];
- return wxStrlen( psz );
- }
- else
- {
- return wxStrlen( psz );
- }
-#else
- return wxWC2MB(buf, psz, n);
-#endif
-}
-
const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
{
if ( psz )
}
// ----------------------------------------------------------------------------
-// UTF-7
+// wxMBConvLibc
// ----------------------------------------------------------------------------
-WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7) wxConvUTF7;
+size_t wxMBConvLibc::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+ return wxMB2WC(buf, psz, n);
+}
+
+size_t wxMBConvLibc::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+ return wxWC2MB(buf, psz, n);
+}
+
+// ----------------------------------------------------------------------------
+// UTF-7
+// ----------------------------------------------------------------------------
#if 0
static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
// UTF-8
// ----------------------------------------------------------------------------
-WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8) wxConvUTF8;
-
static wxUint32 utf8_max[]=
{ 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff };
return (size_t)-1;
}
#ifdef WC_UTF16
- size_t pa = encode_utf16(res, buf);
+ // 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)
{
wxUint32 cc;
#ifdef WC_UTF16
- size_t pa = decode_utf16(psz, cc);
+ // cast is ok for WC_UTF16
+ size_t pa = decode_utf16((const wxUint16 *)psz, cc);
psz += (pa == (size_t)-1) ? 1 : pa;
#else
cc=(*psz++) & 0x7fffffff;
// ----------------------------------------------------------------------------
#ifdef WORDS_BIGENDIAN
-#define wxMBConvUTF16straight wxMBConvUTF16BE
-#define wxMBConvUTF16swap wxMBConvUTF16LE
+ #define wxMBConvUTF16straight wxMBConvUTF16BE
+ #define wxMBConvUTF16swap wxMBConvUTF16LE
#else
-#define wxMBConvUTF16swap wxMBConvUTF16BE
-#define wxMBConvUTF16straight wxMBConvUTF16LE
+ #define wxMBConvUTF16swap wxMBConvUTF16BE
+ #define wxMBConvUTF16straight wxMBConvUTF16LE
#endif
-WXDLLIMPEXP_DATA_BASE(wxMBConvUTF16LE) wxConvUTF16LE;
-WXDLLIMPEXP_DATA_BASE(wxMBConvUTF16BE) wxConvUTF16BE;
-
-
-
-
-
#ifdef WC_UTF16
-
// copy 16bit MB to 16bit String
size_t wxMBConvUTF16straight::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
if (buf)
{
*(wxUint16*)buf = cc[0];
- buf += sizeof(wxUint16);
+ buf += sizeof(wxUint16);
if (pa > 1)
{
*(wxUint16*)buf = cc[1];
{
wxUint32 cc;
- size_t pa=decode_utf16(psz, cc);
+ // cast is ok for WC_UTF16
+ size_t pa = decode_utf16((const wxUint16 *)psz, cc);
if (pa == (size_t)-1)
return pa;
len += sizeof(wxUint32);
psz += pa;
}
- if (buf && len<=n-sizeof(wxUint32)) *(wxUint32*)buf=0;
+
+ if (buf && len<=n-sizeof(wxUint32))
+ *(wxUint32*)buf=0;
return len;
}
len += pa;
psz += sizeof(wxUint32);
}
- if (buf && len<n) *buf=0;
+
+ if (buf && len<n)
+ *buf=0;
return len;
}
{
char cc[4];
- size_t pa=decode_utf16(psz, *(wxUint32*)cc);
+ // cast is ok for WC_UTF16
+ size_t pa=decode_utf16((const wxUint16 *)psz, *(wxUint32*)cc);
if (pa == (size_t)-1)
return pa;
len += sizeof(wxUint32);
psz += pa;
}
- if (buf && len<=n-sizeof(wxUint32)) *(wxUint32*)buf=0;
+
+ if (buf && len<=n-sizeof(wxUint32))
+ *(wxUint32*)buf=0;
return len;
}
len++;
psz += sizeof(wxUint32);
}
- if (buf && len<n) *buf=0;
+
+ if (buf && len<n)
+ *buf=0;
return len;
}
psz++;
}
- if (buf && len<=n-sizeof(wxUint32)) *(wxUint32*)buf=0;
+ if (buf && len<=n-sizeof(wxUint32))
+ *(wxUint32*)buf=0;
return len;
}
len++;
psz += sizeof(wxUint32);
}
- if (buf && len<n) *buf=0;
+
+ if (buf && len<n)
+ *buf=0;
return len;
}
len += sizeof(wxUint32);
psz++;
}
- if (buf && len<=n-sizeof(wxUint32)) *(wxUint32*)buf=0;
+
+ if (buf && len<=n-sizeof(wxUint32))
+ *(wxUint32*)buf=0;
return len;
}
wxMBConv_iconv(const wxChar *name);
virtual ~wxMBConv_iconv();
- virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n);
- virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n);
+ virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
+ 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); }
iconv_close(w2m);
}
-size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n)
+size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
size_t inbuf = strlen(psz);
size_t outbuf = n * SIZEOF_WCHAR_T;
return res;
}
-size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n)
+size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
size_t inbuf = wxWcslen(psz) * SIZEOF_WCHAR_T;
size_t outbuf = n;
class wxMBConv_win32 : public wxMBConv
{
public:
+ wxMBConv_win32()
+ {
+ m_CodePage = CP_ACP;
+ }
+
wxMBConv_win32(const wxChar* name)
- {
- m_CodePage = wxCharsetToCodepage(name);
- }
+ {
+ m_CodePage = wxCharsetToCodepage(name);
+ }
wxMBConv_win32(wxFontEncoding encoding)
- {
- m_CodePage = wxEncodingToCodepage(encoding);
- }
+ {
+ m_CodePage = wxEncodingToCodepage(encoding);
+ }
- size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
+ size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
const size_t len = ::MultiByteToWideChar
(
buf ? n : 0 // size of output buffer
);
- // note that it returns # of written chars for buf != NULL and *size*
- // of the needed buffer for buf == NULL
- return len ? (buf ? len : len - 1) : (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;
}
- size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
+ size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
const size_t len = ::WideCharToMultiByte
(
NULL // [out] was it used?
);
- // see the comment above!
- return len ? (buf ? len : len - 1) : (size_t)-1;
+ // see the comment above for the reason of "len - 1"
+ return len ? len - 1 : (size_t)-1;
}
bool IsOk() const
Init();
}
- size_t MB2WC(wchar_t *buf, const char *psz, size_t WXUNUSED(n))
+ size_t MB2WC(wchar_t *buf, const char *psz, size_t WXUNUSED(n)) const
{
size_t inbuf = strlen(psz);
if (buf)
return inbuf;
}
- size_t WC2MB(char *buf, const wchar_t *psz, size_t WXUNUSED(n))
+ size_t WC2MB(char *buf, const wchar_t *psz, size_t WXUNUSED(n)) const
{
const size_t inbuf = wxWcslen(psz);
if (buf)
m_deferred = true;
}
-// find a valid value for the encoding
-void wxCSConv::SetEncoding()
-{
-#if wxUSE_INTL
- m_encoding = wxLocale::GetSystemEncoding();
-#else
- m_encoding = wxFONTENCODING_SYSTEM;
-#endif
-}
-
wxCSConv::wxCSConv(const wxChar *charset)
{
Init();
if ( charset )
{
- // not used
- m_encoding = wxFONTENCODING_SYSTEM;
-
SetName(charset);
}
- else // no charset specified
- {
- SetEncoding();
- }
+
+ m_encoding = wxFONTENCODING_SYSTEM;
}
wxCSConv::wxCSConv(wxFontEncoding encoding)
{
- if ( encoding == wxFONTENCODING_MAX ||
- encoding == wxFONTENCODING_DEFAULT )
+ if ( encoding == wxFONTENCODING_MAX || encoding == wxFONTENCODING_DEFAULT )
{
wxFAIL_MSG( _T("invalid encoding value in wxCSConv ctor") );
Init();
- if ( encoding == wxFONTENCODING_SYSTEM )
- {
- SetEncoding();
- }
- else // have valid encoding, use it
- {
- m_encoding = encoding;
- }
+ m_encoding = encoding;
}
wxCSConv::~wxCSConv()
case wxFONTENCODING_UTF8:
return new wxMBConvUTF8;
- case wxFONTENCODING_UTF16:
- return new wxMBConvUTF16;
-
case wxFONTENCODING_UTF16BE:
return new wxMBConvUTF16BE;
case wxFONTENCODING_UTF16LE:
return new wxMBConvUTF16LE;
- case wxFONTENCODING_UTF32:
- return new wxMBConvUTF32;
-
case wxFONTENCODING_UTF32BE:
return new wxMBConvUTF32BE;
if ( m_deferred )
{
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 )
+ {
+ self->m_encoding = wxLocale::GetSystemEncoding();
+ }
+#endif // wxUSE_INTL
+
self->m_convReal = DoCreate();
self->m_deferred = false;
}
return len;
}
-#endif // wxUSE_WCHAR_T
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+#ifdef __WINDOWS__
+ static wxMBConv_win32 wxConvLibcObj;
+#else
+ static wxMBConvLibc wxConvLibcObj;
+#endif
+
+static wxCSConv wxConvLocalObj(wxFONTENCODING_SYSTEM);
+static wxCSConv wxConvISO8859_1Obj(wxFONTENCODING_ISO8859_1);
+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;
+
+#else // !wxUSE_WCHAR_T
+
+// stand-ins in absence of wchar_t
+WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc,
+ wxConvISO8859_1,
+ wxConvLocal,
+ wxConvUTF8;
+
+#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
projects / wxWidgets.git / blobdiff