Trashed old wxCSConv loader code. Replaced with code that uses

wxTheFontMapper->CharsetToEncoding and wxEncodingConverter for now
(trying to do something more major would probably be too big for
WX_2_2_BRANCH, this can be reimplemented in a better way later).
Untested but compiles fine and ought to work.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/strconv.cpp

@@ -249,121 +249,33 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 // specified character set
 // ----------------------------------------------------------------------------
 
-#ifndef WX_PRECOMP
+WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);
-  #include "wx/dynarray.h"
+
-  #include "wx/filefn.h"
+#include "wx/encconv.h"
-  #include "wx/textfile.h"
+#include "wx/fontmap.h"
-  #include "wx/tokenzr.h"
-  #include "wx/utils.h"
-#endif
 
 class wxCharacterSet
 {
 public:
-  wxArrayString names;
+  // temporarily just use wxEncodingConverter stuff,
-  wchar_t *data;
+  // so that it works while a better implementation is built
+  wxFontEncoding enc;
+  wxEncodingConverter m2w, w2m;
+  wxCharacterSet(wxFontEncoding e) : enc(e)
+  {
+    m2w.Init(enc, wxFONTENCODING_UNICODE);
+    w2m.Init(wxFONTENCODING_UNICODE, enc);
+  }
 };
 
-WX_DECLARE_OBJARRAY(wxCharacterSet, wxCSArray);
+static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxCSArray);
-
-static wxCSArray wxCharsets;
-
-static void wxLoadCharacterSets(void)
 {
-  static bool already_loaded = FALSE;
+  wxFontEncoding enc = name ? wxTheFontMapper->CharsetToEncoding(name, FALSE)
-
+                            : wxFONTENCODING_SYSTEM;
-  if (already_loaded) return;
+  wxCharacterSet *cset = (enc != wxFONTENCODING_SYSTEM) ? new wxCharacterSet(enc)
-
+                                                        : (wxCharacterSet *)NULL;
-  already_loaded = TRUE;
+  return cset;
-#if defined(__UNIX__) && wxUSE_TEXTFILE
-  // search through files in /usr/share/i18n/charmaps
-  wxString fname;
-  for (fname = ::wxFindFirstFile(wxT("/usr/share/i18n/charmaps/*"));
-       !fname.IsEmpty();
-       fname = ::wxFindNextFile()) {
-    wxTextFile cmap(fname);
-    if (cmap.Open()) {
-      wxCharacterSet *cset = new wxCharacterSet;
-      wxString comchar,escchar;
-      bool in_charset = FALSE;
-
-      // wxFprintf(stderr,wxT("Loaded: %s\n"),fname.c_str());
-
-      wxString line;
-      for (line = cmap.GetFirstLine();
-           !cmap.Eof();
-           line = cmap.GetNextLine()) {
-        // wxFprintf(stderr,wxT("line contents: %s\n"),line.c_str());
-        wxStringTokenizer token(line);
-        wxString cmd = token.GetNextToken();
-        if (cmd == comchar) {
-          if (token.GetNextToken() == wxT("alias"))
-            cset->names.Add(token.GetNextToken());
 }
-        else if (cmd == wxT("<code_set_name>"))
-          cset->names.Add(token.GetNextToken());
-        else if (cmd == wxT("<comment_char>"))
-          comchar = token.GetNextToken();
-        else if (cmd == wxT("<escape_char>"))
-          escchar = token.GetNextToken();
-        else if (cmd == wxT("<mb_cur_min>")) {
-          delete cset;
-          cset = (wxCharacterSet *) NULL;
-          break; // we don't support multibyte charsets ourselves (yet)
-        }
-        else if (cmd == wxT("CHARMAP")) {
-          cset->data = (wchar_t *)calloc(256, sizeof(wchar_t));
-          in_charset = TRUE;
-        }
-        else if (cmd == wxT("END")) {
-          if (token.GetNextToken() == wxT("CHARMAP"))
-            in_charset = FALSE;
-        }
-        else if (in_charset) {
-          // format: <NUL> /x00 <U0000> NULL (NUL)
-          //         <A>   /x41 <U0041> LATIN CAPITAL LETTER A
-          wxString hex = token.GetNextToken();
-          // skip whitespace (why doesn't wxStringTokenizer do this?)
-          while (wxIsEmpty(hex) && token.HasMoreTokens()) hex = token.GetNextToken();
-          wxString uni = token.GetNextToken();
-          // skip whitespace again
-          while (wxIsEmpty(uni) && token.HasMoreTokens()) uni = token.GetNextToken();
-          if ((hex.Len() > 2) && (wxString(hex.GetChar(0)) == escchar) && (hex.GetChar(1) == wxT('x')) &&
-              (uni.Left(2) == wxT("<U"))) {
-            hex.MakeUpper(); uni.MakeUpper();
-            int pos = ::wxHexToDec(hex.Mid(2,2));
-            if (pos>=0) {
-              unsigned long uni1 = ::wxHexToDec(uni.Mid(2,2));
-              unsigned long uni2 = ::wxHexToDec(uni.Mid(4,2));
-              cset->data[pos] = (uni1 << 16) | uni2;
-              // wxFprintf(stderr,wxT("char %02x mapped to %04x (%c)\n"),pos,cset->data[pos],cset->data[pos]);
-            }
-          }
-        }
-      }
-      if (cset) {
-        cset->names.Shrink();
-        wxCharsets.Add(cset);
-      }
-    }
-  }
-#endif
-  wxCharsets.Shrink();
-}
-
-static wxCharacterSet *wxFindCharacterSet(const wxChar *charset)
-{
-  if (!charset) return (wxCharacterSet *)NULL;
-  wxLoadCharacterSets();
-  for (size_t n=0; n<wxCharsets.GetCount(); n++)
-    if (wxCharsets[n].names.Index(charset) != wxNOT_FOUND)
-      return &(wxCharsets[n]);
-  return (wxCharacterSet *)NULL;
-}
-
-WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);
 
 wxCSConv::wxCSConv(const wxChar *charset)
 {
@@ -376,31 +288,14 @@ wxCSConv::wxCSConv(const wxChar *charset)
 wxCSConv::~wxCSConv()
 {
   if (m_name) free(m_name);
+  if (m_cset) delete m_cset;
 }
 
 void wxCSConv::SetName(const wxChar *charset)
 {
   if (charset) {
-#ifdef __UNIX__
+    m_name = wxStrdup(charset);
-    // first, convert the character set name to standard form
-    wxString codeset;
-    if (wxString(charset,3).CmpNoCase(wxT("ISO")) == 0) {
-      // make sure it's represented in the standard form: ISO_8859-1
-      codeset = wxT("ISO_");
-      charset += 3;
-      if ((*charset == wxT('-')) || (*charset == wxT('_'))) charset++;
-      if (wxStrlen(charset)>4) {
-        if (wxString(charset,4) == wxT("8859")) {
-          codeset << wxT("8859-");
-          if (*charset == wxT('-')) charset++;
-        }
-      }
-    }
-    codeset << charset;
-    codeset.MakeUpper();
-    m_name = wxStrdup(codeset.c_str());
     m_deferred = TRUE;
-#endif
   }
 }
 
@@ -410,12 +305,13 @@ void wxCSConv::LoadNow()
   if (m_deferred) {
     if (!m_name) {
 #ifdef __UNIX__
-      wxChar *lang = wxGetenv(wxT("LANG"));
+      wxChar *lang = wxGetenv(wxT("LC_ALL"));
+      if (!lang) lang = wxGetenv(wxT("LANG"));
       wxChar *dot = lang ? wxStrchr(lang, wxT('.')) : (wxChar *)NULL;
       if (dot) SetName(dot+1);
 #endif
     }
-    m_cset = wxFindCharacterSet(m_name);
+    m_cset = wxGetCharacterSet(m_name);
     m_deferred = FALSE;
   }
 }
@@ -425,8 +321,7 @@ size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
   ((wxCSConv *)this)->LoadNow(); // discard constness
   if (buf) {
     if (m_cset) {
-      for (size_t c=0; c<n; c++)
+      m_cset->m2w.Convert(psz, buf);
-        buf[c] = m_cset->data[(unsigned char)(psz[c])];
     } else {
       // latin-1 (direct)
       for (size_t c=0; c<n; c++)
@@ -442,11 +337,7 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
   ((wxCSConv *)this)->LoadNow(); // discard constness
   if (buf) {
     if (m_cset) {
-      for (size_t c=0; c<n; c++) {
+      m_cset->w2m.Convert(psz, buf);
-        size_t n;
-        for (n=0; (n<256) && (m_cset->data[n] != psz[c]); n++);
-        buf[c] = (n>0xff) ? '?' : n;
-      }
     } else {
       // latin-1 (direct)
       for (size_t c=0; c<n; c++)