[Xcb-commit] Branch 'xspec' - xcb-proto
Alp Toker
alp at kemper.freedesktop.org
Mon Mar 6 16:04:18 PST 2006
xcb-proto/src/extensions/randr.xml | 4 +
xcb-proto/src/extensions/render.xml | 96 ++++++++++++++++++++++++++----------
2 files changed, 74 insertions(+), 26 deletions(-)
New commits:
diff-tree ffe40b938f02ef98bf4883a2cd6c3d38bb0d843f (from 62c0ea954851337165a878e6bfa365df928be274)
Author: Alp Toker <alp at atoker.com>
Date: Tue Mar 7 00:04:06 2006 +0000
Preliminary RENDER 0.9, 0.10 support
Version history cleanups
diff --git a/xcb-proto/src/extensions/randr.xml b/xcb-proto/src/extensions/randr.xml
index 74f5c6f..5cc69d2 100644
--- a/xcb-proto/src/extensions/randr.xml
+++ b/xcb-proto/src/extensions/randr.xml
@@ -26,6 +26,8 @@ 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 -->
+ <import>render</import>
<enum name="Rotation">
<item name="rotate0">
<value>1</value>
@@ -79,7 +81,7 @@ authorization from the authors.
<field type="TIMESTAMP" name="time"/>
<field type="TIMESTAMP" name="config-time"/>
<field type="WINDOW" name="root"/>
- <field type="CARD16" name="subpixel-order"/>
+ <field type="SubpixelOrder" name="subpixel-order"/>
<pad bytes="10"/>
</reply>
</request>
diff --git a/xcb-proto/src/extensions/render.xml b/xcb-proto/src/extensions/render.xml
index a04ea2c..95d0ddd 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2002-2004 Carl D. Worth, Jamey Sharp, Bart Massey, Josh Triplett
+Copyright (C) 2006 Alp Toker
All Rights Reserved. See the file COPYING in this directory
for licensing information.
-->
-<extension header="render" xname="RENDER" name="Render" version="0.8">
+<extension header="render" xname="RENDER" name="Render" version="0.10">
<!-- supports version 0.8 -->
<enum name="PictType">
<item name="indexed"/>
@@ -26,6 +27,7 @@ for licensing information.
<item name="xor"/>
<item name="add"/>
<item name="saturate"/>
+<!-- Operators only available in version 0.2 -->
<item name="disjoint-clear">
<value>0x10</value>
</item>
@@ -143,7 +145,7 @@ for licensing information.
</op>
</item>
</enum>
- <enum name="SubPixel">
+ <enum type="CARD16" name="SubpixelOrder">
<item name="unknown"/>
<item name="horizontal-rgb"/>
<item name="horizontal-bgr"/>
@@ -199,19 +201,16 @@ for licensing information.
<fieldref>num-depths</fieldref>
</list>
</struct>
- <struct name="INDEXVALUE">
- <field type="CARD32" name="pixel"/>
- <field type="CARD16" name="red"/>
- <field type="CARD16" name="green"/>
- <field type="CARD16" name="blue"/>
- <field type="CARD16" name="alpha"/>
- </struct>
<struct name="COLOR">
<field type="CARD16" name="red"/>
<field type="CARD16" name="green"/>
<field type="CARD16" name="blue"/>
<field type="CARD16" name="alpha"/>
</struct>
+ <struct name="INDEXVALUE">
+ <field type="CARD32" name="pixel"/>
+ <field type="COLOR"/>
+ </struct>
<struct name="POINTFIX">
<field type="FIXED" name="x"/>
<field type="FIXED" name="y"/>
@@ -265,7 +264,7 @@ for licensing information.
<list type="PICTSCREEN" name="screens">
<fieldref>num-screens</fieldref>
</list>
- <list type="CARD32" name="subpixels">
+ <list type="SubpixelOrder" name="subpixels">
<fieldref>num-subpixel</fieldref>
</list>
</reply>
@@ -282,7 +281,7 @@ for licensing information.
</list>
</reply>
</request>
-<!-- opcode 3 reserved for QueryDithers -->
+<!-- FIXME: opcode 3 reserved for QueryDithers -->
<request name="CreatePicture" opcode="4">
<field type="PICTURE" name="pid"/>
<field type="DRAWABLE" name="drawable"/>
@@ -391,16 +390,16 @@ for licensing information.
<struct name="GLYPHSETELT">
<field type="CARD8" name="len"/>
<pad bytes="3"/>
- <field type="INT16" name="deltax"/>
- <field type="INT16" name="deltay"/>
+ <field type="INT16" name="delta-x"/>
+ <field type="INT16" name="delta-y"/>
<field type="GLYPHSET" name="glyphset"/>
</struct>
<!-- CompositeGlyphs8 -->
<struct name="GLYPHELT8">
<field type="CARD8" name="len"/>
<pad bytes="3"/>
- <field type="INT16" name="deltax"/>
- <field type="INT16" name="deltay"/>
+ <field type="INT16" name="delta-x"/>
+ <field type="INT16" name="delta-y"/>
<list type="CARD8" name="glyphs">
<fieldref>len</fieldref>
</list>
@@ -424,8 +423,8 @@ for licensing information.
<struct name="GLYPHELT16">
<field type="CARD8" name="len"/>
<pad bytes="3"/>
- <field type="INT16" name="deltax"/>
- <field type="INT16" name="deltay"/>
+ <field type="INT16" name="delta-x"/>
+ <field type="INT16" name="delta-y"/>
<list type="CARD16" name="glyphs">
<fieldref>len</fieldref>
</list>
@@ -441,16 +440,15 @@ for licensing information.
<field type="PICTURE" name="dst"/>
<field type="PICTFORMAT" name="mask-format"/>
<field type="GLYPHSET" name="glyphset"/>
- <field type="INT16" name="src-x"/>
- <field type="INT16" name="src-y"/>
+ <field type="POINT" name="src-point"/>
<list type="GLYPHITEM16" name="glyphcmds"/>
</request>
<!-- CompositeGlyphs32 -->
<struct name="GLYPHELT32">
<field type="CARD8" name="len"/>
<pad bytes="3"/>
- <field type="INT16" name="deltax"/>
- <field type="INT16" name="deltay"/>
+ <field type="INT16" name="delta-x"/>
+ <field type="INT16" name="delta-y"/>
<list type="CARD32" name="glyphs">
<fieldref>len</fieldref>
</list>
@@ -466,8 +464,7 @@ for licensing information.
<field type="PICTURE" name="dst"/>
<field type="PICTFORMAT" name="mask-format"/>
<field type="GLYPHSET" name="glyphset"/>
- <field type="INT16" name="src-x"/>
- <field type="INT16" name="src-y"/>
+ <field type="POINT" name="src-point"/>
<list type="GLYPHITEM32" name="glyphcmds"/>
</request>
<!-- new in version 0.1 -->
@@ -482,8 +479,7 @@ for licensing information.
<request name="CreateCursor" opcode="27">
<field type="CURSOR" name="cid"/>
<field type="PICTURE" name="source"/>
- <field type="CARD16" name="x"/>
- <field type="CARD16" name="y"/>
+ <field type="POINT"/>
</request>
<!-- new in version 0.6 -->
<struct name="TRANSFORM">
@@ -533,4 +529,54 @@ for licensing information.
<field type="CURSOR" name="cid"/>
<list type="ANIMCURSORELT" name="cursors"/>
</request>
+ <!-- new in version 0.9 -->
+ <!-- FIXME: validate from 0.9 onwards, esp. field order and padding -->
+ <request name="AddTrapezoids" opcode="32">
+ <field type="PICTURE" name="picture"/>
+ <field type="POINT" name="offset"/>
+ <list type="TRAP" name="trapezoids"/>
+ </request>
+ <!-- new in version 0.10 -->
+ <enum type="CARD16" name="Repeat">
+ <item name="none"/>
+ <item name="normal"/>
+ <item name="pad"/>
+ <item name="reflect"/>
+ </enum>
+ <request name="CreateSolidFill" opcode="33">
+ <field type="PICTURE" name="pid"/>
+ <field type="COLOR" name="color"/>
+ </request>
+ <request name="CreateLinearGradient" opcode="34">
+ <field type="PICTURE" name="pid"/>
+ <field type="POINTFIX" name="p1"/>
+ <field type="POINTFIX" name="p2"/>
+ <field type="CARD16" name="spread"/>
+ <field type="CARD16" name="n-stops"/>
+ <!-- FIXME: spec says: -->
+ <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" opcode="35">
+ <field type="PICTURE" name="pid"/>
+ <field type="POINTFIX" name="inner-center"/>
+ <field type="POINTFIX" name="outer-center"/>
+ <field type="FIXED" name="inner-radius"/>
+ <field type="FIXED" name="outer-radius"/>
+ <field type="CARD16" name="spread"/>
+ <field type="CARD16" name="n-stops"/>
+ <list type="FIXED" name="stops"/>
+ <list type="COLOR" name="stop-colors"/>
+ </request>
+ <request name="CreateConicalGradient" opcode="36">
+ <field type="PICTURE" name="pid"/>
+ <field type="POINTFIX" name="center"/>
+ <field type="FIXED" name="angle"/>
+ <field type="CARD16" name="spread"/>
+ <field type="CARD16" name="n-stops"/>
+ <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>
More information about the xcb-commit
mailing list