[Xcb-commit] Branch 'xspec' - 2 commits - xcb-proto
Alp Toker
alp at kemper.freedesktop.org
Mon Mar 6 23:08:44 PST 2006
xcb-proto/src/extensions/glx.xml | 16 ++++++++--------
xcb-proto/src/extensions/randr.xml | 13 +++++--------
xcb-proto/src/extensions/shape.xml | 12 ++++--------
xcb-proto/src/extensions/xfixes.xml | 2 +-
xcb-proto/src/xcb_types.xml | 4 ++--
xcb-proto/src/xproto.xml | 4 ++--
6 files changed, 22 insertions(+), 29 deletions(-)
New commits:
diff-tree c695741da43e289d065a7af784c1399ef4b6d4e4 (from e210f2967be1b4354695492532566047cd91643e)
Author: Alp Toker <alp at atoker.com>
Date: Tue Mar 7 07:08:20 2006 +0000
Cleanups
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index 160f158..627f759 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -250,7 +250,7 @@ The patch that fixed this server bug in
<field type="CARD32" name="screen"/>
<field type="VISUALID" name="visual"/>
<field type="xcb_types:PIXMAP" name="pixmap"/>
- <field type="glx:PIXMAP" name="glxpixmap"/>
+ <field type="glx:PIXMAP" name="glx_pixmap"/>
</request>
<request name="GetVisualConfigs" opcode="14">
<field type="CARD32" name="screen"/>
@@ -263,7 +263,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="DestroyGLXPixmap" opcode="15">
- <field type="glx:PIXMAP" name="glxpixmap"/>
+ <field type="glx:PIXMAP" name="glx_pixmap"/>
</request>
<!--
Context tag is not in the proto, should be part of the list of bytes
@@ -333,11 +333,11 @@ The patch that fixed this server bug in
<field type="CARD32" name="screen"/>
<field type="CARD32" name="fbconfig"/>
<field type="xcb_types:PIXMAP" name="pixmap"/>
- <field type="glx:PIXMAP" name="glxpixmap"/>
+ <field type="glx:PIXMAP" name="glx_pixmap"/>
<field type="CARD32" name="num_attribs"/>
</request>
<request name="DestroyPixmap" opcode="23">
- <field type="glx:PIXMAP" name="glxpixmap"/>
+ <field type="glx:PIXMAP" name="glx_pixmap"/>
</request>
<request name="CreateNewContext" opcode="24">
<field type="glx:CONTEXT" name="context"/>
diff --git a/xcb-proto/src/extensions/randr.xml b/xcb-proto/src/extensions/randr.xml
index 5cc69d2..19f09c5 100644
--- a/xcb-proto/src/extensions/randr.xml
+++ b/xcb-proto/src/extensions/randr.xml
@@ -26,7 +26,7 @@ sale, use or other dealings in this Soft
authorization from the authors.
-->
<extension header="randr" xname="RANDR" name="RandR" version="1.1">
-<!-- for SubPixelOrder, import render -->
+<!-- for SubpixelOrder, import render -->
<import>render</import>
<enum name="Rotation">
<item name="rotate0">
@@ -64,10 +64,7 @@ authorization from the authors.
<pad bytes="16"/>
</reply>
</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!
- -->
+<!-- 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" opcode="2">
<field type="WINDOW" name="drawable"/>
<field type="TIMESTAMP" name="time"/>
@@ -81,7 +78,7 @@ authorization from the authors.
<field type="TIMESTAMP" name="time"/>
<field type="TIMESTAMP" name="config-time"/>
<field type="WINDOW" name="root"/>
- <field type="SubpixelOrder" name="subpixel-order"/>
+ <field type="render:SubpixelOrder" name="subpixel-order"/>
<pad bytes="10"/>
</reply>
</request>
@@ -105,7 +102,7 @@ authorization from the authors.
<pad bytes="2"/>
</request>
<!--
- I think this is correct. It works. though I believe nInfo is a bit high...
+ I think this is correct. It works. though I believe n-info is a bit high...
-->
<request name="GetScreenInfo" opcode="5">
<field type="WINDOW" name="window"/>
@@ -143,7 +140,7 @@ authorization from the authors.
<field type="WINDOW" name="root"/>
<field type="WINDOW" name="request-window"/>
<field type="CARD16" name="size-id"/>
- <field type="CARD16" name="subpixel-order"/>
+ <field type="render:SubpixelOrder" name="subpixel-order"/>
<field type="ScreenSize"/>
</event>
</extension>
diff --git a/xcb-proto/src/extensions/shape.xml b/xcb-proto/src/extensions/shape.xml
index cea497e..1c57a1f 100644
--- a/xcb-proto/src/extensions/shape.xml
+++ b/xcb-proto/src/extensions/shape.xml
@@ -59,8 +59,7 @@ authorization from the authors.
<field type="BYTE" name="ordering"/>
<pad bytes="1"/>
<field type="WINDOW" name="destination-window"/>
- <field type="INT16" name="x-offset"/>
- <field type="INT16" name="y-offset"/>
+ <field type="POINT" name="offset"/>
<list type="RECTANGLE" name="rectangles"/>
</request>
<request name="Mask" opcode="2">
@@ -68,8 +67,7 @@ authorization from the authors.
<field type="ShapeKind" name="destination-kind"/>
<pad bytes="2"/>
<field type="WINDOW" name="destination-window"/>
- <field type="INT16" name="x-offset"/>
- <field type="INT16" name="y-offset"/>
+ <field type="POINT" name="offset"/>
<field type="PIXMAP" name="source-bitmap"/>
</request>
<request name="Combine" opcode="3">
@@ -78,16 +76,14 @@ authorization from the authors.
<field type="ShapeKind" name="source-kind"/>
<pad bytes="1"/>
<field type="WINDOW" name="destination-window"/>
- <field type="INT16" name="x-offset"/>
- <field type="INT16" name="y-offset"/>
+ <field type="POINT" name="offset"/>
<field type="WINDOW" name="source-window"/>
</request>
<request name="Offset" opcode="4">
<field type="ShapeKind" name="destination-kind"/>
<pad bytes="3"/>
<field type="WINDOW" name="destination-window"/>
- <field type="INT16" name="x-offset"/>
- <field type="INT16" name="y-offset"/>
+ <field type="POINT" name="offset"/>
</request>
<request name="QueryExtents" opcode="5">
<field type="WINDOW" name="destination-window"/>
diff --git a/xcb-proto/src/extensions/xfixes.xml b/xcb-proto/src/extensions/xfixes.xml
index 972b78a..001412e 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -131,7 +131,7 @@ authorization from the authors.
<field type="POINT" name="hot-point"/>
<field type="CARD32" name="cursor-serial"/>
<pad bytes="8"/>
-<!-- FIXME: refers to anonymous fields -->
+<!-- FIXME: xspec: refers to anonymous fields -->
<list type="CARD32" name="cursor-image">
<op op="*">
<fieldref>width</fieldref>
diff --git a/xcb-proto/src/xcb_types.xml b/xcb-proto/src/xcb_types.xml
index 15e6b4a..99b0917 100644
--- a/xcb-proto/src/xcb_types.xml
+++ b/xcb-proto/src/xcb_types.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="xcb_types">
+<protocol name="X">
<!-- Core protocol types -->
<struct name="CHAR2B">
<field type="CARD8" name="byte1"/>
@@ -207,4 +207,4 @@ authorization from the authors.
</op>
</list>
</struct>
-</xcb>
+</protocol>
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index ccbb065..56054bb 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -27,7 +27,7 @@ authorization from the authors.
-->
<!-- TODO: rename, add version attribute -->
<!-- eg. protocol name="X" version="11" -->
-<xcb header="xproto">
+<protocol name="X">
<!-- Core error types -->
<error name="Request" number="1">
<field type="CARD32" name="bad-value"/>
@@ -1680,4 +1680,4 @@ authorization from the authors.
to hand to write(2) seems silly...!
-->
<request name="NoOperation" opcode="127"/>
-</xcb>
+</protocol>
diff-tree e210f2967be1b4354695492532566047cd91643e (from ffe40b938f02ef98bf4883a2cd6c3d38bb0d843f)
Author: Alp Toker <alp at atoker.com>
Date: Tue Mar 7 05:25:22 2006 +0000
Fix overzealous regex damage (extension_types -> xcb_types)
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index d8aafbd..160f158 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -249,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="extension_types:PIXMAP" name="pixmap"/>
+ <field type="xcb_types:PIXMAP" name="pixmap"/>
<field type="glx:PIXMAP" name="glxpixmap"/>
</request>
<request name="GetVisualConfigs" opcode="14">
@@ -332,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="extension_types:PIXMAP" name="pixmap"/>
+ <field type="xcb_types:PIXMAP" name="pixmap"/>
<field type="glx:PIXMAP" name="glxpixmap"/>
<field type="CARD32" name="num_attribs"/>
</request>
@@ -396,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="extension_types:WINDOW" name="window"/>
+ <field type="xcb_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"/>
@@ -501,7 +501,7 @@ The patch that fixed this server bug in
</request>
<!-- FIXME:
All the Get* functions can return different stuff for replies.
- Hopefully extension will support multiple reply structures at some point
+ Hopefully xcb will support multiple reply structures at some point
but for now... grrrr
Starts on page 58/180
-->
More information about the xcb-commit
mailing list