Simplify FbTk::Resource template class

by outsourcing the conversion from string/lua to the specific type (and back) to a separate
class. This change touches a lot of files because the interface of FbTk::Resource changed
slightly. However, the changes are minor.

1 files changed, 34 insertions, 338 deletions

diff --git a/src/Resources.cc b/src/Resources.cc
index cdc142d..cf09543 100644
--- a/src/Resources.cc
+++ b/src/Resources.cc
@@ -48,343 +48,39 @@ using std::vector;
 namespace FbTk {
 
 template<>
-string FbTk::Resource<int>::
-getString() const {
-    return FbTk::StringUtil::number2String(**this);
-}
-
-template<>
-void FbTk::Resource<int>::
-setFromString(const char* strval) {
-    FbTk::StringUtil::extractNumber(strval, get());
-}
-
-template<>
-void FbTk::Resource<int>::setFromLua(lua::state &l) {
-    lua::stack_sentry s(l, -1);
-    if(l.isnumber(-1))
-        *this = l.tonumber(-1);
-    else if(l.isstring(-1))
-        setFromString(l.tostring(-1).c_str());
-    l.pop();
-}
-
-template<>
-void FbTk::Resource<int>::pushToLua(lua::state &l) const {
-    l.pushnumber(*this);
-}
-
-
-template<>
-string FbTk::Resource<string>::
-getString() const { return **this; }
-
-template<>
-void FbTk::Resource<string>::
-setFromString(const char *strval) {
-    *this = strval;
-}
-
-template<>
-void FbTk::Resource<string>::setFromLua(lua::state &l) {
-    lua::stack_sentry s(l, -1);
-    if(l.isstring(-1))
-        *this = l.tostring(-1);
-    l.pop();
-}
-
-template<>
-void FbTk::Resource<string>::pushToLua(lua::state &l) const {
-    l.pushstring(*this);
-}
-
-
-template<>
-string FbTk::Resource<bool>::
-getString() const {
-    return string(**this == true ? "true" : "false");
-}
-
-template<>
-void FbTk::Resource<bool>::
-setFromString(char const *strval) {
-    *this = (bool)!strcasecmp(strval, "true");
-}
-
-template<>
-void FbTk::Resource<bool>::setFromLua(lua::state &l) {
-    lua::stack_sentry s(l, -1);
-    if(l.isstring(-1))
-        setFromString(l.tostring(-1).c_str());
-    else if(l.isnumber(-1))
-        *this = l.tointeger(-1) != 0;
-    else
-        *this = l.toboolean(-1);
-    l.pop();
-}
-
-template<>
-void FbTk::Resource<bool>::pushToLua(lua::state &l) const {
-    l.pushboolean(*this);
-}
-
-
-namespace {
-    struct ButtonPair {
-        WinButton::Type type;
-        const char *name;
-    };
-    const ButtonPair button_map[] = {
-        { WinButton::SHADE, "Shade" },
-        { WinButton::MINIMIZE, "Minimize" },
-        { WinButton::MAXIMIZE, "Maximize" },
-        { WinButton::CLOSE, "Close" },
-        { WinButton::STICK, "Stick" },
-        { WinButton::MENUICON, "MenuIcon" }
-    };
-
-    const char *buttonToStr(WinButton::Type t) {
-        for(size_t i = 0; i < sizeof(button_map)/sizeof(button_map[0]); ++i) {
-            if(button_map[i].type == t)
-                return button_map[i].name;
-        }
-        assert(0);
-    }
-
-    WinButton::Type strToButton(const char *v) {
-        for(size_t i = 0; i < sizeof(button_map)/sizeof(button_map[0]); ++i) {
-            if(strcasecmp(v, button_map[i].name) == 0)
-                return button_map[i].type;
-        }
-        throw std::runtime_error("bad button");
-    }
-}
-
-template<>
-string FbTk::Resource<vector<WinButton::Type> >::
-getString() const {
-    string retval;
-    for (size_t i = 0; i < m_value.size(); i++) {
-        retval.append(buttonToStr(m_value[i]));
-        retval.append(" ");
-    }
-
-    return retval;
-}
-
-template<>
-void FbTk::Resource<vector<WinButton::Type> >::
-setFromString(char const *strval) {
-    vector<string> val;
-    StringUtil::stringtok(val, strval);
-    //clear old values
-    m_value.clear();
-
-    for (size_t i = 0; i < val.size(); i++) {
-        try {
-            m_value.push_back(strToButton(val[i].c_str()));
-        }
-        catch(std::runtime_error &) {
-        }
-    }
-}
-
-template<>
-void FbTk::Resource<vector<WinButton::Type> >::setFromLua(lua::state &l) {
-    l.checkstack(1);
-    lua::stack_sentry s(l, -1);
-
-    if(l.type(-1) == lua::TTABLE) {
-        for(size_t i = 0; l.rawgeti(-1, i), !l.isnil(-1); l.pop(), ++i) {
-            if(l.isstring(-1)) {
-                try {
-                    m_value.push_back(strToButton(l.tostring(-1).c_str()));
-                }
-                catch(std::runtime_error &) {
-                }
-            }
-        }
-        l.pop();
-    }
-    l.pop();
-}
-
-template<>
-void FbTk::Resource<vector<WinButton::Type> >::pushToLua(lua::state &l) const {
-    l.checkstack(2);
-    l.newtable();
-    lua::stack_sentry s(l);
-
-    for (size_t i = 0; i < m_value.size(); ++i) {
-        l.pushstring(buttonToStr(m_value[i]));
-        l.rawseti(-2, i);
-    }
-}
-
-
-template<>
-string FbTk::Resource<Fluxbox::TabsAttachArea>::
-getString() const {
-    if (m_value == Fluxbox::ATTACH_AREA_TITLEBAR)
-        return "Titlebar";
-    else
-        return "Window";
-}
-
-template<>
-void FbTk::Resource<Fluxbox::TabsAttachArea>::
-setFromString(char const *strval) {
-    if (strcasecmp(strval, "Titlebar")==0)
-        m_value= Fluxbox::ATTACH_AREA_TITLEBAR;
-    else
-        m_value= Fluxbox::ATTACH_AREA_WINDOW;
-}
-
-template<>
-void FbTk::Resource<Fluxbox::TabsAttachArea>::setFromLua(lua::state &l) {
-    lua::stack_sentry s(l, -1);
-
-    if(l.isstring(-1) && strcasecmp(l.tostring(-1).c_str(), "Titlebar") == 0)
-        m_value = Fluxbox::ATTACH_AREA_TITLEBAR;
-    else
-        m_value = Fluxbox::ATTACH_AREA_WINDOW;
-
-    l.pop();
-}
-
-template<>
-void FbTk::Resource<Fluxbox::TabsAttachArea>::pushToLua(lua::state &l) const {
-    l.checkstack(1);
-
-    l.pushstring(getString());
-}
-
-
-template<>
-string FbTk::Resource<unsigned int>::
-getString() const {
-    return FbTk::StringUtil::number2String(m_value);
-}
-
-template<>
-void FbTk::Resource<unsigned int>::
-setFromString(const char *strval) {
-    if (!FbTk::StringUtil::extractNumber(strval, m_value))
-        setDefaultValue();
-}
-
-template<>
-void FbTk::Resource<unsigned int>::setFromLua(lua::state &l) {
-    lua::stack_sentry s(l, -1);
-    if(l.isnumber(-1))
-        *this = l.tonumber(-1);
-    else if(l.isstring(-1))
-        setFromString(l.tostring(-1).c_str());
-    l.pop();
-}
-
-template<>
-void FbTk::Resource<unsigned int>::pushToLua(lua::state &l) const {
-    l.pushnumber(*this);
-}
-
-
-template<>
-string FbTk::Resource<long long>::
-getString() const {
-    return FbTk::StringUtil::number2String(m_value);
-}
-
-template<>
-void FbTk::Resource<long long>::
-setFromString(const char *strval) {
-    if (!FbTk::StringUtil::extractNumber(strval, m_value))
-        setDefaultValue();
-}
-
-template<>
-void FbTk::Resource<long long>::setFromLua(lua::state &l) {
-    lua::stack_sentry s(l, -1);
-    if(l.isnumber(-1))
-        *this = l.tonumber(-1);
-    else if(l.isstring(-1))
-        setFromString(l.tostring(-1).c_str());
-    l.pop();
-}
-
-template<>
-void FbTk::Resource<long long>::pushToLua(lua::state &l) const {
-    l.pushnumber(*this);
-}
-
-
-template<>
-string FbTk::Resource<ResourceLayer>::
-getString() const {
-    return ::ResourceLayer::getString(m_value.getNum());
-}
-
-template<>
-void FbTk::Resource<ResourceLayer>::
-setFromString(const char *strval) {
-    string str(strval);
-    int tempnum = ::ResourceLayer::getNumFromString(str);
-    if (tempnum >= 0 && tempnum < ::ResourceLayer::NUM_LAYERS)
-        m_value = tempnum;
-    else
-        setDefaultValue();
-}
-
-template<>
-void FbTk::Resource<ResourceLayer>::setFromLua(lua::state &l) {
-    lua::stack_sentry s(l, -1);
-
-    int tempnum = -1;
-    if(l.isnumber(-1))
-        tempnum = l.tonumber(-1);
-    else if(l.isstring(-1))
-        tempnum = ::ResourceLayer::getNumFromString(l.tostring(-1));
-
-    if (tempnum >= 0 && tempnum < ::ResourceLayer::NUM_LAYERS)
-        m_value = tempnum;
-    else
-        setDefaultValue();
-
-    l.pop();
-}
-
-template<>
-void FbTk::Resource<ResourceLayer>::pushToLua(lua::state &l) const {
-    l.pushstring(getString());
-}
-
-
-template<>
-string FbTk::Resource<long>::
-getString() const {
-    return FbTk::StringUtil::number2String(m_value);
-}
-
-template<>
-void FbTk::Resource<long>::
-setFromString(const char *strval) {
-    if (!FbTk::StringUtil::extractNumber(strval, m_value))
-        setDefaultValue();
-}
-
-template<>
-void FbTk::Resource<long>::setFromLua(lua::state &l) {
-    lua::stack_sentry s(l, -1);
-    if(l.isnumber(-1))
-        *this = l.tonumber(-1);
-    else if(l.isstring(-1))
-        setFromString(l.tostring(-1).c_str());
-    l.pop();
-}
-
-template<>
-void FbTk::Resource<long>::pushToLua(lua::state &l) const {
-    l.pushnumber(*this);
-}
+const EnumTraits<WinButton::Type>::Pair EnumTraits<WinButton::Type>::s_map[] = {
+    { "Shade",    WinButton::SHADE },
+    { "Minimize", WinButton::MINIMIZE },
+    { "Maximize", WinButton::MAXIMIZE },
+    { "Close",    WinButton::CLOSE },
+    { "Stick",    WinButton::STICK },
+    { "MenuIcon", WinButton::MENUICON },
+    { NULL,       WinButton::MENUICON }
+};
+
+template<>
+const EnumTraits<Fluxbox::TabsAttachArea>::Pair EnumTraits<Fluxbox::TabsAttachArea>::s_map[] = {
+    { "Titlebar", Fluxbox::ATTACH_AREA_TITLEBAR },
+    { "Window",   Fluxbox::ATTACH_AREA_WINDOW },
+    { NULL,       Fluxbox::ATTACH_AREA_WINDOW }
+};
+
+template<>
+const EnumTraits<ResourceLayer::Type>::Pair EnumTraits<ResourceLayer::Type>::s_map[] = {
+    { "Menu",     ResourceLayer::MENU },
+    { "1",        ResourceLayer::LAYER1 },
+    { "AboveDock",ResourceLayer::ABOVE_DOCK },
+    { "3",        ResourceLayer::LAYER3 },
+    { "Dock",     ResourceLayer::DOCK },
+    { "5",        ResourceLayer::LAYER5 },
+    { "Top",      ResourceLayer::TOP },
+    { "7",        ResourceLayer::LAYER7 },
+    { "Normal",   ResourceLayer::NORMAL },
+    { "9",        ResourceLayer::LAYER9 },
+    { "Bottom",   ResourceLayer::BOTTOM },
+    { "11",       ResourceLayer::LAYER11 },
+    { "Desktop",  ResourceLayer::DESKTOP },
+    { NULL,       ResourceLayer::DESKTOP }
+};
 
 } // end namespace FbTk