5 files changed, 193 insertions, 0 deletions

diff --git a/src/FbTk/Command.hh b/src/FbTk/Command.hh
index 391aa78..5d38cb8 100644
--- a/src/FbTk/Command.hh
+++ b/src/FbTk/Command.hh
@@ -31,6 +31,14 @@ public:
     virtual void execute() = 0;
 };
 
+/// Interface class for boolean commands
+class BoolCommand: public Command {
+public:
+    virtual ~BoolCommand() { }
+    virtual void execute() { bool_execute(); }
+    virtual bool bool_execute() = 0;
+};
+
 } // end namespace FbTk
 
 #endif // FBTK_COMMAND_HH
diff --git a/src/FbTk/LogicCommands.cc b/src/FbTk/LogicCommands.cc
new file mode 100644
index 0000000..99b5b53
--- /dev/null
+++ b/src/FbTk/LogicCommands.cc
@@ -0,0 +1,75 @@
+// LogicCommands.cc for FbTk
+// 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.
+
+// $Id: $
+
+#include "LogicCommands.hh"
+
+namespace FbTk {
+
+void OrCommand::add(RefCount<BoolCommand> &com) {
+    m_commandlist.push_back(com);
+}
+
+size_t OrCommand::size() const {
+    return m_commandlist.size();
+}
+
+bool OrCommand::bool_execute() {
+    for (size_t i=0; i < m_commandlist.size(); ++i) {
+        if (m_commandlist[i]->bool_execute())
+            return true;
+    }
+    return false;
+}
+
+void AndCommand::add(RefCount<BoolCommand> &com) {
+    m_commandlist.push_back(com);
+}
+
+size_t AndCommand::size() const {
+    return m_commandlist.size();
+}
+
+bool AndCommand::bool_execute() {
+    for (size_t i=0; i < m_commandlist.size(); ++i) {
+        if (!m_commandlist[i]->bool_execute())
+            return false;
+    }
+    return true;
+}
+
+void XorCommand::add(RefCount<BoolCommand> &com) {
+    m_commandlist.push_back(com);
+}
+
+size_t XorCommand::size() const {
+    return m_commandlist.size();
+}
+
+bool XorCommand::bool_execute() {
+    bool ret = false;
+    for (size_t i=0; i < m_commandlist.size(); ++i)
+        ret ^= m_commandlist[i]->bool_execute();
+    return ret;
+}
+
+}; // end namespace FbTk
diff --git a/src/FbTk/LogicCommands.hh b/src/FbTk/LogicCommands.hh
new file mode 100644
index 0000000..a94dad8
--- /dev/null
+++ b/src/FbTk/LogicCommands.hh
@@ -0,0 +1,97 @@
+// LogicCommands.hh for FbTk
+// 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.
+
+// $Id: $
+
+#ifndef FBTK_LOGICCOMMANDS_HH
+#define FBTK_LOGICCOMMANDS_HH
+
+#include "Command.hh"
+#include "RefCount.hh"
+
+#include <vector>
+
+namespace FbTk {
+
+/// executes a boolcommand and uses the result to decide what to do
+class IfCommand: public Command {
+public:
+    IfCommand(RefCount<BoolCommand> &cond,
+              RefCount<Command> &t, RefCount<Command> &f):
+        m_cond(cond), m_t(t), m_f(f) { }
+    void execute() {
+        if (m_cond->bool_execute())
+            m_t->execute();
+        else
+            m_f->execute();
+    }
+
+private:
+    RefCount<BoolCommand> m_cond;
+    RefCount<Command> m_t, m_f;
+};
+
+/// executes a list of boolcommands until one is true
+class OrCommand: public BoolCommand {
+public:
+    void add(RefCount<BoolCommand> &com);
+    size_t size() const;
+    bool bool_execute();
+
+private:
+    std::vector<RefCount<BoolCommand> > m_commandlist;
+};
+
+/// executes a list of boolcommands until one is false
+class AndCommand: public BoolCommand {
+public:
+    void add(RefCount<BoolCommand> &com);
+    size_t size() const;
+    bool bool_execute();
+
+private:
+    std::vector<RefCount<BoolCommand> > m_commandlist;
+};
+
+/// executes a list of boolcommands, returning the parity
+class XorCommand: public BoolCommand {
+public:
+    void add(RefCount<BoolCommand> &com);
+    size_t size() const;
+    bool bool_execute();
+
+private:
+    std::vector<RefCount<BoolCommand> > m_commandlist;
+};
+
+/// executes a boolcommand and returns the negation
+class NotCommand: public BoolCommand {
+public:
+    NotCommand(RefCount<BoolCommand> &com): m_command(com) { }
+    bool bool_execute() { return !m_command->bool_execute(); }
+
+private:
+    RefCount<BoolCommand> m_command;
+};
+
+} // end namespace FbTk
+
+#endif // FBTK_LOGICCOMMANDS_HH
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index d98c8f6..2bf9da7 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -21,6 +21,7 @@ libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
         FbWindow.hh FbWindow.cc Font.cc Font.hh FontImp.hh \
         I18n.cc I18n.hh \
         ImageControl.hh ImageControl.cc \
+        LogicCommands.hh LogicCommands.cc \
         MacroCommand.hh MacroCommand.cc \
         Menu.hh Menu.cc MenuItem.hh MenuItem.cc \
         MultiButtonMenuItem.hh MultiButtonMenuItem.cc \
diff --git a/src/FbTk/SimpleCommand.hh b/src/FbTk/SimpleCommand.hh
index 8cc7283..7ae91a5 100644
--- a/src/FbTk/SimpleCommand.hh
+++ b/src/FbTk/SimpleCommand.hh
@@ -39,6 +39,18 @@ private:
     Action m_action;
 };
 
+template <typename Receiver, typename ReturnType=bool>
+class SimpleBoolCommand: public BoolCommand {
+public:
+    typedef ReturnType (Receiver::* Action)();
+    SimpleBoolCommand(Receiver &r, Action a):
+        m_receiver(r), m_action(a) { }
+    bool bool_execute() { return (bool)(m_receiver.*m_action)(); }
+private:
+    Receiver &m_receiver;
+    Action m_action;
+};
+
 } // end namespace FbTk
 
 #endif // FBTK_SIMPLECOMMAND_HH