A rough version of resource implementation in lua

I added a new class, LResourceManager, which should handle loading and saving of resources like
the old ResourceManager, only it does that with the help of lua. I moved the common features of
the two managers (interface + a few functions) to a common base class ResourceManager_base. I
augmented the Resource_base class with two new functions (setFromLua and pushToLua) which are
used by the lua RM instead of getString and setFromString.

Parts of the new RM are written in lua. To avoid loading scripts from a file at runtime I decided
to link compiled lua code straight into the executable. For this purpose I created a small script
which converts a binary file into a declaration of a C array of bytes.

1 files changed, 163 insertions, 0 deletions

diff --git a/src/FbTk/LResource.cc b/src/FbTk/LResource.cc
new file mode 100644
index 0000000..fd8ef2f
--- /dev/null
+++ b/src/FbTk/LResource.cc
@@ -0,0 +1,163 @@
+// LResource: Fluxbox Resource implementation in lua
+// Copyright (C) 2010 - 2011 Pavel Labath
+//
+// 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 <config.h>
+
+#include "LResource.hh"
+
+#include "Resource.hh"
+#include "Luamm.hh"
+
+extern const char LResourceHelper[];
+extern const unsigned int LResourceHelper_size;
+
+namespace FbTk {
+
+namespace {
+    const char make_root[] = "FbTk::make_root";
+    const char register_resource[] = "FbTk::register_resource";
+    const char dump_resources[] = "FbTk::dump_resources";
+    const char resource_metatable[] = "FbTk::resource_metatable";
+
+    int readResource(lua::state *l) {
+        Resource_base *r = *static_cast<Resource_base **>(l->touserdata(-1));
+        l->pop();
+
+        if(r != NULL)
+            r->pushToLua(*l);
+        else
+            l->pushnil();
+
+        return 1;
+    }
+
+    int writeResource(lua::state *l) {
+        Resource_base *r = *static_cast<Resource_base **>(l->touserdata(-2));
+        l->replace(-2);
+
+        if(r != NULL)
+            r->setFromLua(*l);
+        else
+            l->pop();
+
+        return 0;
+    }
+}
+
+void LResourceManager::initState(lua::state &l) {
+    l.checkstack(6);
+    lua::stack_sentry s(l);
+
+    l.loadstring(LResourceHelper, LResourceHelper_size);
+    l.pushfunction(&readResource);
+    l.pushfunction(&writeResource);
+    l.newtable(); {
+        l.newtable(); {
+            l.pushvalue(-2);
+            l.setfield(-2, "__metatable");
+        } l.setfield(lua::REGISTRYINDEX, resource_metatable);
+    }
+    l.call(3, 3);
+    l.setfield(lua::REGISTRYINDEX, dump_resources);
+    l.setfield(lua::REGISTRYINDEX, register_resource);
+    l.setfield(lua::REGISTRYINDEX, make_root);
+}
+
+LResourceManager::LResourceManager(lua::state &l, const std::string &root)
+                        : m_l(&l), m_root(root) {
+    l.checkstack(2);
+    lua::stack_sentry s(l);
+
+    l.getfield(lua::REGISTRYINDEX, make_root);
+    l.pushstring(root);
+    l.call(1, 0);
+}
+
+bool LResourceManager::save(const char *filename, const char *) {
+    m_l->checkstack(3);
+    lua::stack_sentry s(*m_l);
+
+    m_l->getfield(lua::REGISTRYINDEX, dump_resources);
+    m_l->getfield(lua::GLOBALSINDEX, m_root.c_str());
+    m_l->pushstring(filename);
+    m_l->call(2, 0);
+
+    return true; // FIXME
+}
+
+void LResourceManager::addResource(Resource_base &r) {
+    m_l->checkstack(5);
+    lua::stack_sentry s(*m_l);
+
+    m_resourcelist.push_back(&r);
+    m_resourcelist.unique();
+
+    m_l->getfield(lua::REGISTRYINDEX, register_resource);
+    m_l->getfield(lua::GLOBALSINDEX, m_root.c_str());
+    m_l->pushstring(r.name());
+    m_l->createuserdata<Resource_base *>(&r); {
+        m_l->getfield(lua::REGISTRYINDEX, resource_metatable);
+        m_l->setmetatable(-2);
+    }
+    m_l->call(3, 0);
+}
+
+void LResourceManager::removeResource(Resource_base &r) {
+    m_l->checkstack(5);
+    lua::stack_sentry s(*m_l);
+
+    m_l->getfield(lua::REGISTRYINDEX, register_resource);
+    m_l->getfield(lua::GLOBALSINDEX, m_root.c_str());
+    m_l->pushstring(r.name());
+    r.pushToLua(*m_l);
+    m_l->call(3, 1);
+    *static_cast<Resource_base **>(m_l->touserdata(-1)) = NULL;
+    m_l->pop();
+
+    m_resourcelist.remove(&r);
+}
+
+Resource_base *LResourceManager::findResource(const std::string &resname) {
+    // find resource name
+    ResourceList::const_iterator i = m_resourcelist.begin();
+    ResourceList::const_iterator i_end = m_resourcelist.end();
+    for (; i != i_end; ++i) {
+        if ((*i)->name() == resname ||
+                (*i)->altName() == resname)
+            return *i;
+    }
+    return 0;
+}
+
+const Resource_base *LResourceManager::findResource(const std::string &resname) const {
+    // find resource name
+    ResourceList::const_iterator i = m_resourcelist.begin();
+    ResourceList::const_iterator i_end = m_resourcelist.end();
+    for (; i != i_end; ++i) {
+        if ((*i)->name() == resname ||
+                (*i)->altName() == resname)
+            return *i;
+    }
+    return 0;
+}
+
+} // end namespace FbTk