[Xcb-commit] Branch 'xspec' - xcb-proto
Alp Toker
alp at kemper.freedesktop.org
Thu Mar 9 10:30:05 PST 2006
xcb-proto/src/extensions/composite.xml | 11 +++++------
xcb-proto/src/extensions/render.xml | 21 +++++++--------------
xcb-proto/src/extensions/xc_misc.xml | 4 ++--
xcb-proto/src/extensions/xfixes.xml | 16 ++++++++--------
xcb-proto/src/xcb_types.xml | 27 ++++++++++++++++++++-------
5 files changed, 42 insertions(+), 37 deletions(-)
New commits:
diff-tree b8e918f567081c689493c5ad6c174f3477688ff6 (from c695741da43e289d065a7af784c1399ef4b6d4e4)
Author: Alp Toker <alp at atoker.com>
Date: Thu Mar 9 17:49:40 2006 +0000
Misc fixes
diff --git a/xcb-proto/src/extensions/composite.xml b/xcb-proto/src/extensions/composite.xml
index 6250410..d09e2b8 100644
--- a/xcb-proto/src/extensions/composite.xml
+++ b/xcb-proto/src/extensions/composite.xml
@@ -26,8 +26,7 @@ authorization from the authors.
-->
<extension header="composite" xname="Composite" name="Composite" version="0.3">
<import>xfixes</import>
-<!-- TODO: fix naming? UPDATETYPE { Automatic, Manual } -->
- <enum name="Redirect">
+ <enum name="UpdateType">
<item name="automatic"/>
<item name="manual"/>
</enum>
@@ -41,22 +40,22 @@ authorization from the authors.
</request>
<request name="RedirectWindow" opcode="1">
<field type="WINDOW" name="window"/>
- <field type="CARD8" name="update"/>
+ <field type="UpdateType" name="update"/>
<pad bytes="3"/>
</request>
<request name="RedirectSubwindows" opcode="2">
<field type="WINDOW" name="window"/>
- <field type="CARD8" name="update"/>
+ <field type="UpdateType" name="update"/>
<pad bytes="3"/>
</request>
<request name="UnredirectWindow" opcode="3">
<field type="WINDOW" name="window"/>
- <field type="CARD8" name="update"/>
+ <field type="UpdateType" name="update"/>
<pad bytes="3"/>
</request>
<request name="UnredirectSubwindows" opcode="4">
<field type="WINDOW" name="window"/>
- <field type="CARD8" name="update"/>
+ <field type="UpdateType" name="update"/>
<pad bytes="3"/>
</request>
<request name="CreateRegionFromBorderClip" opcode="5">
diff --git a/xcb-proto/src/extensions/render.xml b/xcb-proto/src/extensions/render.xml
index 95d0ddd..ea0dd91 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -231,12 +231,9 @@ for licensing information.
<field type="LINEFIX" name="right"/>
</struct>
<struct name="GLYPHINFO">
- <field type="CARD16" name="width"/>
- <field type="CARD16" name="height"/>
- <field type="INT16" name="x"/>
- <field type="INT16" name="y"/>
- <field type="INT16" name="x-off"/>
- <field type="INT16" name="y-off"/>
+ <field type="SIZE"/>
+ <field type="POINT"/>
+ <field type="POINT" name="offset"/>
</struct>
<request name="QueryVersion" opcode="0">
<field type="CARD32" name="client-major-version"/>
@@ -390,16 +387,14 @@ for licensing information.
<struct name="GLYPHSETELT">
<field type="CARD8" name="len"/>
<pad bytes="3"/>
- <field type="INT16" name="delta-x"/>
- <field type="INT16" name="delta-y"/>
+ <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="INT16" name="delta-x"/>
- <field type="INT16" name="delta-y"/>
+ <field type="POINT" name="delta"/>
<list type="CARD8" name="glyphs">
<fieldref>len</fieldref>
</list>
@@ -423,8 +418,7 @@ for licensing information.
<struct name="GLYPHELT16">
<field type="CARD8" name="len"/>
<pad bytes="3"/>
- <field type="INT16" name="delta-x"/>
- <field type="INT16" name="delta-y"/>
+ <field type="POINT" name="delta"/>
<list type="CARD16" name="glyphs">
<fieldref>len</fieldref>
</list>
@@ -447,8 +441,7 @@ for licensing information.
<struct name="GLYPHELT32">
<field type="CARD8" name="len"/>
<pad bytes="3"/>
- <field type="INT16" name="delta-x"/>
- <field type="INT16" name="delta-y"/>
+ <field type="POINT" name="delta"/>
<list type="CARD32" name="glyphs">
<fieldref>len</fieldref>
</list>
diff --git a/xcb-proto/src/extensions/xc_misc.xml b/xcb-proto/src/extensions/xc_misc.xml
index 9675779..5c4c9f6 100644
--- a/xcb-proto/src/extensions/xc_misc.xml
+++ b/xcb-proto/src/extensions/xc_misc.xml
@@ -17,7 +17,7 @@ for licensing information.
<request name="GetXIDRange" opcode="1">
<reply>
<pad bytes="1"/>
- <field type="XID" name="start-id"/>
+ <field type="CARD32" name="start-id"/>
<field type="CARD32" name="count"/>
</reply>
</request>
@@ -27,7 +27,7 @@ for licensing information.
<pad bytes="1"/>
<field type="CARD32" name="ids-len"/>
<pad bytes="20"/>
- <list type="XID" name="ids">
+ <list type="CARD32" name="ids">
<fieldref>ids-len</fieldref>
</list>
</reply>
diff --git a/xcb-proto/src/extensions/xfixes.xml b/xcb-proto/src/extensions/xfixes.xml
index 001412e..2570593 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -233,10 +233,10 @@ authorization from the authors.
</request>
<request name="SetCursorName" opcode="23">
<field type="CURSOR" name="cursor"/>
- <field type="CARD16" name="nbytes"/>
+ <field type="CARD16" name="n-bytes"/>
<pad bytes="2"/>
<list type="CARD8" name="name">
- <fieldref>nbytes</fieldref>
+ <fieldref>n-bytes</fieldref>
</list>
</request>
<request name="GetCursorName" opcode="24">
@@ -244,10 +244,10 @@ authorization from the authors.
<reply>
<pad bytes="1"/>
<field type="ATOM" name="atom"/>
- <field type="CARD16" name="nbytes"/>
+ <field type="CARD16" name="n-bytes"/>
<pad bytes="18"/>
<list type="CARD8" name="name">
- <fieldref>nbytes</fieldref>
+ <fieldref>n-bytes</fieldref>
</list>
</reply>
</request>
@@ -258,10 +258,10 @@ authorization from the authors.
<field type="POINT" name="hot-point"/>
<field type="CARD32" name="cursor-serial"/>
<field type="ATOM" name="cursor-atom"/>
- <field type="CARD16" name="nbytes"/>
+ <field type="CARD16" name="n-bytes"/>
<pad bytes="2"/>
<list type="CARD8" name="name">
- <fieldref>nbytes</fieldref>
+ <fieldref>n-bytes</fieldref>
</list>
<list type="CARD32" name="cursor-image">
<op op="*">
@@ -277,10 +277,10 @@ authorization from the authors.
</request>
<request name="ChangeCursorByName" opcode="27">
<field type="CURSOR" name="src"/>
- <field type="CARD16" name="nbytes"/>
+ <field type="CARD16" name="n-bytes"/>
<pad bytes="2"/>
<list type="CARD8" name="name">
- <fieldref>nbytes</fieldref>
+ <fieldref>n-bytes</fieldref>
</list>
</request>
<!-- Version 3 -->
diff --git a/xcb-proto/src/xcb_types.xml b/xcb-proto/src/xcb_types.xml
index 99b0917..319ecc2 100644
--- a/xcb-proto/src/xcb_types.xml
+++ b/xcb-proto/src/xcb_types.xml
@@ -27,25 +27,34 @@ authorization from the authors.
-->
<protocol name="X">
<!-- Core protocol types -->
- <struct name="CHAR2B">
- <field type="CARD8" name="byte1"/>
- <field type="CARD8" name="byte2"/>
- </struct>
+ <!-- Request -->
+ <!-- Value -->
<type name="WINDOW"/>
<type name="PIXMAP"/>
+ <type name="ATOM"/>
<type name="CURSOR"/>
<type name="FONT"/>
- <type name="GCONTEXT"/>
- <type name="COLORMAP"/>
- <type name="ATOM"/>
+ <!-- Match -->
<union name="DRAWABLE">
<field type="WINDOW" name="window"/>
<field type="PIXMAP" name="pixmap"/>
</union>
+ <!-- Access -->
+ <!-- Alloc -->
+ <type name="COLORMAP"/>
+ <type name="GCONTEXT"/>
+ <!-- IDChoice -->
+ <!-- Name -->
+ <!-- Length -->
+ <!-- Implementation -->
<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">
<field type="CARD16" name="major"/>
<field type="CARD16" name="minor"/>
@@ -69,6 +78,10 @@ authorization from the authors.
<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>
<struct name="SIZE">
<field type="CARD16" name="width"/>
<field type="CARD16" name="height"/>
More information about the xcb-commit
mailing list