#endif // PCH
#ifdef __X__
+ #ifdef __VMS__
+ #pragma message disable nosimpint
+ #endif
+
#include <X11/Xlib.h>
+ #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 <time.h>
+
+ #include <gdk/gdk.h>
#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
bool underlined,
const wxString& facename,
const wxString& xregistry,
- const wxString& xencoding);
+ const wxString& xencoding,
+ wxString* xFontName);
// ============================================================================
// implementation
// ----------------------------------------------------------------------------
// 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 )
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;
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:
}
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;
return FALSE;
}
+ info->encoding = encoding;
+
return TRUE;
}
int weight,
bool underlined,
const wxString &facename,
- wxFontEncoding encoding)
+ wxFontEncoding encoding,
+ wxString* xFontName)
{
if ( encoding == wxFONTENCODING_DEFAULT )
{
if ( !wxGetNativeFontEncoding(encoding, &info) ||
!wxTestFontEncoding(info) )
{
+#if wxUSE_FONTMAP
if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+#endif // wxUSE_FONTMAP
{
// unspported encoding - replace it with the default
//
}
}
}
-
+
// 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 )
{
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
{
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);
+ }
+ }
+ }
}
}
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);
bool WXUNUSED(underlined),
const wxString& facename,
const wxString& xregistry,
- const wxString& xencoding)
+ const wxString& xencoding,
+ wxString* xFontName)
{
wxString xfamily;
switch (family)
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;
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;
+}
projects / wxWidgets.git / blobdiff