X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffont.cc;h=ee9c37d79a22483ff0f808a4b2201b7fec33c5a0;hb=77a46782db2996c0bc662c0f6d191df7a39c2cce;hp=4c3a347670b321cb6d4415e06a52d9e4bdd14b03;hpb=2a195d71e20689fd90544543a6b049fae615a55f;p=chaz%2Fopenbox

diff --git a/otk/font.cc b/otk/font.cc
index 4c3a3476..ee9c37d7 100644
--- a/otk/font.cc
+++ b/otk/font.cc
@@ -1,17 +1,6 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef    HAVE_CONFIG_H
-#  include "../config.h"
-#endif // HAVE_CONFIG_H
-
-extern "C" {
-#ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-#endif // HAVE_STDLIB_H
-}
-
-#include <iostream>
-#include <algorithm>
+#include "config.h"
 
 #include "font.hh"
 #include "surface.hh"
@@ -20,17 +9,17 @@ extern "C" {
 #include "screeninfo.hh"
 
 extern "C" {
-#ifdef    HAVE_STDIO_H
-#  include <stdio.h>
-#endif // HAVE_STDIO_H
-
 #include "../src/gettext.h"
 #define _(str) gettext(str)
 }
 
+#include <cstdio>
+#include <cstdlib>
+#include <iostream>
+#include <algorithm>
+
 namespace otk {
 
-std::string Font::_fallback_font = "fixed";
 bool        Font::_xft_init      = false;
 
 Font::Font(int screen_num, const std::string &fontstring,
@@ -50,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;
   }
 
@@ -62,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