2 files changed, 149 insertions, 0 deletions

diff --git a/src/FbTk/MenuIcon.cc b/src/FbTk/MenuIcon.cc
new file mode 100644
index 0000000..168e056
--- /dev/null
+++ b/src/FbTk/MenuIcon.cc
@@ -0,0 +1,96 @@
+// MenuIcon.cc for FbTk - Fluxbox ToolKit
+// Copyright (c) 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+//                and Simon Bowden (rathnor 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"),
+// 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: MenuIcon.cc,v 1.1 2004/06/07 22:28:39 fluxgen Exp $
+
+#include "MenuIcon.hh"
+
+#include "MenuTheme.hh"
+#include "Image.hh"
+#include "App.hh"
+
+namespace FbTk {
+
+MenuIcon::MenuIcon(const std::string &filename, const std::string &label, int screen_num):
+    MenuItem(label.c_str()),
+    m_filename(filename) {
+    FbTk::PixmapWithMask *pm = Image::load(filename.c_str(), screen_num);
+    if (pm != 0) {
+        m_pixmap = pm->pixmap().release();
+        m_mask = pm->mask().release();
+        delete pm;
+    }
+    
+}
+
+void MenuIcon::updateTheme(const MenuTheme &theme) {
+    FbTk::PixmapWithMask *pm = Image::load(m_filename.c_str(), theme.screenNum());
+    if (pm != 0) {
+        m_pixmap = pm->pixmap().release();
+        m_mask = pm->mask().release();
+        delete pm;
+    }
+}
+
+void MenuIcon::draw(FbDrawable &drawable, 
+                    const MenuTheme &theme,
+                    bool highlight,
+                    int x, int y,
+                    unsigned int width, unsigned int height) const {
+
+    if (height - 2*theme.bevelWidth() != m_pixmap.height() &&
+        !m_filename.empty()) {
+        unsigned int scale_size = height - 2*theme.bevelWidth();
+        m_pixmap.scale(scale_size, scale_size);
+        m_mask.scale(scale_size, scale_size);
+    }
+
+    if (m_pixmap.drawable() != 0) {
+        GC gc = theme.frameTextGC().gc();
+
+        // enable clip mask
+        XSetClipMask(FbTk::App::instance()->display(),
+                     gc,
+                     m_mask.drawable());
+        XSetClipOrigin(FbTk::App::instance()->display(),
+                       gc, x + theme.bevelWidth(), y + theme.bevelWidth());
+
+        drawable.copyArea(m_pixmap.drawable(),
+                          gc,
+                          0, 0,
+                          x + theme.bevelWidth(), y + theme.bevelWidth(),
+                          m_pixmap.width(), m_pixmap.height());
+
+        // restore clip mask
+        XSetClipMask(FbTk::App::instance()->display(),
+                     gc,
+                     None);
+    }
+    FbTk::MenuItem::draw(drawable, theme, highlight, x, y, width, height);
+}
+
+unsigned int MenuIcon::width(const MenuTheme &theme) const {
+    return MenuItem::width(theme) + 2 * (theme.bevelWidth()  + height(theme));
+}
+
+} // end namespace FbTk
+
diff --git a/src/FbTk/MenuIcon.hh b/src/FbTk/MenuIcon.hh
new file mode 100644
index 0000000..de695b1
--- /dev/null
+++ b/src/FbTk/MenuIcon.hh
@@ -0,0 +1,53 @@
+// MenuIcon.hh for FbTk - Fluxbox ToolKit
+// Copyright (c) 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+//                and Simon Bowden (rathnor 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"),
+// 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: MenuIcon.hh,v 1.1 2004/06/07 22:28:39 fluxgen Exp $
+
+#ifndef MENUICON_HH
+#define MENUICON_HH
+
+#include "MenuItem.hh"
+#include "FbPixmap.hh"
+
+#include <string>
+
+namespace FbTk {
+
+class MenuIcon: public MenuItem {
+public:
+    MenuIcon(const std::string &filename, const std::string &label, int screen_num);
+    void draw(FbDrawable &drawable, 
+              const MenuTheme &theme,
+              bool highlight,
+              int x, int y,
+              unsigned int width, unsigned int height) const;
+    unsigned int width(const MenuTheme &item) const;
+    void updateTheme(const MenuTheme &theme);
+private:
+    mutable FbPixmap m_pixmap, m_mask;
+    const std::string m_filename;
+};
+
+} // end namespace FbTk
+
+#endif // MENUICON_HH
+