From 1f4944abb4c3c1076391412f61c1bb9579e73a12 Mon Sep 17 00:00:00 2001 From: fluxgen Date: Tue, 12 Aug 2003 12:21:42 +0000 Subject: added shutdown variable to indicate that we are shutting down and dont need to listen to some signals --- src/Screen.cc | 7 ++++--- src/Screen.hh | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Screen.cc b/src/Screen.cc index e39dc1c..3396ccf 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Screen.cc,v 1.217 2003/08/12 01:03:25 fluxgen Exp $ +// $Id: Screen.cc,v 1.218 2003/08/12 12:21:42 fluxgen Exp $ #include "Screen.hh" @@ -302,7 +302,8 @@ BScreen::BScreen(FbTk::ResourceManager &rm, m_altname(altscreenname), m_resource_manager(rm), m_available_workspace_area(new Strut(0, 0, 0, 0)), - m_xinerama_headinfo(0) { + m_xinerama_headinfo(0), + m_shutdown(false) { Display *disp = FbTk::App::instance()->display(); @@ -2099,7 +2100,7 @@ void BScreen::shutdown() { Display *disp = FbTk::App::instance()->display(); rootWindow().setEventMask(NoEventMask); XSync(disp, False); - + m_shutdown = true; for_each(m_workspaces_list.begin(), m_workspaces_list.end(), mem_fun(&Workspace::shutdown)); diff --git a/src/Screen.hh b/src/Screen.hh index 2eacfa2..0f359cb 100644 --- a/src/Screen.hh +++ b/src/Screen.hh @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Screen.hh,v 1.120 2003/08/12 00:27:13 fluxgen Exp $ +// $Id: Screen.hh,v 1.121 2003/08/12 12:20:48 fluxgen Exp $ #ifndef SCREEN_HH #define SCREEN_HH @@ -318,6 +318,7 @@ public: void addConfigMenu(const char *label, FbTk::Menu &menu); void removeConfigMenu(FbTk::Menu &menu); + bool isShuttingdown() const { return m_shutdown; } enum { ROWSMARTPLACEMENT = 1, COLSMARTPLACEMENT, CASCADEPLACEMENT, UNDERMOUSEPLACEMENT, LEFTRIGHT, RIGHTLEFT, TOPBOTTOM, BOTTOMTOP }; @@ -445,6 +446,7 @@ private: } *m_xinerama_headinfo; std::list m_strutlist; + bool m_shutdown; }; -- cgit v0.11.2