Index: programs/Xserver/Xext/panoramiX.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/panoramiX.c,v
retrieving revision 1.3
diff -u -r1.3 panoramiX.c
--- programs/Xserver/Xext/panoramiX.c	30 Jun 2004 20:06:53 -0000	1.3
+++ programs/Xserver/Xext/panoramiX.c	28 Oct 2004 20:18:28 -0000
@@ -1037,7 +1037,16 @@
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
+#if 1
+    {
+	/* The following hack fools clients into thinking that Xinerama
+	 * is disabled even though it is not. */
+	extern Bool PanoramiXExtensionDisabledHack;
+	rep.state = !noPanoramiXExtension && !PanoramiXExtensionDisabledHack;
+    }
+#else
     rep.state = !noPanoramiXExtension;
+#endif
     if (client->swapped) {
 	register int n;
 	swaps (&rep.sequenceNumber, n);
Index: programs/Xserver/os/utils.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/os/utils.c,v
retrieving revision 1.6
diff -u -r1.6 utils.c
--- programs/Xserver/os/utils.c	11 Aug 2004 22:27:50 -0000	1.6
+++ programs/Xserver/os/utils.c	28 Oct 2004 20:18:48 -0000
@@ -136,6 +136,7 @@
 Bool PanoramiXMapped = FALSE;
 Bool PanoramiXWindowExposureSent = FALSE;
 Bool PanoramiXOneExposeRequest = FALSE;
+Bool PanoramiXExtensionDisabledHack = FALSE;
 #endif
 
 #ifdef XEVIE
@@ -923,6 +924,9 @@
 	else if ( strcmp( argv[i], "-xinerama") == 0){
 	    noPanoramiXExtension = TRUE;
 	}
+	else if ( strcmp( argv[i], "-disablexineramaextension") == 0){
+	    PanoramiXExtensionDisabledHack = TRUE;
+	}
 #endif
 	else if ( strcmp( argv[i], "-x") == 0)
 	{