diff options
-rw-r--r-- | src/FbTk/LResource.cc | 34 | ||||
-rw-r--r-- | src/FbTk/LResource.hh | 2 | ||||
-rw-r--r-- | src/fluxbox.cc | 22 |
3 files changed, 37 insertions, 21 deletions
diff --git a/src/FbTk/LResource.cc b/src/FbTk/LResource.cc index 0909520..31362bd 100644 --- a/src/FbTk/LResource.cc +++ b/src/FbTk/LResource.cc | |||
@@ -24,6 +24,7 @@ | |||
24 | 24 | ||
25 | #include "LResource.hh" | 25 | #include "LResource.hh" |
26 | 26 | ||
27 | #include "I18n.hh" | ||
27 | #include "LuaUtil.hh" | 28 | #include "LuaUtil.hh" |
28 | #include "Resource.hh" | 29 | #include "Resource.hh" |
29 | 30 | ||
@@ -105,10 +106,43 @@ LResourceManager::LResourceManager(const std::string &root, Lua &l) | |||
105 | setLua(l); | 106 | setLua(l); |
106 | } | 107 | } |
107 | 108 | ||
109 | void LResourceManager::load(const std::string &filename, const std::string &fallback) { | ||
110 | _FB_USES_NLS; | ||
111 | m_l->checkstack(1); | ||
112 | lua::stack_sentry s(*m_l); | ||
113 | |||
114 | m_filename = filename; | ||
115 | |||
116 | try { | ||
117 | m_l->loadfile(filename.c_str()); | ||
118 | m_l->call(0, 0); | ||
119 | } | ||
120 | catch(lua::exception &e) { | ||
121 | std::cerr << _FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", | ||
122 | "Failed trying to read rc file") << ":" << filename << std::endl; | ||
123 | std::cerr << "Fluxbox: " << e.what() << std::endl; | ||
124 | std::cerr << _FB_CONSOLETEXT(Fluxbox, CantLoadRCFileTrying, "Retrying with", | ||
125 | "Retrying rc file loading with (the following file)") | ||
126 | << ": " << fallback << std::endl; | ||
127 | try { | ||
128 | m_l->loadfile(fallback.c_str()); | ||
129 | m_l->call(0, 0); | ||
130 | } | ||
131 | catch(lua::exception &e) { | ||
132 | std::cerr << _FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "") | ||
133 | << ": " << fallback << std::endl; | ||
134 | std::cerr << "Fluxbox: " << e.what() << std::endl; | ||
135 | } | ||
136 | } | ||
137 | } | ||
138 | |||
108 | bool LResourceManager::save(const char *filename, const char *) { | 139 | bool LResourceManager::save(const char *filename, const char *) { |
109 | m_l->checkstack(3); | 140 | m_l->checkstack(3); |
110 | lua::stack_sentry s(*m_l); | 141 | lua::stack_sentry s(*m_l); |
111 | 142 | ||
143 | if(filename == NULL) | ||
144 | filename = m_filename.c_str(); | ||
145 | |||
112 | m_l->getfield(lua::REGISTRYINDEX, dump_resources); | 146 | m_l->getfield(lua::REGISTRYINDEX, dump_resources); |
113 | m_l->getfield(lua::GLOBALSINDEX, m_root.c_str()); | 147 | m_l->getfield(lua::GLOBALSINDEX, m_root.c_str()); |
114 | m_l->pushstring(filename); | 148 | m_l->pushstring(filename); |
diff --git a/src/FbTk/LResource.hh b/src/FbTk/LResource.hh index bb7f224..f0f8050 100644 --- a/src/FbTk/LResource.hh +++ b/src/FbTk/LResource.hh | |||
@@ -38,6 +38,7 @@ public: | |||
38 | static void convert(ResourceManager &old, const std::string &new_file); | 38 | static void convert(ResourceManager &old, const std::string &new_file); |
39 | 39 | ||
40 | LResourceManager(const std::string &root, Lua &l); | 40 | LResourceManager(const std::string &root, Lua &l); |
41 | void load(const std::string &filename, const std::string &fallback); | ||
41 | virtual bool save(const char *filename, const char *); | 42 | virtual bool save(const char *filename, const char *); |
42 | virtual void addResource(Resource_base &r); | 43 | virtual void addResource(Resource_base &r); |
43 | virtual void removeResource(Resource_base &r); | 44 | virtual void removeResource(Resource_base &r); |
@@ -48,6 +49,7 @@ private: | |||
48 | void doRemoveResource(Resource_base &r); | 49 | void doRemoveResource(Resource_base &r); |
49 | 50 | ||
50 | Lua *m_l; | 51 | Lua *m_l; |
52 | std::string m_filename; | ||
51 | }; | 53 | }; |
52 | 54 | ||
53 | } // end namespace FbTk | 55 | } // end namespace FbTk |
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index f66d83d..0c8c3af 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -1158,28 +1158,8 @@ string Fluxbox::getDefaultDataFilename(const char *name) const { | |||
1158 | 1158 | ||
1159 | /// loads resources | 1159 | /// loads resources |
1160 | void Fluxbox::load_rc() { | 1160 | void Fluxbox::load_rc() { |
1161 | _FB_USES_NLS; | ||
1162 | lua::stack_sentry s(*m_l); | ||
1163 | |||
1164 | string dbfile(getRcFilename()); | ||
1165 | 1161 | ||
1166 | try { | 1162 | m_resourcemanager.load(getRcFilename(), DEFAULT_INITFILE); |
1167 | m_l->loadfile(dbfile.c_str()); | ||
1168 | m_l->call(0, 0); | ||
1169 | } | ||
1170 | catch(lua::exception &e) { | ||
1171 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "Failed trying to read rc file")<<":"<<dbfile<<endl; | ||
1172 | cerr<<"Fluxbox: "<<e.what()<<endl; | ||
1173 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFileTrying, "Retrying with", "Retrying rc file loading with (the following file)")<<": "<<DEFAULT_INITFILE<<endl; | ||
1174 | try { | ||
1175 | m_l->loadfile(DEFAULT_INITFILE); | ||
1176 | m_l->call(0, 0); | ||
1177 | } | ||
1178 | catch(lua::exception &e) { | ||
1179 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "")<<": "<<DEFAULT_INITFILE<<endl; | ||
1180 | cerr<<"Fluxbox: "<<e.what()<<endl; | ||
1181 | } | ||
1182 | } | ||
1183 | 1163 | ||
1184 | if (m_rc_menufile->empty()) | 1164 | if (m_rc_menufile->empty()) |
1185 | m_rc_menufile.setDefaultValue(); | 1165 | m_rc_menufile.setDefaultValue(); |