Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb/proto into debian

27 files changed, 269 insertions, 92 deletions

diff --git a/NEWS b/NEWS
index dd18f3d..10a2284 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,36 @@
+Release 1.0 (2006-11-23)
+========================
+
+The "Thanksgiving" release: We feel thankful to have it released.
+
+* Fix Bug #8990: randr type fixes
+* Fixed screen parameter type in several GLX requests to use CARD32 instead
+  of the SCREEN structure.
+* Corrected valueparam arguments to attribute lists in several requests and
+  a reply.
+* Estethic change for attribute parameter name
+* Remove support for the <localfield> tag: nothing needs it.
+* Fix Bug #8973: In UngrabKey, the 'key' field should have type KEYCODE, not
+  the more general CARD8.
+
+
+Release 1.0 RC3 (2006-11-02)
+============================
+
+* Add support for the Xinerama extension, version 1.1
+* Protocol descriptions now document the major and minor version numbers
+  of the extension version they support, through major-version and
+  minor-version attributes on the xcb tag.  XML Schema updated
+  accordingly.
+* Minor source reorganization: Now that the extensions do not get
+  installed to an extensions/ subdirectory, move them out of the
+  extensions/ subdirectory in the source as well.
+* Various protocol description fixes:
+    * Add REPEAT enumeration to Render extension to fix bug #8535
+    * Fix core xproto GrabMode enumeration (reported by Yang JianJun)
+    * Fix core xproto cap style enumeration (bug #8857).
+
+
 Release 1.0 RC2 (2006-10-07)
 ============================
 
diff --git a/configure.ac b/configure.ac
index 9d51d75..8b94249 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([XCB Proto],
-        0.9.92,
+        1.0,
         [xcb@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([xcb-proto.pc.in])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
diff --git a/src/Makefile.am b/src/Makefile.am
index daf6623..dd0d329 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,30 +1,30 @@
 xcbinclude_HEADERS = \
 	xcb.xsd \
 	xproto.xml \
-	extensions/bigreq.xml \
-	extensions/composite.xml \
-	extensions/damage.xml \
-	extensions/dpms.xml \
-	extensions/glx.xml \
-	extensions/randr.xml \
-	extensions/record.xml \
-	extensions/render.xml \
-	extensions/res.xml \
-	extensions/screensaver.xml \
-	extensions/shape.xml \
-	extensions/shm.xml \
-	extensions/sync.xml \
-	extensions/xc_misc.xml \
-	extensions/xevie.xml \
-	extensions/xf86dri.xml \
-	extensions/xfixes.xml \
-	extensions/xprint.xml \
-	extensions/xtest.xml \
-	extensions/xv.xml	 \
-	extensions/xvmc.xml
+	bigreq.xml \
+	composite.xml \
+	damage.xml \
+	dpms.xml \
+	glx.xml \
+	randr.xml \
+	record.xml \
+	render.xml \
+	res.xml \
+	screensaver.xml \
+	shape.xml \
+	shm.xml \
+	sync.xml \
+	xc_misc.xml \
+	xevie.xml \
+	xinerama.xml \
+	xf86dri.xml \
+	xfixes.xml \
+	xprint.xml \
+	xtest.xml \
+	xv.xml \
+	xvmc.xml
 
 if HAVE_XMLLINT
 check-local:
-	$(XMLLINT) --noout --schema $(srcdir)/xcb.xsd \
-	           $(srcdir)/*.xml $(srcdir)/extensions/*.xml
+	$(XMLLINT) --noout --schema $(srcdir)/xcb.xsd $(srcdir)/*.xml
 endif
diff --git a/src/extensions/bigreq.xml b/src/bigreq.xml
index 9e99d2e..d58a084 100644
--- a/src/extensions/bigreq.xml
+++ b/src/bigreq.xml
@@ -26,7 +26,9 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 <xcb header="bigreq" extension-xname="BIG-REQUESTS"
-                     extension-name="BigRequests">
+    extension-name="BigRequests"
+    major-version="0" minor-version="0">
+
   <request name="Enable" opcode="0">
     <reply>
       <pad bytes="1" />
diff --git a/src/extensions/composite.xml b/src/composite.xml
index 48c90fd..3f3a4b1 100644
--- a/src/extensions/composite.xml
+++ b/src/composite.xml
@@ -25,7 +25,9 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 <!-- This file describes version 0.3 of COMPOSITE. -->
-<xcb header="composite" extension-xname="Composite" extension-name="Composite">
+<xcb header="composite" extension-xname="Composite" extension-name="Composite"
+    major-version="0" minor-version="3">
+
   <import>xproto</import>
   <import>xfixes</import>
 
diff --git a/src/extensions/damage.xml b/src/damage.xml
index 474fd60..4e03057 100644
--- a/src/extensions/damage.xml
+++ b/src/damage.xml
@@ -25,7 +25,8 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 <!-- This file describes version 1 of DAMAGE. -->
-<xcb header="damage" extension-xname="DAMAGE" extension-name="Damage">
+<xcb header="damage" extension-xname="DAMAGE" extension-name="Damage"
+    major-version="1" minor-version="0">
   <import>xproto</import>
   <import>xfixes</import>
 
diff --git a/src/extensions/dpms.xml b/src/dpms.xml
index 27ba98a..0d4fad1 100644
--- a/src/extensions/dpms.xml
+++ b/src/dpms.xml
@@ -25,7 +25,8 @@ institutions shall not be used in advertising or otherwise to promote the
 sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
-<xcb header="dpms" extension-xname="DPMS" extension-name="DPMS">
+<xcb header="dpms" extension-xname="DPMS" extension-name="DPMS"
+    major-version="0" minor-version="0">
   <request name="GetVersion" opcode="0">
     <field type="CARD16" name="client_major_version" />
     <field type="CARD16" name="client_minor_version" />
diff --git a/src/extensions/glx.xml b/src/glx.xml
index 5f8b5e6..feaffce 100644
--- a/src/extensions/glx.xml
+++ b/src/glx.xml
@@ -44,7 +44,8 @@ The patch that fixed this server bug in X.org CVS is here:
 	http://cvs.freedesktop.org/xorg/xserver/xorg/GL/glx/glxcmds.c?r1=1.6&r2=1.7
 -->
 
-<xcb header="glx" extension-xname="GLX" extension-name="Glx">
+<xcb header="glx" extension-xname="GLX" extension-name="Glx"
+    major-version="1" minor-version="3">
 	<!-- target support: 1.3 -->
 
 	<import>xproto</import>
@@ -341,6 +342,12 @@ The patch that fixed this server bug in X.org CVS is here:
 		<field type="xproto:PIXMAP" name="pixmap" />
 		<field type="glx:PIXMAP" name="glx_pixmap" />
 		<field type="CARD32" name="num_attribs" />  
+		<list type="CARD32" name="attribs">
+			<op op="*">
+				<fieldref>num_attribs</fieldref>
+				<value>2</value>
+			</op>
+		</list>
 	</request>
 
 	<request name="DestroyPixmap" opcode="23">
@@ -350,7 +357,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	<request name="CreateNewContext" opcode="24">
 		<field type="glx:CONTEXT" name="context" />
 		<field type="CARD32" name="fbconfig" />
-		<field type="SCREEN" name="screen" />
+		<field type="CARD32" name="screen" />
 		<field type="CARD32" name="render_type" />
 		<field type="CARD32" name="share_list" />
 		<field type="BOOL" name="is_direct" />
@@ -362,11 +369,14 @@ The patch that fixed this server bug in X.org CVS is here:
 		<field type="glx:CONTEXT" name="context" />
 		<reply>
 			<pad bytes="1" />
-			<field type="CARD32" name="num_attributes"/>
+			<field type="CARD32" name="num_attribs"/>
 			<pad bytes="20" />
-			<valueparam value-mask-type="CARD32"
-				value-mask-name="value_mask"
-				value-list-name="value_list" />
+			<list type="CARD32" name="attribs">
+				<op op="*">
+					<fieldref>num_attribs</fieldref>
+					<value>2</value>
+				</op>
+			</list>
 		</reply>
 	</request>
 
@@ -383,13 +393,16 @@ The patch that fixed this server bug in X.org CVS is here:
 	</request>
 
 	<request name="CreatePbuffer" opcode="27">
-		<field type="SCREEN" name="screen" />
+		<field type="CARD32" name="screen" />
 		<field type="FBCONFIG" name="fbconfig" />
 		<field type="PBUFFER" name="pbuffer" />
 		<field type="CARD32" name="num_attribs" />
-		<valueparam value-mask-type="CARD32"
-			value-mask-name="value_mask"
-			value-list-name="value_list" />
+		<list type="CARD32" name="attribs">
+			<op op="*">
+				<fieldref>num_attribs</fieldref>
+				<value>2</value>
+			</op>
+		</list>
 	</request>
 
 	<request name="DestroyPbuffer" opcode="28">
@@ -402,29 +415,38 @@ The patch that fixed this server bug in X.org CVS is here:
 			<pad bytes="1" />
 			<field type="CARD32" name="num_attribs" />
 			<pad bytes="20" />
-			<valueparam value-mask-type="CARD32"
-				value-mask-name="value_mask"
-				value-list-name="value_list" />
+			<list type="CARD32" name="attribs">
+				<op op="*">
+					<fieldref>num_attribs</fieldref>
+					<value>2</value>
+				</op>
+			</list>
 		</reply>
 	</request>
 
 	<request name="ChangeDrawableAttributes" opcode="30">
 		<field type="glx:DRAWABLE" name="drawable" />
 		<field type="CARD32" name="num_attribs" />
-		<valueparam value-mask-type="CARD32"
-			value-mask-name="value_mask"
-			value-list-name="value_list" />
+		<list type="CARD32" name="attribs">
+			<op op="*">
+				<fieldref>num_attribs</fieldref>
+				<value>2</value>
+			</op>
+		</list>
 	</request>
 
 	<request name="CreateWindow" opcode="31">
-		<field type="SCREEN" name="screen" />
+		<field type="CARD32" name="screen" />
 		<field type="FBCONFIG" name="fbconfig" />
 		<field type="xproto:WINDOW" name="window" />
 		<field type="glx:WINDOW" name="glx_window" />
 		<field type="CARD32" name="num_attribs" />
-		<valueparam value-mask-type="CARD32"
-			value-mask-name="value_mask"
-			value-list-name="value_list" />
+		<list type="CARD32" name="attribs">
+			<op op="*">
+				<fieldref>num_attribs</fieldref>
+				<value>2</value>
+			</op>
+		</list>
 	</request>
 
 	<request name="DeleteWindow" opcode="32">
diff --git a/src/extensions/randr.xml b/src/randr.xml
index 5c0ccdf..8a46f3c 100644
--- a/src/extensions/randr.xml
+++ b/src/randr.xml
@@ -26,7 +26,8 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 
-<xcb header="randr" extension-xname="RANDR" extension-name="RandR">
+<xcb header="randr" extension-xname="RANDR" extension-name="RandR"
+    major-version="1" minor-version="1">
 	<!-- Implements version 1.1 of RANDR -->	
 
 	<import>xproto</import>
@@ -70,17 +71,17 @@ authorization from the authors.
 	BEWARE: the docs lie!
 	-->
 	<request name="SetScreenConfig" opcode="2">
-		<field type="WINDOW" name="drawable" />
-		<field type="CARD32" name="timestamp" />
-		<field type="CARD32" name="config_timestamp" />
+		<field type="DRAWABLE" name="drawable" />
+		<field type="TIMESTAMP" name="timestamp" />
+		<field type="TIMESTAMP" name="config_timestamp" />
 		<field type="CARD16" name="sizeID" />
 		<field type="INT16" name="rotation" />
-		<field type="CARD16" name="refresh" />
+		<field type="CARD16" name="rate" />
 		<pad bytes="2" />
 		<reply>
 			<field type="CARD8" name="status" />
-			<field type="CARD32" name="timestamp" />
-			<field type="CARD32" name="config_timestamp" />
+			<field type="TIMESTAMP" name="new_timestamp" />
+			<field type="TIMESTAMP" name="config_timestamp" />
 			<field type="WINDOW" name="root" />
 			<field type="CARD16" name="subpixel_order" />
 			<pad bytes="10" />
@@ -108,8 +109,8 @@ authorization from the authors.
 		<reply>
 			<field type="CARD8" name="rotations" />
 			<field type="WINDOW" name="root" />
-			<field type="CARD32" name="timestamp" />
-			<field type="CARD32" name="config_timestamp" />
+			<field type="TIMESTAMP" name="timestamp" />
+			<field type="TIMESTAMP" name="config_timestamp" />
 			<field type="CARD16" name="nSizes" />
 			<field type="CARD16" name="sizeID" />
 			<field type="INT16" name="rotation" />
@@ -134,16 +135,16 @@ authorization from the authors.
 	
 	<event name="ScreenChangeNotify" number="0">
 		<field type="CARD8" name="rotation" />
-		<field type="CARD32" name="timestamp" />
-		<field type="CARD32" name="config_timestamp" />
+		<field type="TIMESTAMP" name="timestamp" />
+		<field type="TIMESTAMP" name="config_timestamp" />
 		<field type="WINDOW" name="root" />
 		<field type="WINDOW" name="request_window" />
 		<field type="CARD16" name="sizeID" />
 		<field type="CARD16" name="subpixel_order" />
-		<field type="CARD16" name="width" />
-		<field type="CARD16" name="height" />
-		<field type="CARD16" name="mwidth" />
-		<field type="CARD16" name="mheight" />
+		<field type="INT16" name="width" />
+		<field type="INT16" name="height" />
+		<field type="INT16" name="mwidth" />
+		<field type="INT16" name="mheight" />
 	</event>
 		
 </xcb>
diff --git a/src/extensions/record.xml b/src/record.xml
index 09729ad..464f4d8 100644
--- a/src/extensions/record.xml
+++ b/src/record.xml
@@ -26,7 +26,8 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 
-<xcb header="record" extension-xname="RECORD" extension-name="Record">
+<xcb header="record" extension-xname="RECORD" extension-name="Record"
+    major-version="1" minor-version="13">
 
     <!-- Types -->
     <xidtype name="CONTEXT" />
diff --git a/src/extensions/render.xml b/src/render.xml
index 7dbf926..b538f00 100644
--- a/src/extensions/render.xml
+++ b/src/render.xml
@@ -4,7 +4,8 @@ Copyright (C) 2002-2004 Carl D. Worth, Jamey Sharp, Bart Massey, Josh Triplett
 All Rights Reserved.  See the file COPYING in this directory
 for licensing information.
 -->
-<xcb header="render" extension-xname="RENDER" extension-name="Render">
+<xcb header="render" extension-xname="RENDER" extension-name="Render"
+    major-version="0" minor-version="10">
   <!-- supports version 0.10 -->
 
   <import>xproto</import>
@@ -93,6 +94,14 @@ for licensing information.
     <item name="None" />
   </enum>
 
+  <!-- Extended repeat attributes introduced in 0.10 -->
+  <enum name="Repeat">
+    <item name="None" />
+    <item name="Normal" />
+    <item name="Pad" />
+    <item name="Reflect" />
+  </enum>
+
   <typedef oldname="CARD32" newname="GLYPH" />
   <xidtype name="GLYPHSET" />
 
diff --git a/src/extensions/res.xml b/src/res.xml
index eda0cbe..b046ec2 100644
--- a/src/extensions/res.xml
+++ b/src/res.xml
@@ -25,7 +25,8 @@ institutions shall not be used in advertising or otherwise to promote the
 sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
-<xcb header="res" extension-xname="X-Resource" extension-name="Res">
+<xcb header="res" extension-xname="X-Resource" extension-name="Res"
+    major-version="1" minor-version="0">
     <struct name="Client">
         <field type="CARD32" name="resource_base" />
         <field type="CARD32" name="resource_mask" />
diff --git a/src/extensions/screensaver.xml b/src/screensaver.xml
index 1a095de..8acd292 100644
--- a/src/extensions/screensaver.xml
+++ b/src/screensaver.xml
@@ -29,7 +29,8 @@ authorization from the authors.
 Screen Saver Extension to the X Protocol
 Draft Standard Version 1.1
 -->
-<xcb header="screensaver" extension-xname="MIT-SCREEN-SAVER" extension-name="ScreenSaver">
+<xcb header="screensaver" extension-xname="MIT-SCREEN-SAVER" extension-name="ScreenSaver" major-version="1" minor-version="1">
+
   <!-- Types -->
 
   <import>xproto</import>
diff --git a/src/extensions/shape.xml b/src/shape.xml
index 36d0652..a3c929a 100644
--- a/src/extensions/shape.xml
+++ b/src/shape.xml
@@ -26,7 +26,7 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 <!-- This file describes version 1.1 of the Shape extension. -->
-<xcb header="shape" extension-xname="SHAPE" extension-name="Shape">
+<xcb header="shape" extension-xname="SHAPE" extension-name="Shape" major-version="1" minor-version="1">
   <import>xproto</import>
 
   <typedef oldname="CARD8" newname="OP" />
diff --git a/src/extensions/shm.xml b/src/shm.xml
index e576c1f..49e243b 100644
--- a/src/extensions/shm.xml
+++ b/src/shm.xml
@@ -25,7 +25,8 @@ institutions shall not be used in advertising or otherwise to promote the
 sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
-<xcb header="shm" extension-xname="MIT-SHM" extension-name="Shm">
+<xcb header="shm" extension-xname="MIT-SHM" extension-name="Shm"
+    major-version="1" minor-version="1">
   <import>xproto</import>
 
   <xidtype name="SEG" />
diff --git a/src/extensions/sync.xml b/src/sync.xml
index 6efca36..74281f1 100644
--- a/src/extensions/sync.xml
+++ b/src/sync.xml
@@ -4,7 +4,8 @@ Copyright (C) 2004 Mikko Torni and Josh Triplett.
 All Rights Reserved.  See the file COPYING in this directory
 for licensing information.
 -->
-<xcb header="sync" extension-xname="SYNC" extension-name="Sync">
+<xcb header="sync" extension-xname="SYNC" extension-name="Sync"
+    major-version="3" minor-version="0">
   <import>xproto</import>
 
   <xidtype name="ALARM" />
diff --git a/src/extensions/xc_misc.xml b/src/xc_misc.xml
index 8643503..18f5a84 100644
--- a/src/extensions/xc_misc.xml
+++ b/src/xc_misc.xml
@@ -4,7 +4,8 @@ Copyright (C) 2004 Mikko Torni and Josh Triplett.
 All Rights Reserved.  See the file COPYING in this directory
 for licensing information.
 -->
-<xcb header="xc_misc" extension-xname="XC-MISC" extension-name="XCMisc">
+<xcb header="xc_misc" extension-xname="XC-MISC" extension-name="XCMisc"
+    major-version="1" minor-version="1">
   <request name="GetVersion" opcode="0">
     <field type="CARD16" name="client_major_version" />
     <field type="CARD16" name="client_minor_version" />
diff --git a/src/xcb.xsd b/src/xcb.xsd
index d171656..674a185 100644
--- a/src/xcb.xsd
+++ b/src/xcb.xsd
@@ -33,6 +33,8 @@ authorization from the authors.
       <xsd:attribute name="header" type="xsd:string" use="required" />
       <xsd:attribute name="extension-xname" type="xsd:string" use="optional" />
       <xsd:attribute name="extension-name"  type="xsd:string" use="optional" />
+      <xsd:attribute name="major-version"   type="xsd:integer" use="optional" />
+      <xsd:attribute name="minor-version"   type="xsd:integer" use="optional" />
     </xsd:complexType>
   </xsd:element>
 
@@ -65,9 +67,6 @@ authorization from the authors.
     </xsd:complexType>
   </xsd:element>
 
-  <!-- Parameters in requests that are not sent with the request. -->
-  <xsd:element name="localfield" type="var" />
-  
   <!-- Expressions -->
   <xsd:group name="expression">
     <xsd:choice>
@@ -160,7 +159,6 @@ authorization from the authors.
           <xsd:sequence>
             <xsd:choice minOccurs="0" maxOccurs="unbounded">
               <xsd:group ref="fields" />
-              <xsd:element ref="localfield" />
               <xsd:element ref="exprfield" />
               <xsd:element ref="valueparam" />
             </xsd:choice>
diff --git a/src/extensions/xevie.xml b/src/xevie.xml
index 1e5851f..222b412 100644
--- a/src/extensions/xevie.xml
+++ b/src/xevie.xml
@@ -25,7 +25,8 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 <!-- This file describes version 1 of XEVIE. -->
-<xcb header="xevie" extension-xname="XEVIE" extension-name="Xevie">
+<xcb header="xevie" extension-xname="XEVIE" extension-name="Xevie"
+    major-version="1" minor-version="0">
   <request name="QueryVersion" opcode="0">
     <field type="CARD16" name="client_major_version" />
     <field type="CARD16" name="client_minor_version" />
diff --git a/src/extensions/xf86dri.xml b/src/xf86dri.xml
index bb37ca7..c05b724 100644
--- a/src/extensions/xf86dri.xml
+++ b/src/xf86dri.xml
@@ -26,7 +26,8 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 
-<xcb header="xf86dri" extension-xname="XFree86-DRI" extension-name="XF86Dri">
+<xcb header="xf86dri" extension-xname="XFree86-DRI" extension-name="XF86Dri"
+    major-version="4" minor-version="1">
 
     <!-- Using http://dri.sourceforge.net/doc/dri_extensions_low_level.txt -->
 
diff --git a/src/extensions/xfixes.xml b/src/xfixes.xml
index 9f890cb..203c2a8 100644
--- a/src/extensions/xfixes.xml
+++ b/src/xfixes.xml
@@ -25,7 +25,8 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 <!-- This file describes version 4 of XFixes. -->
-<xcb header="xfixes" extension-xname="XFIXES" extension-name="XFixes">
+<xcb header="xfixes" extension-xname="XFIXES" extension-name="XFixes"
+    major-version="4" minor-version="0">
   <import>xproto</import>
   <import>render</import>
   <import>shape</import>
diff --git a/src/xinerama.xml b/src/xinerama.xml
new file mode 100644
index 0000000..675325e
--- /dev/null
+++ b/src/xinerama.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2006 Jeremy Kolb.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the names of the authors or their
+institutions shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from the authors.
+-->
+
+<xcb header="xinerama" extension-xname="XINERAMA" extension-name="Xinerama"
+    major-version="1" minor-version="1">
+
+    <!-- Version 1.1 -->
+
+    <import>xproto</import>
+
+    <struct name="ScreenInfo">
+        <field type="INT16" name="x_org" />
+        <field type="INT16" name="y_org" />
+        <field type="CARD16" name="width" />
+        <field type="CARD16" name="height" />
+    </struct>
+
+    <request name="QueryVersion" opcode="0">
+        <field type="CARD8" name="major" />
+        <field type="CARD8" name="minor" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD16" name="major" />
+            <field type="CARD16" name="minor" />
+        </reply>
+    </request>
+
+    <request name="GetState" opcode="1">
+        <field type="WINDOW" name="window" />
+        <reply>
+            <field type="BYTE" name="state" />
+            <field type="WINDOW" name="window" />
+        </reply>
+    </request>
+
+    <request name="GetScreenCount" opcode="2">
+        <field type="WINDOW" name="window" />
+        <reply>
+            <field type="BYTE" name="screen_count" />
+            <field type="WINDOW" name="window" />
+        </reply>
+    </request>
+
+    <request name="GetScreenSize" opcode="3">
+        <field type="WINDOW" name="window" />
+        <field type="SCREEN" name="screen" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="width" />
+            <field type="CARD32" name="height" />
+            <field type="WINDOW" name="window" />
+            <field type="SCREEN" name="screen" />
+        </reply>
+    </request>
+
+    <request name="IsActive" opcode="4">
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="state" />
+        </reply>
+    </request>
+
+    <request name="QueryScreens" opcode="5">
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="number" />
+            <pad bytes="20" />
+            <list type="ScreenInfo" name="screen_info">
+                <fieldref>number</fieldref>
+            </list>
+        </reply>
+    </request>
+
+</xcb>
diff --git a/src/extensions/xprint.xml b/src/xprint.xml
index 11cd7c0..040b353 100644
--- a/src/extensions/xprint.xml
+++ b/src/xprint.xml
@@ -26,7 +26,9 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 
-<xcb header="xprint" extension-xname="XpExtension" extension-name="XP">
+<xcb header="xprint" extension-xname="XpExtension" extension-name="XPrint"
+    major-version="1" minor-version="0">
+
     <!-- Conforms to XPRINT 1.0 -->
 
     <import>xproto</import>
diff --git a/src/xproto.xml b/src/xproto.xml
index 7fcbc2f..8254d11 100644
--- a/src/xproto.xml
+++ b/src/xproto.xml
@@ -988,8 +988,8 @@ authorization from the authors.
   </request>
 
   <enum name="GrabMode">
-    <item name="Async"><value>0</value></item>
-    <item name="Sync"> <value>1</value></item>
+    <item name="Sync"> <value>0</value></item>
+    <item name="Async"><value>1</value></item>
   </enum>
 
   <enum name="GrabStatus">
@@ -1086,7 +1086,7 @@ authorization from the authors.
   </request>
 
   <request name="UngrabKey" opcode="34">
-    <field type="CARD8" name="key" />
+    <field type="KEYCODE" name="key" />
     <field type="WINDOW" name="grab_window" />
     <field type="CARD16" name="modifiers" />
   </request>
@@ -1421,8 +1421,8 @@ authorization from the authors.
 
   <enum name="CapStyle">
     <item name="NotLast">   <value>0</value></item>
-    <item name="Cap">       <value>1</value></item>
-    <item name="Butt">      <value>2</value></item>
+    <item name="Butt">      <value>1</value></item>
+    <item name="Round">     <value>2</value></item>
     <item name="Projecting"><value>3</value></item>
   </enum>
 
diff --git a/src/extensions/xtest.xml b/src/xtest.xml
index 72adf0b..8e18691 100644
--- a/src/extensions/xtest.xml
+++ b/src/xtest.xml
@@ -26,7 +26,8 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 
-<xcb header="xtest" extension-xname="XTEST" extension-name="Test">
+<xcb header="xtest" extension-xname="XTEST" extension-name="Test"
+    major-version="2" minor-version="1">
     <!-- Conforms to XTEST 2.1 -->
 
     <import>xproto</import>
@@ -102,4 +103,4 @@ authorization from the authors.
     
     <!-- No events or errors -->
 
-</xcb>
\ No newline at end of file
+</xcb>
diff --git a/src/extensions/xv.xml b/src/xv.xml
index b232dea..bbaa4eb 100644
--- a/src/extensions/xv.xml
+++ b/src/xv.xml
@@ -26,7 +26,7 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 
-<xcb header="xv" extension-xname="XVideo" extension-name="Xv">
+<xcb header="xv" extension-xname="XVideo" extension-name="Xv" major-version="2" minor-version="2">
     <import>xproto</import>
     <import>shm</import>
     <!-- Implements version 2.2 of XV -->
@@ -402,10 +402,7 @@ authorization from the authors.
         <field type="CARD16" name="drw_h" />
         <field type="CARD16" name="width" />
         <field type="CARD16" name="height" />
-        <localfield type="CARD32" name="data_size" />
-        <list type="CARD8" name="data">
-            <fieldref>data_size</fieldref>
-        </list>
+	<list type="CARD8" name="data" />
     </request>
 
     <request name="ShmPutImage" opcode="19">
diff --git a/src/extensions/xvmc.xml b/src/xvmc.xml
index e2eb04d..ecfafea 100644
--- a/src/extensions/xvmc.xml
+++ b/src/xvmc.xml
@@ -26,7 +26,7 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 
-<xcb header="xvmc" extension-xname="XVideo-MotionCompensation" extension-name="XvMC">
+<xcb header="xvmc" extension-xname="XVideo-MotionCompensation" extension-name="XvMC" major-version="1" minor-version="1">
     <import>xv</import>
 
     <xidtype name="CONTEXT" />