From aa3526e42f46043900fe83dde04f9bde927d7c64 Mon Sep 17 00:00:00 2001
From: Matthias Ettrich <ettrich@troll.no>
Date: Mon, 10 Jul 2000 21:48:13 +0000
Subject: [PATCH] more autoRaise and focusFollowsMouse fun

svn path=/trunk/kdebase/kwin/; revision=56016
---
 client.cpp | 6 ++++--
 client.h   | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client.cpp b/client.cpp
index 8aeceee6c3..17f6bdcedc 100644
--- a/client.cpp
+++ b/client.cpp
@@ -322,7 +322,7 @@ bool WindowWrapper::x11Event( XEvent * e)
 	{
 	    if ( ((Client*)parentWidget())->isActive()
 		 && ( options->focusPolicy != Options::ClickToFocus &&  options->clickRaise ) ) {
-		((Client*)parentWidget())->workspace()->raiseClient( (Client*) parentWidget() );
+		((Client*)parentWidget())->autoRaise();
 		ungrabButton( winId(),  None );
 	    }
 	
@@ -1058,7 +1058,9 @@ void Client::mousePressEvent( QMouseEvent * e)
             workspace()->lowerClient( this );
         }
         else if ( e->button() == RightButton ) {
-	    workspace()->clientPopup( this ) ->popup( e->globalPos() );
+	    if ( isActive() & ( options->focusPolicy != Options::ClickToFocus &&  options->clickRaise ) )
+		autoRaise();
+	    workspace()->clientPopup( this )->popup( e->globalPos() );
         }
     }
 }
diff --git a/client.h b/client.h
index 4148c9a26d..779bb8ac85 100644
--- a/client.h
+++ b/client.h
@@ -165,8 +165,6 @@ public slots:
     void maximize();
     void toggleSticky();
     void contextHelp();
-
-private slots:
     void autoRaise();
     
 protected: