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

some more src code reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-05-11 18:32:17 +00:00
parent be52217ed3
commit 4def3b3595
1 changed files with 187 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
src/common/strconv.cpp
View File

@@ -93,14 +93,19 @@ WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
static size_t encode_utf16(wxUint32 input,wxUint16*output) static size_t encode_utf16(wxUint32 input,wxUint16*output)
{ {
if (input<=0xffff) { if (input<=0xffff)
{
if (output) *output++ = input; if (output) *output++ = input;
return 1; return 1;
} else }
if (input>=0x110000) { else if (input>=0x110000)
{
return (size_t)-1; return (size_t)-1;
} else { }
if (output) { else
{
if (output)
{
*output++ = (input >> 10)+0xd7c0; *output++ = (input >> 10)+0xd7c0;
*output++ = (input&0x3ff)+0xdc00; *output++ = (input&0x3ff)+0xdc00;
} }
@@ -110,14 +115,18 @@ static size_t encode_utf16(wxUint32 input,wxUint16*output)
static size_t decode_utf16(wxUint16*input,wxUint32&output) static size_t decode_utf16(wxUint16*input,wxUint32&output)
{ {
if ((*input<0xd800) || (*input>0xdfff)) { if ((*input<0xd800) || (*input>0xdfff))
{
output = *input; output = *input;
return 1; return 1;
} else }
if ((input[1]<0xdc00) || (input[1]>=0xdfff)) { else if ((input[1]<0xdc00) || (input[1]>=0xdfff))
{
output = *input; output = *input;
return (size_t)-1; return (size_t)-1;
} else { }
else
{
output = ((input[0] - 0xd7c0) << 10) + (input[1] - 0xdc00); output = ((input[0] - 0xd7c0) << 10) + (input[1] - 0xdc00);
return 2; return 2;
} }
@@ -200,12 +209,15 @@ WXDLLEXPORT_DATA(wxMBConvGdk) wxConvGdk;
size_t wxMBConvGdk::MB2WC(wchar_t *buf, const char *psz, size_t n) const 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); return gdk_mbstowcs((GdkWChar *)buf, psz, n);
} else { }
else
{
GdkWChar *nbuf = new GdkWChar[n=strlen(psz)]; GdkWChar *nbuf = new GdkWChar[n=strlen(psz)];
size_t len = gdk_mbstowcs(nbuf, psz, n); size_t len = gdk_mbstowcs(nbuf, psz, n);
delete [] nbuf; delete[] nbuf;
return len; return len;
} }
} }
@@ -214,10 +226,13 @@ size_t wxMBConvGdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{ {
char *mbstr = gdk_wcstombs((GdkWChar *)psz); char *mbstr = gdk_wcstombs((GdkWChar *)psz);
size_t len = mbstr ? strlen(mbstr) : 0; size_t len = mbstr ? strlen(mbstr) : 0;
if (buf) { if (buf)
if (len > n) len = n; {
if (len > n)
len = n;
memcpy(buf, psz, len); memcpy(buf, psz, len);
if (len < n) buf[len] = 0; if (len < n)
buf[len] = 0;
} }
return len; return len;
} }
@@ -261,37 +276,50 @@ size_t wxMBConvUTF7::WC2MB(char * WXUNUSED(buf),
WXDLLEXPORT_DATA(wxMBConvUTF8) wxConvUTF8; WXDLLEXPORT_DATA(wxMBConvUTF8) wxConvUTF8;
static wxUint32 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 wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
size_t len = 0; size_t len = 0;
while (*psz && ((!buf) || (len<n))) { while (*psz && ((!buf) || (len < n)))
unsigned char cc=*psz++, fc=cc; {
unsigned char cc = *psz++, fc = cc;
unsigned cnt; unsigned cnt;
for (cnt=0; fc&0x80; cnt++) fc<<=1; for (cnt = 0; fc & 0x80; cnt++)
if (!cnt) { fc <<= 1;
if (!cnt)
{
// plain ASCII char // plain ASCII char
if (buf) *buf++=cc; if (buf)
*buf++ = cc;
len++; len++;
} else { }
else
{
cnt--; cnt--;
if (!cnt) { if (!cnt)
{
// invalid UTF-8 sequence // invalid UTF-8 sequence
return (size_t)-1; return (size_t)-1;
} else { }
unsigned ocnt=cnt-1; else
wxUint32 res=cc&(0x3f>>cnt); {
while (cnt--) { unsigned ocnt = cnt - 1;
wxUint32 res = cc & (0x3f >> cnt);
while (cnt--)
{
cc = *psz++; cc = *psz++;
if ((cc&0xC0)!=0x80) { if ((cc & 0xC0) != 0x80)
{
// invalid UTF-8 sequence // invalid UTF-8 sequence
return (size_t)-1; return (size_t)-1;
} }
res=(res<<6)|(cc&0x3f); res = (res << 6) | (cc & 0x3f);
} }
if (res<=utf8_max[ocnt]) { if (res <= utf8_max[ocnt])
{
// illegal UTF-8 encoding // illegal UTF-8 encoding
return (size_t)-1; return (size_t)-1;
} }
@@ -299,16 +327,19 @@ size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
size_t pa = encode_utf16(res, buf); size_t pa = encode_utf16(res, buf);
if (pa == (size_t)-1) if (pa == (size_t)-1)
return (size_t)-1; return (size_t)-1;
if (buf) buf+=pa; if (buf)
len+=pa; buf += pa;
len += pa;
#else #else
if (buf) *buf++=res; if (buf)
*buf++ = res;
len++; len++;
#endif #endif
} }
} }
} }
if (buf && (len<n)) *buf = 0; if (buf && (len < n))
*buf = 0;
return len; return len;
} }
@@ -316,29 +347,37 @@ size_t wxMBConvUTF8::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)))
{
wxUint32 cc; wxUint32 cc;
#ifdef WC_UTF16 #ifdef WC_UTF16
size_t pa = decode_utf16(psz,cc); size_t pa = decode_utf16(psz,cc);
psz += (pa == (size_t)-1) ? 1 : pa; psz += (pa == (size_t)-1) ? 1 : pa;
#else #else
cc=(*psz++)&0x7fffffff; cc=(*psz++) & 0x7fffffff;
#endif #endif
unsigned cnt; unsigned cnt;
for (cnt=0; cc>utf8_max[cnt]; cnt++); for (cnt = 0; cc > utf8_max[cnt]; cnt++) {}
if (!cnt) { if (!cnt)
{
// plain ASCII char // plain ASCII char
if (buf) *buf++=cc; if (buf)
*buf++ = cc;
len++; len++;
} else { }
len+=cnt+1;
if (buf) { else
*buf++=(-128>>cnt)|((cc>>(cnt*6))&(0x3f>>cnt)); {
len += cnt + 1;
if (buf)
{
*buf++ = (-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt));
while (cnt--) while (cnt--)
*buf++=0x80|((cc>>(cnt*6))&0x3f); *buf++ = 0x80 | ((cc >> (cnt * 6)) & 0x3f);
} }
} }
} }
if (buf && (len<n)) *buf = 0; if (buf && (len<n)) *buf = 0;
return len; return len;
} }
@@ -399,9 +438,9 @@ public:
: cname(name) {} : cname(name) {}
virtual ~wxCharacterSet() 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; } { return (size_t)-1; }
virtual size_t WC2MB(char*buf, const wchar_t*psz, size_t n) virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
{ return (size_t)-1; } { return (size_t)-1; }
virtual bool usable() virtual bool usable()
{ return FALSE; } { return FALSE; }
@@ -412,13 +451,13 @@ public:
class ID_CharSet : public wxCharacterSet class ID_CharSet : public wxCharacterSet
{ {
public: public:
ID_CharSet(const wxChar*name,wxMBConv*cnv) ID_CharSet(const wxChar *name,wxMBConv *cnv)
: wxCharacterSet(name), work(cnv) {} : wxCharacterSet(name), work(cnv) {}
size_t MB2WC(wchar_t*buf, const char*psz, size_t n) size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
{ return work ? work->MB2WC(buf,psz,n) : (size_t)-1; } { return work ? work->MB2WC(buf,psz,n) : (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)
{ return work ? work->WC2MB(buf,psz,n) : (size_t)-1; } { return work ? work->WC2MB(buf,psz,n) : (size_t)-1; }
bool usable() bool usable()
@@ -447,7 +486,7 @@ public:
class IC_CharSet : public wxCharacterSet class IC_CharSet : public wxCharacterSet
{ {
public: public:
IC_CharSet(const wxChar*name) IC_CharSet(const wxChar *name)
: wxCharacterSet(name) : wxCharacterSet(name)
{ {
m2w = iconv_open(WC_NAME, wxConvLibc.cWX2MB(cname)); m2w = iconv_open(WC_NAME, wxConvLibc.cWX2MB(cname));
@@ -508,7 +547,7 @@ public:
return res; return res;
} }
size_t WC2MB(char*buf, const wchar_t*psz, size_t n) size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
{ {
#if defined(__BORLANDC__) && (__BORLANDC__ > 0x530) #if defined(__BORLANDC__) && (__BORLANDC__ > 0x530)
size_t inbuf = std::wcslen(psz) * SIZEOF_WCHAR_T; size_t inbuf = std::wcslen(psz) * SIZEOF_WCHAR_T;
@@ -523,7 +562,7 @@ public:
// this absolutely doesn't rock! // this absolutely doesn't rock!
// (no, doing WC_BSWAP twice on the original buffer won't help, as it // (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) // could be in read-only memory, or be accessed in some other thread)
wchar_t*tmpbuf=(wchar_t*)malloc((inbuf+1)*SIZEOF_WCHAR_T); wchar_t *tmpbuf=(wchar_t*)malloc((inbuf+1)*SIZEOF_WCHAR_T);
memcpy(tmpbuf,psz,(inbuf+1)*SIZEOF_WCHAR_T); memcpy(tmpbuf,psz,(inbuf+1)*SIZEOF_WCHAR_T);
WC_BSWAP(tmpbuf, inbuf) WC_BSWAP(tmpbuf, inbuf)
psz=tmpbuf; psz=tmpbuf;
@@ -578,20 +617,22 @@ public:
CP_CharSet(const wxChar*name) CP_CharSet(const wxChar*name)
: wxCharacterSet(name), CodePage(CharsetToCodepage(name)) {} : wxCharacterSet(name), CodePage(CharsetToCodepage(name)) {}
size_t MB2WC(wchar_t*buf, const char*psz, size_t n) size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
{ {
size_t len = MultiByteToWideChar(CodePage,0,psz,-1,buf,buf?n:0); size_t len =
MultiByteToWideChar(CodePage, 0, psz, -1, buf, buf ? n : 0);
return len ? len : (size_t)-1; return len ? len : (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)
{ {
size_t len = WideCharToMultiByte(CodePage,0,psz,-1,buf,buf?n:0,NULL,NULL); size_t len = WideCharToMultiByte(CodePage, 0, psz, -1, buf,
buf ? n : 0, NULL, NULL);
return len ? len : (size_t)-1; return len ? len : (size_t)-1;
} }
bool usable() bool usable()
{ return CodePage!=-1; } { return CodePage != -1; }
public: public:
long CodePage; long CodePage;
@@ -603,7 +644,8 @@ class EC_CharSet : public wxCharacterSet
public: public:
// temporarily just use wxEncodingConverter stuff, // temporarily just use wxEncodingConverter stuff,
// so that it works while a better implementation is built // so that it works while a better implementation is built
EC_CharSet(const wxChar*name) : wxCharacterSet(name), enc(wxFONTENCODING_SYSTEM) EC_CharSet(const wxChar*name) : wxCharacterSet(name),
enc(wxFONTENCODING_SYSTEM)
{ {
if (name) if (name)
enc = wxTheFontMapper->CharsetToEncoding(name, FALSE); enc = wxTheFontMapper->CharsetToEncoding(name, FALSE);
@@ -611,14 +653,15 @@ public:
w2m.Init(wxFONTENCODING_UNICODE, enc); w2m.Init(wxFONTENCODING_UNICODE, enc);
} }
size_t MB2WC(wchar_t*buf, const char*psz, size_t n) size_t MB2WC(wchar_t *buf, const char *psz, size_t n)
{ {
size_t inbuf = strlen(psz); size_t inbuf = strlen(psz);
if (buf) m2w.Convert(psz,buf); if (buf)
m2w.Convert(psz,buf);
return inbuf; return inbuf;
} }
size_t WC2MB(char*buf, const wchar_t*psz, size_t n) size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
{ {
#if defined(__BORLANDC__) && (__BORLANDC__ > 0x530) #if defined(__BORLANDC__) && (__BORLANDC__ > 0x530)
size_t inbuf = std::wcslen(psz); size_t inbuf = std::wcslen(psz);
@@ -644,7 +687,7 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
wxCharacterSet *cset = NULL; wxCharacterSet *cset = NULL;
if (name) if (name)
{ {
if (!wxStricmp(name, wxT("UTF8")) || !wxStricmp(name, wxT("UTF-8"))) if (wxStricmp(name, wxT("UTF8")) == 0 || wxStricmp(name, wxT("UTF-8")) == 0)
{ {
cset = new ID_CharSet(name, &wxConvUTF8); cset = new ID_CharSet(name, &wxConvUTF8);
} }
@@ -703,7 +746,7 @@ void wxCSConv::LoadNow()
#ifdef __UNIX__ #ifdef __UNIX__
#if defined(HAVE_LANGINFO_H) && defined(CODESET) #if defined(HAVE_LANGINFO_H) && defined(CODESET)
// GNU libc provides current character set this way // GNU libc provides current character set this way
char*alang = nl_langinfo(CODESET); char *alang = nl_langinfo(CODESET);
if (alang) if (alang)
{ {
SetName(wxConvLibc.cMB2WX(alang)); SetName(wxConvLibc.cMB2WX(alang));
@@ -715,10 +758,13 @@ void wxCSConv::LoadNow()
// try to see if it's in the environment variables // try to see if it's in the environment variables
// (in most cases this won't work, but I was out of ideas) // (in most cases this won't work, but I was out of ideas)
wxChar *lang = wxGetenv(wxT("LC_ALL")); wxChar *lang = wxGetenv(wxT("LC_ALL"));
if (!lang) lang = wxGetenv(wxT("LC_CTYPE")); if (!lang)
if (!lang) lang = wxGetenv(wxT("LANG")); lang = wxGetenv(wxT("LC_CTYPE"));
if (!lang)
lang = wxGetenv(wxT("LANG"));
wxChar *dot = lang ? wxStrchr(lang, wxT('.')) : (wxChar *)NULL; wxChar *dot = lang ? wxStrchr(lang, wxT('.')) : (wxChar *)NULL;
if (dot) SetName(dot+1); if (dot)
SetName(dot+1);
} }
#endif #endif
} }
@@ -735,11 +781,11 @@ size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
return m_cset->MB2WC(buf, psz, n); return m_cset->MB2WC(buf, psz, n);
// latin-1 (direct) // latin-1 (direct)
size_t len=strlen(psz); size_t len = strlen(psz);
if (buf) if (buf)
{ {
for (size_t c=0; c<=len; c++) for (size_t c = 0; c <= len; c++)
buf[c] = (unsigned char)(psz[c]); buf[c] = (unsigned char)(psz[c]);
} }
@@ -761,8 +807,8 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
#endif #endif
if (buf) if (buf)
{ {
for (size_t c=0; c<=len; c++) for (size_t c = 0; c <= len; c++)
buf[c] = (psz[c]>0xff) ? '?' : psz[c]; buf[c] = (psz[c] > 0xff) ? '?' : psz[c];
} }
return len; return len;
@@ -772,13 +818,19 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
class IC_CharSetConverter class IC_CharSetConverter
{ {
public: public:
IC_CharSetConverter(IC_CharSet*from,IC_CharSet*to) 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() ~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 Convert(char *buf, const char *psz, size_t n)
{ {
size_t inbuf = strlen(psz); size_t inbuf = strlen(psz);
size_t outbuf = n; size_t outbuf = n;
@@ -787,8 +839,9 @@ public:
#else #else
size_t res = iconv( cnv, &psz, &inbuf, &buf, &outbuf ); size_t res = iconv( cnv, &psz, &inbuf, &buf, &outbuf );
#endif #endif
if (res==(size_t)-1) return (size_t)-1; if (res == (size_t)-1)
return n-outbuf; return (size_t)-1;
return (n - outbuf);
} }
public: public: