aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-07-30 10:21:53 (GMT)
committerPavel Labath <pavelo@centrum.sk>2013-02-18 21:04:25 (GMT)
commit54ed350776d4f78de9aabb0273f085aa7c2ce124 (patch)
tree994cd8b01e4423c3e535b54a41e30238fce1b10b /src/fluxbox.hh
parentfe7a9bf5b0d59d25ef87ca6ccf47e40055596b84 (diff)
downloadfluxbox_pavel-54ed350776d4f78de9aabb0273f085aa7c2ce124.zip
fluxbox_pavel-54ed350776d4f78de9aabb0273f085aa7c2ce124.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.hh4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 68e4fb5..c24d581 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);
@@ -272,7 +269,6 @@ private:
272 269
273 Atom m_fluxbox_pid; 270 Atom m_fluxbox_pid;
274 271
275 bool m_reconfigure_wait;
276 Time m_last_time; 272 Time m_last_time;
277 Window m_masked; 273 Window m_masked;
278 std::string m_rc_file; ///< resource filename 274 std::string m_rc_file; ///< resource filename