// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "font.h"
#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#include "wx/defs.h"
#ifdef __VMS
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
// ----------------------------------------------------------------------------
wxXFont();
~wxXFont();
+#if !wxMOTIF_NEW_FONT_HANDLING
WXFontStructPtr m_fontStruct; // XFontStruct
+#endif
+#if !wxUSE_RENDER_TABLE && !wxMOTIF_NEW_FONT_HANDLING
WXFontList m_fontList; // Motif XmFontList
-#if wxCHECK_MOTIF_VERSION( 2, 0 )
+#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
{
-friend class wxFont;
+ friend class wxFont;
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)
{
wxXFont::wxXFont()
{
+#if !wxMOTIF_NEW_FONT_HANDLING
m_fontStruct = (WXFontStructPtr) 0;
+#endif
+#if !wxUSE_RENDER_TABLE && !wxMOTIF_NEW_FONT_HANDLING
m_fontList = (WXFontList) 0;
-#if wxCHECK_MOTIF_VERSION( 2, 0 )
+#else // if wxUSE_RENDER_TABLE
m_renderTable = (WXRenderTable) 0;
+ m_rendition = (WXRendition) 0;
#endif
m_display = (WXDisplay*) 0;
m_scale = 100;
wxXFont::~wxXFont()
{
- XmFontList fontList = (XmFontList) m_fontList;
- XmFontListFree (fontList);
-
-#if wxCHECK_MOTIF_VERSION( 2, 0 )
- XmRenderTable renderTable = (XmRenderTable) m_renderTable;
- XmRenderTableFree (renderTable);
+#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.
+ // MBN: probably some interaction with fonts being still
+ // in use in some widgets...
// XFontStruct* fontStruct = (XFontStruct*) m_fontStruct;
// XFreeFont((Display*) m_display, fontStruct);
}
wxFontRefData::~wxFontRefData()
{
- wxList::Node* node = m_fonts.GetFirst();
+ wxList::compatibility_iterator node = m_fonts.GetFirst();
while (node)
{
wxXFont* f = (wxXFont*) node->GetData();
RealizeResource();
- return TRUE;
+ return true;
}
bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
if( !fontname )
{
*this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);
- return TRUE;
+ return true;
}
m_refData = new wxFontRefData();
}
//else: unknown encoding - may be give a warning here?
else
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
wxFont::~wxFont()
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_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();
- return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+ return &(M_FONTDATA->m_nativeFontInfo);
}
// ----------------------------------------------------------------------------
int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
// search existing fonts first
- wxList::Node* node = M_FONTDATA->m_fonts.GetFirst();
+ wxList::compatibility_iterator node = M_FONTDATA->m_fonts.GetFirst();
while (node)
{
wxXFont* f = (wxXFont*) node->GetData();
}
// not found, create a new one
+ wxString xFontSpec;
XFontStruct *font = (XFontStruct *)
wxLoadQueryNearestFont(pointSize,
M_FONTDATA->m_family,
M_FONTDATA->m_weight,
M_FONTDATA->m_underlined,
wxT(""),
- M_FONTDATA->m_encoding);
+ M_FONTDATA->m_encoding,
+ &xFontSpec);
if ( !font )
{
}
wxXFont* f = new wxXFont;
+#if wxMOTIF_NEW_FONT_HANDLING
+ XFreeFont( (Display*) display, font );
+#else
f->m_fontStruct = (WXFontStructPtr)font;
+#endif
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 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 ),
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);
+ wxASSERT( f->m_fontList != NULL );
#endif
+ 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);
WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
{
+#if !wxUSE_RENDER_TABLE
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
+#endif // wxCHECK_MOTIF_VERSION( 2, 0 )
WXFontType wxFont::GetFontType(WXDisplay* display) const
{
-#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+#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 wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
+#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
projects / wxWidgets.git / blobdiff