merged changes from pre-devel

9 files changed, 25 insertions, 168 deletions

diff --git a/src/FbTk/ITypeAheadable.hh b/src/FbTk/ITypeAheadable.hh
index 1b0bd03..c998f98 100644
--- a/src/FbTk/ITypeAheadable.hh
+++ b/src/FbTk/ITypeAheadable.hh
@@ -19,6 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+// $Id$
+
 #ifndef FBTK_ITYPEAHEADABLE_HH
 #define FBTK_ITYPEAHEADABLE_HH
 
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index fadc998..d98c8f6 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -49,7 +49,6 @@ libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
         GContext.hh GContext.cc \
         KeyUtil.hh KeyUtil.cc \
         MenuSeparator.hh MenuSeparator.cc \
-        MenuIcon.hh MenuIcon.cc \
         stringstream.hh \
         TypeAhead.hh SearchResult.hh SearchResult.cc ITypeAheadable.hh \
         Select2nd.hh \
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index b0fcb4b..23efcfe 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -357,10 +357,6 @@ void Menu::enterSubmenu() {
     submenu->cycleItems(false);
 }
 
-void Menu::enterParent() {
-    internal_hide();
-}
-
 void Menu::disableTitle() {
     setTitleVisibility(false);
 }
@@ -1033,7 +1029,7 @@ void Menu::keyPressEvent(XKeyEvent &event) {
         break;
     case XK_Left: // enter parent if we have one
         resetTypeAhead();
-        enterParent();
+        internal_hide();
         break;
     case XK_Right: // enter submenu if we have one
         resetTypeAhead();
@@ -1046,7 +1042,7 @@ void Menu::keyPressEvent(XKeyEvent &event) {
         break;
     case XK_BackSpace:
         if (m_type_ahead.stringSize() == 0) {
-            enterParent();
+            internal_hide();
             break;           
         }    
 
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 34df40a..06af08d 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -49,7 +49,8 @@ class MenuItem;
 class ImageControl;
 
 ///   Base class for menus
-class Menu: public FbTk::EventHandler, FbTk::FbWindowRenderer, protected FbTk::Observer {
+class Menu: public FbTk::EventHandler, FbTk::FbWindowRenderer,
+            public FbTk::Observer {
 public:
     enum Alignment{ ALIGNDONTCARE = 1, ALIGNTOP, ALIGNBOTTOM };
     enum { RIGHT = 1, LEFT };
@@ -91,7 +92,6 @@ public:
     /// cycle through menuitems
     void cycleItems(bool reverse);
     void enterSubmenu();
-    void enterParent();
 
     void disableTitle();
     void enableTitle();
@@ -193,7 +193,7 @@ protected:
 
     virtual void internal_hide(bool first = true);
 
-    void update(FbTk::Subject *);
+    virtual void update(FbTk::Subject *);
 
 private: 
 
diff --git a/src/FbTk/MenuIcon.cc b/src/FbTk/MenuIcon.cc
deleted file mode 100644
index d64d876..0000000
--- a/src/FbTk/MenuIcon.cc
+++ /dev/null
@@ -1,96 +0,0 @@
-// MenuIcon.cc for FbTk - Fluxbox ToolKit
-// Copyright (c) 2004 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org)
-//                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$
-
-#include "MenuIcon.hh"
-
-#include "MenuTheme.hh"
-#include "Image.hh"
-#include "App.hh"
-
-namespace FbTk {
-
-MenuIcon::MenuIcon(const std::string &filename, FbString &label, int screen_num):
-    MenuItem(label),
-    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, bool draw_foreground, bool draw_background,
-                    int x, int y,
-                    unsigned int width, unsigned int height) const {
-
-    // all background
-    if (draw_background) {
-        Display *disp = FbTk::App::instance()->display();
-        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(disp, gc, m_mask.drawable());
-            XSetClipOrigin(disp, 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(disp, gc, None);
-        }
-    }
-    FbTk::MenuItem::draw(drawable, theme, highlight, 
-                         draw_background, draw_foreground, 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
deleted file mode 100644
index 90cf320..0000000
--- a/src/FbTk/MenuIcon.hh
+++ /dev/null
@@ -1,54 +0,0 @@
-// MenuIcon.hh for FbTk - Fluxbox ToolKit
-// Copyright (c) 2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
-//                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$
-
-#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, FbString &label, int screen_num);
-    void draw(FbDrawable &drawable, 
-              const MenuTheme &theme,
-              bool highlight,
-              bool draw_foreground, bool draw_background,
-              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
-
diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc
index bc80ca0..2576d2b 100644
--- a/src/FbTk/MenuItem.cc
+++ b/src/FbTk/MenuItem.cc
@@ -93,27 +93,32 @@ void MenuItem::draw(FbDrawable &draw,
     // Icon
     //
     if (draw_background) {
-        if (m_icon.get() != 0 && m_icon->pixmap.get() != 0) {
+        if (icon() != 0) {
+            // copy pixmap, so we don't resize the original
+            FbPixmap tmp_pixmap, tmp_mask;
+            tmp_pixmap.copy(icon()->pixmap());
+            tmp_mask.copy(icon()->mask());
+
             // scale pixmap to right size
-            if (height - 2*theme.bevelWidth() != m_icon->pixmap->height() &&
-                !m_icon->filename.empty()) {
+            if (height - 2*theme.bevelWidth() != tmp_pixmap.height()) {
                 unsigned int scale_size = height - 2*theme.bevelWidth();
-                m_icon->pixmap->scale(scale_size, scale_size);
+                tmp_pixmap.scale(scale_size, scale_size);
+                tmp_mask.scale(scale_size, scale_size);
             }
 
-            if (m_icon->pixmap->pixmap().drawable() != 0) {
+            if (tmp_pixmap.drawable() != 0) {
                 GC gc = theme.frameTextGC().gc();
                 int icon_x = x + theme.bevelWidth();
                 int icon_y = y + theme.bevelWidth();
                 // enable clip mask
-                XSetClipMask(disp, gc, m_icon->pixmap->mask().drawable());
+                XSetClipMask(disp, gc, tmp_mask.drawable());
                 XSetClipOrigin(disp, gc, icon_x, icon_y);
 
-                draw.copyArea(m_icon->pixmap->pixmap().drawable(),
+                draw.copyArea(tmp_pixmap.drawable(),
                               gc,
                               0, 0,
                               icon_x, icon_y,
-                              m_icon->pixmap->width(), m_icon->pixmap->height());
+                              tmp_pixmap.width(), tmp_pixmap.height());
 
                 // restore clip mask
                 XSetClipMask(disp, gc, None);
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh
index afb6be9..7fac8c7 100644
--- a/src/FbTk/MenuItem.hh
+++ b/src/FbTk/MenuItem.hh
@@ -101,6 +101,9 @@ public:
     */
     //@{
     virtual const std::string &label() const { return m_label; }
+    virtual const PixmapWithMask *icon() const {
+        return m_icon.get() ? m_icon->pixmap.get() : 0;
+    }
     virtual const Menu *submenu() const { return m_submenu; } 
     virtual bool isEnabled() const { return m_enabled; }
     virtual bool isSelected() const { return m_selected; }
diff --git a/src/FbTk/TypeAhead.hh b/src/FbTk/TypeAhead.hh
index 15246b9..b28c803 100644
--- a/src/FbTk/TypeAhead.hh
+++ b/src/FbTk/TypeAhead.hh
@@ -103,6 +103,8 @@ public:
 
         if (!m_search_results.empty())
             fillValues(m_search_results.back().result(), last_matched);
+        else
+            return *m_ref;
         return last_matched;
     }