[Xcb-commit] Branch 'xspec' - xcb-proto
Alp Toker
alp at kemper.freedesktop.org
Wed Mar 15 09:36:53 PST 2006
xcb-proto/src/extensions/composite.xml | 40 -
xcb-proto/src/extensions/damage.xml | 26 -
xcb-proto/src/extensions/dpms.xml | 8
xcb-proto/src/extensions/glx.xml | 82 +--
xcb-proto/src/extensions/randr.xml | 30 -
xcb-proto/src/extensions/record.xml | 10
xcb-proto/src/extensions/render.xml | 294 ++++++------
xcb-proto/src/extensions/screensaver.xml | 22
xcb-proto/src/extensions/shape.xml | 56 +-
xcb-proto/src/extensions/shm.xml | 28 -
xcb-proto/src/extensions/sync.xml | 8
xcb-proto/src/extensions/xf86dri.xml | 2
xcb-proto/src/extensions/xfixes.xml | 142 ++---
xcb-proto/src/extensions/xprint.xml | 22
xcb-proto/src/extensions/xv.xml | 116 ++--
xcb-proto/src/extensions/xvmc.xml | 10
xcb-proto/src/xcb_types.xml | 100 ++--
xcb-proto/src/xproto.xml | 754 +++++++++++++++----------------
18 files changed, 875 insertions(+), 875 deletions(-)
New commits:
diff-tree a3ed83459d12960fe6eae5bc3d20930b2d9063ba (from ba7d343389a584ec5413874d30c80f6746acce34)
Author: Alp Toker <alp at atoker.com>
Date: Wed Mar 15 17:36:46 2006 +0000
Reconcile type names with X11 protocol headers
diff --git a/xcb-proto/src/extensions/composite.xml b/xcb-proto/src/extensions/composite.xml
index b19ac6e..ba14346 100644
--- a/xcb-proto/src/extensions/composite.xml
+++ b/xcb-proto/src/extensions/composite.xml
@@ -31,66 +31,66 @@ authorization from the authors.
<item name="manual"/>
</enum>
<request name="QueryVersion" number="0">
- <field type="VERSION" name="client-version"/>
+ <field type="Version" name="client-version"/>
<reply>
<pad bytes="1"/>
- <field type="VERSION" name="server-version"/>
+ <field type="Version" name="server-version"/>
<pad bytes="16"/>
</reply>
</request>
<request name="RedirectWindow" number="1">
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<field type="UpdateType" name="update"/>
<pad bytes="3"/>
</request>
<request name="RedirectSubwindows" number="2">
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<field type="UpdateType" name="update"/>
<pad bytes="3"/>
</request>
<request name="UnredirectWindow" number="3">
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<field type="UpdateType" name="update"/>
<pad bytes="3"/>
</request>
<request name="UnredirectSubwindows" number="4">
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<field type="UpdateType" name="update"/>
<pad bytes="3"/>
</request>
<request name="CreateRegionFromBorderClip" number="5">
- <field type="REGION" name="region"/>
- <field type="WINDOW" name="window"/>
+ <field type="Region" name="region"/>
+ <field type="Window" name="window"/>
</request>
<!-- Version 0.2 additions -->
<request name="NameWindowPixmap" number="6">
- <field type="WINDOW" name="window"/>
- <field type="PIXMAP" name="pixmap"/>
+ <field type="Window" name="window"/>
+ <field type="Pixmap" name="pixmap"/>
</request>
<!-- Version 0.3 additions -->
<!-- FIXME: complete and validate -->
<struct name="CompositeCoordinate">
- <field type="WINDOW" name="child"/>
- <field type="POINT"/>
+ <field type="Window" name="child"/>
+ <field type="Point"/>
</struct>
<request name="RedirectCoordinate" number="7">
- <field type="WINDOW" name="window"/>
- <field type="BOOL" name="redirect"/>
+ <field type="Window" name="window"/>
+ <field type="bool" name="redirect"/>
<pad bytes="3"/>
</request>
<event name="TransformCoordinateNotify" number="0">
- <field type="TIMESTAMP" name="time"/>
- <field type="WINDOW" name="window"/>
- <field type="WINDOW" name="child"/>
+ <field type="Time" name="time"/>
+ <field type="Window" name="window"/>
+ <field type="Window" name="child"/>
<field type="CARD32" name="serial-number"/>
<field type="CARD32" name="count"/>
- <field type="POINT"/>
+ <field type="Point"/>
<pad bytes="4"/>
</event>
<request name="TransformCoordinate" number="8">
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<field type="CARD32" name="serial-number"/>
- <field type="POINT"/>
+ <field type="Point"/>
<list type="CompositeCoordinate" name="coordinates"/>
</request>
</extension>
diff --git a/xcb-proto/src/extensions/damage.xml b/xcb-proto/src/extensions/damage.xml
index 7f9570a..5a817af 100644
--- a/xcb-proto/src/extensions/damage.xml
+++ b/xcb-proto/src/extensions/damage.xml
@@ -24,9 +24,9 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<extension header="damage" xname="DAMAGE" name="Damage" version="1">
+<extension header="damage" xname="Damage" name="Damage" version="1">
<import>xfixes</import>
- <type name="DAMAGE"/>
+ <type name="Damage"/>
<error name="BadDamage" number="0"/>
<enum type="CARD8" name="ReportLevel">
<item name="raw-rectangles"/>
@@ -45,25 +45,25 @@ authorization from the authors.
</reply>
</request>
<request name="Create" number="1">
- <field type="DAMAGE" name="damage"/>
- <field type="DRAWABLE" name="drawable"/>
+ <field type="Damage" name="damage"/>
+ <field type="Drawable" name="drawable"/>
<field type="ReportLevel" name="level"/>
<pad bytes="3"/>
</request>
<request name="Destroy" number="2">
- <field type="DAMAGE" name="damage"/>
+ <field type="Damage" name="damage"/>
</request>
<request name="Subtract" number="3">
- <field type="DAMAGE" name="damage"/>
- <field type="REGION" name="repair"/>
- <field type="REGION" name="parts"/>
+ <field type="Damage" name="damage"/>
+ <field type="Region" name="repair"/>
+ <field type="Region" name="parts"/>
</request>
<event name="Notify" number="0">
<field type="ReportLevel" name="level"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="DAMAGE" name="damage"/>
- <field type="TIMESTAMP" name="timestamp"/>
- <field type="RECTANGLE" name="area"/>
- <field type="RECTANGLE" name="geometry"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="Damage" name="damage"/>
+ <field type="Time" name="timestamp"/>
+ <field type="Rectangle" name="area"/>
+ <field type="Rectangle" name="geometry"/>
</event>
</extension>
diff --git a/xcb-proto/src/extensions/dpms.xml b/xcb-proto/src/extensions/dpms.xml
index c0daf10..e09c948 100644
--- a/xcb-proto/src/extensions/dpms.xml
+++ b/xcb-proto/src/extensions/dpms.xml
@@ -27,16 +27,16 @@ authorization from the authors.
-->
<extension header="dpms" xname="DPMS" name="DPMS">
<request name="GetVersion" number="0">
- <field type="VERSION" name="client-version"/>
+ <field type="Version" name="client-version"/>
<reply>
<pad bytes="1"/>
- <field type="VERSION" name="server-version"/>
+ <field type="Version" name="server-version"/>
</reply>
</request>
<request name="Capable" number="1">
<reply>
<pad bytes="1"/>
- <field type="BOOL" name="capable"/>
+ <field type="bool" name="capable"/>
</reply>
</request>
<request name="GetTimeouts" number="2">
@@ -61,7 +61,7 @@ authorization from the authors.
<reply>
<pad bytes="1"/>
<field type="CARD16" name="power-level"/>
- <field type="BOOL" name="state"/>
+ <field type="bool" name="state"/>
</reply>
</request>
</extension>
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index 0351df2..930c9c2 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -44,11 +44,11 @@ The patch that fixed this server bug in
-->
<extension header="glx" xname="GLX" name="Glx" version="1.3">
<type name="CONTEXT"/>
- <type name="DRAWABLE"/>
- <type name="PIXMAP"/>
+ <type name="Drawable"/>
+ <type name="Pixmap"/>
<type name="FBCONFIG"/>
<type name="PBUFFER"/>
- <type name="WINDOW"/>
+ <type name="Window"/>
<typedef oldname="float" newname="FLOAT32"/>
<typedef oldname="double" newname="FLOAT64"/>
<typedef oldname="CARD32" newname="BOOL32"/>
@@ -107,23 +107,23 @@ The patch that fixed this server bug in
<!-- Requests -->
<request name="Render" number="1" combine-adjacent="true">
<field type="CARD32" name="context_tag"/>
- <list type="BYTE" name="data"/>
+ <list type="byte" name="data"/>
</request>
<request name="RenderLarge" number="2">
<field type="CARD32" name="context_tag"/>
<field type="CARD16" name="request_num"/>
<field type="CARD16" name="request_total"/>
<field type="CARD32" name="data_len"/>
- <list type="BYTE" name="data">
+ <list type="byte" name="data">
<fieldref>data_len</fieldref>
</list>
</request>
<request name="CreateContext" number="3">
<field type="glx:CONTEXT" name="context"/>
- <field type="VISUALID" name="visual"/>
+ <field type="VisualID" name="visual"/>
<field type="CARD32" name="screen"/>
<field type="CARD32" name="share_list"/>
- <field type="BOOL" name="is_direct"/>
+ <field type="bool" name="is_direct"/>
<pad bytes="3"/>
</request>
<request name="DestroyContext" number="4">
@@ -143,7 +143,7 @@ The patch that fixed this server bug in
<field type="glx:CONTEXT" name="context"/>
<reply>
<pad bytes="1"/>
- <field type="BOOL" name="is_direct"/>
+ <field type="bool" name="is_direct"/>
<pad bytes="23"/>
</reply>
</request>
@@ -241,14 +241,14 @@ The patch that fixed this server bug in
</request>
<request name="UseXFont" number="12">
<field type="CARD32" name="context_tag"/>
- <field type="FONT" name="font"/>
+ <field type="Font" name="font"/>
<field type="CARD32" name="first"/>
<field type="CARD32" name="count"/>
<field type="CARD32" name="list_base"/>
</request>
<request name="CreateGLXPixmap" number="13">
<field type="CARD32" name="screen"/>
- <field type="VISUALID" name="visual"/>
+ <field type="VisualID" name="visual"/>
<field type="xcb_types:PIXMAP" name="pixmap"/>
<field type="glx:PIXMAP" name="glx_pixmap"/>
</request>
@@ -273,19 +273,19 @@ The patch that fixed this server bug in
<request name="VendorPrivate" number="16">
<field type="CARD32" name="vendor_code"/>
<field type="CARD32" name="context_tag"/>
- <list type="BYTE" name="data"/>
+ <list type="byte" name="data"/>
</request>
<request name="VendorPrivateWithReply" number="17">
<field type="CARD32" name="vendor_code"/>
<field type="CARD32" name="context_tag"/>
- <list type="BYTE" name="data"/>
+ <list type="byte" name="data"/>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="retval"/>
- <list type="BYTE" name="data1">
+ <list type="byte" name="data1">
<value>24</value>
</list>
- <list type="BYTE" name="data2"/>
+ <list type="byte" name="data2"/>
</reply>
</request>
<request name="QueryExtensionsString" number="18">
@@ -342,10 +342,10 @@ The patch that fixed this server bug in
<request name="CreateNewContext" number="24">
<field type="glx:CONTEXT" name="context"/>
<field type="CARD32" name="fbconfig"/>
- <field type="SCREEN" name="screen"/>
+ <field type="Screen" name="screen"/>
<field type="CARD32" name="render_type"/>
<field type="CARD32" name="share_list"/>
- <field type="BOOL" name="is_direct"/>
+ <field type="bool" name="is_direct"/>
<field type="CARD8" name="reserved1"/>
<field type="CARD16" name="reserved2"/>
</request>
@@ -370,7 +370,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="CreatePbuffer" number="27">
- <field type="SCREEN" name="screen"/>
+ <field type="Screen" name="screen"/>
<field type="FBCONFIG" name="fbconfig"/>
<field type="PBUFFER" name="pbuffer"/>
<field type="CARD32" name="num_attribs"/>
@@ -394,7 +394,7 @@ The patch that fixed this server bug in
<valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
</request>
<request name="CreateWindow" number="31">
- <field type="SCREEN" name="screen"/>
+ <field type="Screen" name="screen"/>
<field type="FBCONFIG" name="fbconfig"/>
<field type="xcb_types:WINDOW" name="window"/>
<field type="glx:WINDOW" name="glx_window"/>
@@ -491,12 +491,12 @@ The patch that fixed this server bug in
<field type="INT32" name="height"/>
<field type="CARD32" name="format"/>
<field type="CARD32" name="type"/>
- <field type="BOOL" name="swap_bytes"/>
- <field type="BOOL" name="lsb_first"/>
+ <field type="bool" name="swap_bytes"/>
+ <field type="bool" name="lsb_first"/>
<reply>
<pad bytes="1"/>
<pad bytes="24"/>
- <list type="BYTE" name="data"/>
+ <list type="byte" name="data"/>
</reply>
</request>
<!-- FIXME:
@@ -512,9 +512,9 @@ The patch that fixed this server bug in
<pad bytes="1"/>
<pad bytes="4"/>
<field type="CARD32" name="n"/>
- <field type="BOOL" name="datum"/>
+ <field type="bool" name="datum"/>
<pad bytes="15"/>
- <list type="BOOL" name="data">
+ <list type="bool" name="data">
<fieldref>n</fieldref>
</list>
</reply>
@@ -726,11 +726,11 @@ The patch that fixed this server bug in
</request>
<request name="GetPolygonStipple" number="128">
<field type="CARD32" name="context_tag"/>
- <field type="BOOL" name="lsb_first"/>
+ <field type="bool" name="lsb_first"/>
<reply>
<pad bytes="1"/>
<pad bytes="24"/>
- <list type="BYTE" name="data"/>
+ <list type="byte" name="data"/>
</reply>
</request>
<request name="GetString" number="129">
@@ -827,7 +827,7 @@ The patch that fixed this server bug in
<field type="INT32" name="level"/>
<field type="CARD32" name="format"/>
<field type="CARD32" name="type"/>
- <field type="BOOL" name="swap_bytes"/>
+ <field type="bool" name="swap_bytes"/>
<reply>
<pad bytes="1"/>
<pad bytes="8"/>
@@ -835,7 +835,7 @@ The patch that fixed this server bug in
<field type="INT32" name="height"/>
<field type="INT32" name="depth"/>
<pad bytes="4"/>
- <list type="BYTE" name="data"/>
+ <list type="byte" name="data"/>
</reply>
</request>
<request name="GetTexParameterfv" number="136">
@@ -921,7 +921,7 @@ The patch that fixed this server bug in
<pad bytes="1"/>
<field type="BOOL32" name="ret_val"/>
<pad bytes="20"/>
- <list type="BOOL" name="data"/>
+ <list type="bool" name="data"/>
</reply>
</request>
<request name="DeleteTextures" number="144">
@@ -953,13 +953,13 @@ The patch that fixed this server bug in
<field type="CARD32" name="target"/>
<field type="CARD32" name="format"/>
<field type="CARD32" name="type"/>
- <field type="BOOL" name="swap_bytes"/>
+ <field type="bool" name="swap_bytes"/>
<reply>
<pad bytes="1"/>
<pad bytes="8"/>
<field type="INT32" name="width"/>
<pad bytes="12"/>
- <list type="BYTE" name="data"/>
+ <list type="byte" name="data"/>
</reply>
</request>
<request name="GetColorTableParameterfv" number="148">
@@ -997,14 +997,14 @@ The patch that fixed this server bug in
<field type="CARD32" name="target"/>
<field type="CARD32" name="format"/>
<field type="CARD32" name="type"/>
- <field type="BOOL" name="swap_bytes"/>
+ <field type="bool" name="swap_bytes"/>
<reply>
<pad bytes="1"/>
<pad bytes="8"/>
<field type="INT32" name="width"/>
<field type="INT32" name="height"/>
<pad bytes="8"/>
- <list type="BYTE" name="data"/>
+ <list type="byte" name="data"/>
</reply>
</request>
<request name="GetConvolutionParameterfv" number="151">
@@ -1042,14 +1042,14 @@ The patch that fixed this server bug in
<field type="CARD32" name="target"/>
<field type="CARD32" name="format"/>
<field type="CARD32" name="type"/>
- <field type="BOOL" name="swap_bytes"/>
+ <field type="bool" name="swap_bytes"/>
<reply>
<pad bytes="1"/>
<pad bytes="8"/>
<field type="INT32" name="row_w"/>
<field type="INT32" name="col_h"/>
<pad bytes="8"/>
- <list type="BYTE" name="rows_and_cols"/>
+ <list type="byte" name="rows_and_cols"/>
</reply>
</request>
<request name="GetHistogram" number="154">
@@ -1057,14 +1057,14 @@ The patch that fixed this server bug in
<field type="CARD32" name="target"/>
<field type="CARD32" name="format"/>
<field type="CARD32" name="type"/>
- <field type="BOOL" name="swap_bytes"/>
- <field type="BOOL" name="reset"/>
+ <field type="bool" name="swap_bytes"/>
+ <field type="bool" name="reset"/>
<reply>
<pad bytes="1"/>
<pad bytes="8"/>
<field type="INT32" name="width"/>
<pad bytes="12"/>
- <list type="BYTE" name="data"/>
+ <list type="byte" name="data"/>
</reply>
</request>
<request name="GetHistogramParameterfv" number="155">
@@ -1102,12 +1102,12 @@ The patch that fixed this server bug in
<field type="CARD32" name="target"/>
<field type="CARD32" name="format"/>
<field type="CARD32" name="type"/>
- <field type="BOOL" name="swap_bytes"/>
- <field type="BOOL" name="reset"/>
+ <field type="bool" name="swap_bytes"/>
+ <field type="bool" name="reset"/>
<reply>
<pad bytes="1"/>
<pad bytes="24"/>
- <list type="BYTE" name="data"/>
+ <list type="byte" name="data"/>
</reply>
</request>
<request name="GetMinmaxParameterfv" number="158">
@@ -1159,7 +1159,7 @@ The patch that fixed this server bug in
<pad bytes="8"/>
<field type="INT32" name="size"/>
<pad bytes="12"/>
- <list type="BYTE" name="data"/>
+ <list type="byte" name="data"/>
</reply>
</request>
<!--
diff --git a/xcb-proto/src/extensions/randr.xml b/xcb-proto/src/extensions/randr.xml
index d6f2f30..0c89924 100644
--- a/xcb-proto/src/extensions/randr.xml
+++ b/xcb-proto/src/extensions/randr.xml
@@ -66,18 +66,18 @@ authorization from the authors.
</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" number="2">
- <field type="WINDOW" name="drawable"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="TIMESTAMP" name="config-time"/>
+ <field type="Window" name="drawable"/>
+ <field type="Time" name="time"/>
+ <field type="Time" name="config-time"/>
<field type="CARD16" name="size-id"/>
<field type="INT16" name="rotation"/>
<field type="CARD16" name="refresh"/>
<pad bytes="2"/>
<reply>
<field type="CARD8" name="status"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="TIMESTAMP" name="config-time"/>
- <field type="WINDOW" name="root"/>
+ <field type="Time" name="time"/>
+ <field type="Time" name="config-time"/>
+ <field type="Window" name="root"/>
<field type="render:SubpixelOrder" name="subpixel-order"/>
<pad bytes="10"/>
</reply>
@@ -97,7 +97,7 @@ authorization from the authors.
</item>
</enum>
<request name="SelectInput" number="4">
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<field type="CARD16" name="enable"/>
<pad bytes="2"/>
</request>
@@ -105,12 +105,12 @@ authorization from the authors.
I think this is correct. It works. though I believe n-info is a bit high...
-->
<request name="GetScreenInfo" number="5">
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<reply>
<field type="CARD8" name="rotations"/>
- <field type="WINDOW" name="root"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="TIMESTAMP" name="config-time"/>
+ <field type="Window" name="root"/>
+ <field type="Time" name="time"/>
+ <field type="Time" name="config-time"/>
<field type="CARD16" name="n-sizes"/>
<field type="CARD16" name="size-id"/>
<field type="INT16" name="rotation"/>
@@ -135,10 +135,10 @@ authorization from the authors.
</enum>
<event name="ScreenChangeNotify" number="0">
<field type="CARD8" name="rotation"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="TIMESTAMP" name="config-time"/>
- <field type="WINDOW" name="root"/>
- <field type="WINDOW" name="request-window"/>
+ <field type="Time" name="time"/>
+ <field type="Time" name="config-time"/>
+ <field type="Window" name="root"/>
+ <field type="Window" name="request-window"/>
<field type="CARD16" name="size-id"/>
<field type="render:SubpixelOrder" name="subpixel-order"/>
<field type="ScreenSize"/>
diff --git a/xcb-proto/src/extensions/record.xml b/xcb-proto/src/extensions/record.xml
index fbd244a..bad8372 100644
--- a/xcb-proto/src/extensions/record.xml
+++ b/xcb-proto/src/extensions/record.xml
@@ -48,8 +48,8 @@ authorization from the authors.
<field type="Range8" name="delivered-events"/>
<field type="Range8" name="device-events"/>
<field type="Range8" name="errors"/>
- <field type="BOOL" name="client-started"/>
- <field type="BOOL" name="client-died"/>
+ <field type="bool" name="client-started"/>
+ <field type="bool" name="client-died"/>
</struct>
<typedef oldname="CARD8" newname="ElementHeader"/>
<enum name="HType">
@@ -132,7 +132,7 @@ authorization from the authors.
<request name="GetContext" number="4">
<field type="record:CONTEXT" name="context"/>
<reply>
- <field type="BOOL" name="enabled"/>
+ <field type="bool" name="enabled"/>
<field type="ElementHeader" name="element-header"/>
<pad bytes="3"/>
<field type="CARD32" name="num-intercepted-clients"/>
@@ -147,13 +147,13 @@ authorization from the authors.
<reply>
<field type="CARD8" name="category"/>
<field type="ElementHeader" name="element-header"/>
- <field type="BOOL" name="client-swapped"/>
+ <field type="bool" name="client-swapped"/>
<pad bytes="2"/>
<field type="CARD32" name="xid-base"/>
<field type="CARD32" name="server-time"/>
<field type="CARD32" name="rec-sequence-num"/>
<pad bytes="8"/>
- <list type="BYTE" name="data"/>
+ <list type="byte" name="data"/>
</reply>
</request>
<request name="DisableContext" number="6">
diff --git a/xcb-proto/src/extensions/render.xml b/xcb-proto/src/extensions/render.xml
index 4c39fc0..c8b18ac 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -153,11 +153,11 @@ for licensing information.
<item name="vertical-bgr"/>
<item name="none"/>
</enum>
- <typedef oldname="CARD32" newname="GLYPH"/>
- <type name="GLYPHSET"/>
- <type name="PICTURE"/>
- <type name="PICTFORMAT"/>
- <typedef oldname="INT32" newname="FIXED"/>
+ <typedef oldname="CARD32" newname="Glyph"/>
+ <type name="Glyphset"/>
+ <type name="Picture"/>
+ <type name="PictFormat"/>
+ <typedef oldname="INT32" newname="Fixed"/>
<error name="PictFormat" number="0"/>
<error name="Picture" number="1"/>
<error name="PictOp" number="2"/>
@@ -173,35 +173,35 @@ for licensing information.
<field type="CARD16" name="alpha-shift"/>
<field type="CARD16" name="alpha-mask"/>
</struct>
- <struct name="PICTFORMINFO">
- <field type="PICTFORMAT" name="id"/>
+ <struct name="PictFormInfo">
+ <field type="PictFormat" name="id"/>
<field type="CARD8" name="type"/>
<field type="CARD8" name="depth"/>
<pad bytes="2"/>
<field type="DIRECTFORMAT" name="direct"/>
- <field type="COLORMAP" name="colormap"/>
+ <field type="Colormap" name="colormap"/>
</struct>
- <struct name="PICTVISUAL">
- <field type="VISUALID" name="visual"/>
- <field type="PICTFORMAT" name="format"/>
+ <struct name="PictVisual">
+ <field type="VisualID" name="visual"/>
+ <field type="PictFormat" name="format"/>
</struct>
- <struct name="PICTDEPTH">
+ <struct name="PictDepth">
<field type="CARD8" name="depth"/>
<pad bytes="1"/>
<field type="CARD16" name="num-visuals"/>
<pad bytes="4"/>
- <list type="PICTVISUAL" name="visuals">
+ <list type="PictVisual" name="visuals">
<fieldref>num-visuals</fieldref>
</list>
</struct>
- <struct name="PICTSCREEN">
+ <struct name="PictScreen">
<field type="CARD32" name="num-depths"/>
- <field type="PICTFORMAT" name="fallback"/>
- <list type="PICTDEPTH" name="depths">
+ <field type="PictFormat" name="fallback"/>
+ <list type="PictDepth" name="depths">
<fieldref>num-depths</fieldref>
</list>
</struct>
- <struct name="COLOR">
+ <struct name="Color">
<field type="CARD16" name="red"/>
<field type="CARD16" name="green"/>
<field type="CARD16" name="blue"/>
@@ -209,31 +209,31 @@ for licensing information.
</struct>
<struct name="INDEXVALUE">
<field type="CARD32" name="pixel"/>
- <field type="COLOR"/>
+ <field type="Color"/>
</struct>
- <struct name="POINTFIX">
- <field type="FIXED" name="x"/>
- <field type="FIXED" name="y"/>
- </struct>
- <struct name="LINEFIX">
- <field type="POINTFIX" name="p1"/>
- <field type="POINTFIX" name="p2"/>
- </struct>
- <struct name="TRIANGLE">
- <field type="POINTFIX" name="p1"/>
- <field type="POINTFIX" name="p2"/>
- <field type="POINTFIX" name="p3"/>
- </struct>
- <struct name="TRAP">
- <field type="FIXED" name="top"/>
- <field type="FIXED" name="bottom"/>
- <field type="LINEFIX" name="left"/>
- <field type="LINEFIX" name="right"/>
- </struct>
- <struct name="GLYPHINFO">
- <field type="SIZE"/>
- <field type="POINT"/>
- <field type="POINT" name="offset"/>
+ <struct name="PointFixed">
+ <field type="Fixed" name="x"/>
+ <field type="Fixed" name="y"/>
+ </struct>
+ <struct name="LineFixed">
+ <field type="PointFixed" name="p1"/>
+ <field type="PointFixed" name="p2"/>
+ </struct>
+ <struct name="Triangle">
+ <field type="PointFixed" name="p1"/>
+ <field type="PointFixed" name="p2"/>
+ <field type="PointFixed" name="p3"/>
+ </struct>
+ <struct name="Trapezoid">
+ <field type="Fixed" name="top"/>
+ <field type="Fixed" name="bottom"/>
+ <field type="LineFixed" name="left"/>
+ <field type="LineFixed" name="right"/>
+ </struct>
+ <struct name="GlyphInfo">
+ <field type="Size"/>
+ <field type="Point"/>
+ <field type="Point" name="offset"/>
</struct>
<request name="QueryVersion" number="0">
<field type="CARD32" name="client-major-version"/>
@@ -255,10 +255,10 @@ for licensing information.
<field type="CARD32" name="num-subpixel"/>
<!-- new in version 0.6 -->
<pad bytes="4"/>
- <list type="PICTFORMINFO" name="formats">
+ <list type="PictFormInfo" name="formats">
<fieldref>num-formats</fieldref>
</list>
- <list type="PICTSCREEN" name="screens">
+ <list type="PictScreen" name="screens">
<fieldref>num-screens</fieldref>
</list>
<list type="SubpixelOrder" name="subpixels">
@@ -268,7 +268,7 @@ for licensing information.
</request>
<!-- from version 0.7 -->
<request name="QueryPictIndexValues" number="2">
- <field type="PICTFORMAT" name="format"/>
+ <field type="PictFormat" name="format"/>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="num-values"/>
@@ -280,30 +280,30 @@ for licensing information.
</request>
<!-- FIXME: opcode 3 reserved for QueryDithers -->
<request name="CreatePicture" number="4">
- <field type="PICTURE" name="pid"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="PICTFORMAT" name="format"/>
+ <field type="Picture" name="pid"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="PictFormat" name="format"/>
<valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="ChangePicture" number="5">
- <field type="PICTURE" name="picture"/>
+ <field type="Picture" name="picture"/>
<valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="SetPictureClipRectangles" number="6">
- <field type="PICTURE" name="picture"/>
+ <field type="Picture" name="picture"/>
<field type="INT16" name="clip-x-origin"/>
<field type="INT16" name="clip-y-origin"/>
- <list type="RECTANGLE" name="rectangles"/>
+ <list type="Rectangle" name="rectangles"/>
</request>
<request name="FreePicture" number="7">
- <field type="PICTURE" name="picture"/>
+ <field type="Picture" name="picture"/>
</request>
<request name="Composite" number="8">
<field type="CARD8" name="op"/>
<pad bytes="3"/>
- <field type="PICTURE" name="src"/>
- <field type="PICTURE" name="mask"/>
- <field type="PICTURE" name="dst"/>
+ <field type="Picture" name="src"/>
+ <field type="Picture" name="mask"/>
+ <field type="Picture" name="dst"/>
<field type="INT16" name="src-x"/>
<field type="INT16" name="src-y"/>
<field type="INT16" name="mask-x"/>
@@ -317,99 +317,99 @@ for licensing information.
<request name="Trapezoids" number="10">
<field type="CARD8" name="op"/>
<pad bytes="3"/>
- <field type="PICTURE" name="src"/>
- <field type="PICTURE" name="dst"/>
- <field type="PICTFORMAT" name="mask-format"/>
+ <field type="Picture" name="src"/>
+ <field type="Picture" name="dst"/>
+ <field type="PictFormat" name="mask-format"/>
<field type="INT16" name="src-x"/>
<field type="INT16" name="src-y"/>
- <list type="TRAP" name="traps"/>
+ <list type="Trapezoid" name="traps"/>
</request>
<request name="Triangles" number="11">
<field type="CARD8" name="op"/>
<pad bytes="3"/>
- <field type="PICTURE" name="src"/>
- <field type="PICTURE" name="dst"/>
- <field type="PICTFORMAT" name="mask-format"/>
+ <field type="Picture" name="src"/>
+ <field type="Picture" name="dst"/>
+ <field type="PictFormat" name="mask-format"/>
<field type="INT16" name="src-x"/>
<field type="INT16" name="src-y"/>
- <list type="TRIANGLE" name="triangles"/>
+ <list type="Triangle" name="triangles"/>
</request>
<request name="TriStrip" number="12">
<field type="CARD8" name="op"/>
<pad bytes="3"/>
- <field type="PICTURE" name="src"/>
- <field type="PICTURE" name="dst"/>
- <field type="PICTFORMAT" name="mask-format"/>
+ <field type="Picture" name="src"/>
+ <field type="Picture" name="dst"/>
+ <field type="PictFormat" name="mask-format"/>
<field type="INT16" name="src-x"/>
<field type="INT16" name="src-y"/>
- <list type="POINTFIX" name="points"/>
+ <list type="PointFixed" name="points"/>
</request>
<request name="TriFan" number="13">
<field type="CARD8" name="op"/>
<pad bytes="3"/>
- <field type="PICTURE" name="src"/>
- <field type="PICTURE" name="dst"/>
- <field type="PICTFORMAT" name="mask-format"/>
+ <field type="Picture" name="src"/>
+ <field type="Picture" name="dst"/>
+ <field type="PictFormat" name="mask-format"/>
<field type="INT16" name="src-x"/>
<field type="INT16" name="src-y"/>
- <list type="POINTFIX" name="points"/>
+ <list type="PointFixed" name="points"/>
</request>
<!-- opcode 14 reserved for ColorTrapezoids -->
<!-- opcode 15 reserved for ColorTriangles -->
<!-- opcode 16 reserved for Transform -->
<request name="CreateGlyphSet" number="17">
- <field type="GLYPHSET" name="gsid"/>
- <field type="PICTFORMAT" name="format"/>
+ <field type="Glyphset" name="gsid"/>
+ <field type="PictFormat" name="format"/>
</request>
<request name="ReferenceGlyphSet" number="18">
- <field type="GLYPHSET" name="gsid"/>
- <field type="GLYPHSET" name="existing"/>
+ <field type="Glyphset" name="gsid"/>
+ <field type="Glyphset" name="existing"/>
</request>
<request name="FreeGlyphSet" number="19">
- <field type="GLYPHSET" name="glyphset"/>
+ <field type="Glyphset" name="glyphset"/>
</request>
<request name="AddGlyphs" number="20">
- <field type="GLYPHSET" name="glyphset"/>
+ <field type="Glyphset" name="glyphset"/>
<field type="CARD32" name="glyphs-len"/>
<list type="CARD32" name="glyphids">
<fieldref>glyphs-len</fieldref>
</list>
- <list type="GLYPHINFO" name="glyphs">
+ <list type="GlyphInfo" name="glyphs">
<fieldref>glyphs-len</fieldref>
</list>
- <list type="BYTE" name="data"/>
+ <list type="byte" name="data"/>
</request>
<!-- opcode 21 reserved for AddGlyphsFromPicture -->
<request name="FreeGlyphs" number="22">
- <field type="GLYPHSET" name="glyphset"/>
- <list type="GLYPH" name="glyphs"/>
+ <field type="Glyphset" name="glyphset"/>
+ <list type="Glyph" name="glyphs"/>
</request>
- <struct name="GLYPHSETELT">
+ <struct name="GlyphsetElt">
<field type="CARD8" name="len"/>
<pad bytes="3"/>
- <field type="POINT" name="delta"/>
- <field type="GLYPHSET" name="glyphset"/>
+ <field type="Point" name="delta"/>
+ <field type="Glyphset" name="glyphset"/>
</struct>
<!-- CompositeGlyphs8 -->
<struct name="GLYPHELT8">
<field type="CARD8" name="len"/>
<pad bytes="3"/>
- <field type="POINT" name="delta"/>
+ <field type="Point" name="delta"/>
<list type="CARD8" name="glyphs">
<fieldref>len</fieldref>
</list>
</struct>
<union name="GLYPHITEM8">
<field type="GLYPHELT8" name="glyphelt"/>
- <field type="GLYPHSETELT" name="glyphset"/>
+ <field type="GlyphsetElt" name="glyphset"/>
</union>
<request name="CompositeGlyphs8" number="23">
<field type="CARD8" name="op"/>
<pad bytes="3"/>
- <field type="PICTURE" name="src"/>
- <field type="PICTURE" name="dst"/>
- <field type="PICTFORMAT" name="mask-format"/>
- <field type="GLYPHSET" name="glyphset"/>
+ <field type="Picture" name="src"/>
+ <field type="Picture" name="dst"/>
+ <field type="PictFormat" name="mask-format"/>
+ <field type="Glyphset" name="glyphset"/>
<field type="INT16" name="src-x"/>
<field type="INT16" name="src-y"/>
<list type="GLYPHITEM8" name="glyphcmds"/>
@@ -418,80 +418,80 @@ for licensing information.
<struct name="GLYPHELT16">
<field type="CARD8" name="len"/>
<pad bytes="3"/>
- <field type="POINT" name="delta"/>
+ <field type="Point" name="delta"/>
<list type="CARD16" name="glyphs">
<fieldref>len</fieldref>
</list>
</struct>
<union name="GLYPHITEM16">
<field type="GLYPHELT16" name="glyphelt"/>
- <field type="GLYPHSETELT" name="glyphset"/>
+ <field type="GlyphsetElt" name="glyphset"/>
</union>
<request name="CompositeGlyphs16" number="24">
<field type="CARD8" name="op"/>
<pad bytes="3"/>
- <field type="PICTURE" name="src"/>
- <field type="PICTURE" name="dst"/>
- <field type="PICTFORMAT" name="mask-format"/>
- <field type="GLYPHSET" name="glyphset"/>
- <field type="POINT" name="src-point"/>
+ <field type="Picture" name="src"/>
+ <field type="Picture" name="dst"/>
+ <field type="PictFormat" name="mask-format"/>
+ <field type="Glyphset" name="glyphset"/>
+ <field type="Point" name="src-point"/>
<list type="GLYPHITEM16" name="glyphcmds"/>
</request>
<!-- CompositeGlyphs32 -->
<struct name="GLYPHELT32">
<field type="CARD8" name="len"/>
<pad bytes="3"/>
- <field type="POINT" name="delta"/>
+ <field type="Point" name="delta"/>
<list type="CARD32" name="glyphs">
<fieldref>len</fieldref>
</list>
</struct>
<union name="GLYPHITEM32">
<field type="GLYPHELT32" name="glyphelt"/>
- <field type="GLYPHSETELT" name="glyphset"/>
+ <field type="GlyphsetElt" name="glyphset"/>
</union>
<request name="CompositeGlyphs32" number="25">
<field type="CARD8" name="op"/>
<pad bytes="3"/>
- <field type="PICTURE" name="src"/>
- <field type="PICTURE" name="dst"/>
- <field type="PICTFORMAT" name="mask-format"/>
- <field type="GLYPHSET" name="glyphset"/>
- <field type="POINT" name="src-point"/>
+ <field type="Picture" name="src"/>
+ <field type="Picture" name="dst"/>
+ <field type="PictFormat" name="mask-format"/>
+ <field type="Glyphset" name="glyphset"/>
+ <field type="Point" name="src-point"/>
<list type="GLYPHITEM32" name="glyphcmds"/>
</request>
<!-- new in version 0.1 -->
<request name="FillRectangles" number="26">
<field type="CARD8" name="op"/>
<pad bytes="3"/>
- <field type="PICTURE" name="dst"/>
- <field type="COLOR" name="color"/>
- <list type="RECTANGLE" name="rects"/>
+ <field type="Picture" name="dst"/>
+ <field type="Color" name="color"/>
+ <list type="Rectangle" name="rects"/>
</request>
<!-- new in version 0.5 -->
<request name="CreateCursor" number="27">
- <field type="CURSOR" name="cid"/>
- <field type="PICTURE" name="source"/>
- <field type="POINT"/>
+ <field type="Cursor" name="cid"/>
+ <field type="Picture" name="source"/>
+ <field type="Point"/>
</request>
<!-- new in version 0.6 -->
<struct name="TRANSFORM">
- <field type="FIXED" name="matrix11"/>
- <field type="FIXED" name="matrix12"/>
- <field type="FIXED" name="matrix13"/>
- <field type="FIXED" name="matrix21"/>
- <field type="FIXED" name="matrix22"/>
- <field type="FIXED" name="matrix23"/>
- <field type="FIXED" name="matrix31"/>
- <field type="FIXED" name="matrix32"/>
- <field type="FIXED" name="matrix33"/>
+ <field type="Fixed" name="matrix11"/>
+ <field type="Fixed" name="matrix12"/>
+ <field type="Fixed" name="matrix13"/>
+ <field type="Fixed" name="matrix21"/>
+ <field type="Fixed" name="matrix22"/>
+ <field type="Fixed" name="matrix23"/>
+ <field type="Fixed" name="matrix31"/>
+ <field type="Fixed" name="matrix32"/>
+ <field type="Fixed" name="matrix33"/>
</struct>
<request name="SetPictureTransform" number="28">
- <field type="PICTURE" name="picture"/>
+ <field type="Picture" name="picture"/>
<field type="TRANSFORM" name="transform"/>
</request>
<request name="QueryFilters" number="29">
- <field type="DRAWABLE" name="drawable"/>
+ <field type="Drawable" name="drawable"/>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="num-aliases"/>
@@ -500,34 +500,34 @@ for licensing information.
<list type="CARD16" name="aliases">
<fieldref>num-aliases</fieldref>
</list>
- <list type="STR" name="filters">
+ <list type="string" name="filters">
<fieldref>num-filters</fieldref>
</list>
</reply>
</request>
<request name="SetPictureFilter" number="30">
- <field type="PICTURE" name="picture"/>
+ <field type="Picture" name="picture"/>
<field type="CARD16" name="filter-len"/>
<list type="char" name="filter">
<fieldref>filter-len</fieldref>
</list>
- <list type="FIXED" name="values"/>
+ <list type="Fixed" name="values"/>
</request>
<!-- new in version 0.8 -->
<struct name="ANIMCURSORELT">
- <field type="CURSOR" name="cursor"/>
+ <field type="Cursor" name="cursor"/>
<field type="CARD32" name="delay"/>
</struct>
<request name="CreateAnimCursor" number="31">
- <field type="CURSOR" name="cid"/>
+ <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" number="32">
- <field type="PICTURE" name="picture"/>
- <field type="POINT" name="offset"/>
- <list type="TRAP" name="trapezoids"/>
+ <field type="Picture" name="picture"/>
+ <field type="Point" name="offset"/>
+ <list type="Trapezoid" name="trapezoids"/>
</request>
<!-- new in version 0.10 -->
<enum type="CARD16" name="Repeat">
@@ -537,39 +537,39 @@ for licensing information.
<item name="reflect"/>
</enum>
<request name="CreateSolidFill" number="33">
- <field type="PICTURE" name="pid"/>
- <field type="COLOR" name="color"/>
+ <field type="Picture" name="pid"/>
+ <field type="Color" name="color"/>
</request>
<request name="CreateLinearGradient" number="34">
- <field type="PICTURE" name="pid"/>
- <field type="POINTFIX" name="p1"/>
- <field type="POINTFIX" name="p2"/>
+ <field type="Picture" name="pid"/>
+ <field type="PointFixed" name="p1"/>
+ <field type="PointFixed" name="p2"/>
<field type="CARD16" name="spread"/>
<field type="CARD16" name="n-stops"/>
<!-- FIXME: spec says: -->
- <list type="FIXED" name="stops"/>
- <list type="COLOR" name="stop-colors"/>
+ <list type="Fixed" name="stops"/>
+ <list type="Color" name="stop-colors"/>
<!-- ..but renderproto.h says CARD32 n-stops for all these -->
</request>
<request name="CreateRadialGradient" number="35">
- <field type="PICTURE" name="pid"/>
- <field type="POINTFIX" name="inner-center"/>
- <field type="POINTFIX" name="outer-center"/>
- <field type="FIXED" name="inner-radius"/>
- <field type="FIXED" name="outer-radius"/>
+ <field type="Picture" name="pid"/>
+ <field type="PointFixed" name="inner-center"/>
+ <field type="PointFixed" name="outer-center"/>
+ <field type="Fixed" name="inner-radius"/>
+ <field type="Fixed" name="outer-radius"/>
<field type="CARD16" name="spread"/>
<field type="CARD16" name="n-stops"/>
- <list type="FIXED" name="stops"/>
- <list type="COLOR" name="stop-colors"/>
+ <list type="Fixed" name="stops"/>
+ <list type="Color" name="stop-colors"/>
</request>
<request name="CreateConicalGradient" number="36">
- <field type="PICTURE" name="pid"/>
- <field type="POINTFIX" name="center"/>
- <field type="FIXED" name="angle"/>
+ <field type="Picture" name="pid"/>
+ <field type="PointFixed" name="center"/>
+ <field type="Fixed" name="angle"/>
<field type="CARD16" name="spread"/>
<field type="CARD16" name="n-stops"/>
- <list type="FIXED" name="stops"/>
- <list type="COLOR" name="stop-colors"/>
+ <list type="Fixed" name="stops"/>
+ <list type="Color" name="stop-colors"/>
</request>
<!-- TODO: 0.10: The repeat picture attribute now supports Pad and Reflect, older versions only supported None and Normal. -->
</extension>
diff --git a/xcb-proto/src/extensions/screensaver.xml b/xcb-proto/src/extensions/screensaver.xml
index 84131fd..58a2c06 100644
--- a/xcb-proto/src/extensions/screensaver.xml
+++ b/xcb-proto/src/extensions/screensaver.xml
@@ -76,10 +76,10 @@ Draft Standard Version 1.0
</reply>
</request>
<request name="QueryInfo" number="1">
- <field type="DRAWABLE" name="drawable"/>
+ <field type="Drawable" name="drawable"/>
<reply>
<field type="CARD8" name="state"/>
- <field type="WINDOW" name="saver-window"/>
+ <field type="Window" name="saver-window"/>
<field type="CARD32" name="ms-until-server"/>
<field type="CARD32" name="ms-since-user-input"/>
<field type="CARD16" name="event-mask"/>
@@ -88,31 +88,31 @@ Draft Standard Version 1.0
</reply>
</request>
<request name="SelectInput" number="2">
- <field type="DRAWABLE" name="drawable"/>
+ <field type="Drawable" name="drawable"/>
<field type="EVENT" name="event-mask"/>
</request>
<request name="SetAttributes" number="3">
- <field type="DRAWABLE" name="drawable"/>
- <field type="RECTANGLE"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="Rectangle"/>
<field type="CARD16" name="border-width"/>
<field type="CLASS" name="class"/>
<field type="CARD8" name="depth"/>
- <field type="VISUALID" name="visual"/>
+ <field type="VisualID" name="visual"/>
<valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="UnsetAttributes" number="4">
- <field type="DRAWABLE" name="drawable"/>
+ <field type="Drawable" name="drawable"/>
</request>
<!-- Events -->
<event name="Notify" number="0">
<field type="CARD8" name="code"/>
<field type="STATE" name="state"/>
<field type="CARD16" name="sequence-number"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="WINDOW" name="root"/>
- <field type="WINDOW" name="window"/>
+ <field type="Time" name="time"/>
+ <field type="Window" name="root"/>
+ <field type="Window" name="window"/>
<field type="KIND" name="kind"/>
- <field type="BOOL" name="forced"/>
+ <field type="bool" name="forced"/>
<pad bytes="14"/>
</event>
</extension>
diff --git a/xcb-proto/src/extensions/shape.xml b/xcb-proto/src/extensions/shape.xml
index 7bbdc2c..09960e4 100644
--- a/xcb-proto/src/extensions/shape.xml
+++ b/xcb-proto/src/extensions/shape.xml
@@ -41,10 +41,10 @@ authorization from the authors.
</enum>
<event name="Notify" number="0">
<field type="ShapeKind" name="shape-kind"/>
- <field type="WINDOW" name="affected-window"/>
- <field type="RECTANGLE" name="extents"/>
- <field type="TIMESTAMP" name="server-time"/>
- <field type="BOOL" name="shaped"/>
+ <field type="Window" name="affected-window"/>
+ <field type="Rectangle" name="extents"/>
+ <field type="Time" name="server-time"/>
+ <field type="bool" name="shaped"/>
</event>
<request name="QueryVersion" number="0">
<reply>
@@ -56,64 +56,64 @@ authorization from the authors.
<request name="Rectangles" number="1">
<field type="ShapeOp" name="operation"/>
<field type="ShapeKind" name="destination-kind"/>
- <field type="BYTE" name="ordering"/>
+ <field type="byte" name="ordering"/>
<pad bytes="1"/>
- <field type="WINDOW" name="destination-window"/>
- <field type="POINT" name="offset"/>
- <list type="RECTANGLE" name="rectangles"/>
+ <field type="Window" name="destination-window"/>
+ <field type="Point" name="offset"/>
+ <list type="Rectangle" name="rectangles"/>
</request>
<request name="Mask" number="2">
<field type="ShapeOp" name="operation"/>
<field type="ShapeKind" name="destination-kind"/>
<pad bytes="2"/>
- <field type="WINDOW" name="destination-window"/>
- <field type="POINT" name="offset"/>
- <field type="PIXMAP" name="source-bitmap"/>
+ <field type="Window" name="destination-window"/>
+ <field type="Point" name="offset"/>
+ <field type="Pixmap" name="source-bitmap"/>
</request>
<request name="Combine" number="3">
<field type="ShapeOp" name="operation"/>
<field type="ShapeKind" name="destination-kind"/>
<field type="ShapeKind" name="source-kind"/>
<pad bytes="1"/>
- <field type="WINDOW" name="destination-window"/>
- <field type="POINT" name="offset"/>
- <field type="WINDOW" name="source-window"/>
+ <field type="Window" name="destination-window"/>
+ <field type="Point" name="offset"/>
+ <field type="Window" name="source-window"/>
</request>
<request name="Offset" number="4">
<field type="ShapeKind" name="destination-kind"/>
<pad bytes="3"/>
- <field type="WINDOW" name="destination-window"/>
- <field type="POINT" name="offset"/>
+ <field type="Window" name="destination-window"/>
+ <field type="Point" name="offset"/>
</request>
<request name="QueryExtents" number="5">
- <field type="WINDOW" name="destination-window"/>
+ <field type="Window" name="destination-window"/>
<reply>
<pad bytes="1"/>
- <field type="BOOL" name="bounding-shaped"/>
- <field type="BOOL" name="clip-shaped"/>
+ <field type="bool" name="bounding-shaped"/>
+ <field type="bool" name="clip-shaped"/>
<pad bytes="2"/>
<!-- FIXME: xspec: validate unrolling -->
- <field type="RECTANGLE" name="bounding-shape-extents"/>
- <field type="RECTANGLE" name="clip-shape-extents"/>
+ <field type="Rectangle" name="bounding-shape-extents"/>
+ <field type="Rectangle" name="clip-shape-extents"/>
</reply>
</request>
<request name="SelectInput" number="6">
- <field type="WINDOW" name="destination-window"/>
- <field type="BOOL" name="enable"/>
+ <field type="Window" name="destination-window"/>
+ <field type="bool" name="enable"/>
</request>
<request name="InputSelected" number="7">
- <field type="WINDOW" name="destination-window"/>
+ <field type="Window" name="destination-window"/>
<reply>
- <field type="BOOL" name="enabled"/>
+ <field type="bool" name="enabled"/>
</reply>
</request>
<request name="GetRectangles" number="8">
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<field type="ShapeKind" name="source-kind"/>
<reply>
- <field type="BYTE" name="ordering"/>
+ <field type="byte" name="ordering"/>
<field type="CARD32" name="rectangles-len"/>
- <list type="RECTANGLE" name="rectangles">
+ <list type="Rectangle" name="rectangles">
<fieldref>rectangles-len</fieldref>
</list>
</reply>
diff --git a/xcb-proto/src/extensions/shm.xml b/xcb-proto/src/extensions/shm.xml
index 00afc22..c18a8b7 100644
--- a/xcb-proto/src/extensions/shm.xml
+++ b/xcb-proto/src/extensions/shm.xml
@@ -29,18 +29,18 @@ authorization from the authors.
<type name="SEG"/>
<event name="Completion" number="0">
<pad bytes="1"/>
- <field type="DRAWABLE" name="drawable"/>
+ <field type="Drawable" name="drawable"/>
<field type="SEG" name="shmseg"/>
<field type="CARD16" name="minor-event"/>
- <field type="BYTE" name="major-event"/>
+ <field type="byte" name="major-event"/>
<pad bytes="1"/>
<field type="CARD32" name="offset"/>
</event>
<errorcopy name="BadSeg" number="0" ref="Value"/>
<request name="QueryVersion" number="0">
<reply>
- <field type="BOOL" name="shared-pixmaps"/>
- <field type="VERSION"/>
+ <field type="bool" name="shared-pixmaps"/>
+ <field type="Version"/>
<field type="CARD16" name="uid"/>
<field type="CARD16" name="gid"/>
<field type="CARD8" name="pixmap-format"/>
@@ -49,15 +49,15 @@ authorization from the authors.
<request name="Attach" number="1">
<field type="SEG" name="shmseg"/>
<field type="CARD32" name="shmid"/>
- <field type="BOOL" name="read-only"/>
+ <field type="bool" name="read-only"/>
</request>
<request name="Detach" number="2">
<field type="SEG" name="shmseg"/>
</request>
<request name="PutImage" number="3">
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
- <field type="SIZE" name="total-size"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
+ <field type="Size" name="total-size"/>
<field type="CARD16" name="src-x"/>
<field type="CARD16" name="src-y"/>
<field type="CARD16" name="src-width"/>
@@ -72,8 +72,8 @@ authorization from the authors.
<field type="CARD32" name="offset"/>
</request>
<request name="GetImage" number="4">
- <field type="DRAWABLE" name="drawable"/>
- <field type="RECTANGLE"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="Rectangle"/>
<field type="CARD32" name="plane-mask"/>
<field type="CARD8" name="format"/>
<pad bytes="3"/>
@@ -81,14 +81,14 @@ authorization from the authors.
<field type="CARD32" name="offset"/>
<reply>
<field type="CARD8" name="depth"/>
- <field type="VISUALID" name="visual"/>
+ <field type="VisualID" name="visual"/>
<field type="CARD32" name="size"/>
</reply>
</request>
<request name="CreatePixmap" number="5">
- <field type="PIXMAP" name="pid"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="SIZE"/>
+ <field type="Pixmap" name="pid"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="Size"/>
<field type="CARD8" name="depth"/>
<pad bytes="3"/>
<field type="SEG" name="shmseg"/>
diff --git a/xcb-proto/src/extensions/sync.xml b/xcb-proto/src/extensions/sync.xml
index 4130836..d95ac5e 100644
--- a/xcb-proto/src/extensions/sync.xml
+++ b/xcb-proto/src/extensions/sync.xml
@@ -113,7 +113,7 @@ for licensing information.
<pad bytes="1"/>
<field type="TRIGGER" name="trigger"/>
<field type="INT64" name="delta"/>
- <field type="BOOL" name="events"/>
+ <field type="bool" name="events"/>
<field type="ALARMSTATE" name="state"/>
</reply>
</request>
@@ -133,15 +133,15 @@ for licensing information.
<field type="COUNTER" name="counter"/>
<field type="INT64" name="wait-value"/>
<field type="INT64" name="counter-value"/>
- <field type="TIMESTAMP" name="timestamp"/>
+ <field type="Time" name="timestamp"/>
<field type="CARD16" name="count"/>
- <field type="BOOL" name="destroyed"/>
+ <field type="bool" name="destroyed"/>
</event>
<event name="AlarmNotify" number="1">
<field type="CARD8" name="kind"/>
<field type="ALARM" name="alarm"/>
<field type="INT64" name="counter-value"/>
<field type="INT64" name="alarm-value"/>
- <field type="TIMESTAMP" name="timestamp"/>
+ <field type="Time" name="timestamp"/>
</event>
</extension>
diff --git a/xcb-proto/src/extensions/xf86dri.xml b/xcb-proto/src/extensions/xf86dri.xml
index 4f1c5ff..92d445e 100644
--- a/xcb-proto/src/extensions/xf86dri.xml
+++ b/xcb-proto/src/extensions/xf86dri.xml
@@ -47,7 +47,7 @@ authorization from the authors.
<field type="CARD32" name="screen"/>
<reply>
<pad bytes="1"/>
- <field type="BOOL" name="is-capable"/>
+ <field type="bool" name="is-capable"/>
</reply>
</request>
<request name="OpenConnection" number="2">
diff --git a/xcb-proto/src/extensions/xfixes.xml b/xcb-proto/src/extensions/xfixes.xml
index 2bbb1ea..943da80 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -38,15 +38,15 @@ authorization from the authors.
<pad bytes="16"/>
</reply>
</request>
- <enum type="BYTE" name="SaveSetMode">
+ <enum type="byte" name="SaveSetMode">
<item name="insert"/>
<item name="delete"/>
</enum>
- <enum type="BYTE" name="SaveSetTarget">
+ <enum type="byte" name="SaveSetTarget">
<item name="nearest"/>
<item name="root"/>
</enum>
- <enum type="BYTE" name="SaveSetMapping">
+ <enum type="byte" name="SaveSetMapping">
<item name="map"/>
<item name="unmap"/>
</enum>
@@ -55,7 +55,7 @@ authorization from the authors.
<field type="SaveSetTarget" name="target"/>
<field type="SaveSetMapping" name="map"/>
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
</request>
<enum name="SelectionEvent">
<item name="set-selection-owner"/>
@@ -85,16 +85,16 @@ authorization from the authors.
<event name="SelectionNotify" number="0">
<!-- SelectionEvent -->
<field type="CARD8" name="subtype"/>
- <field type="WINDOW" name="window"/>
- <field type="WINDOW" name="owner"/>
- <field type="ATOM" name="selection"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="TIMESTAMP" name="selection-time"/>
+ <field type="Window" name="window"/>
+ <field type="Window" name="owner"/>
+ <field type="Atom" name="selection"/>
+ <field type="Time" name="time"/>
+ <field type="Time" name="selection-time"/>
<pad bytes="8"/>
</event>
<request name="SelectSelectionInput" number="2">
- <field type="WINDOW" name="window"/>
- <field type="ATOM" name="selection"/>
+ <field type="Window" name="window"/>
+ <field type="Atom" name="selection"/>
<!-- SelectionEventMask -->
<field type="CARD32" name="event-mask"/>
</request>
@@ -112,23 +112,23 @@ authorization from the authors.
<event name="CursorNotify" number="1">
<!-- CursorNotify -->
<field type="CARD8" name="subtype"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<field type="CARD32" name="cursor-serial"/>
- <field type="TIMESTAMP" name="time"/>
+ <field type="Time" name="time"/>
<!-- Added in version 2 -->
- <field type="ATOM" name="name"/>
+ <field type="Atom" name="name"/>
<pad bytes="12"/>
</event>
<request name="SelectCursorInput" number="3">
<!-- CursorNotifyMask -->
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<field type="CARD32" name="event-mask"/>
</request>
<request name="GetCursorImage" number="4">
<reply>
<pad bytes="1"/>
- <field type="RECTANGLE"/>
- <field type="POINT" name="hot-point"/>
+ <field type="Rectangle"/>
+ <field type="Point" name="hot-point"/>
<field type="CARD32" name="cursor-serial"/>
<pad bytes="8"/>
<!-- FIXME: xspec: refers to anonymous fields -->
@@ -141,98 +141,98 @@ authorization from the authors.
</reply>
</request>
<!-- Version 2 -->
- <type name="REGION"/>
+ <type name="Region"/>
<error name="BadRegion" number="0"/>
<request name="CreateRegion" number="5">
- <field type="REGION" name="region"/>
- <list type="RECTANGLE" name="rectangles"/>
+ <field type="Region" name="region"/>
+ <list type="Rectangle" name="rectangles"/>
</request>
<request name="CreateRegionFromBitmap" number="6">
- <field type="REGION" name="region"/>
- <field type="PIXMAP" name="bitmap"/>
+ <field type="Region" name="region"/>
+ <field type="Pixmap" name="bitmap"/>
</request>
<request name="CreateRegionFromWindow" number="7">
- <field type="REGION" name="region"/>
- <field type="WINDOW" name="window"/>
+ <field type="Region" name="region"/>
+ <field type="Window" name="window"/>
<field type="ShapeKind" name="kind"/>
<pad bytes="3"/>
</request>
<request name="CreateRegionFromGC" number="8">
- <field type="REGION" name="region"/>
- <field type="GCONTEXT" name="gc"/>
+ <field type="Region" name="region"/>
+ <field type="GContext" name="gc"/>
</request>
<request name="CreateRegionFromPicture" number="9">
- <field type="REGION" name="region"/>
- <field type="PICTURE" name="picture"/>
+ <field type="Region" name="region"/>
+ <field type="Picture" name="picture"/>
</request>
<request name="DestroyRegion" number="10">
- <field type="REGION" name="region"/>
+ <field type="Region" name="region"/>
</request>
<request name="SetRegion" number="11">
- <field type="REGION" name="region"/>
- <list type="RECTANGLE" name="rectangles"/>
+ <field type="Region" name="region"/>
+ <list type="Rectangle" name="rectangles"/>
</request>
<request name="CopyRegion" number="12">
- <field type="REGION" name="source"/>
- <field type="REGION" name="destination"/>
+ <field type="Region" name="source"/>
+ <field type="Region" name="destination"/>
</request>
<request name="UnionRegion" number="13">
- <field type="REGION" name="source1"/>
- <field type="REGION" name="source2"/>
- <field type="REGION" name="destination"/>
+ <field type="Region" name="source1"/>
+ <field type="Region" name="source2"/>
+ <field type="Region" name="destination"/>
</request>
<request name="IntersectRegion" number="14">
- <field type="REGION" name="source1"/>
- <field type="REGION" name="source2"/>
- <field type="REGION" name="destination"/>
+ <field type="Region" name="source1"/>
+ <field type="Region" name="source2"/>
+ <field type="Region" name="destination"/>
</request>
<request name="SubtractRegion" number="15">
- <field type="REGION" name="source1"/>
- <field type="REGION" name="source2"/>
- <field type="REGION" name="destination"/>
+ <field type="Region" name="source1"/>
+ <field type="Region" name="source2"/>
+ <field type="Region" name="destination"/>
</request>
<request name="InvertRegion" number="16">
- <field type="REGION" name="source"/>
- <field type="RECTANGLE" name="bounds"/>
- <field type="REGION" name="destination"/>
+ <field type="Region" name="source"/>
+ <field type="Rectangle" name="bounds"/>
+ <field type="Region" name="destination"/>
</request>
<request name="TranslateRegion" number="17">
- <field type="REGION" name="region"/>
+ <field type="Region" name="region"/>
<field type="INT16" name="dx"/>
<field type="INT16" name="dy"/>
</request>
<request name="RegionExtents" number="18">
- <field type="REGION" name="source"/>
- <field type="REGION" name="destination"/>
+ <field type="Region" name="source"/>
+ <field type="Region" name="destination"/>
</request>
<request name="FetchRegion" number="19">
- <field type="REGION" name="region"/>
+ <field type="Region" name="region"/>
<reply>
<pad bytes="1"/>
- <field type="RECTANGLE" name="extents"/>
+ <field type="Rectangle" name="extents"/>
<pad bytes="16"/>
- <list type="RECTANGLE" name="rectangles"/>
+ <list type="Rectangle" name="rectangles"/>
</reply>
</request>
<request name="SetGCClipRegion" number="20">
- <field type="GCONTEXT" name="gc"/>
- <field type="REGION" name="region"/>
- <field type="POINT" name="origin"/>
+ <field type="GContext" name="gc"/>
+ <field type="Region" name="region"/>
+ <field type="Point" name="origin"/>
</request>
<request name="SetWindowShapeRegion" number="21">
- <field type="WINDOW" name="dest"/>
+ <field type="Window" name="dest"/>
<field type="ShapeKind" name="dest-kind"/>
<pad bytes="3"/>
- <field type="POINT" name="offset"/>
- <field type="REGION" name="region"/>
+ <field type="Point" name="offset"/>
+ <field type="Region" name="region"/>
</request>
<request name="SetPictureClipRegion" number="22">
- <field type="PICTURE" name="picture"/>
- <field type="REGION" name="region"/>
- <field type="POINT" name="origin"/>
+ <field type="Picture" name="picture"/>
+ <field type="Region" name="region"/>
+ <field type="Point" name="origin"/>
</request>
<request name="SetCursorName" number="23">
- <field type="CURSOR" name="cursor"/>
+ <field type="Cursor" name="cursor"/>
<field type="CARD16" name="n-bytes"/>
<pad bytes="2"/>
<list type="CARD8" name="name">
@@ -240,10 +240,10 @@ authorization from the authors.
</list>
</request>
<request name="GetCursorName" number="24">
- <field type="CURSOR" name="cursor"/>
+ <field type="Cursor" name="cursor"/>
<reply>
<pad bytes="1"/>
- <field type="ATOM" name="atom"/>
+ <field type="Atom" name="atom"/>
<field type="CARD16" name="n-bytes"/>
<pad bytes="18"/>
<list type="CARD8" name="name">
@@ -254,10 +254,10 @@ authorization from the authors.
<request name="GetCursorImageAndName" number="25">
<reply>
<pad bytes="1"/>
- <field type="RECTANGLE"/>
- <field type="POINT" name="hot-point"/>
+ <field type="Rectangle"/>
+ <field type="Point" name="hot-point"/>
<field type="CARD32" name="cursor-serial"/>
- <field type="ATOM" name="cursor-atom"/>
+ <field type="Atom" name="cursor-atom"/>
<field type="CARD16" name="n-bytes"/>
<pad bytes="2"/>
<list type="CARD8" name="name">
@@ -272,11 +272,11 @@ authorization from the authors.
</reply>
</request>
<request name="ChangeCursor" number="26">
- <field type="CURSOR" name="source"/>
- <field type="CURSOR" name="destination"/>
+ <field type="Cursor" name="source"/>
+ <field type="Cursor" name="destination"/>
</request>
<request name="ChangeCursorByName" number="27">
- <field type="CURSOR" name="src"/>
+ <field type="Cursor" name="src"/>
<field type="CARD16" name="n-bytes"/>
<pad bytes="2"/>
<list type="CARD8" name="name">
@@ -285,8 +285,8 @@ authorization from the authors.
</request>
<!-- Version 3 -->
<request name="ExpandRegion" number="28">
- <field type="REGION" name="source"/>
- <field type="REGION" name="destination"/>
+ <field type="Region" name="source"/>
+ <field type="Region" name="destination"/>
<field type="CARD16" name="left"/>
<field type="CARD16" name="right"/>
<field type="CARD16" name="top"/>
diff --git a/xcb-proto/src/extensions/xprint.xml b/xcb-proto/src/extensions/xprint.xml
index 29e4a27..1e8e375 100644
--- a/xcb-proto/src/extensions/xprint.xml
+++ b/xcb-proto/src/extensions/xprint.xml
@@ -163,27 +163,27 @@ authorization from the authors.
<request name="PrintGetScreenOfContext" number="6">
<reply>
<pad bytes="1"/>
- <field type="WINDOW" name="root"/>
+ <field type="Window" name="root"/>
</reply>
</request>
<request name="PrintStartJob" number="7">
<field type="CARD8" name="output-mode"/>
</request>
<request name="PrintEndJob" number="8">
- <field type="BOOL" name="cancel"/>
+ <field type="bool" name="cancel"/>
</request>
<request name="PrintStartDoc" number="9">
<field type="CARD8" name="driver-mode"/>
</request>
<request name="PrintEndDoc" number="10">
- <field type="BOOL" name="cancel"/>
+ <field type="bool" name="cancel"/>
</request>
<request name="PrintPutDocumentData" number="11">
- <field type="DRAWABLE" name="drawable"/>
+ <field type="Drawable" name="drawable"/>
<field type="CARD32" name="len-data"/>
<field type="CARD16" name="len-fmt"/>
<field type="CARD16" name="len-options"/>
- <list type="BYTE" name="data">
+ <list type="byte" name="data">
<fieldref>len-data</fieldref>
</list>
<!-- padding -->
@@ -200,16 +200,16 @@ authorization from the authors.
<field type="CARD32" name="finished-flag"/>
<field type="CARD32" name="data-len"/>
<pad bytes="12"/>
- <list type="BYTE" name="data">
+ <list type="byte" name="data">
<fieldref>data-len</fieldref>
</list>
</reply>
</request>
<request name="PrintStartPage" number="13">
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
</request>
<request name="PrintEndPage" number="14">
- <field type="BOOL" name="cancel"/>
+ <field type="bool" name="cancel"/>
<pad bytes="3"/>
</request>
<request name="PrintSelectInput" number="15">
@@ -277,7 +277,7 @@ authorization from the authors.
<pad bytes="1"/>
<field type="CARD32" name="list-count"/>
<pad bytes="20"/>
- <list type="WINDOW" name="roots">
+ <list type="Window" name="roots">
<fieldref>list-count</fieldref>
</list>
<!-- There may be a WINDOW rootWindow here... -->
@@ -287,7 +287,7 @@ authorization from the authors.
<field type="PCONTEXT" name="context"/>
<field type="CARD16" name="image-resolution"/>
<reply>
- <field type="BOOL" name="status"/>
+ <field type="bool" name="status"/>
<field type="CARD16" name="previous-resolutions"/>
</reply>
</request>
@@ -302,7 +302,7 @@ authorization from the authors.
<event name="Notify" number="0">
<field type="CARD8" name="detail"/>
<field type="PCONTEXT" name="context"/>
- <field type="BOOL" name="cancel"/>
+ <field type="bool" name="cancel"/>
</event>
<event name="AttributNotify" number="1">
<field type="CARD8" name="detail"/>
diff --git a/xcb-proto/src/extensions/xv.xml b/xcb-proto/src/extensions/xv.xml
index 5b1e7de..bed70a7 100644
--- a/xcb-proto/src/extensions/xv.xml
+++ b/xcb-proto/src/extensions/xv.xml
@@ -28,8 +28,8 @@ authorization from the authors.
<extension header="xv" xname="XVideo" name="Xv" version="2.2">
<import>shm</import>
<!-- XIDs -->
- <type name="PORT"/>
- <type name="ENCODING"/>
+ <type name="Port"/>
+ <type name="Encoding"/>
<!-- Errors -->
<error name="BadPort" number="0"/>
<error name="BadEncoding" number="1"/>
@@ -72,7 +72,7 @@ authorization from the authors.
<field type="INT32" name="denominator"/>
</struct>
<struct name="AdaptorInfo">
- <field type="PORT" name="base-id"/>
+ <field type="Port" name="base-id"/>
<field type="CARD16" name="name-size"/>
<field type="CARD16" name="num-ports"/>
<field type="CARD16" name="num-formats"/>
@@ -86,9 +86,9 @@ authorization from the authors.
</list>
</struct>
<struct name="EncodingInfo">
- <field type="ENCODING" name="encoding"/>
+ <field type="Encoding" name="encoding"/>
<field type="CARD16" name="name-size"/>
- <field type="SIZE"/>
+ <field type="Size"/>
<field type="Rational" name="rate"/>
<!--
Xvproto.h has a padding CARD16 here but the name
@@ -99,12 +99,12 @@ authorization from the authors.
</list>
</struct>
<struct name="Format">
- <field type="VISUALID" name="visual"/>
+ <field type="VisualID" name="visual"/>
<field type="CARD8" name="depth"/>
</struct>
<struct name="Image">
<field type="CARD32" name="id"/>
- <field type="SIZE"/>
+ <field type="Size"/>
<field type="CARD32" name="data-size"/>
<field type="CARD32" name="num-planes"/>
<list type="CARD32" name="pitches">
@@ -163,27 +163,27 @@ authorization from the authors.
</struct>
<!-- Events -->
<event name="VideoNotify" number="0">
- <field type="BYTE" name="reason"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="PORT" name="port"/>
+ <field type="byte" name="reason"/>
+ <field type="Time" name="time"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="Port" name="port"/>
</event>
<event name="PortNotify" number="1">
<pad bytes="1"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="PORT" name="port"/>
- <field type="ATOM" name="attribute"/>
+ <field type="Time" name="time"/>
+ <field type="Port" name="port"/>
+ <field type="Atom" name="attribute"/>
<field type="INT32" name="value"/>
</event>
<!-- Requests -->
<request name="QueryExtension" number="0">
<reply>
<pad bytes="1"/>
- <field type="VERSION"/>
+ <field type="Version"/>
</reply>
</request>
<request name="QueryAdaptors" number="1">
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<reply>
<pad bytes="1"/>
<field type="CARD16" name="num-adaptors"/>
@@ -194,7 +194,7 @@ authorization from the authors.
</reply>
</request>
<request name="QueryEncodings" number="2">
- <field type="PORT" name="port"/>
+ <field type="Port" name="port"/>
<reply>
<pad bytes="1"/>
<field type="CARD16" name="num-encodings"/>
@@ -206,20 +206,20 @@ authorization from the authors.
</reply>
</request>
<request name="GrabPort" number="3">
- <field type="PORT" name="port"/>
- <field type="TIMESTAMP" name="time"/>
+ <field type="Port" name="port"/>
+ <field type="Time" name="time"/>
<reply>
- <field type="BYTE" name="result"/>
+ <field type="byte" name="result"/>
</reply>
</request>
<request name="UngrabPort" number="4">
- <field type="PORT" name="port"/>
- <field type="TIMESTAMP" name="time"/>
+ <field type="Port" name="port"/>
+ <field type="Time" name="time"/>
</request>
<request name="PutVideo" number="5">
- <field type="PORT" name="port"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
+ <field type="Port" name="port"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
<field type="INT16" name="vid-x"/>
<field type="INT16" name="vid-y"/>
<field type="CARD16" name="vid-w"/>
@@ -230,9 +230,9 @@ authorization from the authors.
<field type="CARD16" name="drw-h"/>
</request>
<request name="PutStill" number="6">
- <field type="PORT" name="port"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
+ <field type="Port" name="port"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
<field type="INT16" name="vid-x"/>
<field type="INT16" name="vid-y"/>
<field type="CARD16" name="vid-w"/>
@@ -243,9 +243,9 @@ authorization from the authors.
<field type="CARD16" name="drw-h"/>
</request>
<request name="GetVideo" number="7">
- <field type="PORT" name="port"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
+ <field type="Port" name="port"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
<field type="INT16" name="vid-x"/>
<field type="INT16" name="vid-y"/>
<field type="CARD16" name="vid-w"/>
@@ -256,9 +256,9 @@ authorization from the authors.
<field type="CARD16" name="drw-h"/>
</request>
<request name="GetStill" number="8">
- <field type="PORT" name="port"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
+ <field type="Port" name="port"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
<field type="INT16" name="vid-x"/>
<field type="INT16" name="vid-y"/>
<field type="CARD16" name="vid-w"/>
@@ -269,37 +269,37 @@ authorization from the authors.
<field type="CARD16" name="drw-h"/>
</request>
<request name="StopVideo" number="9">
- <field type="PORT" name="port"/>
- <field type="DRAWABLE" name="drawable"/>
+ <field type="Port" name="port"/>
+ <field type="Drawable" name="drawable"/>
</request>
<request name="SelectVideoNotify" number="10">
- <field type="DRAWABLE" name="drawable"/>
- <field type="BOOL" name="enabled"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="bool" name="enabled"/>
</request>
<request name="SelectPortNotify" number="11">
- <field type="DRAWABLE" name="drawable"/>
- <field type="BOOL" name="enabled"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="bool" name="enabled"/>
</request>
<request name="QueryBestSize" number="12">
- <field type="PORT" name="port"/>
+ <field type="Port" name="port"/>
<field type="CARD16" name="vid-w"/>
<field type="CARD16" name="vid-h"/>
<field type="CARD16" name="drw-w"/>
<field type="CARD16" name="drw-h"/>
- <field type="BOOL" name="motion"/>
+ <field type="bool" name="motion"/>
<reply>
<pad bytes="1"/>
- <field type="SIZE" name="actual-size"/>
+ <field type="Size" name="actual-size"/>
</reply>
</request>
<request name="SetPortAttribute" number="13">
- <field type="PORT" name="port"/>
- <field type="ATOM" name="attribute"/>
+ <field type="Port" name="port"/>
+ <field type="Atom" name="attribute"/>
<field type="INT32" name="value"/>
</request>
<request name="GetPortAttribute" number="14">
- <field type="PORT" name="port"/>
- <field type="ATOM" name="attribute"/>
+ <field type="Port" name="port"/>
+ <field type="Atom" name="attribute"/>
<reply>
<pad bytes="1"/>
<field type="INT32" name="value"/>
@@ -307,7 +307,7 @@ authorization from the authors.
</request>
<!-- Not in the docs beyond this point :( -->
<request name="QueryPortAttributes" number="15">
- <field type="PORT" name="port"/>
+ <field type="Port" name="port"/>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="num-attributes"/>
@@ -319,7 +319,7 @@ authorization from the authors.
</reply>
</request>
<request name="ListImageFormats" number="16">
- <field type="PORT" name="port"/>
+ <field type="Port" name="port"/>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="num-formats"/>
@@ -330,14 +330,14 @@ authorization from the authors.
</reply>
</request>
<request name="QueryImageAttributes" number="17">
- <field type="PORT" name="port"/>
+ <field type="Port" name="port"/>
<field type="CARD32" name="id"/>
- <field type="SIZE"/>
+ <field type="Size"/>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="num-planes"/>
<field type="CARD32" name="data-size"/>
- <field type="SIZE"/>
+ <field type="Size"/>
<pad bytes="12"/>
<list type="CARD32" name="pitches">
<fieldref>num-planes</fieldref>
@@ -348,9 +348,9 @@ authorization from the authors.
</reply>
</request>
<request name="PutImage" number="18">
- <field type="PORT" name="port"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
+ <field type="Port" name="port"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
<field type="CARD32" name="id"/>
<field type="INT16" name="src-x"/>
<field type="INT16" name="src-y"/>
@@ -368,9 +368,9 @@ authorization from the authors.
</list>
</request>
<request name="ShmPutImage" number="19">
- <field type="PORT" name="port"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
+ <field type="Port" name="port"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
<field type="SEG" name="shmseg"/>
<field type="CARD32" name="id"/>
<field type="CARD32" name="offset"/>
diff --git a/xcb-proto/src/extensions/xvmc.xml b/xcb-proto/src/extensions/xvmc.xml
index a08bba8..8f0d62f 100644
--- a/xcb-proto/src/extensions/xvmc.xml
+++ b/xcb-proto/src/extensions/xvmc.xml
@@ -35,8 +35,8 @@ authorization from the authors.
<field type="SURFACE" name="id"/>
<field type="CARD16" name="chroma-format"/>
<pad bytes="2"/>
- <field type="SIZE" name="max-size"/>
- <field type="SIZE" name="subpicture-max-size"/>
+ <field type="Size" name="max-size"/>
+ <field type="Size" name="subpicture-max-size"/>
<field type="CARD32" name="mc-type"/>
<field type="CARD32" name="flags"/>
</struct>
@@ -48,7 +48,7 @@ authorization from the authors.
</reply>
</request>
<request name="ListSurfaceTypes" number="1">
- <field type="PORT" name="port-id"/>
+ <field type="Port" name="port-id"/>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="num"/>
@@ -60,7 +60,7 @@ authorization from the authors.
</request>
<request name="CreateContext" number="2">
<field type="CONTEXT" name="context-id"/>
- <field type="PORT" name="port-id"/>
+ <field type="Port" name="port-id"/>
<field type="SURFACE" name="surface-id"/>
<field type="CARD16" name="width"/>
<field type="CARD16" name="height"/>
@@ -112,7 +112,7 @@ authorization from the authors.
<field type="SUBPICTURE" name="subpicture-id"/>
</request>
<request name="ListSubpictureTypes" number="8">
- <field type="PORT" name="port-id"/>
+ <field type="Port" name="port-id"/>
<field type="SURFACE" name="surface-id"/>
<reply>
<pad bytes="1"/>
diff --git a/xcb-proto/src/xcb_types.xml b/xcb-proto/src/xcb_types.xml
index 319ecc2..6b78b70 100644
--- a/xcb-proto/src/xcb_types.xml
+++ b/xcb-proto/src/xcb_types.xml
@@ -29,81 +29,81 @@ authorization from the authors.
<!-- Core protocol types -->
<!-- Request -->
<!-- Value -->
- <type name="WINDOW"/>
- <type name="PIXMAP"/>
- <type name="ATOM"/>
- <type name="CURSOR"/>
- <type name="FONT"/>
+ <type name="Window"/>
+ <type name="Pixmap"/>
+ <type name="Atom"/>
+ <type name="Cursor"/>
+ <type name="Font"/>
<!-- Match -->
- <union name="DRAWABLE">
- <field type="WINDOW" name="window"/>
- <field type="PIXMAP" name="pixmap"/>
+ <union name="Drawable">
+ <field type="Window" name="window"/>
+ <field type="Pixmap" name="pixmap"/>
</union>
<!-- Access -->
<!-- Alloc -->
- <type name="COLORMAP"/>
- <type name="GCONTEXT"/>
+ <type name="Colormap"/>
+ <type name="GContext"/>
<!-- IDChoice -->
<!-- Name -->
<!-- Length -->
<!-- Implementation -->
- <union name="FONTABLE">
- <field type="FONT" name="font"/>
- <field type="GCONTEXT" name="gcontext"/>
+ <union name="Fontable">
+ <field type="Font" name="font"/>
+ <field type="GContext" name="gcontext"/>
</union>
<struct name="CHAR2B">
<field type="CARD8" name="byte1"/>
<field type="CARD8" name="byte2"/>
</struct>
- <struct name="VERSION">
+ <struct name="Version">
<field type="CARD16" name="major"/>
<field type="CARD16" name="minor"/>
</struct>
- <struct name="VISUALID">
+ <struct name="VisualID">
<field type="CARD32" name="id"/>
</struct>
- <struct name="TIMESTAMP">
+ <struct name="Time">
<field type="CARD32" name="id"/>
</struct>
- <struct name="KEYSYM">
+ <struct name="KeySym">
<field type="CARD32" name="id"/>
</struct>
- <struct name="KEYCODE">
+ <struct name="KeyCode">
<field type="CARD8" name="id"/>
</struct>
- <struct name="BUTTON">
+ <struct name="Button">
<field type="CARD8" name="id"/>
</struct>
- <struct name="POINT">
+ <struct name="Point">
<field type="INT16" name="x"/>
<field type="INT16" name="y"/>
</struct>
- <struct name="LINE">
- <field type="POINT" name="p1"/>
- <field type="POINT" name="p2"/>
+ <struct name="Line">
+ <field type="Point" name="p1"/>
+ <field type="Point" name="p2"/>
</struct>
- <struct name="SIZE">
+ <struct name="Size">
<field type="CARD16" name="width"/>
<field type="CARD16" name="height"/>
</struct>
- <struct name="RECTANGLE">
- <field type="POINT"/>
- <field type="SIZE"/>
+ <struct name="Rectangle">
+ <field type="Point"/>
+ <field type="Size"/>
</struct>
- <struct name="ARC">
- <field type="RECTANGLE"/>
+ <struct name="Arc">
+ <field type="Rectangle"/>
<field type="INT16" name="angle1"/>
<field type="INT16" name="angle2"/>
</struct>
<!-- Connection setup-related types -->
- <struct name="FORMAT">
+ <struct name="Format">
<field type="CARD8" name="depth"/>
<field type="CARD8" name="bits-per-pixel"/>
<field type="CARD8" name="scanline-pad"/>
<pad bytes="5"/>
</struct>
- <struct name="VISUALTYPE">
- <field type="VISUALID" name="visual-id"/>
+ <struct name="VisualType">
+ <field type="VisualID" name="visual-id"/>
<field type="CARD8" name="class"/>
<field type="CARD8" name="bits-per-rgb-value"/>
<field type="CARD16" name="colormap-entries"/>
@@ -112,34 +112,34 @@ authorization from the authors.
<field type="CARD32" name="blue-mask"/>
<pad bytes="4"/>
</struct>
- <struct name="DEPTH">
+ <struct name="Depth">
<field type="CARD8" name="depth"/>
<pad bytes="1"/>
<field type="CARD16" name="visuals-len"/>
<pad bytes="4"/>
- <list type="VISUALTYPE" name="visuals">
+ <list type="VisualType" name="visuals">
<fieldref>visuals-len</fieldref>
</list>
</struct>
<struct name="ScreenSize">
- <field type="SIZE" name="size-in-pixels"/>
- <field type="SIZE" name="size-in-millimeters"/>
+ <field type="Size" name="size-in-pixels"/>
+ <field type="Size" name="size-in-millimeters"/>
</struct>
- <struct name="SCREEN">
- <field type="WINDOW" name="root"/>
- <field type="COLORMAP" name="default-colormap"/>
+ <struct name="Screen">
+ <field type="Window" name="root"/>
+ <field type="Colormap" name="default-colormap"/>
<field type="CARD32" name="white-pixel"/>
<field type="CARD32" name="black-pixel"/>
<field type="CARD32" name="current-input-masks"/>
<field type="ScreenSize"/>
<field type="CARD16" name="min-installed-maps"/>
<field type="CARD16" name="max-installed-maps"/>
- <field type="VISUALID" name="root-visual"/>
- <field type="BYTE" name="backing-stores"/>
- <field type="BOOL" name="save-unders"/>
+ <field type="VisualID" name="root-visual"/>
+ <field type="byte" name="backing-stores"/>
+ <field type="bool" name="save-unders"/>
<field type="CARD8" name="root-depth"/>
<field type="CARD8" name="allowed-depths-len"/>
- <list type="DEPTH" name="allowed-depths">
+ <list type="Depth" name="allowed-depths">
<fieldref>allowed-depths-len</fieldref>
</list>
</struct>
@@ -152,7 +152,7 @@ authorization from the authors.
<struct name="ConnSetupReq">
<field type="CARD8" name="byte-order"/>
<pad bytes="1"/>
- <field type="VERSION" name="protocol-version"/>
+ <field type="Version" name="protocol-version"/>
<field type="CARD16" name="authorization-protocol-name-len"/>
<field type="CARD16" name="authorization-protocol-data-len"/>
<list type="char" name="authorization-protocol-name">
@@ -171,7 +171,7 @@ authorization from the authors.
<!-- always 0 -> Failed -->
<field type="CARD8" name="status"/>
<field type="CARD8" name="reason-len"/>
- <field type="VERSION" name="protocol-version"/>
+ <field type="Version" name="protocol-version"/>
<field type="CARD16" name="length"/>
<list type="char" name="reason">
<fieldref>reason-len</fieldref>
@@ -181,7 +181,7 @@ authorization from the authors.
<!-- always 1 -> Success -->
<field type="CARD8" name="status"/>
<pad bytes="1"/>
- <field type="VERSION" name="protocol-version"/>
+ <field type="Version" name="protocol-version"/>
<field type="CARD16" name="length"/>
<field type="CARD32" name="release-number"/>
<field type="CARD32" name="resource-id-base"/>
@@ -195,16 +195,16 @@ authorization from the authors.
<field type="CARD8" name="bitmap-format-bit-order"/>
<field type="CARD8" name="bitmap-format-scanline-unit"/>
<field type="CARD8" name="bitmap-format-scanline-pad"/>
- <field type="KEYCODE" name="min-keycode"/>
- <field type="KEYCODE" name="max-keycode"/>
+ <field type="KeyCode" name="min-keycode"/>
+ <field type="KeyCode" name="max-keycode"/>
<pad bytes="4"/>
<list type="char" name="vendor">
<fieldref>vendor-len</fieldref>
</list>
- <list type="FORMAT" name="pixmap-formats">
+ <list type="Format" name="pixmap-formats">
<fieldref>pixmap-formats-len</fieldref>
</list>
- <list type="SCREEN" name="roots">
+ <list type="Screen" name="roots">
<fieldref>roots-len</fieldref>
</list>
</struct>
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index 3a78bde..0f327d4 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -56,57 +56,57 @@ authorization from the authors.
<errorcopy name="Implementation" number="17" ref="Request"/>
<!-- Core event types -->
<event name="KeyPress" number="2">
- <field type="KEYCODE" name="detail"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="WINDOW" name="root"/>
- <field type="WINDOW" name="event"/>
- <field type="WINDOW" name="child"/>
- <field type="POINT" name="root-point"/>
- <field type="POINT" name="event-point"/>
+ <field type="KeyCode" name="detail"/>
+ <field type="Time" name="time"/>
+ <field type="Window" name="root"/>
+ <field type="Window" name="event"/>
+ <field type="Window" name="child"/>
+ <field type="Point" name="root-point"/>
+ <field type="Point" name="event-point"/>
<field type="CARD16" name="state"/>
- <field type="BOOL" name="same-screen"/>
+ <field type="bool" name="same-screen"/>
</event>
<eventcopy name="KeyRelease" number="3" ref="KeyPress"/>
<event name="ButtonPress" number="4">
- <field type="BUTTON" name="detail"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="WINDOW" name="root"/>
- <field type="WINDOW" name="event"/>
- <field type="WINDOW" name="child"/>
- <field type="POINT" name="root-point"/>
- <field type="POINT" name="event-point"/>
+ <field type="Button" name="detail"/>
+ <field type="Time" name="time"/>
+ <field type="Window" name="root"/>
+ <field type="Window" name="event"/>
+ <field type="Window" name="child"/>
+ <field type="Point" name="root-point"/>
+ <field type="Point" name="event-point"/>
<field type="CARD16" name="state"/>
- <field type="BOOL" name="same-screen"/>
+ <field type="bool" name="same-screen"/>
</event>
<eventcopy name="ButtonRelease" number="5" ref="ButtonPress"/>
<event name="MotionNotify" number="6">
- <field type="BYTE" name="detail"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="WINDOW" name="root"/>
- <field type="WINDOW" name="event"/>
- <field type="WINDOW" name="child"/>
- <field type="POINT" name="root-point"/>
- <field type="POINT" name="event-point"/>
+ <field type="byte" name="detail"/>
+ <field type="Time" name="time"/>
+ <field type="Window" name="root"/>
+ <field type="Window" name="event"/>
+ <field type="Window" name="child"/>
+ <field type="Point" name="root-point"/>
+ <field type="Point" name="event-point"/>
<field type="CARD16" name="state"/>
- <field type="BOOL" name="same-screen"/>
+ <field type="bool" name="same-screen"/>
</event>
<event name="EnterNotify" number="7">
- <field type="BYTE" name="detail"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="WINDOW" name="root"/>
- <field type="WINDOW" name="event"/>
- <field type="WINDOW" name="child"/>
- <field type="POINT" name="root-point"/>
- <field type="POINT" name="event-point"/>
+ <field type="byte" name="detail"/>
+ <field type="Time" name="time"/>
+ <field type="Window" name="root"/>
+ <field type="Window" name="event"/>
+ <field type="Window" name="child"/>
+ <field type="Point" name="root-point"/>
+ <field type="Point" name="event-point"/>
<field type="CARD16" name="state"/>
- <field type="BYTE" name="mode"/>
- <field type="BYTE" name="same-screen-focus"/>
+ <field type="byte" name="mode"/>
+ <field type="byte" name="same-screen-focus"/>
</event>
<eventcopy name="LeaveNotify" number="8" ref="EnterNotify"/>
<event name="FocusIn" number="9">
<field type="FocusDetail" name="detail"/>
- <field type="WINDOW" name="event"/>
- <field type="BYTE" name="mode"/>
+ <field type="Window" name="event"/>
+ <field type="byte" name="mode"/>
</event>
<eventcopy name="FocusOut" number="10" ref="FocusIn"/>
<event name="KeymapNotify" number="11" no-sequence-number="true">
@@ -116,142 +116,142 @@ authorization from the authors.
</event>
<event name="Expose" number="12">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<!-- FIXME: type change -->
- <field type="RECTANGLE"/>
+ <field type="Rectangle"/>
<field type="CARD16" name="count"/>
</event>
<event name="GraphicsExposure" number="13">
<pad bytes="1"/>
- <field type="DRAWABLE" name="drawable"/>
+ <field type="Drawable" name="drawable"/>
<!-- FIXME: type change -->
- <field type="RECTANGLE"/>
+ <field type="Rectangle"/>
<field type="CARD16" name="minor-opcode"/>
<field type="CARD16" name="count"/>
<field type="CARD8" name="major-opcode"/>
</event>
<event name="NoExposure" number="14">
<pad bytes="1"/>
- <field type="DRAWABLE" name="drawable"/>
+ <field type="Drawable" name="drawable"/>
<field type="CARD16" name="minor-opcode"/>
<field type="CARD8" name="major-opcode"/>
</event>
<event name="VisibilityNotify" number="15">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<field type="Visibility" name="state"/>
</event>
<event name="CreateNotify" number="16">
<pad bytes="1"/>
- <field type="WINDOW" name="parent"/>
- <field type="WINDOW" name="window"/>
- <field type="RECTANGLE"/>
+ <field type="Window" name="parent"/>
+ <field type="Window" name="window"/>
+ <field type="Rectangle"/>
<field type="CARD16" name="border-width"/>
- <field type="BOOL" name="override-redirect"/>
+ <field type="bool" name="override-redirect"/>
</event>
<event name="DestroyNotify" number="17">
<pad bytes="1"/>
- <field type="WINDOW" name="event"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="event"/>
+ <field type="Window" name="window"/>
</event>
<event name="UnmapNotify" number="18">
<pad bytes="1"/>
- <field type="WINDOW" name="event"/>
- <field type="WINDOW" name="window"/>
- <field type="BOOL" name="from-configure"/>
+ <field type="Window" name="event"/>
+ <field type="Window" name="window"/>
+ <field type="bool" name="from-configure"/>
</event>
<event name="MapNotify" number="19">
<pad bytes="1"/>
- <field type="WINDOW" name="event"/>
- <field type="WINDOW" name="window"/>
- <field type="BOOL" name="override-redirect"/>
+ <field type="Window" name="event"/>
+ <field type="Window" name="window"/>
+ <field type="bool" name="override-redirect"/>
</event>
<event name="MapRequest" number="20">
<pad bytes="1"/>
- <field type="WINDOW" name="parent"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="parent"/>
+ <field type="Window" name="window"/>
</event>
<event name="ReparentNotify" number="21">
<pad bytes="1"/>
- <field type="WINDOW" name="event"/>
- <field type="WINDOW" name="window"/>
- <field type="WINDOW" name="parent"/>
- <field type="POINT"/>
- <field type="BOOL" name="override-redirect"/>
+ <field type="Window" name="event"/>
+ <field type="Window" name="window"/>
+ <field type="Window" name="parent"/>
+ <field type="Point"/>
+ <field type="bool" name="override-redirect"/>
</event>
<event name="ConfigureNotify" number="22">
<pad bytes="1"/>
- <field type="WINDOW" name="event"/>
- <field type="WINDOW" name="window"/>
- <field type="WINDOW" name="above-sibling"/>
- <field type="RECTANGLE"/>
+ <field type="Window" name="event"/>
+ <field type="Window" name="window"/>
+ <field type="Window" name="above-sibling"/>
+ <field type="Rectangle"/>
<field type="CARD16" name="border-width"/>
- <field type="BOOL" name="override-redirect"/>
+ <field type="bool" name="override-redirect"/>
</event>
<event name="ConfigureRequest" number="23">
- <field type="BYTE" name="stack-mode"/>
- <field type="WINDOW" name="parent"/>
- <field type="WINDOW" name="window"/>
- <field type="WINDOW" name="sibling"/>
- <field type="RECTANGLE"/>
+ <field type="byte" name="stack-mode"/>
+ <field type="Window" name="parent"/>
+ <field type="Window" name="window"/>
+ <field type="Window" name="sibling"/>
+ <field type="Rectangle"/>
<field type="CARD16" name="border-width"/>
<field type="CARD16" name="value-mask"/>
</event>
<event name="GravityNotify" number="24">
<pad bytes="1"/>
- <field type="WINDOW" name="event"/>
- <field type="WINDOW" name="window"/>
- <field type="POINT"/>
+ <field type="Window" name="event"/>
+ <field type="Window" name="window"/>
+ <field type="Point"/>
</event>
<event name="ResizeRequest" number="25">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
- <field type="SIZE"/>
+ <field type="Window" name="window"/>
+ <field type="Size"/>
</event>
<event name="CirculateNotify" number="26">
<pad bytes="1"/>
- <field type="WINDOW" name="event"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="event"/>
+ <field type="Window" name="window"/>
<pad bytes="4"/>
- <field type="BYTE" name="place"/>
+ <field type="byte" name="place"/>
</event>
<eventcopy name="CirculateRequest" number="27" ref="CirculateNotify"/>
<event name="PropertyNotify" number="28">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
- <field type="ATOM" name="atom"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="BYTE" name="state"/>
+ <field type="Window" name="window"/>
+ <field type="Atom" name="atom"/>
+ <field type="Time" name="time"/>
+ <field type="byte" name="state"/>
</event>
<event name="SelectionClear" number="29">
<pad bytes="1"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="WINDOW" name="owner"/>
- <field type="ATOM" name="selection"/>
+ <field type="Time" name="time"/>
+ <field type="Window" name="owner"/>
+ <field type="Atom" name="selection"/>
</event>
<event name="SelectionRequest" number="30">
<pad bytes="1"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="WINDOW" name="owner"/>
- <field type="WINDOW" name="requestor"/>
- <field type="ATOM" name="selection"/>
- <field type="ATOM" name="target"/>
- <field type="ATOM" name="property"/>
+ <field type="Time" name="time"/>
+ <field type="Window" name="owner"/>
+ <field type="Window" name="requestor"/>
+ <field type="Atom" name="selection"/>
+ <field type="Atom" name="target"/>
+ <field type="Atom" name="property"/>
</event>
<event name="SelectionNotify" number="31">
<pad bytes="1"/>
- <field type="TIMESTAMP" name="time"/>
- <field type="WINDOW" name="requestor"/>
- <field type="ATOM" name="selection"/>
- <field type="ATOM" name="target"/>
- <field type="ATOM" name="property"/>
+ <field type="Time" name="time"/>
+ <field type="Window" name="requestor"/>
+ <field type="Atom" name="selection"/>
+ <field type="Atom" name="target"/>
+ <field type="Atom" name="property"/>
</event>
<event name="ColormapNotify" number="32">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
- <field type="COLORMAP" name="colormap"/>
- <field type="BOOL" name="new"/>
- <field type="BYTE" name="state"/>
+ <field type="Window" name="window"/>
+ <field type="Colormap" name="colormap"/>
+ <field type="bool" name="new"/>
+ <field type="byte" name="state"/>
</event>
<union name="ClientMessageData">
<!-- The format member of the ClientMessage event determines which array to use. -->
@@ -271,14 +271,14 @@ authorization from the authors.
<event name="ClientMessage" number="33">
<!-- 8, 16, or 32. -->
<field type="CARD8" name="format"/>
- <field type="WINDOW" name="window"/>
- <field type="ATOM" name="type"/>
+ <field type="Window" name="window"/>
+ <field type="Atom" name="type"/>
<field type="ClientMessageData" name="data"/>
</event>
<event name="MappingNotify" number="34">
<pad bytes="1"/>
- <field type="BYTE" name="request"/>
- <field type="KEYCODE" name="first-keycode"/>
+ <field type="byte" name="request"/>
+ <field type="KeyCode" name="first-keycode"/>
<field type="CARD8" name="count"/>
</event>
<!-- Enumerations -->
@@ -348,11 +348,11 @@ authorization from the authors.
<item name="pointer-window"/>
<item name="input-focus"/>
</enum>
-<enum type="BYTE" name="GrabMode">
+<enum type="byte" name="GrabMode">
<item name="synchronous"/>
<item name="asynchronous"/>
</enum>
-<enum type="BYTE" name="GrabStatus">
+<enum type="byte" name="GrabStatus">
<item name="success"/>
<item name="already-grabbed"/>
<item name="invalid-time"/>
@@ -364,7 +364,7 @@ authorization from the authors.
<item name="pointer-root"/>
<item name="parent"/>
</enum>
-<enum type="BYTE" name="Direction">
+<enum type="byte" name="Direction">
<item name="left-to-right"/>
<item name="right-to-left"/>
</enum>
@@ -402,13 +402,13 @@ authorization from the authors.
<item name="chord"/>
<item name="pie-slice"/>
</enum>
-<enum type="BYTE" name="Ordering">
+<enum type="byte" name="Ordering">
<item name="unsorted"/>
<item name="y-sorted"/>
<item name="yx-sorted"/>
<item name="yx-banded"/>
</enum>
-<enum type="BYTE" name="CoordinateMode">
+<enum type="byte" name="CoordinateMode">
<item name="absolute"/>
<item name="relative"/>
</enum>
@@ -422,7 +422,7 @@ authorization from the authors.
<item name="xy-pixmap"/>
<item name="z-pixmap"/>
</enum>
-<enum type="BYTE" name="Allocation">
+<enum type="byte" name="Allocation">
<item name="none"/>
<item name="all"/>
</enum>
@@ -440,7 +440,7 @@ authorization from the authors.
<item name="reset"/>
<item name="activate"/>
</enum>
-<enum type="BYTE" name="MappingStatus">
+<enum type="byte" name="MappingStatus">
<item name="success"/>
<item name="busy"/>
<item name="failed"/>
@@ -449,7 +449,7 @@ authorization from the authors.
<item name="normal"/>
<item name="hint"/>
</enum>
-<enum type="BYTE" name="Visibility">
+<enum type="byte" name="Visibility">
<item name="full"/>
<item name="partial"/>
<item name="none"/>
@@ -485,7 +485,7 @@ authorization from the authors.
<item name="nand"/>
<item name="set"/>
</enum>
-<enum type="BYTE" name="FocusDetail">
+<enum type="byte" name="FocusDetail">
<item name="ancestor"/>
<item name="virtual"/>
<item name="inferior"/>
@@ -593,115 +593,115 @@ authorization from the authors.
</enum>
<request name="CreateWindow" number="1">
<field type="CARD8" name="depth"/>
- <field type="WINDOW" name="wid"/>
- <field type="WINDOW" name="parent"/>
- <field type="RECTANGLE"/>
+ <field type="Window" name="wid"/>
+ <field type="Window" name="parent"/>
+ <field type="Rectangle"/>
<field type="CARD16" name="border-width"/>
<field type="WindowClass" name="class"/>
- <field type="VISUALID" name="visual"/>
+ <field type="VisualID" name="visual"/>
<valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="ChangeWindowAttributes" number="2">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<struct name="WindowAttributes">
<field type="StoreUsage" name="backing-store"/>
- <field type="VISUALID" name="visual"/>
+ <field type="VisualID" name="visual"/>
<field type="WindowClass" name="class"/>
<field type="Gravity" name="bit-gravity"/>
<field type="Gravity" name="win-gravity"/>
<field type="CARD32" name="backing-planes"/>
<field type="CARD32" name="backing-pixel"/>
- <field type="BOOL" name="save-under"/>
- <field type="BOOL" name="map-is-installed"/>
+ <field type="bool" name="save-under"/>
+ <field type="bool" name="map-is-installed"/>
<field type="MapState" name="map-state"/>
- <field type="BOOL" name="override-redirect"/>
- <field type="COLORMAP" name="colormap"/>
+ <field type="bool" name="override-redirect"/>
+ <field type="Colormap" name="colormap"/>
<field type="CARD32" name="all-event-masks"/>
<field type="CARD32" name="your-event-mask"/>
<field type="CARD16" name="do-not-propagate-mask"/>
</struct>
<request name="GetWindowAttributes" number="3">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<reply>
<field type="WindowAttributes" name="value"/>
</reply>
</request>
<request name="DestroyWindow" number="4">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
</request>
<request name="DestroySubwindows" number="5">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
</request>
<request name="ChangeSaveSet" number="6">
- <field type="BYTE" name="mode"/>
- <field type="WINDOW" name="window"/>
+ <field type="byte" name="mode"/>
+ <field type="Window" name="window"/>
</request>
<request name="ReparentWindow" number="7">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
- <field type="WINDOW" name="parent"/>
- <field type="POINT"/>
+ <field type="Window" name="window"/>
+ <field type="Window" name="parent"/>
+ <field type="Point"/>
</request>
<request name="MapWindow" number="8">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
</request>
<request name="MapSubwindows" number="9">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
</request>
<request name="UnmapWindow" number="10">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
</request>
<request name="UnmapSubwindows" number="11">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
</request>
<request name="ConfigureWindow" number="12">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<valueparam value-mask-type="CARD16" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="CirculateWindow" number="13">
<field type="CirculateDirection" name="direction"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
</request>
<struct name="Geometry">
<field type="CARD8" name="depth"/>
- <field type="WINDOW" name="root"/>
- <field type="RECTANGLE"/>
+ <field type="Window" name="root"/>
+ <field type="Rectangle"/>
<field type="CARD16" name="border-width"/>
</struct>
<request name="GetGeometry" number="14">
<pad bytes="1"/>
- <field type="DRAWABLE" name="drawable"/>
+ <field type="Drawable" name="drawable"/>
<reply>
<field type="Geometry"/>
</reply>
</request>
<request name="QueryTree" number="15">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<reply>
<pad bytes="1"/>
- <field type="WINDOW" name="root"/>
- <field type="WINDOW" name="parent"/>
+ <field type="Window" name="root"/>
+ <field type="Window" name="parent"/>
<field type="CARD16" name="children-len"/>
<pad bytes="14"/>
- <list type="WINDOW" name="children">
+ <list type="Window" name="children">
<fieldref>children-len</fieldref>
</list>
</reply>
</request>
<request name="InternAtom" number="16">
- <field type="BOOL" name="only-if-exists"/>
+ <field type="bool" name="only-if-exists"/>
<field type="CARD16" name="name-len"/>
<pad bytes="2"/>
<list type="char" name="name">
@@ -709,12 +709,12 @@ authorization from the authors.
</list>
<reply>
<pad bytes="1"/>
- <field type="ATOM" name="atom"/>
+ <field type="Atom" name="atom"/>
</reply>
</request>
<request name="GetAtomName" number="17">
<pad bytes="1"/>
- <field type="ATOM" name="atom"/>
+ <field type="Atom" name="atom"/>
<reply>
<pad bytes="1"/>
<field type="CARD16" name="name-len"/>
@@ -726,9 +726,9 @@ authorization from the authors.
</request>
<request name="ChangeProperty" number="18">
<field type="PropertyMode" name="mode"/>
- <field type="WINDOW" name="window"/>
- <field type="ATOM" name="property"/>
- <field type="ATOM" name="type"/>
+ <field type="Window" name="window"/>
+ <field type="Atom" name="property"/>
+ <field type="Atom" name="type"/>
<field type="CARD8" name="format"/>
<pad bytes="3"/>
<field type="CARD32" name="data-len"/>
@@ -744,19 +744,19 @@ authorization from the authors.
</request>
<request name="DeleteProperty" number="19">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
- <field type="ATOM" name="property"/>
+ <field type="Window" name="window"/>
+ <field type="Atom" name="property"/>
</request>
<request name="GetProperty" number="20">
- <field type="BOOL" name="delete"/>
- <field type="WINDOW" name="window"/>
- <field type="ATOM" name="property"/>
- <field type="ATOM" name="type"/>
+ <field type="bool" name="delete"/>
+ <field type="Window" name="window"/>
+ <field type="Atom" name="property"/>
+ <field type="Atom" name="type"/>
<field type="CARD32" name="long-offset"/>
<field type="CARD32" name="long-length"/>
<reply>
<field type="CARD8" name="format"/>
- <field type="ATOM" name="type"/>
+ <field type="Atom" name="type"/>
<field type="CARD32" name="bytes-after"/>
<field type="CARD32" name="value-len"/>
<pad bytes="12"/>
@@ -767,41 +767,41 @@ authorization from the authors.
</request>
<request name="ListProperties" number="21">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<reply>
<pad bytes="1"/>
<field type="CARD16" name="atoms-len"/>
<pad bytes="22"/>
- <list type="ATOM" name="atoms">
+ <list type="Atom" name="atoms">
<fieldref>atoms-len</fieldref>
</list>
</reply>
</request>
<request name="SetSelectionOwner" number="22">
<pad bytes="1"/>
- <field type="WINDOW" name="owner"/>
- <field type="ATOM" name="selection"/>
- <field type="TIMESTAMP" name="time"/>
+ <field type="Window" name="owner"/>
+ <field type="Atom" name="selection"/>
+ <field type="Time" name="time"/>
</request>
<request name="GetSelectionOwner" number="23">
<pad bytes="1"/>
- <field type="ATOM" name="selection"/>
+ <field type="Atom" name="selection"/>
<reply>
<pad bytes="1"/>
- <field type="WINDOW" name="owner"/>
+ <field type="Window" name="owner"/>
</reply>
</request>
<request name="ConvertSelection" number="24">
<pad bytes="1"/>
- <field type="WINDOW" name="requestor"/>
- <field type="ATOM" name="selection"/>
- <field type="ATOM" name="target"/>
- <field type="ATOM" name="property"/>
- <field type="TIMESTAMP" name="time"/>
+ <field type="Window" name="requestor"/>
+ <field type="Atom" name="selection"/>
+ <field type="Atom" name="target"/>
+ <field type="Atom" name="property"/>
+ <field type="Time" name="time"/>
</request>
<request name="SendEvent" number="25">
- <field type="BOOL" name="propagate"/>
- <field type="WINDOW" name="destination"/>
+ <field type="bool" name="propagate"/>
+ <field type="Window" name="destination"/>
<field type="CARD32" name="event-mask"/>
<!-- TODO: merge with xevie Event struct -->
<list type="char" name="event">
@@ -809,51 +809,51 @@ authorization from the authors.
</list>
</request>
<request name="GrabPointer" number="26">
- <field type="BOOL" name="owner-events"/>
- <field type="WINDOW" name="grab-window"/>
+ <field type="bool" name="owner-events"/>
+ <field type="Window" name="grab-window"/>
<field type="CARD16" name="event-mask"/>
<field type="GrabMode" name="pointer-mode"/>
<field type="GrabMode" name="keyboard-mode"/>
- <field type="WINDOW" name="confine-to"/>
- <field type="CURSOR" name="cursor"/>
- <field type="TIMESTAMP" name="time"/>
+ <field type="Window" name="confine-to"/>
+ <field type="Cursor" name="cursor"/>
+ <field type="Time" name="time"/>
<reply>
<field type="GrabStatus" name="status"/>
</reply>
</request>
<request name="UngrabPointer" number="27">
<pad bytes="1"/>
- <field type="TIMESTAMP" name="time"/>
+ <field type="Time" name="time"/>
</request>
<request name="GrabButton" number="28">
- <field type="BOOL" name="owner-events"/>
- <field type="WINDOW" name="grab-window"/>
+ <field type="bool" name="owner-events"/>
+ <field type="Window" name="grab-window"/>
<field type="CARD16" name="event-mask"/>
<!-- FIXME: type change? BYTE/CARD8 -->
<field type="GrabMode" name="pointer-mode"/>
<field type="GrabMode" name="keyboard-mode"/>
- <field type="WINDOW" name="confine-to"/>
- <field type="CURSOR" name="cursor"/>
+ <field type="Window" name="confine-to"/>
+ <field type="Cursor" name="cursor"/>
<field type="CARD8" name="button"/>
<pad bytes="1"/>
<field type="CARD16" name="modifiers"/>
</request>
<request name="UngrabButton" number="29">
- <field type="BUTTON" name="button"/>
- <field type="WINDOW" name="grab-window"/>
+ <field type="Button" name="button"/>
+ <field type="Window" name="grab-window"/>
<field type="CARD16" name="modifiers"/>
<pad bytes="2"/>
</request>
<request name="ChangeActivePointerGrab" number="30">
<pad bytes="1"/>
- <field type="CURSOR" name="cursor"/>
- <field type="TIMESTAMP" name="time"/>
+ <field type="Cursor" name="cursor"/>
+ <field type="Time" name="time"/>
<field type="CARD16" name="event-mask"/>
</request>
<request name="GrabKeyboard" number="31">
- <field type="BOOL" name="owner-events"/>
- <field type="WINDOW" name="grab-window"/>
- <field type="TIMESTAMP" name="time"/>
+ <field type="bool" name="owner-events"/>
+ <field type="Window" name="grab-window"/>
+ <field type="Time" name="time"/>
<field type="GrabMode" name="pointer-mode"/>
<field type="GrabMode" name="keyboard-mode"/>
<reply>
@@ -862,74 +862,74 @@ authorization from the authors.
</request>
<request name="UngrabKeyboard" number="32">
<pad bytes="1"/>
- <field type="TIMESTAMP" name="time"/>
+ <field type="Time" name="time"/>
</request>
<request name="GrabKey" number="33">
- <field type="BOOL" name="owner-events"/>
- <field type="WINDOW" name="grab-window"/>
+ <field type="bool" name="owner-events"/>
+ <field type="Window" name="grab-window"/>
<field type="CARD16" name="modifiers"/>
- <field type="KEYCODE" name="key"/>
+ <field type="KeyCode" name="key"/>
<field type="GrabMode" name="pointer-mode"/>
<field type="GrabMode" name="keyboard-mode"/>
</request>
<request name="UngrabKey" number="34">
<field type="CARD8" name="key"/>
- <field type="WINDOW" name="grab-window"/>
+ <field type="Window" name="grab-window"/>
<field type="CARD16" name="modifiers"/>
</request>
<request name="AllowEvents" number="35">
<field type="CARD8" name="mode"/>
- <field type="TIMESTAMP" name="time"/>
+ <field type="Time" name="time"/>
</request>
<request name="GrabServer" number="36"/>
<request name="UngrabServer" number="37"/>
<request name="QueryPointer" number="38">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<reply>
- <field type="BOOL" name="same-screen"/>
- <field type="WINDOW" name="root"/>
- <field type="WINDOW" name="child"/>
- <field type="POINT" name="root-point"/>
- <field type="POINT" name="win-point"/>
+ <field type="bool" name="same-screen"/>
+ <field type="Window" name="root"/>
+ <field type="Window" name="child"/>
+ <field type="Point" name="root-point"/>
+ <field type="Point" name="win-point"/>
<field type="CARD16" name="mask"/>
</reply>
</request>
- <struct name="TIMECOORD">
- <field type="TIMESTAMP" name="time"/>
- <field type="POINT"/>
+ <struct name="TimeCoord">
+ <field type="Time" name="time"/>
+ <field type="Point"/>
</struct>
<request name="GetMotionEvents" number="39">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
- <field type="TIMESTAMP" name="start"/>
- <field type="TIMESTAMP" name="stop"/>
+ <field type="Window" name="window"/>
+ <field type="Time" name="start"/>
+ <field type="Time" name="stop"/>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="events-len"/>
<pad bytes="20"/>
- <list type="TIMECOORD" name="events">
+ <list type="TimeCoord" name="events">
<fieldref>events-len</fieldref>
</list>
</reply>
</request>
<request name="TranslateCoordinates" number="40">
<pad bytes="1"/>
- <field type="WINDOW" name="src-window"/>
- <field type="WINDOW" name="dst-window"/>
+ <field type="Window" name="src-window"/>
+ <field type="Window" name="dst-window"/>
<field type="INT16" name="src-x"/>
<field type="INT16" name="src-y"/>
<reply>
- <field type="BOOL" name="same-screen"/>
- <field type="WINDOW" name="child"/>
+ <field type="bool" name="same-screen"/>
+ <field type="Window" name="child"/>
<field type="CARD16" name="dst-x"/>
<field type="CARD16" name="dst-y"/>
</reply>
</request>
<request name="WarpPointer" number="41">
<pad bytes="1"/>
- <field type="WINDOW" name="src-window"/>
- <field type="WINDOW" name="dst-window"/>
+ <field type="Window" name="src-window"/>
+ <field type="Window" name="dst-window"/>
<field type="INT16" name="src-x"/>
<field type="INT16" name="src-y"/>
<field type="CARD16" name="src-width"/>
@@ -939,13 +939,13 @@ authorization from the authors.
</request>
<request name="SetInputFocus" number="42">
<field type="FocusRevert" name="revert-to"/>
- <field type="WINDOW" name="focus"/>
- <field type="TIMESTAMP" name="time"/>
+ <field type="Window" name="focus"/>
+ <field type="Time" name="time"/>
</request>
<request name="GetInputFocus" number="43">
<reply>
<field type="FocusRevert" name="revert-to"/>
- <field type="WINDOW" name="focus"/>
+ <field type="Window" name="focus"/>
</reply>
</request>
<request name="QueryKeymap" number="44">
@@ -958,7 +958,7 @@ authorization from the authors.
</request>
<request name="OpenFont" number="45">
<pad bytes="1"/>
- <field type="FONT" name="fid"/>
+ <field type="Font" name="fid"/>
<field type="CARD16" name="name-len"/>
<list type="char" name="name">
<fieldref>name-len</fieldref>
@@ -966,13 +966,13 @@ authorization from the authors.
</request>
<request name="CloseFont" number="46">
<pad bytes="1"/>
- <field type="FONT" name="font"/>
+ <field type="Font" name="font"/>
</request>
- <struct name="FONTPROP">
- <field type="ATOM" name="name"/>
+ <struct name="FontProp">
+ <field type="Atom" name="name"/>
<field type="CARD32" name="value"/>
</struct>
- <struct name="CHARINFO">
+ <struct name="CharInfo">
<field type="INT16" name="left-side-bearing"/>
<field type="INT16" name="right-side-bearing"/>
<field type="INT16" name="character-width"/>
@@ -982,12 +982,12 @@ authorization from the authors.
</struct>
<request name="QueryFont" number="47">
<pad bytes="1"/>
- <field type="FONTABLE" name="font"/>
+ <field type="Fontable" name="font"/>
<reply>
<pad bytes="1"/>
- <field type="CHARINFO" name="min-bounds"/>
+ <field type="CharInfo" name="min-bounds"/>
<pad bytes="4"/>
- <field type="CHARINFO" name="max-bounds"/>
+ <field type="CharInfo" name="max-bounds"/>
<pad bytes="4"/>
<field type="CARD16" name="min-char-or-byte2"/>
<field type="CARD16" name="max-char-or-byte2"/>
@@ -996,26 +996,26 @@ authorization from the authors.
<field type="Direction" name="draw-direction"/>
<field type="CARD8" name="min-byte1"/>
<field type="CARD8" name="max-byte1"/>
- <field type="BOOL" name="all-chars-exist"/>
+ <field type="bool" name="all-chars-exist"/>
<field type="INT16" name="font-ascent"/>
<field type="INT16" name="font-descent"/>
<field type="CARD32" name="char-infos-len"/>
- <list type="FONTPROP" name="properties">
+ <list type="FontProp" name="properties">
<fieldref>properties-len</fieldref>
</list>
- <list type="CHARINFO" name="char-infos">
+ <list type="CharInfo" name="char-infos">
<fieldref>char-infos-len</fieldref>
</list>
</reply>
</request>
<request name="QueryTextExtents" number="48">
- <exprfield type="BOOL" name="odd-length">
+ <exprfield type="bool" name="odd-length">
<op op="&">
<fieldref>string-len</fieldref>
<value>1</value>
</op>
</exprfield>
- <field type="FONTABLE" name="font"/>
+ <field type="Fontable" name="font"/>
<list type="CHAR2B" name="string"/>
<reply>
<field type="Direction" name="draw-direction"/>
@@ -1028,7 +1028,7 @@ authorization from the authors.
<field type="INT32" name="overall-right"/>
</reply>
</request>
- <struct name="STR">
+ <struct name="string">
<field type="CARD8" name="name-len"/>
<list type="char" name="name">
<fieldref>name-len</fieldref>
@@ -1045,7 +1045,7 @@ authorization from the authors.
<pad bytes="1"/>
<field type="CARD16" name="names-len"/>
<pad bytes="22"/>
- <list type="STR" name="names">
+ <list type="string" name="names">
<fieldref>names-len</fieldref>
</list>
</reply>
@@ -1059,9 +1059,9 @@ authorization from the authors.
</list>
<reply>
<field type="CARD8" name="name-len"/>
- <field type="CHARINFO" name="min-bounds"/>
+ <field type="CharInfo" name="min-bounds"/>
<pad bytes="4"/>
- <field type="CHARINFO" name="max-bounds"/>
+ <field type="CharInfo" name="max-bounds"/>
<pad bytes="4"/>
<field type="CARD16" name="min-char-or-byte2"/>
<field type="CARD16" name="max-char-or-byte2"/>
@@ -1070,11 +1070,11 @@ authorization from the authors.
<field type="Direction" name="draw-direction"/>
<field type="CARD8" name="min-byte1"/>
<field type="CARD8" name="max-byte1"/>
- <field type="BOOL" name="all-chars-exist"/>
+ <field type="bool" name="all-chars-exist"/>
<field type="INT16" name="font-ascent"/>
<field type="INT16" name="font-descent"/>
<field type="CARD32" name="replies-hint"/>
- <list type="FONTPROP" name="properties">
+ <list type="FontProp" name="properties">
<fieldref>properties-len</fieldref>
</list>
<list type="char" name="name">
@@ -1092,41 +1092,41 @@ authorization from the authors.
<pad bytes="1"/>
<field type="CARD16" name="path-len"/>
<pad bytes="22"/>
- <list type="STR" name="path">
+ <list type="string" name="path">
<fieldref>path-len</fieldref>
</list>
</reply>
</request>
<request name="CreatePixmap" number="53">
<field type="CARD8" name="depth"/>
- <field type="PIXMAP" name="pid"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="SIZE" name="size"/>
+ <field type="Pixmap" name="pid"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="Size" name="size"/>
</request>
<request name="FreePixmap" number="54">
<pad bytes="1"/>
- <field type="PIXMAP" name="pixmap"/>
+ <field type="Pixmap" name="pixmap"/>
</request>
<request name="CreateGC" number="55">
<pad bytes="1"/>
- <field type="GCONTEXT" name="cid"/>
- <field type="DRAWABLE" name="drawable"/>
+ <field type="GContext" name="cid"/>
+ <field type="Drawable" name="drawable"/>
<valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="ChangeGC" number="56">
<pad bytes="1"/>
- <field type="GCONTEXT" name="gc"/>
+ <field type="GContext" name="gc"/>
<valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="CopyGC" number="57">
<pad bytes="1"/>
- <field type="GCONTEXT" name="src-gc"/>
- <field type="GCONTEXT" name="dst-gc"/>
+ <field type="GContext" name="src-gc"/>
+ <field type="GContext" name="dst-gc"/>
<field type="CARD32" name="value-mask"/>
</request>
<request name="SetDashes" number="58">
<pad bytes="1"/>
- <field type="GCONTEXT" name="gc"/>
+ <field type="GContext" name="gc"/>
<field type="CARD16" name="dash-offset"/>
<field type="CARD16" name="dashes-len"/>
<list type="CARD8" name="dashes">
@@ -1135,55 +1135,55 @@ authorization from the authors.
</request>
<request name="SetClipRectangles" number="59">
<field type="Ordering" name="ordering"/>
- <field type="GCONTEXT" name="gc"/>
- <field type="POINT" name="clip-origin"/>
- <list type="RECTANGLE" name="rectangles"/>
+ <field type="GContext" name="gc"/>
+ <field type="Point" name="clip-origin"/>
+ <list type="Rectangle" name="rectangles"/>
</request>
<request name="FreeGC" number="60">
<pad bytes="1"/>
- <field type="GCONTEXT" name="gc"/>
+ <field type="GContext" name="gc"/>
</request>
<request name="ClearArea" number="61">
- <field type="BOOL" name="exposures"/>
- <field type="WINDOW" name="window"/>
- <field type="RECTANGLE"/>
+ <field type="bool" name="exposures"/>
+ <field type="Window" name="window"/>
+ <field type="Rectangle"/>
</request>
<request name="CopyArea" number="62">
<pad bytes="1"/>
- <field type="DRAWABLE" name="src-drawable"/>
- <field type="DRAWABLE" name="dst-drawable"/>
- <field type="GCONTEXT" name="gc"/>
+ <field type="Drawable" name="src-drawable"/>
+ <field type="Drawable" name="dst-drawable"/>
+ <field type="GContext" name="gc"/>
<field type="INT16" name="src-x"/>
<field type="INT16" name="src-y"/>
<field type="INT16" name="dst-x"/>
<field type="INT16" name="dst-y"/>
- <field type="SIZE"/>
+ <field type="Size"/>
</request>
<request name="CopyPlane" number="63">
<pad bytes="1"/>
- <field type="DRAWABLE" name="src-drawable"/>
- <field type="DRAWABLE" name="dst-drawable"/>
- <field type="GCONTEXT" name="gc"/>
+ <field type="Drawable" name="src-drawable"/>
+ <field type="Drawable" name="dst-drawable"/>
+ <field type="GContext" name="gc"/>
<field type="INT16" name="src-x"/>
<field type="INT16" name="src-y"/>
<field type="INT16" name="dst-x"/>
<field type="INT16" name="dst-y"/>
- <field type="SIZE"/>
+ <field type="Size"/>
<field type="CARD32" name="bit-plane"/>
</request>
<request name="PolyPoint" number="64" combine-adjacent="true">
<field type="CoordinateMode" name="coordinate-mode"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
- <list type="POINT" name="points"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
+ <list type="Point" name="points"/>
</request>
<request name="PolyLine" number="65" combine-adjacent="true">
<field type="CoordinateMode" name="coordinate-mode"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
- <list type="POINT" name="points"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
+ <list type="Point" name="points"/>
</request>
- <struct name="SEGMENT">
+ <struct name="Segment">
<field type="INT16" name="x1"/>
<field type="INT16" name="y1"/>
<field type="INT16" name="x2"/>
@@ -1191,15 +1191,15 @@ authorization from the authors.
</struct>
<request name="PolySegment" number="66" combine-adjacent="true">
<pad bytes="1"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
- <list type="SEGMENT" name="segments"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
+ <list type="Segment" name="segments"/>
</request>
<request name="PolyRectangle" number="67" combine-adjacent="true">
<pad bytes="1"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
- <list type="RECTANGLE" name="rectangles"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
+ <list type="Rectangle" name="rectangles"/>
</request>
<!--
The semantics of PolyArc change after the first arc: the GC's
@@ -1208,52 +1208,52 @@ authorization from the authors.
-->
<request name="PolyArc" number="68">
<pad bytes="1"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
- <list type="ARC" name="arcs"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
+ <list type="Arc" name="arcs"/>
</request>
<request name="FillPoly" number="69">
<pad bytes="1"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
<field type="ShapeType" name="shape"/>
<field type="CoordinateMode" name="coordinate-mode"/>
- <list type="POINT" name="points"/>
+ <list type="Point" name="points"/>
</request>
<request name="PolyFillRectangle" number="70" combine-adjacent="true">
<pad bytes="1"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
- <list type="RECTANGLE" name="rectangles"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
+ <list type="Rectangle" name="rectangles"/>
</request>
<request name="PolyFillArc" number="71" combine-adjacent="true">
<pad bytes="1"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
- <list type="ARC" name="arcs"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
+ <list type="Arc" name="arcs"/>
</request>
<request name="PutImage" number="72">
<field type="ImageFormat" name="format"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
- <field type="SIZE"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
+ <field type="Size"/>
<field type="INT16" name="dst-x"/>
<field type="INT16" name="dst-y"/>
<field type="CARD8" name="left-pad"/>
<field type="CARD8" name="depth"/>
- <list type="BYTE" name="data"/>
+ <list type="byte" name="data"/>
</request>
<!-- FIXME: data array in reply will include padding, but ought not to. -->
<request name="GetImage" number="73">
<field type="ImageFormat" name="format"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="RECTANGLE"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="Rectangle"/>
<field type="CARD32" name="plane-mask"/>
<reply>
<field type="CARD8" name="depth"/>
- <field type="VISUALID" name="visual"/>
+ <field type="VisualID" name="visual"/>
<pad bytes="20"/>
- <list type="BYTE" name="data">
+ <list type="byte" name="data">
<op op="*">
<fieldref>length</fieldref>
<value>4</value>
@@ -1263,85 +1263,85 @@ authorization from the authors.
</request>
<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"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
+ <field type="Point"/>
+ <list type="byte" name="items"/>
</request>
<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"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
+ <field type="Point"/>
+ <list type="byte" name="items"/>
</request>
<request name="ImageText8" number="76">
- <field type="BYTE" name="string-len"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
- <field type="POINT"/>
+ <field type="byte" name="string-len"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
+ <field type="Point"/>
<list type="char" name="string">
<fieldref>string-len</fieldref>
</list>
</request>
<request name="ImageText16" number="77">
- <field type="BYTE" name="string-len"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="GCONTEXT" name="gc"/>
- <field type="POINT"/>
+ <field type="byte" name="string-len"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="GContext" name="gc"/>
+ <field type="Point"/>
<list type="CHAR2B" name="string">
<fieldref>string-len</fieldref>
</list>
</request>
<request name="CreateColormap" number="78">
<field type="Allocation" name="alloc"/>
- <field type="COLORMAP" name="mid"/>
- <field type="WINDOW" name="window"/>
- <field type="VISUALID" name="visual"/>
+ <field type="Colormap" name="mid"/>
+ <field type="Window" name="window"/>
+ <field type="VisualID" name="visual"/>
</request>
<request name="FreeColormap" number="79">
<pad bytes="1"/>
- <field type="COLORMAP" name="cmap"/>
+ <field type="Colormap" name="cmap"/>
</request>
<request name="CopyColormapAndFree" number="80">
<pad bytes="1"/>
- <field type="COLORMAP" name="mid"/>
- <field type="COLORMAP" name="src-cmap"/>
+ <field type="Colormap" name="mid"/>
+ <field type="Colormap" name="src-cmap"/>
</request>
<request name="InstallColormap" number="81">
<pad bytes="1"/>
- <field type="COLORMAP" name="cmap"/>
+ <field type="Colormap" name="cmap"/>
</request>
<request name="UninstallColormap" number="82">
<pad bytes="1"/>
- <field type="COLORMAP" name="cmap"/>
+ <field type="Colormap" name="cmap"/>
</request>
<request name="ListInstalledColormaps" number="83">
<pad bytes="1"/>
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<reply>
<pad bytes="1"/>
<field type="CARD16" name="cmaps-len"/>
<pad bytes="22"/>
- <list type="COLORMAP" name="cmaps">
+ <list type="Colormap" name="cmaps">
<fieldref>cmaps-len</fieldref>
</list>
</reply>
</request>
<request name="AllocColor" number="84">
<pad bytes="1"/>
- <field type="COLORMAP" name="cmap"/>
- <field type="COLOR" name="color"/>
+ <field type="Colormap" name="cmap"/>
+ <field type="Color" name="color"/>
<reply>
<pad bytes="1"/>
- <field type="COLOR" name="color"/>
+ <field type="Color" name="color"/>
<pad bytes="2"/>
<field type="CARD32" name="pixel"/>
</reply>
</request>
<request name="AllocNamedColor" number="85">
<pad bytes="1"/>
- <field type="COLORMAP" name="cmap"/>
+ <field type="Colormap" name="cmap"/>
<field type="CARD16" name="name-len"/>
<list type="char" name="name">
<fieldref>name-len</fieldref>
@@ -1349,13 +1349,13 @@ authorization from the authors.
<reply>
<pad bytes="1"/>
<field type="CARD32" name="pixel"/>
- <field type="COLOR" name="exact-color"/>
- <field type="COLOR" name="visual-color"/>
+ <field type="Color" name="exact-color"/>
+ <field type="Color" name="visual-color"/>
</reply>
</request>
<request name="AllocColorCells" number="86">
- <field type="BOOL" name="contiguous"/>
- <field type="COLORMAP" name="cmap"/>
+ <field type="bool" name="contiguous"/>
+ <field type="Colormap" name="cmap"/>
<field type="CARD16" name="colors"/>
<field type="CARD16" name="planes"/>
<reply>
@@ -1372,8 +1372,8 @@ authorization from the authors.
</reply>
</request>
<request name="AllocColorPlanes" number="87">
- <field type="BOOL" name="contiguous"/>
- <field type="COLORMAP" name="cmap"/>
+ <field type="bool" name="contiguous"/>
+ <field type="Colormap" name="cmap"/>
<field type="CARD16" name="colors"/>
<field type="CARD16" name="reds"/>
<field type="CARD16" name="greens"/>
@@ -1393,24 +1393,24 @@ authorization from the authors.
</request>
<request name="FreeColors" number="88">
<pad bytes="1"/>
- <field type="COLORMAP" name="cmap"/>
+ <field type="Colormap" name="cmap"/>
<field type="CARD32" name="plane-mask"/>
<list type="CARD32" name="pixels"/>
</request>
<struct name="COLORITEM">
<field type="CARD32" name="pixel"/>
- <field type="COLOR" name="color"/>
- <field type="BYTE" name="flags"/>
+ <field type="Color" name="color"/>
+ <field type="byte" name="flags"/>
<pad bytes="1"/>
</struct>
<request name="StoreColors" number="89" combine-adjacent="true">
<pad bytes="1"/>
- <field type="COLORMAP" name="cmap"/>
+ <field type="Colormap" name="cmap"/>
<list type="COLORITEM" name="items"/>
</request>
<request name="StoreNamedColor" number="90">
<field type="CARD8" name="flags"/>
- <field type="COLORMAP" name="cmap"/>
+ <field type="Colormap" name="cmap"/>
<field type="CARD32" name="pixel"/>
<field type="CARD16" name="name-len"/>
<list type="char" name="name">
@@ -1419,12 +1419,12 @@ authorization from the authors.
</request>
<!-- TODO: this looks funny. RGBA maybe? -->
<struct name="RGB">
- <field type="COLOR"/>
+ <field type="Color"/>
<pad bytes="2"/>
</struct>
<request name="QueryColors" number="91">
<pad bytes="1"/>
- <field type="COLORMAP" name="cmap"/>
+ <field type="Colormap" name="cmap"/>
<list type="CARD32" name="pixels"/>
<reply>
<pad bytes="1"/>
@@ -1437,53 +1437,53 @@ authorization from the authors.
</request>
<request name="LookupColor" number="92">
<pad bytes="1"/>
- <field type="COLORMAP" name="cmap"/>
+ <field type="Colormap" name="cmap"/>
<field type="CARD16" name="name-len"/>
<list type="char" name="name">
<fieldref>name-len</fieldref>
</list>
<reply>
<pad bytes="1"/>
- <field type="COLOR" name="exact-color"/>
- <field type="COLOR" name="visual-color"/>
+ <field type="Color" name="exact-color"/>
+ <field type="Color" name="visual-color"/>
</reply>
</request>
<request name="CreateCursor" number="93">
<pad bytes="1"/>
- <field type="CURSOR" name="cid"/>
- <field type="PIXMAP" name="source"/>
- <field type="PIXMAP" name="mask"/>
- <field type="COLOR" name="fore-color"/>
- <field type="COLOR" name="back-color"/>
- <field type="POINT"/>
+ <field type="Cursor" name="cid"/>
+ <field type="Pixmap" name="source"/>
+ <field type="Pixmap" name="mask"/>
+ <field type="Color" name="fore-color"/>
+ <field type="Color" name="back-color"/>
+ <field type="Point"/>
</request>
<request name="CreateGlyphCursor" number="94">
<pad bytes="1"/>
- <field type="CURSOR" name="cid"/>
- <field type="FONT" name="source-font"/>
- <field type="FONT" name="mask-font"/>
+ <field type="Cursor" name="cid"/>
+ <field type="Font" name="source-font"/>
+ <field type="Font" name="mask-font"/>
<field type="CARD16" name="source-char"/>
<field type="CARD16" name="mask-char"/>
- <field type="COLOR" name="fore-color"/>
- <field type="COLOR" name="back-color"/>
+ <field type="Color" name="fore-color"/>
+ <field type="Color" name="back-color"/>
</request>
<request name="FreeCursor" number="95">
<pad bytes="1"/>
- <field type="CURSOR" name="cursor"/>
+ <field type="Cursor" name="cursor"/>
</request>
<request name="RecolorCursor" number="96">
<pad bytes="1"/>
- <field type="CURSOR" name="cursor"/>
- <field type="COLOR" name="fore-color"/>
- <field type="COLOR" name="back-color"/>
+ <field type="Cursor" name="cursor"/>
+ <field type="Color" name="fore-color"/>
+ <field type="Color" name="back-color"/>
</request>
<request name="QueryBestSize" number="97">
<field type="QueryClass" name="class"/>
- <field type="DRAWABLE" name="drawable"/>
- <field type="SIZE" name="size"/>
+ <field type="Drawable" name="drawable"/>
+ <field type="Size" name="size"/>
<reply>
<pad bytes="1"/>
- <field type="SIZE" name="value"/>
+ <field type="Size" name="value"/>
</reply>
</request>
<request name="QueryExtension" number="98">
@@ -1494,7 +1494,7 @@ authorization from the authors.
</list>
<reply>
<pad bytes="1"/>
- <field type="BOOL" name="present"/>
+ <field type="bool" name="present"/>
<field type="CARD8" name="major-opcode"/>
<field type="CARD8" name="first-event"/>
<field type="CARD8" name="first-error"/>
@@ -1504,16 +1504,16 @@ authorization from the authors.
<reply>
<field type="CARD8" name="names-len"/>
<pad bytes="24"/>
- <list type="STR" name="names">
+ <list type="string" name="names">
<fieldref>names-len</fieldref>
</list>
</reply>
</request>
<request name="ChangeKeyboardMapping" number="100">
<field type="CARD8" name="keycode-count"/>
- <field type="KEYCODE" name="first-keycode"/>
+ <field type="KeyCode" name="first-keycode"/>
<field type="CARD8" name="keysyms-per-keycode"/>
- <list type="KEYSYM" name="keysyms">
+ <list type="KeySym" name="keysyms">
<op op="*">
<fieldref>keycode-count</fieldref>
<fieldref>keysyms-per-keycode</fieldref>
@@ -1522,12 +1522,12 @@ authorization from the authors.
</request>
<request name="GetKeyboardMapping" number="101">
<pad bytes="1"/>
- <field type="KEYCODE" name="first-keycode"/>
+ <field type="KeyCode" name="first-keycode"/>
<field type="CARD8" name="count"/>
<reply>
- <field type="BYTE" name="keysyms-per-keycode"/>
+ <field type="byte" name="keysyms-per-keycode"/>
<pad bytes="24"/>
- <list type="KEYSYM" name="keysyms">
+ <list type="KeySym" name="keysyms">
<op op="*">
<fieldref>length</fieldref>
<value>4</value>
@@ -1541,7 +1541,7 @@ authorization from the authors.
</request>
<request name="GetKeyboardControl" number="103">
<reply>
- <field type="BYTE" name="global-auto-repeat"/>
+ <field type="byte" name="global-auto-repeat"/>
<field type="CARD32" name="led-mask"/>
<field type="CARD8" name="key-click-percent"/>
<field type="CARD8" name="bell-percent"/>
@@ -1564,8 +1564,8 @@ authorization from the authors.
<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"/>
+ <field type="bool" name="do-acceleration"/>
+ <field type="bool" name="do-threshold"/>
</request>
<request name="GetPointerControl" number="106">
<reply>
@@ -1589,24 +1589,24 @@ authorization from the authors.
<field type="ScreenSaver" name="value"/>
</reply>
</request>
- <struct name="HOST">
+ <struct name="Host">
<field type="CARD8" name="family"/>
<pad bytes="1"/>
<field type="CARD16" name="address-len"/>
- <list type="BYTE" name="address">
+ <list type="byte" name="address">
<fieldref>address-len</fieldref>
</list>
</struct>
<request name="ChangeHosts" number="109">
<field type="CARD8" name="mode"/>
- <field type="HOST" name="host"/>
+ <field type="Host" name="host"/>
</request>
<request name="ListHosts" number="110">
<reply>
- <field type="BYTE" name="mode"/>
+ <field type="byte" name="mode"/>
<field type="CARD16" name="hosts-len"/>
<pad bytes="22"/>
- <list type="HOST" name="hosts">
+ <list type="Host" name="hosts">
<fieldref>hosts-len</fieldref>
</list>
</reply>
@@ -1622,10 +1622,10 @@ authorization from the authors.
<field type="CARD32" name="resource"/>
</request>
<request name="RotateProperties" number="114">
- <field type="WINDOW" name="window"/>
+ <field type="Window" name="window"/>
<field type="CARD16" name="atoms-len"/>
<field type="INT16" name="delta"/>
- <list type="ATOM" name="atoms">
+ <list type="Atom" name="atoms">
<fieldref>atoms-len</fieldref>
</list>
</request>
@@ -1652,7 +1652,7 @@ authorization from the authors.
</request>
<request name="SetModifierMapping" number="118">
<field type="CARD8" name="keycodes-per-modifier"/>
- <list type="KEYCODE" name="keycodes">
+ <list type="KeyCode" name="keycodes">
<op op="*">
<fieldref>keycodes-per-modifier</fieldref>
<value>8</value>
@@ -1666,7 +1666,7 @@ authorization from the authors.
<reply>
<field type="CARD8" name="keycodes-per-modifier"/>
<pad bytes="24"/>
- <list type="KEYCODE" name="keycodes">
+ <list type="KeyCode" name="keycodes">
<op op="*">
<fieldref>keycodes-per-modifier</fieldref>
<value>8</value>
More information about the xcb-commit
mailing list