3 files changed, 38 insertions, 5 deletions

diff --git a/src/FbTk/LResource.cc b/src/FbTk/LResource.cc
index 31362bd..de90b95 100644
--- a/src/FbTk/LResource.cc
+++ b/src/FbTk/LResource.cc
@@ -26,8 +26,11 @@
 
 #include "I18n.hh"
 #include "LuaUtil.hh"
+#include "MemFun.hh"
 #include "Resource.hh"
 
+// defined in LResourceHelper-lua.cc
+// contains the compiled code of LResourceHelper.lua
 extern const char LResourceHelper[];
 extern const unsigned int LResourceHelper_size;
 
@@ -101,8 +104,15 @@ void LResourceManager::convert(ResourceManager &old, const std::string &new_file
     new_rm.save(new_file.c_str(), NULL);
 }
 
-LResourceManager::LResourceManager(const std::string &root, Lua &l)
-        : ResourceManager_base(root), m_l(&l) {
+LResourceManager::LResourceManager(const std::string &root, Lua &l, unsigned int autosave)
+    : ResourceManager_base(root), m_l(&l) {
+
+    m_savetimer.setInterval(autosave);
+    m_savetimer.fireOnce(true);
+    m_savetimer.setFunctor( MemFunBind(*this, &LResourceManager::save,
+                static_cast<const char *>(NULL), static_cast<const char *>(NULL)
+            ) );
+
     setLua(l);
 }
 
@@ -143,6 +153,8 @@ bool LResourceManager::save(const char *filename, const char *) {
     if(filename == NULL)
         filename = m_filename.c_str();
 
+    std::cerr << "XXX SAVING " << filename << std::endl;
+
     m_l->getfield(lua::REGISTRYINDEX, dump_resources);
     m_l->getfield(lua::GLOBALSINDEX, m_root.c_str());
     m_l->pushstring(filename);
@@ -194,6 +206,11 @@ void LResourceManager::doRemoveResource(Resource_base &r) {
     m_l->pop();
 }
 
+void LResourceManager::resourceChanged(Resource_base &r) {
+    if(! m_savetimer.isTiming())
+        m_savetimer.start();
+}
+
 void LResourceManager::setLua(Lua &l) {
     l.checkstack(2);
     lua::stack_sentry s(l);
diff --git a/src/FbTk/LResource.hh b/src/FbTk/LResource.hh
index f0f8050..30f0e02 100644
--- a/src/FbTk/LResource.hh
+++ b/src/FbTk/LResource.hh
@@ -28,6 +28,7 @@
 #include <string>
 
 #include "Resource.hh"
+#include "Timer.hh"
 
 namespace FbTk {
 
@@ -37,11 +38,18 @@ class LResourceManager: public ResourceManager_base {
 public:
     static void convert(ResourceManager &old, const std::string &new_file);
 
-    LResourceManager(const std::string &root, Lua &l);
+    /**
+     * @param root the name of the table where settings will reside
+     * @param l lua context
+     * @param autosave delay (in seconds) for automatic saving of resources. Modifying a resource
+     * starts a timer. If another resource is modified, the timer is restarted. 0 = disabled
+     */
+    LResourceManager(const std::string &root, Lua &l, unsigned int autosave = 0);
     void load(const std::string &filename, const std::string &fallback);
     virtual bool save(const char *filename, const char *);
     virtual void addResource(Resource_base &r);
     virtual void removeResource(Resource_base &r);
+    virtual void resourceChanged(Resource_base &r);
     void setLua(Lua &l);
 
 private:
@@ -50,6 +58,7 @@ private:
 
     Lua *m_l;
     std::string m_filename;
+    Timer m_savetimer;
 };
 
 } // end namespace FbTk
diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh
index 7a797a1..c4a7951 100644
--- a/src/FbTk/Resource.hh
+++ b/src/FbTk/Resource.hh
@@ -96,8 +96,6 @@ public:
     /// @return true on success
     virtual bool save(const char *filename, const char *mergefilename=0) = 0;
 
-
-
     /// Add resource to list, only used in Resource<T>
     virtual void addResource(Resource_base &r);
 
@@ -106,6 +104,9 @@ public:
         m_resourcelist.remove(&r);
     }
 
+    /// Called by Resources when their value changes
+    virtual void resourceChanged(Resource_base &r) = 0;
+
     /// searches for the resource with the resourcename
     /// @return pointer to resource base on success, else 0.
     Resource_base *findResource(const std::string &resourcename);
@@ -154,6 +155,8 @@ public:
     /// Add resource to list, only used in Resource<T>
     virtual void addResource(Resource_base &r);
 
+    virtual void resourceChanged(Resource_base &r) {};
+
     // this marks the database as "in use" and will avoid reloading
     // resources unless it is zero.
     // It returns this resource manager. Useful for passing to
@@ -211,12 +214,14 @@ public:
 
     void setDefaultValue() {
         m_value = m_defaultval;
+        m_rm.resourceChanged(*this);
         m_modified_sig.emit(m_value);
     }
     /// sets resource from string, specialized, must be implemented
     void setFromString(const char *strval) {
         try {
             m_value = Traits::fromString(strval);
+            m_rm.resourceChanged(*this);
             m_modified_sig.emit(m_value);
         }
         catch(ConversionError &e) {
@@ -226,6 +231,7 @@ public:
     }
     Accessor<T> &operator =(const T& newvalue) {
         m_value = newvalue;
+        m_rm.resourceChanged(*this);
         m_modified_sig.emit(m_value);
         return *this;
     }
@@ -236,6 +242,7 @@ public:
     virtual void setFromLua(lua::state &l) {
         try {
             m_value = Traits::fromLua(l);
+            m_rm.resourceChanged(*this);
             m_modified_sig.emit(m_value);
         }
         catch(ConversionError &e) {