From d140d97616ca359a1c069186ea26232a82052ab3 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 27 Jun 2004 21:29:23 +0000
Subject: [PATCH] Only use XCompositeNameWindowPixmap when the library provides
 it

---
 ChangeLog  |  5 +++++
 xcompmgr.c | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 93440dc6..06ea70fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-27  Keith Packard  <keithp@keithp.com>
+
+	* xcompmgr.c: (map_win), (unmap_win), (main):
+	Only use XCompositeNameWindowPixmap when the library provides it
+
 2004-06-26  Keith Packard  <keithp@keithp.com>
 
 	* xcompmgr.c: (win_extents), (paint_all), (repair_win),
diff --git a/xcompmgr.c b/xcompmgr.c
index dbeb71c5..90240408 100644
--- a/xcompmgr.c
+++ b/xcompmgr.c
@@ -43,6 +43,10 @@
 #include <X11/extensions/Xdamage.h>
 #include <X11/extensions/Xrender.h>
 
+#if COMPOSITE_MAJOR > 0 || COMPOSITE_MINOR >= 2
+#define HAS_NAME_WINDOW_PIXMAP 1
+#endif
+
 typedef struct _ignore {
     struct _ignore	*next;
     unsigned long	sequence;
@@ -91,7 +95,9 @@ Picture		transBlackPicture;
 Picture		rootTile;
 XserverRegion	allDamage;
 Bool		clipChanged;
+#if HAS_NAME_WINDOW_PIXMAP
 Bool		hasNamePixmap;
+#endif
 int		root_height, root_width;
 ignore		*ignore_head, **ignore_tail = &ignore_head;
 int		xfixes_event, xfixes_error;
@@ -809,12 +815,14 @@ map_win (Display *dpy, Window id, unsigned long sequence)
 	return;
     w->a.map_state = IsViewable;
 
+#if HAS_NAME_WINDOW_PIXMAP
     if (hasNamePixmap)
     {
 	w->pixmap = XCompositeNameWindowPixmap (dpy, id);
 	back = w->pixmap;
     }
     else
+#endif
     {
 	w->pixmap = 0;
 	back = id;
@@ -853,11 +861,13 @@ unmap_win (Display *dpy, Window id)
 	add_damage (dpy, w->extents);    /* destroys region */
 	w->extents = None;
     }
+#if HAS_NAME_WINDOW_PIXMAP
     if (hasNamePixmap)
     {
 	XFreePixmap (dpy, w->pixmap);
 	w->pixmap = 0;
     }
+#endif
     if (w->picture)
     {
 	set_ignore (dpy, NextRequest (dpy));
@@ -1352,12 +1362,14 @@ main (int argc, char **argv)
 	exit (1);
     }
     XCompositeQueryVersion (dpy, &composite_major, &composite_minor);
+#if HAS_NAME_WINDOW_PIXMAP
 #if 0
     /*
      * Don't use this yet; we don't have set semantics for new pixmaps
      */
     if (composite_major > 0 || composite_minor >= 2)
 	hasNamePixmap = True;
+#endif
 #endif
 
     if (!XDamageQueryExtension (dpy, &damage_event, &damage_error))