aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-06-16 19:09:37 (GMT)
committerPavel Labath <pavelo@centrum.sk>2013-02-16 23:54:31 (GMT)
commit9f2c3883b7cf08a5f9d311fd8f7fc317574b605b (patch)
tree55461e357b95ddaa582b73c840f4c5e6846b0f69 /src/fluxbox.hh
parent590efd07bb2ed1ce78ce6e5e6750b57311904f1f (diff)
downloadfluxbox_pavel-9f2c3883b7cf08a5f9d311fd8f7fc317574b605b.zip
fluxbox_pavel-9f2c3883b7cf08a5f9d311fd8f7fc317574b605b.tar.bz2
Replace ResourceManager with the lua version
Loading of an init file with the new manager works ok. Saving and restarting is still not completed. This touches many files because i removed the alternative name of resources. Unlike Xrm, lua does not have native support for alt names. It should be fairly easy to add them, but I think that is unnecessary and would be confusing.
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r--src/fluxbox.hh5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 868d65c..2e0aabb 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -26,7 +26,7 @@
26#define FLUXBOX_HH 26#define FLUXBOX_HH
27 27
28#include "FbTk/App.hh" 28#include "FbTk/App.hh"
29#include "FbTk/Resource.hh" 29#include "FbTk/LResource.hh"
30#include "FbTk/Timer.hh" 30#include "FbTk/Timer.hh"
31#include "FbTk/SignalHandler.hh" 31#include "FbTk/SignalHandler.hh"
32#include "FbTk/Signal.hh" 32#include "FbTk/Signal.hh"
@@ -225,9 +225,10 @@ private:
225 /// Called when a window layer changes 225 /// Called when a window layer changes
226 void windowLayerChanged(FluxboxWindow &win); 226 void windowLayerChanged(FluxboxWindow &win);
227 227
228 std::auto_ptr<lua::state> m_l;
228 std::auto_ptr<FbAtoms> m_fbatoms; 229 std::auto_ptr<FbAtoms> m_fbatoms;
229 230
230 FbTk::ResourceManager m_resourcemanager, &m_screen_rm; 231 FbTk::LResourceManager m_resourcemanager;
231 232
232 std::string m_RC_PATH; 233 std::string m_RC_PATH;
233 234