Commited latest SciTech changes into CVS. This includes updates to the

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

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index abf1e37e36fff0bb13ffa73d8265fdeda09a318a..c63b9af1c49958d66e313ea57b3fafeaaf829332 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -58,8 +58,11 @@
 static const wxChar* FONTMAPPER_ROOT_PATH = wxT("/wxWindows/FontMapper");
 static const wxChar* FONTMAPPER_CHARSET_PATH = wxT("Charsets");
 static const wxChar* FONTMAPPER_CHARSET_ALIAS_PATH = wxT("Aliases");
 static const wxChar* FONTMAPPER_ROOT_PATH = wxT("/wxWindows/FontMapper");
 static const wxChar* FONTMAPPER_CHARSET_PATH = wxT("Charsets");
 static const wxChar* FONTMAPPER_CHARSET_ALIAS_PATH = wxT("Aliases");

+
+// we only ask questions in GUI mode

 #if wxUSE_GUI
     static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings");
 #if wxUSE_GUI
     static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings");

+    static const wxChar* FONTMAPPER_FONT_DONT_ASK = wxT("none");

 #endif // wxUSE_GUI
 
 // encodings supported by GetEncodingDescription
 #endif // wxUSE_GUI
 
 // encodings supported by GetEncodingDescription


@@ -145,15 +148,15 @@ static const wxChar* gs_encodingNames[] =
     wxT( "iso8859-14" ),
     wxT( "iso8859-15" ),
     wxT( "koi8-r" ),
     wxT( "iso8859-14" ),
     wxT( "iso8859-15" ),
     wxT( "koi8-r" ),

-    wxT( "windows1250" ),
-    wxT( "windows1251" ),
-    wxT( "windows1252" ),
-    wxT( "windows1253" ),
-    wxT( "windows1254" ),
-    wxT( "windows1255" ),
-    wxT( "windows1256" ),
-    wxT( "windows1257" ),
-    wxT( "windows437" ),
+    wxT( "windows-1250" ),
+    wxT( "windows-1251" ),
+    wxT( "windows-1252" ),
+    wxT( "windows-1253" ),
+    wxT( "windows-1254" ),
+    wxT( "windows-1255" ),
+    wxT( "windows-1256" ),
+    wxT( "windows-1257" ),
+    wxT( "windows-437" ),

     wxT( "utf7" ),
     wxT( "utf8" ),
 };
     wxT( "utf7" ),
     wxT( "utf8" ),
 };


@@ -319,6 +322,11 @@ void wxFontMapper::RestorePath(const wxString& pathOld)
 /* static */
 wxString wxFontMapper::GetEncodingDescription(wxFontEncoding encoding)
 {
 /* static */
 wxString wxFontMapper::GetEncodingDescription(wxFontEncoding encoding)
 {

+    if ( encoding == wxFONTENCODING_DEFAULT )
+    {
+        return _("Default encoding");
+    }
+

     size_t count = WXSIZEOF(gs_encodingDescs);
 
     wxASSERT_MSG( count == WXSIZEOF(gs_encodings),
     size_t count = WXSIZEOF(gs_encodingDescs);
 
     wxASSERT_MSG( count == WXSIZEOF(gs_encodings),


@@ -341,6 +349,11 @@ wxString wxFontMapper::GetEncodingDescription(wxFontEncoding encoding)
 /* static */
 wxString wxFontMapper::GetEncodingName(wxFontEncoding encoding)
 {
 /* static */
 wxString wxFontMapper::GetEncodingName(wxFontEncoding encoding)
 {

+    if ( encoding == wxFONTENCODING_DEFAULT )
+    {
+        return _("default");
+    }
+

     size_t count = WXSIZEOF(gs_encodingNames);
 
     wxASSERT_MSG( count == WXSIZEOF(gs_encodings),
     size_t count = WXSIZEOF(gs_encodingNames);
 
     wxASSERT_MSG( count == WXSIZEOF(gs_encodings),


@@ -405,11 +418,15 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
 
         RestorePath(pathOld);
     }
 
         RestorePath(pathOld);
     }

-#endif // wxUSE_CONFIG
+#endif

 
 

-    // if didn't find it there, try to reckognise it ourselves
+    // if didn't find it there, try to recognize it ourselves

     if ( encoding == wxFONTENCODING_SYSTEM )
     {
     if ( encoding == wxFONTENCODING_SYSTEM )
     {

+        // trim any spaces
+        cs.Trim(TRUE);
+        cs.Trim(FALSE);
+

         // discard the optional quotes
         if ( !!cs )
         {
         // discard the optional quotes
         if ( !!cs )
         {


@@ -422,13 +439,26 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
         cs.MakeUpper();
 
         if ( !cs || cs == wxT("US-ASCII") )
         cs.MakeUpper();
 
         if ( !cs || cs == wxT("US-ASCII") )

+        {

             encoding = wxFONTENCODING_DEFAULT;
             encoding = wxFONTENCODING_DEFAULT;

+        }

         else if ( cs == wxT("UTF-7") )
         else if ( cs == wxT("UTF-7") )

+        {

             encoding = wxFONTENCODING_UTF7;
             encoding = wxFONTENCODING_UTF7;

+        }

         else if ( cs == wxT("UTF-8") )
         else if ( cs == wxT("UTF-8") )

+        {

             encoding = wxFONTENCODING_UTF8;
             encoding = wxFONTENCODING_UTF8;

-        else if ( cs == wxT("KOI8-R") || cs == wxT("KOI8-U") )
+        }
+        else if ( cs == wxT("KOI8-R") ||
+                  cs == wxT("KOI8-U") ||
+                  cs == wxT("KOI8-RU") )
+        {
+            // although koi8-ru is not strictly speaking the same as koi8-r,
+            // they are similar enough to make mapping it to koi8 better than
+            // not reckognizing it at all

             encoding = wxFONTENCODING_KOI8;
             encoding = wxFONTENCODING_KOI8;

+        }

         else if ( cs.Left(3) == wxT("ISO") )
         {
             // the dash is optional (or, to be exact, it is not, but
         else if ( cs.Left(3) == wxT("ISO") )
         {
             // the dash is optional (or, to be exact, it is not, but


@@ -440,29 +470,53 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
             unsigned int value;
             if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 )
             {
             unsigned int value;
             if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 )
             {

-                if ( value < wxFONTENCODING_ISO8859_MAX -
-                             wxFONTENCODING_ISO8859_1 )
+                // make it 0 based and check that it is strictly positive in
+                // the process (no such thing as iso8859-0 encoding)
+                if ( (value-- > 0) &&
+                     (value < wxFONTENCODING_ISO8859_MAX -
+                              wxFONTENCODING_ISO8859_1) )

                 {
                     // it's a valid ISO8859 encoding
                 {
                     // it's a valid ISO8859 encoding

-                    value += wxFONTENCODING_ISO8859_1 - 1;
+                    value += wxFONTENCODING_ISO8859_1;

                     encoding = (wxFontEncoding)value;
                 }
             }
         }
                     encoding = (wxFontEncoding)value;
                 }
             }
         }

-        else if ( cs.Left(8) == wxT("WINDOWS-") )
+        else // check for Windows charsets

         {
         {

-            int value;
-            if ( wxSscanf(cs.c_str() + 8, wxT("%u"), &value) == 1 )
+            size_t len;
+            if ( cs.Left(7) == wxT("WINDOWS") )
+            {
+                len = 7;
+            }
+            else if ( cs.Left(2) == wxT("CP") )
+            {
+                len = 2;
+            }
+            else // not a Windows encoding

             {
             {

-                if ( value >= 1250 )
+                len = 0;
+            }
+
+            if ( len )
+            {
+                const wxChar *p = cs.c_str() + len;
+                if ( *p == wxT('-') )
+                    p++;
+
+                int value;
+                if ( wxSscanf(p, wxT("%u"), &value) == 1 )

                 {
                 {

-                    value -= 1250;
-                    if ( value < wxFONTENCODING_CP12_MAX -
-                                 wxFONTENCODING_CP1250 )
+                    if ( value >= 1250 )

                     {
                     {

-                        // a valid Windows code page
-                        value += wxFONTENCODING_CP1250;
-                        encoding = (wxFontEncoding)value;
+                        value -= 1250;
+                        if ( value < wxFONTENCODING_CP12_MAX -
+                                     wxFONTENCODING_CP1250 )
+                        {
+                            // a valid Windows code page
+                            value += wxFONTENCODING_CP1250;
+                            encoding = (wxFontEncoding)value;
+                        }

                     }
                 }
             }
                     }
                 }
             }


@@ -641,29 +695,41 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
 
         RestorePath(pathOld);
 
 
         RestorePath(pathOld);
 

-        if ( !!fontinfo && !!facename )
+        // this special value means that we don't know of fonts for this
+        // encoding but, moreover, have already asked the user as well and he
+        // didn't specify any font neither
+        if ( fontinfo == FONTMAPPER_FONT_DONT_ASK )

         {
         {

-            // we tried to find a match with facename - now try without it
-            fontinfo = config->Read(encName);
+            interactive = FALSE;

         }
         }

-
-        if ( !!fontinfo )
+        else // use the info entered the last time

         {
         {

-            if ( info->FromString(fontinfo) )
+            if ( !!fontinfo && !!facename )

             {
             {

-                if ( wxTestFontEncoding(*info) )
-                {
-                    // ok, got something
-                    return TRUE;
-                }
-                //else: no such fonts, look for something else
+                // we tried to find a match with facename - now try without it
+                fontinfo = config->Read(encName);

             }
             }

-            else
+
+            if ( !!fontinfo )

             {
             {

-                wxLogDebug(wxT("corrupted config data: string '%s' is not a valid font encoding info"), fontinfo.c_str());
+                if ( info->FromString(fontinfo) )
+                {
+                    if ( wxTestFontEncoding(*info) )
+                    {
+                        // ok, got something
+                        return TRUE;
+                    }
+                    //else: no such fonts, look for something else
+                    //      (should we erase the outdated value?)
+                }
+                else
+                {
+                    wxLogDebug(wxT("corrupted config data: string '%s' is not a valid font encoding info"),
+                               fontinfo.c_str());
+                }

             }
             }

+            //else: there is no information in config about this encoding

         }
         }

-        //else: there is no information in config about this encoding

     }
 #endif // wxUSE_CONFIG
 
     }
 #endif // wxUSE_CONFIG
 


@@ -676,7 +742,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
 
         // the message
         wxString msg;
 
         // the message
         wxString msg;

-        msg.Printf(_("The encoding '%s' is unknown.\nWould you like to select a font to be used for this encoding\n(otherwise the text in this encoding will not be shown correctly)?"),
+        msg.Printf(_("No font for displaying text in encoding '%s' found.\nWould you like to select a font to be used for this encoding\n(otherwise the text in this encoding will not be shown correctly)?"),

                      GetEncodingDescription(encoding).c_str());
 
         wxWindow *parent = m_windowParent;
                      GetEncodingDescription(encoding).c_str());
 
         wxWindow *parent = m_windowParent;


@@ -696,7 +762,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
                 wxFont font = retData.GetChosenFont();
 
                 *info = retData.EncodingInfo();
                 wxFont font = retData.GetChosenFont();
 
                 *info = retData.EncodingInfo();

-                info->encoding = retData.GetEncoding();
+                info -> encoding = retData.GetEncoding();

 
 #if wxUSE_CONFIG
                 // remember this in the config
 
 #if wxUSE_CONFIG
                 // remember this in the config


@@ -712,7 +778,19 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
             }
             //else: the user canceled the font selection dialog
         }
             }
             //else: the user canceled the font selection dialog
         }

-        //else: the user doesn't want to select a font
+        else
+        {
+            // the user doesn't want to select a font for this encoding,
+            // remember it to avoid asking the same question again later
+#if wxUSE_CONFIG
+            if ( ChangePath(FONTMAPPER_FONT_FROM_ENCODING_PATH, &pathOld) )
+            {
+                GetConfig()->Write(configEntry, FONTMAPPER_FONT_DONT_ASK);
+
+                RestorePath(pathOld);
+            }
+#endif // wxUSE_CONFIG
+        }

     }
     //else: we're in non-interactive mode
 
     }
     //else: we're in non-interactive mode
 


@@ -747,7 +825,7 @@ bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding,
 {
     wxNativeEncodingInfo info;
 
 {
     wxNativeEncodingInfo info;
 

-    if ( wxGetNativeFontEncoding(encoding, &info) )
+    if (wxGetNativeFontEncoding(encoding, &info))

     {
         info.facename = facename;
         return wxTestFontEncoding(info);
     {
         info.facename = facename;
         return wxTestFontEncoding(info);