Merge branch 'master' of fluxbox@git.fluxbox.org:fluxbox

3 files changed, 121 insertions, 0 deletions

diff --git a/src/FbTk/AutoReloadHelper.cc b/src/FbTk/AutoReloadHelper.cc
new file mode 100644
index 0000000..e3c1d59
--- /dev/null
+++ b/src/FbTk/AutoReloadHelper.cc
@@ -0,0 +1,66 @@
+// AutoReloadHelper.cc
+// Copyright (c) 2008 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.
+
+#include "AutoReloadHelper.hh"
+
+#include "FileUtil.hh"
+#include "StringUtil.hh"
+
+namespace FbTk {
+
+void AutoReloadHelper::checkReload() {
+    if (!m_reload_cmd.get())
+        return;
+    TimestampMap::const_iterator it = m_timestamps.begin();
+    TimestampMap::const_iterator it_end = m_timestamps.end();
+    for (; it != it_end; ++it) {
+        if (FileUtil::getLastStatusChangeTimestamp(it->first.c_str()) !=
+            it->second) {
+            reload();
+            return;
+        }
+    }
+}
+
+void AutoReloadHelper::setMainFile(std::string file) {
+    file = StringUtil::expandFilename(file);
+    if (file == m_main_file)
+        return;
+    m_main_file = file;
+    reload();
+}
+
+void AutoReloadHelper::addFile(std::string file) {
+    if (file.empty())
+        return;
+    file = StringUtil::expandFilename(file);
+    m_timestamps[file] = FileUtil::getLastStatusChangeTimestamp(file.c_str());
+}
+
+void AutoReloadHelper::reload() {
+    if (!m_reload_cmd.get())
+        return;
+    m_timestamps.clear();
+    addFile(m_main_file);
+    m_reload_cmd->execute();
+}
+
+} // end namespace FbTk
diff --git a/src/FbTk/AutoReloadHelper.hh b/src/FbTk/AutoReloadHelper.hh
new file mode 100644
index 0000000..36be8f1
--- /dev/null
+++ b/src/FbTk/AutoReloadHelper.hh
@@ -0,0 +1,54 @@
+// AutoReloadHelper.hh
+// Copyright (c) 2008 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 AUTORELOADHELPER_HH
+#define AUTORELOADHELPER_HH
+
+#include <map>
+#include <string>
+#include <sys/types.h>
+
+#include "Command.hh"
+#include "RefCount.hh"
+
+namespace FbTk {
+
+class AutoReloadHelper {
+public:
+
+    void setMainFile(std::string filename);
+    void addFile(std::string filename);
+    void setReloadCmd(RefCount<Command<void> > cmd) { m_reload_cmd = cmd; }
+
+    void checkReload();
+    void reload();
+
+private:
+    RefCount<Command<void> > m_reload_cmd;
+    std::string m_main_file;
+
+    typedef std::map<std::string, time_t> TimestampMap;
+    TimestampMap m_timestamps;
+};
+
+} // end namespace FbTk
+
+#endif // AUTORELOADHELPER_HH
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index fcf0304..f830e4a 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -45,6 +45,7 @@ libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
         RegExp.hh RegExp.cc \
         FbString.hh FbString.cc \
         Subject.hh Subject.cc Observer.hh Observer.cc SimpleObserver.hh \
+        AutoReloadHelper.hh AutoReloadHelper.cc \
         Transparent.hh Transparent.cc \
         FbPixmap.hh FbPixmap.cc \
         FbDrawable.hh FbDrawable.cc \