[Xcb-commit] Branch 'xspec' - 2 commits - xcb-proto
Alp Toker
alp at kemper.freedesktop.org
Mon Mar 6 05:42:11 PST 2006
xcb-proto/src/extensions/bigreq.xml | 4 -
xcb-proto/src/extensions/composite.xml | 5 -
xcb-proto/src/extensions/damage.xml | 7 +-
xcb-proto/src/extensions/dpms.xml | 4 -
xcb-proto/src/extensions/glx.xml | 21 +++----
xcb-proto/src/extensions/randr.xml | 5 -
xcb-proto/src/extensions/record.xml | 4 -
xcb-proto/src/extensions/render.xml | 4 -
xcb-proto/src/extensions/res.xml | 4 -
xcb-proto/src/extensions/screensaver.xml | 4 -
xcb-proto/src/extensions/shape.xml | 6 +-
xcb-proto/src/extensions/shm.xml | 4 -
xcb-proto/src/extensions/sync.xml | 26 ++++----
xcb-proto/src/extensions/xc_misc.xml | 4 -
xcb-proto/src/extensions/xevie.xml | 5 -
xcb-proto/src/extensions/xf86dri.xml | 4 -
xcb-proto/src/extensions/xfixes.xml | 21 +++----
xcb-proto/src/extensions/xprint.xml | 5 -
xcb-proto/src/extensions/xv.xml | 20 ++----
xcb-proto/src/extensions/xvmc.xml | 7 +-
xcb-proto/src/xcb_types.xml | 2
xcb-proto/src/xproto.xml | 90 ++++++++++++++-----------------
22 files changed, 120 insertions(+), 136 deletions(-)
New commits:
diff-tree c5d95ef552c1a0e5131d128afa2e619cc3394f26 (from aac6775980a4f77cf61dff024cc64caf3b5d7bfb)
Author: Alp Toker <alp at atoker.com>
Date: Mon Mar 6 13:41:48 2006 +0000
Refactor xcb element usage
Add extension implementation version attribute where available
More comment suffix-to-prefix corrections
diff --git a/xcb-proto/src/extensions/bigreq.xml b/xcb-proto/src/extensions/bigreq.xml
index 070b9ca..7c35c55 100644
--- a/xcb-proto/src/extensions/bigreq.xml
+++ b/xcb-proto/src/extensions/bigreq.xml
@@ -25,11 +25,11 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<xcb header="bigreq" extension-xname="BIG-REQUESTS" extension-name="BigRequests">
+<extension header="bigreq" xname="BIG-REQUESTS" name="BigRequests">
<request name="Enable" opcode="0">
<reply>
<pad bytes="1"/>
<field type="CARD32" name="maximum-request-length"/>
</reply>
</request>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/composite.xml b/xcb-proto/src/extensions/composite.xml
index 28992ef..a93ca23 100644
--- a/xcb-proto/src/extensions/composite.xml
+++ b/xcb-proto/src/extensions/composite.xml
@@ -24,8 +24,7 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<!-- This file describes version 0.2 of COMPOSITE. -->
-<xcb header="composite" extension-xname="Composite" extension-name="Composite">
+<extension header="composite" xname="Composite" name="Composite" version="0.2">
<import>xfixes</import>
<enum name="Redirect">
<item name="automatic"/>
@@ -67,4 +66,4 @@ authorization from the authors.
<field type="WINDOW" name="window"/>
<field type="PIXMAP" name="pixmap"/>
</request>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/damage.xml b/xcb-proto/src/extensions/damage.xml
index 9d0642e..4d54a94 100644
--- a/xcb-proto/src/extensions/damage.xml
+++ b/xcb-proto/src/extensions/damage.xml
@@ -24,8 +24,7 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<!-- This file describes version 1 of DAMAGE. -->
-<xcb header="damage" extension-xname="DAMAGE" extension-name="Damage">
+<extension header="damage" xname="DAMAGE" name="Damage" version="1">
<import>xfixes</import>
<xidtype name="DAMAGE"/>
<error name="BadDamage" number="0"/>
@@ -69,4 +68,4 @@ authorization from the authors.
<field type="RECTANGLE" name="area"/>
<field type="RECTANGLE" name="geometry"/>
</event>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/dpms.xml b/xcb-proto/src/extensions/dpms.xml
index 97d13ed..849dbd6 100644
--- a/xcb-proto/src/extensions/dpms.xml
+++ b/xcb-proto/src/extensions/dpms.xml
@@ -25,7 +25,7 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<xcb header="dpms" extension-xname="DPMS" extension-name="DPMS">
+<extension header="dpms" xname="DPMS" name="DPMS">
<request name="GetVersion" opcode="0">
<field type="VERSION" name="client-version"/>
<reply>
@@ -64,4 +64,4 @@ authorization from the authors.
<field type="BOOL" name="state"/>
</reply>
</request>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index 530e102..2d77b6c 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -42,8 +42,7 @@ side, using the expression above.
The patch that fixed this server bug in X.org CVS is here:
http://cvs.freedesktop.org/xorg/xserver/xorg/GL/glx/glxcmds.c?r1=1.6&r2=1.7
-->
-<xcb header="glx" extension-xname="GLX" extension-name="Glx">
-<!-- target support: 1.3 -->
+<extension header="glx" xname="GLX" name="Glx" version="1.3">
<xidtype name="CONTEXT"/>
<xidtype name="DRAWABLE"/>
<xidtype name="PIXMAP"/>
@@ -250,7 +249,7 @@ The patch that fixed this server bug in
<request name="CreateGLXPixmap" opcode="13">
<field type="CARD32" name="screen"/>
<field type="VISUALID" name="visual"/>
- <field type="xcb_types:PIXMAP" name="pixmap"/>
+ <field type="extension_types:PIXMAP" name="pixmap"/>
<field type="glx:PIXMAP" name="glxpixmap"/>
</request>
<request name="GetVisualConfigs" opcode="14">
@@ -333,7 +332,7 @@ The patch that fixed this server bug in
<request name="CreatePixmap" opcode="22">
<field type="CARD32" name="screen"/>
<field type="CARD32" name="fbconfig"/>
- <field type="xcb_types:PIXMAP" name="pixmap"/>
+ <field type="extension_types:PIXMAP" name="pixmap"/>
<field type="glx:PIXMAP" name="glxpixmap"/>
<field type="CARD32" name="num_attribs"/>
</request>
@@ -397,7 +396,7 @@ The patch that fixed this server bug in
<request name="CreateWindow" opcode="31">
<field type="SCREEN" name="screen"/>
<field type="FBCONFIG" name="fbconfig"/>
- <field type="xcb_types:WINDOW" name="window"/>
+ <field type="extension_types:WINDOW" name="window"/>
<field type="glx:WINDOW" name="glx_window"/>
<field type="CARD32" name="num_attribs"/>
<valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
@@ -502,7 +501,7 @@ The patch that fixed this server bug in
</request>
<!-- FIXME:
All the Get* functions can return different stuff for replies.
- Hopefully xcb will support multiple reply structures at some point
+ Hopefully extension will support multiple reply structures at some point
but for now... grrrr
Starts on page 58/180
-->
@@ -1346,4 +1345,4 @@ The patch that fixed this server bug in
http://oss.sgi.com/projects/ogl-sample/registry/OES/single_precision.txt
XXX: Need to write up vops
-->
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/randr.xml b/xcb-proto/src/extensions/randr.xml
index ac22a30..74f5c6f 100644
--- a/xcb-proto/src/extensions/randr.xml
+++ b/xcb-proto/src/extensions/randr.xml
@@ -25,8 +25,7 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<xcb header="randr" extension-xname="RANDR" extension-name="RandR">
-<!-- Implements version 1.1 of RANDR -->
+<extension header="randr" xname="RANDR" name="RandR" version="1.1">
<enum name="Rotation">
<item name="rotate0">
<value>1</value>
@@ -145,4 +144,4 @@ authorization from the authors.
<field type="CARD16" name="subpixel-order"/>
<field type="ScreenSize"/>
</event>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/record.xml b/xcb-proto/src/extensions/record.xml
index 2483f0c..f371a84 100644
--- a/xcb-proto/src/extensions/record.xml
+++ b/xcb-proto/src/extensions/record.xml
@@ -25,7 +25,7 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<xcb header="record" extension-xname="RECORD" extension-name="Record">
+<extension header="record" xname="RECORD" name="Record">
<!-- Types -->
<xidtype name="CONTEXT"/>
<struct name="Range8">
@@ -162,4 +162,4 @@ authorization from the authors.
<request name="FreeContext" opcode="7">
<field type="record:CONTEXT" name="context"/>
</request>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/render.xml b/xcb-proto/src/extensions/render.xml
index fae39d5..c88e5d6 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -4,7 +4,7 @@ Copyright (C) 2002-2004 Carl D. Worth, J
All Rights Reserved. See the file COPYING in this directory
for licensing information.
-->
-<xcb header="render" extension-xname="RENDER" extension-name="Render">
+<extension header="render" xname="RENDER" name="Render" version="0.8">
<!-- supports version 0.8 -->
<enum name="PictType">
<item name="indexed"/>
@@ -533,4 +533,4 @@ for licensing information.
<field type="CURSOR" name="cid"/>
<list type="ANIMCURSORELT" name="cursors"/>
</request>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/res.xml b/xcb-proto/src/extensions/res.xml
index 0f118fa..e1c1519 100644
--- a/xcb-proto/src/extensions/res.xml
+++ b/xcb-proto/src/extensions/res.xml
@@ -25,7 +25,7 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<xcb header="res" extension-xname="X-Resource" extension-name="Res">
+<extension header="res" xname="X-Resource" name="Res">
<struct name="Client">
<field type="CARD32" name="resource-base"/>
<field type="CARD32" name="resource-mask"/>
@@ -72,4 +72,4 @@ authorization from the authors.
<field type="CARD32" name="bytes-overflow"/>
</reply>
</request>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/screensaver.xml b/xcb-proto/src/extensions/screensaver.xml
index 2f2f6cb..ea8f910 100644
--- a/xcb-proto/src/extensions/screensaver.xml
+++ b/xcb-proto/src/extensions/screensaver.xml
@@ -30,7 +30,7 @@ authorization from the authors.
Screen Saver Extension to the X Protocol
Draft Standard Version 1.0
-->
-<xcb header="screensaver" extension-xname="SCREENSAVER" extension-name="ScreenSaver">
+<extension header="screensaver" xname="SCREENSAVER" name="ScreenSaver" version="1.0">
<!-- Types -->
<enum name="KIND">
<item name="blanked"/>
@@ -115,4 +115,4 @@ Draft Standard Version 1.0
<field type="BOOL" name="forced"/>
<pad bytes="14"/>
</event>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/shape.xml b/xcb-proto/src/extensions/shape.xml
index c5e313e..668fc40 100644
--- a/xcb-proto/src/extensions/shape.xml
+++ b/xcb-proto/src/extensions/shape.xml
@@ -25,7 +25,7 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<xcb header="shape" extension-xname="SHAPE" extension-name="Shape">
+<extension header="shape" xname="SHAPE" name="Shape">
<typedef oldname="CARD8" newname="SHAPE_OP"/>
<typedef oldname="CARD8" newname="SHAPE_KIND"/>
<!-- Shape attributes of type SHAPE_OP. -->
@@ -40,7 +40,7 @@ authorization from the authors.
<enum name="SK">
<item name="bounding"/>
<item name="clip"/>
-<!-- TODO: xspec: 'Input' borrowed from xlib headers, validate -->
+<!-- TODO: xspec: 'input' borrowed from xlib headers, validate -->
<item name="input"/>
</enum>
<event name="Notify" number="0">
@@ -129,4 +129,4 @@ authorization from the authors.
</list>
</reply>
</request>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/shm.xml b/xcb-proto/src/extensions/shm.xml
index 8411e97..ccc593d 100644
--- a/xcb-proto/src/extensions/shm.xml
+++ b/xcb-proto/src/extensions/shm.xml
@@ -25,7 +25,7 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<xcb header="shm" extension-xname="MIT-SHM" extension-name="Shm">
+<extension header="shm" xname="MIT-SHM" name="Shm">
<xidtype name="SEG"/>
<event name="Completion" number="0">
<pad bytes="1"/>
@@ -94,4 +94,4 @@ authorization from the authors.
<field type="SEG" name="shmseg"/>
<field type="CARD32" name="offset"/>
</request>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/sync.xml b/xcb-proto/src/extensions/sync.xml
index dc2860f..3113495 100644
--- a/xcb-proto/src/extensions/sync.xml
+++ b/xcb-proto/src/extensions/sync.xml
@@ -4,7 +4,7 @@ Copyright (C) 2004 Mikko Torni and Josh
All Rights Reserved. See the file COPYING in this directory
for licensing information.
-->
-<xcb header="sync" extension-xname="SYNC" extension-name="Sync">
+<extension header="sync" xname="SYNC" name="Sync">
<xidtype name="COUNTER"/>
<error name="Counter" number="0">
<field type="CARD32" name="bad-counter"/>
@@ -144,4 +144,4 @@ for licensing information.
<field type="INT64" name="alarm-value"/>
<field type="TIMESTAMP" name="timestamp"/>
</event>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/xc_misc.xml b/xcb-proto/src/extensions/xc_misc.xml
index c681792..9675779 100644
--- a/xcb-proto/src/extensions/xc_misc.xml
+++ b/xcb-proto/src/extensions/xc_misc.xml
@@ -4,7 +4,7 @@ Copyright (C) 2004 Mikko Torni and Josh
All Rights Reserved. See the file COPYING in this directory
for licensing information.
-->
-<xcb header="xc_misc" extension-xname="XC-MISC" extension-name="XCMisc">
+<extension header="xc_misc" xname="XC-MISC" name="XCMisc">
<request name="GetVersion" opcode="0">
<field type="CARD16" name="client-major-version"/>
<field type="CARD16" name="client-minor-version"/>
@@ -32,4 +32,4 @@ for licensing information.
</list>
</reply>
</request>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/xevie.xml b/xcb-proto/src/extensions/xevie.xml
index d4f09ca..5d55eb0 100644
--- a/xcb-proto/src/extensions/xevie.xml
+++ b/xcb-proto/src/extensions/xevie.xml
@@ -24,8 +24,7 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<!-- This file describes version 1 of XEVIE. -->
-<xcb header="xevie" extension-xname="XEVIE" extension-name="Xevie">
+<extension header="xevie" xname="XEVIE" name="Xevie" version="1">
<request name="QueryVersion" opcode="0">
<field type="CARD16" name="client-major-version"/>
<field type="CARD16" name="client-minor-version"/>
@@ -76,4 +75,4 @@ authorization from the authors.
<pad bytes="24"/>
</reply>
</request>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/xf86dri.xml b/xcb-proto/src/extensions/xf86dri.xml
index 79f440c..1118ddd 100644
--- a/xcb-proto/src/extensions/xf86dri.xml
+++ b/xcb-proto/src/extensions/xf86dri.xml
@@ -25,7 +25,7 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<xcb header="xf86dri" extension-xname="XFree86-DRI" extension-name="XF86Dri">
+<extension header="xf86dri" xname="XFree86-DRI" name="XF86Dri">
<!-- Using http://dri.sourceforge.net/doc/dri_extensions_low_level.txt -->
<!-- Types -->
<struct name="DrmClipRect">
@@ -149,4 +149,4 @@ authorization from the authors.
<field type="CARD32" name="authenticated"/>
</reply>
</request>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/xfixes.xml b/xcb-proto/src/extensions/xfixes.xml
index cc62122..29c0f27 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -24,8 +24,7 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<!-- This file describes version 3 of XFixes. -->
-<xcb header="xfixes" extension-xname="XFIXES" extension-name="XFixes">
+<extension header="xfixes" xname="XFIXES" name="XFixes" version="3">
<import>render</import>
<import>shape</import>
<!-- Version 1 -->
@@ -52,12 +51,12 @@ authorization from the authors.
<item name="unmap"/>
</enum>
<request name="ChangeSaveSet" opcode="1">
- <field type="BYTE" name="mode"/>
<!-- SaveSetMode -->
- <field type="BYTE" name="target"/>
+ <field type="BYTE" name="mode"/>
<!-- SaveSetTarget -->
- <field type="BYTE" name="map"/>
+ <field type="BYTE" name="target"/>
<!-- SaveSetMapping -->
+ <field type="BYTE" name="map"/>
<pad bytes="1"/>
<field type="WINDOW" name="window"/>
</request>
@@ -87,8 +86,8 @@ authorization from the authors.
</item>
</enum>
<event name="SelectionNotify" number="0">
- <field type="CARD8" name="subtype"/>
<!-- SelectionEvent -->
+ <field type="CARD8" name="subtype"/>
<field type="WINDOW" name="window"/>
<field type="WINDOW" name="owner"/>
<field type="ATOM" name="selection"/>
@@ -99,8 +98,8 @@ authorization from the authors.
<request name="SelectSelectionInput" opcode="2">
<field type="WINDOW" name="window"/>
<field type="ATOM" name="selection"/>
- <field type="CARD32" name="event-mask"/>
<!-- SelectionEventMask -->
+ <field type="CARD32" name="event-mask"/>
</request>
<enum name="CursorNotify">
<item name="display-cursor"/>
@@ -114,18 +113,18 @@ authorization from the authors.
</item>
</enum>
<event name="CursorNotify" number="1">
- <field type="CARD8" name="subtype"/>
<!-- CursorNotify -->
+ <field type="CARD8" name="subtype"/>
<field type="WINDOW" name="window"/>
<field type="CARD32" name="cursor-serial"/>
<field type="TIMESTAMP" name="time"/>
- <field type="ATOM" name="name"/>
<!-- Added in version 2 -->
+ <field type="ATOM" name="name"/>
<pad bytes="12"/>
</event>
<request name="SelectCursorInput" opcode="3">
- <field type="WINDOW" name="window"/>
<!-- CursorNotifyMask -->
+ <field type="WINDOW" name="window"/>
<field type="CARD32" name="event-mask"/>
</request>
<request name="GetCursorImage" opcode="4">
@@ -296,4 +295,4 @@ authorization from the authors.
<field type="CARD16" name="top"/>
<field type="CARD16" name="bottom"/>
</request>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/xprint.xml b/xcb-proto/src/extensions/xprint.xml
index 5abebaa..1249de8 100644
--- a/xcb-proto/src/extensions/xprint.xml
+++ b/xcb-proto/src/extensions/xprint.xml
@@ -25,8 +25,7 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<xcb header="xprint" extension-xname="XpExtension" extension-name="XP">
-<!-- Conforms to XPRINT 1.0 -->
+<extension header="xprint" xname="XpExtension" name="XP" version="1.0">
<!-- Types -->
<struct name="PRINTER">
<field type="CARD32" name="name-len"/>
@@ -312,4 +311,4 @@ authorization from the authors.
<!-- Errors -->
<error name="BadContext" number="0"/>
<error name="BadSequence" number="1"/>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/xv.xml b/xcb-proto/src/extensions/xv.xml
index bef56c1..c428459 100644
--- a/xcb-proto/src/extensions/xv.xml
+++ b/xcb-proto/src/extensions/xv.xml
@@ -25,9 +25,8 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<xcb header="xv" extension-xname="XVideo" extension-name="Xv">
+<extension header="xv" xname="XVideo" name="Xv" version="2.2">
<import>shm</import>
-<!-- Implements version 2.2 of XV -->
<!-- XIDs -->
<xidtype name="PORT"/>
<xidtype name="ENCODING"/>
@@ -391,4 +390,4 @@ authorization from the authors.
<field type="CARD16" name="height"/>
<field type="CARD8" name="send-event"/>
</request>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/extensions/xvmc.xml b/xcb-proto/src/extensions/xvmc.xml
index 550807f..e1b4c62 100644
--- a/xcb-proto/src/extensions/xvmc.xml
+++ b/xcb-proto/src/extensions/xvmc.xml
@@ -25,7 +25,7 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<xcb header="xvmc" extension-xname="XVideo-MotionCompensation" extension-name="XvMC">
+<extension header="xvmc" xname="XVideo-MotionCompensation" name="XvMC">
<import>xv</import>
<!-- TODO: xspec: why don't these xidtypes have errors? -->
<xidtype name="CONTEXT"/>
@@ -125,4 +125,4 @@ authorization from the authors.
</list>
</reply>
</request>
-</xcb>
+</extension>
diff --git a/xcb-proto/src/xcb_types.xml b/xcb-proto/src/xcb_types.xml
index a772624..ba11dcf 100644
--- a/xcb-proto/src/xcb_types.xml
+++ b/xcb-proto/src/xcb_types.xml
@@ -133,7 +133,7 @@ authorization from the authors.
<!--
<struct name="AuthInfo">
<field type="string" name="name" />
- <field type="" name="data" />
+ <field type="blob" name="data" />
</struct>
-->
<struct name="ConnSetupReq">
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index 4fcdd74..a57195c 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -25,6 +25,8 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
+<!-- TODO: rename, add version attribute -->
+<!-- eg. protocol name="X" version="11" -->
<xcb header="xproto">
<!-- Core error types -->
<error name="Request" number="1">
diff-tree aac6775980a4f77cf61dff024cc64caf3b5d7bfb (from 1bf0d79257d2cc4eb8e0b8a74ce8c26b55aae90d)
Author: Alp Toker <alp at atoker.com>
Date: Mon Mar 6 13:17:24 2006 +0000
Groundwork for xidtype/error merge
diff --git a/xcb-proto/src/extensions/damage.xml b/xcb-proto/src/extensions/damage.xml
index 12b4655..9d0642e 100644
--- a/xcb-proto/src/extensions/damage.xml
+++ b/xcb-proto/src/extensions/damage.xml
@@ -28,13 +28,13 @@ authorization from the authors.
<xcb header="damage" extension-xname="DAMAGE" extension-name="Damage">
<import>xfixes</import>
<xidtype name="DAMAGE"/>
+ <error name="BadDamage" number="0"/>
<enum name="ReportLevel">
<item name="raw-rectangles"/>
<item name="delta-rectangles"/>
<item name="bounding-box"/>
<item name="non-empty"/>
</enum>
- <error name="BadDamage" number="0"/>
<request name="QueryVersion" opcode="0">
<field type="CARD32" name="client-major-version"/>
<field type="CARD32" name="client-minor-version"/>
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index f17aab4..530e102 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -44,18 +44,18 @@ The patch that fixed this server bug in
-->
<xcb header="glx" extension-xname="GLX" extension-name="Glx">
<!-- target support: 1.3 -->
- <xidtype name="PIXMAP"/>
<xidtype name="CONTEXT"/>
+ <xidtype name="DRAWABLE"/>
+ <xidtype name="PIXMAP"/>
+ <xidtype name="FBCONFIG"/>
<xidtype name="PBUFFER"/>
<xidtype name="WINDOW"/>
- <xidtype name="FBCONFIG"/>
- <xidtype name="DRAWABLE"/>
<typedef oldname="float" newname="FLOAT32"/>
<typedef oldname="double" newname="FLOAT64"/>
<typedef oldname="CARD32" newname="BOOL32"/>
<!-- Errors -->
- <error name="Generic" number="-1">
<!-- FIXME: fake number -->
+ <error name="Generic" number="-1">
<field type="CARD32" name="bad_value"/>
<field type="CARD16" name="minor_opcode"/>
<field type="CARD8" name="major_opcode"/>
diff --git a/xcb-proto/src/extensions/sync.xml b/xcb-proto/src/extensions/sync.xml
index 1c8f2a3..dc2860f 100644
--- a/xcb-proto/src/extensions/sync.xml
+++ b/xcb-proto/src/extensions/sync.xml
@@ -5,13 +5,23 @@ All Rights Reserved. See the file COPYI
for licensing information.
-->
<xcb header="sync" extension-xname="SYNC" extension-name="Sync">
+ <xidtype 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"/>
+ <error name="Alarm" number="1">
+ <field type="CARD32" name="bad-alarm"/>
+ <field type="CARD16" name="minor-opcode"/>
+ <field type="CARD8" name="major-opcode"/>
+ </error>
<enum name="ALARMSTATE">
<item name="active"/>
<item name="inactive"/>
<item name="destroyed"/>
</enum>
- <xidtype name="COUNTER"/>
<enum name="TESTTYPE">
<item name="positive-transition"/>
<item name="negative-transition"/>
@@ -44,16 +54,6 @@ for licensing information.
<field type="TRIGGER" name="trigger"/>
<field type="INT64" name="event-threshold"/>
</struct>
- <error name="Counter" number="0">
- <field type="CARD32" name="bad-counter"/>
- <field type="CARD16" name="minor-opcode"/>
- <field type="CARD8" name="major-opcode"/>
- </error>
- <error name="Alarm" number="1">
- <field type="CARD32" name="bad-alarm"/>
- <field type="CARD16" name="minor-opcode"/>
- <field type="CARD8" name="major-opcode"/>
- </error>
<request name="Initialize" opcode="0">
<reply>
<pad bytes="1"/>
diff --git a/xcb-proto/src/extensions/xv.xml b/xcb-proto/src/extensions/xv.xml
index b3e3a29..bef56c1 100644
--- a/xcb-proto/src/extensions/xv.xml
+++ b/xcb-proto/src/extensions/xv.xml
@@ -31,6 +31,10 @@ authorization from the authors.
<!-- XIDs -->
<xidtype name="PORT"/>
<xidtype name="ENCODING"/>
+<!-- Errors -->
+ <error name="BadPort" number="0"/>
+ <error name="BadEncoding" number="1"/>
+ <error name="BadControl" number="2"/>
<enum name="Type">
<item name="input-mask">
<value>0x00000001</value>
@@ -110,10 +114,10 @@ authorization from the authors.
<list type="CARD32" name="offsets">
<fieldref>num-planes</fieldref>
</list>
+<!-- Some XPointer "obdata" for SHM use-->
<list type="CARD8" name="data">
<fieldref>data-size</fieldref>
</list>
-<!-- Some XPointer "obdata" for SHM use-->
</struct>
<struct name="AttributeInfo">
<field type="CARD32" name="flags"/>
@@ -162,10 +166,6 @@ authorization from the authors.
<field type="CARD32" name="vpad9"/>
<field type="CARD32" name="vpad10"/>
</struct>
-<!-- Errors -->
- <error name="BadPort" number="0"/>
- <error name="BadEncoding" number="1"/>
- <error name="BadControl" number="2"/>
<!-- Events -->
<event name="VideoNotify" number="0">
<field type="BYTE" name="reason"/>
@@ -203,10 +203,7 @@ authorization from the authors.
<reply>
<pad bytes="1"/>
<field type="CARD16" name="num-encodings"/>
-<!--
- In Xvproto.h this padding is 24 bytes
- in actuality it is 22 bytes
- -->
+<!-- In Xvproto.h this padding is 24 bytes. In actuality it is 22 bytes. -->
<pad bytes="22"/>
<list type="EncodingInfo" name="info">
<fieldref>num-encodings</fieldref>
diff --git a/xcb-proto/src/extensions/xvmc.xml b/xcb-proto/src/extensions/xvmc.xml
index 6d3d16d..550807f 100644
--- a/xcb-proto/src/extensions/xvmc.xml
+++ b/xcb-proto/src/extensions/xvmc.xml
@@ -26,7 +26,8 @@ sale, use or other dealings in this Soft
authorization from the authors.
-->
<xcb header="xvmc" extension-xname="XVideo-MotionCompensation" extension-name="XvMC">
- <import>xv</import>
+ <import>xv</import>
+<!-- TODO: xspec: why don't these xidtypes have errors? -->
<xidtype name="CONTEXT"/>
<xidtype name="SURFACE"/>
<xidtype name="SUBPICTURE"/>
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index a69975e..4fcdd74 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -26,17 +26,41 @@ sale, use or other dealings in this Soft
authorization from the authors.
-->
<xcb header="xproto">
-<!-- Core event and error types -->
+<!-- Core error types -->
+ <error name="Request" number="1">
+ <field type="CARD32" name="bad-value"/>
+ <field type="CARD16" name="minor-opcode"/>
+ <field type="CARD8" name="major-opcode"/>
+ </error>
+ <error name="Value" number="2">
+ <field type="CARD32" name="bad-value"/>
+ <field type="CARD16" name="minor-opcode"/>
+ <field type="CARD8" name="major-opcode"/>
+ </error>
+ <errorcopy name="Window" number="3" ref="Value"/>
+ <errorcopy name="Pixmap" number="4" ref="Value"/>
+ <errorcopy name="Atom" number="5" ref="Value"/>
+ <errorcopy name="Cursor" number="6" ref="Value"/>
+ <errorcopy name="Font" number="7" ref="Value"/>
+ <errorcopy name="Match" number="8" ref="Request"/>
+ <errorcopy name="Drawable" number="9" ref="Value"/>
+ <errorcopy name="Access" number="10" ref="Request"/>
+ <errorcopy name="Alloc" number="11" ref="Request"/>
+ <errorcopy name="Colormap" number="12" ref="Value"/>
+ <errorcopy name="GContext" number="13" ref="Value"/>
+ <errorcopy name="IDChoice" number="14" ref="Value"/>
+ <errorcopy name="Name" number="15" ref="Request"/>
+ <errorcopy name="Length" number="16" ref="Request"/>
+ <errorcopy name="Implementation" number="17" ref="Request"/>
+<!-- Core event types -->
<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="INT16" name="root-x"/>
- <field type="INT16" name="root-y"/>
- <field type="INT16" name="event-x"/>
- <field type="INT16" name="event-y"/>
+ <field type="POINT" name="root-point"/>
+ <field type="POINT" name="event-point"/>
<field type="CARD16" name="state"/>
<field type="BOOL" name="same-screen"/>
</event>
@@ -47,10 +71,8 @@ authorization from the authors.
<field type="WINDOW" name="root"/>
<field type="WINDOW" name="event"/>
<field type="WINDOW" name="child"/>
- <field type="INT16" name="root-x"/>
- <field type="INT16" name="root-y"/>
- <field type="INT16" name="event-x"/>
- <field type="INT16" name="event-y"/>
+ <field type="POINT" name="root-point"/>
+ <field type="POINT" name="event-point"/>
<field type="CARD16" name="state"/>
<field type="BOOL" name="same-screen"/>
</event>
@@ -61,10 +83,8 @@ authorization from the authors.
<field type="WINDOW" name="root"/>
<field type="WINDOW" name="event"/>
<field type="WINDOW" name="child"/>
- <field type="INT16" name="root-x"/>
- <field type="INT16" name="root-y"/>
- <field type="INT16" name="event-x"/>
- <field type="INT16" name="event-y"/>
+ <field type="POINT" name="root-point"/>
+ <field type="POINT" name="event-point"/>
<field type="CARD16" name="state"/>
<field type="BOOL" name="same-screen"/>
</event>
@@ -74,10 +94,8 @@ authorization from the authors.
<field type="WINDOW" name="root"/>
<field type="WINDOW" name="event"/>
<field type="WINDOW" name="child"/>
- <field type="INT16" name="root-x"/>
- <field type="INT16" name="root-y"/>
- <field type="INT16" name="event-x"/>
- <field type="INT16" name="event-y"/>
+ <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"/>
@@ -234,8 +252,7 @@ authorization from the authors.
<field type="BYTE" name="state"/>
</event>
<union name="ClientMessageData">
-<!-- The format member of the ClientMessage event determines which array
- to use. -->
+<!-- The format member of the ClientMessage event determines which array to use. -->
<!-- 8 -->
<list type="CARD8" name="data8">
<value>20</value>
@@ -262,31 +279,6 @@ authorization from the authors.
<field type="KEYCODE" name="first-keycode"/>
<field type="CARD8" name="count"/>
</event>
- <error name="Request" number="1">
- <field type="CARD32" name="bad-value"/>
- <field type="CARD16" name="minor-opcode"/>
- <field type="CARD8" name="major-opcode"/>
- </error>
- <error name="Value" number="2">
- <field type="CARD32" name="bad-value"/>
- <field type="CARD16" name="minor-opcode"/>
- <field type="CARD8" name="major-opcode"/>
- </error>
- <errorcopy name="Window" number="3" ref="Value"/>
- <errorcopy name="Pixmap" number="4" ref="Value"/>
- <errorcopy name="Atom" number="5" ref="Value"/>
- <errorcopy name="Cursor" number="6" ref="Value"/>
- <errorcopy name="Font" number="7" ref="Value"/>
- <errorcopy name="Match" number="8" ref="Request"/>
- <errorcopy name="Drawable" number="9" ref="Value"/>
- <errorcopy name="Access" number="10" ref="Request"/>
- <errorcopy name="Alloc" number="11" ref="Request"/>
- <errorcopy name="Colormap" number="12" ref="Value"/>
- <errorcopy name="GContext" number="13" ref="Value"/>
- <errorcopy name="IDChoice" number="14" ref="Value"/>
- <errorcopy name="Name" number="15" ref="Request"/>
- <errorcopy name="Length" number="16" ref="Request"/>
- <errorcopy name="Implementation" number="17" ref="Request"/>
<!-- The requests, in major number order. -->
<!-- It is the caller's responsibility to free returned XCB*Rep objects. -->
<!-- FIXME: The ListFontsWithInfo request is not supported by XCB. -->
@@ -595,6 +587,7 @@ authorization from the authors.
<field type="BOOL" name="propagate"/>
<field type="WINDOW" name="destination"/>
<field type="CARD32" name="event-mask"/>
+<!-- TODO: merge with xevie Event struct -->
<list type="char" name="event">
<value>32</value>
</list>
@@ -680,10 +673,8 @@ authorization from the authors.
<field type="BOOL" name="same-screen"/>
<field type="WINDOW" name="root"/>
<field type="WINDOW" name="child"/>
- <field type="INT16" name="root-x"/>
- <field type="INT16" name="root-y"/>
- <field type="INT16" name="win-x"/>
- <field type="INT16" name="win-y"/>
+ <field type="POINT" name="root-point"/>
+ <field type="POINT" name="win-point"/>
<field type="CARD16" name="mask"/>
</reply>
</request>
@@ -1209,6 +1200,7 @@ authorization from the authors.
<fieldref>name-len</fieldref>
</list>
</request>
+<!-- TODO: this looks funny. RGBA maybe? -->
<struct name="RGB">
<field type="COLOR"/>
<pad bytes="2"/>
More information about the xcb-commit
mailing list