diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-07-30 10:21:53 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-07-30 10:21:53 (GMT) |
commit | 13c3958d67b85b86350492b89f93b63d388abcbd (patch) | |
tree | 78823fd18bb4fbf995e2735f662f05fc95acf648 /src/fluxbox.hh | |
parent | 39ffee57bb5e53174d9ef1f709f89da286d0a6c8 (diff) | |
download | fluxbox_pavel-13c3958d67b85b86350492b89f93b63d388abcbd.zip fluxbox_pavel-13c3958d67b85b86350492b89f93b63d388abcbd.tar.bz2 |
Create a completely new lua state upon USR2 reconfigure
This way, global variables set by the scripts don't persist between hard reconfigures.
I also cleaned up the reconfig-handling code in fluxbox.cc. Instead of three reconfig functions
(real_reconfig, timed_reconfig, reconfig) we have just one.
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r-- | src/fluxbox.hh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh index 6be5253..00a2e7d 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh | |||
@@ -159,7 +159,6 @@ public: | |||
159 | void attachSignals(FluxboxWindow &win); | 159 | void attachSignals(FluxboxWindow &win); |
160 | void attachSignals(WinClient &winclient); | 160 | void attachSignals(WinClient &winclient); |
161 | 161 | ||
162 | void timed_reconfigure(); | ||
163 | void revertFocus(); | 162 | void revertFocus(); |
164 | void setShowingDialog(bool value) { | 163 | void setShowingDialog(bool value) { |
165 | m_showing_dialog = value; if (!value) revertFocus(); | 164 | m_showing_dialog = value; if (!value) revertFocus(); |
@@ -193,8 +192,6 @@ private: | |||
193 | std::string getRcFilename(); | 192 | std::string getRcFilename(); |
194 | void load_rc(); | 193 | void load_rc(); |
195 | 194 | ||
196 | void real_reconfigure(); | ||
197 | |||
198 | void handleEvent(XEvent *xe); | 195 | void handleEvent(XEvent *xe); |
199 | 196 | ||
200 | void handleUnmapNotify(XUnmapEvent &ue); | 197 | void handleUnmapNotify(XUnmapEvent &ue); |
@@ -273,7 +270,6 @@ private: | |||
273 | 270 | ||
274 | Atom m_fluxbox_pid; | 271 | Atom m_fluxbox_pid; |
275 | 272 | ||
276 | bool m_reconfigure_wait; | ||
277 | Time m_last_time; | 273 | Time m_last_time; |
278 | Window m_masked; | 274 | Window m_masked; |
279 | std::string m_rc_file; ///< resource filename | 275 | std::string m_rc_file; ///< resource filename |