X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5283098e1316b4a811fbccaabbda71f676e86c93..6afa47d63d56094958ed4d2528bf45ad67340954:/src/common/encconv.cpp diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp index 9c7d0d3ee6..68a6a6d4eb 100644 --- a/src/common/encconv.cpp +++ b/src/common/encconv.cpp @@ -7,7 +7,7 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "encconv.h" #endif @@ -23,12 +23,9 @@ #include "wx/encconv.h" #include -#ifdef __WINE__ -#include -#endif // conversion tables, generated by scripts in $(WXWIN)/misc/unictabl: -#ifdef __BORLANDC__ +#if defined( __BORLANDC__ ) || defined(__DARWIN__) #include "../common/unictabl.inc" #else #include "unictabl.inc" @@ -40,8 +37,53 @@ typedef wchar_t tchar; typedef char tchar; #endif +#ifdef __WXWINCE__ +#undef LINKAGEMODE +#define LINKAGEMODE __cdecl +#endif + +#ifdef __WXMAC__ + +#include "ATSUnicode.h" +#include "TextCommon.h" +#include "TextEncodingConverter.h" + +#include "wx/fontutil.h" +#include "wx/mac/private.h" // includes mac headers + +wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ; +bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ; + +#endif + static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc) { +#ifdef __WXMAC__ + if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX ) + { + int i = enc-wxFONTENCODING_MACMIN ; + if ( gMacEncodingsInited[i] == false ) + { + TECObjectRef converter ; + TextEncodingBase code = wxMacGetSystemEncFromFontEnc( enc ) ; + TextEncodingBase unicode = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ; + OSStatus status = TECCreateConverter(&converter,code,unicode); + char s[2] ; + s[1] = 0 ; + ByteCount byteInLen, byteOutLen ; + for( unsigned char c = 255 ; c >= 128 ; --c ) + { + s[0] = c ; + status = TECConvertText(converter, (ConstTextPtr) &s , 1, &byteInLen, + (TextPtr) &gMacEncodings[i][c-128] , 2, &byteOutLen); + } + status = TECDisposeConverter(converter); + gMacEncodingsInited[i]=true; + } + return gMacEncodings[i] ; + } +#endif + for (int i = 0; encodings_list[i].table != NULL; i++) { if (encodings_list[i].encoding == enc) @@ -55,8 +97,6 @@ typedef struct { wxUint8 c; } CharsetItem; - - extern "C" int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2) { return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u ); @@ -89,7 +129,7 @@ wxEncodingConverter::wxEncodingConverter() bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_enc, int method) { unsigned i; - wxUint16 *in_tbl = NULL, *out_tbl = NULL; + wxUint16 *in_tbl, *out_tbl = NULL; if (m_Table) {delete[] m_Table; m_Table = NULL;} @@ -121,10 +161,8 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e m_Table[out_tbl[i]] = (tchar)(128 + i); m_UnicodeInput = TRUE; - return TRUE; } - - else + else // input !Unicode { if ((in_tbl = GetEncTable(input_enc)) == NULL) return FALSE; if (output_enc != wxFONTENCODING_UNICODE) @@ -140,7 +178,9 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e for (i = 0; i < 128; i++) m_Table[128 + i] = (tchar)in_tbl[i]; return TRUE; } - else + // FIXME: write a substitute for bsearch +#ifndef __WXWINCE__ + else // output !Unicode { CharsetItem *rev = BuildReverseTable(out_tbl); CharsetItem *item; @@ -164,14 +204,16 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e } delete[] rev; - return TRUE; } +#endif // !__WXWINCE__ } + + return TRUE; } -void wxEncodingConverter::Convert(const char* input, char* output) +void wxEncodingConverter::Convert(const char* input, char* output) const { wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!")); wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!")); @@ -195,7 +237,7 @@ void wxEncodingConverter::Convert(const char* input, char* output) #if wxUSE_WCHAR_T -void wxEncodingConverter::Convert(const char* input, wchar_t* output) +void wxEncodingConverter::Convert(const char* input, wchar_t* output) const { wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!")); wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!")); @@ -220,7 +262,7 @@ void wxEncodingConverter::Convert(const char* input, wchar_t* output) -void wxEncodingConverter::Convert(const wchar_t* input, char* output) +void wxEncodingConverter::Convert(const wchar_t* input, char* output) const { wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!")); wxASSERT_MSG(m_UnicodeInput, wxT("You cannot convert from 8-bit if input is const wchar_t*!")); @@ -245,7 +287,7 @@ void wxEncodingConverter::Convert(const wchar_t* input, char* output) -void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) +void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) const { wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!")); wxASSERT_MSG(m_UnicodeInput, wxT("You cannot convert from 8-bit if input is const wchar_t*!")); @@ -272,7 +314,7 @@ void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) #endif // wxUSE_WCHAR_T -wxString wxEncodingConverter::Convert(const wxString& input) +wxString wxEncodingConverter::Convert(const wxString& input) const { if (m_JustCopy) return input; @@ -322,7 +364,7 @@ static wxFontEncoding /* unix */ {wxFONTENCODING_ISO8859_1, wxFONTENCODING_ISO8859_15, STOP}, /* windows */ {wxFONTENCODING_CP1252, STOP}, /* os2 */ {STOP}, - /* mac */ {STOP} + /* mac */ {wxFONTENCODING_MACROMAN, STOP} }, // Central European @@ -330,7 +372,7 @@ static wxFontEncoding /* unix */ {wxFONTENCODING_ISO8859_2, STOP}, /* windows */ {wxFONTENCODING_CP1250, STOP}, /* os2 */ {STOP}, - /* mac */ {STOP} + /* mac */ {wxFONTENCODING_MACCENTRALEUR, STOP} }, // Baltic @@ -346,7 +388,7 @@ static wxFontEncoding /* unix */ {wxFONTENCODING_ISO8859_8, STOP}, /* windows */ {wxFONTENCODING_CP1255, STOP}, /* os2 */ {STOP}, - /* mac */ {STOP} + /* mac */ {wxFONTENCODING_MACHEBREW, STOP} }, // Greek @@ -354,7 +396,7 @@ static wxFontEncoding /* unix */ {wxFONTENCODING_ISO8859_7, STOP}, /* windows */ {wxFONTENCODING_CP1253, STOP}, /* os2 */ {STOP}, - /* mac */ {STOP} + /* mac */ {wxFONTENCODING_MACGREEK, STOP} }, // Arabic @@ -362,7 +404,7 @@ static wxFontEncoding /* unix */ {wxFONTENCODING_ISO8859_6, STOP}, /* windows */ {wxFONTENCODING_CP1256, STOP}, /* os2 */ {STOP}, - /* mac */ {STOP} + /* mac */ {wxFONTENCODING_MACARABIC, STOP} }, // Turkish @@ -370,7 +412,7 @@ static wxFontEncoding /* unix */ {wxFONTENCODING_ISO8859_9, STOP}, /* windows */ {wxFONTENCODING_CP1254, STOP}, /* os2 */ {STOP}, - /* mac */ {STOP} + /* mac */ {wxFONTENCODING_MACTURKISH, STOP} }, // Cyrillic @@ -378,7 +420,7 @@ static wxFontEncoding /* unix */ {wxFONTENCODING_KOI8, wxFONTENCODING_ISO8859_5, STOP}, /* windows */ {wxFONTENCODING_CP1251, STOP}, /* os2 */ {STOP}, - /* mac */ {STOP} + /* mac */ {wxFONTENCODING_MACCYRILLIC, STOP} }, {{STOP},{STOP},{STOP},{STOP}} /* Terminator */ @@ -386,7 +428,14 @@ static wxFontEncoding }; - +static bool FindEncoding(const wxFontEncodingArray& arr, wxFontEncoding f) +{ + for (wxFontEncodingArray::const_iterator it = arr.begin(), en = arr.end(); + it != en; ++it) + if (*it == f) + return true; + return false; +} wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding enc, int platform) { @@ -415,9 +464,9 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e if (EquivalentEncodings[clas][i][e] == enc) { for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++) - if (*f == enc) arr.Add(enc); + if (*f == enc) arr.push_back(enc); for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++) - if (arr.Index(*f) == wxNOT_FOUND) arr.Add(*f); + if (!FindEncoding(arr, *f)) arr.push_back(*f); i = NUM_OF_PLATFORMS/*hack*/; break; } clas++; @@ -445,7 +494,7 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc) { for (j = 0; j < NUM_OF_PLATFORMS; j++) for (f = EquivalentEncodings[clas][j]; *f != STOP; f++) - if (arr.Index(*f) == wxNOT_FOUND) arr.Add(*f); + if (!FindEncoding(arr, *f)) arr.push_back(*f); i = NUM_OF_PLATFORMS/*hack*/; break; } clas++;