1 files changed, 16 insertions, 14 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index a6e5e84..3d6d479 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -856,19 +856,26 @@ void BScreen::propertyNotify(Atom atom) {
 }
 
 void BScreen::keyPressEvent(XKeyEvent &ke) {
-    Fluxbox::instance()->keys()->doAction(ke.type, ke.state, ke.keycode,
-                                          Keys::GLOBAL|Keys::ON_DESKTOP);
+    if (Fluxbox::instance()->keys()->doAction(ke.type, ke.state, ke.keycode,
+                                              Keys::GLOBAL|Keys::ON_DESKTOP))
+        // re-grab keyboard, so we don't pass KeyRelease to clients
+        FbTk::EventManager::instance()->grabKeyboard(rootWindow().window());
+
 }
 
 void BScreen::keyReleaseEvent(XKeyEvent &ke) {
-    if (!m_cycling)
-        return;
+    if (m_cycling) {
+        unsigned int state = FbTk::KeyUtil::instance().cleanMods(ke.state);
+        state &= ~FbTk::KeyUtil::instance().keycodeToModmask(ke.keycode);
+
+        if (state) // still cycling
+            return;
 
-    unsigned int state = FbTk::KeyUtil::instance().cleanMods(ke.state);
-    state &= ~FbTk::KeyUtil::instance().keycodeToModmask(ke.keycode);
+        m_cycling = false;
+        focusControl().stopCyclingFocus();
+    }
 
-    if (!state) // all modifiers were released
-        FbTk::EventManager::instance()->ungrabKeyboard();
+    FbTk::EventManager::instance()->ungrabKeyboard();
 }
 
 void BScreen::buttonPressEvent(XButtonEvent &be) {
@@ -880,11 +887,6 @@ void BScreen::buttonPressEvent(XButtonEvent &be) {
                    0, be.time);
 }
 
-void BScreen::notifyUngrabKeyboard() {
-    m_cycling = false;
-    focusControl().stopCyclingFocus();
-}
-
 void BScreen::cycleFocus(int options, const ClientPattern *pat, bool reverse) {
     // get modifiers from event that causes this for focus order cycling
     XEvent ev = Fluxbox::instance()->lastEvent();
@@ -896,7 +898,7 @@ void BScreen::cycleFocus(int options, const ClientPattern *pat, bool reverse) {
 
     if (!m_cycling && mods) {
         m_cycling = true;
-        FbTk::EventManager::instance()->grabKeyboard(*this, rootWindow().window());
+        FbTk::EventManager::instance()->grabKeyboard(rootWindow().window());
     }
 
     if (mods == 0) // can't stacked cycle unless there is a mod to grab