// -*- 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"
#include "screeninfo.hh"
extern "C" {
-#ifdef HAVE_STDIO_H
-# include <stdio.h>
-#endif // HAVE_STDIO_H
-
-#include "gettext.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,
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;
}
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
}
-unsigned int Font::measureString(const ustring &string) const
+int Font::measureString(const ustring &string) const
{
XGlyphInfo info;
XftTextExtents8(**display, _xftfont,
(FcChar8*)string.c_str(), string.bytes(), &info);
- return info.xOff + (_shadow ? _offset : 0);
+ return (signed) info.xOff + (_shadow ? _offset : 0);
}
-unsigned int Font::height(void) const
+int Font::height(void) const
{
- return _xftfont->height + (_shadow ? _offset : 0);
+ return (signed) _xftfont->height + (_shadow ? _offset : 0);
}
-unsigned int Font::maxCharWidth(void) const
+int Font::maxCharWidth(void) const
{
- return _xftfont->max_advance_width;
+ return (signed) _xftfont->max_advance_width;
}
}