From 1034a53451942f0be68e30343ceebffad84dffa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Wed, 9 May 2001 20:06:46 +0000
Subject: [PATCH] Make KWinModule::activeWindowChanged() emit with 0 when
 there's no window active - no need to try to focus windows that don't accept
 it anyway unless forced to.

svn path=/trunk/kdebase/kwin/; revision=96046
---
 workspace.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/workspace.cpp b/workspace.cpp
index 3bf38e118f..5c0b352329 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -2006,7 +2006,8 @@ void Workspace::focusToNull(){
     XMapWindow(qt_xdisplay(), null_focus_window);
   }
   XSetInputFocus(qt_xdisplay(), null_focus_window, RevertToPointerRoot, kwin_time );
-  updateColormap();
+  if( !block_focus )
+      setActiveClient( NULL );
 }
 
 
@@ -2192,7 +2193,7 @@ void Workspace::setCurrentDesktop( int new_desktop ){
             }
         }
 
-        if (!c) {
+/*        if (!c) { // this is useless - these windows don't accept focus
             // Search top-most visible window
             for ( ClientList::ConstIterator it = stacking_order.fromLast(); it != stacking_order.end(); --it) {
                 if ( (*it)->isVisible() ) {
@@ -2200,7 +2201,7 @@ void Workspace::setCurrentDesktop( int new_desktop ){
                     break;
                 }
             }
-        }
+        }*/
     }
 
     if ( c ) {