X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b02da6b18713d069cc9f4077f9b43df7a11bc7fb..65aeaf19f6781193697d28f868901a80ee623396:/src/unix/fontenum.cpp?ds=sidebyside diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp index bb2dbed789..e09f06170e 100644 --- a/src/unix/fontenum.cpp +++ b/src/unix/fontenum.cpp @@ -17,18 +17,115 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "fontenum.h" +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/fontenum.h" + +#ifndef WX_PRECOMP + #include "wx/dynarray.h" + #include "wx/string.h" + #include "wx/app.h" + #include "wx/utils.h" #endif -#include "wx/defs.h" -#include "wx/dynarray.h" -#include "wx/string.h" -#include "wx/utils.h" +#include "wx/regex.h" +#include "wx/fontmap.h" +#include "wx/fontutil.h" +#include "wx/encinfo.h" -#include "wx/fontenum.h" +// ---------------------------------------------------------------------------- +// Pango +// ---------------------------------------------------------------------------- + +#if wxUSE_PANGO + +#include "pango/pango.h" + +#ifdef __WXGTK20__ +#include "gtk/gtk.h" +extern GtkWidget *wxGetRootWindow(); +#endif // __WXGTK20__ + +extern "C" int wxCMPFUNC_CONV +wxCompareFamilies (const void *a, const void *b) +{ + const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a); + const char *b_name = pango_font_family_get_name (*(PangoFontFamily **)b); + + return g_utf8_collate (a_name, b_name); +} + +bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, + bool fixedWidthOnly) +{ + if ( encoding != wxFONTENCODING_SYSTEM && encoding != wxFONTENCODING_UTF8 ) + { + // Pango supports only UTF-8 encoding (and system means any, so we + // accept it too) + return false; + } + +#if defined(__WXGTK20__) || !defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE) + if ( fixedWidthOnly +#if defined(__WXGTK24__) + && (gtk_check_version(2,4,0) != NULL) +#endif + ) + { + OnFacename( wxT("monospace") ); + } + else // !fixedWidthOnly +#endif // __WXGTK20__ || !HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE + { + PangoFontFamily **families = NULL; + gint n_families = 0; + pango_context_list_families ( +#ifdef __WXGTK20__ + gtk_widget_get_pango_context( wxGetRootWindow() ), +#else + wxTheApp->GetPangoContext(), +#endif + &families, &n_families ); + qsort (families, n_families, sizeof (PangoFontFamily *), wxCompareFamilies); + + for (int i=0; i +#ifdef __VMS__ +#pragma message enable nosimpint +#endif // ---------------------------------------------------------------------------- // private functions @@ -39,7 +136,7 @@ static char **CreateFontList(wxChar spacing, wxFontEncoding encoding, int *nFonts); // extract all font families from the given font list and call our -// OnFontFamily() for each of them +// OnFacename() for each of them static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, char **fonts, int nFonts); @@ -57,16 +154,27 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, // helpers // ---------------------------------------------------------------------------- +#if !wxUSE_NANOX static char **CreateFontList(wxChar spacing, wxFontEncoding encoding, int *nFonts) { - wxString xencoding, xregistry; - wxGetXFontEncoding(encoding, &xregistry, &xencoding); + wxNativeEncodingInfo info; + wxGetNativeFontEncoding(encoding, &info); + +#if wxUSE_FONTMAP + if ( !wxTestFontEncoding(info) ) + { + // ask font mapper for a replacement + (void)wxFontMapper::Get()->GetAltForEncoding(encoding, &info); + } +#endif // wxUSE_FONTMAP wxString pattern; pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-%s-%s"), - spacing, xregistry.c_str(), xencoding.c_str()); + spacing, + info.xregistry.c_str(), + info.xencoding.c_str()); // get the list of all fonts return XListFonts((Display *)wxGetDisplay(), pattern.mb_str(), 32767, nFonts); @@ -76,17 +184,26 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, char **fonts, int nFonts) { +#if wxUSE_REGEX + wxRegEx re(wxT("^(-[^-]*){14}$"), wxRE_NOSUB); +#endif // wxUSE_REGEX + // extract the list of (unique) font families wxSortedArrayString families; for ( int n = 0; n < nFonts; n++ ) { char *font = fonts[n]; +#if wxUSE_REGEX + if ( !re.Matches(font) ) +#else // !wxUSE_REGEX if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) ) +#endif // wxUSE_REGEX/!wxUSE_REGEX { // it's not a full font name (probably an alias) continue; } - + + // coverity[returned_null] char *dash = strchr(font + 1, '-'); char *family = dash + 1; dash = strchr(family, '-'); @@ -95,10 +212,10 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, if ( families.Index(fam) == wxNOT_FOUND ) { - if ( !This->OnFontFamily(fam) ) + if ( !This->OnFacename(fam) ) { // stop enumerating - return FALSE; + return false; } families.Add(fam); @@ -106,22 +223,27 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, //else: already seen } - return TRUE; + return true; } +#endif + // wxUSE_NANOX // ---------------------------------------------------------------------------- // wxFontEnumerator // ---------------------------------------------------------------------------- -bool wxFontEnumerator::EnumerateFamilies(wxFontEncoding encoding, - bool fixedWidthOnly) +bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, + bool fixedWidthOnly) { +#if wxUSE_NANOX + return false; +#else int nFonts; char **fonts; if ( fixedWidthOnly ) { - bool cont = TRUE; + bool cont = true; fonts = CreateFontList(wxT('m'), encoding, &nFonts); if ( fonts ) { @@ -132,13 +254,13 @@ bool wxFontEnumerator::EnumerateFamilies(wxFontEncoding encoding, if ( !cont ) { - return TRUE; + return true; } fonts = CreateFontList(wxT('c'), encoding, &nFonts); if ( !fonts ) { - return TRUE; + return true; } } else @@ -152,22 +274,26 @@ bool wxFontEnumerator::EnumerateFamilies(wxFontEncoding encoding, wxASSERT_MSG(encoding != wxFONTENCODING_SYSTEM, wxT("No fonts at all on this system?")); - return FALSE; + return false; } } (void)ProcessFamiliesFromFontList(this, fonts, nFonts); XFreeFontNames(fonts); - - return TRUE; + return true; +#endif + // wxUSE_NANOX } bool wxFontEnumerator::EnumerateEncodings(const wxString& family) { +#if wxUSE_NANOX + return false; +#else wxString pattern; pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"), - family.IsEmpty() ? wxT("*") : family.c_str()); + family.empty() ? wxT("*") : family.c_str()); // get the list of all fonts int nFonts; @@ -177,7 +303,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) if ( !fonts ) { // unknown family? - return FALSE; + return false; } // extract the list of (unique) encodings @@ -197,7 +323,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) dash = strchr(familyFont, '-'); *dash = '\0'; // !NULL because Matches() above succeeded - if ( !family.IsEmpty() && (family != familyFont) ) + if ( !family.empty() && (family != familyFont) ) { // family doesn't match continue; @@ -228,5 +354,9 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) XFreeFontNames(fonts); - return TRUE; + return true; +#endif + // wxUSE_NANOX } + +#endif // !wxUSE_PANGO