aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-05-12 19:16:37 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-05-12 19:16:37 (GMT)
commitdcdc78332431ff2b258c54a99d6fac382c6a0595 (patch)
treec667adfc3cf2a2a90972d1342147f31bd6beeb40 /src/fluxbox.cc
parenta56492c0d538c9c3a019812558938df0b6afedeb (diff)
downloadfluxbox-dcdc78332431ff2b258c54a99d6fac382c6a0595.zip
fluxbox-dcdc78332431ff2b258c54a99d6fac382c6a0595.tar.bz2
only reload the keys file if the contents have changed
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 70503a5..076ae45 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -307,7 +307,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
307 // Create keybindings handler and load keys file 307 // Create keybindings handler and load keys file
308 // Note: this needs to be done before creating screens 308 // Note: this needs to be done before creating screens
309 m_key.reset(new Keys); 309 m_key.reset(new Keys);
310 m_key->load(StringUtil::expandFilename(*m_rc_keyfile).c_str()); 310 m_key->reconfigure();
311 311
312 vector<int> screens; 312 vector<int> screens;
313 int i; 313 int i;
@@ -751,7 +751,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
751 XRefreshKeyboardMapping(&e->xmapping); 751 XRefreshKeyboardMapping(&e->xmapping);
752 FbTk::KeyUtil::instance().init(); // reinitialise the key utils 752 FbTk::KeyUtil::instance().init(); // reinitialise the key utils
753 // reconfigure keys (if the mapping changes, they don't otherwise update 753 // reconfigure keys (if the mapping changes, they don't otherwise update
754 m_key->reconfigure(StringUtil::expandFilename(*m_rc_keyfile).c_str()); 754 m_key->reconfigure();
755 } 755 }
756 break; 756 break;
757 case CreateNotify: 757 case CreateNotify:
@@ -1443,7 +1443,7 @@ void Fluxbox::real_reconfigure() {
1443 for_each(m_screen_list.begin(), m_screen_list.end(), mem_fun(&BScreen::reconfigure)); 1443 for_each(m_screen_list.begin(), m_screen_list.end(), mem_fun(&BScreen::reconfigure));
1444 1444
1445 //reconfigure keys 1445 //reconfigure keys
1446 m_key->reconfigure(StringUtil::expandFilename(*m_rc_keyfile).c_str()); 1446 m_key->reconfigure();
1447 1447
1448 // and atomhandlers 1448 // and atomhandlers
1449 for (AtomHandlerContainerIt it= m_atomhandler.begin(); 1449 for (AtomHandlerContainerIt it= m_atomhandler.begin();