X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1d7cbac4369e180a8d7c19f386b301196d09369..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/unix/fontenum.cpp diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp index c68984623b..25ab081632 100644 --- a/src/unix/fontenum.cpp +++ b/src/unix/fontenum.cpp @@ -17,19 +17,130 @@ // 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/regex.h" -#include "wx/string.h" -#include "wx/utils.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); +} + +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; iGetAltForEncoding(encoding, &info); + (void)wxFontMapper::Get()->GetAltForEncoding(encoding, &info); } #endif // wxUSE_FONTMAP @@ -106,7 +218,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, { char *font = fonts[n]; #if wxUSE_REGEX - if ( re.Matches(font) ) + if ( !re.Matches(font) ) #else // !wxUSE_REGEX if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) ) #endif // wxUSE_REGEX/!wxUSE_REGEX @@ -115,6 +227,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, continue; } + // coverity[returned_null] char *dash = strchr(font + 1, '-'); char *family = dash + 1; dash = strchr(family, '-'); @@ -126,7 +239,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, if ( !This->OnFacename(fam) ) { // stop enumerating - return FALSE; + return false; } families.Add(fam); @@ -134,8 +247,10 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, //else: already seen } - return TRUE; + return true; } +#endif + // wxUSE_NANOX // ---------------------------------------------------------------------------- // wxFontEnumerator @@ -144,12 +259,15 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, 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 ) { @@ -160,13 +278,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 @@ -180,22 +298,26 @@ 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 } 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; @@ -205,7 +327,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) if ( !fonts ) { // unknown family? - return FALSE; + return false; } // extract the list of (unique) encodings @@ -225,7 +347,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; @@ -256,5 +378,9 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) XFreeFontNames(fonts); - return TRUE; + return true; +#endif + // wxUSE_NANOX } + +#endif // !wxUSE_PANGO