From d051f95e4b9e689078a19366f0871b9e2ad55e03 Mon Sep 17 00:00:00 2001
From: George Staikos <staikos@kde.org>
Date: Wed, 11 Dec 2002 00:44:10 +0000
Subject: [PATCH] remove HAVE_XINERAMA since it's no longer necessary.  Will
 remove the configure check once the rest of CVS (less kdenonbeta) is
 cleansed.

Qt has a good API for this so we dont' need to link to libXinerama.

GUI: Changed the terms to be non-Xinerama specific.

svn path=/trunk/kdebase/kwin/; revision=193268
---
 kcmkwin/kwinoptions/windows.cpp | 22 ++++------------------
 kcmkwin/kwinoptions/windows.h   |  2 --
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index 228455527a..e8616c9c5b 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -40,9 +40,7 @@
 #include <kdialog.h>
 #include <dcopclient.h>
 
-#ifdef HAVE_XINERAMA
 #include <kapplication.h>
-#endif
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
@@ -491,11 +489,10 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, QWidget *p
     connect(shadeHoverOn, SIGNAL(toggled(bool)), SLOT(changed()));
     connect(shadeHover, SIGNAL(valueChanged(int)), SLOT(changed()));
 
-#ifdef HAVE_XINERAMA
-    xineramaBox = new QVButtonGroup(i18n("Xinerama"), this);
-
-    xineramaEnable = new QCheckBox(i18n("Enable Xinerama support"), xineramaBox);
-    QWhatsThis::add(xineramaEnable, i18n("Enable support for Xinerama."));
+    xineramaBox = new QVButtonGroup(i18n("Multiple monitor support"), this);
+    xineramaBox->setEnabled(QApplication::desktop()->isVirtualDesktop());
+    xineramaEnable = new QCheckBox(i18n("Enable multiple monitor support"), xineramaBox);
+    QWhatsThis::add(xineramaEnable, i18n("Enable support for multiple monitors merged to form a single desktop."));
     connect(xineramaEnable, SIGNAL(toggled(bool)), this, SLOT(setXinerama(bool)));
     xineramaMovementEnable = new QCheckBox(i18n("Enable window resistance support"), xineramaBox);
     QWhatsThis::add(xineramaMovementEnable, i18n("Turn on resistance when moving a window from one physical screen to the other."));
@@ -505,7 +502,6 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, QWidget *p
     QWhatsThis::add(xineramaMaximizeEnable, i18n("When this option is turned on, windows will only maximize up to the physical screen size."));
 
     lay->addWidget(xineramaBox);
-#endif
 
     electricBox = new QVButtonGroup(i18n("Active Desktop Borders"), this);
     electricBox->setMargin(15);
@@ -536,12 +532,10 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, QWidget *p
     lay->addStretch();
     load();
 
-#ifdef HAVE_XINERAMA
     connect( xineramaEnable, SIGNAL(clicked()), SLOT(changed()));
     connect( xineramaMovementEnable, SIGNAL(clicked()), SLOT(changed()));
     connect( xineramaPlacementEnable, SIGNAL(clicked()), SLOT(changed()));
     connect( xineramaMaximizeEnable, SIGNAL(clicked()), SLOT(changed()));
-#endif
 
 
 }
@@ -565,7 +559,6 @@ void KAdvancedConfig::shadeHoverChanged(bool a) {
 }
 
 void KAdvancedConfig::setXinerama(bool on) {
-#ifdef HAVE_XINERAMA
     if (KApplication::desktop()->isVirtualDesktop())
         xineramaEnable->setChecked(on);
     else
@@ -574,9 +567,6 @@ void KAdvancedConfig::setXinerama(bool on) {
     xineramaMovementEnable->setEnabled(on);
     xineramaPlacementEnable->setEnabled(on);
     xineramaMaximizeEnable->setEnabled(on);
-#else
-    Q_UNUSED(on);
-#endif
 }
 
 void KAdvancedConfig::setAnimateShade(bool a) {
@@ -591,12 +581,10 @@ void KAdvancedConfig::load( void )
     setShadeHover(config->readBoolEntry(KWIN_SHADEHOVER, false));
     setShadeHoverInterval(config->readNumEntry(KWIN_SHADEHOVER_INTERVAL, 250));
 
-#ifdef HAVE_XINERAMA
     setXinerama(config->readBoolEntry(KWIN_XINERAMA, false));
     xineramaMovementEnable->setChecked( config->readBoolEntry(KWIN_XINERAMA_MOVEMENT, false));
     xineramaPlacementEnable->setChecked(config->readBoolEntry(KWIN_XINERAMA_PLACEMENT, false));
     xineramaMaximizeEnable->setChecked(config->readBoolEntry(KWIN_XINERAMA_MAXIMIZE, false));
-#endif
 
     setElectricBorders(config->readNumEntry(KWM_ELECTRIC_BORDER, false));
     setElectricBorderDelay(config->readNumEntry(KWM_ELECTRIC_BORDER_DELAY, 150));
@@ -617,12 +605,10 @@ void KAdvancedConfig::save( void )
     if (v<0) v = 0;
     config->writeEntry(KWIN_SHADEHOVER_INTERVAL, v);
 
-#ifdef HAVE_XINERAMA
     config->writeEntry(KWIN_XINERAMA, xineramaEnable->isChecked());
     config->writeEntry(KWIN_XINERAMA_MOVEMENT, xineramaMovementEnable->isChecked());
     config->writeEntry(KWIN_XINERAMA_PLACEMENT, xineramaPlacementEnable->isChecked());
     config->writeEntry(KWIN_XINERAMA_MAXIMIZE, xineramaMaximizeEnable->isChecked());
-#endif
 
     config->writeEntry(KWM_ELECTRIC_BORDER, getElectricBorders());
     config->writeEntry(KWM_ELECTRIC_BORDER_DELAY,getElectricBorderDelay());
diff --git a/kcmkwin/kwinoptions/windows.h b/kcmkwin/kwinoptions/windows.h
index ff35710ad4..37ff029fdd 100644
--- a/kcmkwin/kwinoptions/windows.h
+++ b/kcmkwin/kwinoptions/windows.h
@@ -199,13 +199,11 @@ private:
   QCheckBox *shadeHoverOn;
   KIntNumInput *shadeHover;
 
-#ifdef HAVE_XINERAMA
   QButtonGroup *xineramaBox;
   QCheckBox *xineramaEnable;
   QCheckBox *xineramaMovementEnable;
   QCheckBox *xineramaPlacementEnable;
   QCheckBox *xineramaMaximizeEnable;
-#endif
 
   KConfig *config;
   bool     standAlone;