more fun with the window menu

1 files changed, 1 insertions, 7 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index a97f1aa..bf5a625 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -832,11 +832,8 @@ void BScreen::propertyNotify(Atom atom) {
 }
 
 void BScreen::keyPressEvent(XKeyEvent &ke) {
-    WinClient *old = WindowCmd<void>::client();
-    WindowCmd<void>::setWindow(FocusControl::focusedFbWindow());
     Fluxbox::instance()->keys()->doAction(ke.type, ke.state, ke.keycode,
                                           Keys::GLOBAL|Keys::ON_DESKTOP);
-    WindowCmd<void>::setClient(old);
 }
 
 void BScreen::keyReleaseEvent(XKeyEvent &ke) {
@@ -855,11 +852,8 @@ void BScreen::buttonPressEvent(XButtonEvent &be) {
         imageControl().installRootColormap();
 
     Keys *keys = Fluxbox::instance()->keys();
-    WinClient *old = WindowCmd<void>::client();
-    WindowCmd<void>::setWindow(FocusControl::focusedFbWindow());
     keys->doAction(be.type, be.state, be.button, Keys::GLOBAL|Keys::ON_DESKTOP,
-                   be.time);
-    WindowCmd<void>::setClient(old);
+                   0, be.time);
 }
 
 void BScreen::notifyUngrabKeyboard() {