Convert FluxboxWindow::layerSig to FbTk::Signal

1 files changed, 6 insertions, 20 deletions

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 9c30b03..0dc958d 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -940,24 +940,6 @@ void Fluxbox::handleSignal(int signum) {
 }
 
 
-void Fluxbox::update(FbTk::Subject *changedsub) {
-    //TODO: fix signaling, this does not look good
-    FluxboxWindow *fbwin = 0;
-
-    if (typeid(*changedsub) == typeid(FluxboxWindow::WinSubject)) {
-        FluxboxWindow::WinSubject *winsub = dynamic_cast<FluxboxWindow::WinSubject *>(changedsub);
-        fbwin = &winsub->win();
-    } else if (typeid(*changedsub) == typeid(Focusable::FocusSubject)) {
-        Focusable::FocusSubject *winsub = dynamic_cast<Focusable::FocusSubject *>(changedsub);
-        fbwin = winsub->win().fbwindow();
-    }
-
-    if (fbwin && &fbwin->layerSig() == changedsub) { // layer signal
-        STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
-            CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateLayer, *fbwin));
-    }
-}
-
 void Fluxbox::windowDied(Focusable &focusable) {
     FluxboxWindow *fbwin = focusable.fbwindow();
 
@@ -1024,11 +1006,15 @@ void Fluxbox::windowStateChanged(FluxboxWindow &win) {
     }
 }
 
+void Fluxbox::windowLayerChanged(FluxboxWindow &win) {
+    STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
+        CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateLayer, win));
+}
+
 void Fluxbox::attachSignals(FluxboxWindow &win) {
-    win.hintSig().attach(this);
     join(win.stateSig(), FbTk::MemFun(*this, &Fluxbox::windowStateChanged));
     join(win.workspaceSig(), FbTk::MemFun(*this, &Fluxbox::windowWorkspaceChanged));
-    win.layerSig().attach(this);
+    join(win.layerSig(), FbTk::MemFun(*this, &Fluxbox::windowLayerChanged));
     join(win.dieSig(), FbTk::MemFun(*this, &Fluxbox::windowDied));
     STLUtil::forAll(m_atomhandler,
             CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::setupFrame, win));