aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-07-30 10:21:53 (GMT)
committerPaul Tagliamonte <paultag@fluxbox.org>2012-04-07 02:12:16 (GMT)
commitf614d641a4abb2b1926c7327a3242cd95e1fcfdc (patch)
treebfa0e93d167140c0ec30f6ccf1d67e5b5e9c5b1e /src/fluxbox.hh
parent6cf46efc6ae4415833e54a795ff630c9faf4b9ce (diff)
downloadfluxbox_paul-f614d641a4abb2b1926c7327a3242cd95e1fcfdc.zip
fluxbox_paul-f614d641a4abb2b1926c7327a3242cd95e1fcfdc.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 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