// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "encconv.h"
#endif
#include <stdlib.h>
// conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:
-#ifdef __BORLANDC__
+#if defined( __BORLANDC__ ) || defined(__DARWIN__)
#include "../common/unictabl.inc"
#else
#include "unictabl.inc"
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)
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 );
}
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;}
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)
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;
m_Table[128 + i] = (wchar_t)(128 + i);
#else
m_Table[128 + i] = (char)(128 + i);
-#endif
+#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*!"));
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++)]);
#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*!"));
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++)]);
-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*!"));
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++)]);
-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*!"));
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++)]);
#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;
}
/* unix */ {wxFONTENCODING_ISO8859_1, wxFONTENCODING_ISO8859_15, STOP},
/* windows */ {wxFONTENCODING_CP1252, STOP},
/* os2 */ {STOP},
- /* mac */ {STOP}
+ /* mac */ {wxFONTENCODING_MACROMAN, STOP}
},
// Central European
/* unix */ {wxFONTENCODING_ISO8859_2, STOP},
/* windows */ {wxFONTENCODING_CP1250, STOP},
/* os2 */ {STOP},
- /* mac */ {STOP}
+ /* mac */ {wxFONTENCODING_MACCENTRALEUR, STOP}
},
// Baltic
/* unix */ {wxFONTENCODING_ISO8859_8, STOP},
/* windows */ {wxFONTENCODING_CP1255, STOP},
/* os2 */ {STOP},
- /* mac */ {STOP}
+ /* mac */ {wxFONTENCODING_MACHEBREW, STOP}
},
// Greek
/* unix */ {wxFONTENCODING_ISO8859_7, STOP},
/* windows */ {wxFONTENCODING_CP1253, STOP},
/* os2 */ {STOP},
- /* mac */ {STOP}
+ /* mac */ {wxFONTENCODING_MACGREEK, STOP}
},
// Arabic
/* unix */ {wxFONTENCODING_ISO8859_6, STOP},
/* windows */ {wxFONTENCODING_CP1256, STOP},
/* os2 */ {STOP},
- /* mac */ {STOP}
+ /* mac */ {wxFONTENCODING_MACARABIC, STOP}
},
// Turkish
/* unix */ {wxFONTENCODING_ISO8859_9, STOP},
/* windows */ {wxFONTENCODING_CP1254, STOP},
/* os2 */ {STOP},
- /* mac */ {STOP}
+ /* mac */ {wxFONTENCODING_MACTURKISH, STOP}
},
// Cyrillic
/* unix */ {wxFONTENCODING_KOI8, wxFONTENCODING_ISO8859_5, STOP},
/* windows */ {wxFONTENCODING_CP1251, STOP},
/* os2 */ {STOP},
- /* mac */ {STOP}
+ /* mac */ {wxFONTENCODING_MACCYRILLIC, STOP}
},
{{STOP},{STOP},{STOP},{STOP}} /* Terminator */
};
-
+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)
{
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++;
{
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++;
projects / wxWidgets.git / blobdiff