diff options
author | mathias <mathias> | 2004-12-21 23:42:09 (GMT) |
---|---|---|
committer | mathias <mathias> | 2004-12-21 23:42:09 (GMT) |
commit | bc7c988561f79edb03b2ece80bb4ba0c8c73fc2e (patch) | |
tree | a48f394504f8b44cdab668ef69daf054c178500c /src/FbTk/Font.hh | |
parent | 7e41a1494a65ecdb05c7a34c274693cbd950647f (diff) | |
download | fluxbox-bc7c988561f79edb03b2ece80bb4ba0c8c73fc2e.zip fluxbox-bc7c988561f79edb03b2ece80bb4ba0c8c73fc2e.tar.bz2 |
adds imlib2-support to fluxbox: allows us to load several imageformats
besides xpm. to get imlib2 support in fluxbox one has to
./configure --enable-imblib2
default is disabled. a fluxbox-binary that supports imlib2 will have
IMLIB2 in "fluxbox -info"-output
explanation to the changed files:
* xft.m4 -> acinclude.m4 + added ac_path_generic.m4
(from http://ac-archive.sourceforge.net/Miscellaneous/ac_path_generic.html)
* configure.in, Makefile.am, src/FbTk/Makefile.am changed to handle
imlib2-support
* Font.cc/hh Image.cc/hh App.cc fluxbox.cc consistent way of init for global
stuff for fonts and imagehandlers.
* rest of changes just add the imlib2-code, pretty straightforward
Diffstat (limited to 'src/FbTk/Font.hh')
-rw-r--r-- | src/FbTk/Font.hh | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/FbTk/Font.hh b/src/FbTk/Font.hh index d299848..f6742cb 100644 --- a/src/FbTk/Font.hh +++ b/src/FbTk/Font.hh | |||
@@ -40,8 +40,6 @@ | |||
40 | 40 | ||
41 | namespace FbTk { | 41 | namespace FbTk { |
42 | 42 | ||
43 | void fontInit(); | ||
44 | |||
45 | class FontImp; | 43 | class FontImp; |
46 | class FbDrawable; | 44 | class FbDrawable; |
47 | 45 | ||
@@ -51,6 +49,19 @@ class FbDrawable; | |||
51 | class Font { | 49 | class Font { |
52 | public: | 50 | public: |
53 | 51 | ||
52 | /// called at FbTk::App creation time, initializes some stuff | ||
53 | static void init(); | ||
54 | |||
55 | /// called at FbTk::App destruction time, cleans up what was inited first | ||
56 | static void shutdown(); | ||
57 | |||
58 | /// @return true if multibyte is enabled, else false | ||
59 | static bool multibyte() { return m_multibyte; } | ||
60 | /// @return true if utf-8 mode is enabled, else false | ||
61 | static bool utf8() { return m_utf8mode; } | ||
62 | |||
63 | |||
64 | |||
54 | Font(const char *name=0, bool antialias = false); | 65 | Font(const char *name=0, bool antialias = false); |
55 | virtual ~Font(); | 66 | virtual ~Font(); |
56 | /** | 67 | /** |
@@ -60,10 +71,6 @@ public: | |||
60 | */ | 71 | */ |
61 | bool load(const std::string &name); | 72 | bool load(const std::string &name); |
62 | 73 | ||
63 | /// @return true if multibyte is enabled, else false | ||
64 | static bool multibyte() { return m_multibyte; } | ||
65 | /// @return true if utf-8 mode is enabled, else false | ||
66 | static bool utf8() { return m_utf8mode; } | ||
67 | void setAntialias(bool flag); | 74 | void setAntialias(bool flag); |
68 | inline void setShadow(bool flag) { m_shadow = flag; if (m_shadow) setHalo(false); } | 75 | inline void setShadow(bool flag) { m_shadow = flag; if (m_shadow) setHalo(false); } |
69 | inline void setHalo(bool flag) { m_halo = flag; if (m_halo) setShadow(false); } | 76 | inline void setHalo(bool flag) { m_halo = flag; if (m_halo) setShadow(false); } |