4 files changed, 19 insertions, 13 deletions

diff --git a/src/FbTk/LResource.cc b/src/FbTk/LResource.cc
index 5842b65..78511eb 100644
--- a/src/FbTk/LResource.cc
+++ b/src/FbTk/LResource.cc
@@ -82,8 +82,8 @@ void LResourceManager::initState(lua::state &l) {
     l.setfield(lua::REGISTRYINDEX, make_root);
 }
 
-LResourceManager::LResourceManager(lua::state &l, const std::string &root)
-                        : m_l(&l), m_root(root) {
+LResourceManager::LResourceManager(const std::string &root, lua::state &l)
+                        : ResourceManager_base(root), m_l(&l) {
     l.checkstack(2);
     lua::stack_sentry s(l);
 
diff --git a/src/FbTk/LResource.hh b/src/FbTk/LResource.hh
index 0853687..185a029 100644
--- a/src/FbTk/LResource.hh
+++ b/src/FbTk/LResource.hh
@@ -39,7 +39,7 @@ class LResourceManager: public ResourceManager_base {
 public:
     static void initState(lua::state &l);
 
-    LResourceManager(lua::state &l, const std::string &root);
+    LResourceManager(const std::string &root, lua::state &l);
     virtual bool save(const char *filename, const char *);
     virtual void addResource(Resource_base &r);
     virtual void removeResource(Resource_base &r);
@@ -47,7 +47,6 @@ public:
 private:
 
     lua::state *m_l;
-    std::string m_root;
 };
 
 } // end namespace FbTk
diff --git a/src/FbTk/Resource.cc b/src/FbTk/Resource.cc
index fb0f595..37555b3 100644
--- a/src/FbTk/Resource.cc
+++ b/src/FbTk/Resource.cc
@@ -82,10 +82,13 @@ void ResourceManager_base::setResourceValue(const string &resname, const string
 
 }
 
-ResourceManager::ResourceManager(const char *filename, bool lock_db) :
+ResourceManager::ResourceManager(const std::string &root, const std::string &alt_root,
+                const char *filename, bool lock_db) :
+ ResourceManager_base(root),
  m_db_lock(0),
  m_database(0),
- m_filename(filename ? filename : "")
+ m_filename(filename ? filename : ""),
+ m_alt_root(alt_root)
 {
     static bool xrm_initialized = false;
     if (!xrm_initialized) {
@@ -131,8 +134,8 @@ bool ResourceManager::load(const char *filename) {
     for (; i != i_end; ++i) {
 
         Resource_base *resource = *i;
-        if (XrmGetResource(**m_database, resource->name().c_str(),
-                           resource->altName().c_str(), &value_type, &value))
+        if (XrmGetResource(**m_database, (m_root + '.' + resource->name()).c_str(),
+                           (m_alt_root + '.' + resource->altName()).c_str(), &value_type, &value))
             resource->setFromString(value.addr);
         else {
             _FB_USES_NLS;
@@ -166,13 +169,12 @@ bool ResourceManager::save(const char *filename, const char *mergefilename) {
     // empty database
     XrmDatabaseHelper database;
 
-    string rc_string;
     ResourceList::iterator i = m_resourcelist.begin();
     ResourceList::iterator i_end = m_resourcelist.end();
     //write all resources to database
     for (; i != i_end; ++i) {
         Resource_base *resource = *i;
-        rc_string = resource->name() + string(": ") + resource->getString();
+        const string &rc_string = m_root + '.' + resource->name() + ": " + resource->getString();
         XrmPutLineResource(&*database, rc_string.c_str());
     }
 
@@ -248,8 +250,8 @@ void ResourceManager::addResource(Resource_base &r) {
     char *value_type;
 
     // now, load the value for this resource
-    if (XrmGetResource(**m_database, r.name().c_str(),
-                       r.altName().c_str(), &value_type, &value)) {
+    if (XrmGetResource(**m_database, (m_root + '.' + r.name()).c_str(),
+                       (m_alt_root + '.' + r.altName()).c_str(), &value_type, &value)) {
         r.setFromString(value.addr);
     } else {
         std::cerr<<"Failed to read: "<<r.name()<<std::endl;
diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh
index 33a6bb2..744178b 100644
--- a/src/FbTk/Resource.hh
+++ b/src/FbTk/Resource.hh
@@ -87,6 +87,8 @@ class ResourceManager_base
 public:
     typedef std::list<Resource_base *> ResourceList;
 
+    ResourceManager_base(const std::string &root) : m_root(root) {}
+
     virtual ~ResourceManager_base() {}
 
     /// Save all resouces registered to this class
@@ -123,6 +125,7 @@ public:
 
 protected:
     ResourceList m_resourcelist;
+    const std::string m_root;
 };
 
 class ResourceManager: public ResourceManager_base
@@ -130,7 +133,8 @@ class ResourceManager: public ResourceManager_base
 public:
     // lock specifies if the database should be opened with one level locked
     // (useful for constructing inside initial set of constructors)
-    ResourceManager(const char *filename, bool lock_db);
+    ResourceManager(const std::string &root, const std::string &alt_root,
+            const char *filename, bool lock_db);
     virtual ~ResourceManager();
 
     /// Load all resources registered to this class
@@ -169,6 +173,7 @@ private:
     XrmDatabaseHelper *m_database;
 
     std::string m_filename;
+    std::string m_alt_root;
 };