//success - return actual length and the buffer
*pOutSize = nActualLength;
- return theBuffer;
+ return theBuffer;
}
const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *szString, size_t nStringLen, size_t* pOutSize) const
//Increase the actual length (+1 for current null character)
nActualLength += nLen + 1;
-
+
//if buffer too big, realloc the buffer
if (nActualLength > (nCurrentSize+1))
{
//success - return actual length and the buffer
*pOutSize = nActualLength;
- return theBuffer;
+ return theBuffer;
}
// ----------------------------------------------------------------------------
// wxConvBrokenFileNames is made for GTK2 in Unicode mode when
// files are accidentally written in an encoding which is not
// the system encoding. Typically, the system encoding will be
-// UTF8 but there might be files stored in ISO8859-1 on disk.
+// UTF8 but there might be files stored in ISO8859-1 on disk.
// ----------------------------------------------------------------------------
class wxConvBrokenFileNames: public wxMBConvLibc
}
// ----------------------------------------------------------------------------
-// UTF-7
+// UTF-7
// ----------------------------------------------------------------------------
// Implementation (C) 2004 Fredrik Roubert
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;
#endif
}
}
- else
- if (m_options & MAP_INVALID_UTF8_TO_OCTAL)
+ else if (m_options & MAP_INVALID_UTF8_TO_OCTAL)
{
while (opsz < psz && (!buf || len < n))
{
- wchar_t str[6];
- wxSnprintf( str, 5, L"\\%o", (int) (unsigned char) *opsz );
- if (buf)
- *buf++ = str[0];
- if (buf)
- *buf++ = str[1];
- if (buf)
- *buf++ = str[2];
- if (buf)
- *buf++ = str[3];
+ if ( buf && len + 3 < n )
+ {
+ unsigned char n = *opsz;
+ *buf++ = L'\\';
+ *buf++ = L'0' + n / 0100;
+ *buf++ = L'0' + (n % 0100) / 010;
+ *buf++ = L'0' + n % 010;
+ }
opsz++;
len += 4;
}
}
- else
+ 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
- if ((m_options & MAP_INVALID_UTF8_TO_PUA)
- && cc >= wxUnicodePUA && cc < wxUnicodePUAEnd)
+
+ 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'\\')
+ }
+ else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL) &&
+ cc == L'\\' &&
+ isoctal(psz[0]) && isoctal(psz[1]) && isoctal(psz[2]) )
{
- wchar_t str[4];
- str[0] = *psz; psz++;
- str[1] = *psz; psz++;
- str[2] = *psz; psz++;
- str[3] = 0;
- int octal;
- wxSscanf( str, L"%o", &octal );
if (buf)
- *buf++ = (char) octal;
+ {
+ *buf++ = (char) (psz[0] - L'0')*0100 +
+ (psz[1] - L'0')*010 +
+ (psz[2] - L'0');
+ }
+
+ psz += 3;
len++;
}
else
}
}
- if (buf && (len<n)) *buf = 0;
+ if (buf && (len<n))
+ *buf = 0;
return len;
}
// 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;
// NB: explained in MB2WC
wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex);
#endif
-
+
size_t inbuf = wxWcslen(psz) * SIZEOF_WCHAR_T;
size_t outbuf = n;
size_t res, cres;
#if SIZEOF_WCHAR_T == 4
UniChar* szUniCharBuffer = new UniChar[nOutSize];
#endif
-
+
CFStringGetCharacters(theString, theRange, szUniCharBuffer);
-
+
CFRelease(theString);
szUniCharBuffer[nOutLength] = '\0' ;
converter.MB2WC(szOut, (const char*)szUniCharBuffer , nOutSize ) ;
delete[] szUniCharBuffer;
#endif
-
+
return nOutLength;
}
size_t WC2MB(char *szOut, const wchar_t *szUnConv, size_t nOutSize) const
{
wxASSERT(szUnConv);
-
+
size_t nRealOutSize;
size_t nBufSize = wxWcslen(szUnConv);
UniChar* szUniBuffer = (UniChar*) szUnConv;
{
if (szOut != NULL)
CFStringGetCharacters(theString, CFRangeMake(0, nOutSize - 1), (UniChar*) szOut);
-
+
nRealOutSize = CFStringGetLength(theString) + 1;
}
else
//0 tells CFString to return NULL if it meets such a character
false, //not an external representation
(UInt8*) szOut,
- nOutSize,
+ nOutSize,
(CFIndex*) &nRealOutSize
);
}
bool IsOk() const
{
- return m_encoding != kCFStringEncodingInvalidId &&
+ return m_encoding != kCFStringEncodingInvalidId &&
CFStringIsEncodingAvailable(m_encoding);
}
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);
#if defined(__WXMAC__)
{
// leave UTF16 and UTF32 to the built-ins of wx
- if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ||
+ if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ||
( m_encoding >= wxFONTENCODING_MACMIN && m_encoding <= wxFONTENCODING_MACMAX ) ) )
{
projects / wxWidgets.git / blobdiff