1 files changed, 18 insertions, 0 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index 22b41dd..d2117ff 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -329,6 +329,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
     m_focus_control(new FocusControl(*this)),
     m_placement_strategy(new ScreenPlacement(*this)),
     m_xinerama_headinfo(0),
+    m_restart(false),
     m_shutdown(false) {
 
 
@@ -354,6 +355,19 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
         return;
     }
 
+    // check if we're the first EWMH compliant window manager on this screen
+    Atom wm_check = XInternAtom(disp, "_NET_SUPPORTING_WM_CHECK", False);
+    Atom xa_ret_type;
+    int ret_format;
+    unsigned long ret_nitems, ret_bytes_after;
+    unsigned char *ret_prop;
+    if (XGetWindowProperty(disp, m_root_window.window(), wm_check, 0l, 1l,
+            False, XA_WINDOW, &xa_ret_type, &ret_format, &ret_nitems,
+            &ret_bytes_after, &ret_prop) == Success) {
+        m_restart = (ret_prop != NULL);
+        XFree(ret_prop);
+    }
+
     // TODO fluxgen: check if this is the right place
     m_head_areas = new HeadArea[numHeads() ? numHeads() : 1];
         
@@ -535,6 +549,10 @@ BScreen::~BScreen() {
 
 }
 
+bool BScreen::isRestart() {
+    return Fluxbox::instance()->isStartup() && m_restart;
+}
+
 void BScreen::initWindows() {
     unsigned int nchild;
     Window r, p, *children;