diff options
-rw-r--r-- | src/FbTk/XFontImp.hh | 8 | ||||
-rw-r--r-- | src/FbTk/XftFontImp.hh | 13 | ||||
-rw-r--r-- | src/FbTk/XmbFontImp.hh | 8 |
3 files changed, 20 insertions, 9 deletions
diff --git a/src/FbTk/XFontImp.hh b/src/FbTk/XFontImp.hh index 0a9b49a..c297615 100644 --- a/src/FbTk/XFontImp.hh +++ b/src/FbTk/XFontImp.hh | |||
@@ -1,5 +1,5 @@ | |||
1 | // XFontImp.hh for FbTk fluxbox toolkit | 1 | // XFontImp.hh for FbTk fluxbox toolkit |
2 | // Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org) | 2 | // Copyright (c) 2002-2003 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,14 +19,18 @@ | |||
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: XFontImp.hh,v 1.3 2002/12/09 22:10:01 fluxgen Exp $ | 22 | // $Id: XFontImp.hh,v 1.4 2003/01/05 23:39:50 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef FBTK_XFONTIMP_HH | 24 | #ifndef FBTK_XFONTIMP_HH |
25 | #define FBTK_XFONTIMP_HH | 25 | #define FBTK_XFONTIMP_HH |
26 | 26 | ||
27 | #include "FontImp.hh" | 27 | #include "FontImp.hh" |
28 | |||
29 | #include <X11/Xlib.h> | ||
30 | |||
28 | namespace FbTk { | 31 | namespace FbTk { |
29 | 32 | ||
33 | /// regular X font implementation for FbTk | ||
30 | class XFontImp:public FbTk::FontImp { | 34 | class XFontImp:public FbTk::FontImp { |
31 | public: | 35 | public: |
32 | explicit XFontImp(const char *filename = 0); | 36 | explicit XFontImp(const char *filename = 0); |
diff --git a/src/FbTk/XftFontImp.hh b/src/FbTk/XftFontImp.hh index cad25d5..ee13fe1 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 Henrik Kinnunen (fluxgen@linuxmail.org) | 2 | // Copyright (c) 2002-2003 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,15 +19,18 @@ | |||
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.2 2002/12/01 13:42:15 rathnor Exp $ | 22 | //$Id: XftFontImp.hh,v 1.3 2003/01/05 23:39:49 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef XFTFONTIMP_HH | 24 | #ifndef FBTK_XFTFONTIMP_HH |
25 | #define XFTFONTIMP_HH | 25 | #define FBTK_XFTFONTIMP_HH |
26 | 26 | ||
27 | #include "FontImp.hh" | 27 | #include "FontImp.hh" |
28 | |||
28 | #include <X11/Xft/Xft.h> | 29 | #include <X11/Xft/Xft.h> |
30 | |||
29 | namespace FbTk { | 31 | namespace FbTk { |
30 | 32 | ||
33 | /// Handles Xft font drawing | ||
31 | class XftFontImp:public FbTk::FontImp { | 34 | class XftFontImp:public FbTk::FontImp { |
32 | public: | 35 | public: |
33 | XftFontImp(const char *fontname, bool utf8); | 36 | XftFontImp(const char *fontname, bool utf8); |
@@ -46,4 +49,4 @@ private: | |||
46 | 49 | ||
47 | }; // end namespace FbTk | 50 | }; // end namespace FbTk |
48 | 51 | ||
49 | #endif // XFTFONTIMP_HH | 52 | #endif // FBTK_XFTFONTIMP_HH |
diff --git a/src/FbTk/XmbFontImp.hh b/src/FbTk/XmbFontImp.hh index 4372585..9f58385 100644 --- a/src/FbTk/XmbFontImp.hh +++ b/src/FbTk/XmbFontImp.hh | |||
@@ -1,5 +1,5 @@ | |||
1 | // XmbFontImp.hh for FbTk fluxbox toolkit | 1 | // XmbFontImp.hh for FbTk fluxbox toolkit |
2 | // Copyright (c) 2002 Henrik Kinnunen (fluxgen at linuxmail.org) | 2 | // Copyright (c) 2002-2003 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,14 +19,18 @@ | |||
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: XmbFontImp.hh,v 1.2 2002/12/01 13:42:15 rathnor Exp $ | 22 | // $Id: XmbFontImp.hh,v 1.3 2003/01/05 23:39:50 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef FBTK_XMBFONTIMP_HH | 24 | #ifndef FBTK_XMBFONTIMP_HH |
25 | #define FBTK_XMBFONTIMP_HH | 25 | #define FBTK_XMBFONTIMP_HH |
26 | 26 | ||
27 | #include "FontImp.hh" | 27 | #include "FontImp.hh" |
28 | |||
29 | #include <X11/Xlib.h> | ||
30 | |||
28 | namespace FbTk { | 31 | namespace FbTk { |
29 | 32 | ||
33 | /// multibyte font implementation for FbTk | ||
30 | class XmbFontImp:public FbTk::FontImp { | 34 | class XmbFontImp:public FbTk::FontImp { |
31 | public: | 35 | public: |
32 | XmbFontImp(const char *fontname, bool utf8); | 36 | XmbFontImp(const char *fontname, bool utf8); |