X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=otk%2Ffont.cc;h=ee9c37d79a22483ff0f808a4b2201b7fec33c5a0;hb=9dc2a9171cb4d7c9ff62342808686b1c96735194;hp=2d983d0cab614c4b3d1af4000d7f9ec8756655a5;hpb=f65e21ce1dc4464f3a0160c70de3caac7b9d712a;p=chaz%2Fopenbox diff --git a/otk/font.cc b/otk/font.cc index 2d983d0c..ee9c37d7 100644 --- a/otk/font.cc +++ b/otk/font.cc @@ -20,7 +20,6 @@ extern "C" { namespace otk { -std::string Font::_fallback_font = "fixed"; bool Font::_xft_init = false; Font::Font(int screen_num, const std::string &fontstring, @@ -40,10 +39,12 @@ Font::Font(int screen_num, const std::string &fontstring, printf(_("Couldn't initialize Xft.\n\n")); ::exit(3); } +#ifdef DEBUG int version = XftGetVersion(); - printf(_("Using Xft %d.%d.%d (Built against %d.%d.%d).\n"), + printf("Using Xft %d.%d.%d (Built against %d.%d.%d).\n", version / 10000 % 100, version / 100 % 100, version % 100, XFT_MAJOR, XFT_MINOR, XFT_REVISION); +#endif _xft_init = true; } @@ -52,13 +53,13 @@ Font::Font(int screen_num, const std::string &fontstring, 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