compilation fix for last fix

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

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 0c82eed410a31493c00b002cc07afe7baffeb078..6ecf5494054c0cb9b9132bc27323fba954adcac4 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -17,15 +17,9 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "font.h"
-#endif
-

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

-#include "wx/defs.h"
-

 #ifdef __VMS
 #pragma message disable nosimpint
 #include "wx/vms_x_fix.h"
 #ifdef __VMS
 #pragma message disable nosimpint
 #include "wx/vms_x_fix.h"


@@ -35,13 +29,17 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

-#include "wx/string.h"

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

-#include "wx/gdicmn.h"
-#include "wx/utils.h"       // for wxGetDisplay()
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/utils.h"       // for wxGetDisplay()
+    #include "wx/settings.h"
+    #include "wx/gdicmn.h"
+#endif
+

 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"

-#include "wx/settings.h"

 #include "wx/motif/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 #include "wx/motif/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)


@@ -56,12 +54,16 @@ class wxXFont : public wxObject
 {
 public:
     wxXFont();
 {
 public:
     wxXFont();

-    ~wxXFont();
+    virtual ~wxXFont();

 
 

+#if !wxMOTIF_NEW_FONT_HANDLING

     WXFontStructPtr     m_fontStruct;   // XFontStruct
     WXFontStructPtr     m_fontStruct;   // XFontStruct

+#endif
+#if !wxMOTIF_USE_RENDER_TABLE && !wxMOTIF_NEW_FONT_HANDLING

     WXFontList          m_fontList;     // Motif XmFontList
     WXFontList          m_fontList;     // Motif XmFontList

-#if wxCHECK_MOTIF_VERSION( 2, 0 )
+#else // if wxUSE_RENDER_TABLE

     WXRenderTable       m_renderTable;  // Motif XmRenderTable
     WXRenderTable       m_renderTable;  // Motif XmRenderTable

+    WXRendition         m_rendition;    // Motif XmRendition

 #endif
     WXDisplay*          m_display;      // XDisplay
     int                 m_scale;        // Scale * 100
 #endif
     WXDisplay*          m_display;      // XDisplay
     int                 m_scale;        // Scale * 100


@@ -69,14 +71,14 @@ public:
 
 class wxFontRefData: public wxGDIRefData
 {
 
 class wxFontRefData: public wxGDIRefData
 {

-friend class wxFont;
+    friend class wxFont;

 
 public:
     wxFontRefData(int size = wxDEFAULT,
                   int family = wxDEFAULT,
                   int style = wxDEFAULT,
                   int weight = wxDEFAULT,
 
 public:
     wxFontRefData(int size = wxDEFAULT,
                   int family = wxDEFAULT,
                   int style = wxDEFAULT,
                   int weight = wxDEFAULT,

-                  bool underlined = FALSE,
+                  bool underlined = false,

                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {


@@ -89,7 +91,7 @@ public:
              data.m_underlined, data.m_faceName, data.m_encoding);
     }
 
              data.m_underlined, data.m_faceName, data.m_encoding);
     }
 

-    ~wxFontRefData();
+    virtual ~wxFontRefData();

 
 protected:
     // common part of all ctors
 
 protected:
     // common part of all ctors


@@ -126,10 +128,14 @@ protected:
 
 wxXFont::wxXFont()
 {
 
 wxXFont::wxXFont()
 {

+#if !wxMOTIF_NEW_FONT_HANDLING

     m_fontStruct = (WXFontStructPtr) 0;
     m_fontStruct = (WXFontStructPtr) 0;

+#endif
+#if !wxMOTIF_USE_RENDER_TABLE && !wxMOTIF_NEW_FONT_HANDLING

     m_fontList = (WXFontList) 0;
     m_fontList = (WXFontList) 0;

-#if wxCHECK_MOTIF_VERSION( 2, 0 )
+#else // if wxMOTIF_USE_RENDER_TABLE

     m_renderTable = (WXRenderTable) 0;
     m_renderTable = (WXRenderTable) 0;

+    m_rendition   = (WXRendition) 0;

 #endif
     m_display = (WXDisplay*) 0;
     m_scale = 100;
 #endif
     m_display = (WXDisplay*) 0;
     m_scale = 100;


@@ -137,16 +143,20 @@ wxXFont::wxXFont()
 
 wxXFont::~wxXFont()
 {
 
 wxXFont::~wxXFont()
 {

-    XmFontList fontList = (XmFontList) m_fontList;
-    XmFontListFree (fontList);
-
-#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
-    XmRenderTable renderTable = (XmRenderTable) m_renderTable;
-    XmRenderTableFree (renderTable);
+#if !wxMOTIF_USE_RENDER_TABLE
+    if (m_fontList)
+        XmFontListFree ((XmFontList) m_fontList);
+    m_fontList = NULL;
+#else // if wxUSE_RENDER_TABLE
+    if (m_renderTable)
+        XmRenderTableFree ((XmRenderTable) m_renderTable);
+    m_renderTable = NULL;

 #endif
 
     // TODO: why does freeing the font produce a segv???
     // Note that XFreeFont wasn't called in wxWin 1.68 either.
 #endif
 
     // TODO: why does freeing the font produce a segv???
     // Note that XFreeFont wasn't called in wxWin 1.68 either.

+    // MBN: probably some interaction with fonts being still
+    //      in use in some widgets...

     // XFontStruct* fontStruct = (XFontStruct*) m_fontStruct;
     //        XFreeFont((Display*) m_display, fontStruct);
 }
     // XFontStruct* fontStruct = (XFontStruct*) m_fontStruct;
     //        XFreeFont((Display*) m_display, fontStruct);
 }


@@ -207,15 +217,9 @@ wxFontRefData::~wxFontRefData()
 
 wxFont::wxFont(const wxNativeFontInfo& info)
 {
 
 wxFont::wxFont(const wxNativeFontInfo& info)
 {

-    Init();
-

     (void)Create(info.GetXFontName());
 }
 
     (void)Create(info.GetXFontName());
 }
 

-void wxFont::Init()
-{
-}
-

 bool wxFont::Create(int pointSize,
                     int family,
                     int style,
 bool wxFont::Create(int pointSize,
                     int family,
                     int style,


@@ -228,9 +232,7 @@ bool wxFont::Create(int pointSize,
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, faceName, encoding);
 
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, faceName, encoding);
 

-    RealizeResource();
-
-    return TRUE;
+    return true;

 }
 
 bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
 }
 
 bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)


@@ -238,7 +240,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
     if( !fontname )
     {
         *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);
     if( !fontname )
     {
         *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);

-        return TRUE;
+        return true;

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


@@ -331,9 +333,9 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
         }
         //else: unknown encoding - may be give a warning here?
         else
         }
         //else: unknown encoding - may be give a warning here?
         else

-            return FALSE;
+            return false;

     }
     }

-    return TRUE;
+    return true;

 }
 
 wxFont::~wxFont()
 }
 
 wxFont::~wxFont()


@@ -365,8 +367,6 @@ void wxFont::SetPointSize(int pointSize)
 
     M_FONTDATA->m_pointSize = pointSize;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_pointSize = pointSize;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

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


@@ -375,8 +375,6 @@ void wxFont::SetFamily(int family)
 
     M_FONTDATA->m_family = family;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_family = family;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

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


@@ -385,8 +383,6 @@ void wxFont::SetStyle(int style)
 
     M_FONTDATA->m_style = style;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_style = style;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

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


@@ -395,18 +391,16 @@ void wxFont::SetWeight(int weight)
 
     M_FONTDATA->m_weight = weight;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_weight = weight;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

 }
 
 }
 

-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)

 {
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
 {
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 

-    RealizeResource();
+    return wxFontBase::SetFaceName(faceName);

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


@@ -414,8 +408,6 @@ void wxFont::SetUnderlined(bool underlined)
     Unshare();
 
     M_FONTDATA->m_underlined = underlined;
     Unshare();
 
     M_FONTDATA->m_underlined = underlined;

-
-    RealizeResource();

 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)
 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)


@@ -424,8 +416,6 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
 
     M_FONTDATA->m_encoding = encoding;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_encoding = encoding;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

 }
 
 void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
 }
 
 void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)


@@ -448,7 +438,7 @@ int wxFont::GetPointSize() const
 
 wxString wxFont::GetFaceName() const
 {
 
 wxString wxFont::GetFaceName() const
 {

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

 
     return M_FONTDATA->m_faceName ;
 }
 
     return M_FONTDATA->m_faceName ;
 }


@@ -476,7 +466,7 @@ int wxFont::GetWeight() const
 
 bool wxFont::GetUnderlined() const
 {
 
 bool wxFont::GetUnderlined() const
 {

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

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


@@ -492,7 +482,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 
 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 

-    if(M_FONTDATA->m_nativeFontInfo.GetXFontName().IsEmpty())
+    if(M_FONTDATA->m_nativeFontInfo.GetXFontName().empty())

         GetInternalFont();
 
     return &(M_FONTDATA->m_nativeFontInfo);
         GetInternalFont();
 
     return &(M_FONTDATA->m_nativeFontInfo);


@@ -524,6 +514,7 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     }
 
     // not found, create a new one
     }
 
     // not found, create a new one

+    wxString xFontSpec;

     XFontStruct *font = (XFontStruct *)
                         wxLoadQueryNearestFont(pointSize,
                                                M_FONTDATA->m_family,
     XFontStruct *font = (XFontStruct *)
                         wxLoadQueryNearestFont(pointSize,
                                                M_FONTDATA->m_family,


@@ -531,7 +522,8 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
                                                M_FONTDATA->m_weight,
                                                M_FONTDATA->m_underlined,
                                                wxT(""),
                                                M_FONTDATA->m_weight,
                                                M_FONTDATA->m_underlined,
                                                wxT(""),

-                                               M_FONTDATA->m_encoding);
+                                               M_FONTDATA->m_encoding,
+                                               &xFontSpec);

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


@@ -541,19 +533,27 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     }
 
     wxXFont* f = new wxXFont;
     }
 
     wxXFont* f = new wxXFont;

+#if wxMOTIF_NEW_FONT_HANDLING
+    XFreeFont( (Display*) display, font );
+#else

     f->m_fontStruct = (WXFontStructPtr)font;
     f->m_fontStruct = (WXFontStructPtr)font;

+#endif

     f->m_display = ( display ? display : wxGetDisplay() );
     f->m_scale = intScale;
     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()
+#if wxMOTIF_USE_RENDER_TABLE

     XmRendition rendition;
     XmRenderTable renderTable;
     Arg args[5];
     int count = 0;
 
     XmRendition rendition;
     XmRenderTable renderTable;
     Arg args[5];
     int count = 0;
 

+#if wxMOTIF_NEW_FONT_HANDLING
+    wxChar* fontSpec = wxStrdup( xFontSpec.c_str() );
+    XtSetArg( args[count], XmNfontName, fontSpec ); ++count;
+    XtSetArg( args[count], XmNfontType, XmFONT_IS_FONTSET ); ++count;
+#else

     XtSetArg( args[count], XmNfont, font ); ++count;
     XtSetArg( args[count], XmNfont, font ); ++count;

+#endif

     XtSetArg( args[count], XmNunderlineType,
               GetUnderlined() ? XmSINGLE_LINE : XmNO_LINE ); ++count;
     rendition = XmRenditionCreate( XmGetXmDisplay( (Display*)f->m_display ),
     XtSetArg( args[count], XmNunderlineType,
               GetUnderlined() ? XmSINGLE_LINE : XmNO_LINE ); ++count;
     rendition = XmRenditionCreate( XmGetXmDisplay( (Display*)f->m_display ),


@@ -563,11 +563,20 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
                                               XmMERGE_REPLACE );
 
     f->m_renderTable = (WXRenderTable)renderTable;
                                               XmMERGE_REPLACE );
 
     f->m_renderTable = (WXRenderTable)renderTable;

+    f->m_rendition = (WXRendition)rendition;
+    wxASSERT( f->m_renderTable != NULL );
+#else // if !wxMOTIF_USE_RENDER_TABLE
+    f->m_fontList = XmFontListCreate ((XFontStruct*) font, XmSTRING_DEFAULT_CHARSET);
+    wxASSERT( f->m_fontList != NULL );

 #endif
 
 #endif
 

+    M_FONTDATA->m_fonts.Append(f);
+

     return f;
 }
 
     return f;
 }
 

+#if !wxMOTIF_NEW_FONT_HANDLING
+

 WXFontStructPtr wxFont::GetFontStruct(double scale, WXDisplay* display) const
 {
     wxXFont* f = GetInternalFont(scale, display);
 WXFontStructPtr wxFont::GetFontStruct(double scale, WXDisplay* display) const
 {
     wxXFont* f = GetInternalFont(scale, display);


@@ -575,6 +584,10 @@ WXFontStructPtr wxFont::GetFontStruct(double scale, WXDisplay* display) const
     return (f ? f->m_fontStruct : (WXFontStructPtr) 0);
 }
 
     return (f ? f->m_fontStruct : (WXFontStructPtr) 0);
 }
 

+#endif
+
+#if !wxMOTIF_USE_RENDER_TABLE
+

 WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
 {
     wxXFont* f = GetInternalFont(scale, display);
 WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
 {
     wxXFont* f = GetInternalFont(scale, display);


@@ -582,31 +595,99 @@ WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
     return (f ? f->m_fontList : (WXFontList) 0);
 }
 
     return (f ? f->m_fontList : (WXFontList) 0);
 }
 

-#if wxCHECK_MOTIF_VERSION( 2, 0 )
+#else // if wxMOTIF_USE_RENDER_TABLE

 
 WXRenderTable wxFont::GetRenderTable(WXDisplay* display) const
 {
     wxXFont* f = GetInternalFont(1.0, display);
 
 
 WXRenderTable wxFont::GetRenderTable(WXDisplay* display) const
 {
     wxXFont* f = GetInternalFont(1.0, display);
 

-    return (f ? f->m_renderTable : (WXFontList) 0);
+    return (f ? f->m_renderTable : (WXRenderTable) 0);

 }
 
 }
 

-#endif
+#endif // wxMOTIF_USE_RENDER_TABLE

 
 WXFontType wxFont::GetFontType(WXDisplay* display) const
 {
 
 WXFontType wxFont::GetFontType(WXDisplay* display) const
 {

-#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+#if wxMOTIF_USE_RENDER_TABLE

     return Ok() ? GetRenderTable(display) : NULL;
 #else
     return Ok() ? GetFontList(1.0, display) : NULL;
 #endif
 }
 
     return Ok() ? GetRenderTable(display) : NULL;
 #else
     return Ok() ? GetFontList(1.0, display) : NULL;
 #endif
 }
 

+WXFontType wxFont::GetFontTypeC(WXDisplay* display) const
+{
+#if wxMOTIF_USE_RENDER_TABLE
+    return Ok() ? GetRenderTable(display) : NULL;
+#else
+    return Ok() ? XmFontListCopy( (XmFontList)GetFontList(1.0, display) ) : NULL;
+#endif
+}
+

 /*static*/ WXString wxFont::GetFontTag()
 {
 /*static*/ WXString wxFont::GetFontTag()
 {

-#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+#if wxMOTIF_USE_RENDER_TABLE

     return (WXString)XmNrenderTable;
 #else
     return (WXString)XmNfontList;
 #endif
 }
     return (WXString)XmNrenderTable;
 #else
     return (WXString)XmNfontList;
 #endif
 }

+
+#if wxMOTIF_NEW_FONT_HANDLING
+
+WXFontSet wxFont::GetFontSet(double scale, WXDisplay* display) const
+{
+    wxXFont* f = GetInternalFont(scale, display);
+
+    if( !f ) return (WXFontSet) 0;
+
+    Arg args[2];
+    int count = 0;
+
+    XtSetArg( args[count], XmNfont, 0 ); ++count;
+    XmRenditionRetrieve( (XmRendition) f->m_rendition, args, count );
+
+    return (WXFontSet) args[0].value;
+}
+
+void wxGetTextExtent(WXDisplay* display, const wxFont& font, double scale,
+                     const wxString& str,
+                     int* width, int* height, int* ascent, int* descent)
+{
+    XRectangle ink, logical;
+    WXFontSet fset = font.GetFontSet(scale, display);
+
+    XmbTextExtents( (XFontSet)fset, str.c_str(), str.length(), &ink, &logical);
+
+    if( width ) *width = logical.width;
+    if( height ) *height = logical.height;
+    if( ascent ) *ascent = -logical.y;
+    if( descent ) *descent = logical.height + logical.y;
+}
+
+#else // if !wxMOTIF_NEW_FONT_HANDLING
+
+void wxGetTextExtent(WXDisplay* display, const wxFont& font,
+                     double scale, const wxString& str,
+                     int* width, int* height, int* ascent, int* descent)
+{
+    WXFontStructPtr pFontStruct = font.GetFontStruct(scale, display);
+
+    int direction, ascent2, descent2;
+    XCharStruct overall;
+    int slen = str.length();
+
+    XTextExtents((XFontStruct*) pFontStruct, (char*) str.c_str(), slen,
+                 &direction, &ascent2, &descent2, &overall);
+
+    if ( width )
+        *width = (overall.width);
+    if ( height )
+        *height = (ascent2 + descent2);
+    if ( descent )
+        *descent = descent2;
+    if ( ascent )
+        *ascent = ascent2;
+}
+
+#endif // !wxMOTIF_NEW_FONT_HANDLING