aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.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/fluxbox.cc
parent7e41a1494a65ecdb05c7a34c274693cbd950647f (diff)
downloadfluxbox-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/fluxbox.cc')
-rw-r--r--src/fluxbox.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 3d82eb5..19a0daa 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -244,8 +244,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
244 "Error message when no X display appears to exist")); 244 "Error message when no X display appears to exist"));
245 } 245 }
246 246
247 FbTk::fontInit();
248
249 Display *disp = FbTk::App::instance()->display(); 247 Display *disp = FbTk::App::instance()->display();
250 // For KDE dock applets 248 // For KDE dock applets
251 // KDE v1.x 249 // KDE v1.x
@@ -1369,7 +1367,6 @@ void Fluxbox::shutdown() {
1369 m_screen_list.end(), mem_fun(&BScreen::shutdown)); 1367 m_screen_list.end(), mem_fun(&BScreen::shutdown));
1370 1368
1371 sync(false); 1369 sync(false);
1372
1373} 1370}
1374 1371
1375/// saves resources 1372/// saves resources