From 0d8883e74a18027f73c8ffcd7b4a8d367190f5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Mon, 16 Aug 2004 13:49:47 +0000 Subject: [PATCH] Don't refuse activation with focus stealing prevention turned off (#48786, comment 11). svn path=/trunk/kdebase/kwin/; revision=338306 --- activation.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/activation.cpp b/activation.cpp index a9c1733dfc..ae5a369170 100644 --- a/activation.cpp +++ b/activation.cpp @@ -696,7 +696,7 @@ Time Client::readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStar // use the _KDE_NET_WM_USER_CREATION_TIME trick. // Otherwise, refuse activation of a window // from already running application if this application - // is not the active one. + // is not the active one (unless focus stealing prevention is turned off). Client* act = workspace()->mostRecentlyActivatedClient(); if( act != NULL && !belongToSameApplication( act, this, true )) { @@ -717,7 +717,8 @@ Time Client::readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStar if( workspace()->findClient( SameApplicationActiveHackPredicate( this ))) first_window = false; } - if( !first_window ) + // don't refuse if focus stealing prevention is turned off + if( !first_window && rules()->checkFSP( options->focusStealingPreventionLevel ) > 0 ) { kdDebug( 1212 ) << "User timestamp, already exists:" << 0 << endl; return 0; // refuse activation