From 61b04e336632ff1cf0bf38ef6b35ebf29288060c Mon Sep 17 00:00:00 2001 From: Mark Tiefenbruck <mark@fluxbox.org> Date: Thu, 15 May 2008 12:30:11 -0700 Subject: need to reset keybindings when keymap changes --- src/Keys.hh | 11 +++++------ src/fluxbox.cc | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Keys.hh b/src/Keys.hh index 68ff4ec..0812761 100644 --- a/src/Keys.hh +++ b/src/Keys.hh @@ -75,8 +75,11 @@ public: const std::string& filename() const { return m_filename; } /** - Reload configuration from filename - @return true on success, else false + Load configuration from file + */ + void reload(); + /** + Reload configuration if keys file has changed */ void reconfigure(); void keyMode(const std::string& keyMode); @@ -94,10 +97,6 @@ private: void ungrabButtons(); void grabWindow(Window win); - /** - Load configuration from file - */ - void reload(); // Load default keybindings for when there are errors loading the keys file void loadDefaults(); void setKeyMode(t_key *keyMode); diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 076ae45..ec8537c 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc @@ -751,7 +751,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->reconfigure(); + m_key->reload(); } break; case CreateNotify: -- cgit v0.11.2