diff options
| author | Dana Jansens <danakj@orodu.net> | 2002-10-31 08:42:45 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2002-10-31 08:42:45 +0000 |
| commit | 7bf96a9123a9f6b29a4c6168f7391db72f374f8a (patch) | |
| tree | 1be5840f3a76f618b9e8b029317e664a93660f4e /src/font.hh | |
| parent | 0caf2ba9315336aa5206d8f5f28facf14f3ff34d (diff) | |
compiles now. uses xft2
remove the nls remainders
Diffstat (limited to 'src/font.hh')
| -rw-r--r-- | src/font.hh | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/font.hh b/src/font.hh index f28a0ac5..00c8f50e 100644 --- a/src/font.hh +++ b/src/font.hh @@ -27,9 +27,7 @@ extern "C" { #include <X11/Xlib.h> -#ifdef XFT -# include <X11/Xft/Xft.h> -#endif +#include <X11/Xft/Xft.h> } #include <assert.h> @@ -69,7 +67,6 @@ private: bool _bold; bool _italic; -#ifdef XFT bool _antialias; bool _shadow; unsigned char _offset; @@ -78,31 +75,14 @@ private: XftFont *_xftfont; bool createXftFont(void); -#endif - - // standard - XFontStruct *_font; - // multibyte - XFontSet _fontset; - XFontSetExtents *_fontset_extents; - - std::string buildXlfd(void) const; - std::string buildMultibyteXlfd(void) const; - - bool createXFont(const std::string &xlfd); - bool parseXlfd(const std::string &xlfd); bool _valid; public: -#ifdef XFT // loads an Xft font BFont(Display *d, BScreen *screen, const std::string &family, int size, bool bold, bool italic, bool shadow, unsigned char offset, unsigned char tint, bool antialias = True); -#endif - // loads a standard X font - BFont(Display *d, BScreen *screen, const std::string &xlfd); virtual ~BFont(void); inline bool valid(void) const { return _valid; } |