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

Don't disable xinerama options if xinerama is not available, this may

Browse source 
change with xrandr1.2 and in the worst case those options simply
will degenerate to the trivial one-screen case.
BUG: 142860


svn path=/trunk/KDE/kdebase/workspace/; revision=786319
This commit is contained in:
Luboš Luňák 2008-03-16 18:42:27 +00:00
parent 982eb3de07
commit 877810b4c6
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
options.cpp
View file

@ -92,23 +92,13 @@ unsigned long Options::updateSettings()
if( !focusPolicyIsReasonable()) // #48786, comments #7 and later if( !focusPolicyIsReasonable()) // #48786, comments #7 and later
focusStealingPreventionLevel = 0; focusStealingPreventionLevel = 0;
KConfig *gc = new KConfig("kdeglobals", KConfig::NoGlobals); KConfig gc("kdeglobals", KConfig::NoGlobals);
bool isVirtual = KApplication::desktop()->isVirtualDesktop(); KConfigGroup gWindowsConfig(&gc, "Windows");
KConfigGroup gWindowsConfig(gc, "Windows"); xineramaEnabled = gWindowsConfig.readEntry ("XineramaEnabled", true);
xineramaEnabled = gWindowsConfig.readEntry ("XineramaEnabled", isVirtual) &&
isVirtual;
if (xineramaEnabled)
{
xineramaPlacementEnabled = gWindowsConfig.readEntry ("XineramaPlacementEnabled", true); xineramaPlacementEnabled = gWindowsConfig.readEntry ("XineramaPlacementEnabled", true);
xineramaMovementEnabled = gWindowsConfig.readEntry ("XineramaMovementEnabled", true); xineramaMovementEnabled = gWindowsConfig.readEntry ("XineramaMovementEnabled", true);
xineramaMaximizeEnabled = gWindowsConfig.readEntry ("XineramaMaximizeEnabled", true); xineramaMaximizeEnabled = gWindowsConfig.readEntry ("XineramaMaximizeEnabled", true);
xineramaFullscreenEnabled = gWindowsConfig.readEntry ("XineramaFullscreenEnabled", true); xineramaFullscreenEnabled = gWindowsConfig.readEntry ("XineramaFullscreenEnabled", true);
}
else
{
xineramaPlacementEnabled = xineramaMovementEnabled = xineramaMaximizeEnabled = xineramaFullscreenEnabled = false;
}
delete gc;
placement = Placement::policyFromString( config.readEntry("Placement"), true ); placement = Placement::policyFromString( config.readEntry("Placement"), true );
xineramaPlacementScreen = qBound( -1, config.readEntry( "XineramaPlacementScreen", -1 ), xineramaPlacementScreen = qBound( -1, config.readEntry( "XineramaPlacementScreen", -1 ),