composite: move unredirected window data out of input structs, into composite

It touches less things here, and is now completely within composite directory.

1 files changed, 0 insertions, 9 deletions

diff --git a/include/inputstr.h b/include/inputstr.h
index 6580e1ce2..b284ea4e9 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -199,10 +199,6 @@ typedef struct _GrabRec {
     Mask                deviceMask;     
     /* XI2 event masks. One per device, each bit is a mask of (1 << type) */
     unsigned char       xi2mask[EMASKSIZE][XI2MASKSIZE];
-#ifdef COMPOSITE
-    WindowPtr       *spriteTrace;
-    int             spriteTraceGood;
-#endif
 } GrabRec;
 
 typedef struct _KeyClassRec {
@@ -387,11 +383,6 @@ typedef struct {
      * windows must be checked.
      * spriteTraces should only be used at dix/events.c! */
     WindowPtr *spriteTrace;
-#ifdef COMPOSITE
-    /* the real (rather than redirected) heirachy,
-     * so we know which windows to transform with respect to */
-    WindowPtr *spriteTraceUnredirected;
-#endif
     int spriteTraceSize;
     int spriteTraceGood;