diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-08-03 05:39:19 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-08-03 05:39:19 +0000 |
| commit | b7ba272da0910c6558f71cfedd0bf9836fc892c1 (patch) | |
| tree | 05d9cc8b6517dec2ce7b985bd6dd9c4cafa8931c /mi | |
| parent | d112e55992e9e03e74fdf5738c8c47cd90033a37 (diff) | |
The Damage extension has to wrap after (be called before) the Composite
extension so that the redirecting of drawables by the wrapper doesn't
confuse Damage.
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/miinitext.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c index 2ce03ff8f..66e4bf5e8 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.9 2004/07/31 09:14:06 kem Exp $ */ +/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.10 2004/07/31 09:41:27 kem Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */ /*********************************************************** @@ -489,12 +489,13 @@ InitExtensions(argc, argv) #ifdef XEVIE if (!noXevieExtension) XevieExtensionInit(); #endif -#ifdef DAMAGE - DamageExtensionInit(); -#endif #ifdef COMPOSITE if (!noCompositeExtension) CompositeExtensionInit(); #endif +#ifdef DAMAGE + /* Must be after Composite to layer with composite wrapper properly */ + DamageExtensionInit(); +#endif } void @@ -621,12 +622,13 @@ static ExtensionModule staticExtensions[] = { #ifdef RANDR { RRExtensionInit, "RANDR", NULL, NULL, NULL }, #endif -#ifdef DAMAGE - { DamageExtensionInit, "DAMAGE", NULL, NULL }, -#endif #ifdef COMPOSITE { CompositeExtensionInit, "COMPOSITE", &noCompositeExtension, NULL }, #endif +#ifdef DAMAGE + /* Must be after Composite to layer with composite wrapper properly */ + { DamageExtensionInit, "DAMAGE", NULL, NULL }, +#endif #ifdef XEVIE { XevieExtensionInit, "XEVIE", &noXevieExtension, NULL }, #endif |