Bug#480737: xserver-xephyr: "-extension Composite" does not disable composite extension

[Julien Cristau <jcristau@debian.org>]

tag 480737 + confirmed upstream
kthxbye

On Sun, May 11, 2008 at 22:11:02 +0200, Sebastian Fontius wrote:

> I use Xephyr to play Alpha Centauri (mea culpa) as Alpha Centauri has
> problems with 32 bit visuals (available when the Composite extension
> is enabled) and Xephyr did not provide those until recently.
> 
> But some time ago Xephyr apparently enabled the Composite extension
> and therefor 32 bit visuals.  No problem, Xephyr's --help says this:
> 
> ,----
> | % Xephyr --help 2>&1 | grep -- '[-+]extension'
> | +extension name        Enable extension
> | -extension name        Disable extension
> `----
> 
> But this simply does not work for Composite:
> 
Confirmed.  This is because kdrive's InitOutput() function resets
noCompositeExtension to FALSE after the command-line arguments have been
parsed.
Daniel, this change was introduced by commit 'new KDrive input world
order' (02d09105113fb9b560a770fe15f7bb041165831c), when Composite was
disabled by default.  Maybe it would make sense to remove this now that
composite is enabled by default, so it's possible to disable it?

>From 7dde1dcaf32cd114c4bad855ecd96472cc76e320 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Sun, 11 May 2008 23:17:27 +0200
Subject: [PATCH] kdrive: make it possible to disable Composite

KdInitOutput() used to enable Composite when it was disabled by default,
but now this hack prevents ``-extension Composite'' from working.
Remove it, as Composite is enabled by default anyway.
---
 hw/kdrive/src/kdrive.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index 50148c4..e2ee4ad 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -1353,12 +1353,6 @@ KdInitOutput (ScreenInfo    *pScreenInfo,
     KdCardInfo	    *card;
     KdScreenInfo    *screen;
 
-#ifdef COMPOSITE
-    /* kind of a hack: we want Composite enabled, but it's disabled per
-     * default. */
-    noCompositeExtension = FALSE;
-#endif
-    
     if (!kdCardInfo)
     {
 	InitCard (0);
-- 
1.5.5.1

Cheers,
Julien