wxMediaCtrl patch from Ryan:

[wxWidgets.git] / src / common / encconv.cpp

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index e6b921e027457a83338a6e5b9029c67378f77042..d6d4dd5a54be7d162df0ee3cfb8cf0d81753167c 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -4,7 +4,7 @@
 //              font encodings
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 //              font encodings
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)


@@ -18,86 +18,67 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_FONTMAP
-

 #include "wx/encconv.h"
 
 #include <stdlib.h>
 
 // conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:
 #include "wx/encconv.h"
 
 #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
 #else

-#include "unictabl.inc"
+    #include "unictabl.inc"

 #endif
 
 #if wxUSE_WCHAR_T
 #endif
 
 #if wxUSE_WCHAR_T

-typedef wchar_t tchar;
+    typedef wchar_t tchar;

 #else
 #else

-typedef char tchar;
-#endif
-
-#ifdef __WXWINCE__
-#undef LINKAGEMODE
-#define LINKAGEMODE __cdecl
+    typedef char tchar;

 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

+#ifdef __DARWIN__
+#include <Carbon/Carbon.h>
+#else
+#include <ATSUnicode.h>
+#include <TextCommon.h>
+#include <TextEncodingConverter.h>
+#endif
+    #include "wx/fontutil.h"
+    #include "wx/mac/private.h"  // includes mac headers

 
 

-#include "ATSUnicode.h"
-#include "TextCommon.h"
-#include "TextEncodingConverter.h"
-
-#include  "wx/mac/private.h"  // includes mac headers
-
-typedef struct {
-    wxFontEncoding enc ;
-    TextEncodingBase mac ;
-} MacCP ;
-
-MacCP gMacCodePages[] =
-{
-    wxFONTENCODING_MACROMAN, kTextEncodingMacRoman,
-    wxFONTENCODING_MACCENTRALEUR, kTextEncodingMacCentralEurRoman,
-    wxFONTENCODING_MACHEBREW, kTextEncodingMacHebrew,
-    wxFONTENCODING_MACGREEK, kTextEncodingMacGreek,
-    wxFONTENCODING_MACARABIC, kTextEncodingMacArabic,
-    wxFONTENCODING_MACTURKISH, kTextEncodingMacTurkish,
-    wxFONTENCODING_MACCYRILLIC, kTextEncodingMacCyrillic,
-} ;
-
-wxUint16 gMacEncodings[WXSIZEOF(gMacCodePages)][128] ;
-bool gMacEncodingsInited[WXSIZEOF(gMacCodePages)] ;
+    wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ;
+    bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ;
+#endif

 
 

+#ifdef __WXWINCE__
+    #include "wx/msw/wince/missing.h"       // for bsearch()

 #endif
 
 #endif
 

-static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)
+static wxUint16* GetEncTable(wxFontEncoding enc)

 {
 #ifdef __WXMAC__
 {
 #ifdef __WXMAC__

-    for (int i = 0 ; i < WXSIZEOF(gMacCodePages) ; ++i )
+    if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX )

     {
     {

-        if ( gMacCodePages[i].enc == enc )
+        int i = enc-wxFONTENCODING_MACMIN ;
+        if ( gMacEncodingsInited[i] == false )

         {
         {

-            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 )

             {
             {

-                TECObjectRef converter ;
-                TextEncodingBase code = gMacCodePages[i].mac ;
-                       TextEncodingBase unicode = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
-                   OSStatus status = TECCreateConverter(&converter,code,unicode);
-                   char s[2] ;
-                   s[1] = 0 ;
-                   ByteCount byteInLen, byteOutLen ;
-                   for( 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;        
+                s[0] = c ;
+                status = TECConvertText(converter, (ConstTextPtr) &s , 1, &byteInLen,
+                (TextPtr) &gMacEncodings[i][c-128] , 2, &byteOutLen);

             }
             }

-            return gMacEncodings[i] ;
+            status = TECDisposeConverter(converter);
+            gMacEncodingsInited[i]=true;

         }
         }

+        return gMacEncodings[i] ;

     }
 #endif
 
     }
 #endif
 


@@ -114,18 +95,19 @@ typedef struct {
     wxUint8  c;
 } CharsetItem;
 
     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 );
 }
 
 
 {
     return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
 }
 
 

-static CharsetItem* LINKAGEMODE BuildReverseTable(wxUint16 *tbl)
+static CharsetItem* BuildReverseTable(wxUint16 *tbl)

 {
     CharsetItem *rev = new CharsetItem[128];
 
     for (int i = 0; i < 128; i++)
 {
     CharsetItem *rev = new CharsetItem[128];
 
     for (int i = 0; i < 128; i++)

-        rev[i].c = 128 + i, rev[i].u = tbl[i];
+        rev[i].c = wxUint8(128 + i), rev[i].u = tbl[i];

 
     qsort(rev, 128, sizeof(CharsetItem), CompareCharsetItems);
 
 
     qsort(rev, 128, sizeof(CharsetItem), CompareCharsetItems);
 


@@ -137,8 +119,8 @@ static CharsetItem* LINKAGEMODE BuildReverseTable(wxUint16 *tbl)
 wxEncodingConverter::wxEncodingConverter()
 {
     m_Table = NULL;
 wxEncodingConverter::wxEncodingConverter()
 {
     m_Table = NULL;

-    m_UnicodeInput = m_UnicodeOutput = FALSE;
-    m_JustCopy = FALSE;
+    m_UnicodeInput = m_UnicodeOutput = false;
+    m_JustCopy = false;

 }
 
 
 }
 
 


@@ -151,22 +133,21 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
     if (m_Table) {delete[] m_Table; m_Table = NULL;}
 
 #if !wxUSE_WCHAR_T
     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
 
 #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_UnicodeOutput = (output_enc == wxFONTENCODING_UNICODE);

-    m_JustCopy = FALSE;
+    m_JustCopy = false;

 
     if (input_enc == wxFONTENCODING_UNICODE)
     {
 
     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
 
         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)'?';
-                // FIXME - this should be character that means `unicode to charset' impossible, not '?'
+        for (i = 128; i < 65536; i++)  m_Table[i] = (tchar)0;

 
         if (method == wxCONVERT_SUBSTITUTE)
         {
 
         if (method == wxCONVERT_SUBSTITUTE)
         {


@@ -177,15 +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);
 
         for (i = 0; i < 128; i++)
             m_Table[out_tbl[i]] = (tchar)(128 + i);
 

-        m_UnicodeInput = TRUE;
+        m_UnicodeInput = true;

     }
     else // input !Unicode
     {
     }
     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 (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
 
         m_Table = new tchar[256];
         for (i = 0; i < 128; i++)  m_Table[i] = (tchar)i; // 7bit ASCII


@@ -193,10 +174,8 @@ 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];
         if (output_enc == wxFONTENCODING_UNICODE)
         {
             for (i = 0; i < 128; i++)  m_Table[128 + i] = (tchar)in_tbl[i];

-            return TRUE;
+            return true;

         }
         }

-        // FIXME: write a substitute for bsearch
-#ifndef __WXWINCE__

         else // output !Unicode
         {
             CharsetItem *rev = BuildReverseTable(out_tbl);
         else // output !Unicode
         {
             CharsetItem *rev = BuildReverseTable(out_tbl);


@@ -222,15 +201,27 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
 
             delete[] rev;
         }
 
             delete[] rev;
         }

-#endif // !__WXWINCE__

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 

+#define REPLACEMENT_CHAR  ((tchar)'?')
+
+inline tchar GetTableValue(const tchar *table, tchar value, bool& repl)
+{
+    tchar r = table[value];
+    if (r == 0 && value != 0)
+    {
+        r = REPLACEMENT_CHAR;
+        repl = true;
+    }
+    return r;
+}

 
 

-void wxEncodingConverter::Convert(const char* input, char* output) const
+
+bool 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*!"));
 {
     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*!"));


@@ -241,20 +232,25 @@ void wxEncodingConverter::Convert(const char* input, char* output) const
     if (m_JustCopy)
     {
         strcpy(output, input);
     if (m_JustCopy)
     {
         strcpy(output, input);

-        return;
+        return true;

     }
 
     }
 

-    wxCHECK_RET(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+    wxCHECK_MSG(m_Table != NULL, false,
+                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+    bool replaced = false;

 
     for (i = input, o = output; *i != 0;)
 
     for (i = input, o = output; *i != 0;)

-        *(o++) = (char)(m_Table[(wxUint8)*(i++)]);
+        *(o++) = (char)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));

     *o = 0;
     *o = 0;

+
+    return !replaced;

 }
 
 
 #if wxUSE_WCHAR_T
 
 }
 
 
 #if wxUSE_WCHAR_T
 

-void wxEncodingConverter::Convert(const char* input, wchar_t* output) const
+bool 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*!"));
 {
     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*!"));


@@ -267,19 +263,24 @@ void wxEncodingConverter::Convert(const char* input, wchar_t* output) const
         for (i = input, o = output; *i != 0;)
             *(o++) = (wchar_t)(*(i++));
         *o = 0;
         for (i = input, o = output; *i != 0;)
             *(o++) = (wchar_t)(*(i++));
         *o = 0;

-        return;
+        return true;

     }
 
     }
 

-    wxCHECK_RET(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+    wxCHECK_MSG(m_Table != NULL, false,
+                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+    bool replaced = false;

 
     for (i = input, o = output; *i != 0;)
 
     for (i = input, o = output; *i != 0;)

-        *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);
+        *(o++) = (wchar_t)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));

     *o = 0;
     *o = 0;

+
+    return !replaced;

 }
 
 
 
 }
 
 
 

-void wxEncodingConverter::Convert(const wchar_t* input, char* output) const
+bool 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*!"));
 {
     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*!"));


@@ -292,19 +293,24 @@ void wxEncodingConverter::Convert(const wchar_t* input, char* output) const
         for (i = input, o = output; *i != 0;)
             *(o++) = (char)(*(i++));
         *o = 0;
         for (i = input, o = output; *i != 0;)
             *(o++) = (char)(*(i++));
         *o = 0;

-        return;
+        return true;

     }
 
     }
 

-    wxCHECK_RET(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+    wxCHECK_MSG(m_Table != NULL, false,
+                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+    bool replaced = false;

 
     for (i = input, o = output; *i != 0;)
 
     for (i = input, o = output; *i != 0;)

-        *(o++) = (char)(m_Table[(wxUint16)*(i++)]);
+        *(o++) = (char)(GetTableValue(m_Table, (wxUint16)*(i++), replaced));

     *o = 0;
     *o = 0;

+
+    return !replaced;

 }
 
 
 
 }
 
 
 

-void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) const
+bool 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*!"));
 {
     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*!"));


@@ -318,14 +324,19 @@ void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) const
         for (i = input, o = output; *i != 0;)
             *(o++) = (*(i++));
         *o = 0;
         for (i = input, o = output; *i != 0;)
             *(o++) = (*(i++));
         *o = 0;

-        return;
+        return true;

     }
 
     }
 

-    wxCHECK_RET(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+    wxCHECK_MSG(m_Table != NULL, false,
+                wxT("You must call wxEncodingConverter::Init() before actually converting!"));

 
 

+    bool replaced = false;
+    

     for (i = input, o = output; *i != 0;)
     for (i = input, o = output; *i != 0;)

-        *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);
+        *(o++) = (wchar_t)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));

     *o = 0;
     *o = 0;

+
+    return !replaced;

 }
 
 #endif // wxUSE_WCHAR_T
 }
 
 #endif // wxUSE_WCHAR_T


@@ -434,7 +445,7 @@ static wxFontEncoding
 
     // Cyrillic
     {
 
     // 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     */ {wxFONTENCODING_MACCYRILLIC, STOP}
         /* windows */ {wxFONTENCODING_CP1251, STOP},
         /* os2     */ {STOP},
         /* mac     */ {wxFONTENCODING_MACCYRILLIC, STOP}


@@ -520,4 +531,3 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
     return arr;
 }
 
     return arr;
 }
 

-#endif // wxUSE_FONTMAP