[Xcb-commit] Branch 'xspec' - 2 commits - xcb-proto

Alp Toker alp at kemper.freedesktop.org
Thu Mar 30 02:52:56 PST 2006


 xcb-proto/src/extensions/bigreq.xml      |    4 
 xcb-proto/src/extensions/composite.xml   |   66 
 xcb-proto/src/extensions/damage.xml      |   52 
 xcb-proto/src/extensions/dmx.xml         |  108 -
 xcb-proto/src/extensions/dpms.xml        |   46 
 xcb-proto/src/extensions/glx.xml         | 1616 +++++++++++-------------
 xcb-proto/src/extensions/randr.xml       |  114 -
 xcb-proto/src/extensions/record.xml      |  132 -
 xcb-proto/src/extensions/render.xml      |  650 ++++-----
 xcb-proto/src/extensions/res.xml         |   40 
 xcb-proto/src/extensions/screensaver.xml |  102 -
 xcb-proto/src/extensions/shape.xml       |  114 -
 xcb-proto/src/extensions/shm.xml         |  100 -
 xcb-proto/src/extensions/sync.xml        |  146 +-
 xcb-proto/src/extensions/xc_misc.xml     |   24 
 xcb-proto/src/extensions/xevie.xml       |   51 
 xcb-proto/src/extensions/xf86dri.xml     |  134 -
 xcb-proto/src/extensions/xfixes.xml      |  276 ++--
 xcb-proto/src/extensions/xprint.xml      |  258 +--
 xcb-proto/src/extensions/xv.xml          |  420 +++---
 xcb-proto/src/extensions/xvmc.xml        |  118 -
 xcb-proto/src/xcb_types.xml              |  216 +--
 xcb-proto/src/xproto.xml                 | 2086 +++++++++++++++----------------
 23 files changed, 3415 insertions(+), 3458 deletions(-)

New commits:
diff-tree d496de88e3d2a9d7d7934fcd852286420978df38 (from 477d6bca2416b577920adb25a12169b9625aaaf3)
Author: Alp Toker <alp at atoker.com>
Date:   Thu Mar 30 11:51:59 2006 +0100

    Comment cleanups

diff --git a/xcb-proto/src/extensions/composite.xml b/xcb-proto/src/extensions/composite.xml
index 1ada884..f033b22 100644
--- a/xcb-proto/src/extensions/composite.xml
+++ b/xcb-proto/src/extensions/composite.xml
@@ -80,13 +80,13 @@ authorization from the authors.
   <request name="ReleaseOverlayWindow" number="8">
     <field type="Window" name="window" />
   </request>
-  <!-- TODO: where did this come from? -->
+  <!-- TODO: keithp's latest features -->
   <!--
   <struct name="CompositeCoordinate">
     <field type="Window" name="child"/>
     <field type="Point"/>
   </struct>
-  <request name="RedirectCoordinate" number="7">
+  <request name="RedirectCoordinate" number="9">
     <field type="Window" name="window"/>
     <field type="bool" name="redirect"/>
     <pad bytes="3"/>
@@ -100,7 +100,7 @@ authorization from the authors.
     <field type="Point"/>
     <pad bytes="4"/>
   </event>
-  <request name="TransformCoordinate" number="8">
+  <request name="TransformCoordinate" number="10">
     <field type="Window" name="window"/>
     <field type="CARD32" name="serial-number"/>
     <field type="Point"/>
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index 3386024..568182e 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -224,11 +224,7 @@ The patch that fixed this server bug in 
   <request name="DestroyGLXPixmap" number="15">
     <field type="glx:Pixmap" name="glx_pixmap" />
   </request>
-  <!--
-        Context tag is not in the proto, should be part of the list of bytes
-        but every VendorPrivate and VendorPrivateWithReply request uses them
-        so it is safe to put them in.  That's how Mesa does it.
-        -->
+  <!-- Context tag is not in the proto, should be part of the list of bytes but every VendorPrivate and VendorPrivateWithReply request uses them so it is safe to put them in.  That's how Mesa does it. -->
   <request name="VendorPrivate" number="16">
     <field type="CARD32" name="vendor_code" />
     <field type="ContextTag" name="context_tag" />
@@ -393,17 +389,12 @@ The patch that fixed this server bug in 
   <request name="SelectBuffer" number="106">
     <field type="ContextTag" name="context_tag" />
     <field type="INT32" name="size" />
-    <!-- the reply is actually returned in the data
-                of the next RenderMode request -->
+    <!-- the reply is actually returned in the data of the next RenderMode request -->
   </request>
   <request name="RenderMode" number="107">
     <field type="ContextTag" name="context_tag" />
     <field type="CARD32" name="mode" />
-    <!--
-                This reply is only if RM was previously feedback/selection.
-                If it was in feedback mode then data is FLOAT32.
-                If previously in render mode there is no reply.
-                -->
+    <!-- This reply is only if RM was previously feedback/selection.  If it was in feedback mode then data is FLOAT32. If previously in render mode there is no reply. -->
     <reply>
       <pad bytes="1" />
       <field type="CARD32" name="ret_val" />
@@ -458,12 +449,7 @@ The patch that fixed this server bug in 
       <list type="byte" name="data" />
     </reply>
   </request>
-  <!-- FIXME:
-        All the Get* functions can return different stuff for replies.
-        Hopefully xcb will support multiple reply structures at some point
-        but for now... grrrr
-        Starts on page 58/180
-        -->
+  <!-- FIXME: All the Get* functions can return different stuff for replies. Hopefully xcb will support multiple reply structures at some point but for now... grrrr Starts on page 58/180 -->
   <request name="GetBooleanv" number="112">
     <field type="ContextTag" name="context_tag" />
     <field type="INT32" name="pname" />
diff --git a/xcb-proto/src/extensions/randr.xml b/xcb-proto/src/extensions/randr.xml
index a93a8ed..9af1a03 100644
--- a/xcb-proto/src/extensions/randr.xml
+++ b/xcb-proto/src/extensions/randr.xml
@@ -82,9 +82,7 @@ authorization from the authors.
     <field type="CARD16" name="enable" />
     <pad bytes="2" />
   </request>
-  <!--
-        I think this is correct.  It works. though I believe n-info is a bit high...
-        -->
+  <!-- I think this is correct.  It works. though I believe n-info is a bit high... -->
   <request name="GetScreenInfo" number="5">
     <field type="Window" name="window" />
     <reply>
diff --git a/xcb-proto/src/extensions/xevie.xml b/xcb-proto/src/extensions/xevie.xml
index 10d96c1..d0b3dc6 100644
--- a/xcb-proto/src/extensions/xevie.xml
+++ b/xcb-proto/src/extensions/xevie.xml
@@ -54,8 +54,7 @@ authorization from the authors.
     <item name="unmodified" />
     <item name="modified" />
   </enum>
-  <!-- The Send request needs to send an arbitrary Event; this type is used
-       to reserve the necessary structure size. -->
+  <!-- The Send request needs to send an arbitrary Event; this type is used to reserve the necessary structure size. -->
   <struct name="Event">
     <pad bytes="32" />
   </struct>
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index f720653..831274c 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -256,7 +256,7 @@ authorization from the authors.
   </event>
   <union name="ClientMessageData">
     <!-- The format member of the ClientMessage event determines which array to use. -->
-    <!--  8 -->
+    <!-- 8 -->
     <list type="CARD8" name="data8">
       <value>20</value>
     </list>
@@ -1160,11 +1160,7 @@ authorization from the authors.
     <field type="GContext" name="gc" />
     <list type="Rectangle" name="rectangles" />
   </request>
-  <!--
-    The semantics of PolyArc change after the first arc: the GC's
-    join style may be applied to successive arcs under some circumstances.
-    So using combine-adjacent here is bad.
-  -->
+  <!-- The semantics of PolyArc change after the first arc: the GC's join style may be applied to successive arcs under some circumstances. So using combine-adjacent here is bad. -->
   <request name="PolyArc" number="68">
     <pad bytes="1" />
     <field type="Drawable" name="drawable" />
@@ -1633,10 +1629,6 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <!--
-    FIXME: NoOperation should allow specifying payload length
-    but geez, malloc()ing a 262140 byte buffer just so I have something
-    to hand to write(2) seems silly...!
-  -->
+  <!-- FIXME: NoOperation should allow specifying payload length but geez, malloc()ing a 262140 byte buffer just so I have something to hand to write(2) seems silly...! -->
   <request name="NoOperation" number="127" />
 </protocol>
diff-tree 477d6bca2416b577920adb25a12169b9625aaaf3 (from 8bd8e270b7f87c9b1e5fe9de8f97a6512247779c)
Author: Alp Toker <alp at atoker.com>
Date:   Thu Mar 30 11:40:18 2006 +0100

    Unfortunate XML formatting patch:
    
    This patch uses the options:
    	tidy -quiet -xml -indent -wrap 0 -utf8
    
    Previously we used:
    	xmllint -format
    
    It was inconsistent and unhelpful.
    
    This patch also addresses XCB hackers' prefence of a space before />
    
    This scheme appears to be the best way to canonicalize the XML for
    diff/patch/git harmony.

diff --git a/xcb-proto/src/extensions/bigreq.xml b/xcb-proto/src/extensions/bigreq.xml
index b46a8cc..bd6820b 100644
--- a/xcb-proto/src/extensions/bigreq.xml
+++ b/xcb-proto/src/extensions/bigreq.xml
@@ -29,8 +29,8 @@ authorization from the authors.
 <extension header="bigreq" xname="BIG-REQUESTS" name="BigRequests">
   <request name="Enable" number="0">
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="maximum-request-length"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="maximum-request-length" />
     </reply>
   </request>
 </extension>
diff --git a/xcb-proto/src/extensions/composite.xml b/xcb-proto/src/extensions/composite.xml
index da4b682..1ada884 100644
--- a/xcb-proto/src/extensions/composite.xml
+++ b/xcb-proto/src/extensions/composite.xml
@@ -28,60 +28,60 @@ authorization from the authors.
 <extension header="composite" xname="Composite" name="Composite" version="0.3">
   <import>xfixes</import>
   <enum name="UpdateType">
-    <item name="automatic"/>
-    <item name="manual"/>
+    <item name="automatic" />
+    <item name="manual" />
   </enum>
   <request name="QueryVersion" number="0">
-    <field type="Version32" name="client-version"/>
+    <field type="Version32" name="client-version" />
     <reply>
-      <pad bytes="1"/>
-      <field type="Version32" name="server-version"/>
-      <pad bytes="16"/>
+      <pad bytes="1" />
+      <field type="Version32" name="server-version" />
+      <pad bytes="16" />
     </reply>
   </request>
   <request name="RedirectWindow" number="1">
-    <field type="Window" name="window"/>
-    <field type="UpdateType" name="update"/>
-    <pad bytes="3"/>
+    <field type="Window" name="window" />
+    <field type="UpdateType" name="update" />
+    <pad bytes="3" />
   </request>
   <request name="RedirectSubwindows" number="2">
-    <field type="Window" name="window"/>
-    <field type="UpdateType" name="update"/>
-    <pad bytes="3"/>
+    <field type="Window" name="window" />
+    <field type="UpdateType" name="update" />
+    <pad bytes="3" />
   </request>
   <request name="UnredirectWindow" number="3">
-    <field type="Window" name="window"/>
-    <field type="UpdateType" name="update"/>
-    <pad bytes="3"/>
+    <field type="Window" name="window" />
+    <field type="UpdateType" name="update" />
+    <pad bytes="3" />
   </request>
   <request name="UnredirectSubwindows" number="4">
-    <field type="Window" name="window"/>
-    <field type="UpdateType" name="update"/>
-    <pad bytes="3"/>
+    <field type="Window" name="window" />
+    <field type="UpdateType" name="update" />
+    <pad bytes="3" />
   </request>
   <request name="CreateRegionFromBorderClip" number="5">
-    <field type="Region" name="region"/>
-    <field type="Window" name="window"/>
+    <field type="Region" name="region" />
+    <field type="Window" name="window" />
   </request>
-<!-- Version 0.2 additions -->
+  <!-- Version 0.2 additions -->
   <request name="NameWindowPixmap" number="6">
-    <field type="Window" name="window"/>
-    <field type="Pixmap" name="pixmap"/>
+    <field type="Window" name="window" />
+    <field type="Pixmap" name="pixmap" />
   </request>
-<!-- Version 0.3 additions -->
+  <!-- Version 0.3 additions -->
   <request name="GetOverlayWindow" number="7">
-    <field type="Window" name="window"/>
+    <field type="Window" name="window" />
     <reply>
-      <pad bytes="1"/>
-      <field type="Window" name="overlay-win"/>
-      <pad bytes="20"/>
+      <pad bytes="1" />
+      <field type="Window" name="overlay-win" />
+      <pad bytes="20" />
     </reply>
   </request>
   <request name="ReleaseOverlayWindow" number="8">
-    <field type="Window" name="window"/>
+    <field type="Window" name="window" />
   </request>
-<!-- TODO: where did this come from? -->
-<!--
+  <!-- TODO: where did this come from? -->
+  <!--
   <struct name="CompositeCoordinate">
     <field type="Window" name="child"/>
     <field type="Point"/>
diff --git a/xcb-proto/src/extensions/damage.xml b/xcb-proto/src/extensions/damage.xml
index 37150ef..644eb8c 100644
--- a/xcb-proto/src/extensions/damage.xml
+++ b/xcb-proto/src/extensions/damage.xml
@@ -27,44 +27,44 @@ authorization from the authors.
 -->
 <extension header="damage" xname="DAMAGE" name="Damage" version="1">
   <import>xfixes</import>
-  <resource name="Damage"/>
-  <error name="BadDamage" number="0"/>
+  <resource name="Damage" />
+  <error name="BadDamage" number="0" />
   <enum type="CARD8" name="ReportLevel">
-    <item name="raw-rectangles"/>
-    <item name="delta-rectangles"/>
-    <item name="bounding-box"/>
-    <item name="non-empty"/>
+    <item name="raw-rectangles" />
+    <item name="delta-rectangles" />
+    <item name="bounding-box" />
+    <item name="non-empty" />
   </enum>
   <request name="QueryVersion" number="0">
-    <field type="CARD32" name="client-major-version"/>
-    <field type="CARD32" name="client-minor-version"/>
+    <field type="CARD32" name="client-major-version" />
+    <field type="CARD32" name="client-minor-version" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="major-version"/>
-      <field type="CARD32" name="minor-version"/>
-      <pad bytes="16"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="major-version" />
+      <field type="CARD32" name="minor-version" />
+      <pad bytes="16" />
     </reply>
   </request>
   <request name="Create" number="1">
-    <field type="Damage" name="damage"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="ReportLevel" name="level"/>
-    <pad bytes="3"/>
+    <field type="Damage" name="damage" />
+    <field type="Drawable" name="drawable" />
+    <field type="ReportLevel" name="level" />
+    <pad bytes="3" />
   </request>
   <request name="Destroy" number="2">
-    <field type="Damage" name="damage"/>
+    <field type="Damage" name="damage" />
   </request>
   <request name="Subtract" number="3">
-    <field type="Damage" name="damage"/>
-    <field type="Region" name="repair"/>
-    <field type="Region" name="parts"/>
+    <field type="Damage" name="damage" />
+    <field type="Region" name="repair" />
+    <field type="Region" name="parts" />
   </request>
   <event name="Notify" number="0">
-    <field type="ReportLevel" name="level"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="Damage" name="damage"/>
-    <field type="Time" name="timestamp"/>
-    <field type="Rectangle" name="area"/>
-    <field type="Rectangle" name="geometry"/>
+    <field type="ReportLevel" name="level" />
+    <field type="Drawable" name="drawable" />
+    <field type="Damage" name="damage" />
+    <field type="Time" name="timestamp" />
+    <field type="Rectangle" name="area" />
+    <field type="Rectangle" name="geometry" />
   </event>
 </extension>
diff --git a/xcb-proto/src/extensions/dmx.xml b/xcb-proto/src/extensions/dmx.xml
index 6868e62..5b0c166 100644
--- a/xcb-proto/src/extensions/dmx.xml
+++ b/xcb-proto/src/extensions/dmx.xml
@@ -2,117 +2,99 @@
 <!-- FIXME: complete this extension, it is not yet usable -->
 <extension header="dmx" xname="DMX" name="DMX" version="2.2.20040604">
   <mask name="Screen">
-    <item name="screen-window-width"/>
-    <item name="screen-window-height"/>
-    <item name="screen-window-x-offset"/>
-    <item name="screen-window-y-offset"/>
-    <item name="root-window-width"/>
-    <item name="root-window-height"/>
-    <item name="root-window-x-offset"/>
-    <item name="root-window-y-offset"/>
-    <item name="root-window-x-origin"/>
-    <item name="root-window-y-origin"/>
+    <item name="screen-window-width" />
+    <item name="screen-window-height" />
+    <item name="screen-window-x-offset" />
+    <item name="screen-window-y-offset" />
+    <item name="root-window-width" />
+    <item name="root-window-height" />
+    <item name="root-window-x-offset" />
+    <item name="root-window-y-offset" />
+    <item name="root-window-x-origin" />
+    <item name="root-window-y-origin" />
   </mask>
   <struct name="ScreenAttributes">
     <!-- TODO: name string and index -->
     <!-- TODO: auto-generate above mask from below fields -->
-    <field type="Size" name="screen-window-size"/>
-    <field type="Point" name="screen-window-offset"/>
-    <field type="Size" name="root-window-size"/>
-    <field type="Point" name="root-window-offset"/>
-    <field type="Point" name="root-window-origin"/>
+    <field type="Size" name="screen-window-size" />
+    <field type="Point" name="screen-window-offset" />
+    <field type="Size" name="root-window-size" />
+    <field type="Point" name="root-window-offset" />
+    <field type="Point" name="root-window-origin" />
   </struct>
   <mask name="Desktop">
-    <item name="width"/>
-    <item name="height"/>
-    <item name="shift-x"/>
-    <item name="shift-y"/>
+    <item name="width" />
+    <item name="height" />
+    <item name="shift-x" />
+    <item name="shift-y" />
   </mask>
-  <struct name="DesktopAttributes">
-  </struct>
-  <struct name="WindowAttributes">
-  </struct>
+  <struct name="DesktopAttributes"></struct>
+  <struct name="WindowAttributes"></struct>
   <mask name="Input">
-    <item name="type"/>
-    <item name="physical-screen"/>
-    <item name="sends-core"/>
+    <item name="type" />
+    <item name="physical-screen" />
+    <item name="sends-core" />
   </mask>
   <enum name="InputType">
-    <item name="local"/>
-    <item name="console"/>
-    <item name="backend"/>
+    <item name="local" />
+    <item name="console" />
+    <item name="backend" />
   </enum>
   <request name="QueryVersion" number="0">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
   <request name="GetScreenCount" number="1">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
   <!-- TODO: versioning: requests 2, 6 and 7 deprecated -->
-<!--
+  <!--
   <request name="GetScreenInformation" number="2">
   </request>
 -->
   <request name="GetWindowAttributes" number="3">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
   <request name="GetInputCount" number="4">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
-  <struct name="InputAttributes">
-  </struct>
+  <struct name="InputAttributes"></struct>
   <request name="GetInputAttributes" number="5">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
-<!--
+  <!--
   <request name="ForceWindowCreation" number="6">
   </request>
   <request name="ReconfigureScreen" number="7">
   </request>
 -->
   <request name="Sync" number="8">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
   <request name="ForceWindowCreation" number="9">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
   <request name="GetScreenAttributes" number="10">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
   <request name="ChangeScreensAttributes" number="11">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
   <request name="AddScreen" number="12">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
   <request name="RemoveScreen" number="13">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
   <request name="GetDesktopAttributes" number="14">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
   <request name="ChangeDesktopAttributes" number="15">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
   <request name="AddInput" number="16">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
   <request name="RemoveInput" number="17">
-    <reply>
-    </reply>
+    <reply></reply>
   </request>
 </extension>
diff --git a/xcb-proto/src/extensions/dpms.xml b/xcb-proto/src/extensions/dpms.xml
index a2aa44c..ccf32f4 100644
--- a/xcb-proto/src/extensions/dpms.xml
+++ b/xcb-proto/src/extensions/dpms.xml
@@ -27,49 +27,49 @@ sale, use or other dealings in this Soft
 authorization from the authors.
 -->
 <extension header="dpms" xname="DPMS" name="DPMS">
-<!-- TODO: make use of this enum -->
+  <!-- TODO: make use of this enum -->
   <enum name="DPMSMode">
-    <item name="on"/>
-    <item name="standby"/>
-    <item name="suspend"/>
-    <item name="off"/>
+    <item name="on" />
+    <item name="standby" />
+    <item name="suspend" />
+    <item name="off" />
   </enum>
   <request name="GetVersion" number="0">
-    <field type="Version32" name="client-version"/>
+    <field type="Version32" name="client-version" />
     <reply>
-      <pad bytes="1"/>
-      <field type="Version32" name="server-version"/>
+      <pad bytes="1" />
+      <field type="Version32" name="server-version" />
     </reply>
   </request>
   <request name="Capable" number="1">
     <reply>
-      <pad bytes="1"/>
-      <field type="bool" name="capable"/>
+      <pad bytes="1" />
+      <field type="bool" name="capable" />
     </reply>
   </request>
   <request name="GetTimeouts" number="2">
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="standby-timeout"/>
-      <field type="CARD16" name="suspend-timeout"/>
-      <field type="CARD16" name="off-timeout"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="standby-timeout" />
+      <field type="CARD16" name="suspend-timeout" />
+      <field type="CARD16" name="off-timeout" />
     </reply>
   </request>
   <request name="SetTimeouts" number="3">
-    <field type="CARD16" name="standby-timeout"/>
-    <field type="CARD16" name="suspend-timeout"/>
-    <field type="CARD16" name="off-timeout"/>
+    <field type="CARD16" name="standby-timeout" />
+    <field type="CARD16" name="suspend-timeout" />
+    <field type="CARD16" name="off-timeout" />
   </request>
-  <request name="Enable" number="4"/>
-  <request name="Disable" number="5"/>
+  <request name="Enable" number="4" />
+  <request name="Disable" number="5" />
   <request name="ForceLevel" number="6">
-    <field type="CARD16" name="power-level"/>
+    <field type="CARD16" name="power-level" />
   </request>
   <request name="Info" number="7">
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="power-level"/>
-      <field type="bool" name="state"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="power-level" />
+      <field type="bool" name="state" />
     </reply>
   </request>
 </extension>
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index d41d5c5..3386024 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -30,65 +30,65 @@ Note that on X.org servers before 6.9 (a
 field in the reply is computed incorrectly for GetFBConfigs and
 VendorPrivateWithReply vendor_code 0x10004 (GetFBConfigsSGIX). For these
 requests the reply structure begins:
-	<pad bytes="1" />
-	<field type="CARD32" name="numVisuals" />
-	<field type="CARD32" name="numProps" />
+        <pad bytes="1" />
+        <field type="CARD32" name="numVisuals" />
+        <field type="CARD32" name="numProps" />
 The correct value for the length field is
-	numVisuals * numProps * 2
+        numVisuals * numProps * 2
 but on broken servers the "* 2" was missing. A workaround that is correct for
 all implementations is to rewrite the length field on receipt on the client
 side, using the expression above.
 
 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
+        http://cvs.freedesktop.org/xorg/xserver/xorg/GL/glx/glxcmds.c?r1=1.6&r2=1.7
 -->
 <extension header="glx" xname="GLX" name="Glx" version="1.3">
-  <resource name="Context"/>
-  <resource name="Drawable"/>
-  <resource name="Pixmap"/>
-  <typedef oldname="CARD32" newname="ContextTag"/>
-  <resource name="FBConfig"/>
-  <resource name="PBuffer"/>
-  <resource name="Window"/>
-  <typedef oldname="float" newname="FLOAT32"/>
-  <typedef oldname="double" newname="FLOAT64"/>
-  <typedef oldname="CARD32" newname="BOOL32"/>
-<!-- Errors -->
-<!-- FIXME: fake number -->
+  <resource name="Context" />
+  <resource name="Drawable" />
+  <resource name="Pixmap" />
+  <typedef oldname="CARD32" newname="ContextTag" />
+  <resource name="FBConfig" />
+  <resource name="PBuffer" />
+  <resource name="Window" />
+  <typedef oldname="float" newname="FLOAT32" />
+  <typedef oldname="double" newname="FLOAT64" />
+  <typedef oldname="CARD32" newname="BOOL32" />
+  <!-- Errors -->
+  <!-- FIXME: fake number -->
   <error name="Generic" number="-1">
-    <field type="CARD32" name="bad_value"/>
-    <field type="CARD16" name="minor_opcode"/>
-    <field type="CARD8" name="major_opcode"/>
-    <pad bytes="21"/>
+    <field type="CARD32" name="bad_value" />
+    <field type="CARD16" name="minor_opcode" />
+    <field type="CARD8" name="major_opcode" />
+    <pad bytes="21" />
   </error>
-  <errorcopy name="BadContext" number="0" ref="Generic"/>
-  <errorcopy name="BadContextState" number="1" ref="Generic"/>
-  <errorcopy name="BadDrawable" number="2" ref="Generic"/>
-  <errorcopy name="BadPixmap" number="3" ref="Generic"/>
-  <errorcopy name="BadContextTag" number="4" ref="Generic"/>
-  <errorcopy name="BadCurrentWindow" number="5" ref="Generic"/>
-  <errorcopy name="BadRenderRequest" number="6" ref="Generic"/>
-  <errorcopy name="BadLargeRequest" number="7" ref="Generic"/>
-  <errorcopy name="UnsupportedPrivateRequest" number="8" ref="Generic"/>
-  <errorcopy name="BadFBConfig" number="9" ref="Generic"/>
-  <errorcopy name="BadPbuffer" number="10" ref="Generic"/>
-  <errorcopy name="BadCurrentDrawable" number="11" ref="Generic"/>
-  <errorcopy name="BadWindow" number="12" ref="Generic"/>
-<!-- Events -->
+  <errorcopy name="BadContext" number="0" ref="Generic" />
+  <errorcopy name="BadContextState" number="1" ref="Generic" />
+  <errorcopy name="BadDrawable" number="2" ref="Generic" />
+  <errorcopy name="BadPixmap" number="3" ref="Generic" />
+  <errorcopy name="BadContextTag" number="4" ref="Generic" />
+  <errorcopy name="BadCurrentWindow" number="5" ref="Generic" />
+  <errorcopy name="BadRenderRequest" number="6" ref="Generic" />
+  <errorcopy name="BadLargeRequest" number="7" ref="Generic" />
+  <errorcopy name="UnsupportedPrivateRequest" number="8" ref="Generic" />
+  <errorcopy name="BadFBConfig" number="9" ref="Generic" />
+  <errorcopy name="BadPbuffer" number="10" ref="Generic" />
+  <errorcopy name="BadCurrentDrawable" number="11" ref="Generic" />
+  <errorcopy name="BadWindow" number="12" ref="Generic" />
+  <!-- Events -->
   <event name="PbufferClobber" number="0">
-    <field type="CARD16" name="event_type"/>
-    <field type="CARD16" name="draw_type"/>
-    <field type="glx:Drawable" name="drawable"/>
-    <field type="CARD32" name="b_mask"/>
-    <field type="CARD16" name="aux_buffer"/>
-    <field type="CARD16" name="x"/>
-    <field type="CARD16" name="y"/>
-    <field type="CARD16" name="width"/>
-    <field type="CARD16" name="height"/>
-    <field type="CARD16" name="count"/>
-    <pad bytes="4"/>
+    <field type="CARD16" name="event_type" />
+    <field type="CARD16" name="draw_type" />
+    <field type="glx:Drawable" name="drawable" />
+    <field type="CARD32" name="b_mask" />
+    <field type="CARD16" name="aux_buffer" />
+    <field type="CARD16" name="x" />
+    <field type="CARD16" name="y" />
+    <field type="CARD16" name="width" />
+    <field type="CARD16" name="height" />
+    <field type="CARD16" name="count" />
+    <pad bytes="4" />
   </event>
-<!-- enums for PbufferClobber event/draw type -->
+  <!-- enums for PbufferClobber event/draw type -->
   <enum name="PBCET">
     <item name="Damaged">
       <value>0x8017</value>
@@ -105,311 +105,311 @@ The patch that fixed this server bug in 
       <value>0x801A</value>
     </item>
   </enum>
-<!-- Requests -->
+  <!-- Requests -->
   <request name="Render" number="1" combine-adjacent="true">
-    <field type="ContextTag" name="context_tag"/>
-    <list type="byte" name="data"/>
+    <field type="ContextTag" name="context_tag" />
+    <list type="byte" name="data" />
   </request>
   <request name="RenderLarge" number="2">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD16" name="request_num"/>
-    <field type="CARD16" name="request_total"/>
-    <field type="CARD32" name="data_len"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD16" name="request_num" />
+    <field type="CARD16" name="request_total" />
+    <field type="CARD32" name="data_len" />
     <list type="byte" name="data">
       <fieldref>data_len</fieldref>
     </list>
   </request>
   <request name="CreateContext" number="3">
-    <field type="glx:Context" name="context"/>
-    <field type="VisualID" name="visual"/>
-    <field type="CARD32" name="screen"/>
-    <field type="CARD32" name="share_list"/>
-    <field type="bool" name="is_direct"/>
-    <pad bytes="3"/>
+    <field type="glx:Context" name="context" />
+    <field type="VisualID" name="visual" />
+    <field type="CARD32" name="screen" />
+    <field type="CARD32" name="share_list" />
+    <field type="bool" name="is_direct" />
+    <pad bytes="3" />
   </request>
   <request name="DestroyContext" number="4">
-    <field type="glx:Context" name="context"/>
+    <field type="glx:Context" name="context" />
   </request>
   <request name="MakeCurrent" number="5">
-    <field type="glx:Drawable" name="drawable"/>
-    <field type="glx:Context" name="context"/>
-    <field type="ContextTag" name="old_context_tag"/>
-    <reply>
-      <pad bytes="1"/>
-      <field type="ContextTag" name="context_tag"/>
-      <pad bytes="20"/>
+    <field type="glx:Drawable" name="drawable" />
+    <field type="glx:Context" name="context" />
+    <field type="ContextTag" name="old_context_tag" />
+    <reply>
+      <pad bytes="1" />
+      <field type="ContextTag" name="context_tag" />
+      <pad bytes="20" />
     </reply>
   </request>
   <request name="IsDirect" number="6">
-    <field type="glx:Context" name="context"/>
+    <field type="glx:Context" name="context" />
     <reply>
-      <pad bytes="1"/>
-      <field type="bool" name="is_direct"/>
-      <pad bytes="23"/>
+      <pad bytes="1" />
+      <field type="bool" name="is_direct" />
+      <pad bytes="23" />
     </reply>
   </request>
   <request name="QueryVersion" number="7">
-    <field type="Version32"/>
+    <field type="Version32" />
     <reply>
-      <pad bytes="1"/>
-      <field type="Version32"/>
-      <pad bytes="16"/>
+      <pad bytes="1" />
+      <field type="Version32" />
+      <pad bytes="16" />
     </reply>
   </request>
   <request name="WaitGL" number="8">
-    <field type="ContextTag" name="context_tag"/>
+    <field type="ContextTag" name="context_tag" />
   </request>
   <request name="WaitX" number="9">
-    <field type="ContextTag" name="context_tag"/>
+    <field type="ContextTag" name="context_tag" />
   </request>
   <request name="CopyContext" number="10">
-    <field type="glx:Context" name="src"/>
-    <field type="glx:Context" name="dest"/>
-    <field type="CARD32" name="mask"/>
-    <field type="ContextTag" name="src_context_tag"/>
+    <field type="glx:Context" name="src" />
+    <field type="glx:Context" name="dest" />
+    <field type="CARD32" name="mask" />
+    <field type="ContextTag" name="src_context_tag" />
   </request>
-<!-- Enum for CopyContext: mask -->
+  <!-- Enum for CopyContext: mask -->
   <mask type="CARD32" name="GC">
-    <item name="_GL_CURRENT_BIT"/>
-    <item name="_GL_POINT_BIT"/>
-    <item name="_GL_LINE_BIT"/>
-    <item name="_GL_POLYGON_BIT"/>
-    <item name="_GL_POLYGON_STIPPLE_BIT"/>
-    <item name="_GL_PIXEL_MODE_BIT"/>
-    <item name="_GL_LIGHTING_BIT"/>
-    <item name="_GL_FOG_BIT"/>
-    <item name="_GL_DEPTH_BUFFER_BIT"/>
-    <item name="_GL_ACCUM_BUFFER_BIT"/>
-    <item name="_GL_STENCIL_BUFFER_BIT"/>
-    <item name="_GL_VIEWPORT_BIT"/>
-    <item name="_GL_TRANSFORM_BIT"/>
-    <item name="_GL_ENABLE_BIT"/>
-    <item name="_GL_COLOR_BUFFER_BIT"/>
-    <item name="_GL_HINT_BIT"/>
-    <item name="_GL_EVAL_BIT"/>
-    <item name="_GL_LIST_BIT"/>
-    <item name="_GL_TEXTURE_BIT"/>
-    <item name="_GL_SCISSOR_BIT"/>
+    <item name="_GL_CURRENT_BIT" />
+    <item name="_GL_POINT_BIT" />
+    <item name="_GL_LINE_BIT" />
+    <item name="_GL_POLYGON_BIT" />
+    <item name="_GL_POLYGON_STIPPLE_BIT" />
+    <item name="_GL_PIXEL_MODE_BIT" />
+    <item name="_GL_LIGHTING_BIT" />
+    <item name="_GL_FOG_BIT" />
+    <item name="_GL_DEPTH_BUFFER_BIT" />
+    <item name="_GL_ACCUM_BUFFER_BIT" />
+    <item name="_GL_STENCIL_BUFFER_BIT" />
+    <item name="_GL_VIEWPORT_BIT" />
+    <item name="_GL_TRANSFORM_BIT" />
+    <item name="_GL_ENABLE_BIT" />
+    <item name="_GL_COLOR_BUFFER_BIT" />
+    <item name="_GL_HINT_BIT" />
+    <item name="_GL_EVAL_BIT" />
+    <item name="_GL_LIST_BIT" />
+    <item name="_GL_TEXTURE_BIT" />
+    <item name="_GL_SCISSOR_BIT" />
     <item name="_GL_ALL_ATTRIB_BITS">
       <value>0x000ffffff</value>
     </item>
   </mask>
   <request name="SwapBuffers" number="11">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="glx:Drawable" name="drawable"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="glx:Drawable" name="drawable" />
   </request>
   <request name="UseXFont" number="12">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="Font" name="font"/>
-    <field type="CARD32" name="first"/>
-    <field type="CARD32" name="count"/>
-    <field type="CARD32" name="list_base"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="Font" name="font" />
+    <field type="CARD32" name="first" />
+    <field type="CARD32" name="count" />
+    <field type="CARD32" name="list_base" />
   </request>
   <request name="CreateGLXPixmap" number="13">
-    <field type="CARD32" name="screen"/>
-    <field type="VisualID" name="visual"/>
-    <field type="xcb_types:Pixmap" name="pixmap"/>
-    <field type="glx:Pixmap" name="glx_pixmap"/>
+    <field type="CARD32" name="screen" />
+    <field type="VisualID" name="visual" />
+    <field type="xcb_types:Pixmap" name="pixmap" />
+    <field type="glx:Pixmap" name="glx_pixmap" />
   </request>
   <request name="GetVisualConfigs" number="14">
-    <field type="CARD32" name="screen"/>
+    <field type="CARD32" name="screen" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="num_visuals"/>
-      <field type="CARD32" name="num_props"/>
-      <pad bytes="16"/>
-      <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="num_visuals" />
+      <field type="CARD32" name="num_props" />
+      <pad bytes="16" />
+      <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list" />
     </reply>
   </request>
   <request name="DestroyGLXPixmap" number="15">
-    <field type="glx:Pixmap" name="glx_pixmap"/>
+    <field type="glx:Pixmap" name="glx_pixmap" />
   </request>
-<!--
-	Context tag is not in the proto, should be part of the list of bytes
-	but every VendorPrivate and VendorPrivateWithReply request uses them
-	so it is safe to put them in.  That's how Mesa does it.
-	-->
+  <!--
+        Context tag is not in the proto, should be part of the list of bytes
+        but every VendorPrivate and VendorPrivateWithReply request uses them
+        so it is safe to put them in.  That's how Mesa does it.
+        -->
   <request name="VendorPrivate" number="16">
-    <field type="CARD32" name="vendor_code"/>
-    <field type="ContextTag" name="context_tag"/>
-    <list type="byte" name="data"/>
+    <field type="CARD32" name="vendor_code" />
+    <field type="ContextTag" name="context_tag" />
+    <list type="byte" name="data" />
   </request>
   <request name="VendorPrivateWithReply" number="17">
-    <field type="CARD32" name="vendor_code"/>
-    <field type="ContextTag" name="context_tag"/>
-    <list type="byte" name="data"/>
+    <field type="CARD32" name="vendor_code" />
+    <field type="ContextTag" name="context_tag" />
+    <list type="byte" name="data" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="retval"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="retval" />
       <list type="byte" name="data1">
         <value>24</value>
       </list>
-      <list type="byte" name="data2"/>
+      <list type="byte" name="data2" />
     </reply>
   </request>
   <request name="QueryExtensionsString" number="18">
-    <field type="CARD32" name="screen"/>
+    <field type="CARD32" name="screen" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <pad bytes="16"/>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <pad bytes="16" />
     </reply>
   </request>
   <request name="QueryServerString" number="19">
-    <field type="CARD32" name="screen"/>
-    <field type="CARD32" name="name"/>
+    <field type="CARD32" name="screen" />
+    <field type="CARD32" name="name" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="str_len"/>
-      <pad bytes="16"/>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="str_len" />
+      <pad bytes="16" />
       <list type="CARD8" name="string">
         <fieldref>str_len</fieldref>
       </list>
     </reply>
   </request>
   <request name="ClientInfo" number="20">
-    <field type="CARD32" name="major_version"/>
-    <field type="CARD32" name="minor_version"/>
-    <field type="CARD32" name="str_len"/>
+    <field type="CARD32" name="major_version" />
+    <field type="CARD32" name="minor_version" />
+    <field type="CARD32" name="str_len" />
     <list type="CARD8" name="string">
       <fieldref>str_len</fieldref>
     </list>
   </request>
-<!-- Start of GLX 1.3 Requests -->
+  <!-- Start of GLX 1.3 Requests -->
   <request name="GetFBConfigs" number="21">
-    <field type="CARD32" name="screen"/>
+    <field type="CARD32" name="screen" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="num_FB_configs"/>
-      <field type="CARD32" name="num_properties"/>
-      <pad bytes="16"/>
-      <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="num_FB_configs" />
+      <field type="CARD32" name="num_properties" />
+      <pad bytes="16" />
+      <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list" />
     </reply>
   </request>
   <request name="CreatePixmap" number="22">
-    <field type="CARD32" name="screen"/>
-    <field type="CARD32" name="fbconfig"/>
-    <field type="xcb_types:Pixmap" name="pixmap"/>
-    <field type="glx:Pixmap" name="glx_pixmap"/>
-    <field type="CARD32" name="num_attribs"/>
+    <field type="CARD32" name="screen" />
+    <field type="CARD32" name="fbconfig" />
+    <field type="xcb_types:Pixmap" name="pixmap" />
+    <field type="glx:Pixmap" name="glx_pixmap" />
+    <field type="CARD32" name="num_attribs" />
   </request>
   <request name="DestroyPixmap" number="23">
-    <field type="glx:Pixmap" name="glx_pixmap"/>
+    <field type="glx:Pixmap" name="glx_pixmap" />
   </request>
   <request name="CreateNewContext" number="24">
-    <field type="glx:Context" name="context"/>
-    <field type="CARD32" name="fbconfig"/>
-    <field type="Screen" name="screen"/>
-    <field type="CARD32" name="render_type"/>
-    <field type="glx:Context" name="share_list"/>
-    <field type="bool" name="is_direct"/>
-    <field type="CARD8" name="reserved1"/>
-    <field type="CARD16" name="reserved2"/>
+    <field type="glx:Context" name="context" />
+    <field type="CARD32" name="fbconfig" />
+    <field type="Screen" name="screen" />
+    <field type="CARD32" name="render_type" />
+    <field type="glx:Context" name="share_list" />
+    <field type="bool" name="is_direct" />
+    <field type="CARD8" name="reserved1" />
+    <field type="CARD16" name="reserved2" />
   </request>
   <request name="QueryContext" number="25">
-    <field type="glx:Context" name="context"/>
+    <field type="glx:Context" name="context" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="num_attributes"/>
-      <pad bytes="20"/>
-      <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="num_attributes" />
+      <pad bytes="20" />
+      <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list" />
     </reply>
   </request>
   <request name="MakeContextCurrent" number="26">
-    <field type="ContextTag" name="old_context_tag"/>
-    <field type="glx:Drawable" name="drawable"/>
-    <field type="glx:Drawable" name="read_drawable"/>
-    <field type="glx:Context" name="context"/>
-    <reply>
-      <pad bytes="1"/>
-      <field type="ContextTag" name="context_tag"/>
-      <pad bytes="20"/>
+    <field type="ContextTag" name="old_context_tag" />
+    <field type="glx:Drawable" name="drawable" />
+    <field type="glx:Drawable" name="read_drawable" />
+    <field type="glx:Context" name="context" />
+    <reply>
+      <pad bytes="1" />
+      <field type="ContextTag" name="context_tag" />
+      <pad bytes="20" />
     </reply>
   </request>
   <request name="CreatePbuffer" number="27">
-    <field type="Screen" 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"/>
+    <field type="Screen" 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" />
   </request>
   <request name="DestroyPbuffer" number="28">
-    <field type="PBuffer" name="pbuffer"/>
+    <field type="PBuffer" name="pbuffer" />
   </request>
   <request name="GetDrawableAttributes" number="29">
-    <field type="glx:Drawable" name="drawable"/>
+    <field type="glx:Drawable" name="drawable" />
     <reply>
-      <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"/>
+      <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" />
     </reply>
   </request>
   <request name="ChangeDrawableAttributes" number="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"/>
+    <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" />
   </request>
   <request name="CreateWindow" number="31">
-    <field type="Screen" name="screen"/>
-    <field type="FBConfig" name="fbconfig"/>
-    <field type="xcb_types: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"/>
+    <field type="Screen" name="screen" />
+    <field type="FBConfig" name="fbconfig" />
+    <field type="xcb_types: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" />
   </request>
   <request name="DeleteWindow" number="32">
-    <field type="glx:Window" name="glxwindow"/>
+    <field type="glx:Window" name="glxwindow" />
   </request>
-<!-- Requests for GL Non-rendering Commands (single ops) -->
+  <!-- Requests for GL Non-rendering Commands (single ops) -->
   <request name="NewList" number="101">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="list"/>
-    <field type="CARD32" name="mode"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="list" />
+    <field type="CARD32" name="mode" />
   </request>
   <request name="EndList" number="102">
-    <field type="ContextTag" name="context_tag"/>
+    <field type="ContextTag" name="context_tag" />
   </request>
   <request name="DeleteLists" number="103">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="list"/>
-    <field type="INT32" name="range"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="list" />
+    <field type="INT32" name="range" />
   </request>
   <request name="GenLists" number="104">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="INT32" name="range"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="INT32" name="range" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="ret_val"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="ret_val" />
     </reply>
   </request>
   <request name="FeedbackBuffer" number="105">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="INT32" name="size"/>
-    <field type="INT32" name="type"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="INT32" name="size" />
+    <field type="INT32" name="type" />
   </request>
   <request name="SelectBuffer" number="106">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="INT32" name="size"/>
-<!-- the reply is actually returned in the data
-		of the next RenderMode request -->
+    <field type="ContextTag" name="context_tag" />
+    <field type="INT32" name="size" />
+    <!-- the reply is actually returned in the data
+                of the next RenderMode request -->
   </request>
   <request name="RenderMode" number="107">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="mode"/>
-<!--
-		This reply is only if RM was previously feedback/selection.
-		If it was in feedback mode then data is FLOAT32.
-		If previously in render mode there is no reply.
-		-->
-    <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="ret_val"/>
-      <field type="CARD32" name="n"/>
-      <field type="CARD32" name="new_mode"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="mode" />
+    <!--
+                This reply is only if RM was previously feedback/selection.
+                If it was in feedback mode then data is FLOAT32.
+                If previously in render mode there is no reply.
+                -->
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="ret_val" />
+      <field type="CARD32" name="n" />
+      <field type="CARD32" name="new_mode" />
+      <pad bytes="12" />
       <list type="CARD32" name="data">
         <fieldref>n</fieldref>
       </list>
@@ -427,881 +427,881 @@ The patch that fixed this server bug in 
     </item>
   </enum>
   <request name="Finish" number="108">
-    <field type="ContextTag" name="context_tag"/>
+    <field type="ContextTag" name="context_tag" />
     <reply>
-      <pad bytes="1"/>
+      <pad bytes="1" />
     </reply>
   </request>
   <request name="PixelStoref" number="109">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="pname"/>
-    <field type="FLOAT32" name="datum"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="pname" />
+    <field type="FLOAT32" name="datum" />
   </request>
   <request name="PixelStorei" number="110">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="pname"/>
-    <field type="INT32" name="datum"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="pname" />
+    <field type="INT32" name="datum" />
   </request>
   <request name="ReadPixels" number="111">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="INT32" name="x"/>
-    <field type="INT32" name="y"/>
-    <field type="INT32" name="width"/>
-    <field type="INT32" name="height"/>
-    <field type="CARD32" name="format"/>
-    <field type="CARD32" name="type"/>
-    <field type="bool" name="swap_bytes"/>
-    <field type="bool" name="lsb_first"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="24"/>
-      <list type="byte" name="data"/>
-    </reply>
-  </request>
-<!-- FIXME:
-	All the Get* functions can return different stuff for replies.
-	Hopefully xcb will support multiple reply structures at some point
-	but for now... grrrr
-	Starts on page 58/180
-	-->
+    <field type="ContextTag" name="context_tag" />
+    <field type="INT32" name="x" />
+    <field type="INT32" name="y" />
+    <field type="INT32" name="width" />
+    <field type="INT32" name="height" />
+    <field type="CARD32" name="format" />
+    <field type="CARD32" name="type" />
+    <field type="bool" name="swap_bytes" />
+    <field type="bool" name="lsb_first" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="24" />
+      <list type="byte" name="data" />
+    </reply>
+  </request>
+  <!-- FIXME:
+        All the Get* functions can return different stuff for replies.
+        Hopefully xcb will support multiple reply structures at some point
+        but for now... grrrr
+        Starts on page 58/180
+        -->
   <request name="GetBooleanv" number="112">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="INT32" name="pname"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="INT32" name="pname" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="bool" name="datum"/>
-      <pad bytes="15"/>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="bool" name="datum" />
+      <pad bytes="15" />
       <list type="bool" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetClipPlane" number="113">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="INT32" name="plane"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="INT32" name="plane" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="24"/>
-      <list type="FLOAT64" name="data"/>
+      <pad bytes="1" />
+      <pad bytes="24" />
+      <list type="FLOAT64" name="data" />
     </reply>
   </request>
   <request name="GetDoublev" number="114">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="pname"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="pname" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT64" name="datum"/>
-      <pad bytes="8"/>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT64" name="datum" />
+      <pad bytes="8" />
       <list type="FLOAT64" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetError" number="115">
-    <field type="ContextTag" name="context_tag"/>
+    <field type="ContextTag" name="context_tag" />
     <reply>
-      <pad bytes="1"/>
-      <field type="INT32" name="error"/>
+      <pad bytes="1" />
+      <field type="INT32" name="error" />
     </reply>
   </request>
   <request name="GetFloatv" number="116">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="pname"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="pname" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT32" name="datum"/>
-      <pad bytes="12"/>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT32" name="datum" />
+      <pad bytes="12" />
       <list type="FLOAT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetIntegerv" number="117">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="pname"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="pname" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="INT32" name="datum"/>
-      <pad bytes="12"/>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="INT32" name="datum" />
+      <pad bytes="12" />
       <list type="INT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetLightfv" number="118">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="light"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="light" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT32" name="datum" />
+      <pad bytes="12" />
       <list type="FLOAT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetLightiv" number="119">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="light"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="INT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="light" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="INT32" name="datum" />
+      <pad bytes="12" />
       <list type="INT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetMapdv" number="120">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="query"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT64" name="datum"/>
-      <pad bytes="8"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="query" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT64" name="datum" />
+      <pad bytes="8" />
       <list type="FLOAT64" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetMapfv" number="121">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="query"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="query" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT32" name="datum" />
+      <pad bytes="12" />
       <list type="FLOAT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetMapiv" number="122">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="query"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="INT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="query" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="INT32" name="datum" />
+      <pad bytes="12" />
       <list type="INT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetMaterialfv" number="123">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="face"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="face" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT32" name="datum" />
+      <pad bytes="12" />
       <list type="FLOAT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetMaterialiv" number="124">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="face"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="INT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="face" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="INT32" name="datum" />
+      <pad bytes="12" />
       <list type="INT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetPixelMapfv" number="125">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="map"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="map" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT32" name="datum"/>
-      <pad bytes="12"/>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT32" name="datum" />
+      <pad bytes="12" />
       <list type="FLOAT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetPixelMapuiv" number="126">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="map"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="map" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="CARD32" name="datum"/>
-      <pad bytes="12"/>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="CARD32" name="datum" />
+      <pad bytes="12" />
       <list type="CARD32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetPixelMapusv" number="127">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="map"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="map" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="CARD16" name="datum"/>
-      <pad bytes="16"/>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="CARD16" name="datum" />
+      <pad bytes="16" />
       <list type="CARD16" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetPolygonStipple" number="128">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="bool" name="lsb_first"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="bool" name="lsb_first" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="24"/>
-      <list type="byte" name="data"/>
+      <pad bytes="1" />
+      <pad bytes="24" />
+      <list type="byte" name="data" />
     </reply>
   </request>
   <request name="GetString" number="129">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="name"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="name" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <pad bytes="16"/>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <pad bytes="16" />
       <list type="CARD8" name="string">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetTexEnvfv" number="130">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT32" name="datum" />
+      <pad bytes="12" />
       <list type="FLOAT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetTexEnviv" number="131">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="INT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="INT32" name="datum" />
+      <pad bytes="12" />
       <list type="INT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetTexGendv" number="132">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="coord"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT64" name="datum"/>
-      <pad bytes="8"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="coord" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT64" name="datum" />
+      <pad bytes="8" />
       <list type="FLOAT64" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetTexGenfv" number="133">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="coord"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="coord" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT32" name="datum" />
+      <pad bytes="12" />
       <list type="FLOAT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetTexGeniv" number="134">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="coord"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="INT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="coord" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="INT32" name="datum" />
+      <pad bytes="12" />
       <list type="INT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetTexImage" number="135">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="INT32" name="level"/>
-    <field type="CARD32" name="format"/>
-    <field type="CARD32" name="type"/>
-    <field type="bool" name="swap_bytes"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="8"/>
-      <field type="INT32" name="width"/>
-      <field type="INT32" name="height"/>
-      <field type="INT32" name="depth"/>
-      <pad bytes="4"/>
-      <list type="byte" name="data"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="INT32" name="level" />
+    <field type="CARD32" name="format" />
+    <field type="CARD32" name="type" />
+    <field type="bool" name="swap_bytes" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="8" />
+      <field type="INT32" name="width" />
+      <field type="INT32" name="height" />
+      <field type="INT32" name="depth" />
+      <pad bytes="4" />
+      <list type="byte" name="data" />
     </reply>
   </request>
   <request name="GetTexParameterfv" number="136">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT32" name="datum" />
+      <pad bytes="12" />
       <list type="FLOAT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetTexParameteriv" number="137">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="INT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="INT32" name="datum" />
+      <pad bytes="12" />
       <list type="INT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetTexLevelParameterfv" number="138">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="INT32" name="level"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="INT32" name="level" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT32" name="datum" />
+      <pad bytes="12" />
       <list type="FLOAT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetTexLevelParameteriv" number="139">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="INT32" name="level"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="INT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="INT32" name="level" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="INT32" name="datum" />
+      <pad bytes="12" />
       <list type="INT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="IsList" number="141">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="list"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="list" />
     <reply>
-      <pad bytes="1"/>
-      <field type="BOOL32" name="ret_val"/>
+      <pad bytes="1" />
+      <field type="BOOL32" name="ret_val" />
     </reply>
   </request>
   <request name="Flush" number="142">
-    <field type="ContextTag" name="context_tag"/>
+    <field type="ContextTag" name="context_tag" />
   </request>
   <request name="AreTexturesResident" number="143">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="INT32" name="n"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="INT32" name="n" />
     <list type="CARD32" name="textures">
       <fieldref>n</fieldref>
     </list>
     <reply>
-      <pad bytes="1"/>
-      <field type="BOOL32" name="ret_val"/>
-      <pad bytes="20"/>
-      <list type="bool" name="data"/>
+      <pad bytes="1" />
+      <field type="BOOL32" name="ret_val" />
+      <pad bytes="20" />
+      <list type="bool" name="data" />
     </reply>
   </request>
   <request name="DeleteTextures" number="144">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="INT32" name="n"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="INT32" name="n" />
     <list type="CARD32" name="textures">
       <fieldref>n</fieldref>
     </list>
   </request>
   <request name="GenTextures" number="145">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="INT32" name="n"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="INT32" name="n" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="24"/>
-      <list type="CARD32" name="data"/>
+      <pad bytes="1" />
+      <pad bytes="24" />
+      <list type="CARD32" name="data" />
     </reply>
   </request>
   <request name="IsTexture" number="146">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="texture"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="texture" />
     <reply>
-      <pad bytes="1"/>
-      <field type="BOOL32" name="ret_val"/>
+      <pad bytes="1" />
+      <field type="BOOL32" name="ret_val" />
     </reply>
   </request>
   <request name="GetColorTable" number="147">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="format"/>
-    <field type="CARD32" name="type"/>
-    <field type="bool" name="swap_bytes"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="8"/>
-      <field type="INT32" name="width"/>
-      <pad bytes="12"/>
-      <list type="byte" name="data"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="format" />
+    <field type="CARD32" name="type" />
+    <field type="bool" name="swap_bytes" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="8" />
+      <field type="INT32" name="width" />
+      <pad bytes="12" />
+      <list type="byte" name="data" />
     </reply>
   </request>
   <request name="GetColorTableParameterfv" number="148">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT32" name="datum" />
+      <pad bytes="12" />
       <list type="FLOAT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetColorTableParameteriv" number="149">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="INT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="INT32" name="datum" />
+      <pad bytes="12" />
       <list type="INT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetConvolutionFilter" number="150">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="format"/>
-    <field type="CARD32" name="type"/>
-    <field type="bool" name="swap_bytes"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="8"/>
-      <field type="INT32" name="width"/>
-      <field type="INT32" name="height"/>
-      <pad bytes="8"/>
-      <list type="byte" name="data"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="format" />
+    <field type="CARD32" name="type" />
+    <field type="bool" name="swap_bytes" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="8" />
+      <field type="INT32" name="width" />
+      <field type="INT32" name="height" />
+      <pad bytes="8" />
+      <list type="byte" name="data" />
     </reply>
   </request>
   <request name="GetConvolutionParameterfv" number="151">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT32" name="datum" />
+      <pad bytes="12" />
       <list type="FLOAT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetConvolutionParameteriv" number="152">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="INT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="INT32" name="datum" />
+      <pad bytes="12" />
       <list type="INT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetSeparableFilter" number="153">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="format"/>
-    <field type="CARD32" name="type"/>
-    <field type="bool" name="swap_bytes"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="8"/>
-      <field type="INT32" name="row_w"/>
-      <field type="INT32" name="col_h"/>
-      <pad bytes="8"/>
-      <list type="byte" name="rows_and_cols"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="format" />
+    <field type="CARD32" name="type" />
+    <field type="bool" name="swap_bytes" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="8" />
+      <field type="INT32" name="row_w" />
+      <field type="INT32" name="col_h" />
+      <pad bytes="8" />
+      <list type="byte" name="rows_and_cols" />
     </reply>
   </request>
   <request name="GetHistogram" number="154">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="format"/>
-    <field type="CARD32" name="type"/>
-    <field type="bool" name="swap_bytes"/>
-    <field type="bool" name="reset"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="8"/>
-      <field type="INT32" name="width"/>
-      <pad bytes="12"/>
-      <list type="byte" name="data"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="format" />
+    <field type="CARD32" name="type" />
+    <field type="bool" name="swap_bytes" />
+    <field type="bool" name="reset" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="8" />
+      <field type="INT32" name="width" />
+      <pad bytes="12" />
+      <list type="byte" name="data" />
     </reply>
   </request>
   <request name="GetHistogramParameterfv" number="155">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT32" name="datum" />
+      <pad bytes="12" />
       <list type="FLOAT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetHistogramParameteriv" number="156">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="INT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="INT32" name="datum" />
+      <pad bytes="12" />
       <list type="INT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetMinmax" number="157">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="format"/>
-    <field type="CARD32" name="type"/>
-    <field type="bool" name="swap_bytes"/>
-    <field type="bool" name="reset"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="24"/>
-      <list type="byte" name="data"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="format" />
+    <field type="CARD32" name="type" />
+    <field type="bool" name="swap_bytes" />
+    <field type="bool" name="reset" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="24" />
+      <list type="byte" name="data" />
     </reply>
   </request>
   <request name="GetMinmaxParameterfv" number="158">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="FLOAT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="FLOAT32" name="datum" />
+      <pad bytes="12" />
       <list type="FLOAT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetMinmaxParameteriv" number="159">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="INT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="INT32" name="datum" />
+      <pad bytes="12" />
       <list type="INT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
-<!--
-	GLX Extensions
-	
-	* XXX: So far only define non-rendering commands.
-	* Only those extensions that affect the GLX wire protocol are listed.
-	-->
-<!--
-	GL_ARB_texture_compression
-	http://oss.sgi.com/projects/ogl-sample/registry/ARB/texture_compression.txt
-	-->
+  <!--
+        GLX Extensions
+        
+        * XXX: So far only define non-rendering commands.
+        * Only those extensions that affect the GLX wire protocol are listed.
+        -->
+  <!--
+        GL_ARB_texture_compression
+        http://oss.sgi.com/projects/ogl-sample/registry/ARB/texture_compression.txt
+        -->
   <request name="GetCompressedTexImageARB" number="160">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="INT32" name="level"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="8"/>
-      <field type="INT32" name="size"/>
-      <pad bytes="12"/>
-      <list type="byte" name="data"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="INT32" name="level" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="8" />
+      <field type="INT32" name="size" />
+      <pad bytes="12" />
+      <list type="byte" name="data" />
     </reply>
   </request>
-<!--
-	GL_ARB_occlusion_query
-	http://oss.sgi.com/projects/ogl-sample/registry/ARB/occlusion_query.txt
-	-->
+  <!--
+        GL_ARB_occlusion_query
+        http://oss.sgi.com/projects/ogl-sample/registry/ARB/occlusion_query.txt
+        -->
   <request name="DeleteQueriesARB" number="161">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="INT32" name="n"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="INT32" name="n" />
     <list type="CARD32" name="ids">
       <fieldref>n</fieldref>
     </list>
   </request>
   <request name="GenQueriesARB" number="162">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="INT32" name="n"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="INT32" name="n" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="24"/>
-      <list type="CARD32" name="data"/>
+      <pad bytes="1" />
+      <pad bytes="24" />
+      <list type="CARD32" name="data" />
     </reply>
   </request>
   <request name="IsQueryARB" number="163">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="id"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="id" />
     <reply>
-      <pad bytes="1"/>
-      <field type="BOOL32" name="ret_val"/>
+      <pad bytes="1" />
+      <field type="BOOL32" name="ret_val" />
     </reply>
   </request>
   <request name="GetQueryivARB" number="164">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="target"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="INT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="target" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="INT32" name="datum" />
+      <pad bytes="12" />
       <list type="INT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetQueryObjectivARB" number="165">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="id"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="INT32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="id" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="INT32" name="datum" />
+      <pad bytes="12" />
       <list type="INT32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetQueryObjectuivARB" number="166">
-    <field type="ContextTag" name="context_tag"/>
-    <field type="CARD32" name="id"/>
-    <field type="CARD32" name="pname"/>
-    <reply>
-      <pad bytes="1"/>
-      <pad bytes="4"/>
-      <field type="CARD32" name="n"/>
-      <field type="CARD32" name="datum"/>
-      <pad bytes="12"/>
+    <field type="ContextTag" name="context_tag" />
+    <field type="CARD32" name="id" />
+    <field type="CARD32" name="pname" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="4" />
+      <field type="CARD32" name="n" />
+      <field type="CARD32" name="datum" />
+      <pad bytes="12" />
       <list type="CARD32" name="data">
         <fieldref>n</fieldref>
       </list>
     </reply>
   </request>
-<!--
-	GL_ARB_vertex_program
-	http://oss.sgi.com/projects/ogl-sample/registry/ARB/vertex_program.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_ARB_fragment_program
-	http://oss.sgi.com/projects/ogl-sample/registry/ARB/fragment_program.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_SGIS_texture_filter4
-	http://oss.sgi.com/projects/ogl-sample/registry/SGIS/texture_filter4.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_EXT_histogram
-	http://oss.sgi.com/projects/ogl-sample/registry/EXT/histogram.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_EXT_convolution
-	http://oss.sgi.com/projects/ogl-sample/registry/EXT/convolution.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_SGI_color_table
-	http://oss.sgi.com/projects/ogl-sample/registry/SGI/color_table.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_EXT_texture_object
-	http://oss.sgi.com/projects/ogl-sample/registry/EXT/texture_object.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_SGIS_detail_texture
-	http://oss.sgi.com/projects/ogl-sample/registry/SGIS/detail_texture.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_SGIS_sharpen_texture
-	http://oss.sgi.com/projects/ogl-sample/registry/SGIS/sharpen_texture.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_SGI_make_current_read
-	http://oss.sgi.com/projects/ogl-sample/registry/SGI/make_current_read.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_EXT_import_context
-	http://oss.sgi.com/projects/ogl-sample/registry/EXT/import_context.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_SGIX_fbconfig
-	http://oss.sgi.com/projects/ogl-sample/registry/SGIX/fbconfig.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_SGIX_pbuffer
-	http://oss.sgi.com/projects/ogl-sample/registry/SGIX/pbuffer.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_EXT_pixel_transform
-	http://oss.sgi.com/projects/ogl-sample/registry/EXT/pixel_transform.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_NV_register_combiners
-	http://oss.sgi.com/projects/ogl-sample/registry/NV/register_combiners.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_NV_fence
-	http://oss.sgi.com/projects/ogl-sample/registry/NV/fence.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_NV_register_combiners2
-	http://oss.sgi.com/projects/ogl-sample/registry/NV/register_combiners2.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_NV_vertex_program
-	http://oss.sgi.com/projects/ogl-sample/registry/NV/vertex_program.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_NV_vertex_program
-	http://oss.sgi.com/projects/ogl-sample/registry/NV/vertex_program.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_NV_occlusion_query
-	http://oss.sgi.com/projects/ogl-sample/registry/NV/occlusion_query.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_NV_fragment_program
-	http://oss.sgi.com/projects/ogl-sample/registry/NV/fragment_program.txt
-	XXX: Need to write up vops
-	-->
-<!--
-	GL_OES_single_precision
-	http://oss.sgi.com/projects/ogl-sample/registry/OES/single_precision.txt
-	XXX: Need to write up vops
-	-->
+  <!--
+        GL_ARB_vertex_program
+        http://oss.sgi.com/projects/ogl-sample/registry/ARB/vertex_program.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_ARB_fragment_program
+        http://oss.sgi.com/projects/ogl-sample/registry/ARB/fragment_program.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_SGIS_texture_filter4
+        http://oss.sgi.com/projects/ogl-sample/registry/SGIS/texture_filter4.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_EXT_histogram
+        http://oss.sgi.com/projects/ogl-sample/registry/EXT/histogram.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_EXT_convolution
+        http://oss.sgi.com/projects/ogl-sample/registry/EXT/convolution.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_SGI_color_table
+        http://oss.sgi.com/projects/ogl-sample/registry/SGI/color_table.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_EXT_texture_object
+        http://oss.sgi.com/projects/ogl-sample/registry/EXT/texture_object.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_SGIS_detail_texture
+        http://oss.sgi.com/projects/ogl-sample/registry/SGIS/detail_texture.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_SGIS_sharpen_texture
+        http://oss.sgi.com/projects/ogl-sample/registry/SGIS/sharpen_texture.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_SGI_make_current_read
+        http://oss.sgi.com/projects/ogl-sample/registry/SGI/make_current_read.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_EXT_import_context
+        http://oss.sgi.com/projects/ogl-sample/registry/EXT/import_context.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_SGIX_fbconfig
+        http://oss.sgi.com/projects/ogl-sample/registry/SGIX/fbconfig.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_SGIX_pbuffer
+        http://oss.sgi.com/projects/ogl-sample/registry/SGIX/pbuffer.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_EXT_pixel_transform
+        http://oss.sgi.com/projects/ogl-sample/registry/EXT/pixel_transform.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_NV_register_combiners
+        http://oss.sgi.com/projects/ogl-sample/registry/NV/register_combiners.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_NV_fence
+        http://oss.sgi.com/projects/ogl-sample/registry/NV/fence.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_NV_register_combiners2
+        http://oss.sgi.com/projects/ogl-sample/registry/NV/register_combiners2.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_NV_vertex_program
+        http://oss.sgi.com/projects/ogl-sample/registry/NV/vertex_program.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_NV_vertex_program
+        http://oss.sgi.com/projects/ogl-sample/registry/NV/vertex_program.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_NV_occlusion_query
+        http://oss.sgi.com/projects/ogl-sample/registry/NV/occlusion_query.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_NV_fragment_program
+        http://oss.sgi.com/projects/ogl-sample/registry/NV/fragment_program.txt
+        XXX: Need to write up vops
+        -->
+  <!--
+        GL_OES_single_precision
+        http://oss.sgi.com/projects/ogl-sample/registry/OES/single_precision.txt
+        XXX: Need to write up vops
+        -->
 </extension>
diff --git a/xcb-proto/src/extensions/randr.xml b/xcb-proto/src/extensions/randr.xml
index 87715bd..a93a8ed 100644
--- a/xcb-proto/src/extensions/randr.xml
+++ b/xcb-proto/src/extensions/randr.xml
@@ -27,77 +27,77 @@ sale, use or other dealings in this Soft
 authorization from the authors.
 -->
 <extension header="randr" xname="RANDR" name="RandR" version="1.1">
-<!-- for SubpixelOrder, import render -->
+  <!-- for SubpixelOrder, import render -->
   <import>render</import>
   <mask name="Rotation">
-    <item name="rotate0"/>
-    <item name="rotate90"/>
-    <item name="rotate180"/>
-    <item name="rotate270"/>
-    <item name="reflect-x"/>
-    <item name="reflect-y"/>
+    <item name="rotate0" />
+    <item name="rotate90" />
+    <item name="rotate180" />
+    <item name="rotate270" />
+    <item name="reflect-x" />
+    <item name="reflect-y" />
   </mask>
   <struct name="RefreshRates">
-    <field type="CARD16" name="n-rates"/>
+    <field type="CARD16" name="n-rates" />
     <list type="CARD16" name="rates">
       <fieldref>n-rates</fieldref>
     </list>
   </struct>
   <request name="QueryVersion" number="0">
-    <field type="CARD32" name="major-version"/>
-    <field type="CARD32" name="minor-version"/>
+    <field type="CARD32" name="major-version" />
+    <field type="CARD32" name="minor-version" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="major-version"/>
-      <field type="CARD32" name="minor-version"/>
-      <pad bytes="16"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="major-version" />
+      <field type="CARD32" name="minor-version" />
+      <pad bytes="16" />
     </reply>
   </request>
-<!-- This is for the 1.1 version request.  I don't believe we need to specify a 1.0 request as few things used randr 1.0.  The only difference is the removal of refresh and padding I think. BEWARE: the docs lie! -->
+  <!-- This is for the 1.1 version request.  I don't believe we need to specify a 1.0 request as few things used randr 1.0.  The only difference is the removal of refresh and padding I think. BEWARE: the docs lie! -->
   <request name="SetScreenConfig" number="2">
-    <field type="Window" name="drawable"/>
-    <field type="Time" name="time"/>
-    <field type="Time" name="config-time"/>
-    <field type="CARD16" name="size-id"/>
-    <field type="INT16" name="rotation"/>
-    <field type="CARD16" name="refresh"/>
-    <pad bytes="2"/>
+    <field type="Window" name="drawable" />
+    <field type="Time" name="time" />
+    <field type="Time" name="config-time" />
+    <field type="CARD16" name="size-id" />
+    <field type="INT16" name="rotation" />
+    <field type="CARD16" name="refresh" />
+    <pad bytes="2" />
     <reply>
-      <field type="CARD8" name="status"/>
-      <field type="Time" name="time"/>
-      <field type="Time" name="config-time"/>
-      <field type="Window" name="root"/>
-      <field type="render:SubpixelOrder" name="subpixel-order"/>
-      <pad bytes="10"/>
+      <field type="CARD8" name="status" />
+      <field type="Time" name="time" />
+      <field type="Time" name="config-time" />
+      <field type="Window" name="root" />
+      <field type="render:SubpixelOrder" name="subpixel-order" />
+      <pad bytes="10" />
     </reply>
   </request>
   <enum name="SetConfig">
-    <item name="success"/>
-    <item name="invalid-config-time"/>
-    <item name="invalid-time"/>
-    <item name="failed"/>
+    <item name="success" />
+    <item name="invalid-config-time" />
+    <item name="invalid-time" />
+    <item name="failed" />
   </enum>
   <request name="SelectInput" number="4">
-    <field type="Window" name="window"/>
-    <field type="CARD16" name="enable"/>
-    <pad bytes="2"/>
+    <field type="Window" name="window" />
+    <field type="CARD16" name="enable" />
+    <pad bytes="2" />
   </request>
-<!--
-	I think this is correct.  It works. though I believe n-info is a bit high...
-	-->
+  <!--
+        I think this is correct.  It works. though I believe n-info is a bit high...
+        -->
   <request name="GetScreenInfo" number="5">
-    <field type="Window" name="window"/>
+    <field type="Window" name="window" />
     <reply>
-      <field type="CARD8" name="rotations"/>
-      <field type="Window" name="root"/>
-      <field type="Time" name="time"/>
-      <field type="Time" name="config-time"/>
-      <field type="CARD16" name="n-sizes"/>
-      <field type="CARD16" name="size-id"/>
-      <field type="INT16" name="rotation"/>
-      <field type="CARD16" name="rate"/>
-      <field type="CARD16" name="n-info"/>
-      <pad bytes="2"/>
+      <field type="CARD8" name="rotations" />
+      <field type="Window" name="root" />
+      <field type="Time" name="time" />
+      <field type="Time" name="config-time" />
+      <field type="CARD16" name="n-sizes" />
+      <field type="CARD16" name="size-id" />
+      <field type="INT16" name="rotation" />
+      <field type="CARD16" name="rate" />
+      <field type="CARD16" name="n-info" />
+      <pad bytes="2" />
       <list type="ScreenSize" name="sizes">
         <fieldref>n-sizes</fieldref>
       </list>
@@ -110,16 +110,16 @@ authorization from the authors.
     </reply>
   </request>
   <mask name="SM">
-    <item name="screen-change-notify"/>
+    <item name="screen-change-notify" />
   </mask>
   <event name="ScreenChangeNotify" number="0">
-    <field type="CARD8" name="rotation"/>
-    <field type="Time" name="time"/>
-    <field type="Time" name="config-time"/>
-    <field type="Window" name="root"/>
-    <field type="Window" name="request-window"/>
-    <field type="CARD16" name="size-id"/>
-    <field type="render:SubpixelOrder" name="subpixel-order"/>
-    <field type="ScreenSize"/>
+    <field type="CARD8" name="rotation" />
+    <field type="Time" name="time" />
+    <field type="Time" name="config-time" />
+    <field type="Window" name="root" />
+    <field type="Window" name="request-window" />
+    <field type="CARD16" name="size-id" />
+    <field type="render:SubpixelOrder" name="subpixel-order" />
+    <field type="ScreenSize" />
   </event>
 </extension>
diff --git a/xcb-proto/src/extensions/record.xml b/xcb-proto/src/extensions/record.xml
index ab241a2..c307017 100644
--- a/xcb-proto/src/extensions/record.xml
+++ b/xcb-proto/src/extensions/record.xml
@@ -27,71 +27,71 @@ sale, use or other dealings in this Soft
 authorization from the authors.
 -->
 <extension header="record" xname="RECORD" name="Record">
-<!-- Types -->
-  <resource name="Context"/>
+  <!-- Types -->
+  <resource name="Context" />
   <struct name="Range8">
-    <field type="CARD8" name="first"/>
-    <field type="CARD8" name="last"/>
+    <field type="CARD8" name="first" />
+    <field type="CARD8" name="last" />
   </struct>
   <struct name="Range16">
-    <field type="CARD16" name="first"/>
-    <field type="CARD16" name="last"/>
+    <field type="CARD16" name="first" />
+    <field type="CARD16" name="last" />
   </struct>
   <struct name="ExtRange">
-    <field type="Range8" name="major"/>
-    <field type="Range16" name="minor"/>
+    <field type="Range8" name="major" />
+    <field type="Range16" name="minor" />
   </struct>
   <struct name="Range">
-    <field type="Range8" name="core-requests"/>
-    <field type="Range8" name="core-replies"/>
-    <field type="ExtRange" name="ext-requests"/>
-    <field type="ExtRange" name="ext-replies"/>
-    <field type="Range8" name="delivered-events"/>
-    <field type="Range8" name="device-events"/>
-    <field type="Range8" name="errors"/>
-    <field type="bool" name="client-started"/>
-    <field type="bool" name="client-died"/>
+    <field type="Range8" name="core-requests" />
+    <field type="Range8" name="core-replies" />
+    <field type="ExtRange" name="ext-requests" />
+    <field type="ExtRange" name="ext-replies" />
+    <field type="Range8" name="delivered-events" />
+    <field type="Range8" name="device-events" />
+    <field type="Range8" name="errors" />
+    <field type="bool" name="client-started" />
+    <field type="bool" name="client-died" />
   </struct>
-  <typedef oldname="CARD8" newname="ElementHeader"/>
+  <typedef oldname="CARD8" newname="ElementHeader" />
   <mask type="CARD8" name="HType">
-    <item name="from-server-time"/>
-    <item name="from-client-time"/>
-    <item name="from-client-sequence"/>
+    <item name="from-server-time" />
+    <item name="from-client-time" />
+    <item name="from-client-sequence" />
   </mask>
-  <typedef oldname="CARD32" newname="ClientSpec"/>
+  <typedef oldname="CARD32" newname="ClientSpec" />
   <enum name="CS">
-    <item/>
-    <item name="current-clients"/>
-    <item name="future-clients"/>
-    <item name="all-clients"/>
+    <item />
+    <item name="current-clients" />
+    <item name="future-clients" />
+    <item name="all-clients" />
   </enum>
   <struct name="ClientInfo">
-    <field type="ClientSpec" name="client-resource"/>
-    <field type="CARD32" name="num-ranges"/>
+    <field type="ClientSpec" name="client-resource" />
+    <field type="CARD32" name="num-ranges" />
     <list type="Range" name="ranges">
       <fieldref>num-ranges</fieldref>
     </list>
   </struct>
-<!-- Errors -->
+  <!-- Errors -->
   <error name="BadContext" number="0">
-    <field type="CARD32" name="invalid-record"/>
+    <field type="CARD32" name="invalid-record" />
   </error>
-<!-- Requests -->
+  <!-- Requests -->
   <request name="QueryVersion" number="0">
-    <field type="CARD16" name="major-version"/>
-    <field type="CARD16" name="minor-version"/>
+    <field type="CARD16" name="major-version" />
+    <field type="CARD16" name="minor-version" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="major-version"/>
-      <field type="CARD16" name="minor-version"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="major-version" />
+      <field type="CARD16" name="minor-version" />
     </reply>
   </request>
   <request name="CreateContext" number="1">
-    <field type="record:Context" name="context"/>
-    <field type="ElementHeader" name="element-header"/>
-    <pad bytes="3"/>
-    <field type="CARD32" name="num-client-specs"/>
-    <field type="CARD32" name="num-ranges"/>
+    <field type="record:Context" name="context" />
+    <field type="ElementHeader" name="element-header" />
+    <pad bytes="3" />
+    <field type="CARD32" name="num-client-specs" />
+    <field type="CARD32" name="num-ranges" />
     <list type="ClientSpec" name="client-specs">
       <fieldref>num-client-specs</fieldref>
     </list>
@@ -100,11 +100,11 @@ authorization from the authors.
     </list>
   </request>
   <request name="RegisterClients" number="2">
-    <field type="record:Context" name="context"/>
-    <field type="ElementHeader" name="element-header"/>
-    <pad bytes="3"/>
-    <field type="CARD32" name="num-client-specs"/>
-    <field type="CARD32" name="num-ranges"/>
+    <field type="record:Context" name="context" />
+    <field type="ElementHeader" name="element-header" />
+    <pad bytes="3" />
+    <field type="CARD32" name="num-client-specs" />
+    <field type="CARD32" name="num-ranges" />
     <list type="ClientSpec" name="client-specs">
       <fieldref>num-client-specs</fieldref>
     </list>
@@ -113,43 +113,43 @@ authorization from the authors.
     </list>
   </request>
   <request name="UnregisterClients" number="3">
-    <field type="record:Context" name="context"/>
-    <field type="CARD32" name="num-client-specs"/>
+    <field type="record:Context" name="context" />
+    <field type="CARD32" name="num-client-specs" />
     <list type="ClientSpec" name="client-specs">
       <fieldref>num-client-specs</fieldref>
     </list>
   </request>
   <request name="GetContext" number="4">
-    <field type="record:Context" name="context"/>
+    <field type="record:Context" name="context" />
     <reply>
-      <field type="bool" name="enabled"/>
-      <field type="ElementHeader" name="element-header"/>
-      <pad bytes="3"/>
-      <field type="CARD32" name="num-intercepted-clients"/>
-      <pad bytes="16"/>
+      <field type="bool" name="enabled" />
+      <field type="ElementHeader" name="element-header" />
+      <pad bytes="3" />
+      <field type="CARD32" name="num-intercepted-clients" />
+      <pad bytes="16" />
       <list type="ClientInfo" name="intercepted-clients">
         <fieldref>num-intercepted-clients</fieldref>
       </list>
     </reply>
   </request>
   <request name="EnableContext" number="5">
-    <field type="record:Context" name="context"/>
+    <field type="record:Context" name="context" />
     <reply>
-      <field type="CARD8" name="category"/>
-      <field type="ElementHeader" name="element-header"/>
-      <field type="bool" name="client-swapped"/>
-      <pad bytes="2"/>
-      <field type="CARD32" name="xid-base"/>
-      <field type="CARD32" name="server-time"/>
-      <field type="CARD32" name="rec-sequence-num"/>
-      <pad bytes="8"/>
-      <list type="byte" name="data"/>
+      <field type="CARD8" name="category" />
+      <field type="ElementHeader" name="element-header" />
+      <field type="bool" name="client-swapped" />
+      <pad bytes="2" />
+      <field type="CARD32" name="xid-base" />
+      <field type="CARD32" name="server-time" />
+      <field type="CARD32" name="rec-sequence-num" />
+      <pad bytes="8" />
+      <list type="byte" name="data" />
     </reply>
   </request>
   <request name="DisableContext" number="6">
-    <field type="record:Context" name="context"/>
+    <field type="record:Context" name="context" />
   </request>
   <request name="FreeContext" number="7">
-    <field type="record:Context" name="context"/>
+    <field type="record:Context" name="context" />
   </request>
 </extension>
diff --git a/xcb-proto/src/extensions/render.xml b/xcb-proto/src/extensions/render.xml
index 6829a44..19fafc2 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -6,194 +6,194 @@ All Rights Reserved.  See the file COPYI
 for licensing information.
 -->
 <extension header="render" xname="RENDER" name="Render" version="0.10">
-<!-- supports version 0.8 -->
+  <!-- supports version 0.8 -->
   <enum type="CARD8" name="PictType">
-    <item name="indexed"/>
-    <item name="direct"/>
+    <item name="indexed" />
+    <item name="direct" />
   </enum>
-<!-- Disjoint* and Conjoint* are new in version 0.2 -->
+  <!-- Disjoint* and Conjoint* are new in version 0.2 -->
   <enum name="PictOp">
-    <item name="clear"/>
-    <item name="src"/>
-    <item name="dst"/>
-    <item name="over"/>
-    <item name="over-reverse"/>
-    <item name="in"/>
-    <item name="in-reverse"/>
-    <item name="out"/>
-    <item name="out-reverse"/>
-    <item name="atop"/>
-    <item name="atop-reverse"/>
-    <item name="xor"/>
-    <item name="add"/>
-    <item name="saturate"/>
-<!-- Operators only available in version 0.2 -->
+    <item name="clear" />
+    <item name="src" />
+    <item name="dst" />
+    <item name="over" />
+    <item name="over-reverse" />
+    <item name="in" />
+    <item name="in-reverse" />
+    <item name="out" />
+    <item name="out-reverse" />
+    <item name="atop" />
+    <item name="atop-reverse" />
+    <item name="xor" />
+    <item name="add" />
+    <item name="saturate" />
+    <!-- Operators only available in version 0.2 -->
     <item name="disjoint-clear">
       <value>0x10</value>
     </item>
-    <item name="disjoint-src"/>
-    <item name="disjoint-dst"/>
-    <item name="disjoint-over"/>
-    <item name="disjoint-over-reverse"/>
-    <item name="disjoint-in"/>
-    <item name="disjoint-in-reverse"/>
-    <item name="disjoint-out"/>
-    <item name="disjoint-out-reverse"/>
-    <item name="disjoint-atop"/>
-    <item name="disjoint-atop-reverse"/>
-    <item name="disjoint-xor"/>
+    <item name="disjoint-src" />
+    <item name="disjoint-dst" />
+    <item name="disjoint-over" />
+    <item name="disjoint-over-reverse" />
+    <item name="disjoint-in" />
+    <item name="disjoint-in-reverse" />
+    <item name="disjoint-out" />
+    <item name="disjoint-out-reverse" />
+    <item name="disjoint-atop" />
+    <item name="disjoint-atop-reverse" />
+    <item name="disjoint-xor" />
     <item name="conjoint-clear">
       <value>0x20</value>
     </item>
-    <item name="conjoint-src"/>
-    <item name="conjoint-dst"/>
-    <item name="conjoint-over"/>
-    <item name="conjoint-over-reverse"/>
-    <item name="conjoint-in"/>
-    <item name="conjoint-in-reverse"/>
-    <item name="conjoint-out"/>
-    <item name="conjoint-out-reverse"/>
-    <item name="conjoint-atop"/>
-    <item name="conjoint-atop-reverse"/>
-    <item name="conjoint-xor"/>
+    <item name="conjoint-src" />
+    <item name="conjoint-dst" />
+    <item name="conjoint-over" />
+    <item name="conjoint-over-reverse" />
+    <item name="conjoint-in" />
+    <item name="conjoint-in-reverse" />
+    <item name="conjoint-out" />
+    <item name="conjoint-out-reverse" />
+    <item name="conjoint-atop" />
+    <item name="conjoint-atop-reverse" />
+    <item name="conjoint-xor" />
   </enum>
   <enum name="PolyEdge">
-    <item name="sharp"/>
-    <item name="smooth"/>
+    <item name="sharp" />
+    <item name="smooth" />
   </enum>
   <enum name="PolyMode">
-    <item name="precise"/>
-    <item name="imprecise"/>
+    <item name="precise" />
+    <item name="imprecise" />
   </enum>
   <mask name="CP">
-    <item name="repeat"/>
-    <item name="alpha-map"/>
-    <item name="alpha-x-origin"/>
-    <item name="alpha-y-origin"/>
-    <item name="clip-x-origin"/>
-    <item name="clip-y-origin"/>
-    <item name="clip-mask"/>
-    <item name="graphics-exposure"/>
-    <item name="subwindow-mode"/>
-    <item name="poly-edge"/>
-    <item name="poly-mode"/>
-    <item name="dither"/>
-    <item name="component-alpha"/>
+    <item name="repeat" />
+    <item name="alpha-map" />
+    <item name="alpha-x-origin" />
+    <item name="alpha-y-origin" />
+    <item name="clip-x-origin" />
+    <item name="clip-y-origin" />
+    <item name="clip-mask" />
+    <item name="graphics-exposure" />
+    <item name="subwindow-mode" />
+    <item name="poly-edge" />
+    <item name="poly-mode" />
+    <item name="dither" />
+    <item name="component-alpha" />
   </mask>
   <enum type="CARD16" name="SubpixelOrder">
-    <item name="unknown"/>
-    <item name="horizontal-rgb"/>
-    <item name="horizontal-bgr"/>
-    <item name="vertical-rgb"/>
-    <item name="vertical-bgr"/>
-    <item name="none"/>
+    <item name="unknown" />
+    <item name="horizontal-rgb" />
+    <item name="horizontal-bgr" />
+    <item name="vertical-rgb" />
+    <item name="vertical-bgr" />
+    <item name="none" />
   </enum>
-  <typedef oldname="CARD32" newname="Glyph"/>
-  <resource name="GlyphSet"/>
-  <resource name="Picture"/>
-  <resource name="PictFormat"/>
-  <typedef oldname="INT32" newname="Fixed"/>
-  <error name="PictFormat" number="0"/>
-  <error name="Picture" number="1"/>
-  <error name="PictOp" number="2"/>
-  <error name="GlyphSet" number="3"/>
-  <error name="Glyph" number="4"/>
+  <typedef oldname="CARD32" newname="Glyph" />
+  <resource name="GlyphSet" />
+  <resource name="Picture" />
+  <resource name="PictFormat" />
+  <typedef oldname="INT32" newname="Fixed" />
+  <error name="PictFormat" number="0" />
+  <error name="Picture" number="1" />
+  <error name="PictOp" number="2" />
+  <error name="GlyphSet" number="3" />
+  <error name="Glyph" number="4" />
   <struct name="DirectFormat">
-    <field type="CARD16" name="red-shift"/>
-    <field type="CARD16" name="red-mask"/>
-    <field type="CARD16" name="green-shift"/>
-    <field type="CARD16" name="green-mask"/>
-    <field type="CARD16" name="blue-shift"/>
-    <field type="CARD16" name="blue-mask"/>
-    <field type="CARD16" name="alpha-shift"/>
-    <field type="CARD16" name="alpha-mask"/>
+    <field type="CARD16" name="red-shift" />
+    <field type="CARD16" name="red-mask" />
+    <field type="CARD16" name="green-shift" />
+    <field type="CARD16" name="green-mask" />
+    <field type="CARD16" name="blue-shift" />
+    <field type="CARD16" name="blue-mask" />
+    <field type="CARD16" name="alpha-shift" />
+    <field type="CARD16" name="alpha-mask" />
   </struct>
   <struct name="PictFormInfo">
-    <field type="PictFormat" name="id"/>
-    <field type="PictType" name="type"/>
-    <field type="CARD8" name="depth"/>
-    <pad bytes="2"/>
-    <field type="DirectFormat" name="direct"/>
-    <field type="Colormap" name="colormap"/>
+    <field type="PictFormat" name="id" />
+    <field type="PictType" name="type" />
+    <field type="CARD8" name="depth" />
+    <pad bytes="2" />
+    <field type="DirectFormat" name="direct" />
+    <field type="Colormap" name="colormap" />
   </struct>
   <struct name="PictVisual">
-    <field type="VisualID" name="visual"/>
-    <field type="PictFormat" name="format"/>
+    <field type="VisualID" name="visual" />
+    <field type="PictFormat" name="format" />
   </struct>
   <struct name="PictDepth">
-    <field type="CARD8" name="depth"/>
-    <pad bytes="1"/>
-    <field type="CARD16" name="num-visuals"/>
-    <pad bytes="4"/>
+    <field type="CARD8" name="depth" />
+    <pad bytes="1" />
+    <field type="CARD16" name="num-visuals" />
+    <pad bytes="4" />
     <list type="PictVisual" name="visuals">
       <fieldref>num-visuals</fieldref>
     </list>
   </struct>
   <struct name="PictScreen">
-    <field type="CARD32" name="num-depths"/>
-    <field type="PictFormat" name="fallback"/>
+    <field type="CARD32" name="num-depths" />
+    <field type="PictFormat" name="fallback" />
     <list type="PictDepth" name="depths">
       <fieldref>num-depths</fieldref>
     </list>
   </struct>
   <struct name="Color">
-    <field type="CARD16" name="red"/>
-    <field type="CARD16" name="green"/>
-    <field type="CARD16" name="blue"/>
-    <field type="CARD16" name="alpha"/>
+    <field type="CARD16" name="red" />
+    <field type="CARD16" name="green" />
+    <field type="CARD16" name="blue" />
+    <field type="CARD16" name="alpha" />
   </struct>
   <struct name="IndexValue">
-    <field type="CARD32" name="pixel"/>
-    <field type="Color"/>
+    <field type="CARD32" name="pixel" />
+    <field type="Color" />
   </struct>
   <struct name="PointFixed">
-    <field type="Fixed" name="x"/>
-    <field type="Fixed" name="y"/>
+    <field type="Fixed" name="x" />
+    <field type="Fixed" name="y" />
   </struct>
   <struct name="LineFixed">
-    <field type="PointFixed" name="p1"/>
-    <field type="PointFixed" name="p2"/>
+    <field type="PointFixed" name="p1" />
+    <field type="PointFixed" name="p2" />
   </struct>
   <struct name="Quad">
-    <field type="PointFixed" name="p1"/>
-    <field type="PointFixed" name="p2"/>
-    <field type="PointFixed" name="p3"/>
-    <field type="PointFixed" name="p4"/>
+    <field type="PointFixed" name="p1" />
+    <field type="PointFixed" name="p2" />
+    <field type="PointFixed" name="p3" />
+    <field type="PointFixed" name="p4" />
   </struct>
   <struct name="Triangle">
-    <field type="PointFixed" name="p1"/>
-    <field type="PointFixed" name="p2"/>
-    <field type="PointFixed" name="p3"/>
+    <field type="PointFixed" name="p1" />
+    <field type="PointFixed" name="p2" />
+    <field type="PointFixed" name="p3" />
   </struct>
   <struct name="Trapezoid">
-    <field type="Fixed" name="top"/>
-    <field type="Fixed" name="bottom"/>
-    <field type="LineFixed" name="left"/>
-    <field type="LineFixed" name="right"/>
+    <field type="Fixed" name="top" />
+    <field type="Fixed" name="bottom" />
+    <field type="LineFixed" name="left" />
+    <field type="LineFixed" name="right" />
   </struct>
   <struct name="GlyphInfo">
-    <field type="Size"/>
-    <field type="Point"/>
-    <field type="Point" name="offset"/>
+    <field type="Size" />
+    <field type="Point" />
+    <field type="Point" name="offset" />
   </struct>
   <request name="QueryVersion" number="0">
-    <field type="Version32" name="client-version"/>
+    <field type="Version32" name="client-version" />
     <reply>
-      <pad bytes="1"/>
-      <field type="Version32" name="version"/>
-      <pad bytes="16"/>
+      <pad bytes="1" />
+      <field type="Version32" name="version" />
+      <pad bytes="16" />
     </reply>
   </request>
   <request name="QueryPictFormats" number="1">
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="num-formats"/>
-      <field type="CARD32" name="num-screens"/>
-      <field type="CARD32" name="num-depths"/>
-      <field type="CARD32" name="num-visuals"/>
-      <field type="CARD32" name="num-subpixel"/>
-<!-- new in version 0.6 -->
-      <pad bytes="4"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="num-formats" />
+      <field type="CARD32" name="num-screens" />
+      <field type="CARD32" name="num-depths" />
+      <field type="CARD32" name="num-visuals" />
+      <field type="CARD32" name="num-subpixel" />
+      <!-- new in version 0.6 -->
+      <pad bytes="4" />
       <list type="PictFormInfo" name="formats">
         <fieldref>num-formats</fieldref>
       </list>
@@ -205,237 +205,237 @@ for licensing information.
       </list>
     </reply>
   </request>
-<!-- from version 0.7 -->
+  <!-- from version 0.7 -->
   <request name="QueryPictIndexValues" number="2">
-    <field type="PictFormat" name="format"/>
+    <field type="PictFormat" name="format" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="num-values"/>
-      <pad bytes="20"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="num-values" />
+      <pad bytes="20" />
       <list type="IndexValue" name="values">
         <fieldref>num-values</fieldref>
       </list>
     </reply>
   </request>
-<!-- FIXME: opcode 3 reserved for QueryDithers -->
+  <!-- FIXME: opcode 3 reserved for QueryDithers -->
   <request name="CreatePicture" number="4">
-    <field type="Picture" name="pid"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="PictFormat" name="format"/>
-    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
+    <field type="Picture" name="pid" />
+    <field type="Drawable" name="drawable" />
+    <field type="PictFormat" name="format" />
+    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list" />
   </request>
   <request name="ChangePicture" number="5">
-    <field type="Picture" name="picture"/>
-    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
+    <field type="Picture" name="picture" />
+    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list" />
   </request>
   <request name="SetPictureClipRectangles" number="6">
-    <field type="Picture" name="picture"/>
-    <field type="INT16" name="clip-x-origin"/>
-    <field type="INT16" name="clip-y-origin"/>
-    <list type="Rectangle" name="rectangles"/>
+    <field type="Picture" name="picture" />
+    <field type="INT16" name="clip-x-origin" />
+    <field type="INT16" name="clip-y-origin" />
+    <list type="Rectangle" name="rectangles" />
   </request>
   <request name="FreePicture" number="7">
-    <field type="Picture" name="picture"/>
+    <field type="Picture" name="picture" />
   </request>
   <request name="Composite" number="8">
-    <field type="CARD8" name="op"/>
-    <pad bytes="3"/>
-    <field type="Picture" name="src"/>
-    <field type="Picture" name="mask"/>
-    <field type="Picture" name="dst"/>
-    <field type="INT16" name="src-x"/>
-    <field type="INT16" name="src-y"/>
-    <field type="INT16" name="mask-x"/>
-    <field type="INT16" name="mask-y"/>
-    <field type="INT16" name="dst-x"/>
-    <field type="INT16" name="dst-y"/>
-    <field type="CARD16" name="width"/>
-    <field type="CARD16" name="height"/>
+    <field type="CARD8" name="op" />
+    <pad bytes="3" />
+    <field type="Picture" name="src" />
+    <field type="Picture" name="mask" />
+    <field type="Picture" name="dst" />
+    <field type="INT16" name="src-x" />
+    <field type="INT16" name="src-y" />
+    <field type="INT16" name="mask-x" />
+    <field type="INT16" name="mask-y" />
+    <field type="INT16" name="dst-x" />
+    <field type="INT16" name="dst-y" />
+    <field type="CARD16" name="width" />
+    <field type="CARD16" name="height" />
   </request>
-<!-- TODO: opcode 9 reserved for Scale -->
+  <!-- TODO: opcode 9 reserved for Scale -->
   <request name="Trapezoids" number="10">
-    <field type="CARD8" name="op"/>
-    <pad bytes="3"/>
-    <field type="Picture" name="src"/>
-    <field type="Picture" name="dst"/>
-    <field type="PictFormat" name="mask-format"/>
-    <field type="INT16" name="src-x"/>
-    <field type="INT16" name="src-y"/>
-    <list type="Trapezoid" name="traps"/>
+    <field type="CARD8" name="op" />
+    <pad bytes="3" />
+    <field type="Picture" name="src" />
+    <field type="Picture" name="dst" />
+    <field type="PictFormat" name="mask-format" />
+    <field type="INT16" name="src-x" />
+    <field type="INT16" name="src-y" />
+    <list type="Trapezoid" name="traps" />
   </request>
   <request name="Triangles" number="11">
-    <field type="CARD8" name="op"/>
-    <pad bytes="3"/>
-    <field type="Picture" name="src"/>
-    <field type="Picture" name="dst"/>
-    <field type="PictFormat" name="mask-format"/>
-    <field type="INT16" name="src-x"/>
-    <field type="INT16" name="src-y"/>
-    <list type="Triangle" name="triangles"/>
+    <field type="CARD8" name="op" />
+    <pad bytes="3" />
+    <field type="Picture" name="src" />
+    <field type="Picture" name="dst" />
+    <field type="PictFormat" name="mask-format" />
+    <field type="INT16" name="src-x" />
+    <field type="INT16" name="src-y" />
+    <list type="Triangle" name="triangles" />
   </request>
   <request name="TriStrip" number="12">
-    <field type="CARD8" name="op"/>
-    <pad bytes="3"/>
-    <field type="Picture" name="src"/>
-    <field type="Picture" name="dst"/>
-    <field type="PictFormat" name="mask-format"/>
-    <field type="INT16" name="src-x"/>
-    <field type="INT16" name="src-y"/>
-    <list type="PointFixed" name="points"/>
+    <field type="CARD8" name="op" />
+    <pad bytes="3" />
+    <field type="Picture" name="src" />
+    <field type="Picture" name="dst" />
+    <field type="PictFormat" name="mask-format" />
+    <field type="INT16" name="src-x" />
+    <field type="INT16" name="src-y" />
+    <list type="PointFixed" name="points" />
   </request>
   <request name="TriFan" number="13">
-    <field type="CARD8" name="op"/>
-    <pad bytes="3"/>
-    <field type="Picture" name="src"/>
-    <field type="Picture" name="dst"/>
-    <field type="PictFormat" name="mask-format"/>
-    <field type="INT16" name="src-x"/>
-    <field type="INT16" name="src-y"/>
-    <list type="PointFixed" name="points"/>
-  </request>
-<!-- TODO: opcode 14 reserved for ColorTrapezoids -->
-<!-- TODO: opcode 15 reserved for ColorTriangles -->
-<!-- opcode 16 reserved for Transform -->
+    <field type="CARD8" name="op" />
+    <pad bytes="3" />
+    <field type="Picture" name="src" />
+    <field type="Picture" name="dst" />
+    <field type="PictFormat" name="mask-format" />
+    <field type="INT16" name="src-x" />
+    <field type="INT16" name="src-y" />
+    <list type="PointFixed" name="points" />
+  </request>
+  <!-- TODO: opcode 14 reserved for ColorTrapezoids -->
+  <!-- TODO: opcode 15 reserved for ColorTriangles -->
+  <!-- opcode 16 reserved for Transform -->
   <request name="CreateGlyphSet" number="17">
-    <field type="GlyphSet" name="gsid"/>
-    <field type="PictFormat" name="format"/>
+    <field type="GlyphSet" name="gsid" />
+    <field type="PictFormat" name="format" />
   </request>
   <request name="ReferenceGlyphSet" number="18">
-    <field type="GlyphSet" name="gsid"/>
-    <field type="GlyphSet" name="existing"/>
+    <field type="GlyphSet" name="gsid" />
+    <field type="GlyphSet" name="existing" />
   </request>
   <request name="FreeGlyphSet" number="19">
-    <field type="GlyphSet" name="glyphset"/>
+    <field type="GlyphSet" name="glyphset" />
   </request>
   <request name="AddGlyphs" number="20">
-    <field type="GlyphSet" name="glyphset"/>
-    <field type="CARD32" name="glyphs-len"/>
+    <field type="GlyphSet" name="glyphset" />
+    <field type="CARD32" name="glyphs-len" />
     <list type="CARD32" name="glyphids">
       <fieldref>glyphs-len</fieldref>
     </list>
     <list type="GlyphInfo" name="glyphs">
       <fieldref>glyphs-len</fieldref>
     </list>
-    <list type="byte" name="data"/>
+    <list type="byte" name="data" />
   </request>
-<!-- TODO: opcode 21 reserved for AddGlyphsFromPicture -->
+  <!-- TODO: opcode 21 reserved for AddGlyphsFromPicture -->
   <request name="FreeGlyphs" number="22">
-    <field type="GlyphSet" name="glyphset"/>
-    <list type="Glyph" name="glyphs"/>
+    <field type="GlyphSet" name="glyphset" />
+    <list type="Glyph" name="glyphs" />
   </request>
   <struct name="GlyphSetElt">
-    <field type="CARD8" name="len"/>
-    <pad bytes="3"/>
-    <field type="Point" name="delta"/>
-    <field type="GlyphSet" name="glyphset"/>
+    <field type="CARD8" name="len" />
+    <pad bytes="3" />
+    <field type="Point" name="delta" />
+    <field type="GlyphSet" name="glyphset" />
   </struct>
-<!-- CompositeGlyphs8 -->
+  <!-- CompositeGlyphs8 -->
   <struct name="GLYPHELT8">
-    <field type="CARD8" name="len"/>
-    <pad bytes="3"/>
-    <field type="Point" name="delta"/>
+    <field type="CARD8" name="len" />
+    <pad bytes="3" />
+    <field type="Point" name="delta" />
     <list type="CARD8" name="glyphs">
       <fieldref>len</fieldref>
     </list>
   </struct>
   <union name="GLYPHITEM8">
-    <field type="GLYPHELT8" name="glyphelt"/>
-    <field type="GlyphSetElt" name="glyphset"/>
+    <field type="GLYPHELT8" name="glyphelt" />
+    <field type="GlyphSetElt" name="glyphset" />
   </union>
   <request name="CompositeGlyphs8" number="23">
-    <field type="CARD8" name="op"/>
-    <pad bytes="3"/>
-    <field type="Picture" name="src"/>
-    <field type="Picture" name="dst"/>
-    <field type="PictFormat" name="mask-format"/>
-    <field type="GlyphSet" name="glyphset"/>
-    <field type="INT16" name="src-x"/>
-    <field type="INT16" name="src-y"/>
-    <list type="GLYPHITEM8" name="glyphcmds"/>
+    <field type="CARD8" name="op" />
+    <pad bytes="3" />
+    <field type="Picture" name="src" />
+    <field type="Picture" name="dst" />
+    <field type="PictFormat" name="mask-format" />
+    <field type="GlyphSet" name="glyphset" />
+    <field type="INT16" name="src-x" />
+    <field type="INT16" name="src-y" />
+    <list type="GLYPHITEM8" name="glyphcmds" />
   </request>
-<!-- CompositeGlyphs16 -->
+  <!-- CompositeGlyphs16 -->
   <struct name="GLYPHELT16">
-    <field type="CARD8" name="len"/>
-    <pad bytes="3"/>
-    <field type="Point" name="delta"/>
+    <field type="CARD8" name="len" />
+    <pad bytes="3" />
+    <field type="Point" name="delta" />
     <list type="CARD16" name="glyphs">
       <fieldref>len</fieldref>
     </list>
   </struct>
   <union name="GLYPHITEM16">
-    <field type="GLYPHELT16" name="glyphelt"/>
-    <field type="GlyphSetElt" name="glyphset"/>
+    <field type="GLYPHELT16" name="glyphelt" />
+    <field type="GlyphSetElt" name="glyphset" />
   </union>
   <request name="CompositeGlyphs16" number="24">
-    <field type="CARD8" name="op"/>
-    <pad bytes="3"/>
-    <field type="Picture" name="src"/>
-    <field type="Picture" name="dst"/>
-    <field type="PictFormat" name="mask-format"/>
-    <field type="GlyphSet" name="glyphset"/>
-    <field type="Point" name="src-point"/>
-    <list type="GLYPHITEM16" name="glyphcmds"/>
+    <field type="CARD8" name="op" />
+    <pad bytes="3" />
+    <field type="Picture" name="src" />
+    <field type="Picture" name="dst" />
+    <field type="PictFormat" name="mask-format" />
+    <field type="GlyphSet" name="glyphset" />
+    <field type="Point" name="src-point" />
+    <list type="GLYPHITEM16" name="glyphcmds" />
   </request>
-<!-- CompositeGlyphs32 -->
+  <!-- CompositeGlyphs32 -->
   <struct name="GLYPHELT32">
-    <field type="CARD8" name="len"/>
-    <pad bytes="3"/>
-    <field type="Point" name="delta"/>
+    <field type="CARD8" name="len" />
+    <pad bytes="3" />
+    <field type="Point" name="delta" />
     <list type="CARD32" name="glyphs">
       <fieldref>len</fieldref>
     </list>
   </struct>
   <union name="GLYPHITEM32">
-    <field type="GLYPHELT32" name="glyphelt"/>
-    <field type="GlyphSetElt" name="glyphset"/>
+    <field type="GLYPHELT32" name="glyphelt" />
+    <field type="GlyphSetElt" name="glyphset" />
   </union>
   <request name="CompositeGlyphs32" number="25">
-    <field type="CARD8" name="op"/>
-    <pad bytes="3"/>
-    <field type="Picture" name="src"/>
-    <field type="Picture" name="dst"/>
-    <field type="PictFormat" name="mask-format"/>
-    <field type="GlyphSet" name="glyphset"/>
-    <field type="Point" name="src-point"/>
-    <list type="GLYPHITEM32" name="glyphcmds"/>
+    <field type="CARD8" name="op" />
+    <pad bytes="3" />
+    <field type="Picture" name="src" />
+    <field type="Picture" name="dst" />
+    <field type="PictFormat" name="mask-format" />
+    <field type="GlyphSet" name="glyphset" />
+    <field type="Point" name="src-point" />
+    <list type="GLYPHITEM32" name="glyphcmds" />
   </request>
-<!-- new in version 0.1 -->
+  <!-- new in version 0.1 -->
   <request name="FillRectangles" number="26">
-    <field type="CARD8" name="op"/>
-    <pad bytes="3"/>
-    <field type="Picture" name="dst"/>
-    <field type="Color" name="color"/>
-    <list type="Rectangle" name="rects"/>
+    <field type="CARD8" name="op" />
+    <pad bytes="3" />
+    <field type="Picture" name="dst" />
+    <field type="Color" name="color" />
+    <list type="Rectangle" name="rects" />
   </request>
-<!-- new in version 0.5 -->
+  <!-- new in version 0.5 -->
   <request name="CreateCursor" number="27">
-    <field type="Cursor" name="cid"/>
-    <field type="Picture" name="source"/>
-    <field type="Point"/>
+    <field type="Cursor" name="cid" />
+    <field type="Picture" name="source" />
+    <field type="Point" />
   </request>
-<!-- new in version 0.6 -->
+  <!-- new in version 0.6 -->
   <struct name="Transform">
-    <field type="Fixed" name="matrix11"/>
-    <field type="Fixed" name="matrix12"/>
-    <field type="Fixed" name="matrix13"/>
-    <field type="Fixed" name="matrix21"/>
-    <field type="Fixed" name="matrix22"/>
-    <field type="Fixed" name="matrix23"/>
-    <field type="Fixed" name="matrix31"/>
-    <field type="Fixed" name="matrix32"/>
-    <field type="Fixed" name="matrix33"/>
+    <field type="Fixed" name="matrix11" />
+    <field type="Fixed" name="matrix12" />
+    <field type="Fixed" name="matrix13" />
+    <field type="Fixed" name="matrix21" />
+    <field type="Fixed" name="matrix22" />
+    <field type="Fixed" name="matrix23" />
+    <field type="Fixed" name="matrix31" />
+    <field type="Fixed" name="matrix32" />
+    <field type="Fixed" name="matrix33" />
   </struct>
   <request name="SetPictureTransform" number="28">
-    <field type="Picture" name="picture"/>
-    <field type="Transform" name="transform"/>
+    <field type="Picture" name="picture" />
+    <field type="Transform" name="transform" />
   </request>
   <request name="QueryFilters" number="29">
-    <field type="Drawable" name="drawable"/>
+    <field type="Drawable" name="drawable" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="num-aliases"/>
-      <field type="CARD32" name="num-filters"/>
-      <pad bytes="16"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="num-aliases" />
+      <field type="CARD32" name="num-filters" />
+      <pad bytes="16" />
       <list type="CARD16" name="aliases">
         <fieldref>num-aliases</fieldref>
       </list>
@@ -445,69 +445,69 @@ for licensing information.
     </reply>
   </request>
   <request name="SetPictureFilter" number="30">
-    <field type="Picture" name="picture"/>
-    <field type="CARD16" name="filter-len"/>
+    <field type="Picture" name="picture" />
+    <field type="CARD16" name="filter-len" />
     <list type="char" name="filter">
       <fieldref>filter-len</fieldref>
     </list>
-    <list type="Fixed" name="values"/>
+    <list type="Fixed" name="values" />
   </request>
-<!-- new in version 0.8 -->
+  <!-- new in version 0.8 -->
   <struct name="AnimCursorElt">
-    <field type="Cursor" name="cursor"/>
-    <field type="CARD32" name="delay"/>
+    <field type="Cursor" name="cursor" />
+    <field type="CARD32" name="delay" />
   </struct>
   <request name="CreateAnimCursor" number="31">
-    <field type="Cursor" name="cid"/>
-    <list type="AnimCursorElt" name="cursors"/>
+    <field type="Cursor" name="cid" />
+    <list type="AnimCursorElt" name="cursors" />
   </request>
   <!-- new in version 0.9 -->
   <!-- FIXME: validate from 0.9 onwards, esp. field order and padding -->
   <request name="AddTraps" number="32">
-    <field type="Picture" name="picture"/>
-    <field type="Point" name="offset"/>
-    <list type="Trap" name="trapezoids"/>
+    <field type="Picture" name="picture" />
+    <field type="Point" name="offset" />
+    <list type="Trap" name="trapezoids" />
   </request>
   <enum type="CARD16" name="Repeat">
-    <item name="none"/>
-    <item name="normal"/>
+    <item name="none" />
+    <item name="normal" />
     <!-- new in version 0.10 -->
-    <item name="pad"/>
-    <item name="reflect"/>
+    <item name="pad" />
+    <item name="reflect" />
   </enum>
   <!-- new in version 0.10 -->
   <request name="CreateSolidFill" number="33">
-    <field type="Picture" name="pid"/>
-    <field type="Color" name="color"/>
+    <field type="Picture" name="pid" />
+    <field type="Color" name="color" />
   </request>
   <request name="CreateLinearGradient" number="34">
-    <field type="Picture" name="pid"/>
-    <field type="LineFixed"/>
-    <field type="CARD16" name="spread"/>
-  <!-- FIXME: spec says: -->
-    <field type="CARD16" name="n-stops"/>
-  <!-- ..but renderproto.h says CARD32 n-stops for all these -->
-    <list type="Fixed" name="stops"/>
-    <list type="Color" name="stop-colors"/>
+    <field type="Picture" name="pid" />
+    <field type="LineFixed" />
+    <field type="CARD16" name="spread" />
+    <!-- FIXME: spec says: -->
+    <field type="CARD16" name="n-stops" />
+    <!-- ..but renderproto.h says CARD32 n-stops for all these -->
+    <list type="Fixed" name="stops" />
+    <list type="Color" name="stop-colors" />
   </request>
   <request name="CreateRadialGradient" number="35">
-    <field type="Picture" name="pid"/>
-    <field type="PointFixed" name="inner-center"/>
-    <field type="PointFixed" name="outer-center"/>
-    <field type="Fixed" name="inner-radius"/>
-    <field type="Fixed" name="outer-radius"/>
-    <field type="CARD16" name="spread"/>
-    <field type="CARD16" name="n-stops"/>
-    <list type="Fixed" name="stops"/>
-    <list type="Color" name="stop-colors"/>
+    <field type="Picture" name="pid" />
+    <field type="PointFixed" name="inner-center" />
+    <field type="PointFixed" name="outer-center" />
+    <field type="Fixed" name="inner-radius" />
+    <field type="Fixed" name="outer-radius" />
+    <field type="CARD16" name="spread" />
+    <field type="CARD16" name="n-stops" />
+    <list type="Fixed" name="stops" />
+    <list type="Color" name="stop-colors" />
   </request>
   <request name="CreateConicalGradient" number="36">
-    <field type="Picture" name="pid"/>
-    <field type="PointFixed" name="center"/>
-    <field type="Fixed" name="angle"/>
-    <field type="CARD16" name="spread"/>
-    <field type="CARD16" name="n-stops"/>
-    <list type="Fixed" name="stops"/>
-    <list type="Color" name="stop-colors"/>
+    <field type="Picture" name="pid" />
+    <field type="PointFixed" name="center" />
+    <field type="Fixed" name="angle" />
+    <field type="CARD16" name="spread" />
+    <field type="CARD16" name="n-stops" />
+    <list type="Fixed" name="stops" />
+    <list type="Color" name="stop-colors" />
   </request>
 </extension>
diff --git a/xcb-proto/src/extensions/res.xml b/xcb-proto/src/extensions/res.xml
index b251ba1..6d75a0c 100644
--- a/xcb-proto/src/extensions/res.xml
+++ b/xcb-proto/src/extensions/res.xml
@@ -28,49 +28,49 @@ authorization from the authors.
 -->
 <extension header="res" xname="X-Resource" name="Res">
   <struct name="Client">
-    <field type="CARD32" name="resource-base"/>
-    <field type="CARD32" name="resource-mask"/>
+    <field type="CARD32" name="resource-base" />
+    <field type="CARD32" name="resource-mask" />
   </struct>
   <struct name="Type">
-    <field type="CARD32" name="resource-type"/>
-    <field type="CARD32" name="count"/>
+    <field type="CARD32" name="resource-type" />
+    <field type="CARD32" name="count" />
   </struct>
   <request name="QueryVersion" number="0">
-    <field type="CARD8" name="client-major"/>
-    <field type="CARD8" name="client-minor"/>
+    <field type="CARD8" name="client-major" />
+    <field type="CARD8" name="client-minor" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="server-major"/>
-      <field type="CARD16" name="server-minor"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="server-major" />
+      <field type="CARD16" name="server-minor" />
     </reply>
   </request>
   <request name="QueryClients" number="1">
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="num-clients"/>
-      <pad bytes="20"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="num-clients" />
+      <pad bytes="20" />
       <list type="Client" name="clients">
         <fieldref>num-clients</fieldref>
       </list>
     </reply>
   </request>
   <request name="QueryClientResources" number="2">
-    <field type="CARD32" name="xid"/>
+    <field type="CARD32" name="xid" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="num-types"/>
-      <pad bytes="20"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="num-types" />
+      <pad bytes="20" />
       <list type="Type" name="types">
         <fieldref>num-types</fieldref>
       </list>
     </reply>
   </request>
   <request name="QueryClientPixmapBytes" number="3">
-    <field type="CARD32" name="xid"/>
+    <field type="CARD32" name="xid" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="bytes"/>
-      <field type="CARD32" name="bytes-overflow"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="bytes" />
+      <field type="CARD32" name="bytes-overflow" />
     </reply>
   </request>
 </extension>
diff --git a/xcb-proto/src/extensions/screensaver.xml b/xcb-proto/src/extensions/screensaver.xml
index 8e1f052..f361600 100644
--- a/xcb-proto/src/extensions/screensaver.xml
+++ b/xcb-proto/src/extensions/screensaver.xml
@@ -32,79 +32,79 @@ Screen Saver Extension to the X Protocol
 Draft Standard Version 1.0
 -->
 <extension header="screensaver" xname="MIT-SCREEN-SAVER" name="ScreenSaver" version="1.0">
-<!-- Types -->
+  <!-- Types -->
   <enum type="byte" name="ScreenSaverKind">
-    <item name="blanked"/>
-    <item name="internal"/>
-    <item name="external"/>
+    <item name="blanked" />
+    <item name="internal" />
+    <item name="external" />
   </enum>
   <mask name="Event">
-    <item name="notify-mask"/>
-    <item name="cycle-mask"/>
+    <item name="notify-mask" />
+    <item name="cycle-mask" />
   </mask>
   <enum type="byte" name="ScreenSaverState">
-    <item name="off"/>
-    <item name="on"/>
-    <item name="cycle"/>
-    <item name="disabled"/>
+    <item name="off" />
+    <item name="on" />
+    <item name="cycle" />
+    <item name="disabled" />
   </enum>
-<!-- TODO: merge with "WindowClass" -->
+  <!-- TODO: merge with "WindowClass" -->
   <enum name="CLASS">
-    <item name="copy-from-parent"/>
-    <item name="input-output"/>
-    <item name="input-only"/>
+    <item name="copy-from-parent" />
+    <item name="input-output" />
+    <item name="input-only" />
   </enum>
-<!-- Errors -->
-<!-- Requests -->
+  <!-- Errors -->
+  <!-- Requests -->
   <request name="QueryVersion" number="0">
-    <field type="CARD8" name="client-major-version"/>
-    <field type="CARD8" name="client-minor-version"/>
-    <pad bytes="2"/>
+    <field type="CARD8" name="client-major-version" />
+    <field type="CARD8" name="client-minor-version" />
+    <pad bytes="2" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD8" name="server-major-version"/>
-      <field type="CARD8" name="server-minor-version"/>
-      <pad bytes="22"/>
+      <pad bytes="1" />
+      <field type="CARD8" name="server-major-version" />
+      <field type="CARD8" name="server-minor-version" />
+      <pad bytes="22" />
     </reply>
   </request>
   <request name="QueryInfo" number="1">
-    <field type="Drawable" name="drawable"/>
+    <field type="Drawable" name="drawable" />
     <reply>
-      <field type="ScreenSaverState" name="state"/>
-      <field type="Window" name="saver-window"/>
-      <field type="CARD32" name="ms-until-server"/>
-      <field type="CARD32" name="ms-since-user-input"/>
-      <field type="CARD16" name="event-mask"/>
-      <field type="ScreenSaverKind" name="kind"/>
-      <pad bytes="10"/>
+      <field type="ScreenSaverState" name="state" />
+      <field type="Window" name="saver-window" />
+      <field type="CARD32" name="ms-until-server" />
+      <field type="CARD32" name="ms-since-user-input" />
+      <field type="CARD16" name="event-mask" />
+      <field type="ScreenSaverKind" name="kind" />
+      <pad bytes="10" />
     </reply>
   </request>
   <request name="SelectInput" number="2">
-    <field type="Drawable" name="drawable"/>
-    <field type="Event" name="event-mask"/>
+    <field type="Drawable" name="drawable" />
+    <field type="Event" name="event-mask" />
   </request>
   <request name="SetAttributes" number="3">
-    <field type="Drawable" name="drawable"/>
-    <field type="Rectangle"/>
-    <field type="CARD16" name="border-width"/>
-    <field type="CLASS" name="class"/>
-    <field type="CARD8" name="depth"/>
-    <field type="VisualID" name="visual"/>
-    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
+    <field type="Drawable" name="drawable" />
+    <field type="Rectangle" />
+    <field type="CARD16" name="border-width" />
+    <field type="CLASS" name="class" />
+    <field type="CARD8" name="depth" />
+    <field type="VisualID" name="visual" />
+    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list" />
   </request>
   <request name="UnsetAttributes" number="4">
-    <field type="Drawable" name="drawable"/>
+    <field type="Drawable" name="drawable" />
   </request>
-<!-- Events -->
+  <!-- Events -->
   <event name="Notify" number="0">
-    <field type="CARD8" name="code"/>
-    <field type="ScreenSaverState" name="state"/>
-    <field type="CARD16" name="sequence-number"/>
-    <field type="Time" name="time"/>
-    <field type="Window" name="root"/>
-    <field type="Window" name="window"/>
-    <field type="ScreenSaverKind" name="kind"/>
-    <field type="bool" name="forced"/>
-    <pad bytes="14"/>
+    <field type="CARD8" name="code" />
+    <field type="ScreenSaverState" name="state" />
+    <field type="CARD16" name="sequence-number" />
+    <field type="Time" name="time" />
+    <field type="Window" name="root" />
+    <field type="Window" name="window" />
+    <field type="ScreenSaverKind" name="kind" />
+    <field type="bool" name="forced" />
+    <pad bytes="14" />
   </event>
 </extension>
diff --git a/xcb-proto/src/extensions/shape.xml b/xcb-proto/src/extensions/shape.xml
index f0fb19a..f1aef61 100644
--- a/xcb-proto/src/extensions/shape.xml
+++ b/xcb-proto/src/extensions/shape.xml
@@ -28,92 +28,92 @@ authorization from the authors.
 -->
 <extension header="shape" xname="SHAPE" name="Shape">
   <enum type="CARD8" name="ShapeOp">
-    <item name="set"/>
-    <item name="union"/>
-    <item name="intersect"/>
-    <item name="subtract"/>
-    <item name="invert"/>
+    <item name="set" />
+    <item name="union" />
+    <item name="intersect" />
+    <item name="subtract" />
+    <item name="invert" />
   </enum>
   <enum type="CARD8" name="ShapeKind">
-    <item name="bounding"/>
-    <item name="clip"/>
-<!-- TODO: xspec: 'input' borrowed from xlib headers, validate -->
-    <item name="input"/>
+    <item name="bounding" />
+    <item name="clip" />
+    <!-- TODO: xspec: 'input' borrowed from xlib headers, validate -->
+    <item name="input" />
   </enum>
   <event name="Notify" number="0">
-    <field type="ShapeKind" name="shape-kind"/>
-    <field type="Window" name="affected-window"/>
-    <field type="Rectangle" name="extents"/>
-    <field type="Time" name="server-time"/>
-    <field type="bool" name="shaped"/>
+    <field type="ShapeKind" name="shape-kind" />
+    <field type="Window" name="affected-window" />
+    <field type="Rectangle" name="extents" />
+    <field type="Time" name="server-time" />
+    <field type="bool" name="shaped" />
   </event>
   <request name="QueryVersion" number="0">
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="major-version"/>
-      <field type="CARD16" name="minor-version"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="major-version" />
+      <field type="CARD16" name="minor-version" />
     </reply>
   </request>
   <request name="Rectangles" number="1">
-    <field type="ShapeOp" name="operation"/>
-    <field type="ShapeKind" name="destination-kind"/>
-    <field type="byte" name="ordering"/>
-    <pad bytes="1"/>
-    <field type="Window" name="destination-window"/>
-    <field type="Point" name="offset"/>
-    <list type="Rectangle" name="rectangles"/>
+    <field type="ShapeOp" name="operation" />
+    <field type="ShapeKind" name="destination-kind" />
+    <field type="byte" name="ordering" />
+    <pad bytes="1" />
+    <field type="Window" name="destination-window" />
+    <field type="Point" name="offset" />
+    <list type="Rectangle" name="rectangles" />
   </request>
   <request name="Mask" number="2">
-    <field type="ShapeOp" name="operation"/>
-    <field type="ShapeKind" name="destination-kind"/>
-    <pad bytes="2"/>
-    <field type="Window" name="destination-window"/>
-    <field type="Point" name="offset"/>
-    <field type="Pixmap" name="source-bitmap"/>
+    <field type="ShapeOp" name="operation" />
+    <field type="ShapeKind" name="destination-kind" />
+    <pad bytes="2" />
+    <field type="Window" name="destination-window" />
+    <field type="Point" name="offset" />
+    <field type="Pixmap" name="source-bitmap" />
   </request>
   <request name="Combine" number="3">
-    <field type="ShapeOp" name="operation"/>
-    <field type="ShapeKind" name="destination-kind"/>
-    <field type="ShapeKind" name="source-kind"/>
-    <pad bytes="1"/>
-    <field type="Window" name="destination-window"/>
-    <field type="Point" name="offset"/>
-    <field type="Window" name="source-window"/>
+    <field type="ShapeOp" name="operation" />
+    <field type="ShapeKind" name="destination-kind" />
+    <field type="ShapeKind" name="source-kind" />
+    <pad bytes="1" />
+    <field type="Window" name="destination-window" />
+    <field type="Point" name="offset" />
+    <field type="Window" name="source-window" />
   </request>
   <request name="Offset" number="4">
-    <field type="ShapeKind" name="destination-kind"/>
-    <pad bytes="3"/>
-    <field type="Window" name="destination-window"/>
-    <field type="Point" name="offset"/>
+    <field type="ShapeKind" name="destination-kind" />
+    <pad bytes="3" />
+    <field type="Window" name="destination-window" />
+    <field type="Point" name="offset" />
   </request>
   <request name="QueryExtents" number="5">
-    <field type="Window" name="destination-window"/>
+    <field type="Window" name="destination-window" />
     <reply>
-      <pad bytes="1"/>
-      <field type="bool" name="bounding-shaped"/>
-      <field type="bool" name="clip-shaped"/>
-      <pad bytes="2"/>
-<!-- FIXME: xspec: validate unrolling -->
-      <field type="Rectangle" name="bounding-shape-extents"/>
-      <field type="Rectangle" name="clip-shape-extents"/>
+      <pad bytes="1" />
+      <field type="bool" name="bounding-shaped" />
+      <field type="bool" name="clip-shaped" />
+      <pad bytes="2" />
+      <!-- FIXME: xspec: validate unrolling -->
+      <field type="Rectangle" name="bounding-shape-extents" />
+      <field type="Rectangle" name="clip-shape-extents" />
     </reply>
   </request>
   <request name="SelectInput" number="6">
-    <field type="Window" name="destination-window"/>
-    <field type="bool" name="enable"/>
+    <field type="Window" name="destination-window" />
+    <field type="bool" name="enable" />
   </request>
   <request name="InputSelected" number="7">
-    <field type="Window" name="destination-window"/>
+    <field type="Window" name="destination-window" />
     <reply>
-      <field type="bool" name="enabled"/>
+      <field type="bool" name="enabled" />
     </reply>
   </request>
   <request name="GetRectangles" number="8">
-    <field type="Window" name="window"/>
-    <field type="ShapeKind" name="source-kind"/>
+    <field type="Window" name="window" />
+    <field type="ShapeKind" name="source-kind" />
     <reply>
-      <field type="byte" name="ordering"/>
-      <field type="CARD32" name="rectangles-len"/>
+      <field type="byte" name="ordering" />
+      <field type="CARD32" name="rectangles-len" />
       <list type="Rectangle" name="rectangles">
         <fieldref>rectangles-len</fieldref>
       </list>
diff --git a/xcb-proto/src/extensions/shm.xml b/xcb-proto/src/extensions/shm.xml
index 2854b8f..a480f56 100644
--- a/xcb-proto/src/extensions/shm.xml
+++ b/xcb-proto/src/extensions/shm.xml
@@ -27,72 +27,72 @@ sale, use or other dealings in this Soft
 authorization from the authors.
 -->
 <extension header="shm" xname="MIT-SHM" name="Shm">
-  <resource name="SEG"/>
+  <resource name="SEG" />
   <event name="Completion" number="0">
-    <pad bytes="1"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="SEG" name="shmseg"/>
-    <field type="CARD16" name="minor-event"/>
-    <field type="byte" name="major-event"/>
-    <pad bytes="1"/>
-    <field type="CARD32" name="offset"/>
+    <pad bytes="1" />
+    <field type="Drawable" name="drawable" />
+    <field type="SEG" name="shmseg" />
+    <field type="CARD16" name="minor-event" />
+    <field type="byte" name="major-event" />
+    <pad bytes="1" />
+    <field type="CARD32" name="offset" />
   </event>
-  <errorcopy name="BadSeg" number="0" ref="Value"/>
+  <errorcopy name="BadSeg" number="0" ref="Value" />
   <request name="QueryVersion" number="0">
     <reply>
-      <field type="bool" name="shared-pixmaps"/>
-      <field type="Version32"/>
-      <field type="CARD16" name="uid"/>
-      <field type="CARD16" name="gid"/>
-      <field type="CARD8" name="pixmap-format"/>
+      <field type="bool" name="shared-pixmaps" />
+      <field type="Version32" />
+      <field type="CARD16" name="uid" />
+      <field type="CARD16" name="gid" />
+      <field type="CARD8" name="pixmap-format" />
     </reply>
   </request>
   <request name="Attach" number="1">
-    <field type="SEG" name="shmseg"/>
-    <field type="CARD32" name="shmid"/>
-    <field type="bool" name="read-only"/>
+    <field type="SEG" name="shmseg" />
+    <field type="CARD32" name="shmid" />
+    <field type="bool" name="read-only" />
   </request>
   <request name="Detach" number="2">
-    <field type="SEG" name="shmseg"/>
+    <field type="SEG" name="shmseg" />
   </request>
   <request name="PutImage" number="3">
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="Size" name="total-size"/>
-    <field type="CARD16" name="src-x"/>
-    <field type="CARD16" name="src-y"/>
-    <field type="CARD16" name="src-width"/>
-    <field type="CARD16" name="src-height"/>
-    <field type="INT16" name="dst-x"/>
-    <field type="INT16" name="dst-y"/>
-    <field type="CARD8" name="depth"/>
-    <field type="CARD8" name="format"/>
-    <field type="CARD8" name="send-event"/>
-    <pad bytes="1"/>
-    <field type="SEG" name="shmseg"/>
-    <field type="CARD32" name="offset"/>
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <field type="Size" name="total-size" />
+    <field type="CARD16" name="src-x" />
+    <field type="CARD16" name="src-y" />
+    <field type="CARD16" name="src-width" />
+    <field type="CARD16" name="src-height" />
+    <field type="INT16" name="dst-x" />
+    <field type="INT16" name="dst-y" />
+    <field type="CARD8" name="depth" />
+    <field type="CARD8" name="format" />
+    <field type="CARD8" name="send-event" />
+    <pad bytes="1" />
+    <field type="SEG" name="shmseg" />
+    <field type="CARD32" name="offset" />
   </request>
   <request name="GetImage" number="4">
-    <field type="Drawable" name="drawable"/>
-    <field type="Rectangle"/>
-    <field type="CARD32" name="plane-mask"/>
-    <field type="CARD8" name="format"/>
-    <pad bytes="3"/>
-    <field type="SEG" name="shmseg"/>
-    <field type="CARD32" name="offset"/>
+    <field type="Drawable" name="drawable" />
+    <field type="Rectangle" />
+    <field type="CARD32" name="plane-mask" />
+    <field type="CARD8" name="format" />
+    <pad bytes="3" />
+    <field type="SEG" name="shmseg" />
+    <field type="CARD32" name="offset" />
     <reply>
-      <field type="CARD8" name="depth"/>
-      <field type="VisualID" name="visual"/>
-      <field type="CARD32" name="size"/>
+      <field type="CARD8" name="depth" />
+      <field type="VisualID" name="visual" />
+      <field type="CARD32" name="size" />
     </reply>
   </request>
   <request name="CreatePixmap" number="5">
-    <field type="Pixmap" name="pid"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="Size"/>
-    <field type="CARD8" name="depth"/>
-    <pad bytes="3"/>
-    <field type="SEG" name="shmseg"/>
-    <field type="CARD32" name="offset"/>
+    <field type="Pixmap" name="pid" />
+    <field type="Drawable" name="drawable" />
+    <field type="Size" />
+    <field type="CARD8" name="depth" />
+    <pad bytes="3" />
+    <field type="SEG" name="shmseg" />
+    <field type="CARD32" name="offset" />
   </request>
 </extension>
diff --git a/xcb-proto/src/extensions/sync.xml b/xcb-proto/src/extensions/sync.xml
index 58dc5bd..19548d2 100644
--- a/xcb-proto/src/extensions/sync.xml
+++ b/xcb-proto/src/extensions/sync.xml
@@ -6,143 +6,143 @@ All Rights Reserved.  See the file COPYI
 for licensing information.
 -->
 <extension header="sync" xname="SYNC" name="Sync">
-  <resource name="Counter"/>
+  <resource name="Counter" />
   <error name="Counter" number="0">
-    <field type="CARD32" name="bad-counter"/>
-    <field type="CARD16" name="minor-opcode"/>
-    <field type="CARD8" name="major-opcode"/>
+    <field type="CARD32" name="bad-counter" />
+    <field type="CARD16" name="minor-opcode" />
+    <field type="CARD8" name="major-opcode" />
   </error>
-  <resource name="Alarm"/>
+  <resource name="Alarm" />
   <error name="Alarm" number="1">
-    <field type="CARD32" name="bad-alarm"/>
-    <field type="CARD16" name="minor-opcode"/>
-    <field type="CARD8" name="major-opcode"/>
+    <field type="CARD32" name="bad-alarm" />
+    <field type="CARD16" name="minor-opcode" />
+    <field type="CARD8" name="major-opcode" />
   </error>
   <enum name="AlarmState">
-    <item name="active"/>
-    <item name="inactive"/>
-    <item name="destroyed"/>
+    <item name="active" />
+    <item name="inactive" />
+    <item name="destroyed" />
   </enum>
   <enum name="TestType">
-    <item name="positive-transition"/>
-    <item name="negative-transition"/>
-    <item name="positive-comparison"/>
-    <item name="negative-comparison"/>
+    <item name="positive-transition" />
+    <item name="negative-transition" />
+    <item name="positive-comparison" />
+    <item name="negative-comparison" />
   </enum>
   <enum name="ValueType">
-    <item name="absolute"/>
-    <item name="relative"/>
+    <item name="absolute" />
+    <item name="relative" />
   </enum>
   <struct name="INT64">
-    <field type="INT32" name="hi"/>
-    <field type="CARD32" name="lo"/>
+    <field type="INT32" name="hi" />
+    <field type="CARD32" name="lo" />
   </struct>
   <struct name="SystemCounter">
-    <field type="Counter" name="counter"/>
-    <field type="INT64" name="resolution"/>
-    <field type="CARD16" name="name-len"/>
+    <field type="Counter" name="counter" />
+    <field type="INT64" name="resolution" />
+    <field type="CARD16" name="name-len" />
     <list type="CARD8" name="name">
       <fieldref>name-len</fieldref>
     </list>
   </struct>
   <struct name="Trigger">
-    <field type="Counter" name="counter"/>
-    <field type="ValueType" name="wait-type"/>
-    <field type="INT64" name="wait-value"/>
-    <field type="TestType" name="test-type"/>
+    <field type="Counter" name="counter" />
+    <field type="ValueType" name="wait-type" />
+    <field type="INT64" name="wait-value" />
+    <field type="TestType" name="test-type" />
   </struct>
   <struct name="WaitCondition">
-    <field type="Trigger" name="trigger"/>
-    <field type="INT64" name="event-threshold"/>
+    <field type="Trigger" name="trigger" />
+    <field type="INT64" name="event-threshold" />
   </struct>
   <request name="Initialize" number="0">
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD8" name="major-version"/>
-      <field type="CARD8" name="minor-version"/>
+      <pad bytes="1" />
+      <field type="CARD8" name="major-version" />
+      <field type="CARD8" name="minor-version" />
     </reply>
   </request>
   <request name="ListSystemCounters" number="1">
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="counters-len"/>
-      <pad bytes="20"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="counters-len" />
+      <pad bytes="20" />
       <list type="SystemCounter" name="counters">
         <fieldref>counters-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="CreateCounter" number="2">
-    <field type="Counter" name="id"/>
-    <field type="INT64" name="initial-value"/>
+    <field type="Counter" name="id" />
+    <field type="INT64" name="initial-value" />
   </request>
   <request name="DestroyCounter" number="6">
-    <field type="Counter" name="counter"/>
+    <field type="Counter" name="counter" />
   </request>
   <request name="QueryCounter" number="5">
-    <field type="Counter" name="counter"/>
+    <field type="Counter" name="counter" />
     <reply>
-      <pad bytes="1"/>
-      <field type="INT64" name="counter-value"/>
+      <pad bytes="1" />
+      <field type="INT64" name="counter-value" />
     </reply>
   </request>
   <request name="Await" number="7">
-    <list type="WaitCondition" name="wait-list"/>
+    <list type="WaitCondition" name="wait-list" />
   </request>
   <request name="ChangeCounter" number="4">
-    <field type="Counter" name="counter"/>
-    <field type="INT64" name="amount"/>
+    <field type="Counter" name="counter" />
+    <field type="INT64" name="amount" />
   </request>
   <request name="SetCounter" number="3">
-    <field type="Counter" name="counter"/>
-    <field type="INT64" name="value"/>
+    <field type="Counter" name="counter" />
+    <field type="INT64" name="value" />
   </request>
   <request name="CreateAlarm" number="8">
-    <field type="Alarm" name="id"/>
-    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
+    <field type="Alarm" name="id" />
+    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list" />
   </request>
   <request name="ChangeAlarm" number="9">
-    <field type="Alarm" name="id"/>
-    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
+    <field type="Alarm" name="id" />
+    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list" />
   </request>
   <request name="DestroyAlarm" number="11">
-    <field type="Alarm" name="alarm"/>
+    <field type="Alarm" name="alarm" />
   </request>
   <request name="QueryAlarm" number="10">
-    <field type="Alarm" name="alarm"/>
+    <field type="Alarm" name="alarm" />
     <reply>
-      <pad bytes="1"/>
-      <field type="Trigger" name="trigger"/>
-      <field type="INT64" name="delta"/>
-      <field type="bool" name="events"/>
-      <field type="AlarmState" name="state"/>
+      <pad bytes="1" />
+      <field type="Trigger" name="trigger" />
+      <field type="INT64" name="delta" />
+      <field type="bool" name="events" />
+      <field type="AlarmState" name="state" />
     </reply>
   </request>
   <request name="SetPriority" number="12">
-    <field type="CARD32" name="id"/>
-    <field type="INT32" name="priority"/>
+    <field type="CARD32" name="id" />
+    <field type="INT32" name="priority" />
   </request>
   <request name="GetPriority" number="13">
-    <field type="CARD32" name="id"/>
+    <field type="CARD32" name="id" />
     <reply>
-      <pad bytes="1"/>
-      <field type="INT32" name="priority"/>
+      <pad bytes="1" />
+      <field type="INT32" name="priority" />
     </reply>
   </request>
   <event name="CounterNotify" number="0">
-    <field type="CARD8" name="kind"/>
-    <field type="Counter" name="counter"/>
-    <field type="INT64" name="wait-value"/>
-    <field type="INT64" name="counter-value"/>
-    <field type="Time" name="timestamp"/>
-    <field type="CARD16" name="count"/>
-    <field type="bool" name="destroyed"/>
+    <field type="CARD8" name="kind" />
+    <field type="Counter" name="counter" />
+    <field type="INT64" name="wait-value" />
+    <field type="INT64" name="counter-value" />
+    <field type="Time" name="timestamp" />
+    <field type="CARD16" name="count" />
+    <field type="bool" name="destroyed" />
   </event>
   <event name="AlarmNotify" number="1">
-    <field type="CARD8" name="kind"/>
-    <field type="Alarm" name="alarm"/>
-    <field type="INT64" name="counter-value"/>
-    <field type="INT64" name="alarm-value"/>
-    <field type="Time" name="timestamp"/>
+    <field type="CARD8" name="kind" />
+    <field type="Alarm" name="alarm" />
+    <field type="INT64" name="counter-value" />
+    <field type="INT64" name="alarm-value" />
+    <field type="Time" name="timestamp" />
   </event>
 </extension>
diff --git a/xcb-proto/src/extensions/xc_misc.xml b/xcb-proto/src/extensions/xc_misc.xml
index c02ac12..6b21264 100644
--- a/xcb-proto/src/extensions/xc_misc.xml
+++ b/xcb-proto/src/extensions/xc_misc.xml
@@ -7,27 +7,27 @@ for licensing information.
 -->
 <extension header="xc_misc" xname="XC-MISC" name="XCMisc">
   <request name="GetVersion" number="0">
-    <field type="CARD16" name="client-major-version"/>
-    <field type="CARD16" name="client-minor-version"/>
+    <field type="CARD16" name="client-major-version" />
+    <field type="CARD16" name="client-minor-version" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="server-major-version"/>
-      <field type="CARD16" name="server-minor-version"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="server-major-version" />
+      <field type="CARD16" name="server-minor-version" />
     </reply>
   </request>
   <request name="GetXIDRange" number="1">
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="start-id"/>
-      <field type="CARD32" name="count"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="start-id" />
+      <field type="CARD32" name="count" />
     </reply>
   </request>
   <request name="GetXIDList" number="2">
-    <field type="CARD32" name="count"/>
+    <field type="CARD32" name="count" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="ids-len"/>
-      <pad bytes="20"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="ids-len" />
+      <pad bytes="20" />
       <list type="CARD32" name="ids">
         <fieldref>ids-len</fieldref>
       </list>
diff --git a/xcb-proto/src/extensions/xevie.xml b/xcb-proto/src/extensions/xevie.xml
index 8539606..10d96c1 100644
--- a/xcb-proto/src/extensions/xevie.xml
+++ b/xcb-proto/src/extensions/xevie.xml
@@ -27,53 +27,53 @@ authorization from the authors.
 -->
 <extension header="xevie" xname="XEVIE" name="Xevie" version="1">
   <request name="QueryVersion" number="0">
-    <field type="CARD16" name="client-major-version"/>
-    <field type="CARD16" name="client-minor-version"/>
+    <field type="CARD16" name="client-major-version" />
+    <field type="CARD16" name="client-minor-version" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="server-major-version"/>
-      <field type="CARD16" name="server-minor-version"/>
-      <pad bytes="20"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="server-major-version" />
+      <field type="CARD16" name="server-minor-version" />
+      <pad bytes="20" />
     </reply>
   </request>
   <request name="Start" number="1">
-    <field type="CARD32" name="screen"/>
+    <field type="CARD32" name="screen" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="24"/>
+      <pad bytes="1" />
+      <pad bytes="24" />
     </reply>
   </request>
   <request name="End" number="2">
-    <field type="CARD32" name="cmap"/>
+    <field type="CARD32" name="cmap" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="24"/>
+      <pad bytes="1" />
+      <pad bytes="24" />
     </reply>
   </request>
   <enum name="Datatype">
-    <item name="unmodified"/>
-    <item name="modified"/>
+    <item name="unmodified" />
+    <item name="modified" />
   </enum>
-<!-- The Send request needs to send an arbitrary Event; this type is used
+  <!-- The Send request needs to send an arbitrary Event; this type is used
        to reserve the necessary structure size. -->
   <struct name="Event">
-    <pad bytes="32"/>
+    <pad bytes="32" />
   </struct>
   <request name="Send" number="3">
-    <field type="Event" name="event"/>
-<!-- Datatype -->
-    <field type="CARD32" name="data-type"/>
-    <pad bytes="64"/>
+    <field type="Event" name="event" />
+    <!-- Datatype -->
+    <field type="CARD32" name="data-type" />
+    <pad bytes="64" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="24"/>
+      <pad bytes="1" />
+      <pad bytes="24" />
     </reply>
   </request>
   <request name="SelectInput" number="4">
-    <field type="CARD32" name="event-mask"/>
+    <field type="CARD32" name="event-mask" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="24"/>
+      <pad bytes="1" />
+      <pad bytes="24" />
     </reply>
   </request>
 </extension>
diff --git a/xcb-proto/src/extensions/xf86dri.xml b/xcb-proto/src/extensions/xf86dri.xml
index f583cae..c209b87 100644
--- a/xcb-proto/src/extensions/xf86dri.xml
+++ b/xcb-proto/src/extensions/xf86dri.xml
@@ -27,127 +27,127 @@ sale, use or other dealings in this Soft
 authorization from the authors.
 -->
 <extension header="xf86dri" xname="XFree86-DRI" name="XF86Dri">
-<!-- Using http://dri.sourceforge.net/doc/dri_extensions_low_level.txt -->
-<!-- Types -->
+  <!-- Using http://dri.sourceforge.net/doc/dri_extensions_low_level.txt -->
+  <!-- Types -->
   <struct name="DrmClipRect">
-    <field type="INT16" name="x1"/>
-    <field type="INT16" name="y1"/>
-    <field type="INT16" name="x2"/>
-    <field type="INT16" name="x3"/>
+    <field type="INT16" name="x1" />
+    <field type="INT16" name="y1" />
+    <field type="INT16" name="x2" />
+    <field type="INT16" name="x3" />
   </struct>
-<!-- Requests -->
+  <!-- Requests -->
   <request name="QueryVersion" number="0">
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="dri-major-version"/>
-      <field type="CARD16" name="dri-minor-version"/>
-      <field type="CARD32" name="dri-minor-patch"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="dri-major-version" />
+      <field type="CARD16" name="dri-minor-version" />
+      <field type="CARD32" name="dri-minor-patch" />
     </reply>
   </request>
   <request name="QueryDirectRenderingCapable" number="1">
-    <field type="CARD32" name="screen"/>
+    <field type="CARD32" name="screen" />
     <reply>
-      <pad bytes="1"/>
-      <field type="bool" name="is-capable"/>
+      <pad bytes="1" />
+      <field type="bool" name="is-capable" />
     </reply>
   </request>
   <request name="OpenConnection" number="2">
-    <field type="CARD32" name="screen"/>
+    <field type="CARD32" name="screen" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="drm-client-key-low"/>
-      <field type="CARD32" name="drm-client-key-high"/>
-      <field type="CARD32" name="sarea-handle-low"/>
-      <field type="CARD32" name="sarea-handle-high"/>
-      <field type="CARD32" name="bus-id-len"/>
-      <pad bytes="12"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="drm-client-key-low" />
+      <field type="CARD32" name="drm-client-key-high" />
+      <field type="CARD32" name="sarea-handle-low" />
+      <field type="CARD32" name="sarea-handle-high" />
+      <field type="CARD32" name="bus-id-len" />
+      <pad bytes="12" />
       <list type="CARD8" name="bus-id">
         <fieldref>bus-id-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="CloseConnection" number="3">
-    <field type="CARD32" name="screen"/>
+    <field type="CARD32" name="screen" />
   </request>
   <request name="GetClientDriverName" number="4">
-    <field type="CARD32" name="screen"/>
+    <field type="CARD32" name="screen" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="client-driver-major-version"/>
-      <field type="CARD32" name="client-driver-minor-version"/>
-      <field type="CARD32" name="client-driver-patch-version"/>
-      <field type="CARD32" name="client-driver-name-len"/>
-      <pad bytes="8"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="client-driver-major-version" />
+      <field type="CARD32" name="client-driver-minor-version" />
+      <field type="CARD32" name="client-driver-patch-version" />
+      <field type="CARD32" name="client-driver-name-len" />
+      <pad bytes="8" />
       <list type="CARD8" name="client-driver-name">
         <fieldref>client-driver-name-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="CreateContext" number="5">
-    <field type="CARD32" name="visual"/>
-    <field type="CARD32" name="screen"/>
-    <field type="CARD32" name="context"/>
+    <field type="CARD32" name="visual" />
+    <field type="CARD32" name="screen" />
+    <field type="CARD32" name="context" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="hw-context"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="hw-context" />
     </reply>
   </request>
   <request name="DestroyContext" number="6">
-    <field type="CARD32" name="screen"/>
-    <field type="CARD32" name="context"/>
+    <field type="CARD32" name="screen" />
+    <field type="CARD32" name="context" />
   </request>
   <request name="CreateDrawable" number="7">
-    <field type="CARD32" name="screen"/>
-    <field type="CARD32" name="drawable"/>
+    <field type="CARD32" name="screen" />
+    <field type="CARD32" name="drawable" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="hw-drawable-handle"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="hw-drawable-handle" />
     </reply>
   </request>
   <request name="DestroyDrawable" number="8">
-    <field type="CARD32" name="screen"/>
-    <field type="CARD32" name="drawable"/>
+    <field type="CARD32" name="screen" />
+    <field type="CARD32" name="drawable" />
   </request>
   <request name="GetDrawableInfo" number="9">
-    <field type="CARD32" name="screen"/>
-    <field type="CARD32" name="drawable"/>
+    <field type="CARD32" name="screen" />
+    <field type="CARD32" name="drawable" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="drawable-table-index"/>
-      <field type="CARD32" name="drawable-table-stamp"/>
-      <field type="INT16" name="drawable-origin-x"/>
-      <field type="INT16" name="drawable-origin-y"/>
-      <field type="INT16" name="drawable-size-w"/>
-      <field type="INT16" name="drawable-size-h"/>
-      <field type="CARD32" name="num-clip-rects"/>
-      <pad bytes="4"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="drawable-table-index" />
+      <field type="CARD32" name="drawable-table-stamp" />
+      <field type="INT16" name="drawable-origin-x" />
+      <field type="INT16" name="drawable-origin-y" />
+      <field type="INT16" name="drawable-size-w" />
+      <field type="INT16" name="drawable-size-h" />
+      <field type="CARD32" name="num-clip-rects" />
+      <pad bytes="4" />
       <list type="DrmClipRect" name="clip-rects">
         <fieldref>num-clip-rects</fieldref>
       </list>
     </reply>
   </request>
   <request name="GetDeviceInfo" number="10">
-    <field type="CARD32" name="screen"/>
+    <field type="CARD32" name="screen" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="framebuffer-handle-low"/>
-      <field type="CARD32" name="framebuffer-handle-high"/>
-      <field type="CARD32" name="framebuffer-origin-offset"/>
-      <field type="CARD32" name="framebuffer-size"/>
-      <field type="CARD32" name="framebuffer-stride"/>
-      <field type="CARD32" name="device-private-size"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="framebuffer-handle-low" />
+      <field type="CARD32" name="framebuffer-handle-high" />
+      <field type="CARD32" name="framebuffer-origin-offset" />
+      <field type="CARD32" name="framebuffer-size" />
+      <field type="CARD32" name="framebuffer-stride" />
+      <field type="CARD32" name="device-private-size" />
       <list type="CARD32" name="device-private">
         <fieldref>device-private-size</fieldref>
       </list>
     </reply>
   </request>
-<!-- Not in this doc, but specified in Mesa/src/glx/x11/xf86dri.h -->
+  <!-- Not in this doc, but specified in Mesa/src/glx/x11/xf86dri.h -->
   <request name="AuthConnection" number="11">
-    <field type="CARD32" name="screen"/>
-    <field type="CARD32" name="magic"/>
+    <field type="CARD32" name="screen" />
+    <field type="CARD32" name="magic" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="authenticated"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="authenticated" />
     </reply>
   </request>
 </extension>
diff --git a/xcb-proto/src/extensions/xfixes.xml b/xcb-proto/src/extensions/xfixes.xml
index 3c36633..e880243 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -28,91 +28,91 @@ authorization from the authors.
 <extension header="xfixes" xname="XFIXES" name="XFixes" version="4">
   <import>render</import>
   <import>shape</import>
-<!-- Version 1 -->
+  <!-- Version 1 -->
   <request name="QueryVersion" number="0">
-    <field type="CARD32" name="client-major-version"/>
-    <field type="CARD32" name="client-minor-version"/>
+    <field type="CARD32" name="client-major-version" />
+    <field type="CARD32" name="client-minor-version" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="major-version"/>
-      <field type="CARD32" name="minor-version"/>
-      <pad bytes="16"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="major-version" />
+      <field type="CARD32" name="minor-version" />
+      <pad bytes="16" />
     </reply>
   </request>
   <enum type="byte" name="SaveSetMode">
-    <item name="insert"/>
-    <item name="delete"/>
+    <item name="insert" />
+    <item name="delete" />
   </enum>
   <enum type="byte" name="SaveSetTarget">
-    <item name="nearest"/>
-    <item name="root"/>
+    <item name="nearest" />
+    <item name="root" />
   </enum>
   <enum type="byte" name="SaveSetMapping">
-    <item name="map"/>
-    <item name="unmap"/>
+    <item name="map" />
+    <item name="unmap" />
   </enum>
   <request name="ChangeSaveSet" number="1">
-    <field type="SaveSetMode" name="mode"/>
-    <field type="SaveSetTarget" name="target"/>
-    <field type="SaveSetMapping" name="map"/>
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
+    <field type="SaveSetMode" name="mode" />
+    <field type="SaveSetTarget" name="target" />
+    <field type="SaveSetMapping" name="map" />
+    <pad bytes="1" />
+    <field type="Window" name="window" />
   </request>
   <enum name="SelectionEvent">
-    <item name="set-selection-owner"/>
-    <item name="selection-window-destroy"/>
-    <item name="selection-client-close"/>
+    <item name="set-selection-owner" />
+    <item name="selection-window-destroy" />
+    <item name="selection-client-close" />
   </enum>
   <mask name="SelectionEventMask">
-    <item name="set-selection-owner"/>
-    <item name="selection-window-destroy"/>
-    <item name="selection-client-close"/>
+    <item name="set-selection-owner" />
+    <item name="selection-window-destroy" />
+    <item name="selection-client-close" />
   </mask>
   <event name="SelectionNotify" number="0">
-<!-- SelectionEvent -->
-    <field type="CARD8" name="subtype"/>
-    <field type="Window" name="window"/>
-    <field type="Window" name="owner"/>
-    <field type="Atom" name="selection"/>
-    <field type="Time" name="time"/>
-    <field type="Time" name="selection-time"/>
-    <pad bytes="8"/>
+    <!-- SelectionEvent -->
+    <field type="CARD8" name="subtype" />
+    <field type="Window" name="window" />
+    <field type="Window" name="owner" />
+    <field type="Atom" name="selection" />
+    <field type="Time" name="time" />
+    <field type="Time" name="selection-time" />
+    <pad bytes="8" />
   </event>
   <request name="SelectSelectionInput" number="2">
-    <field type="Window" name="window"/>
-    <field type="Atom" name="selection"/>
-<!-- SelectionEventMask -->
-    <field type="CARD32" name="event-mask"/>
+    <field type="Window" name="window" />
+    <field type="Atom" name="selection" />
+    <!-- SelectionEventMask -->
+    <field type="CARD32" name="event-mask" />
   </request>
   <enum name="CursorNotify">
-    <item name="display-cursor"/>
+    <item name="display-cursor" />
   </enum>
   <mask name="CursorNotifyMask">
-    <item name="display-cursor"/>
+    <item name="display-cursor" />
   </mask>
   <event name="CursorNotify" number="1">
-<!-- CursorNotify -->
-    <field type="CARD8" name="subtype"/>
-    <field type="Window" name="window"/>
-    <field type="CARD32" name="cursor-serial"/>
-    <field type="Time" name="time"/>
-<!-- Added in version 2 -->
-    <field type="Atom" name="name"/>
-    <pad bytes="12"/>
+    <!-- CursorNotify -->
+    <field type="CARD8" name="subtype" />
+    <field type="Window" name="window" />
+    <field type="CARD32" name="cursor-serial" />
+    <field type="Time" name="time" />
+    <!-- Added in version 2 -->
+    <field type="Atom" name="name" />
+    <pad bytes="12" />
   </event>
   <request name="SelectCursorInput" number="3">
-<!-- CursorNotifyMask -->
-    <field type="Window" name="window"/>
-    <field type="CARD32" name="event-mask"/>
+    <!-- CursorNotifyMask -->
+    <field type="Window" name="window" />
+    <field type="CARD32" name="event-mask" />
   </request>
   <request name="GetCursorImage" number="4">
     <reply>
-      <pad bytes="1"/>
-      <field type="Rectangle"/>
-      <field type="Point" name="hot-point"/>
-      <field type="CARD32" name="cursor-serial"/>
-      <pad bytes="8"/>
-<!-- FIXME: xspec: refers to anonymous fields -->
+      <pad bytes="1" />
+      <field type="Rectangle" />
+      <field type="Point" name="hot-point" />
+      <field type="CARD32" name="cursor-serial" />
+      <pad bytes="8" />
+      <!-- FIXME: xspec: refers to anonymous fields -->
       <list type="CARD32" name="cursor-image">
         <op op="*">
           <fieldref>width</fieldref>
@@ -121,112 +121,112 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-<!-- Version 2 -->
-  <resource name="Region"/>
-  <error name="BadRegion" number="0"/>
+  <!-- Version 2 -->
+  <resource name="Region" />
+  <error name="BadRegion" number="0" />
   <request name="CreateRegion" number="5">
-    <field type="Region" name="region"/>
-    <list type="Rectangle" name="rectangles"/>
+    <field type="Region" name="region" />
+    <list type="Rectangle" name="rectangles" />
   </request>
   <request name="CreateRegionFromBitmap" number="6">
-    <field type="Region" name="region"/>
-    <field type="Pixmap" name="bitmap"/>
+    <field type="Region" name="region" />
+    <field type="Pixmap" name="bitmap" />
   </request>
   <request name="CreateRegionFromWindow" number="7">
-    <field type="Region" name="region"/>
-    <field type="Window" name="window"/>
-    <field type="ShapeKind" name="kind"/>
-    <pad bytes="3"/>
+    <field type="Region" name="region" />
+    <field type="Window" name="window" />
+    <field type="ShapeKind" name="kind" />
+    <pad bytes="3" />
   </request>
   <request name="CreateRegionFromGC" number="8">
-    <field type="Region" name="region"/>
-    <field type="GContext" name="gc"/>
+    <field type="Region" name="region" />
+    <field type="GContext" name="gc" />
   </request>
   <request name="CreateRegionFromPicture" number="9">
-    <field type="Region" name="region"/>
-    <field type="Picture" name="picture"/>
+    <field type="Region" name="region" />
+    <field type="Picture" name="picture" />
   </request>
   <request name="DestroyRegion" number="10">
-    <field type="Region" name="region"/>
+    <field type="Region" name="region" />
   </request>
   <request name="SetRegion" number="11">
-    <field type="Region" name="region"/>
-    <list type="Rectangle" name="rectangles"/>
+    <field type="Region" name="region" />
+    <list type="Rectangle" name="rectangles" />
   </request>
   <request name="CopyRegion" number="12">
-    <field type="Region" name="source"/>
-    <field type="Region" name="destination"/>
+    <field type="Region" name="source" />
+    <field type="Region" name="destination" />
   </request>
   <request name="UnionRegion" number="13">
-    <field type="Region" name="source1"/>
-    <field type="Region" name="source2"/>
-    <field type="Region" name="destination"/>
+    <field type="Region" name="source1" />
+    <field type="Region" name="source2" />
+    <field type="Region" name="destination" />
   </request>
   <request name="IntersectRegion" number="14">
-    <field type="Region" name="source1"/>
-    <field type="Region" name="source2"/>
-    <field type="Region" name="destination"/>
+    <field type="Region" name="source1" />
+    <field type="Region" name="source2" />
+    <field type="Region" name="destination" />
   </request>
   <request name="SubtractRegion" number="15">
-    <field type="Region" name="source1"/>
-    <field type="Region" name="source2"/>
-    <field type="Region" name="destination"/>
+    <field type="Region" name="source1" />
+    <field type="Region" name="source2" />
+    <field type="Region" name="destination" />
   </request>
   <request name="InvertRegion" number="16">
-    <field type="Region" name="source"/>
-    <field type="Rectangle" name="bounds"/>
-    <field type="Region" name="destination"/>
+    <field type="Region" name="source" />
+    <field type="Rectangle" name="bounds" />
+    <field type="Region" name="destination" />
   </request>
   <request name="TranslateRegion" number="17">
-    <field type="Region" name="region"/>
-    <field type="INT16" name="dx"/>
-    <field type="INT16" name="dy"/>
+    <field type="Region" name="region" />
+    <field type="INT16" name="dx" />
+    <field type="INT16" name="dy" />
   </request>
   <request name="RegionExtents" number="18">
-    <field type="Region" name="source"/>
-    <field type="Region" name="destination"/>
+    <field type="Region" name="source" />
+    <field type="Region" name="destination" />
   </request>
   <request name="FetchRegion" number="19">
-    <field type="Region" name="region"/>
+    <field type="Region" name="region" />
     <reply>
-      <pad bytes="1"/>
-      <field type="Rectangle" name="extents"/>
-      <pad bytes="16"/>
-      <list type="Rectangle" name="rectangles"/>
+      <pad bytes="1" />
+      <field type="Rectangle" name="extents" />
+      <pad bytes="16" />
+      <list type="Rectangle" name="rectangles" />
     </reply>
   </request>
   <request name="SetGCClipRegion" number="20">
-    <field type="GContext" name="gc"/>
-    <field type="Region" name="region"/>
-    <field type="Point" name="origin"/>
+    <field type="GContext" name="gc" />
+    <field type="Region" name="region" />
+    <field type="Point" name="origin" />
   </request>
   <request name="SetWindowShapeRegion" number="21">
-    <field type="Window" name="dest"/>
-    <field type="ShapeKind" name="dest-kind"/>
-    <pad bytes="3"/>
-    <field type="Point" name="offset"/>
-    <field type="Region" name="region"/>
+    <field type="Window" name="dest" />
+    <field type="ShapeKind" name="dest-kind" />
+    <pad bytes="3" />
+    <field type="Point" name="offset" />
+    <field type="Region" name="region" />
   </request>
   <request name="SetPictureClipRegion" number="22">
-    <field type="Picture" name="picture"/>
-    <field type="Region" name="region"/>
-    <field type="Point" name="origin"/>
+    <field type="Picture" name="picture" />
+    <field type="Region" name="region" />
+    <field type="Point" name="origin" />
   </request>
   <request name="SetCursorName" number="23">
-    <field type="Cursor" name="cursor"/>
-    <field type="CARD16" name="n-bytes"/>
-    <pad bytes="2"/>
+    <field type="Cursor" name="cursor" />
+    <field type="CARD16" name="n-bytes" />
+    <pad bytes="2" />
     <list type="CARD8" name="name">
       <fieldref>n-bytes</fieldref>
     </list>
   </request>
   <request name="GetCursorName" number="24">
-    <field type="Cursor" name="cursor"/>
+    <field type="Cursor" name="cursor" />
     <reply>
-      <pad bytes="1"/>
-      <field type="Atom" name="atom"/>
-      <field type="CARD16" name="n-bytes"/>
-      <pad bytes="18"/>
+      <pad bytes="1" />
+      <field type="Atom" name="atom" />
+      <field type="CARD16" name="n-bytes" />
+      <pad bytes="18" />
       <list type="CARD8" name="name">
         <fieldref>n-bytes</fieldref>
       </list>
@@ -234,13 +234,13 @@ authorization from the authors.
   </request>
   <request name="GetCursorImageAndName" number="25">
     <reply>
-      <pad bytes="1"/>
-      <field type="Rectangle"/>
-      <field type="Point" name="hot-point"/>
-      <field type="CARD32" name="cursor-serial"/>
-      <field type="Atom" name="cursor-atom"/>
-      <field type="CARD16" name="n-bytes"/>
-      <pad bytes="2"/>
+      <pad bytes="1" />
+      <field type="Rectangle" />
+      <field type="Point" name="hot-point" />
+      <field type="CARD32" name="cursor-serial" />
+      <field type="Atom" name="cursor-atom" />
+      <field type="CARD16" name="n-bytes" />
+      <pad bytes="2" />
       <list type="CARD8" name="name">
         <fieldref>n-bytes</fieldref>
       </list>
@@ -253,31 +253,31 @@ authorization from the authors.
     </reply>
   </request>
   <request name="ChangeCursor" number="26">
-    <field type="Cursor" name="source"/>
-    <field type="Cursor" name="destination"/>
+    <field type="Cursor" name="source" />
+    <field type="Cursor" name="destination" />
   </request>
   <request name="ChangeCursorByName" number="27">
-    <field type="Cursor" name="src"/>
-    <field type="CARD16" name="n-bytes"/>
-    <pad bytes="2"/>
+    <field type="Cursor" name="src" />
+    <field type="CARD16" name="n-bytes" />
+    <pad bytes="2" />
     <list type="CARD8" name="name">
       <fieldref>n-bytes</fieldref>
     </list>
   </request>
-<!-- Version 3 -->
+  <!-- Version 3 -->
   <request name="ExpandRegion" number="28">
-    <field type="Region" name="source"/>
-    <field type="Region" name="destination"/>
-    <field type="CARD16" name="left"/>
-    <field type="CARD16" name="right"/>
-    <field type="CARD16" name="top"/>
-    <field type="CARD16" name="bottom"/>
+    <field type="Region" name="source" />
+    <field type="Region" name="destination" />
+    <field type="CARD16" name="left" />
+    <field type="CARD16" name="right" />
+    <field type="CARD16" name="top" />
+    <field type="CARD16" name="bottom" />
   </request>
-<!-- Version 4 -->
+  <!-- Version 4 -->
   <request name="HideCursor" number="29">
-    <field type="Window" name="window"/>
+    <field type="Window" name="window" />
   </request>
   <request name="ShowCursor" number="30">
-    <field type="Window" name="window"/>
+    <field type="Window" name="window" />
   </request>
 </extension>
diff --git a/xcb-proto/src/extensions/xprint.xml b/xcb-proto/src/extensions/xprint.xml
index 4fdef04..151b59f 100644
--- a/xcb-proto/src/extensions/xprint.xml
+++ b/xcb-proto/src/extensions/xprint.xml
@@ -27,259 +27,259 @@ sale, use or other dealings in this Soft
 authorization from the authors.
 -->
 <extension header="xprint" xname="XpExtension" name="XP" version="1.0">
-<!-- Types -->
+  <!-- Types -->
   <struct name="PRINTER">
-    <field type="CARD32" name="name-len"/>
+    <field type="CARD32" name="name-len" />
     <list type="STRING8" name="name">
       <fieldref>name-len</fieldref>
     </list>
-<!-- Padding -->
-    <field type="CARD32" name="desc-len"/>
+    <!-- Padding -->
+    <field type="CARD32" name="desc-len" />
     <list type="STRING8" name="description">
       <fieldref>desc-len</fieldref>
     </list>
-<!-- More padding -->
+    <!-- More padding -->
   </struct>
-<!--<typedef oldname="CARD32" newname="PCONTEXT" />-->
-  <resource name="PCONTEXT"/>
-  <typedef oldname="char" newname="STRING8"/>
-<!-- "PrintGetDocumentData" -->
+  <!--<typedef oldname="CARD32" newname="PCONTEXT" />-->
+  <resource name="PCONTEXT" />
+  <typedef oldname="char" newname="STRING8" />
+  <!-- "PrintGetDocumentData" -->
   <enum name="GetDoc">
-    <item name="finished"/>
-    <item name="second-consumer"/>
+    <item name="finished" />
+    <item name="second-consumer" />
   </enum>
-<!-- Event Mask ("PrintSelectInput") -->
+  <!-- Event Mask ("PrintSelectInput") -->
   <mask name="EvMask">
     <!--
     <item name="no-event-mask">
       <value>0x00000000</value>
     </item>
     -->
-    <item name="print-mask"/>
-    <item name="attribute-mask"/>
+    <item name="print-mask" />
+    <item name="attribute-mask" />
   </mask>
-<!-- "PrintNotify" detail -->
+  <!-- "PrintNotify" detail -->
   <enum name="Detail">
-    <item/>
-    <item name="start-job-notify"/>
-    <item name="end-job-notify"/>
-    <item name="start-doc-notify"/>
-    <item name="end-doc-notify"/>
-    <item name="start-page-notify"/>
-    <item name="end-page-notify"/>
+    <item />
+    <item name="start-job-notify" />
+    <item name="end-job-notify" />
+    <item name="start-doc-notify" />
+    <item name="end-doc-notify" />
+    <item name="start-page-notify" />
+    <item name="end-page-notify" />
   </enum>
-<!-- "AttributeNotify" detail -->
+  <!-- "AttributeNotify" detail -->
   <enum name="Attr">
-    <item/>
-    <item name="job-attr"/>
-    <item name="doc-attr"/>
-    <item name="page-attr"/>
-    <item name="printer-attr"/>
-    <item name="server-attr"/>
-    <item name="medium-attr"/>
-    <item name="spooler-attr"/>
+    <item />
+    <item name="job-attr" />
+    <item name="doc-attr" />
+    <item name="page-attr" />
+    <item name="printer-attr" />
+    <item name="server-attr" />
+    <item name="medium-attr" />
+    <item name="spooler-attr" />
   </enum>
-<!-- Requests -->
+  <!-- Requests -->
   <request name="PrintQueryVersion" number="0">
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="major-version"/>
-      <field type="CARD16" name="minor-version"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="major-version" />
+      <field type="CARD16" name="minor-version" />
     </reply>
   </request>
   <request name="PrintGetPrinterList" number="1">
-    <field type="CARD32" name="printer-name-len"/>
-    <field type="CARD32" name="locale-len"/>
+    <field type="CARD32" name="printer-name-len" />
+    <field type="CARD32" name="locale-len" />
     <list type="STRING8" name="printer-name">
       <fieldref>printer-name-len</fieldref>
     </list>
-<!-- There's some padding in here... -->
+    <!-- There's some padding in here... -->
     <list type="STRING8" name="locale">
       <fieldref>locale-len</fieldref>
     </list>
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="list-count"/>
-      <pad bytes="20"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="list-count" />
+      <pad bytes="20" />
       <list type="PRINTER" name="printers">
         <fieldref>list-count</fieldref>
       </list>
     </reply>
   </request>
-  <request name="PrintRehashPrinterList" number="20"/>
+  <request name="PrintRehashPrinterList" number="20" />
   <request name="CreateContext" number="2">
-    <field type="CARD32" name="context-id"/>
-    <field type="CARD32" name="printer-name-len"/>
-    <field type="CARD32" name="locale-len"/>
+    <field type="CARD32" name="context-id" />
+    <field type="CARD32" name="printer-name-len" />
+    <field type="CARD32" name="locale-len" />
     <list type="STRING8" name="printer-name">
       <fieldref>printer-name-len</fieldref>
     </list>
-<!-- padding -->
+    <!-- padding -->
     <list type="STRING8" name="locale">
       <fieldref>locale-len</fieldref>
     </list>
   </request>
   <request name="PrintSetContext" number="3">
-    <field type="CARD32" name="context"/>
+    <field type="CARD32" name="context" />
   </request>
   <request name="PrintGetContext" number="4">
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="context"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="context" />
     </reply>
   </request>
   <request name="PrintDestroyContext" number="5">
-    <field type="CARD32" name="context"/>
+    <field type="CARD32" name="context" />
   </request>
   <request name="PrintGetScreenOfContext" number="6">
     <reply>
-      <pad bytes="1"/>
-      <field type="Window" name="root"/>
+      <pad bytes="1" />
+      <field type="Window" name="root" />
     </reply>
   </request>
   <request name="PrintStartJob" number="7">
-    <field type="CARD8" name="output-mode"/>
+    <field type="CARD8" name="output-mode" />
   </request>
   <request name="PrintEndJob" number="8">
-    <field type="bool" name="cancel"/>
+    <field type="bool" name="cancel" />
   </request>
   <request name="PrintStartDoc" number="9">
-    <field type="CARD8" name="driver-mode"/>
+    <field type="CARD8" name="driver-mode" />
   </request>
   <request name="PrintEndDoc" number="10">
-    <field type="bool" name="cancel"/>
+    <field type="bool" name="cancel" />
   </request>
   <request name="PrintPutDocumentData" number="11">
-    <field type="Drawable" name="drawable"/>
-    <field type="CARD32" name="len-data"/>
-    <field type="CARD16" name="len-fmt"/>
-    <field type="CARD16" name="len-options"/>
+    <field type="Drawable" name="drawable" />
+    <field type="CARD32" name="len-data" />
+    <field type="CARD16" name="len-fmt" />
+    <field type="CARD16" name="len-options" />
     <list type="byte" name="data">
       <fieldref>len-data</fieldref>
     </list>
-<!-- padding -->
-    <list type="STRING8" name="doc-format"/>
-<!-- padding -->
-    <list type="STRING8" name="options"/>
+    <!-- padding -->
+    <list type="STRING8" name="doc-format" />
+    <!-- padding -->
+    <list type="STRING8" name="options" />
   </request>
   <request name="PrintGetDocumentData" number="12">
-    <field type="PCONTEXT" name="context"/>
-    <field type="CARD32" name="max-bytes"/>
+    <field type="PCONTEXT" name="context" />
+    <field type="CARD32" name="max-bytes" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="status-code"/>
-      <field type="CARD32" name="finished-flag"/>
-      <field type="CARD32" name="data-len"/>
-      <pad bytes="12"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="status-code" />
+      <field type="CARD32" name="finished-flag" />
+      <field type="CARD32" name="data-len" />
+      <pad bytes="12" />
       <list type="byte" name="data">
         <fieldref>data-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="PrintStartPage" number="13">
-    <field type="Window" name="window"/>
+    <field type="Window" name="window" />
   </request>
   <request name="PrintEndPage" number="14">
-    <field type="bool" name="cancel"/>
-    <pad bytes="3"/>
+    <field type="bool" name="cancel" />
+    <pad bytes="3" />
   </request>
   <request name="PrintSelectInput" number="15">
-    <field type="PCONTEXT" name="context"/>
-    <valueparam value-mask-type="CARD32" value-mask-name="event-mask" value-list-name="event-list"/>
+    <field type="PCONTEXT" name="context" />
+    <valueparam value-mask-type="CARD32" value-mask-name="event-mask" value-list-name="event-list" />
   </request>
   <request name="PrintInputSelected" number="16">
-    <field type="PCONTEXT" name="context"/>
+    <field type="PCONTEXT" name="context" />
     <reply>
-      <pad bytes="1"/>
-      <valueparam value-mask-type="CARD32" value-mask-name="event-mask" value-list-name="event-list"/>
-      <valueparam value-mask-type="CARD32" value-mask-name="all-events-mask" value-list-name="all-events-list"/>
+      <pad bytes="1" />
+      <valueparam value-mask-type="CARD32" value-mask-name="event-mask" value-list-name="event-list" />
+      <valueparam value-mask-type="CARD32" value-mask-name="all-events-mask" value-list-name="all-events-list" />
     </reply>
   </request>
   <request name="PrintGetAttributes" number="17">
-    <field type="PCONTEXT" name="context"/>
-    <field type="CARD8" name="pool"/>
-    <pad bytes="3"/>
-    <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="string-len"/>
-      <pad bytes="20"/>
-      <field type="STRING8" name="attributes"/>
+    <field type="PCONTEXT" name="context" />
+    <field type="CARD8" name="pool" />
+    <pad bytes="3" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="string-len" />
+      <pad bytes="20" />
+      <field type="STRING8" name="attributes" />
     </reply>
   </request>
   <request name="PrintGetOneAttributes" number="19">
-    <field type="PCONTEXT" name="context"/>
-    <field type="CARD32" name="name-len"/>
-    <field type="CARD8" name="pool"/>
-    <pad bytes="3"/>
+    <field type="PCONTEXT" name="context" />
+    <field type="CARD32" name="name-len" />
+    <field type="CARD8" name="pool" />
+    <pad bytes="3" />
     <list type="STRING8" name="name">
       <fieldref>name-len</fieldref>
     </list>
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="value-len"/>
-      <pad bytes="20"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="value-len" />
+      <pad bytes="20" />
       <list type="STRING8" name="value">
         <fieldref>value-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="PrintSetAttributes" number="18">
-    <field type="PCONTEXT" name="context"/>
-    <field type="CARD32" name="string-len"/>
-    <field type="CARD8" name="pool"/>
-    <field type="CARD8" name="rule"/>
-    <pad bytes="2"/>
-    <list type="STRING8" name="attributes"/>
+    <field type="PCONTEXT" name="context" />
+    <field type="CARD32" name="string-len" />
+    <field type="CARD8" name="pool" />
+    <field type="CARD8" name="rule" />
+    <pad bytes="2" />
+    <list type="STRING8" name="attributes" />
   </request>
   <request name="PrintGetPageDimensions" number="21">
-    <field type="PCONTEXT" name="context"/>
+    <field type="PCONTEXT" name="context" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="width"/>
-      <field type="CARD16" name="height"/>
-      <field type="CARD16" name="offset-x"/>
-      <field type="CARD16" name="offset-y"/>
-      <field type="CARD16" name="reproducible-width"/>
-      <field type="CARD16" name="reproducible-height"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="width" />
+      <field type="CARD16" name="height" />
+      <field type="CARD16" name="offset-x" />
+      <field type="CARD16" name="offset-y" />
+      <field type="CARD16" name="reproducible-width" />
+      <field type="CARD16" name="reproducible-height" />
     </reply>
   </request>
   <request name="PrintQueryScreens" number="22">
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="list-count"/>
-      <pad bytes="20"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="list-count" />
+      <pad bytes="20" />
       <list type="Window" name="roots">
         <fieldref>list-count</fieldref>
       </list>
-<!-- There may be a WINDOW rootWindow here... -->
+      <!-- There may be a WINDOW rootWindow here... -->
     </reply>
   </request>
   <request name="PrintSetImageResolution" number="23">
-    <field type="PCONTEXT" name="context"/>
-    <field type="CARD16" name="image-resolution"/>
+    <field type="PCONTEXT" name="context" />
+    <field type="CARD16" name="image-resolution" />
     <reply>
-      <field type="bool" name="status"/>
-      <field type="CARD16" name="previous-resolutions"/>
+      <field type="bool" name="status" />
+      <field type="CARD16" name="previous-resolutions" />
     </reply>
   </request>
   <request name="PrintGetImageResolution" number="24">
-    <field type="PCONTEXT" name="context"/>
+    <field type="PCONTEXT" name="context" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="image-resolution"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="image-resolution" />
     </reply>
   </request>
-<!-- Events -->
+  <!-- Events -->
   <event name="Notify" number="0">
-    <field type="CARD8" name="detail"/>
-    <field type="PCONTEXT" name="context"/>
-    <field type="bool" name="cancel"/>
+    <field type="CARD8" name="detail" />
+    <field type="PCONTEXT" name="context" />
+    <field type="bool" name="cancel" />
   </event>
   <event name="AttributNotify" number="1">
-    <field type="CARD8" name="detail"/>
-    <field type="PCONTEXT" name="context"/>
+    <field type="CARD8" name="detail" />
+    <field type="PCONTEXT" name="context" />
   </event>
-<!-- Errors -->
-  <error name="BadContext" number="0"/>
-  <error name="BadSequence" number="1"/>
+  <!-- Errors -->
+  <error name="BadContext" number="0" />
+  <error name="BadSequence" number="1" />
 </extension>
diff --git a/xcb-proto/src/extensions/xv.xml b/xcb-proto/src/extensions/xv.xml
index ba33072..a3480a4 100644
--- a/xcb-proto/src/extensions/xv.xml
+++ b/xcb-proto/src/extensions/xv.xml
@@ -28,43 +28,43 @@ authorization from the authors.
 -->
 <extension header="xv" xname="XVideo" name="Xv" version="2.2">
   <import>shm</import>
-<!-- XIDs -->
-  <resource name="Port"/>
-  <resource name="Encoding"/>
-<!-- Errors -->
-  <error name="BadPort" number="0"/>
-  <error name="BadEncoding" number="1"/>
-  <error name="BadControl" number="2"/>
+  <!-- XIDs -->
+  <resource name="Port" />
+  <resource name="Encoding" />
+  <!-- Errors -->
+  <error name="BadPort" number="0" />
+  <error name="BadEncoding" number="1" />
+  <error name="BadControl" number="2" />
   <mask type="CARD32" name="Type">
-    <item name="input-mask"/>
-    <item name="output-mask"/>
-    <item name="video-mask"/>
-    <item name="still-mask"/>
-    <item name="image-mask"/>
+    <item name="input-mask" />
+    <item name="output-mask" />
+    <item name="video-mask" />
+    <item name="still-mask" />
+    <item name="image-mask" />
   </mask>
   <enum name="ImageFormatInfoType">
-    <item name="rgb"/>
-    <item name="yuv"/>
+    <item name="rgb" />
+    <item name="yuv" />
   </enum>
   <enum name="ImageFormatInfoFormat">
-    <item name="packed"/>
-    <item name="planar"/>
+    <item name="packed" />
+    <item name="planar" />
   </enum>
   <mask type="CARD8" name="AttributeFlag">
-    <item name="gettable"/>
-    <item name="settable"/>
+    <item name="gettable" />
+    <item name="settable" />
   </mask>
   <struct name="Rational">
-    <field type="INT32" name="numerator"/>
-    <field type="INT32" name="denominator"/>
+    <field type="INT32" name="numerator" />
+    <field type="INT32" name="denominator" />
   </struct>
   <struct name="AdaptorInfo">
-    <field type="Port" name="base-id"/>
-    <field type="CARD16" name="name-size"/>
-    <field type="CARD16" name="num-ports"/>
-    <field type="CARD16" name="num-formats"/>
-    <field type="CARD8" name="type"/>
-    <pad bytes="1"/>
+    <field type="Port" name="base-id" />
+    <field type="CARD16" name="name-size" />
+    <field type="CARD16" name="num-ports" />
+    <field type="CARD16" name="num-formats" />
+    <field type="CARD8" name="type" />
+    <pad bytes="1" />
     <list type="char" name="name">
       <fieldref>name-size</fieldref>
     </list>
@@ -73,11 +73,11 @@ authorization from the authors.
     </list>
   </struct>
   <struct name="EncodingInfo">
-    <field type="Encoding" name="encoding"/>
-    <field type="CARD16" name="name-size"/>
-    <field type="Size"/>
-    <field type="Rational" name="rate"/>
-<!--
+    <field type="Encoding" name="encoding" />
+    <field type="CARD16" name="name-size" />
+    <field type="Size" />
+    <field type="Rational" name="rate" />
+    <!--
         Xvproto.h has a padding CARD16 here but the name
         overlaps.
         -->
@@ -86,248 +86,248 @@ authorization from the authors.
     </list>
   </struct>
   <struct name="Format">
-    <field type="VisualID" name="visual"/>
-    <field type="CARD8" name="depth"/>
+    <field type="VisualID" name="visual" />
+    <field type="CARD8" name="depth" />
   </struct>
   <struct name="Image">
-    <field type="CARD32" name="id"/>
-    <field type="Size"/>
-    <field type="CARD32" name="data-size"/>
-    <field type="CARD32" name="num-planes"/>
+    <field type="CARD32" name="id" />
+    <field type="Size" />
+    <field type="CARD32" name="data-size" />
+    <field type="CARD32" name="num-planes" />
     <list type="CARD32" name="pitches">
       <fieldref>num-planes</fieldref>
     </list>
     <list type="CARD32" name="offsets">
       <fieldref>num-planes</fieldref>
     </list>
-<!-- Some XPointer "obdata" for SHM use-->
+    <!-- Some XPointer "obdata" for SHM use-->
     <list type="CARD8" name="data">
       <fieldref>data-size</fieldref>
     </list>
   </struct>
   <struct name="AttributeInfo">
-    <field type="CARD32" name="flags"/>
-    <field type="INT32" name="min"/>
-    <field type="INT32" name="max"/>
-    <field type="CARD32" name="size"/>
+    <field type="CARD32" name="flags" />
+    <field type="INT32" name="min" />
+    <field type="INT32" name="max" />
+    <field type="CARD32" name="size" />
     <list type="char" name="name">
       <fieldref>size</fieldref>
     </list>
   </struct>
   <struct name="ImageFormatInfo">
-    <field type="CARD32" name="id"/>
-    <field type="CARD8" name="type"/>
-    <field type="CARD8" name="byte-order"/>
-    <pad bytes="2"/>
+    <field type="CARD32" name="id" />
+    <field type="CARD8" name="type" />
+    <field type="CARD8" name="byte-order" />
+    <pad bytes="2" />
     <list type="CARD8" name="guid">
       <value>16</value>
     </list>
-    <field type="CARD8" name="bpp"/>
-    <field type="CARD8" name="num-planes"/>
-    <pad bytes="2"/>
-    <field type="CARD8" name="depth"/>
-    <pad bytes="3"/>
-    <field type="CARD32" name="red-mask"/>
-    <field type="CARD32" name="green-mask"/>
-    <field type="CARD32" name="blue-mask"/>
-    <field type="CARD8" name="format"/>
-    <pad bytes="3"/>
-    <field type="CARD32" name="y-sample-bits"/>
-    <field type="CARD32" name="u-sample-bits"/>
-    <field type="CARD32" name="v-sample-bits"/>
-    <field type="CARD32" name="vhorz-y-period"/>
-    <field type="CARD32" name="vhorz-u-period"/>
-    <field type="CARD32" name="vhorz-v-period"/>
-    <field type="CARD32" name="vvert-y-period"/>
-    <field type="CARD32" name="vvert-u-period"/>
-    <field type="CARD32" name="vvert-v-period"/>
+    <field type="CARD8" name="bpp" />
+    <field type="CARD8" name="num-planes" />
+    <pad bytes="2" />
+    <field type="CARD8" name="depth" />
+    <pad bytes="3" />
+    <field type="CARD32" name="red-mask" />
+    <field type="CARD32" name="green-mask" />
+    <field type="CARD32" name="blue-mask" />
+    <field type="CARD8" name="format" />
+    <pad bytes="3" />
+    <field type="CARD32" name="y-sample-bits" />
+    <field type="CARD32" name="u-sample-bits" />
+    <field type="CARD32" name="v-sample-bits" />
+    <field type="CARD32" name="vhorz-y-period" />
+    <field type="CARD32" name="vhorz-u-period" />
+    <field type="CARD32" name="vhorz-v-period" />
+    <field type="CARD32" name="vvert-y-period" />
+    <field type="CARD32" name="vvert-u-period" />
+    <field type="CARD32" name="vvert-v-period" />
     <list type="CARD8" name="vcomp-order">
       <value>32</value>
     </list>
-    <field type="CARD8" name="vscanline-order"/>
-<!-- FIXME: should these pads really be structured? changing to anon. for now -->
-    <pad bytes="11"/>
+    <field type="CARD8" name="vscanline-order" />
+    <!-- FIXME: should these pads really be structured? changing to anon. for now -->
+    <pad bytes="11" />
   </struct>
-<!-- Events -->
+  <!-- Events -->
   <event name="VideoNotify" number="0">
-    <field type="byte" name="reason"/>
-    <field type="Time" name="time"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="Port" name="port"/>
+    <field type="byte" name="reason" />
+    <field type="Time" name="time" />
+    <field type="Drawable" name="drawable" />
+    <field type="Port" name="port" />
   </event>
   <event name="PortNotify" number="1">
-    <pad bytes="1"/>
-    <field type="Time" name="time"/>
-    <field type="Port" name="port"/>
-    <field type="Atom" name="attribute"/>
-    <field type="INT32" name="value"/>
+    <pad bytes="1" />
+    <field type="Time" name="time" />
+    <field type="Port" name="port" />
+    <field type="Atom" name="attribute" />
+    <field type="INT32" name="value" />
   </event>
-<!-- Requests -->
+  <!-- Requests -->
   <request name="QueryExtension" number="0">
     <reply>
-      <pad bytes="1"/>
-      <field type="Version16" name="version"/>
+      <pad bytes="1" />
+      <field type="Version16" name="version" />
     </reply>
   </request>
   <request name="QueryAdaptors" number="1">
-    <field type="Window" name="window"/>
+    <field type="Window" name="window" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="num-adaptors"/>
-      <pad bytes="22"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="num-adaptors" />
+      <pad bytes="22" />
       <list type="AdaptorInfo" name="info">
         <fieldref>num-adaptors</fieldref>
       </list>
     </reply>
   </request>
   <request name="QueryEncodings" number="2">
-    <field type="Port" name="port"/>
+    <field type="Port" name="port" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="num-encodings"/>
-<!-- In Xvproto.h this padding is 24 bytes. In actuality it is 22 bytes. -->
-      <pad bytes="22"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="num-encodings" />
+      <!-- In Xvproto.h this padding is 24 bytes. In actuality it is 22 bytes. -->
+      <pad bytes="22" />
       <list type="EncodingInfo" name="info">
         <fieldref>num-encodings</fieldref>
       </list>
     </reply>
   </request>
   <request name="GrabPort" number="3">
-    <field type="Port" name="port"/>
-    <field type="Time" name="time"/>
+    <field type="Port" name="port" />
+    <field type="Time" name="time" />
     <reply>
-      <field type="byte" name="result"/>
+      <field type="byte" name="result" />
     </reply>
   </request>
   <request name="UngrabPort" number="4">
-    <field type="Port" name="port"/>
-    <field type="Time" name="time"/>
+    <field type="Port" name="port" />
+    <field type="Time" name="time" />
   </request>
   <request name="PutVideo" number="5">
-    <field type="Port" name="port"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="INT16" name="vid-x"/>
-    <field type="INT16" name="vid-y"/>
-    <field type="CARD16" name="vid-w"/>
-    <field type="CARD16" name="vid-h"/>
-    <field type="INT16" name="drw-x"/>
-    <field type="INT16" name="drw-y"/>
-    <field type="CARD16" name="drw-w"/>
-    <field type="CARD16" name="drw-h"/>
+    <field type="Port" name="port" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <field type="INT16" name="vid-x" />
+    <field type="INT16" name="vid-y" />
+    <field type="CARD16" name="vid-w" />
+    <field type="CARD16" name="vid-h" />
+    <field type="INT16" name="drw-x" />
+    <field type="INT16" name="drw-y" />
+    <field type="CARD16" name="drw-w" />
+    <field type="CARD16" name="drw-h" />
   </request>
   <request name="PutStill" number="6">
-    <field type="Port" name="port"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="INT16" name="vid-x"/>
-    <field type="INT16" name="vid-y"/>
-    <field type="CARD16" name="vid-w"/>
-    <field type="CARD16" name="vid-h"/>
-    <field type="INT16" name="drw-x"/>
-    <field type="INT16" name="drw-y"/>
-    <field type="CARD16" name="drw-w"/>
-    <field type="CARD16" name="drw-h"/>
+    <field type="Port" name="port" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <field type="INT16" name="vid-x" />
+    <field type="INT16" name="vid-y" />
+    <field type="CARD16" name="vid-w" />
+    <field type="CARD16" name="vid-h" />
+    <field type="INT16" name="drw-x" />
+    <field type="INT16" name="drw-y" />
+    <field type="CARD16" name="drw-w" />
+    <field type="CARD16" name="drw-h" />
   </request>
   <request name="GetVideo" number="7">
-    <field type="Port" name="port"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="INT16" name="vid-x"/>
-    <field type="INT16" name="vid-y"/>
-    <field type="CARD16" name="vid-w"/>
-    <field type="CARD16" name="vid-h"/>
-    <field type="INT16" name="drw-x"/>
-    <field type="INT16" name="drw-y"/>
-    <field type="CARD16" name="drw-w"/>
-    <field type="CARD16" name="drw-h"/>
+    <field type="Port" name="port" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <field type="INT16" name="vid-x" />
+    <field type="INT16" name="vid-y" />
+    <field type="CARD16" name="vid-w" />
+    <field type="CARD16" name="vid-h" />
+    <field type="INT16" name="drw-x" />
+    <field type="INT16" name="drw-y" />
+    <field type="CARD16" name="drw-w" />
+    <field type="CARD16" name="drw-h" />
   </request>
   <request name="GetStill" number="8">
-    <field type="Port" name="port"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="INT16" name="vid-x"/>
-    <field type="INT16" name="vid-y"/>
-    <field type="CARD16" name="vid-w"/>
-    <field type="CARD16" name="vid-h"/>
-    <field type="INT16" name="drw-x"/>
-    <field type="INT16" name="drw-y"/>
-    <field type="CARD16" name="drw-w"/>
-    <field type="CARD16" name="drw-h"/>
+    <field type="Port" name="port" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <field type="INT16" name="vid-x" />
+    <field type="INT16" name="vid-y" />
+    <field type="CARD16" name="vid-w" />
+    <field type="CARD16" name="vid-h" />
+    <field type="INT16" name="drw-x" />
+    <field type="INT16" name="drw-y" />
+    <field type="CARD16" name="drw-w" />
+    <field type="CARD16" name="drw-h" />
   </request>
   <request name="StopVideo" number="9">
-    <field type="Port" name="port"/>
-    <field type="Drawable" name="drawable"/>
+    <field type="Port" name="port" />
+    <field type="Drawable" name="drawable" />
   </request>
   <request name="SelectVideoNotify" number="10">
-    <field type="Drawable" name="drawable"/>
+    <field type="Drawable" name="drawable" />
     <!-- xspec: Updated for clarity; name was formerly onoff -->
-    <field type="bool" name="enabled"/>
+    <field type="bool" name="enabled" />
   </request>
   <request name="SelectPortNotify" number="11">
-    <field type="Drawable" name="drawable"/>
+    <field type="Drawable" name="drawable" />
     <!-- xspec: Updated for clarity; name was formerly onoff -->
-    <field type="bool" name="enabled"/>
+    <field type="bool" name="enabled" />
   </request>
   <request name="QueryBestSize" number="12">
-    <field type="Port" name="port"/>
-    <field type="CARD16" name="vid-w"/>
-    <field type="CARD16" name="vid-h"/>
-    <field type="CARD16" name="drw-w"/>
-    <field type="CARD16" name="drw-h"/>
-    <field type="bool" name="motion"/>
+    <field type="Port" name="port" />
+    <field type="CARD16" name="vid-w" />
+    <field type="CARD16" name="vid-h" />
+    <field type="CARD16" name="drw-w" />
+    <field type="CARD16" name="drw-h" />
+    <field type="bool" name="motion" />
     <reply>
-      <pad bytes="1"/>
-      <field type="Size" name="actual-size"/>
+      <pad bytes="1" />
+      <field type="Size" name="actual-size" />
     </reply>
   </request>
   <request name="SetPortAttribute" number="13">
-    <field type="Port" name="port"/>
-    <field type="Atom" name="attribute"/>
-    <field type="INT32" name="value"/>
+    <field type="Port" name="port" />
+    <field type="Atom" name="attribute" />
+    <field type="INT32" name="value" />
   </request>
   <request name="GetPortAttribute" number="14">
-    <field type="Port" name="port"/>
-    <field type="Atom" name="attribute"/>
+    <field type="Port" name="port" />
+    <field type="Atom" name="attribute" />
     <reply>
-      <pad bytes="1"/>
-      <field type="INT32" name="value"/>
+      <pad bytes="1" />
+      <field type="INT32" name="value" />
     </reply>
   </request>
-<!-- Not in the docs beyond this point :( -->
+  <!-- Not in the docs beyond this point :( -->
   <request name="QueryPortAttributes" number="15">
-    <field type="Port" name="port"/>
+    <field type="Port" name="port" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="num-attributes"/>
-      <field type="CARD32" name="text-size"/>
-      <pad bytes="16"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="num-attributes" />
+      <field type="CARD32" name="text-size" />
+      <pad bytes="16" />
       <list type="AttributeInfo" name="attributes">
         <fieldref>num-attributes</fieldref>
       </list>
     </reply>
   </request>
   <request name="ListImageFormats" number="16">
-    <field type="Port" name="port"/>
+    <field type="Port" name="port" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="num-formats"/>
-      <pad bytes="20"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="num-formats" />
+      <pad bytes="20" />
       <list type="ImageFormatInfo" name="format">
         <fieldref>num-formats</fieldref>
       </list>
     </reply>
   </request>
   <request name="QueryImageAttributes" number="17">
-    <field type="Port" name="port"/>
-    <field type="CARD32" name="id"/>
-    <field type="Size"/>
+    <field type="Port" name="port" />
+    <field type="CARD32" name="id" />
+    <field type="Size" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="num-planes"/>
-      <field type="CARD32" name="data-size"/>
-      <field type="Size"/>
-      <pad bytes="12"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="num-planes" />
+      <field type="CARD32" name="data-size" />
+      <field type="Size" />
+      <pad bytes="12" />
       <list type="CARD32" name="pitches">
         <fieldref>num-planes</fieldref>
       </list>
@@ -337,42 +337,42 @@ authorization from the authors.
     </reply>
   </request>
   <request name="PutImage" number="18">
-    <field type="Port" name="port"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="CARD32" name="id"/>
-    <field type="INT16" name="src-x"/>
-    <field type="INT16" name="src-y"/>
-    <field type="CARD16" name="src-w"/>
-    <field type="CARD16" name="src-h"/>
-    <field type="INT16" name="drw-x"/>
-    <field type="INT16" name="drw-y"/>
-    <field type="CARD16" name="drw-w"/>
-    <field type="CARD16" name="drw-h"/>
-    <field type="CARD16" name="width"/>
-    <field type="CARD16" name="height"/>
-    <localfield type="CARD32" name="data-size"/>
+    <field type="Port" name="port" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <field type="CARD32" name="id" />
+    <field type="INT16" name="src-x" />
+    <field type="INT16" name="src-y" />
+    <field type="CARD16" name="src-w" />
+    <field type="CARD16" name="src-h" />
+    <field type="INT16" name="drw-x" />
+    <field type="INT16" name="drw-y" />
+    <field type="CARD16" name="drw-w" />
+    <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>
   </request>
   <request name="ShmPutImage" number="19">
-    <field type="Port" name="port"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="SEG" name="shmseg"/>
-    <field type="CARD32" name="id"/>
-    <field type="CARD32" name="offset"/>
-    <field type="INT16" name="src-x"/>
-    <field type="INT16" name="src-y"/>
-    <field type="CARD16" name="src-w"/>
-    <field type="CARD16" name="src-h"/>
-    <field type="INT16" name="drw-x"/>
-    <field type="INT16" name="drw-y"/>
-    <field type="CARD16" name="drw-w"/>
-    <field type="CARD16" name="drw-h"/>
-    <field type="CARD16" name="width"/>
-    <field type="CARD16" name="height"/>
-    <field type="CARD8" name="send-event"/>
+    <field type="Port" name="port" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <field type="SEG" name="shmseg" />
+    <field type="CARD32" name="id" />
+    <field type="CARD32" name="offset" />
+    <field type="INT16" name="src-x" />
+    <field type="INT16" name="src-y" />
+    <field type="CARD16" name="src-w" />
+    <field type="CARD16" name="src-h" />
+    <field type="INT16" name="drw-x" />
+    <field type="INT16" name="drw-y" />
+    <field type="CARD16" name="drw-w" />
+    <field type="CARD16" name="drw-h" />
+    <field type="CARD16" name="width" />
+    <field type="CARD16" name="height" />
+    <field type="CARD8" name="send-event" />
   </request>
 </extension>
diff --git a/xcb-proto/src/extensions/xvmc.xml b/xcb-proto/src/extensions/xvmc.xml
index a2e7000..2a48d27 100644
--- a/xcb-proto/src/extensions/xvmc.xml
+++ b/xcb-proto/src/extensions/xvmc.xml
@@ -29,103 +29,103 @@ authorization from the authors.
 <extension header="xvmc" xname="XVideo-MotionCompensation" name="XvMC" version="1.1">
   <import>xv</import>
   <enum name="ChromaFormat">
-    <item name="420"/>
-    <item name="422"/>
-    <item name="444"/>
+    <item name="420" />
+    <item name="422" />
+    <item name="444" />
   </enum>
-<!-- FIXME: Read up on XvMC_API.txt and headers to complete this extension -->
-  <resource name="Context"/>
-  <resource name="Surface"/>
-  <resource name="Subpicture"/>
-  <error name="BadContext" number="0"/>
-  <error name="BadSurface" number="1"/>
-  <error name="BadSubpicture" number="2"/>
+  <!-- FIXME: Read up on XvMC_API.txt and headers to complete this extension -->
+  <resource name="Context" />
+  <resource name="Surface" />
+  <resource name="Subpicture" />
+  <error name="BadContext" number="0" />
+  <error name="BadSurface" number="1" />
+  <error name="BadSubpicture" number="2" />
   <struct name="SurfaceInfo">
-    <field type="Surface" name="id"/>
-    <field type="CARD16" name="chroma-format"/>
-    <pad bytes="2"/>
-    <field type="Size" name="max-size"/>
-    <field type="Size" name="subpicture-max-size"/>
-    <field type="CARD32" name="mc-type"/>
-    <field type="CARD32" name="flags"/>
+    <field type="Surface" name="id" />
+    <field type="CARD16" name="chroma-format" />
+    <pad bytes="2" />
+    <field type="Size" name="max-size" />
+    <field type="Size" name="subpicture-max-size" />
+    <field type="CARD32" name="mc-type" />
+    <field type="CARD32" name="flags" />
   </struct>
   <request name="QueryVersion" number="0">
     <reply>
-      <pad bytes="1"/>
-      <field type="Version32"/>
+      <pad bytes="1" />
+      <field type="Version32" />
     </reply>
   </request>
   <request name="ListSurfaceTypes" number="1">
-    <field type="Port" name="port-id"/>
+    <field type="Port" name="port-id" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="num"/>
-      <pad bytes="20"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="num" />
+      <pad bytes="20" />
       <list type="SurfaceInfo" name="surfaces">
         <fieldref>num</fieldref>
       </list>
     </reply>
   </request>
   <request name="CreateContext" number="2">
-    <field type="Context" name="context-id"/>
-    <field type="Port" name="port-id"/>
-    <field type="Surface" name="surface-id"/>
-    <field type="Size"/>
-    <field type="CARD32" name="flags"/>
-    <reply>
-      <pad bytes="1"/>
-      <field type="Size" name="size-actual"/>
-      <field type="CARD32" name="flags-return"/>
-      <pad bytes="20"/>
-      <list type="CARD32" name="priv-data"/>
+    <field type="Context" name="context-id" />
+    <field type="Port" name="port-id" />
+    <field type="Surface" name="surface-id" />
+    <field type="Size" />
+    <field type="CARD32" name="flags" />
+    <reply>
+      <pad bytes="1" />
+      <field type="Size" name="size-actual" />
+      <field type="CARD32" name="flags-return" />
+      <pad bytes="20" />
+      <list type="CARD32" name="priv-data" />
     </reply>
   </request>
   <request name="DestroyContext" number="3">
-    <field type="Context" name="context-id"/>
+    <field type="Context" name="context-id" />
   </request>
   <request name="CreateSurface" number="4">
-    <field type="Surface" name="surface-id"/>
-    <field type="Context" name="context-id"/>
+    <field type="Surface" name="surface-id" />
+    <field type="Context" name="context-id" />
     <reply>
-      <pad bytes="1"/>
-      <pad bytes="24"/>
-      <list type="CARD32" name="priv-data"/>
+      <pad bytes="1" />
+      <pad bytes="24" />
+      <list type="CARD32" name="priv-data" />
     </reply>
   </request>
   <request name="DestroySurface" number="5">
-    <field type="Surface" name="surface-id"/>
+    <field type="Surface" name="surface-id" />
   </request>
   <request name="CreateSubpicture" number="6">
-    <field type="Subpicture" name="subpicture-id"/>
-    <field type="Context" name="context"/>
-    <field type="CARD32" name="xvimage-id"/>
-    <field type="Size"/>
-    <reply>
-      <pad bytes="1"/>
-      <field type="Size" name="size-actual"/>
-      <field type="CARD16" name="num-palette-entries"/>
-      <field type="CARD16" name="entry-bytes"/>
+    <field type="Subpicture" name="subpicture-id" />
+    <field type="Context" name="context" />
+    <field type="CARD32" name="xvimage-id" />
+    <field type="Size" />
+    <reply>
+      <pad bytes="1" />
+      <field type="Size" name="size-actual" />
+      <field type="CARD16" name="num-palette-entries" />
+      <field type="CARD16" name="entry-bytes" />
       <list type="CARD8" name="component-order">
         <value>4</value>
       </list>
-      <pad bytes="12"/>
-      <list type="CARD32" name="priv-data"/>
+      <pad bytes="12" />
+      <list type="CARD32" name="priv-data" />
     </reply>
   </request>
   <request name="DestroySubpicture" number="7">
-    <field type="Subpicture" name="subpicture-id"/>
+    <field type="Subpicture" name="subpicture-id" />
   </request>
   <request name="ListSubpictureTypes" number="8">
-    <field type="Port" name="port-id"/>
-    <field type="Surface" name="surface-id"/>
+    <field type="Port" name="port-id" />
+    <field type="Surface" name="surface-id" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="num"/>
-      <pad bytes="20"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="num" />
+      <pad bytes="20" />
       <list type="ImageFormatInfo" name="types">
         <fieldref>num</fieldref>
       </list>
     </reply>
   </request>
-<!-- TODO: GetDRInfoRequest -->
+  <!-- TODO: GetDRInfoRequest -->
 </extension>
diff --git a/xcb-proto/src/xcb_types.xml b/xcb-proto/src/xcb_types.xml
index 914e355..4b3e159 100644
--- a/xcb-proto/src/xcb_types.xml
+++ b/xcb-proto/src/xcb_types.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.
 Copyright (C) 2006 Alp Toker
@@ -27,139 +27,139 @@ sale, use or other dealings in this Soft
 authorization from the authors.
 -->
 <protocol name="X">
-<!-- Core protocol types -->
+  <!-- Core protocol types -->
   <!-- Request -->
   <!-- Value -->
-  <resource name="Window"/>
-  <resource name="Pixmap"/>
-  <resource name="Atom"/>
-  <resource name="Cursor"/>
-  <resource name="Font"/>
+  <resource name="Window" />
+  <resource name="Pixmap" />
+  <resource name="Atom" />
+  <resource name="Cursor" />
+  <resource name="Font" />
   <!-- Match -->
   <union name="Drawable">
-    <field type="Window" name="window"/>
-    <field type="Pixmap" name="pixmap"/>
+    <field type="Window" name="window" />
+    <field type="Pixmap" name="pixmap" />
   </union>
   <!-- Access -->
   <!-- Alloc -->
-  <resource name="Colormap"/>
-  <resource name="GContext"/>
+  <resource name="Colormap" />
+  <resource name="GContext" />
   <!-- IDChoice -->
   <!-- Name -->
   <!-- Length -->
   <!-- Implementation -->
   <union name="Fontable">
-    <field type="Font" name="font"/>
-    <field type="GContext" name="gcontext"/>
+    <field type="Font" name="font" />
+    <field type="GContext" name="gcontext" />
   </union>
   <struct name="CHAR2B">
-    <field type="CARD8" name="byte1"/>
-    <field type="CARD8" name="byte2"/>
+    <field type="CARD8" name="byte1" />
+    <field type="CARD8" name="byte2" />
   </struct>
   <struct name="Version16">
-    <field type="CARD16" name="major"/>
-    <field type="CARD16" name="minor"/>
+    <field type="CARD16" name="major" />
+    <field type="CARD16" name="minor" />
   </struct>
   <struct name="Version32">
-    <field type="CARD32" name="major"/>
-    <field type="CARD32" name="minor"/>
+    <field type="CARD32" name="major" />
+    <field type="CARD32" name="minor" />
   </struct>
   <struct name="VisualID">
-    <field type="CARD32" name="id"/>
+    <field type="CARD32" name="id" />
   </struct>
   <struct name="Time">
-    <field type="CARD32" name="id"/>
+    <field type="CARD32" name="id" />
   </struct>
   <struct name="KeySym">
-    <field type="CARD32" name="id"/>
+    <field type="CARD32" name="id" />
   </struct>
   <struct name="KeyCode">
-    <field type="CARD8" name="id"/>
+    <field type="CARD8" name="id" />
   </struct>
   <struct name="Button">
-    <field type="CARD8" name="id"/>
+    <field type="CARD8" name="id" />
   </struct>
   <struct name="Point">
-    <field type="INT16" name="x"/>
-    <field type="INT16" name="y"/>
+    <field type="INT16" name="x" />
+    <field type="INT16" name="y" />
   </struct>
   <struct name="Line">
-    <field type="Point" name="p1"/>
-    <field type="Point" name="p2"/>
+    <field type="Point" name="p1" />
+    <field type="Point" name="p2" />
   </struct>
   <struct name="Size">
-    <field type="CARD16" name="width"/>
-    <field type="CARD16" name="height"/>
+    <field type="CARD16" name="width" />
+    <field type="CARD16" name="height" />
   </struct>
   <struct name="Rectangle">
-    <field type="Point"/>
-    <field type="Size"/>
+    <field type="Point" />
+    <field type="Size" />
   </struct>
   <struct name="Arc">
-    <field type="Rectangle"/>
-    <field type="INT16" name="angle1"/>
-    <field type="INT16" name="angle2"/>
+    <field type="Rectangle" />
+    <field type="INT16" name="angle1" />
+    <field type="INT16" name="angle2" />
   </struct>
-<!-- Connection setup-related types -->
+  <!-- Connection setup-related types -->
   <struct name="Format">
-    <field type="CARD8" name="depth"/>
-    <field type="CARD8" name="bits-per-pixel"/>
-    <field type="CARD8" name="scanline-pad"/>
-    <pad bytes="5"/>
+    <field type="CARD8" name="depth" />
+    <field type="CARD8" name="bits-per-pixel" />
+    <field type="CARD8" name="scanline-pad" />
+    <pad bytes="5" />
   </struct>
   <struct name="VisualType">
-    <field type="VisualID" name="visual-id"/>
-    <field type="CARD8" name="class"/>
-    <field type="CARD8" name="bits-per-rgb-value"/>
-    <field type="CARD16" name="colormap-entries"/>
-    <field type="CARD32" name="red-mask"/>
-    <field type="CARD32" name="green-mask"/>
-    <field type="CARD32" name="blue-mask"/>
-    <pad bytes="4"/>
+    <field type="VisualID" name="visual-id" />
+    <field type="CARD8" name="class" />
+    <field type="CARD8" name="bits-per-rgb-value" />
+    <field type="CARD16" name="colormap-entries" />
+    <field type="CARD32" name="red-mask" />
+    <field type="CARD32" name="green-mask" />
+    <field type="CARD32" name="blue-mask" />
+    <pad bytes="4" />
   </struct>
   <struct name="Depth">
-    <field type="CARD8" name="depth"/>
-    <pad bytes="1"/>
-    <field type="CARD16" name="visuals-len"/>
-    <pad bytes="4"/>
+    <field type="CARD8" name="depth" />
+    <pad bytes="1" />
+    <field type="CARD16" name="visuals-len" />
+    <pad bytes="4" />
     <list type="VisualType" name="visuals">
       <fieldref>visuals-len</fieldref>
     </list>
   </struct>
   <struct name="ScreenSize">
-    <field type="Size" name="size-in-pixels"/>
-    <field type="Size" name="size-in-millimeters"/>
+    <field type="Size" name="size-in-pixels" />
+    <field type="Size" name="size-in-millimeters" />
   </struct>
   <struct name="Screen">
-    <field type="Window" name="root"/>
-    <field type="Colormap" name="default-colormap"/>
-    <field type="CARD32" name="white-pixel"/>
-    <field type="CARD32" name="black-pixel"/>
-    <field type="CARD32" name="current-input-masks"/>
-    <field type="ScreenSize"/>
-    <field type="CARD16" name="min-installed-maps"/>
-    <field type="CARD16" name="max-installed-maps"/>
-    <field type="VisualID" name="root-visual"/>
-    <field type="byte" name="backing-stores"/>
-    <field type="bool" name="save-unders"/>
-    <field type="CARD8" name="root-depth"/>
-    <field type="CARD8" name="allowed-depths-len"/>
+    <field type="Window" name="root" />
+    <field type="Colormap" name="default-colormap" />
+    <field type="CARD32" name="white-pixel" />
+    <field type="CARD32" name="black-pixel" />
+    <field type="CARD32" name="current-input-masks" />
+    <field type="ScreenSize" />
+    <field type="CARD16" name="min-installed-maps" />
+    <field type="CARD16" name="max-installed-maps" />
+    <field type="VisualID" name="root-visual" />
+    <field type="byte" name="backing-stores" />
+    <field type="bool" name="save-unders" />
+    <field type="CARD8" name="root-depth" />
+    <field type="CARD8" name="allowed-depths-len" />
     <list type="Depth" name="allowed-depths">
       <fieldref>allowed-depths-len</fieldref>
     </list>
   </struct>
-<!--
-	<struct name="AuthInfo">
+  <!--
+        <struct name="AuthInfo">
     <field type="string" name="name" />
     <field type="blob" name="data" />
-	</struct>
-	-->
+        </struct>
+        -->
   <struct name="ConnSetupReq">
-    <field type="CARD8" name="byte-order"/>
-    <pad bytes="1"/>
-    <field type="Version16" name="protocol-version"/>
-    <field type="CARD16" name="authorization-protocol-name-len"/>
-    <field type="CARD16" name="authorization-protocol-data-len"/>
+    <field type="CARD8" name="byte-order" />
+    <pad bytes="1" />
+    <field type="Version16" name="protocol-version" />
+    <field type="CARD16" name="authorization-protocol-name-len" />
+    <field type="CARD16" name="authorization-protocol-data-len" />
     <list type="char" name="authorization-protocol-name">
       <fieldref>authorization-protocol-name-len</fieldref>
     </list>
@@ -168,41 +168,41 @@ authorization from the authors.
     </list>
   </struct>
   <struct name="ConnSetupGenericRep">
-    <field type="CARD8" name="status"/>
-    <pad bytes="5"/>
-    <field type="CARD16" name="length"/>
+    <field type="CARD8" name="status" />
+    <pad bytes="5" />
+    <field type="CARD16" name="length" />
   </struct>
   <struct name="ConnSetupFailedRep">
-<!-- always 0 -> Failed -->
-    <field type="CARD8" name="status"/>
-    <field type="CARD8" name="reason-len"/>
-    <field type="Version16" name="protocol-version"/>
-    <field type="CARD16" name="length"/>
+    <!-- always 0 -> Failed -->
+    <field type="CARD8" name="status" />
+    <field type="CARD8" name="reason-len" />
+    <field type="Version16" name="protocol-version" />
+    <field type="CARD16" name="length" />
     <list type="char" name="reason">
       <fieldref>reason-len</fieldref>
     </list>
   </struct>
   <struct name="ConnSetupSuccessRep">
-<!-- always 1 -> Success -->
-    <field type="CARD8" name="status"/>
-    <pad bytes="1"/>
-    <field type="Version16" name="protocol-version"/>
-    <field type="CARD16" name="length"/>
-    <field type="CARD32" name="release-number"/>
-    <field type="CARD32" name="resource-id-base"/>
-    <field type="CARD32" name="resource-id-mask"/>
-    <field type="CARD32" name="motion-buffer-size"/>
-    <field type="CARD16" name="vendor-len"/>
-    <field type="CARD16" name="maximum-request-length"/>
-    <field type="CARD8" name="roots-len"/>
-    <field type="CARD8" name="pixmap-formats-len"/>
-    <field type="CARD8" name="image-byte-order"/>
-    <field type="CARD8" name="bitmap-format-bit-order"/>
-    <field type="CARD8" name="bitmap-format-scanline-unit"/>
-    <field type="CARD8" name="bitmap-format-scanline-pad"/>
-    <field type="KeyCode" name="min-keycode"/>
-    <field type="KeyCode" name="max-keycode"/>
-    <pad bytes="4"/>
+    <!-- always 1 -> Success -->
+    <field type="CARD8" name="status" />
+    <pad bytes="1" />
+    <field type="Version16" name="protocol-version" />
+    <field type="CARD16" name="length" />
+    <field type="CARD32" name="release-number" />
+    <field type="CARD32" name="resource-id-base" />
+    <field type="CARD32" name="resource-id-mask" />
+    <field type="CARD32" name="motion-buffer-size" />
+    <field type="CARD16" name="vendor-len" />
+    <field type="CARD16" name="maximum-request-length" />
+    <field type="CARD8" name="roots-len" />
+    <field type="CARD8" name="pixmap-formats-len" />
+    <field type="CARD8" name="image-byte-order" />
+    <field type="CARD8" name="bitmap-format-bit-order" />
+    <field type="CARD8" name="bitmap-format-scanline-unit" />
+    <field type="CARD8" name="bitmap-format-scanline-pad" />
+    <field type="KeyCode" name="min-keycode" />
+    <field type="KeyCode" name="max-keycode" />
+    <pad bytes="4" />
     <list type="char" name="vendor">
       <fieldref>vendor-len</fieldref>
     </list>
@@ -214,10 +214,10 @@ authorization from the authors.
     </list>
   </struct>
   <struct name="ConnSetupAuthenticateRep">
-<!-- always 2 -> Authenticate -->
-    <field type="CARD8" name="status"/>
-    <pad bytes="5"/>
-    <field type="CARD16" name="length"/>
+    <!-- always 2 -> Authenticate -->
+    <field type="CARD8" name="status" />
+    <pad bytes="5" />
+    <field type="CARD16" name="length" />
     <list type="char" name="reason">
       <op op="*">
         <fieldref>length</fieldref>
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index 1767987..f720653 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -29,668 +29,668 @@ authorization from the authors.
 <!-- TODO: rename, add version attribute -->
 <!-- eg. protocol name="X" version="11" -->
 <protocol name="X">
-<!-- Core error types -->
+  <!-- Core error types -->
   <error name="Request" number="1">
-    <field type="CARD32" name="bad-value"/>
-    <field type="CARD16" name="minor-opcode"/>
-    <field type="CARD8" name="major-opcode"/>
+    <field type="CARD32" name="bad-value" />
+    <field type="CARD16" name="minor-opcode" />
+    <field type="CARD8" name="major-opcode" />
   </error>
   <error name="Value" number="2">
-    <field type="CARD32" name="bad-value"/>
-    <field type="CARD16" name="minor-opcode"/>
-    <field type="CARD8" name="major-opcode"/>
+    <field type="CARD32" name="bad-value" />
+    <field type="CARD16" name="minor-opcode" />
+    <field type="CARD8" name="major-opcode" />
   </error>
-  <errorcopy name="Window" number="3" ref="Value"/>
-  <errorcopy name="Pixmap" number="4" ref="Value"/>
-  <errorcopy name="Atom" number="5" ref="Value"/>
-  <errorcopy name="Cursor" number="6" ref="Value"/>
-  <errorcopy name="Font" number="7" ref="Value"/>
-  <errorcopy name="Match" number="8" ref="Request"/>
-  <errorcopy name="Drawable" number="9" ref="Value"/>
-  <errorcopy name="Access" number="10" ref="Request"/>
-  <errorcopy name="Alloc" number="11" ref="Request"/>
-  <errorcopy name="Colormap" number="12" ref="Value"/>
-  <errorcopy name="GContext" number="13" ref="Value"/>
-  <errorcopy name="IDChoice" number="14" ref="Value"/>
-  <errorcopy name="Name" number="15" ref="Request"/>
-  <errorcopy name="Length" number="16" ref="Request"/>
-  <errorcopy name="Implementation" number="17" ref="Request"/>
-<!-- Core event types -->
+  <errorcopy name="Window" number="3" ref="Value" />
+  <errorcopy name="Pixmap" number="4" ref="Value" />
+  <errorcopy name="Atom" number="5" ref="Value" />
+  <errorcopy name="Cursor" number="6" ref="Value" />
+  <errorcopy name="Font" number="7" ref="Value" />
+  <errorcopy name="Match" number="8" ref="Request" />
+  <errorcopy name="Drawable" number="9" ref="Value" />
+  <errorcopy name="Access" number="10" ref="Request" />
+  <errorcopy name="Alloc" number="11" ref="Request" />
+  <errorcopy name="Colormap" number="12" ref="Value" />
+  <errorcopy name="GContext" number="13" ref="Value" />
+  <errorcopy name="IDChoice" number="14" ref="Value" />
+  <errorcopy name="Name" number="15" ref="Request" />
+  <errorcopy name="Length" number="16" ref="Request" />
+  <errorcopy name="Implementation" number="17" ref="Request" />
+  <!-- Core event types -->
   <event name="KeyPress" number="2">
-    <field type="KeyCode" name="detail"/>
-    <field type="Time" name="time"/>
-    <field type="Window" name="root"/>
-    <field type="Window" name="event"/>
-    <field type="Window" name="child"/>
-    <field type="Point" name="root-point"/>
-    <field type="Point" name="event-point"/>
-    <field type="CARD16" name="state"/>
-    <field type="bool" name="same-screen"/>
+    <field type="KeyCode" name="detail" />
+    <field type="Time" name="time" />
+    <field type="Window" name="root" />
+    <field type="Window" name="event" />
+    <field type="Window" name="child" />
+    <field type="Point" name="root-point" />
+    <field type="Point" name="event-point" />
+    <field type="CARD16" name="state" />
+    <field type="bool" name="same-screen" />
   </event>
-  <eventcopy name="KeyRelease" number="3" ref="KeyPress"/>
+  <eventcopy name="KeyRelease" number="3" ref="KeyPress" />
   <event name="ButtonPress" number="4">
-    <field type="Button" name="detail"/>
-    <field type="Time" name="time"/>
-    <field type="Window" name="root"/>
-    <field type="Window" name="event"/>
-    <field type="Window" name="child"/>
-    <field type="Point" name="root-point"/>
-    <field type="Point" name="event-point"/>
-    <field type="CARD16" name="state"/>
-    <field type="bool" name="same-screen"/>
+    <field type="Button" name="detail" />
+    <field type="Time" name="time" />
+    <field type="Window" name="root" />
+    <field type="Window" name="event" />
+    <field type="Window" name="child" />
+    <field type="Point" name="root-point" />
+    <field type="Point" name="event-point" />
+    <field type="CARD16" name="state" />
+    <field type="bool" name="same-screen" />
   </event>
-  <eventcopy name="ButtonRelease" number="5" ref="ButtonPress"/>
+  <eventcopy name="ButtonRelease" number="5" ref="ButtonPress" />
   <event name="MotionNotify" number="6">
-    <field type="byte" name="detail"/>
-    <field type="Time" name="time"/>
-    <field type="Window" name="root"/>
-    <field type="Window" name="event"/>
-    <field type="Window" name="child"/>
-    <field type="Point" name="root-point"/>
-    <field type="Point" name="event-point"/>
-    <field type="CARD16" name="state"/>
-    <field type="bool" name="same-screen"/>
+    <field type="byte" name="detail" />
+    <field type="Time" name="time" />
+    <field type="Window" name="root" />
+    <field type="Window" name="event" />
+    <field type="Window" name="child" />
+    <field type="Point" name="root-point" />
+    <field type="Point" name="event-point" />
+    <field type="CARD16" name="state" />
+    <field type="bool" name="same-screen" />
   </event>
   <event name="EnterNotify" number="7">
-    <field type="byte" name="detail"/>
-    <field type="Time" name="time"/>
-    <field type="Window" name="root"/>
-    <field type="Window" name="event"/>
-    <field type="Window" name="child"/>
-    <field type="Point" name="root-point"/>
-    <field type="Point" name="event-point"/>
-    <field type="CARD16" name="state"/>
-    <field type="byte" name="mode"/>
-    <field type="byte" name="same-screen-focus"/>
+    <field type="byte" name="detail" />
+    <field type="Time" name="time" />
+    <field type="Window" name="root" />
+    <field type="Window" name="event" />
+    <field type="Window" name="child" />
+    <field type="Point" name="root-point" />
+    <field type="Point" name="event-point" />
+    <field type="CARD16" name="state" />
+    <field type="byte" name="mode" />
+    <field type="byte" name="same-screen-focus" />
   </event>
-  <eventcopy name="LeaveNotify" number="8" ref="EnterNotify"/>
+  <eventcopy name="LeaveNotify" number="8" ref="EnterNotify" />
   <event name="FocusIn" number="9">
-    <field type="FocusDetail" name="detail"/>
-    <field type="Window" name="event"/>
-    <field type="byte" name="mode"/>
+    <field type="FocusDetail" name="detail" />
+    <field type="Window" name="event" />
+    <field type="byte" name="mode" />
   </event>
-  <eventcopy name="FocusOut" number="10" ref="FocusIn"/>
+  <eventcopy name="FocusOut" number="10" ref="FocusIn" />
   <event name="KeymapNotify" number="11" no-sequence-number="true">
     <list type="CARD8" name="keys">
       <value>31</value>
     </list>
   </event>
   <event name="Expose" number="12">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
-<!-- FIXME: type change -->
-    <field type="Rectangle"/>
-    <field type="CARD16" name="count"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
+    <!-- FIXME: type change -->
+    <field type="Rectangle" />
+    <field type="CARD16" name="count" />
   </event>
   <event name="GraphicsExposure" number="13">
-    <pad bytes="1"/>
-    <field type="Drawable" name="drawable"/>
-<!-- FIXME: type change -->
-    <field type="Rectangle"/>
-    <field type="CARD16" name="minor-opcode"/>
-    <field type="CARD16" name="count"/>
-    <field type="CARD8" name="major-opcode"/>
+    <pad bytes="1" />
+    <field type="Drawable" name="drawable" />
+    <!-- FIXME: type change -->
+    <field type="Rectangle" />
+    <field type="CARD16" name="minor-opcode" />
+    <field type="CARD16" name="count" />
+    <field type="CARD8" name="major-opcode" />
   </event>
   <event name="NoExposure" number="14">
-    <pad bytes="1"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="CARD16" name="minor-opcode"/>
-    <field type="CARD8" name="major-opcode"/>
+    <pad bytes="1" />
+    <field type="Drawable" name="drawable" />
+    <field type="CARD16" name="minor-opcode" />
+    <field type="CARD8" name="major-opcode" />
   </event>
   <event name="VisibilityNotify" number="15">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
-    <field type="Visibility" name="state"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
+    <field type="Visibility" name="state" />
   </event>
   <event name="CreateNotify" number="16">
-    <pad bytes="1"/>
-    <field type="Window" name="parent"/>
-    <field type="Window" name="window"/>
-    <field type="Rectangle"/>
-    <field type="CARD16" name="border-width"/>
-    <field type="bool" name="override-redirect"/>
+    <pad bytes="1" />
+    <field type="Window" name="parent" />
+    <field type="Window" name="window" />
+    <field type="Rectangle" />
+    <field type="CARD16" name="border-width" />
+    <field type="bool" name="override-redirect" />
   </event>
   <event name="DestroyNotify" number="17">
-    <pad bytes="1"/>
-    <field type="Window" name="event"/>
-    <field type="Window" name="window"/>
+    <pad bytes="1" />
+    <field type="Window" name="event" />
+    <field type="Window" name="window" />
   </event>
   <event name="UnmapNotify" number="18">
-    <pad bytes="1"/>
-    <field type="Window" name="event"/>
-    <field type="Window" name="window"/>
-    <field type="bool" name="from-configure"/>
+    <pad bytes="1" />
+    <field type="Window" name="event" />
+    <field type="Window" name="window" />
+    <field type="bool" name="from-configure" />
   </event>
   <event name="MapNotify" number="19">
-    <pad bytes="1"/>
-    <field type="Window" name="event"/>
-    <field type="Window" name="window"/>
-    <field type="bool" name="override-redirect"/>
+    <pad bytes="1" />
+    <field type="Window" name="event" />
+    <field type="Window" name="window" />
+    <field type="bool" name="override-redirect" />
   </event>
   <event name="MapRequest" number="20">
-    <pad bytes="1"/>
-    <field type="Window" name="parent"/>
-    <field type="Window" name="window"/>
+    <pad bytes="1" />
+    <field type="Window" name="parent" />
+    <field type="Window" name="window" />
   </event>
   <event name="ReparentNotify" number="21">
-    <pad bytes="1"/>
-    <field type="Window" name="event"/>
-    <field type="Window" name="window"/>
-    <field type="Window" name="parent"/>
-    <field type="Point"/>
-    <field type="bool" name="override-redirect"/>
+    <pad bytes="1" />
+    <field type="Window" name="event" />
+    <field type="Window" name="window" />
+    <field type="Window" name="parent" />
+    <field type="Point" />
+    <field type="bool" name="override-redirect" />
   </event>
   <event name="ConfigureNotify" number="22">
-    <pad bytes="1"/>
-    <field type="Window" name="event"/>
-    <field type="Window" name="window"/>
-    <field type="Window" name="above-sibling"/>
-    <field type="Rectangle"/>
-    <field type="CARD16" name="border-width"/>
-    <field type="bool" name="override-redirect"/>
+    <pad bytes="1" />
+    <field type="Window" name="event" />
+    <field type="Window" name="window" />
+    <field type="Window" name="above-sibling" />
+    <field type="Rectangle" />
+    <field type="CARD16" name="border-width" />
+    <field type="bool" name="override-redirect" />
   </event>
   <event name="ConfigureRequest" number="23">
-    <field type="byte" name="stack-mode"/>
-    <field type="Window" name="parent"/>
-    <field type="Window" name="window"/>
-    <field type="Window" name="sibling"/>
-    <field type="Rectangle"/>
-    <field type="CARD16" name="border-width"/>
-    <field type="CARD16" name="value-mask"/>
+    <field type="byte" name="stack-mode" />
+    <field type="Window" name="parent" />
+    <field type="Window" name="window" />
+    <field type="Window" name="sibling" />
+    <field type="Rectangle" />
+    <field type="CARD16" name="border-width" />
+    <field type="CARD16" name="value-mask" />
   </event>
   <event name="GravityNotify" number="24">
-    <pad bytes="1"/>
-    <field type="Window" name="event"/>
-    <field type="Window" name="window"/>
-    <field type="Point"/>
+    <pad bytes="1" />
+    <field type="Window" name="event" />
+    <field type="Window" name="window" />
+    <field type="Point" />
   </event>
   <event name="ResizeRequest" number="25">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
-    <field type="Size"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
+    <field type="Size" />
   </event>
   <event name="CirculateNotify" number="26">
-    <pad bytes="1"/>
-    <field type="Window" name="event"/>
-    <field type="Window" name="window"/>
-    <pad bytes="4"/>
-    <field type="byte" name="place"/>
+    <pad bytes="1" />
+    <field type="Window" name="event" />
+    <field type="Window" name="window" />
+    <pad bytes="4" />
+    <field type="byte" name="place" />
   </event>
-  <eventcopy name="CirculateRequest" number="27" ref="CirculateNotify"/>
+  <eventcopy name="CirculateRequest" number="27" ref="CirculateNotify" />
   <event name="PropertyNotify" number="28">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
-    <field type="Atom" name="atom"/>
-    <field type="Time" name="time"/>
-    <field type="byte" name="state"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
+    <field type="Atom" name="atom" />
+    <field type="Time" name="time" />
+    <field type="byte" name="state" />
   </event>
   <event name="SelectionClear" number="29">
-    <pad bytes="1"/>
-    <field type="Time" name="time"/>
-    <field type="Window" name="owner"/>
-    <field type="Atom" name="selection"/>
+    <pad bytes="1" />
+    <field type="Time" name="time" />
+    <field type="Window" name="owner" />
+    <field type="Atom" name="selection" />
   </event>
   <event name="SelectionRequest" number="30">
-    <pad bytes="1"/>
-    <field type="Time" name="time"/>
-    <field type="Window" name="owner"/>
-    <field type="Window" name="requestor"/>
-    <field type="Atom" name="selection"/>
-    <field type="Atom" name="target"/>
-    <field type="Atom" name="property"/>
+    <pad bytes="1" />
+    <field type="Time" name="time" />
+    <field type="Window" name="owner" />
+    <field type="Window" name="requestor" />
+    <field type="Atom" name="selection" />
+    <field type="Atom" name="target" />
+    <field type="Atom" name="property" />
   </event>
   <event name="SelectionNotify" number="31">
-    <pad bytes="1"/>
-    <field type="Time" name="time"/>
-    <field type="Window" name="requestor"/>
-    <field type="Atom" name="selection"/>
-    <field type="Atom" name="target"/>
-    <field type="Atom" name="property"/>
+    <pad bytes="1" />
+    <field type="Time" name="time" />
+    <field type="Window" name="requestor" />
+    <field type="Atom" name="selection" />
+    <field type="Atom" name="target" />
+    <field type="Atom" name="property" />
   </event>
   <event name="ColormapNotify" number="32">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
-    <field type="Colormap" name="colormap"/>
-    <field type="bool" name="new"/>
-    <field type="byte" name="state"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
+    <field type="Colormap" name="colormap" />
+    <field type="bool" name="new" />
+    <field type="byte" name="state" />
   </event>
   <union name="ClientMessageData">
-<!-- The format member of the ClientMessage event determines which array to use. -->
-<!--  8 -->
+    <!-- The format member of the ClientMessage event determines which array to use. -->
+    <!--  8 -->
     <list type="CARD8" name="data8">
       <value>20</value>
     </list>
-<!-- 16 -->
+    <!-- 16 -->
     <list type="CARD16" name="data16">
       <value>10</value>
     </list>
-<!-- 32 -->
+    <!-- 32 -->
     <list type="CARD32" name="data32">
       <value>5</value>
     </list>
   </union>
   <event name="ClientMessage" number="33">
-<!-- 8, 16, or 32. -->
-    <field type="CARD8" name="format"/>
-    <field type="Window" name="window"/>
-    <field type="Atom" name="type"/>
-    <field type="ClientMessageData" name="data"/>
+    <!-- 8, 16, or 32. -->
+    <field type="CARD8" name="format" />
+    <field type="Window" name="window" />
+    <field type="Atom" name="type" />
+    <field type="ClientMessageData" name="data" />
   </event>
   <event name="MappingNotify" number="34">
-    <pad bytes="1"/>
-    <field type="byte" name="request"/>
-    <field type="KeyCode" name="first-keycode"/>
-    <field type="CARD8" name="count"/>
-  </event>
-<!-- Enumerations -->
-<enum type="CARD8" name="Gravity">
-  <item name="forget"/>
-  <item name="north-west"/>
-  <item name="north"/>
-  <item name="north-east"/>
-  <item name="west"/>
-  <item name="center"/>
-  <item name="east"/>
-  <item name="south-west"/>
-  <item name="south"/>
-  <item name="south-east"/>
-  <item name="static"/>
-</enum>
-<enum name="HostFamily">
-  <item name="internet"/>
-  <item name="dec-net"/>
-  <item name="chaos"/>
-  <item/>
-  <item/>
-  <item name="server-interpreted"/>
-  <item name="internet-v6"/>
-</enum>
-<enum type="CARD8" name="StoreUsage">
-	<!-- <item name="never"/> -->
-  <item name="not-useful"/>
-  <item name="when-mapped"/>
-  <item name="always"/>
-</enum>
-<enum name="VisualType">
-  <item name="static-gray"/>
-  <item name="grayscale"/>
-  <item name="static-color"/>
-  <item name="pseudo-color"/>
-  <item name="true-color"/>
-  <item name="direct-color"/>
-</enum>
-<enum type="CARD16" name="WindowClass">
-  <item name="copy-from-parent"/>
-  <item name="input-output"/>
-  <item name="input-only"/>
-</enum>
-<enum type="CARD8" name="MapState">
-  <item name="unmapped"/>
-  <item name="unviewable"/>
-  <item name="viewable"/>
-</enum>
-<enum name="StackMode">
-  <item name="above"/>
-  <item name="below"/>
-  <item name="top-if"/>
-  <item name="bottom-if"/>
-  <item name="opposite"/>
-</enum>
-<enum type="CARD8" name="CirculateDirection">
-  <item name="raise-lowest"/>
-  <item name="lower-highest"/>
-</enum>
-<enum type="CARD8" name="PropertyMode">
-  <item name="replace"/>
-  <item name="prepend"/>
-  <item name="append"/>
-</enum>
-<enum name="EventDestination">
-  <item name="pointer-window"/>
-  <item name="input-focus"/>
-</enum>
-<enum type="byte" name="GrabMode">
-  <item name="synchronous"/>
-  <item name="asynchronous"/>
-</enum>
-<enum type="byte" name="GrabStatus">
-  <item name="success"/>
-  <item name="already-grabbed"/>
-  <item name="invalid-time"/>
-  <item name="not-viewable"/>
-  <item name="frozen"/>
-</enum>
-<enum type="CARD8" name="FocusRevert">
-  <item name="none"/>
-  <item name="pointer-root"/>
-  <item name="parent"/>
-</enum>
-<enum type="byte" name="Direction">
-  <item name="left-to-right"/>
-  <item name="right-to-left"/>
-</enum>
-<enum name="LineStyle">
-  <item name="solid"/>
-  <item name="on-off-dash"/>
-  <item name="double-dash"/>
-</enum>
-<enum name="CapStyle">
-  <item name="not-last"/>
-  <item name="butt"/>
-  <item name="round"/>
-  <item name="projecting"/>
-</enum>
-<enum name="JoinStyle">
-  <item name="miter"/>
-  <item name="round"/>
-  <item name="bevel"/>
-</enum>
-<enum name="FillStyle">
-  <item name="solid"/>
-  <item name="tiled"/>
-  <item name="stippled"/>
-  <item name="opaque-stippled"/>
-</enum>
-<enum name="FillRule">
-  <item name="even-odd"/>
-  <item name="winding"/>
-</enum>
-<enum name="SubwindowMode">
-  <item name="clip-by-children"/>
-  <item name="include-inferiors"/>
-</enum>
-<enum name="ArcMode">
-  <item name="chord"/>
-  <item name="pie-slice"/>
-</enum>
-<enum type="byte" name="Ordering">
-  <item name="unsorted"/>
-  <item name="y-sorted"/>
-  <item name="yx-sorted"/>
-  <item name="yx-banded"/>
-</enum>
-<enum type="byte" name="CoordinateMode">
-  <item name="absolute"/>
-  <item name="relative"/>
-</enum>
-<enum type="CARD8" name="ShapeType">
-  <item name="complex"/>
-  <item name="nonconvex"/>
-  <item name="convex"/>
-</enum>
-<enum type="CARD8" name="ImageFormat">
-  <item name="bitmap"/>
-  <item name="xy-pixmap"/>
-  <item name="z-pixmap"/>
-</enum>
-<enum type="byte" name="Allocation">
-  <item name="none"/>
-  <item name="all"/>
-</enum>
-<enum type="CARD8" name="QueryClass">
-  <item name="cursor"/>
-  <item name="tile"/>
-  <item name="stipple"/>
-</enum>
-<enum type="CARD8" name="CloseDownMode">
-  <item name="destroy"/>
-  <item name="retain-permanent"/>
-  <item name="retain-temporary"/>
-</enum>
-<enum name="ForceMode">
-  <item name="reset"/>
-  <item name="activate"/>
-</enum>
-<enum type="byte" name="MappingStatus">
-  <item name="success"/>
-  <item name="busy"/>
-  <item name="failed"/>
-</enum>
-<enum name="NotifyType">
-  <item name="normal"/>
-  <item name="hint"/>
-</enum>
-<enum type="byte" name="Visibility">
-  <!-- xspec: Updated for clarity; formerly {unobscured, partially-obscured, fully-obscured} -->
-  <item name="full"/>
-  <item name="partial"/>
-  <item name="none"/>
-</enum>
-<enum name="ColormapState">
-  <item name="uninstalled"/>
-  <item name="installed"/>
-</enum>
-<enum name="MappingRequestType">
-  <item name="modifer"/>
-  <item name="keyboard"/>
-  <item name="pointer"/>
-</enum>
-<enum name="VPlacement">
-  <item name="top"/>
-  <item name="bottom"/>
-</enum>
-<mask type="CARD32" name="GC">
-  <item name="function"/>
-  <item name="plane-mask"/>
-  <item name="foreground"/>
-  <item name="background"/>
-  <item name="line-width"/>
-  <item name="line-style"/>
-  <item name="cap-style"/>
-  <item name="join-style"/>
-  <item name="fill-style"/>
-  <item name="fill-rule"/>
-  <item name="tile"/>
-  <item name="stipple"/>
-  <item name="tile-stipple-x-origin"/>
-  <item name="tile-stipple-y-origin"/>
-  <item name="font"/>
-  <item name="subwindow-mode"/>
-  <item name="graphics-exposures"/>
-  <item name="clip-x-origin"/>
-  <item name="clip-y-origin"/>
-  <item name="clip-mask"/>
-  <item name="dash-offset"/>
-  <item name="dashes"/>
-  <item name="arc-mode"/>
-</mask>
-<enum name="GFunction">
-  <item name="clear"/>
-  <item name="and"/>
-  <item name="and-reverse"/>
-  <item name="copy"/>
-  <item name="and-inverted"/>
-  <item name="no-op"/>
-  <item name="xor"/>
-  <item name="or"/>
-  <item name="nor"/>
-  <item name="equiv"/>
-  <item name="invert"/>
-  <item name="or-reverse"/>
-  <item name="copy-inverted"/>
-  <item name="or-inverted"/>
-  <item name="nand"/>
-  <item name="set"/>
-</enum>
-<enum type="byte" name="FocusDetail">
-	<item name="ancestor"/>
-	<item name="virtual"/>
-	<item name="inferior"/>
-	<item name="nonlinear"/>
-	<item name="nonlinear-virtual"/>
-	<item name="pointer"/>
-	<item name="pointer-root"/>
-	<item name="none"/>
-</enum>
-<!-- Window attributes for CreateWindow and ChangeWindowAttributes. -->
+    <pad bytes="1" />
+    <field type="byte" name="request" />
+    <field type="KeyCode" name="first-keycode" />
+    <field type="CARD8" name="count" />
+  </event>
+  <!-- Enumerations -->
+  <enum type="CARD8" name="Gravity">
+    <item name="forget" />
+    <item name="north-west" />
+    <item name="north" />
+    <item name="north-east" />
+    <item name="west" />
+    <item name="center" />
+    <item name="east" />
+    <item name="south-west" />
+    <item name="south" />
+    <item name="south-east" />
+    <item name="static" />
+  </enum>
+  <enum name="HostFamily">
+    <item name="internet" />
+    <item name="dec-net" />
+    <item name="chaos" />
+    <item />
+    <item />
+    <item name="server-interpreted" />
+    <item name="internet-v6" />
+  </enum>
+  <enum type="CARD8" name="StoreUsage">
+    <!-- <item name="never"/> -->
+    <item name="not-useful" />
+    <item name="when-mapped" />
+    <item name="always" />
+  </enum>
+  <enum name="VisualType">
+    <item name="static-gray" />
+    <item name="grayscale" />
+    <item name="static-color" />
+    <item name="pseudo-color" />
+    <item name="true-color" />
+    <item name="direct-color" />
+  </enum>
+  <enum type="CARD16" name="WindowClass">
+    <item name="copy-from-parent" />
+    <item name="input-output" />
+    <item name="input-only" />
+  </enum>
+  <enum type="CARD8" name="MapState">
+    <item name="unmapped" />
+    <item name="unviewable" />
+    <item name="viewable" />
+  </enum>
+  <enum name="StackMode">
+    <item name="above" />
+    <item name="below" />
+    <item name="top-if" />
+    <item name="bottom-if" />
+    <item name="opposite" />
+  </enum>
+  <enum type="CARD8" name="CirculateDirection">
+    <item name="raise-lowest" />
+    <item name="lower-highest" />
+  </enum>
+  <enum type="CARD8" name="PropertyMode">
+    <item name="replace" />
+    <item name="prepend" />
+    <item name="append" />
+  </enum>
+  <enum name="EventDestination">
+    <item name="pointer-window" />
+    <item name="input-focus" />
+  </enum>
+  <enum type="byte" name="GrabMode">
+    <item name="synchronous" />
+    <item name="asynchronous" />
+  </enum>
+  <enum type="byte" name="GrabStatus">
+    <item name="success" />
+    <item name="already-grabbed" />
+    <item name="invalid-time" />
+    <item name="not-viewable" />
+    <item name="frozen" />
+  </enum>
+  <enum type="CARD8" name="FocusRevert">
+    <item name="none" />
+    <item name="pointer-root" />
+    <item name="parent" />
+  </enum>
+  <enum type="byte" name="Direction">
+    <item name="left-to-right" />
+    <item name="right-to-left" />
+  </enum>
+  <enum name="LineStyle">
+    <item name="solid" />
+    <item name="on-off-dash" />
+    <item name="double-dash" />
+  </enum>
+  <enum name="CapStyle">
+    <item name="not-last" />
+    <item name="butt" />
+    <item name="round" />
+    <item name="projecting" />
+  </enum>
+  <enum name="JoinStyle">
+    <item name="miter" />
+    <item name="round" />
+    <item name="bevel" />
+  </enum>
+  <enum name="FillStyle">
+    <item name="solid" />
+    <item name="tiled" />
+    <item name="stippled" />
+    <item name="opaque-stippled" />
+  </enum>
+  <enum name="FillRule">
+    <item name="even-odd" />
+    <item name="winding" />
+  </enum>
+  <enum name="SubwindowMode">
+    <item name="clip-by-children" />
+    <item name="include-inferiors" />
+  </enum>
+  <enum name="ArcMode">
+    <item name="chord" />
+    <item name="pie-slice" />
+  </enum>
+  <enum type="byte" name="Ordering">
+    <item name="unsorted" />
+    <item name="y-sorted" />
+    <item name="yx-sorted" />
+    <item name="yx-banded" />
+  </enum>
+  <enum type="byte" name="CoordinateMode">
+    <item name="absolute" />
+    <item name="relative" />
+  </enum>
+  <enum type="CARD8" name="ShapeType">
+    <item name="complex" />
+    <item name="nonconvex" />
+    <item name="convex" />
+  </enum>
+  <enum type="CARD8" name="ImageFormat">
+    <item name="bitmap" />
+    <item name="xy-pixmap" />
+    <item name="z-pixmap" />
+  </enum>
+  <enum type="byte" name="Allocation">
+    <item name="none" />
+    <item name="all" />
+  </enum>
+  <enum type="CARD8" name="QueryClass">
+    <item name="cursor" />
+    <item name="tile" />
+    <item name="stipple" />
+  </enum>
+  <enum type="CARD8" name="CloseDownMode">
+    <item name="destroy" />
+    <item name="retain-permanent" />
+    <item name="retain-temporary" />
+  </enum>
+  <enum name="ForceMode">
+    <item name="reset" />
+    <item name="activate" />
+  </enum>
+  <enum type="byte" name="MappingStatus">
+    <item name="success" />
+    <item name="busy" />
+    <item name="failed" />
+  </enum>
+  <enum name="NotifyType">
+    <item name="normal" />
+    <item name="hint" />
+  </enum>
+  <enum type="byte" name="Visibility">
+    <!-- xspec: Updated for clarity; formerly {unobscured, partially-obscured, fully-obscured} -->
+    <item name="full" />
+    <item name="partial" />
+    <item name="none" />
+  </enum>
+  <enum name="ColormapState">
+    <item name="uninstalled" />
+    <item name="installed" />
+  </enum>
+  <enum name="MappingRequestType">
+    <item name="modifer" />
+    <item name="keyboard" />
+    <item name="pointer" />
+  </enum>
+  <enum name="VPlacement">
+    <item name="top" />
+    <item name="bottom" />
+  </enum>
+  <mask type="CARD32" name="GC">
+    <item name="function" />
+    <item name="plane-mask" />
+    <item name="foreground" />
+    <item name="background" />
+    <item name="line-width" />
+    <item name="line-style" />
+    <item name="cap-style" />
+    <item name="join-style" />
+    <item name="fill-style" />
+    <item name="fill-rule" />
+    <item name="tile" />
+    <item name="stipple" />
+    <item name="tile-stipple-x-origin" />
+    <item name="tile-stipple-y-origin" />
+    <item name="font" />
+    <item name="subwindow-mode" />
+    <item name="graphics-exposures" />
+    <item name="clip-x-origin" />
+    <item name="clip-y-origin" />
+    <item name="clip-mask" />
+    <item name="dash-offset" />
+    <item name="dashes" />
+    <item name="arc-mode" />
+  </mask>
+  <enum name="GFunction">
+    <item name="clear" />
+    <item name="and" />
+    <item name="and-reverse" />
+    <item name="copy" />
+    <item name="and-inverted" />
+    <item name="no-op" />
+    <item name="xor" />
+    <item name="or" />
+    <item name="nor" />
+    <item name="equiv" />
+    <item name="invert" />
+    <item name="or-reverse" />
+    <item name="copy-inverted" />
+    <item name="or-inverted" />
+    <item name="nand" />
+    <item name="set" />
+  </enum>
+  <enum type="byte" name="FocusDetail">
+    <item name="ancestor" />
+    <item name="virtual" />
+    <item name="inferior" />
+    <item name="nonlinear" />
+    <item name="nonlinear-virtual" />
+    <item name="pointer" />
+    <item name="pointer-root" />
+    <item name="none" />
+  </enum>
+  <!-- Window attributes for CreateWindow and ChangeWindowAttributes. -->
   <mask type="CARD32" name="CW">
-    <item name="background-pixmap"/>
-    <item name="background-pixel"/>
-    <item name="border-pixmap"/>
-    <item name="border-pixel"/>
-    <item name="bit-gravity"/>
-    <item name="win-gravity"/>
-    <item name="backing-store"/>
-    <item name="backing-planes"/>
-    <item name="backing-pixel"/>
-    <item name="override-redirect"/>
-    <item name="save-under"/>
-    <item name="event-mask"/>
-    <item name="do-not-propagate-mask"/>
-    <item name="colormap"/>
-    <item name="cursor"/>
+    <item name="background-pixmap" />
+    <item name="background-pixel" />
+    <item name="border-pixmap" />
+    <item name="border-pixel" />
+    <item name="bit-gravity" />
+    <item name="win-gravity" />
+    <item name="backing-store" />
+    <item name="backing-planes" />
+    <item name="backing-pixel" />
+    <item name="override-redirect" />
+    <item name="save-under" />
+    <item name="event-mask" />
+    <item name="do-not-propagate-mask" />
+    <item name="colormap" />
+    <item name="cursor" />
   </mask>
   <request name="CreateWindow" number="1">
-    <field type="CARD8" name="depth"/>
-    <field type="Window" name="wid"/>
-    <field type="Window" name="parent"/>
-    <field type="Rectangle"/>
-    <field type="CARD16" name="border-width"/>
-    <field type="WindowClass" name="class"/>
-    <field type="VisualID" name="visual"/>
-    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
+    <field type="CARD8" name="depth" />
+    <field type="Window" name="wid" />
+    <field type="Window" name="parent" />
+    <field type="Rectangle" />
+    <field type="CARD16" name="border-width" />
+    <field type="WindowClass" name="class" />
+    <field type="VisualID" name="visual" />
+    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list" />
   </request>
   <request name="ChangeWindowAttributes" number="2" atomic="false">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
-    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
+    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list" />
   </request>
   <struct name="WindowAttributes">
-    <field type="StoreUsage" name="backing-store"/>
-    <field type="VisualID" name="visual"/>
-    <field type="WindowClass" name="class"/>
-    <field type="Gravity" name="bit-gravity"/>
-    <field type="Gravity" name="win-gravity"/>
-    <field type="CARD32" name="backing-planes"/>
-    <field type="CARD32" name="backing-pixel"/>
-    <field type="bool" name="save-under"/>
-    <field type="bool" name="map-is-installed"/>
-    <field type="MapState" name="map-state"/>
-    <field type="bool" name="override-redirect"/>
-    <field type="Colormap" name="colormap"/>
-    <field type="CARD32" name="all-event-masks"/>
-    <field type="CARD32" name="your-event-mask"/>
-    <field type="CARD16" name="do-not-propagate-mask"/>
+    <field type="StoreUsage" name="backing-store" />
+    <field type="VisualID" name="visual" />
+    <field type="WindowClass" name="class" />
+    <field type="Gravity" name="bit-gravity" />
+    <field type="Gravity" name="win-gravity" />
+    <field type="CARD32" name="backing-planes" />
+    <field type="CARD32" name="backing-pixel" />
+    <field type="bool" name="save-under" />
+    <field type="bool" name="map-is-installed" />
+    <field type="MapState" name="map-state" />
+    <field type="bool" name="override-redirect" />
+    <field type="Colormap" name="colormap" />
+    <field type="CARD32" name="all-event-masks" />
+    <field type="CARD32" name="your-event-mask" />
+    <field type="CARD16" name="do-not-propagate-mask" />
   </struct>
   <request name="GetWindowAttributes" number="3">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
     <reply>
-      <field type="WindowAttributes" name="value"/>
+      <field type="WindowAttributes" name="value" />
     </reply>
   </request>
   <request name="DestroyWindow" number="4">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
   </request>
   <request name="DestroySubwindows" number="5">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
   </request>
   <request name="ChangeSaveSet" number="6">
-    <field type="byte" name="mode"/>
-    <field type="Window" name="window"/>
+    <field type="byte" name="mode" />
+    <field type="Window" name="window" />
   </request>
   <request name="ReparentWindow" number="7">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
-    <field type="Window" name="parent"/>
-    <field type="Point"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
+    <field type="Window" name="parent" />
+    <field type="Point" />
   </request>
   <request name="MapWindow" number="8">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
   </request>
   <request name="MapSubwindows" number="9">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
   </request>
   <request name="UnmapWindow" number="10">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
   </request>
   <request name="UnmapSubwindows" number="11">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
   </request>
   <!-- TODO: merge this mask with ConfigureRequest fields -->
   <mask type="CARD16" name="ConfigureWindowStructure">
-    <item name="x"/>
-    <item name="y"/>
-    <item name="width"/>
-    <item name="height"/>
-    <item name="border-width"/>
-    <item name="sibling"/>
-    <item name="stack-mode"/>
+    <item name="x" />
+    <item name="y" />
+    <item name="width" />
+    <item name="height" />
+    <item name="border-width" />
+    <item name="sibling" />
+    <item name="stack-mode" />
   </mask>
   <request name="ConfigureWindow" number="12">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
-    <valueparam value-mask-type="CARD16" value-mask-name="value-mask" value-list-name="value-list"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
+    <valueparam value-mask-type="CARD16" value-mask-name="value-mask" value-list-name="value-list" />
   </request>
   <request name="CirculateWindow" number="13">
-    <field type="CirculateDirection" name="direction"/>
-    <field type="Window" name="window"/>
+    <field type="CirculateDirection" name="direction" />
+    <field type="Window" name="window" />
   </request>
   <struct name="Geometry">
-    <field type="CARD8" name="depth"/>
-    <field type="Window" name="root"/>
-    <field type="Rectangle"/>
-    <field type="CARD16" name="border-width"/>
+    <field type="CARD8" name="depth" />
+    <field type="Window" name="root" />
+    <field type="Rectangle" />
+    <field type="CARD16" name="border-width" />
   </struct>
   <request name="GetGeometry" number="14">
-    <pad bytes="1"/>
-    <field type="Drawable" name="drawable"/>
+    <pad bytes="1" />
+    <field type="Drawable" name="drawable" />
     <reply>
-      <field type="Geometry"/>
+      <field type="Geometry" />
     </reply>
   </request>
   <request name="QueryTree" number="15">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
     <reply>
-      <pad bytes="1"/>
-      <field type="Window" name="root"/>
-      <field type="Window" name="parent"/>
-      <field type="CARD16" name="children-len"/>
-      <pad bytes="14"/>
+      <pad bytes="1" />
+      <field type="Window" name="root" />
+      <field type="Window" name="parent" />
+      <field type="CARD16" name="children-len" />
+      <pad bytes="14" />
       <list type="Window" name="children">
         <fieldref>children-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="InternAtom" number="16">
-    <field type="bool" name="only-if-exists"/>
-    <field type="CARD16" name="name-len"/>
-    <pad bytes="2"/>
+    <field type="bool" name="only-if-exists" />
+    <field type="CARD16" name="name-len" />
+    <pad bytes="2" />
     <list type="char" name="name">
       <fieldref>name-len</fieldref>
     </list>
     <reply>
-      <pad bytes="1"/>
-      <field type="Atom" name="atom"/>
+      <pad bytes="1" />
+      <field type="Atom" name="atom" />
     </reply>
   </request>
   <request name="GetAtomName" number="17">
-    <pad bytes="1"/>
-    <field type="Atom" name="atom"/>
+    <pad bytes="1" />
+    <field type="Atom" name="atom" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="name-len"/>
-      <pad bytes="22"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="name-len" />
+      <pad bytes="22" />
       <list type="CARD8" name="name">
         <fieldref>name-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="ChangeProperty" number="18">
-    <field type="PropertyMode" name="mode"/>
-    <field type="Window" name="window"/>
-    <field type="Atom" name="property"/>
-    <field type="Atom" name="type"/>
-    <field type="CARD8" name="format"/>
-    <pad bytes="3"/>
-    <field type="CARD32" name="data-len"/>
+    <field type="PropertyMode" name="mode" />
+    <field type="Window" name="window" />
+    <field type="Atom" name="property" />
+    <field type="Atom" name="type" />
+    <field type="CARD8" name="format" />
+    <pad bytes="3" />
+    <field type="CARD32" name="data-len" />
     <list type="void" name="data">
       <op op="/">
         <op op="*">
@@ -702,263 +702,263 @@ authorization from the authors.
     </list>
   </request>
   <request name="DeleteProperty" number="19">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
-    <field type="Atom" name="property"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
+    <field type="Atom" name="property" />
   </request>
   <request name="GetProperty" number="20">
-    <field type="bool" name="delete"/>
-    <field type="Window" name="window"/>
-    <field type="Atom" name="property"/>
-    <field type="Atom" name="type"/>
-    <field type="CARD32" name="long-offset"/>
-    <field type="CARD32" name="long-length"/>
-    <reply>
-      <field type="CARD8" name="format"/>
-      <field type="Atom" name="type"/>
-      <field type="CARD32" name="bytes-after"/>
-      <field type="CARD32" name="value-len"/>
-      <pad bytes="12"/>
+    <field type="bool" name="delete" />
+    <field type="Window" name="window" />
+    <field type="Atom" name="property" />
+    <field type="Atom" name="type" />
+    <field type="CARD32" name="long-offset" />
+    <field type="CARD32" name="long-length" />
+    <reply>
+      <field type="CARD8" name="format" />
+      <field type="Atom" name="type" />
+      <field type="CARD32" name="bytes-after" />
+      <field type="CARD32" name="value-len" />
+      <pad bytes="12" />
       <list type="void" name="value">
         <fieldref>value-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="ListProperties" number="21">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="atoms-len"/>
-      <pad bytes="22"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="atoms-len" />
+      <pad bytes="22" />
       <list type="Atom" name="atoms">
         <fieldref>atoms-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="SetSelectionOwner" number="22">
-    <pad bytes="1"/>
-    <field type="Window" name="owner"/>
-    <field type="Atom" name="selection"/>
-    <field type="Time" name="time"/>
+    <pad bytes="1" />
+    <field type="Window" name="owner" />
+    <field type="Atom" name="selection" />
+    <field type="Time" name="time" />
   </request>
   <request name="GetSelectionOwner" number="23">
-    <pad bytes="1"/>
-    <field type="Atom" name="selection"/>
+    <pad bytes="1" />
+    <field type="Atom" name="selection" />
     <reply>
-      <pad bytes="1"/>
-      <field type="Window" name="owner"/>
+      <pad bytes="1" />
+      <field type="Window" name="owner" />
     </reply>
   </request>
   <request name="ConvertSelection" number="24">
-    <pad bytes="1"/>
-    <field type="Window" name="requestor"/>
-    <field type="Atom" name="selection"/>
-    <field type="Atom" name="target"/>
-    <field type="Atom" name="property"/>
-    <field type="Time" name="time"/>
+    <pad bytes="1" />
+    <field type="Window" name="requestor" />
+    <field type="Atom" name="selection" />
+    <field type="Atom" name="target" />
+    <field type="Atom" name="property" />
+    <field type="Time" name="time" />
   </request>
   <request name="SendEvent" number="25">
-    <field type="bool" name="propagate"/>
-    <field type="Window" name="destination"/>
-    <field type="CARD32" name="event-mask"/>
-<!-- TODO: merge with xevie Event struct -->
+    <field type="bool" name="propagate" />
+    <field type="Window" name="destination" />
+    <field type="CARD32" name="event-mask" />
+    <!-- TODO: merge with xevie Event struct -->
     <list type="char" name="event">
       <value>32</value>
     </list>
   </request>
   <request name="GrabPointer" number="26">
-    <field type="bool" name="owner-events"/>
-    <field type="Window" name="grab-window"/>
-    <field type="CARD16" name="event-mask"/>
-    <field type="GrabMode" name="pointer-mode"/>
-    <field type="GrabMode" name="keyboard-mode"/>
-    <field type="Window" name="confine-to"/>
-    <field type="Cursor" name="cursor"/>
-    <field type="Time" name="time"/>
+    <field type="bool" name="owner-events" />
+    <field type="Window" name="grab-window" />
+    <field type="CARD16" name="event-mask" />
+    <field type="GrabMode" name="pointer-mode" />
+    <field type="GrabMode" name="keyboard-mode" />
+    <field type="Window" name="confine-to" />
+    <field type="Cursor" name="cursor" />
+    <field type="Time" name="time" />
     <reply>
-      <field type="GrabStatus" name="status"/>
+      <field type="GrabStatus" name="status" />
     </reply>
   </request>
   <request name="UngrabPointer" number="27">
-    <pad bytes="1"/>
-    <field type="Time" name="time"/>
+    <pad bytes="1" />
+    <field type="Time" name="time" />
   </request>
   <request name="GrabButton" number="28">
-    <field type="bool" name="owner-events"/>
-    <field type="Window" name="grab-window"/>
-		<field type="CARD16" name="event-mask"/>
-<!-- FIXME: type change? BYTE/CARD8 -->
-    <field type="GrabMode" name="pointer-mode"/>
-    <field type="GrabMode" name="keyboard-mode"/>
-    <field type="Window" name="confine-to"/>
-    <field type="Cursor" name="cursor"/>
-    <field type="CARD8" name="button"/>
-    <pad bytes="1"/>
-    <field type="CARD16" name="modifiers"/>
+    <field type="bool" name="owner-events" />
+    <field type="Window" name="grab-window" />
+    <field type="CARD16" name="event-mask" />
+    <!-- FIXME: type change? BYTE/CARD8 -->
+    <field type="GrabMode" name="pointer-mode" />
+    <field type="GrabMode" name="keyboard-mode" />
+    <field type="Window" name="confine-to" />
+    <field type="Cursor" name="cursor" />
+    <field type="CARD8" name="button" />
+    <pad bytes="1" />
+    <field type="CARD16" name="modifiers" />
   </request>
   <request name="UngrabButton" number="29">
-    <field type="Button" name="button"/>
-    <field type="Window" name="grab-window"/>
-    <field type="CARD16" name="modifiers"/>
-    <pad bytes="2"/>
+    <field type="Button" name="button" />
+    <field type="Window" name="grab-window" />
+    <field type="CARD16" name="modifiers" />
+    <pad bytes="2" />
   </request>
   <request name="ChangeActivePointerGrab" number="30">
-    <pad bytes="1"/>
-    <field type="Cursor" name="cursor"/>
-    <field type="Time" name="time"/>
-    <field type="CARD16" name="event-mask"/>
+    <pad bytes="1" />
+    <field type="Cursor" name="cursor" />
+    <field type="Time" name="time" />
+    <field type="CARD16" name="event-mask" />
   </request>
   <request name="GrabKeyboard" number="31">
-    <field type="bool" name="owner-events"/>
-    <field type="Window" name="grab-window"/>
-    <field type="Time" name="time"/>
-    <field type="GrabMode" name="pointer-mode"/>
-    <field type="GrabMode" name="keyboard-mode"/>
+    <field type="bool" name="owner-events" />
+    <field type="Window" name="grab-window" />
+    <field type="Time" name="time" />
+    <field type="GrabMode" name="pointer-mode" />
+    <field type="GrabMode" name="keyboard-mode" />
     <reply>
-      <field type="GrabStatus" name="status"/>
+      <field type="GrabStatus" name="status" />
     </reply>
   </request>
   <request name="UngrabKeyboard" number="32">
-    <pad bytes="1"/>
-    <field type="Time" name="time"/>
+    <pad bytes="1" />
+    <field type="Time" name="time" />
   </request>
   <request name="GrabKey" number="33">
-    <field type="bool" name="owner-events"/>
-    <field type="Window" name="grab-window"/>
-    <field type="CARD16" name="modifiers"/>
-    <field type="KeyCode" name="key"/>
-    <field type="GrabMode" name="pointer-mode"/>
-    <field type="GrabMode" name="keyboard-mode"/>
+    <field type="bool" name="owner-events" />
+    <field type="Window" name="grab-window" />
+    <field type="CARD16" name="modifiers" />
+    <field type="KeyCode" name="key" />
+    <field type="GrabMode" name="pointer-mode" />
+    <field type="GrabMode" name="keyboard-mode" />
   </request>
   <request name="UngrabKey" number="34">
-    <field type="CARD8" name="key"/>
-    <field type="Window" name="grab-window"/>
-    <field type="CARD16" name="modifiers"/>
+    <field type="CARD8" name="key" />
+    <field type="Window" name="grab-window" />
+    <field type="CARD16" name="modifiers" />
   </request>
   <request name="AllowEvents" number="35">
-    <field type="CARD8" name="mode"/>
-    <field type="Time" name="time"/>
+    <field type="CARD8" name="mode" />
+    <field type="Time" name="time" />
   </request>
-  <request name="GrabServer" number="36"/>
-  <request name="UngrabServer" number="37"/>
+  <request name="GrabServer" number="36" />
+  <request name="UngrabServer" number="37" />
   <request name="QueryPointer" number="38">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
     <reply>
-      <field type="bool" name="same-screen"/>
-      <field type="Window" name="root"/>
-      <field type="Window" name="child"/>
-      <field type="Point" name="root-point"/>
-      <field type="Point" name="win-point"/>
-      <field type="CARD16" name="mask"/>
+      <field type="bool" name="same-screen" />
+      <field type="Window" name="root" />
+      <field type="Window" name="child" />
+      <field type="Point" name="root-point" />
+      <field type="Point" name="win-point" />
+      <field type="CARD16" name="mask" />
     </reply>
   </request>
   <struct name="TimeCoord">
-    <field type="Time" name="time"/>
-    <field type="Point"/>
+    <field type="Time" name="time" />
+    <field type="Point" />
   </struct>
   <request name="GetMotionEvents" number="39">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
-    <field type="Time" name="start"/>
-    <field type="Time" name="stop"/>
-    <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="events-len"/>
-      <pad bytes="20"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
+    <field type="Time" name="start" />
+    <field type="Time" name="stop" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="events-len" />
+      <pad bytes="20" />
       <list type="TimeCoord" name="events">
         <fieldref>events-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="TranslateCoordinates" number="40">
-    <pad bytes="1"/>
-    <field type="Window" name="src-window"/>
-    <field type="Window" name="dst-window"/>
-    <field type="INT16" name="src-x"/>
-    <field type="INT16" name="src-y"/>
-    <reply>
-      <field type="bool" name="same-screen"/>
-      <field type="Window" name="child"/>
-      <field type="CARD16" name="dst-x"/>
-      <field type="CARD16" name="dst-y"/>
+    <pad bytes="1" />
+    <field type="Window" name="src-window" />
+    <field type="Window" name="dst-window" />
+    <field type="INT16" name="src-x" />
+    <field type="INT16" name="src-y" />
+    <reply>
+      <field type="bool" name="same-screen" />
+      <field type="Window" name="child" />
+      <field type="CARD16" name="dst-x" />
+      <field type="CARD16" name="dst-y" />
     </reply>
   </request>
   <request name="WarpPointer" number="41">
-    <pad bytes="1"/>
-    <field type="Window" name="src-window"/>
-    <field type="Window" name="dst-window"/>
-    <field type="INT16" name="src-x"/>
-    <field type="INT16" name="src-y"/>
-    <field type="CARD16" name="src-width"/>
-    <field type="CARD16" name="src-height"/>
-    <field type="INT16" name="dst-x"/>
-    <field type="INT16" name="dst-y"/>
+    <pad bytes="1" />
+    <field type="Window" name="src-window" />
+    <field type="Window" name="dst-window" />
+    <field type="INT16" name="src-x" />
+    <field type="INT16" name="src-y" />
+    <field type="CARD16" name="src-width" />
+    <field type="CARD16" name="src-height" />
+    <field type="INT16" name="dst-x" />
+    <field type="INT16" name="dst-y" />
   </request>
   <request name="SetInputFocus" number="42">
-    <field type="FocusRevert" name="revert-to"/>
-    <field type="Window" name="focus"/>
-    <field type="Time" name="time"/>
+    <field type="FocusRevert" name="revert-to" />
+    <field type="Window" name="focus" />
+    <field type="Time" name="time" />
   </request>
   <request name="GetInputFocus" number="43">
     <reply>
-      <field type="FocusRevert" name="revert-to"/>
-      <field type="Window" name="focus"/>
+      <field type="FocusRevert" name="revert-to" />
+      <field type="Window" name="focus" />
     </reply>
   </request>
   <request name="QueryKeymap" number="44">
     <reply>
-      <pad bytes="1"/>
+      <pad bytes="1" />
       <list type="CARD8" name="keys">
         <value>32</value>
       </list>
     </reply>
   </request>
   <request name="OpenFont" number="45">
-    <pad bytes="1"/>
-    <field type="Font" name="fid"/>
-    <field type="CARD16" name="name-len"/>
+    <pad bytes="1" />
+    <field type="Font" name="fid" />
+    <field type="CARD16" name="name-len" />
     <list type="char" name="name">
       <fieldref>name-len</fieldref>
     </list>
   </request>
   <request name="CloseFont" number="46">
-    <pad bytes="1"/>
-    <field type="Font" name="font"/>
+    <pad bytes="1" />
+    <field type="Font" name="font" />
   </request>
   <struct name="FontProp">
-    <field type="Atom" name="name"/>
-    <field type="CARD32" name="value"/>
+    <field type="Atom" name="name" />
+    <field type="CARD32" name="value" />
   </struct>
   <struct name="CharInfo">
-    <field type="INT16" name="left-side-bearing"/>
-    <field type="INT16" name="right-side-bearing"/>
-    <field type="INT16" name="character-width"/>
-    <field type="INT16" name="ascent"/>
-    <field type="INT16" name="descent"/>
-    <field type="CARD16" name="attributes"/>
+    <field type="INT16" name="left-side-bearing" />
+    <field type="INT16" name="right-side-bearing" />
+    <field type="INT16" name="character-width" />
+    <field type="INT16" name="ascent" />
+    <field type="INT16" name="descent" />
+    <field type="CARD16" name="attributes" />
   </struct>
   <request name="QueryFont" number="47">
-    <pad bytes="1"/>
-    <field type="Fontable" name="font"/>
+    <pad bytes="1" />
+    <field type="Fontable" name="font" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CharInfo" name="min-bounds"/>
-      <pad bytes="4"/>
-      <field type="CharInfo" name="max-bounds"/>
-      <pad bytes="4"/>
-      <field type="CARD16" name="min-char-or-byte2"/>
-      <field type="CARD16" name="max-char-or-byte2"/>
-      <field type="CARD16" name="default-char"/>
-      <field type="CARD16" name="properties-len"/>
-      <field type="Direction" name="draw-direction"/>
-      <field type="CARD8" name="min-byte1"/>
-      <field type="CARD8" name="max-byte1"/>
-      <field type="bool" name="all-chars-exist"/>
-      <field type="INT16" name="font-ascent"/>
-      <field type="INT16" name="font-descent"/>
-      <field type="CARD32" name="char-infos-len"/>
+      <pad bytes="1" />
+      <field type="CharInfo" name="min-bounds" />
+      <pad bytes="4" />
+      <field type="CharInfo" name="max-bounds" />
+      <pad bytes="4" />
+      <field type="CARD16" name="min-char-or-byte2" />
+      <field type="CARD16" name="max-char-or-byte2" />
+      <field type="CARD16" name="default-char" />
+      <field type="CARD16" name="properties-len" />
+      <field type="Direction" name="draw-direction" />
+      <field type="CARD8" name="min-byte1" />
+      <field type="CARD8" name="max-byte1" />
+      <field type="bool" name="all-chars-exist" />
+      <field type="INT16" name="font-ascent" />
+      <field type="INT16" name="font-descent" />
+      <field type="CARD32" name="char-infos-len" />
       <list type="FontProp" name="properties">
         <fieldref>properties-len</fieldref>
       </list>
@@ -974,65 +974,65 @@ authorization from the authors.
         <value>1</value>
       </op>
     </exprfield>
-    <field type="Fontable" name="font"/>
-    <list type="CHAR2B" name="string"/>
+    <field type="Fontable" name="font" />
+    <list type="CHAR2B" name="string" />
     <reply>
-      <field type="Direction" name="draw-direction"/>
-      <field type="INT16" name="font-ascent"/>
-      <field type="INT16" name="font-descent"/>
-      <field type="INT16" name="overall-ascent"/>
-      <field type="INT16" name="overall-descent"/>
-      <field type="INT32" name="overall-width"/>
-      <field type="INT32" name="overall-left"/>
-      <field type="INT32" name="overall-right"/>
+      <field type="Direction" name="draw-direction" />
+      <field type="INT16" name="font-ascent" />
+      <field type="INT16" name="font-descent" />
+      <field type="INT16" name="overall-ascent" />
+      <field type="INT16" name="overall-descent" />
+      <field type="INT32" name="overall-width" />
+      <field type="INT32" name="overall-left" />
+      <field type="INT32" name="overall-right" />
     </reply>
   </request>
   <struct name="string">
-    <field type="CARD8" name="name-len"/>
+    <field type="CARD8" name="name-len" />
     <list type="char" name="name">
       <fieldref>name-len</fieldref>
     </list>
   </struct>
   <request name="ListFonts" number="49">
-    <pad bytes="1"/>
-    <field type="CARD16" name="max-names"/>
-    <field type="CARD16" name="pattern-len"/>
+    <pad bytes="1" />
+    <field type="CARD16" name="max-names" />
+    <field type="CARD16" name="pattern-len" />
     <list type="char" name="pattern">
       <fieldref>pattern-len</fieldref>
     </list>
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="names-len"/>
-      <pad bytes="22"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="names-len" />
+      <pad bytes="22" />
       <list type="string" name="names">
         <fieldref>names-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="ListFontsWithInfo" number="50">
-    <pad bytes="1"/>
-    <field type="CARD16" name="max-names"/>
-    <field type="CARD16" name="pattern-len"/>
+    <pad bytes="1" />
+    <field type="CARD16" name="max-names" />
+    <field type="CARD16" name="pattern-len" />
     <list type="char" name="pattern">
       <fieldref>pattern-len</fieldref>
     </list>
     <reply>
-      <field type="CARD8" name="name-len"/>
-      <field type="CharInfo" name="min-bounds"/>
-      <pad bytes="4"/>
-      <field type="CharInfo" name="max-bounds"/>
-      <pad bytes="4"/>
-      <field type="CARD16" name="min-char-or-byte2"/>
-      <field type="CARD16" name="max-char-or-byte2"/>
-      <field type="CARD16" name="default-char"/>
-      <field type="CARD16" name="properties-len"/>
-      <field type="Direction" name="draw-direction"/>
-      <field type="CARD8" name="min-byte1"/>
-      <field type="CARD8" name="max-byte1"/>
-      <field type="bool" name="all-chars-exist"/>
-      <field type="INT16" name="font-ascent"/>
-      <field type="INT16" name="font-descent"/>
-      <field type="CARD32" name="replies-hint"/>
+      <field type="CARD8" name="name-len" />
+      <field type="CharInfo" name="min-bounds" />
+      <pad bytes="4" />
+      <field type="CharInfo" name="max-bounds" />
+      <pad bytes="4" />
+      <field type="CARD16" name="min-char-or-byte2" />
+      <field type="CARD16" name="max-char-or-byte2" />
+      <field type="CARD16" name="default-char" />
+      <field type="CARD16" name="properties-len" />
+      <field type="Direction" name="draw-direction" />
+      <field type="CARD8" name="min-byte1" />
+      <field type="CARD8" name="max-byte1" />
+      <field type="bool" name="all-chars-exist" />
+      <field type="INT16" name="font-ascent" />
+      <field type="INT16" name="font-descent" />
+      <field type="CARD32" name="replies-hint" />
       <list type="FontProp" name="properties">
         <fieldref>properties-len</fieldref>
       </list>
@@ -1042,176 +1042,176 @@ authorization from the authors.
     </reply>
   </request>
   <request name="SetFontPath" number="51">
-    <pad bytes="1"/>
-    <field type="CARD16" name="font-qty"/>
-    <list type="char" name="path"/>
+    <pad bytes="1" />
+    <field type="CARD16" name="font-qty" />
+    <list type="char" name="path" />
   </request>
   <request name="GetFontPath" number="52">
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="path-len"/>
-      <pad bytes="22"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="path-len" />
+      <pad bytes="22" />
       <list type="string" name="path">
         <fieldref>path-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="CreatePixmap" number="53">
-    <field type="CARD8" name="depth"/>
-    <field type="Pixmap" name="pid"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="Size" name="size"/>
+    <field type="CARD8" name="depth" />
+    <field type="Pixmap" name="pid" />
+    <field type="Drawable" name="drawable" />
+    <field type="Size" name="size" />
   </request>
   <request name="FreePixmap" number="54">
-    <pad bytes="1"/>
-    <field type="Pixmap" name="pixmap"/>
+    <pad bytes="1" />
+    <field type="Pixmap" name="pixmap" />
   </request>
   <request name="CreateGC" number="55">
-    <pad bytes="1"/>
-    <field type="GContext" name="cid"/>
-    <field type="Drawable" name="drawable"/>
-    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
+    <pad bytes="1" />
+    <field type="GContext" name="cid" />
+    <field type="Drawable" name="drawable" />
+    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list" />
   </request>
   <request name="ChangeGC" number="56" atomic="false">
-    <pad bytes="1"/>
-    <field type="GContext" name="gc"/>
-    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
+    <pad bytes="1" />
+    <field type="GContext" name="gc" />
+    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list" />
   </request>
   <request name="CopyGC" number="57">
-    <pad bytes="1"/>
-    <field type="GContext" name="src-gc"/>
-    <field type="GContext" name="dst-gc"/>
-    <field type="CARD32" name="value-mask"/>
+    <pad bytes="1" />
+    <field type="GContext" name="src-gc" />
+    <field type="GContext" name="dst-gc" />
+    <field type="CARD32" name="value-mask" />
   </request>
   <request name="SetDashes" number="58">
-    <pad bytes="1"/>
-    <field type="GContext" name="gc"/>
-    <field type="CARD16" name="dash-offset"/>
-    <field type="CARD16" name="dashes-len"/>
+    <pad bytes="1" />
+    <field type="GContext" name="gc" />
+    <field type="CARD16" name="dash-offset" />
+    <field type="CARD16" name="dashes-len" />
     <list type="CARD8" name="dashes">
       <fieldref>dashes-len</fieldref>
     </list>
   </request>
   <request name="SetClipRectangles" number="59">
-    <field type="Ordering" name="ordering"/>
-    <field type="GContext" name="gc"/>
-    <field type="Point" name="clip-origin"/>
-    <list type="Rectangle" name="rectangles"/>
+    <field type="Ordering" name="ordering" />
+    <field type="GContext" name="gc" />
+    <field type="Point" name="clip-origin" />
+    <list type="Rectangle" name="rectangles" />
   </request>
   <request name="FreeGC" number="60">
-    <pad bytes="1"/>
-    <field type="GContext" name="gc"/>
+    <pad bytes="1" />
+    <field type="GContext" name="gc" />
   </request>
   <request name="ClearArea" number="61">
-    <field type="bool" name="exposures"/>
-    <field type="Window" name="window"/>
-    <field type="Rectangle"/>
+    <field type="bool" name="exposures" />
+    <field type="Window" name="window" />
+    <field type="Rectangle" />
   </request>
   <request name="CopyArea" number="62">
-    <pad bytes="1"/>
-    <field type="Drawable" name="src-drawable"/>
-    <field type="Drawable" name="dst-drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="INT16" name="src-x"/>
-    <field type="INT16" name="src-y"/>
-    <field type="INT16" name="dst-x"/>
-    <field type="INT16" name="dst-y"/>
-    <field type="Size"/>
+    <pad bytes="1" />
+    <field type="Drawable" name="src-drawable" />
+    <field type="Drawable" name="dst-drawable" />
+    <field type="GContext" name="gc" />
+    <field type="INT16" name="src-x" />
+    <field type="INT16" name="src-y" />
+    <field type="INT16" name="dst-x" />
+    <field type="INT16" name="dst-y" />
+    <field type="Size" />
   </request>
   <request name="CopyPlane" number="63">
-    <pad bytes="1"/>
-    <field type="Drawable" name="src-drawable"/>
-    <field type="Drawable" name="dst-drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="INT16" name="src-x"/>
-    <field type="INT16" name="src-y"/>
-    <field type="INT16" name="dst-x"/>
-    <field type="INT16" name="dst-y"/>
-    <field type="Size"/>
-    <field type="CARD32" name="bit-plane"/>
+    <pad bytes="1" />
+    <field type="Drawable" name="src-drawable" />
+    <field type="Drawable" name="dst-drawable" />
+    <field type="GContext" name="gc" />
+    <field type="INT16" name="src-x" />
+    <field type="INT16" name="src-y" />
+    <field type="INT16" name="dst-x" />
+    <field type="INT16" name="dst-y" />
+    <field type="Size" />
+    <field type="CARD32" name="bit-plane" />
   </request>
   <request name="PolyPoint" number="64" combine-adjacent="true">
-    <field type="CoordinateMode" name="coordinate-mode"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <list type="Point" name="points"/>
+    <field type="CoordinateMode" name="coordinate-mode" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <list type="Point" name="points" />
   </request>
   <request name="PolyLine" number="65" combine-adjacent="true">
-    <field type="CoordinateMode" name="coordinate-mode"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <list type="Point" name="points"/>
+    <field type="CoordinateMode" name="coordinate-mode" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <list type="Point" name="points" />
   </request>
   <struct name="Segment">
-    <field type="INT16" name="x1"/>
-    <field type="INT16" name="y1"/>
-    <field type="INT16" name="x2"/>
-    <field type="INT16" name="y2"/>
+    <field type="INT16" name="x1" />
+    <field type="INT16" name="y1" />
+    <field type="INT16" name="x2" />
+    <field type="INT16" name="y2" />
   </struct>
   <request name="PolySegment" number="66" combine-adjacent="true">
-    <pad bytes="1"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <list type="Segment" name="segments"/>
+    <pad bytes="1" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <list type="Segment" name="segments" />
   </request>
   <request name="PolyRectangle" number="67" combine-adjacent="true">
-    <pad bytes="1"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <list type="Rectangle" name="rectangles"/>
+    <pad bytes="1" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <list type="Rectangle" name="rectangles" />
   </request>
-<!--
+  <!--
     The semantics of PolyArc change after the first arc: the GC's
     join style may be applied to successive arcs under some circumstances.
     So using combine-adjacent here is bad.
   -->
   <request name="PolyArc" number="68">
-    <pad bytes="1"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <list type="Arc" name="arcs"/>
+    <pad bytes="1" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <list type="Arc" name="arcs" />
   </request>
   <request name="FillPoly" number="69">
-    <pad bytes="1"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="ShapeType" name="shape"/>
-    <field type="CoordinateMode" name="coordinate-mode"/>
-    <list type="Point" name="points"/>
+    <pad bytes="1" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <field type="ShapeType" name="shape" />
+    <field type="CoordinateMode" name="coordinate-mode" />
+    <list type="Point" name="points" />
   </request>
   <request name="PolyFillRectangle" number="70" combine-adjacent="true">
-    <pad bytes="1"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <list type="Rectangle" name="rectangles"/>
+    <pad bytes="1" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <list type="Rectangle" name="rectangles" />
   </request>
   <request name="PolyFillArc" number="71" combine-adjacent="true">
-    <pad bytes="1"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <list type="Arc" name="arcs"/>
+    <pad bytes="1" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <list type="Arc" name="arcs" />
   </request>
   <request name="PutImage" number="72">
-    <field type="ImageFormat" name="format"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="Size"/>
-    <field type="INT16" name="dst-x"/>
-    <field type="INT16" name="dst-y"/>
-    <field type="CARD8" name="left-pad"/>
-    <field type="CARD8" name="depth"/>
-    <list type="byte" name="data"/>
+    <field type="ImageFormat" name="format" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <field type="Size" />
+    <field type="INT16" name="dst-x" />
+    <field type="INT16" name="dst-y" />
+    <field type="CARD8" name="left-pad" />
+    <field type="CARD8" name="depth" />
+    <list type="byte" name="data" />
   </request>
-<!-- FIXME: data array in reply will include padding, but ought not to. -->
+  <!-- FIXME: data array in reply will include padding, but ought not to. -->
   <request name="GetImage" number="73">
-    <field type="ImageFormat" name="format"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="Rectangle"/>
-    <field type="CARD32" name="plane-mask"/>
-    <reply>
-      <field type="CARD8" name="depth"/>
-      <field type="VisualID" name="visual"/>
-      <pad bytes="20"/>
+    <field type="ImageFormat" name="format" />
+    <field type="Drawable" name="drawable" />
+    <field type="Rectangle" />
+    <field type="CARD32" name="plane-mask" />
+    <reply>
+      <field type="CARD8" name="depth" />
+      <field type="VisualID" name="visual" />
+      <pad bytes="20" />
       <list type="byte" name="data">
         <op op="*">
           <fieldref>length</fieldref>
@@ -1221,107 +1221,107 @@ authorization from the authors.
     </reply>
   </request>
   <request name="PolyText8" number="74" atomic="false">
-    <pad bytes="1"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="Point"/>
-    <list type="byte" name="items"/>
+    <pad bytes="1" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <field type="Point" />
+    <list type="byte" name="items" />
   </request>
   <request name="PolyText16" number="75" atomic="false">
-    <pad bytes="1"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="Point"/>
-    <list type="byte" name="items"/>
+    <pad bytes="1" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <field type="Point" />
+    <list type="byte" name="items" />
   </request>
   <request name="ImageText8" number="76">
-    <field type="byte" name="string-len"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="Point"/>
+    <field type="byte" name="string-len" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <field type="Point" />
     <list type="char" name="string">
       <fieldref>string-len</fieldref>
     </list>
   </request>
   <request name="ImageText16" number="77">
-    <field type="byte" name="string-len"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="GContext" name="gc"/>
-    <field type="Point"/>
+    <field type="byte" name="string-len" />
+    <field type="Drawable" name="drawable" />
+    <field type="GContext" name="gc" />
+    <field type="Point" />
     <list type="CHAR2B" name="string">
       <fieldref>string-len</fieldref>
     </list>
   </request>
   <request name="CreateColormap" number="78">
-    <field type="Allocation" name="alloc"/>
-    <field type="Colormap" name="mid"/>
-    <field type="Window" name="window"/>
-    <field type="VisualID" name="visual"/>
+    <field type="Allocation" name="alloc" />
+    <field type="Colormap" name="mid" />
+    <field type="Window" name="window" />
+    <field type="VisualID" name="visual" />
   </request>
   <request name="FreeColormap" number="79">
-    <pad bytes="1"/>
-    <field type="Colormap" name="cmap"/>
+    <pad bytes="1" />
+    <field type="Colormap" name="cmap" />
   </request>
   <request name="CopyColormapAndFree" number="80">
-    <pad bytes="1"/>
-    <field type="Colormap" name="mid"/>
-    <field type="Colormap" name="src-cmap"/>
+    <pad bytes="1" />
+    <field type="Colormap" name="mid" />
+    <field type="Colormap" name="src-cmap" />
   </request>
   <request name="InstallColormap" number="81">
-    <pad bytes="1"/>
-    <field type="Colormap" name="cmap"/>
+    <pad bytes="1" />
+    <field type="Colormap" name="cmap" />
   </request>
   <request name="UninstallColormap" number="82">
-    <pad bytes="1"/>
-    <field type="Colormap" name="cmap"/>
+    <pad bytes="1" />
+    <field type="Colormap" name="cmap" />
   </request>
   <request name="ListInstalledColormaps" number="83">
-    <pad bytes="1"/>
-    <field type="Window" name="window"/>
+    <pad bytes="1" />
+    <field type="Window" name="window" />
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="cmaps-len"/>
-      <pad bytes="22"/>
+      <pad bytes="1" />
+      <field type="CARD16" name="cmaps-len" />
+      <pad bytes="22" />
       <list type="Colormap" name="cmaps">
         <fieldref>cmaps-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="AllocColor" number="84">
-    <pad bytes="1"/>
-    <field type="Colormap" name="cmap"/>
-    <field type="Color" name="color"/>
-    <reply>
-      <pad bytes="1"/>
-      <field type="Color" name="color"/>
-      <pad bytes="2"/>
-      <field type="CARD32" name="pixel"/>
+    <pad bytes="1" />
+    <field type="Colormap" name="cmap" />
+    <field type="Color" name="color" />
+    <reply>
+      <pad bytes="1" />
+      <field type="Color" name="color" />
+      <pad bytes="2" />
+      <field type="CARD32" name="pixel" />
     </reply>
   </request>
   <request name="AllocNamedColor" number="85">
-    <pad bytes="1"/>
-    <field type="Colormap" name="cmap"/>
-    <field type="CARD16" name="name-len"/>
+    <pad bytes="1" />
+    <field type="Colormap" name="cmap" />
+    <field type="CARD16" name="name-len" />
     <list type="char" name="name">
       <fieldref>name-len</fieldref>
     </list>
     <reply>
-      <pad bytes="1"/>
-      <field type="CARD32" name="pixel"/>
-      <field type="Color" name="exact-color"/>
-      <field type="Color" name="visual-color"/>
+      <pad bytes="1" />
+      <field type="CARD32" name="pixel" />
+      <field type="Color" name="exact-color" />
+      <field type="Color" name="visual-color" />
     </reply>
   </request>
   <request name="AllocColorCells" number="86">
-    <field type="bool" name="contiguous"/>
-    <field type="Colormap" name="cmap"/>
-    <field type="CARD16" name="colors"/>
-    <field type="CARD16" name="planes"/>
-    <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="pixels-len"/>
-      <field type="CARD16" name="masks-len"/>
-      <pad bytes="20"/>
+    <field type="bool" name="contiguous" />
+    <field type="Colormap" name="cmap" />
+    <field type="CARD16" name="colors" />
+    <field type="CARD16" name="planes" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="pixels-len" />
+      <field type="CARD16" name="masks-len" />
+      <pad bytes="20" />
       <list type="CARD32" name="pixels">
         <fieldref>pixels-len</fieldref>
       </list>
@@ -1331,147 +1331,147 @@ authorization from the authors.
     </reply>
   </request>
   <request name="AllocColorPlanes" number="87">
-    <field type="bool" name="contiguous"/>
-    <field type="Colormap" name="cmap"/>
-    <field type="CARD16" name="colors"/>
-    <field type="CARD16" name="reds"/>
-    <field type="CARD16" name="greens"/>
-    <field type="CARD16" name="blues"/>
-    <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="pixels-len"/>
-      <pad bytes="2"/>
-      <field type="CARD32" name="red-mask"/>
-      <field type="CARD32" name="green-mask"/>
-      <field type="CARD32" name="blue-mask"/>
-      <pad bytes="8"/>
+    <field type="bool" name="contiguous" />
+    <field type="Colormap" name="cmap" />
+    <field type="CARD16" name="colors" />
+    <field type="CARD16" name="reds" />
+    <field type="CARD16" name="greens" />
+    <field type="CARD16" name="blues" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="pixels-len" />
+      <pad bytes="2" />
+      <field type="CARD32" name="red-mask" />
+      <field type="CARD32" name="green-mask" />
+      <field type="CARD32" name="blue-mask" />
+      <pad bytes="8" />
       <list type="CARD32" name="pixels">
         <fieldref>pixels-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="FreeColors" number="88" atomic="false">
-    <pad bytes="1"/>
-    <field type="Colormap" name="cmap"/>
-    <field type="CARD32" name="plane-mask"/>
-    <list type="CARD32" name="pixels"/>
+    <pad bytes="1" />
+    <field type="Colormap" name="cmap" />
+    <field type="CARD32" name="plane-mask" />
+    <list type="CARD32" name="pixels" />
   </request>
   <struct name="ColorItem">
-    <field type="CARD32" name="pixel"/>
-    <field type="Color" name="color"/>
-    <field type="byte" name="flags"/>
-    <pad bytes="1"/>
+    <field type="CARD32" name="pixel" />
+    <field type="Color" name="color" />
+    <field type="byte" name="flags" />
+    <pad bytes="1" />
   </struct>
   <request name="StoreColors" number="89" combine-adjacent="true" atomic="false">
-    <pad bytes="1"/>
-    <field type="Colormap" name="cmap"/>
-    <list type="ColorItem" name="items"/>
+    <pad bytes="1" />
+    <field type="Colormap" name="cmap" />
+    <list type="ColorItem" name="items" />
   </request>
   <request name="StoreNamedColor" number="90">
-    <field type="CARD8" name="flags"/>
-    <field type="Colormap" name="cmap"/>
-    <field type="CARD32" name="pixel"/>
-    <field type="CARD16" name="name-len"/>
+    <field type="CARD8" name="flags" />
+    <field type="Colormap" name="cmap" />
+    <field type="CARD32" name="pixel" />
+    <field type="CARD16" name="name-len" />
     <list type="char" name="name">
       <fieldref>name-len</fieldref>
     </list>
   </request>
-<!-- TODO: this looks funny. RGBA maybe? -->
+  <!-- TODO: this looks funny. RGBA maybe? -->
   <struct name="RGB">
-    <field type="Color"/>
-    <pad bytes="2"/>
+    <field type="Color" />
+    <pad bytes="2" />
   </struct>
   <request name="QueryColors" number="91">
-    <pad bytes="1"/>
-    <field type="Colormap" name="cmap"/>
-    <list type="CARD32" name="pixels"/>
-    <reply>
-      <pad bytes="1"/>
-      <field type="CARD16" name="colors-len"/>
-      <pad bytes="22"/>
+    <pad bytes="1" />
+    <field type="Colormap" name="cmap" />
+    <list type="CARD32" name="pixels" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="colors-len" />
+      <pad bytes="22" />
       <list type="RGB" name="colors">
         <fieldref>colors-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="LookupColor" number="92">
-    <pad bytes="1"/>
-    <field type="Colormap" name="cmap"/>
-    <field type="CARD16" name="name-len"/>
+    <pad bytes="1" />
+    <field type="Colormap" name="cmap" />
+    <field type="CARD16" name="name-len" />
     <list type="char" name="name">
       <fieldref>name-len</fieldref>
     </list>
     <reply>
-      <pad bytes="1"/>
-      <field type="Color" name="exact-color"/>
-      <field type="Color" name="visual-color"/>
+      <pad bytes="1" />
+      <field type="Color" name="exact-color" />
+      <field type="Color" name="visual-color" />
     </reply>
   </request>
   <request name="CreateCursor" number="93">
-    <pad bytes="1"/>
-    <field type="Cursor" name="cid"/>
-    <field type="Pixmap" name="source"/>
-    <field type="Pixmap" name="mask"/>
-    <field type="Color" name="fore-color"/>
-    <field type="Color" name="back-color"/>
-    <field type="Point"/>
+    <pad bytes="1" />
+    <field type="Cursor" name="cid" />
+    <field type="Pixmap" name="source" />
+    <field type="Pixmap" name="mask" />
+    <field type="Color" name="fore-color" />
+    <field type="Color" name="back-color" />
+    <field type="Point" />
   </request>
   <request name="CreateGlyphCursor" number="94">
-    <pad bytes="1"/>
-    <field type="Cursor" name="cid"/>
-    <field type="Font" name="source-font"/>
-    <field type="Font" name="mask-font"/>
-    <field type="CARD16" name="source-char"/>
-    <field type="CARD16" name="mask-char"/>
-    <field type="Color" name="fore-color"/>
-    <field type="Color" name="back-color"/>
+    <pad bytes="1" />
+    <field type="Cursor" name="cid" />
+    <field type="Font" name="source-font" />
+    <field type="Font" name="mask-font" />
+    <field type="CARD16" name="source-char" />
+    <field type="CARD16" name="mask-char" />
+    <field type="Color" name="fore-color" />
+    <field type="Color" name="back-color" />
   </request>
   <request name="FreeCursor" number="95">
-    <pad bytes="1"/>
-    <field type="Cursor" name="cursor"/>
+    <pad bytes="1" />
+    <field type="Cursor" name="cursor" />
   </request>
   <request name="RecolorCursor" number="96">
-    <pad bytes="1"/>
-    <field type="Cursor" name="cursor"/>
-    <field type="Color" name="fore-color"/>
-    <field type="Color" name="back-color"/>
+    <pad bytes="1" />
+    <field type="Cursor" name="cursor" />
+    <field type="Color" name="fore-color" />
+    <field type="Color" name="back-color" />
   </request>
   <request name="QueryBestSize" number="97">
-    <field type="QueryClass" name="class"/>
-    <field type="Drawable" name="drawable"/>
-    <field type="Size" name="size"/>
+    <field type="QueryClass" name="class" />
+    <field type="Drawable" name="drawable" />
+    <field type="Size" name="size" />
     <reply>
-      <pad bytes="1"/>
-      <field type="Size" name="value"/>
+      <pad bytes="1" />
+      <field type="Size" name="value" />
     </reply>
   </request>
   <request name="QueryExtension" number="98">
-    <pad bytes="1"/>
-    <field type="CARD16" name="name-len"/>
+    <pad bytes="1" />
+    <field type="CARD16" name="name-len" />
     <list type="char" name="name">
       <fieldref>name-len</fieldref>
     </list>
     <reply>
-      <pad bytes="1"/>
-      <field type="bool" name="present"/>
-      <field type="CARD8" name="major-opcode"/>
-      <field type="CARD8" name="first-event"/>
-      <field type="CARD8" name="first-error"/>
+      <pad bytes="1" />
+      <field type="bool" name="present" />
+      <field type="CARD8" name="major-opcode" />
+      <field type="CARD8" name="first-event" />
+      <field type="CARD8" name="first-error" />
     </reply>
   </request>
   <request name="ListExtensions" number="99">
     <reply>
-      <field type="CARD8" name="names-len"/>
-      <pad bytes="24"/>
+      <field type="CARD8" name="names-len" />
+      <pad bytes="24" />
       <list type="string" name="names">
         <fieldref>names-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="ChangeKeyboardMapping" number="100">
-    <field type="CARD8" name="keycode-count"/>
-    <field type="KeyCode" name="first-keycode"/>
-    <field type="CARD8" name="keysyms-per-keycode"/>
+    <field type="CARD8" name="keycode-count" />
+    <field type="KeyCode" name="first-keycode" />
+    <field type="CARD8" name="keysyms-per-keycode" />
     <list type="KeySym" name="keysyms">
       <op op="*">
         <fieldref>keycode-count</fieldref>
@@ -1480,12 +1480,12 @@ authorization from the authors.
     </list>
   </request>
   <request name="GetKeyboardMapping" number="101">
-    <pad bytes="1"/>
-    <field type="KeyCode" name="first-keycode"/>
-    <field type="CARD8" name="count"/>
+    <pad bytes="1" />
+    <field type="KeyCode" name="first-keycode" />
+    <field type="CARD8" name="count" />
     <reply>
-      <field type="byte" name="keysyms-per-keycode"/>
-      <pad bytes="24"/>
+      <field type="byte" name="keysyms-per-keycode" />
+      <pad bytes="24" />
       <list type="KeySym" name="keysyms">
         <op op="*">
           <fieldref>length</fieldref>
@@ -1495,122 +1495,122 @@ authorization from the authors.
     </reply>
   </request>
   <request name="ChangeKeyboardControl" number="102" atomic="false">
-    <pad bytes="1"/>
-    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
+    <pad bytes="1" />
+    <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list" />
   </request>
   <request name="GetKeyboardControl" number="103">
     <reply>
-      <field type="byte" name="global-auto-repeat"/>
-      <field type="CARD32" name="led-mask"/>
-      <field type="CARD8" name="key-click-percent"/>
-      <field type="CARD8" name="bell-percent"/>
-      <field type="CARD16" name="bell-pitch"/>
-      <field type="CARD16" name="bell-duration"/>
-      <pad bytes="2"/>
+      <field type="byte" name="global-auto-repeat" />
+      <field type="CARD32" name="led-mask" />
+      <field type="CARD8" name="key-click-percent" />
+      <field type="CARD8" name="bell-percent" />
+      <field type="CARD16" name="bell-pitch" />
+      <field type="CARD16" name="bell-duration" />
+      <pad bytes="2" />
       <list type="CARD8" name="auto-repeats">
         <value>32</value>
       </list>
     </reply>
   </request>
   <request name="Bell" number="104">
-    <field type="INT8" name="percent"/>
+    <field type="INT8" name="percent" />
   </request>
   <struct name="PointerControl">
-    <field type="CARD16" name="acceleration-numerator"/>
-    <field type="CARD16" name="acceleration-denominator"/>
-    <field type="CARD16" name="threshold"/>
+    <field type="CARD16" name="acceleration-numerator" />
+    <field type="CARD16" name="acceleration-denominator" />
+    <field type="CARD16" name="threshold" />
   </struct>
   <request name="ChangePointerControl" number="105">
-    <pad bytes="1"/>
-    <field type="PointerControl" name="value"/>
-    <field type="bool" name="do-acceleration"/>
-    <field type="bool" name="do-threshold"/>
+    <pad bytes="1" />
+    <field type="PointerControl" name="value" />
+    <field type="bool" name="do-acceleration" />
+    <field type="bool" name="do-threshold" />
   </request>
   <request name="GetPointerControl" number="106">
     <reply>
-      <pad bytes="1"/>
-      <field type="PointerControl" name="value"/>
+      <pad bytes="1" />
+      <field type="PointerControl" name="value" />
     </reply>
   </request>
   <struct name="ScreenSaver">
-    <field type="INT16" name="timeout"/>
-    <field type="INT16" name="interval"/>
-    <field type="CARD8" name="prefer-blanking"/>
-    <field type="CARD8" name="allow-exposures"/>
+    <field type="INT16" name="timeout" />
+    <field type="INT16" name="interval" />
+    <field type="CARD8" name="prefer-blanking" />
+    <field type="CARD8" name="allow-exposures" />
   </struct>
   <request name="SetScreenSaver" number="107">
-    <pad bytes="1"/>
-    <field type="ScreenSaver" name="value"/>
+    <pad bytes="1" />
+    <field type="ScreenSaver" name="value" />
   </request>
   <request name="GetScreenSaver" number="108">
     <reply>
-      <pad bytes="1"/>
-      <field type="ScreenSaver" name="value"/>
+      <pad bytes="1" />
+      <field type="ScreenSaver" name="value" />
     </reply>
   </request>
   <struct name="Host">
-    <field type="CARD8" name="family"/>
-    <pad bytes="1"/>
-    <field type="CARD16" name="address-len"/>
+    <field type="CARD8" name="family" />
+    <pad bytes="1" />
+    <field type="CARD16" name="address-len" />
     <list type="byte" name="address">
       <fieldref>address-len</fieldref>
     </list>
   </struct>
   <request name="ChangeHosts" number="109">
-    <field type="CARD8" name="mode"/>
-    <field type="Host" name="host"/>
+    <field type="CARD8" name="mode" />
+    <field type="Host" name="host" />
   </request>
   <request name="ListHosts" number="110">
     <reply>
-      <field type="byte" name="mode"/>
-      <field type="CARD16" name="hosts-len"/>
-      <pad bytes="22"/>
+      <field type="byte" name="mode" />
+      <field type="CARD16" name="hosts-len" />
+      <pad bytes="22" />
       <list type="Host" name="hosts">
         <fieldref>hosts-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="SetAccessControl" number="111">
-    <field type="CARD8" name="mode"/>
+    <field type="CARD8" name="mode" />
   </request>
   <request name="SetCloseDownMode" number="112">
-    <field type="CloseDownMode" name="mode"/>
+    <field type="CloseDownMode" name="mode" />
   </request>
   <request name="KillClient" number="113">
-    <pad bytes="1"/>
-    <field type="CARD32" name="resource"/>
+    <pad bytes="1" />
+    <field type="CARD32" name="resource" />
   </request>
   <request name="RotateProperties" number="114">
-    <field type="Window" name="window"/>
-    <field type="CARD16" name="atoms-len"/>
-    <field type="INT16" name="delta"/>
+    <field type="Window" name="window" />
+    <field type="CARD16" name="atoms-len" />
+    <field type="INT16" name="delta" />
     <list type="Atom" name="atoms">
       <fieldref>atoms-len</fieldref>
     </list>
   </request>
   <request name="ForceScreenSaver" number="115">
-    <field type="CARD8" name="mode"/>
+    <field type="CARD8" name="mode" />
   </request>
   <request name="SetPointerMapping" number="116">
-    <field type="CARD8" name="map-len"/>
+    <field type="CARD8" name="map-len" />
     <list type="CARD8" name="map">
       <fieldref>map-len</fieldref>
     </list>
     <reply>
-      <field type="MappingStatus" name="status"/>
+      <field type="MappingStatus" name="status" />
     </reply>
   </request>
   <request name="GetPointerMapping" number="117">
     <reply>
-      <field type="CARD8" name="map-len"/>
-      <pad bytes="24"/>
+      <field type="CARD8" name="map-len" />
+      <pad bytes="24" />
       <list type="CARD8" name="map">
         <fieldref>map-len</fieldref>
       </list>
     </reply>
   </request>
   <request name="SetModifierMapping" number="118">
-    <field type="CARD8" name="keycodes-per-modifier"/>
+    <field type="CARD8" name="keycodes-per-modifier" />
     <list type="KeyCode" name="keycodes">
       <op op="*">
         <fieldref>keycodes-per-modifier</fieldref>
@@ -1618,13 +1618,13 @@ authorization from the authors.
       </op>
     </list>
     <reply>
-      <field type="MappingStatus" name="status"/>
+      <field type="MappingStatus" name="status" />
     </reply>
   </request>
   <request name="GetModifierMapping" number="119">
     <reply>
-      <field type="CARD8" name="keycodes-per-modifier"/>
-      <pad bytes="24"/>
+      <field type="CARD8" name="keycodes-per-modifier" />
+      <pad bytes="24" />
       <list type="KeyCode" name="keycodes">
         <op op="*">
           <fieldref>keycodes-per-modifier</fieldref>
@@ -1633,10 +1633,10 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-<!--
+  <!--
     FIXME: NoOperation should allow specifying payload length
     but geez, malloc()ing a 262140 byte buffer just so I have something
     to hand to write(2) seems silly...!
   -->
-  <request name="NoOperation" number="127"/>
+  <request name="NoOperation" number="127" />
 </protocol>


More information about the xcb-commit mailing list