aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index fbb4203..5fcd4fe 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -383,7 +383,8 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
383 m_reconfigure_wait = m_reread_menu_wait = false; 383 m_reconfigure_wait = m_reread_menu_wait = false;
384 384
385 // Create keybindings handler and load keys file 385 // Create keybindings handler and load keys file
386 m_key.reset(new Keys(StringUtil::expandFilename(*m_rc_keyfile).c_str())); 386 m_key.reset(new Keys);
387 m_key->load(StringUtil::expandFilename(*m_rc_keyfile).c_str());
387 388
388 m_resourcemanager.unlock(); 389 m_resourcemanager.unlock();
389 ungrab(); 390 ungrab();
@@ -1083,7 +1084,10 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1083 1084
1084 switch (ke.type) { 1085 switch (ke.type) {
1085 case KeyPress: 1086 case KeyPress:
1086 m_key->doAction(ke); 1087 if (m_key->doAction(ke))
1088 XAllowEvents(FbTk::App::instance()->display(), AsyncKeyboard, CurrentTime);
1089 else
1090 XAllowEvents(FbTk::App::instance()->display(), ReplayKeyboard, CurrentTime);
1087 break; 1091 break;
1088 case KeyRelease: { 1092 case KeyRelease: {
1089 // we ignore most key releases unless we need to use 1093 // we ignore most key releases unless we need to use