recall initial font

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

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index feeb310e0bacf7a884d9eedd459050fa63642d76..0c82eed410a31493c00b002cc07afe7baffeb078 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -1,123 +1,362 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        font.cpp
+// Name:        src/motif/font.cpp

 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "font.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "font.h"

 #endif
 
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/defs.h"
 #include "wx/defs.h"

+
+#ifdef __VMS
+#pragma message disable nosimpint
+#include "wx/vms_x_fix.h"
+#endif
+#include <Xm/Xm.h>
+#ifdef __VMS
+#pragma message enable nosimpint
+#endif
+

 #include "wx/string.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 #include "wx/string.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"

-#include "wx/utils.h"
+#include "wx/utils.h"       // for wxGetDisplay()
+#include "wx/fontutil.h"    // for wxNativeFontInfo
+#include "wx/tokenzr.h"
+#include "wx/settings.h"
+#include "wx/motif/private.h"

 
 

-#include <X11/Xlib.h>
-
-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)

+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// For every wxFont, there must be a font for each display and scale requested.
+// So these objects are stored in wxFontRefData::m_fonts
+class wxXFont : public wxObject
+{
+public:
+    wxXFont();
+    ~wxXFont();
+
+    WXFontStructPtr     m_fontStruct;   // XFontStruct
+    WXFontList          m_fontList;     // Motif XmFontList
+#if wxCHECK_MOTIF_VERSION( 2, 0 )
+    WXRenderTable       m_renderTable;  // Motif XmRenderTable
+#endif
+    WXDisplay*          m_display;      // XDisplay
+    int                 m_scale;        // Scale * 100
+};
+
+class wxFontRefData: public wxGDIRefData
+{
+friend class wxFont;
+
+public:
+    wxFontRefData(int size = wxDEFAULT,
+                  int family = wxDEFAULT,
+                  int style = wxDEFAULT,
+                  int weight = wxDEFAULT,
+                  bool underlined = FALSE,
+                  const wxString& faceName = wxEmptyString,
+                  wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        Init(size, family, style, weight, underlined, faceName, encoding);
+    }
+
+    wxFontRefData(const wxFontRefData& data)
+    {
+        Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
+             data.m_underlined, data.m_faceName, data.m_encoding);
+    }
+
+    ~wxFontRefData();
+
+protected:
+    // common part of all ctors
+    void Init(int size,
+              int family,
+              int style,
+              int weight,
+              bool underlined,
+              const wxString& faceName,
+              wxFontEncoding encoding);
+
+    // font attributes
+    int           m_pointSize;
+    int           m_family;
+    int           m_style;
+    int           m_weight;
+    bool          m_underlined;
+    wxString      m_faceName;
+    wxFontEncoding m_encoding;
+
+    wxNativeFontInfo m_nativeFontInfo;
+
+    // A list of wxXFonts
+    wxList        m_fonts;
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxXFont
+// ----------------------------------------------------------------------------
+
+wxXFont::wxXFont()
+{
+    m_fontStruct = (WXFontStructPtr) 0;
+    m_fontList = (WXFontList) 0;
+#if wxCHECK_MOTIF_VERSION( 2, 0 )
+    m_renderTable = (WXRenderTable) 0;

 #endif
 #endif

+    m_display = (WXDisplay*) 0;
+    m_scale = 100;
+}

 
 

-wxFontRefData::wxFontRefData(): m_fontsByScale(wxKEY_INTEGER)
+wxXFont::~wxXFont()

 {
 {

-    m_style = 0;
-    m_pointSize = 0;
-    m_family = 0;
-    m_style = 0;
-    m_weight = 0;
-    m_underlined = 0;
-    m_faceName = "";
+    XmFontList fontList = (XmFontList) m_fontList;
+    XmFontListFree (fontList);
+
+#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+    XmRenderTable renderTable = (XmRenderTable) m_renderTable;
+    XmRenderTableFree (renderTable);
+#endif
+
+    // TODO: why does freeing the font produce a segv???
+    // Note that XFreeFont wasn't called in wxWin 1.68 either.
+    // XFontStruct* fontStruct = (XFontStruct*) m_fontStruct;
+    //        XFreeFont((Display*) m_display, fontStruct);

 }
 
 }
 

-wxFontRefData::wxFontRefData(const wxFontRefData& data): m_fontsByScale(wxKEY_INTEGER)
+// ----------------------------------------------------------------------------
+// wxFontRefData
+// ----------------------------------------------------------------------------
+
+void wxFontRefData::Init(int pointSize,
+                         int family,
+                         int style,
+                         int weight,
+                         bool underlined,
+                         const wxString& faceName,
+                         wxFontEncoding encoding)

 {
 {

-    m_style = data.m_style;
-    m_pointSize = data.m_pointSize;
-    m_family = data.m_family;
-    m_style = data.m_style;
-    m_weight = data.m_weight;
-    m_underlined = data.m_underlined;
-    m_faceName = data.m_faceName;
+    if (family == wxDEFAULT)
+        m_family = wxSWISS;
+    else
+        m_family = family;
+
+    m_faceName = faceName;

 
 

-    // Don't have to copy actual fonts, because they'll be created
-    // on demand.
+    if (style == wxDEFAULT)
+        m_style = wxNORMAL;
+    else
+        m_style = style;
+
+    if (weight == wxDEFAULT)
+        m_weight = wxNORMAL;
+    else
+        m_weight = weight;
+
+    if (pointSize == wxDEFAULT)
+        m_pointSize = 12;
+    else
+        m_pointSize = pointSize;
+
+    m_underlined = underlined;
+    m_encoding = encoding;

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

-    wxNode* node = m_fontsByScale.First();
+    wxList::compatibility_iterator node = m_fonts.GetFirst();

     while (node)
     {
     while (node)
     {

-        XFontStruct* fontStruct = (XFontStruct*) node->Data();
-        XFreeFont((Display*) wxGetDisplay, fontStruct);
-        node = node->Next();
+        wxXFont* f = (wxXFont*) node->GetData();
+        delete f;
+        node = node->GetNext();

     }
     }

-    m_fontsByScale.Clear();
+    m_fonts.Clear();

 }
 
 }
 

-wxFont::wxFont()
+// ----------------------------------------------------------------------------
+// wxFont
+// ----------------------------------------------------------------------------
+
+wxFont::wxFont(const wxNativeFontInfo& info)

 {
 {

-    if ( wxTheFontList )
-        wxTheFontList->Append(this);
+    Init();
+
+    (void)Create(info.GetXFontName());

 }
 
 }
 

-wxFont::wxFont(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName)
+void wxFont::Init()

 {
 {

-    Create(pointSize, family, style, weight, underlined, faceName);
-
-    if ( wxTheFontList )
-        wxTheFontList->Append(this);

 }
 
 }
 

-bool wxFont::Create(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName)
+bool wxFont::Create(int pointSize,
+                    int family,
+                    int style,
+                    int weight,
+                    bool underlined,
+                    const wxString& faceName,
+                    wxFontEncoding encoding)

 {
     UnRef();
 {
     UnRef();

-    m_refData = new wxFontRefData;
-
-    M_FONTDATA->m_family = family;
-    M_FONTDATA->m_style = style;
-    M_FONTDATA->m_weight = weight;
-    M_FONTDATA->m_pointSize = pointSize;
-    M_FONTDATA->m_underlined = underlined;
-    M_FONTDATA->m_faceName = faceName;
+    m_refData = new wxFontRefData(pointSize, family, style, weight,
+                                  underlined, faceName, encoding);

 
     RealizeResource();
 
     return TRUE;
 }
 
 
     RealizeResource();
 
     return TRUE;
 }
 

-wxFont::~wxFont()
+bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)

 {
 {

-    if (wxTheFontList)
-        wxTheFontList->DeleteObject(this);
+    if( !fontname )
+    {
+        *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);
+        return TRUE;
+    }
+
+    m_refData = new wxFontRefData();
+
+    M_FONTDATA->m_nativeFontInfo.SetXFontName(fontname);  // X font name
+
+    wxString tmp;
+
+    wxStringTokenizer tn( fontname, wxT("-") );
+
+    tn.GetNextToken();                           // skip initial empty token
+    tn.GetNextToken();                           // foundry
+
+
+    M_FONTDATA->m_faceName = tn.GetNextToken();  // family
+
+    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();                           // add. style
+    tn.GetNextToken();                           // pixel size
+
+    tmp = tn.GetNextToken();                     // pointsize
+    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
+
+    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;

 }
 
 }
 

-bool wxFont::RealizeResource()
+wxFont::~wxFont()

 {
 {

-    // TODO: create the font (if there is a native font object)
-    return FALSE;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// change the font attributes
+// ----------------------------------------------------------------------------
+

 void wxFont::Unshare()
 {
 void wxFont::Unshare()
 {

-       // Don't change shared data
-       if (!m_refData)
+    // Don't change shared data
+    if (!m_refData)

     {
     {

-               m_refData = new wxFontRefData();
-       }
+        m_refData = new wxFontRefData();
+    }

     else
     {
     else
     {

-               wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
-               UnRef();
-               m_refData = ref;
-       }
+        wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
+        UnRef();
+        m_refData = ref;
+    }

 }
 
 void wxFont::SetPointSize(int pointSize)
 }
 
 void wxFont::SetPointSize(int pointSize)


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

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

 
     RealizeResource();
 }
 
     RealizeResource();
 }


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

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

 
     RealizeResource();
 }
 
     RealizeResource();
 }


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

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

 
     RealizeResource();
 }
 
     RealizeResource();
 }


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

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

 
     RealizeResource();
 }
 
     RealizeResource();
 }


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

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

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -174,177 +418,195 @@ void wxFont::SetUnderlined(bool underlined)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-wxString wxFont::GetFamilyString() const
-{
-  wxString fam("");
-  switch (GetFamily())
-  {
-    case wxDECORATIVE:
-      fam = "wxDECORATIVE";
-      break;
-    case wxROMAN:
-      fam = "wxROMAN";
-      break;
-    case wxSCRIPT:
-      fam = "wxSCRIPT";
-      break;
-    case wxSWISS:
-      fam = "wxSWISS";
-      break;
-    case wxMODERN:
-      fam = "wxMODERN";
-      break;
-    case wxTELETYPE:
-      fam = "wxTELETYPE";
-      break;
-    default:
-      fam = "wxDEFAULT";
-      break;
-  }
-  return fam;
-}
-
-/* New font system */
+void wxFont::SetEncoding(wxFontEncoding encoding)
+{
+    Unshare();
+
+    M_FONTDATA->m_encoding = encoding;
+    M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
+
+    RealizeResource();
+}
+
+void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
+{
+    Unshare();
+
+    M_FONTDATA->m_nativeFontInfo = info;
+}
+
+// ----------------------------------------------------------------------------
+// query font attributes
+// ----------------------------------------------------------------------------
+
+int wxFont::GetPointSize() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+
+    return M_FONTDATA->m_pointSize;
+}
+

 wxString wxFont::GetFaceName() const
 {
 wxString wxFont::GetFaceName() const
 {

-    wxString str("");
-    if (M_FONTDATA)
-           str = M_FONTDATA->m_faceName ;
-    return str;
+    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+
+    return M_FONTDATA->m_faceName ;

 }
 
 }
 

-wxString wxFont::GetStyleString() const
+int wxFont::GetFamily() const

 {
 {

-    wxString styl("");
-    switch (GetStyle())
-    {
-        case wxITALIC:
-            styl = "wxITALIC";
-            break;
-        case wxSLANT:
-            styl = "wxSLANT";
-            break;
-        default:
-            styl = "wxNORMAL";
-            break;
-    }
-    return styl;
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+
+    return M_FONTDATA->m_family;

 }
 
 }
 

-wxString wxFont::GetWeightString() const
+int wxFont::GetStyle() const

 {
 {

-    wxString w("");
-    switch (GetWeight())
-    {
-        case wxBOLD:
-            w = "wxBOLD";
-            break;
-        case wxLIGHT:
-            w = "wxLIGHT";
-            break;
-        default:
-            w = "wxNORMAL";
-            break;
-    }
-    return w;
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+
+    return M_FONTDATA->m_style;
+}
+
+int wxFont::GetWeight() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+
+    return M_FONTDATA->m_weight;
+}
+
+bool wxFont::GetUnderlined() const
+{
+    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+
+    return M_FONTDATA->m_underlined;
+}
+
+wxFontEncoding wxFont::GetEncoding() const
+{
+    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+
+    return M_FONTDATA->m_encoding;
+}
+
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+    wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
+
+    if(M_FONTDATA->m_nativeFontInfo.GetXFontName().IsEmpty())
+        GetInternalFont();
+
+    return &(M_FONTDATA->m_nativeFontInfo);

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// real implementation
+// ----------------------------------------------------------------------------
+

 // Find an existing, or create a new, XFontStruct
 // based on this wxFont and the given scale. Append the
 // font to list in the private data for future reference.
 // Find an existing, or create a new, XFontStruct
 // based on this wxFont and the given scale. Append the
 // font to list in the private data for future reference.

-WXFontStructPtr wxFont::FindOrCreateFontStruct(double scale)
-{
-  if (!Ok())
-    return NULL;
-
-  long intScale = long(scale * 100.0 + 0.5); // key for fontlist
-  int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
-
-  wxNode* node = M_FONTDATA->m_fontsByScale.Find(intScale);
-  if (node)
-  {
-    return (WXFontStructPtr) node->Data();
-  }
-
-  WXFontStructPtr font = LoadQueryFont(pointSize, M_FONTDATA->m_family,
-    M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
-
-  if (!font)
-  {
-       // search up and down by stepsize 10
-       int max_size = pointSize + 20 * (1 + (pointSize/180));
-       int min_size = pointSize - 20 * (1 + (pointSize/180));
-       int i;
-
-       // Search for smaller size (approx.)
-       for (i=pointSize-10; !font && i >= 10 && i >= min_size; i -= 10)
-           font = LoadQueryFont(i, M_FONTDATA->m_family, M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
-       // Search for larger size (approx.)
-       for (i=pointSize+10; !font && i <= max_size; i += 10)
-           font = LoadQueryFont(i, M_FONTDATA->m_family, M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
-       // Try default family
-       if (!font && M_FONTDATA->m_family != wxDEFAULT)
-           font = LoadQueryFont(pointSize, wxDEFAULT, M_FONTDATA->m_style, 
-                                  M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
-       // Bogus font
-       if (!font)
-           font = LoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
-                                   M_FONTDATA->m_underlined);
-  }
-  if (font)
-  {
-      M_FONTDATA->m_fontsByScale.Append(intScale, (wxObject*) font);
-      return (WXFontStructPtr) font;
-  }
-  return font;
-}
-
-WXFontStructPtr wxFont::LoadQueryFont(int pointSize, int family, int style,
-   int weight, bool underlined)
-{
-    char *xfamily;
-    char *xstyle;
-    char *xweight;
-    switch (family)
-    {
-      case wxDECORATIVE: xfamily = "lucida";
-                         break;
-      case wxROMAN:      xfamily = "times";
-                         break;
-      case wxMODERN:     xfamily = "courier";
-                         break;
-      case wxSWISS:      xfamily = "lucida";
-                         break;
-      case wxDEFAULT:
-        default:           xfamily = "*";
-    }
-    switch (style)
+wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
+{
+    if ( !Ok() )
+        return (wxXFont *)NULL;
+
+    long intScale = long(scale * 100.0 + 0.5); // key for wxXFont
+    int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
+
+    // search existing fonts first
+    wxList::compatibility_iterator node = M_FONTDATA->m_fonts.GetFirst();
+    while (node)

     {
     {

-      case wxITALIC:     xstyle = "i";
-                         break;
-      case wxSLANT:      xstyle = "o";
-                         break;
-      case wxNORMAL:     xstyle = "r";
-                         break;
-      default:           xstyle = "*";
-                         break;
+        wxXFont* f = (wxXFont*) node->GetData();
+        if ((!display || (f->m_display == display)) && (f->m_scale == intScale))
+            return f;
+        node = node->GetNext();

     }
     }

-    switch (weight)
+
+    // not found, create a new one
+    XFontStruct *font = (XFontStruct *)
+                        wxLoadQueryNearestFont(pointSize,
+                                               M_FONTDATA->m_family,
+                                               M_FONTDATA->m_style,
+                                               M_FONTDATA->m_weight,
+                                               M_FONTDATA->m_underlined,
+                                               wxT(""),
+                                               M_FONTDATA->m_encoding);
+
+    if ( !font )

     {
     {

-      case wxBOLD:       xweight = "bold";
-                         break;
-      case wxLIGHT:
-      case wxNORMAL:     xweight = "medium";
-                         break;
-      default:           xweight = "*";
-                         break;
+        wxFAIL_MSG( wxT("Could not allocate even a default font -- something is wrong.") );
+
+        return (wxXFont*) NULL;

     }
 
     }
 

-    sprintf(wxBuffer, "-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-*-*",
-            xfamily, xweight, xstyle, pointSize);
+    wxXFont* f = new wxXFont;
+    f->m_fontStruct = (WXFontStructPtr)font;
+    f->m_display = ( display ? display : wxGetDisplay() );
+    f->m_scale = intScale;
+    f->m_fontList = XmFontListCreate ((XFontStruct*) font, XmSTRING_DEFAULT_CHARSET);
+    M_FONTDATA->m_fonts.Append(f);
+
+#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+    XmRendition rendition;
+    XmRenderTable renderTable;
+    Arg args[5];
+    int count = 0;
+
+    XtSetArg( args[count], XmNfont, font ); ++count;
+    XtSetArg( args[count], XmNunderlineType,
+              GetUnderlined() ? XmSINGLE_LINE : XmNO_LINE ); ++count;
+    rendition = XmRenditionCreate( XmGetXmDisplay( (Display*)f->m_display ),
+                                   (XmStringTag)"",
+                                   args, count );
+    renderTable = XmRenderTableAddRenditions( NULL, &rendition, 1,
+                                              XmMERGE_REPLACE );
+
+    f->m_renderTable = (WXRenderTable)renderTable;
+#endif

 
 

-    Display *dpy = (Display*) wxGetDisplay();
-    XFontStruct* font = XLoadQueryFont(dpy, wxBuffer);
+    return f;
+}
+
+WXFontStructPtr wxFont::GetFontStruct(double scale, WXDisplay* display) const
+{
+    wxXFont* f = GetInternalFont(scale, display);
+
+    return (f ? f->m_fontStruct : (WXFontStructPtr) 0);
+}

 
 

-    return (WXFontStructPtr) font;
+WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
+{
+    wxXFont* f = GetInternalFont(scale, display);
+
+    return (f ? f->m_fontList : (WXFontList) 0);
+}
+
+#if wxCHECK_MOTIF_VERSION( 2, 0 )
+
+WXRenderTable wxFont::GetRenderTable(WXDisplay* display) const
+{
+    wxXFont* f = GetInternalFont(1.0, display);
+
+    return (f ? f->m_renderTable : (WXFontList) 0);
+}
+
+#endif
+
+WXFontType wxFont::GetFontType(WXDisplay* display) const
+{
+#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+    return Ok() ? GetRenderTable(display) : NULL;
+#else
+    return Ok() ? GetFontList(1.0, display) : NULL;
+#endif
+}
+
+/*static*/ WXString wxFont::GetFontTag()
+{
+#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+    return (WXString)XmNrenderTable;
+#else
+    return (WXString)XmNfontList;
+#endif

 }
 }