Move wxMBConv_cf out of strconv.cpp and into strconv_cf.(cpp|h) by forking the files (svn copy) and removing the appropriate portions from each fork.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
@@ -57,10 +57,7 @@
|
||||
#include "wx/fontmap.h"
|
||||
|
||||
#ifdef __DARWIN__
|
||||
#include <CoreFoundation/CFString.h>
|
||||
#include <CoreFoundation/CFStringEncodingExt.h>
|
||||
|
||||
#include "wx/mac/corefoundation/cfref.h"
|
||||
#include "wx/mac/corefoundation/private/strconv_cf.h"
|
||||
#endif //def __DARWIN__
|
||||
|
||||
#ifdef __WXMAC__
|
||||
@@ -2303,495 +2300,6 @@ private:
|
||||
|
||||
#endif // wxHAVE_WIN32_MB2WC
|
||||
|
||||
// ============================================================================
|
||||
// CoreFoundation conversion classes
|
||||
// ============================================================================
|
||||
|
||||
#ifdef __DARWIN__
|
||||
|
||||
CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
|
||||
{
|
||||
CFStringEncoding enc = kCFStringEncodingInvalidId ;
|
||||
|
||||
switch (encoding)
|
||||
{
|
||||
case wxFONTENCODING_DEFAULT :
|
||||
enc = CFStringGetSystemEncoding();
|
||||
break ;
|
||||
|
||||
case wxFONTENCODING_ISO8859_1 :
|
||||
enc = kCFStringEncodingISOLatin1 ;
|
||||
break ;
|
||||
case wxFONTENCODING_ISO8859_2 :
|
||||
enc = kCFStringEncodingISOLatin2;
|
||||
break ;
|
||||
case wxFONTENCODING_ISO8859_3 :
|
||||
enc = kCFStringEncodingISOLatin3 ;
|
||||
break ;
|
||||
case wxFONTENCODING_ISO8859_4 :
|
||||
enc = kCFStringEncodingISOLatin4;
|
||||
break ;
|
||||
case wxFONTENCODING_ISO8859_5 :
|
||||
enc = kCFStringEncodingISOLatinCyrillic;
|
||||
break ;
|
||||
case wxFONTENCODING_ISO8859_6 :
|
||||
enc = kCFStringEncodingISOLatinArabic;
|
||||
break ;
|
||||
case wxFONTENCODING_ISO8859_7 :
|
||||
enc = kCFStringEncodingISOLatinGreek;
|
||||
break ;
|
||||
case wxFONTENCODING_ISO8859_8 :
|
||||
enc = kCFStringEncodingISOLatinHebrew;
|
||||
break ;
|
||||
case wxFONTENCODING_ISO8859_9 :
|
||||
enc = kCFStringEncodingISOLatin5;
|
||||
break ;
|
||||
case wxFONTENCODING_ISO8859_10 :
|
||||
enc = kCFStringEncodingISOLatin6;
|
||||
break ;
|
||||
case wxFONTENCODING_ISO8859_11 :
|
||||
enc = kCFStringEncodingISOLatinThai;
|
||||
break ;
|
||||
case wxFONTENCODING_ISO8859_13 :
|
||||
enc = kCFStringEncodingISOLatin7;
|
||||
break ;
|
||||
case wxFONTENCODING_ISO8859_14 :
|
||||
enc = kCFStringEncodingISOLatin8;
|
||||
break ;
|
||||
case wxFONTENCODING_ISO8859_15 :
|
||||
enc = kCFStringEncodingISOLatin9;
|
||||
break ;
|
||||
|
||||
case wxFONTENCODING_KOI8 :
|
||||
enc = kCFStringEncodingKOI8_R;
|
||||
break ;
|
||||
case wxFONTENCODING_ALTERNATIVE : // MS-DOS CP866
|
||||
enc = kCFStringEncodingDOSRussian;
|
||||
break ;
|
||||
|
||||
// case wxFONTENCODING_BULGARIAN :
|
||||
// enc = ;
|
||||
// break ;
|
||||
|
||||
case wxFONTENCODING_CP437 :
|
||||
enc = kCFStringEncodingDOSLatinUS ;
|
||||
break ;
|
||||
case wxFONTENCODING_CP850 :
|
||||
enc = kCFStringEncodingDOSLatin1;
|
||||
break ;
|
||||
case wxFONTENCODING_CP852 :
|
||||
enc = kCFStringEncodingDOSLatin2;
|
||||
break ;
|
||||
case wxFONTENCODING_CP855 :
|
||||
enc = kCFStringEncodingDOSCyrillic;
|
||||
break ;
|
||||
case wxFONTENCODING_CP866 :
|
||||
enc = kCFStringEncodingDOSRussian ;
|
||||
break ;
|
||||
case wxFONTENCODING_CP874 :
|
||||
enc = kCFStringEncodingDOSThai;
|
||||
break ;
|
||||
case wxFONTENCODING_CP932 :
|
||||
enc = kCFStringEncodingDOSJapanese;
|
||||
break ;
|
||||
case wxFONTENCODING_CP936 :
|
||||
enc = kCFStringEncodingDOSChineseSimplif ;
|
||||
break ;
|
||||
case wxFONTENCODING_CP949 :
|
||||
enc = kCFStringEncodingDOSKorean;
|
||||
break ;
|
||||
case wxFONTENCODING_CP950 :
|
||||
enc = kCFStringEncodingDOSChineseTrad;
|
||||
break ;
|
||||
case wxFONTENCODING_CP1250 :
|
||||
enc = kCFStringEncodingWindowsLatin2;
|
||||
break ;
|
||||
case wxFONTENCODING_CP1251 :
|
||||
enc = kCFStringEncodingWindowsCyrillic ;
|
||||
break ;
|
||||
case wxFONTENCODING_CP1252 :
|
||||
enc = kCFStringEncodingWindowsLatin1 ;
|
||||
break ;
|
||||
case wxFONTENCODING_CP1253 :
|
||||
enc = kCFStringEncodingWindowsGreek;
|
||||
break ;
|
||||
case wxFONTENCODING_CP1254 :
|
||||
enc = kCFStringEncodingWindowsLatin5;
|
||||
break ;
|
||||
case wxFONTENCODING_CP1255 :
|
||||
enc = kCFStringEncodingWindowsHebrew ;
|
||||
break ;
|
||||
case wxFONTENCODING_CP1256 :
|
||||
enc = kCFStringEncodingWindowsArabic ;
|
||||
break ;
|
||||
case wxFONTENCODING_CP1257 :
|
||||
enc = kCFStringEncodingWindowsBalticRim;
|
||||
break ;
|
||||
// This only really encodes to UTF7 (if that) evidently
|
||||
// case wxFONTENCODING_UTF7 :
|
||||
// enc = kCFStringEncodingNonLossyASCII ;
|
||||
// break ;
|
||||
case wxFONTENCODING_UTF8 :
|
||||
enc = kCFStringEncodingUTF8 ;
|
||||
break ;
|
||||
case wxFONTENCODING_EUC_JP :
|
||||
enc = kCFStringEncodingEUC_JP;
|
||||
break ;
|
||||
/* Don't support conversion to/from UTF16 as wxWidgets can do this better.
|
||||
* In particular, ToWChar would fail miserably using strlen on an input UTF16.
|
||||
case wxFONTENCODING_UTF16 :
|
||||
enc = kCFStringEncodingUnicode ;
|
||||
break ;
|
||||
*/
|
||||
case wxFONTENCODING_MACROMAN :
|
||||
enc = kCFStringEncodingMacRoman ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACJAPANESE :
|
||||
enc = kCFStringEncodingMacJapanese ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACCHINESETRAD :
|
||||
enc = kCFStringEncodingMacChineseTrad ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACKOREAN :
|
||||
enc = kCFStringEncodingMacKorean ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACARABIC :
|
||||
enc = kCFStringEncodingMacArabic ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACHEBREW :
|
||||
enc = kCFStringEncodingMacHebrew ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACGREEK :
|
||||
enc = kCFStringEncodingMacGreek ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACCYRILLIC :
|
||||
enc = kCFStringEncodingMacCyrillic ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACDEVANAGARI :
|
||||
enc = kCFStringEncodingMacDevanagari ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACGURMUKHI :
|
||||
enc = kCFStringEncodingMacGurmukhi ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACGUJARATI :
|
||||
enc = kCFStringEncodingMacGujarati ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACORIYA :
|
||||
enc = kCFStringEncodingMacOriya ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACBENGALI :
|
||||
enc = kCFStringEncodingMacBengali ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACTAMIL :
|
||||
enc = kCFStringEncodingMacTamil ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACTELUGU :
|
||||
enc = kCFStringEncodingMacTelugu ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACKANNADA :
|
||||
enc = kCFStringEncodingMacKannada ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACMALAJALAM :
|
||||
enc = kCFStringEncodingMacMalayalam ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACSINHALESE :
|
||||
enc = kCFStringEncodingMacSinhalese ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACBURMESE :
|
||||
enc = kCFStringEncodingMacBurmese ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACKHMER :
|
||||
enc = kCFStringEncodingMacKhmer ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACTHAI :
|
||||
enc = kCFStringEncodingMacThai ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACLAOTIAN :
|
||||
enc = kCFStringEncodingMacLaotian ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACGEORGIAN :
|
||||
enc = kCFStringEncodingMacGeorgian ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACARMENIAN :
|
||||
enc = kCFStringEncodingMacArmenian ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACCHINESESIMP :
|
||||
enc = kCFStringEncodingMacChineseSimp ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACTIBETAN :
|
||||
enc = kCFStringEncodingMacTibetan ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACMONGOLIAN :
|
||||
enc = kCFStringEncodingMacMongolian ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACETHIOPIC :
|
||||
enc = kCFStringEncodingMacEthiopic ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACCENTRALEUR :
|
||||
enc = kCFStringEncodingMacCentralEurRoman ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACVIATNAMESE :
|
||||
enc = kCFStringEncodingMacVietnamese ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACARABICEXT :
|
||||
enc = kCFStringEncodingMacExtArabic ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACSYMBOL :
|
||||
enc = kCFStringEncodingMacSymbol ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACDINGBATS :
|
||||
enc = kCFStringEncodingMacDingbats ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACTURKISH :
|
||||
enc = kCFStringEncodingMacTurkish ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACCROATIAN :
|
||||
enc = kCFStringEncodingMacCroatian ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACICELANDIC :
|
||||
enc = kCFStringEncodingMacIcelandic ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACROMANIAN :
|
||||
enc = kCFStringEncodingMacRomanian ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACCELTIC :
|
||||
enc = kCFStringEncodingMacCeltic ;
|
||||
break ;
|
||||
case wxFONTENCODING_MACGAELIC :
|
||||
enc = kCFStringEncodingMacGaelic ;
|
||||
break ;
|
||||
// case wxFONTENCODING_MACKEYBOARD :
|
||||
// enc = kCFStringEncodingMacKeyboardGlyphs ;
|
||||
// break ;
|
||||
|
||||
default :
|
||||
// because gcc is picky
|
||||
break ;
|
||||
}
|
||||
|
||||
return enc ;
|
||||
}
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
|
||||
// Provide a constant for the wchat_t encoding used by the host platform.
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
static const CFStringEncoding wxCFStringEncodingWcharT = kCFStringEncodingUTF32BE;
|
||||
#else
|
||||
static const CFStringEncoding wxCFStringEncodingWcharT = kCFStringEncodingUTF32LE;
|
||||
#endif
|
||||
|
||||
#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 */
|
||||
|
||||
class wxMBConv_cf : public wxMBConv
|
||||
{
|
||||
public:
|
||||
wxMBConv_cf()
|
||||
{
|
||||
Init(CFStringGetSystemEncoding()) ;
|
||||
}
|
||||
|
||||
wxMBConv_cf(const wxMBConv_cf& conv)
|
||||
{
|
||||
m_encoding = conv.m_encoding;
|
||||
}
|
||||
|
||||
#if wxUSE_FONTMAP
|
||||
wxMBConv_cf(const char* name)
|
||||
{
|
||||
Init( wxCFStringEncFromFontEnc(wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) ) ;
|
||||
}
|
||||
#endif
|
||||
|
||||
wxMBConv_cf(wxFontEncoding encoding)
|
||||
{
|
||||
Init( wxCFStringEncFromFontEnc(encoding) );
|
||||
}
|
||||
|
||||
virtual ~wxMBConv_cf()
|
||||
{
|
||||
}
|
||||
|
||||
void Init( CFStringEncoding encoding)
|
||||
{
|
||||
m_encoding = encoding ;
|
||||
}
|
||||
|
||||
virtual size_t ToWChar(wchar_t * dst, size_t dstSize, const char * src, size_t srcSize = wxNO_LEN) const
|
||||
{
|
||||
wxCHECK(src, wxCONV_FAILED);
|
||||
|
||||
/* NOTE: This is wrong if the source encoding has an element size
|
||||
* other than char (e.g. it's kCFStringEncodingUnicode)
|
||||
* If the user specifies it, it's presumably right though.
|
||||
* Right now we don't support UTF-16 in anyway since wx can do a better job.
|
||||
*/
|
||||
if(srcSize == wxNO_LEN)
|
||||
srcSize = strlen(src) + 1;
|
||||
|
||||
// First create the temporary CFString
|
||||
wxCFRef<CFStringRef> theString( CFStringCreateWithBytes (
|
||||
NULL, //the allocator
|
||||
(const UInt8*)src,
|
||||
srcSize,
|
||||
m_encoding,
|
||||
false //no BOM/external representation
|
||||
));
|
||||
|
||||
wxCHECK(theString != NULL, wxCONV_FAILED);
|
||||
|
||||
/* NOTE: The string content includes the NULL element if the source string did
|
||||
* That means we have to do nothing special because the destination will have
|
||||
* the NULL element iff the source did and the NULL element will be included
|
||||
* in the count iff it was included in the source count.
|
||||
*/
|
||||
|
||||
|
||||
/* If we're compiling against Tiger headers we can support direct conversion
|
||||
* to UTF32. If we are then run against a pre-Tiger system, the encoding
|
||||
* won't be available so we'll defer to the string->UTF-16->UTF-32 conversion.
|
||||
*/
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
|
||||
if(CFStringIsEncodingAvailable(wxCFStringEncodingWcharT))
|
||||
{
|
||||
CFRange fullStringRange = CFRangeMake(0, CFStringGetLength(theString));
|
||||
CFIndex usedBufLen;
|
||||
|
||||
CFIndex charsConverted = CFStringGetBytes(
|
||||
theString,
|
||||
fullStringRange,
|
||||
wxCFStringEncodingWcharT,
|
||||
0,
|
||||
false,
|
||||
// if dstSize is 0 then pass NULL to get required length in usedBufLen
|
||||
dstSize != 0?(UInt8*)dst:NULL,
|
||||
dstSize * sizeof(wchar_t),
|
||||
&usedBufLen);
|
||||
|
||||
// charsConverted is > 0 iff conversion succeeded
|
||||
if(charsConverted <= 0)
|
||||
return wxCONV_FAILED;
|
||||
|
||||
/* usedBufLen is the number of bytes written, so we divide by
|
||||
* sizeof(wchar_t) to get the number of elements written.
|
||||
*/
|
||||
wxASSERT( (usedBufLen % sizeof(wchar_t)) == 0 );
|
||||
|
||||
// CFStringGetBytes does exactly the right thing when buffer
|
||||
// pointer is NULL and returns the number of bytes required
|
||||
return usedBufLen / sizeof(wchar_t);
|
||||
}
|
||||
else
|
||||
#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 */
|
||||
{
|
||||
// NOTE: Includes NULL iff source did
|
||||
/* NOTE: This is an approximation. The eventual UTF-32 will
|
||||
* possibly have less elements but certainly not more.
|
||||
*/
|
||||
size_t returnSize = CFStringGetLength(theString);
|
||||
|
||||
if (dstSize == 0 || dst == NULL)
|
||||
{
|
||||
return returnSize;
|
||||
}
|
||||
|
||||
// Convert the entire string.. too hard to figure out how many UTF-16 we'd need
|
||||
// for an undersized UTF-32 destination buffer.
|
||||
CFRange fullStringRange = CFRangeMake(0, CFStringGetLength(theString));
|
||||
UniChar *szUniCharBuffer = new UniChar[fullStringRange.length];
|
||||
|
||||
CFStringGetCharacters(theString, fullStringRange, szUniCharBuffer);
|
||||
|
||||
wxMBConvUTF16 converter;
|
||||
returnSize = converter.ToWChar( dst, dstSize, (const char*)szUniCharBuffer, fullStringRange.length );
|
||||
delete [] szUniCharBuffer;
|
||||
|
||||
return returnSize;
|
||||
}
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
virtual size_t FromWChar(char *dst, size_t dstSize, const wchar_t *src, size_t srcSize) const
|
||||
{
|
||||
wxCHECK(src, wxCONV_FAILED);
|
||||
|
||||
if(srcSize == wxNO_LEN)
|
||||
srcSize = wxStrlen(src) + 1;
|
||||
|
||||
// Temporary CFString
|
||||
wxCFRef<CFStringRef> theString;
|
||||
|
||||
/* If we're compiling against Tiger headers we can support direct conversion
|
||||
* from UTF32. If we are then run against a pre-Tiger system, the encoding
|
||||
* won't be available so we'll defer to the UTF-32->UTF-16->string conversion.
|
||||
*/
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
|
||||
if(CFStringIsEncodingAvailable(wxCFStringEncodingWcharT))
|
||||
{
|
||||
theString = wxCFRef<CFStringRef>(CFStringCreateWithBytes(
|
||||
kCFAllocatorDefault,
|
||||
(UInt8*)src,
|
||||
srcSize * sizeof(wchar_t),
|
||||
wxCFStringEncodingWcharT,
|
||||
false));
|
||||
}
|
||||
else
|
||||
#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 */
|
||||
{
|
||||
wxMBConvUTF16 converter;
|
||||
size_t cbUniBuffer = converter.FromWChar( NULL, 0, src, srcSize );
|
||||
wxASSERT(cbUniBuffer % sizeof(UniChar));
|
||||
|
||||
// Will be free'd by kCFAllocatorMalloc when CFString is released
|
||||
UniChar *tmpUniBuffer = (UniChar*)malloc(cbUniBuffer);
|
||||
|
||||
cbUniBuffer = converter.FromWChar( (char*) tmpUniBuffer, cbUniBuffer, src, srcSize );
|
||||
wxASSERT(cbUniBuffer % sizeof(UniChar));
|
||||
|
||||
theString = wxCFRef<CFStringRef>(CFStringCreateWithCharactersNoCopy(
|
||||
kCFAllocatorDefault,
|
||||
tmpUniBuffer,
|
||||
cbUniBuffer / sizeof(UniChar),
|
||||
kCFAllocatorMalloc
|
||||
));
|
||||
|
||||
}
|
||||
|
||||
wxCHECK(theString != NULL, wxCONV_FAILED);
|
||||
|
||||
CFIndex usedBufLen;
|
||||
|
||||
CFIndex charsConverted = CFStringGetBytes(
|
||||
theString,
|
||||
CFRangeMake(0, CFStringGetLength(theString)),
|
||||
m_encoding,
|
||||
0, // FAIL on unconvertible characters
|
||||
false, // not an external representation
|
||||
// if dstSize is 0 then pass NULL to get required length in usedBufLen
|
||||
(dstSize != 0)?(UInt8*)dst:NULL,
|
||||
dstSize,
|
||||
&usedBufLen
|
||||
);
|
||||
|
||||
// charsConverted is > 0 iff conversion succeeded
|
||||
if(charsConverted <= 0)
|
||||
return wxCONV_FAILED;
|
||||
|
||||
return usedBufLen;
|
||||
}
|
||||
|
||||
virtual wxMBConv *Clone() const { return new wxMBConv_cf(*this); }
|
||||
|
||||
bool IsOk() const
|
||||
{
|
||||
return m_encoding != kCFStringEncodingInvalidId &&
|
||||
CFStringIsEncodingAvailable(m_encoding);
|
||||
}
|
||||
|
||||
private:
|
||||
CFStringEncoding m_encoding ;
|
||||
};
|
||||
|
||||
#endif // __DARWIN__
|
||||
|
||||
// ============================================================================
|
||||
// Mac conversion classes
|
||||
|
||||
Reference in New Issue
Block a user