X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e97f20a0f2bcff6b144b8ab81c73c1d412361864..ee6a122fa3446c7aa020e7fdfeb85584d92309d1:/src/motif/font.cpp?ds=sidebyside diff --git a/src/motif/font.cpp b/src/motif/font.cpp index ae4ccd07ff..a07b6fa920 100644 --- a/src/motif/font.cpp +++ b/src/motif/font.cpp @@ -1,126 +1,374 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.cpp +// Name: src/motif/font.cpp // Purpose: wxFont class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "font.h" +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __VMS +#pragma message disable nosimpint +#include "wx/vms_x_fix.h" +#endif +#include +#ifdef __VMS +#pragma message enable nosimpint #endif -#include "wx/defs.h" -#include "wx/string.h" #include "wx/font.h" -#include "wx/gdicmn.h" -#include "wx/utils.h" -#include +#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/motif/private.h" -#if !USE_SHARED_LIBRARIES -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) +// ---------------------------------------------------------------------------- +// 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(); + virtual ~wxXFont(); + +#if !wxMOTIF_NEW_FONT_HANDLING + WXFontStructPtr m_fontStruct; // XFontStruct +#endif +#if !wxMOTIF_USE_RENDER_TABLE + WXFontList m_fontList; // Motif XmFontList +#else // if wxMOTIF_USE_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; + +public: + wxFontRefData(int size = wxDEFAULT, + wxFontFamily family = wxFONTFAMILY_DEFAULT, + wxFontStyle style = wxFONTSTYLE_NORMAL, + wxFontWeight weight = wxFONTWEIGHT_NORMAL, + 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); + } + + virtual ~wxFontRefData(); + +protected: + // common part of all ctors + void Init(int size, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined, + const wxString& faceName, + wxFontEncoding encoding); + + // font attributes + int m_pointSize; + wxFontFamily m_family; + wxFontStyle m_style; + wxFontWeight m_weight; + bool m_underlined; + wxString m_faceName; + wxFontEncoding m_encoding; + + wxNativeFontInfo m_nativeFontInfo; + + // A list of wxXFonts + wxList m_fonts; +}; + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxXFont +// ---------------------------------------------------------------------------- + +wxXFont::wxXFont() +{ +#if !wxMOTIF_NEW_FONT_HANDLING + m_fontStruct = (WXFontStructPtr) 0; +#endif +#if !wxMOTIF_USE_RENDER_TABLE + m_fontList = (WXFontList) 0; +#else // if wxMOTIF_USE_RENDER_TABLE + m_renderTable = (WXRenderTable) 0; + m_rendition = (WXRendition) 0; #endif + m_display = (WXDisplay*) 0; + m_scale = 100; +} -wxFontRefData::wxFontRefData(): m_fontsByScale(wxKEY_INTEGER) +wxXFont::~wxXFont() { - m_style = 0; - m_pointSize = 0; - m_family = 0; - m_style = 0; - m_weight = 0; - m_underlined = 0; - m_faceName = ""; +#if !wxMOTIF_USE_RENDER_TABLE + if (m_fontList) + XmFontListFree ((XmFontList) m_fontList); + m_fontList = NULL; +#else // if wxMOTIF_USE_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(const wxFontRefData& data): m_fontsByScale(wxKEY_INTEGER) +// ---------------------------------------------------------------------------- +// wxFontRefData +// ---------------------------------------------------------------------------- + +void wxFontRefData::Init(int pointSize, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined, + const wxString& faceName, + wxFontEncoding encoding) { - 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; + if (family == wxDEFAULT) + m_family = wxFONTFAMILY_SWISS; + else + m_family = family; + + m_faceName = faceName; + + if (style == wxDEFAULT) + m_style = wxFONTSTYLE_NORMAL; + else + m_style = style; + + if (weight == wxDEFAULT) + m_weight = wxFONTWEIGHT_NORMAL; + else + m_weight = weight; + + if (pointSize == wxDEFAULT) + m_pointSize = 12; + else + m_pointSize = pointSize; - // Don't have to copy actual fonts, because they'll be created - // on demand. + m_underlined = underlined; + m_encoding = encoding; } wxFontRefData::~wxFontRefData() { - wxNode* node = m_fontsByScale.First(); + wxList::compatibility_iterator node = m_fonts.GetFirst(); while (node) { - XFontStruct* fontStruct = (XFontStruct*) node->Data(); - // TODO: why does freeing the font produce a segv??? - // Commenting it out will result in memory leaks, and - // maybe X resource problems, who knows... - // XFreeFont((Display*) wxGetDisplay, fontStruct); - node = node->Next(); + wxXFont* f = (wxXFont*) node->GetData(); + delete f; + node = node->GetNext(); } - m_fontsByScale.Clear(); + m_fonts.Clear(); } -wxFont::wxFont() +#define M_FONTDATA ((wxFontRefData*)m_refData) + +// ---------------------------------------------------------------------------- +// wxFont +// ---------------------------------------------------------------------------- + +wxFont::wxFont(const wxNativeFontInfo& info) { - if ( wxTheFontList ) - wxTheFontList->Append(this); + (void)Create(info.GetXFontName()); } -wxFont::wxFont(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName) +bool wxFont::Create(int pointSize, + wxFontFamily family, + wxFontStyle style, + wxFontWeight weight, + bool underlined, + const wxString& faceName, + wxFontEncoding encoding) { - Create(pointSize, family, style, weight, underlined, faceName); + UnRef(); + m_refData = new wxFontRefData(pointSize, family, style, weight, + underlined, faceName, encoding); - if ( wxTheFontList ) - wxTheFontList->Append(this); + return true; } -bool wxFont::Create(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName) +bool wxFont::Create(const wxString& fontname, wxFontEncoding enc) { - UnRef(); - m_refData = new wxFontRefData; + if( !fontname ) + { + *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT); + return true; + } - 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(); + + M_FONTDATA->m_nativeFontInfo.SetXFontName(fontname); // X font name + + wxString tmp; + + wxStringTokenizer tn( fontname, wxT("-") ); + + tn.GetNextToken(); // skip initial empty token + tn.GetNextToken(); // foundry + + + M_FONTDATA->m_faceName = tn.GetNextToken(); // family + + tmp = tn.GetNextToken().MakeUpper(); // weight + if (tmp == wxT("BOLD")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD; + if (tmp == wxT("BLACK")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD; + if (tmp == wxT("EXTRABOLD")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD; + if (tmp == wxT("DEMIBOLD")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD; + if (tmp == wxT("ULTRABOLD")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD; + + if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxFONTWEIGHT_LIGHT; + if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxFONTWEIGHT_LIGHT; + + tmp = tn.GetNextToken().MakeUpper(); // slant + if (tmp == wxT("I")) M_FONTDATA->m_style = wxFONTSTYLE_ITALIC; + if (tmp == wxT("O")) M_FONTDATA->m_style = wxFONTSTYLE_ITALIC; - RealizeResource(); + tn.GetNextToken(); // set width + tn.GetNextToken(); // add. style + tn.GetNextToken(); // pixel size - return TRUE; + tmp = tn.GetNextToken(); // pointsize + if (tmp != wxT("*")) + { + long num = wxStrtol (tmp.mb_str(), (wxChar **) NULL, 10); + M_FONTDATA->m_pointSize = (int)(num / 10); + } + + tn.GetNextToken(); // x-res + tn.GetNextToken(); // y-res + + tmp = tn.GetNextToken().MakeUpper(); // spacing + + if (tmp == wxT("M")) + M_FONTDATA->m_family = wxFONTFAMILY_MODERN; + else if (M_FONTDATA->m_faceName == wxT("TIMES")) + M_FONTDATA->m_family = wxFONTFAMILY_ROMAN; + else if (M_FONTDATA->m_faceName == wxT("HELVETICA")) + M_FONTDATA->m_family = wxFONTFAMILY_SWISS; + else if (M_FONTDATA->m_faceName == wxT("LUCIDATYPEWRITER")) + M_FONTDATA->m_family = wxFONTFAMILY_TELETYPE; + else if (M_FONTDATA->m_faceName == wxT("LUCIDA")) + M_FONTDATA->m_family = wxFONTFAMILY_DECORATIVE; + else if (M_FONTDATA->m_faceName == wxT("UTOPIA")) + M_FONTDATA->m_family = wxFONTFAMILY_SCRIPT; + + tn.GetNextToken(); // avg width + + // deal with font encoding + M_FONTDATA->m_encoding = enc; + if ( M_FONTDATA->m_encoding == wxFONTENCODING_SYSTEM ) + { + wxString registry = tn.GetNextToken().MakeUpper(), + encoding = tn.GetNextToken().MakeUpper(); + + if ( registry == wxT("ISO8859") ) + { + int cp; + if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 ) + { + M_FONTDATA->m_encoding = + (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1); + } + } + else if ( registry == wxT("MICROSOFT") ) + { + int cp; + if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 ) + { + M_FONTDATA->m_encoding = + (wxFontEncoding)(wxFONTENCODING_CP1250 + cp); + } + } + else if ( registry == wxT("KOI8") ) + { + M_FONTDATA->m_encoding = wxFONTENCODING_KOI8; + } + //else: unknown encoding - may be give a warning here? + else + return false; + } + return true; } wxFont::~wxFont() { - if (wxTheFontList) - wxTheFontList->DeleteObject(this); } -bool wxFont::RealizeResource() +wxGDIRefData *wxFont::CreateGDIRefData() const { - // TODO: create the font (if there is a native font object) - return FALSE; + return new wxFontRefData; } +wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const +{ + return new wxFontRefData(*static_cast(data)); +} + +// ---------------------------------------------------------------------------- +// change the font attributes +// ---------------------------------------------------------------------------- + void wxFont::Unshare() { - // Don't change shared data - if (!m_refData) + // Don't change shared data + if (!m_refData) { - m_refData = new wxFontRefData(); - } + m_refData = new wxFontRefData(); + } else { - wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData); - UnRef(); - m_refData = ref; - } + wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData); + UnRef(); + m_refData = ref; + } } void wxFont::SetPointSize(int pointSize) @@ -128,44 +376,41 @@ void wxFont::SetPointSize(int pointSize) Unshare(); M_FONTDATA->m_pointSize = pointSize; - - RealizeResource(); + M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now } -void wxFont::SetFamily(int family) +void wxFont::SetFamily(wxFontFamily family) { Unshare(); M_FONTDATA->m_family = family; - - RealizeResource(); + M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now } -void wxFont::SetStyle(int style) +void wxFont::SetStyle(wxFontStyle style) { Unshare(); M_FONTDATA->m_style = style; - - RealizeResource(); + M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now } -void wxFont::SetWeight(int weight) +void wxFont::SetWeight(wxFontWeight weight) { Unshare(); M_FONTDATA->m_weight = weight; - - RealizeResource(); + M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now } -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 - RealizeResource(); + return wxFontBase::SetFaceName(faceName); } void wxFont::SetUnderlined(bool underlined) @@ -173,182 +418,285 @@ void wxFont::SetUnderlined(bool underlined) Unshare(); M_FONTDATA->m_underlined = underlined; +} + +void wxFont::SetEncoding(wxFontEncoding encoding) +{ + Unshare(); + + M_FONTDATA->m_encoding = encoding; + M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now +} + +void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info) +{ + Unshare(); + + M_FONTDATA->m_nativeFontInfo = info; +} + +// ---------------------------------------------------------------------------- +// query font attributes +// ---------------------------------------------------------------------------- + +int wxFont::GetPointSize() const +{ + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); + + return M_FONTDATA->m_pointSize; +} - RealizeResource(); -} - -wxString wxFont::GetFamilyString() const -{ - 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; -} - -/* New font system */ wxString wxFont::GetFaceName() const { - wxString str(""); - if (M_FONTDATA) - str = M_FONTDATA->m_faceName ; - return str; + wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); + + return M_FONTDATA->m_faceName ; } -wxString wxFont::GetStyleString() const +wxFontFamily wxFont::DoGetFamily() 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_family; } -wxString wxFont::GetWeightString() const +wxFontStyle wxFont::GetStyle() const { - wxString w(""); - switch (GetWeight()) - { - case wxBOLD: - w = "wxBOLD"; - break; - case wxLIGHT: - w = "wxLIGHT"; - break; - default: - w = "wxNORMAL"; - break; - } - return w; + wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") ); + + return M_FONTDATA->m_style; +} + +wxFontWeight wxFont::GetWeight() const +{ + wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") ); + + return M_FONTDATA->m_weight; +} + +bool wxFont::GetUnderlined() const +{ + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); + + return M_FONTDATA->m_underlined; +} + +wxFontEncoding wxFont::GetEncoding() const +{ + wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + + return M_FONTDATA->m_encoding; +} + +const wxNativeFontInfo *wxFont::GetNativeFontInfo() const +{ + wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") ); + + if(M_FONTDATA->m_nativeFontInfo.GetXFontName().empty()) + GetInternalFont(); + + return &(M_FONTDATA->m_nativeFontInfo); } +// ---------------------------------------------------------------------------- +// 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. -WXFontStructPtr wxFont::FindOrCreateFontStruct(double scale) -{ - if (!Ok()) - return NULL; - - long intScale = long(scale * 100.0 + 0.5); // key for fontlist - int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100; - - wxNode* node = M_FONTDATA->m_fontsByScale.Find(intScale); - if (node) - { - return (WXFontStructPtr) node->Data(); - } - - WXFontStructPtr font = LoadQueryFont(pointSize, M_FONTDATA->m_family, - M_FONTDATA->m_style, M_FONTDATA->m_weight, M_FONTDATA->m_underlined); - - 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) - { - M_FONTDATA->m_fontsByScale.Append(intScale, (wxObject*) font); - return (WXFontStructPtr) font; - } - return font; -} - -WXFontStructPtr wxFont::LoadQueryFont(int pointSize, int family, int style, - int weight, bool underlined) -{ - 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) +wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const +{ + if ( !IsOk() ) + return NULL; + + long intScale = long(scale * 100.0 + 0.5); // key for wxXFont + int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100; + + // search existing fonts first + wxList::compatibility_iterator node = M_FONTDATA->m_fonts.GetFirst(); + while (node) { - case wxITALIC: xstyle = "i"; - break; - case wxSLANT: xstyle = "o"; - break; - case wxNORMAL: xstyle = "r"; - break; - default: xstyle = "*"; - break; + wxXFont* f = (wxXFont*) node->GetData(); + if ((!display || (f->m_display == display)) && (f->m_scale == intScale)) + return f; + node = node->GetNext(); } - switch (weight) + + // not found, create a new one + wxString xFontSpec; + 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, + &xFontSpec); + + if ( !font ) { - case wxBOLD: xweight = "bold"; - break; - case wxLIGHT: - case wxNORMAL: xweight = "medium"; - break; - default: xweight = "*"; - break; + wxFAIL_MSG( wxT("Could not allocate even a default font -- something is wrong.") ); + + return NULL; } - sprintf(wxBuffer, "-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-*-*", - xfamily, xweight, xstyle, pointSize); + 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; + +#if wxMOTIF_USE_RENDER_TABLE + XmRendition rendition; + XmRenderTable renderTable; + Arg args[5]; + int count = 0; + +#if wxMOTIF_NEW_FONT_HANDLING + char* fontSpec = wxStrdup(xFontSpec.mb_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 !wxMOTIF_USE_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 - Display *dpy = (Display*) wxGetDisplay(); - XFontStruct* font = XLoadQueryFont(dpy, wxBuffer); +WXFontStructPtr wxFont::GetFontStruct(double scale, WXDisplay* display) const +{ + wxXFont* f = GetInternalFont(scale, display); - return (WXFontStructPtr) font; + 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); + + return (f ? f->m_fontList : (WXFontList) 0); +} + +#else // if wxMOTIF_USE_RENDER_TABLE + +WXRenderTable wxFont::GetRenderTable(WXDisplay* display) const +{ + wxXFont* f = GetInternalFont(1.0, display); + + return (f ? f->m_renderTable : (WXRenderTable) 0); +} + +#endif // wxMOTIF_USE_RENDER_TABLE + +WXFontType wxFont::GetFontType(WXDisplay* display) const +{ +#if wxMOTIF_USE_RENDER_TABLE + return IsOk() ? GetRenderTable(display) : NULL; +#else + return IsOk() ? GetFontList(1.0, display) : NULL; +#endif +} + +WXFontType wxFont::GetFontTypeC(WXDisplay* display) const +{ +#if wxMOTIF_USE_RENDER_TABLE + return IsOk() ? GetRenderTable(display) : NULL; +#else + return IsOk() ? XmFontListCopy( (XmFontList)GetFontList(1.0, display) ) : NULL; +#endif +} + +/*static*/ WXString wxFont::GetFontTag() +{ +#if wxMOTIF_USE_RENDER_TABLE + return (WXString)XmNrenderTable; +#else + return (WXString)XmNfontList; +#endif +} + +#if wxMOTIF_USE_RENDER_TABLE + +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.mb_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_USE_RENDER_TABLE + +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, + const_cast((const char *)str.mb_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_USE_RENDER_TABLE