rewrote wxFileName::Normalize(), added a few methods, general clean up,

[wxWidgets.git] / src / unix / fontutil.cpp

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 19c96b3df6254ee78e75f2db8202db7068563398..2c371f3c1f4357ff440dd9ab42981ee56dc7c9ee 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -95,7 +95,8 @@ static wxNativeFont wxLoadQueryFont(int pointSize,
                                     bool underlined,
                                     const wxString& facename,
                                     const wxString& xregistry,
                                     bool underlined,
                                     const wxString& facename,
                                     const wxString& xregistry,

-                                    const wxString& xencoding);
+                                    const wxString& xencoding,
+                                    wxString* xFontName);

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -106,10 +107,17 @@ static wxNativeFont wxLoadQueryFont(int pointSize,
 // ----------------------------------------------------------------------------
 
 // convert to/from the string representation: format is
 // ----------------------------------------------------------------------------
 
 // convert to/from the string representation: format is

-//      registry-encoding[-facename]
+//      encodingid;registry;encoding[;facename]

 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {

-    wxStringTokenizer tokenizer(s, _T("-"));
+    wxStringTokenizer tokenizer(s, _T(";"));
+            // cannot use "-" because it may be part of encoding name
+
+    wxString encid = tokenizer.GetNextToken();
+    long enc;
+    if ( !encid.ToLong(&enc) )
+        return FALSE;
+    encoding = (wxFontEncoding)enc;

 
     xregistry = tokenizer.GetNextToken();
     if ( !xregistry )
 
     xregistry = tokenizer.GetNextToken();
     if ( !xregistry )


@@ -128,10 +136,10 @@ bool wxNativeEncodingInfo::FromString(const wxString& s)
 wxString wxNativeEncodingInfo::ToString() const
 {
     wxString s;
 wxString wxNativeEncodingInfo::ToString() const
 {
     wxString s;

-    s << xregistry << _T('-') << xencoding;
+    s << (long)encoding << _T(';') << xregistry << _T(';') << xencoding;

     if ( !!facename )
     {
     if ( !!facename )
     {

-        s << _T('-') << facename;
+        s << _T(';') << facename;

     }
 
     return s;
     }
 
     return s;


@@ -164,6 +172,7 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
         case wxFONTENCODING_ISO8859_9:
         case wxFONTENCODING_ISO8859_10:
         case wxFONTENCODING_ISO8859_11:
         case wxFONTENCODING_ISO8859_9:
         case wxFONTENCODING_ISO8859_10:
         case wxFONTENCODING_ISO8859_11:

+        case wxFONTENCODING_ISO8859_12:

         case wxFONTENCODING_ISO8859_13:
         case wxFONTENCODING_ISO8859_14:
         case wxFONTENCODING_ISO8859_15:
         case wxFONTENCODING_ISO8859_13:
         case wxFONTENCODING_ISO8859_14:
         case wxFONTENCODING_ISO8859_15:


@@ -206,6 +215,8 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
             return FALSE;
     }
 
             return FALSE;
     }
 

+   info->encoding = encoding;
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -230,7 +241,8 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
                                     int weight,
                                     bool underlined,
                                     const wxString &facename,
                                     int weight,
                                     bool underlined,
                                     const wxString &facename,

-                                    wxFontEncoding encoding)
+                                    wxFontEncoding encoding,
+                                    wxString* xFontName)

 {
     if ( encoding == wxFONTENCODING_DEFAULT )
     {
 {
     if ( encoding == wxFONTENCODING_DEFAULT )
     {


@@ -264,9 +276,17 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
     }
     
     // OK, we have the correct xregistry/xencoding in info structure
     }
     
     // OK, we have the correct xregistry/xencoding in info structure

-    wxNativeFont font = wxLoadQueryFont( pointSize, family, style, weight,
+    wxNativeFont font = 0;
+
+    // if we already have the X font name, try to use it
+    if( xFontName && !xFontName->IsEmpty() )
+        font = wxLoadFont(*xFontName);
+
+    if( !font )
+        font = wxLoadQueryFont( pointSize, family, style, weight,

                                          underlined, facename,
                                          underlined, facename,

-                                         info.xregistry, info.xencoding );
+                                info.xregistry, info.xencoding,
+                                xFontName );

 
     if ( !font )
     {
 
     if ( !font )
     {


@@ -280,14 +300,16 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
         for ( i = pointSize - 10; !font && i >= 10 && i >= min_size; i -= 10 )
         {
             font = wxLoadQueryFont(i, family, style, weight, underlined,
         for ( i = pointSize - 10; !font && i >= 10 && i >= min_size; i -= 10 )
         {
             font = wxLoadQueryFont(i, family, style, weight, underlined,

-                                   facename, info.xregistry, info.xencoding);
+                                   facename, info.xregistry, info.xencoding,
+                                   xFontName);

         }
 
         // Search for larger size (approx.)
         for ( i = pointSize + 10; !font && i <= max_size; i += 10 )
         {
             font = wxLoadQueryFont(i, family, style, weight, underlined,
         }
 
         // Search for larger size (approx.)
         for ( i = pointSize + 10; !font && i <= max_size; i += 10 )
         {
             font = wxLoadQueryFont(i, family, style, weight, underlined,

-                                   facename, info.xregistry, info.xencoding);
+                                   facename, info.xregistry, info.xencoding,
+                                   xFontName);

         }
 
         // Try default family
         }
 
         // Try default family


@@ -295,7 +317,8 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
         {
             font = wxLoadQueryFont(pointSize, wxDEFAULT, style, weight,
                                    underlined, facename,
         {
             font = wxLoadQueryFont(pointSize, wxDEFAULT, style, weight,
                                    underlined, facename,

-                                   info.xregistry, info.xencoding );
+                                   info.xregistry, info.xencoding,
+                                   xFontName );

         }
 
         // Bogus font I
         }
 
         // Bogus font I


@@ -303,7 +326,8 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
         {
             font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
                                    underlined, facename,
         {
             font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
                                    underlined, facename,

-                                   info.xregistry, info.xencoding);
+                                   info.xregistry, info.xencoding,
+                                   xFontName);

         }
 
         // Bogus font II
         }
 
         // Bogus font II


@@ -311,7 +335,8 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
         {
             font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
                                    underlined, wxEmptyString,
         {
             font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
                                    underlined, wxEmptyString,

-                                   info.xregistry, info.xencoding);
+                                   info.xregistry, info.xencoding,
+                                   xFontName);

         }
     }
 
         }
     }
 


@@ -361,7 +386,8 @@ static wxNativeFont wxLoadQueryFont(int pointSize,
                                     bool WXUNUSED(underlined),
                                     const wxString& facename,
                                     const wxString& xregistry,
                                     bool WXUNUSED(underlined),
                                     const wxString& facename,
                                     const wxString& xregistry,

-                                    const wxString& xencoding)
+                                    const wxString& xencoding,
+                                    wxString* xFontName)

 {
     wxString xfamily;
     switch (family)
 {
     wxString xfamily;
     switch (family)


@@ -535,6 +561,9 @@ static wxNativeFont wxLoadQueryFont(int pointSize,
                     xfamily.c_str(), xweight.c_str(), xstyle.c_str(),
                     pointSize, xregistry.c_str(), xencoding.c_str());
 
                     xfamily.c_str(), xweight.c_str(), xstyle.c_str(),
                     pointSize, xregistry.c_str(), xencoding.c_str());
 

+    if( xFontName )
+        *xFontName = fontSpec;
+

     return wxLoadFont(fontSpec);
 }
 
     return wxLoadFont(fontSpec);
 }