X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/142b3bc26a6e93f5857bc053c7748b2c845c4a8e..de63b922cadc81306a1905c81cfd0be7ae32adbb:/src/unix/fontenum.cpp diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp index fdeb46a105..0496afeeef 100644 --- a/src/unix/fontenum.cpp +++ b/src/unix/fontenum.cpp @@ -17,19 +17,97 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "fontenum.h" -#endif +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#include "wx/defs.h" #include "wx/dynarray.h" #include "wx/string.h" #include "wx/regex.h" #include "wx/utils.h" - +#include "wx/app.h" #include "wx/fontmap.h" #include "wx/fontenum.h" #include "wx/fontutil.h" +#include "wx/encinfo.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); +} + +// I admit I don't yet understand encodings with Pango +bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, + bool fixedWidthOnly) +{ +#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 +#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; iOnFacename(fam) ) { // stop enumerating - return FALSE; + return false; } families.Add(fam); @@ -135,7 +213,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, //else: already seen } - return TRUE; + return true; } #endif // wxUSE_NANOX @@ -148,14 +226,14 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, bool fixedWidthOnly) { #if wxUSE_NANOX - return FALSE; + return false; #else int nFonts; char **fonts; if ( fixedWidthOnly ) { - bool cont = TRUE; + bool cont = true; fonts = CreateFontList(wxT('m'), encoding, &nFonts); if ( fonts ) { @@ -166,13 +244,13 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, if ( !cont ) { - return TRUE; + return true; } fonts = CreateFontList(wxT('c'), encoding, &nFonts); if ( !fonts ) { - return TRUE; + return true; } } else @@ -186,14 +264,14 @@ bool wxFontEnumerator::EnumerateFacenames(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 } @@ -201,11 +279,11 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, bool wxFontEnumerator::EnumerateEncodings(const wxString& family) { #if wxUSE_NANOX - return FALSE; + 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; @@ -215,7 +293,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) if ( !fonts ) { // unknown family? - return FALSE; + return false; } // extract the list of (unique) encodings @@ -235,7 +313,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; @@ -266,7 +344,9 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) XFreeFontNames(fonts); - return TRUE; + return true; #endif // wxUSE_NANOX } + +#endif // !wxUSE_PANGO