summaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 2fa7714..bc985a7 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.195 2003/10/05 06:28:47 rathnor Exp $ 25// $Id: fluxbox.cc,v 1.196 2003/10/05 07:19:38 rathnor Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -43,6 +43,7 @@
43#include "defaults.hh" 43#include "defaults.hh"
44 44
45#include "FbTk/Image.hh" 45#include "FbTk/Image.hh"
46#include "FbTk/KeyUtil.hh"
46 47
47//Use GNU extensions 48//Use GNU extensions
48#ifndef _GNU_SOURCE 49#ifndef _GNU_SOURCE
@@ -840,9 +841,9 @@ void Fluxbox::handleEvent(XEvent * const e) {
840#ifdef DEBUG 841#ifdef DEBUG
841 cerr<<__FILE__<<"("<<__FUNCTION__<<"): MappingNotify"<<endl; 842 cerr<<__FILE__<<"("<<__FUNCTION__<<"): MappingNotify"<<endl;
842#endif // DEBUG 843#endif // DEBUG
843 if (m_key.get()) { 844
844 m_key->loadModmap(); 845 FbTk::KeyUtil::instance()->init(); // reinitialise the key utils
845 } 846
846 break; 847 break;
847 case CreateNotify: 848 case CreateNotify:
848 break; 849 break;
@@ -1182,7 +1183,7 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1182 if (m_watching_screen && m_watch_keyrelease) { 1183 if (m_watching_screen && m_watch_keyrelease) {
1183 // mask the mod of the released key out 1184 // mask the mod of the released key out
1184 // won't mask anything if it isn't a mod 1185 // won't mask anything if it isn't a mod
1185 ke.state &= ~m_key->keycodeToModmask(ke.keycode); 1186 ke.state &= ~FbTk::KeyUtil::keycodeToModmask(ke.keycode);
1186 1187
1187 if ((m_watch_keyrelease & ke.state) == 0) { 1188 if ((m_watch_keyrelease & ke.state) == 0) {
1188 1189