aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-09-12 22:55:33 (GMT)
committerfluxgen <fluxgen>2003-09-12 22:55:33 (GMT)
commit96132f2afef4489f4faa85f24ac807086ed66b12 (patch)
treeb7acd226500db8ddc26ad2d8beef992c15e4163b
parent5eaa34347139844afe27ce28276c40898bb55abb (diff)
downloadfluxbox-96132f2afef4489f4faa85f24ac807086ed66b12.zip
fluxbox-96132f2afef4489f4faa85f24ac807086ed66b12.tar.bz2
fixed focus issue when changing next or prevclient
-rw-r--r--src/fluxbox.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 16c4204..d83fe0b 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.189 2003/09/11 21:30:20 rathnor Exp $ 25// $Id: fluxbox.cc,v 1.190 2003/09/12 22:55:33 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -871,10 +871,6 @@ void Fluxbox::handleEvent(XEvent * const e) {
871#ifdef DEBUG 871#ifdef DEBUG
872 cerr<<__FILE__<<"("<<__FUNCTION__<<") Focus out is not a FluxboxWindow !!"<<endl; 872 cerr<<__FILE__<<"("<<__FUNCTION__<<") Focus out is not a FluxboxWindow !!"<<endl;
873#endif // DEBUG 873#endif // DEBUG
874
875 } else {
876 if (winclient == m_focused_window)
877 setFocusedWindow(0);
878 } 874 }
879 } 875 }
880 break; 876 break;
@@ -1912,7 +1908,7 @@ void Fluxbox::setFocusedWindow(WinClient *client) {
1912 BScreen *old_screen = 0, *screen = 0; 1908 BScreen *old_screen = 0, *screen = 0;
1913 WinClient *old_client = 0; 1909 WinClient *old_client = 0;
1914 Workspace *old_wkspc = 0, *wkspc = 0; 1910 Workspace *old_wkspc = 0, *wkspc = 0;
1915 1911
1916 if (m_focused_window != 0) { 1912 if (m_focused_window != 0) {
1917 // check if m_focused_window is valid 1913 // check if m_focused_window is valid
1918 bool found = false; 1914 bool found = false;
@@ -1957,10 +1953,12 @@ void Fluxbox::setFocusedWindow(WinClient *client) {
1957 win->setCurrentClient(*client, false); // don't setinputfocus 1953 win->setCurrentClient(*client, false); // don't setinputfocus
1958 win->setFocusFlag(true); // set focus flag 1954 win->setFocusFlag(true); // set focus flag
1959 } 1955 }
1956
1960 } else 1957 } else
1961 m_focused_window = 0; 1958 m_focused_window = 0;
1962 1959
1963 1960
1961
1964 if (screen != 0) 1962 if (screen != 0)
1965 screen->updateNetizenWindowFocus(); 1963 screen->updateNetizenWindowFocus();
1966 1964