X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcd408aa76716cd34e9f26440e326a65a002a2d..d223107206e4dfa6768e0bc2455325dd49e4d2bb:/src/unix/fontutil.cpp diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index 0e8aeaddd2..e422117996 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -6,7 +6,7 @@ // Created: 05.11.99 // RCS-ID: $Id$ // Copyright: (c) Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "fontutil.h" #endif @@ -29,6 +29,7 @@ #endif #ifndef WX_PRECOMP + #include "wx/encinfo.h" #endif // PCH #include "wx/fontutil.h" @@ -37,9 +38,15 @@ #include "wx/hash.h" #include "wx/module.h" -#ifdef __WXGTK20__ +#if wxUSE_PANGO + +#include "pango/pango.h" +#ifdef __WXGTK20__ #include "wx/gtk/private.h" +#else +#include "wx/x11/private.h" +#endif // ---------------------------------------------------------------------------- // wxNativeFontInfo @@ -71,7 +78,7 @@ wxFontStyle wxNativeFontInfo::GetStyle() const m_style = wxFONTSTYLE_SLANT; break; } - + return m_style; } @@ -100,7 +107,7 @@ wxFontWeight wxNativeFontInfo::GetWeight() const m_weight = wxFONTWEIGHT_BOLD; break; } - + return m_weight; } @@ -112,7 +119,7 @@ bool wxNativeFontInfo::GetUnderlined() const wxString wxNativeFontInfo::GetFaceName() const { wxString tmp = wxGTK_CONV_BACK( pango_font_description_get_family( description ) ); - + return tmp; } @@ -126,6 +133,44 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const return wxFONTENCODING_SYSTEM; } + +void wxNativeFontInfo::SetPointSize(int WXUNUSED(pointsize)) +{ + wxFAIL_MSG( _T("not implemented") ); +} + +void wxNativeFontInfo::SetStyle(wxFontStyle WXUNUSED(style)) +{ + wxFAIL_MSG( _T("not implemented") ); +} + +void wxNativeFontInfo::SetWeight(wxFontWeight WXUNUSED(weight)) +{ + wxFAIL_MSG( _T("not implemented") ); +} + +void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined)) +{ + wxFAIL_MSG( _T("not implemented") ); +} + +void wxNativeFontInfo::SetFaceName(wxString WXUNUSED(facename)) +{ + wxFAIL_MSG( _T("not implemented") ); +} + +void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family)) +{ + wxFAIL_MSG( _T("not implemented") ); +} + +void wxNativeFontInfo::SetEncoding(wxFontEncoding WXUNUSED(encoding)) +{ + wxFAIL_MSG( _T("not implemented") ); +} + + + bool wxNativeFontInfo::FromString(const wxString& s) { if (description) @@ -138,7 +183,9 @@ bool wxNativeFontInfo::FromString(const wxString& s) wxString wxNativeFontInfo::ToString() const { - wxString tmp = wxGTK_CONV_BACK( pango_font_description_to_string( description ) ); + char *str = pango_font_description_to_string( description ); + wxString tmp = wxGTK_CONV_BACK( str ); + g_free( str ); return tmp; } @@ -178,8 +225,7 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, return FALSE; } -#else - // __WXGTK20__ +#else // GTK+ 1.x #ifdef __X__ #ifdef __VMS__ @@ -228,7 +274,13 @@ static wxHashTable *g_fontHash = (wxHashTable*) NULL; #elif defined(__WXGTK__) wxNativeFont wxLoadFont(const wxString& fontSpec) { - return gdk_font_load( wxConvertWX2MB(fontSpec) ); + // VZ: we should use gdk_fontset_load() instead of gdk_font_load() + // here to be able to display Japanese fonts correctly (at least + // this is what people report) but unfortunately doing it results + // in tons of warnings when using GTK with "normal" European + // languages and so we can't always do it and I don't know enough + // to determine when should this be done... (FIXME) + return gdk_font_load( wxConvertWX2MB(fontSpec) ); } inline void wxFreeFont(wxNativeFont font) @@ -381,11 +433,21 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname) return FALSE; } - fontElements[n] = tokenizer.GetNextToken(); + wxString field = tokenizer.GetNextToken(); + if ( !field.empty() && field != _T('*') ) + { + // we're really initialized now + m_isDefault = FALSE; + } + + fontElements[n] = field; } // this should be all - return !tokenizer.HasMoreTokens(); + if ( tokenizer.HasMoreTokens() ) + return FALSE; + + return TRUE; } wxString wxNativeFontInfo::GetXFontName() const @@ -446,6 +508,164 @@ void wxNativeFontInfo::SetXFontName(const wxString& xFontName_) m_isDefault = FALSE; } +int wxNativeFontInfo::GetPointSize() const +{ + const wxString s = GetXFontComponent(wxXLFD_POINTSIZE); + + // return -1 to indicate that the size is unknown + long l; + return s.ToLong(&l) ? l : -1; +} + +wxFontStyle wxNativeFontInfo::GetStyle() const +{ + const wxString s = GetXFontComponent(wxXLFD_SLANT); + + if ( s.length() != 1 ) + { + // it is really unknown but we don't have any way to return it from + // here + return wxFONTSTYLE_NORMAL; + } + + switch ( s[0] ) + { + default: + // again, unknown but consider normal by default + + case _T('r'): + return wxFONTSTYLE_NORMAL; + + case _T('i'): + return wxFONTSTYLE_ITALIC; + + case _T('o'): + return wxFONTSTYLE_SLANT; + } +} + +wxFontWeight wxNativeFontInfo::GetWeight() const +{ + const wxString s = GetXFontComponent(wxXLFD_WEIGHT).MakeLower(); + if ( s.find(_T("bold")) != wxString::npos || s == _T("black") ) + return wxFONTWEIGHT_BOLD; + else if ( s == _T("light") ) + return wxFONTWEIGHT_LIGHT; + + return wxFONTWEIGHT_NORMAL; +} + +bool wxNativeFontInfo::GetUnderlined() const +{ + // X fonts are never underlined + return FALSE; +} + +wxString wxNativeFontInfo::GetFaceName() const +{ + // wxWindows facename probably more accurately corresponds to X family + return GetXFontComponent(wxXLFD_FAMILY); +} + +wxFontFamily wxNativeFontInfo::GetFamily() const +{ + // and wxWindows family -- to X foundry, but we have to translate it to + // wxFontFamily somehow... + wxFAIL_MSG(_T("not implemented")); // GetXFontComponent(wxXLFD_FOUNDRY); + + return wxFONTFAMILY_DEFAULT; +} + +wxFontEncoding wxNativeFontInfo::GetEncoding() const +{ + // we already have the code for this but need to refactor it first + wxFAIL_MSG( _T("not implemented") ); + + return wxFONTENCODING_MAX; +} + +void wxNativeFontInfo::SetPointSize(int pointsize) +{ + SetXFontComponent(wxXLFD_POINTSIZE, wxString::Format(_T("%d"), pointsize)); +} + +void wxNativeFontInfo::SetStyle(wxFontStyle style) +{ + wxString s; + switch ( style ) + { + case wxFONTSTYLE_ITALIC: + s = _T('i'); + break; + + case wxFONTSTYLE_SLANT: + s = _T('o'); + break; + + case wxFONTSTYLE_NORMAL: + s = _T('r'); + + default: + wxFAIL_MSG( _T("unknown wxFontStyle in wxNativeFontInfo::SetStyle") ); + return; + } + + SetXFontComponent(wxXLFD_SLANT, s); +} + +void wxNativeFontInfo::SetWeight(wxFontWeight weight) +{ + wxString s; + switch ( weight ) + { + case wxFONTWEIGHT_BOLD: + s = _T("bold"); + break; + + case wxFONTWEIGHT_LIGHT: + s = _T("light"); + break; + + case wxFONTWEIGHT_NORMAL: + s = _T("medium"); + break; + + default: + wxFAIL_MSG( _T("unknown wxFontWeight in wxNativeFontInfo::SetWeight") ); + return; + } + + SetXFontComponent(wxXLFD_WEIGHT, s); +} + +void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined)) +{ + // can't do this under X +} + +void wxNativeFontInfo::SetFaceName(wxString facename) +{ + SetXFontComponent(wxXLFD_FAMILY, facename); +} + +void wxNativeFontInfo::SetFamily(wxFontFamily family) +{ + // wxFontFamily -> X foundry, anyone? + wxFAIL_MSG( _T("not implemented") ); + + // SetXFontComponent(wxXLFD_FOUNDRY, ...); +} + +void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding) +{ + wxNativeEncodingInfo info; + if ( wxGetNativeFontEncoding(encoding, &info) ) + { + SetXFontComponent(wxXLFD_ENCODING, info.xencoding); + SetXFontComponent(wxXLFD_REGISTRY, info.xregistry); + } +} + // ---------------------------------------------------------------------------- // common functions // ---------------------------------------------------------------------------- @@ -489,6 +709,11 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, info->xencoding = wxT("*"); break; + case wxFONTENCODING_GB2312: + info->xregistry = wxT("GB2312"); // or the otherway round? + info->xencoding = wxT("*"); + break; + case wxFONTENCODING_KOI8: info->xregistry = wxT("koi8"); @@ -611,27 +836,49 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, *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 ) { // search up and down by stepsize 10 int max_size = pointSize + 20 * (1 + (pointSize/180)); int min_size = pointSize - 20 * (1 + (pointSize/180)); - int i; + int i, round; // counters + + // first round: search for equal, then for smaller and for larger size with the given weight and style + int testweight = weight; + int teststyle = style; - // Search for smaller size (approx.) - for ( i = pointSize - 10; !font && i >= 10 && i >= min_size; i -= 10 ) + for ( round = 0; round < 3; round++ ) { - font = wxLoadQueryFont(i, family, style, weight, underlined, + // second round: use normal weight + if ( round == 1 ) + { + if ( testweight != wxNORMAL ) + { + testweight = wxNORMAL; + } + else + { + ++round; // fall through to third round + } + } + + // third round: ... and use normal style + if ( round == 2 ) + { + if ( teststyle != wxNORMAL ) + { + teststyle = wxNORMAL; + } + else + { + break; + } + } + // Search for equal or smaller size (approx.) + for ( i = pointSize; !font && i >= 10 && i >= min_size; i -= 10 ) + { + font = wxLoadQueryFont(i, family, teststyle, testweight, underlined, facename, info.xregistry, info.xencoding, xFontName); } @@ -639,9 +886,10 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize, // Search for larger size (approx.) for ( i = pointSize + 10; !font && i <= max_size; i += 10 ) { - font = wxLoadQueryFont(i, family, style, weight, underlined, + font = wxLoadQueryFont(i, family, teststyle, testweight, underlined, facename, info.xregistry, info.xencoding, xFontName); + } } // Try default family @@ -800,7 +1048,7 @@ static wxNativeFont wxLoadQueryFont(int pointSize, // An alternative: assume that the screen is 72 dpi. //int pixelHeight = (int) (((float)pointSize / 720.0) * 72.0) ; //int pixelHeight = (int) ((float)pointSize / 10.0) ; - + GR_LOGFONT logFont; logFont.lfHeight = pixelHeight; logFont.lfWidth = 0; @@ -827,7 +1075,7 @@ static wxNativeFont wxLoadQueryFont(int pointSize, fontInfo->fid = GrCreateFont((GR_CHAR*) facename.c_str(), pixelHeight, & logFont); GrGetFontInfo(fontInfo->fid, & fontInfo->info); return (wxNativeFont) fontInfo; - + #else wxString fontSpec; if (!facename.IsEmpty()) @@ -1038,5 +1286,5 @@ void wxFontModule::OnExit() g_fontHash = (wxHashTable *)NULL; } -#endif - // not GTK 2.0 +#endif // GTK 2.0/1.x +