#include "wx/log.h"
#include "wx/gdicmn.h"
#include "wx/tokenzr.h"
+#include "wx/settings.h"
#include <strings.h>
-#include "gdk/gdk.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gtk/gtk.h>
// ----------------------------------------------------------------------------
// wxFontRefData
wxString m_faceName;
wxFontEncoding m_encoding;
- friend wxFont;
+ wxNativeFontInfo m_nativeFontInfo;
+
+ friend class wxFont;
};
// ============================================================================
: m_scaled_xfonts(wxKEY_INTEGER)
{
Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
- data.m_underlined, data.m_faceName, data.m_encoding);
+ data.m_underlined, data.m_faceName, data.m_encoding);
}
wxFontRefData::wxFontRefData(int size, int family, int style,
- int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding )
+ int weight, bool underlined,
+ const wxString& faceName,
+ wxFontEncoding encoding)
: m_scaled_xfonts(wxKEY_INTEGER)
{
- Init(size, family, style, weight,
- underlined, faceName, encoding);
+ Init(size, family, style, weight, underlined, faceName, encoding);
}
wxFontRefData::~wxFontRefData()
}
}
+// ----------------------------------------------------------------------------
+// wxNativeFontInfo
+// ----------------------------------------------------------------------------
+
+bool wxNativeFontInfo::FromString(const wxString& s)
+{
+ wxStringTokenizer tokenizer(s, _T(";"));
+
+ wxString token = tokenizer.GetNextToken();
+ //
+ // Ignore the version for now
+ //
+
+ xFontName = tokenizer.GetNextToken();
+ if(!xFontName)
+ return FALSE;
+
+ return TRUE;
+}
+
+wxString wxNativeFontInfo::ToString() const
+{
+ wxString s;
+
+ s.Printf(_T("%d;%s"),
+ 0, // version
+ xFontName.c_str());
+
+ return s;
+}
+
// ----------------------------------------------------------------------------
// wxFont
// ----------------------------------------------------------------------------
wxTheFontList->Append( this );
}
-wxFont::wxFont( const wxString& fontname, const wxFontData& fontdata )
+wxFont::wxFont(const wxNativeFontInfo& info)
{
Init();
- wxCHECK_RET( !!fontname, _T("invalid font spec") );
+ Create(info.xFontName);
+}
+
+bool wxFont::Create(const wxNativeFontInfo& info)
+{
+ return Create(info.xFontName);
+}
+
+bool wxFont::Create( int pointSize,
+ int family,
+ int style,
+ int weight,
+ bool underlined,
+ const wxString& face,
+ wxFontEncoding encoding)
+{
+ m_refData = new wxFontRefData(pointSize, family, style, weight,
+ underlined, face, encoding);
+
+ return TRUE;
+}
+
+bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
+{
+ if( !fontname )
+ {
+ *this = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT);
+ return TRUE;
+ }
m_refData = new wxFontRefData();
+ M_FONTDATA->m_nativeFontInfo.xFontName = fontname; // X font name
+
wxString tmp;
wxStringTokenizer tn( fontname, wxT("-") );
+ tn.GetNextToken(); // skip initial empty token
tn.GetNextToken(); // foundry
+
M_FONTDATA->m_faceName = tn.GetNextToken(); // family
tmp = tn.GetNextToken().MakeUpper(); // weight
tn.GetNextToken(); // pixel size
tmp = tn.GetNextToken(); // pointsize
- long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
- M_FONTDATA->m_pointSize = num / 10;
+ if (tmp != wxT("*"))
+ {
+ long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
+ M_FONTDATA->m_pointSize = (int)(num / 10);
+ }
tn.GetNextToken(); // x-res
tn.GetNextToken(); // y-res
tn.GetNextToken(); // avg width
// deal with font encoding
- M_FONTDATA->m_encoding = fontdata.GetEncoding();
+ M_FONTDATA->m_encoding = enc;
if ( M_FONTDATA->m_encoding == wxFONTENCODING_SYSTEM )
{
wxString registry = tn.GetNextToken().MakeUpper(),
M_FONTDATA->m_encoding = wxFONTENCODING_KOI8;
}
//else: unknown encoding - may be give a warning here?
+ else
+ return FALSE;
}
-}
-
-bool wxFont::Create( int pointSize,
- int family,
- int style,
- int weight,
- bool underlined,
- const wxString& face,
- wxFontEncoding encoding )
-{
- m_refData = new wxFontRefData(pointSize, family, style, weight,
- underlined, face, encoding);
-
return TRUE;
}
return M_FONTDATA->m_encoding;
}
+wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+ wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
+
+ if(M_FONTDATA->m_nativeFontInfo.xFontName.IsEmpty())
+ GetInternalFont();
+
+ return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+}
+
+
// ----------------------------------------------------------------------------
// change font attributes
// ----------------------------------------------------------------------------
Unshare();
M_FONTDATA->m_pointSize = pointSize;
+ M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now
}
void wxFont::SetFamily(int family)
Unshare();
M_FONTDATA->m_family = family;
+ M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now
}
void wxFont::SetStyle(int style)
Unshare();
M_FONTDATA->m_style = style;
+ M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now
}
void wxFont::SetWeight(int weight)
Unshare();
M_FONTDATA->m_weight = weight;
+ M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now
}
void wxFont::SetFaceName(const wxString& faceName)
Unshare();
M_FONTDATA->m_faceName = faceName;
+ M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now
}
void wxFont::SetUnderlined(bool underlined)
Unshare();
M_FONTDATA->m_encoding = encoding;
+ M_FONTDATA->m_nativeFontInfo.xFontName.Clear(); // invalid now
+}
+
+void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+{
+ Unshare();
+
+ M_FONTDATA->m_nativeFontInfo = info;
}
// ----------------------------------------------------------------------------
// get internal representation of font
// ----------------------------------------------------------------------------
+static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
+
+GdkFont *GtkGetDefaultGuiFont()
+{
+ if (!g_systemDefaultGuiFont)
+ {
+ GtkWidget *widget = gtk_button_new();
+ GtkStyle *def = gtk_rc_get_style( widget );
+ if (def)
+ {
+ g_systemDefaultGuiFont = gdk_font_ref( def->font );
+ }
+ else
+ {
+ def = gtk_widget_get_default_style();
+ if (def)
+ g_systemDefaultGuiFont = gdk_font_ref( def->font );
+ }
+ gtk_widget_destroy( widget );
+ }
+ else
+ {
+ // already have it, but ref it once more before returning
+ gdk_font_ref(g_systemDefaultGuiFont);
+ }
+
+ return g_systemDefaultGuiFont;
+}
+
GdkFont *wxFont::GetInternalFont( float scale ) const
{
if (!Ok())
}
else
{
-#if 0
- if ((int_scale == 100) &&
- (M_FONTDATA->m_family == wxSWISS) &&
- (M_FONTDATA->m_style == wxNORMAL) &&
- (M_FONTDATA->m_pointSize == 12) &&
- (M_FONTDATA->m_weight == wxNORMAL) &&
- (M_FONTDATA->m_underlined == FALSE))
+ if (*this == wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT))
{
- font = gdk_font_load( "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*" );
+ font = GtkGetDefaultGuiFont();
}
- else
-#endif // 0
+ if (!font)
{
font = wxLoadQueryNearestFont( point_scale,
M_FONTDATA->m_family,
M_FONTDATA->m_weight,
M_FONTDATA->m_underlined,
M_FONTDATA->m_faceName,
- M_FONTDATA->m_encoding );
+ M_FONTDATA->m_encoding,
+ &M_FONTDATA->m_nativeFontInfo.xFontName );
}
M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
projects / wxWidgets.git / blobdiff