X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/338dd992160bf20205743c092b353d96ef7604fb..68d02db3ed88ffbb043650af1060260bc5aa93bc:/src/unix/fontutil.cpp?ds=inline diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index d1af8fa759..841e90bf64 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -32,22 +32,38 @@ #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" #include "wx/fontmap.h" #include "wx/tokenzr.h" +#include "wx/hash.h" +#include "wx/module.h" + +// ---------------------------------------------------------------------------- +// private data +// ---------------------------------------------------------------------------- + +static wxHashTable *g_fontHash = (wxHashTable*) NULL; // ---------------------------------------------------------------------------- // private functions @@ -87,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 @@ -98,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 ) @@ -120,15 +144,100 @@ 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; } +// ---------------------------------------------------------------------------- +// wxNativeFontInfo +// ---------------------------------------------------------------------------- + +void wxNativeFontInfo::Init() +{ + xFontName.clear(); +} + +bool wxNativeFontInfo::FromString(const wxString& s) +{ + wxStringTokenizer tokenizer(s, _T(";")); + + // check the version + wxString token = tokenizer.GetNextToken(); + if ( token != _T('0') ) + return FALSE; + + xFontName = tokenizer.GetNextToken(); + + // this should be the end + if ( tokenizer.HasMoreTokens() ) + return FALSE; + + return FromXFontName(xFontName); +} + +wxString wxNativeFontInfo::ToString() const +{ + // 0 is the version + return wxString::Format(_T("%d;%s"), 0, GetXFontName().c_str()); +} + +bool wxNativeFontInfo::FromUserString(const wxString& s) +{ + return FromXFontName(s); +} + +wxString wxNativeFontInfo::ToUserString() const +{ + return GetXFontName(); +} + +bool wxNativeFontInfo::FromXFontName(const wxString& xFontName) +{ + // TODO: we should be able to handle the font aliases here, but how? + wxStringTokenizer tokenizer(xFontName, _T("-"), wxTOKEN_STRTOK); + + for ( size_t n = 0; n < WXSIZEOF(fontElements); n++ ) + { + if ( !tokenizer.HasMoreTokens() ) + { + // not enough elements in the XLFD - or maybe an alias + return FALSE; + } + + fontElements[n] = tokenizer.GetNextToken(); + } + + // this should be all + return !tokenizer.HasMoreTokens(); +} + +wxString wxNativeFontInfo::GetXFontName() const +{ + if ( xFontName.empty() ) + { + for ( size_t n = 0; n < WXSIZEOF(fontElements); n++ ) + { + // replace the non specified elements with '*' except for the + // additional style which is usually just omitted + wxString elt = fontElements[n]; + if ( elt.empty() && n != 5 ) + { + elt = _T('*'); + } + + // const_cast + ((wxNativeFontInfo *)this)->xFontName << _T('-') << elt; + } + } + + return xFontName; +} + // ---------------------------------------------------------------------------- // common functions // ---------------------------------------------------------------------------- @@ -156,6 +265,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: @@ -166,10 +276,15 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, } break; + case wxFONTENCODING_UTF8: + info->xregistry = wxT("iso10646"); + info->xencoding = wxT("*"); + break; + case wxFONTENCODING_KOI8: info->xregistry = wxT("koi8"); - // we don't make distinction between koi8-r and koi8-u (so far) + // we don't make distinction between koi8-r, koi8-u and koi8-ru (so far) info->xencoding = wxT("*"); break; @@ -198,6 +313,8 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, return FALSE; } + info->encoding = encoding; + return TRUE; } @@ -222,7 +339,8 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, int weight, bool underlined, const wxString &facename, - wxFontEncoding encoding) + wxFontEncoding encoding, + wxString* xFontName) { if ( encoding == wxFONTENCODING_DEFAULT ) { @@ -243,7 +361,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 // @@ -254,11 +374,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 ) { @@ -272,14 +424,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 @@ -287,23 +441,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); + } + } + } } } @@ -324,7 +508,15 @@ static bool wxTestFontSpec(const wxString& fontspec) return TRUE; } - wxNativeFont test = wxLoadFont(fontspec); + wxNativeFont test = (wxNativeFont) g_fontHash->Get( fontspec ); + if (test) + { + return TRUE; + } + + test = wxLoadFont(fontspec); + g_fontHash->Put( fontspec, (wxObject*) test ); + if ( test ) { wxFreeFont(test); @@ -344,7 +536,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) @@ -374,10 +567,47 @@ static wxNativeFont wxLoadQueryFont(int pointSize, wxString xstyle; switch (style) { - case wxITALIC: xstyle = wxT("i"); break; - case wxSLANT: xstyle = wxT("o"); break; - case wxNORMAL: xstyle = wxT("r"); break; - default: xstyle = wxT("*"); break; + case wxSLANT: + fontSpec.Printf(wxT("-*-%s-*-o-*-*-*-*-*-*-*-*-*-*"), + xfamily.c_str()); + if ( wxTestFontSpec(fontSpec) ) + { + xstyle = wxT("o"); + break; + } + // fall through - try wxITALIC now + + case wxITALIC: + fontSpec.Printf(wxT("-*-%s-*-i-*-*-*-*-*-*-*-*-*-*"), + xfamily.c_str()); + if ( wxTestFontSpec(fontSpec) ) + { + xstyle = wxT("i"); + } + else if ( style == wxITALIC ) // and not wxSLANT + { + // try wxSLANT + fontSpec.Printf(wxT("-*-%s-*-o-*-*-*-*-*-*-*-*-*-*"), + xfamily.c_str()); + if ( wxTestFontSpec(fontSpec) ) + { + xstyle = wxT("o"); + } + else + { + // no italic, no slant - leave default + xstyle = wxT("*"); + } + } + break; + + default: + wxFAIL_MSG(_T("unknown font style")); + // fall back to normal + + case wxNORMAL: + xstyle = wxT("r"); + break; } wxString xweight; @@ -476,11 +706,54 @@ 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); } +// ---------------------------------------------------------------------------- +// wxFontModule +// ---------------------------------------------------------------------------- + +class wxFontModule : public wxModule +{ +public: + bool OnInit(); + void OnExit(); + +private: + DECLARE_DYNAMIC_CLASS(wxFontModule) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxFontModule, wxModule) + +bool wxFontModule::OnInit() +{ + g_fontHash = new wxHashTable( wxKEY_STRING ); + + return TRUE; +} + +void wxFontModule::OnExit() +{ + delete g_fontHash; + + g_fontHash = (wxHashTable *)NULL; +}