aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-05-15 19:30:11 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-05-15 19:30:11 (GMT)
commit61b04e336632ff1cf0bf38ef6b35ebf29288060c (patch)
tree107236f022eb3ed2700dc6c2ddeb35ed02b97630 /src
parent398b63c7c54f16f92dfbd305f6899253372a4260 (diff)
downloadfluxbox-61b04e336632ff1cf0bf38ef6b35ebf29288060c.zip
fluxbox-61b04e336632ff1cf0bf38ef6b35ebf29288060c.tar.bz2
need to reset keybindings when keymap changes
Diffstat (limited to 'src')
-rw-r--r--src/Keys.hh11
-rw-r--r--src/fluxbox.cc2
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:
75 75
76 const std::string& filename() const { return m_filename; } 76 const std::string& filename() const { return m_filename; }
77 /** 77 /**
78 Reload configuration from filename 78 Load configuration from file
79 @return true on success, else false 79 */
80 void reload();
81 /**
82 Reload configuration if keys file has changed
80 */ 83 */
81 void reconfigure(); 84 void reconfigure();
82 void keyMode(const std::string& keyMode); 85 void keyMode(const std::string& keyMode);
@@ -94,10 +97,6 @@ private:
94 void ungrabButtons(); 97 void ungrabButtons();
95 void grabWindow(Window win); 98 void grabWindow(Window win);
96 99
97 /**
98 Load configuration from file
99 */
100 void reload();
101 // Load default keybindings for when there are errors loading the keys file 100 // Load default keybindings for when there are errors loading the keys file
102 void loadDefaults(); 101 void loadDefaults();
103 void setKeyMode(t_key *keyMode); 102 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) {
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(); 754 m_key->reload();
755 } 755 }
756 break; 756 break;
757 case CreateNotify: 757 case CreateNotify: