[Xcb-commit] Branch 'xspec' - xcb-proto
Alp Toker
alp at kemper.freedesktop.org
Mon Mar 6 14:19:07 PST 2006
xcb-proto/src/extensions/composite.xml | 4 ++--
xcb-proto/src/extensions/damage.xml | 10 ++++------
xcb-proto/src/extensions/glx.xml | 12 ++++++------
xcb-proto/src/extensions/record.xml | 2 +-
xcb-proto/src/extensions/render.xml | 6 +++---
xcb-proto/src/extensions/shape.xml | 5 +----
xcb-proto/src/extensions/shm.xml | 2 +-
xcb-proto/src/extensions/sync.xml | 4 ++--
xcb-proto/src/extensions/xfixes.xml | 6 +++---
xcb-proto/src/extensions/xprint.xml | 2 +-
xcb-proto/src/extensions/xv.xml | 24 ++++++++++--------------
xcb-proto/src/extensions/xvmc.xml | 16 +++++++---------
xcb-proto/src/xcb_types.xml | 14 +++++++-------
xcb-proto/src/xproto.xml | 8 ++++----
14 files changed, 52 insertions(+), 63 deletions(-)
New commits:
diff-tree 62c0ea954851337165a878e6bfa365df928be274 (from 297cf6d464973050d9f3ed2def40822a442956cf)
Author: Alp Toker <alp at atoker.com>
Date: Mon Mar 6 22:18:51 2006 +0000
More enums, pad fixups, refactor xidtype -> type
diff --git a/xcb-proto/src/extensions/composite.xml b/xcb-proto/src/extensions/composite.xml
index 069b9db..6250410 100644
--- a/xcb-proto/src/extensions/composite.xml
+++ b/xcb-proto/src/extensions/composite.xml
@@ -77,7 +77,7 @@ authorization from the authors.
<request name="RedirectCoordinate" opcode="7">
<field type="WINDOW" name="window"/>
<field type="BOOL" name="redirect"/>
- <pad size="3"/>
+ <pad bytes="3"/>
</request>
<event name="TransformCoordinateNotify" number="0">
<field type="TIMESTAMP" name="time"/>
@@ -86,7 +86,7 @@ authorization from the authors.
<field type="CARD32" name="serial-number"/>
<field type="CARD32" name="count"/>
<field type="POINT"/>
- <pad size="4"/>
+ <pad bytes="4"/>
</event>
<request name="TransformCoordinate" opcode="8">
<field type="WINDOW" name="window"/>
diff --git a/xcb-proto/src/extensions/damage.xml b/xcb-proto/src/extensions/damage.xml
index 4d54a94..e34ea46 100644
--- a/xcb-proto/src/extensions/damage.xml
+++ b/xcb-proto/src/extensions/damage.xml
@@ -26,9 +26,9 @@ authorization from the authors.
-->
<extension header="damage" xname="DAMAGE" name="Damage" version="1">
<import>xfixes</import>
- <xidtype name="DAMAGE"/>
+ <type name="DAMAGE"/>
<error name="BadDamage" number="0"/>
- <enum name="ReportLevel">
+ <enum type="CARD8" name="ReportLevel">
<item name="raw-rectangles"/>
<item name="delta-rectangles"/>
<item name="bounding-box"/>
@@ -47,8 +47,7 @@ authorization from the authors.
<request name="Create" opcode="1">
<field type="DAMAGE" name="damage"/>
<field type="DRAWABLE" name="drawable"/>
-<!-- ReportLevel -->
- <field type="CARD8" name="level"/>
+ <field type="ReportLevel" name="level"/>
<pad bytes="3"/>
</request>
<request name="Destroy" opcode="2">
@@ -60,8 +59,7 @@ authorization from the authors.
<field type="REGION" name="parts"/>
</request>
<event name="Notify" number="0">
-<!-- ReportLevel -->
- <field type="CARD8" name="level"/>
+ <field type="ReportLevel" name="level"/>
<field type="DRAWABLE" name="drawable"/>
<field type="DAMAGE" name="damage"/>
<field type="TIMESTAMP" name="timestamp"/>
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index 2d77b6c..d8aafbd 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -43,12 +43,12 @@ The patch that fixed this server bug in
http://cvs.freedesktop.org/xorg/xserver/xorg/GL/glx/glxcmds.c?r1=1.6&r2=1.7
-->
<extension header="glx" xname="GLX" name="Glx" version="1.3">
- <xidtype name="CONTEXT"/>
- <xidtype name="DRAWABLE"/>
- <xidtype name="PIXMAP"/>
- <xidtype name="FBCONFIG"/>
- <xidtype name="PBUFFER"/>
- <xidtype name="WINDOW"/>
+ <type name="CONTEXT"/>
+ <type name="DRAWABLE"/>
+ <type name="PIXMAP"/>
+ <type name="FBCONFIG"/>
+ <type name="PBUFFER"/>
+ <type name="WINDOW"/>
<typedef oldname="float" newname="FLOAT32"/>
<typedef oldname="double" newname="FLOAT64"/>
<typedef oldname="CARD32" newname="BOOL32"/>
diff --git a/xcb-proto/src/extensions/record.xml b/xcb-proto/src/extensions/record.xml
index f371a84..3ddd930 100644
--- a/xcb-proto/src/extensions/record.xml
+++ b/xcb-proto/src/extensions/record.xml
@@ -27,7 +27,7 @@ authorization from the authors.
-->
<extension header="record" xname="RECORD" name="Record">
<!-- Types -->
- <xidtype name="CONTEXT"/>
+ <type name="CONTEXT"/>
<struct name="Range8">
<field type="CARD8" name="first"/>
<field type="CARD8" name="last"/>
diff --git a/xcb-proto/src/extensions/render.xml b/xcb-proto/src/extensions/render.xml
index c88e5d6..a04ea2c 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -152,9 +152,9 @@ for licensing information.
<item name="none"/>
</enum>
<typedef oldname="CARD32" newname="GLYPH"/>
- <xidtype name="GLYPHSET"/>
- <xidtype name="PICTURE"/>
- <xidtype name="PICTFORMAT"/>
+ <type name="GLYPHSET"/>
+ <type name="PICTURE"/>
+ <type name="PICTFORMAT"/>
<typedef oldname="INT32" newname="FIXED"/>
<error name="PictFormat" number="0"/>
<error name="Picture" number="1"/>
diff --git a/xcb-proto/src/extensions/shape.xml b/xcb-proto/src/extensions/shape.xml
index 9763016..cea497e 100644
--- a/xcb-proto/src/extensions/shape.xml
+++ b/xcb-proto/src/extensions/shape.xml
@@ -42,10 +42,7 @@ authorization from the authors.
<event name="Notify" number="0">
<field type="ShapeKind" name="shape-kind"/>
<field type="WINDOW" name="affected-window"/>
- <field type="INT16" name="extents-x"/>
- <field type="INT16" name="extents-y"/>
- <field type="CARD16" name="extents-width"/>
- <field type="CARD16" name="extents-height"/>
+ <field type="RECTANGLE" name="extents"/>
<field type="TIMESTAMP" name="server-time"/>
<field type="BOOL" name="shaped"/>
</event>
diff --git a/xcb-proto/src/extensions/shm.xml b/xcb-proto/src/extensions/shm.xml
index ccc593d..b0830e2 100644
--- a/xcb-proto/src/extensions/shm.xml
+++ b/xcb-proto/src/extensions/shm.xml
@@ -26,7 +26,7 @@ sale, use or other dealings in this Soft
authorization from the authors.
-->
<extension header="shm" xname="MIT-SHM" name="Shm">
- <xidtype name="SEG"/>
+ <type name="SEG"/>
<event name="Completion" number="0">
<pad bytes="1"/>
<field type="DRAWABLE" name="drawable"/>
diff --git a/xcb-proto/src/extensions/sync.xml b/xcb-proto/src/extensions/sync.xml
index 3113495..936e7fd 100644
--- a/xcb-proto/src/extensions/sync.xml
+++ b/xcb-proto/src/extensions/sync.xml
@@ -5,13 +5,13 @@ All Rights Reserved. See the file COPYI
for licensing information.
-->
<extension header="sync" xname="SYNC" name="Sync">
- <xidtype name="COUNTER"/>
+ <type name="COUNTER"/>
<error name="Counter" number="0">
<field type="CARD32" name="bad-counter"/>
<field type="CARD16" name="minor-opcode"/>
<field type="CARD8" name="major-opcode"/>
</error>
- <xidtype name="ALARM"/>
+ <type name="ALARM"/>
<error name="Alarm" number="1">
<field type="CARD32" name="bad-alarm"/>
<field type="CARD16" name="minor-opcode"/>
diff --git a/xcb-proto/src/extensions/xfixes.xml b/xcb-proto/src/extensions/xfixes.xml
index 01de671..972b78a 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -141,7 +141,7 @@ authorization from the authors.
</reply>
</request>
<!-- Version 2 -->
- <xidtype name="REGION"/>
+ <type name="REGION"/>
<error name="BadRegion" number="0"/>
<request name="CreateRegion" opcode="5">
<field type="REGION" name="region"/>
@@ -154,7 +154,7 @@ authorization from the authors.
<request name="CreateRegionFromWindow" opcode="7">
<field type="REGION" name="region"/>
<field type="WINDOW" name="window"/>
- <field type="SHAPE_KIND" name="kind"/>
+ <field type="ShapeKind" name="kind"/>
<pad bytes="3"/>
</request>
<request name="CreateRegionFromGC" opcode="8">
@@ -221,7 +221,7 @@ authorization from the authors.
</request>
<request name="SetWindowShapeRegion" opcode="21">
<field type="WINDOW" name="dest"/>
- <field type="SHAPE_KIND" name="dest-kind"/>
+ <field type="ShapeKind" name="dest-kind"/>
<pad bytes="3"/>
<field type="POINT" name="offset"/>
<field type="REGION" name="region"/>
diff --git a/xcb-proto/src/extensions/xprint.xml b/xcb-proto/src/extensions/xprint.xml
index 1249de8..1090e61 100644
--- a/xcb-proto/src/extensions/xprint.xml
+++ b/xcb-proto/src/extensions/xprint.xml
@@ -40,7 +40,7 @@ authorization from the authors.
<!-- More padding -->
</struct>
<!--<typedef oldname="CARD32" newname="PCONTEXT" />-->
- <xidtype name="PCONTEXT"/>
+ <type name="PCONTEXT"/>
<typedef oldname="char" newname="STRING8"/>
<!-- "PrintGetDocumentData" -->
<enum name="GetDoc">
diff --git a/xcb-proto/src/extensions/xv.xml b/xcb-proto/src/extensions/xv.xml
index c428459..363cc43 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 -->
- <xidtype name="PORT"/>
- <xidtype name="ENCODING"/>
+ <type name="PORT"/>
+ <type name="ENCODING"/>
<!-- Errors -->
<error name="BadPort" number="0"/>
<error name="BadEncoding" number="1"/>
@@ -77,7 +77,7 @@ authorization from the authors.
<field type="CARD16" name="num-ports"/>
<field type="CARD16" name="num-formats"/>
<field type="CARD8" name="type"/>
- <field type="CARD8" name="pad"/>
+ <pad bytes="1"/>
<list type="char" name="name">
<fieldref>name-size</fieldref>
</list>
@@ -131,22 +131,20 @@ authorization from the authors.
<field type="CARD32" name="id"/>
<field type="CARD8" name="type"/>
<field type="CARD8" name="byte-order"/>
- <field type="CARD16" name="pad1"/>
+ <pad bytes="2"/>
<list type="CARD8" name="guid">
<value>16</value>
</list>
<field type="CARD8" name="bpp"/>
<field type="CARD8" name="num-planes"/>
- <field type="CARD16" name="pad2"/>
+ <pad bytes="2"/>
<field type="CARD8" name="depth"/>
- <field type="CARD8" name="pad3"/>
- <field type="CARD16" name="pad4"/>
+ <pad bytes="3"/>
<field type="CARD32" name="red-mask"/>
<field type="CARD32" name="green-mask"/>
<field type="CARD32" name="blue-mask"/>
<field type="CARD8" name="format"/>
- <field type="CARD8" name="pad5"/>
- <field type="CARD16" name="pad6"/>
+ <pad bytes="3"/>
<field type="CARD32" name="y-sample-bits"/>
<field type="CARD32" name="u-sample-bits"/>
<field type="CARD32" name="v-sample-bits"/>
@@ -160,10 +158,8 @@ authorization from the authors.
<value>32</value>
</list>
<field type="CARD8" name="vscanline-order"/>
- <field type="CARD8" name="vpad7"/>
- <field type="CARD16" name="vpad8"/>
- <field type="CARD32" name="vpad9"/>
- <field type="CARD32" name="vpad10"/>
+<!-- FIXME: should these pads really be structured? changing to anon. for now -->
+ <pad bytes="11"/>
</struct>
<!-- Events -->
<event name="VideoNotify" number="0">
@@ -366,7 +362,7 @@ authorization from the authors.
<field type="CARD16" name="drw-h"/>
<field type="CARD16" name="width"/>
<field type="CARD16" name="height"/>
- <localfield type="CARD32" name="data_size"/>
+ <localfield type="CARD32" name="data-size"/>
<list type="CARD8" name="data">
<fieldref>data-size</fieldref>
</list>
diff --git a/xcb-proto/src/extensions/xvmc.xml b/xcb-proto/src/extensions/xvmc.xml
index e1b4c62..3aead34 100644
--- a/xcb-proto/src/extensions/xvmc.xml
+++ b/xcb-proto/src/extensions/xvmc.xml
@@ -27,18 +27,16 @@ authorization from the authors.
-->
<extension header="xvmc" xname="XVideo-MotionCompensation" name="XvMC">
<import>xv</import>
-<!-- TODO: xspec: why don't these xidtypes have errors? -->
- <xidtype name="CONTEXT"/>
- <xidtype name="SURFACE"/>
- <xidtype name="SUBPICTURE"/>
+<!-- TODO: xspec: why don't these types have errors? -->
+ <type name="CONTEXT"/>
+ <type name="SURFACE"/>
+ <type name="SUBPICTURE"/>
<struct name="SurfaceInfo">
<field type="SURFACE" name="id"/>
<field type="CARD16" name="chroma-format"/>
- <field type="CARD16" name="pad0"/>
- <field type="CARD16" name="max-width"/>
- <field type="CARD16" name="max-height"/>
- <field type="CARD16" name="subpicture-max-width"/>
- <field type="CARD16" name="subpicture-max-height"/>
+ <pad bytes="2"/>
+ <field type="SIZE" name="max-size"/>
+ <field type="SIZE" name="subpicture-max-size"/>
<field type="CARD32" name="mc-type"/>
<field type="CARD32" name="flags"/>
</struct>
diff --git a/xcb-proto/src/xcb_types.xml b/xcb-proto/src/xcb_types.xml
index ba11dcf..15e6b4a 100644
--- a/xcb-proto/src/xcb_types.xml
+++ b/xcb-proto/src/xcb_types.xml
@@ -31,13 +31,13 @@ authorization from the authors.
<field type="CARD8" name="byte1"/>
<field type="CARD8" name="byte2"/>
</struct>
- <xidtype name="WINDOW"/>
- <xidtype name="PIXMAP"/>
- <xidtype name="CURSOR"/>
- <xidtype name="FONT"/>
- <xidtype name="GCONTEXT"/>
- <xidtype name="COLORMAP"/>
- <xidtype name="ATOM"/>
+ <type name="WINDOW"/>
+ <type name="PIXMAP"/>
+ <type name="CURSOR"/>
+ <type name="FONT"/>
+ <type name="GCONTEXT"/>
+ <type name="COLORMAP"/>
+ <type name="ATOM"/>
<union name="DRAWABLE">
<field type="WINDOW" name="window"/>
<field type="PIXMAP" name="pixmap"/>
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index e09550c..ccbb065 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -304,8 +304,8 @@ authorization from the authors.
<item name="server-interpreted"/>
<item name="internet-v6"/>
</enum>
-<enum type="CARD8" name="BackingStoreUsage">
- <item name="never"/>
+<enum type="CARD8" name="StoreUsage">
+ <!-- <item name="never"/> -->
<item name="not-useful"/>
<item name="when-mapped"/>
<item name="always"/>
@@ -607,7 +607,7 @@ authorization from the authors.
<valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<struct name="WindowAttributes">
- <field type="BackingStoreUsage" name="backing-store"/>
+ <field type="StoreUsage" name="backing-store"/>
<field type="VISUALID" name="visual"/>
<field type="WindowClass" name="class"/>
<field type="Gravity" name="bit-gravity"/>
@@ -1009,7 +1009,7 @@ authorization from the authors.
</reply>
</request>
<request name="QueryTextExtents" opcode="48">
- <exprfield type="BOOL" name="odd_length">
+ <exprfield type="BOOL" name="odd-length">
<op op="&">
<fieldref>string-len</fieldref>
<value>1</value>
More information about the xcb-commit
mailing list