From f4b75f439e73af9d2d7fb96272921d679736ab02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Tue, 12 Dec 2006 13:40:02 +0000
Subject: [PATCH] Don't steal focus from windows using globally active input
 focus.

svn path=/branches/work/kwin_composite/; revision=612731
---
 workspace.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/workspace.cpp b/workspace.cpp
index df8790a206..d406f65fdb 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1278,18 +1278,11 @@ bool Workspace::setCurrentDesktop( int new_desktop )
 
     if ( c )
         requestFocus( c );
+    else if( !desktops.isEmpty() )
+        requestFocus( findDesktop( true, currentDesktop()));
     else
         focusToNull();
 
-    if( !desktops.isEmpty() )
-        {
-        Window w_tmp;
-        int i_tmp;
-        XGetInputFocus( display(), &w_tmp, &i_tmp );
-        if( w_tmp == null_focus_window ) // CHECKME?
-            requestFocus( findDesktop( true, currentDesktop()));
-        }
-
     updateCurrentTopMenu();
 
     // Update focus chain: