aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/App.cc
diff options
context:
space:
mode:
authormathias <mathias>2004-12-21 23:42:09 (GMT)
committermathias <mathias>2004-12-21 23:42:09 (GMT)
commitbc7c988561f79edb03b2ece80bb4ba0c8c73fc2e (patch)
treea48f394504f8b44cdab668ef69daf054c178500c /src/FbTk/App.cc
parent7e41a1494a65ecdb05c7a34c274693cbd950647f (diff)
downloadfluxbox_pavel-bc7c988561f79edb03b2ece80bb4ba0c8c73fc2e.zip
fluxbox_pavel-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/App.cc')
-rw-r--r--src/FbTk/App.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/FbTk/App.cc b/src/FbTk/App.cc
index 2479944..c48ccb1 100644
--- a/src/FbTk/App.cc
+++ b/src/FbTk/App.cc
@@ -20,6 +20,8 @@
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22#include "App.hh" 22#include "App.hh"
23#include "Font.hh"
24#include "Image.hh"
23 25
24#include "EventManager.hh" 26#include "EventManager.hh"
25 27
@@ -49,10 +51,17 @@ App::App(const char *displayname):m_done(false), m_display(0) {
49 if (displayname != 0 && displayname[0] == '\0') 51 if (displayname != 0 && displayname[0] == '\0')
50 displayname = 0; 52 displayname = 0;
51 m_display = XOpenDisplay(displayname); 53 m_display = XOpenDisplay(displayname);
54
55 Font::init();
56 Image::init();
52} 57}
53 58
54App::~App() { 59App::~App() {
55 if (m_display != 0) { 60 if (m_display != 0) {
61
62 Font::shutdown();
63 Image::shutdown();
64
56 XCloseDisplay(m_display); 65 XCloseDisplay(m_display);
57 m_display = 0; 66 m_display = 0;
58 } 67 }