X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7dd62924826c2015d9c2563ce0e9443e73dbddc1..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/unix/fontenum.cpp diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp index fceeff6ca2..bc76c80086 100644 --- a/src/unix/fontenum.cpp +++ b/src/unix/fontenum.cpp @@ -24,21 +24,32 @@ #include "wx/defs.h" #include "wx/dynarray.h" #include "wx/string.h" +#include "wx/regex.h" #include "wx/utils.h" +#include "wx/fontmap.h" #include "wx/fontenum.h" +#include "wx/fontutil.h" +#ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++ + // The resulting warnings are switched off here +#pragma message disable nosimpint +#endif #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- -// create the list of all fonts with the given spacing -static char **CreateFontList(wxChar spacing, int *nFonts); +// create the list of all fonts with the given spacing and encoding +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); @@ -56,10 +67,27 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, // helpers // ---------------------------------------------------------------------------- -static char **CreateFontList(wxChar spacing, int *nFonts) +#if !wxUSE_NANOX +static char **CreateFontList(wxChar spacing, + wxFontEncoding encoding, + int *nFonts) { + wxNativeEncodingInfo info; + wxGetNativeFontEncoding(encoding, &info); + +#if wxUSE_FONTMAP + if ( !wxTestFontEncoding(info) ) + { + // ask font mapper for a replacement + (void)wxTheFontMapper->GetAltForEncoding(encoding, &info); + } +#endif // wxUSE_FONTMAP + wxString pattern; - pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-*-*"), spacing); + pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-%s-%s"), + spacing, + info.xregistry.c_str(), + info.xencoding.c_str()); // get the list of all fonts return XListFonts((Display *)wxGetDisplay(), pattern.mb_str(), 32767, nFonts); @@ -69,17 +97,25 @@ 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; } - + char *dash = strchr(font + 1, '-'); char *family = dash + 1; dash = strchr(family, '-'); @@ -88,7 +124,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, if ( families.Index(fam) == wxNOT_FOUND ) { - if ( !This->OnFontFamily(fam) ) + if ( !This->OnFacename(fam) ) { // stop enumerating return FALSE; @@ -101,20 +137,26 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, return TRUE; } +#endif + // wxUSE_NANOX // ---------------------------------------------------------------------------- // wxFontEnumerator // ---------------------------------------------------------------------------- -bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly) +bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, + bool fixedWidthOnly) { +#if wxUSE_NANOX + return FALSE; +#else int nFonts; char **fonts; if ( fixedWidthOnly ) { bool cont = TRUE; - fonts = CreateFontList(wxT('m'), &nFonts); + fonts = CreateFontList(wxT('m'), encoding, &nFonts); if ( fonts ) { cont = ProcessFamiliesFromFontList(this, fonts, nFonts); @@ -127,7 +169,7 @@ bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly) return TRUE; } - fonts = CreateFontList(wxT('c'), &nFonts); + fonts = CreateFontList(wxT('c'), encoding, &nFonts); if ( !fonts ) { return TRUE; @@ -135,11 +177,14 @@ bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly) } else { - fonts = CreateFontList(wxT('*'), &nFonts); + fonts = CreateFontList(wxT('*'), encoding, &nFonts); if ( !fonts ) { - wxFAIL_MSG(wxT("No fonts at all on this system?")); + // it's ok if there are no fonts in given encoding - but it's not + // ok if there are no fonts at all + wxASSERT_MSG(encoding != wxFONTENCODING_SYSTEM, + wxT("No fonts at all on this system?")); return FALSE; } @@ -148,12 +193,16 @@ bool wxFontEnumerator::EnumerateFamilies(bool fixedWidthOnly) (void)ProcessFamiliesFromFontList(this, fonts, nFonts); XFreeFontNames(fonts); - 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()); @@ -218,4 +267,6 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) XFreeFontNames(fonts); return TRUE; +#endif + // wxUSE_NANOX }