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

Alp Toker alp at kemper.freedesktop.org
Wed Mar 15 08:24:33 PST 2006


 xcb-proto/src/extensions/bigreq.xml      |    2 
 xcb-proto/src/extensions/composite.xml   |   18 +-
 xcb-proto/src/extensions/damage.xml      |    8 -
 xcb-proto/src/extensions/dpms.xml        |   16 +-
 xcb-proto/src/extensions/glx.xml         |  194 ++++++++++++-------------
 xcb-proto/src/extensions/randr.xml       |    8 -
 xcb-proto/src/extensions/record.xml      |   16 +-
 xcb-proto/src/extensions/render.xml      |   62 ++++----
 xcb-proto/src/extensions/res.xml         |    8 -
 xcb-proto/src/extensions/screensaver.xml |   10 -
 xcb-proto/src/extensions/shape.xml       |   18 +-
 xcb-proto/src/extensions/shm.xml         |   12 -
 xcb-proto/src/extensions/sync.xml        |   28 +--
 xcb-proto/src/extensions/xc_misc.xml     |    6 
 xcb-proto/src/extensions/xevie.xml       |   10 -
 xcb-proto/src/extensions/xf86dri.xml     |   24 +--
 xcb-proto/src/extensions/xfixes.xml      |   58 +++----
 xcb-proto/src/extensions/xprint.xml      |   50 +++---
 xcb-proto/src/extensions/xv.xml          |   40 ++---
 xcb-proto/src/extensions/xvmc.xml        |   18 +-
 xcb-proto/src/xproto.xml                 |  240 +++++++++++++++----------------
 21 files changed, 423 insertions(+), 423 deletions(-)

New commits:
diff-tree 8ee8cb3f2eb544a8a09309ada9c357f5f56a41f6 (from b8e918f567081c689493c5ad6c174f3477688ff6)
Author: Alp Toker <alp at atoker.com>
Date:   Wed Mar 15 16:08:34 2006 +0000

    s/opcode/number standardization

diff --git a/xcb-proto/src/extensions/bigreq.xml b/xcb-proto/src/extensions/bigreq.xml
index 7c35c55..e489015 100644
--- a/xcb-proto/src/extensions/bigreq.xml
+++ b/xcb-proto/src/extensions/bigreq.xml
@@ -26,7 +26,7 @@ sale, use or other dealings in this Soft
 authorization from the authors.
 -->
 <extension header="bigreq" xname="BIG-REQUESTS" name="BigRequests">
-  <request name="Enable" opcode="0">
+  <request name="Enable" number="0">
     <reply>
       <pad bytes="1"/>
       <field type="CARD32" name="maximum-request-length"/>
diff --git a/xcb-proto/src/extensions/composite.xml b/xcb-proto/src/extensions/composite.xml
index d09e2b8..b19ac6e 100644
--- a/xcb-proto/src/extensions/composite.xml
+++ b/xcb-proto/src/extensions/composite.xml
@@ -30,7 +30,7 @@ authorization from the authors.
     <item name="automatic"/>
     <item name="manual"/>
   </enum>
-  <request name="QueryVersion" opcode="0">
+  <request name="QueryVersion" number="0">
     <field type="VERSION" name="client-version"/>
     <reply>
       <pad bytes="1"/>
@@ -38,32 +38,32 @@ authorization from the authors.
       <pad bytes="16"/>
     </reply>
   </request>
-  <request name="RedirectWindow" opcode="1">
+  <request name="RedirectWindow" number="1">
     <field type="WINDOW" name="window"/>
     <field type="UpdateType" name="update"/>
     <pad bytes="3"/>
   </request>
-  <request name="RedirectSubwindows" opcode="2">
+  <request name="RedirectSubwindows" number="2">
     <field type="WINDOW" name="window"/>
     <field type="UpdateType" name="update"/>
     <pad bytes="3"/>
   </request>
-  <request name="UnredirectWindow" opcode="3">
+  <request name="UnredirectWindow" number="3">
     <field type="WINDOW" name="window"/>
     <field type="UpdateType" name="update"/>
     <pad bytes="3"/>
   </request>
-  <request name="UnredirectSubwindows" opcode="4">
+  <request name="UnredirectSubwindows" number="4">
     <field type="WINDOW" name="window"/>
     <field type="UpdateType" name="update"/>
     <pad bytes="3"/>
   </request>
-  <request name="CreateRegionFromBorderClip" opcode="5">
+  <request name="CreateRegionFromBorderClip" number="5">
     <field type="REGION" name="region"/>
     <field type="WINDOW" name="window"/>
   </request>
 <!-- Version 0.2 additions -->
-  <request name="NameWindowPixmap" opcode="6">
+  <request name="NameWindowPixmap" number="6">
     <field type="WINDOW" name="window"/>
     <field type="PIXMAP" name="pixmap"/>
   </request>
@@ -73,7 +73,7 @@ authorization from the authors.
     <field type="WINDOW" name="child"/>
     <field type="POINT"/>
   </struct>
-  <request name="RedirectCoordinate" opcode="7">
+  <request name="RedirectCoordinate" number="7">
     <field type="WINDOW" name="window"/>
     <field type="BOOL" name="redirect"/>
     <pad bytes="3"/>
@@ -87,7 +87,7 @@ authorization from the authors.
     <field type="POINT"/>
     <pad bytes="4"/>
   </event>
-  <request name="TransformCoordinate" opcode="8">
+  <request name="TransformCoordinate" number="8">
     <field type="WINDOW" name="window"/>
     <field type="CARD32" name="serial-number"/>
     <field type="POINT"/>
diff --git a/xcb-proto/src/extensions/damage.xml b/xcb-proto/src/extensions/damage.xml
index e34ea46..7f9570a 100644
--- a/xcb-proto/src/extensions/damage.xml
+++ b/xcb-proto/src/extensions/damage.xml
@@ -34,7 +34,7 @@ authorization from the authors.
     <item name="bounding-box"/>
     <item name="non-empty"/>
   </enum>
-  <request name="QueryVersion" opcode="0">
+  <request name="QueryVersion" number="0">
     <field type="CARD32" name="client-major-version"/>
     <field type="CARD32" name="client-minor-version"/>
     <reply>
@@ -44,16 +44,16 @@ authorization from the authors.
       <pad bytes="16"/>
     </reply>
   </request>
-  <request name="Create" opcode="1">
+  <request name="Create" number="1">
     <field type="DAMAGE" name="damage"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="ReportLevel" name="level"/>
     <pad bytes="3"/>
   </request>
-  <request name="Destroy" opcode="2">
+  <request name="Destroy" number="2">
     <field type="DAMAGE" name="damage"/>
   </request>
-  <request name="Subtract" opcode="3">
+  <request name="Subtract" number="3">
     <field type="DAMAGE" name="damage"/>
     <field type="REGION" name="repair"/>
     <field type="REGION" name="parts"/>
diff --git a/xcb-proto/src/extensions/dpms.xml b/xcb-proto/src/extensions/dpms.xml
index 849dbd6..c0daf10 100644
--- a/xcb-proto/src/extensions/dpms.xml
+++ b/xcb-proto/src/extensions/dpms.xml
@@ -26,20 +26,20 @@ sale, use or other dealings in this Soft
 authorization from the authors.
 -->
 <extension header="dpms" xname="DPMS" name="DPMS">
-  <request name="GetVersion" opcode="0">
+  <request name="GetVersion" number="0">
     <field type="VERSION" name="client-version"/>
     <reply>
       <pad bytes="1"/>
       <field type="VERSION" name="server-version"/>
     </reply>
   </request>
-  <request name="Capable" opcode="1">
+  <request name="Capable" number="1">
     <reply>
       <pad bytes="1"/>
       <field type="BOOL" name="capable"/>
     </reply>
   </request>
-  <request name="GetTimeouts" opcode="2">
+  <request name="GetTimeouts" number="2">
     <reply>
       <pad bytes="1"/>
       <field type="CARD16" name="standby-timeout"/>
@@ -47,17 +47,17 @@ authorization from the authors.
       <field type="CARD16" name="off-timeout"/>
     </reply>
   </request>
-  <request name="SetTimeouts" opcode="3">
+  <request name="SetTimeouts" number="3">
     <field type="CARD16" name="standby-timeout"/>
     <field type="CARD16" name="suspend-timeout"/>
     <field type="CARD16" name="off-timeout"/>
   </request>
-  <request name="Enable" opcode="4"/>
-  <request name="Disable" opcode="5"/>
-  <request name="ForceLevel" opcode="6">
+  <request name="Enable" number="4"/>
+  <request name="Disable" number="5"/>
+  <request name="ForceLevel" number="6">
     <field type="CARD16" name="power-level"/>
   </request>
-  <request name="Info" opcode="7">
+  <request name="Info" number="7">
     <reply>
       <pad bytes="1"/>
       <field type="CARD16" name="power-level"/>
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index 627f759..0351df2 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -105,11 +105,11 @@ The patch that fixed this server bug in 
     </item>
   </enum>
 <!-- Requests -->
-  <request name="Render" opcode="1" combine-adjacent="true">
+  <request name="Render" number="1" combine-adjacent="true">
     <field type="CARD32" name="context_tag"/>
     <list type="BYTE" name="data"/>
   </request>
-  <request name="RenderLarge" opcode="2">
+  <request name="RenderLarge" number="2">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD16" name="request_num"/>
     <field type="CARD16" name="request_total"/>
@@ -118,7 +118,7 @@ The patch that fixed this server bug in 
       <fieldref>data_len</fieldref>
     </list>
   </request>
-  <request name="CreateContext" opcode="3">
+  <request name="CreateContext" number="3">
     <field type="glx:CONTEXT" name="context"/>
     <field type="VISUALID" name="visual"/>
     <field type="CARD32" name="screen"/>
@@ -126,10 +126,10 @@ The patch that fixed this server bug in 
     <field type="BOOL" name="is_direct"/>
     <pad bytes="3"/>
   </request>
-  <request name="DestroyContext" opcode="4">
+  <request name="DestroyContext" number="4">
     <field type="glx:CONTEXT" name="context"/>
   </request>
-  <request name="MakeCurrent" opcode="5">
+  <request name="MakeCurrent" number="5">
     <field type="glx:DRAWABLE" name="drawable"/>
     <field type="glx:CONTEXT" name="context"/>
     <field type="CARD32" name="old_context_tag"/>
@@ -139,7 +139,7 @@ The patch that fixed this server bug in 
       <pad bytes="20"/>
     </reply>
   </request>
-  <request name="IsDirect" opcode="6">
+  <request name="IsDirect" number="6">
     <field type="glx:CONTEXT" name="context"/>
     <reply>
       <pad bytes="1"/>
@@ -147,7 +147,7 @@ The patch that fixed this server bug in 
       <pad bytes="23"/>
     </reply>
   </request>
-  <request name="QueryVersion" opcode="7">
+  <request name="QueryVersion" number="7">
     <field type="CARD32" name="major_version"/>
     <field type="CARD32" name="minor_version"/>
     <reply>
@@ -157,13 +157,13 @@ The patch that fixed this server bug in 
       <pad bytes="16"/>
     </reply>
   </request>
-  <request name="WaitGL" opcode="8">
+  <request name="WaitGL" number="8">
     <field type="CARD32" name="context_tag"/>
   </request>
-  <request name="WaitX" opcode="9">
+  <request name="WaitX" number="9">
     <field type="CARD32" name="context_tag"/>
   </request>
-  <request name="CopyContext" opcode="10">
+  <request name="CopyContext" number="10">
     <field type="glx:CONTEXT" name="src"/>
     <field type="glx:CONTEXT" name="dest"/>
     <field type="CARD32" name="mask"/>
@@ -235,24 +235,24 @@ The patch that fixed this server bug in 
       <value>0x000ffffff</value>
     </item>
   </enum>
-  <request name="SwapBuffers" opcode="11">
+  <request name="SwapBuffers" number="11">
     <field type="CARD32" name="context_tag"/>
     <field type="glx:DRAWABLE" name="drawable"/>
   </request>
-  <request name="UseXFont" opcode="12">
+  <request name="UseXFont" number="12">
     <field type="CARD32" 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" opcode="13">
+  <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"/>
   </request>
-  <request name="GetVisualConfigs" opcode="14">
+  <request name="GetVisualConfigs" number="14">
     <field type="CARD32" name="screen"/>
     <reply>
       <pad bytes="1"/>
@@ -262,7 +262,7 @@ The patch that fixed this server bug in 
       <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
     </reply>
   </request>
-  <request name="DestroyGLXPixmap" opcode="15">
+  <request name="DestroyGLXPixmap" number="15">
     <field type="glx:PIXMAP" name="glx_pixmap"/>
   </request>
 <!--
@@ -270,12 +270,12 @@ The patch that fixed this server bug in 
 	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" opcode="16">
+  <request name="VendorPrivate" number="16">
     <field type="CARD32" name="vendor_code"/>
     <field type="CARD32" name="context_tag"/>
     <list type="BYTE" name="data"/>
   </request>
-  <request name="VendorPrivateWithReply" opcode="17">
+  <request name="VendorPrivateWithReply" number="17">
     <field type="CARD32" name="vendor_code"/>
     <field type="CARD32" name="context_tag"/>
     <list type="BYTE" name="data"/>
@@ -288,7 +288,7 @@ The patch that fixed this server bug in 
       <list type="BYTE" name="data2"/>
     </reply>
   </request>
-  <request name="QueryExtensionsString" opcode="18">
+  <request name="QueryExtensionsString" number="18">
     <field type="CARD32" name="screen"/>
     <reply>
       <pad bytes="1"/>
@@ -297,7 +297,7 @@ The patch that fixed this server bug in 
       <pad bytes="16"/>
     </reply>
   </request>
-  <request name="QueryServerString" opcode="19">
+  <request name="QueryServerString" number="19">
     <field type="CARD32" name="screen"/>
     <field type="CARD32" name="name"/>
     <reply>
@@ -310,7 +310,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="ClientInfo" opcode="20">
+  <request name="ClientInfo" number="20">
     <field type="CARD32" name="major_version"/>
     <field type="CARD32" name="minor_version"/>
     <field type="CARD32" name="str_len"/>
@@ -319,7 +319,7 @@ The patch that fixed this server bug in 
     </list>
   </request>
 <!-- Start of GLX 1.3 Requests -->
-  <request name="GetFBConfigs" opcode="21">
+  <request name="GetFBConfigs" number="21">
     <field type="CARD32" name="screen"/>
     <reply>
       <pad bytes="1"/>
@@ -329,17 +329,17 @@ The patch that fixed this server bug in 
       <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
     </reply>
   </request>
-  <request name="CreatePixmap" opcode="22">
+  <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"/>
   </request>
-  <request name="DestroyPixmap" opcode="23">
+  <request name="DestroyPixmap" number="23">
     <field type="glx:PIXMAP" name="glx_pixmap"/>
   </request>
-  <request name="CreateNewContext" opcode="24">
+  <request name="CreateNewContext" number="24">
     <field type="glx:CONTEXT" name="context"/>
     <field type="CARD32" name="fbconfig"/>
     <field type="SCREEN" name="screen"/>
@@ -349,7 +349,7 @@ The patch that fixed this server bug in 
     <field type="CARD8" name="reserved1"/>
     <field type="CARD16" name="reserved2"/>
   </request>
-  <request name="QueryContext" opcode="25">
+  <request name="QueryContext" number="25">
     <field type="glx:CONTEXT" name="context"/>
     <reply>
       <pad bytes="1"/>
@@ -358,7 +358,7 @@ The patch that fixed this server bug in 
       <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
     </reply>
   </request>
-  <request name="MakeContextCurrent" opcode="26">
+  <request name="MakeContextCurrent" number="26">
     <field type="CARD32" name="old_context_tag"/>
     <field type="glx:DRAWABLE" name="drawable"/>
     <field type="glx:DRAWABLE" name="read_drawable"/>
@@ -369,17 +369,17 @@ The patch that fixed this server bug in 
       <pad bytes="20"/>
     </reply>
   </request>
-  <request name="CreatePbuffer" opcode="27">
+  <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"/>
   </request>
-  <request name="DestroyPbuffer" opcode="28">
+  <request name="DestroyPbuffer" number="28">
     <field type="PBUFFER" name="pbuffer"/>
   </request>
-  <request name="GetDrawableAttributes" opcode="29">
+  <request name="GetDrawableAttributes" number="29">
     <field type="glx:DRAWABLE" name="drawable"/>
     <reply>
       <pad bytes="1"/>
@@ -388,12 +388,12 @@ The patch that fixed this server bug in 
       <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
     </reply>
   </request>
-  <request name="ChangeDrawableAttributes" opcode="30">
+  <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"/>
   </request>
-  <request name="CreateWindow" opcode="31">
+  <request name="CreateWindow" number="31">
     <field type="SCREEN" name="screen"/>
     <field type="FBCONFIG" name="fbconfig"/>
     <field type="xcb_types:WINDOW" name="window"/>
@@ -401,24 +401,24 @@ The patch that fixed this server bug in 
     <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" opcode="32">
+  <request name="DeleteWindow" number="32">
     <field type="glx:WINDOW" name="glxwindow"/>
   </request>
 <!-- Requests for GL Non-rendering Commands (single ops) -->
-  <request name="NewList" opcode="101">
+  <request name="NewList" number="101">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="list"/>
     <field type="CARD32" name="mode"/>
   </request>
-  <request name="EndList" opcode="102">
+  <request name="EndList" number="102">
     <field type="CARD32" name="context_tag"/>
   </request>
-  <request name="DeleteLists" opcode="103">
+  <request name="DeleteLists" number="103">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="list"/>
     <field type="INT32" name="range"/>
   </request>
-  <request name="GenLists" opcode="104">
+  <request name="GenLists" number="104">
     <field type="CARD32" name="context_tag"/>
     <field type="INT32" name="range"/>
     <reply>
@@ -426,18 +426,18 @@ The patch that fixed this server bug in 
       <field type="CARD32" name="ret_val"/>
     </reply>
   </request>
-  <request name="FeedbackBuffer" opcode="105">
+  <request name="FeedbackBuffer" number="105">
     <field type="CARD32" name="context_tag"/>
     <field type="INT32" name="size"/>
     <field type="INT32" name="type"/>
   </request>
-  <request name="SelectBuffer" opcode="106">
+  <request name="SelectBuffer" number="106">
     <field type="CARD32" 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" opcode="107">
+  <request name="RenderMode" number="107">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="mode"/>
 <!--
@@ -467,23 +467,23 @@ The patch that fixed this server bug in 
       <value>0x1C02</value>
     </item>
   </enum>
-  <request name="Finish" opcode="108">
+  <request name="Finish" number="108">
     <field type="CARD32" name="context_tag"/>
     <reply>
       <pad bytes="1"/>
     </reply>
   </request>
-  <request name="PixelStoref" opcode="109">
+  <request name="PixelStoref" number="109">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="pname"/>
     <field type="FLOAT32" name="datum"/>
   </request>
-  <request name="PixelStorei" opcode="110">
+  <request name="PixelStorei" number="110">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="pname"/>
     <field type="INT32" name="datum"/>
   </request>
-  <request name="ReadPixels" opcode="111">
+  <request name="ReadPixels" number="111">
     <field type="CARD32" name="context_tag"/>
     <field type="INT32" name="x"/>
     <field type="INT32" name="y"/>
@@ -505,7 +505,7 @@ The patch that fixed this server bug in 
 	but for now... grrrr
 	Starts on page 58/180
 	-->
-  <request name="GetBooleanv" opcode="112">
+  <request name="GetBooleanv" number="112">
     <field type="CARD32" name="context_tag"/>
     <field type="INT32" name="pname"/>
     <reply>
@@ -519,7 +519,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetClipPlane" opcode="113">
+  <request name="GetClipPlane" number="113">
     <field type="CARD32" name="context_tag"/>
     <field type="INT32" name="plane"/>
     <reply>
@@ -528,7 +528,7 @@ The patch that fixed this server bug in 
       <list type="FLOAT64" name="data"/>
     </reply>
   </request>
-  <request name="GetDoublev" opcode="114">
+  <request name="GetDoublev" number="114">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="pname"/>
     <reply>
@@ -542,14 +542,14 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetError" opcode="115">
+  <request name="GetError" number="115">
     <field type="CARD32" name="context_tag"/>
     <reply>
       <pad bytes="1"/>
       <field type="INT32" name="error"/>
     </reply>
   </request>
-  <request name="GetFloatv" opcode="116">
+  <request name="GetFloatv" number="116">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="pname"/>
     <reply>
@@ -563,7 +563,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetIntegerv" opcode="117">
+  <request name="GetIntegerv" number="117">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="pname"/>
     <reply>
@@ -577,7 +577,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetLightfv" opcode="118">
+  <request name="GetLightfv" number="118">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="light"/>
     <field type="CARD32" name="pname"/>
@@ -592,7 +592,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetLightiv" opcode="119">
+  <request name="GetLightiv" number="119">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="light"/>
     <field type="CARD32" name="pname"/>
@@ -607,7 +607,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetMapdv" opcode="120">
+  <request name="GetMapdv" number="120">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="query"/>
@@ -622,7 +622,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetMapfv" opcode="121">
+  <request name="GetMapfv" number="121">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="query"/>
@@ -637,7 +637,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetMapiv" opcode="122">
+  <request name="GetMapiv" number="122">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="query"/>
@@ -652,7 +652,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetMaterialfv" opcode="123">
+  <request name="GetMaterialfv" number="123">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="face"/>
     <field type="CARD32" name="pname"/>
@@ -667,7 +667,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetMaterialiv" opcode="124">
+  <request name="GetMaterialiv" number="124">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="face"/>
     <field type="CARD32" name="pname"/>
@@ -682,7 +682,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetPixelMapfv" opcode="125">
+  <request name="GetPixelMapfv" number="125">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="map"/>
     <reply>
@@ -696,7 +696,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetPixelMapuiv" opcode="126">
+  <request name="GetPixelMapuiv" number="126">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="map"/>
     <reply>
@@ -710,7 +710,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetPixelMapusv" opcode="127">
+  <request name="GetPixelMapusv" number="127">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="map"/>
     <reply>
@@ -724,7 +724,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetPolygonStipple" opcode="128">
+  <request name="GetPolygonStipple" number="128">
     <field type="CARD32" name="context_tag"/>
     <field type="BOOL" name="lsb_first"/>
     <reply>
@@ -733,7 +733,7 @@ The patch that fixed this server bug in 
       <list type="BYTE" name="data"/>
     </reply>
   </request>
-  <request name="GetString" opcode="129">
+  <request name="GetString" number="129">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="name"/>
     <reply>
@@ -746,7 +746,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetTexEnvfv" opcode="130">
+  <request name="GetTexEnvfv" number="130">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="pname"/>
@@ -761,7 +761,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetTexEnviv" opcode="131">
+  <request name="GetTexEnviv" number="131">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="pname"/>
@@ -776,7 +776,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetTexGendv" opcode="132">
+  <request name="GetTexGendv" number="132">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="coord"/>
     <field type="CARD32" name="pname"/>
@@ -791,7 +791,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetTexGenfv" opcode="133">
+  <request name="GetTexGenfv" number="133">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="coord"/>
     <field type="CARD32" name="pname"/>
@@ -806,7 +806,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetTexGeniv" opcode="134">
+  <request name="GetTexGeniv" number="134">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="coord"/>
     <field type="CARD32" name="pname"/>
@@ -821,7 +821,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetTexImage" opcode="135">
+  <request name="GetTexImage" number="135">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="INT32" name="level"/>
@@ -838,7 +838,7 @@ The patch that fixed this server bug in 
       <list type="BYTE" name="data"/>
     </reply>
   </request>
-  <request name="GetTexParameterfv" opcode="136">
+  <request name="GetTexParameterfv" number="136">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="pname"/>
@@ -853,7 +853,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetTexParameteriv" opcode="137">
+  <request name="GetTexParameteriv" number="137">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="pname"/>
@@ -868,7 +868,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetTexLevelParameterfv" opcode="138">
+  <request name="GetTexLevelParameterfv" number="138">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="INT32" name="level"/>
@@ -884,7 +884,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetTexLevelParameteriv" opcode="139">
+  <request name="GetTexLevelParameteriv" number="139">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="INT32" name="level"/>
@@ -900,7 +900,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="IsList" opcode="141">
+  <request name="IsList" number="141">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="list"/>
     <reply>
@@ -908,10 +908,10 @@ The patch that fixed this server bug in 
       <field type="BOOL32" name="ret_val"/>
     </reply>
   </request>
-  <request name="Flush" opcode="142">
+  <request name="Flush" number="142">
     <field type="CARD32" name="context_tag"/>
   </request>
-  <request name="AreTexturesResident" opcode="143">
+  <request name="AreTexturesResident" number="143">
     <field type="CARD32" name="context_tag"/>
     <field type="INT32" name="n"/>
     <list type="CARD32" name="textures">
@@ -924,14 +924,14 @@ The patch that fixed this server bug in 
       <list type="BOOL" name="data"/>
     </reply>
   </request>
-  <request name="DeleteTextures" opcode="144">
+  <request name="DeleteTextures" number="144">
     <field type="CARD32" name="context_tag"/>
     <field type="INT32" name="n"/>
     <list type="CARD32" name="textures">
       <fieldref>n</fieldref>
     </list>
   </request>
-  <request name="GenTextures" opcode="145">
+  <request name="GenTextures" number="145">
     <field type="CARD32" name="context_tag"/>
     <field type="INT32" name="n"/>
     <reply>
@@ -940,7 +940,7 @@ The patch that fixed this server bug in 
       <list type="CARD32" name="data"/>
     </reply>
   </request>
-  <request name="IsTexture" opcode="146">
+  <request name="IsTexture" number="146">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="texture"/>
     <reply>
@@ -948,7 +948,7 @@ The patch that fixed this server bug in 
       <field type="BOOL32" name="ret_val"/>
     </reply>
   </request>
-  <request name="GetColorTable" opcode="147">
+  <request name="GetColorTable" number="147">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="format"/>
@@ -962,7 +962,7 @@ The patch that fixed this server bug in 
       <list type="BYTE" name="data"/>
     </reply>
   </request>
-  <request name="GetColorTableParameterfv" opcode="148">
+  <request name="GetColorTableParameterfv" number="148">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="pname"/>
@@ -977,7 +977,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetColorTableParameteriv" opcode="149">
+  <request name="GetColorTableParameteriv" number="149">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="pname"/>
@@ -992,7 +992,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetConvolutionFilter" opcode="150">
+  <request name="GetConvolutionFilter" number="150">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="format"/>
@@ -1007,7 +1007,7 @@ The patch that fixed this server bug in 
       <list type="BYTE" name="data"/>
     </reply>
   </request>
-  <request name="GetConvolutionParameterfv" opcode="151">
+  <request name="GetConvolutionParameterfv" number="151">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="pname"/>
@@ -1022,7 +1022,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetConvolutionParameteriv" opcode="152">
+  <request name="GetConvolutionParameteriv" number="152">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="pname"/>
@@ -1037,7 +1037,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetSeparableFilter" opcode="153">
+  <request name="GetSeparableFilter" number="153">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="format"/>
@@ -1052,7 +1052,7 @@ The patch that fixed this server bug in 
       <list type="BYTE" name="rows_and_cols"/>
     </reply>
   </request>
-  <request name="GetHistogram" opcode="154">
+  <request name="GetHistogram" number="154">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="format"/>
@@ -1067,7 +1067,7 @@ The patch that fixed this server bug in 
       <list type="BYTE" name="data"/>
     </reply>
   </request>
-  <request name="GetHistogramParameterfv" opcode="155">
+  <request name="GetHistogramParameterfv" number="155">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="pname"/>
@@ -1082,7 +1082,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetHistogramParameteriv" opcode="156">
+  <request name="GetHistogramParameteriv" number="156">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="pname"/>
@@ -1097,7 +1097,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetMinmax" opcode="157">
+  <request name="GetMinmax" number="157">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="format"/>
@@ -1110,7 +1110,7 @@ The patch that fixed this server bug in 
       <list type="BYTE" name="data"/>
     </reply>
   </request>
-  <request name="GetMinmaxParameterfv" opcode="158">
+  <request name="GetMinmaxParameterfv" number="158">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="pname"/>
@@ -1125,7 +1125,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetMinmaxParameteriv" opcode="159">
+  <request name="GetMinmaxParameteriv" number="159">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="pname"/>
@@ -1150,7 +1150,7 @@ The patch that fixed this server bug in 
 	GL_ARB_texture_compression
 	http://oss.sgi.com/projects/ogl-sample/registry/ARB/texture_compression.txt
 	-->
-  <request name="GetCompressedTexImageARB" opcode="160">
+  <request name="GetCompressedTexImageARB" number="160">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="INT32" name="level"/>
@@ -1166,14 +1166,14 @@ The patch that fixed this server bug in 
 	GL_ARB_occlusion_query
 	http://oss.sgi.com/projects/ogl-sample/registry/ARB/occlusion_query.txt
 	-->
-  <request name="DeleteQueriesARB" opcode="161">
+  <request name="DeleteQueriesARB" number="161">
     <field type="CARD32" name="context_tag"/>
     <field type="INT32" name="n"/>
     <list type="CARD32" name="ids">
       <fieldref>n</fieldref>
     </list>
   </request>
-  <request name="GenQueriesARB" opcode="162">
+  <request name="GenQueriesARB" number="162">
     <field type="CARD32" name="context_tag"/>
     <field type="INT32" name="n"/>
     <reply>
@@ -1182,7 +1182,7 @@ The patch that fixed this server bug in 
       <list type="CARD32" name="data"/>
     </reply>
   </request>
-  <request name="IsQueryARB" opcode="163">
+  <request name="IsQueryARB" number="163">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="id"/>
     <reply>
@@ -1190,7 +1190,7 @@ The patch that fixed this server bug in 
       <field type="BOOL32" name="ret_val"/>
     </reply>
   </request>
-  <request name="GetQueryivARB" opcode="164">
+  <request name="GetQueryivARB" number="164">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="target"/>
     <field type="CARD32" name="pname"/>
@@ -1205,7 +1205,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetQueryObjectivARB" opcode="165">
+  <request name="GetQueryObjectivARB" number="165">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="id"/>
     <field type="CARD32" name="pname"/>
@@ -1220,7 +1220,7 @@ The patch that fixed this server bug in 
       </list>
     </reply>
   </request>
-  <request name="GetQueryObjectuivARB" opcode="166">
+  <request name="GetQueryObjectuivARB" number="166">
     <field type="CARD32" name="context_tag"/>
     <field type="CARD32" name="id"/>
     <field type="CARD32" name="pname"/>
diff --git a/xcb-proto/src/extensions/randr.xml b/xcb-proto/src/extensions/randr.xml
index 19f09c5..d6f2f30 100644
--- a/xcb-proto/src/extensions/randr.xml
+++ b/xcb-proto/src/extensions/randr.xml
@@ -54,7 +54,7 @@ authorization from the authors.
       <fieldref>n-rates</fieldref>
     </list>
   </struct>
-  <request name="QueryVersion" opcode="0">
+  <request name="QueryVersion" number="0">
     <field type="CARD32" name="major-version"/>
     <field type="CARD32" name="minor-version"/>
     <reply>
@@ -65,7 +65,7 @@ authorization from the authors.
     </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! -->
-  <request name="SetScreenConfig" opcode="2">
+  <request name="SetScreenConfig" number="2">
     <field type="WINDOW" name="drawable"/>
     <field type="TIMESTAMP" name="time"/>
     <field type="TIMESTAMP" name="config-time"/>
@@ -96,7 +96,7 @@ authorization from the authors.
       <value>3</value>
     </item>
   </enum>
-  <request name="SelectInput" opcode="4">
+  <request name="SelectInput" number="4">
     <field type="WINDOW" name="window"/>
     <field type="CARD16" name="enable"/>
     <pad bytes="2"/>
@@ -104,7 +104,7 @@ authorization from the authors.
 <!--
 	I think this is correct.  It works. though I believe n-info is a bit high...
 	-->
-  <request name="GetScreenInfo" opcode="5">
+  <request name="GetScreenInfo" number="5">
     <field type="WINDOW" name="window"/>
     <reply>
       <field type="CARD8" name="rotations"/>
diff --git a/xcb-proto/src/extensions/record.xml b/xcb-proto/src/extensions/record.xml
index 3ddd930..fbd244a 100644
--- a/xcb-proto/src/extensions/record.xml
+++ b/xcb-proto/src/extensions/record.xml
@@ -87,7 +87,7 @@ authorization from the authors.
     <field type="CARD32" name="invalid-record"/>
   </error>
 <!-- Requests -->
-  <request name="QueryVersion" opcode="0">
+  <request name="QueryVersion" number="0">
     <field type="CARD16" name="major-version"/>
     <field type="CARD16" name="minor-version"/>
     <reply>
@@ -96,7 +96,7 @@ authorization from the authors.
       <field type="CARD16" name="minor-version"/>
     </reply>
   </request>
-  <request name="CreateContext" opcode="1">
+  <request name="CreateContext" number="1">
     <field type="record:CONTEXT" name="context"/>
     <field type="ElementHeader" name="element-header"/>
     <pad bytes="3"/>
@@ -109,7 +109,7 @@ authorization from the authors.
       <fieldref>num-ranges</fieldref>
     </list>
   </request>
-  <request name="RegisterClients" opcode="2">
+  <request name="RegisterClients" number="2">
     <field type="record:CONTEXT" name="context"/>
     <field type="ElementHeader" name="element-header"/>
     <pad bytes="3"/>
@@ -122,14 +122,14 @@ authorization from the authors.
       <fieldref>num-ranges</fieldref>
     </list>
   </request>
-  <request name="UnregisterClients" opcode="3">
+  <request name="UnregisterClients" number="3">
     <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" opcode="4">
+  <request name="GetContext" number="4">
     <field type="record:CONTEXT" name="context"/>
     <reply>
       <field type="BOOL" name="enabled"/>
@@ -142,7 +142,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="EnableContext" opcode="5">
+  <request name="EnableContext" number="5">
     <field type="record:CONTEXT" name="context"/>
     <reply>
       <field type="CARD8" name="category"/>
@@ -156,10 +156,10 @@ authorization from the authors.
       <list type="BYTE" name="data"/>
     </reply>
   </request>
-  <request name="DisableContext" opcode="6">
+  <request name="DisableContext" number="6">
     <field type="record:CONTEXT" name="context"/>
   </request>
-  <request name="FreeContext" opcode="7">
+  <request name="FreeContext" number="7">
     <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 ea0dd91..4c39fc0 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -235,7 +235,7 @@ for licensing information.
     <field type="POINT"/>
     <field type="POINT" name="offset"/>
   </struct>
-  <request name="QueryVersion" opcode="0">
+  <request name="QueryVersion" number="0">
     <field type="CARD32" name="client-major-version"/>
     <field type="CARD32" name="client-minor-version"/>
     <reply>
@@ -245,7 +245,7 @@ for licensing information.
       <pad bytes="16"/>
     </reply>
   </request>
-  <request name="QueryPictFormats" opcode="1">
+  <request name="QueryPictFormats" number="1">
     <reply>
       <pad bytes="1"/>
       <field type="CARD32" name="num-formats"/>
@@ -267,7 +267,7 @@ for licensing information.
     </reply>
   </request>
 <!-- from version 0.7 -->
-  <request name="QueryPictIndexValues" opcode="2">
+  <request name="QueryPictIndexValues" number="2">
     <field type="PICTFORMAT" name="format"/>
     <reply>
       <pad bytes="1"/>
@@ -279,26 +279,26 @@ for licensing information.
     </reply>
   </request>
 <!-- FIXME: opcode 3 reserved for QueryDithers -->
-  <request name="CreatePicture" opcode="4">
+  <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"/>
   </request>
-  <request name="ChangePicture" opcode="5">
+  <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"/>
   </request>
-  <request name="SetPictureClipRectangles" opcode="6">
+  <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"/>
   </request>
-  <request name="FreePicture" opcode="7">
+  <request name="FreePicture" number="7">
     <field type="PICTURE" name="picture"/>
   </request>
-  <request name="Composite" opcode="8">
+  <request name="Composite" number="8">
     <field type="CARD8" name="op"/>
     <pad bytes="3"/>
     <field type="PICTURE" name="src"/>
@@ -314,7 +314,7 @@ for licensing information.
     <field type="CARD16" name="height"/>
   </request>
 <!-- opcode 9 reserved for Scale -->
-  <request name="Trapezoids" opcode="10">
+  <request name="Trapezoids" number="10">
     <field type="CARD8" name="op"/>
     <pad bytes="3"/>
     <field type="PICTURE" name="src"/>
@@ -324,7 +324,7 @@ for licensing information.
     <field type="INT16" name="src-y"/>
     <list type="TRAP" name="traps"/>
   </request>
-  <request name="Triangles" opcode="11">
+  <request name="Triangles" number="11">
     <field type="CARD8" name="op"/>
     <pad bytes="3"/>
     <field type="PICTURE" name="src"/>
@@ -334,7 +334,7 @@ for licensing information.
     <field type="INT16" name="src-y"/>
     <list type="TRIANGLE" name="triangles"/>
   </request>
-  <request name="TriStrip" opcode="12">
+  <request name="TriStrip" number="12">
     <field type="CARD8" name="op"/>
     <pad bytes="3"/>
     <field type="PICTURE" name="src"/>
@@ -344,7 +344,7 @@ for licensing information.
     <field type="INT16" name="src-y"/>
     <list type="POINTFIX" name="points"/>
   </request>
-  <request name="TriFan" opcode="13">
+  <request name="TriFan" number="13">
     <field type="CARD8" name="op"/>
     <pad bytes="3"/>
     <field type="PICTURE" name="src"/>
@@ -357,18 +357,18 @@ for licensing information.
 <!-- opcode 14 reserved for ColorTrapezoids -->
 <!-- opcode 15 reserved for ColorTriangles -->
 <!-- opcode 16 reserved for Transform -->
-  <request name="CreateGlyphSet" opcode="17">
+  <request name="CreateGlyphSet" number="17">
     <field type="GLYPHSET" name="gsid"/>
     <field type="PICTFORMAT" name="format"/>
   </request>
-  <request name="ReferenceGlyphSet" opcode="18">
+  <request name="ReferenceGlyphSet" number="18">
     <field type="GLYPHSET" name="gsid"/>
     <field type="GLYPHSET" name="existing"/>
   </request>
-  <request name="FreeGlyphSet" opcode="19">
+  <request name="FreeGlyphSet" number="19">
     <field type="GLYPHSET" name="glyphset"/>
   </request>
-  <request name="AddGlyphs" opcode="20">
+  <request name="AddGlyphs" number="20">
     <field type="GLYPHSET" name="glyphset"/>
     <field type="CARD32" name="glyphs-len"/>
     <list type="CARD32" name="glyphids">
@@ -380,7 +380,7 @@ for licensing information.
     <list type="BYTE" name="data"/>
   </request>
 <!-- opcode 21 reserved for AddGlyphsFromPicture -->
-  <request name="FreeGlyphs" opcode="22">
+  <request name="FreeGlyphs" number="22">
     <field type="GLYPHSET" name="glyphset"/>
     <list type="GLYPH" name="glyphs"/>
   </request>
@@ -403,7 +403,7 @@ for licensing information.
     <field type="GLYPHELT8" name="glyphelt"/>
     <field type="GLYPHSETELT" name="glyphset"/>
   </union>
-  <request name="CompositeGlyphs8" opcode="23">
+  <request name="CompositeGlyphs8" number="23">
     <field type="CARD8" name="op"/>
     <pad bytes="3"/>
     <field type="PICTURE" name="src"/>
@@ -427,7 +427,7 @@ for licensing information.
     <field type="GLYPHELT16" name="glyphelt"/>
     <field type="GLYPHSETELT" name="glyphset"/>
   </union>
-  <request name="CompositeGlyphs16" opcode="24">
+  <request name="CompositeGlyphs16" number="24">
     <field type="CARD8" name="op"/>
     <pad bytes="3"/>
     <field type="PICTURE" name="src"/>
@@ -450,7 +450,7 @@ for licensing information.
     <field type="GLYPHELT32" name="glyphelt"/>
     <field type="GLYPHSETELT" name="glyphset"/>
   </union>
-  <request name="CompositeGlyphs32" opcode="25">
+  <request name="CompositeGlyphs32" number="25">
     <field type="CARD8" name="op"/>
     <pad bytes="3"/>
     <field type="PICTURE" name="src"/>
@@ -461,7 +461,7 @@ for licensing information.
     <list type="GLYPHITEM32" name="glyphcmds"/>
   </request>
 <!-- new in version 0.1 -->
-  <request name="FillRectangles" opcode="26">
+  <request name="FillRectangles" number="26">
     <field type="CARD8" name="op"/>
     <pad bytes="3"/>
     <field type="PICTURE" name="dst"/>
@@ -469,7 +469,7 @@ for licensing information.
     <list type="RECTANGLE" name="rects"/>
   </request>
 <!-- new in version 0.5 -->
-  <request name="CreateCursor" opcode="27">
+  <request name="CreateCursor" number="27">
     <field type="CURSOR" name="cid"/>
     <field type="PICTURE" name="source"/>
     <field type="POINT"/>
@@ -486,11 +486,11 @@ for licensing information.
     <field type="FIXED" name="matrix32"/>
     <field type="FIXED" name="matrix33"/>
   </struct>
-  <request name="SetPictureTransform" opcode="28">
+  <request name="SetPictureTransform" number="28">
     <field type="PICTURE" name="picture"/>
     <field type="TRANSFORM" name="transform"/>
   </request>
-  <request name="QueryFilters" opcode="29">
+  <request name="QueryFilters" number="29">
     <field type="DRAWABLE" name="drawable"/>
     <reply>
       <pad bytes="1"/>
@@ -505,7 +505,7 @@ for licensing information.
       </list>
     </reply>
   </request>
-  <request name="SetPictureFilter" opcode="30">
+  <request name="SetPictureFilter" number="30">
     <field type="PICTURE" name="picture"/>
     <field type="CARD16" name="filter-len"/>
     <list type="char" name="filter">
@@ -518,13 +518,13 @@ for licensing information.
     <field type="CURSOR" name="cursor"/>
     <field type="CARD32" name="delay"/>
   </struct>
-  <request name="CreateAnimCursor" opcode="31">
+  <request name="CreateAnimCursor" number="31">
     <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="AddTrapezoids" opcode="32">
+  <request name="AddTrapezoids" number="32">
     <field type="PICTURE" name="picture"/>
     <field type="POINT" name="offset"/>
     <list type="TRAP" name="trapezoids"/>
@@ -536,11 +536,11 @@ for licensing information.
     <item name="pad"/>
     <item name="reflect"/>
   </enum>
-  <request name="CreateSolidFill" opcode="33">
+  <request name="CreateSolidFill" number="33">
     <field type="PICTURE" name="pid"/>
     <field type="COLOR" name="color"/>
   </request>
-  <request name="CreateLinearGradient" opcode="34">
+  <request name="CreateLinearGradient" number="34">
     <field type="PICTURE" name="pid"/>
     <field type="POINTFIX" name="p1"/>
     <field type="POINTFIX" name="p2"/>
@@ -551,7 +551,7 @@ for licensing information.
     <list type="COLOR" name="stop-colors"/>
   <!-- ..but renderproto.h says CARD32 n-stops for all these -->
   </request>
-  <request name="CreateRadialGradient" opcode="35">
+  <request name="CreateRadialGradient" number="35">
     <field type="PICTURE" name="pid"/>
     <field type="POINTFIX" name="inner-center"/>
     <field type="POINTFIX" name="outer-center"/>
@@ -562,7 +562,7 @@ for licensing information.
     <list type="FIXED" name="stops"/>
     <list type="COLOR" name="stop-colors"/>
   </request>
-  <request name="CreateConicalGradient" opcode="36">
+  <request name="CreateConicalGradient" number="36">
     <field type="PICTURE" name="pid"/>
     <field type="POINTFIX" name="center"/>
     <field type="FIXED" name="angle"/>
diff --git a/xcb-proto/src/extensions/res.xml b/xcb-proto/src/extensions/res.xml
index e1c1519..db94aaa 100644
--- a/xcb-proto/src/extensions/res.xml
+++ b/xcb-proto/src/extensions/res.xml
@@ -34,7 +34,7 @@ authorization from the authors.
     <field type="CARD32" name="resource-type"/>
     <field type="CARD32" name="count"/>
   </struct>
-  <request name="QueryVersion" opcode="0">
+  <request name="QueryVersion" number="0">
     <field type="CARD8" name="client-major"/>
     <field type="CARD8" name="client-minor"/>
     <reply>
@@ -43,7 +43,7 @@ authorization from the authors.
       <field type="CARD16" name="server-minor"/>
     </reply>
   </request>
-  <request name="QueryClients" opcode="1">
+  <request name="QueryClients" number="1">
     <reply>
       <pad bytes="1"/>
       <field type="CARD32" name="num-clients"/>
@@ -53,7 +53,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="QueryClientResources" opcode="2">
+  <request name="QueryClientResources" number="2">
     <field type="CARD32" name="xid"/>
     <reply>
       <pad bytes="1"/>
@@ -64,7 +64,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="QueryClientPixmapBytes" opcode="3">
+  <request name="QueryClientPixmapBytes" number="3">
     <field type="CARD32" name="xid"/>
     <reply>
       <pad bytes="1"/>
diff --git a/xcb-proto/src/extensions/screensaver.xml b/xcb-proto/src/extensions/screensaver.xml
index ea8f910..84131fd 100644
--- a/xcb-proto/src/extensions/screensaver.xml
+++ b/xcb-proto/src/extensions/screensaver.xml
@@ -64,7 +64,7 @@ Draft Standard Version 1.0
   </enum>
 <!-- Errors -->
 <!-- Requests -->
-  <request name="QueryVersion" opcode="0">
+  <request name="QueryVersion" number="0">
     <field type="CARD8" name="client-major-version"/>
     <field type="CARD8" name="client-minor-version"/>
     <pad bytes="2"/>
@@ -75,7 +75,7 @@ Draft Standard Version 1.0
       <pad bytes="22"/>
     </reply>
   </request>
-  <request name="QueryInfo" opcode="1">
+  <request name="QueryInfo" number="1">
     <field type="DRAWABLE" name="drawable"/>
     <reply>
       <field type="CARD8" name="state"/>
@@ -87,11 +87,11 @@ Draft Standard Version 1.0
       <pad bytes="10"/>
     </reply>
   </request>
-  <request name="SelectInput" opcode="2">
+  <request name="SelectInput" number="2">
     <field type="DRAWABLE" name="drawable"/>
     <field type="EVENT" name="event-mask"/>
   </request>
-  <request name="SetAttributes" opcode="3">
+  <request name="SetAttributes" number="3">
     <field type="DRAWABLE" name="drawable"/>
     <field type="RECTANGLE"/>
     <field type="CARD16" name="border-width"/>
@@ -100,7 +100,7 @@ Draft Standard Version 1.0
     <field type="VISUALID" name="visual"/>
     <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
   </request>
-  <request name="UnsetAttributes" opcode="4">
+  <request name="UnsetAttributes" number="4">
     <field type="DRAWABLE" name="drawable"/>
   </request>
 <!-- Events -->
diff --git a/xcb-proto/src/extensions/shape.xml b/xcb-proto/src/extensions/shape.xml
index 1c57a1f..7bbdc2c 100644
--- a/xcb-proto/src/extensions/shape.xml
+++ b/xcb-proto/src/extensions/shape.xml
@@ -46,14 +46,14 @@ authorization from the authors.
     <field type="TIMESTAMP" name="server-time"/>
     <field type="BOOL" name="shaped"/>
   </event>
-  <request name="QueryVersion" opcode="0">
+  <request name="QueryVersion" number="0">
     <reply>
       <pad bytes="1"/>
       <field type="CARD16" name="major-version"/>
       <field type="CARD16" name="minor-version"/>
     </reply>
   </request>
-  <request name="Rectangles" opcode="1">
+  <request name="Rectangles" number="1">
     <field type="ShapeOp" name="operation"/>
     <field type="ShapeKind" name="destination-kind"/>
     <field type="BYTE" name="ordering"/>
@@ -62,7 +62,7 @@ authorization from the authors.
     <field type="POINT" name="offset"/>
     <list type="RECTANGLE" name="rectangles"/>
   </request>
-  <request name="Mask" opcode="2">
+  <request name="Mask" number="2">
     <field type="ShapeOp" name="operation"/>
     <field type="ShapeKind" name="destination-kind"/>
     <pad bytes="2"/>
@@ -70,7 +70,7 @@ authorization from the authors.
     <field type="POINT" name="offset"/>
     <field type="PIXMAP" name="source-bitmap"/>
   </request>
-  <request name="Combine" opcode="3">
+  <request name="Combine" number="3">
     <field type="ShapeOp" name="operation"/>
     <field type="ShapeKind" name="destination-kind"/>
     <field type="ShapeKind" name="source-kind"/>
@@ -79,13 +79,13 @@ authorization from the authors.
     <field type="POINT" name="offset"/>
     <field type="WINDOW" name="source-window"/>
   </request>
-  <request name="Offset" opcode="4">
+  <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"/>
   </request>
-  <request name="QueryExtents" opcode="5">
+  <request name="QueryExtents" number="5">
     <field type="WINDOW" name="destination-window"/>
     <reply>
       <pad bytes="1"/>
@@ -97,17 +97,17 @@ authorization from the authors.
       <field type="RECTANGLE" name="clip-shape-extents"/>
     </reply>
   </request>
-  <request name="SelectInput" opcode="6">
+  <request name="SelectInput" number="6">
     <field type="WINDOW" name="destination-window"/>
     <field type="BOOL" name="enable"/>
   </request>
-  <request name="InputSelected" opcode="7">
+  <request name="InputSelected" number="7">
     <field type="WINDOW" name="destination-window"/>
     <reply>
       <field type="BOOL" name="enabled"/>
     </reply>
   </request>
-  <request name="GetRectangles" opcode="8">
+  <request name="GetRectangles" number="8">
     <field type="WINDOW" name="window"/>
     <field type="ShapeKind" name="source-kind"/>
     <reply>
diff --git a/xcb-proto/src/extensions/shm.xml b/xcb-proto/src/extensions/shm.xml
index b0830e2..00afc22 100644
--- a/xcb-proto/src/extensions/shm.xml
+++ b/xcb-proto/src/extensions/shm.xml
@@ -37,7 +37,7 @@ authorization from the authors.
     <field type="CARD32" name="offset"/>
   </event>
   <errorcopy name="BadSeg" number="0" ref="Value"/>
-  <request name="QueryVersion" opcode="0">
+  <request name="QueryVersion" number="0">
     <reply>
       <field type="BOOL" name="shared-pixmaps"/>
       <field type="VERSION"/>
@@ -46,15 +46,15 @@ authorization from the authors.
       <field type="CARD8" name="pixmap-format"/>
     </reply>
   </request>
-  <request name="Attach" opcode="1">
+  <request name="Attach" number="1">
     <field type="SEG" name="shmseg"/>
     <field type="CARD32" name="shmid"/>
     <field type="BOOL" name="read-only"/>
   </request>
-  <request name="Detach" opcode="2">
+  <request name="Detach" number="2">
     <field type="SEG" name="shmseg"/>
   </request>
-  <request name="PutImage" opcode="3">
+  <request name="PutImage" number="3">
     <field type="DRAWABLE" name="drawable"/>
     <field type="GCONTEXT" name="gc"/>
     <field type="SIZE" name="total-size"/>
@@ -71,7 +71,7 @@ authorization from the authors.
     <field type="SEG" name="shmseg"/>
     <field type="CARD32" name="offset"/>
   </request>
-  <request name="GetImage" opcode="4">
+  <request name="GetImage" number="4">
     <field type="DRAWABLE" name="drawable"/>
     <field type="RECTANGLE"/>
     <field type="CARD32" name="plane-mask"/>
@@ -85,7 +85,7 @@ authorization from the authors.
       <field type="CARD32" name="size"/>
     </reply>
   </request>
-  <request name="CreatePixmap" opcode="5">
+  <request name="CreatePixmap" number="5">
     <field type="PIXMAP" name="pid"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="SIZE"/>
diff --git a/xcb-proto/src/extensions/sync.xml b/xcb-proto/src/extensions/sync.xml
index 936e7fd..4130836 100644
--- a/xcb-proto/src/extensions/sync.xml
+++ b/xcb-proto/src/extensions/sync.xml
@@ -54,14 +54,14 @@ for licensing information.
     <field type="TRIGGER" name="trigger"/>
     <field type="INT64" name="event-threshold"/>
   </struct>
-  <request name="Initialize" opcode="0">
+  <request name="Initialize" number="0">
     <reply>
       <pad bytes="1"/>
       <field type="CARD8" name="major-version"/>
       <field type="CARD8" name="minor-version"/>
     </reply>
   </request>
-  <request name="ListSystemCounters" opcode="1">
+  <request name="ListSystemCounters" number="1">
     <reply>
       <pad bytes="1"/>
       <field type="CARD32" name="counters-len"/>
@@ -71,43 +71,43 @@ for licensing information.
       </list>
     </reply>
   </request>
-  <request name="CreateCounter" opcode="2">
+  <request name="CreateCounter" number="2">
     <field type="COUNTER" name="id"/>
     <field type="INT64" name="initial-value"/>
   </request>
-  <request name="DestroyCounter" opcode="6">
+  <request name="DestroyCounter" number="6">
     <field type="COUNTER" name="counter"/>
   </request>
-  <request name="QueryCounter" opcode="5">
+  <request name="QueryCounter" number="5">
     <field type="COUNTER" name="counter"/>
     <reply>
       <pad bytes="1"/>
       <field type="INT64" name="counter-value"/>
     </reply>
   </request>
-  <request name="Await" opcode="7">
+  <request name="Await" number="7">
     <list type="WAITCONDITION" name="wait-list"/>
   </request>
-  <request name="ChangeCounter" opcode="4">
+  <request name="ChangeCounter" number="4">
     <field type="COUNTER" name="counter"/>
     <field type="INT64" name="amount"/>
   </request>
-  <request name="SetCounter" opcode="3">
+  <request name="SetCounter" number="3">
     <field type="COUNTER" name="counter"/>
     <field type="INT64" name="value"/>
   </request>
-  <request name="CreateAlarm" opcode="8">
+  <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"/>
   </request>
-  <request name="ChangeAlarm" opcode="9">
+  <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"/>
   </request>
-  <request name="DestroyAlarm" opcode="11">
+  <request name="DestroyAlarm" number="11">
     <field type="ALARM" name="alarm"/>
   </request>
-  <request name="QueryAlarm" opcode="10">
+  <request name="QueryAlarm" number="10">
     <field type="ALARM" name="alarm"/>
     <reply>
       <pad bytes="1"/>
@@ -117,11 +117,11 @@ for licensing information.
       <field type="ALARMSTATE" name="state"/>
     </reply>
   </request>
-  <request name="SetPriority" opcode="12">
+  <request name="SetPriority" number="12">
     <field type="CARD32" name="id"/>
     <field type="INT32" name="priority"/>
   </request>
-  <request name="GetPriority" opcode="13">
+  <request name="GetPriority" number="13">
     <field type="CARD32" name="id"/>
     <reply>
       <pad bytes="1"/>
diff --git a/xcb-proto/src/extensions/xc_misc.xml b/xcb-proto/src/extensions/xc_misc.xml
index 5c4c9f6..4380870 100644
--- a/xcb-proto/src/extensions/xc_misc.xml
+++ b/xcb-proto/src/extensions/xc_misc.xml
@@ -5,7 +5,7 @@ All Rights Reserved.  See the file COPYI
 for licensing information.
 -->
 <extension header="xc_misc" xname="XC-MISC" name="XCMisc">
-  <request name="GetVersion" opcode="0">
+  <request name="GetVersion" number="0">
     <field type="CARD16" name="client-major-version"/>
     <field type="CARD16" name="client-minor-version"/>
     <reply>
@@ -14,14 +14,14 @@ for licensing information.
       <field type="CARD16" name="server-minor-version"/>
     </reply>
   </request>
-  <request name="GetXIDRange" opcode="1">
+  <request name="GetXIDRange" number="1">
     <reply>
       <pad bytes="1"/>
       <field type="CARD32" name="start-id"/>
       <field type="CARD32" name="count"/>
     </reply>
   </request>
-  <request name="GetXIDList" opcode="2">
+  <request name="GetXIDList" number="2">
     <field type="CARD32" name="count"/>
     <reply>
       <pad bytes="1"/>
diff --git a/xcb-proto/src/extensions/xevie.xml b/xcb-proto/src/extensions/xevie.xml
index 5d55eb0..5f09984 100644
--- a/xcb-proto/src/extensions/xevie.xml
+++ b/xcb-proto/src/extensions/xevie.xml
@@ -25,7 +25,7 @@ sale, use or other dealings in this Soft
 authorization from the authors.
 -->
 <extension header="xevie" xname="XEVIE" name="Xevie" version="1">
-  <request name="QueryVersion" opcode="0">
+  <request name="QueryVersion" number="0">
     <field type="CARD16" name="client-major-version"/>
     <field type="CARD16" name="client-minor-version"/>
     <reply>
@@ -35,14 +35,14 @@ authorization from the authors.
       <pad bytes="20"/>
     </reply>
   </request>
-  <request name="Start" opcode="1">
+  <request name="Start" number="1">
     <field type="CARD32" name="screen"/>
     <reply>
       <pad bytes="1"/>
       <pad bytes="24"/>
     </reply>
   </request>
-  <request name="End" opcode="2">
+  <request name="End" number="2">
     <field type="CARD32" name="cmap"/>
     <reply>
       <pad bytes="1"/>
@@ -58,7 +58,7 @@ authorization from the authors.
   <struct name="Event">
     <pad bytes="32"/>
   </struct>
-  <request name="Send" opcode="3">
+  <request name="Send" number="3">
     <field type="Event" name="event"/>
 <!-- Datatype -->
     <field type="CARD32" name="data-type"/>
@@ -68,7 +68,7 @@ authorization from the authors.
       <pad bytes="24"/>
     </reply>
   </request>
-  <request name="SelectInput" opcode="4">
+  <request name="SelectInput" number="4">
     <field type="CARD32" name="event-mask"/>
     <reply>
       <pad bytes="1"/>
diff --git a/xcb-proto/src/extensions/xf86dri.xml b/xcb-proto/src/extensions/xf86dri.xml
index 1118ddd..4f1c5ff 100644
--- a/xcb-proto/src/extensions/xf86dri.xml
+++ b/xcb-proto/src/extensions/xf86dri.xml
@@ -35,7 +35,7 @@ authorization from the authors.
     <field type="INT16" name="x3"/>
   </struct>
 <!-- Requests -->
-  <request name="QueryVersion" opcode="0">
+  <request name="QueryVersion" number="0">
     <reply>
       <pad bytes="1"/>
       <field type="CARD16" name="dri-major-version"/>
@@ -43,14 +43,14 @@ authorization from the authors.
       <field type="CARD32" name="dri-minor-patch"/>
     </reply>
   </request>
-  <request name="QueryDirectRenderingCapable" opcode="1">
+  <request name="QueryDirectRenderingCapable" number="1">
     <field type="CARD32" name="screen"/>
     <reply>
       <pad bytes="1"/>
       <field type="BOOL" name="is-capable"/>
     </reply>
   </request>
-  <request name="OpenConnection" opcode="2">
+  <request name="OpenConnection" number="2">
     <field type="CARD32" name="screen"/>
     <reply>
       <pad bytes="1"/>
@@ -65,10 +65,10 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="CloseConnection" opcode="3">
+  <request name="CloseConnection" number="3">
     <field type="CARD32" name="screen"/>
   </request>
-  <request name="GetClientDriverName" opcode="4">
+  <request name="GetClientDriverName" number="4">
     <field type="CARD32" name="screen"/>
     <reply>
       <pad bytes="1"/>
@@ -82,7 +82,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="CreateContext" opcode="5">
+  <request name="CreateContext" number="5">
     <field type="CARD32" name="visual"/>
     <field type="CARD32" name="screen"/>
     <field type="CARD32" name="context"/>
@@ -91,11 +91,11 @@ authorization from the authors.
       <field type="CARD32" name="hw-context"/>
     </reply>
   </request>
-  <request name="DestroyContext" opcode="6">
+  <request name="DestroyContext" number="6">
     <field type="CARD32" name="screen"/>
     <field type="CARD32" name="context"/>
   </request>
-  <request name="CreateDrawable" opcode="7">
+  <request name="CreateDrawable" number="7">
     <field type="CARD32" name="screen"/>
     <field type="CARD32" name="drawable"/>
     <reply>
@@ -103,11 +103,11 @@ authorization from the authors.
       <field type="CARD32" name="hw-drawable-handle"/>
     </reply>
   </request>
-  <request name="DestroyDrawable" opcode="8">
+  <request name="DestroyDrawable" number="8">
     <field type="CARD32" name="screen"/>
     <field type="CARD32" name="drawable"/>
   </request>
-  <request name="GetDrawableInfo" opcode="9">
+  <request name="GetDrawableInfo" number="9">
     <field type="CARD32" name="screen"/>
     <field type="CARD32" name="drawable"/>
     <reply>
@@ -125,7 +125,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="GetDeviceInfo" opcode="10">
+  <request name="GetDeviceInfo" number="10">
     <field type="CARD32" name="screen"/>
     <reply>
       <pad bytes="1"/>
@@ -141,7 +141,7 @@ authorization from the authors.
     </reply>
   </request>
 <!-- Not in this doc, but specified in Mesa/src/glx/x11/xf86dri.h -->
-  <request name="AuthConnection" opcode="11">
+  <request name="AuthConnection" number="11">
     <field type="CARD32" name="screen"/>
     <field type="CARD32" name="magic"/>
     <reply>
diff --git a/xcb-proto/src/extensions/xfixes.xml b/xcb-proto/src/extensions/xfixes.xml
index 2570593..2bbb1ea 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -28,7 +28,7 @@ authorization from the authors.
   <import>render</import>
   <import>shape</import>
 <!-- Version 1 -->
-  <request name="QueryVersion" opcode="0">
+  <request name="QueryVersion" number="0">
     <field type="CARD32" name="client-major-version"/>
     <field type="CARD32" name="client-minor-version"/>
     <reply>
@@ -50,7 +50,7 @@ authorization from the authors.
     <item name="map"/>
     <item name="unmap"/>
   </enum>
-  <request name="ChangeSaveSet" opcode="1">
+  <request name="ChangeSaveSet" number="1">
     <field type="SaveSetMode" name="mode"/>
     <field type="SaveSetTarget" name="target"/>
     <field type="SaveSetMapping" name="map"/>
@@ -92,7 +92,7 @@ authorization from the authors.
     <field type="TIMESTAMP" name="selection-time"/>
     <pad bytes="8"/>
   </event>
-  <request name="SelectSelectionInput" opcode="2">
+  <request name="SelectSelectionInput" number="2">
     <field type="WINDOW" name="window"/>
     <field type="ATOM" name="selection"/>
 <!-- SelectionEventMask -->
@@ -119,12 +119,12 @@ authorization from the authors.
     <field type="ATOM" name="name"/>
     <pad bytes="12"/>
   </event>
-  <request name="SelectCursorInput" opcode="3">
+  <request name="SelectCursorInput" number="3">
 <!-- CursorNotifyMask -->
     <field type="WINDOW" name="window"/>
     <field type="CARD32" name="event-mask"/>
   </request>
-  <request name="GetCursorImage" opcode="4">
+  <request name="GetCursorImage" number="4">
     <reply>
       <pad bytes="1"/>
       <field type="RECTANGLE"/>
@@ -143,69 +143,69 @@ authorization from the authors.
 <!-- Version 2 -->
   <type name="REGION"/>
   <error name="BadRegion" number="0"/>
-  <request name="CreateRegion" opcode="5">
+  <request name="CreateRegion" number="5">
     <field type="REGION" name="region"/>
     <list type="RECTANGLE" name="rectangles"/>
   </request>
-  <request name="CreateRegionFromBitmap" opcode="6">
+  <request name="CreateRegionFromBitmap" number="6">
     <field type="REGION" name="region"/>
     <field type="PIXMAP" name="bitmap"/>
   </request>
-  <request name="CreateRegionFromWindow" opcode="7">
+  <request name="CreateRegionFromWindow" number="7">
     <field type="REGION" name="region"/>
     <field type="WINDOW" name="window"/>
     <field type="ShapeKind" name="kind"/>
     <pad bytes="3"/>
   </request>
-  <request name="CreateRegionFromGC" opcode="8">
+  <request name="CreateRegionFromGC" number="8">
     <field type="REGION" name="region"/>
     <field type="GCONTEXT" name="gc"/>
   </request>
-  <request name="CreateRegionFromPicture" opcode="9">
+  <request name="CreateRegionFromPicture" number="9">
     <field type="REGION" name="region"/>
     <field type="PICTURE" name="picture"/>
   </request>
-  <request name="DestroyRegion" opcode="10">
+  <request name="DestroyRegion" number="10">
     <field type="REGION" name="region"/>
   </request>
-  <request name="SetRegion" opcode="11">
+  <request name="SetRegion" number="11">
     <field type="REGION" name="region"/>
     <list type="RECTANGLE" name="rectangles"/>
   </request>
-  <request name="CopyRegion" opcode="12">
+  <request name="CopyRegion" number="12">
     <field type="REGION" name="source"/>
     <field type="REGION" name="destination"/>
   </request>
-  <request name="UnionRegion" opcode="13">
+  <request name="UnionRegion" number="13">
     <field type="REGION" name="source1"/>
     <field type="REGION" name="source2"/>
     <field type="REGION" name="destination"/>
   </request>
-  <request name="IntersectRegion" opcode="14">
+  <request name="IntersectRegion" number="14">
     <field type="REGION" name="source1"/>
     <field type="REGION" name="source2"/>
     <field type="REGION" name="destination"/>
   </request>
-  <request name="SubtractRegion" opcode="15">
+  <request name="SubtractRegion" number="15">
     <field type="REGION" name="source1"/>
     <field type="REGION" name="source2"/>
     <field type="REGION" name="destination"/>
   </request>
-  <request name="InvertRegion" opcode="16">
+  <request name="InvertRegion" number="16">
     <field type="REGION" name="source"/>
     <field type="RECTANGLE" name="bounds"/>
     <field type="REGION" name="destination"/>
   </request>
-  <request name="TranslateRegion" opcode="17">
+  <request name="TranslateRegion" number="17">
     <field type="REGION" name="region"/>
     <field type="INT16" name="dx"/>
     <field type="INT16" name="dy"/>
   </request>
-  <request name="RegionExtents" opcode="18">
+  <request name="RegionExtents" number="18">
     <field type="REGION" name="source"/>
     <field type="REGION" name="destination"/>
   </request>
-  <request name="FetchRegion" opcode="19">
+  <request name="FetchRegion" number="19">
     <field type="REGION" name="region"/>
     <reply>
       <pad bytes="1"/>
@@ -214,24 +214,24 @@ authorization from the authors.
       <list type="RECTANGLE" name="rectangles"/>
     </reply>
   </request>
-  <request name="SetGCClipRegion" opcode="20">
+  <request name="SetGCClipRegion" number="20">
     <field type="GCONTEXT" name="gc"/>
     <field type="REGION" name="region"/>
     <field type="POINT" name="origin"/>
   </request>
-  <request name="SetWindowShapeRegion" opcode="21">
+  <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"/>
   </request>
-  <request name="SetPictureClipRegion" opcode="22">
+  <request name="SetPictureClipRegion" number="22">
     <field type="PICTURE" name="picture"/>
     <field type="REGION" name="region"/>
     <field type="POINT" name="origin"/>
   </request>
-  <request name="SetCursorName" opcode="23">
+  <request name="SetCursorName" number="23">
     <field type="CURSOR" name="cursor"/>
     <field type="CARD16" name="n-bytes"/>
     <pad bytes="2"/>
@@ -239,7 +239,7 @@ authorization from the authors.
       <fieldref>n-bytes</fieldref>
     </list>
   </request>
-  <request name="GetCursorName" opcode="24">
+  <request name="GetCursorName" number="24">
     <field type="CURSOR" name="cursor"/>
     <reply>
       <pad bytes="1"/>
@@ -251,7 +251,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="GetCursorImageAndName" opcode="25">
+  <request name="GetCursorImageAndName" number="25">
     <reply>
       <pad bytes="1"/>
       <field type="RECTANGLE"/>
@@ -271,11 +271,11 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="ChangeCursor" opcode="26">
+  <request name="ChangeCursor" number="26">
     <field type="CURSOR" name="source"/>
     <field type="CURSOR" name="destination"/>
   </request>
-  <request name="ChangeCursorByName" opcode="27">
+  <request name="ChangeCursorByName" number="27">
     <field type="CURSOR" name="src"/>
     <field type="CARD16" name="n-bytes"/>
     <pad bytes="2"/>
@@ -284,7 +284,7 @@ authorization from the authors.
     </list>
   </request>
 <!-- Version 3 -->
-  <request name="ExpandRegion" opcode="28">
+  <request name="ExpandRegion" number="28">
     <field type="REGION" name="source"/>
     <field type="REGION" name="destination"/>
     <field type="CARD16" name="left"/>
diff --git a/xcb-proto/src/extensions/xprint.xml b/xcb-proto/src/extensions/xprint.xml
index 1090e61..29e4a27 100644
--- a/xcb-proto/src/extensions/xprint.xml
+++ b/xcb-proto/src/extensions/xprint.xml
@@ -109,14 +109,14 @@ authorization from the authors.
     </item>
   </enum>
 <!-- Requests -->
-  <request name="PrintQueryVersion" opcode="0">
+  <request name="PrintQueryVersion" number="0">
     <reply>
       <pad bytes="1"/>
       <field type="CARD16" name="major-version"/>
       <field type="CARD16" name="minor-version"/>
     </reply>
   </request>
-  <request name="PrintGetPrinterList" opcode="1">
+  <request name="PrintGetPrinterList" number="1">
     <field type="CARD32" name="printer-name-len"/>
     <field type="CARD32" name="locale-len"/>
     <list type="STRING8" name="printer-name">
@@ -135,8 +135,8 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="PrintRehashPrinterList" opcode="20"/>
-  <request name="CreateContext" opcode="2">
+  <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"/>
@@ -148,37 +148,37 @@ authorization from the authors.
       <fieldref>locale-len</fieldref>
     </list>
   </request>
-  <request name="PrintSetContext" opcode="3">
+  <request name="PrintSetContext" number="3">
     <field type="CARD32" name="context"/>
   </request>
-  <request name="PrintGetContext" opcode="4">
+  <request name="PrintGetContext" number="4">
     <reply>
       <pad bytes="1"/>
       <field type="CARD32" name="context"/>
     </reply>
   </request>
-  <request name="PrintDestroyContext" opcode="5">
+  <request name="PrintDestroyContext" number="5">
     <field type="CARD32" name="context"/>
   </request>
-  <request name="PrintGetScreenOfContext" opcode="6">
+  <request name="PrintGetScreenOfContext" number="6">
     <reply>
       <pad bytes="1"/>
       <field type="WINDOW" name="root"/>
     </reply>
   </request>
-  <request name="PrintStartJob" opcode="7">
+  <request name="PrintStartJob" number="7">
     <field type="CARD8" name="output-mode"/>
   </request>
-  <request name="PrintEndJob" opcode="8">
+  <request name="PrintEndJob" number="8">
     <field type="BOOL" name="cancel"/>
   </request>
-  <request name="PrintStartDoc" opcode="9">
+  <request name="PrintStartDoc" number="9">
     <field type="CARD8" name="driver-mode"/>
   </request>
-  <request name="PrintEndDoc" opcode="10">
+  <request name="PrintEndDoc" number="10">
     <field type="BOOL" name="cancel"/>
   </request>
-  <request name="PrintPutDocumentData" opcode="11">
+  <request name="PrintPutDocumentData" number="11">
     <field type="DRAWABLE" name="drawable"/>
     <field type="CARD32" name="len-data"/>
     <field type="CARD16" name="len-fmt"/>
@@ -191,7 +191,7 @@ authorization from the authors.
 <!-- padding -->
     <list type="STRING8" name="options"/>
   </request>
-  <request name="PrintGetDocumentData" opcode="12">
+  <request name="PrintGetDocumentData" number="12">
     <field type="PCONTEXT" name="context"/>
     <field type="CARD32" name="max-bytes"/>
     <reply>
@@ -205,18 +205,18 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="PrintStartPage" opcode="13">
+  <request name="PrintStartPage" number="13">
     <field type="WINDOW" name="window"/>
   </request>
-  <request name="PrintEndPage" opcode="14">
+  <request name="PrintEndPage" number="14">
     <field type="BOOL" name="cancel"/>
     <pad bytes="3"/>
   </request>
-  <request name="PrintSelectInput" opcode="15">
+  <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"/>
   </request>
-  <request name="PrintInputSelected" opcode="16">
+  <request name="PrintInputSelected" number="16">
     <field type="PCONTEXT" name="context"/>
     <reply>
       <pad bytes="1"/>
@@ -224,7 +224,7 @@ authorization from the authors.
       <valueparam value-mask-type="CARD32" value-mask-name="all-events-mask" value-list-name="all-events-list"/>
     </reply>
   </request>
-  <request name="PrintGetAttributes" opcode="17">
+  <request name="PrintGetAttributes" number="17">
     <field type="PCONTEXT" name="context"/>
     <field type="CARD8" name="pool"/>
     <pad bytes="3"/>
@@ -235,7 +235,7 @@ authorization from the authors.
       <field type="STRING8" name="attributes"/>
     </reply>
   </request>
-  <request name="PrintGetOneAttributes" opcode="19">
+  <request name="PrintGetOneAttributes" number="19">
     <field type="PCONTEXT" name="context"/>
     <field type="CARD32" name="name-len"/>
     <field type="CARD8" name="pool"/>
@@ -252,7 +252,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="PrintSetAttributes" opcode="18">
+  <request name="PrintSetAttributes" number="18">
     <field type="PCONTEXT" name="context"/>
     <field type="CARD32" name="string-len"/>
     <field type="CARD8" name="pool"/>
@@ -260,7 +260,7 @@ authorization from the authors.
     <pad bytes="2"/>
     <list type="STRING8" name="attributes"/>
   </request>
-  <request name="PrintGetPageDimensions" opcode="21">
+  <request name="PrintGetPageDimensions" number="21">
     <field type="PCONTEXT" name="context"/>
     <reply>
       <pad bytes="1"/>
@@ -272,7 +272,7 @@ authorization from the authors.
       <field type="CARD16" name="reproducible-height"/>
     </reply>
   </request>
-  <request name="PrintQueryScreens" opcode="22">
+  <request name="PrintQueryScreens" number="22">
     <reply>
       <pad bytes="1"/>
       <field type="CARD32" name="list-count"/>
@@ -283,7 +283,7 @@ authorization from the authors.
 <!-- There may be a WINDOW rootWindow here... -->
     </reply>
   </request>
-  <request name="PrintSetImageResolution" opcode="23">
+  <request name="PrintSetImageResolution" number="23">
     <field type="PCONTEXT" name="context"/>
     <field type="CARD16" name="image-resolution"/>
     <reply>
@@ -291,7 +291,7 @@ authorization from the authors.
       <field type="CARD16" name="previous-resolutions"/>
     </reply>
   </request>
-  <request name="PrintGetImageResolution" opcode="24">
+  <request name="PrintGetImageResolution" number="24">
     <field type="PCONTEXT" name="context"/>
     <reply>
       <pad bytes="1"/>
diff --git a/xcb-proto/src/extensions/xv.xml b/xcb-proto/src/extensions/xv.xml
index 363cc43..7646df9 100644
--- a/xcb-proto/src/extensions/xv.xml
+++ b/xcb-proto/src/extensions/xv.xml
@@ -176,13 +176,13 @@ authorization from the authors.
     <field type="INT32" name="value"/>
   </event>
 <!-- Requests -->
-  <request name="QueryExtension" opcode="0">
+  <request name="QueryExtension" number="0">
     <reply>
       <pad bytes="1"/>
       <field type="VERSION"/>
     </reply>
   </request>
-  <request name="QueryAdaptors" opcode="1">
+  <request name="QueryAdaptors" number="1">
     <field type="WINDOW" name="window"/>
     <reply>
       <pad bytes="1"/>
@@ -193,7 +193,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="QueryEncodings" opcode="2">
+  <request name="QueryEncodings" number="2">
     <field type="PORT" name="port"/>
     <reply>
       <pad bytes="1"/>
@@ -205,18 +205,18 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="GrabPort" opcode="3">
+  <request name="GrabPort" number="3">
     <field type="PORT" name="port"/>
     <field type="TIMESTAMP" name="time"/>
     <reply>
       <field type="BYTE" name="result"/>
     </reply>
   </request>
-  <request name="UngrabPort" opcode="4">
+  <request name="UngrabPort" number="4">
     <field type="PORT" name="port"/>
     <field type="TIMESTAMP" name="time"/>
   </request>
-  <request name="PutVideo" opcode="5">
+  <request name="PutVideo" number="5">
     <field type="PORT" name="port"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="GCONTEXT" name="gc"/>
@@ -229,7 +229,7 @@ authorization from the authors.
     <field type="CARD16" name="drw-w"/>
     <field type="CARD16" name="drw-h"/>
   </request>
-  <request name="PutStill" opcode="6">
+  <request name="PutStill" number="6">
     <field type="PORT" name="port"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="GCONTEXT" name="gc"/>
@@ -242,7 +242,7 @@ authorization from the authors.
     <field type="CARD16" name="drw-w"/>
     <field type="CARD16" name="drw-h"/>
   </request>
-  <request name="GetVideo" opcode="7">
+  <request name="GetVideo" number="7">
     <field type="PORT" name="port"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="GCONTEXT" name="gc"/>
@@ -255,7 +255,7 @@ authorization from the authors.
     <field type="CARD16" name="drw-w"/>
     <field type="CARD16" name="drw-h"/>
   </request>
-  <request name="GetStill" opcode="8">
+  <request name="GetStill" number="8">
     <field type="PORT" name="port"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="GCONTEXT" name="gc"/>
@@ -268,19 +268,19 @@ authorization from the authors.
     <field type="CARD16" name="drw-w"/>
     <field type="CARD16" name="drw-h"/>
   </request>
-  <request name="StopVideo" opcode="9">
+  <request name="StopVideo" number="9">
     <field type="PORT" name="port"/>
     <field type="DRAWABLE" name="drawable"/>
   </request>
-  <request name="SelectVideoNotify" opcode="10">
+  <request name="SelectVideoNotify" number="10">
     <field type="DRAWABLE" name="drawable"/>
     <field type="BOOL" name="onoff"/>
   </request>
-  <request name="SelectPortNotify" opcode="11">
+  <request name="SelectPortNotify" number="11">
     <field type="DRAWABLE" name="drawable"/>
     <field type="BOOL" name="onoff"/>
   </request>
-  <request name="QueryBestSize" opcode="12">
+  <request name="QueryBestSize" number="12">
     <field type="PORT" name="port"/>
     <field type="CARD16" name="vid-w"/>
     <field type="CARD16" name="vid-h"/>
@@ -292,12 +292,12 @@ authorization from the authors.
       <field type="SIZE" name="actual-size"/>
     </reply>
   </request>
-  <request name="SetPortAttribute" opcode="13">
+  <request name="SetPortAttribute" number="13">
     <field type="PORT" name="port"/>
     <field type="ATOM" name="attribute"/>
     <field type="INT32" name="value"/>
   </request>
-  <request name="GetPortAttribute" opcode="14">
+  <request name="GetPortAttribute" number="14">
     <field type="PORT" name="port"/>
     <field type="ATOM" name="attribute"/>
     <reply>
@@ -306,7 +306,7 @@ authorization from the authors.
     </reply>
   </request>
 <!-- Not in the docs beyond this point :( -->
-  <request name="QueryPortAttributes" opcode="15">
+  <request name="QueryPortAttributes" number="15">
     <field type="PORT" name="port"/>
     <reply>
       <pad bytes="1"/>
@@ -318,7 +318,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="ListImageFormats" opcode="16">
+  <request name="ListImageFormats" number="16">
     <field type="PORT" name="port"/>
     <reply>
       <pad bytes="1"/>
@@ -329,7 +329,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="QueryImageAttributes" opcode="17">
+  <request name="QueryImageAttributes" number="17">
     <field type="PORT" name="port"/>
     <field type="CARD32" name="id"/>
     <field type="SIZE"/>
@@ -347,7 +347,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="PutImage" opcode="18">
+  <request name="PutImage" number="18">
     <field type="PORT" name="port"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="GCONTEXT" name="gc"/>
@@ -367,7 +367,7 @@ authorization from the authors.
       <fieldref>data-size</fieldref>
     </list>
   </request>
-  <request name="ShmPutImage" opcode="19">
+  <request name="ShmPutImage" number="19">
     <field type="PORT" name="port"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="GCONTEXT" name="gc"/>
diff --git a/xcb-proto/src/extensions/xvmc.xml b/xcb-proto/src/extensions/xvmc.xml
index 3aead34..a08bba8 100644
--- a/xcb-proto/src/extensions/xvmc.xml
+++ b/xcb-proto/src/extensions/xvmc.xml
@@ -40,14 +40,14 @@ authorization from the authors.
     <field type="CARD32" name="mc-type"/>
     <field type="CARD32" name="flags"/>
   </struct>
-  <request name="QueryVersion" opcode="0">
+  <request name="QueryVersion" number="0">
     <reply>
       <pad bytes="1"/>
       <field type="CARD32" name="major"/>
       <field type="CARD32" name="minor"/>
     </reply>
   </request>
-  <request name="ListSurfaceTypes" opcode="1">
+  <request name="ListSurfaceTypes" number="1">
     <field type="PORT" name="port-id"/>
     <reply>
       <pad bytes="1"/>
@@ -58,7 +58,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="CreateContext" opcode="2">
+  <request name="CreateContext" number="2">
     <field type="CONTEXT" name="context-id"/>
     <field type="PORT" name="port-id"/>
     <field type="SURFACE" name="surface-id"/>
@@ -74,10 +74,10 @@ authorization from the authors.
       <list type="CARD32" name="priv-data"/>
     </reply>
   </request>
-  <request name="DestroyContext" opcode="3">
+  <request name="DestroyContext" number="3">
     <field type="CONTEXT" name="context-id"/>
   </request>
-  <request name="CreateSurface" opcode="4">
+  <request name="CreateSurface" number="4">
     <field type="SURFACE" name="surface-id"/>
     <field type="CONTEXT" name="context-id"/>
     <reply>
@@ -86,10 +86,10 @@ authorization from the authors.
       <list type="CARD32" name="priv-data"/>
     </reply>
   </request>
-  <request name="DestroySurface" opcode="5">
+  <request name="DestroySurface" number="5">
     <field type="SURFACE" name="surface-id"/>
   </request>
-  <request name="CreateSubpicture" opcode="6">
+  <request name="CreateSubpicture" number="6">
     <field type="SUBPICTURE" name="subpicture-id"/>
     <field type="CONTEXT" name="context"/>
     <field type="CARD32" name="xvimage-id"/>
@@ -108,10 +108,10 @@ authorization from the authors.
       <list type="CARD32" name="priv-data"/>
     </reply>
   </request>
-  <request name="DestroySubpicture" opcode="7">
+  <request name="DestroySubpicture" number="7">
     <field type="SUBPICTURE" name="subpicture-id"/>
   </request>
-  <request name="ListSubpictureTypes" opcode="8">
+  <request name="ListSubpictureTypes" number="8">
     <field type="PORT" name="port-id"/>
     <field type="SURFACE" name="surface-id"/>
     <reply>
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index 56054bb..3a78bde 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -591,7 +591,7 @@ authorization from the authors.
       </op>
     </item>
   </enum>
-  <request name="CreateWindow" opcode="1">
+  <request name="CreateWindow" number="1">
     <field type="CARD8" name="depth"/>
     <field type="WINDOW" name="wid"/>
     <field type="WINDOW" name="parent"/>
@@ -601,7 +601,7 @@ authorization from the authors.
     <field type="VISUALID" name="visual"/>
     <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
   </request>
-  <request name="ChangeWindowAttributes" opcode="2">
+  <request name="ChangeWindowAttributes" number="2">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
     <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
@@ -623,53 +623,53 @@ authorization from the authors.
     <field type="CARD32" name="your-event-mask"/>
     <field type="CARD16" name="do-not-propagate-mask"/>
   </struct>
-  <request name="GetWindowAttributes" opcode="3">
+  <request name="GetWindowAttributes" number="3">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
     <reply>
       <field type="WindowAttributes" name="value"/>
     </reply>
   </request>
-  <request name="DestroyWindow" opcode="4">
+  <request name="DestroyWindow" number="4">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
   </request>
-  <request name="DestroySubwindows" opcode="5">
+  <request name="DestroySubwindows" number="5">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
   </request>
-  <request name="ChangeSaveSet" opcode="6">
+  <request name="ChangeSaveSet" number="6">
     <field type="BYTE" name="mode"/>
     <field type="WINDOW" name="window"/>
   </request>
-  <request name="ReparentWindow" opcode="7">
+  <request name="ReparentWindow" number="7">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
     <field type="WINDOW" name="parent"/>
     <field type="POINT"/>
   </request>
-  <request name="MapWindow" opcode="8">
+  <request name="MapWindow" number="8">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
   </request>
-  <request name="MapSubwindows" opcode="9">
+  <request name="MapSubwindows" number="9">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
   </request>
-  <request name="UnmapWindow" opcode="10">
+  <request name="UnmapWindow" number="10">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
   </request>
-  <request name="UnmapSubwindows" opcode="11">
+  <request name="UnmapSubwindows" number="11">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
   </request>
-  <request name="ConfigureWindow" opcode="12">
+  <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"/>
   </request>
-  <request name="CirculateWindow" opcode="13">
+  <request name="CirculateWindow" number="13">
     <field type="CirculateDirection" name="direction"/>
     <field type="WINDOW" name="window"/>
   </request>
@@ -679,14 +679,14 @@ authorization from the authors.
     <field type="RECTANGLE"/>
     <field type="CARD16" name="border-width"/>
   </struct>
-  <request name="GetGeometry" opcode="14">
+  <request name="GetGeometry" number="14">
     <pad bytes="1"/>
     <field type="DRAWABLE" name="drawable"/>
     <reply>
       <field type="Geometry"/>
     </reply>
   </request>
-  <request name="QueryTree" opcode="15">
+  <request name="QueryTree" number="15">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
     <reply>
@@ -700,7 +700,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="InternAtom" opcode="16">
+  <request name="InternAtom" number="16">
     <field type="BOOL" name="only-if-exists"/>
     <field type="CARD16" name="name-len"/>
     <pad bytes="2"/>
@@ -712,7 +712,7 @@ authorization from the authors.
       <field type="ATOM" name="atom"/>
     </reply>
   </request>
-  <request name="GetAtomName" opcode="17">
+  <request name="GetAtomName" number="17">
     <pad bytes="1"/>
     <field type="ATOM" name="atom"/>
     <reply>
@@ -724,7 +724,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="ChangeProperty" opcode="18">
+  <request name="ChangeProperty" number="18">
     <field type="PropertyMode" name="mode"/>
     <field type="WINDOW" name="window"/>
     <field type="ATOM" name="property"/>
@@ -742,12 +742,12 @@ authorization from the authors.
       </op>
     </list>
   </request>
-  <request name="DeleteProperty" opcode="19">
+  <request name="DeleteProperty" number="19">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
     <field type="ATOM" name="property"/>
   </request>
-  <request name="GetProperty" opcode="20">
+  <request name="GetProperty" number="20">
     <field type="BOOL" name="delete"/>
     <field type="WINDOW" name="window"/>
     <field type="ATOM" name="property"/>
@@ -765,7 +765,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="ListProperties" opcode="21">
+  <request name="ListProperties" number="21">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
     <reply>
@@ -777,13 +777,13 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="SetSelectionOwner" opcode="22">
+  <request name="SetSelectionOwner" number="22">
     <pad bytes="1"/>
     <field type="WINDOW" name="owner"/>
     <field type="ATOM" name="selection"/>
     <field type="TIMESTAMP" name="time"/>
   </request>
-  <request name="GetSelectionOwner" opcode="23">
+  <request name="GetSelectionOwner" number="23">
     <pad bytes="1"/>
     <field type="ATOM" name="selection"/>
     <reply>
@@ -791,7 +791,7 @@ authorization from the authors.
       <field type="WINDOW" name="owner"/>
     </reply>
   </request>
-  <request name="ConvertSelection" opcode="24">
+  <request name="ConvertSelection" number="24">
     <pad bytes="1"/>
     <field type="WINDOW" name="requestor"/>
     <field type="ATOM" name="selection"/>
@@ -799,7 +799,7 @@ authorization from the authors.
     <field type="ATOM" name="property"/>
     <field type="TIMESTAMP" name="time"/>
   </request>
-  <request name="SendEvent" opcode="25">
+  <request name="SendEvent" number="25">
     <field type="BOOL" name="propagate"/>
     <field type="WINDOW" name="destination"/>
     <field type="CARD32" name="event-mask"/>
@@ -808,7 +808,7 @@ authorization from the authors.
       <value>32</value>
     </list>
   </request>
-  <request name="GrabPointer" opcode="26">
+  <request name="GrabPointer" number="26">
     <field type="BOOL" name="owner-events"/>
     <field type="WINDOW" name="grab-window"/>
     <field type="CARD16" name="event-mask"/>
@@ -821,11 +821,11 @@ authorization from the authors.
       <field type="GrabStatus" name="status"/>
     </reply>
   </request>
-  <request name="UngrabPointer" opcode="27">
+  <request name="UngrabPointer" number="27">
     <pad bytes="1"/>
     <field type="TIMESTAMP" name="time"/>
   </request>
-  <request name="GrabButton" opcode="28">
+  <request name="GrabButton" number="28">
     <field type="BOOL" name="owner-events"/>
     <field type="WINDOW" name="grab-window"/>
 		<field type="CARD16" name="event-mask"/>
@@ -838,19 +838,19 @@ authorization from the authors.
     <pad bytes="1"/>
     <field type="CARD16" name="modifiers"/>
   </request>
-  <request name="UngrabButton" opcode="29">
+  <request name="UngrabButton" number="29">
     <field type="BUTTON" name="button"/>
     <field type="WINDOW" name="grab-window"/>
     <field type="CARD16" name="modifiers"/>
     <pad bytes="2"/>
   </request>
-  <request name="ChangeActivePointerGrab" opcode="30">
+  <request name="ChangeActivePointerGrab" number="30">
     <pad bytes="1"/>
     <field type="CURSOR" name="cursor"/>
     <field type="TIMESTAMP" name="time"/>
     <field type="CARD16" name="event-mask"/>
   </request>
-  <request name="GrabKeyboard" opcode="31">
+  <request name="GrabKeyboard" number="31">
     <field type="BOOL" name="owner-events"/>
     <field type="WINDOW" name="grab-window"/>
     <field type="TIMESTAMP" name="time"/>
@@ -860,11 +860,11 @@ authorization from the authors.
       <field type="GrabStatus" name="status"/>
     </reply>
   </request>
-  <request name="UngrabKeyboard" opcode="32">
+  <request name="UngrabKeyboard" number="32">
     <pad bytes="1"/>
     <field type="TIMESTAMP" name="time"/>
   </request>
-  <request name="GrabKey" opcode="33">
+  <request name="GrabKey" number="33">
     <field type="BOOL" name="owner-events"/>
     <field type="WINDOW" name="grab-window"/>
     <field type="CARD16" name="modifiers"/>
@@ -872,18 +872,18 @@ authorization from the authors.
     <field type="GrabMode" name="pointer-mode"/>
     <field type="GrabMode" name="keyboard-mode"/>
   </request>
-  <request name="UngrabKey" opcode="34">
+  <request name="UngrabKey" number="34">
     <field type="CARD8" name="key"/>
     <field type="WINDOW" name="grab-window"/>
     <field type="CARD16" name="modifiers"/>
   </request>
-  <request name="AllowEvents" opcode="35">
+  <request name="AllowEvents" number="35">
     <field type="CARD8" name="mode"/>
     <field type="TIMESTAMP" name="time"/>
   </request>
-  <request name="GrabServer" opcode="36"/>
-  <request name="UngrabServer" opcode="37"/>
-  <request name="QueryPointer" opcode="38">
+  <request name="GrabServer" number="36"/>
+  <request name="UngrabServer" number="37"/>
+  <request name="QueryPointer" number="38">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
     <reply>
@@ -899,7 +899,7 @@ authorization from the authors.
     <field type="TIMESTAMP" name="time"/>
     <field type="POINT"/>
   </struct>
-  <request name="GetMotionEvents" opcode="39">
+  <request name="GetMotionEvents" number="39">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
     <field type="TIMESTAMP" name="start"/>
@@ -913,7 +913,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="TranslateCoordinates" opcode="40">
+  <request name="TranslateCoordinates" number="40">
     <pad bytes="1"/>
     <field type="WINDOW" name="src-window"/>
     <field type="WINDOW" name="dst-window"/>
@@ -926,7 +926,7 @@ authorization from the authors.
       <field type="CARD16" name="dst-y"/>
     </reply>
   </request>
-  <request name="WarpPointer" opcode="41">
+  <request name="WarpPointer" number="41">
     <pad bytes="1"/>
     <field type="WINDOW" name="src-window"/>
     <field type="WINDOW" name="dst-window"/>
@@ -937,18 +937,18 @@ authorization from the authors.
     <field type="INT16" name="dst-x"/>
     <field type="INT16" name="dst-y"/>
   </request>
-  <request name="SetInputFocus" opcode="42">
+  <request name="SetInputFocus" number="42">
     <field type="FocusRevert" name="revert-to"/>
     <field type="WINDOW" name="focus"/>
     <field type="TIMESTAMP" name="time"/>
   </request>
-  <request name="GetInputFocus" opcode="43">
+  <request name="GetInputFocus" number="43">
     <reply>
       <field type="FocusRevert" name="revert-to"/>
       <field type="WINDOW" name="focus"/>
     </reply>
   </request>
-  <request name="QueryKeymap" opcode="44">
+  <request name="QueryKeymap" number="44">
     <reply>
       <pad bytes="1"/>
       <list type="CARD8" name="keys">
@@ -956,7 +956,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="OpenFont" opcode="45">
+  <request name="OpenFont" number="45">
     <pad bytes="1"/>
     <field type="FONT" name="fid"/>
     <field type="CARD16" name="name-len"/>
@@ -964,7 +964,7 @@ authorization from the authors.
       <fieldref>name-len</fieldref>
     </list>
   </request>
-  <request name="CloseFont" opcode="46">
+  <request name="CloseFont" number="46">
     <pad bytes="1"/>
     <field type="FONT" name="font"/>
   </request>
@@ -980,7 +980,7 @@ authorization from the authors.
     <field type="INT16" name="descent"/>
     <field type="CARD16" name="attributes"/>
   </struct>
-  <request name="QueryFont" opcode="47">
+  <request name="QueryFont" number="47">
     <pad bytes="1"/>
     <field type="FONTABLE" name="font"/>
     <reply>
@@ -1008,7 +1008,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="QueryTextExtents" opcode="48">
+  <request name="QueryTextExtents" number="48">
     <exprfield type="BOOL" name="odd-length">
       <op op="&amp;">
         <fieldref>string-len</fieldref>
@@ -1034,7 +1034,7 @@ authorization from the authors.
       <fieldref>name-len</fieldref>
     </list>
   </struct>
-  <request name="ListFonts" opcode="49">
+  <request name="ListFonts" number="49">
     <pad bytes="1"/>
     <field type="CARD16" name="max-names"/>
     <field type="CARD16" name="pattern-len"/>
@@ -1050,7 +1050,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="ListFontsWithInfo" opcode="50">
+  <request name="ListFontsWithInfo" number="50">
     <pad bytes="1"/>
     <field type="CARD16" name="max-names"/>
     <field type="CARD16" name="pattern-len"/>
@@ -1082,12 +1082,12 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="SetFontPath" opcode="51">
+  <request name="SetFontPath" number="51">
     <pad bytes="1"/>
     <field type="CARD16" name="font-qty"/>
     <list type="char" name="path"/>
   </request>
-  <request name="GetFontPath" opcode="52">
+  <request name="GetFontPath" number="52">
     <reply>
       <pad bytes="1"/>
       <field type="CARD16" name="path-len"/>
@@ -1097,34 +1097,34 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="CreatePixmap" opcode="53">
+  <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"/>
   </request>
-  <request name="FreePixmap" opcode="54">
+  <request name="FreePixmap" number="54">
     <pad bytes="1"/>
     <field type="PIXMAP" name="pixmap"/>
   </request>
-  <request name="CreateGC" opcode="55">
+  <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"/>
   </request>
-  <request name="ChangeGC" opcode="56">
+  <request name="ChangeGC" number="56">
     <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" opcode="57">
+  <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"/>
   </request>
-  <request name="SetDashes" opcode="58">
+  <request name="SetDashes" number="58">
     <pad bytes="1"/>
     <field type="GCONTEXT" name="gc"/>
     <field type="CARD16" name="dash-offset"/>
@@ -1133,22 +1133,22 @@ authorization from the authors.
       <fieldref>dashes-len</fieldref>
     </list>
   </request>
-  <request name="SetClipRectangles" opcode="59">
+  <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"/>
   </request>
-  <request name="FreeGC" opcode="60">
+  <request name="FreeGC" number="60">
     <pad bytes="1"/>
     <field type="GCONTEXT" name="gc"/>
   </request>
-  <request name="ClearArea" opcode="61">
+  <request name="ClearArea" number="61">
     <field type="BOOL" name="exposures"/>
     <field type="WINDOW" name="window"/>
     <field type="RECTANGLE"/>
   </request>
-  <request name="CopyArea" opcode="62">
+  <request name="CopyArea" number="62">
     <pad bytes="1"/>
     <field type="DRAWABLE" name="src-drawable"/>
     <field type="DRAWABLE" name="dst-drawable"/>
@@ -1159,7 +1159,7 @@ authorization from the authors.
     <field type="INT16" name="dst-y"/>
     <field type="SIZE"/>
   </request>
-  <request name="CopyPlane" opcode="63">
+  <request name="CopyPlane" number="63">
     <pad bytes="1"/>
     <field type="DRAWABLE" name="src-drawable"/>
     <field type="DRAWABLE" name="dst-drawable"/>
@@ -1171,13 +1171,13 @@ authorization from the authors.
     <field type="SIZE"/>
     <field type="CARD32" name="bit-plane"/>
   </request>
-  <request name="PolyPoint" opcode="64" combine-adjacent="true">
+  <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"/>
   </request>
-  <request name="PolyLine" opcode="65" combine-adjacent="true">
+  <request name="PolyLine" number="65" combine-adjacent="true">
     <field type="CoordinateMode" name="coordinate-mode"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="GCONTEXT" name="gc"/>
@@ -1189,13 +1189,13 @@ authorization from the authors.
     <field type="INT16" name="x2"/>
     <field type="INT16" name="y2"/>
   </struct>
-  <request name="PolySegment" opcode="66" combine-adjacent="true">
+  <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"/>
   </request>
-  <request name="PolyRectangle" opcode="67" combine-adjacent="true">
+  <request name="PolyRectangle" number="67" combine-adjacent="true">
     <pad bytes="1"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="GCONTEXT" name="gc"/>
@@ -1206,13 +1206,13 @@ authorization from the authors.
     join style may be applied to successive arcs under some circumstances.
     So using combine-adjacent here is bad.
   -->
-  <request name="PolyArc" opcode="68">
+  <request name="PolyArc" number="68">
     <pad bytes="1"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="GCONTEXT" name="gc"/>
     <list type="ARC" name="arcs"/>
   </request>
-  <request name="FillPoly" opcode="69">
+  <request name="FillPoly" number="69">
     <pad bytes="1"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="GCONTEXT" name="gc"/>
@@ -1220,19 +1220,19 @@ authorization from the authors.
     <field type="CoordinateMode" name="coordinate-mode"/>
     <list type="POINT" name="points"/>
   </request>
-  <request name="PolyFillRectangle" opcode="70" combine-adjacent="true">
+  <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"/>
   </request>
-  <request name="PolyFillArc" opcode="71" combine-adjacent="true">
+  <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"/>
   </request>
-  <request name="PutImage" opcode="72">
+  <request name="PutImage" number="72">
     <field type="ImageFormat" name="format"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="GCONTEXT" name="gc"/>
@@ -1244,7 +1244,7 @@ authorization from the authors.
     <list type="BYTE" name="data"/>
   </request>
 <!-- FIXME: data array in reply will include padding, but ought not to. -->
-  <request name="GetImage" opcode="73">
+  <request name="GetImage" number="73">
     <field type="ImageFormat" name="format"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="RECTANGLE"/>
@@ -1261,21 +1261,21 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="PolyText8" opcode="74">
+  <request name="PolyText8" number="74">
     <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" opcode="75">
+  <request name="PolyText16" number="75">
     <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" opcode="76">
+  <request name="ImageText8" number="76">
     <field type="BYTE" name="string-len"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="GCONTEXT" name="gc"/>
@@ -1284,7 +1284,7 @@ authorization from the authors.
       <fieldref>string-len</fieldref>
     </list>
   </request>
-  <request name="ImageText16" opcode="77">
+  <request name="ImageText16" number="77">
     <field type="BYTE" name="string-len"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="GCONTEXT" name="gc"/>
@@ -1293,30 +1293,30 @@ authorization from the authors.
       <fieldref>string-len</fieldref>
     </list>
   </request>
-  <request name="CreateColormap" opcode="78">
+  <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"/>
   </request>
-  <request name="FreeColormap" opcode="79">
+  <request name="FreeColormap" number="79">
     <pad bytes="1"/>
     <field type="COLORMAP" name="cmap"/>
   </request>
-  <request name="CopyColormapAndFree" opcode="80">
+  <request name="CopyColormapAndFree" number="80">
     <pad bytes="1"/>
     <field type="COLORMAP" name="mid"/>
     <field type="COLORMAP" name="src-cmap"/>
   </request>
-  <request name="InstallColormap" opcode="81">
+  <request name="InstallColormap" number="81">
     <pad bytes="1"/>
     <field type="COLORMAP" name="cmap"/>
   </request>
-  <request name="UninstallColormap" opcode="82">
+  <request name="UninstallColormap" number="82">
     <pad bytes="1"/>
     <field type="COLORMAP" name="cmap"/>
   </request>
-  <request name="ListInstalledColormaps" opcode="83">
+  <request name="ListInstalledColormaps" number="83">
     <pad bytes="1"/>
     <field type="WINDOW" name="window"/>
     <reply>
@@ -1328,7 +1328,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="AllocColor" opcode="84">
+  <request name="AllocColor" number="84">
     <pad bytes="1"/>
     <field type="COLORMAP" name="cmap"/>
     <field type="COLOR" name="color"/>
@@ -1339,7 +1339,7 @@ authorization from the authors.
       <field type="CARD32" name="pixel"/>
     </reply>
   </request>
-  <request name="AllocNamedColor" opcode="85">
+  <request name="AllocNamedColor" number="85">
     <pad bytes="1"/>
     <field type="COLORMAP" name="cmap"/>
     <field type="CARD16" name="name-len"/>
@@ -1353,7 +1353,7 @@ authorization from the authors.
       <field type="COLOR" name="visual-color"/>
     </reply>
   </request>
-  <request name="AllocColorCells" opcode="86">
+  <request name="AllocColorCells" number="86">
     <field type="BOOL" name="contiguous"/>
     <field type="COLORMAP" name="cmap"/>
     <field type="CARD16" name="colors"/>
@@ -1371,7 +1371,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="AllocColorPlanes" opcode="87">
+  <request name="AllocColorPlanes" number="87">
     <field type="BOOL" name="contiguous"/>
     <field type="COLORMAP" name="cmap"/>
     <field type="CARD16" name="colors"/>
@@ -1391,7 +1391,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="FreeColors" opcode="88">
+  <request name="FreeColors" number="88">
     <pad bytes="1"/>
     <field type="COLORMAP" name="cmap"/>
     <field type="CARD32" name="plane-mask"/>
@@ -1403,12 +1403,12 @@ authorization from the authors.
     <field type="BYTE" name="flags"/>
     <pad bytes="1"/>
   </struct>
-  <request name="StoreColors" opcode="89" combine-adjacent="true">
+  <request name="StoreColors" number="89" combine-adjacent="true">
     <pad bytes="1"/>
     <field type="COLORMAP" name="cmap"/>
     <list type="COLORITEM" name="items"/>
   </request>
-  <request name="StoreNamedColor" opcode="90">
+  <request name="StoreNamedColor" number="90">
     <field type="CARD8" name="flags"/>
     <field type="COLORMAP" name="cmap"/>
     <field type="CARD32" name="pixel"/>
@@ -1422,7 +1422,7 @@ authorization from the authors.
     <field type="COLOR"/>
     <pad bytes="2"/>
   </struct>
-  <request name="QueryColors" opcode="91">
+  <request name="QueryColors" number="91">
     <pad bytes="1"/>
     <field type="COLORMAP" name="cmap"/>
     <list type="CARD32" name="pixels"/>
@@ -1435,7 +1435,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="LookupColor" opcode="92">
+  <request name="LookupColor" number="92">
     <pad bytes="1"/>
     <field type="COLORMAP" name="cmap"/>
     <field type="CARD16" name="name-len"/>
@@ -1448,7 +1448,7 @@ authorization from the authors.
       <field type="COLOR" name="visual-color"/>
     </reply>
   </request>
-  <request name="CreateCursor" opcode="93">
+  <request name="CreateCursor" number="93">
     <pad bytes="1"/>
     <field type="CURSOR" name="cid"/>
     <field type="PIXMAP" name="source"/>
@@ -1457,7 +1457,7 @@ authorization from the authors.
     <field type="COLOR" name="back-color"/>
     <field type="POINT"/>
   </request>
-  <request name="CreateGlyphCursor" opcode="94">
+  <request name="CreateGlyphCursor" number="94">
     <pad bytes="1"/>
     <field type="CURSOR" name="cid"/>
     <field type="FONT" name="source-font"/>
@@ -1467,17 +1467,17 @@ authorization from the authors.
     <field type="COLOR" name="fore-color"/>
     <field type="COLOR" name="back-color"/>
   </request>
-  <request name="FreeCursor" opcode="95">
+  <request name="FreeCursor" number="95">
     <pad bytes="1"/>
     <field type="CURSOR" name="cursor"/>
   </request>
-  <request name="RecolorCursor" opcode="96">
+  <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"/>
   </request>
-  <request name="QueryBestSize" opcode="97">
+  <request name="QueryBestSize" number="97">
     <field type="QueryClass" name="class"/>
     <field type="DRAWABLE" name="drawable"/>
     <field type="SIZE" name="size"/>
@@ -1486,7 +1486,7 @@ authorization from the authors.
       <field type="SIZE" name="value"/>
     </reply>
   </request>
-  <request name="QueryExtension" opcode="98">
+  <request name="QueryExtension" number="98">
     <pad bytes="1"/>
     <field type="CARD16" name="name-len"/>
     <list type="char" name="name">
@@ -1500,7 +1500,7 @@ authorization from the authors.
       <field type="CARD8" name="first-error"/>
     </reply>
   </request>
-  <request name="ListExtensions" opcode="99">
+  <request name="ListExtensions" number="99">
     <reply>
       <field type="CARD8" name="names-len"/>
       <pad bytes="24"/>
@@ -1509,7 +1509,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="ChangeKeyboardMapping" opcode="100">
+  <request name="ChangeKeyboardMapping" number="100">
     <field type="CARD8" name="keycode-count"/>
     <field type="KEYCODE" name="first-keycode"/>
     <field type="CARD8" name="keysyms-per-keycode"/>
@@ -1520,7 +1520,7 @@ authorization from the authors.
       </op>
     </list>
   </request>
-  <request name="GetKeyboardMapping" opcode="101">
+  <request name="GetKeyboardMapping" number="101">
     <pad bytes="1"/>
     <field type="KEYCODE" name="first-keycode"/>
     <field type="CARD8" name="count"/>
@@ -1535,11 +1535,11 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="ChangeKeyboardControl" opcode="102">
+  <request name="ChangeKeyboardControl" number="102">
     <pad bytes="1"/>
     <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
   </request>
-  <request name="GetKeyboardControl" opcode="103">
+  <request name="GetKeyboardControl" number="103">
     <reply>
       <field type="BYTE" name="global-auto-repeat"/>
       <field type="CARD32" name="led-mask"/>
@@ -1553,7 +1553,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="Bell" opcode="104">
+  <request name="Bell" number="104">
     <field type="INT8" name="percent"/>
   </request>
   <struct name="PointerControl">
@@ -1561,13 +1561,13 @@ authorization from the authors.
     <field type="CARD16" name="acceleration-denominator"/>
     <field type="CARD16" name="threshold"/>
   </struct>
-  <request name="ChangePointerControl" opcode="105">
+  <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"/>
   </request>
-  <request name="GetPointerControl" opcode="106">
+  <request name="GetPointerControl" number="106">
     <reply>
       <pad bytes="1"/>
       <field type="PointerControl" name="value"/>
@@ -1579,11 +1579,11 @@ authorization from the authors.
     <field type="CARD8" name="prefer-blanking"/>
     <field type="CARD8" name="allow-exposures"/>
   </struct>
-  <request name="SetScreenSaver" opcode="107">
+  <request name="SetScreenSaver" number="107">
     <pad bytes="1"/>
     <field type="ScreenSaver" name="value"/>
   </request>
-  <request name="GetScreenSaver" opcode="108">
+  <request name="GetScreenSaver" number="108">
     <reply>
       <pad bytes="1"/>
       <field type="ScreenSaver" name="value"/>
@@ -1597,11 +1597,11 @@ authorization from the authors.
       <fieldref>address-len</fieldref>
     </list>
   </struct>
-  <request name="ChangeHosts" opcode="109">
+  <request name="ChangeHosts" number="109">
     <field type="CARD8" name="mode"/>
     <field type="HOST" name="host"/>
   </request>
-  <request name="ListHosts" opcode="110">
+  <request name="ListHosts" number="110">
     <reply>
       <field type="BYTE" name="mode"/>
       <field type="CARD16" name="hosts-len"/>
@@ -1611,17 +1611,17 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="SetAccessControl" opcode="111">
+  <request name="SetAccessControl" number="111">
     <field type="CARD8" name="mode"/>
   </request>
-  <request name="SetCloseDownMode" opcode="112">
+  <request name="SetCloseDownMode" number="112">
     <field type="CloseDownMode" name="mode"/>
   </request>
-  <request name="KillClient" opcode="113">
+  <request name="KillClient" number="113">
     <pad bytes="1"/>
     <field type="CARD32" name="resource"/>
   </request>
-  <request name="RotateProperties" opcode="114">
+  <request name="RotateProperties" number="114">
     <field type="WINDOW" name="window"/>
     <field type="CARD16" name="atoms-len"/>
     <field type="INT16" name="delta"/>
@@ -1629,10 +1629,10 @@ authorization from the authors.
       <fieldref>atoms-len</fieldref>
     </list>
   </request>
-  <request name="ForceScreenSaver" opcode="115">
+  <request name="ForceScreenSaver" number="115">
     <field type="CARD8" name="mode"/>
   </request>
-  <request name="SetPointerMapping" opcode="116">
+  <request name="SetPointerMapping" number="116">
     <field type="CARD8" name="map-len"/>
     <list type="CARD8" name="map">
       <fieldref>map-len</fieldref>
@@ -1641,7 +1641,7 @@ authorization from the authors.
       <field type="MappingStatus" name="status"/>
     </reply>
   </request>
-  <request name="GetPointerMapping" opcode="117">
+  <request name="GetPointerMapping" number="117">
     <reply>
       <field type="CARD8" name="map-len"/>
       <pad bytes="24"/>
@@ -1650,7 +1650,7 @@ authorization from the authors.
       </list>
     </reply>
   </request>
-  <request name="SetModifierMapping" opcode="118">
+  <request name="SetModifierMapping" number="118">
     <field type="CARD8" name="keycodes-per-modifier"/>
     <list type="KEYCODE" name="keycodes">
       <op op="*">
@@ -1662,7 +1662,7 @@ authorization from the authors.
       <field type="MappingStatus" name="status"/>
     </reply>
   </request>
-  <request name="GetModifierMapping" opcode="119">
+  <request name="GetModifierMapping" number="119">
     <reply>
       <field type="CARD8" name="keycodes-per-modifier"/>
       <pad bytes="24"/>
@@ -1679,5 +1679,5 @@ authorization from the authors.
     but geez, malloc()ing a 262140 byte buffer just so I have something
     to hand to write(2) seems silly...!
   -->
-  <request name="NoOperation" opcode="127"/>
+  <request name="NoOperation" number="127"/>
 </protocol>


More information about the xcb-commit mailing list