summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-19 07:22:48 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-19 07:22:48 (GMT)
commit176865bf931d4c2b2db4ce31700b5106d571cb61 (patch)
treefcb522bdfa6e5b88a99ca2d1cbb10b3073166b5b /src
parent8f66fe372a7ab1e6b12edd885ef648b2b02485ae (diff)
downloadfluxbox_lack-176865bf931d4c2b2db4ce31700b5106d571cb61.zip
fluxbox_lack-176865bf931d4c2b2db4ce31700b5106d571cb61.tar.bz2
always focus a client that gets raised in the focused window
Diffstat (limited to 'src')
-rw-r--r--src/Window.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Window.cc b/src/Window.cc
index fc710dc..7c36329 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1016,10 +1016,16 @@ bool FluxboxWindow::setCurrentClient(WinClient &client, bool setinput) {
1016 frame().setLabelButtonFocus(*button); 1016 frame().setLabelButtonFocus(*button);
1017 frame().setShapingClient(&client, false); 1017 frame().setShapingClient(&client, false);
1018 1018
1019 setinput = setinput || m_focused && !screen().focusControl().isCycling();
1019 bool ret = setinput && focus(); 1020 bool ret = setinput && focus();
1020 if (setinput) 1021 if (setinput) {
1021 // restore old client until focus event comes 1022 // restore old client until focus event comes
1022 m_client = old; 1023 m_client = old;
1024 if (!ret && old) {
1025 old->raise();
1026 titleSig().notify();
1027 }
1028 }
1023 return ret; 1029 return ret;
1024} 1030}
1025 1031