summaryrefslogtreecommitdiff
path: root/composite/compint.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2004-08-15 19:05:01 +0000
committerKeith Packard <keithp@keithp.com>2004-08-15 19:05:01 +0000
commita68f350195c1c54034f98e2b78c2c3da70044884 (patch)
tree4f8f33ab22dfcdd1708ea8fbf5d6ac20ab4db016 /composite/compint.h
parent5db70ae2575e3e8669d7a66e2218ba28e8bdfa68 (diff)
Remove debugging code which did a full tree walk on every window operation
Eliminate needless (and, it turns out, dangerous) call to ChangeGC on DestroyGCPrivate. in cwSetWindowPixmap, check if the pixmap is the screen pixmap and disable the wrapper by setting the private to NULL.
Diffstat (limited to 'composite/compint.h')
-rw-r--r--composite/compint.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/composite/compint.h b/composite/compint.h
index 78a138a74..81b4027ec 100644
--- a/composite/compint.h
+++ b/composite/compint.h
@@ -49,6 +49,12 @@
#include <X11/extensions/compositeproto.h>
#include <assert.h>
+/*
+ * enable this for debugging
+
+ #define COMPOSITE_DEBUG
+ */
+
typedef struct _CompClientWindow {
struct _CompClientWindow *next;
XID id;
@@ -118,10 +124,6 @@ typedef struct _CompScreen {
XID alternateVisuals[NUM_COMP_ALTERNATE_VISUALS];
} CompScreenRec, *CompScreenPtr;
-#define HasCompRedirect(w) (wPixmap(w) != wPixmap(w->parent))
-#define wScreen(w) ((w)->drawable.pScreen)
-#define wPixmap(w) (*(wScreen(w)->GetWindowPixmap) (w))
-
extern int CompScreenPrivateIndex;
extern int CompWindowPrivateIndex;
extern int CompSubwindowsPrivateIndex;
@@ -192,11 +194,11 @@ compScreenInit (ScreenPtr pScreen);
* compwindow.c
*/
-#ifdef NDEBUG
-#define compCheckTree(s)
-#else
+#ifdef COMPOSITE_DEBUG
void
compCheckTree (ScreenPtr pScreen);
+#else
+#define compCheckTree(s)
#endif
void