[Xcb-commit] Branch 'xspec' - 2 commits - xcb-proto
Alp Toker
alp at kemper.freedesktop.org
Mon Mar 27 02:39:53 PST 2006
xcb-proto/src/extensions/damage.xml | 2 -
xcb-proto/src/extensions/glx.xml | 12 ++++----
xcb-proto/src/extensions/record.xml | 2 -
xcb-proto/src/extensions/render.xml | 49 +++++++++++++++++++-----------------
xcb-proto/src/extensions/shm.xml | 2 -
xcb-proto/src/extensions/sync.xml | 4 +-
xcb-proto/src/extensions/xfixes.xml | 2 -
xcb-proto/src/extensions/xprint.xml | 2 -
xcb-proto/src/extensions/xv.xml | 4 +-
xcb-proto/src/extensions/xvmc.xml | 6 ++--
xcb-proto/src/xcb_types.xml | 14 +++++-----
11 files changed, 51 insertions(+), 48 deletions(-)
New commits:
diff-tree a37a6dd90100152b0c518745e177cd1691d257c5 (from b9e7b24b89f05de62624bad59a6173cec027ce34)
Author: Alp Toker <alp at atoker.com>
Date: Mon Mar 27 11:33:55 2006 +0100
Capitalization, comment cleanups
diff --git a/xcb-proto/src/extensions/render.xml b/xcb-proto/src/extensions/render.xml
index fc0be6c..50cb899 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -7,7 +7,7 @@ for licensing information.
-->
<extension header="render" xname="RENDER" name="Render" version="0.10">
<!-- supports version 0.8 -->
- <enum name="PictType">
+ <enum type="CARD8" name="PictType">
<item name="indexed"/>
<item name="direct"/>
</enum>
@@ -163,7 +163,7 @@ for licensing information.
<error name="PictOp" number="2"/>
<error name="GlyphSet" number="3"/>
<error name="Glyph" number="4"/>
- <struct name="DIRECTFORMAT">
+ <struct name="DirectFormat">
<field type="CARD16" name="red-shift"/>
<field type="CARD16" name="red-mask"/>
<field type="CARD16" name="green-shift"/>
@@ -175,10 +175,10 @@ for licensing information.
</struct>
<struct name="PictFormInfo">
<field type="PictFormat" name="id"/>
- <field type="CARD8" name="type"/>
+ <field type="PictType" name="type"/>
<field type="CARD8" name="depth"/>
<pad bytes="2"/>
- <field type="DIRECTFORMAT" name="direct"/>
+ <field type="DirectFormat" name="direct"/>
<field type="Colormap" name="colormap"/>
</struct>
<struct name="PictVisual">
@@ -207,7 +207,7 @@ for licensing information.
<field type="CARD16" name="blue"/>
<field type="CARD16" name="alpha"/>
</struct>
- <struct name="INDEXVALUE">
+ <struct name="IndexValue">
<field type="CARD32" name="pixel"/>
<field type="Color"/>
</struct>
@@ -219,6 +219,12 @@ for licensing information.
<field type="PointFixed" name="p1"/>
<field type="PointFixed" name="p2"/>
</struct>
+ <struct name="Quad">
+ <field type="PointFixed" name="p1"/>
+ <field type="PointFixed" name="p2"/>
+ <field type="PointFixed" name="p3"/>
+ <field type="PointFixed" name="p4"/>
+ </struct>
<struct name="Triangle">
<field type="PointFixed" name="p1"/>
<field type="PointFixed" name="p2"/>
@@ -236,12 +242,10 @@ for licensing information.
<field type="Point" name="offset"/>
</struct>
<request name="QueryVersion" number="0">
- <field type="CARD32" name="client-major-version"/>
- <field type="CARD32" name="client-minor-version"/>
+ <field type="Version32" name="client-version"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="major-version"/>
- <field type="CARD32" name="minor-version"/>
+ <field type="Version32" name="version"/>
<pad bytes="16"/>
</reply>
</request>
@@ -273,7 +277,7 @@ for licensing information.
<pad bytes="1"/>
<field type="CARD32" name="num-values"/>
<pad bytes="20"/>
- <list type="INDEXVALUE" name="values">
+ <list type="IndexValue" name="values">
<fieldref>num-values</fieldref>
</list>
</reply>
@@ -475,7 +479,7 @@ for licensing information.
<field type="Point"/>
</request>
<!-- new in version 0.6 -->
- <struct name="TRANSFORM">
+ <struct name="Transform">
<field type="Fixed" name="matrix11"/>
<field type="Fixed" name="matrix12"/>
<field type="Fixed" name="matrix13"/>
@@ -488,7 +492,7 @@ for licensing information.
</struct>
<request name="SetPictureTransform" number="28">
<field type="Picture" name="picture"/>
- <field type="TRANSFORM" name="transform"/>
+ <field type="Transform" name="transform"/>
</request>
<request name="QueryFilters" number="29">
<field type="Drawable" name="drawable"/>
@@ -514,13 +518,13 @@ for licensing information.
<list type="Fixed" name="values"/>
</request>
<!-- new in version 0.8 -->
- <struct name="ANIMCURSORELT">
+ <struct name="AnimCursorElt">
<field type="Cursor" name="cursor"/>
<field type="CARD32" name="delay"/>
</struct>
<request name="CreateAnimCursor" number="31">
<field type="Cursor" name="cid"/>
- <list type="ANIMCURSORELT" name="cursors"/>
+ <list type="AnimCursorElt" name="cursors"/>
</request>
<!-- new in version 0.9 -->
<!-- FIXME: validate from 0.9 onwards, esp. field order and padding -->
@@ -529,27 +533,27 @@ for licensing information.
<field type="Point" name="offset"/>
<list type="Trapezoid" name="trapezoids"/>
</request>
- <!-- new in version 0.10 -->
<enum type="CARD16" name="Repeat">
<item name="none"/>
<item name="normal"/>
+ <!-- new in version 0.10 -->
<item name="pad"/>
<item name="reflect"/>
</enum>
+ <!-- new in version 0.10 -->
<request name="CreateSolidFill" number="33">
<field type="Picture" name="pid"/>
<field type="Color" name="color"/>
</request>
<request name="CreateLinearGradient" number="34">
<field type="Picture" name="pid"/>
- <field type="PointFixed" name="p1"/>
- <field type="PointFixed" name="p2"/>
+ <field type="LineFixed"/>
<field type="CARD16" name="spread"/>
- <field type="CARD16" name="n-stops"/>
<!-- FIXME: spec says: -->
+ <field type="CARD16" name="n-stops"/>
+ <!-- ..but renderproto.h says CARD32 n-stops for all these -->
<list type="Fixed" name="stops"/>
<list type="Color" name="stop-colors"/>
- <!-- ..but renderproto.h says CARD32 n-stops for all these -->
</request>
<request name="CreateRadialGradient" number="35">
<field type="Picture" name="pid"/>
@@ -571,5 +575,4 @@ for licensing information.
<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-tree b9e7b24b89f05de62624bad59a6173cec027ce34 (from 807c42427efd54ea0d4e7353ba9706f9ffdceb72)
Author: Alp Toker <alp at atoker.com>
Date: Mon Mar 27 08:27:21 2006 +0100
Semantics: Element 'type' (xidtype) renamed to 'resource'
diff --git a/xcb-proto/src/extensions/damage.xml b/xcb-proto/src/extensions/damage.xml
index 8ee62af..37150ef 100644
--- a/xcb-proto/src/extensions/damage.xml
+++ b/xcb-proto/src/extensions/damage.xml
@@ -27,7 +27,7 @@ authorization from the authors.
-->
<extension header="damage" xname="DAMAGE" name="Damage" version="1">
<import>xfixes</import>
- <type name="Damage"/>
+ <resource name="Damage"/>
<error name="BadDamage" number="0"/>
<enum type="CARD8" name="ReportLevel">
<item name="raw-rectangles"/>
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index 7e9919c..c55c0dd 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -43,13 +43,13 @@ 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">
- <type name="Context"/>
- <type name="Drawable"/>
- <type name="Pixmap"/>
+ <resource name="Context"/>
+ <resource name="Drawable"/>
+ <resource name="Pixmap"/>
<typedef oldname="CARD32" newname="ContextTag"/>
- <type name="FBConfig"/>
- <type name="PBuffer"/>
- <type name="Window"/>
+ <resource name="FBConfig"/>
+ <resource name="PBuffer"/>
+ <resource 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 8ca3193..a275e41 100644
--- a/xcb-proto/src/extensions/record.xml
+++ b/xcb-proto/src/extensions/record.xml
@@ -28,7 +28,7 @@ authorization from the authors.
-->
<extension header="record" xname="RECORD" name="Record">
<!-- Types -->
- <type name="CONTEXT"/>
+ <resource 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 91f9fd2..fc0be6c 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -154,9 +154,9 @@ for licensing information.
<item name="none"/>
</enum>
<typedef oldname="CARD32" newname="Glyph"/>
- <type name="GlyphSet"/>
- <type name="Picture"/>
- <type name="PictFormat"/>
+ <resource name="GlyphSet"/>
+ <resource name="Picture"/>
+ <resource name="PictFormat"/>
<typedef oldname="INT32" newname="Fixed"/>
<error name="PictFormat" number="0"/>
<error name="Picture" number="1"/>
diff --git a/xcb-proto/src/extensions/shm.xml b/xcb-proto/src/extensions/shm.xml
index c9d5db0..2854b8f 100644
--- a/xcb-proto/src/extensions/shm.xml
+++ b/xcb-proto/src/extensions/shm.xml
@@ -27,7 +27,7 @@ sale, use or other dealings in this Soft
authorization from the authors.
-->
<extension header="shm" xname="MIT-SHM" name="Shm">
- <type name="SEG"/>
+ <resource 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 9c5fe9e..58dc5bd 100644
--- a/xcb-proto/src/extensions/sync.xml
+++ b/xcb-proto/src/extensions/sync.xml
@@ -6,13 +6,13 @@ All Rights Reserved. See the file COPYI
for licensing information.
-->
<extension header="sync" xname="SYNC" name="Sync">
- <type name="Counter"/>
+ <resource name="Counter"/>
<error name="Counter" number="0">
<field type="CARD32" name="bad-counter"/>
<field type="CARD16" name="minor-opcode"/>
<field type="CARD8" name="major-opcode"/>
</error>
- <type name="Alarm"/>
+ <resource 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 4c21706..2632cc1 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -142,7 +142,7 @@ authorization from the authors.
</reply>
</request>
<!-- Version 2 -->
- <type name="Region"/>
+ <resource name="Region"/>
<error name="BadRegion" number="0"/>
<request name="CreateRegion" number="5">
<field type="Region" name="region"/>
diff --git a/xcb-proto/src/extensions/xprint.xml b/xcb-proto/src/extensions/xprint.xml
index e71f95a..f9844d5 100644
--- a/xcb-proto/src/extensions/xprint.xml
+++ b/xcb-proto/src/extensions/xprint.xml
@@ -41,7 +41,7 @@ authorization from the authors.
<!-- More padding -->
</struct>
<!--<typedef oldname="CARD32" newname="PCONTEXT" />-->
- <type name="PCONTEXT"/>
+ <resource 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 2a11964..a1ae7fe 100644
--- a/xcb-proto/src/extensions/xv.xml
+++ b/xcb-proto/src/extensions/xv.xml
@@ -29,8 +29,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"/>
+ <resource name="Port"/>
+ <resource name="Encoding"/>
<!-- Errors -->
<error name="BadPort" number="0"/>
<error name="BadEncoding" number="1"/>
diff --git a/xcb-proto/src/extensions/xvmc.xml b/xcb-proto/src/extensions/xvmc.xml
index 2b3f326..a2e7000 100644
--- a/xcb-proto/src/extensions/xvmc.xml
+++ b/xcb-proto/src/extensions/xvmc.xml
@@ -34,9 +34,9 @@ authorization from the authors.
<item name="444"/>
</enum>
<!-- FIXME: Read up on XvMC_API.txt and headers to complete this extension -->
- <type name="Context"/>
- <type name="Surface"/>
- <type name="Subpicture"/>
+ <resource name="Context"/>
+ <resource name="Surface"/>
+ <resource name="Subpicture"/>
<error name="BadContext" number="0"/>
<error name="BadSurface" number="1"/>
<error name="BadSubpicture" number="2"/>
diff --git a/xcb-proto/src/xcb_types.xml b/xcb-proto/src/xcb_types.xml
index 1a1adbc..914e355 100644
--- a/xcb-proto/src/xcb_types.xml
+++ b/xcb-proto/src/xcb_types.xml
@@ -30,11 +30,11 @@ authorization from the authors.
<!-- Core protocol types -->
<!-- Request -->
<!-- Value -->
- <type name="Window"/>
- <type name="Pixmap"/>
- <type name="Atom"/>
- <type name="Cursor"/>
- <type name="Font"/>
+ <resource name="Window"/>
+ <resource name="Pixmap"/>
+ <resource name="Atom"/>
+ <resource name="Cursor"/>
+ <resource name="Font"/>
<!-- Match -->
<union name="Drawable">
<field type="Window" name="window"/>
@@ -42,8 +42,8 @@ authorization from the authors.
</union>
<!-- Access -->
<!-- Alloc -->
- <type name="Colormap"/>
- <type name="GContext"/>
+ <resource name="Colormap"/>
+ <resource name="GContext"/>
<!-- IDChoice -->
<!-- Name -->
<!-- Length -->
More information about the xcb-commit
mailing list