added wxRegEx::GetMatch

[wxWidgets.git] / src / gtk / font.cpp

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index c27134680f81880480b1c48b9fe5b957f0f7c0a8..c8a4c8da16b251022b6d1cb634d7683328fea849 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -20,14 +20,19 @@
 #endif
 
 #include "wx/font.h"
 #endif
 
 #include "wx/font.h"

+#include "wx/fontutil.h"
+#include "wx/cmndata.h"

 #include "wx/utils.h"
 #include "wx/log.h"
 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
 #include "wx/utils.h"
 #include "wx/log.h"
 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"

+#include "wx/settings.h"

 
 #include <strings.h>
 
 
 #include <strings.h>
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gtk/gtk.h>

 
 // ----------------------------------------------------------------------------
 // wxFontRefData
 
 // ----------------------------------------------------------------------------
 // wxFontRefData


@@ -66,7 +71,9 @@ private:
     wxString        m_faceName;
     wxFontEncoding  m_encoding;
 
     wxString        m_faceName;
     wxFontEncoding  m_encoding;
 

-    friend wxFont;
+    wxNativeFontInfo m_nativeFontInfo;
+
+    friend class wxFont;

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -115,15 +122,16 @@ wxFontRefData::wxFontRefData( const wxFontRefData& data )
     : m_scaled_xfonts(wxKEY_INTEGER)
 {
     Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
     : m_scaled_xfonts(wxKEY_INTEGER)
 {
     Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,

-        data.m_underlined, data.m_faceName, data.m_encoding);
+         data.m_underlined, data.m_faceName, data.m_encoding);

 }
 
 wxFontRefData::wxFontRefData(int size, int family, int style,
 }
 
 wxFontRefData::wxFontRefData(int size, int family, int style,

-    int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding )
+                             int weight, bool underlined,
+                             const wxString& faceName,
+                             wxFontEncoding encoding)

     : m_scaled_xfonts(wxKEY_INTEGER)
 {
     : m_scaled_xfonts(wxKEY_INTEGER)
 {

-    Init(size, family, style, weight, 
-        underlined, faceName, encoding);
+    Init(size, family, style, weight, underlined, faceName, encoding);

 }
 
 wxFontRefData::~wxFontRefData()
 }
 
 wxFontRefData::~wxFontRefData()


@@ -138,6 +146,37 @@ wxFontRefData::~wxFontRefData()
     }
 }
 
     }
 }
 

+// ----------------------------------------------------------------------------
+// wxNativeFontInfo
+// ----------------------------------------------------------------------------
+
+bool wxNativeFontInfo::FromString(const wxString& s)
+{
+    wxStringTokenizer tokenizer(s, _T(";"));
+
+    wxString token = tokenizer.GetNextToken();
+    //
+    //  Ignore the version for now
+    //
+
+    xFontName = tokenizer.GetNextToken();
+    if(!xFontName)
+        return FALSE;
+        
+    return TRUE;
+}
+
+wxString wxNativeFontInfo::ToString() const
+{
+    wxString s;
+    
+    s.Printf(_T("%d;%s"),
+             0,                         // version
+             xFontName.c_str());
+             
+    return s;
+}
+

 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------


@@ -150,62 +189,132 @@ void wxFont::Init()
         wxTheFontList->Append( this );
 }
 
         wxTheFontList->Append( this );
 }
 

-wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName )
+wxFont::wxFont(const wxNativeFontInfo& info)

 {
 {

-    if (!xFontName)
-        return;
-

     Init();
 
     Init();
 

+    Create(info.xFontName);
+}
+
+bool wxFont::Create(const wxNativeFontInfo& info)
+{
+    return Create(info.xFontName);
+}
+
+bool wxFont::Create( int pointSize,
+                     int family,
+                     int style,
+                     int weight,
+                     bool underlined,
+                     const wxString& face,
+                     wxFontEncoding encoding)
+{
+    m_refData = new wxFontRefData(pointSize, family, style, weight,
+                                  underlined, face, encoding);
+
+    return TRUE;
+}
+
+bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
+{
+    if( !fontname )
+    {
+         *this = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT);
+         return TRUE;
+    }
+

     m_refData = new wxFontRefData();
 
     m_refData = new wxFontRefData();
 

+    M_FONTDATA->m_nativeFontInfo.xFontName = fontname;  // X font name
+

     wxString tmp;
 
     wxString tmp;
 

-    wxString fontname( xFontName );
-    wxStringTokenizer tn( fontname, T("-") );
+    wxStringTokenizer tn( fontname, wxT("-") );

 
 

+    tn.GetNextToken();                           // skip initial empty token

     tn.GetNextToken();                           // foundry
 
     tn.GetNextToken();                           // foundry
 

-    M_FONTDATA->m_faceName = tn.GetNextToken();  // courier

 
 

-    tmp = tn.GetNextToken().MakeUpper();
-    if (tmp == T("BOLD")) M_FONTDATA->m_weight = wxBOLD;
+    M_FONTDATA->m_faceName = tn.GetNextToken();  // family

 
 

-    tmp = tn.GetNextToken().MakeUpper();
-    if (tmp == T("I")) M_FONTDATA->m_style = wxITALIC;
-    if (tmp == T("O")) M_FONTDATA->m_style = wxITALIC;
+    tmp = tn.GetNextToken().MakeUpper();         // weight
+    if (tmp == wxT("BOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("BLACK")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("EXTRABOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("DEMIBOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("ULTRABOLD")) M_FONTDATA->m_weight = wxBOLD;
+
+    if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxLIGHT;
+    if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxLIGHT;
+
+    tmp = tn.GetNextToken().MakeUpper();        // slant
+    if (tmp == wxT("I")) M_FONTDATA->m_style = wxITALIC;
+    if (tmp == wxT("O")) M_FONTDATA->m_style = wxITALIC;

 
     tn.GetNextToken();                           // set width
 
     tn.GetNextToken();                           // set width

-    tn.GetNextToken();                           // ?
+    tn.GetNextToken();                           // add. style

     tn.GetNextToken();                           // pixel size
 
     tmp = tn.GetNextToken();                     // pointsize
     tn.GetNextToken();                           // pixel size
 
     tmp = tn.GetNextToken();                     // pointsize

-    int num =  wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
-    M_FONTDATA->m_pointSize = num / 10;
+    if (tmp != wxT("*"))
+    {
+        long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
+        M_FONTDATA->m_pointSize = (int)(num / 10);
+    }

 
     tn.GetNextToken();                           // x-res
     tn.GetNextToken();                           // y-res
 
 
     tn.GetNextToken();                           // x-res
     tn.GetNextToken();                           // y-res
 

-    tmp = tn.GetNextToken().MakeUpper();
-    if (tmp == T("M")) M_FONTDATA->m_family = wxMODERN;
-    else if (M_FONTDATA->m_faceName == T("TIMES")) M_FONTDATA->m_family = wxROMAN;
-    else if (M_FONTDATA->m_faceName == T("HELVETICA")) M_FONTDATA->m_family = wxSWISS;
-    else if (M_FONTDATA->m_faceName == T("LUCIDATYPEWRITER")) M_FONTDATA->m_family = wxTELETYPE;
-    else if (M_FONTDATA->m_faceName == T("LUCIDA")) M_FONTDATA->m_family = wxDECORATIVE;
-    else if (M_FONTDATA->m_faceName == T("UTOPIA")) M_FONTDATA->m_family = wxSCRIPT;
-}
-
-bool wxFont::Create( int pointSize,
-                     int family,
-                     int style,
-                     int weight,
-                     bool underlined,
-                     const wxString& face,
-                     wxFontEncoding encoding )
-{
-    m_refData = new wxFontRefData(pointSize, family, style, weight,
-                                  underlined, face, encoding);
+    tmp = tn.GetNextToken().MakeUpper();         // spacing
+
+    if (tmp == wxT("M"))
+        M_FONTDATA->m_family = wxMODERN;
+    else if (M_FONTDATA->m_faceName == wxT("TIMES"))
+        M_FONTDATA->m_family = wxROMAN;
+    else if (M_FONTDATA->m_faceName == wxT("HELVETICA"))
+        M_FONTDATA->m_family = wxSWISS;
+    else if (M_FONTDATA->m_faceName == wxT("LUCIDATYPEWRITER"))
+        M_FONTDATA->m_family = wxTELETYPE;
+    else if (M_FONTDATA->m_faceName == wxT("LUCIDA"))
+        M_FONTDATA->m_family = wxDECORATIVE;
+    else if (M_FONTDATA->m_faceName == wxT("UTOPIA"))
+        M_FONTDATA->m_family = wxSCRIPT;
+
+    tn.GetNextToken();                           // avg width
+
+    // deal with font encoding
+    M_FONTDATA->m_encoding = enc;
+    if ( M_FONTDATA->m_encoding == wxFONTENCODING_SYSTEM )
+    {
+        wxString registry = tn.GetNextToken().MakeUpper(),
+                 encoding = tn.GetNextToken().MakeUpper();

 
 

+        if ( registry == _T("ISO8859") )
+        {
+            int cp;
+            if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
+            {
+                M_FONTDATA->m_encoding =
+                    (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
+            }
+        }
+        else if ( registry == _T("MICROSOFT") )
+        {
+            int cp;
+            if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
+            {
+                M_FONTDATA->m_encoding =
+                    (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
+            }
+        }
+        else if ( registry == _T("KOI8") )
+        {
+            M_FONTDATA->m_encoding = wxFONTENCODING_KOI8;
+        }
+        //else: unknown encoding - may be give a warning here?
+        else
+            return FALSE;
+    }

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -235,42 +344,42 @@ wxFont::~wxFont()
 
 int wxFont::GetPointSize() const
 {
 
 int wxFont::GetPointSize() const
 {

-    wxCHECK_MSG( Ok(), 0, T("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );

 
     return M_FONTDATA->m_pointSize;
 }
 
 wxString wxFont::GetFaceName() const
 {
 
     return M_FONTDATA->m_pointSize;
 }
 
 wxString wxFont::GetFaceName() const
 {

-    wxCHECK_MSG( Ok(), T(""), T("invalid font") );
+    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );

 
     return M_FONTDATA->m_faceName;
 }
 
 int wxFont::GetFamily() const
 {
 
     return M_FONTDATA->m_faceName;
 }
 
 int wxFont::GetFamily() const
 {

-    wxCHECK_MSG( Ok(), 0, T("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );

 
     return M_FONTDATA->m_family;
 }
 
 int wxFont::GetStyle() const
 {
 
     return M_FONTDATA->m_family;
 }
 
 int wxFont::GetStyle() const
 {

-    wxCHECK_MSG( Ok(), 0, T("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );

 
     return M_FONTDATA->m_style;
 }
 
 int wxFont::GetWeight() const
 {
 
     return M_FONTDATA->m_style;
 }
 
 int wxFont::GetWeight() const
 {

-    wxCHECK_MSG( Ok(), 0, T("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );

 
     return M_FONTDATA->m_weight;
 }
 
 bool wxFont::GetUnderlined() const
 {
 
     return M_FONTDATA->m_weight;
 }
 
 bool wxFont::GetUnderlined() const
 {

-    wxCHECK_MSG( Ok(), FALSE, T("invalid font") );
+    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );

 
     return M_FONTDATA->m_underlined;
 }
 
     return M_FONTDATA->m_underlined;
 }


@@ -278,11 +387,22 @@ bool wxFont::GetUnderlined() const
 
 wxFontEncoding wxFont::GetEncoding() const
 {
 
 wxFontEncoding wxFont::GetEncoding() const
 {

-    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, T("invalid font") );
+    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );

 
     return M_FONTDATA->m_encoding;
 }
 
 
     return M_FONTDATA->m_encoding;
 }
 

+wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+    wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
+
+    if(M_FONTDATA->m_nativeFontInfo.xFontName.IsEmpty())
+        GetInternalFont();
+
+    return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+}
+
+

 // ----------------------------------------------------------------------------
 // change font attributes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // change font attributes
 // ----------------------------------------------------------------------------


@@ -292,6 +412,7 @@ void wxFont::SetPointSize(int pointSize)
     Unshare();
 
     M_FONTDATA->m_pointSize = pointSize;
     Unshare();
 
     M_FONTDATA->m_pointSize = pointSize;

+    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now

 }
 
 void wxFont::SetFamily(int family)
 }
 
 void wxFont::SetFamily(int family)


@@ -299,6 +420,7 @@ void wxFont::SetFamily(int family)
     Unshare();
 
     M_FONTDATA->m_family = family;
     Unshare();
 
     M_FONTDATA->m_family = family;

+    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now

 }
 
 void wxFont::SetStyle(int style)
 }
 
 void wxFont::SetStyle(int style)


@@ -306,6 +428,7 @@ void wxFont::SetStyle(int style)
     Unshare();
 
     M_FONTDATA->m_style = style;
     Unshare();
 
     M_FONTDATA->m_style = style;

+    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now

 }
 
 void wxFont::SetWeight(int weight)
 }
 
 void wxFont::SetWeight(int weight)


@@ -313,6 +436,7 @@ void wxFont::SetWeight(int weight)
     Unshare();
 
     M_FONTDATA->m_weight = weight;
     Unshare();
 
     M_FONTDATA->m_weight = weight;

+    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now

 }
 
 void wxFont::SetFaceName(const wxString& faceName)
 }
 
 void wxFont::SetFaceName(const wxString& faceName)


@@ -320,6 +444,7 @@ void wxFont::SetFaceName(const wxString& faceName)
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;

+    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now

 }
 
 void wxFont::SetUnderlined(bool underlined)
 }
 
 void wxFont::SetUnderlined(bool underlined)


@@ -334,23 +459,60 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
     Unshare();
 
     M_FONTDATA->m_encoding = encoding;
     Unshare();
 
     M_FONTDATA->m_encoding = encoding;

+    M_FONTDATA->m_nativeFontInfo.xFontName.Clear();            // invalid now
+}
+
+void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+{
+    Unshare();
+
+    M_FONTDATA->m_nativeFontInfo = info;

 }
 
 // ----------------------------------------------------------------------------
 // get internal representation of font
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // get internal representation of font
 // ----------------------------------------------------------------------------
 

+static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
+
+GdkFont *GtkGetDefaultGuiFont()
+{
+    if (!g_systemDefaultGuiFont)
+    {
+        GtkWidget *widget = gtk_button_new();
+        GtkStyle *def = gtk_rc_get_style( widget );
+        if (def)
+        {
+            g_systemDefaultGuiFont = gdk_font_ref( def->font );
+        }
+        else
+        {
+            def = gtk_widget_get_default_style();
+            if (def)
+                g_systemDefaultGuiFont = gdk_font_ref( def->font );
+        }
+        gtk_widget_destroy( widget );
+    }
+    else
+    {
+        // already have it, but ref it once more before returning
+        gdk_font_ref(g_systemDefaultGuiFont);
+    }
+
+    return g_systemDefaultGuiFont;
+}
+

 GdkFont *wxFont::GetInternalFont( float scale ) const
 {
     if (!Ok())
     {
 GdkFont *wxFont::GetInternalFont( float scale ) const
 {
     if (!Ok())
     {

-        wxFAIL_MSG( T("invalid font") );
+        wxFAIL_MSG( wxT("invalid font") );

 
         return (GdkFont*) NULL;
     }
 
     long int_scale = long(scale * 100.0 + 0.5); /* key for fontlist */
 
         return (GdkFont*) NULL;
     }
 
     long int_scale = long(scale * 100.0 + 0.5); /* key for fontlist */

-    int point_scale = (M_FONTDATA->m_pointSize * 10 * int_scale) / 100;
+    int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);

     GdkFont *font = (GdkFont *) NULL;
 
     wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);
     GdkFont *font = (GdkFont *) NULL;
 
     wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);


@@ -360,18 +522,11 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
     }
     else
     {
     }
     else
     {

-#if 0
-        if ((int_scale == 100) &&
-                (M_FONTDATA->m_family == wxSWISS) &&
-                (M_FONTDATA->m_style == wxNORMAL) &&
-                (M_FONTDATA->m_pointSize == 12) &&
-                (M_FONTDATA->m_weight == wxNORMAL) &&
-                (M_FONTDATA->m_underlined == FALSE))
+        if (*this == wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT))

         {
         {

-            font = gdk_font_load( "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*" );
+            font = GtkGetDefaultGuiFont();

         }
         }

-        else
-#endif // 0
+        if (!font)

         {
             font = wxLoadQueryNearestFont( point_scale,
                                            M_FONTDATA->m_family,
         {
             font = wxLoadQueryNearestFont( point_scale,
                                            M_FONTDATA->m_family,


@@ -379,16 +534,16 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
                                            M_FONTDATA->m_weight,
                                            M_FONTDATA->m_underlined,
                                            M_FONTDATA->m_faceName,
                                            M_FONTDATA->m_weight,
                                            M_FONTDATA->m_underlined,
                                            M_FONTDATA->m_faceName,

-                                           M_FONTDATA->m_encoding );
+                                           M_FONTDATA->m_encoding,
+                                           &M_FONTDATA->m_nativeFontInfo.xFontName );

         }
 
         M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
     }
 
         }
 
         M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
     }
 

-    if (!font)
-    {
-        wxLogError(T("could not load any font"));
-    }
+    // it's quite useless to make it a wxCHECK because we're going to crash
+    // anyhow...
+    wxASSERT_MSG( font, wxT("could not load any font?") );

 
     return font;
 }
 
     return font;
 }