X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/011ba5ed7eb41a0f404960746212bf67a06a9351..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/unix/fontutil.cpp diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index e826a295a2..3d09eb207c 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: unix/fontutil.cpp +// Name: src/unix/fontutil.cpp // Purpose: Font helper functions for X11 (GDK/X) // Author: Vadim Zeitlin // Modified by: // Created: 05.11.99 // RCS-ID: $Id$ // Copyright: (c) Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "fontutil.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,18 +24,36 @@ #pragma hdrstop #endif +#include "wx/fontutil.h" + #ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/font.h" // wxFont enums + #include "wx/encinfo.h" + #include "wx/hash.h" + #include "wx/utils.h" // for wxGetDisplay() + #include "wx/module.h" #endif // PCH -#include "wx/fontutil.h" #include "wx/fontmap.h" #include "wx/tokenzr.h" -#include "wx/hash.h" -#include "wx/module.h" +#include "wx/fontenum.h" + +#if wxUSE_PANGO + +#include "pango/pango.h" #ifdef __WXGTK20__ + #include "wx/gtk/private.h" + extern GtkWidget *wxGetRootWindow(); -#include "wx/gtk/private.h" + #define wxPANGO_CONV wxGTK_CONV_SYS +#else + #include "wx/x11/private.h" + #include "wx/gtk/private/string.h" + + #define wxPANGO_CONV(s) (wxConvUTF8.cWX2MB((s))) +#endif // ---------------------------------------------------------------------------- // wxNativeFontInfo @@ -50,6 +64,21 @@ void wxNativeFontInfo::Init() description = NULL; } +void +wxNativeFontInfo::Init(const wxNativeFontInfo& info) +{ + if (info.description) + description = pango_font_description_copy(info.description); + else + description = NULL; +} + +void wxNativeFontInfo::Free() +{ + if (description) + pango_font_description_free(description); +} + int wxNativeFontInfo::GetPointSize() const { return pango_font_description_get_size( description ) / PANGO_SCALE; @@ -71,54 +100,117 @@ wxFontStyle wxNativeFontInfo::GetStyle() const m_style = wxFONTSTYLE_SLANT; break; } - + return m_style; } wxFontWeight wxNativeFontInfo::GetWeight() const { - wxFontWeight m_weight = wxFONTWEIGHT_NORMAL; +#if 0 + // We seem to currently initialize only by string. + // In that case PANGO_FONT_MASK_WEIGHT is always set. + if (!(pango_font_description_get_set_fields(description) & PANGO_FONT_MASK_WEIGHT)) + return wxFONTWEIGHT_NORMAL; +#endif - switch (pango_font_description_get_weight( description )) - { - case PANGO_WEIGHT_ULTRALIGHT: - m_weight = wxFONTWEIGHT_LIGHT; - break; - case PANGO_WEIGHT_LIGHT: - m_weight = wxFONTWEIGHT_LIGHT; - break; - case PANGO_WEIGHT_NORMAL: - m_weight = wxFONTWEIGHT_NORMAL; - break; - case PANGO_WEIGHT_BOLD: - m_weight = wxFONTWEIGHT_BOLD; - break; - case PANGO_WEIGHT_ULTRABOLD: - m_weight = wxFONTWEIGHT_BOLD; - break; - case PANGO_WEIGHT_HEAVY: - m_weight = wxFONTWEIGHT_BOLD; - break; - } - - return m_weight; + PangoWeight pango_weight = pango_font_description_get_weight( description ); + + // Until the API can be changed the following ranges of weight values are used: + // wxFONTWEIGHT_LIGHT: 100 .. 349 - range of 250 + // wxFONTWEIGHT_NORMAL: 350 .. 599 - range of 250 + // wxFONTWEIGHT_BOLD: 600 .. 900 - range of 301 (600 is "semibold" already) + + if (pango_weight >= 600) + return wxFONTWEIGHT_BOLD; + + if (pango_weight < 350) + return wxFONTWEIGHT_LIGHT; + + return wxFONTWEIGHT_NORMAL; } bool wxNativeFontInfo::GetUnderlined() const { - return FALSE; + return false; } wxString wxNativeFontInfo::GetFaceName() const { wxString tmp = wxGTK_CONV_BACK( pango_font_description_get_family( description ) ); - + return tmp; } wxFontFamily wxNativeFontInfo::GetFamily() const { - return wxFONTFAMILY_SWISS; + wxFontFamily ret = wxFONTFAMILY_DEFAULT; + // note: not passing -1 as the 2nd parameter to g_ascii_strdown to work + // around a bug in the 64-bit glib shipped with solaris 10, -1 causes it + // to try to allocate 2^32 bytes. + const char *family_name = pango_font_description_get_family( description ); + if ( !family_name ) + return ret; + + wxGtkString family_text(g_ascii_strdown(family_name, strlen(family_name))); + + // Check for some common fonts, to salvage what we can from the current win32 centric wxFont API: + if (strncmp( family_text, "monospace", 9 ) == 0) + ret = wxFONTFAMILY_TELETYPE; // begins with "Monospace" + else if (strncmp( family_text, "courier", 7 ) == 0) + ret = wxFONTFAMILY_TELETYPE; // begins with "Courier" +#if defined(__WXGTK24__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE) + else +#ifdef __WXGTK24__ + if (!gtk_check_version(2,4,0)) +#endif + { + PangoFontFamily **families; + PangoFontFamily *family = NULL; + int n_families; + pango_context_list_families( +#ifdef __WXGTK20__ + gtk_widget_get_pango_context( wxGetRootWindow() ), +#else + wxTheApp->GetPangoContext(), +#endif + &families, &n_families); + + for (int i = 0;i < n_families;++i) + { + if (g_ascii_strcasecmp(pango_font_family_get_name( families[i] ), pango_font_description_get_family( description )) == 0 ) + { + family = families[i]; + break; + } + } + + g_free(families); + + // Some gtk+ systems might query for a non-existing font from wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) + // on initialization, don't assert until wxSystemSettings::GetFont is checked for this - MR + // wxASSERT_MSG( family, wxT("wxNativeFontInfo::GetFamily() - No appropriate PangoFontFamily found for ::description") ); + + //BCI: Cache the wxFontFamily inside the class. Validate cache with + //BCI: g_ascii_strcasecmp(pango_font_description_get_family(description), pango_font_family_get_name(family)) == 0 + + if (family != NULL && pango_font_family_is_monospace( family )) + ret = wxFONTFAMILY_TELETYPE; // is deemed a monospace font by pango + } +#endif // gtk24 || HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE + + if (ret == wxFONTFAMILY_DEFAULT) + { + if (strstr( family_text, "sans" ) != NULL) // checked before serif, so that "* Sans Serif" fonts are detected correctly + ret = wxFONTFAMILY_SWISS; // contains "Sans" + else if (strstr( family_text, "serif" ) != NULL) + ret = wxFONTFAMILY_ROMAN; // contains "Serif" + else if (strncmp( family_text, "times", 5 ) == 0) + ret = wxFONTFAMILY_ROMAN; // begins with "Times" + else if (strncmp( family_text, "old", 3 ) == 0) + ret = wxFONTFAMILY_DECORATIVE; // Begins with "Old" - "Old English", "Old Town" + } + + return ret; } wxFontEncoding wxNativeFontInfo::GetEncoding() const @@ -126,21 +218,116 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const return wxFONTENCODING_SYSTEM; } + +void wxNativeFontInfo::SetPointSize(int pointsize) +{ + pango_font_description_set_size( description, pointsize * PANGO_SCALE ); +} + +void wxNativeFontInfo::SetStyle(wxFontStyle style) +{ + switch (style) + { + case wxFONTSTYLE_ITALIC: + pango_font_description_set_style( description, PANGO_STYLE_ITALIC ); + break; + case wxFONTSTYLE_SLANT: + pango_font_description_set_style( description, PANGO_STYLE_OBLIQUE ); + break; + default: + wxFAIL_MSG( _T("unknown font style") ); + // fall through + case wxFONTSTYLE_NORMAL: + pango_font_description_set_style( description, PANGO_STYLE_NORMAL ); + break; + } +} + +void wxNativeFontInfo::SetWeight(wxFontWeight weight) +{ + switch (weight) + { + case wxFONTWEIGHT_BOLD: + pango_font_description_set_weight(description, PANGO_WEIGHT_BOLD); + break; + case wxFONTWEIGHT_LIGHT: + pango_font_description_set_weight(description, PANGO_WEIGHT_LIGHT); + break; + default: + wxFAIL_MSG( _T("unknown font weight") ); + // fall through + case wxFONTWEIGHT_NORMAL: + pango_font_description_set_weight(description, PANGO_WEIGHT_NORMAL); + } +} + +void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined)) +{ + wxFAIL_MSG( _T("not implemented") ); +} + +bool wxNativeFontInfo::SetFaceName(const wxString& facename) +{ + pango_font_description_set_family(description, wxPANGO_CONV(facename)); + return true; +} + +void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family)) +{ + wxFAIL_MSG( _T("not implemented") ); +} + +void wxNativeFontInfo::SetEncoding(wxFontEncoding WXUNUSED(encoding)) +{ + wxFAIL_MSG( _T("not implemented") ); +} + + + bool wxNativeFontInfo::FromString(const wxString& s) { if (description) pango_font_description_free( description ); - description = pango_font_description_from_string( wxGTK_CONV( s ) ); + // there is a bug in at least pango <= 1.13 which makes it (or its backends) + // segfault for very big point sizes and for negative point sizes. + // To workaround that bug for pango <= 1.13 + // (see http://bugzilla.gnome.org/show_bug.cgi?id=340229) + // we do the check on the size here using same (arbitrary) limits used by + // pango > 1.13. Note that the segfault could happen also for pointsize + // smaller than this limit !! + wxString str(s); + const size_t pos = str.find_last_of(_T(" ")); + double size; + if ( pos != wxString::npos && wxString(str, pos + 1).ToDouble(&size) ) + { + wxString sizeStr; + if ( size < 1 ) + sizeStr = _T("1"); + else if ( size >= 1E6 ) + sizeStr = _T("1E6"); - return TRUE; + if ( !sizeStr.empty() ) + { + // replace the old size with the adjusted one + str = wxString(s, 0, pos) + sizeStr; + } + } + + description = pango_font_description_from_string(wxPANGO_CONV(str)); + + // ensure a valid facename is selected + if (!wxFontEnumerator::IsValidFacename(GetFaceName())) + SetFaceName(wxNORMAL_FONT->GetFaceName()); + + return true; } wxString wxNativeFontInfo::ToString() const { - wxString tmp = wxGTK_CONV_BACK( pango_font_description_to_string( description ) ); + wxGtkString str(pango_font_description_to_string( description )); - return tmp; + return wxGTK_CONV_BACK(str); } bool wxNativeFontInfo::FromUserString(const wxString& s) @@ -157,9 +344,9 @@ wxString wxNativeFontInfo::ToUserString() const // wxNativeEncodingInfo // ---------------------------------------------------------------------------- -bool wxNativeEncodingInfo::FromString(const wxString& s) +bool wxNativeEncodingInfo::FromString(const wxString& WXUNUSED(s)) { - return FALSE; + return false; } wxString wxNativeEncodingInfo::ToString() const @@ -167,19 +354,23 @@ wxString wxNativeEncodingInfo::ToString() const return wxEmptyString; } -bool wxTestFontEncoding(const wxNativeEncodingInfo& info) +bool wxTestFontEncoding(const wxNativeEncodingInfo& WXUNUSED(info)) { - return TRUE; + return true; } bool wxGetNativeFontEncoding(wxFontEncoding encoding, wxNativeEncodingInfo *info) { - return FALSE; + // all encodings are available in GTK+ 2 because we translate text in any + // encoding to UTF-8 internally anyhow + info->facename.clear(); + info->encoding = encoding; + + return true; } -#else - // __WXGTK20__ +#else // GTK+ 1.x #ifdef __X__ #ifdef __VMS__ @@ -192,7 +383,6 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, #pragma message enable nosimpint #endif - #include "wx/utils.h" // for wxGetDisplay() #elif defined(__WXGTK__) // we have to declare struct tm to avoid problems with first forward // declaring it in C code (glib.h included from gdk.h does it) and then @@ -228,7 +418,13 @@ static wxHashTable *g_fontHash = (wxHashTable*) NULL; #elif defined(__WXGTK__) wxNativeFont wxLoadFont(const wxString& fontSpec) { - return gdk_font_load( wxConvertWX2MB(fontSpec) ); + // VZ: we should use gdk_fontset_load() instead of gdk_font_load() + // here to be able to display Japanese fonts correctly (at least + // this is what people report) but unfortunately doing it results + // in tons of warnings when using GTK with "normal" European + // languages and so we can't always do it and I don't know enough + // to determine when should this be done... (FIXME) + return gdk_font_load( wxConvertWX2MB(fontSpec) ); } inline void wxFreeFont(wxNativeFont font) @@ -269,28 +465,28 @@ bool wxNativeEncodingInfo::FromString(const wxString& s) wxString encid = tokenizer.GetNextToken(); long enc; if ( !encid.ToLong(&enc) ) - return FALSE; + return false; encoding = (wxFontEncoding)enc; xregistry = tokenizer.GetNextToken(); if ( !xregistry ) - return FALSE; + return false; xencoding = tokenizer.GetNextToken(); if ( !xencoding ) - return FALSE; + return false; // ok even if empty facename = tokenizer.GetNextToken(); - return TRUE; + return true; } wxString wxNativeEncodingInfo::ToString() const { wxString s; s << (long)encoding << _T(';') << xregistry << _T(';') << xencoding; - if ( !!facename ) + if ( !facename.empty() ) { s << _T(';') << facename; } @@ -304,7 +500,7 @@ wxString wxNativeEncodingInfo::ToString() const void wxNativeFontInfo::Init() { - m_isDefault = TRUE; + m_isDefault = true; } bool wxNativeFontInfo::FromString(const wxString& s) @@ -314,13 +510,13 @@ bool wxNativeFontInfo::FromString(const wxString& s) // check the version wxString token = tokenizer.GetNextToken(); if ( token != _T('0') ) - return FALSE; + return false; xFontName = tokenizer.GetNextToken(); // this should be the end if ( tokenizer.HasMoreTokens() ) - return FALSE; + return false; return FromXFontName(xFontName); } @@ -350,13 +546,13 @@ bool wxNativeFontInfo::HasElements() const wxString wxNativeFontInfo::GetXFontComponent(wxXLFDField field) const { - wxCHECK_MSG( field < wxXLFD_MAX, _T(""), _T("invalid XLFD field") ); + wxCHECK_MSG( field < wxXLFD_MAX, wxEmptyString, _T("invalid XLFD field") ); if ( !HasElements() ) { // const_cast if ( !((wxNativeFontInfo *)this)->FromXFontName(xFontName) ) - return _T(""); + return wxEmptyString; } return fontElements[field]; @@ -369,7 +565,7 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname) // skip the leading, usually empty field (font name registry) if ( !tokenizer.HasMoreTokens() ) - return FALSE; + return false; (void)tokenizer.GetNextToken(); @@ -378,20 +574,24 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname) if ( !tokenizer.HasMoreTokens() ) { // not enough elements in the XLFD - or maybe an alias - return FALSE; + return false; } - fontElements[n] = tokenizer.GetNextToken(); + wxString field = tokenizer.GetNextToken(); + if ( !field.empty() && field != _T('*') ) + { + // we're really initialized now + m_isDefault = false; + } + + fontElements[n] = field; } // this should be all if ( tokenizer.HasMoreTokens() ) - return FALSE; - - // we're initialized now - m_isDefault = FALSE; + return false; - return TRUE; + return true; } wxString wxNativeFontInfo::GetXFontName() const @@ -449,7 +649,166 @@ void wxNativeFontInfo::SetXFontName(const wxString& xFontName_) xFontName = xFontName_; - m_isDefault = FALSE; + m_isDefault = false; +} + +int wxNativeFontInfo::GetPointSize() const +{ + const wxString s = GetXFontComponent(wxXLFD_POINTSIZE); + + // return -1 to indicate that the size is unknown + long l; + return s.ToLong(&l) ? l : -1; +} + +wxFontStyle wxNativeFontInfo::GetStyle() const +{ + const wxString s = GetXFontComponent(wxXLFD_SLANT); + + if ( s.length() != 1 ) + { + // it is really unknown but we don't have any way to return it from + // here + return wxFONTSTYLE_NORMAL; + } + + switch ( s[0] ) + { + default: + // again, unknown but consider normal by default + + case _T('r'): + return wxFONTSTYLE_NORMAL; + + case _T('i'): + return wxFONTSTYLE_ITALIC; + + case _T('o'): + return wxFONTSTYLE_SLANT; + } +} + +wxFontWeight wxNativeFontInfo::GetWeight() const +{ + const wxString s = GetXFontComponent(wxXLFD_WEIGHT).MakeLower(); + if ( s.find(_T("bold")) != wxString::npos || s == _T("black") ) + return wxFONTWEIGHT_BOLD; + else if ( s == _T("light") ) + return wxFONTWEIGHT_LIGHT; + + return wxFONTWEIGHT_NORMAL; +} + +bool wxNativeFontInfo::GetUnderlined() const +{ + // X fonts are never underlined + return false; +} + +wxString wxNativeFontInfo::GetFaceName() const +{ + // wxWidgets facename probably more accurately corresponds to X family + return GetXFontComponent(wxXLFD_FAMILY); +} + +wxFontFamily wxNativeFontInfo::GetFamily() const +{ + // and wxWidgets family -- to X foundry, but we have to translate it to + // wxFontFamily somehow... + wxFAIL_MSG(_T("not implemented")); // GetXFontComponent(wxXLFD_FOUNDRY); + + return wxFONTFAMILY_DEFAULT; +} + +wxFontEncoding wxNativeFontInfo::GetEncoding() const +{ + // we already have the code for this but need to refactor it first + wxFAIL_MSG( _T("not implemented") ); + + return wxFONTENCODING_MAX; +} + +void wxNativeFontInfo::SetPointSize(int pointsize) +{ + SetXFontComponent(wxXLFD_POINTSIZE, wxString::Format(_T("%d"), pointsize)); +} + +void wxNativeFontInfo::SetStyle(wxFontStyle style) +{ + wxString s; + switch ( style ) + { + case wxFONTSTYLE_ITALIC: + s = _T('i'); + break; + + case wxFONTSTYLE_SLANT: + s = _T('o'); + break; + + case wxFONTSTYLE_NORMAL: + s = _T('r'); + + default: + wxFAIL_MSG( _T("unknown wxFontStyle in wxNativeFontInfo::SetStyle") ); + return; + } + + SetXFontComponent(wxXLFD_SLANT, s); +} + +void wxNativeFontInfo::SetWeight(wxFontWeight weight) +{ + wxString s; + switch ( weight ) + { + case wxFONTWEIGHT_BOLD: + s = _T("bold"); + break; + + case wxFONTWEIGHT_LIGHT: + s = _T("light"); + break; + + case wxFONTWEIGHT_NORMAL: + s = _T("medium"); + break; + + default: + wxFAIL_MSG( _T("unknown wxFontWeight in wxNativeFontInfo::SetWeight") ); + return; + } + + SetXFontComponent(wxXLFD_WEIGHT, s); +} + +void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined)) +{ + // can't do this under X +} + +bool wxNativeFontInfo::SetFaceName(const wxString& facename) +{ + SetXFontComponent(wxXLFD_FAMILY, facename); + return true; +} + +void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family)) +{ + // wxFontFamily -> X foundry, anyone? + wxFAIL_MSG( _T("not implemented") ); + + // SetXFontComponent(wxXLFD_FOUNDRY, ...); +} + +void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding) +{ + wxNativeEncodingInfo info; + if ( wxGetNativeFontEncoding(encoding, &info) ) + { + SetXFontComponent(wxXLFD_ENCODING, info.xencoding); + SetXFontComponent(wxXLFD_REGISTRY, info.xregistry); + } } // ---------------------------------------------------------------------------- @@ -459,7 +818,7 @@ void wxNativeFontInfo::SetXFontName(const wxString& xFontName_) bool wxGetNativeFontEncoding(wxFontEncoding encoding, wxNativeEncodingInfo *info) { - wxCHECK_MSG( info, FALSE, _T("bad pointer in wxGetNativeFontEncoding") ); + wxCHECK_MSG( info, false, _T("bad pointer in wxGetNativeFontEncoding") ); if ( encoding == wxFONTENCODING_DEFAULT ) { @@ -495,7 +854,13 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, info->xencoding = wxT("*"); break; + case wxFONTENCODING_GB2312: + info->xregistry = wxT("GB2312"); // or the otherway round? + info->xencoding = wxT("*"); + break; + case wxFONTENCODING_KOI8: + case wxFONTENCODING_KOI8_U: info->xregistry = wxT("koi8"); // we don't make distinction between koi8-r, koi8-u and koi8-ru (so far) @@ -517,6 +882,12 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, } break; + case wxFONTENCODING_EUC_JP: + case wxFONTENCODING_SHIFT_JIS: + info->xregistry = "jis*"; + info->xencoding = "*"; + break; + case wxFONTENCODING_SYSTEM: info->xregistry = info->xencoding = wxT("*"); @@ -524,12 +895,12 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, default: // don't know how to translate this encoding into X fontspec - return FALSE; + return false; } info->encoding = encoding; - return TRUE; + return true; } bool wxTestFontEncoding(const wxNativeEncodingInfo& info) @@ -593,7 +964,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, wxNativeFont font = 0; // if we already have the X font name, try to use it - if( xFontName && !xFontName->IsEmpty() ) + if( xFontName && !xFontName->empty() ) { // // Make sure point size is correct for scale factor. @@ -617,37 +988,60 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, *xFontName = newFontName; } - // try to load exactly the font requested first - if( !font ) - { - font = wxLoadQueryFont( pointSize, family, style, weight, - underlined, facename, - info.xregistry, info.xencoding, - xFontName ); - } - 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; + int i, round; // counters - // Search for smaller size (approx.) - for ( i = pointSize - 10; !font && i >= 10 && i >= min_size; i -= 10 ) + // first round: search for equal, then for smaller and for larger size with the given weight and style + int testweight = weight; + int teststyle = style; + + for ( round = 0; round < 3; round++ ) { - font = wxLoadQueryFont(i, family, style, weight, underlined, + // second round: use normal weight + if ( round == 1 ) + { + if ( testweight != wxNORMAL ) + { + testweight = wxNORMAL; + } + else + { + ++round; // fall through to third round + } + } + + // third round: ... and use normal style + if ( round == 2 ) + { + if ( teststyle != wxNORMAL ) + { + teststyle = wxNORMAL; + } + else + { + break; + } + } + // Search for equal or smaller size (approx.) + for ( i = pointSize; !font && i >= 10 && i >= min_size; i -= 10 ) + { + font = wxLoadQueryFont(i, family, teststyle, testweight, underlined, facename, info.xregistry, info.xencoding, xFontName); - } + } - // Search for larger size (approx.) - for ( i = pointSize + 10; !font && i <= max_size; i += 10 ) - { - font = wxLoadQueryFont(i, family, style, weight, underlined, + // Search for larger size (approx.) + for ( i = pointSize + 10; !font && i <= max_size; i += 10 ) + { + font = wxLoadQueryFont(i, family, teststyle, testweight, underlined, facename, info.xregistry, info.xencoding, xFontName); + } } // Try default family @@ -683,7 +1077,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, if ( !font ) { font = wxLoadQueryFont(-1, wxDEFAULT, wxNORMAL, wxNORMAL, - FALSE, wxEmptyString, + false, wxEmptyString, info.xregistry, info.xencoding, xFontName); @@ -696,7 +1090,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, font = wxLoadQueryFont(-1, wxDEFAULT, wxNORMAL, wxNORMAL, - FALSE, wxEmptyString, + false, wxEmptyString, _T("*"), _T("*"), xFontName); } @@ -712,20 +1106,20 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, // private functions // ---------------------------------------------------------------------------- -// returns TRUE if there are any fonts matching this font spec +// returns true if there are any fonts matching this font spec static bool wxTestFontSpec(const wxString& fontspec) { // some X servers will fail to load this font because there are too many // matches so we must test explicitly for this if ( fontspec == _T("-*-*-*-*-*-*-*-*-*-*-*-*-*-*") ) { - return TRUE; + return true; } wxNativeFont test = (wxNativeFont) g_fontHash->Get( fontspec ); if (test) { - return TRUE; + return true; } test = wxLoadFont(fontspec); @@ -735,11 +1129,11 @@ static bool wxTestFontSpec(const wxString& fontspec) { wxFreeFont(test); - return TRUE; + return true; } else { - return FALSE; + return false; } } @@ -806,7 +1200,7 @@ static wxNativeFont wxLoadQueryFont(int pointSize, // An alternative: assume that the screen is 72 dpi. //int pixelHeight = (int) (((float)pointSize / 720.0) * 72.0) ; //int pixelHeight = (int) ((float)pointSize / 10.0) ; - + GR_LOGFONT logFont; logFont.lfHeight = pixelHeight; logFont.lfWidth = 0; @@ -833,10 +1227,10 @@ static wxNativeFont wxLoadQueryFont(int pointSize, fontInfo->fid = GrCreateFont((GR_CHAR*) facename.c_str(), pixelHeight, & logFont); GrGetFontInfo(fontInfo->fid, & fontInfo->info); return (wxNativeFont) fontInfo; - + #else wxString fontSpec; - if (!facename.IsEmpty()) + if (!facename.empty()) { fontSpec.Printf(wxT("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"), facename.c_str()); @@ -1034,7 +1428,7 @@ bool wxFontModule::OnInit() { g_fontHash = new wxHashTable( wxKEY_STRING ); - return TRUE; + return true; } void wxFontModule::OnExit() @@ -1044,5 +1438,4 @@ void wxFontModule::OnExit() g_fontHash = (wxHashTable *)NULL; } -#endif - // not GTK 2.0 +#endif // GTK 2.0/1.x