10 files changed, 272 insertions, 19 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 @@
 // DEALINGS IN THE SOFTWARE.
 
 #include "App.hh"
+#include "Font.hh"
+#include "Image.hh"
 
 #include "EventManager.hh"
 
@@ -49,10 +51,17 @@ App::App(const char *displayname):m_done(false), m_display(0) {
     if (displayname != 0 && displayname[0] == '\0')
         displayname = 0;
     m_display = XOpenDisplay(displayname);
+
+    Font::init();
+    Image::init();
 }
 
 App::~App() {
     if (m_display != 0) {
+        
+        Font::shutdown();
+        Image::shutdown();
+        
         XCloseDisplay(m_display);
         m_display = 0;
     }
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index e2e3dec..c7193f7 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -229,9 +229,14 @@ namespace FbTk {
 bool Font::m_multibyte = false; 
 bool Font::m_utf8mode = false;
 
-// some initialisation for using fonts
-void fontInit() {
-   setlocale(LC_CTYPE, "");
+
+void Font::init() {
+    // must be set before the first XFontSet is created
+    setlocale(LC_CTYPE, "");
+}
+
+void Font::shutdown() {
+
 }
 
 Font::Font(const char *name, bool antialias):
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 @@
 
 namespace FbTk {
 
-void fontInit();
-
 class FontImp;
 class FbDrawable;
 
@@ -51,6 +49,19 @@ class FbDrawable;
 class Font {
 public:
 
+    /// called at FbTk::App creation time, initializes some stuff
+    static void init();
+
+    /// called at FbTk::App destruction time, cleans up what was inited first
+    static void shutdown();
+    
+    /// @return true if multibyte is enabled, else false
+    static bool multibyte() { return m_multibyte; }
+    /// @return true if utf-8 mode is enabled, else false
+    static bool utf8() { return m_utf8mode; }
+
+
+
     Font(const char *name=0, bool antialias = false);
     virtual ~Font();
     /** 
@@ -60,10 +71,6 @@ public:
     */
     bool load(const std::string &name);
 
-    /// @return true if multibyte is enabled, else false
-    static bool multibyte() { return m_multibyte; }
-    /// @return true if utf-8 mode is enabled, else false
-    static bool utf8() { return m_utf8mode; }
     void setAntialias(bool flag);
     inline void setShadow(bool flag) { m_shadow = flag; if (m_shadow) setHalo(false); }
     inline void setHalo(bool flag)   { m_halo = flag; if (m_halo) setShadow(false); }
diff --git a/src/FbTk/Image.cc b/src/FbTk/Image.cc
index 1026a92..a7ff7e5 100644
--- a/src/FbTk/Image.cc
+++ b/src/FbTk/Image.cc
@@ -1,5 +1,5 @@
 // Image.cc for FbTk - Fluxbox ToolKit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -30,10 +30,15 @@
 
 #ifdef HAVE_XPM
 #include "ImageXPM.hh"
-#endif /// HAVE_XPM
+#endif // HAVE_XPM
+
+#ifdef HAVE_IMLIB2
+#include "ImageImlib2.hh"
+#endif // HAVE_IMLIB2
 
 #include <list>
 #include <iostream>
+#include <set>
 using namespace std;
 
 namespace FbTk {
@@ -41,13 +46,41 @@ namespace FbTk {
 Image::ImageMap Image::s_image_map;
 Image::StringList Image::s_search_paths;
 
-PixmapWithMask *Image::load(const std::string &filename, int screen_num) {
 
+void Image::init() {
+
+// create imagehandlers for their extensions
 #ifdef HAVE_XPM
-    // we must do this because static linkage with libFbTk will not init 
-    // a static autoreg variable for it
-    static ImageXPM xpm;
+    new ImageXPM();
 #endif // HAVE_XPM
+#ifdef HAVE_IMLIB2
+    new ImageImlib2();
+#endif // HAVE_IMLIB2
+}
+
+void Image::shutdown() {
+
+    std::set<ImageBase*> handlers;
+    
+    // one imagehandler could be registered 
+    // for more than one type
+    ImageMap::iterator it = s_image_map.begin();
+    ImageMap::iterator it_end = s_image_map.end();
+    for (; it != it_end; it++)
+        handlers.insert(it->second);
+
+    // free the unique handlers
+    std::set<ImageBase*>::iterator handler_it = handlers.begin();
+    std::set<ImageBase*>::iterator handler_it_end = handlers.end();
+    for(; handler_it != handler_it_end; handler_it++) {
+        delete (*handler_it);
+    }
+
+    s_image_map.clear();
+}
+
+PixmapWithMask *Image::load(const std::string &filename, int screen_num) {
+
 
     if (filename == "")
         return false;
diff --git a/src/FbTk/Image.hh b/src/FbTk/Image.hh
index 6e0bf53..eaa66ae 100644
--- a/src/FbTk/Image.hh
+++ b/src/FbTk/Image.hh
@@ -36,6 +36,13 @@ class PixmapWithMask;
 /// loads images 
 class Image {
 public:
+    
+    /// called at FbTk::App creation time, init some internal stuff
+    static void init();
+
+    /// called at FbTk:App destruction time, frees stuff allocated by init()
+    static void shutdown();
+    
     /// @return an instance of PixmapWithMask on success, 0 on failure
     static PixmapWithMask *load(const std::string &filename, int screen_num);
     /// for register file type and imagebase
diff --git a/src/FbTk/ImageImlib2.cc b/src/FbTk/ImageImlib2.cc
new file mode 100644
index 0000000..82079a3
--- /dev/null
+++ b/src/FbTk/ImageImlib2.cc
@@ -0,0 +1,147 @@
+// ImageImlib2.cc for FbTk - Fluxbox ToolKit
+// Copyright (c) 2004 Mathias Gumz <akira at fluxbox dot org>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+// $Id:  $
+
+#include "ImageImlib2.hh"
+
+#include "App.hh"
+#include "PixmapWithMask.hh"
+
+#include <X11/xpm.h>
+
+#include <Imlib2.h>
+#include <map>
+
+namespace {
+
+typedef std::map<int, Imlib_Context> ScreenImlibContextContainer;
+typedef ScreenImlibContextContainer::iterator ScreenImlibContext;
+
+ScreenImlibContextContainer contexts;
+
+}; // anon namespace
+
+
+namespace FbTk {
+
+ImageImlib2::ImageImlib2() {
+
+    // lets have a 2mb cache inside imlib, holds
+    // uncompressed images
+    imlib_set_cache_size(2048 * 1024);
+
+    // TODO: this are the potential candidates,
+    //       choose only sane ones. open for discussion
+    char* format_list[] = {
+        "PNG",                               // pngloader
+        "JPEG", "JPG", "JFI", "JFIF",        // jpegloader
+//        "TIFF", "TIF",                       // tiffloader
+        "PNM", "PPM", "PGM", "PBM", "PAM",   // pnmloader
+//        "TGA",                               // tgaloader
+//        "IFF", "ILBM", "LBM",                // lbmloader
+//        "GIF",                               // gifloader
+//        "ARGB", "AGR",                       // argbloader
+//        "BMP",                               // bmploader
+//        "BZ2",                               // bzloader
+//        "GZ",                                // gzloader
+        NULL
+    };
+
+    char** format = NULL;
+    for(format = format_list; *format != NULL; format++) {
+        Image::registerType(*format, *this);
+    }
+}
+
+ImageImlib2::~ImageImlib2() {
+    ScreenImlibContext it = contexts.begin();
+    ScreenImlibContext it_end = contexts.end();
+    for (; it != it_end; it++) {
+        imlib_context_free(it->second);
+    }
+    contexts.clear();
+}
+
+PixmapWithMask *ImageImlib2::load(const std::string &filename, int screen_num) const {
+
+    Display *dpy = FbTk::App::instance()->display();
+    
+    // init imlib2 if needed, the settings for each screen may differ
+    ScreenImlibContext screen_context = contexts.find(screen_num);
+    if (screen_context == contexts.end()) {
+
+        Imlib_Context new_context = imlib_context_new();
+        imlib_context_push(new_context);
+
+        imlib_context_set_display(dpy);
+        imlib_context_set_drawable(RootWindow(dpy, screen_num));
+        imlib_context_set_colormap(DefaultColormap(dpy, screen_num));
+        imlib_context_set_visual(DefaultVisual(dpy, screen_num));
+
+        imlib_context_pop();
+
+        contexts[screen_num] = new_context;
+        screen_context = contexts.find(screen_num);
+    }
+
+    if (screen_context == contexts.end()) {
+#ifdef DEBUG
+        cerr << "ImageImlib2::load: error, couldnt find a valid Imlib_Context.\n";
+#endif // DEBUG
+        return 0;
+    }
+
+    // now load the stuff
+    Imlib_Context context = screen_context->second;
+    imlib_context_push(context);
+    Imlib_Image image = imlib_load_image_immediately(filename.c_str());
+    if (image) { // loading was ok
+        imlib_context_set_image(image);
+
+        Pixmap pm = 0, mask = 0;
+        imlib_render_pixmaps_for_whole_image(&pm, &mask);
+        
+        // pm and mask belong to imlib, so we have to copy them
+        FbPixmap fbpm;
+        FbPixmap fbmask;
+
+        fbpm.copy(pm);
+        fbmask.copy(mask);
+
+        // mark pm and mask as freeable in imlib
+        imlib_free_image();
+        imlib_free_pixmap_and_mask(pm);
+
+        imlib_context_pop();
+
+        PixmapWithMask* result = new PixmapWithMask();
+        result->pixmap() = fbpm;
+        result->mask() = fbmask;
+        return result;
+    }
+
+    // loading failure
+    imlib_context_pop();
+    return 0;
+}
+
+} // end namespace FbTk
diff --git a/src/FbTk/ImageImlib2.hh b/src/FbTk/ImageImlib2.hh
new file mode 100644
index 0000000..85aca68
--- /dev/null
+++ b/src/FbTk/ImageImlib2.hh
@@ -0,0 +1,39 @@
+// ImageImlib2.hh for FbTk - Fluxbox ToolKit
+// Copyright (c) 2004 Mathias Gumz (akira at fluxbox dot org)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+// $Id:$
+
+#ifndef FBTK_IMAGEIMLIB2_HH
+#define FBTK_IMAGEIMLIB2_HH
+
+#include "Image.hh"
+namespace FbTk {
+
+class ImageImlib2: public ImageBase {
+public:
+    ImageImlib2();
+    ~ImageImlib2();
+    PixmapWithMask *load(const std::string &filename, int screen_num) const;
+};
+
+} // end namespace FbTk
+
+#endif // FBTK_IMAGEIMLIB2_HH
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index be9b3ef..47ed58f 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -11,6 +11,9 @@ endif
 if XPM
 xpm_SOURCE= ImageXPM.hh ImageXPM.cc
 endif
+if IMLIB2
+imlib2_SOURCE= ImageImlib2.hh ImageImlib2.cc
+endif
 
 libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
         FileUtil.hh FileUtil.cc \
@@ -48,4 +51,5 @@ libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
         MenuIcon.hh MenuIcon.cc \
         ${xpm_SOURCE} \
         ${xft_SOURCE} \
-        ${xmb_SOURCE}
+        ${xmb_SOURCE} \
+        ${imlib2_SOURCE}
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
                              "Error message when no X display appears to exist"));
     }
 
-    FbTk::fontInit();
-
     Display *disp = FbTk::App::instance()->display();
     // For KDE dock applets
     // KDE v1.x
@@ -1369,7 +1367,6 @@ void Fluxbox::shutdown() {
              m_screen_list.end(), mem_fun(&BScreen::shutdown));
 
     sync(false);
-
 }
 
 /// saves resources
diff --git a/src/main.cc b/src/main.cc
index c91fb3f..b7fffc3 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -106,6 +106,11 @@ void showInfo(ostream &ostr) {
 #endif // HAVE_XPM
         "XPM"<<endl<<
 
+#ifndef HAVE_IMLIB2
+        NOT<<
+#endif // HAVE_IMLIB2
+        "IMLIB2"<<endl<<
+
 #ifndef USE_GNOME
         NOT<<
 #endif // USE_GNOME