1 files changed, 13 insertions, 10 deletions

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 3a07060..4041444 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -453,9 +453,11 @@ void Fluxbox::initScreen(BScreen *screen) {
     screen->initWindows();
 
     // attach screen signals to this
-    screen->focusedWindowSig().attach(this);
     screen->workspaceAreaSig().attach(this);
 
+    join(screen->focusedWindowSig(),
+         FbTk::MemFun(*this, &Fluxbox::focusedWindowChanged));
+
     join(screen->clientListSig(),
          FbTk::MemFun(*this, &Fluxbox::clientListChanged));
 
@@ -1105,15 +1107,7 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
     } else if (typeid(*changedsub) == typeid(BScreen::ScreenSubject)) {
         BScreen::ScreenSubject *subj = dynamic_cast<BScreen::ScreenSubject *>(changedsub);
         BScreen &screen = subj->screen();
-        if ((&(screen.focusedWindowSig())) == changedsub) {
-            for (AtomHandlerContainerIt it= m_atomhandler.begin();
-                 it != m_atomhandler.end(); it++) {
-                (*it).first->updateFocusedWindow(screen,
-                        (FocusControl::focusedWindow() ?
-                         FocusControl::focusedWindow()->window() :
-                         0));
-            }
-        } else if ((&(screen.workspaceAreaSig())) == changedsub) {
+        if ((&(screen.workspaceAreaSig())) == changedsub) {
             for (AtomHandlerContainerIt it= m_atomhandler.begin();
                  it != m_atomhandler.end(); ++it) {
                 if ((*it).first->update())
@@ -1537,3 +1531,12 @@ void Fluxbox::clientListChanged(BScreen &screen) {
             (*it).first->updateClientList(screen);
     }
 }
+
+void Fluxbox::focusedWindowChanged(BScreen &screen, 
+                                   FluxboxWindow* win, 
+                                   WinClient* client) {
+    for (AtomHandlerContainerIt it= m_atomhandler.begin();
+         it != m_atomhandler.end(); it++) {
+        (*it).first->updateFocusedWindow(screen, client ? client->window() : 0 );
+    }
+}