Add update mode to Unredirect requests so clients can redirect multiple times (and then unredirect) Add CompositeNumberRequests Fix some typeos

3 files changed, 24 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index ae57758..5d01260 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-06  Keith Packard  <keithp@keithp.com>
+
+	* composite.h:
+	* compositeproto.h:
+	Add update mode to Unredirect requests so clients
+	can redirect multiple times (and then unredirect)
+	Add CompositeNumberRequests
+	Fix some typeos
+
 2003-11-04  Keith Packard  <keithp@keithp.com>
 
 	* COPYING:
diff --git a/composite.h b/composite.h
index a6e1fc6..12546e3 100644
--- a/composite.h
+++ b/composite.h
@@ -1,5 +1,5 @@
 /*
- * $Id: composite.h,v 1.2 2003-11-05 05:39:58 keithp Exp $
+ * $Id: composite.h,v 1.3 2003-11-07 04:21:01 keithp Exp $
  *
  * Copyright © 2003 Keith Packard
  *
@@ -41,4 +41,6 @@
 #define X_CompositeUnredirectSubwindows		4
 #define X_CompositeCreateRegionFromBorderClip	5
 
+#define CompositeNumberRequests	    (X_CompositeCreateRegionFromBorderClip + 1)
+
 #endif /* _COMPOSITE_H_ */
diff --git a/compositeproto.h b/compositeproto.h
index 005a371..4f349d4 100644
--- a/compositeproto.h
+++ b/compositeproto.h
@@ -1,5 +1,5 @@
 /*
- * $Id: compositeproto.h,v 1.2 2003-11-05 05:39:58 keithp Exp $
+ * $Id: compositeproto.h,v 1.3 2003-11-07 04:21:01 keithp Exp $
  *
  * Copyright © 2003 Keith Packard
  *
@@ -79,27 +79,33 @@ typedef struct {
     CARD8   update;
     CARD8   pad1;
     CARD16  pad2 B16;
-} xCompositeRedirectWindowsReq;
+} xCompositeRedirectSubwindowsReq;
 
-#define sz_xCompositeRedirectWindowsReq	    12
+#define sz_xCompositeRedirectSubwindowsReq	    12
 
 typedef struct {
     CARD8   reqType;
     CARD8   compositeReqType;
     CARD16  length B16;
     Window  window B32;
+    CARD8   update;
+    CARD8   pad1;
+    CARD16  pad2 B16;
 } xCompositeUnredirectWindowReq;
 
-#define sz_xCompositeUnredirectWindowReq    8
+#define sz_xCompositeUnredirectWindowReq    12
 
 typedef struct {
     CARD8   reqType;
     CARD8   compositeReqType;
     CARD16  length B16;
     Window  window B32;
-} xCompositeUnredirectWindowsReq;
+    CARD8   update;
+    CARD8   pad1;
+    CARD16  pad2 B16;
+} xCompositeUnredirectSubwindowsReq;
 
-#define sz_xCompositeUnredirectWindowsReq   8
+#define sz_xCompositeUnredirectSubwindowsReq   12
 
 typedef struct {
     CARD8   reqType;