diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp index f1181a4aa7..9f5618be99 100644 --- a/src/unix/fontenum.cpp +++ b/src/unix/fontenum.cpp @@ -47,44 +47,105 @@ extern GtkWidget *wxGetRootWindow(); static int cmp_families (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); + 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); + return g_utf8_collate (a_name, b_name); +} + +static PangoLanguage *font_test_language; + +static gboolean font_is_latin( PangoContext *context, PangoFontDescription *desc ) +{ + PangoFont *font = pango_context_load_font( context, desc ); + if (!font) return FALSE; + + font_test_language = pango_language_from_string( "eng" ); + + PangoCoverage *coverage =pango_font_get_coverage( font, font_test_language ); + if (!coverage) return FALSE; + + if ((pango_coverage_get(coverage, 'i') == PANGO_COVERAGE_EXACT) && + (pango_coverage_get(coverage, 'W') == PANGO_COVERAGE_EXACT)) + { + return TRUE; + } + + return FALSE; } -// I admit I don't yet understand encodings with Pango bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, bool fixedWidthOnly) { - if ( fixedWidthOnly ) - { - OnFacename( wxT("monospace") ); - } - else - { - PangoFontFamily **families = NULL; - gint n_families = 0; - pango_context_list_families ( + PangoContext *context = #ifdef __WXGTK20__ - gtk_widget_get_pango_context( wxGetRootWindow() ), + gtk_widget_get_pango_context( wxGetRootWindow() ); #else - wxTheApp->GetPangoContext(), + wxTheApp->GetPangoContext(); #endif - &families, &n_families ); - qsort (families, n_families, sizeof (PangoFontFamily *), cmp_families); + PangoFontFamily **families = NULL; + gint n_families = 0; + pango_context_list_families( context, &families, &n_families ); + qsort (families, n_families, sizeof (PangoFontFamily *), cmp_families); - for (int i=0; i