use unsgined int instead of int for 1 bit bitfields (SGI CC warning fix)

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

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index e63de3bf42faada65180b07736a508a9488f7ad1..0eca7c505a02ff8886b11c6d6136ee7529ca965b 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -17,10 +17,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "font.h"
 #endif
 
     #pragma implementation "font.h"
 #endif
 

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

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


@@ -39,9 +42,16 @@
 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
 #include "wx/settings.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)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 

+#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+    #define wxUSE_RENDER_TABLE 1
+#else
+    #define wxUSE_RENDER_TABLE 0
+#endif
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -54,22 +64,29 @@ public:
     wxXFont();
     ~wxXFont();
 
     wxXFont();
     ~wxXFont();
 

+#if !wxMOTIF_NEW_FONT_HANDLING

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

+#endif
+#if !wxUSE_RENDER_TABLE && !wxMOTIF_NEW_FONT_HANDLING

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

+#else // if wxUSE_RENDER_TABLE
+    WXRenderTable       m_renderTable;  // Motif XmRenderTable
+    WXRendition         m_rendition;    // Motif XmRendition
+#endif

     WXDisplay*          m_display;      // XDisplay
     int                 m_scale;        // Scale * 100
 };
 
 class wxFontRefData: public wxGDIRefData
 {
     WXDisplay*          m_display;      // XDisplay
     int                 m_scale;        // Scale * 100
 };
 
 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)
     {


@@ -104,7 +121,7 @@ protected:
     wxFontEncoding m_encoding;
 
     wxNativeFontInfo m_nativeFontInfo;
     wxFontEncoding m_encoding;
 
     wxNativeFontInfo m_nativeFontInfo;

-    
+

     // A list of wxXFonts
     wxList        m_fonts;
 };
     // A list of wxXFonts
     wxList        m_fonts;
 };


@@ -119,20 +136,35 @@ protected:
 
 wxXFont::wxXFont()
 {
 
 wxXFont::wxXFont()
 {

+#if !wxMOTIF_NEW_FONT_HANDLING

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

+#endif
+#if !wxUSE_RENDER_TABLE && !wxMOTIF_NEW_FONT_HANDLING

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

+#else // if wxUSE_RENDER_TABLE
+    m_renderTable = (WXRenderTable) 0;
+    m_rendition   = (WXRendition) 0;
+#endif

     m_display = (WXDisplay*) 0;
     m_scale = 100;
 }
 
 wxXFont::~wxXFont()
 {
     m_display = (WXDisplay*) 0;
     m_scale = 100;
 }
 
 wxXFont::~wxXFont()
 {

-    XmFontList fontList = (XmFontList) m_fontList;
-
-    XmFontListFree (fontList);
+#if !wxUSE_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.
 
     // 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);
 }


@@ -177,12 +209,12 @@ void wxFontRefData::Init(int pointSize,
 
 wxFontRefData::~wxFontRefData()
 {
 
 wxFontRefData::~wxFontRefData()
 {

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

     while (node)
     {
     while (node)
     {

-        wxXFont* f = (wxXFont*) node->Data();
+        wxXFont* f = (wxXFont*) node->GetData();

         delete f;
         delete f;

-        node = node->Next();
+        node = node->GetNext();

     }
     m_fonts.Clear();
 }
     }
     m_fonts.Clear();
 }


@@ -216,7 +248,7 @@ bool wxFont::Create(int pointSize,
 
     RealizeResource();
 
 
     RealizeResource();
 

-    return TRUE;
+    return true;

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


@@ -224,7 +256,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();


@@ -317,9 +349,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()


@@ -351,7 +383,7 @@ 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();
 }
 
     RealizeResource();
 }
 


@@ -361,7 +393,7 @@ 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();
 }
 
     RealizeResource();
 }
 


@@ -371,7 +403,7 @@ 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();
 }
 
     RealizeResource();
 }
 


@@ -381,7 +413,7 @@ 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();
 }
 
     RealizeResource();
 }
 


@@ -391,7 +423,7 @@ void wxFont::SetFaceName(const wxString& faceName)
 
     M_FONTDATA->m_faceName = faceName;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_faceName = faceName;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-    
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -400,7 +432,7 @@ void wxFont::SetUnderlined(bool underlined)
     Unshare();
 
     M_FONTDATA->m_underlined = underlined;
     Unshare();
 
     M_FONTDATA->m_underlined = underlined;

-    
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -410,11 +442,11 @@ 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();
 }
 
     RealizeResource();
 }
 

-void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)

 {
     Unshare();
 
 {
     Unshare();
 


@@ -428,7 +460,7 @@ void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
 int wxFont::GetPointSize() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 int wxFont::GetPointSize() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );

-    
+

     return M_FONTDATA->m_pointSize;
 }
 
     return M_FONTDATA->m_pointSize;
 }
 


@@ -462,7 +494,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;
 }


@@ -474,14 +506,14 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->m_encoding;
 }
 
     return M_FONTDATA->m_encoding;
 }
 

-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const

 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 
     if(M_FONTDATA->m_nativeFontInfo.GetXFontName().IsEmpty())
         GetInternalFont();
 
 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 
     if(M_FONTDATA->m_nativeFontInfo.GetXFontName().IsEmpty())
         GetInternalFont();
 

-    return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+    return &(M_FONTDATA->m_nativeFontInfo);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -500,16 +532,17 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
 
     // search existing fonts first
     int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
 
     // search existing fonts first

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

     while (node)
     {
     while (node)
     {

-        wxXFont* f = (wxXFont*) node->Data();
+        wxXFont* f = (wxXFont*) node->GetData();

         if ((!display || (f->m_display == display)) && (f->m_scale == intScale))
             return f;
         if ((!display || (f->m_display == display)) && (f->m_scale == intScale))
             return f;

-        node = node->Next();
+        node = node->GetNext();

     }
 
     // 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,


@@ -517,7 +550,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 )
     {


@@ -527,15 +561,50 @@ 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;

+    
+#if wxUSE_RENDER_TABLE
+    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;
+#endif
+    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;
+    f->m_rendition = (WXRendition)rendition;
+    wxASSERT( f->m_renderTable != NULL );
+#else // if !wxUSE_RENDER_TABLE

     f->m_fontList = XmFontListCreate ((XFontStruct*) font, XmSTRING_DEFAULT_CHARSET);
     f->m_fontList = XmFontListCreate ((XFontStruct*) font, XmSTRING_DEFAULT_CHARSET);

+    wxASSERT( f->m_fontList != NULL );
+#endif
+

     M_FONTDATA->m_fonts.Append(f);
 
     return f;
 }
 
     M_FONTDATA->m_fonts.Append(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);


@@ -545,8 +614,115 @@ WXFontStructPtr wxFont::GetFontStruct(double scale, WXDisplay* display) const
 
 WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
 {
 
 WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
 {

+#if !wxUSE_RENDER_TABLE

     wxXFont* f = GetInternalFont(scale, display);
 
     return (f ? f->m_fontList : (WXFontList) 0);
     wxXFont* f = GetInternalFont(scale, display);
 
     return (f ? f->m_fontList : (WXFontList) 0);

+#else
+    return NULL;
+#endif
+}
+
+#endif // !wxMOTIF_NEW_FONT_HANDLING
+
+ // declared in the header, can't use wxUSE_RENDER_TABLE
+#if wxCHECK_MOTIF_VERSION( 2, 0 )
+
+WXRenderTable wxFont::GetRenderTable(WXDisplay* display) const
+{
+#if wxUSE_RENDER_TABLE
+    wxXFont* f = GetInternalFont(1.0, display);
+
+    return (f ? f->m_renderTable : (WXFontList) 0);
+#else
+    return NULL;
+#endif
+}
+
+#endif // wxCHECK_MOTIF_VERSION( 2, 0 )
+
+WXFontType wxFont::GetFontType(WXDisplay* display) const
+{
+#if wxUSE_RENDER_TABLE
+    return Ok() ? GetRenderTable(display) : NULL;
+#else
+    return Ok() ? GetFontList(1.0, display) : NULL;
+#endif
+}
+
+WXFontType wxFont::GetFontTypeC(WXDisplay* display) const
+{
+#if wxUSE_RENDER_TABLE
+    return Ok() ? GetRenderTable(display) : NULL;
+#else
+    return Ok() ? XmFontListCopy( (XmFontList)GetFontList(1.0, display) ) : NULL;
+#endif
+}
+
+/*static*/ WXString wxFont::GetFontTag()
+{
+#if wxUSE_RENDER_TABLE
+    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.Len();
+
+    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