aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authormarkt <markt>2007-10-15 18:05:28 (GMT)
committermarkt <markt>2007-10-15 18:05:28 (GMT)
commit72130f350ef08c6200d18e544b861940cbcb7526 (patch)
treee2f789548a7e675ecb12cb2f5cda62e22552cde2 /src/Screen.cc
parent7e4f8a38531642cc9cb6cba31499d549f4c5f8a0 (diff)
downloadfluxbox-72130f350ef08c6200d18e544b861940cbcb7526.zip
fluxbox-72130f350ef08c6200d18e544b861940cbcb7526.tar.bz2
add OnWindow modifier to keys file
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index d843a53..5549ca5 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -30,6 +30,7 @@
30#include "fluxbox.hh" 30#include "fluxbox.hh"
31#include "Keys.hh" 31#include "Keys.hh"
32#include "Window.hh" 32#include "Window.hh"
33#include "WindowCmd.hh"
33#include "Workspace.hh" 34#include "Workspace.hh"
34 35
35#include "Layer.hh" 36#include "Layer.hh"
@@ -827,6 +828,7 @@ void BScreen::propertyNotify(Atom atom) {
827 828
828void BScreen::keyPressEvent(XKeyEvent &ke) { 829void BScreen::keyPressEvent(XKeyEvent &ke) {
829 if (!m_typing_ahead) { 830 if (!m_typing_ahead) {
831 WindowCmd<void>::setWindow(FocusControl::focusedFbWindow());
830 Fluxbox::instance()->keys()->doAction(ke.type, ke.state, ke.keycode, 832 Fluxbox::instance()->keys()->doAction(ke.type, ke.state, ke.keycode,
831 Keys::GLOBAL|Keys::ON_DESKTOP); 833 Keys::GLOBAL|Keys::ON_DESKTOP);
832 return; 834 return;
@@ -882,6 +884,7 @@ void BScreen::buttonPressEvent(XButtonEvent &be) {
882 imageControl().installRootColormap(); 884 imageControl().installRootColormap();
883 885
884 Keys *keys = Fluxbox::instance()->keys(); 886 Keys *keys = Fluxbox::instance()->keys();
887 WindowCmd<void>::setWindow(FocusControl::focusedFbWindow());
885 keys->doAction(be.type, be.state, be.button, Keys::GLOBAL|Keys::ON_DESKTOP); 888 keys->doAction(be.type, be.state, be.button, Keys::GLOBAL|Keys::ON_DESKTOP);
886} 889}
887 890