From eb0d7931572ca753aca7d099d66c8ce335691132 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, 21 Nov 2007 15:54:06 +0000
Subject: [PATCH] Default to SeparateScreenFocus being false, to be consistent
 with KDE3. (and e.g. #141997).

svn path=/trunk/KDE/kdebase/workspace/; revision=739693
---
 composite.cpp                   | 1 +
 compositingprefs.cpp            | 6 +++++-
 kcmkwin/kwinoptions/windows.cpp | 4 ++--
 options.cpp                     | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/composite.cpp b/composite.cpp
index ae0bb32907..16c2cc473c 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -128,6 +128,7 @@ void Workspace::setupCompositing()
 #endif
         default:
 // this is the inverse of the two above tests, to have a different message
+// it is also used in compositingprefs.cpp
 #if !(defined(HAVE_OPENGL) || (defined(HAVE_XRENDER) && defined(HAVE_XFIXES)))
             kDebug( 1212 ) << "Compositing was not available at compile time";
 #else
diff --git a/compositingprefs.cpp b/compositingprefs.cpp
index 3f05b25a39..1561e4ece9 100644
--- a/compositingprefs.cpp
+++ b/compositingprefs.cpp
@@ -48,6 +48,10 @@ bool CompositingPrefs::compositingPossible()
         return false;
         }
 
+#if !(defined(HAVE_OPENGL) || (defined(HAVE_XRENDER) && defined(HAVE_XFIXES)))
+    kDebug( 1212 ) << "Not compiled with OpenGL/XRender support";
+    return false;
+#endif
     return true;
 #else
     return false;
@@ -56,7 +60,7 @@ bool CompositingPrefs::compositingPossible()
 
 QString CompositingPrefs::compositingNotPossibleReason()
     {
-#if defined( HAVE_XCOMPOSITE ) && defined( HAVE_XDAMAGE )
+#if defined( HAVE_XCOMPOSITE ) && defined( HAVE_XDAMAGE ) && (defined(HAVE_OPENGL) || (defined(HAVE_XRENDER) && defined(HAVE_XFIXES)))
     Extensions::init();
     if( !Extensions::compositeAvailable() || Extensions::damageAvailable())
         {
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index 251e8090d2..8a96c4c2d5 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -459,7 +459,7 @@ void KFocusConfig::load( void )
     setAutoRaiseEnabled();      // this will disable/hide the auto raise delay widget if focus==click
     setDelayFocusEnabled();
 
-    setSeparateScreenFocus( cg.readEntry(KWIN_SEPARATE_SCREEN_FOCUS, true));
+    setSeparateScreenFocus( cg.readEntry(KWIN_SEPARATE_SCREEN_FOCUS, false));
     // on by default for non click to focus policies
     setActiveMouseScreen( cg.readEntry(KWIN_ACTIVE_MOUSE_SCREEN, focusCombo->currentIndex() != 0 ));
 
@@ -538,7 +538,7 @@ void KFocusConfig::defaults()
     setAutoRaise(false);
     setDelayFocus(false);
     setClickRaise(true);
-    setSeparateScreenFocus( true );
+    setSeparateScreenFocus( false );
     // on by default for non click to focus policies
     setActiveMouseScreen( focusCombo->currentIndex() != 0 );
     setAltTabMode(true);
diff --git a/options.cpp b/options.cpp
index 52538cea8d..4b49f7f9e9 100644
--- a/options.cpp
+++ b/options.cpp
@@ -73,7 +73,7 @@ unsigned long Options::updateSettings()
     if ( val == "CDE" )
         altTabStyle = CDE;
         
-    separateScreenFocus = config.readEntry( "SeparateScreenFocus", true );
+    separateScreenFocus = config.readEntry( "SeparateScreenFocus", false );
     activeMouseScreen = config.readEntry( "ActiveMouseScreen", focusPolicy != ClickToFocus );
 
     rollOverDesktops = config.readEntry("RollOverDesktops", true);