added wxUSE_NOTEBOOK to include/wx/msw/setup0.h, removed wxUSE_RADIOBUTTON (we

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

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 4b46312660b357f9fc2896a6fdc79ce5a77ba3d0..e112ff2d26c1d31e077ea44168b8970c97e9bde3 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -9,21 +9,107 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "font.h"
+    #pragma implementation "font.h"
+#endif
+
+#ifdef __VMS
+#pragma message disable nosimpint
+#endif
+#include <Xm/Xm.h>
+#ifdef __VMS
+#pragma message enable nosimpint

 #endif
 
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/defs.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"

 
 

-#include <Xm/Xm.h>
+    IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)

 
 

-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-#endif
+// ----------------------------------------------------------------------------
+// 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
+    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;
+
+    // A list of wxXFonts
+    wxList        m_fonts;
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxXFont
+// ----------------------------------------------------------------------------

 
 wxXFont::wxXFont()
 {
 
 wxXFont::wxXFont()
 {


@@ -45,29 +131,42 @@ wxXFont::~wxXFont()
     //        XFreeFont((Display*) m_display, fontStruct);
 }
 
     //        XFreeFont((Display*) m_display, fontStruct);
 }
 

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

 {
 {

-    m_style = 0;
-    m_pointSize = 0;
-    m_family = 0;
-    m_style = 0;
-    m_weight = 0;
-    m_underlined = 0;
-    m_faceName = "";
-}
+    if (family == wxDEFAULT)
+        m_family = wxSWISS;
+    else
+        m_family = family;

 
 

-wxFontRefData::wxFontRefData(const wxFontRefData& data)
-{
-    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;
-
-    // Don't have to copy actual fonts, because they'll be created
-    // on demand.
+    m_faceName = faceName;
+
+    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()


@@ -82,31 +181,27 @@ wxFontRefData::~wxFontRefData()
     m_fonts.Clear();
 }
 
     m_fonts.Clear();
 }
 

-wxFont::wxFont()
-{
-    if ( wxTheFontList )
-        wxTheFontList->Append(this);
-}
+// ----------------------------------------------------------------------------
+// wxFont
+// ----------------------------------------------------------------------------

 
 

-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);
 }
 
     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();
 
 
     RealizeResource();
 


@@ -115,15 +210,13 @@ bool wxFont::Create(int pointSize, int family, int style, int weight, bool under
 
 wxFont::~wxFont()
 {
 
 wxFont::~wxFont()
 {

-    if (wxTheFontList)
+    if ( wxTheFontList )

         wxTheFontList->DeleteObject(this);
 }
 
         wxTheFontList->DeleteObject(this);
 }
 

-bool wxFont::RealizeResource()
-{
-    // TODO: create the font (if there is a native font object)
-    return FALSE;
-}
+// ----------------------------------------------------------------------------
+// change the font attributes
+// ----------------------------------------------------------------------------

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


@@ -194,92 +287,73 @@ void wxFont::SetUnderlined(bool underlined)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-wxString wxFont::GetFamilyString() const
+void wxFont::SetEncoding(wxFontEncoding encoding)

 {
 {

-    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;
+    Unshare();
+
+    M_FONTDATA->m_encoding = encoding;
+
+    RealizeResource();
+}
+
+// ----------------------------------------------------------------------------
+// query font attributes
+// ----------------------------------------------------------------------------
+
+int wxFont::GetPointSize() const
+{
+    return M_FONTDATA->m_pointSize;
+}
+
+int wxFont::GetFamily() const
+{
+    return M_FONTDATA->m_family;
+}
+
+int wxFont::GetStyle() const
+{
+    return M_FONTDATA->m_style;
+}
+
+int wxFont::GetWeight() const
+{
+    return M_FONTDATA->m_weight;
+}
+
+bool wxFont::GetUnderlined() const
+{
+    return M_FONTDATA->m_underlined;

 }
 
 }
 

-/* New font system */

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

-    wxString str("");
-    if (M_FONTDATA)
+    wxString str;
+    if ( M_FONTDATA )

         str = M_FONTDATA->m_faceName ;
     return str;
 }
 
         str = M_FONTDATA->m_faceName ;
     return str;
 }
 

-wxString wxFont::GetStyleString() const
+wxFontEncoding wxFont::GetEncoding() const

 {
 {

-    wxString styl("");
-    switch (GetStyle())
-    {
-    case wxITALIC:
-        styl = "wxITALIC";
-        break;
-    case wxSLANT:
-        styl = "wxSLANT";
-        break;
-    default:
-        styl = "wxNORMAL";
-        break;
-    }
-    return styl;
+    return M_FONTDATA->m_encoding;

 }
 
 }
 

-wxString wxFont::GetWeightString() const
-{
-    wxString w("");
-    switch (GetWeight())
-    {
-    case wxBOLD:
-        w = "wxBOLD";
-        break;
-    case wxLIGHT:
-        w = "wxLIGHT";
-        break;
-    default:
-        w = "wxNORMAL";
-        break;
-    }
-    return w;
-}
+// ----------------------------------------------------------------------------
+// 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.
 wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
 {
 
 // 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.
 wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
 {

-    if (!Ok())
-        return (wxXFont*) NULL;
+    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;
 
 
     long intScale = long(scale * 100.0 + 0.5); // key for wxXFont
     int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
 

+    // search existing fonts first

     wxNode* node = M_FONTDATA->m_fonts.First();
     while (node)
     {
     wxNode* node = M_FONTDATA->m_fonts.First();
     while (node)
     {


@@ -289,91 +363,43 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
         node = node->Next();
     }
 
         node = node->Next();
     }
 

-    WXFontStructPtr font = LoadQueryFont(pointSize, M_FONTDATA->m_family,
-        M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined);
-
-    if (!font)
+    // 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 )

     {
     {

-        // 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);
-        wxASSERT_MSG( (font != (XFontStruct*) NULL), "Could not allocate even a default font -- something is wrong." );
-    }
-    if (font)
-    {
-        wxXFont* f = new wxXFont;
-        f->m_fontStruct = 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);
-        return f;
+        wxFAIL_MSG( wxT("Could not allocate even a default font -- something is wrong.") );
+
+        return (wxXFont*) NULL;

     }
     }

-    return (wxXFont*) NULL;
+
+    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);
+
+    return f;

 }
 
 }
 

-WXFontStructPtr wxFont::LoadQueryFont(int pointSize, int family, int style,
-                                      int weight, bool underlined) const
+WXFontStructPtr wxFont::GetFontStruct(double scale, WXDisplay* display) const

 {
 {

-    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)
-    {
-    case wxITALIC:     xstyle = "i";
-        break;
-    case wxSLANT:      xstyle = "o";
-        break;
-    case wxNORMAL:     xstyle = "r";
-        break;
-    default:           xstyle = "*";
-        break;
-    }
-    switch (weight)
-    {
-    case wxBOLD:       xweight = "bold";
-        break;
-    case wxLIGHT:
-    case wxNORMAL:     xweight = "medium";
-        break;
-    default:           xweight = "*";
-        break;
-    }
+    wxXFont* f = GetInternalFont(scale, display);

 
 

-    sprintf(wxBuffer, "-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-*-*",
-        xfamily, xweight, xstyle, pointSize);
+    return (f ? f->m_fontStruct : (WXFontStructPtr) 0);
+}

 
 

-    Display *dpy = (Display*) wxGetDisplay();
-    XFontStruct* font = XLoadQueryFont(dpy, wxBuffer);
+WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
+{
+    wxXFont* f = GetInternalFont(scale, display);

 
 

-    return (WXFontStructPtr) font;
+    return (f ? f->m_fontList : (WXFontList) 0);

 }
 }