[Xcb-commit] 6 commits - xcb-demo xcb-proto
Ian Osgood
iano at kemper.freedesktop.org
Tue Jun 6 12:50:18 PDT 2006
xcb-demo/rendertest.c | 2
xcb-demo/tests/flames.c | 2
xcb-proto/src/extensions/composite.xml | 17 ++++
xcb-proto/src/extensions/render.xml | 108 ++++++++++++++++++-------------
xcb-proto/src/extensions/screensaver.xml | 44 +++++-------
xcb-proto/src/extensions/xfixes.xml | 27 ++++---
6 files changed, 118 insertions(+), 82 deletions(-)
New commits:
diff-tree 1a7c80ecb73c2978cc16cda33896d51b786850ec (from 63ca6cea3b12f95e5a1fe8c621980c09e4f22327)
Author: Ian Osgood <iano at quirkster.com>
Date: Tue Jun 6 12:49:35 2006 -0700
Replace another Sync -> Flush
diff --git a/xcb-demo/tests/flames.c b/xcb-demo/tests/flames.c
index 1db9b1c..66764e0 100644
--- a/xcb-demo/tests/flames.c
+++ b/xcb-demo/tests/flames.c
@@ -226,7 +226,7 @@ main ()
free (e);
}
flame_draw_flame (f);
- XCBSync (f->xcb.c, 0);
+ XCBFlush (f->xcb.c);
}
sortie:
diff-tree 63ca6cea3b12f95e5a1fe8c621980c09e4f22327 (from ef27cb80134308877e59b9a61eea6ffbe198f555)
Author: Ian Osgood <iano at quirkster.com>
Date: Tue Jun 6 12:44:39 2006 -0700
Adapt rendertest for rename of TRAP -> TRAPEZOID
diff --git a/xcb-demo/rendertest.c b/xcb-demo/rendertest.c
index 82900ba..ac8af9d 100644
--- a/xcb-demo/rendertest.c
+++ b/xcb-demo/rendertest.c
@@ -120,7 +120,7 @@ int draw_window(XCBConnection *conn, XCB
XCBRECTANGLE pict_rect[1], window_rect;
XCBRenderCOLOR pict_color[4], back_color, alpha_color;
XCBSCREEN *root;
- XCBRenderTRAP traps[4];
+ XCBRenderTRAPEZOID traps[4];
XCBRenderTRIANGLE triangles[4];
XCBRenderPOINTFIX tristrips[9];
XCBRenderPOINTFIX trifans[9];
diff-tree ef27cb80134308877e59b9a61eea6ffbe198f555 (from 013beacae60c6d3876eab40c5da1e4a7662a1943)
Author: Ian Osgood <iano at quirkster.com>
Date: Tue Jun 6 12:40:01 2006 -0700
Update Composite to version 0.3
diff --git a/xcb-proto/src/extensions/composite.xml b/xcb-proto/src/extensions/composite.xml
index 20c4976..f055549 100644
--- a/xcb-proto/src/extensions/composite.xml
+++ b/xcb-proto/src/extensions/composite.xml
@@ -24,7 +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. -->
+<!-- This file describes version 0.3 of COMPOSITE. -->
<xcb header="composite" extension-xname="Composite" extension-name="Composite">
<import>xfixes</import>
@@ -77,4 +77,19 @@ authorization from the authors.
<field type="WINDOW" name="window" />
<field type="PIXMAP" name="pixmap" />
</request>
+
+ <!-- new in version 0.3 -->
+
+ <request name="GetOverlayWindow" opcode="7">
+ <field type="WINDOW" name="window" />
+ <reply>
+ <pad bytes="1" />
+ <field type="WINDOW" name="overlay_win" />
+ <pad bytes="20" />
+ </reply>
+ </request>
+
+ <request name="ReleaseOverlayWindow" opcode="8">
+ <field type="WINDOW" name="window" />
+ </request>
</xcb>
diff-tree 013beacae60c6d3876eab40c5da1e4a7662a1943 (from 3d986d1595240ea4c8a04b4be71b86b86e7d11f1)
Author: Ian Osgood <iano at quirkster.com>
Date: Tue Jun 6 12:36:20 2006 -0700
Update Render to version 0.10
Renamed previous type TRAP -> TRAPEZOID to make room for new TRAP type.
Use <bit> construct for masks.
diff --git a/xcb-proto/src/extensions/render.xml b/xcb-proto/src/extensions/render.xml
index 74938be..53782c8 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -5,7 +5,7 @@ All Rights Reserved. See the file COPYI
for licensing information.
-->
<xcb header="render" extension-xname="RENDER" extension-name="Render">
- <!-- supports version 0.8 -->
+ <!-- supports version 0.10 -->
<enum name="PictType">
<item name="Indexed" />
@@ -67,45 +67,19 @@ for licensing information.
</enum>
<enum name="CP">
- <item name="Repeat">
- <op op="<<"><value>1</value><value>0</value></op>
- </item>
- <item name="AlphaMap">
- <op op="<<"><value>1</value><value>1</value></op>
- </item>
- <item name="AlphaXOrigin">
- <op op="<<"><value>1</value><value>2</value></op>
- </item>
- <item name="AlphaYOrigin">
- <op op="<<"><value>1</value><value>3</value></op>
- </item>
- <item name="ClipXOrigin">
- <op op="<<"><value>1</value><value>4</value></op>
- </item>
- <item name="ClipYOrigin">
- <op op="<<"><value>1</value><value>5</value></op>
- </item>
- <item name="ClipMask">
- <op op="<<"><value>1</value><value>6</value></op>
- </item>
- <item name="GraphicsExposure">
- <op op="<<"><value>1</value><value>7</value></op>
- </item>
- <item name="SubwindowMode">
- <op op="<<"><value>1</value><value>8</value></op>
- </item>
- <item name="PolyEdge">
- <op op="<<"><value>1</value><value>9</value></op>
- </item>
- <item name="PolyMode">
- <op op="<<"><value>1</value><value>10</value></op>
- </item>
- <item name="Dither">
- <op op="<<"><value>1</value><value>11</value></op>
- </item>
- <item name="ComponentAlpha">
- <op op="<<"><value>1</value><value>12</value></op>
- </item>
+ <item name="Repeat"> <bit>0</bit></item>
+ <item name="AlphaMap"> <bit>1</bit></item>
+ <item name="AlphaXOrigin"> <bit>2</bit></item>
+ <item name="AlphaYOrigin"> <bit>3</bit></item>
+ <item name="ClipXOrigin"> <bit>4</bit></item>
+ <item name="ClipYOrigin"> <bit>5</bit></item>
+ <item name="ClipMask"> <bit>6</bit></item>
+ <item name="GraphicsExposure"><bit>7</bit></item>
+ <item name="SubwindowMode"> <bit>8</bit></item>
+ <item name="PolyEdge"> <bit>9</bit></item>
+ <item name="PolyMode"> <bit>10</bit></item>
+ <item name="Dither"> <bit>11</bit></item>
+ <item name="ComponentAlpha"> <bit>12</bit></item>
</enum>
<enum name="SubPixel">
@@ -205,7 +179,7 @@ for licensing information.
<field type="POINTFIX" name="p3" />
</struct>
- <struct name="TRAP">
+ <struct name="TRAPEZOID">
<field type="FIXED" name="top" />
<field type="FIXED" name="bottom" />
<field type="LINEFIX" name="left" />
@@ -322,7 +296,7 @@ for licensing information.
<field type="PICTFORMAT" name="mask_format" />
<field type="INT16" name="src_x" />
<field type="INT16" name="src_y" />
- <list type="TRAP" name="traps" />
+ <list type="TRAPEZOID" name="traps" />
</request>
<request name="Triangles" opcode="11">
@@ -566,4 +540,54 @@ for licensing information.
<field type="CURSOR" name="cid" />
<list type="ANIMCURSORELT" name="cursors" />
</request>
+
+ <!-- new in version 0.9 -->
+
+ <struct name="SPANFIX">
+ <field type="FIXED" name="l" />
+ <field type="FIXED" name="r" />
+ <field type="FIXED" name="y" />
+ </struct>
+
+ <struct name="TRAP">
+ <field type="SPANFIX" name="top" />
+ <field type="SPANFIX" name="bot" />
+ </struct>
+
+ <request name="AddTraps" opcode="32">
+ <field type="PICTURE" name="picture" />
+ <field type="INT16" name="x_off" />
+ <field type="INT16" name="y_off" />
+ <list type="TRAP" name="traps" />
+ </request>
+
+ <!-- new in version 0.10 -->
+
+ <request name="CreateSolidFill" opcode="33">
+ <field type="PICTURE" name="picture" />
+ <field type="COLOR" name="color" />
+ </request>
+
+ <request name="CreateLinearGradient" opcode="34">
+ <field type="PICTURE" name="picture" />
+ <field type="POINTFIX" name="p1" />
+ <field type="POINTFIX" name="p2" />
+ <field type="CARD32" name="num_stops" />
+ </request>
+
+ <request name="CreateRadialGradient" opcode="35">
+ <field type="PICTURE" name="picture" />
+ <field type="POINTFIX" name="inner" />
+ <field type="POINTFIX" name="outer" />
+ <field type="FIXED" name="inner_radius" />
+ <field type="FIXED" name="outer_radius" />
+ <field type="CARD32" name="num_stops" />
+ </request>
+
+ <request name="CreateConicalGradient" opcode="36">
+ <field type="PICTURE" name="picture" />
+ <field type="POINTFIX" name="center" />
+ <field type="FIXED" name="angle" /> <!-- degrees -->
+ <field type="CARD32" name="num_stops" />
+ </request>
</xcb>
diff-tree 3d986d1595240ea4c8a04b4be71b86b86e7d11f1 (from ed1a8d66bf8483a2ee86cf7393e70c70509fb993)
Author: Ian Osgood <iano at quirkster.com>
Date: Tue Jun 6 11:26:31 2006 -0700
Update screen saver protocol to version 1.1
Fix type names, field sizes, and padding.
diff --git a/xcb-proto/src/extensions/screensaver.xml b/xcb-proto/src/extensions/screensaver.xml
index f6cff9c..2d82998 100644
--- a/xcb-proto/src/extensions/screensaver.xml
+++ b/xcb-proto/src/extensions/screensaver.xml
@@ -27,39 +27,29 @@ authorization from the authors.
-->
<!--
Screen Saver Extension to the X Protocol
-Draft Standard Version 1.0
+Draft Standard Version 1.1
-->
<xcb header="screensaver" extension-xname="MIT-SCREEN-SAVER" extension-name="ScreenSaver">
<!-- Types -->
- <enum name="KIND">
+ <enum name="Kind">
<item name="Blanked" />
<item name="Internal" />
<item name="External" />
</enum>
- <enum name="EVENT">
- <item name="NotifyMask">
- <op op="<<"><value>1</value><value>0</value></op>
- </item>
- <item name="CycleMask">
- <op op="<<"><value>1</value><value>1</value></op>
- </item>
+ <enum name="Event">
+ <item name="NotifyMask"><bit>0</bit></item>
+ <item name="CycleMask"> <bit>1</bit></item>
</enum>
- <enum name="STATE">
+ <enum name="State">
<item name="Off" />
<item name="On" />
<item name="Cycle" />
<item name="Disabled" />
</enum>
- <enum name="CLASS">
- <item name="CopyFromParent" />
- <item name="InputOutput" />
- <item name="InputOnly" />
- </enum>
-
<!-- Errors -->
<!-- Requests -->
<request name="QueryVersion" opcode="0">
@@ -70,7 +60,7 @@ Draft Standard Version 1.0
<pad bytes="1"/>
<field type="CARD8" name="server_major_version"/>
<field type="CARD8" name="server_minor_version"/>
- <pad bytes="22"/>
+ <pad bytes="20"/>
</reply>
</request>
@@ -81,15 +71,15 @@ Draft Standard Version 1.0
<field type="WINDOW" name="saver_window"/>
<field type="CARD32" name="ms_until_server"/>
<field type="CARD32" name="ms_since_user_input"/>
- <field type="CARD16" name="event_mask" />
- <field type="KIND" name="kind"/>
- <pad bytes="10"/>
+ <field type="CARD32" name="event_mask" />
+ <field type="BYTE" name="kind"/> <!-- enum Kind -->
+ <pad bytes="7"/>
</reply>
</request>
<request name="SelectInput" opcode="2">
<field type="DRAWABLE" name="drawable"/>
- <field type="EVENT" name="event_mask" />
+ <field type="CARD32" name="event_mask" /> <!-- enum Event -->
</request>
<request name="SetAttributes" opcode="3">
@@ -99,7 +89,7 @@ Draft Standard Version 1.0
<field type="CARD16" name="width"/>
<field type="CARD16" name="height"/>
<field type="CARD16" name="border_width"/>
- <field type="CLASS" name="class"/>
+ <field type="BYTE" name="class"/> <!-- enum XCBWindowClass -->
<field type="CARD8" name="depth"/>
<field type="VISUALID" name="visual"/>
<valueparam value-mask-type="CARD32"
@@ -110,17 +100,23 @@ Draft Standard Version 1.0
<request name="UnsetAttributes" opcode="4">
<field type="DRAWABLE" name="drawable"/>
</request>
+
+ <!-- version 1.1 -->
+ <request name="Suspend" opcode="5">
+ <field type="BOOL" name="suspend" />
+ <pad bytes="3" />
+ </request>
<!-- Events -->
<event name="Notify" number="0">
<field type="CARD8" name="code"/>
- <field type="STATE" name="state"/>
+ <field type="BYTE" name="state"/> <!-- enum State -->
<field type="CARD16" name="sequence_number"/>
<field type="TIMESTAMP" name="time"/>
<field type="WINDOW" name="root"/>
<field type="WINDOW" name="window"/>
- <field type="KIND" name="kind"/>
+ <field type="BYTE" name="kind"/> <!-- enum Kind -->
<field type="BOOL" name="forced"/>
<pad bytes="14"/>
</event>
diff-tree ed1a8d66bf8483a2ee86cf7393e70c70509fb993 (from b39e9256cd11ec3fa1e3ecac1743dbc6412e745a)
Author: Ian Osgood <iano at quirkster.com>
Date: Tue Jun 6 10:02:16 2006 -0700
Update XFixes to protocol version 4.
Use <bit> construct for mask enums.
diff --git a/xcb-proto/src/extensions/xfixes.xml b/xcb-proto/src/extensions/xfixes.xml
index ab59637..b82c63b 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -24,7 +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. -->
+<!-- This file describes version 4 of XFixes. -->
<xcb header="xfixes" extension-xname="XFIXES" extension-name="XFixes">
<import>render</import>
<import>shape</import>
@@ -71,15 +71,9 @@ authorization from the authors.
</enum>
<enum name="SelectionEventMask">
- <item name="SetSelectionOwner">
- <op op="<<"><value>1</value><value>0</value></op>
- </item>
- <item name="SelectionWindowDestroy">
- <op op="<<"><value>1</value><value>1</value></op>
- </item>
- <item name="SelectionClientClose">
- <op op="<<"><value>1</value><value>2</value></op>
- </item>
+ <item name="SetSelectionOwner"> <bit>0</bit></item>
+ <item name="SelectionWindowDestroy"><bit>1</bit></item>
+ <item name="SelectionClientClose"> <bit>2</bit></item>
</enum>
<event name="SelectionNotify" number="0">
@@ -103,9 +97,7 @@ authorization from the authors.
</enum>
<enum name="CursorNotifyMask">
- <item name="DisplayCursor">
- <op op="<<"><value>1</value><value>0</value></op>
- </item>
+ <item name="DisplayCursor"><bit>0</bit></item>
</enum>
<event name="CursorNotify" number="1">
@@ -319,4 +311,13 @@ authorization from the authors.
<field type="CARD16" name="top" />
<field type="CARD16" name="bottom" />
</request>
+
+ <!-- Version 4 -->
+ <request name="HideCursor" opcode="29">
+ <field type="WINDOW" name="window" />
+ </request>
+
+ <request name="ShowCursor" opcode="30">
+ <field type="WINDOW" name="window" />
+ </request>
</xcb>
More information about the xcb-commit
mailing list