X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a3f08bc6f9d7d7ece178d98fe01ac3ef45e1509..a63d48fa138e9eaa3079172ace9a804ba5b0415e:/src/common/encconv.cpp diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp index 6404d6ef85..6fbf324fbf 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 @@ -18,15 +18,17 @@ #pragma hdrstop #endif +#if wxUSE_FONTMAP + #include "wx/encconv.h" #include // conversion tables, generated by scripts in $(WXWIN)/misc/unictabl: -#ifdef __BORLANDC__ +#if defined( __BORLANDC__ ) || defined(__DARWIN__) #include "../common/unictabl.inc" #else -#include "unictabl.inc" +#include "unictabl.inc" #endif #if wxUSE_WCHAR_T @@ -35,11 +37,56 @@ typedef wchar_t tchar; typedef char tchar; #endif +#ifdef __WXWINCE__ +#undef LINKAGEMODE +#define LINKAGEMODE __cdecl +#endif + +#ifdef __WXMAC__ + +#include +#include +#include + +#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) + if (encodings_list[i].encoding == enc) return encodings_list[i].table; } return NULL; @@ -50,9 +97,7 @@ typedef struct { wxUint8 c; } CharsetItem; - - -static int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2) +extern "C" int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2) { return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u ); } @@ -61,12 +106,12 @@ static int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2) static CharsetItem* LINKAGEMODE BuildReverseTable(wxUint16 *tbl) { CharsetItem *rev = new CharsetItem[128]; - + for (int i = 0; i < 128; i++) rev[i].c = 128 + i, rev[i].u = tbl[i]; qsort(rev, 128, sizeof(CharsetItem), CompareCharsetItems); - + return rev; } @@ -84,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;} @@ -93,17 +138,17 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e #endif if (input_enc == output_enc) {m_JustCopy = TRUE; return TRUE;} - + m_UnicodeOutput = (output_enc == wxFONTENCODING_UNICODE); m_JustCopy = FALSE; - + if (input_enc == wxFONTENCODING_UNICODE) { if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE; m_Table = new tchar[65536]; for (i = 0; i < 128; i++) m_Table[i] = (tchar)i; // 7bit ASCII - for (i = 128; i < 65536; i++) m_Table[i] = (tchar)'?'; + for (i = 128; i < 65536; i++) m_Table[i] = (tchar)'?'; // FIXME - this should be character that means `unicode to charset' impossible, not '?' if (method == wxCONVERT_SUBSTITUTE) @@ -116,52 +161,59 @@ 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) if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE; m_UnicodeInput = FALSE; - + m_Table = new tchar[256]; for (i = 0; i < 128; i++) m_Table[i] = (tchar)i; // 7bit ASCII - + if (output_enc == wxFONTENCODING_UNICODE) { 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, key; - - for (i = 0; i < 128; i++) + CharsetItem *item; + CharsetItem key; + + for (i = 0; i < 128; i++) { key.u = in_tbl[i]; item = (CharsetItem*) bsearch(&key, rev, 128, sizeof(CharsetItem), CompareCharsetItems); if (item == NULL && method == wxCONVERT_SUBSTITUTE) - item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback, + item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback, encoding_unicode_fallback_count, sizeof(CharsetItem), CompareCharsetItems); if (item) m_Table[128 + i] = (tchar)item -> c; else - m_Table[128 + i] = 128 + i; // don't know => don't touch +#if wxUSE_WCHAR_T + m_Table[128 + i] = (wchar_t)(128 + i); +#else + m_Table[128 + i] = (char)(128 + i); +#endif } - + 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*!")); @@ -174,9 +226,9 @@ void wxEncodingConverter::Convert(const char* input, char* output) strcpy(output, input); return; } - - wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!")); - + + wxCHECK_RET(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!")); + for (i = input, o = output; *i != 0;) *(o++) = (char)(m_Table[(wxUint8)*(i++)]); *o = 0; @@ -185,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*!")); @@ -200,9 +252,9 @@ void wxEncodingConverter::Convert(const char* input, wchar_t* output) *o = 0; return; } - - wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!")); - + + wxCHECK_RET(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!")); + for (i = input, o = output; *i != 0;) *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]); *o = 0; @@ -210,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*!")); @@ -225,9 +277,9 @@ void wxEncodingConverter::Convert(const wchar_t* input, char* output) *o = 0; return; } - - wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!")); - + + wxCHECK_RET(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!")); + for (i = input, o = output; *i != 0;) *(o++) = (char)(m_Table[(wxUint16)*(i++)]); *o = 0; @@ -235,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*!")); @@ -251,9 +303,9 @@ void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) *o = 0; return; } - - wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!")); - + + wxCHECK_RET(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!")); + for (i = input, o = output; *i != 0;) *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]); *o = 0; @@ -262,21 +314,27 @@ 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; - + wxString s; const wxChar *i; - - wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!")); - + + wxCHECK_MSG(m_Table != NULL, s, + wxT("You must call wxEncodingConverter::Init() before actually converting!")); + if (m_UnicodeInput) + { for (i = input.c_str(); *i != 0; i++) s << (wxChar)(m_Table[(wxUint16)*i]); + } else + { for (i = input.c_str(); *i != 0; i++) s << (wxChar)(m_Table[(wxUint8)*i]); + } + return s; } @@ -287,7 +345,7 @@ wxString wxEncodingConverter::Convert(const wxString& input) // Following tables describe classes of encoding equivalence. -// +// #define STOP wxFONTENCODING_SYSTEM @@ -296,17 +354,17 @@ wxString wxEncodingConverter::Convert(const wxString& input) // max no. of encodings for one language used on one platform // Anybody thinks 5 is not enough? ;-) -static wxFontEncoding +static wxFontEncoding EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = { // *** Please put more common encodings as first! *** - // West European + // Western European { /* unix */ {wxFONTENCODING_ISO8859_1, wxFONTENCODING_ISO8859_15, STOP}, /* windows */ {wxFONTENCODING_CP1252, STOP}, /* os2 */ {STOP}, - /* mac */ {STOP} + /* mac */ {wxFONTENCODING_MACROMAN, STOP} }, // Central European @@ -314,15 +372,15 @@ static wxFontEncoding /* unix */ {wxFONTENCODING_ISO8859_2, STOP}, /* windows */ {wxFONTENCODING_CP1250, STOP}, /* os2 */ {STOP}, - /* mac */ {STOP} + /* mac */ {wxFONTENCODING_MACCENTRALEUR, STOP} }, - + // Baltic { - /* unix */ {wxFONTENCODING_ISO8859_13, STOP}, + /* unix */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4, STOP}, /* windows */ {wxFONTENCODING_CP1257, STOP}, /* os2 */ {STOP}, - /* mac */ {STOP} + /* mac */ {STOP} }, // Hebrew @@ -330,7 +388,7 @@ static wxFontEncoding /* unix */ {wxFONTENCODING_ISO8859_8, STOP}, /* windows */ {wxFONTENCODING_CP1255, STOP}, /* os2 */ {STOP}, - /* mac */ {STOP} + /* mac */ {wxFONTENCODING_MACHEBREW, STOP} }, // Greek @@ -338,7 +396,7 @@ static wxFontEncoding /* unix */ {wxFONTENCODING_ISO8859_7, STOP}, /* windows */ {wxFONTENCODING_CP1253, STOP}, /* os2 */ {STOP}, - /* mac */ {STOP} + /* mac */ {wxFONTENCODING_MACGREEK, STOP} }, // Arabic @@ -346,7 +404,7 @@ static wxFontEncoding /* unix */ {wxFONTENCODING_ISO8859_6, STOP}, /* windows */ {wxFONTENCODING_CP1256, STOP}, /* os2 */ {STOP}, - /* mac */ {STOP} + /* mac */ {wxFONTENCODING_MACARABIC, STOP} }, // Turkish @@ -354,7 +412,7 @@ static wxFontEncoding /* unix */ {wxFONTENCODING_ISO8859_9, STOP}, /* windows */ {wxFONTENCODING_CP1254, STOP}, /* os2 */ {STOP}, - /* mac */ {STOP} + /* mac */ {wxFONTENCODING_MACTURKISH, STOP} }, // Cyrillic @@ -362,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 */ @@ -370,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) { @@ -386,7 +451,7 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e platform = wxPLATFORM_MAC; #endif } - + int i, clas, e ; wxFontEncoding *f; wxFontEncodingArray arr; @@ -399,14 +464,14 @@ 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); - i = NUM_OF_PLATFORMS/*hack*/; break; + if (!FindEncoding(arr, *f)) arr.push_back(*f); + i = NUM_OF_PLATFORMS/*hack*/; break; } clas++; } - + return arr; } @@ -417,7 +482,7 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc) int i, clas, e, j ; wxFontEncoding *f; wxFontEncodingArray arr; - + arr = GetPlatformEquivalents(enc); // we want them to be first items in array clas = 0; @@ -428,12 +493,14 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc) if (EquivalentEncodings[clas][i][e] == 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); - i = NUM_OF_PLATFORMS/*hack*/; break; + for (f = EquivalentEncodings[clas][j]; *f != STOP; f++) + if (!FindEncoding(arr, *f)) arr.push_back(*f); + i = NUM_OF_PLATFORMS/*hack*/; break; } clas++; } - + return arr; } + +#endif // wxUSE_FONTMAP