don't reload keys file on modifier map events, just re-grab keys

This commit is contained in:
Mark Tiefenbruck 2008-11-01 17:03:32 -07:00
parent 3b9611b61d
commit f5fdbab98c
4 changed files with 11 additions and 1 deletions

View file

@ -1,5 +1,8 @@
(Format: Year/Month/Day)
Changes for 1.1.2
*08/11/01:
* Don't reload keys file when modifier map changes, just regrab (Mark)
Keys.cc/hh fluxbox.cc
*08/10/15:
* Don't allow resizing to negative dimensions (Mathias)
Window.cc/hh

View file

@ -571,6 +571,10 @@ void Keys::reconfigure() {
m_reloader->checkReload();
}
void Keys::regrab() {
setKeyMode(m_keylist);
}
void Keys::keyMode(const string& keyMode) {
keyspace_t::iterator it = m_map.find(keyMode + ":");
if (it == m_map.end())

View file

@ -73,6 +73,9 @@ public:
/// unregister window
void unregisterWindow(Window win);
/// grab keys again when keymap changes
void regrab();
const std::string& filename() const { return m_filename; }
/**
Load configuration from file

View file

@ -772,7 +772,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
XRefreshKeyboardMapping(&e->xmapping);
FbTk::KeyUtil::instance().init(); // reinitialise the key utils
// reconfigure keys (if the mapping changes, they don't otherwise update
m_key->reload();
m_key->regrab();
}
break;
case CreateNotify: