aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-05-06 16:18:20 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-05-10 11:00:45 (GMT)
commit4f89009c9e6521910442eabc36d572367398c0bf (patch)
tree61ff9ae12d0d54d0d06b0bf82cb56e2cc806d33b /src/fluxbox.cc
parentae68b7f7cd47c91e776fadee7aecb93d5b3ee3df (diff)
downloadfluxbox-4f89009c9e6521910442eabc36d572367398c0bf.zip
fluxbox-4f89009c9e6521910442eabc36d572367398c0bf.tar.bz2
Convert FluxboxWindow::workspaceSig to FbTk::Signal
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 0263de7..e319a2f 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -978,9 +978,6 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
978 } else if (fbwin && &fbwin->layerSig() == changedsub) { // layer signal 978 } else if (fbwin && &fbwin->layerSig() == changedsub) { // layer signal
979 STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update), 979 STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
980 CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateLayer, *fbwin)); 980 CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateLayer, *fbwin));
981 } else if (fbwin && &fbwin->workspaceSig() == changedsub) { // workspace signal
982 STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
983 CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateWorkspace, *fbwin));
984 } 981 }
985} 982}
986 983
@@ -1023,10 +1020,15 @@ void Fluxbox::clientDied(Focusable &focusable) {
1023 screen.removeClient(client); 1020 screen.removeClient(client);
1024} 1021}
1025 1022
1023void Fluxbox::windowWorkspaceChanged(FluxboxWindow &win) {
1024 STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
1025 CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateWorkspace, win));
1026}
1027
1026void Fluxbox::attachSignals(FluxboxWindow &win) { 1028void Fluxbox::attachSignals(FluxboxWindow &win) {
1027 win.hintSig().attach(this); 1029 win.hintSig().attach(this);
1028 win.stateSig().attach(this); 1030 win.stateSig().attach(this);
1029 win.workspaceSig().attach(this); 1031 join(win.workspaceSig(), FbTk::MemFun(*this, &Fluxbox::windowWorkspaceChanged));
1030 win.layerSig().attach(this); 1032 win.layerSig().attach(this);
1031 join(win.dieSig(), FbTk::MemFun(*this, &Fluxbox::windowDied)); 1033 join(win.dieSig(), FbTk::MemFun(*this, &Fluxbox::windowDied));
1032 STLUtil::forAll(m_atomhandler, 1034 STLUtil::forAll(m_atomhandler,