summaryrefslogtreecommitdiff
path: root/Xext
diff options
context:
space:
mode:
authorDavid Reveman <davidr@novell.com>2010-01-06 14:55:48 -0500
committerAdam Jackson <ajax@redhat.com>2010-11-30 13:47:42 -0500
commit84a14fab8f930ef1855444ae4e9e3e14ee008328 (patch)
treed2b964cbfff99633a83c17cdc5ed369dcdd7c5d9 /Xext
parent6dea617e0f71a6fc7937e3a1e10474fa87488284 (diff)
composite: add panoramix support
Taken from: 50d2d8c8969c165582d215c6e85c4be9eac02b6a dbffd0d44a33dcc84898c7a891d7ba212f65cbb8 9b5b102163b4eaa1b70647354fcab4f6e461c94c 75f9b98af31abf537ac6616c99f3797deb7ba017 07fba8b1f77a6bca44ea6568b346a18ce9d1e61d With minor style fixes, ported to dixLookupResourceByType, and ported away from client->noClientException and xalloc/xfree. v2: Fix a memory leak in PanoramiXCompositeNameWindowPixmap, spotted by James Jones. v3: Fix a buglet in PanoramiXCompositeUnredirectSubwindows, spotted by Dave Airlie. v4: Fix a style issue with resource lookup noted by Jamey Sharp. Reviewed-by: Dave Airlie <airlied@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'Xext')
-rw-r--r--Xext/panoramiX.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 5a395fc49..e6334bd93 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -56,6 +56,9 @@ Equipment Corporation.
#ifdef XFIXES
#include "xfixesint.h"
#endif
+#ifdef COMPOSITE
+#include "compint.h"
+#endif
#include "modinit.h"
#include "protocol-versions.h"
@@ -587,6 +590,10 @@ void PanoramiXExtensionInit(int argc, char *argv[])
#ifdef XFIXES
PanoramiXFixesInit ();
#endif
+#ifdef COMPOSITE
+ PanoramiXCompositeInit ();
+#endif
+
}
extern Bool CreateConnectionBlock(void);