use "fixed" as the fallback font always
Dana Jansens danakj@orodu.net
2 files changed,
4 insertions(+),
17 deletions(-)
M
otk/font.cc
→
otk/font.cc
@@ -20,7 +20,6 @@ #include <algorithm>
namespace otk { -std::string Font::_fallback_font = "fixed"; bool Font::_xft_init = false; Font::Font(int screen_num, const std::string &fontstring,@@ -52,13 +51,13 @@ _fontstring.c_str())))
return; printf(_("Unable to load font: %s\n"), _fontstring.c_str()); - printf(_("Trying fallback font: %s\n"), _fallback_font.c_str()); + printf(_("Trying fallback font: %s\n"), "fixed"); if ((_xftfont = XftFontOpenName(**display, _screen_num, - _fallback_font.c_str()))) + "fixed"))) return; - printf(_("Unable to load font: %s\n"), _fallback_font.c_str()); + printf(_("Unable to load font: %s\n"), "fixed"); printf(_("Aborting!.\n")); ::exit(3); // can't continue without a font
M
otk/font.hh
→
otk/font.hh
@@ -23,20 +23,8 @@ /*
* static members */ private: - static std::string _fallback_font; - static bool _xft_init; - -public: - // the fallback is only used for X fonts, not for Xft fonts, since it is - // assumed that X fonts will be the fallback from Xft. - inline static std::string fallbackFont(void) { return _fallback_font; } - inline static void setFallbackFont(const std::string &f) - { _fallback_font = f; } + static bool _xft_init; - /* - * instance members - */ -private: int _screen_num; std::string _fontstring;