diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-06-16 19:09:37 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-11-01 09:57:19 (GMT) |
commit | e3feca08ce0f6753f7e71ccb9088cf9003d41fc2 (patch) | |
tree | abf0dafc53405d67fdf5ccc285961a37603092d3 /src/fluxbox.hh | |
parent | 0e8a7bfb12e6d03ec288cd1fdd0a1453d5e814e1 (diff) | |
download | fluxbox_pavel-e3feca08ce0f6753f7e71ccb9088cf9003d41fc2.zip fluxbox_pavel-e3feca08ce0f6753f7e71ccb9088cf9003d41fc2.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.hh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh index dad58f8..47a8187 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 | const char *m_RC_INIT_FILE; | 234 | const char *m_RC_INIT_FILE; |