X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/563f868d3850d70d4b08afd6fa507daafb29c656..f6e9a8189cfd9189418d6c0976a8a07f3bcd914b:/src/motif/font.cpp diff --git a/src/motif/font.cpp b/src/motif/font.cpp index d5b995aa3b..0c82eed410 100644 --- a/src/motif/font.cpp +++ b/src/motif/font.cpp @@ -17,10 +17,15 @@ // 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 #pragma message disable nosimpint #include "wx/vms_x_fix.h" @@ -30,7 +35,6 @@ #pragma message enable nosimpint #endif -#include "wx/defs.h" #include "wx/string.h" #include "wx/font.h" #include "wx/gdicmn.h" @@ -38,6 +42,7 @@ #include "wx/fontutil.h" // for wxNativeFontInfo #include "wx/tokenzr.h" #include "wx/settings.h" +#include "wx/motif/private.h" IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) @@ -55,6 +60,9 @@ public: 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 }; @@ -103,7 +111,7 @@ protected: wxFontEncoding m_encoding; wxNativeFontInfo m_nativeFontInfo; - + // A list of wxXFonts wxList m_fonts; }; @@ -120,6 +128,9 @@ wxXFont::wxXFont() { m_fontStruct = (WXFontStructPtr) 0; m_fontList = (WXFontList) 0; +#if wxCHECK_MOTIF_VERSION( 2, 0 ) + m_renderTable = (WXRenderTable) 0; +#endif m_display = (WXDisplay*) 0; m_scale = 100; } @@ -127,9 +138,13 @@ 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); +#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; @@ -176,12 +191,12 @@ void wxFontRefData::Init(int pointSize, wxFontRefData::~wxFontRefData() { - wxNode* node = m_fonts.First(); + wxList::compatibility_iterator node = m_fonts.GetFirst(); while (node) { - wxXFont* f = (wxXFont*) node->Data(); + wxXFont* f = (wxXFont*) node->GetData(); delete f; - node = node->Next(); + node = node->GetNext(); } m_fonts.Clear(); } @@ -194,7 +209,7 @@ wxFont::wxFont(const wxNativeFontInfo& info) { Init(); - (void)Create(info.xFontName); + (void)Create(info.GetXFontName()); } void wxFont::Init() @@ -222,13 +237,13 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc) { if( !fontname ) { - *this = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT); + *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT); return TRUE; } m_refData = new wxFontRefData(); - M_FONTDATA->m_nativeFontInfo.xFontName = fontname; // X font name + M_FONTDATA->m_nativeFontInfo.SetXFontName(fontname); // X font name wxString tmp; @@ -318,7 +333,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc) else return FALSE; } - return TRUE; + return TRUE; } wxFont::~wxFont() @@ -349,8 +364,8 @@ void wxFont::SetPointSize(int pointSize) Unshare(); M_FONTDATA->m_pointSize = pointSize; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now - + M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now + RealizeResource(); } @@ -359,8 +374,8 @@ void wxFont::SetFamily(int family) Unshare(); M_FONTDATA->m_family = family; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now - + M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now + RealizeResource(); } @@ -369,8 +384,8 @@ void wxFont::SetStyle(int style) Unshare(); M_FONTDATA->m_style = style; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now - + M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now + RealizeResource(); } @@ -379,8 +394,8 @@ void wxFont::SetWeight(int weight) Unshare(); M_FONTDATA->m_weight = weight; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now - + M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now + RealizeResource(); } @@ -389,8 +404,8 @@ void wxFont::SetFaceName(const wxString& faceName) Unshare(); M_FONTDATA->m_faceName = faceName; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now - + M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now + RealizeResource(); } @@ -399,7 +414,7 @@ void wxFont::SetUnderlined(bool underlined) Unshare(); M_FONTDATA->m_underlined = underlined; - + RealizeResource(); } @@ -408,12 +423,12 @@ void wxFont::SetEncoding(wxFontEncoding encoding) Unshare(); M_FONTDATA->m_encoding = encoding; - M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now - + M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now + RealizeResource(); } -void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info) +void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info) { Unshare(); @@ -427,7 +442,7 @@ void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info) int wxFont::GetPointSize() const { wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); - + return M_FONTDATA->m_pointSize; } @@ -473,14 +488,14 @@ wxFontEncoding wxFont::GetEncoding() const 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.xFontName.IsEmpty()) + if(M_FONTDATA->m_nativeFontInfo.GetXFontName().IsEmpty()) GetInternalFont(); - return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo); + return &(M_FONTDATA->m_nativeFontInfo); } // ---------------------------------------------------------------------------- @@ -499,13 +514,13 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const 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) { - wxXFont* f = (wxXFont*) node->Data(); + wxXFont* f = (wxXFont*) node->GetData(); if ((!display || (f->m_display == display)) && (f->m_scale == intScale)) return f; - node = node->Next(); + node = node->GetNext(); } // not found, create a new one @@ -532,6 +547,24 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const 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 + return f; } @@ -549,3 +582,31 @@ WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const 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 +}