summaryrefslogtreecommitdiff
path: root/src/FbTk/XftFontImp.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-09-11 23:01:34 (GMT)
committerfluxgen <fluxgen>2004-09-11 23:01:34 (GMT)
commit049e40c9eb6e6e8651b171a2a78465398c87f6a1 (patch)
tree7aef9d57e82336221d6d953617c7a5d53ee95db0 /src/FbTk/XftFontImp.hh
parentacd2176355876a7bb7afe9d026f9780a3d1c2737 (diff)
downloadfluxbox_lack-049e40c9eb6e6e8651b171a2a78465398c87f6a1.zip
fluxbox_lack-049e40c9eb6e6e8651b171a2a78465398c87f6a1.tar.bz2
Font::drawText takes reference to FbDrawable instead of X Drawable + some code cleaning
Diffstat (limited to 'src/FbTk/XftFontImp.hh')
-rw-r--r--src/FbTk/XftFontImp.hh6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/FbTk/XftFontImp.hh b/src/FbTk/XftFontImp.hh
index a29ad41..74b5a5b 100644
--- a/src/FbTk/XftFontImp.hh
+++ b/src/FbTk/XftFontImp.hh
@@ -1,5 +1,5 @@
1// XftFontImp.hh Xft font implementation for FbTk 1// XftFontImp.hh Xft font implementation for FbTk
2// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net) 2// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
3// 3//
4// Permission is hereby granted, free of charge, to any person obtaining a 4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"), 5// copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22//$Id: XftFontImp.hh,v 1.4 2003/12/16 17:06:52 fluxgen Exp $ 22//$Id: XftFontImp.hh,v 1.5 2004/09/11 22:58:20 fluxgen Exp $
23 23
24#ifndef FBTK_XFTFONTIMP_HH 24#ifndef FBTK_XFTFONTIMP_HH
25#define FBTK_XFTFONTIMP_HH 25#define FBTK_XFTFONTIMP_HH
@@ -36,7 +36,7 @@ public:
36 XftFontImp(const char *fontname, bool utf8); 36 XftFontImp(const char *fontname, bool utf8);
37 ~XftFontImp(); 37 ~XftFontImp();
38 bool load(const std::string &name); 38 bool load(const std::string &name);
39 void drawText(Drawable w, int screen, GC gc, const char *text, size_t len, int x, int y) const; 39 void drawText(const FbDrawable &w, int screen, GC gc, const char *text, size_t len, int x, int y) const;
40 unsigned int textWidth(const char * const text, unsigned int len) const; 40 unsigned int textWidth(const char * const text, unsigned int len) const;
41 unsigned int height() const; 41 unsigned int height() const;
42 int ascent() const { return m_xftfont ? m_xftfont->ascent : 0; } 42 int ascent() const { return m_xftfont ? m_xftfont->ascent : 0; }