X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/903506828b7d042350eae97b5014a63ffca17ef5..ed7c11abc829a8f7becc92ee438866e36f2216fe:/src/common/encconv.cpp

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 8422433e81..dd7c28d520 100644
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -4,10 +4,10 @@
 //              font encodings
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "encconv.h"
 #endif
 
@@ -25,20 +25,62 @@
 #include <stdlib.h>
 
 // conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:
-#ifdef __BORLANDC__
-#include "../common/unictabl.inc"
+#if defined( __BORLANDC__ ) || defined(__DARWIN__)
+    #include "../common/unictabl.inc"
 #else
-#include "unictabl.inc"
+    #include "unictabl.inc"
 #endif
 
 #if wxUSE_WCHAR_T
-typedef wchar_t tchar;
+    typedef wchar_t tchar;
 #else
-typedef char tchar;
+    typedef char tchar;
+#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 __WXWINCE__
+    #include "wx/msw/wince/missing.h"       // for bsearch()
+#endif
+
+static wxUint16* 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)
@@ -52,15 +94,14 @@ typedef struct {
     wxUint8  c;
 } CharsetItem;
 
-
-
-extern "C" int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2)
+extern "C" int wxCMPFUNC_CONV
+CompareCharsetItems(const void *i1, const void *i2)
 {
     return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
 }
 
 
-static CharsetItem* LINKAGEMODE BuildReverseTable(wxUint16 *tbl)
+static CharsetItem* BuildReverseTable(wxUint16 *tbl)
 {
     CharsetItem *rev = new CharsetItem[128];
 
@@ -77,8 +118,8 @@ static CharsetItem* LINKAGEMODE BuildReverseTable(wxUint16 *tbl)
 wxEncodingConverter::wxEncodingConverter()
 {
     m_Table = NULL;
-    m_UnicodeInput = m_UnicodeOutput = FALSE;
-    m_JustCopy = FALSE;
+    m_UnicodeInput = m_UnicodeOutput = false;
+    m_JustCopy = false;
 }
 
 
@@ -86,22 +127,22 @@ 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;}
 
 #if !wxUSE_WCHAR_T
-    if (input_enc == wxFONTENCODING_UNICODE || output_enc == wxFONTENCODING_UNICODE) return FALSE;
+    if (input_enc == wxFONTENCODING_UNICODE || output_enc == wxFONTENCODING_UNICODE) return false;
 #endif
 
-    if (input_enc == output_enc) {m_JustCopy = TRUE; return TRUE;}
+    if (input_enc == output_enc) {m_JustCopy = true; return true;}
 
     m_UnicodeOutput = (output_enc == wxFONTENCODING_UNICODE);
-    m_JustCopy = FALSE;
+    m_JustCopy = false;
 
     if (input_enc == wxFONTENCODING_UNICODE)
     {
-        if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE;
+        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
@@ -117,17 +158,15 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
         for (i = 0; i < 128; i++)
             m_Table[out_tbl[i]] = (tchar)(128 + i);
 
-        m_UnicodeInput = TRUE;
-        return TRUE;
+        m_UnicodeInput = true;
     }
-
-    else
+    else // input !Unicode
     {
-        if ((in_tbl = GetEncTable(input_enc)) == NULL) return FALSE;
+        if ((in_tbl = GetEncTable(input_enc)) == NULL) return false;
         if (output_enc != wxFONTENCODING_UNICODE)
-            if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE;
+            if ((out_tbl = GetEncTable(output_enc)) == NULL) return false;
 
-        m_UnicodeInput = FALSE;
+        m_UnicodeInput = false;
 
         m_Table = new tchar[256];
         for (i = 0; i < 128; i++)  m_Table[i] = (tchar)i; // 7bit ASCII
@@ -135,9 +174,9 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
         if (output_enc == wxFONTENCODING_UNICODE)
         {
             for (i = 0; i < 128; i++)  m_Table[128 + i] = (tchar)in_tbl[i];
-            return TRUE;
+            return true;
         }
-        else
+        else // output !Unicode
         {
             CharsetItem *rev = BuildReverseTable(out_tbl);
             CharsetItem *item;
@@ -157,18 +196,19 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
                     m_Table[128 + i] = (wchar_t)(128 + i);
 #else
                     m_Table[128 + i] = (char)(128 + i);
-#endif					
+#endif
             }
 
             delete[] rev;
-            return TRUE;
         }
     }
+
+    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*!"));
@@ -182,7 +222,7 @@ void wxEncodingConverter::Convert(const char* input, char* output)
         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++)]);
@@ -192,7 +232,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*!"));
@@ -208,7 +248,7 @@ void wxEncodingConverter::Convert(const char* input, wchar_t* output)
         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++)]);
@@ -217,7 +257,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*!"));
@@ -233,7 +273,7 @@ void wxEncodingConverter::Convert(const wchar_t* input, char* output)
         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++)]);
@@ -242,7 +282,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*!"));
@@ -259,7 +299,7 @@ void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output)
         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++)]);
@@ -269,21 +309,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;
 }
 
@@ -313,7 +359,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
@@ -321,7 +367,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_2, STOP},
         /* windows */ {wxFONTENCODING_CP1250, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}
+        /* mac     */ {wxFONTENCODING_MACCENTRALEUR, STOP}
     },
 
     // Baltic
@@ -337,7 +383,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_8, STOP},
         /* windows */ {wxFONTENCODING_CP1255, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}
+        /* mac     */ {wxFONTENCODING_MACHEBREW, STOP}
     },
 
     // Greek
@@ -345,7 +391,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_7, STOP},
         /* windows */ {wxFONTENCODING_CP1253, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}
+        /* mac     */ {wxFONTENCODING_MACGREEK, STOP}
     },
 
     // Arabic
@@ -353,7 +399,7 @@ static wxFontEncoding
         /* unix    */ {wxFONTENCODING_ISO8859_6, STOP},
         /* windows */ {wxFONTENCODING_CP1256, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}
+        /* mac     */ {wxFONTENCODING_MACARABIC, STOP}
     },
 
     // Turkish
@@ -361,15 +407,15 @@ static wxFontEncoding
         /* 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},
+        /* unix    */ {wxFONTENCODING_KOI8, wxFONTENCODING_KOI8_U, wxFONTENCODING_ISO8859_5, STOP},
         /* windows */ {wxFONTENCODING_CP1251, STOP},
         /* os2     */ {STOP},
-        /* mac     */ {STOP}
+        /* mac     */ {wxFONTENCODING_MACCYRILLIC, STOP}
     },
 
     {{STOP},{STOP},{STOP},{STOP}} /* Terminator */
@@ -377,7 +423,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)
 {
@@ -406,9 +459,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++;
@@ -436,7 +489,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++;