6 files changed, 275 insertions, 50 deletions

diff --git a/src/FbTk/Accessor.hh b/src/FbTk/Accessor.hh
new file mode 100644
index 0000000..88db1aa
--- /dev/null
+++ b/src/FbTk/Accessor.hh
@@ -0,0 +1,85 @@
+// Accessor.hh
+// Copyright (c) 2007 Fluxbox Team (fluxgen 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.
+
+#ifndef FBTK_ACCESSOR_HH
+#define FBTK_ACCESSOR_HH
+
+namespace FbTk {
+
+// base class for objects that act like data type T
+template <typename T>
+class Accessor {
+public:
+    virtual Accessor<T> &operator =(const T &val) = 0;
+    virtual operator T() const = 0;
+};
+
+// essentially just a reference
+template <typename T>
+class SimpleAccessor: public Accessor<T> {
+public:
+    SimpleAccessor(T &val): m_val(val) { }
+    inline Accessor<T> &operator =(const T &val) { m_val = val; return *this; }
+    inline operator T() const { return m_val; }
+
+private:
+    T &m_val;
+};
+
+// use object methods as an accessor
+template <typename T, typename Receiver>
+class ObjectAccessor: public Accessor<T> {
+public:
+    typedef T (Receiver:: *Getter)() const;
+    typedef void (Receiver:: *Setter)(T &);
+    ObjectAccessor(Receiver &r, Getter g, Setter s):
+        m_receiver(r), m_getter(g), m_setter(s) { }
+
+    inline operator T() const { return (m_receiver.*m_getter)(); }
+    inline Accessor<T> &operator =(const T &val) {
+        (m_receiver.*m_setter)(val); return *this;
+    }
+
+private:
+    Receiver &m_receiver;
+    Getter m_getter;
+    Setter m_setter;
+};
+
+// same as above but with no set method
+template <typename T, typename Receiver>
+class ConstObjectAccessor: public Accessor<T> {
+public:
+    typedef T (Receiver:: *Getter)() const;
+    ConstObjectAccessor(const Receiver &r, Getter g):
+        m_receiver(r), m_getter(g) { }
+
+    inline operator T() const { return (m_receiver.*m_getter)(); }
+    inline Accessor<T> &operator =(const T &val) { return *this; }
+
+private:
+    const Receiver &m_receiver;
+    Getter m_getter;
+};
+
+}; // end namespace FbTk
+
+#endif // FBTK_ACCESSOR_HH
diff --git a/src/FbTk/BoolMenuItem.hh b/src/FbTk/BoolMenuItem.hh
new file mode 100644
index 0000000..2e8b2c3
--- /dev/null
+++ b/src/FbTk/BoolMenuItem.hh
@@ -0,0 +1,62 @@
+// BoolMenuItem.hh for FbTk
+// Copyright (c) 2003 - 2007 Henrik Kinnunen (fluxgen 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.
+
+#ifndef FBTK_BOOLMENUITEM_HH
+#define FBTK_BOOLMENUITEM_HH
+
+#include "MenuItem.hh"
+#include "Accessor.hh"
+
+namespace FbTk {
+
+/// a bool menu item
+class BoolMenuItem: public FbTk::MenuItem {
+public:
+    BoolMenuItem(const FbTk::FbString &label, Accessor<bool> &item, 
+                 FbTk::RefCount<FbTk::Command> &cmd):
+        FbTk::MenuItem(label, cmd), m_item(item) { 
+        FbTk::MenuItem::setSelected(m_item);
+        setToggleItem(true);
+        setCloseOnClick(false);
+    }
+    BoolMenuItem(const FbTk::FbString &label, Accessor<bool> &item):
+        FbTk::MenuItem(label), m_item(item) {
+        FbTk::MenuItem::setSelected(m_item);
+        setToggleItem(true);
+        setCloseOnClick(false);
+    }
+    bool isSelected() const { return m_item; }
+    // toggle state
+    void click(int button, int time, unsigned int mods) {
+        setSelected(!m_item);
+        FbTk::MenuItem::click(button, time, mods);
+    }
+    void setSelected(bool value) { 
+        m_item = value;
+        FbTk::MenuItem::setSelected(m_item);
+    }
+private:
+    Accessor<bool> &m_item;
+};
+
+}; // end namespace FbTk
+
+#endif // FBTK_BOOLMENUITEM_HH
diff --git a/src/FbTk/DefaultValue.hh b/src/FbTk/DefaultValue.hh
index 4e7eb49..95b534a 100644
--- a/src/FbTk/DefaultValue.hh
+++ b/src/FbTk/DefaultValue.hh
@@ -22,58 +22,32 @@
 #ifndef FBTK_DEFAULTVALUE_HH
 #define FBTK_DEFAULTVALUE_HH
 
-namespace FbTk {
-
-// classes for overriding default values without having to listen for changes
-template <typename T>
-class DefaultValue {
-public:
-    DefaultValue(const T &def):
-        m_default(def), m_actual(def), m_use_default(true) { }
+#include "Accessor.hh"
 
-    inline const T &get() const { return m_use_default ? m_default : m_actual; }
-    inline void set(const T &val) { m_use_default = false; m_actual = val; }
-    inline void restoreDefault() { m_use_default = true; }
-    inline bool isDefault() const { return m_use_default; }
-
-    inline DefaultValue<T> &operator =(const T &val) {
-        set(val); return *this;
-    }
+namespace FbTk {
 
-    inline operator T() const { return get(); }
+// class for overriding default values and restoring them later
 
-private:
-    const T &m_default;
-    T m_actual;
-    bool m_use_default;
-};
-
-// designed for use with built-in types T, thus no need to return references
-template <typename T, typename Receiver>
-class DefaultAccessor {
+// Ret = type of value that gets returned
+// Def = type of default value -- may be Accessor<Ret> &, for example
+template <typename Ret, typename Def=Ret &>
+class DefaultValue: public Accessor<Ret> {
 public:
-    typedef T (Receiver:: *Accessor)() const;
-    DefaultAccessor(const Receiver &r, Accessor a):
-        m_receiver(r), m_accessor(a), m_actual((r.*a)()),
-        m_use_default(true) { }
+    DefaultValue(const Def def):
+        m_default(def), m_actual(def), m_use_default(true) { }
 
-    inline const T get() const {
-        return m_use_default ? (m_receiver.*m_accessor)() : m_actual;
-    }
-    inline void set(const T &val) { m_use_default = false; m_actual = val; }
     inline void restoreDefault() { m_use_default = true; }
     inline bool isDefault() const { return m_use_default; }
 
-    inline DefaultAccessor<T, Receiver> &operator =(const T &val) {
-        set(val); return *this;
+    inline DefaultValue<Ret, Def> &operator =(const Ret &val) {
+        m_use_default = false; m_actual = val; return *this;
     }
 
-    inline operator T() const { return get(); }
+    inline operator Ret() const { return m_use_default ? m_default : m_actual; }
 
 private:
-    const Receiver &m_receiver;
-    Accessor m_accessor;
-    T m_actual;
+    const Def m_default;
+    Ret m_actual;
     bool m_use_default;
 };
 
diff --git a/src/FbTk/IntMenuItem.hh b/src/FbTk/IntMenuItem.hh
new file mode 100644
index 0000000..6246787
--- /dev/null
+++ b/src/FbTk/IntMenuItem.hh
@@ -0,0 +1,102 @@
+// IntMenuItem.hh for FbTk
+// Copyright (c) 2003-2007 Henrik Kinnunen (fluxgen 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.
+
+#ifndef FBTK_INTMENUITEM_HH
+#define FBTK_INTMENUITEM_HH
+
+#include "MenuItem.hh"
+#include "Accessor.hh"
+
+#include <string>
+
+namespace FbTk {
+
+/// Changes an resource integer value between min and max
+class IntMenuItem: public FbTk::MenuItem {
+public:
+    IntMenuItem(const FbTk::FbString &label, Accessor<int> &res,
+                   int min_val, int max_val, FbTk::Menu &host_menu) :
+        FbTk::MenuItem(label, host_menu), m_org_label(FbTk::MenuItem::label()),
+        m_max(max_val), m_min(min_val), m_res(res) { 
+        updateLabel();
+        setCloseOnClick(false);
+    }
+
+    /* Utility, but doesn't get found in anonymous namespace? */
+    std::string appendIntValue(const std::string &label, int value) {
+        char *buff = new char[label.size() + 16];
+        sprintf(buff, "%s:  %d", label.c_str(), value);
+        std::string ret(buff);
+        delete [] buff;
+        return ret;
+    }
+
+    void click(int button, int time, unsigned int mods) {
+        static int last_time = -201;
+        int inc_val = 1;
+        // check double click
+        //!! TODO: must have some sort of "global" double click time in FbTk
+        if (time - last_time <= 200)
+            inc_val = 5;
+
+        last_time = time;
+
+        // make sure values stay within bounds _before_ we try to set m_res
+        // otherwise, this may cause bugs (say, with casting to unsigned char)
+        if ((button == 4 || button == 3) && m_res < m_max) { // up
+            if (m_res + inc_val < m_max)
+                m_res = m_res + inc_val;
+            else
+                m_res = m_max;
+        } else if ((button == 5 || button == 1) && m_res > m_min) { // down
+            if (m_res - inc_val >= m_min)
+                m_res = m_res - inc_val;
+            else
+                m_res = m_min;
+        }
+
+        // update label
+        updateLabel();
+        // call other commands
+        FbTk::MenuItem::click(button, time, mods);
+        
+        // show new value, which for us means forcing a full menu update
+        // since the text is drawn onto the background!
+        if (menu()) {
+            menu()->frameWindow().updateBackground(false);
+            menu()->clearWindow();
+        }
+    }
+
+    void updateLabel() {
+        setLabel(appendIntValue(m_org_label, m_res));
+    }
+
+private:
+    std::string m_org_label; ///< original label
+    const int m_max; ///< maximum value the integer can have
+    const int m_min; ///< minimum value the integer can have
+    Accessor<int> &m_res; ///< resource item to be changed
+};
+
+}; // end namespace FbTk
+
+#endif // FBTK_INTMENUITEM_HH
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index 0de5475..e3e5d76 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -16,7 +16,7 @@ imlib2_SOURCE= ImageImlib2.hh ImageImlib2.cc
 endif
 
 libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
-        ObjectRegistry.hh DefaultValue.hh \
+        ObjectRegistry.hh Accessor.hh DefaultValue.hh \
         FileUtil.hh FileUtil.cc \
         EventHandler.hh EventManager.hh EventManager.cc \
         FbWindow.hh FbWindow.cc Font.cc Font.hh FontImp.hh \
@@ -25,6 +25,7 @@ libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
         LogicCommands.hh LogicCommands.cc \
         MacroCommand.hh MacroCommand.cc \
         Menu.hh Menu.cc MenuItem.hh MenuItem.cc \
+        BoolMenuItem.hh IntMenuItem.hh \
         MultiButtonMenuItem.hh MultiButtonMenuItem.cc \
         MenuTheme.hh MenuTheme.cc NotCopyable.hh \
         RefCount.hh SimpleCommand.hh SignalHandler.cc SignalHandler.hh \
diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh
index 55eeddc..20ce3ba 100644
--- a/src/FbTk/Resource.hh
+++ b/src/FbTk/Resource.hh
@@ -25,6 +25,7 @@
 #define FBTK_RESOURCE_HH
 
 #include "NotCopyable.hh"
+#include "Accessor.hh"
 
 #include <string>
 #include <list>
@@ -160,23 +161,22 @@ private:
 
 /// Real resource class
 /**
- * usage: Resource<int> someresource(resourcemanager, 10, "someresourcename", "somealternativename"); \n
- * and then implement setFromString and getString \n
- * example: \n
- * template <> \n
- * void Resource<int>::setFromString(const char *str) { \n
- *   *(*this) = atoi(str); \n
+ * usage: Resource<int> someresource(resourcemanager, 10, "someresourcename", "somealternativename");
+ * and then implement setFromString and getString
+ * example:
+ * template <>
+ * void Resource<int>::setFromString(const char *str) {
+ *   *(*this) = atoi(str);
  * }
  */
 template <typename T>
-class Resource:public Resource_base
-{
+class Resource:public Resource_base, public Accessor<T> {
 public: 
     typedef T Type;
     Resource(ResourceManager &rm, T val, 
              const std::string &name, const std::string &altname):
         Resource_base(name, altname),
-        m_value(val), m_defaultval(val),
+        m_value(val), m_defaultval(val),
         m_rm(rm) {
         m_rm.addResource(*this); // add this to resource handler
     }
@@ -192,6 +192,7 @@ public:
     /// @return string value of resource
     std::string getString() const;
 
+    inline operator T() const { return m_value; }
     inline T& get() { return m_value; }
     inline T& operator*() { return m_value; }
     inline const T& operator*() const { return m_value; }