From 877810b4c652949d23dc3e834329e16433398bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Sun, 16 Mar 2008 18:42:27 +0000 Subject: [PATCH] Don't disable xinerama options if xinerama is not available, this may 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 --- options.cpp | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/options.cpp b/options.cpp index 33863b43cb..3f8d165dba 100644 --- a/options.cpp +++ b/options.cpp @@ -92,23 +92,13 @@ unsigned long Options::updateSettings() if( !focusPolicyIsReasonable()) // #48786, comments #7 and later focusStealingPreventionLevel = 0; - KConfig *gc = new KConfig("kdeglobals", KConfig::NoGlobals); - bool isVirtual = KApplication::desktop()->isVirtualDesktop(); - KConfigGroup gWindowsConfig(gc, "Windows"); - xineramaEnabled = gWindowsConfig.readEntry ("XineramaEnabled", isVirtual) && - isVirtual; - if (xineramaEnabled) - { - xineramaPlacementEnabled = gWindowsConfig.readEntry ("XineramaPlacementEnabled", true); - xineramaMovementEnabled = gWindowsConfig.readEntry ("XineramaMovementEnabled", true); - xineramaMaximizeEnabled = gWindowsConfig.readEntry ("XineramaMaximizeEnabled", true); - xineramaFullscreenEnabled = gWindowsConfig.readEntry ("XineramaFullscreenEnabled", true); - } - else - { - xineramaPlacementEnabled = xineramaMovementEnabled = xineramaMaximizeEnabled = xineramaFullscreenEnabled = false; - } - delete gc; + KConfig gc("kdeglobals", KConfig::NoGlobals); + KConfigGroup gWindowsConfig(&gc, "Windows"); + xineramaEnabled = gWindowsConfig.readEntry ("XineramaEnabled", true); + xineramaPlacementEnabled = gWindowsConfig.readEntry ("XineramaPlacementEnabled", true); + xineramaMovementEnabled = gWindowsConfig.readEntry ("XineramaMovementEnabled", true); + xineramaMaximizeEnabled = gWindowsConfig.readEntry ("XineramaMaximizeEnabled", true); + xineramaFullscreenEnabled = gWindowsConfig.readEntry ("XineramaFullscreenEnabled", true); placement = Placement::policyFromString( config.readEntry("Placement"), true ); xineramaPlacementScreen = qBound( -1, config.readEntry( "XineramaPlacementScreen", -1 ),