Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxLocale::GetSystemEncoding

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-05-31 20:27:37 +00:00
parent 0d6ae333cd
commit dccce9eae1
8 changed files with 326 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

242
src/common/strconv.cpp
View File

@@ -93,18 +93,18 @@ WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
static size_t encode_utf16(wxUint32 input,wxUint16*output)
{
if (input<=0xffff)
if (input<=0xffff)
{
if (output) *output++ = input;
return 1;
}
else if (input>=0x110000)
}
else if (input>=0x110000)
{
return (size_t)-1;
}
else
}
else
{
if (output)
if (output)
{
*output++ = (input >> 10)+0xd7c0;
*output++ = (input&0x3ff)+0xdc00;
@@ -115,17 +115,17 @@ static size_t encode_utf16(wxUint32 input,wxUint16*output)
static size_t decode_utf16(wxUint16*input,wxUint32&output)
{
if ((*input<0xd800) || (*input>0xdfff))
if ((*input<0xd800) || (*input>0xdfff))
{
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;
}
else
}
else
{
output = ((input[0] - 0xd7c0) << 10) + (input[1] - 0xdc00);
return 2;
@@ -209,11 +209,11 @@ WXDLLEXPORT_DATA(wxMBConvGdk) wxConvGdk;
size_t wxMBConvGdk::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
if (buf)
if (buf)
{
return gdk_mbstowcs((GdkWChar *)buf, psz, n);
}
else
}
else
{
GdkWChar *nbuf = new GdkWChar[n=strlen(psz)];
size_t len = gdk_mbstowcs(nbuf, psz, n);
@@ -226,12 +226,12 @@ 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 (buf)
{
if (len > n)
if (len > n)
len = n;
memcpy(buf, psz, len);
if (len < n)
if (len < n)
buf[len] = 0;
}
return len;
@@ -276,49 +276,49 @@ size_t wxMBConvUTF7::WC2MB(char * WXUNUSED(buf),
WXDLLEXPORT_DATA(wxMBConvUTF8) wxConvUTF8;
static wxUint32 utf8_max[]=
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 < n)))
while (*psz && ((!buf) || (len < n)))
{
unsigned char cc = *psz++, fc = cc;
unsigned cnt;
for (cnt = 0; fc & 0x80; cnt++)
for (cnt = 0; fc & 0x80; cnt++)
fc <<= 1;
if (!cnt)
if (!cnt)
{
// plain ASCII char
if (buf)
if (buf)
*buf++ = cc;
len++;
}
else
}
else
{
cnt--;
if (!cnt)
if (!cnt)
{
// invalid UTF-8 sequence
return (size_t)-1;
}
else
}
else
{
unsigned ocnt = cnt - 1;
wxUint32 res = cc & (0x3f >> cnt);
while (cnt--)
while (cnt--)
{
cc = *psz++;
if ((cc & 0xC0) != 0x80)
if ((cc & 0xC0) != 0x80)
{
// invalid UTF-8 sequence
return (size_t)-1;
}
res = (res << 6) | (cc & 0x3f);
}
if (res <= utf8_max[ocnt])
if (res <= utf8_max[ocnt])
{
// illegal UTF-8 encoding
return (size_t)-1;
@@ -327,18 +327,18 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
size_t pa = encode_utf16(res, buf);
if (pa == (size_t)-1)
return (size_t)-1;
if (buf)
if (buf)
buf += pa;
len += pa;
#else
if (buf)
if (buf)
*buf++ = res;
len++;
#endif
}
}
}
if (buf && (len < n))
if (buf && (len < n))
*buf = 0;
return len;
}
@@ -347,7 +347,7 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
size_t len = 0;
while (*psz && ((!buf) || (len < n)))
while (*psz && ((!buf) || (len < n)))
{
wxUint32 cc;
#ifdef WC_UTF16
@@ -358,18 +358,18 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
#endif
unsigned cnt;
for (cnt = 0; cc > utf8_max[cnt]; cnt++) {}
if (!cnt)
if (!cnt)
{
// plain ASCII char
if (buf)
if (buf)
*buf++ = cc;
len++;
}
else
}
else
{
len += cnt + 1;
if (buf)
if (buf)
{
*buf++ = (-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt));
while (cnt--)
@@ -401,11 +401,11 @@ WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);
// this should work if M$ Internet Exploiter is installed
static long CharsetToCodepage(const wxChar *name)
{
if (!name)
if (!name)
return GetACP();
long CP=-1;
wxString cn(name);
do {
wxString path(wxT("MIME\\Database\\Charset\\"));
@@ -413,7 +413,7 @@ static long CharsetToCodepage(const wxChar *name)
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,
@@ -421,12 +421,12 @@ static long CharsetToCodepage(const wxChar *name)
// 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
@@ -438,7 +438,7 @@ public:
: cname(name) {}
virtual ~wxCharacterSet()
{}
virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
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; }
@@ -453,13 +453,13 @@ 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:
@@ -486,21 +486,21 @@ public:
class IC_CharSet : public wxCharacterSet
{
public:
IC_CharSet(const wxChar *name)
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 )
if ( m2w != (iconv_t)-1 )
iconv_close(m2w);
if ( w2m != (iconv_t)-1 )
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);
@@ -540,13 +540,13 @@ public:
res += 8-(outbuf/SIZEOF_WCHAR_T);
} while ((cres==(size_t)-1) && (errno==E2BIG));
}
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)
@@ -598,13 +598,13 @@ public:
#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;
};
@@ -614,23 +614,23 @@ public:
class CP_CharSet : public wxCharacterSet
{
public:
CP_CharSet(const wxChar*name)
CP_CharSet(const wxChar*name)
: wxCharacterSet(name), CodePage(CharsetToCodepage(name)) {}
size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
{
size_t len =
size_t len =
MultiByteToWideChar(CodePage, 0, psz, -1, buf, buf ? n : 0);
return len ? len : (size_t)-1;
}
size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
{
size_t len = WideCharToMultiByte(CodePage, 0, psz, -1, buf,
buf ? n : 0, NULL, NULL);
return len ? len : (size_t)-1;
}
bool usable()
{ return CodePage != -1; }
@@ -644,7 +644,7 @@ class EC_CharSet : public wxCharacterSet
public:
// temporarily just use wxEncodingConverter stuff,
// so that it works while a better implementation is built
EC_CharSet(const wxChar*name) : wxCharacterSet(name),
EC_CharSet(const wxChar*name) : wxCharacterSet(name),
enc(wxFONTENCODING_SYSTEM)
{
if (name)
@@ -652,15 +652,15 @@ public:
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)
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)
@@ -670,10 +670,10 @@ public:
#endif
if (buf)
w2m.Convert(psz,buf);
return inbuf;
}
bool usable()
{ return (enc!=wxFONTENCODING_SYSTEM) && (enc!=wxFONTENCODING_DEFAULT); }
@@ -698,17 +698,26 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
#endif
}
}
if (cset && cset->usable()) return cset;
if (cset) delete cset;
cset = NULL;
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;
if (cset->usable())
return cset;
delete cset;
#endif // __WIN32__
cset = new EC_CharSet(name);
if (cset->usable()) return cset;
if (cset->usable())
return cset;
delete cset;
wxLogError(_("Unknown encoding '%s'!"), name);
return NULL;
@@ -716,16 +725,15 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
wxCSConv::wxCSConv(const wxChar *charset)
{
m_name = (wxChar *) NULL;
m_name = (wxChar *)NULL;
m_cset = (wxCharacterSet *) NULL;
m_deferred = TRUE;
SetName(charset);
}
wxCSConv::~wxCSConv()
{
if (m_name) free(m_name);
if (m_cset) delete m_cset;
free(m_name);
delete m_cset;
}
void wxCSConv::SetName(const wxChar *charset)
@@ -741,39 +749,13 @@ void wxCSConv::LoadNow()
{
if (m_deferred)
{
if (!m_name)
if ( !m_name )
{
#ifdef __UNIX__
#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
wxString name = wxLocale::GetSystemEncodingName();
if ( !name.empty() )
SetName(name);
}
m_cset = wxGetCharacterSet(m_name);
m_deferred = FALSE;
}
@@ -782,26 +764,26 @@ void wxCSConv::LoadNow()
size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
((wxCSConv *)this)->LoadNow(); // 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 len;
}
size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
((wxCSConv *)this)->LoadNow(); // discard constness
if (m_cset)
return m_cset->WC2MB(buf, psz, n);
@@ -816,26 +798,27 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
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));
cnv = iconv_open(wxConvLibc.cWX2MB(to->cname),
wxConvLibc.cWX2MB(from->cname));
}
~IC_CharSetConverter()
{
if (cnv != (iconv_t)-1)
iconv_close(cnv);
{
if (cnv != (iconv_t)-1)
iconv_close(cnv);
}
size_t Convert(char *buf, const char *psz, size_t n)
{
size_t inbuf = strlen(psz);
@@ -845,7 +828,7 @@ public:
#else
size_t res = iconv( cnv, &psz, &inbuf, &buf, &outbuf );
#endif
if (res == (size_t)-1)
if (res == (size_t)-1)
return (size_t)-1;
return (n - outbuf);
}
@@ -853,21 +836,22 @@ public:
public:
iconv_t cnv;
};
#endif
#endif // HAVE_ICONV_H
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;
};