X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b0eebc537c0f96eab28295b4ae2c4e978a435a5..11ec1f16f83fd89a86c2b8912c991b226c15886e:/src/unix/fontutil.cpp diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index db1939e352..9411fc8df6 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -32,17 +32,25 @@ #endif // PCH #ifdef __X__ -#ifdef __VMS__ -#pragma message disable nosimpint -#endif -#include -#ifdef __VMS__ -#pragma message enable nosimpint -#endif + #ifdef __VMS__ + #pragma message disable nosimpint + #endif + + #include + + #ifdef __VMS__ + #pragma message enable nosimpint + #endif #include "wx/utils.h" // for wxGetDisplay() #elif defined(__WXGTK__) - #include "gdk/gdk.h" + // we have to declare struct tm to avoid problems with first forward + // declaring it in C code (glib.h included from gdk.h does it) and then + // defining it when time.h is included from the headers below - this is + // known not to work at least with Sun CC 6.01 + #include + + #include #endif #include "wx/fontutil.h" @@ -95,7 +103,8 @@ static wxNativeFont wxLoadQueryFont(int pointSize, bool underlined, const wxString& facename, const wxString& xregistry, - const wxString& xencoding); + const wxString& xencoding, + wxString* xFontName); // ============================================================================ // implementation @@ -106,10 +115,17 @@ static wxNativeFont wxLoadQueryFont(int pointSize, // ---------------------------------------------------------------------------- // convert to/from the string representation: format is -// registry-encoding[-facename] +// encodingid;registry;encoding[;facename] bool wxNativeEncodingInfo::FromString(const wxString& s) { - wxStringTokenizer tokenizer(s, _T("-")); + // use ";", not "-" because it may be part of encoding name + wxStringTokenizer tokenizer(s, _T(";")); + + wxString encid = tokenizer.GetNextToken(); + long enc; + if ( !encid.ToLong(&enc) ) + return FALSE; + encoding = (wxFontEncoding)enc; xregistry = tokenizer.GetNextToken(); if ( !xregistry ) @@ -128,10 +144,10 @@ bool wxNativeEncodingInfo::FromString(const wxString& s) wxString wxNativeEncodingInfo::ToString() const { wxString s; - s << xregistry << _T('-') << xencoding; + s << (long)encoding << _T(';') << xregistry << _T(';') << xencoding; if ( !!facename ) { - s << _T('-') << facename; + s << _T(';') << facename; } return s; @@ -164,6 +180,7 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, case wxFONTENCODING_ISO8859_9: case wxFONTENCODING_ISO8859_10: case wxFONTENCODING_ISO8859_11: + case wxFONTENCODING_ISO8859_12: case wxFONTENCODING_ISO8859_13: case wxFONTENCODING_ISO8859_14: case wxFONTENCODING_ISO8859_15: @@ -174,6 +191,13 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, } break; + case wxFONTENCODING_UTF8: + // FIXME: this is probably false, but this is how they are called on + // my system and I don't know what the standard XFLD is (VZ) + info->xregistry = wxT("iso646.1991"); + info->xencoding = wxT("*"); + break; + case wxFONTENCODING_KOI8: info->xregistry = wxT("koi8"); @@ -232,7 +256,8 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, int weight, bool underlined, const wxString &facename, - wxFontEncoding encoding) + wxFontEncoding encoding, + wxString* xFontName) { if ( encoding == wxFONTENCODING_DEFAULT ) { @@ -253,7 +278,9 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, if ( !wxGetNativeFontEncoding(encoding, &info) || !wxTestFontEncoding(info) ) { +#if wxUSE_FONTMAP if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) ) +#endif // wxUSE_FONTMAP { // unspported encoding - replace it with the default // @@ -264,11 +291,43 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, } } } - + // OK, we have the correct xregistry/xencoding in info structure - wxNativeFont font = wxLoadQueryFont( pointSize, family, style, weight, - underlined, facename, - info.xregistry, info.xencoding ); + wxNativeFont font = 0; + + // if we already have the X font name, try to use it + if( xFontName && !xFontName->IsEmpty() ) + { + // + // Make sure point size is correct for scale factor. + // + wxStringTokenizer tokenizer(*xFontName, _T("-"), wxTOKEN_RET_DELIMS); + wxString newFontName; + + for(int i = 0; i < 8; i++) + newFontName += tokenizer.NextToken(); + + (void) tokenizer.NextToken(); + + newFontName += wxString::Format("%d-", pointSize); + + while(tokenizer.HasMoreTokens()) + newFontName += tokenizer.GetNextToken(); + + font = wxLoadFont(newFontName); + + if(font) + *xFontName = newFontName; + } + + // try to load exactly the font requested first + if( !font ) + { + font = wxLoadQueryFont( pointSize, family, style, weight, + underlined, facename, + info.xregistry, info.xencoding, + xFontName ); + } if ( !font ) { @@ -282,14 +341,16 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, for ( i = pointSize - 10; !font && i >= 10 && i >= min_size; i -= 10 ) { font = wxLoadQueryFont(i, family, style, weight, underlined, - facename, info.xregistry, info.xencoding); + facename, info.xregistry, info.xencoding, + xFontName); } // Search for larger size (approx.) for ( i = pointSize + 10; !font && i <= max_size; i += 10 ) { font = wxLoadQueryFont(i, family, style, weight, underlined, - facename, info.xregistry, info.xencoding); + facename, info.xregistry, info.xencoding, + xFontName); } // Try default family @@ -297,23 +358,53 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, { font = wxLoadQueryFont(pointSize, wxDEFAULT, style, weight, underlined, facename, - info.xregistry, info.xencoding ); + info.xregistry, info.xencoding, + xFontName ); } - // Bogus font I + // ignore size, family, style and weight but try to find font with the + // given facename and encoding if ( !font ) { font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL, underlined, facename, - info.xregistry, info.xencoding); - } + info.xregistry, info.xencoding, + xFontName); - // Bogus font II - if ( !font ) - { - font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL, - underlined, wxEmptyString, - info.xregistry, info.xencoding); + // ignore family as well + if ( !font ) + { + font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL, + underlined, wxEmptyString, + info.xregistry, info.xencoding, + xFontName); + + // if it still failed, try to get the font of any size but + // with the requested encoding: this can happen if the + // encoding is only available in one size which happens to be + // different from 120 + if ( !font ) + { + font = wxLoadQueryFont(-1, wxDEFAULT, wxNORMAL, wxNORMAL, + FALSE, wxEmptyString, + info.xregistry, info.xencoding, + xFontName); + + // this should never happen as we had tested for it in the + // very beginning, but if it does, do return something non + // NULL or we'd crash in wxFont code + if ( !font ) + { + wxFAIL_MSG( _T("this encoding should be available!") ); + + font = wxLoadQueryFont(-1, + wxDEFAULT, wxNORMAL, wxNORMAL, + FALSE, wxEmptyString, + _T("*"), _T("*"), + xFontName); + } + } + } } } @@ -337,13 +428,12 @@ static bool wxTestFontSpec(const wxString& fontspec) wxNativeFont test = (wxNativeFont) g_fontHash->Get( fontspec ); if (test) { -// printf( "speed up\n" ); return TRUE; } test = wxLoadFont(fontspec); g_fontHash->Put( fontspec, (wxObject*) test ); - + if ( test ) { wxFreeFont(test); @@ -363,7 +453,8 @@ static wxNativeFont wxLoadQueryFont(int pointSize, bool WXUNUSED(underlined), const wxString& facename, const wxString& xregistry, - const wxString& xencoding) + const wxString& xencoding, + wxString* xFontName) { wxString xfamily; switch (family) @@ -532,10 +623,24 @@ static wxNativeFont wxLoadQueryFont(int pointSize, default: xweight = wxT("*"); break; } + // if pointSize is -1, don't specify any + wxString sizeSpec; + if ( fontSpec == -1 ) + { + sizeSpec = _T('*'); + } + else + { + sizeSpec.Printf(_T("%d"), pointSize); + } + // construct the X font spec from our data - fontSpec.Printf(wxT("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-%s-%s"), + fontSpec.Printf(wxT("-*-%s-%s-%s-normal-*-*-%s-*-*-*-*-%s-%s"), xfamily.c_str(), xweight.c_str(), xstyle.c_str(), - pointSize, xregistry.c_str(), xencoding.c_str()); + sizeSpec.c_str(), xregistry.c_str(), xencoding.c_str()); + + if( xFontName ) + *xFontName = fontSpec; return wxLoadFont(fontSpec); }