1 files changed, 7 insertions, 28 deletions

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 468e723..89bd0d5 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -970,19 +970,7 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
     if (be.button == 1 && !screen->isRootColormapInstalled())
         screen->imageControl().installRootColormap();
 
-    // see if we need to keep watching for key releases
-    BScreen *old_watching_screen = m_watching_screen;
-    m_watching_screen = 0;
-    if (!m_key->doAction(be.type, be.state, be.button))
-        // no command run, so could still be cycling
-        m_watching_screen = old_watching_screen;
-    else if (old_watching_screen &&
-             m_watching_screen != old_watching_screen) {
-        // no longer need to watch old screen, so stop cycling
-        old_watching_screen->notifyReleasedKeys();
-        if (!m_watching_screen)
-            XUngrabKeyboard(FbTk::App::instance()->display(), CurrentTime);
-    }
+    m_key->doAction(be.type, be.state, be.button);
 }
 
 void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) {
@@ -1113,21 +1101,9 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
     if (keyScreen() == 0 || mouseScreen() == 0)
         return;
 
-    BScreen *old_watching_screen = m_watching_screen;
-
     switch (ke.type) {
     case KeyPress:
-        // see if we need to keep watching for key releases
-        m_watching_screen = 0;
-        if (!m_key->doAction(ke.type, ke.state, ke.keycode))
-            // no command run, so could still be cycling
-            m_watching_screen = old_watching_screen;
-        else if (old_watching_screen &&
-                 m_watching_screen != old_watching_screen) {
-            old_watching_screen->notifyReleasedKeys();
-            if (!m_watching_screen)
-                XUngrabKeyboard(FbTk::App::instance()->display(), CurrentTime);
-        }
+        m_key->doAction(ke.type, ke.state, ke.keycode);
         break;
     case KeyRelease: {
         // we ignore most key releases unless we need to use
@@ -1841,12 +1817,15 @@ void Fluxbox::watchKeyRelease(BScreen &screen, unsigned int mods) {
         cerr<<"WARNING: attempt to grab without modifiers!"<<endl;
         return;
     }
+    // just make sure we are saving the mods with any other flags (xkb)
+    m_watch_keyrelease = FbTk::KeyUtil::instance().isolateModifierMask(mods);
+
+    if (m_watching_screen == &screen)
+        return;
     if (m_watching_screen)
         m_watching_screen->focusControl().stopCyclingFocus();
     m_watching_screen = &screen;
 
-    // just make sure we are saving the mods with any other flags (xkb)
-    m_watch_keyrelease = FbTk::KeyUtil::instance().isolateModifierMask(mods);
     // TODO: it's possible (and happens to me sometimes) for the mods to be
     // released before we grab the keyboard -- not sure of a good way to fix it
     XGrabKeyboard(FbTk::App::instance()->display(),