yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Default to SeparateScreenFocus being false, to be consistent with KDE3.

Browse source 
(and e.g. #141997).


svn path=/trunk/KDE/kdebase/workspace/; revision=739693
This commit is contained in:
Luboš Luňák 2007-11-21 15:54:06 +00:00
parent 5c9fd52311
commit eb0d793157
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
composite.cpp
View file

@ -128,6 +128,7 @@ void Workspace::setupCompositing()
#endif #endif
default: default:
// this is the inverse of the two above tests, to have a different message // 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))) #if !(defined(HAVE_OPENGL) || (defined(HAVE_XRENDER) && defined(HAVE_XFIXES)))
kDebug( 1212 ) << "Compositing was not available at compile time"; kDebug( 1212 ) << "Compositing was not available at compile time";
#else #else

6
compositingprefs.cpp
View file

@ -48,6 +48,10 @@ bool CompositingPrefs::compositingPossible()
return false; 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; return true;
#else #else
return false; return false;
@ -56,7 +60,7 @@ bool CompositingPrefs::compositingPossible()
QString CompositingPrefs::compositingNotPossibleReason() 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(); Extensions::init();
if( !Extensions::compositeAvailable() || Extensions::damageAvailable()) if( !Extensions::compositeAvailable() || Extensions::damageAvailable())
{ {

4
kcmkwin/kwinoptions/windows.cpp
View file

@ -459,7 +459,7 @@ void KFocusConfig::load( void )
setAutoRaiseEnabled(); // this will disable/hide the auto raise delay widget if focus==click setAutoRaiseEnabled(); // this will disable/hide the auto raise delay widget if focus==click
setDelayFocusEnabled(); 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 // on by default for non click to focus policies
setActiveMouseScreen( cg.readEntry(KWIN_ACTIVE_MOUSE_SCREEN, focusCombo->currentIndex() != 0 )); setActiveMouseScreen( cg.readEntry(KWIN_ACTIVE_MOUSE_SCREEN, focusCombo->currentIndex() != 0 ));
@ -538,7 +538,7 @@ void KFocusConfig::defaults()
setAutoRaise(false); setAutoRaise(false);
setDelayFocus(false); setDelayFocus(false);
setClickRaise(true); setClickRaise(true);
setSeparateScreenFocus( true ); setSeparateScreenFocus( false );
// on by default for non click to focus policies // on by default for non click to focus policies
setActiveMouseScreen( focusCombo->currentIndex() != 0 ); setActiveMouseScreen( focusCombo->currentIndex() != 0 );
setAltTabMode(true); setAltTabMode(true);

2
options.cpp
View file

@ -73,7 +73,7 @@ unsigned long Options::updateSettings()
if ( val == "CDE" ) if ( val == "CDE" )
altTabStyle = CDE; altTabStyle = CDE;
separateScreenFocus = config.readEntry( "SeparateScreenFocus", true ); separateScreenFocus = config.readEntry( "SeparateScreenFocus", false );
activeMouseScreen = config.readEntry( "ActiveMouseScreen", focusPolicy != ClickToFocus ); activeMouseScreen = config.readEntry( "ActiveMouseScreen", focusPolicy != ClickToFocus );
rollOverDesktops = config.readEntry("RollOverDesktops", true); rollOverDesktops = config.readEntry("RollOverDesktops", true);