nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compile fix: use 'CallMemFunWithRefArg' instead of bind2nd(mem_fun(), *foo)

Browse source 
g++-4.1 does not like parts of 12e1ef7826,
calling std::bind2nd(std::mem_fun(func), ref_arg) lead to a bunch of

   error: forming reference to reference type 'XYZ'

in order to avoid switching either back to the old for-loops or boost::bind
or to enforce a newer compiler (eg, g++-4.4) to the users a new helper
functor was created: 'CallMemFunWithRefArg'

this commit also fixes a little copy and paste error introduced in
12e1ef782, 'AtomHandler::updateClientClose' was called instead of
'AtomHandler::updateWorkspace'.
This commit is contained in:
Mathias Gumz 2010-09-19 08:46:21 +02:00
parent 0ef76292c5
commit e3a2c56252
1 changed files with 65 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
src/fluxbox.cc
View file

@ -180,6 +180,49 @@ int handleXErrors(Display *d, XErrorEvent *e) {
return False;
}
/* functor to call a memberfunction with by a reference argument
other places needs this helper as well it should be moved
to FbTk/
g++-4.1 does not like to work with:
struct Bar;
struct Foo {
void foo(Bar&);
};
Bar bar;
bind2nd(mem_fun(&F::foo), bar);
it complaints about not beeing able to store a reference to
a reference (Bar&&).
'CallMemFunWithRefArg' makes g++-4.1 happy without
having to consider switching over to boost::bind() or enforcing
a newer compiler.
*/
template <typename Type, typename ArgType, typename ResultType>
struct CallMemFunWithRefArg : std::unary_function<Type, ResultType> {
explicit CallMemFunWithRefArg(ResultType (Type::*func)(ArgType), ArgType arg) :
m_arg(arg),
m_func(func) { }
ResultType operator()(Type p) const {
(p.*m_func)(m_arg);
}
ResultType operator()(Type* p) const {
(*p.*m_func)(m_arg);
}
ArgType m_arg;
ResultType (Type::*m_func)(ArgType);
};
} // end anonymous
//static singleton var
@ -459,7 +502,9 @@ void Fluxbox::initScreen(BScreen *screen) {
FbTk::MemFun(*this, &Fluxbox::workspaceCountChanged));
// initiate atomhandler for screen specific stuff
STLUtil::forAll(m_atomhandler, bind2nd(mem_fun(&AtomHandler::initForScreen), *screen));
STLUtil::forAll(m_atomhandler,
CallMemFunWithRefArg<AtomHandler, BScreen&, void>(&AtomHandler::initForScreen, *screen));
//STLUtil::forAll(m_atomhandler, bind2nd(mem_fun(&AtomHandler::initForScreen), *screen));
FocusControl::revertFocus(*screen); // make sure focus style is correct
@ -912,7 +957,7 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
if (fbwin && &fbwin->stateSig() == changedsub) { // state signal
STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
bind2nd(mem_fun(&AtomHandler::updateState), *fbwin));
CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateState, *fbwin));
// if window changed to iconic state
// add to icon list
@ -935,10 +980,10 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
}
} else if (fbwin && &fbwin->layerSig() == changedsub) { // layer signal
STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
bind2nd(mem_fun(&AtomHandler::updateLayer), *fbwin));
CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateLayer, *fbwin));
} else if (fbwin && &fbwin->dieSig() == changedsub) { // window death signal
STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
bind2nd(mem_fun(&AtomHandler::updateFrameClose), *fbwin));
CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateFrameClose, *fbwin));
// make sure each workspace get this
BScreen &scr = fbwin->screen();
@ -947,10 +992,10 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
FocusControl::setFocusedFbWindow(0);
} else if (fbwin && &fbwin->workspaceSig() == changedsub) { // workspace signal
STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
bind2nd(mem_fun(&AtomHandler::updateClientClose), *fbwin));
CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateWorkspace, *fbwin));
} else if (client && &client->dieSig() == changedsub) { // client death
STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
bind2nd(mem_fun(&AtomHandler::updateClientClose), *client));
CallMemFunWithRefArg<AtomHandler, WinClient&, void>(&AtomHandler::updateClientClose, *client));
BScreen &screen = client->screen();
@ -979,12 +1024,15 @@ void Fluxbox::attachSignals(FluxboxWindow &win) {
win.workspaceSig().attach(this);
win.layerSig().attach(this);
win.dieSig().attach(this);
STLUtil::forAll(m_atomhandler, bind2nd(mem_fun(&AtomHandler::setupFrame), win));
STLUtil::forAll(m_atomhandler,
bind2nd(mem_fun(&AtomHandler::setupFrame), win));
// CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::setupFrame, win));
}
void Fluxbox::attachSignals(WinClient &winclient) {
winclient.dieSig().attach(this);
STLUtil::forAll(m_atomhandler, bind2nd(mem_fun(&AtomHandler::setupClient), winclient));
STLUtil::forAll(m_atomhandler,
CallMemFunWithRefArg<AtomHandler, WinClient&, void>(&AtomHandler::setupClient, winclient));
}
BScreen *Fluxbox::searchScreen(Window window) {
@ -1129,7 +1177,7 @@ void Fluxbox::save_rc() {
XrmDatabase old_rc = XrmGetFileDatabase(dbfile.c_str());
XrmMergeDatabases(new_rc, &old_rc); //merge database together
XrmMergeDatabases(new_rc, &old_rc);
XrmPutFileDatabase(old_rc, dbfile.c_str());
XrmDestroyDatabase(old_rc);
@ -1152,7 +1200,7 @@ string Fluxbox::getDefaultDataFilename(const char *name) const {
/// loads resources
void Fluxbox::load_rc() {
_FB_USES_NLS;
//get resource filename
string dbfile(getRcFilename());
if (!dbfile.empty()) {
@ -1318,27 +1366,28 @@ bool Fluxbox::validateClient(const WinClient *client) const {
}
void Fluxbox::updateFrameExtents(FluxboxWindow &win) {
STLUtil::forAll(m_atomhandler, bind2nd(mem_fun(&AtomHandler::updateFrameExtents), win));
STLUtil::forAll(m_atomhandler,
CallMemFunWithRefArg<AtomHandler, FluxboxWindow&, void>(&AtomHandler::updateFrameExtents, win));
}
void Fluxbox::workspaceCountChanged( BScreen& screen ) {
STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
bind2nd(mem_fun(&AtomHandler::updateWorkspaceCount), screen));
CallMemFunWithRefArg<AtomHandler, BScreen&, void>(&AtomHandler::updateWorkspaceCount, screen));
}
void Fluxbox::workspaceChanged( BScreen& screen ) {
STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
bind2nd(mem_fun(&AtomHandler::updateCurrentWorkspace), screen));
CallMemFunWithRefArg<AtomHandler, BScreen&, void>(&AtomHandler::updateCurrentWorkspace, screen));
}
void Fluxbox::workspaceNamesChanged(BScreen &screen) {
STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
bind2nd(mem_fun(&AtomHandler::updateWorkspaceNames), screen));
CallMemFunWithRefArg<AtomHandler, BScreen&, void>(&AtomHandler::updateWorkspaceNames, screen));
}
void Fluxbox::clientListChanged(BScreen &screen) {
STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
bind2nd(mem_fun(&AtomHandler::updateClientList), screen));
CallMemFunWithRefArg<AtomHandler, BScreen&, void>(&AtomHandler::updateClientList, screen));
}
void Fluxbox::focusedWindowChanged(BScreen &screen,
@ -1353,6 +1402,6 @@ void Fluxbox::focusedWindowChanged(BScreen &screen,
void Fluxbox::workspaceAreaChanged(BScreen &screen) {
STLUtil::forAllIf(m_atomhandler, mem_fun(&AtomHandler::update),
bind2nd(mem_fun(&AtomHandler::updateWorkarea), screen));
CallMemFunWithRefArg<AtomHandler, BScreen&, void>(&AtomHandler::updateWorkarea, screen));
}