// -*- 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 "config.h"
+#include <cstdlib>
#include <iostream>
#include <algorithm>
# include <stdio.h>
#endif // HAVE_STDIO_H
-#include "gettext.h"
+#include "../src/gettext.h"
#define _(str) gettext(str)
}
}
-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;
}
}