// -*- 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 "font.hh"
+#include "surface.hh"
#include "util.hh"
#include "display.hh"
-#include "color.hh"
#include "screeninfo.hh"
extern "C" {
# include <stdio.h>
#endif // HAVE_STDIO_H
-#include "gettext.h"
+#include "../src/gettext.h"
#define _(str) gettext(str)
}
::exit(3);
}
int version = XftGetVersion();
- printf(_("Using Xft %d.%d.%d.\n"),
- version / 10000 % 100, version / 100 % 100, version % 100);
+ 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);
_xft_init = true;
}
}
-void Font::drawString(XftDraw *d, int x, int y, const Color &color,
- const ustring &string) const
-{
- assert(d);
-
- if (_shadow) {
- XftColor c;
- c.color.red = 0;
- c.color.green = 0;
- c.color.blue = 0;
- c.color.alpha = _tint | _tint << 8; // transparent shadow
- c.pixel = BlackPixel(**display, _screen_num);
-
- if (string.utf8())
- XftDrawStringUtf8(d, &c, _xftfont, x + _offset,
- _xftfont->ascent + y + _offset,
- (FcChar8*)string.c_str(), string.size());
- else
- XftDrawString8(d, &c, _xftfont, x + _offset,
- _xftfont->ascent + y + _offset,
- (FcChar8*)string.c_str(), string.size());
- }
-
- XftColor c;
- c.color.red = color.red() | color.red() << 8;
- c.color.green = color.green() | color.green() << 8;
- c.color.blue = color.blue() | color.blue() << 8;
- c.pixel = color.pixel();
- c.color.alpha = 0xff | 0xff << 8; // no transparency in Color yet
-
- if (string.utf8())
- XftDrawStringUtf8(d, &c, _xftfont, x, _xftfont->ascent + y,
- (FcChar8*)string.c_str(), string.size());
- else
- XftDrawString8(d, &c, _xftfont, x, _xftfont->ascent + y,
- (FcChar8*)string.c_str(), string.size());
-
- return;
-}
-
-
-unsigned int Font::measureString(const ustring &string) const
+int Font::measureString(const ustring &string) const
{
XGlyphInfo info;
if (string.utf8())
XftTextExtentsUtf8(**display, _xftfont,
- (FcChar8*)string.c_str(), string.size(), &info);
+ (FcChar8*)string.c_str(), string.bytes(), &info);
else
XftTextExtents8(**display, _xftfont,
- (FcChar8*)string.c_str(), string.size(), &info);
+ (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;
}
}